Skip to content

Commit

Permalink
afs: Fix calculation of callback expiry time
Browse files Browse the repository at this point in the history 
Fix the calculation of the expiry time of a callback promise, as obtained
from operations like FS.FetchStatus and FS.FetchData.

The time should be based on the timestamp of the first DATA packet in the
reply and the calculation needs to turn the ktime_t timestamp into a
time64_t.

Fixes: c435ee3 ("afs: Overhaul the callback handling")
Signed-off-by: David Howells <dhowells@redhat.com>
  • Loading branch information
@dhowells
dhowells committed May 16, 2019
1 parent 3b05e52 commit 7810705
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 57 deletions.
57 changes: 26 additions & 31 deletions fs/afs/fsclient.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,23 @@ static int afs_decode_status(struct afs_call *call,
return ret;
}

static time64_t xdr_decode_expiry(struct afs_call *call, u32 expiry)
{
return ktime_divns(call->reply_time, NSEC_PER_SEC) + expiry;
}

static void xdr_decode_AFSCallBack_raw(struct afs_call *call,
struct afs_callback *cb,
const __be32 **_bp)
{
const __be32 *bp = *_bp;

cb->version = ntohl(*bp++);
cb->expires_at = xdr_decode_expiry(call, ntohl(*bp++));
cb->type = ntohl(*bp++);
*_bp = bp;
}

/*
* decode an AFSCallBack block
*/
Expand All @@ -264,46 +281,26 @@ static void xdr_decode_AFSCallBack(struct afs_call *call,
const __be32 **_bp)
{
struct afs_cb_interest *old, *cbi = call->cbi;
const __be32 *bp = *_bp;
u32 cb_expiry;
struct afs_callback cb;

xdr_decode_AFSCallBack_raw(call, &cb, _bp);

write_seqlock(&vnode->cb_lock);

if (!afs_cb_is_broken(call->cb_break, vnode, cbi)) {
vnode->cb_version = ntohl(*bp++);
cb_expiry = ntohl(*bp++);
vnode->cb_type = ntohl(*bp++);
vnode->cb_expires_at = cb_expiry + ktime_get_real_seconds();
vnode->cb_version = cb.version;
vnode->cb_type = cb.type;
vnode->cb_expires_at = cb.expires_at;
old = vnode->cb_interest;
if (old != call->cbi) {
vnode->cb_interest = cbi;
cbi = old;
}
set_bit(AFS_VNODE_CB_PROMISED, &vnode->flags);
} else {
bp += 3;
}

write_sequnlock(&vnode->cb_lock);
call->cbi = cbi;
*_bp = bp;
}

static ktime_t xdr_decode_expiry(struct afs_call *call, u32 expiry)
{
return ktime_add_ns(call->reply_time, expiry * NSEC_PER_SEC);
}

static void xdr_decode_AFSCallBack_raw(struct afs_call *call,
const __be32 **_bp,
struct afs_callback *cb)
{
const __be32 *bp = *_bp;

cb->version = ntohl(*bp++);
cb->expires_at = xdr_decode_expiry(call, ntohl(*bp++));
cb->type = ntohl(*bp++);
*_bp = bp;
}

/*
Expand Down Expand Up @@ -744,7 +741,7 @@ static int afs_deliver_fs_create_vnode(struct afs_call *call)
&call->expected_version, NULL);
if (ret < 0)
return ret;
xdr_decode_AFSCallBack_raw(call, &bp, call->reply[3]);
xdr_decode_AFSCallBack_raw(call, call->reply[3], &bp);
/* xdr_decode_AFSVolSync(&bp, call->reply[X]); */

_leave(" = 0 [done]");
Expand Down Expand Up @@ -2168,7 +2165,7 @@ static int afs_deliver_fs_fetch_status(struct afs_call *call)
&call->expected_version, NULL);
if (ret < 0)
return ret;
xdr_decode_AFSCallBack_raw(call, &bp, callback);
xdr_decode_AFSCallBack_raw(call, callback, &bp);
xdr_decode_AFSVolSync(&bp, volsync);

