folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add nvme_multipath and change default (#5584)

This commit is contained in:
rlmenge 2023-05-31 09:44:59 -07:00 committed by GitHub
parent c939408f71
commit 0af13f0fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS-SIGNED/kernel-signed/kernel-signed.spec
View File

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.112.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld
%changelog
* Wed May 24 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.112.1-2
- Bump release to match kernel
* Tue May 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.112.1-1
- Auto-upgrade to 5.15.112.1

5
SPECS/kernel-headers/kernel-headers.spec
View File

@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.15.112.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*
%changelog
* Wed May 24 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.112.1-2
- Bump release to match kernel
* Tue May 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.112.1-1
- Auto-upgrade to 5.15.112.1

2
SPECS/kernel/config
View File

@ -2019,7 +2019,7 @@ CONFIG_BLK_DEV_RBD=m
#
CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=y
# CONFIG_NVME_MULTIPATH is not set
CONFIG_NVME_MULTIPATH=y
# CONFIG_NVME_HWMON is not set
CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m

2
SPECS/kernel/config_aarch64
View File

@ -2572,7 +2572,7 @@ CONFIG_BLK_DEV_RBD=m
#
CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=y
# CONFIG_NVME_MULTIPATH is not set
CONFIG_NVME_MULTIPATH=y
# CONFIG_NVME_HWMON is not set
CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m

4
SPECS/kernel/kernel.signatures.json
View File

@ -1,8 +1,8 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "f950f2da02547dc28d06b488552af0404498b7cb7049088f3e46ed768adb76aa",
"config_aarch64": "0747e000e9ed0dba9df8090e7e399dd7b346d2d3595a12ab2c23694312f3a14a",
"config": "af39093d1fc353c864e473e3067d7eaa6cb5eb0a4cef7b30d2c3307012d9c67f",
"config_aarch64": "f90cbcb71f7121fec80f64c34ca1bfcb726b739cff8691ec3d5dcb38fdd9bc70",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.112.1.tar.gz": "5dd8f03e3aa1f715521c1cadf320f0e8bf66dd5905e97b71366e0b48aa758d57"
}

7
SPECS/kernel/kernel.spec
View File

@ -28,7 +28,7 @@
Summary: Linux Kernel
Name: kernel
Version: 5.15.112.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -39,6 +39,7 @@ Source1: config
Source2: config_aarch64
Source3: sha512hmac-openssl.sh
Source4: cbl-mariner-ca-20211013.pem
Patch0: nvme_multipath_default_false.patch
BuildRequires: audit-devel
BuildRequires: bash
BuildRequires: bc
@ -159,6 +160,7 @@ manipulation of eBPF programs and maps.
%prep
%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-2-%{version}
%patch0 -p1
make mrproper
@ -420,6 +422,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Wed May 24 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.111.1-2
- Enable CONFIG_NVME_MULTIPATH with patch to set default to off
* Tue May 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.112.1-1
- Auto-upgrade to 5.15.112.1

25
SPECS/kernel/nvme_multipath_default_false.patch Normal file
View File

@ -0,0 +1,25 @@
From 023550ed8b18cfabfd33a1acd7c7e98e7623ed5f Mon Sep 17 00:00:00 2001
From: Rachel Menge <rachelmenge@microsoft.com>
Date: Wed, 24 May 2023 10:33:22 -0700
Subject: [PATCH] Change default multipath policy to false
---
drivers/nvme/host/multipath.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 8d97b942de01..ad03014dcf0e 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -8,7 +8,7 @@
#include <trace/events/block.h>
#include "nvme.h"
-static bool multipath = true;
+static bool multipath = false;
module_param(multipath, bool, 0444);
MODULE_PARM_DESC(multipath,
"turn on native support for multiple controllers per subsystem");
--
2.17.1

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-13.cm2.aarch64.rpm
kernel-headers-5.15.112.1-1.cm2.noarch.rpm
kernel-headers-5.15.112.1-2.cm2.noarch.rpm
glibc-2.35-3.cm2.aarch64.rpm
glibc-devel-2.35-3.cm2.aarch64.rpm
glibc-i18n-2.35-3.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-13.cm2.x86_64.rpm
kernel-headers-5.15.112.1-1.cm2.noarch.rpm
kernel-headers-5.15.112.1-2.cm2.noarch.rpm
glibc-2.35-3.cm2.x86_64.rpm
glibc-devel-2.35-3.cm2.x86_64.rpm
glibc-i18n-2.35-3.cm2.x86_64.rpm

2
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -135,7 +135,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.112.1-1.cm2.noarch.rpm
kernel-headers-5.15.112.1-2.cm2.noarch.rpm
kmod-29-1.cm2.aarch64.rpm
kmod-debuginfo-29-1.cm2.aarch64.rpm
kmod-devel-29-1.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -135,7 +135,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-headers-5.15.112.1-1.cm2.noarch.rpm
kernel-headers-5.15.112.1-2.cm2.noarch.rpm
kmod-29-1.cm2.x86_64.rpm
kmod-debuginfo-29-1.cm2.x86_64.rpm
kmod-devel-29-1.cm2.x86_64.rpm