Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 890714 - net-misc/r8125-9.009.02: error: too many arguments to function ‘netif_napi_add’ with kernels >=6.1.0
Summary: net-misc/r8125-9.009.02: error: too many arguments to function ‘netif_napi_ad...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Karlson2k
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks: 890716
  Show dependency tree
 
Reported: 2023-01-13 17:06 UTC by Zoltan Puskas
Modified: 2023-04-15 12:41 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
patch for r8125-9.011.00 (kernel-6.1.diff,762 bytes, patch)
2023-03-06 15:13 UTC, aleck
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Zoltan Puskas 2023-01-13 17:06:16 UTC
Kernel module does not build with kernel versions 6.1.0 and later.

Reproducible: Always

Steps to Reproduce:
1. emerge >=sys-kernel/gentoo-sources-6.1.0
2. emerge -1 r8125

Actual Results:  
In file included from /var/tmp/portage/net-misc/r8125-9.009.02/work/r8125-9.009.02/src/r8125_n.c:83:
/var/tmp/portage/net-misc/r8125-9.009.02/work/r8125-9.009.02/src/r8125_n.c: In function ‘rtl8125_init_napi’:
/var/tmp/portage/net-misc/r8125-9.009.02/work/r8125-9.009.02/src/r8125.h:631:57: error: too many arguments to function ‘netif_napi_add’
  631 | #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
      |                                                         ^~~~~~~~~~~~~~
/var/tmp/portage/net-misc/r8125-9.009.02/work/r8125-9.009.02/src/r8125_n.c:12605:17: note: in expansion of macro ‘RTL_NAPI_CONFIG’
12605 |                 RTL_NAPI_CONFIG(tp->dev, r8125napi, poll, R8125_NAPI_WEIGHT);


Expected Results:  
Successful module build.


# emerge --info
Portage 3.0.43 (python 3.10.9-final-0, default/linux/amd64/17.1/no-multilib/hardened, gcc-11, glibc-2.36-r6, 6.0.9-gentoo x86_64)
=================================================================
System uname: Linux-6.0.9-gentoo-x86_64-AMD_Ryzen_5_5500U_with_Radeon_Graphics-with-glibc2.36
KiB Mem:    32269716 total,  31192556 free
KiB Swap:    2097148 total,   2097148 free
Timestamp of repository gentoo: Fri, 13 Jan 2023 07:15:01 +0000
Head commit of repository gentoo: 5b59efbd061ba0d3931fce6f319ba627272ea798
Head commit of repository sinustrom: 1e45876489e8820933e63863e87d590c8bc50643

sh bash 5.2_p15-r1
ld GNU ld (Gentoo 2.39 p5) 2.39.0
distcc 3.4 x86_64-pc-linux-gnu [enabled]
app-misc/pax-utils:        1.3.6-r1::gentoo
app-shells/bash:           5.2_p15-r1::gentoo
dev-lang/perl:             5.36.0-r1::gentoo
dev-lang/python:           3.9.16::gentoo, 3.10.9::gentoo, 3.11.1::gentoo
dev-lang/rust:             1.66.1::gentoo
dev-util/cmake:            3.25.1::gentoo
dev-util/meson:            1.0.0::gentoo
sys-apps/baselayout:       2.9::gentoo
sys-apps/openrc:           0.46::gentoo
sys-apps/sandbox:          2.30-r1::gentoo
sys-devel/autoconf:        2.71-r5::gentoo
sys-devel/automake:        1.16.5::gentoo
sys-devel/binutils:        2.39-r4::gentoo
sys-devel/binutils-config: 5.5::gentoo
sys-devel/clang:           15.0.6-r1::gentoo
sys-devel/gcc:             11.3.1_p20221223::gentoo
sys-devel/gcc-config:      2.10::gentoo
sys-devel/libtool:         2.4.7-r1::gentoo
sys-devel/llvm:            15.0.6-r1::gentoo
sys-devel/make:            4.4::gentoo
sys-kernel/linux-headers:  6.1::gentoo (virtual/os-headers)
sys-libs/glibc:            2.36-r6::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: rsync
    sync-uri: rsync://barbican.sinustrom.net/gentoo-portage
    priority: -1000
    volatile: True
    sync-rsync-verify-metamanifest: yes
    sync-rsync-verify-max-age: 24
    sync-rsync-extra-opts:
    sync-rsync-verify-jobs: 1

