From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764202AbXHTU0W (ORCPT ); Mon, 20 Aug 2007 16:26:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762695AbXHTUWW (ORCPT ); Mon, 20 Aug 2007 16:22:22 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:54456 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762816AbXHTUWU (ORCPT ); Mon, 20 Aug 2007 16:22:20 -0400 Message-Id: <20070820202146.658620557@polymtl.ca> References: <20070820201902.597091353@polymtl.ca> User-Agent: quilt/0.46-1 Date: Mon, 20 Aug 2007 16:19:07 -0400 From: Mathieu Desnoyers To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org Cc: Mathieu Desnoyers , Andi Kleen Subject: [patch 05/11] Text Edit Lock - Architecture Independent Code Content-Disposition: inline; filename=text-edit-lock-architecture-independent-code.patch X-Poly-FromMTA: (dijkstra.casi.polymtl.ca [132.207.72.10]) at Mon, 20 Aug 2007 20:21:47 +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is an architecture independant synchronization around kernel text modifications through use of a global mutex. A mutex has been chosen so that kprobes, the main user of this, can sleep during memory allocation between the memory read of the instructions it must replace and the memory write of the breakpoint. Other user of this interface: immediate values. Paravirt and alternatives are always done when SMP is inactive, so there is no need to use locks. Signed-off-by: Mathieu Desnoyers CC: Andi Kleen --- include/linux/memory.h | 7 +++++++ mm/memory.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) Index: linux-2.6-lttng/include/linux/memory.h =================================================================== --- linux-2.6-lttng.orig/include/linux/memory.h 2007-08-09 14:52:47.000000000 -0400 +++ linux-2.6-lttng/include/linux/memory.h 2007-08-09 15:22:49.000000000 -0400 @@ -86,4 +86,11 @@ extern int remove_memory_block(unsigned register_memory_notifier(&fn##_mem_nb); \ } +/* + * Take and release the kernel text modification lock, used for code patching. + * Users of this lock can sleep. + */ +extern void kernel_text_lock(void); +extern void kernel_text_unlock(void); + #endif /* _LINUX_MEMORY_H_ */ Index: linux-2.6-lttng/mm/memory.c =================================================================== --- linux-2.6-lttng.orig/mm/memory.c 2007-08-09 15:21:10.000000000 -0400 +++ linux-2.6-lttng/mm/memory.c 2007-08-09 16:38:51.000000000 -0400 @@ -50,6 +50,8 @@ #include #include #include +#include +#include #include #include @@ -84,6 +86,12 @@ EXPORT_SYMBOL(high_memory); int randomize_va_space __read_mostly = 1; +/* + * mutex protecting text section modification (dynamic code patching). + * some users need to sleep (allocating memory...) while they hold this lock. + */ +static DEFINE_MUTEX(text_mutex); + static int __init disable_randmaps(char *s) { randomize_va_space = 0; @@ -2758,3 +2766,29 @@ int access_process_vm(struct task_struct return buf - old_buf; } EXPORT_SYMBOL_GPL(access_process_vm); + +/** + * kernel_text_lock - Take the kernel text modification lock + * + * Insures mutual write exclusion of kernel and modules text live text + * modification. Should be used for code patching. + * Users of this lock can sleep. + */ +void __kprobes kernel_text_lock(void) +{ + mutex_lock(&text_mutex); +} +EXPORT_SYMBOL_GPL(kernel_text_lock); + +/** + * kernel_text_unlock - Release the kernel text modification lock + * + * Insures mutual write exclusion of kernel and modules text live text + * modification. Should be used for code patching. + * Users of this lock can sleep. + */ +void __kprobes kernel_text_unlock(void) +{ + mutex_unlock(&text_mutex); +} +EXPORT_SYMBOL_GPL(kernel_text_unlock); -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68