Merge #26 Fix kernel ABI related scripts

find-provides.ksyms

@@ -1,9 +1,24 @@
-#! /bin/sh
+#! /bin/bash
 
 IFS=$'\n'
 
 for module in $(grep -E '/lib/modules/.+\.ko$'); do
+    if [[ -n $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
         nm $module \
-    | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):ksym(\2) = \1:p'
+        | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
-done \
+        | awk --non-decimal-data '{printf("ksym(%s) = 0x%08x\n", $2, $1)}' \
-| sort -u
+        | LC_ALL=C sort -u
+    else
+        ELFRODATA=$(readelf -R .rodata $module | awk '/0x/{printf $2$3$4$5}')
+        if [[ -n $(readelf -h $module | grep "little endian") ]]; then
+            RODATA=$(echo $ELFRODATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
+        else
+            RODATA=$ELFRODATA
+        fi
+        for sym in $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
+            echo $sym $RODATA
+        done \
+        | awk --non-decimal-data '{printf("ksym(%s) = 0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
+        | LC_ALL=C sort -u
+    fi
+done

find-requires.ksyms

@@ -2,19 +2,47 @@
 
 IFS=$'\n'
 
+# Extract all of the symbols provided by this module.
 all_provides() {
+    if [[ -n $(nm "$@" | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
         nm "$@" \
-    | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \
+        | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
-    | sort -k2 -u
+        | awk --non-decimal-data '{printf("0x%08x\t%s\n", $1, $2)}' \
+        | LC_ALL=C sort -k2,2 -u
+    else
+        ELFRODATA=$(readelf -R .rodata "$@" | awk '/0x/{printf $2$3$4$5}')
+        if [[ -n $(readelf -h "$@" | grep "little endian") ]]; then
+            RODATA=$(echo $ELFRODATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
+        else
+            RODATA=$ELFRODATA
+        fi
+        for sym in $(nm "$@" | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
+            echo $sym $RODATA
+        done \
+        | awk --non-decimal-data '{printf("0x%08s\t%s\n", substr($3,($1*2)+1,8), $2)}' \
+        | LC_ALL=C sort -k2,2 -u
+    fi
 }
 
+# Extract all of the requirements of this module.
 all_requires() {
     for module in "$@"; do
         set -- $(/sbin/modinfo -F vermagic "$module" | sed -e 's: .*::' -e q)
         /sbin/modprobe --dump-modversions "$module" \
-        | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':'
+        | awk --non-decimal-data '
+            BEGIN { FS = "\t" ; OFS = "\t" }
+            {printf("0x%08x\t%s\n", $1, $2)}' \
+        | sed -r -e 's:$:\t'"$1"':'
     done \
-    | sort -k2 -u
+    | LC_ALL=C sort -k2,2 -u
+}
+
+# Filter out requirements fulfilled by the module itself.
+mod_requires() {
+    LC_ALL=C join -t $'\t' -j 2 -v 1 \
+        <(all_requires "$@") \
+        <(all_provides "$@") \
+    | LC_ALL=C sort -k1,1 -u
 }
 
 if ! [ -e /sbin/modinfo -a -e /sbin/modprobe ]; then
@@ -24,25 +52,23 @@ fi
 
 modules=($(grep -E '/lib/modules/.+\.ko$'))
 if [ ${#modules[@]} -gt 0 ]; then
-    symset_table=$(mktemp -t ${0##*/}.XXXXX)
+    kernel=$(/sbin/modinfo -F vermagic "${modules[0]}" | sed -e 's: .*::' -e q)
-    /usr/lib/rpm/redhat/symset-table | sort > $symset_table
 
-    join -t $'\t' -j 1 -a 2 $symset_table <(
+    # get all that kernel provides
-        # Filter out requirements that we fulfill ourself.
+    symvers=$(mktemp -t ${0##*/}.XXXXX)
-        join -t $'\t' -j 2 -v 1 \
+
-            <(all_requires "${modules[@]}") \
+    cat /usr/src/kernels/$kernel/Module.symvers | awk '
-            <(all_provides "${modules[@]}") \
-        | awk '
         BEGIN { FS = "\t" ; OFS = "\t" }
-        { print $3 "/" $2 "/" $1 }
+        { print $2 "\t" $1 }
     ' \
-        | sort -u) \
+    | sed -r -e 's:$:\t'"$kernel"':' \
-    | sort -u \
+    | LC_ALL=C sort -k1,1 -u > $symvers
-    | awk '
+
-    { FS = "\t" ; OFS = "\t" }
+    # Symbols matching with the kernel get a "kernel" dependency
-    NF == 3 { print "kernel(" $2 ") = " $3
+    LC_ALL=C join -t $'\t' -j 1 $symvers <(mod_requires "${modules[@]}") | LC_ALL=C sort -u \
-              next }
+    | awk '{ FS = "\t" ; OFS = "\t" } { print "kernel(" $1 ") = " $2 }'
-            { split($1, arr, "/")
+
-              print "ksym(" arr[3] ") = " arr[2] }
+    # Symbols from elsewhere get a "ksym" dependency
-    '
+    LC_ALL=C join -t $'\t' -j 1 -v 2 $symvers <(mod_requires "${modules[@]}") | LC_ALL=C sort -u \
+    | awk '{ FS = "\t" ; OFS = "\t" } { print "ksym(" $1 ") = " $2 }'
 fi