From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755136Ab0IVP3j (ORCPT ); Wed, 22 Sep 2010 11:29:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34197 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753788Ab0IVP3i (ORCPT ); Wed, 22 Sep 2010 11:29:38 -0400 Date: Wed, 22 Sep 2010 11:28:34 -0400 From: Jason Baron To: Mathieu Desnoyers Cc: Andi Kleen , rusty@rustcorp.co.au, rostedt@goodmis.com, linux-kernel@vger.kernel.org, mingo@elte.hu, hpa@zytor.com, tglx@linutronix.de, roland@redhat.com, rth@redhat.com, mhiramat@redhat.com, fweisbec@gmail.com, avi@redhat.com, davem@davemloft.net, vgoyal@redhat.com, sam@ravnborg.org, tony@bakeyournoodle.com, Andi Kleen Subject: Re: [PATCH 2/2] Rewrite jump_label.c to use binary search Message-ID: <20100922152833.GD2816@redhat.com> References: <1285150102-5506-1-git-send-email-andi@firstfloor.org> <1285150102-5506-2-git-send-email-andi@firstfloor.org> <20100922113114.GA14179@Krystal> <4a8f3ad8416ed61cba1746883da1f839.squirrel@www.firstfloor.org> <589c3dd38437c80704d8224523efbccc.squirrel@www.firstfloor.org> <20100922150250.GB4897@Krystal> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100922150250.GB4897@Krystal> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 22, 2010 at 11:02:50AM -0400, Mathieu Desnoyers wrote: > * Andi Kleen (andi@firstfloor.org) wrote: > > > > > > > >>> + for (; entry < stop && entry->key == key; entry++) > > >>> + if (kernel_text_address(entry->code)) > > >> > > >> This does not work for modules I'm afraid, only for the core kernel. You > > >> should test for __module_text_address() somewhere. > > > > > > I thought it was shared now, but ok. > > > > Double checked. This is ok because kernel_text_address() > > already checks for modules. You were probably thinking > > of __kernel_text_address() > > Ah right, > > Although we have another problem: > > __module_text_address() includes module init text, which defeats the > purpose of the check put in there by Jason. > > So the check works for the core kernel, but not for modules. > > Mathieu > it works for modules too...it does: struct module *__module_text_address(unsigned long addr) { struct module *mod = __module_address(addr); if (mod) { /* Make sure it's within the text section. */ if (!within(addr, mod->module_init, mod->init_text_size) && !within(addr, mod->module_core, mod->core_text_size)) mod = NULL; } return mod; } and then in kernel/module.c we have : module_free(mod, mod->module_init); mod->module_init = NULL; So, I was relying on the fact module_init gets set to NULL after the free happens. However, there a small race there in that the vfree() happens before module_init() is set to NULL. So that is probably most easily fixed be wrapping those two lines with the jump_label_mutex. thanks, -Jason