[PATCH] ppc64le: replace kernel cmdline maxcpu=1 with nr_cpus=1

[Sourabh Jain]

With patch series [1], PowerPC supports nr_cpus=1,
so use nr_cpus=1 instead of maxcpu=1 in the kdump environment.

Note this changes is dependent on kernel changes [1]

[1] https://lore.kernel.org/all/170800202447.601034.7290612623478478380.b4-ty@el...

Signed-off-by: Sourabh Jain 
Cc: Hari Bathini 
Cc: Mahesh Salgaonkar 
---
 gen-kdump-sysconfig.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen-kdump-sysconfig.sh b/gen-kdump-sysconfig.sh
index 4a28350..78b0bb7 100755
--- a/gen-kdump-sysconfig.sh
+++ b/gen-kdump-sysconfig.sh
@@ -92,7 +92,7 @@ ppc64le)
    update_param KDUMP_COMMANDLINE_REMOVE \
    	"hugepages hugepagesz slub_debug quiet log_buf_len swiotlb hugetlb_cma ignition.firstboot"
    update_param KDUMP_COMMANDLINE_APPEND \
-		"irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
+		"irqpoll nr_cpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
    ;;
 s390x)
    update_param KEXEC_ARGS "-s"

[Pingfan Liu]

On Wed, Feb 28, 2024 at 10:51:15PM +0530, Sourabh Jain wrote:
> With patch series [1], PowerPC supports nr_cpus=1,
> so use nr_cpus=1 instead of maxcpu=1 in the kdump environment.
>
> Note this changes is dependent on kernel changes [1]
>
> [1] https://lore.kernel.org/all/170800202447.601034.7290612623478478380.b4-ty(a)...
>
> Signed-off-by: Sourabh Jain 
> Cc: Hari Bathini 
> Cc: Mahesh Salgaonkar
>
> gen-kdump-sysconfig.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gen-kdump-sysconfig.sh b/gen-kdump-sysconfig.sh
> index 4a28350..78b0bb7 100755
> --- a/gen-kdump-sysconfig.sh
> +++ b/gen-kdump-sysconfig.sh
> @@ -92,7 +92,7 @@ ppc64le)
>    update_param KDUMP_COMMANDLINE_REMOVE \
>    	"hugepages hugepagesz slub_debug quiet log_buf_len swiotlb hugetlb_cma ignition.firstboot"
>    update_param KDUMP_COMMANDLINE_APPEND \
> "irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
> "irqpoll nr_cpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"

Acked-by: Pingfan Liu

@Coiby, the related kernel commit is in linux tree now, and will be in
6.9-rc1. This patch can be safely applied after the Fedora kernel is
rebased on that version. Otherwise, the CKI test will oops.
> ;;
>  s390x)
>    update_param KEXEC_ARGS "-s"
> -- 
> 2.43.0

[Sourabh Jain]

On 20/03/24 11:23, Pingfan Liu wrote:
> On Wed, Feb 28, 2024 at 10:51:15PM +0530, Sourabh Jain wrote:
> > With patch series [1], PowerPC supports nr_cpus=1,
> > so use nr_cpus=1 instead of maxcpu=1 in the kdump environment.
> >
> > Note this changes is dependent on kernel changes [1]
> >
> > [1] https://lore.kernel.org/all/170800202447.601034.7290612623478478380.b4-ty(a)...
> >
> > Signed-off-by: Sourabh Jain 
> > Cc: Hari Bathini 
> > Cc: Mahesh Salgaonkar
> >
> > gen-kdump-sysconfig.sh | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/gen-kdump-sysconfig.sh b/gen-kdump-sysconfig.sh
> > index 4a28350..78b0bb7 100755
> > --- a/gen-kdump-sysconfig.sh
> > +++ b/gen-kdump-sysconfig.sh
> > @@ -92,7 +92,7 @@ ppc64le)
> >    update_param KDUMP_COMMANDLINE_REMOVE \
> >    	"hugepages hugepagesz slub_debug quiet log_buf_len swiotlb hugetlb_cma ignition.firstboot"
> >    update_param KDUMP_COMMANDLINE_APPEND \
> > "irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
> > "irqpoll nr_cpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
>
> Acked-by: Pingfan Liu
>
> @Coiby, the related kernel commit is in linux tree now, and will be in
> 6.9-rc1. This patch can be safely applied after the Fedora kernel is
> rebased on that version. Otherwise, the CKI test will oops.

Thanks Pingfan.

- Sourabh Jain
> > ;;
> >   s390x)
> >    update_param KEXEC_ARGS "-s"
> > -- 
> > 2.43.0

[Coiby Xu]

On Wed, Mar 20, 2024 at 01:53:19PM +0800, Pingfan Liu wrote:
> On Wed, Feb 28, 2024 at 10:51:15PM +0530, Sourabh Jain wrote:
> > With patch series [1], PowerPC supports nr_cpus=1,
> > so use nr_cpus=1 instead of maxcpu=1 in the kdump environment.
> >
> > Note this changes is dependent on kernel changes [1]
> >
> > [1] https://lore.kernel.org/all/170800202447.601034.7290612623478478380.b4-ty(a)...
> >
> > Signed-off-by: Sourabh Jain 
> > Cc: Hari Bathini 
> > Cc: Mahesh Salgaonkar
> >
> > gen-kdump-sysconfig.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/gen-kdump-sysconfig.sh b/gen-kdump-sysconfig.sh
> > index 4a28350..78b0bb7 100755
> > --- a/gen-kdump-sysconfig.sh
> > +++ b/gen-kdump-sysconfig.sh
> > @@ -92,7 +92,7 @@ ppc64le)
> >    update_param KDUMP_COMMANDLINE_REMOVE \
> >    	"hugepages hugepagesz slub_debug quiet log_buf_len swiotlb hugetlb_cma ignition.firstboot"
> >    update_param KDUMP_COMMANDLINE_APPEND \
> > "irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
> > "irqpoll nr_cpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10 kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd hugetlb_cma=0"
>
> Acked-by: Pingfan Liu
>
> @Coiby, the related kernel commit is in linux tree now, and will be in
> 6.9-rc1. This patch can be safely applied after the Fedora kernel is
> rebased on that version. Otherwise, the CKI test will oops.

The patch has been merged, thanks!