sinustrom
    location: /var/db/repos/sinustrom
    sync-type: git
    sync-uri: https://github.com/zpuskas/sinustrom-gentoo-overlay.git
    masters: gentoo
    volatile: True

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=znver2 -madx -maes -mavx -mavx2 -mbmi -mbmi2 -mclflushopt -mclwb -mclzero -mcx16 -mf16c -mfma -mfsgsbase -mfxsr -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul -mpopcnt -mprfchw -mrdpid -mrdrnd -mrdseed -msahf -msha -msse -msse2 -msse3 -msse4.1 -msse4.2 -msse4a -mssse3 -mwbnoinvd -mxsave -mxsavec -mxsaveopt -mxsaves --param=l1-cache-line-size=64 --param=l1-cache-size=32 --param=l2-cache-size=512 -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php7.4/ext-active/ /etc/php/cgi-php7.4/ext-active/ /etc/php/cli-php7.4/ext-active/ /etc/php/fpm-php7.4/ext-active/ /etc/php/phpdbg-php7.4/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=znver2 -madx -maes -mavx -mavx2 -mbmi -mbmi2 -mclflushopt -mclwb -mclzero -mcx16 -mf16c -mfma -mfsgsbase -mfxsr -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul -mpopcnt -mprfchw -mrdpid -mrdrnd -mrdseed -msahf -msha -msse -msse2 -msse3 -msse4.1 -msse4.2 -msse4a -mssse3 -mwbnoinvd -mxsave -mxsavec -mxsaveopt -mxsaves --param=l1-cache-line-size=64 --param=l1-cache-size=32 --param=l2-cache-size=512 -O2 -pipe"
DISTDIR="/mnt/cache/portage/distfiles"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME"
FCFLAGS="-march=znver2 -madx -maes -mavx -mavx2 -mbmi -mbmi2 -mclflushopt -mclwb -mclzero -mcx16 -mf16c -mfma -mfsgsbase -mfxsr -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul -mpopcnt -mprfchw -mrdpid -mrdrnd -mrdseed -msahf -msha -msse -msse2 -msse3 -msse4.1 -msse4.2 -msse4a -mssse3 -mwbnoinvd -mxsave -mxsavec -mxsaveopt -mxsaves --param=l1-cache-line-size=64 --param=l1-cache-size=32 --param=l2-cache-size=512 -O2 -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg-live cgroup config-protect-if-modified distcc distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-march=znver2 -madx -maes -mavx -mavx2 -mbmi -mbmi2 -mclflushopt -mclwb -mclzero -mcx16 -mf16c -mfma -mfsgsbase -mfxsr -mlzcnt -mmmx -mmovbe -mmwaitx -mpclmul -mpopcnt -mprfchw -mrdpid -mrdrnd -mrdseed -msahf -msha -msse -msse2 -msse3 -msse4.1 -msse4.2 -msse4a -mssse3 -mwbnoinvd -mxsave -mxsavec -mxsaveopt -mxsaves --param=l1-cache-line-size=64 --param=l1-cache-size=32 --param=l2-cache-size=512 -O2 -pipe"
GENTOO_MIRRORS="rsync://barbican.sinustrom.net/gentoo-distfiles"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LEX="flex"
MAKEOPTS="-j88 -l12"
PKGDIR="/mnt/cache/portage/binpkgs"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
SHELL="/bin/zsh"
USE="7zip acl acpi amd64 bash-completion bzip2 cli crypt dri fortran gdbm gmp hardened iconv ipv6 libglvnd libtirpc lto lzma ncurses nls nptl opencl opengl openmp pam pcre pie posix readline seccomp smp sockets split-usr ssl ssp test-rust threads unicode usb vim-syntax xattr xtpax zlib zsh-completion zstd" ABI_X86="64" ADA_TARGET="gnat_2021" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="AMDGPU" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" NGINX_MODULES_HTTP="access addition auth_basic autoindex browser charset empty_gif fancyindex fastcgi geo grpc gzip headers_more limit_conn limit_req map mirror proxy push_stream referer rewrite scgi ssi userid uwsgi" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_10" PYTHON_TARGETS="python3_9 python3_10" RUBY_TARGETS="ruby27" USERLAND="GNU" VIDEO_CARDS="amdgpu radeonsi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EMERGE_DEFAULT_OPTS, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS
Comment 1 Zoltan Puskas 2023-01-13 17:21:05 UTC
It seems this was the change that caused the kernel driver to break: 

