On Mon, Jul 08, 2019 at 03:23:49PM -0400, Olga Kornievskaia wrote:
> Incoming stateid (used by a READ) could be a saved copy stateid.
> On first use make it active and check that the copy has started
> within the allowable lease time.
>
> Signed-off-by: Olga Kornievskaia <kolga@xxxxxxxxxx>
> ---
> fs/nfsd/nfs4state.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 2555eb9..b786625 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -5232,6 +5232,49 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid)
>
> return 0;
> }
> +/*
> + * A READ from an inter server to server COPY will have a
> + * copy stateid. Return the parent nfs4_stid.
> + */
> +static __be32 _find_cpntf_state(struct nfsd_net *nn, stateid_t *st,
> + struct nfs4_cpntf_state **cps)
> +{
> + struct nfs4_cpntf_state *state = NULL;
> +
> + if (st->si_opaque.so_clid.cl_id != nn->s2s_cp_cl_id)
> + return nfserr_bad_stateid;
> + spin_lock(&nn->s2s_cp_lock);
> + state = idr_find(&nn->s2s_cp_stateids, st->si_opaque.so_id);
> + if (state)
> + refcount_inc(&state->cp_p_stid->sc_count);
> + spin_unlock(&nn->s2s_cp_lock);
> + if (!state)
> + return nfserr_bad_stateid;
> + *cps = state;
> + return 0;
> +}
> +
> +static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st,
> + struct nfs4_stid **stid)
> +{
> + __be32 status;
> + struct nfs4_cpntf_state *cps = NULL;
> +
> + status = _find_cpntf_state(nn, st, &cps);
> + if (status)
> + return status;
> +
> + /* Did the inter server to server copy start in time? */
> + if (cps->cp_active == false && !time_after(cps->cp_timeout, jiffies)) {
> + nfs4_put_stid(cps->cp_p_stid);
> + return nfserr_partner_no_auth;
I wonder whether instead of checking the time we should instead be
destroying copy stateid's as they expire, so the fact that you were
still able to look up the stateid suggests that it's good. Or would
that result in returning the wrong error here? Just curious.
> + } else
> + cps->cp_active = true;
> +
> + *stid = cps->cp_p_stid;
What guarantees that cp_p_stid still points to a valid stateid? (E.g.
if this is an open stateid that has since been closed.)
--b.
> +
> + return nfs_ok;
> +}
>
> /*
> * Checks for stateid operations
> @@ -5264,6 +5307,8 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid)
> status = nfsd4_lookup_stateid(cstate, stateid,
> NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID,
> &s, nn);
> + if (status == nfserr_bad_stateid)
> + status = find_cpntf_state(nn, stateid, &s);
> if (status)
> return status;
> status = nfsd4_stid_check_stateid_generation(stateid, s,
> --
> 1.8.3.1
