Add flags to install latest kernel/tag during SNP host setup #29

LakshmiSaiHarika · 2025-01-14T23:08:12Z

User can install SNP kernel from the upstream kernel using this PR's new additional command options as follows:

User can install upstream SNP kernel from the master branch.
./snp.sh setup-host --upsteam-kernel
User can install specific SNP kernel tagged version from the kernel upstream repository
./snp.sh setup-host --upstream-kernel-tag <specific kernel tag>

LakshmiSaiHarika · 2025-01-17T21:52:25Z

docs/snp.md

@@ -62,6 +62,14 @@ Setup the host by building SNP patched versions of qemu, ovmf and the linux kern
 The `--non-upm` option can be specified with the above command if a non-upm version 
 of the kernel is desired.

+The `--upstr-kernel` option can be specified with the above command if an upstream kernel version from the master branch is desired.


--upstream-kernel

LakshmiSaiHarika · 2025-01-17T21:56:55Z

tools/snp.sh

@@ -1319,6 +1347,17 @@ main() {
        shift; shift
        ;;

+      -u-k|--upstr-kernel)


--upstream-kernel

LakshmiSaiHarika · 2025-01-17T21:57:13Z

tools/snp.sh

+        shift;
+        ;;
+
+      -k-t|--kernel-tag)


--upstream-kernel-tag

Add check if kernel tag version exists

LakshmiSaiHarika · 2025-01-17T22:04:17Z

docs/snp.md

@@ -62,6 +62,14 @@ Setup the host by building SNP patched versions of qemu, ovmf and the linux kern
 The `--non-upm` option can be specified with the above command if a non-upm version 
 of the kernel is desired.

+The `--upstr-kernel` option can be specified with the above command if an upstream kernel version from the master branch is desired.
+
+The `--kernel-tag` option can be specified with the above command if a specific snp kernel tag version from the upstream kernel is desired as follows:


The --upstream-kernel-tag option can be specified with the above command to install specific tag version from the upstream kernel:

LakshmiSaiHarika · 2025-01-17T22:06:12Z

tools/snp.sh

@@ -94,6 +95,11 @@ GENERATED_INITRD_BIN="${SETUP_WORKING_DIR}/initrd.img"
 AMDSEV_URL="https://github.com/confidential-containers/amdese-amdsev.git"
 AMDSEV_DEFAULT_BRANCH="amd-snp"
 AMDSEV_NON_UPM_BRANCH="amd-snp-202306070000"
+UPSTREAM_KERNEL_HOST_GIT_URL="https://github.com/torvalds/linux.git"


UPSTREAM_KERNEL_GIT_URL

LakshmiSaiHarika · 2025-01-17T22:06:33Z

tools/snp.sh

@@ -94,6 +95,11 @@ GENERATED_INITRD_BIN="${SETUP_WORKING_DIR}/initrd.img"
 AMDSEV_URL="https://github.com/confidential-containers/amdese-amdsev.git"
 AMDSEV_DEFAULT_BRANCH="amd-snp"
 AMDSEV_NON_UPM_BRANCH="amd-snp-202306070000"
+UPSTREAM_KERNEL_HOST_GIT_URL="https://github.com/torvalds/linux.git"
+UPSTREAM_KERNEL_HOST_DEFAULT_BRANCH="master"
+UPSTREAM_KERNEL_GUEST_GIT_URL="https://github.com/torvalds/linux.git"


remove this line

LakshmiSaiHarika · 2025-01-17T22:07:02Z

tools/snp.sh

@@ -94,6 +95,11 @@ GENERATED_INITRD_BIN="${SETUP_WORKING_DIR}/initrd.img"
 AMDSEV_URL="https://github.com/confidential-containers/amdese-amdsev.git"
 AMDSEV_DEFAULT_BRANCH="amd-snp"
 AMDSEV_NON_UPM_BRANCH="amd-snp-202306070000"
+UPSTREAM_KERNEL_HOST_GIT_URL="https://github.com/torvalds/linux.git"
+UPSTREAM_KERNEL_HOST_DEFAULT_BRANCH="master"


UPSTREAM_KERNEL_BRANCH

