unix: update to Linux 6.11

Change-Id: I1cc777822da1b557e69634faade8e24d06c00ce8 GitHub-Last-Rev: d09238e GitHub-Pull-Request: #218 Reviewed-on: https://go-review.googlesource.com/c/sys/+/613855 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Ian Lance Taylor <iant@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com> Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Michael Knyszek <mknyszek@google.com>
golang · Sep 30, 2024 · e7397b9 · e7397b9
1 parent 981de40
commit e7397b9
Show file tree

Hide file tree

Showing 26 changed files with 147 additions and 36 deletions.
diff --git a/unix/linux/Dockerfile b/unix/linux/Dockerfile
@@ -15,8 +15,8 @@ RUN apt-get update && apt-get install -y  --no-install-recommends \
 # Get the git sources. If not cached, this takes O(5 minutes).
 WORKDIR /git
 RUN git config --global advice.detachedHead false
-# Linux Kernel: Released 14 July 2024
-RUN git clone --branch v6.10 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
+# Linux Kernel: Released 15 Sep 2024
+RUN git clone --branch v6.11 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
 # GNU C library: Released 21 July 2024
 RUN git clone --branch release/2.40/master --depth 1 https://sourceware.org/git/glibc.git
 

diff --git a/unix/linux/mksysnum.go b/unix/linux/mksysnum.go
@@ -8,6 +8,7 @@ package main
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"os"
 	"os/exec"
@@ -125,6 +126,19 @@ func main() {
 		fmt.Fprintf(os.Stderr, "can't run %s", cc)
 		os.Exit(1)
 	}
+
+	switch goarch {
+	case "riscv64", "loong64", "arm64":
+		// Kernel linux v6.11 removed some __NR_* macros that only
+		// existed on some architectures as an implementation detail. In
+		// order to keep backwards compatibility we add them back.
+		//
+		// See https://lkml.org/lkml/2024/8/5/1283.
+		if !bytes.Contains(cmd, []byte("#define __NR_arch_specific_syscall")) {
+			cmd = append(cmd, []byte("#define __NR_arch_specific_syscall 244\n")...)
+		}
+	}
+
 	s := bufio.NewScanner(strings.NewReader(string(cmd)))
 	var offset, prev, asOffset int
 	var nums syscallNums

diff --git a/unix/syscall_linux_arm64.go b/unix/syscall_linux_arm64.go
@@ -182,3 +182,5 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
 	}
 	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
 }
+
+const SYS_FSTATAT = SYS_NEWFSTATAT
diff --git a/unix/syscall_linux_loong64.go b/unix/syscall_linux_loong64.go
@@ -214,3 +214,5 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
 	}
 	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
 }
+
+const SYS_FSTATAT = SYS_NEWFSTATAT
diff --git a/unix/syscall_linux_riscv64.go b/unix/syscall_linux_riscv64.go
@@ -187,3 +187,5 @@ func RISCVHWProbe(pairs []RISCVHWProbePairs, set *CPUSet, flags uint) (err error
 	}
 	return riscvHWProbe(pairs, setSize, set, flags)
 }
+
+const SYS_FSTATAT = SYS_NEWFSTATAT
diff --git a/unix/zerrors_linux.go b/unix/zerrors_linux.go
diff --git a/unix/zerrors_linux_386.go b/unix/zerrors_linux_386.go
diff --git a/unix/zerrors_linux_amd64.go b/unix/zerrors_linux_amd64.go
diff --git a/unix/zerrors_linux_arm.go b/unix/zerrors_linux_arm.go
diff --git a/unix/zerrors_linux_arm64.go b/unix/zerrors_linux_arm64.go
diff --git a/unix/zerrors_linux_loong64.go b/unix/zerrors_linux_loong64.go
diff --git a/unix/zerrors_linux_mips.go b/unix/zerrors_linux_mips.go
diff --git a/unix/zerrors_linux_mips64.go b/unix/zerrors_linux_mips64.go
diff --git a/unix/zerrors_linux_mips64le.go b/unix/zerrors_linux_mips64le.go
diff --git a/unix/zerrors_linux_mipsle.go b/unix/zerrors_linux_mipsle.go
diff --git a/unix/zerrors_linux_ppc.go b/unix/zerrors_linux_ppc.go
diff --git a/unix/zerrors_linux_ppc64.go b/unix/zerrors_linux_ppc64.go
diff --git a/unix/zerrors_linux_ppc64le.go b/unix/zerrors_linux_ppc64le.go
diff --git a/unix/zerrors_linux_riscv64.go b/unix/zerrors_linux_riscv64.go
diff --git a/unix/zerrors_linux_s390x.go b/unix/zerrors_linux_s390x.go
diff --git a/unix/zerrors_linux_sparc64.go b/unix/zerrors_linux_sparc64.go
diff --git a/unix/zsysnum_linux_amd64.go b/unix/zsysnum_linux_amd64.go
diff --git a/unix/zsysnum_linux_arm64.go b/unix/zsysnum_linux_arm64.go
diff --git a/unix/zsysnum_linux_loong64.go b/unix/zsysnum_linux_loong64.go
diff --git a/unix/zsysnum_linux_riscv64.go b/unix/zsysnum_linux_riscv64.go
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
     }
+    const SYS_FSTATAT = SYS_NEWFSTATAT