[PATCH v5 2/3] kprobes: copy ainsn after alloc aggr kprobe

[Wang Nan]

On 2014/8/28 17:39, Masami Hiramatsu wrote:
> (2014/08/27 22:02), Wang Nan wrote:
>> Copy old kprobe to newly alloced optimized_kprobe before
>> arch_prepare_optimized_kprobe(). Original kprove can brings more
>> information to optimizer.
>>
>> Signed-off-by: Wang Nan <wangnan0 at huawei.com>
>> Cc: Russell King <linux at arm.linux.org.uk>
>> Cc: "David A. Long" <dave.long at linaro.org> 
>> Cc: Jon Medhurst <tixy at linaro.org>
>> Cc: Taras Kondratiuk <taras.kondratiuk at linaro.org>
>> Cc: Ben Dooks <ben.dooks at codethink.co.uk>
>> Cc: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
>> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy at intel.com>
>> Cc: "David S. Miller" <davem at davemloft.net>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt at hitachi.com>
>> Cc: Will Deacon <will.deacon at arm.com>
>> ---
>>  kernel/kprobes.c | 7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
>> index 3995f54..33cf568 100644
>> --- a/kernel/kprobes.c
>> +++ b/kernel/kprobes.c
>> @@ -730,7 +730,12 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
>>  		return NULL;
>>  
>>  	INIT_LIST_HEAD(&op->list);
>> -	op->kp.addr = p->addr;
> 
> Do not remove this, since copy_kprobe() doesn't copy kp.addr.
> 
> static inline void copy_kprobe(struct kprobe *ap, struct kprobe *p)
> {
>         memcpy(&p->opcode, &ap->opcode, sizeof(kprobe_opcode_t));
>         memcpy(&p->ainsn, &ap->ainsn, sizeof(struct arch_specific_insn));
> }
> 
> Thank you,
> 

It is my fault. I'll fix it in next version.

Thank you for your comment!

>> +
>> +	/*
>> +	 * copy gives arch_prepare_optimized_kprobe
>> +	 * more information
>> +	 */
>> +	copy_kprobe(p, &op->kp);
>>  	arch_prepare_optimized_kprobe(op);
>>  
>>  	return &op->kp;
>>
> 
>