[RLC-8] Rebase Custom Changes to rlc-8/4.18.0-553.125.1.el8_10

.container_build_image

@@ -0,0 +1 @@
+rocky-8-kernel-builder

.github/workflows/build-check_aarch64.yml

@@ -32,3 +32,8 @@ jobs:
           cp configs/kernel-aarch64.config .config
           make olddefconfig
           make -j8
+      - name: Check kabi
+        run: |
+          git clone --branch r8 --single-branch https://git.rockylinux.org/staging/rpms/kernel.git kernel-dist-git
+          git -C kernel-dist-git reset --hard imports/r8/kernel-4.18.0-553.16.1.el8_10
+          ./kernel-dist-git/SOURCES/check-kabi -k ./kernel-dist-git/SOURCES/Module.kabi_aarch64 -s Module.symvers

.github/workflows/build-check_x86_64.yml

@@ -32,3 +32,8 @@ jobs:
           cp configs/kernel-x86_64.config .config
           make olddefconfig
           make -j8
+      - name: Check kabi
+        run: |
+          git clone --branch r8 --single-branch https://git.rockylinux.org/staging/rpms/kernel.git kernel-dist-git
+          git -C kernel-dist-git reset --hard imports/r8/kernel-4.18.0-553.16.1.el8_10
+          ./kernel-dist-git/SOURCES/check-kabi -k ./kernel-dist-git/SOURCES/Module.kabi_x86_64 -s Module.symvers

.github/workflows/diffdiff.py

@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+# coding: utf-8
+#
+
+import argparse
+import copy
+import difflib
+import io
+import git
+import os
+import re
+import subprocess
+import sys
+import tempfile
+
+verbose = False
+
+
+def get_upstream_commit(upstream, c):
+    for l in c.message.splitlines():
+        try:
+            sha = re.match('\s*commit\s+(?P<sha>\S+)', l).groups()[0].upper()
+            return upstream.commit(sha)
+        except:
+            True
+
+def get_diff(d):
+    dif = ''
+    df = False
+    for l in d.splitlines():
+        if l[:10] == 'diff --git':
+            df = True
+        if not df:
+            continue
+        dif = dif + l + '\n'
+    return dif
+
+
+def trim_unchanged_files(lines):
+    dl = []
+    ld = 0       # Last line with a 'diff --git' we saw
+    hd = False   # Have we seen a changed line since ld?
+    i = 0
+    for i, l in enumerate(lines):
+        if l[:4] == '+++ ' or l[:4] == '--- ' :
+            continue
+        if l[0] == '+' or l[0] == '-':
+            hd = True
+        if l[:11] == ' diff --git':
+            if ld:   # We are at a new diff now, last one started at 'ld'
+                if not hd:
+                    dl.insert(0, (ld, i+1),)
+            ld = i
+            hd = False # Reset hasdiff to False as we start a new section
+    # and check the tail
+    if not hd:
+        dl.insert(0, (ld, i+1),)
+    # delete the unchanged file sections
+    for d in dl:
+        del lines[d[0]:d[1]]
+    return lines
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-v', action='store_true', help='Verbose')
+    parser.add_argument('--colour', action='store_true', help='Colorize the diff. Green for additions, red for deletions')
+    parser.add_argument('--commit', help='Commit in current tree to diffdiff. Default is the most recent commit.')
+    parser.add_argument('--upstream', help='A directory that contains the current upstream of linus kernel tree where we can find the commits we reference. Default is the current repo')
+    args = parser.parse_args()
+
+
+    if args.v:
+        verbose = True
+
+    srcgit = git.Repo.init('.')
+    upstream = git.Repo.init(args.upstream)
+    c = srcgit.head.commit if not args.commit else srcgit.commit(args.commit)
+    uc = get_upstream_commit(upstream, c)
+
+    dc = get_diff(srcgit.git.show(c))
+    duc = get_diff(upstream.git.show(uc))
+
+    with open('c.diff', 'w') as f:
+        f.write(dc)
+    with open('u.diff', 'w') as f:
+        f.write(duc)
+
+    res = subprocess.run(['diff', '-u', 'u.diff', 'c.diff'],
+                         check=False, stdout=subprocess.PIPE)
+    lines = res.stdout.splitlines()
+    dd = []
+    for l in lines:
+        l = str(l)[2:-1]
+        if l[:6] == '-index':
+            continue
+        if l[:6] == '+index':
+            continue
+        if l[:3] == '-@@':
+            continue
+        if l[:3] == '+@@':
+            dd.append(' ' + l[1:])
+            continue
+        dd.append(l)
+
+    # trim diffs for files that did not change
+    lines = trim_unchanged_files(dd)
+
+    # colorize the diff
+    diffs = 0
+    if args.colour:
+        dd = []
+        for l in lines:
+            if l[0:4] != '+++ ' and l[0:4] != '--- ':
+                if l[0] == '+':
+                    l = '\033[42m' + l + '\033[0m'
+                    diffs = diffs + 1
+                if l[0] == '-':
+                    l = '\033[41m' + l + '\033[0m'
+                    diffs = diffs + 1
+            dd.append(l)
+        lines = dd
+
+
+    if diffs:
+        for l in lines:
+            print(l)
+
+    sys.exit(diffs)