https://patchwork.kernel.org/project/linux-wireless/patch/20220927132753.750069-1-kuba@kernel.org/
Comment 2 Karlson2k 2023-01-15 07:48:47 UTC
The patch should be simple and straightforward. 
Unfortunately I don't have access to my gentoo boxes currently. 
I'll make a PR as soon as I'm able to test it.
Comment 3 aleck 2023-03-06 15:13:28 UTC
Created attachment 856372 [details, diff]
patch for r8125-9.011.00

With this patch from arch https://aur.archlinux.org/packages/r8125-dkms the module builds, but I still get errors:

Mar  6 16:05:39 localhost kernel: r8125 0000:02:00.0 enp2s0: rss get rxnfc
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x80 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x100 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x180 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x280 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x300 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x380 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x480 flags=0x0020]
Mar  6 16:07:21 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x0 flags=0x0020]
Mar  6 16:07:26 localhost kernel: r8125 0000:02:00.0 enp2s0: rss get rxnfc
Mar  6 16:07:26 localhost kernel: amd_iommu_report_page_fault: 64 callbacks suppressed
Mar  6 16:07:26 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x0 flags=0x0020]
Mar  6 16:07:28 localhost last message buffered 3 times
Mar  6 16:07:28 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x480 flags=0x0020]
Mar  6 16:07:28 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x0 flags=0x0020]
Mar  6 16:07:30 localhost last message buffered 4 times
Mar  6 16:07:34 localhost kernel: amd_iommu_report_page_fault: 3 callbacks suppressed
Mar  6 16:07:34 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x0 flags=0x0020]
Mar  6 16:07:36 localhost last message buffered 9 times
Mar  6 16:07:40 localhost kernel: amd_iommu_report_page_fault: 10 callbacks suppressed
Mar  6 16:07:40 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x0 flags=0x0020]
Mar  6 16:07:43 localhost last message buffered 9 times
Mar  6 16:07:45 localhost kernel: amd_iommu_report_page_fault: 8 callbacks suppressed
Mar  6 16:07:45 localhost kernel: r8125 0000:02:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000c address=0x0 flags=0x0020]
Comment 4 Larry the Git Cow gentoo-dev 2023-04-15 12:41:19 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8212d430a2de8bbe74e842ad54ec744b81463384

commit 8212d430a2de8bbe74e842ad54ec744b81463384
Author:     Karlson2k (Evgeny Grin) <k2k@narod.ru>
AuthorDate: 2023-04-03 15:52:22 +0000
Commit:     Joonas Niilola <juippis@gentoo.org>
CommitDate: 2023-04-15 12:41:16 +0000

    net-misc/r8125: Fixes for kernels 5.19 and 6.1
    
    Closes: https://bugs.gentoo.org/890714
    Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
    Closes: https://github.com/gentoo/gentoo/pull/30461
    Signed-off-by: Joonas Niilola <juippis@gentoo.org>

 .../r8125/files/r8125-9.009.01-linux-5.19.patch    | 35 ++++++++++++++++++++++
 net-misc/r8125/r8125-9.008.00.ebuild               |  2 ++
 net-misc/r8125/r8125-9.009.01.ebuild               |  2 ++
 net-misc/r8125/r8125-9.009.02.ebuild               |  4 +++
 4 files changed, 43 insertions(+)