2013-04-03 14:59:28

by Max Kellermann

[permalink] [raw]
Subject: [PATCH] fscache: extended "dying" check before emitting EV_INVALIDATE

Before emitting an FSCACHE_OBJECT_EV_INVALIDATE event, the function
__fscache_invalidate() checks whether the fscache_object is currently
"dying". This checks only the current state, not the queued events
that will very soon lead to the object's death.

The problem is that fscache_object_state_machine() will
BUG("Unsupported event") when there is object->events includes
EV_INVALIDATE during "terminal_transit". Even if we would ignore that
check, we could run into "Unexpected event in dead state" later
because object->work may still be queued.

The solution is to check for EV_RETIRE and EV_RELEASE; if one of those
two terminal events is already queued, don't bother to queue
EV_INVALIDATE.

Signed-off-by: Max Kellermann <[email protected]>
---
fs/fscache/cookie.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index 8dcb114..ed80d7f 100644
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -402,7 +402,8 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
object = hlist_entry(cookie->backing_objects.first,
struct fscache_object,
cookie_link);
- if (object->state < FSCACHE_OBJECT_DYING)
+ if (object->state < FSCACHE_OBJECT_DYING &&
+ (object->events & (FSCACHE_OBJECT_EV_RETIRE|FSCACHE_OBJECT_EV_RELEASE)) == 0)
fscache_raise_event(
object, FSCACHE_OBJECT_EV_INVALIDATE);
}


2013-04-23 16:46:46

by David Howells

[permalink] [raw]
Subject: Re: [PATCH] fscache: extended "dying" check before emitting EV_INVALIDATE

Max Kellermann <[email protected]> wrote:

> + (object->events & (FSCACHE_OBJECT_EV_RETIRE|FSCACHE_OBJECT_EV_RELEASE)) == 0)

You can't do it like this. EV_RETIRE and EV_RELEASE are bit numbers, so need
to be shifted into place.

David

2013-04-23 16:57:51

by David Howells

[permalink] [raw]
Subject: Re: [PATCH] fscache: extended "dying" check before emitting EV_INVALIDATE

Max Kellermann <[email protected]> wrote:

> Before emitting an FSCACHE_OBJECT_EV_INVALIDATE event, the function
> __fscache_invalidate() checks whether the fscache_object is currently
> "dying". This checks only the current state, not the queued events
> that will very soon lead to the object's death.

This should not be a problem, I think. EV_RETIRE and EV_RELEASE should only be
set by fscache_relinquish_cookie(). If you (the netfs) call that to dispose of
a cookie to fscache, you shouldn't thereafter be calling fscache_invalidate()
on it. The only case in which __fscache_invalidate() should see a dying object
is if the caching backend withdraws it (ie. EV_WITHDRAW is set).

Do you have a backtrace?

David