[OS-BUILD PATCHv2] [redhat] New configs in kernel/Kconfig.kexec

[CKI ARK Bot (via Email Bridge)]

From: Fedora Kernel Team

[redhat] New configs in kernel/Kconfig.kexec

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.

Symbol: CRASH_DM_CRYPT [=n]
 Type  : bool
 Defined at kernel/Kconfig.kexec:132
   Prompt: Support saving crash dump to dm-crypt encrypted volume
   Depends on: KEXEC_FILE [=y] && CRASH_DUMP [=y] && DM_CRYPT [=m]
   Location:
     -> General setup
       -> Kexec and crash features
         -> kernel crash dumps (CRASH_DUMP [=y])
           -> Support saving crash dump to dm-crypt encrypted volume (CRASH_DM_CRYPT [=n])

Commit: 180cf31af7c3 (crash_dump: make dm crypt keys persist for the kdump kernel)

---

Symbol: KEXEC_HANDOVER [=n]
 Type  : bool
 Defined at kernel/Kconfig.kexec:97
   Prompt: kexec handover
   Depends on: ARCH_SUPPORTS_KEXEC_HANDOVER [=y] && ARCH_SUPPORTS_KEXEC_FILE [=y]
   Location:
     -> General setup
       -> Kexec and crash features
         -> kexec handover (KEXEC_HANDOVER [=n])
 Selects: MEMBLOCK_KHO_SCRATCH [=n] && KEXEC_FILE [=y] && DEBUG_FS [=y] && LIBFDT [=n] && CMA [=y]

Commit: 4e1d010e3bda (kexec: add config option for KHO)

---

Signed-off-by: Fedora Kernel Team

v2:
- CONFIG_CRASH_DM_CRYPT enable for rhel.
- CONFIG_KEXEC_HANDOVER enable for rhel.

Signed-off-by: Patrick Talbert

diff --git a/redhat/configs/pending-rhel/generic/CONFIG_CRASH_DM_CRYPT b/redhat/configs/pending-rhel/generic/CONFIG_CRASH_DM_CRYPT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_CRASH_DM_CRYPT
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: CRASH_DM_CRYPT [=n]
-# Type  : bool
-# Defined at kernel/Kconfig.kexec:132
-#   Prompt: Support saving crash dump to dm-crypt encrypted volume
-#   Depends on: KEXEC_FILE [=y] && CRASH_DUMP [=y] && DM_CRYPT [=m]
-#   Location:
-#     -> General setup
-#       -> Kexec and crash features
-#         -> kernel crash dumps (CRASH_DUMP [=y])
-#           -> Support saving crash dump to dm-crypt encrypted volume (CRASH_DM_CRYPT [=n])
-# 
-# 
-# 
-# Commit: 180cf31af7c3 (crash_dump: make dm crypt keys persist for the kdump kernel)
-# CONFIG_CRASH_DM_CRYPT is not set
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_KEXEC_HANDOVER b/redhat/configs/pending-rhel/generic/CONFIG_KEXEC_HANDOVER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_KEXEC_HANDOVER
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: KEXEC_HANDOVER [=n]
-# Type  : bool
-# Defined at kernel/Kconfig.kexec:97
-#   Prompt: kexec handover
-#   Depends on: ARCH_SUPPORTS_KEXEC_HANDOVER [=y] && ARCH_SUPPORTS_KEXEC_FILE [=y]
-#   Location:
-#     -> General setup
-#       -> Kexec and crash features
-#         -> kexec handover (KEXEC_HANDOVER [=n])
-# Selects: MEMBLOCK_KHO_SCRATCH [=n] && KEXEC_FILE [=y] && DEBUG_FS [=y] && LIBFDT [=n] && CMA [=y]
-# 
-# 
-# 
-# Commit: 4e1d010e3bda (kexec: add config option for KHO)
-# CONFIG_KEXEC_HANDOVER is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_CRASH_DM_CRYPT b/redhat/configs/rhel/generic/CONFIG_CRASH_DM_CRYPT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_CRASH_DM_CRYPT
@@ -0,0 +1 @@
+CONFIG_CRASH_DM_CRYPT=y
diff --git a/redhat/configs/rhel/generic/CONFIG_KEXEC_HANDOVER b/redhat/configs/rhel/generic/CONFIG_KEXEC_HANDOVER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_KEXEC_HANDOVER
@@ -0,0 +1 @@
+CONFIG_KEXEC_HANDOVER=y

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924

[Patrick Talbert (via Email Bridge)]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2551287...

@baoquan_he @coxu I have updated this MR to enable both options. I hope that
was the correct thing to do.

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2556116...

I seems we don't need to deal with CONFIG_CRASH_DM_CRYPT_CONFIGS. I tried
"make dist-configs-check" which show no error. Although the generated config
files don't have CONFIG_CRASH_DM_CRYPT_CONFIGS, the .config will have
CONFIG_CRASH_DM_CRYPT_CONFIGS=y after building.

Btw, can you enable these two features for Fedora as well? I notice
redhat/configs/pending-rhel/generic/CONFIG_{CRASH_DM_CRYPT,KEXEC_HANDOVER}
still exists.

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2556116...

I seems we don't need to deal with CONFIG_CRASH_DM_CRYPT_CONFIGS. I tried
"make dist-configs-check" which show no error. Although the generated config
files don't have CONFIG_CRASH_DM_CRYPT_CONFIGS, the .config will have
CONFIG_CRASH_DM_CRYPT_CONFIGS=y when building the kernel.

Btw, can you enable these two features for Fedora as well? I notice
redhat/configs/pending-rhel/generic/CONFIG_{CRASH_DM_CRYPT,KEXEC_HANDOVER}
still exists.

[Patrick Talbert (via Email Bridge)]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2564044...

This MR removes the CONFIG_CRASH_DM_CRYPT & CONFIG_KEXEC_HANDOVER files under
`pending-rhel`.

These MRs are really just for RHEL configuration. For fedora @jmflinuxtx takes
care of that and we can let him know the recommendation is to enable them.

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2556116...

I seems we don't need to deal with CONFIG_CRASH_DM_CRYPT_CONFIGS. I tried
"make dist-configs-check" which show no error. Although the generated config
files don't have CONFIG_CRASH_DM_CRYPT_CONFIGS, the .config will have
CONFIG_CRASH_DM_CRYPT_CONFIGS=y when building the kernel.

Btw, can you enable these two features for Fedora as well? I notice
redhat/configs/pending-fedora/generic/CONFIG_{CRASH_DM_CRYPT,KEXEC_HANDOVER}
still exists.

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2564323...

Thanks for the clarification! Hi @baoquan_he can you approve this MR?

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2569546...

Hi @ptalbert if you don't mind, can you let me take care of these two configs
because I think doing it in one MR means  a bit less overall work? If you
agree, I'll send a new MR and this MR won't be needed.

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2569546...

Hi @ptalbert if you don't mind, can you let me take care of these two configs
because I think doing it in one MR means a bit less overall work for both
maintainers and reviewers? If you agree, I'll send a new MR and this MR won't
be needed.

[Patrick Talbert (via Email Bridge)]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3924#note_2569886...

@coxu that's fine. I think you should have gitlab permissions to update this
MR if there is something you want to add to it or modify.

https://docs.gitlab.com/user/project/merge_requests/#add-changes-to-a-merge-
request

But if you prefer to open a new one that is fine too.