Merge ~kajiya/+git/gce-compute-image-packages:upstream into ~ubuntu-core-dev/+git/gce-compute-image-packages:upstream

[Chloé Smith]

Update to upstream tag 20240307.00 (LP: #2066314)

[Utkarsh Gupta (utkarsh)]

Thanks, Chlo. I just had to adjust the d/ch entry per the usual standard line which gbp generates. But everything looks good. No vendoring required in the package, no complicated build, and no lintian shenanigans. I've sponsored the upload:

$ dput ubuntu ../gce-compute-image-packages_20240307.00-0ubuntu1_source.changes
Uploading gce-compute-image-packages using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running required-fields: check whether a field is present and non-empty in the changes file
running checksum: verify checksums before uploading
running suite-mismatch: check the target distribution for common errors
running check-debs: makes sure the upload contains a binary package
running gpg: check GnuPG signatures before the upload
Uploading gce-compute-image-packages_20240307.00-0ubuntu1.dsc
Uploading gce-compute-image-packages_20240307.00.orig.tar.xz
Uploading gce-compute-image-packages_20240307.00-0ubuntu1.debian.tar.xz
Uploading gce-compute-image-packages_20240307.00-0ubuntu1_source.buildinfo
Uploading gce-compute-image-packages_20240307.00-0ubuntu1_source.changes

review: Approve

diff --git a/OWNERS b/OWNERS
index 80fc96d..59fca61 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,12 +2,15 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 approvers:
+  - a-crate
+  - ajorg
   - bkatyl
   - chaitanyakulkarni28
   - dorileo
+  - drewhli
+  - elicriffield
+  - gaughen
   - jjerger
   - karnvadaliya
   - koln67
-  - quintonamore
-  - vorakl
   - zmarano
diff --git a/src/lib/udev/google_nvme_id b/src/lib/udev/google_nvme_id
index ef02963..f0bba67 100755
--- a/src/lib/udev/google_nvme_id
+++ b/src/lib/udev/google_nvme_id
@@ -69,7 +69,7 @@ function get_namespace_device_name() {
   fi
 
   local device_name
-  device_name="$(echo "$nvme_json" | grep device_name | sed -e 's/.*"device_name":[  \t]*"\([a-zA-Z0-9_-]\+\)".*/\1/')"
+  device_name="$(echo "$nvme_json" | grep device_name | sed -e 's/.*"device_name":[  \t]*"\([.a-zA-Z0-9_-]\+\)".*/\1/')"
 
   # Error if our device name is empty
   if [[ -z "$device_name" ]]; then
diff --git a/src/usr/bin/google_set_hostname b/src/usr/bin/google_set_hostname
index 317768f..05a0412 100755
--- a/src/usr/bin/google_set_hostname
+++ b/src/usr/bin/google_set_hostname
@@ -62,7 +62,8 @@ if [ -n "$new_host_name" ] && [ "${new_host_name%%.*}" != "$old_hostname" ] && !
   # Restart rsyslog to update the hostname.
   systemctl=$(which systemctl 2> /dev/null)
   if [ -x "$systemctl" ]; then
-    hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ')
+	# See man 5 systemd.unit for systemd unit naming rules
+    hasrsyslog=$($systemctl | grep rsyslog | grep -oE '[a-zA-Z0-9:-_.\]+\.(service|socket|device|mount|automount|swap|target|path|timer|slice|scope)')
     if [ ! -z "$hasrsyslog" ]; then
       $systemctl -q --no-block restart "$hasrsyslog"
     fi
diff --git a/src/usr/bin/google_set_multiqueue b/src/usr/bin/google_set_multiqueue
index fa87a1e..8e51934 100755
--- a/src/usr/bin/google_set_multiqueue
+++ b/src/usr/bin/google_set_multiqueue
@@ -45,7 +45,7 @@ function set_channels() {
 
 function set_irq_range() {
   local -r nic="$1"
-  local core="$2"
+  local bind_cores_begin="$2"
 
   # The user may not have this $nic configured on their VM, if not, just skip
   # it, no need to error out.
@@ -53,16 +53,26 @@ function set_irq_range() {
     return;
   fi
 
+
   # We count the number of rx queues and assume number of rx queues == tx
-  # queues. Currently the GVE configuration at boot is 16 rx + 16 tx.
+  # queues. The number of queues shown in the sysfs stands for the initial
+  # queues while the number of IRQs stands for the max queues. The number of
+  # initial queues should be always less than or equal to that of the max
+  # queues.
+  core=$bind_cores_begin
+  num_irqs=$(( $(ls /sys/class/net/"$nic"/device/msi_irqs | wc -l) / 2 ))
   num_q=$(ls -1 /sys/class/net/"$nic"/queues/ | grep rx | wc -l)
 
   echo "Setting irq binding for "$nic" to core [$core - $((core + num_q - 1))] ..."
 
   irqs=($(ls /sys/class/net/"$nic"/device/msi_irqs | sort -g))
-  for ((queue = 0; queue < "$num_q"; queue++)); do
-    tx_irq=${irqs[$queue]}
-    rx_irq=${irqs[$((queue + num_q))]}
+  for ((irq = 0; irq < "$num_irqs"; irq++)); do
+    tx_irq=${irqs[$irq]}
+    rx_irq=${irqs[$((irq + num_irqs))]}
+
+    # Only allocate $num_q cores to the IRQs and queues. If the number of IRQs
+    # is more than that of queues, the CPUs will be wrapped around.
+    core=$(( bind_cores_begin + irq % num_q ))
 
     # this is GVE's TX irq. See gve_tx_idx_to_ntfy().
     echo "$core" > /proc/irq/"$tx_irq"/smp_affinity_list
@@ -70,23 +80,32 @@ function set_irq_range() {
     # this is GVE's RX irq. See gve_rx_idx_to_ntfy().
     echo "$core" > /proc/irq/"$rx_irq"/smp_affinity_list
 
-    # XPS (Transmit Packet Steering) allows a core to decide which queue to
-    # select if its mask is found in one of the queue's xps_cpus
-    cp /proc/irq/"$tx_irq"/smp_affinity /sys/class/net/"$nic"/queues/tx-"$queue"/xps_cpus
-
-    echo -en "$nic:q-$queue: \ttx: irq $tx_irq bind to $core \trx: irq $rx_irq bind to $core"
-    echo -e " \txps_cpus bind to $(cat /sys/class/net/"$nic"/queues/tx-"$queue"/xps_cpus)"
+    # Check if the queue exists at present because the number of IRQs equals
+    # the max number of queues allocated and could be greater than the current
+    # number of queues.
+    tx_queue=/sys/class/net/"$nic"/queues/tx-"$irq"
+    if ls $tx_queue 1> /dev/null 2>&1; then
+      # XPS (Transmit Packet Steering) allows a core to decide which queue to
+      # select if its mask is found in one of the queue's xps_cpus
+      cp /proc/irq/"$tx_irq"/smp_affinity $tx_queue/xps_cpus
+
+      echo -en "$nic:q-$irq: \ttx: irq $tx_irq bind to $core \trx: irq $rx_irq bind to $core"
+      echo -e " \txps_cpus bind to $(cat $tx_queue/xps_cpus)"
+    else
+      echo -e "$nic:q-$irq: \ttx: irq $tx_irq bind to $core \trx: irq $rx_irq bind to $core"
+    fi
 
-    core=$((core + 1))
   done
 }
 
-# returns 0 (success) if it's running on a3 platform.
+# returns 0 (success) if it's running on a3 or a3plus platform.
 function is_a3_platform() {
-  machine_type=$(curl -H "Metadata-Flavor: Google" \
+  machine_type=$(curl -m 1 -H "Metadata-Flavor: Google" \
     http://169.254.169.254/computeMetadata/v1/instance/machine-type)
 
-  [[ "$machine_type" == *"a3-highgpu-8g"* ]] || return 1
+  [[ "$machine_type" == *"a3-highgpu-8g"* \
+  || "$machine_type" == *"a3-ultragpu-8g"* \
+  || "$machine_type" == *"a3-megagpu-8g"* ]] || return 1
 
   return 0
 }
@@ -234,7 +253,7 @@ fi
 
 # IRQ binding for numa 0, CPUs [0, 51] and [104, 155] are for numa 0.
 numa0_irq_start=1
-find /sys/class/net -type l | xargs -L 1 realpath | sort | xargs -L 1 basename | grep -v lo | while read nic_name; do
+find /sys/class/net -type l | xargs -L 1 realpath | grep '/sys/devices/pci' | sort | xargs -L 1 basename | while read nic_name; do
   nic_numa_node=$(cat /sys/class/net/"$nic_name"/device/numa_node)
   if [[ $nic_numa_node -ne 0 ]]; then
     continue
@@ -256,7 +275,7 @@ done
 
 # IRQ binding for numa 1, CPUs [52, 103] and [156, 207] are for numa 1.
 numa1_irq_start=52
-find /sys/class/net -type l | xargs -L 1 realpath | sort | xargs -L 1 basename | grep -v lo | while read nic_name; do
+find /sys/class/net -type l | xargs -L 1 realpath | grep '/sys/devices/pci' | sort | xargs -L 1 basename | while read nic_name; do
   nic_numa_node=$(cat /sys/class/net/"$nic_name"/device/numa_node)
   if [[ $nic_numa_node -ne 1 ]]; then
     continue