Re: [Adeos-main] [PATCH] clean up latest ipipe-tracing changes

[Jan Kiszka <jan.kiszka@domain.hid>]

[-- Attachment #1.1: Type: text/plain, Size: 1026 bytes --]

Philippe Gerum wrote:
> Jan Kiszka wrote:
>> Hi,
>>
>> here is a suggestion to do a tiny cleanup of Gilles' cpuid-fix for the
>> tracer. Sorry that I didn't comment on this earlier. Nothing critical
>> though.
>>
>> I think it's better to drag the include/linux/compiler.h changes into
>> the main patch instead of starting to use
>> __attribute__((no_instrument_function)) all over the place just to avoid
>> notrace (especially as I expect that Ingo's tracer will get merged
>> anyway in the future). Moreover, local_irq_restore_hw_notrace & frieds
>> are available even for !CONFIG_IPIPE_TRACE, so no need to differentiate
>> here. Finally, I do not see a need for marking a static inline function
>> non-traced.
>>
>> The patch does not seem to produce different binary code (I checked
>> kernel/ipipe/tracer.o) - as expected.
>>
> 
> Applied, leaving the ipipe_processor_id() unchanged though. Thanks.
> 

I still think this makes more sense :) (otherwise, at least switch to
"notrace").

Jan

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: tracer-cleanup2.patch --]
[-- Type: text/x-patch; name="tracer-cleanup2.patch", Size: 748 bytes --]

Index: linux-2.6.16-ipipe/include/asm-i386/ipipe.h
===================================================================
--- linux-2.6.16-ipipe.orig/include/asm-i386/ipipe.h
+++ linux-2.6.16-ipipe/include/asm-i386/ipipe.h
@@ -97,11 +97,11 @@
 #define IPIPE_CRITICAL_VECTOR  0xf9	/* Used by ipipe_critical_enter/exit() */
 #define IPIPE_CRITICAL_IPI     (IPIPE_CRITICAL_VECTOR - FIRST_EXTERNAL_VECTOR)
 
-static inline __attribute__((no_instrument_function)) int ipipe_processor_id(void)
-{
-	extern int (*__ipipe_logical_cpuid)(void);
-	return __ipipe_logical_cpuid();
-}
+#define ipipe_processor_id() \
+({ \
+	extern int (*__ipipe_logical_cpuid)(void); \
+	__ipipe_logical_cpuid(); \
+})
 
 extern u8 __ipipe_apicid_2_cpu[];
 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]