_leave(" = 0 [done]");
Expand Down Expand Up @@ -2322,9 +2319,7 @@ static int afs_deliver_fs_inline_bulk_status(struct afs_call *call)
_debug("unmarshall CB array");
bp = call->buffer;
callbacks = call->reply[2];
callbacks[call->count].version = ntohl(bp[0]);
callbacks[call->count].expires_at = xdr_decode_expiry(call, ntohl(bp[1]));
callbacks[call->count].type = ntohl(bp[2]);
xdr_decode_AFSCallBack_raw(call, &callbacks[call->count], &bp);
statuses = call->reply[1];
if (call->count == 0 && vnode && statuses[0].abort_code == 0)
xdr_decode_AFSCallBack(call, vnode, &bp);
Expand Down
51 changes: 25 additions & 26 deletions fs/afs/yfsclient.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,25 +311,40 @@ static int yfs_decode_status(struct afs_call *call,
return ret;
}

static void xdr_decode_YFSCallBack_raw(struct afs_call *call,
struct afs_callback *cb,
const __be32 **_bp)
{
struct yfs_xdr_YFSCallBack *x = (void *)*_bp;
ktime_t cb_expiry;

cb_expiry = call->reply_time;
cb_expiry = ktime_add(cb_expiry, xdr_to_u64(x->expiration_time) * 100);
cb->expires_at = ktime_divns(cb_expiry, NSEC_PER_SEC);
cb->version = ntohl(x->version);
cb->type = ntohl(x->type);

*_bp += xdr_size(x);
}

/*
* Decode a YFSCallBack block
*/
static void xdr_decode_YFSCallBack(struct afs_call *call,
struct afs_vnode *vnode,
const __be32 **_bp)
{
struct yfs_xdr_YFSCallBack *xdr = (void *)*_bp;
struct afs_cb_interest *old, *cbi = call->cbi;
u64 cb_expiry;
struct afs_callback cb;

xdr_decode_YFSCallBack_raw(call, &cb, _bp);

write_seqlock(&vnode->cb_lock);

if (!afs_cb_is_broken(call->cb_break, vnode, cbi)) {
cb_expiry = xdr_to_u64(xdr->expiration_time);
do_div(cb_expiry, 10 * 1000 * 1000);
vnode->cb_version = ntohl(xdr->version);
vnode->cb_type = ntohl(xdr->type);
vnode->cb_expires_at = cb_expiry + ktime_get_real_seconds();
vnode->cb_version = cb.version;
vnode->cb_type = cb.type;
vnode->cb_expires_at = cb.expires_at;
old = vnode->cb_interest;
if (old != call->cbi) {
vnode->cb_interest = cbi;
Expand All @@ -340,22 +355,6 @@ static void xdr_decode_YFSCallBack(struct afs_call *call,

write_sequnlock(&vnode->cb_lock);
call->cbi = cbi;
*_bp += xdr_size(xdr);
}

static void xdr_decode_YFSCallBack_raw(const __be32 **_bp,
struct afs_callback *cb)
{
struct yfs_xdr_YFSCallBack *x = (void *)*_bp;
u64 cb_expiry;

cb_expiry = xdr_to_u64(x->expiration_time);
do_div(cb_expiry, 10 * 1000 * 1000);
cb->version = ntohl(x->version);
cb->type = ntohl(x->type);
cb->expires_at = cb_expiry + ktime_get_real_seconds();

*_bp += xdr_size(x);
}

/*
Expand Down Expand Up @@ -743,7 +742,7 @@ static int yfs_deliver_fs_create_vnode(struct afs_call *call)
&call->expected_version, NULL);
if (ret < 0)
return ret;
xdr_decode_YFSCallBack_raw(&bp, call->reply[3]);
xdr_decode_YFSCallBack_raw(call, call->reply[3], &bp);
xdr_decode_YFSVolSync(&bp, NULL);

_leave(" = 0 [done]");
Expand Down Expand Up @@ -1983,7 +1982,7 @@ static int yfs_deliver_fs_fetch_status(struct afs_call *call)
&call->expected_version, NULL);
if (ret < 0)
return ret;
xdr_decode_YFSCallBack_raw(&bp, callback);
xdr_decode_YFSCallBack_raw(call, callback, &bp);
xdr_decode_YFSVolSync(&bp, volsync);

_leave(" = 0 [done]");
Expand Down Expand Up @@ -2138,7 +2137,7 @@ static int yfs_deliver_fs_inline_bulk_status(struct afs_call *call)
_debug("unmarshall CB array");
bp = call->buffer;
callbacks = call->reply[2];
xdr_decode_YFSCallBack_raw(&bp, &callbacks[call->count]);
xdr_decode_YFSCallBack_raw(call, &callbacks[call->count], &bp);
statuses = call->reply[1];
if (call->count == 0 && vnode && statuses[0].abort_code == 0) {
bp = call->buffer;
Expand Down

0 comments on commit 7810705

Please sign in to comment.