On Sat, 2007-01-13 at 23:57 +0100, [EMAIL PROTECTED] wrote:
> Hi there,
>
> I've been curious enough to try 2.6.20-rc5 with nfs4/kerberos.
> It was working fine before. I was using 2.6.18.1 on the client and
> 2.6.20-rc3-git4 on server and today i tried 2.6.20-rc5 on both client
> and server. (both running up to date debian/sid)
> Trying to mount a nfs4 or nfs3 share with krb5 (did try with krb5 and
> krb5p) produces this oops on the client side:
> (each time I tried i got the same oops)
>
> [ cut here ]
> kernel BUG at net/sunrpc/sched.c:902!
> invalid opcode: [#1]
> PREEMPT
> Modules linked in: rpcsec_gss_spkm3 rfcomm l2cap bluetooth nfsd exportfs
> nsc_irc
> c tun ipv6 dm_snapshot dm_mirror dm_mod eeprom i2c_isa eth1394 usbhid
> snd_intel8
> x0 snd_ac97_codec ac97_bus snd_pcm_oss snd_pcm snd_mixer_oss snd_seq_oss
> snd_seq
> _midi snd_rawmidi snd_seq_midi_event snd_seq snd_timer snd_seq_device
> ohci1394 i
> eee1394 ipw2200 snd ieee80211 ieee80211_crypt i2c_i801 psmouse ide_cd r8169
> rtc
> irda ehci_hcd uhci_hcd serio_raw i2c_core cdrom snd_page_alloc usbcore evdev
> crc
> _ccitt
> CPU:0
> EIP:0060:[]Not tainted VLI
> EFLAGS: 00210297 (2.6.20-rc5 #3)
> EIP is at rpc_release_task+0x8f/0xc0
> eax: f7e40c80 ebx: f7e40c80 ecx: f51eaac0 edx: c03fcc80
> esi: fff3 edi: f6f21c40 ebp: f6f21bf0 esp: f6f21be4
> ds: 007b es: 007b ss: 0068
> Process mount (pid: 4286, ti=f6f2 task=f6c52030 task.ti=f6f2)
> Stack: f6f21bf0 c03f7a77 f7e40c80 f6f21c10 c03f7c0d feff
>
>f6f21c7c f76f1180 f6f21c30 c01fe0d6 f6f21c40 7ffbfaef
> fffe
>f6f21c7c f6de1a40 f76f1b80 f6f21c58 c01fe436 0fff
> c050a180
> Call Trace:
> [] show_trace_log_lvl+0x1a/0x30
> [] show_stack_log_lvl+0xa9/0xd0
> [] show_registers+0x1ef/0x360
> [] die+0x10b/0x210
> [] do_trap+0x82/0xb0
> [] do_invalid_op+0x97/0xb0
> [] error_code+0x74/0x7c
> [] rpc_call_sync+0x8d/0xb0
> [] nfs3_rpc_wrapper+0x46/0x70
> [] nfs3_proc_getattr+0x46/0x80
> [] nfs_create_server+0x2cf/0x520
> [] nfs_get_sb+0xbd/0x580
> [] vfs_kern_mount+0x40/0x90
> [] do_kern_mount+0x36/0x50
> [] do_mount+0x24e/0x690
> [] sys_mount+0x6f/0xb0
> [] sysenter_past_esp+0x5f/0x85
> ===
> Code: d8 e8 86 fc ff ff c7 03 00 00 00 00 8d 43 68 0f ba 73 68 04 ba 04 00 00
> 00
> e8 5e 1d d3 ff 89 d8 e8 f7 fe ff ff 83 c4 08 5b 5d c3 <0f> 0b eb fe 0f 0b eb
> fe
> e8 84 2a 01 00 eb be 0f b7 80 94 00 00
> EIP: [] rpc_release_task+0x8f/0xc0 SS:ESP 0068:f6f21be4
>
>
> ( was a proto=udp mount )
> I can provide more informations if needed, but i'm pretty it would be
> reproducible easily.
Does the attached patch fix it for you?
Cheers,
Trond
--- Begin Message ---
We shouldn't be calling rpc_release_task() for tasks that are not active.
Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]>
---
include/linux/sunrpc/sched.h |1 -
net/sunrpc/clnt.c|8 +++-
net/sunrpc/sched.c |3 ++-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 97c7616..8b6ce60 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -250,7 +250,6 @@ voidrpc_init_task(struct rpc_task *tas
int flags, const struct rpc_call_ops *ops,
void *data);
void rpc_put_task(struct rpc_task *);
-void rpc_release_task(struct rpc_task *);
void rpc_exit_task(struct rpc_task *);
void rpc_release_calldata(const struct rpc_call_ops *, void *);
void rpc_killall_tasks(struct rpc_clnt *);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index aba528b..16c9fbc 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -490,16 +490,14 @@ int rpc_call_sync(struct rpc_clnt *clnt,
/* Set up the call info struct and execute the task */
status = task->tk_status;
- if (status != 0) {
- rpc_release_task(task);
+ if (status != 0)
goto out;
- }
atomic_inc(&task->tk_count);
status = rpc_execute(task);
if (status == 0)
status = task->tk_status;
- rpc_put_task(task);
out:
+ rpc_put_task(task);
rpc_restore_sigmask(&oldset);
return status;
}
@@ -537,7 +535,7 @@ rpc_call_async(struct rpc_clnt *clnt, st
if (status == 0)
rpc_execute(task);
else
- rpc_release_task(task);
+ rpc_put_task(task);
rpc_restore_sigmask(&oldset);
return status;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 79bc4cd..fc083f0 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -42,6 +42,7 @@ static mempool_t *rpc_buffer_mempool __r
static void__rpc_default_timer(struct rpc_task *task);
static
