public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: 結友 <miagetegorann@gmail.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-kernel v5 1/2] d/scripts: correctly compare namespaced ABI exports
Date: Tue, 17 Nov 2026 08:49:52 +0900	[thread overview]
Message-ID: <20261116234953.1476-2-miagetegorann@gmail.com> (raw)
In-Reply-To: <20261116234953.1476-1-miagetegorann@gmail.com>

abi-generate emits a different field order for namespaced exports, as
awk skips the empty namespace column of ordinary ones:

  TYPE MODULE HASH SYMBOL             (ordinary)
  NAMESPACE TYPE HASH SYMBOL MODULE   (namespaced)

abi-check parses both with a single pattern made for the first layout.
For the 2557 namespaced entries of the current amd64 ABI file it thus
takes the namespace as export type, the export type as location and
"SYMBOL<tab>MODULE" as symbol name. This has two consequences:

- Moving a namespaced export between a module and vmlinux is reported
  as one missing and one new symbol. Building hv_vmbus into vmlinux
  falsely fails the check with three missing symbols that way.
- A namespaced export changing from EXPORT_SYMBOL to EXPORT_SYMBOL_GPL
  is not detected at all.

Parse both layouts explicitly and compare the actual export type and
namespace. Adding or changing a namespace is an error like a stricter
export type, as consumers need to change their imports for it, while
dropping one is not.

Abort on entries matching neither layout and on duplicate symbols, so
that a future change in the generated format fails the build instead
of silently weakening the check again. This also applies when the ABI
check is skipped or runs in no-fail mode after an ABI bump, as the
result cannot be trusted at all in that case.

While at it, fix the argument separator in the printf of the export
type diagnostic.

Checked against abi-prev-7.0.14-29-pve-amd64: all 32727 entries are
parsed, comparing the file with itself reports no changes, and moving
the hv_vmbus exports to vmlinux in a copy reports 47 changed locations
and nothing else.

Signed-off-by: 結友 <miagetegorann@gmail.com>
---
 README                   |  7 +++++
 debian/scripts/abi-check | 56 ++++++++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 9dd855a..d2e1af2 100644
--- a/README
+++ b/README
@@ -167,6 +167,13 @@ variable in the Makefile, rebuilding the packages and running 'make abiupdate'
 (the 'abiupdate' target in 'Makefile' contains the steps for consistently
 updating the repository).
 
+The ABI check reads both ordinary and namespaced exports. Moving an export
+between a module and vmlinux is reported without failing the check. Missing
+symbols, hash changes and stricter export or namespace requirements fail it
+unless an applicable blacklist or the ABI skip mode permits them. Entries
+matching neither layout and duplicate symbols always abort the check, so that
+a change in the generated format cannot go unnoticed.
+
 The source package-name is proxmox-kernel-MAJ.MIN, the version of the package
 defaults to MAJ.MIN.PATCH-KREL - but this can be adapted to contain a suffix
 for test-packages (e.g. ~test01). The version in the Makefile needs to be equal
diff --git a/debian/scripts/abi-check b/debian/scripts/abi-check
index 9987d04..ff000c3 100755
--- a/debian/scripts/abi-check
+++ b/debian/scripts/abi-check
@@ -89,17 +89,35 @@ sub is_ignored($$) {
     return 0;
 }
 
+# abi-generate emits four fields for ordinary exports, and five fields for
+# namespaced exports (namespace, type, hash, symbol, module). In the latter
+# format the trailing module must not become part of the symbol name.
+sub parse_symbol {
+    my ($line, $file, $number) = @_;
+    chomp $line;
+    $line =~ s/\r$//;
+
+    if ($line =~ /^(EXPORT_SYMBOL(?:_[A-Z0-9_]+)?)\s+(\S+)\s+(0x[0-9a-f]+)\s+(\S+)$/) {
+	return ($4, $1, $2, $3, '');
+    }
+    if ($line =~ /^(\S+)\s+(EXPORT_SYMBOL(?:_[A-Z0-9_]+)?)\s+(0x[0-9a-f]+)\s+(\S+)\s+(\S+)$/) {
+	return ($4, $2, $5, $3, $1);
+    }
+    die "EE: $file:$number: malformed ABI entry: '$line'\n";
+}
+
 # Read new syms first
 print "    Reading new symbols ($abistr)...";
 $count = 0;
 open(my $NEW_FH, '<', $abinew) or die "Could not open $abinew - $!";
 while (<$NEW_FH>) {
-    chomp;
-    m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
-    $symbols{$4}{'type'} = $1;
-    $symbols{$4}{'loc'} = $2;
-    $symbols{$4}{'hash'} = $3;
-    $module_syms{$2} = 0;
+    my ($sym, $type, $loc, $hash, $namespace) = parse_symbol($_, $abinew, $.);
+    die "EE: $abinew:$.: duplicate symbol '$sym'\n" if defined($symbols{$sym}{'type'});
+    $symbols{$sym}{'type'} = $type;
+    $symbols{$sym}{'loc'} = $loc;
+    $symbols{$sym}{'hash'} = $hash;
+    $symbols{$sym}{'namespace'} = $namespace;
+    $module_syms{$loc} = 0;
     $count++;
 }
 close($NEW_FH);
