|
 |
2464b2 |
commit b367613c3bb88549dbb9944d306fe561dea03f04
|
|
|
2464b2 |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
2464b2 |
Date: Fri Sep 24 15:54:34 2021 -0400
|
|
|
2464b2 |
|
|
|
2464b2 |
PR28384: convert more nfs_proc.stp server_ip to string
|
|
|
2464b2 |
|
|
|
2464b2 |
This tapset variable has been changed in stap version 4.3
|
|
|
2464b2 |
to a string. Finish covering all instances in various
|
|
|
2464b2 |
probe aliases.
|
|
|
2464b2 |
|
|
|
2464b2 |
diff --git a/tapset/linux/nfs_proc.stp b/tapset/linux/nfs_proc.stp
|
|
|
2464b2 |
index 257907457..9b1f65f5f 100644
|
|
|
2464b2 |
--- a/tapset/linux/nfs_proc.stp
|
|
|
2464b2 |
+++ b/tapset/linux/nfs_proc.stp
|
|
|
2464b2 |
@@ -235,7 +235,11 @@ probe _nfs.proc2.lookup = kernel.function("nfs_proc_lookup") !,
|
|
|
2464b2 |
probe _nfs.proc2.missing_lookup = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
name_len = 0
|
|
|
2464b2 |
@@ -361,7 +365,11 @@ probe _nfs.proc2.read = kernel.function("nfs_proc_read") !,
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe _nfs.proc2.missing_read = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
flags = 0
|
|
|
2464b2 |
@@ -496,7 +504,11 @@ probe _nfs.proc2.write = kernel.function("nfs_proc_write") !,
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe _nfs.proc2.missing_write = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
flags = 0
|
|
|
2464b2 |
@@ -759,7 +771,7 @@ probe _nfs.proc2.missing_read_setup = never
|
|
|
2464b2 |
inode = 0
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
- server_ip = "0"
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
%)
|
|
|
2464b2 |
@@ -895,7 +907,11 @@ probe _nfs.proc2.read_done = kernel.function("nfs_read_done") !,
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe _nfs.proc2.missing_read_done = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
count = 0
|
|
|
2464b2 |
status = 0
|
|
|
2464b2 |
@@ -1054,7 +1070,11 @@ probe _nfs.proc2.missing_write_setup = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
inode = 0
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
count = 0
|
|
|
2464b2 |
@@ -1201,7 +1221,11 @@ probe _nfs.proc2.write_done = kernel.function("nfs_write_done") !,
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe _nfs.proc2.missing_write_done = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
count = 0
|
|
|
2464b2 |
valid = 0
|
|
|
2464b2 |
@@ -1826,7 +1850,11 @@ probe _nfs.proc2.create = kernel.function("nfs_proc_create") !,
|
|
|
2464b2 |
probe _nfs.proc2.missing_create = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
fh = 0
|
|
|
2464b2 |
@@ -1946,7 +1974,11 @@ probe _nfs.proc2.remove = kernel.function("nfs_proc_remove") !,
|
|
|
2464b2 |
probe _nfs.proc2.missing_remove = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
fh = 0
|
|
|
2464b2 |
@@ -2067,7 +2099,11 @@ probe _nfs.proc2.rename = kernel.function("nfs_proc_rename") !,
|
|
|
2464b2 |
probe _nfs.proc2.missing_rename = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
old_fh = 0
|
|
|
2464b2 |
@@ -2114,7 +2150,11 @@ probe _nfs.proc3.rename = kernel.function("nfs3_proc_rename") !,
|
|
|
2464b2 |
probe _nfs.proc3.missing_rename = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
old_fh = 0
|
|
|
2464b2 |
@@ -2161,7 +2201,11 @@ probe _nfs.proc4.rename = kernel.function("nfs4_proc_rename") !,
|
|
|
2464b2 |
probe _nfs.proc4.missing_rename = never
|
|
|
2464b2 |
{
|
|
|
2464b2 |
client = 0
|
|
|
2464b2 |
+%( systemtap_v >= "4.3" %?
|
|
|
2464b2 |
+ server_ip = ""
|
|
|
2464b2 |
+%:
|
|
|
2464b2 |
server_ip = 0
|
|
|
2464b2 |
+%)
|
|
|
2464b2 |
prot = 0
|
|
|
2464b2 |
|
|
|
2464b2 |
old_fh = 0
|
|
|
2464b2 |
diff --git a/testsuite/buildok/nfs_proc-detailed.stp b/testsuite/buildok/nfs_proc-detailed.stp
|
|
|
2464b2 |
index 2a04ee2a7..e7c7f2d18 100755
|
|
|
2464b2 |
--- a/testsuite/buildok/nfs_proc-detailed.stp
|
|
|
2464b2 |
+++ b/testsuite/buildok/nfs_proc-detailed.stp
|
|
|
2464b2 |
@@ -3,7 +3,7 @@
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.lookup {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d\n", server_ip, prot, version, name_len)
|
|
|
2464b2 |
+ printf("%s %d %d %d\n", server_ip, prot, version, name_len)
|
|
|
2464b2 |
printf("%d %d\n", bitmask0, bitmask1)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.lookup.return {
|
|
|
2464b2 |
@@ -12,7 +12,7 @@ probe nfs.proc.lookup.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.read ? {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d %s\n", server_ip, prot, version, flags,
|
|
|
2464b2 |
+ printf("%s %d %d %d %d %s\n", server_ip, prot, version, flags,
|
|
|
2464b2 |
size, units)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.read.return ? {
|
|
|
2464b2 |
@@ -21,7 +21,7 @@ probe nfs.proc.read.return ? {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.write ? {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d %s\n", server_ip, prot, version, flags,
|
|
|
2464b2 |
+ printf("%s %d %d %d %d %s\n", server_ip, prot, version, flags,
|
|
|
2464b2 |
size, units)
|
|
|
2464b2 |
printf("%d %d\n", bitmask0, bitmask1)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
@@ -32,7 +32,7 @@ probe nfs.proc.write.return ? {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.commit ? {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %s\n", server_ip, prot, version, size, units)
|
|
|
2464b2 |
+ printf("%s %d %d %d %s\n", server_ip, prot, version, size, units)
|
|
|
2464b2 |
printf("%d %d\n", bitmask0, bitmask1)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.commit.return ? {
|
|
|
2464b2 |
@@ -43,7 +43,7 @@ probe nfs.proc.commit.return ? {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.read_setup {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d %s\n", client, server_ip, prot,
|
|
|
2464b2 |
+ printf("%d %s %d %d %d %s\n", client, server_ip, prot,
|
|
|
2464b2 |
version, size, units)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.read_setup.return {
|
|
|
2464b2 |
@@ -52,7 +52,7 @@ probe nfs.proc.read_setup.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.read_done {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d\n", server_ip, prot, count, version)
|
|
|
2464b2 |
+ printf("%s %d %d %d\n", server_ip, prot, count, version)
|
|
|
2464b2 |
printf("%d\n", timestamp)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.read_done.return {
|
|
|
2464b2 |
@@ -61,7 +61,7 @@ probe nfs.proc.read_done.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.write_setup {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d %s\n", client, server_ip, prot,
|
|
|
2464b2 |
+ printf("%d %s %d %d %d %s\n", client, server_ip, prot,
|
|
|
2464b2 |
version, size, units)
|
|
|
2464b2 |
printf("%d %d %d\n", how, bitmask0, bitmask1)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
@@ -71,7 +71,7 @@ probe nfs.proc.write_setup.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.write_done {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d\n", server_ip, prot, count, valid, version)
|
|
|
2464b2 |
+ printf("%s %d %d %d %d\n", server_ip, prot, count, valid, version)
|
|
|
2464b2 |
printf("%d\n", timestamp)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.write_done.return {
|
|
|
2464b2 |
@@ -80,7 +80,7 @@ probe nfs.proc.write_done.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.commit_setup {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d %s\n", client, server_ip, prot,
|
|
|
2464b2 |
+ printf("%d %s %d %d %d %s\n", client, server_ip, prot,
|
|
|
2464b2 |
version, size, units)
|
|
|
2464b2 |
printf("%d %d\n", bitmask0, bitmask1)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
@@ -90,7 +90,7 @@ probe nfs.proc.commit_setup.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.commit_done {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d\n", server_ip, prot, count, valid, version)
|
|
|
2464b2 |
+ printf("%s %d %d %d %d\n", server_ip, prot, count, valid, version)
|
|
|
2464b2 |
printf("%d\n", timestamp)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.commit_done.return {
|
|
|
2464b2 |
@@ -99,7 +99,7 @@ probe nfs.proc.commit_done.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.rename_setup {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d\n", client, server_ip, prot,
|
|
|
2464b2 |
+ printf("%d %s %d %d\n", client, server_ip, prot,
|
|
|
2464b2 |
version)
|
|
|
2464b2 |
printf("%d\n", fh)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
@@ -109,7 +109,7 @@ probe nfs.proc.rename_setup.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.rename_done {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
+ printf("%s %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
printf("%d %d\n", timestamp, status)
|
|
|
2464b2 |
printf("%d %d\n", old_fh, new_fh)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
@@ -119,7 +119,7 @@ probe nfs.proc.rename_done.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.open {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
+ printf("%s %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.open.return {
|
|
|
2464b2 |
printf("%s(%s)\n", name, retstr)
|
|
|
2464b2 |
@@ -127,7 +127,7 @@ probe nfs.proc.open.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.release ? {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
+ printf("%s %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.release.return ? {
|
|
|
2464b2 |
printf("%s(%s)\n", name, retstr)
|
|
|
2464b2 |
@@ -143,7 +143,7 @@ probe nfs.proc.handle_exception.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.create {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d %d\n", server_ip, prot, version, fh,
|
|
|
2464b2 |
+ printf("%s %d %d %d %d %d\n", server_ip, prot, version, fh,
|
|
|
2464b2 |
filelen, mode)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.create.return {
|
|
|
2464b2 |
@@ -152,7 +152,7 @@ probe nfs.proc.create.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.remove {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d %d %d\n", server_ip, prot, version, fh,
|
|
|
2464b2 |
+ printf("%s %d %d %d %d\n", server_ip, prot, version, fh,
|
|
|
2464b2 |
filelen)
|
|
|
2464b2 |
}
|
|
|
2464b2 |
probe nfs.proc.remove.return {
|
|
|
2464b2 |
@@ -161,7 +161,7 @@ probe nfs.proc.remove.return {
|
|
|
2464b2 |
|
|
|
2464b2 |
probe nfs.proc.rename {
|
|
|
2464b2 |
printf("%s(%s)\n", name, argstr)
|
|
|
2464b2 |
- printf("%d %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
+ printf("%s %d %d\n", server_ip, prot, version)
|
|
|
2464b2 |
printf("%d %d %s\n", old_fh, old_filelen, old_name)
|
|
|
2464b2 |
printf("%d %d %s\n", new_fh, new_filelen, new_name)
|
|
|
2464b2 |
}
|