[PATCH] markup_oops: Use modinfo to avoid confusion with underscored module names

[PATCH] markup_oops: Use modinfo to avoid confusion with underscored module names

[Ozan Çağlayan]

When EIP is at a module having an underscore in its name, the current
code fails to find it because the module filenames has '-' instead of
'_'.

Use modinfo to correctly get the full path to the module.

Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>
---
This is just a trivial patch to pinpoint the problem. Usage of modinfo is faster than
searching through the filesystem but may not be desirable as it brings a dependency
to module-init-tools. Replacing underscore occurences by '-' can be another solution.

 scripts/markup_oops.pl |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index 8977401..bc14f4c 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -184,10 +184,7 @@ if ($target eq "0") {
 
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
-	my $dir = dirname($filename);
-	$dir = $dir . "/";
-	my $mod = $module . ".ko";
-	my $modulefile = `find $dir -name $mod | head -1`;
+	my $modulefile = `modinfo $module | grep 'filename' | gawk '{ print \$2 }'`;
 	chomp($modulefile);
 	$filename = $modulefile;
 	if ($filename eq "") {
-- 
1.6.3.4

Re: [PATCH] markup_oops: Use modinfo to avoid confusion with underscored module names

[Arjan van de Ven]

On Thu,  6 Aug 2009 15:21:55 +0300
Ozan Çağlayan <ozan@pardus.org.tr> wrote:

> When EIP is at a module having an underscore in its name, the current
> code fails to find it because the module filenames has '-' instead of
> '_'.
> 
> Use modinfo to correctly get the full path to the module.
> 
> Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>

I like it, it's simple.
I don't mind about the module-init-tools dependency, everyone will have
that already.

Acked-by: Arjan van de Ven <arjan@linux.intel.com>

Andrew: can you hover this one up and send to Linus when its time is
due?

> ---
> This is just a trivial patch to pinpoint the problem. Usage of
> modinfo is faster than searching through the filesystem but may not
> be desirable as it brings a dependency to module-init-tools.
> Replacing underscore occurences by '-' can be another solution.
> 
>  scripts/markup_oops.pl |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
> index 8977401..bc14f4c 100644
> --- a/scripts/markup_oops.pl
> +++ b/scripts/markup_oops.pl
> @@ -184,10 +184,7 @@ if ($target eq "0") {
>  
>  # if it's a module, we need to find the .ko file and calculate a
> load offset if ($module ne "") {
> -	my $dir = dirname($filename);
> -	$dir = $dir . "/";
> -	my $mod = $module . ".ko";
> -	my $modulefile = `find $dir -name $mod | head -1`;
> +	my $modulefile = `modinfo $module | grep 'filename' | gawk
> '{ print \$2 }'`; chomp($modulefile);
>  	$filename = $modulefile;
>  	if ($filename eq "") {


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

Re: [PATCH] markup_oops: Use modinfo to avoid confusion with underscored module names

[Ozan Çağlayan]

Arjan van de Ven wrote:
> On Thu,  6 Aug 2009 15:21:55 +0300
> Ozan Çağlayan <ozan@pardus.org.tr> wrote:
>
>   
>> When EIP is at a module having an underscore in its name, the current
>> code fails to find it because the module filenames has '-' instead of
>> '_'.
>>
>> Use modinfo to correctly get the full path to the module.
>>
>> Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>
>>     
>
> I like it, it's simple.
> I don't mind about the module-init-tools dependency, everyone will have
> that already.
>   

BTW, note that the old code was searching for *.ko files in
dirname($vmlinux_name). Replacing it by modprobe will eventually always
search for the modules in /lib/modules/KVER/.

Re: [PATCH] markup_oops: Use modinfo to avoid confusion with underscored module names

[Amerigo Wang]

On Thu, Aug 06, 2009 at 03:21:55PM +0300, Ozan Çağlayan wrote:
>When EIP is at a module having an underscore in its name, the current
>code fails to find it because the module filenames has '-' instead of
>'_'.
>
>Use modinfo to correctly get the full path to the module.
>
>Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>
>---
>This is just a trivial patch to pinpoint the problem. Usage of modinfo is faster than
>searching through the filesystem but may not be desirable as it brings a dependency
>to module-init-tools. Replacing underscore occurences by '-' can be another solution.
>
> scripts/markup_oops.pl |    5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
>diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
>index 8977401..bc14f4c 100644
>--- a/scripts/markup_oops.pl
>+++ b/scripts/markup_oops.pl
>@@ -184,10 +184,7 @@ if ($target eq "0") {
> 
> # if it's a module, we need to find the .ko file and calculate a load offset
> if ($module ne "") {
>-	my $dir = dirname($filename);
>-	$dir = $dir . "/";
>-	my $mod = $module . ".ko";
>-	my $modulefile = `find $dir -name $mod | head -1`;
>+	my $modulefile = `modinfo $module | grep 'filename' | gawk '{ print \$2 }'`;


I know this works, but how about grep '^filename:' ? This is more strict.

Also, although on most Linux awk is just a symbol link to gawk,
but it is still better to use awk instead of gawk for portability reason.


> 	chomp($modulefile);
> 	$filename = $modulefile;
> 	if ($filename eq "") {

[PATCH v2] markup_oops: Use modinfo to avoid confusion with underscored module names

[Ozan Çağlayan]

When EIP is at a module having an underscore in its name, the current
code fails to find it because the module filenames has '-' instead of
'_'. Use modinfo for a better path finding.

Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>
---
 scripts/markup_oops.pl |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index 8977401..5f0fcb7 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -184,10 +184,7 @@ if ($target eq "0") {
 
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
-	my $dir = dirname($filename);
-	$dir = $dir . "/";
-	my $mod = $module . ".ko";
-	my $modulefile = `find $dir -name $mod | head -1`;
+	my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
 	chomp($modulefile);
 	$filename = $modulefile;
 	if ($filename eq "") {
-- 
1.6.3.4

Re: [PATCH v2] markup_oops: Use modinfo to avoid confusion with underscored module names

[Américo Wang]

On Mon, Aug 10, 2009 at 12:13:13PM +0300, Ozan Çağlayan wrote:
>When EIP is at a module having an underscore in its name, the current
>code fails to find it because the module filenames has '-' instead of
>'_'. Use modinfo for a better path finding.
>
>Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>

Acked-by: WANG Cong <xiyou.wangcong@gmail.com>

Thanks!

>---
> scripts/markup_oops.pl |    5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
>diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
>index 8977401..5f0fcb7 100644
>--- a/scripts/markup_oops.pl
>+++ b/scripts/markup_oops.pl
>@@ -184,10 +184,7 @@ if ($target eq "0") {
> 
> # if it's a module, we need to find the .ko file and calculate a load offset
> if ($module ne "") {
>-	my $dir = dirname($filename);
>-	$dir = $dir . "/";
>-	my $mod = $module . ".ko";
>-	my $modulefile = `find $dir -name $mod | head -1`;
>+	my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
> 	chomp($modulefile);
> 	$filename = $modulefile;
> 	if ($filename eq "") {
>-- 
>1.6.3.4
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at  http://www.tux.org/lkml/

-- 
Live like a child, think like the god.