x86/oprofile: remove compat accessors usage from backtrace

Remove the unneeded usage of the compat layer to copy frame pointers
from guest address space. Instead just use raw_copy_from_guest.

While there change the accessibility check of one frame_head beyond to
be performed as part of the copy, like it's done in the Linux code in
5.11 and earlier versions. Note it's unclear why this is needed.

Also drop the explicit truncation of the head pointer in the 32bit
case as all callers already pass a zero extended value. The first
value being rsp from the guest registers, and further calls will use
ebp from frame_head_32bit struct.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Roger Pau Monné authored and Jan Beulich committed 2021-04-29 16:05:00 +02:00
1 parent 9a5071e80b
commit 39e7a94273
1 file changed
+11 -30
+11 -30
View File
@@ -20,7 +20,6 @@ struct __packed frame_head {
unsigned long ret;
};
typedef struct frame_head frame_head_t;
DEFINE_XEN_GUEST_HANDLE(frame_head_t);
struct __packed frame_head_32bit {
uint32_t ebp;
@@ -43,7 +42,6 @@ dump_hypervisor_backtrace(struct vcpu *vcpu, const struct frame_head *head,
return head->ebp;
}
#ifdef CONFIG_COMPAT
static inline int is_32bit_vcpu(struct vcpu *vcpu)
{
if (is_hvm_vcpu(vcpu))
@@ -51,52 +49,35 @@ static inline int is_32bit_vcpu(struct vcpu *vcpu)
else
return is_pv_32bit_vcpu(vcpu);
}
#endif
static struct frame_head *
dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head,
int mode)
{
frame_head_t bufhead;
/* Also check accessibility of one struct frame_head beyond. */
frame_head_t bufhead[2];
#ifdef CONFIG_COMPAT
if ( is_32bit_vcpu(vcpu) )
{
DEFINE_COMPAT_HANDLE(frame_head32_t);
__compat_handle_const_frame_head32_t guest_head =
{ .c = (unsigned long)head };
frame_head32_t bufhead32;
frame_head32_t bufhead32[2];
/* Also check accessibility of one struct frame_head beyond */
if (!compat_handle_okay(guest_head, 2))
return 0;
if (__copy_from_compat(&bufhead32, guest_head, 1))
return 0;
bufhead.ebp = (struct frame_head *)(unsigned long)bufhead32.ebp;
bufhead.ret = bufhead32.ret;
}
else
#endif
{
XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head =
const_guest_handle_from_ptr(head, frame_head_t);
/* Also check accessibility of one struct frame_head beyond */
if (!guest_handle_okay(guest_head, 2))
return 0;
if (__copy_from_guest(&bufhead, guest_head, 1))
if ( raw_copy_from_guest(bufhead32, head, sizeof(bufhead32)) )
return 0;
bufhead[0].ebp = (struct frame_head *)(unsigned long)bufhead32[0].ebp;
bufhead[0].ret = bufhead32[0].ret;
}
else if ( raw_copy_from_guest(bufhead, head, sizeof(bufhead)) )
return 0;
if (!xenoprof_add_trace(vcpu, bufhead.ret, mode))
if ( !xenoprof_add_trace(vcpu, bufhead[0].ret, mode) )
return 0;
/* frame pointers should strictly progress back up the stack
* (towards higher addresses) */
if (head >= bufhead.ebp)
if ( head >= bufhead[0].ebp )
return NULL;
return bufhead.ebp;
return bufhead[0].ebp;
}
/*
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.