LakshmiSaiHarika · 2025-01-17T22:07:19Z

tools/snp.sh

+UPSTREAM_KERNEL_HOST_GIT_URL="https://github.com/torvalds/linux.git"
+UPSTREAM_KERNEL_HOST_DEFAULT_BRANCH="master"
+UPSTREAM_KERNEL_GUEST_GIT_URL="https://github.com/torvalds/linux.git"
+UPSTREAM_KERNEL_GUEST_DEFAULT_BRANCH="master"


remove these lines

LakshmiSaiHarika · 2025-01-17T22:07:48Z

tools/snp.sh

+UPSTREAM_KERNEL_HOST_DEFAULT_BRANCH="master"
+UPSTREAM_KERNEL_GUEST_GIT_URL="https://github.com/torvalds/linux.git"
+UPSTREAM_KERNEL_GUEST_DEFAULT_BRANCH="master"
+KERNEL_HOST_GUEST_BRANCH_TAG=""


UPSTREAM_KERNEL_TAG

LakshmiSaiHarika · 2025-01-17T22:08:26Z

tools/snp.sh

@@ -116,6 +122,8 @@ usage() {
  >&2 echo "    stop-guests           Stop all SNP guests started by this script"
  >&2 echo "  where OPTIONS are:"
  >&2 echo "    -n|--non-upm          Build AMDSEV non UPM kernel (sev-snp-devel)"
+  >&2 echo "    -u-k|--upstr-kernel   Build upstream kernel with the master as default branch"


Build upstream kernel from the master branch

LakshmiSaiHarika · 2025-01-17T22:08:58Z

tools/snp.sh

@@ -116,6 +122,8 @@ usage() {
  >&2 echo "    stop-guests           Stop all SNP guests started by this script"
  >&2 echo "  where OPTIONS are:"
  >&2 echo "    -n|--non-upm          Build AMDSEV non UPM kernel (sev-snp-devel)"
+  >&2 echo "    -u-k|--upstr-kernel   Build upstream kernel with the master as default branch"
+  >&2 echo "    -k-t|--kernel-tag     Build upstream kernel with the desired kernel version"


Build upstream kernel from the desired kernel tag version

LakshmiSaiHarika · 2025-01-17T22:09:50Z

tools/snp.sh

@@ -816,6 +824,23 @@ set_acl_for_sev_device() {
  echo "${setfacl_command}" | sudo tee -a "${rc_local_file}" >/dev/null
 }

+set_snp_kernel_upstream() {
+  local amsev_stable_commits_file="${SETUP_WORKING_DIR}/AMDSEV/stable-commits"
+


error out if kernel_tag does not exist

LakshmiSaiHarika · 2025-01-17T22:10:59Z

tools/snp.sh

+  local amsev_stable_commits_file="${SETUP_WORKING_DIR}/AMDSEV/stable-commits"
+
+  # Set kernel source URL to the upstream
+  sed -i -e "s|^\(KERNEL_HOST_GIT_URL=\).*$|\1\"${UPSTREAM_KERNEL_HOST_GIT_URL}\"|g" "${amsev_stable_commits_file}"


sed -i -e "s|^(KERNEL_HOST_GIT_URL=).*$|\1"${UPSTREAM_KERNEL_URL}"|g" "${amsev_stable_commits_file}"

LakshmiSaiHarika · 2025-01-17T22:14:27Z

tools/snp.sh

+  sed -i -e "s|^\(KERNEL_GUEST_GIT_URL=\).*$|\1\"${UPSTREAM_KERNEL_GUEST_GIT_URL}\"|g" "${amsev_stable_commits_file}"
+
+  # Set SNP kernel default branch to the  kernel tagged input version if specified or the upstream default branch
+  if [[ ! -z "${KERNEL_HOST_GUEST_BRANCH_TAG}" ]]; then


[[ -n "${KERNEL_HOST_GUEST_BRANCH_TAG}" ]]

LakshmiSaiHarika · 2025-01-17T22:17:41Z

tools/snp.sh

@@ -839,6 +864,9 @@ build_and_install_amdsev() {
  # Delete the ovmf/ directory prior to the build step for ovmf re-initialization
  [ ! -d "ovmf" ] || rm -rf "ovmf"

+  # Set kernel source to the upstream kernel
+  [ ${SET_KERNEL_UPSTREAM} = "true" ] && set_snp_kernel_upstream


! ${SET_KERNEL_UPSTREAM} || set_snp_kernel_upstream

LakshmiSaiHarika

Feedback session #1 from Ryan, Larry and Diego

LakshmiSaiHarika · 2025-01-20T21:22:47Z

@DGonzalezVillal , @larrydewey and @ryansavino, thanks for the previous feedback session, I modified this PR as per the suggestions. Please re-review this PR and let me know if any further changes are required.

DGonzalezVillal · 2025-01-20T21:36:10Z

docs/snp.md

+The `--upstream-kernel-tag` option can be specified with the above command to install specific tag version from the upstream kernel:
+
+```
+./snp.sh setup-host --upstream-kernel --upstream-kernel-tag <specific kernel tag>


Do the flags need to be used together?

Using the flag --upstream-kernel-tag only gives the same result as the combination of these flags as the fields get updated with the upstream-kernel-tag version

Using --upstream-kernel only installs upstream kernel from master branch
Using --upstream-kernel-tag only installs upstream kernel from the tag version

AdithyaKrishnan · 2025-01-24T17:44:10Z

tools/snp.sh

@@ -816,6 +822,34 @@ set_acl_for_sev_device() {
  echo "${setfacl_command}" | sudo tee -a "${rc_local_file}" >/dev/null
 }

+# Checks if the kernel tag exists in the kernel upstream using the kernel tag URL HTTP status code
+verify_upstream_kernel_tag() {
+  local kernel_tag_url="https://github.com/torvalds/linux/tree/${UPSTREAM_KERNEL_TAG}"


# Get the HTTP status code for the kernel tag URL
local kernel_tag_http_status_code=$(curl -s --head "${kernel_tag_url}" | head -n 1 | grep "HTTP" | awk '{print $2}')

AdithyaKrishnan · 2025-01-24T17:45:52Z

tools/snp.sh

+
+  # Kernel tag doesn't exist if the HTTP status code is other than 200
+  if [ ${kernel_tag_http_status_code} -ne 200 ]; then
+    >&2 echo -e "ERROR: ${UPSTREAM_KERNEL_TAG} doesn't exist in the upstream kernel"


upstream repository instead of kernel?

AdithyaKrishnan · 2025-01-24T17:47:08Z

tools/snp.sh

+
+set_snp_kernel_upstream() {
+  local amsev_stable_commits_file="${SETUP_WORKING_DIR}/AMDSEV/stable-commits"
+


# Validate that the stable-commits file exists
if [[ ! -f "${amsev_stable_commits_file}" ]]; then
>&2 echo -e "ERROR: The file '${amsev_stable_commits_file}' does not exist."
return 1
fi
Probably a good idea to check if file exists before performing sed operations

I think the file exists normally as stable-commits exists in AMDSEV repository which comes when we setup the SNP host via command line.

Do we still require this check?

AdithyaKrishnan · 2025-01-24T17:47:45Z

tools/snp.sh

+    sed -i -e "s|^\(KERNEL_HOST_BRANCH=\).*$|\1\"${UPSTREAM_KERNEL_BRANCH}\"|g" "${amsev_stable_commits_file}"
+    sed -i -e "s|^\(KERNEL_GUEST_BRANCH=\).*$|\1\"${UPSTREAM_KERNEL_BRANCH}\"|g" "${amsev_stable_commits_file}"
+  fi
+}


echo "Successfully updated SNP kernel upstream branches in '${amsev_stable_commits_file}'."

AdithyaKrishnan

Left some minor changes. Incorporate them if they feel useful to you.

Sets the SNP host kernel and SNP guest kernel to the linux upstream User can setup host with the upstream kernel pointing to the master branch(as default) as follows : ./snp.sh setup-host --upstream-kernel User can setup host with the desired SNP kernel tag as follows: ./snp.sh setup-host --upstream-kernel --upstream-kernel-tag <user-specific kernel tag> Signed-off-by: Harika Nittala <[email protected]>

Added additional kernel options (--upstream-kernel, --upstream-kernel-tag) usage in the docs Signed-off-by: Harika Nittala <[email protected]>

AdithyaKrishnan

LGTM!
Thanks @LakshmiSaiHarika

LakshmiSaiHarika changed the title ~~Install SNP upstream kernel during SNP host setup~~ 1) Install SNP upstream kernel during SNP host setup Jan 14, 2025

LakshmiSaiHarika force-pushed the build-install-upstream-snp-kernel branch from d742431 to dab6bb0 Compare January 15, 2025 21:11

LakshmiSaiHarika commented Jan 17, 2025

View reviewed changes

LakshmiSaiHarika changed the title ~~1) Install SNP upstream kernel during SNP host setup~~ Add flags to install latest kernel/tag during SNP host setup Jan 17, 2025

LakshmiSaiHarika commented Jan 17, 2025

View reviewed changes

tools/snp.sh Outdated

@@ -1319,6 +1347,17 @@ main() {

shift; shift

;;

-u-k|--upstr-kernel)

Copy link

Contributor Author

LakshmiSaiHarika Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--upstream-kernel

LakshmiSaiHarika commented Jan 17, 2025

View reviewed changes

LakshmiSaiHarika force-pushed the build-install-upstream-snp-kernel branch 2 times, most recently from 130c354 to cfeb872 Compare January 20, 2025 21:16

LakshmiSaiHarika closed this Jan 20, 2025

LakshmiSaiHarika reopened this Jan 20, 2025

DGonzalezVillal reviewed Jan 20, 2025

View reviewed changes

LakshmiSaiHarika force-pushed the build-install-upstream-snp-kernel branch from cfeb872 to 5aa2acc Compare January 21, 2025 22:54

AdithyaKrishnan reviewed Jan 24, 2025

View reviewed changes

LakshmiSaiHarika added 2 commits January 27, 2025 15:51

Update docs to show additional kernel options use in the SNP host setup

cd78a30

Added additional kernel options (--upstream-kernel, --upstream-kernel-tag) usage in the docs Signed-off-by: Harika Nittala <[email protected]>

LakshmiSaiHarika force-pushed the build-install-upstream-snp-kernel branch from 5aa2acc to cd78a30 Compare January 27, 2025 23:52

LakshmiSaiHarika requested a review from AdithyaKrishnan January 27, 2025 23:53

AdithyaKrishnan approved these changes Jan 28, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add flags to install latest kernel/tag during SNP host setup #29

Add flags to install latest kernel/tag during SNP host setup #29

LakshmiSaiHarika commented Jan 14, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika left a comment

LakshmiSaiHarika commented Jan 20, 2025

DGonzalezVillal Jan 20, 2025

LakshmiSaiHarika Jan 20, 2025

AdithyaKrishnan Jan 24, 2025

AdithyaKrishnan Jan 24, 2025

AdithyaKrishnan Jan 24, 2025

LakshmiSaiHarika Jan 24, 2025 •

edited

Loading

AdithyaKrishnan Jan 24, 2025

AdithyaKrishnan left a comment

AdithyaKrishnan left a comment


		set_snp_kernel_upstream() {
		local amsev_stable_commits_file="${SETUP_WORKING_DIR}/AMDSEV/stable-commits"

Add flags to install latest kernel/tag during SNP host setup #29

Are you sure you want to change the base?

Add flags to install latest kernel/tag during SNP host setup #29

Conversation

LakshmiSaiHarika commented Jan 14, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LakshmiSaiHarika Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LakshmiSaiHarika Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LakshmiSaiHarika Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LakshmiSaiHarika Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LakshmiSaiHarika Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

LakshmiSaiHarika left a comment

Choose a reason for hiding this comment

LakshmiSaiHarika commented Jan 20, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LakshmiSaiHarika Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AdithyaKrishnan left a comment

Choose a reason for hiding this comment

AdithyaKrishnan left a comment

Choose a reason for hiding this comment

LakshmiSaiHarika commented Jan 14, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 17, 2025 •

edited

Loading

LakshmiSaiHarika Jan 24, 2025 •

edited

Loading