From: Mike Travis <travis@sgi.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>,
Jason Wessel <jason.wessel@windriver.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
Dimitri Sivanich <sivanich@sgi.com>, Hedi Berriche <hedi@sgi.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] PATCH: KGDB/KDB Fix no KDB config problem.
Date: Thu, 03 Oct 2013 10:04:01 -0700 [thread overview]
Message-ID: <524DA381.2050108@sgi.com> (raw)
In-Reply-To: <20131003165122.GB32755@gmail.com>
On 10/3/2013 9:51 AM, Ingo Molnar wrote:
>
> * Mike Travis <travis@sgi.com> wrote:
>
>> Some code added to the debug_core module had KDB dependencies
>> that it shouldn't have.
>>
>> Signed-off-by: Mike Travis <travis@sgi.com>
>> ---
>> kernel/debug/debug_core.c | 8 ++++----
>> kernel/debug/debug_core.h | 2 ++
>> 2 files changed, 6 insertions(+), 4 deletions(-)
>>
>> --- linux.orig/kernel/debug/debug_core.c
>> +++ linux/kernel/debug/debug_core.c
>> @@ -575,8 +575,8 @@ return_normal:
>> raw_spin_lock(&dbg_slave_lock);
>>
>> #ifdef CONFIG_SMP
>> - /* If SYSTEM_NMI, slaves are already waiting */
>> - if (ks->err_code == KDB_REASON_SYSTEM_NMI)
>> + /* If send_ready set, slaves are already waiting */
>> + if (ks->send_ready)
>> atomic_set(ks->send_ready, 1);
>>
>> /* Signal the other CPUs to enter kgdb_wait() */
>> @@ -682,11 +682,11 @@ kgdb_handle_exception(int evector, int s
>> if (arch_kgdb_ops.enable_nmi)
>> arch_kgdb_ops.enable_nmi(0);
>>
>> + memset(ks, 0, sizeof(struct kgdb_state));
>> ks->cpu = raw_smp_processor_id();
>> ks->ex_vector = evector;
>> ks->signo = signo;
>> ks->err_code = ecode;
>> - ks->kgdb_usethreadid = 0;
>> ks->linux_regs = regs;
>>
>> if (kgdb_reenter_check(ks))
>> @@ -750,7 +750,7 @@ int kgdb_nmicallin(int cpu, int trapnr,
>> ks->cpu = cpu;
>> ks->ex_vector = trapnr;
>> ks->signo = SIGTRAP;
>> - ks->err_code = KDB_REASON_SYSTEM_NMI;
>> + ks->err_code = KGDB_KDB_REASON_SYSTEM_NMI;
>> ks->linux_regs = regs;
>> ks->send_ready = send_ready;
>> kgdb_cpu_enter(ks, regs, DCPU_WANT_MASTER);
>> --- linux.orig/kernel/debug/debug_core.h
>> +++ linux/kernel/debug/debug_core.h
>> @@ -75,11 +75,13 @@ extern int kdb_stub(struct kgdb_state *k
>> extern int kdb_parse(const char *cmdstr);
>> extern int kdb_common_init_state(struct kgdb_state *ks);
>> extern int kdb_common_deinit_state(void);
>> +#define KGDB_KDB_REASON_SYSTEM_NMI KDB_REASON_SYSTEM_NMI
>> #else /* ! CONFIG_KGDB_KDB */
>> static inline int kdb_stub(struct kgdb_state *ks)
>> {
>> return DBG_PASS_EVENT;
>> }
>> +#define KGDB_KDB_REASON_SYSTEM_NMI 0
>> #endif /* CONFIG_KGDB_KDB */
>>
>> #endif /* _DEBUG_CORE_H_ */
>
> Hm, the KGDB_KDB_REASON_SYSTEM_NMI definition is a bit ugly. I still think
> there are layering violations here and just kludging it around doesn't
> solve it - a helper function that keeps kgdb details to the kgdb code
> would.
>
> Anyway, if Jason is fine with this solution and upholds his Acked-by then
> I'll merge this into the first patch and apply the two patches.
>
> Thanks,
>
> Ingo
>
Would you prefer a simple #ifdef CONFIG_KGDB_KDB around the assignment?
next prev parent reply other threads:[~2013-10-03 17:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-03 16:38 [PATCH 0/1] PATCH: KGDB/KDB Fix no KDB config problem Mike Travis
2013-10-03 16:38 ` [PATCH 1/1] " Mike Travis
2013-10-03 16:51 ` Ingo Molnar
2013-10-03 17:04 ` Mike Travis [this message]
2013-10-03 17:15 ` Ingo Molnar
2013-10-03 17:53 ` Mike Travis
2013-10-03 17:58 ` Mike Travis
2013-10-04 6:30 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=524DA381.2050108@sgi.com \
--to=travis@sgi.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=akpm@linux-foundation.org \
--cc=hedi@sgi.com \
--cc=hpa@zytor.com \
--cc=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=sivanich@sgi.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).