| Message ID | 1626680047-57306-1-git-send-email-zhangshaokun@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: SSBS/DIT: print SSBS and DIT bit when printing PSTATE | expand |
On 7/19/21 8:34 AM, Shaokun Zhang wrote: > From: Lingyan Huang <huanglingyan2@huawei.com> > > The current code to print PSTATE when generating backtraces does not include > SSBS bit and DIT bit, so add this information. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Signed-off-by: Lingyan Huang <huanglingyan2@huawei.com> > Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> > --- > arch/arm64/kernel/process.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c > index c8989b999250..93de6586e0f8 100644 > --- a/arch/arm64/kernel/process.c > +++ b/arch/arm64/kernel/process.c > @@ -179,7 +179,7 @@ static void print_pstate(struct pt_regs *regs) > const char *btype_str = btypes[(pstate & PSR_BTYPE_MASK) >> > PSR_BTYPE_SHIFT]; > > - printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO %cTCO BTYPE=%s)\n", > + printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO %cTCO %cDIT %cSSBS BTYPE=%s)\n", > pstate, > pstate & PSR_N_BIT ? 'N' : 'n', > pstate & PSR_Z_BIT ? 'Z' : 'z', > @@ -192,6 +192,8 @@ static void print_pstate(struct pt_regs *regs) > pstate & PSR_PAN_BIT ? '+' : '-', > pstate & PSR_UAO_BIT ? '+' : '-', > pstate & PSR_TCO_BIT ? '+' : '-', > + pstate & PSR_DIT_BIT ? '+' : '-', > + pstate & PSR_SSBS_BIT ? '+' : '-', > btype_str); > } > } > Don't you need to update compat_user_mode(regs) case for completeness? Cheers Vladimir
Hi Vladimir, On 2021/7/19 18:45, Vladimir Murzin wrote: > On 7/19/21 8:34 AM, Shaokun Zhang wrote: >> From: Lingyan Huang <huanglingyan2@huawei.com> >> >> The current code to print PSTATE when generating backtraces does not include >> SSBS bit and DIT bit, so add this information. >> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will@kernel.org> >> Signed-off-by: Lingyan Huang <huanglingyan2@huawei.com> >> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> >> --- >> arch/arm64/kernel/process.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c >> index c8989b999250..93de6586e0f8 100644 >> --- a/arch/arm64/kernel/process.c >> +++ b/arch/arm64/kernel/process.c >> @@ -179,7 +179,7 @@ static void print_pstate(struct pt_regs *regs) >> const char *btype_str = btypes[(pstate & PSR_BTYPE_MASK) >> >> PSR_BTYPE_SHIFT]; >> >> - printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO %cTCO BTYPE=%s)\n", >> + printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO %cTCO %cDIT %cSSBS BTYPE=%s)\n", >> pstate, >> pstate & PSR_N_BIT ? 'N' : 'n', >> pstate & PSR_Z_BIT ? 'Z' : 'z', >> @@ -192,6 +192,8 @@ static void print_pstate(struct pt_regs *regs) >> pstate & PSR_PAN_BIT ? '+' : '-', >> pstate & PSR_UAO_BIT ? '+' : '-', >> pstate & PSR_TCO_BIT ? '+' : '-', >> + pstate & PSR_DIT_BIT ? '+' : '-', >> + pstate & PSR_SSBS_BIT ? '+' : '-', >> btype_str); >> } >> } >> > > Don't you need to update compat_user_mode(regs) case for completeness? Good catch, will fix it in next version. Thanks, Shaokun > > Cheers > Vladimir > . >
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index c8989b999250..93de6586e0f8 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -179,7 +179,7 @@ static void print_pstate(struct pt_regs *regs) const char *btype_str = btypes[(pstate & PSR_BTYPE_MASK) >> PSR_BTYPE_SHIFT]; - printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO %cTCO BTYPE=%s)\n", + printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO %cTCO %cDIT %cSSBS BTYPE=%s)\n", pstate, pstate & PSR_N_BIT ? 'N' : 'n', pstate & PSR_Z_BIT ? 'Z' : 'z', @@ -192,6 +192,8 @@ static void print_pstate(struct pt_regs *regs) pstate & PSR_PAN_BIT ? '+' : '-', pstate & PSR_UAO_BIT ? '+' : '-', pstate & PSR_TCO_BIT ? '+' : '-', + pstate & PSR_DIT_BIT ? '+' : '-', + pstate & PSR_SSBS_BIT ? '+' : '-', btype_str); } }