Add __init attribute on a function that is only called from other __init
functions and that is not inlined.
The complete semantic patch used to detect the need for this change is
below (http://coccinelle.lip6.fr/). This semantic patch checks for local
static non-init functions that are called from an __init function and are
not called from any other function.
<smpl>
@initialize:ocaml@
@@
let itbl = Hashtbl.create 101
let ltbl = Hashtbl.create 101
let thefile = ref ""
let hashadd t k =
let cell =
try Hashtbl.find t k
with Not_found ->
let cell = ref 0 in
Hashtbl.add t k cell;
cell in
cell := !cell + 1
let hashget t k = try !(Hashtbl.find t k) with Not_found -> 0
let seen = ref []
@script:ocaml@
@@
(let file = List.hd (Coccilib.files()) in
thefile := file;
let file =
try List.hd(List.tl (Str.split (Str.regexp "/linux-next/") file))
with _ -> file in
let ofile = "/var/julia/linux-next/" ^
(Filename.chop_extension file) ^ ".o" in
if not(Sys.file_exists ofile)
then Coccilib.exit());
Hashtbl.clear itbl;
Hashtbl.clear ltbl;
seen := []
@r@
identifier f;
@@
__init f(...) { ... }
@script:ocaml@
f << r.f;
@@
Hashtbl.add itbl f ()
@s disable optional_attributes@
identifier f;
@@
static f(...) { ... }
@script:ocaml@
f << s.f;
@@
Hashtbl.add ltbl f ()
@t exists@
identifier f,g;
position p;
@@
__init f(...) { ... when any
g@p(...)
... when any
}
@script:ocaml@
g << t.g;
_p << t.p;
@@
if not (Hashtbl.mem ltbl g) || Hashtbl.mem itbl g
then Coccilib.include_match false
@ok1 disable optional_attributes exists@
identifier f,t.g;
@@
f(...) { ... when any
g
... when any
}
@ok2 disable optional_attributes exists@
identifier i,j,fld,t.g;
@@
struct i j = { .fld = g, };
@ok3 disable optional_attributes exists@
identifier t.g;
declarer d;
@@
d(...,g,...);
@ok4 disable optional_attributes exists@
identifier t.g;
expression e;
@@
(
e(...,g,...)
|
e(...,&g,...)
|
e = &g
|
e = g
)
@script:ocaml depends on !ok1 && !ok2 && !ok3 && !ok4@
g << t.g;
@@
let file = !thefile in
let file =
try List.hd(List.tl (Str.split (Str.regexp "/linux-next/") file))
with _ -> file in
if not(List.mem (g,file) !seen)
then
begin
seen := (g,file) :: !seen;
let ofile = "/var/julia/linux-next/" ^
(Filename.chop_extension file) ^ ".o" in
if Sys.file_exists ofile
then
let l =
Common.cmd_to_list
(Printf.sprintf
"objdump -x %s | grep -w %s | grep -w F | grep .text.unlikely"
ofile g) in
match l with
[] -> Coccilib.include_match false
| _ ->
Printf.printf "Info for %s %s\n" file g;
List.iter
(function l -> Printf.printf "%s\n" l)
l;
Printf.printf "\n"; flush stdout
else Coccilib.include_match false
end
else Coccilib.include_match false
@depends on !ok1 && !ok2 && !ok3 && !ok4@
identifier t.g;
@@
- g
+__init g
(...) { ... }
</smpl>
---
drivers/clk/clk-qoriq.c | 3 ++-
drivers/clocksource/mtk_timer.c | 2 +-
drivers/ide/cmd640.c | 2 +-
drivers/net/arcnet/com90xx.c | 2 +-
drivers/tty/rocket.c | 3 ++-
5 files changed, 7 insertions(+), 5 deletions(-)
Add __init attribute on a function that is only called from other __init
functions and that is not inlined, at least with gcc version 4.8.4 on an
x86 machine with allyesconfig. Currently, the function is put in the
.text.unlikely segment. Declaring it as __init will cause it to be put in
the .init.text and to disappear after initialization.
The result of objdump -x on the function before the change is as follows:
0000000000000000 l F .text.unlikely 00000000000000e4 cmd640x_init_one
And after the change it is as follows:
00000000000000d2 l F .init.text 00000000000000df cmd640x_init_one
Done with the help of Coccinelle. The semantic patch checks for local
static non-init functions that are called from an __init function and are
not called from any other function.
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/ide/cmd640.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index 70f0a27..004243b 100644
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -695,7 +695,7 @@ static const struct ide_port_info cmd640_port_info __initconst = {
.pio_mask = ATA_PIO5,
};
-static int cmd640x_init_one(unsigned long base, unsigned long ctl)
+static int __init cmd640x_init_one(unsigned long base, unsigned long ctl)
{
if (!request_region(base, 8, DRV_NAME)) {
printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
Add __init attribute on a function that is only called from other __init
functions and that is not inlined, at least with gcc version 4.8.4 on an
x86 machine with allyesconfig. Currently, the function is put in the
.text.unlikely segment. Declaring it as __init will cause it to be put in
the .init.text and to disappear after initialization.
The result of objdump -x on the function before the change is as follows:
000000000000014c l F .text.unlikely 0000000000000a2e init_r_port
And after the change it is as follows:
0000000000000000 l F .init.text 0000000000000a29 init_r_port
Done with the help of Coccinelle. The semantic patch checks for local
static non-init functions that are called from an __init function and are
not called from any other function.
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/tty/rocket.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 0b802cd..e979f2f 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -615,7 +615,8 @@ static void rp_do_poll(unsigned long dummy)
* the board.
* Inputs: board, aiop, chan numbers
*/
-static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
+static void __init
+init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
{
unsigned rocketMode;
struct r_port *info;
Add __init attribute on a function that is only called from other __init
functions and that is not inlined, at least with gcc version 4.8.4 on an
x86 machine with allyesconfig. Currently, the function is put in the
.text.unlikely segment. Declaring it as __init will cause it to be put in
the .init.text and to disappear after initialization.
The result of objdump -x on the function before the change is as follows:
0000000000000000 l F .text.unlikely 000000000000006f mtk_timer_setup.isra.4
And after the change it is as follows:
0000000000000000 l F .init.text 000000000000006a mtk_timer_setup.isra.4
Done with the help of Coccinelle. The semantic patch checks for local
static non-init functions that are called from an __init function and are
not called from any other function.
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/clocksource/mtk_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c
index d67bc35..7e583f8 100644
--- a/drivers/clocksource/mtk_timer.c
+++ b/drivers/clocksource/mtk_timer.c
@@ -152,7 +152,7 @@ static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
}
static void
-mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
+__init mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
{
writel(TIMER_CTRL_CLEAR | TIMER_CTRL_DISABLE,
evt->gpt_base + TIMER_CTRL_REG(timer));
Add __init attribute on a function that is only called from other __init
functions and that is not inlined, at least with gcc version 4.8.4 on an
x86 machine with allyesconfig. Currently, the function is put in the
.text.unlikely segment. Declaring it as __init will cause it to be put in
the .init.text and to disappear after initialization.
The result of objdump -x on the function before the change is as follows:
0000000000000000 l F .text.unlikely 00000000000000bf check_mirror
And after the change it is as follows:
0000000000000000 l F .init.text 00000000000000ba check_mirror
Done with the help of Coccinelle. The semantic patch checks for local
static non-init functions that are called from an __init function and are
not called from any other function.
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/net/arcnet/com90xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 0d9b45f..81f90c4 100644
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -433,7 +433,7 @@ static void __init com90xx_probe(void)
kfree(iomem);
}
-static int check_mirror(unsigned long addr, size_t size)
+static int __init check_mirror(unsigned long addr, size_t size)
{
void __iomem *p;
int res = -1;
Add __init attribute on a function that is only called from other __init
functions and that is not inlined, at least with gcc version 4.8.4 on an
x86 machine with allyesconfig. Currently, the function is put in the
.text.unlikely segment. Declaring it as __init will cause it to be put in
the .init.text and to disappear after initialization.
The result of objdump -x on the function before the change is as follows:
0000000000000000 l F .text.unlikely 0000000000000071 sysclk_from_fixed.constprop.5
And after the change it is as follows:
0000000000000480 l F .init.text 000000000000006c sysclk_from_fixed.constprop.5
Done with the help of Coccinelle. The semantic patch checks for local
static non-init functions that are called from an __init function and are
not called from any other function.
Signed-off-by: Julia Lawall <[email protected]>
---
drivers/clk/clk-qoriq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 7bc1c45..5c11b58 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -869,7 +869,8 @@ static void __init core_mux_init(struct device_node *np)
}
}
-static struct clk *sysclk_from_fixed(struct device_node *node, const char *name)
+static struct clk __init
+*sysclk_from_fixed(struct device_node *node, const char *name)
{
u32 rate;
On 18/04/16 16:55, Julia Lawall wrote:
> Add __init attribute on a function that is only called from other __init
> functions and that is not inlined, at least with gcc version 4.8.4 on an
> x86 machine with allyesconfig. Currently, the function is put in the
> .text.unlikely segment. Declaring it as __init will cause it to be put in
> the .init.text and to disappear after initialization.
>
> The result of objdump -x on the function before the change is as follows:
>
> 0000000000000000 l F .text.unlikely 000000000000006f mtk_timer_setup.isra.4
>
> And after the change it is as follows:
>
> 0000000000000000 l F .init.text 000000000000006a mtk_timer_setup.isra.4
>
> Done with the help of Coccinelle. The semantic patch checks for local
> static non-init functions that are called from an __init function and are
> not called from any other function.
>
> Signed-off-by: Julia Lawall <[email protected]>
>
Acked-by: Matthias Brugger <[email protected]>
> ---
> drivers/clocksource/mtk_timer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c
> index d67bc35..7e583f8 100644
> --- a/drivers/clocksource/mtk_timer.c
> +++ b/drivers/clocksource/mtk_timer.c
> @@ -152,7 +152,7 @@ static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
> }
>
> static void
> -mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
> +__init mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
> {
> writel(TIMER_CTRL_CLEAR | TIMER_CTRL_DISABLE,
> evt->gpt_base + TIMER_CTRL_REG(timer));
>
On Mon, Apr 18, 2016 at 04:55:36PM +0200, Julia Lawall wrote:
> Add __init attribute on a function that is only called from other __init
> functions and that is not inlined, at least with gcc version 4.8.4 on an
> x86 machine with allyesconfig. Currently, the function is put in the
> .text.unlikely segment. Declaring it as __init will cause it to be put in
> the .init.text and to disappear after initialization.
>
> The result of objdump -x on the function before the change is as follows:
>
> 0000000000000000 l F .text.unlikely 000000000000006f mtk_timer_setup.isra.4
>
> And after the change it is as follows:
>
> 0000000000000000 l F .init.text 000000000000006a mtk_timer_setup.isra.4
>
> Done with the help of Coccinelle. The semantic patch checks for local
> static non-init functions that are called from an __init function and are
> not called from any other function.
>
> Signed-off-by: Julia Lawall <[email protected]>
> ---
Applied for 4.7.
Thanks !
-- Daniel
On 04/18, Julia Lawall wrote:
> Add __init attribute on a function that is only called from other __init
> functions and that is not inlined, at least with gcc version 4.8.4 on an
> x86 machine with allyesconfig. Currently, the function is put in the
> .text.unlikely segment. Declaring it as __init will cause it to be put in
> the .init.text and to disappear after initialization.
>
> The result of objdump -x on the function before the change is as follows:
>
> 0000000000000000 l F .text.unlikely 0000000000000071 sysclk_from_fixed.constprop.5
>
> And after the change it is as follows:
>
> 0000000000000480 l F .init.text 000000000000006c sysclk_from_fixed.constprop.5
>
> Done with the help of Coccinelle. The semantic patch checks for local
> static non-init functions that are called from an __init function and are
> not called from any other function.
>
> Signed-off-by: Julia Lawall <[email protected]>
>
> ---
Applied to clk-next
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
On Mon, Apr 18, 2016 at 04:55:35PM +0200, Julia Lawall wrote:
> Add __init attribute on a function that is only called from other __init
> functions and that is not inlined, at least with gcc version 4.8.4 on an
> x86 machine with allyesconfig. Currently, the function is put in the
> .text.unlikely segment. Declaring it as __init will cause it to be put in
> the .init.text and to disappear after initialization.
>
> The result of objdump -x on the function before the change is as follows:
>
> 0000000000000000 l F .text.unlikely 00000000000000bf check_mirror
>
> And after the change it is as follows:
>
> 0000000000000000 l F .init.text 00000000000000ba check_mirror
>
> Done with the help of Coccinelle. The semantic patch checks for local
> static non-init functions that are called from an __init function and are
> not called from any other function.
>
> Signed-off-by: Julia Lawall <[email protected]>
>
Acked-by: Michael Grzeschik <[email protected]>
> ---
> drivers/net/arcnet/com90xx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
> index 0d9b45f..81f90c4 100644
> --- a/drivers/net/arcnet/com90xx.c
> +++ b/drivers/net/arcnet/com90xx.c
> @@ -433,7 +433,7 @@ static void __init com90xx_probe(void)
> kfree(iomem);
> }
>
> -static int check_mirror(unsigned long addr, size_t size)
> +static int __init check_mirror(unsigned long addr, size_t size)
> {
> void __iomem *p;
> int res = -1;
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
From: Julia Lawall <[email protected]>
Date: Mon, 18 Apr 2016 16:55:35 +0200
> Add __init attribute on a function that is only called from other __init
> functions and that is not inlined, at least with gcc version 4.8.4 on an
> x86 machine with allyesconfig. Currently, the function is put in the
> .text.unlikely segment. Declaring it as __init will cause it to be put in
> the .init.text and to disappear after initialization.
>
> The result of objdump -x on the function before the change is as follows:
>
> 0000000000000000 l F .text.unlikely 00000000000000bf check_mirror
>
> And after the change it is as follows:
>
> 0000000000000000 l F .init.text 00000000000000ba check_mirror
>
> Done with the help of Coccinelle. The semantic patch checks for local
> static non-init functions that are called from an __init function and are
> not called from any other function.
>
> Signed-off-by: Julia Lawall <[email protected]>
Applied to net-next, thanks.