@@ -110,11 +128,12 @@ print "    Reading old symbols...";
 $count = 0;
 open(my $OLD_FH, '<', $abiold) or die "Could not open $abiold - $!";
 while (<$OLD_FH>) {
-    chomp;
-    m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
-    $symbols{$4}{'old_type'} = $1;
-    $symbols{$4}{'old_loc'} = $2;
-    $symbols{$4}{'old_hash'} = $3;
+    my ($sym, $type, $loc, $hash, $namespace) = parse_symbol($_, $abiold, $.);
+    die "EE: $abiold:$.: duplicate symbol '$sym'\n" if defined($symbols{$sym}{'old_type'});
+    $symbols{$sym}{'old_type'} = $type;
+    $symbols{$sym}{'old_loc'} = $loc;
+    $symbols{$sym}{'old_hash'} = $hash;
+    $symbols{$sym}{'old_namespace'} = $namespace;
     $count++;
 }
 close($OLD_FH);
@@ -158,6 +177,7 @@ $count = 0;
 my $moved = 0;
 my $changed_type = 0;
 my $changed_hash = 0;
+my $changed_namespace = 0;
 for my $sym (keys(%symbols)) {
     if (!defined($symbols{$sym}{'old_type'}) or !defined($symbols{$sym}{'type'})) {
 	next;
@@ -172,12 +192,21 @@ for my $sym (keys(%symbols)) {
     # Changes to export type are only bad if new type isn't
     # EXPORT_SYMBOL. Changing things to GPL are bad.
     if ($symbols{$sym}{'type'} ne $symbols{$sym}{'old_type'}) {
-	printf("    TYPE : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_type'}.
+	printf("    TYPE : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_type'},
 	    $symbols{$sym}{'type'}, is_ignored($symbols{$sym}{'loc'}, $sym)
 	    ? " (ignored)" : "");
 	$changed_type++ if $symbols{$sym}{'type'} ne "EXPORT_SYMBOL" and !is_ignored($symbols{$sym}{'loc'}, $sym);
     }
 
+    # Adding or changing a namespace requires consumers to change their imports.
+    # Removing a namespace relaxes that requirement and is compatible.
+    if ($symbols{$sym}{'namespace'} ne $symbols{$sym}{'old_namespace'}) {
+	printf("    NS   : %-40s : %s => %s%s\n", $sym,
+	    $symbols{$sym}{'old_namespace'} || '(none)', $symbols{$sym}{'namespace'} || '(none)',
+	    is_ignored($symbols{$sym}{'loc'}, $sym) ? " (ignored)" : "");
+	$changed_namespace++ if $symbols{$sym}{'namespace'} ne '' && !is_ignored($symbols{$sym}{'loc'}, $sym);
+    }
+
     # Changes to the hash are always bad
     if ($symbols{$sym}{'hash'} ne $symbols{$sym}{'old_hash'}) {
 	printf("    HASH : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_hash'},
@@ -191,8 +220,9 @@ for my $sym (keys(%symbols)) {
 print "WW: $moved symbols changed location\n" if $moved;
 print "$EE $changed_type symbols changed export type and weren't ignored\n" if $changed_type;
 print "$EE $changed_hash symbols changed hash and weren't ignored\n" if $changed_hash;
+print "$EE $changed_namespace symbols changed namespace and weren't ignored\n" if $changed_namespace;
 
-$errors++ if $changed_hash or $changed_type;
+$errors++ if $changed_hash or $changed_type or $changed_namespace;
 if ($changed_hash) {
     print "II: Module hash change summary...\n";
     for my $mod (sort { $module_syms{$b} <=> $module_syms{$a} } keys %module_syms) {
-- 
2.56.0.windows.4




  reply	other threads:[~2026-11-16 23:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 23:49 [PATCH pve-kernel v5 0/2] fix #8027: restore built-in Hyper-V VMBus 結友
2026-11-16 23:49 ` 結友 [this message]
2026-11-16 23:49 ` [PATCH pve-kernel v5 2/2] fix #8027: config: enable CONFIG_HYPERV_VMBUS 結友

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261116234953.1476-2-miagetegorann@gmail.com \
    --to=miagetegorann@gmail.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal