From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528AbcFCKc4 (ORCPT ); Fri, 3 Jun 2016 06:32:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38396 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbcFCKcz (ORCPT ); Fri, 3 Jun 2016 06:32:55 -0400 Date: Fri, 3 Jun 2016 11:32:51 +0100 From: "Dr. David Alan Gilbert" To: ak@linux.intel.com Cc: linux-kernel@vger.kernel.org Subject: trace name copy/paste in native_write_msr ? Message-ID: <20160603103250.GC2265@work-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 03 Jun 2016 10:32:54 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andi, In arch/x86/include/asm/msr.h native_write_msr(_safe) you added a trace test in 7f47d8cc, should the tracepoint_active's be testing for __tracepoint_write_msr ? /* Can be uninlined because referenced by paravirt */ notrace static inline void native_write_msr(unsigned int msr, unsigned low, unsigned high) { asm volatile("1: wrmsr\n" "2:\n" _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe) : : "c" (msr), "a"(low), "d" (high) : "memory"); if (msr_tracepoint_active(__tracepoint_read_msr)) <--------------- do_trace_write_msr(msr, ((u64)high << 32 | low), 0); } /* Can be uninlined because referenced by paravirt */ notrace static inline int native_write_msr_safe(unsigned int msr, unsigned low, unsigned high) { int err; asm volatile("2: wrmsr ; xor %[err],%[err]\n" "1:\n\t" ".section .fixup,\"ax\"\n\t" "3: mov %[fault],%[err] ; jmp 1b\n\t" ".previous\n\t" _ASM_EXTABLE(2b, 3b) : [err] "=a" (err) : "c" (msr), "0" (low), "d" (high), [fault] "i" (-EIO) : "memory"); if (msr_tracepoint_active(__tracepoint_read_msr)) <--------------- do_trace_write_msr(msr, ((u64)high << 32 | low), err); return err; } Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK