From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1755806AbZE2B11@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755806AbZE2B11 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 28 May 2009 21:27:27 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753312AbZE2B1U
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 28 May 2009 21:27:20 -0400
Received: from ozlabs.org ([203.10.76.45]:47271 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752471AbZE2B1T (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 28 May 2009 21:27:19 -0400
From: Rusty Russell <rusty@rustcorp.com.au>
To: Amerigo Wang <amwang@redhat.com>
Subject: Re: [Patch 4/4] module: trim exception table in module_free()
Date: Thu, 28 May 2009 16:25:23 +0930
User-Agent: KMail/1.11.2 (Linux/2.6.28-11-generic; KDE/4.2.2; i686; ; )
Cc: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org,
       akpm@linux-foundation.org, jdike@addtoit.com, mingo@elte.hu,
       sparclinux@vger.kernel.org, linux-ia64@vger.kernel.org
References: <20090526083717.5050.32719.sendpatchset@localhost.localdomain> <200905271453.51914.rusty@rustcorp.com.au> <4A1CEFC3.2010309@redhat.com>
In-Reply-To: <4A1CEFC3.2010309@redhat.com>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <200905281625.24974.rusty@rustcorp.com.au>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 27 May 2009 05:16:11 pm Amerigo Wang wrote:
> Rusty Russell wrote:
> > __ex_table ends up with two entries:
> >
> > Contents of section __ex_table:
> >  0000 0c000000 00000000 0e000000 00000000  ................
> >  0010 10000000 0a000000 12000000 0a000000  ................
> >
> > The first is for the __put_user in .text (extable_not_init()) and the
> > second is for the one in .init.text (init()).
> >
> > Depending on how the module gets allocated, the one referring to
> > .init.text may be first or last.
>
> Hmm, how about the following? :-)
>
> struct exception_table_entry *p = mod->extable;
>
> for (;p <= mod->extable+mod->num_exentries; p++ )
>          if (with_in_module_init(p->insn, mod))
>                    trim_it(p);

More like this:

void trim_init_extable(struct module *m)
{
	/* Since entries are sorted, init entries are at the start... */
	while (m->num_exentries && within_module_init(m->extable[0].insn)) {
		m->extable++;
		m->num_exentries--;
	}

	/* ... or the end. */
	while (m->num_exentries && within_module_init(m->extable[m->num_exentries-1].insn))
		m->num_exentries--;
}

Cheers,
Rusty.