From: Mete Durlu <mdurlu(a)redhat.com>
redhat/configs: Add SMC_LO config option on s390
Upstream Status: RHEL only
This introduces a kind of Emulated-ISM device named loopback-ism for
SMCv2.1. The loopback-ism device is currently exclusive for SMC usage,
and aims to provide an SMC shortcut for sockets within the same kernel,
leading to improved intra-OS traffic performance. Configuration of this
feature is managed through the config SMC_LO.
Signed-off-by: Mete Durlu <mdurlu(a)redhat.com>
diff --git a/redhat/configs/common/generic/s390x/CONFIG_SMC_LO b/redhat/configs/common/generic/s390x/CONFIG_SMC_LO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/s390x/CONFIG_SMC_LO
@@ -0,0 +1 @@
+# CONFIG_SMC_LO is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3874
From: Mete Durlu <mdurlu(a)redhat.com>
redhat/configs: Add SMC_LO config option on s390
Upstream Status: RHEL only
This introduces a kind of Emulated-ISM device named loopback-ism for
SMCv2.1. The loopback-ism device is currently exclusive for SMC usage,
and aims to provide an SMC shortcut for sockets within the same kernel,
leading to improved intra-OS traffic performance. Configuration of this
feature is managed through the config SMC_LO.
Signed-off-by: Mete Durlu <mdurlu(a)redhat.com>
diff --git a/redhat/configs/common/generic/s390x/CONFIG_SMC_LO b/redhat/configs/common/generic/s390x/CONFIG_SMC_LO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/s390x/CONFIG_SMC_LO
@@ -0,0 +1 @@
+# CONFIG_SMC_LO is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3874
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870
kernel-automotive is a separate package with its own dist-git and not a
variant of the stock kernel like kernel-debug, kernel-rt, etc. are. In order
to support building this as a separate package we need to add automotive
specific make targets that behave similarly to their analogous stock kernel
targets.
This adds a flag (AUTOMOTIVE_BUILD) that can be included when calling the
standard make targets to repurpose them to build kernel-automotive rather than
the stock kernel.
For example:
`make AUTOMOTIVE_BUILD=1 dist-srpm`
This adds two make target specific to kernel-automotive as a convenience:
- dist-automotive-configs
- dist-cbs
Regarding the automotive scratch build targets: the autosd and rhivos distros
based on cs10 do not exist today. I have gone ahead and included targets for
those as if they did exist rather than trying to force kernel-ark to support
cs9 based automotive distros (which is not the target of these changes). These
changes will eventually be taken to cs10 to support building automotive from
the same branch as the stock kernel.
In summary, these scratch build targets are not for use yet:
- brew: rhivos-2-newest-test-pesign
Currently there is not a suitable scratch build target in brew or cbs now that
Rust is enabled. I'm relying on CKI's c10s build container for now.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
redhat/scripts/rh-dist-git.sh | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 2 +-
redhat/Makefile | 72 ++++++++++++++++++++-
redhat/Makefile.automotive | 15 ++++
redhat/Makefile.variables | 7 +-
redhat/automotive-centpkg-sig.conf | 32 +++++++++
redhat/kernel.spec.template | 65 ++++++++++++++++--
.gitignore | 3 +
.gitlab-ci.yml | 13 ++-
Makefile.rhelver | 10 ++
57 files changed, 366 insertions(+), 117 deletions(-)
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870
kernel-automotive is a separate package with its own dist-git and not a
variant of the stock kernel like kernel-debug, kernel-rt, etc. are. In order
to support building this as a separate package we need to add automotive
specific make targets that behave similarly to their analogous stock kernel
targets.
This adds a flag (AUTOMOTIVE_BUILD) that can be included when calling the
standard make targets to repurpose them to build kernel-automotive rather than
the stock kernel.
For example:
`make AUTOMOTIVE_BUILD=1 dist-srpm`
This adds two make target specific to kernel-automotive as a convenience:
- dist-automotive-configs
- dist-cbs
Regarding the automotive scratch build targets: the autosd and rhivos distros
based on cs10 do not exist today. I have gone ahead and included targets for
those as if they did exist rather than trying to force kernel-ark to support
cs9 based automotive distros (which is not the target of these changes). These
changes will eventually be taken to cs10 to support building automotive from
the same branch as the stock kernel.
In summary, these scratch build targets are not for use yet:
- brew: rhivos-2-newest-test-pesign
Currently there is not a suitable scratch build target in brew or cbs now that
Rust is enabled. I'm relying on CKI's c10s build container for now.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
redhat/scripts/rh-dist-git.sh | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 2 +-
redhat/Makefile | 78 +++++++++++++++++++-
redhat/Makefile.automotive | 15 ++++
redhat/Makefile.variables | 7 +-
redhat/automotive-centpkg-sig.conf | 32 ++++++++
redhat/kernel.spec.template | 65 +++++++++++++++--
.gitignore | 3 +
.gitlab-ci.yml | 13 ++-
Makefile.rhelver | 10 ++
57 files changed, 368 insertions(+), 121 deletions(-)
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870
kernel-automotive is a separate package with its own dist-git and not a
variant of the stock kernel like kernel-debug, kernel-rt, etc. are. In order
to support building this as a separate package we need to add automotive
specific make targets that behave similarly to their analogous stock kernel
targets.
This adds a flag (AUTOMOTIVE_BUILD) that can be included when calling the
standard make targets to repurpose them to build kernel-automotive rather than
the stock kernel.
For example:
`make AUTOMOTIVE_BUILD=1 dist-srpm`
This adds two make target specific to kernel-automotive as a convenience:
- dist-automotive-configs
- dist-cbs
Regarding the automotive scratch build targets: the autosd and rhivos distros
based on cs10 do not exist today. I have gone ahead and included targets for
those as if they did exist rather than trying to force kernel-ark to support
cs9 based automotive distros (which is not the target of these changes). These
changes will eventually be taken to cs10 to support building automotive from
the same branch as the stock kernel.
In summary, these scratch build targets are not for use yet:
- brew: rhivos-2-newest-test-pesign
Currently there is not a suitable scratch build target in brew or cbs now that
Rust is enabled. I'm relying on CKI's c10s build container for now.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
redhat/scripts/rh-dist-git.sh | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 2 +-
redhat/Makefile | 72 ++++++++++++++++++++-
redhat/Makefile.automotive | 15 ++++
redhat/Makefile.variables | 7 +-
redhat/automotive-centpkg-sig.conf | 32 +++++++++
redhat/kernel.spec.template | 58 ++++++++++++++--
.gitignore | 3 +
.gitlab-ci.yml | 13 ++-
Makefile.rhelver | 10 ++
57 files changed, 359 insertions(+), 117 deletions(-)
From: Gregory Bell <grbell(a)redhat.com>
redhat/spec: package full bpftool in selftests
JIRA: https://issues.redhat.com/browse/RHEL-91378
Upstream Status: RHEL-only
test_bpftool.sh selftests fails because selftests is packaged
with bootstrap bpftool. Replace bootstrap bpftool with
full bpftool in selftests package
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3249,6 +3249,11 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
done
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
+
+# Copy bpftool to kselftests so selftests is packaged with
+# the full bpftool instead of bootstrap bpftool
+cp ./bpf/tools/sbin/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool
+
popd
%{log_msg "end build selftests"}
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3948