.github/workflows/kernel-build-and-test-multiarch-trigger.yml

@@ -0,0 +1,11 @@
+name: Trigger Automated kernel build and test (multi-arch)
+
+on:
+  push:
+    branches:
+      - '*_rlc-8/**'
+
+jobs:
+  kernelCI:
+    uses: ctrliq/kernel-src-tree/.github/workflows/kernel-build-and-test-multiarch-trigger.yml@main
+    secrets: inherit

.github/workflows/process-git-request.rb

@@ -0,0 +1,140 @@
+require 'open3'
+
+requestors = { "gvrose8192" => "" }
+
+def file_prepend(file, str)
+  new_contents = ""
+  File.open(file, 'r') do |fd|
+    contents = fd.read
+    new_contents = str << contents
+  end
+  # Overwrite file but now with prepended string on it
+  File.open(file, 'w') do |fd| 
+    fd.write(new_contents)
+  end
+end
+
+def process_git_request(fname, target_branch, source_branch, prj_dir)
+  retcode = 200 #presume success
+#  puts "Opening file " + fname
+  file = File.new(fname, "w")
+  working_dir = prj_dir
+#  puts "Working Dir : " + working_dir
+  Dir.chdir working_dir
+#  puts "pwd : " + Dir.pwd
+  git_cmd = "git log --oneline --no-abbrev-commit base_repo/" + target_branch + ".." + "origin/" + source_branch
+#  puts git_cmd
+  out, err, status = Open3.capture3(git_cmd)
+  if status.exitstatus != 0
+    puts "Command error output is " + err
+    file.write("Command error output is " + err)
+    file.close
+    retcode = 201
+    return retcode
+  end
+  output_lines = out.split(' ')
+# we just want the commit sha IDs
+  output_lines.each { |x|
+#    puts "This is output_lines " + x
+    upstream_diff = false
+    if !x[/\H/]
+      if x.length < 40
+        next
+      end
+      git_cmd = "git show " + x
+      gitlog_out, gitlog_err, gitlog_status = Open3.capture3(git_cmd)
+      if gitlog_status.exitstatus != 0
+        file.write("git show command error output is " + gitlog_err)
+        retcode = 201
+      end
+      loglines = gitlog_out.lines.map(&:chomp)
+      lines_counted = 0
+      local_diffdiff_sha = ""
+      upstream_diffdiff_sha = ""
+      loglines.each { |logline|
+        lines_counted = lines_counted + 1
+        if lines_counted == 1
+            local_commit_sha = logline.match("[0-9a-f]\{40\}")
+            local_diffdiff_sha = local_commit_sha.to_s
+#            puts "Local : " + local_diffdiff_sha
+            file.write("Merge Request sha: " + local_diffdiff_sha)
+            file.write("\n")
+        end
+        if lines_counted == 2 #email address
+          if !logline.downcase.include? "ciq.com"
+            # Bad Author
+            s = "error:\nBad " + logline + "\n"
+            puts s
+            file.write(s)
+            retcode = 201
+          else
+            file.write("\t" + logline + "\n")
+          end
+        end
+        if lines_counted > 1
+          if logline.downcase.include? "jira"
+            file.write("\t" + logline + "\n")
+          end
+          if logline.downcase.include? "upstream-diff"
+            upstream_diff = true
+          end
+          if logline.downcase.include? "commit"
+            commit_sha = logline.match("[0-9a-f]\{40\}")
+            upstream_diffdiff_sha = commit_sha.to_s
+#            puts "Upstream : " + upstream_diffdiff_sha
+            if (!upstream_diffdiff_sha.empty?)
+              file.write("\tUpstream sha: " + upstream_diffdiff_sha)
+              file.write("\n")
+            end
+          end
+        end
+        if lines_counted > 8 #Everything we need should be in the first 8 lines
+          break
+        end
+      }
+      if !local_diffdiff_sha.empty? &&  !upstream_diffdiff_sha.empty?
+        diff_cmd = Dir.pwd + "/.github/workflows/diffdiff.py --colour --commit " + local_diffdiff_sha
+        puts "diffdiff: " + diff_cmd
+        diff_out, diff_err, diff_status = Open3.capture3(diff_cmd)
+        if diff_status.exitstatus != 0 && !upstream_diff
+          puts "diffdiff out: " + diff_out
+          puts "diffdiff err: " + diff_err
+          retcode = 201
+          file.write("error:\nCommit: " + local_diffdiff_sha + " differs with no upstream tag in commit message\n")
+        end
+      end
+    end
+  }
+  file.close
+  return retcode
+end
+
+first_arg,  *argv_in = ARGV
+if argv_in.length < 5
+  puts "Not enough arguments: fname, target_branch, source_branch, prj_dir, pull_request, requestor"
+  exit
+end
+fname = first_arg.to_s
+fname = "tmp-" + fname
+# puts "filename is " + fname
+target_branch  = argv_in[0].to_s
+# puts "target branch is " + target_branch
+source_branch = argv_in[1].to_s
+# puts "source branch is " + source_branch
+prj_dir = argv_in[2].to_s
+# puts "project dir is "  + prj_dir
+pullreq = argv_in[3].to_s
+# puts "pull request is " + pullreq
+requestor = argv_in[4].to_s
+retcode = process_git_request(fname, target_branch, source_branch, prj_dir)
+if retcode != 200
+  File.open(fname, 'r') do |fd|
+    contents = fd.read
+    puts contents
+  end
+  exit(1)
+else
+  puts "Done"
+end
+exit(0)
+

