From 2bc8a0d274256d3c973ffe20bf0023f15e4464d5 Mon Sep 17 00:00:00 2001
From: Tao Liu <ltao@redhat.com>
Date: Jan 26 2022 06:58:39 +0000
Subject: Revert "Remove trace_buf_size and trace_event from the kernel bootparameters of the kdump kernel"


upstream: fedora
conflict: none
resolves: bz2042726

commit 99de77bba7ff7668edab3da723aad7c1c8395b5f
Author: Tao Liu <ltao@redhat.com>
Date:   Fri Jan 21 16:08:47 2022 +0800

    Revert "Remove trace_buf_size and trace_event from the kernel bootparameters of the kdump kernel"

    There is a mechanism to keep memory consumption minimum, i.e. equal
    to trace_buf_size=1, until tracing by ftrace is actually started:

        tracing: keep ring buffer to minimum size till used
        https://github.com/torvalds/linux/commit/73c5162aa362a543793f4a957c6c536dcbaa89ce

    Since ftrace is usually never used in the kdump 2nd kernel, the kdump
    2nd kernel behaves in the same way with or without trace_buf_size=1.
    So the issue which the patch want to solve never exists. Let's revert
    the patch for better maintainance and avoid confusion.

    ref link: https://bugzilla.redhat.com/show_bug.cgi?id=2034501#c20

    This reverts commit f39000f.

    Signed-off-by: Tao Liu <ltao@redhat.com>
    Acked-by: Coiby Xu <coxu@redhat.com>

Signed-off-by: Tao Liu <ltao@redhat.com>

---

diff --git a/kdump-lib.sh b/kdump-lib.sh
index 325f445..4d9fed7 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -782,10 +782,6 @@ prepare_cmdline()
 		fi
 	done
 
-	# Remove trace_buf_size, trace_event
-	cmdline=$(remove_cmdline_param "$cmdline" trace_buf_size trace_event)
-	cmdline="${cmdline} trace_buf_size=1"
-
 	echo "$cmdline"
 }