-----Original Message----- From: Kairui Song <kasong(a)redhat.com&gt; Sent: Thursday, June 11, 2020 11:54 AM To: Onitsuka, Shinichi/鬼束 伸一 <onitsuka.shinic(a)fujitsu.com&gt; Cc: piliu <piliu(a)redhat.com>; kexec(a)lists.fedoraproject.org Subject: Re: [PATCH v4 0/4] /etc/kdump/{pre.d,post.d} interface to set up multiple binary and script files Hi, On Wed, Jun 10, 2020 at 12:56 PM onitsuka.shinic(a)fujitsu.com <onitsuka.shinic(a)fujitsu.com&gt; wrote: > > > -----Original Message----- > > From: piliu <piliu(a)redhat.com&gt; > > Sent: Monday, June 8, 2020 11:28 PM > > To: Onitsuka, Shinichi/鬼束 伸一 <onitsuka.shinic(a)fujitsu.com>; kexec(a)lists.fedoraproject.org; Kairui Song > > <kasong(a)redhat.com&gt; > > Subject: Re: [PATCH v4 0/4] /etc/kdump/{pre.d,post.d} interface to set up multiple binary and script files > > > > > > > > On 06/05/2020 10:21 AM, onitsuka.shinic(a)fujitsu.com wrote: > > > There is restriction on kdump_pre and kdump_post directives now that can be > > > specified only once in /etc/kdump.conf. > > > However, there are multiple components that need to use the directives. > > > > > > This patch implements /etc/kdump/{pre.d,post.d} interface to set up multiple > > > binary and script files. > > > > > > For example, users put multiple binary and script files under > > > /etc/kdump/pre.d directory as below: > > > > > > # find /etc/kdump/pre.d > > > /etc/kdump/pre.d/50-foo.sh > > > /etc/kdump/pre.d/75-hoge.sh > > > > > > Then, 50-foo.sh and 75-hoge.sh are executed in order before kdump dump process > > > begins just like kdump_pre directive written in /etc/kdump.conf. > > > > > > This is composed of the following four patches created based on > > > commit 8fcbb4d265f6f7948081ecd88cccbb1d6548c449. > > Do you mean 8fcbb4d265f6 ("fadump: update fadump-howto.txt with some > > more troubleshooting help") ? > > Thank you for your cooperation. > The above commit is the most newer commit by my local master branch (cloned on June 4). > Therefore, "PATCH v4 1/4"(patch of dracut-module-setup.sh) is created based on > commit 0cc3b85d0d4c88c11e48229a76eb24c7d49f9748. > > $ git log --stat > commit 8fcbb4d265f6f7948081ecd88cccbb1d6548c449 > Author: Hari Bathini <hbathini(a)linux.ibm.com&gt; > Date: Tue May 19 20:19:15 2020 +0530 > > fadump: update fadump-howto.txt with some more troubleshooting help > > On journaling filesystems like XFS, bootloader is likely to pick up > older initrd (without vmcore capture scripts) if system crashes right > after initrd update, as the bootloader (read GRUB) may not replay > filesystem log before reading the initrd from disk. Added steps to > workaround that problem. > > Signed-off-by: Hari Bathini <hbathini(a)linux.ibm.com&gt; > Acked-by: Pingfan Liu <piliu(a)redhat.com&gt; > > fadump-howto.txt | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > commit 47bdeee35d35cec5e0e843aeb36bd0b5aec595c4 > Author: Pingfan Liu <piliu(a)redhat.com&gt; > Date: Wed Jun 3 10:53:25 2020 +0800 > > fadump-howto.txt: source it in spec file > > Signed-off-by: Pingfan Liu <piliu(a)redhat.com&gt; > Acked-by: Kairui Song <kasong(a)redhat.com&gt; > > kexec-tools.spec | 3 +++ > 1 file changed, 3 insertions(+) > > commit 134c578463aface9543cba16532cbac3e3ff2da7 > Author: Kairui Song <kasong(a)redhat.com&gt; > Date: Sun May 17 16:14:06 2020 +0800 > > Don't inherit swiotlb parameter form 1st kernel by default > > Usually kdump kernel don't need a swiotlb. There are two cases known > common case a swiotlb is needed: > > - SEV/SME is active. > - crashkernel high reservation is used, or there are crashkernel memory > above 4G. > > For both case, if swiotlb is set to a large value in first kernel, kdump > kernel will likely to fail with OOM. So don't inherit swiotlb parameter > by default. > > Signed-off-by: Kairui Song <kasong(a)redhat.com&gt; > Acked-by: Pingfan Liu <piliu(a)redhat.com&gt; > > kdump.sysconfig | 2 +- > kdump.sysconfig.aarch64 | 2 +- > kdump.sysconfig.i386 | 2 +- > kdump.sysconfig.ppc64 | 2 +- > kdump.sysconfig.ppc64le | 2 +- > kdump.sysconfig.s390x | 2 +- > kdump.sysconfig.x86_64 | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > commit 0cc3b85d0d4c88c11e48229a76eb24c7d49f9748 > Author: Kairui Song <kasong(a)redhat.com&gt; > Date: Thu May 28 02:20:20 2020 +0800 > > module-setup.sh: Add "rd.neednet" parameter if network is needed > > Upstream dracut now use network-manager module by default and since > upstream commit 3dcaa97, network-manager expects user to pass "rd.neednet" > to indicate network is required. > > Signed-off-by: Kairui Song <kasong(a)redhat.com&gt; > Acked-by: Dave Young <dyoung(a)redhat.com&gt; > > dracut-module-setup.sh | 5 +++++ > 1 file changed, 5 insertions(+) > > Isn't commit 0cc3b85d0d4c88c11e48229a76eb24c7d49f9748 > the most newer commit with dracut-module-setup.sh modified? > > Best Regards, > Shinichi Onitsuka > > > > > I tried to apply 1/4, but failed with > > Applying: dracut-module-setup.sh: Install files under > > /etc/kdump/{pre.d,post.d} into kdump initramfs > > .git/rebase-apply/patch:13: trailing whitespace. > > # install etc/kdump/pre.d and /etc/kdump/post.d > > .git/rebase-apply/patch:14: trailing whitespace. > > kdump_install_pre_post_conf() { > > .git/rebase-apply/patch:15: trailing whitespace. > > if [ -d /etc/kdump/pre.d ]; then > > .git/rebase-apply/patch:16: trailing whitespace. > > for file in /etc/kdump/pre.d/*; do > > .git/rebase-apply/patch:17: trailing whitespace. > > if [ -x "$file" ]; then > > error: patch failed: dracut-module-setup.sh:427 > > error: dracut-module-setup.sh: patch does not apply > > Patch failed at 0001 dracut-module-setup.sh: Install files under > > /etc/kdump/{pre.d,post.d} into kdump initramfs > > The copy of the patch that failed is found in: .git/rebase-apply/patch > > When you have resolved this problem, run "git am --continue". > > If you prefer to skip this patch, run "git am --skip" instead. > > To restore the original branch and stop patching, run "git am --abort". > > > > I think maintainer is also busy on other topic, not sure if he is > > willing to resolve it by manual. > > > > Except this issue, for the series's code part, > > Acked-by: Pingfan Liu <piliu(a)redhat.com&gt; > > No need to worry about the conflict, it was easily resolved, this patch looks good.

-- Best Regards, Kairui Song