.github/workflows/validate-kernel-commits.yml

@@ -0,0 +1,10 @@
+name: Validate Kernel Commits
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  check:
+    uses: ctrliq/kernel-src-tree/.github/workflows/validate-kernel-commits.yml@main
+    secrets: inherit

arch/x86/kernel/cpu/common.c

@@ -1021,17 +1021,34 @@ static void get_cpu_address_sizes(struct cpuinfo_x86 *c)
 {
 	u32 eax, ebx, ecx, edx;
 
-	if (c->extended_cpuid_level >= 0x80000008) {
+	if (!cpu_has(c, X86_FEATURE_CPUID) ||
+	    (c->extended_cpuid_level < 0x80000008)) {
+		if (IS_ENABLED(CONFIG_X86_64)) {
+			c->x86_clflush_size = 64;
+			c->x86_phys_bits = 36;
+			c->x86_virt_bits = 48;
+		} else {
+			c->x86_clflush_size = 32;
+			c->x86_virt_bits = 32;
+			c->x86_phys_bits = 32;
+
+			if (cpu_has(c, X86_FEATURE_PAE) ||
+			    cpu_has(c, X86_FEATURE_PSE36))
+				c->x86_phys_bits = 36;
+		}
+	} else {
 		cpuid(0x80000008, &eax, &ebx, &ecx, &edx);
 
 		c->x86_virt_bits = (eax >> 8) & 0xff;
 		c->x86_phys_bits = eax & 0xff;
+
+		/* Provide a sane default if not enumerated: */
+		if (!c->x86_clflush_size)
+			c->x86_clflush_size = 32;
 	}
-#ifdef CONFIG_X86_32
-	else if (cpu_has(c, X86_FEATURE_PAE) || cpu_has(c, X86_FEATURE_PSE36))
-		c->x86_phys_bits = 36;
-#endif
+
 	c->x86_cache_bits = c->x86_phys_bits;
+	c->x86_cache_alignment = c->x86_clflush_size;
 }
 
 static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
@@ -1485,17 +1502,6 @@ static void __init cpu_parse_early_param(void)
  */
 static void __init early_identify_cpu(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_X86_64
-	c->x86_clflush_size = 64;
-	c->x86_phys_bits = 36;
-	c->x86_virt_bits = 48;
-#else
-	c->x86_clflush_size = 32;
-	c->x86_phys_bits = 32;
-	c->x86_virt_bits = 32;
-#endif
-	c->x86_cache_alignment = c->x86_clflush_size;
-
 	memset(&c->x86_capability, 0, sizeof(c->x86_capability));
 	c->extended_cpuid_level = 0;
 
@@ -1505,8 +1511,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
 		get_cpu_vendor(c);
 		get_cpu_cap(c);
 		get_model_name(c); /* RHEL8: get model name for unsupported check */
-		get_cpu_address_sizes(c);
 		setup_force_cpu_cap(X86_FEATURE_CPUID);
+		get_cpu_address_sizes(c);
 		cpu_parse_early_param();
 
 		if (this_cpu->c_early_init)
@@ -1520,6 +1526,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
 	} else {
 		identify_cpu_without_cpuid(c);
 		setup_clear_cpu_cap(X86_FEATURE_CPUID);
+		get_cpu_address_sizes(c);
 	}
 
 	setup_force_cpu_cap(X86_FEATURE_ALWAYS);