Update disk image source to addhypercall and gem5bridge-driver

src/npb-24.04-imgs/arm-npb.pkr.hcl

@@ -35,10 +35,10 @@ source "qemu" "initialize" {
   format           = "raw"
   headless         = "true"
   disk_image       = "true"
-  iso_checksum     = "sha256:eb94422a3908c6c5183c03666b278b6e8bcfbde04da3d7c3bb5374bc82e0ef48"
-  iso_urls         = ["./arm-ubuntu-24.04-20240823"]
+  iso_checksum     = "sha256:3dbf4f105882cc386fc1e50b6e2c70c94789083038252175739ab6a5e4b1ce52"
+  iso_urls         = ["./arm-ubuntu-24.04-20250515.gz"]
   memory           = "8192"
-  output_directory = "disk-image-arm-npb"
+  output_directory = "disk-image-arm-npb-test"
   qemu_binary      = "/usr/bin/qemu-system-aarch64"
   qemuargs         = [  ["-boot", "order=dc"],
                         ["-bios", "./files/flash0.img"],

src/npb-24.04-imgs/build-arm.sh

@@ -14,8 +14,8 @@ dd if=/usr/share/qemu-efi-aarch64/QEMU_EFI.fd of=flash0.img conv=notrunc
 cd ..
 
 # get the  base image from gem5 resoruces
-wget https://storage.googleapis.com/dist.gem5.org/dist/develop/images/arm/ubuntu-24-04/arm-ubuntu-24.04-20240823.gz
-gunzip arm-ubuntu-24.04-20240823.gz 
+wget https://gem5resources.blob.core.windows.net/dist-gem5-org/dist/develop/images/arm/ubuntu-24-04/arm-ubuntu-24.04-20250515.gz
+gunzip arm-ubuntu-24.04-20250515.gz
 
 # Install the needed plugins
 ./packer init arm-npb.pkr.hcl

src/npb-24.04-imgs/build-x86.sh

@@ -11,8 +11,8 @@ if [ ! -f ./packer ]; then
     rm packer_${PACKER_VERSION}_linux_amd64.zip;
 fi
 
-wget https://storage.googleapis.com/dist.gem5.org/dist/develop/images/x86/ubuntu-24-04/x86-ubuntu-24-04-v2.gz
-gunzip x86-ubuntu-24-04-v2.gz
+wget https://gem5resources.blob.core.windows.net/dist-gem5-org/dist/develop/images/x86/ubuntu-24-04/x86-ubuntu-24.04-20250515.gz
+gunzip x86-ubuntu-24.04-20250515.gz
 
 # Install the needed plugins
 ./packer init x86-npb.pkr.hcl

src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/common/hooks.c

@@ -51,11 +51,11 @@ void m5_work_begin_interface_()
 {
 
     printf(" -------------------- ROI BEGIN -------------------- \n");
-    m5_work_begin_addr(0,0);
+    m5_hypercall_addr(4);
 }
 
 void m5_work_end_interface_()
 {
-    m5_work_end_addr(0,0);
+    m5_hypercall_addr(5);
     printf(" -------------------- ROI END -------------------- \n");
 }

src/npb-24.04-imgs/scripts/post-installation.sh

@@ -16,9 +16,14 @@ make clean
 make suite M5_ANNOTATION=1
 echo "Disabling network by default"
 echo "See README.md for instructions on how to enable network"
-mv /etc/netplan/50-cloud-init.yaml /etc/netplan/50-cloud-init.yaml.bak
+
+if [ -f /etc/netplan/50-cloud-init.yaml ]; then
+    mv /etc/netplan/50-cloud-init.yaml /etc/netplan/50-cloud-init.yaml.bak
+elif [ -f /etc/netplan/00-installer-config.yaml ]; then
+    mv /etc/netplan/00-installer-config.yaml /etc/netplan/00-installer-config.yaml.bak
+    netplan apply
+fi
+
 # Disable systemd service that waits for network to be online
 systemctl disable systemd-networkd-wait-online.service
 systemctl mask systemd-networkd-wait-online.service
-
-netplan apply

src/npb-24.04-imgs/x86-npb.pkr.hcl

@@ -36,8 +36,8 @@ source "qemu" "initialize" {
   format           = "raw"
   headless         = "true"
   disk_image       = "true"
-  iso_checksum     = "sha256:6cedf26ebf281b823b24722341d3a2ab1f1ba26b10b536916d3f23cf92a8f4b5"
-  iso_urls         = ["./x86-ubuntu-24-04-v2"]
+  iso_checksum     = "sha256:58dfdabfd2510657776ad946c8c4e9cceacbd0806414690598a4f4808c2349b6"
+  iso_urls         = ["./x86-ubuntu-24.04-20250515"]
   memory           = "8192"
   output_directory = "disk-image-x86-npb"
   qemu_binary      = "/usr/bin/qemu-system-x86_64"

src/ubuntu-generic-diskimages/files/arm/after_boot.sh

@@ -14,7 +14,7 @@
 
 # gem5-bridge exit signifying that after_boot.sh is running
 printf "In after_boot.sh...\n"
-gem5-bridge --addr=0x10010000 exit # TODO: Make this a specialized event.
+gem5-bridge --addr=0x10010000 hypercall 2
 
 # Read /proc/cmdline and parse options
 
@@ -51,7 +51,7 @@ else
             /tmp/script
             printf "Done running script from gem5-bridge, exiting.\n"
             rm -f /tmp/script
-            gem5-bridge --addr=0x10010000 exit
+            gem5-bridge --addr=0x10010000 hypercall 3
         fi
     fi
 fi

src/ubuntu-generic-diskimages/files/arm/gem5_init.sh

@@ -15,11 +15,27 @@ mount -t sysfs /sys /sys
 cmdline=$(cat /proc/cmdline)
 no_systemd=false
 
+# Load gem5_bridge driver
+## Default parameters (ARM64)
+gem5_bridge_baseaddr=0x10010000
+gem5_bridge_rangesize=0x10000
+## Try to read overloads from kernel arguments
+if [[ $cmdline =~ gem5_bridge_baseaddr=([[:alnum:]]+) ]]; then
+    gem5_bridge_baseaddr=${BASH_REMATCH[1]}
+fi
+if [[ $cmdline =~ gem5_bridge_rangesize=([[:alnum:]]+) ]]; then
+    gem5_bridge_rangesize=${BASH_REMATCH[1]}
+fi
+## Insert driver
+modprobe gem5_bridge \
+    gem5_bridge_baseaddr=$gem5_bridge_baseaddr \
+    gem5_bridge_rangesize=$gem5_bridge_rangesize
+
 # gem5-bridge exit signifying that kernel is booted
 # This will cause the simulation to exit. Note that this will
 # cause qemu to fail.
 printf "Kernel booted, In gem5 init...\n"
-gem5-bridge --addr=0x10010000 exit # TODO: Make this a specialized event.
+gem5-bridge --addr=0x10010000 hypercall 1
 
 if [[ $cmdline == *"no_systemd"* ]]; then
     no_systemd=true

src/ubuntu-generic-diskimages/files/serial-getty@.service-override.conf

@@ -0,0 +1,4 @@
+
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --autologin gem5 --keep-baud 115200,38400,9600 %I $TERM

src/ubuntu-generic-diskimages/files/x86/after_boot.sh

@@ -14,7 +14,7 @@
 
 # gem5-bridge exit signifying that after_boot.sh is running
 printf "In after_boot.sh...\n"
-gem5-bridge exit # TODO: Make this a specialized event.
+gem5-bridge hypercall 2
 
 # Read /proc/cmdline and parse options
 
@@ -51,7 +51,7 @@ else
             /tmp/script
             printf "Done running script from gem5-bridge, exiting.\n"
             rm -f /tmp/script
-            gem5-bridge exit
+            gem5-bridge hypercall 3
         fi
     fi
 fi

src/ubuntu-generic-diskimages/files/x86/gem5_init.sh

@@ -15,11 +15,27 @@ mount -t sysfs /sys /sys
 cmdline=$(cat /proc/cmdline)
 no_systemd=false
 
+# Load gem5_bridge driver
+## Default parameters (x86_64)
+gem5_bridge_baseaddr=0xffff0000
+gem5_bridge_rangesize=0x10000
+## Try to read overloads from kernel arguments
+if [[ $cmdline =~ gem5_bridge_baseaddr=([[:alnum:]]+) ]]; then
+    gem5_bridge_baseaddr=${BASH_REMATCH[1]}
+fi
+if [[ $cmdline =~ gem5_bridge_rangesize=([[:alnum:]]+) ]]; then
+    gem5_bridge_rangesize=${BASH_REMATCH[1]}
+fi
+## Insert driver
+modprobe gem5_bridge \
+    gem5_bridge_baseaddr=$gem5_bridge_baseaddr \
+    gem5_bridge_rangesize=$gem5_bridge_rangesize
+
 # gem5-bridge exit signifying that kernel is booted
 # This will cause the simulation to exit. Note that this will
 # cause qemu to fail.
 printf "Kernel booted, In gem5 init...\n"
-gem5-bridge exit # TODO: Make this a specialized event.
+gem5-bridge hypercall 1
 
 if [[ $cmdline == *"no_systemd"* ]]; then
     no_systemd=true

src/ubuntu-generic-diskimages/kernel-and-modules/arm-ubuntu-22.04/Dockerfile

@@ -0,0 +1,48 @@
+FROM ubuntu:22.04 AS stage1
+
+# Install necessary packages for kernel build
+RUN apt update && apt install -y \
+    build-essential \
+    libncurses-dev \
+    bison \
+    flex \
+    libssl-dev \
+    libelf-dev \
+    bc \
+    wget \
+    git \
+    kmod \
+    apt-src \
+    vim \
+    curl \
+    file
+
+RUN sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
+RUN apt update
+RUN mkdir /workspace 
+RUN cd /workspace && apt source linux-image-unsigned-5.15.0-25-generic
+
+RUN cd /workspace/linux-5.15.0 && \
+    cd scripts && \
+    chmod +x pahole-version.sh && \
+    cd .. && \
+    make defconfig && \
+    make -j $(nproc) && \
+    make INSTALL_MOD_PATH=/workspace/output modules_install
+
+RUN git clone https://github.com/gem5/gem5.git --depth=1 --filter=blob:none --no-checkout --sparse --single-branch --branch=release-staging-v24-1-1-0 && \
+    cd gem5 && \
+    git sparse-checkout add util/m5 && \
+    git sparse-checkout add util/gem5_bridge && \
+    git sparse-checkout add include && \
+    git checkout
+
+RUN cd gem5/util/gem5_bridge && \
+    make KMAKEDIR=/workspace/linux-5.15.0 INSTALL_MOD_PATH=/workspace/output build install
+
+RUN cd /workspace/output/lib/modules/5.15.168 && \
+    rm -rf build source
+
+FROM scratch AS export-stage
+COPY --from=stage1 /workspace/output/lib/modules .
+COPY --from=stage1 workspace/linux-5.15.0/vmlinux .

src/ubuntu-generic-diskimages/kernel-and-modules/arm-ubuntu-22.04/copy_modules_to_host.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Copyright (c) 2025 The Regents of the University of California.
+# SPDX-License-Identifier: BSD 3-Clause
+
+DOCKERFILE="Dockerfile"
+OUTPUT="my-arm-5.15.168-kernel"
+
+# Build the Docker image
+DOCKER_BUILDKIT=1 docker build --no-cache \
+    --file "$DOCKERFILE" \
+    --output "$OUTPUT" .
+
+echo "Build completed for $1: Output directory is $OUTPUT"

src/ubuntu-generic-diskimages/kernel-and-modules/arm-ubuntu-24.04/Dockerfile

@@ -0,0 +1,43 @@
+# Start from Ubuntu 24.04 base image
+FROM ubuntu:24.04 AS stage1
+
+# Install necessary packages for kernel and module build
+RUN apt update && apt install -y \
+    build-essential \
+    libncurses-dev \
+    bison \
+    flex \
+    libssl-dev \
+    libelf-dev \
+    bc \
+    wget \
+    git \
+    kmod
+
+
+RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
+RUN apt update
+RUN mkdir /workspace 
+RUN cd /workspace && apt source linux-image-unsigned-6.8.0-47-generic
+
+RUN cd /workspace/linux-6.8.0 && \
+    make defconfig && \
+    make -j $(nproc) && \
+    make INSTALL_MOD_PATH=/workspace/output modules_install
+
+RUN git clone https://github.com/gem5/gem5.git --depth=1 --filter=blob:none --no-checkout --sparse --single-branch --branch=release-staging-v24-1-1-0 && \
+    cd gem5 && \
+    git sparse-checkout add util/m5 && \
+    git sparse-checkout add util/gem5_bridge && \
+    git sparse-checkout add include && \
+    git checkout
+
+RUN cd gem5/util/gem5_bridge && \
+    make KMAKEDIR=/workspace/linux-6.8.0 INSTALL_MOD_PATH=/workspace/output build install
+
+RUN cd /workspace/output/lib/modules/6.8.12 && \
+    rm -rf build
+
+FROM scratch AS export-stage
+COPY --from=stage1 /workspace/output/lib/modules .
+COPY --from=stage1 /workspace/linux-6.8.0/vmlinux .

src/ubuntu-generic-diskimages/kernel-and-modules/arm-ubuntu-24.04/copy_modules_to_host.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Copyright (c) 2025 The Regents of the University of California.
+# SPDX-License-Identifier: BSD 3-Clause
+
+DOCKERFILE="./Dockerfile"
+OUTPUT="my-arm-6.8.12-kernel"
+
+# Build the Docker image
+DOCKER_BUILDKIT=1 docker build --no-cache \
+    --file "$DOCKERFILE" \
+    --output "$OUTPUT" .
+
+echo "Build completed for $1: Output directory is $OUTPUT"