[PATCH 2/2] PR5434: Use proper $vars according to CONFIG_NFSD in syscall.nfsservctl.

[PATCH 2/2] PR5434: Use proper $vars according to CONFIG_NFSD in syscall.nfsservctl.

[Przemyslaw Pawelczyk]

---
 tapset/syscalls2.stp |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 5e97aef..d29a6d2 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -66,9 +66,15 @@ probe syscall.nfsservctl = kernel.function("sys_nfsservctl").call ?,
 {
 	name = "nfsservctl"
 	cmd = $cmd
+%( CONFIG_NFSD == "y" || CONFIG_NFDS == "m" %?
 	argp_uaddr = $arg
 	resp_uaddr = $res
 	argstr = sprintf("%s, %p, %p", _nfsctl_cmd_str($cmd), $arg, $res)
+%:
+	argp_uaddr = $notused
+	resp_uaddr = $notused2
+	argstr = sprintf("%s, %p, %p", _nfsctl_cmd_str($cmd), $notused, $notused2)
+%)
 }
 probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
                                   kernel.function("compat_sys_nfsservctl").return ?
-- 
1.5.6.5

[PATCH] PR5434: Fix syscall.nfsservctl.

[Przemyslaw Pawelczyk]

Use proper $vars according to CONFIG_NFSD in syscall.nfsservctl and mask
it out if CONFIG_NFSD == "n" && CONFIG_COMPAT == "n".

* tapset/syscalls2.stp (syscall.nfsservctl): Fix it.
---
 tapset/syscalls2.stp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 5e97aef..eaf79fc 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -61,14 +61,21 @@ probe syscall.compat_nanosleep.return = kernel.function("compat_sys_nanosleep").
 # long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *arg,
 #					union compat_nfsctl_res __user *res)
 #
+%( CONFIG_NFSD == "n" && CONFIG_COMPAT == "n" %? %:
 probe syscall.nfsservctl = kernel.function("sys_nfsservctl").call ?,
                            kernel.function("compat_sys_nfsservctl").call ?
 {
 	name = "nfsservctl"
 	cmd = $cmd
+%( CONFIG_NFSD == "n" %?
+	argp_uaddr = $notused
+	resp_uaddr = $notused2
+	argstr = sprintf("/* NI_SYSCALL */ %s, %p, %p", _nfsctl_cmd_str($cmd), $notused, $notused2)
+%:
 	argp_uaddr = $arg
 	resp_uaddr = $res
 	argstr = sprintf("%s, %p, %p", _nfsctl_cmd_str($cmd), $arg, $res)
+%)
 }
 probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
                                   kernel.function("compat_sys_nfsservctl").return ?
@@ -76,6 +83,7 @@ probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
 	name = "nfsservctl"
 	retstr = returnstr(1)
 }
+%)
 
 # nice _______________________________________________________
 # long sys_nice(int increment)
-- 
1.6.3.3

[PATCH v2] PR5434: Fix syscall.nfsservctl.

[Przemyslaw Pawelczyk]

Use proper $vars according to CONFIG_NFSD and CONFIG_COMPAT in
syscall.nfsservctl and mask it out along with return probe if
CONFIG_NFSD != "[ym]" && CONFIG_COMPAT != "y".

* tapset/syscalls2.stp (syscall.nfsservctl): Fix it.
---
 tapset/syscalls2.stp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 5e97aef..47aba9b 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -61,14 +61,21 @@ probe syscall.compat_nanosleep.return = kernel.function("compat_sys_nanosleep").
 # long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *arg,
 #					union compat_nfsctl_res __user *res)
 #
+%( CONFIG_NFSD == "[ym]" || CONFIG_COMPAT == "y" %?
 probe syscall.nfsservctl = kernel.function("sys_nfsservctl").call ?,
                            kernel.function("compat_sys_nfsservctl").call ?
 {
 	name = "nfsservctl"
 	cmd = $cmd
+%( CONFIG_NFSD == "[ym]" %?
 	argp_uaddr = $arg
 	resp_uaddr = $res
 	argstr = sprintf("%s, %p, %p", _nfsctl_cmd_str($cmd), $arg, $res)
+%:
+	argp_uaddr = $notused
+	resp_uaddr = $notused2
+	argstr = sprintf("/* NI_SYSCALL */ %s, %p, %p", _nfsctl_cmd_str($cmd), $notused, $notused2)
+%)
 }
 probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
                                   kernel.function("compat_sys_nfsservctl").return ?
@@ -76,6 +83,7 @@ probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
 	name = "nfsservctl"
 	retstr = returnstr(1)
 }
+%)
 
 # nice _______________________________________________________
 # long sys_nice(int increment)
-- 
1.6.3.3

Re: [PATCH v2] PR5434: Fix syscall.nfsservctl.

[Przemysław Pawełczyk]

On Tue, Oct 13, 2009 at 03:23, Przemyslaw Pawelczyk
<przemyslaw@pawelczyk.it> wrote:
> Use proper $vars according to CONFIG_NFSD and CONFIG_COMPAT in
> syscall.nfsservctl and mask it out along with return probe if
> CONFIG_NFSD != "[ym]" && CONFIG_COMPAT != "y".

I had a bad day yesterday. Really. Good that I don't have rights to
the repository, because I would give a new meaning to saying commit an
error...

> +%( CONFIG_NFSD == "[ym]" || CONFIG_COMPAT == "y" %?

> +%( CONFIG_NFSD == "[ym]" %?

Above lines were wrong, but now thankfully there are correct thanks to
Josh for spotting the typo in CONFIG_-related code and Frank for
fixing it (commit e61d83ef).

-- 
Przemysław Pawełczyk

Re: [PATCH v2] PR5434: Fix syscall.nfsservctl.

[Josh Stone]

On 10/12/2009 06:23 PM, Przemyslaw Pawelczyk wrote:
> Use proper $vars according to CONFIG_NFSD and CONFIG_COMPAT in
> syscall.nfsservctl and mask it out along with return probe if
> CONFIG_NFSD != "[ym]"&&  CONFIG_COMPAT != "y".
>
> * tapset/syscalls2.stp (syscall.nfsservctl): Fix it.

This is now committed, thanks.

Josh