[OS-BUILD PATCH] configs: remove duplicate CONFIG_DRM_HYPERV file
by Patrick Talbert (via Email Bridge)
From: Patrick Talbert <ptalbert(a)redhat.com>
configs: remove duplicate CONFIG_DRM_HYPERV file
CONFIG_DRM_HYPERV was set for x86 by !1259 and then for everyone by
!1213. It is only needed for x86 so remove the less specific one.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_DRM_HYPERV b/redhat/configs/common/generic/CONFIG_DRM_HYPERV
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_DRM_HYPERV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_HYPERV=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1272
2Β years, 9Β months
[OS-BUILD PATCH] CI: Handle all mirrors
by Veronika KabΓ‘tovΓ‘ (via Email Bridge)
From: Veronika Kabatova <vkabatov(a)redhat.com>
CI: Handle all mirrors
Add CI for mirrored c9s and future RHEL9 repositories. Make use of the
new defaults and templates so we don't have to define everything all
over again.
The c9s/RHEL9 specific parts can be extracted into the repos when the
ARK mirror stops and be removed from here.
Upstream Status: RHEL-only
Bugzilla: INTERNAL
Signed-off-by: Veronika Kabatova <vkabatov(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,11 @@
# linked in the merge request and appropriate labels will be added to it.
# Changes to this file will NOT be reflected in the webhook testing.
+include:
+ - project: cki-project/pipeline-definition
+ ref: main
+ file: kernel_templates.yml
+
stages:
- test
- build
@@ -11,40 +16,89 @@ stages:
workflow:
rules:
- - if: $CI_MERGE_REQUEST_ID
- - if: '$CI_PIPELINE_SOURCE == "schedule"'
+ - if: '$CI_PIPELINE_SOURCE == "schedule"' # ARK release pipelines
+ - if: '$CI_MERGE_REQUEST_PROJECT_PATH =~ /^cki-project.kernel-ark/' # ARK MR CI
+ variables:
+ REQUESTED_PIPELINE_TYPE: 'trusted-ark'
+ # We cannot merge rules through !reference and have to copy them over from the
+ # CKI pipeline: https://gitlab.com/gitlab-org/gitlab/-/issues/322992
+ - if: '$CI_MERGE_REQUEST_PROJECT_PATH =~ /^redhat.rhel/ || $CI_PROJECT_PATH =~ /^redhat.rhel/'
+ variables:
+ REQUESTED_PIPELINE_TYPE: 'internal'
+ - if: '$CI_MERGE_REQUEST_PROJECT_PATH =~ /^redhat.centos-stream/ || $CI_PROJECT_PATH =~ /^redhat.centos-stream/'
+ variables:
+ REQUESTED_PIPELINE_TYPE: 'trusted'
-trigger_pipeline:
+# We need to differentiate between the pipeline types that are triggered from this
+# single file. Once the mirroring to c9s stops this anchor can be dropped and the
+# regular ".trusted" anchor and "trusted" type can be used. The template is added
+# here instead of into CKI to avoid having to clear up two places after mirror drop.
+.trusted-ark:
+ trigger:
+ project: redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki-trusted-contributors
+ strategy: depend
+ variables:
+ PIPELINE_TYPE: 'trusted-ark'
+ kernel_type: 'upstream'
+
+.trigger_ark_pipeline:
stage: test
+ trigger:
+ branch: kernel-ark
variables:
- # The following ones are required by CKI pipeline definition
- git_url: ${CI_MERGE_REQUEST_PROJECT_URL}
- branch: ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
- commit_hash: ${CI_COMMIT_SHA}
- mr_id: ${CI_MERGE_REQUEST_IID}
- mr_url: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}
- title: ${CI_COMMIT_TITLE}
name: kernel-ark
-
- # We only need srpm so skip the rest of the stages
- kernel_type: upstream
- make_target: rpm
builder_image: registry.gitlab.com/cki-project/containers/builder-rawhide
builder_image_tag: latest
srpm_make_target: dist-srpm
+ # We only need srpm so skip the rest of the stages
skip_build: 'true'
skip_publish: 'true'
skip_test: 'true'
+ skip_results: 'true'
+.9-common:
+ variables:
+ builder_image_tag: latest
+ srpm_make_target: dist-srpm
+ build_kabi_stablelist: 'true'
+ tree_yaml_name: rhel
+ publish_elsewhere: 'true'
+ native_tools: 'true'
+
+.trigger_c9s_pipeline:
trigger:
- project: redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki-trusted-contributors
- branch: kernel-ark
- strategy: depend
+ branch: c9s
+ variables:
+ name: centos-stream-9
+ builder_image: registry.gitlab.com/cki-project/containers/builder-stream9
+ architectures: 'x86_64 ppc64le aarch64 s390x'
+ kpet_tree_family: c9s
+
+.trigger_rhel9_pipeline:
+ trigger:
+ branch: rhel9
+ variables:
+ name: rhel9
+ builder_image: quay.io/cki/builder-rhel9
+ architectures: 'x86_64 aarch64 s390x' #ppc64le container is not available yet
+ kpet_tree_family: rhel9
+
+ark_merge_request:
+ extends: [.trusted-ark, .merge_request, .trigger_ark_pipeline]
+
+# Only enable c9s pipelines once we have the composes available in Beaker
+# c9s_merge_request:
+# extends: [.trusted, .merge_request, .9-common, .trigger_c9s_pipeline]
+#
+# c9s_baseline:
+# extends: [.trusted, .baseline, .9-common, .trigger_c9s_pipeline]
+
+rhel9_merge_request:
+ extends: [.internal, .merge_request, .9-common, .trigger_rhel9_pipeline]
+
+rhel9_baseline:
+ extends: [.internal, .baseline, .9-common, .trigger_rhel9_pipeline]
- rules:
- - if: '$CI_PIPELINE_SOURCE == "schedule"'
- when: never
- - when: on_success
# scheduled job
merge_upstream:
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1254
2Β years, 9Β months
[OS-BUILD PATCH] rpmspec: add release string to kernel doc directory
name
by Jan Stancek (via Email Bridge)
From: Jan Stancek <jstancek(a)redhat.com>
rpmspec: add release string to kernel doc directory name
https://fedoraproject.org//wiki/Changes/UnversionedDocdirs says:
Packages for which multiple versions are intended to be installed need to
be changed to install their docs into appropriately versioned subdirs.
kernel docs are currently installed to /usr/share/doc/kernel-doc-$VERSION
(for example: /usr/share/doc/kernel-doc-5.14.0), which prevents user
from having kernel docs installed for multiple releases if they happen
to share same $VERSION. This is more visible in downstream releases,
where $VERSION is same for entire lifetime of stream.
This patch adds $RELEASE to kernel doc directory name to allow installing
multiple versions in parallel.
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2321,7 +2321,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2706,9 +2706,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}
+%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
%endif
%if %{with_perf}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1258
2Β years, 9Β months
β FAIL: Test report for kernel 5.13.3-200.fc34 (fedora-34)
by CKI Project
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.13.3-200.fc34
Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=72223489
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Tests: FAILED
One or more kernel tests failed:
ppc64le:
β LTP
π₯ xarray-idr-radixtree-test
aarch64:
β LTP
π₯ stress: stress-ng
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre...
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
β
Boot test
β
Reboot test
β
ACPI table test
β LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
Host 2:
β
Boot test
β
Reboot test
β
xfstests - ext4
β
xfstests - xfs
β
Storage: swraid mdadm raid_module test
π§ β
xfstests - btrfs
π§ β
Storage blktests
π§ β
Storage block - filesystem fio test
π§ β
Storage block - queue scheduler test
π§ β
Storage nvme - tcp
π§ β
storage: software RAID testing
π§ π₯ stress: stress-ng
ppc64le:
Host 1:
β
Boot test
β
Reboot test
β
xfstests - ext4
β
xfstests - xfs
β
Storage: swraid mdadm raid_module test
π§ β
xfstests - btrfs
π§ β
Storage blktests
π§ β
Storage block - filesystem fio test
π§ β
Storage block - queue scheduler test
π§ β
Storage nvme - tcp
π§ β
Storage: lvm device-mapper test - upstream
π§ β
storage: software RAID testing
Host 2:
β
Boot test
β
Reboot test
β LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ π₯ xarray-idr-radixtree-test
s390x:
Host 1:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β
Boot test
β
Reboot test
β
Storage: swraid mdadm raid_module test
π§ β
Storage blktests
π§ β
Storage nvme - tcp
π§ β‘β‘β‘ stress: stress-ng
Host 2:
β
Boot test
β
Reboot test
β
LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β xarray-idr-radixtree-test
x86_64:
Host 1:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ ACPI table test
β‘β‘β‘ LTP
β‘β‘β‘ CIFS Connectathon
β‘β‘β‘ Loopdev Sanity
β‘β‘β‘ Memory: fork_mem
β‘β‘β‘ Memory function: memfd_create
β‘β‘β‘ AMTU (Abstract Machine Test Utility)
β‘β‘β‘ Ethernet drivers sanity
π§ β‘β‘β‘ xarray-idr-radixtree-test
Host 2:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β‘β‘β‘ xfstests - nfsv4.2
β‘β‘β‘ Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β‘β‘β‘ xfstests - cifsv3.11
π§ β‘β‘β‘ Storage blktests
π§ β‘β‘β‘ Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage nvme - tcp
π§ β‘β‘β‘ Storage: lvm device-mapper test - upstream
π§ β‘β‘β‘ storage: software RAID testing
π§ β‘β‘β‘ stress: stress-ng
Host 3:
β
Boot test
β
Reboot test
β
ACPI table test
β
LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
Host 4:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β‘β‘β‘ xfstests - nfsv4.2
β‘β‘β‘ Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β‘β‘β‘ xfstests - cifsv3.11
π§ β‘β‘β‘ Storage blktests
π§ β‘β‘β‘ Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage nvme - tcp
π§ β‘β‘β‘ Storage: lvm device-mapper test - upstream
π§ β‘β‘β‘ storage: software RAID testing
π§ β‘β‘β‘ stress: stress-ng
Test sources: https://gitlab.com/cki-project/kernel-tests
π Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with β‘β‘β‘.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with π§. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with β±.
2Β years, 9Β months
[OS-BUILD PATCHv2] CI: use common code for merge and release
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
CI: use common code for merge and release
Small cleanup to simplify code by re-using duplicated sections through
extends.
Also remove legacy config branch push (now done through merge_upstream).
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ rhel9_baseline:
# scheduled job
-merge_upstream:
+.scheduled_setup:
image: registry.gitlab.com/cki-project/containers/builder-fedora
variables:
GIT_DEPTH: "0"
@@ -121,10 +121,13 @@ merge_upstream:
- chmod 644 ~/.ssh/known_hosts
- git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
- gpg2 --import "$TORVALDS_GPG_KEY"
- script:
- git checkout --track origin/master && git describe
- - git checkout --track origin/os-build && git describe
- export PROJECT_ID="$CI_PROJECT_ID"
+
+merge_upstream:
+ extends: .scheduled_setup
+ script:
+ - git checkout --track origin/os-build && git describe
- make dist-merge-upstream-push || exit 1
retry: 2
rules:
@@ -132,43 +135,15 @@ merge_upstream:
# scheduled job
rawhide_release:
- image: registry.gitlab.com/cki-project/containers/builder-fedora
- variables:
- GIT_DEPTH: "0"
- GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
- before_script:
- - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
- - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
- - git config user.name "Fedora Kernel Team"
- - git config user.email "kernel-team(a)fedoraproject.org"
- - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
- # Need SSH since the clone is set up without write access.
- - eval $(ssh-agent -s)
- - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- - mkdir -p ~/.ssh
- - chmod 700 ~/.ssh
- - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
- - chmod 644 ~/.ssh/known_hosts
- - git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
- - gpg2 --import "$TORVALDS_GPG_KEY"
+ extends: .scheduled_setup
script:
- - git checkout --track origin/master && git describe
- git checkout --track origin/ark-latest && git describe
- git checkout --track origin/ark-infra && git describe
- git checkout --track origin/os-build && git describe
- - export PROJECT_ID="$CI_PROJECT_ID"
- redhat/scripts/ci/ark-create-release.sh "master" "$CI_PROJECT_ID" || exit_code=$?
- if [ $exit_code -eq 3 ]; then echo "Tag exists, halting" && exit 0; fi;
- if [ $exit_code -ne 0 ]; then echo "Unable to create release tag" && exit 1; fi;
- git push gitlab os-build
- - >
- for branch in $(git branch | grep configs/"$(date +%F)"); do
- git push \
- -o merge_request.create \
- -o merge_request.target=os-build \
- -o merge_request.remove_source_branch \
- gitlab "$branch"
- done;
# ark-create-release.sh creates a tag for ark-latest to be pushed.
# Make sure the ark-latest branch is checked out.
- git checkout ark-latest
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1264
2Β years, 9Β months
[OS-BUILD PATCH 0/0] [redhat] New configs in drivers/gpu
by CKI Gitlab (via Email Bridge)
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1213
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_DRM_HYPERV:
This is a KMS driver for Hyper-V synthetic video device. Choose this
option if you would like to enable drm driver for Hyper-V virtual
machine. Unselect Hyper-V framebuffer driver (CONFIG_FB_HYPERV) so
that DRM driver is used by default.
If M is selected the module will be called hyperv_drm.
Symbol: DRM_HYPERV [=n]
Type : tristate
Defined at drivers/gpu/drm/Kconfig:382
Prompt: DRM Support for Hyper-V synthetic video device
Depends on: HAS_IOMEM [=y] && DRM [=m] && PCI [=y] && MMU [=y] && HYPERV
[=m]
Location:
-> Device Drivers
-> Graphics support
Selects: DRM_KMS_HELPER [=m] && DRM_GEM_SHMEM_HELPER [=y]
---
CONFIG_DRM_ITE_IT66121:
Support for ITE IT66121 HDMI bridge.
Symbol: DRM_ITE_IT66121 [=n]
Type : tristate
Defined at drivers/gpu/drm/bridge/Kconfig:121
Prompt: ITE IT66121 HDMI bridge
Depends on: HAS_IOMEM [=y] && DRM [=m] && DRM_BRIDGE [=y] && OF [=y]
Location:
-> Device Drivers
-> Graphics support
-> Display Interface Bridges
Selects: DRM_KMS_HELPER [=m] && REGMAP_I2C [=m]
---
CONFIG_DRM_SIMPLEDRM:
DRM driver for simple platform-provided framebuffers.
This driver assumes that the display hardware has been initialized
by the firmware or bootloader before the kernel boots. Scanout
buffer, size, and display format must be provided via device tree,
UEFI, VESA, etc.
On x86 and compatible, you should also select CONFIG_X86_SYSFB to
use UEFI and VESA framebuffers.
Symbol: DRM_SIMPLEDRM [=n]
Type : tristate
Defined at drivers/gpu/drm/tiny/Kconfig:41
Prompt: Simple framebuffer driver
Depends on: HAS_IOMEM [=y] && DRM [=m]
Location:
-> Device Drivers
-> Graphics support
Selects: DRM_GEM_SHMEM_HELPER [=y] && DRM_KMS_HELPER [=m]
---
CONFIG_DRM_TI_SN65DSI83:
Texas Instruments SN65DSI83 and SN65DSI84 DSI to LVDS Bridge driver
Symbol: DRM_TI_SN65DSI83 [=n]
Type : tristate
Defined at drivers/gpu/drm/bridge/Kconfig:288
Prompt: TI SN65DSI83 and SN65DSI84 DSI to LVDS bridge
Depends on: HAS_IOMEM [=y] && DRM [=m] && DRM_BRIDGE [=y] && OF [=y]
Location:
-> Device Drivers
-> Graphics support
-> Display Interface Bridges
Selects: DRM_KMS_HELPER [=m] && REGMAP_I2C [=m] && DRM_PANEL [=y] &&
DRM_MIPI_DSI [=n]
---
CONFIG_HSA_AMD_SVM:
Enable this to use unified memory and managed memory in HIP. This
memory manager supports two modes of operation. One based on
preemptions and one based on page faults. To enable page fault
based memory management on most GFXv9 GPUs, set the module
parameter amdgpu.noretry=0.
Symbol: HSA_AMD_SVM [=y]
Type : bool
Defined at drivers/gpu/drm/amd/amdkfd/Kconfig:16
Prompt: Enable HMM-based shared virtual memory manager
Depends on: HAS_IOMEM [=y] && HSA_AMD [=y] && DEVICE_PRIVATE [=y]
Location:
-> Device Drivers
-> Graphics support
-> AMD GPU (DRM_AMDGPU [=m])
-> HSA kernel driver for AMD GPU devices (HSA_AMD [=y])
Selects: HMM_MIRROR [=y] && MMU_NOTIFIER [=y]
---
Cc: David Airlie <airlied(a)redhat.com>
Cc: Adam Jackson <ajax(a)redhat.com>
Cc: Lyude Paul <lyude(a)redhat.com>
Cc: Jeremy Cline <jcline(a)redhat.com>
Cc: "Michel DΓ€nzer" <mdaenzer(a)redhat.com>
Cc: "JΓ©rΓ΄me Glisse" <jglisse(a)redhat.com>
Cc: Karol Herbst <kherbst(a)redhat.com>
Cc: Ben Skeggs <bskeggs(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_DRM_HYPERV | 1 +
redhat/configs/common/generic/CONFIG_DRM_ITE_IT66121 | 1 +
redhat/configs/common/generic/CONFIG_DRM_SIMPLEDRM | 1 +
redhat/configs/common/generic/CONFIG_DRM_TI_SN65DSI83 | 1 +
redhat/configs/common/generic/CONFIG_HSA_AMD_SVM | 1 +
redhat/configs/pending-common/generic/CONFIG_DRM_ITE_IT66121 | 18 -------
redhat/configs/pending-common/generic/CONFIG_DRM_SIMPLEDRM | 25 -----------
redhat/configs/pending-common/generic/CONFIG_DRM_TI_SN65DSI83 | 18 -------
redhat/configs/pending-common/generic/CONFIG_HSA_AMD_SVM | 23 ----------
9 files changed, 5 insertions(+), 84 deletions(-)
2Β years, 9Β months
[OS-BUILD PATCHv4] redhat/configs: enable CONFIG_BLK_DEV_ZONED
by Ming Lei (via Email Bridge)
From: Ming Lei <ming.lei(a)redhat.com>
redhat/configs: enable CONFIG_BLK_DEV_ZONED
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1638087
This option has been enabled in Fedora already.
Also it is mentioned in this BZ that 'our current plan is to enable this
in RHEL 9 first', so enable this option in redhat/configs/common so that
people can use ZNS via userspace or play it via nvme-cli.
Signed-off-by: Ming Lei <ming.lei(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED b/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_ZONED is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED b/redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED
rename from redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED
rename to redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED
+++ b/redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1182
2Β years, 9Β months
[OS-BUILD PATCH] Fix fedora-only config updates
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
Fix fedora-only config updates
After every scheduled upstream merge, a script is run to find new
configs, generate pending-* files for them and for ark, create
branches to push MRs.
However, there is a case where new Fedora configs are found but not
new ARK configs. This case had issues.
When the merge is done, make dist-configs-commit is called for Fedora
and RHEL. This results in a possible new commit if configs are found.
The command is run twice and creates the following matrix:
1. Both Fedora and RHEL have new configs.
2. Neither Fedora nor RHEL have new configs.
3. Fedora does not have new configs, but RHEL does.
4. Fedora has new configs, bug RHEL does not.
1 and 2 are common and 1-3 are handled correctly.
Scenario 4 is not.
When the configs are committed, the next script gen_config_patches.sh
looks for a special commit 'AUTOMATIC'. It doesn't care if that commit
comes from Fedora or RHEL.
The gen_config_patches.sh can not handle pending-fedora changes, so
those changes are filtered in the script.
In scenario 4 that leaves an empty file to process, which the script
aborts on. Further no print out was displayed which slowed down
debugging.
The are multiple ways to address this. This patch does multiple things.
* Adds a print statement on the failure for future debugging.
* Exits on success if there are no changes to process after filtering.
* Reduces the risk of calling gen_config_patches.sh by only calling
the script when RHEL adds new configs.
Tested scenario 4 with last week's os-build HEAD.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/gen_config_patches.sh b/redhat/gen_config_patches.sh
index blahblah..blahblah 100755
--- a/redhat/gen_config_patches.sh
+++ b/redhat/gen_config_patches.sh
@@ -26,6 +26,11 @@ trap cleanup EXIT
# Not interested in Fedora configs
git diff --name-only HEAD HEAD^ | grep -v "pending-fedora" > "$tmpdir"/new_config_files
+if [ ! -s "$tmpdir"/new_config_files ]; then
+ echo "No config changes after filtering"
+ exit 0
+fi
+
while read -r line; do
# Read all the files and split up by file path of each config item.
# ethernet and net get handled separately others can be added as needed
@@ -89,7 +94,10 @@ done < "$tmpdir"/new_config_files
# $config_bundles_dir now contains files containing a list of configs per file path
for f in "$config_bundles_dir"/*; do
- [[ -e "$f" ]] || exit 1 # No files in config_bundles_dir, abort
+ if [ ! -e "$f" ]; then
+ echo "Missing generated config file: $f"
+ exit 1 # No files in config_bundles_dir, abort
+ fi
# we had to change to : for the file name so switch it back
_f=$(basename "$f" | sed -e 's/:/\//g')
# Commit subject
diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -49,13 +49,18 @@ if ! git merge -m "Merge '$UPSTREAM_REF' into '$BRANCH'" "$UPSTREAM_REF"; then
fi
# Generates and commits all the pending configs
+
make FLAVOR=fedora dist-configs-commit
+# Skip executing gen_config_patches.sh for new Fedora configs
+
+old_head="$(git rev-parse HEAD)"
make FLAVOR=rhel dist-configs-commit
+new_head="$(git rev-parse HEAD)"
# Converts each new pending config from above into its finalized git
# configs/<date>/<config> branch. These commits are used for Merge
# Requests.
-if git show -s --oneline HEAD | grep -q "AUTOMATIC: New configs"; then
+if [ "$old_head" != "$new_head" ]; then
./redhat/gen_config_patches.sh
else
printf "No new configuration values exposed from merging %s into $BRANCH\n" "$UPSTREAM_REF"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1263
2Β years, 9Β months
β FAIL: Test report for kernel 5.12.18-300.fc34 (fedora-34)
by CKI Project
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.12.18-300.fc34
Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=72186892
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Tests: FAILED
One or more kernel tests failed:
ppc64le:
β LTP
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre...
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
β
Boot test
β
Reboot test
β
ACPI table test
β
LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
Host 2:
β
Boot test
β
Reboot test
β
xfstests - ext4
β
xfstests - xfs
β
Storage: swraid mdadm raid_module test
π§ β
xfstests - btrfs
π§ β Storage blktests
π§ β
Storage block - filesystem fio test
π§ β
Storage block - queue scheduler test
π§ β Storage nvme - tcp
π§ β
storage: software RAID testing
π§ β
stress: stress-ng
ppc64le:
Host 1:
β
Boot test
β
Reboot test
β
xfstests - ext4
β
xfstests - xfs
β
Storage: swraid mdadm raid_module test
π§ β
xfstests - btrfs
π§ β
Storage blktests
π§ β
Storage block - filesystem fio test
π§ β
Storage block - queue scheduler test
π§ β
Storage nvme - tcp
π§ β
Storage: lvm device-mapper test - upstream
π§ β
storage: software RAID testing
Host 2:
β
Boot test
β
Reboot test
β LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
s390x:
Host 1:
β
Boot test
β
Reboot test
β
Storage: swraid mdadm raid_module test
π§ β
Storage blktests
π§ β
Storage nvme - tcp
π§ β
stress: stress-ng
Host 2:
β
Boot test
β
Reboot test
β
LTP
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
x86_64:
Host 1:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β‘β‘β‘ xfstests - nfsv4.2
β‘β‘β‘ Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β‘β‘β‘ xfstests - cifsv3.11
π§ β‘β‘β‘ Storage blktests
π§ β‘β‘β‘ Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage nvme - tcp
π§ β‘β‘β‘ Storage: lvm device-mapper test - upstream
π§ β‘β‘β‘ storage: software RAID testing
π§ β‘β‘β‘ stress: stress-ng
Host 2:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ ACPI table test
β‘β‘β‘ LTP
β‘β‘β‘ CIFS Connectathon
β‘β‘β‘ Loopdev Sanity
β‘β‘β‘ Memory: fork_mem
β‘β‘β‘ Memory function: memfd_create
β‘β‘β‘ AMTU (Abstract Machine Test Utility)
β‘β‘β‘ Ethernet drivers sanity
π§ β‘β‘β‘ xarray-idr-radixtree-test
Host 3:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ ACPI table test
β‘β‘β‘ LTP
β‘β‘β‘ CIFS Connectathon
β‘β‘β‘ Loopdev Sanity
β‘β‘β‘ Memory: fork_mem
β‘β‘β‘ Memory function: memfd_create
β‘β‘β‘ AMTU (Abstract Machine Test Utility)
β‘β‘β‘ Ethernet drivers sanity
π§ β‘β‘β‘ xarray-idr-radixtree-test
Host 4:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
β
Boot test
β
Reboot test
β
ACPI table test
β‘β‘β‘ LTP
β‘β‘β‘ CIFS Connectathon
β‘β‘β‘ Loopdev Sanity
β‘β‘β‘ Memory: fork_mem
β‘β‘β‘ Memory function: memfd_create
β‘β‘β‘ AMTU (Abstract Machine Test Utility)
β‘β‘β‘ Ethernet drivers sanity
π§ β‘β‘β‘ xarray-idr-radixtree-test
Test sources: https://gitlab.com/cki-project/kernel-tests
π Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with β‘β‘β‘.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with π§. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with β±.
2Β years, 9Β months