NFSv4.1 Sessions server code for 2.6.30
Subsystems (4)
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
In reply to J. Bruce FieldsQuoted 53 lines · J. Bruce Fields
Quoted 52 lines · Benny Halevy
Quoted 51 lines · J. Bruce Fields
Quoted 38 lines · Benny Halevy
From: Andy Adamson <[email protected]>
We need to distinguish between client names provided by NFSv4.0 clients SETCLIENTID and those provided by NFSv4.1 via
EXCHANGE_IDwhen looking up the clientid by string.Signed-off-by Benny Halevy <[email protected]>Signed-off-by Andy Adamson <[email protected]>[nfsd41: use boolean values for use_exchange_id argument]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4recover.c | 3 ++- fs/nfsd/nfs4state.c | 41 ++++++++++++++++++++++++++++++----------- include/linux/nfsd/state.h | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-)fs/nfsd/nfs4recover.c +2
-1@@ -344,7 +344,8 @@ purge_old(struct dentry *parent, struct dentry *child) {int status; -if (nfs4_has_reclaimed_state (child->d_name.name)) +/* note: we currently use this path only for minorversion 0 */ +if (nfs4_has_reclaimed_state (child->d_name.name, false))return 0 ; status =nfsd4_clear_clid_dir (parent, child);fs/nfsd/nfs4state.c +0
-0@@ -723,25 +723,44 @@ find_unconfirmed_client(clientid_t *clid)return NULL ; }fs/nfsd/nfs4state.c find_unconfirmed_client(clientid_t *clid) · line 735
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+/* +* Return 1 iff clp's clientid establishment method matches the use_exchange_id +* parameter. Matching is based on the fact the at least one of the +* EXCHGID4_FLAG_USE_{NON_PNFS,PNFS_MDS,PNFS_DS} flags must be set for v4.1 +*/ +static inline int +match_clientid_establishment (struct nfs4_client *clp,bool use_exchange_id) +{ +#if defined(CONFIG_NFSD_V4_1 ) +return (clp->cl_exchange_flags !=0 ) == (use_exchange_id != false);This seems a bit baroque; the "!= false" is a no-op, for one thing, isn't it?
Quoted 5 lines
Quoted 3 lines
The idea is to efficiently do explicit boolean comparison. Without the "!= false" the comparison will fail for 1 !=
use_exchange_id!= 0.
use_exchange_idis defined to be boolean.
Whoops. You're right.
For some reason I thought bool was just a typedef'ed int. I see that gcc's _Bool is actually doing the right thing with it.
Benny
Quoted 136 lines
--b.
Quoted 133 lines
Does this make it any clearer:
if (use_exchange_flags) return clp->cl_exchange_flags != 0; return clp->cl_exchange_flags == 0;or maybe
bool has_exchange_flags = (clp->cl_exchange_flags != 0); if (use_exchange_flags) return has_exchange_flags; return !has_exchange_flags;or a long boolean expression
return ((clp->cl_exchange_flags && use_exchange_id) || (!clp->cl_exchange_flags && !use_exchange_id))Benny
Quoted 113 lines
--b.
Quoted 111 lines
fs/nfsd/nfs4state.c +20
-11+#else /* CONFIG_NFSD_V4_1 */ +return 1 ; +#endif /* CONFIG_NFSD_V4_1 */ +} +static struct nfs4_client * -find_confirmed_client_by_str (const char *dname,unsigned int hashval) +find_confirmed_client_by_str (const char *dname,unsigned int hashval, +bool use_exchange_id) {struct nfs4_client *clp;list_for_each_entry (clp, &conf_str_hashtbl[hashval], cl_strhash) { -if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; }return NULL ; }static struct nfs4_client * -find_unconfirmed_client_by_str (const char *dname,unsigned int hashval) +find_unconfirmed_client_by_str (const char *dname,unsigned int hashval, +bool use_exchange_id) {struct nfs4_client *clp;list_for_each_entry (clp, &unconf_str_hashtbl[hashval], cl_strhash) { -if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; }return NULL ;@@ -895,7 +914,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,nfs4_lock_state (); status = nfs_ok; - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, true);if (conf) {if (!same_verf (&verf, &conf->cl_verifier)) {/* 18.35.4 case 8 */ @@ -943,7 +962,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, } } - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, true);if (unconf) {/* * Possible retry or client restart. Per 18.35.4 case 4, @@ -1041,7 +1060,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, strhashval =clientstr_hashval (dname);nfs4_lock_state (); - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, false);if (conf) {/* RFC 3530 14.2.33 CASE 0: */ status = nfserr_clid_inuse;@@ -1056,7 +1075,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,* has a description of SETCLIENTID request processing consisting * of 5 bullet points, labeled as CASE0 - CASE4 below. */ - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, false); status = nfserr_resource;if (!conf) {/* @@ -1211,7 +1230,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,unsigned int hash =clientstr_hashval (unconf->cl_recdir); conf =find_confirmed_client_by_str (unconf->cl_recdir, - hash); + hash, false);if (conf) {nfsd4_remove_clid_dir (conf);expire_client (conf);@@ -3332,12 +3351,12 @@ alloc_reclaim(void) }int -nfs4_has_reclaimed_state (const char *name) +nfs4_has_reclaimed_state (const char *name,bool use_exchange_id) {unsigned int strhashval =clientstr_hashval (name);struct nfs4_client *clp; - clp =find_confirmed_client_by_str (name, strhashval); + clp =find_confirmed_client_by_str (name, strhashval, use_exchange_id);return clp ?1 :0 ; }include/linux/nfsd/state.h +1
-1@@ -331,7 +331,7 @@ extern void nfsd4_init_recdir(char *recdir_name);extern int nfsd4_recdir_load (void );extern void nfsd4_shutdown_recdir (void );extern int nfs4_client_to_reclaim (const char *name); -extern int nfs4_has_reclaimed_state (const char *name); +extern int nfs4_has_reclaimed_state (const char *name,bool use_exchange_id);extern void nfsd4_recdir_purge_old (void );extern int nfsd4_create_clid_dir (struct nfs4_client *clp);extern void nfsd4_remove_clid_dir (struct nfs4_client *clp);Signature · 1 line
1.6.2.1
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
In reply to Benny HalevyQuoted 21 lines · Benny Halevy
From: Andy Adamson <[email protected]>
We need to distinguish between client names provided by NFSv4.0 clients SETCLIENTID and those provided by NFSv4.1 via
EXCHANGE_IDwhen looking up the clientid by string.Signed-off-by Benny Halevy <[email protected]>Signed-off-by Andy Adamson <[email protected]>[nfsd41: use boolean values for use_exchange_id argument]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4recover.c | 3 ++- fs/nfsd/nfs4state.c | 41 ++++++++++++++++++++++++++++++----------- include/linux/nfsd/state.h | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-)fs/nfsd/nfs4recover.c +0
-0
fs/nfsd/nfs4recover.c purge_old(struct dentry *parent, struct dentry *child) · line 347
Quoted 5 lines
fs/nfsd/nfs4recover.c +1
-1@@ -344,7 +344,8 @@ purge_old(struct dentry *parent, struct dentry *child) {int status; -if (nfs4_has_reclaimed_state (child->d_name.name)) +/* note: we currently use this path only for minorversion 0 */
Why is that?
Quoted 16 lines
fs/nfsd/nfs4recover.c +1
-0+if (nfs4_has_reclaimed_state (child->d_name.name, false))return 0 ; status =nfsd4_clear_clid_dir (parent, child);fs/nfsd/nfs4state.c +4
-0@@ -723,25 +723,44 @@ find_unconfirmed_client(clientid_t *clid)return NULL ; } +/* +* Return 1 iff clp's clientid establishment method matches the use_exchange_id +* parameter. Matching is based on the fact the at least one of the +* EXCHGID4_FLAG_USE_{NON_PNFS,PNFS_MDS,PNFS_DS} flags must be set for v4.1
fs/nfsd/nfs4state.c find_unconfirmed_client(clientid_t *clid) · line 739
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+*/ +static inline int +match_clientid_establishment (struct nfs4_client *clp,bool use_exchange_id) +{ +#if defined(CONFIG_NFSD_V4_1 ) +return (clp->cl_exchange_flags !=0 ) == (use_exchange_id != false); +#else /* CONFIG_NFSD_V4_1 */ +return 1 ; +#endif /* CONFIG_NFSD_V4_1 */ +}
If the point is just to ensure that clients only match clients of the same minorversion, why not just call this match_client_minorversion()? You could still use cl_exchange_flags as the way to distinguish 4.0 from 4.1, but hide that detail away here. In which case clearer might be:
static inline u32 client_minorversion(struct nfs4_client *clp)
{
/*
* Note 4.1 clients always have one of
* EXCHGID4_FLAG_USE{NON_PNFS,PNFS_MDS,PNFS_DS} set.
*/
return clp->cl_exchange_flags != 0;
}
static inline int client_same_minorversion(nfs4_client *clp, u32 minorversion)
{
return client_minorversion(clp) == minorversion;
}or even just open-code the latter.
But: are the 4.0 and 4.1 client owner-name namespaces actually meant to be distinct? 2.4.1 has me a bit confused here.
--b.
Quoted 107 lines
fs/nfsd/nfs4state.c +16
-11+static struct nfs4_client * -find_confirmed_client_by_str (const char *dname,unsigned int hashval) +find_confirmed_client_by_str (const char *dname,unsigned int hashval, +bool use_exchange_id) {struct nfs4_client *clp;list_for_each_entry (clp, &conf_str_hashtbl[hashval], cl_strhash) { -if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; }return NULL ; }static struct nfs4_client * -find_unconfirmed_client_by_str (const char *dname,unsigned int hashval) +find_unconfirmed_client_by_str (const char *dname,unsigned int hashval, +bool use_exchange_id) {struct nfs4_client *clp;list_for_each_entry (clp, &unconf_str_hashtbl[hashval], cl_strhash) { -if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; }return NULL ;@@ -895,7 +914,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,nfs4_lock_state (); status = nfs_ok; - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, true);if (conf) {if (!same_verf (&verf, &conf->cl_verifier)) {/* 18.35.4 case 8 */ @@ -943,7 +962,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, } } - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, true);if (unconf) {/* * Possible retry or client restart. Per 18.35.4 case 4, @@ -1041,7 +1060,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, strhashval =clientstr_hashval (dname);nfs4_lock_state (); - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, false);if (conf) {/* RFC 3530 14.2.33 CASE 0: */ status = nfserr_clid_inuse;@@ -1056,7 +1075,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,* has a description of SETCLIENTID request processing consisting * of 5 bullet points, labeled as CASE0 - CASE4 below. */ - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, false); status = nfserr_resource;if (!conf) {/* @@ -1211,7 +1230,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,unsigned int hash =clientstr_hashval (unconf->cl_recdir); conf =find_confirmed_client_by_str (unconf->cl_recdir, - hash); + hash, false);if (conf) {nfsd4_remove_clid_dir (conf);expire_client (conf);@@ -3332,12 +3351,12 @@ alloc_reclaim(void) }int -nfs4_has_reclaimed_state (const char *name) +nfs4_has_reclaimed_state (const char *name,bool use_exchange_id) {unsigned int strhashval =clientstr_hashval (name);struct nfs4_client *clp; - clp =find_confirmed_client_by_str (name, strhashval); + clp =find_confirmed_client_by_str (name, strhashval, use_exchange_id);return clp ?1 :0 ; }include/linux/nfsd/state.h +1
-1@@ -331,7 +331,7 @@ extern void nfsd4_init_recdir(char *recdir_name);extern int nfsd4_recdir_load (void );extern void nfsd4_shutdown_recdir (void );extern int nfs4_client_to_reclaim (const char *name); -extern int nfs4_has_reclaimed_state (const char *name); +extern int nfs4_has_reclaimed_state (const char *name,bool use_exchange_id);extern void nfsd4_recdir_purge_old (void );extern int nfsd4_create_clid_dir (struct nfs4_client *clp);extern void nfsd4_remove_clid_dir (struct nfs4_client *clp);Signature · 1 line
1.6.2.1
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
Quoted 25 lines · J. Bruce Fields
Quoted 24 lines · Benny Halevy
From: Andy Adamson <[email protected]>
We need to distinguish between client names provided by NFSv4.0 clients SETCLIENTID and those provided by NFSv4.1 via
EXCHANGE_IDwhen looking up the clientid by string.Signed-off-by Benny Halevy <[email protected]>Signed-off-by Andy Adamson <[email protected]>[nfsd41: use boolean values for use_exchange_id argument]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4recover.c | 3 ++- fs/nfsd/nfs4state.c | 41 ++++++++++++++++++++++++++++++----------- include/linux/nfsd/state.h | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-)fs/nfsd/nfs4recover.c +0
-0@@ -344,7 +344,8 @@ purge_old(struct dentry *parent, struct dentry *child) {int status;
Quoted 4 lines
fs/nfsd/nfs4recover.c purge_old(struct dentry *parent, struct dentry *child) · line 347
Quoted 2 lines
fs/nfsd/nfs4recover.c +1
-1-if (nfs4_has_reclaimed_state (child->d_name.name)) +/* note: we currently use this path only for minorversion 0 */ Why is that?
Hmm, I'm not sure this is true anymore.
Andy, do you recall?
One thing for sure, we currently implemented nothing to propagate the "use_exchange_id" state onto the state recovery mechanisms, so this comment merely reflects that, though it isn't clear what "this path" means in this context, i.e. is this the path we were called in, or the path we're calling.
At any rate, if this is something we need to fix for 4.1 and it does not introduce any regression to 4.0, and if the fix isn't trivial/simple, I suggest we add a FIXME comment, and add it to our todo list to defer the solution post this push effort.
Quoted 47 lines
Quoted 17 lines
fs/nfsd/nfs4recover.c +1
-0+if (nfs4_has_reclaimed_state (child->d_name.name, false))return 0 ; status =nfsd4_clear_clid_dir (parent, child);fs/nfsd/nfs4state.c +4
-0@@ -723,25 +723,44 @@ find_unconfirmed_client(clientid_t *clid)return NULL ; } +/* +* Return 1 iff clp's clientid establishment method matches the use_exchange_id +* parameter. Matching is based on the fact the at least one of the +* EXCHGID4_FLAG_USE_{NON_PNFS,PNFS_MDS,PNFS_DS} flags must be set for v4.1 fs/nfsd/nfs4state.c find_unconfirmed_client(clientid_t *clid) · line 739
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+*/ +static inline int +match_clientid_establishment (struct nfs4_client *clp,bool use_exchange_id) +{ +#if defined(CONFIG_NFSD_V4_1 ) +return (clp->cl_exchange_flags !=0 ) == (use_exchange_id != false); +#else /* CONFIG_NFSD_V4_1 */ +return 1 ; +#endif /* CONFIG_NFSD_V4_1 */ +}If the point is just to ensure that clients only match clients of the same minorversion, why not just call this
match_client_minorversion()? You could still usecl_exchange_flagsas the way to distinguish 4.0 from 4.1, but hide that detail away here. In which case clearer might be:static inline u32 client_minorversion(struct nfs4_client *clp) { /* * Note 4.1 clients always have one of * EXCHGID4_FLAG_USE{NON_PNFS,PNFS_MDS,PNFS_DS} set. */ return clp->cl_exchange_flags != 0; } static inline int client_same_minorversion(nfs4_client *clp, u32 minorversion) { return client_minorversion(clp) == minorversion; }
Quoted 1 line
or even just open-code the latter.
I don't like using "minorversion" here since it is a numeric attribute and may be larger than 1 in the future. What we care about here is whether the clientid was established via EXCHANGE_ID or via nfsv4.0 SET_CLIENTID et al, therefore we used cl_exchange_flags as an indication.
Quoted 3 lines
But: are the 4.0 and 4.1 client owner-name namespaces actually meant to be distinct? 2.4.1 has me a bit confused here.
This case is not implemented yet (note to self - update Doc) If we implement it, and deal with v4.1 -> v4.1 downgrade (or prevention thereof), then I think we can indeed unify the clientid spaces. However, 2.4.1 is optional and we don't have to implement it right now.
Benny
Quoted 110 lines
--b.
Quoted 107 lines
fs/nfsd/nfs4state.c +16
-11+static struct nfs4_client * -find_confirmed_client_by_str (const char *dname,unsigned int hashval) +find_confirmed_client_by_str (const char *dname,unsigned int hashval, +bool use_exchange_id) {struct nfs4_client *clp;list_for_each_entry (clp, &conf_str_hashtbl[hashval], cl_strhash) { -if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; }return NULL ; }static struct nfs4_client * -find_unconfirmed_client_by_str (const char *dname,unsigned int hashval) +find_unconfirmed_client_by_str (const char *dname,unsigned int hashval, +bool use_exchange_id) {struct nfs4_client *clp;list_for_each_entry (clp, &unconf_str_hashtbl[hashval], cl_strhash) { -if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; }return NULL ;@@ -895,7 +914,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,nfs4_lock_state (); status = nfs_ok; - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, true);if (conf) {if (!same_verf (&verf, &conf->cl_verifier)) {/* 18.35.4 case 8 */ @@ -943,7 +962,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, } } - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, true);if (unconf) {/* * Possible retry or client restart. Per 18.35.4 case 4, @@ -1041,7 +1060,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, strhashval =clientstr_hashval (dname);nfs4_lock_state (); - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, false);if (conf) {/* RFC 3530 14.2.33 CASE 0: */ status = nfserr_clid_inuse;@@ -1056,7 +1075,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,* has a description of SETCLIENTID request processing consisting * of 5 bullet points, labeled as CASE0 - CASE4 below. */ - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, false); status = nfserr_resource;if (!conf) {/* @@ -1211,7 +1230,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,unsigned int hash =clientstr_hashval (unconf->cl_recdir); conf =find_confirmed_client_by_str (unconf->cl_recdir, - hash); + hash, false);if (conf) {nfsd4_remove_clid_dir (conf);expire_client (conf);@@ -3332,12 +3351,12 @@ alloc_reclaim(void) }int -nfs4_has_reclaimed_state (const char *name) +nfs4_has_reclaimed_state (const char *name,bool use_exchange_id) {unsigned int strhashval =clientstr_hashval (name);struct nfs4_client *clp; - clp =find_confirmed_client_by_str (name, strhashval); + clp =find_confirmed_client_by_str (name, strhashval, use_exchange_id);return clp ?1 :0 ; }include/linux/nfsd/state.h +1
-1@@ -331,7 +331,7 @@ extern void nfsd4_init_recdir(char *recdir_name);extern int nfsd4_recdir_load (void );extern void nfsd4_shutdown_recdir (void );extern int nfs4_client_to_reclaim (const char *name); -extern int nfs4_has_reclaimed_state (const char *name); +extern int nfs4_has_reclaimed_state (const char *name,bool use_exchange_id);extern void nfsd4_recdir_purge_old (void );extern int nfsd4_create_clid_dir (struct nfs4_client *clp);extern void nfsd4_remove_clid_dir (struct nfs4_client *clp);Signature · 1 line
1.6.2.1
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
Quoted 28 lines · Benny Halevy
Quoted 27 lines · J. Bruce Fields
Quoted 26 lines · Benny Halevy
From: Andy Adamson <[email protected]>
We need to distinguish between client names provided by NFSv4.0 clients SETCLIENTID and those provided by NFSv4.1 via
EXCHANGE_IDwhen looking up the clientid by string.Signed-off-by Benny Halevy <[email protected]>Signed-off-by Andy Adamson <[email protected]>[nfsd41: use boolean values for use_exchange_id argument]Signed-off-by Benny Halevy <[email protected]>---
fs/nfsd/nfs4recover.c| 3 ++-fs/nfsd/nfs4state.c| 41 ++++++++++++++++++++++++++++++----------- include/linux/nfsd/state.h | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-)fs/nfsd/nfs4recover.c +0
-0@@ -344,7 +344,8 @@ purge_old(struct dentry *parent, struct dentry *child) {int status;
Quoted 7 lines
Quoted 4 lines
fs/nfsd/nfs4recover.c purge_old(struct dentry *parent, struct dentry *child) · line 347
Quoted 2 lines
fs/nfsd/nfs4recover.c +1
-1-if (nfs4_has_reclaimed_state (child->d_name.name)) +/* note: we currently use this path only for minorversion 0 */ Why is that?
Hmm, I'm not sure this is true anymore.
Andy, do you recall?
I believe this was very early code intended to address the recovery of clientid's established via exchange_id which was never addressed.
Quoted 7 lines
One thing for sure, we currently implemented nothing to propagate the "
use_exchange_id" state onto the state recovery mechanisms, so this comment merely reflects that, though it isn't clear what "this path" means in this context, i.e. is this the path we were called in, or the path we're calling.
Since nfsd4_create_clid_dir is only called in nfsd4_clientid_confirm, we never store a clientid established by exchange_id in the recovery directory.
Quoted 6 lines
At any rate, if this is something we need to fix for 4.1 and it does not introduce any regression to 4.0, and if the fix isn't trivial/simple, I suggest we add a FIXME comment, and add it to our todo list to defer the solution post this push effort.
I agree. Update the above comment to a FIXME.
-->Andy
Quoted 193 lines
Quoted 54 lines
Quoted 29 lines
fs/nfsd/nfs4recover.c +1
-0+if (nfs4_has_reclaimed_state (child->d_name.name, false))return 0 ;status = nfsd4_clear_clid_dir(parent, child);fs/nfsd/nfs4state.c +2
-0@@ -723,25 +723,44 @@ find_unconfirmed_client(clientid_t *clid)return NULL ; } +/* +* Return 1 iff clp's clientid establishment method matches the
use_exchange_id
+ * parameter. Matching is based on the fact the at least one of the
+ * EXCHGID4_FLAG_USE_{NON_PNFS,PNFS_MDS,PNFS_DS} flags must be set for v4.1
+ */fs/nfsd/nfs4state.c +2
-0+static inline int +match_clientid_establishment(struct nfs4_client *clp, bool
use_exchange_id)fs/nfsd/nfs4state.c +3
-0+{ +#if defined(CONFIG_NFSD_V4_1 ) + return (clp->cl_exchange_flags != 0) == (use_exchange_id !=false);
fs/nfsd/nfs4state.c find_unconfirmed_client(clientid_t *clid) · line 739
Quoted 4 lines
fs/nfsd/nfs4state.c +4
-0+#else /* CONFIG_NFSD_V4_1 */ +return 1 ; +#endif /* CONFIG_NFSD_V4_1 */ +}If the point is just to ensure that clients only match clients of the same minorversion, why not just call this
match_client_minorversion()? You could still usecl_exchange_flagsas the way to distinguish 4.0 from 4.1, but hide that detail away here. In which case clearer might be:static inline u32 client_minorversion(struct nfs4_client *clp) { /* * Note 4.1 clients always have one of * EXCHGID4_FLAG_USE{NON_PNFS,PNFS_MDS,PNFS_DS} set. */ return clp->cl_exchange_flags != 0; } static inline int client_same_minorversion(nfs4_client *clp, u32 minorversion) { return client_minorversion(clp) == minorversion; }Quoted 1 line
or even just open-code the latter.
I don't like using "minorversion" here since it is a numeric attribute and may be larger than 1 in the future. What we care about here is whether the clientid was established via
EXCHANGE_IDor via nfsv4.0SET_CLIENTIDet al, therefore we usedcl_exchange_flagsas an indication.Quoted 3 lines
But: are the 4.0 and 4.1 client owner-name namespaces actually meant to be distinct? 2.4.1 has me a bit confused here.
This case is not implemented yet (note to self - update Doc) If we implement it, and deal with v4.1 -> v4.1 downgrade (or prevention thereof), then I think we can indeed unify the clientid spaces. However, 2.4.1 is optional and we don't have to implement it right now.
Benny
Quoted 121 lines
--b.
Quoted 118 lines
+
static structnfs4_client* -find_confirmed_client_by_str(const char *dname, unsigned int hashval)
+find_confirmed_client_by_str(const char *dname, unsigned int hashval,fs/nfsd/nfs4state.c +1
-0+ bool use_exchange_id){ struct nfs4_client *clp; list_for_each_entry(clp, &conf_str_hashtbl[hashval], cl_strhash) {fs/nfsd/nfs4state.c +2
-1-if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; } return NULL; }static struct
nfs4_client* -find_unconfirmed_client_by_str(const char *dname, unsigned int hashval)
+find_unconfirmed_client_by_str(const char *dname, unsigned int hashval,fs/nfsd/nfs4state.c +1
-0+ bool use_exchange_id){ struct nfs4_client *clp; list_for_each_entry(clp, &unconf_str_hashtbl[hashval],
cl_strhash) {fs/nfsd/nfs4state.c +2
-1-if (same_name (clp->cl_recdir, dname)) +if (same_name (clp->cl_recdir, dname) && +match_clientid_establishment (clp, use_exchange_id))return clp; } return NULL;fs/nfsd/nfs4state.c +3
-3@@ -895,7 +914,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,nfs4_lock_state (); status = nfs_ok; - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, true);if (conf) {if (!same_verf (&verf, &conf->cl_verifier)) {/* 18.35.4 case 8 */ @@ -943,7 +962,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, } } - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, true);if (unconf) {/* * Possible retry or client restart. Per 18.35.4 case 4, @@ -1041,7 +1060,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, strhashval =clientstr_hashval (dname);nfs4_lock_state (); - conf =find_confirmed_client_by_str (dname, strhashval); + conf =find_confirmed_client_by_str (dname, strhashval, false);if (conf) {/* RFC 3530 14.2.33 CASE 0: */ status = nfserr_clid_inuse;fs/nfsd/nfs4state.c +1
-1@@ -1056,7 +1075,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, * has a description of SETCLIENTID request processing consisting * of 5 bullet points, labeled as CASE0 - CASE4 below. */ - unconf =find_unconfirmed_client_by_str (dname, strhashval); + unconf =find_unconfirmed_client_by_str (dname, strhashval, false); status = nfserr_resource;if (!conf) {/*fs/nfsd/nfs4state.c +1
-1@@ -1211,7 +1230,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, unsigned int hash =clientstr_hashval (unconf->cl_recdir); conf =find_confirmed_client_by_str (unconf->cl_recdir, - hash); + hash, false);if (conf) {nfsd4_remove_clid_dir (conf);expire_client(conf);fs/nfsd/nfs4state.c +0
-0@@ -3332,12 +3351,12 @@ alloc_reclaim(void) }int
fs/nfsd/nfs4state.c +1
-1-nfs4_has_reclaimed_state(const char *name) +nfs4_has_reclaimed_state(const char *name, bool use_exchange_id){ unsigned int strhashval = clientstr_hashval(name); struct nfs4_client *clp;fs/nfsd/nfs4state.c +1
-1- clp =find_confirmed_client_by_str (name, strhashval); + clp = find_confirmed_client_by_str(name, strhashval,use_exchange_id); return clp ? 1 : 0; }include/linux/nfsd/state.h +1
-1@@ -331,7 +331,7 @@ extern void nfsd4_init_recdir(char *recdir_name);extern int nfsd4_recdir_load (void );extern void nfsd4_shutdown_recdir (void );extern int nfs4_client_to_reclaim (const char *name); -extern int nfs4_has_reclaimed_state (const char *name); +extern int nfs4_has_reclaimed_state (const char *name,bool use_exchange_id);extern void nfsd4_recdir_purge_old (void );extern int
nfsd4_create_clid_dir(struct nfs4_client *clp); extern voidnfsd4_remove_clid_dir(struct nfs4_client *clp);Signature · 1 line
1.6.2.1
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
Quoted 6 lines · Andy Adamson
Quoted 5 lines · Benny Halevy
At any rate, if this is something we need to fix for 4.1 and it does not introduce any regression to 4.0, and if the fix isn't trivial/simple, I suggest we add a FIXME comment, and add it to our todo list to defer the solution post this push effort.
OK, apologies, it's just takes me much too long to catch up with all of you, and make sure I understand these patches.
And I'm conflicted.
On the one hand, submission-time gives a really clear point at which to do review and handle any problems found. I'm a little worried that some problems will be forgotten once the code is in.
On the other hand, there's a lot of 4.1 development going on and it would be better to see it happening in mainline than out. I don't see any more v2/v3/v4.0 regressions, and people in general seem willing to track and respond to comments.
On the other other hand, I do at least want to reassure myself that this is a reasonable basis for further development.
I'd like to put off the callback stuff for now, at least: the addition of a mutex held over the callbacks worries me, and interferes with an ongoing attempt to make all the callback code asynchronous. And I haven't tried to review the rpc-level code there yet (and haven't seen review of it from Trond).
Would it be possible to get one last revison of the patch series which stops short of the callback stuff (so, the first 32 patches or so), and fixes the trivial-to-fix stuff? And would it be possible to do that by (ulp) tomorrow?
--b.
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
By the way, one more random question: the basic tests I run before submitting patches, for example, are mainly just pynfs and cthon. I'd should start adding some 4.1 tests: suggestions? E.g. could anyone suggest a reasonable commandline for the 4.1 pynfs tests that excludes known failing tests?
--b.
Re: [PATCH v2 16/47] nfsd41: match clientid establishment method
In reply to J. Bruce FieldsQuoted 17 lines · J. Bruce Fields
Quoted 6 lines · Andy Adamson
Quoted 5 lines · Benny Halevy
At any rate, if this is something we need to fix for 4.1 and it does not introduce any regression to 4.0, and if the fix isn't trivial/simple, I suggest we add a FIXME comment, and add it to our todo list to defer the solution post this push effort.
OK, apologies, it's just takes me much too long to catch up with all of you, and make sure I understand these patches.
And I'm conflicted.
On the one hand, submission-time gives a really clear point at which to do review and handle any problems found. I'm a little worried that some problems will be forgotten once the code is in.
Quoted 7 lines
On the other hand, there's a lot of 4.1 development going on and it would be better to see it happening in mainline than out. I don't see any more v2/v3/v4.0 regressions, and people in general seem willing to track and respond to comments.
On the other other hand, I do at least want to reassure myself that this is a reasonable basis for further development.
Absolutely. I was just trying to set the focus on the top priority, IMO:
flushing out the interaction with v4.0 and making sure there are no regressions. I know that the v4.1 code is far from being perfect, even with respect to the spec and I like your idea of at least documenting what we have and what we don't, and what needs fixing.
As you said, keeping the code out of tree doesn't make it any easier to fix or maintain so getting the new code in, in spite of possible flaws with the *new* functionality as long as it's in a good enough shape as a starting point, can just accelerate its development.
Quoted 6 lines
I'd like to put off the callback stuff for now, at least: the addition of a mutex held over the callbacks worries me, and interferes with an ongoing attempt to make all the callback code asynchronous. And I haven't tried to review the rpc-level code there yet (and haven't seen review of it from Trond).
Understood.
Quoted 5 lines
Would it be possible to get one last revison of the patch series which stops short of the callback stuff (so, the first 32 patches or so), and fixes the trivial-to-fix stuff? And would it be possible to do that by (ulp) tomorrow?
I'm on it.
Benny
Quoted 2 lines
--b.
PATCH v2 17/47 nfsd41: sequence operation
In reply to Benny HalevyImplement the sequence operation conforming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26
Check for stale clientid (as derived from the sessionid). Enforce slotid range and exactly-once semantics using the slotid and seqid.
If everything went well renew the client lease and mark the slot INPROGRESS.
--- fs/nfsd/nfs4state.c | 71 +++++++++++++++++++++++++++++++++++++++++++- fs/nfsd/nfs4xdr.c | 32 +++++++++++++++++++- include/linux/nfsd/xdr4.h | 10 ++++++- 3 files changed, 108 insertions(+), 5 deletions(-)
fs/nfsd/nfs4state.c +69 -2
@@ -1004,6 +1004,32 @@ error:return status; } +static int +check_slot_seqid (u32 seqid,struct nfsd4_slot *slot) +{ +dprintk ("%s enter. seqid %d slot->sl_seqid %d\n" , __func__, seqid, + slot->sl_seqid); + +/* The slot is in use, and no response has been sent. */ +if (slot->sl_inuse) { +if (seqid == slot->sl_seqid) +return nfserr_jukebox; +else +return nfserr_seq_misordered; + } +/* Normal */ +if (likely (seqid == slot->sl_seqid +1 )) +return nfs_ok; +/* Replay */ +if (seqid == slot->sl_seqid) +return nfserr_replay_cache; +/* Wraparound */ +if (seqid ==1 && (slot->sl_seqid +1 ) ==0 ) +return nfs_ok; +/* Misordered replay or misordered new request */ +return nfserr_seq_misordered; +} + __be32 nfsd4_create_session(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
@@ -1021,11 +1047,52 @@ nfsd4_destroy_session(struct svc_rqst *r, }__be32 -nfsd4_sequence (struct svc_rqst *r, +nfsd4_sequence (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,struct nfsd4_sequence *seq) { -return -1 ;/* stub */ +struct nfsd4_session *session; +struct nfsd4_slot *slot; +int status; + +spin_lock (&sessionid_lock); + status = nfserr_badsession; + session =find_in_sessionid_hashtbl (&seq->sessionid); +if (!session) + goto out; + + status = nfserr_badslot; +if (seq->slotid >= session->se_fnumslots) + goto out; + + slot = &session->se_slots[seq->slotid]; +dprintk ("%s: slotid %d\n" , __func__, seq->slotid); + + status =check_slot_seqid (seq->seqid, slot); +if (status == nfserr_replay_cache) { + cstate->slot = slot; + goto replay_cache; + } +if (status) + goto out; + +/* Success! bump slot seqid */ + slot->sl_inuse = true; + slot->sl_seqid = seq->seqid; + + cstate->slot = slot; + +replay_cache: +/* Renew the clientid on success and on replay. +* Hold a session reference until done processing the compound: +* nfsd4_put_session called only if the cstate slot is set. +*/ +renew_client (session->se_client); +nfsd4_get_session (slot->sl_session); +out: +spin_unlock (&sessionid_lock); +dprintk ("%s: return %d\n" , __func__,ntohl (status)); +return status; }#endif /* CONFIG_NFSD_V4_1 */
fs/nfsd/nfs4xdr.c +30 -2
@@ -1114,7 +1114,16 @@ static __be32 nfsd4_decode_sequence(struct nfsd4_compoundargs *argp, struct nfsd4_sequence *seq) { - return nfserr_opnotsupp; /* stub */ +DECODE_HEAD ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (seq->sessionid.data,NFS4_MAX_SESSIONID_LEN ); +READ32 (seq->seqid); +READ32 (seq->slotid); +READ32 (seq->maxslots); +READ32 (seq->cachethis); + +DECODE_TAIL ; }#endif /* CONFIG_NFSD_V4_1 */
@@ -2836,7 +2845,26 @@ static __be32 nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_sequence *seq) { - /* stub */ +ENCODE_HEAD ; + +if (nfserr) + goto out; + +RESERVE_SPACE (NFS4_MAX_SESSIONID_LEN +20 ); +WRITEMEM (seq->sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (seq->seqid); +WRITE32 (seq->slotid); +WRITE32 (seq->maxslots); +/* +* FIXME: for now: +* target_maxslots = maxslots +* status_flags = 0 +*/ +WRITE32 (seq->maxslots); +WRITE32 (0 ); + +ADJUST_ARGS (); +out:return nfserr; }#endif /* CONFIG_NFSD_V4_1 */
include/linux/nfsd/xdr4.h +9 -1
@@ -362,7 +362,15 @@ struct nfsd4_create_session { };struct nfsd4_sequence { -int foo;/* stub */ +struct nfs4_sessionid sessionid;/* request/response */ +u32 seqid;/* request/response */ +u32 slotid;/* request/response */ +u32 maxslots;/* request/response */ +u32 cachethis;/* request */ +#if 0 +u32 target_maxslots;/* response */ +u32 status_flags;/* response */ +#endif /* not yet */ };struct nfsd4_destroy_session {
Signature · 1 line
1.6.2.1
Re: [PATCH v2 17/47] nfsd41: sequence operation
Quoted 137 lines · Benny Halevy
Implement the sequence operation conforming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26Check for stale clientid (as derived from the sessionid). Enforce slotid range and exactly-once semantics using the slotid and seqid.
If everything went well renew the client lease and mark the slot INPROGRESS.
[nfsd41: rename sequence catchthis to cachethis]Signed-off-by Andy Adamson<[email protected]>[pulled some code to set cstate->slot from "nfsd DRC logic"][use sessionid_lock spin lock][nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4state.c | 71 +++++++++++++++++++++++++++++++++++++++++++- fs/nfsd/nfs4xdr.c | 32 +++++++++++++++++++- include/linux/nfsd/xdr4.h | 10 ++++++- 3 files changed, 108 insertions(+), 5 deletions(-)fs/nfsd/nfs4state.c +69
-2@@ -1004,6 +1004,32 @@ error:return status; } +static int +check_slot_seqid (u32 seqid,struct nfsd4_slot *slot) +{ +dprintk ("%s enter. seqid %d slot->sl_seqid %d\n" , __func__, seqid, + slot->sl_seqid); + +/* The slot is in use, and no response has been sent. */ +if (slot->sl_inuse) { +if (seqid == slot->sl_seqid) +return nfserr_jukebox; +else +return nfserr_seq_misordered; + } +/* Normal */ +if (likely (seqid == slot->sl_seqid +1 )) +return nfs_ok; +/* Replay */ +if (seqid == slot->sl_seqid) +return nfserr_replay_cache; +/* Wraparound */ +if (seqid ==1 && (slot->sl_seqid +1 ) ==0 ) +return nfs_ok; +/* Misordered replay or misordered new request */ +return nfserr_seq_misordered; +} + __be32 nfsd4_create_session(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,@@ -1021,11 +1047,52 @@ nfsd4_destroy_session(struct svc_rqst *r, }__be32 -nfsd4_sequence (struct svc_rqst *r, +nfsd4_sequence (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,struct nfsd4_sequence *seq) { -return -1 ;/* stub */ +struct nfsd4_session *session; +struct nfsd4_slot *slot; +int status; + +spin_lock (&sessionid_lock); + status = nfserr_badsession; + session =find_in_sessionid_hashtbl (&seq->sessionid); +if (!session) + goto out; + + status = nfserr_badslot; +if (seq->slotid >= session->se_fnumslots) + goto out; + + slot = &session->se_slots[seq->slotid]; +dprintk ("%s: slotid %d\n" , __func__, seq->slotid); + + status =check_slot_seqid (seq->seqid, slot); +if (status == nfserr_replay_cache) { + cstate->slot = slot; + goto replay_cache; + } +if (status) + goto out; + +/* Success! bump slot seqid */ + slot->sl_inuse = true; + slot->sl_seqid = seq->seqid; + + cstate->slot = slot; + +replay_cache: +/* Renew the clientid on success and on replay. +* Hold a session reference until done processing the compound: +* nfsd4_put_session called only if the cstate slot is set. +*/ +renew_client (session->se_client); +nfsd4_get_session (slot->sl_session); +out: +spin_unlock (&sessionid_lock); +dprintk ("%s: return %d\n" , __func__,ntohl (status)); +return status; }#endif /* CONFIG_NFSD_V4_1 */ fs/nfsd/nfs4xdr.c +10
-1@@ -1114,7 +1114,16 @@ static __be32 nfsd4_decode_sequence(struct nfsd4_compoundargs *argp, struct nfsd4_sequence *seq) { - return nfserr_opnotsupp; /* stub */ +DECODE_HEAD ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (seq->sessionid.data,NFS4_MAX_SESSIONID_LEN ); +READ32 (seq->seqid); +READ32 (seq->slotid); +READ32 (seq->maxslots); +READ32 (seq->cachethis); + +DECODE_TAIL ; }#endif /* CONFIG_NFSD_V4_1 */
fs/nfsd/nfs4xdr.c static __be32 · line 2851
Quoted 8 lines
fs/nfsd/nfs4xdr.c +4
-1@@ -2836,7 +2845,26 @@ static __be32 nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_sequence *seq) { -/* stub */ +ENCODE_HEAD ; + +if (nfserr) + goto out;
Just 'return nfserr'. I don't see the point of the goto if it's literally just replacing a return.
Quoted 27 lines
fs/nfsd/nfs4xdr.c +16
-0+ +RESERVE_SPACE (NFS4_MAX_SESSIONID_LEN +20 ); +WRITEMEM (seq->sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (seq->seqid); +WRITE32 (seq->slotid); +WRITE32 (seq->maxslots); +/* +* FIXME: for now: +* target_maxslots = maxslots +* status_flags = 0 +*/ +WRITE32 (seq->maxslots); +WRITE32 (0 ); + +ADJUST_ARGS (); +out: return nfserr; }#endif /* CONFIG_NFSD_V4_1 */ include/linux/nfsd/xdr4.h +0
-0@@ -362,7 +362,15 @@ struct nfsd4_create_session { };struct nfsd4_sequence {
include/linux/nfsd/xdr4.h struct nfsd4_create_session { · line 373
Quoted 10 lines
include/linux/nfsd/xdr4.h +9
-1-int foo;/* stub */ +struct nfs4_sessionid sessionid;/* request/response */ +u32 seqid;/* request/response */ +u32 slotid;/* request/response */ +u32 maxslots;/* request/response */ +u32 cachethis;/* request */ +#if 0 +u32 target_maxslots;/* response */ +u32 status_flags;/* response */ +#endif /* not yet */
I'd rather that be patched in when it's needed, but OK.
--b.
Quoted 6 lines
include/linux/nfsd/xdr4.h +0
-0};struct nfsd4_destroy_session {Signature · 1 line
1.6.2.1
PATCH v2 18/47 nfsd41: enforce NFS4ERR_SEQUENCE_POS operation order rules
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
--- fs/nfsd/nfs4proc.c | 24 ++++++++++++++++-------- fs/nfsd/nfs4state.c | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-)
fs/nfsd/nfs4proc.c +16 -8
@@ -811,14 +811,15 @@ static inline void nfsd4_increment_op_stats(u32 opnum)typedef __be32 (*nfsd4op_func )(struct svc_rqst *,struct nfsd4_compound_state *,void *); +enum nfsd4_op_flags { +ALLOWED_WITHOUT_FH =1 <<0 ,/* No current filehandle required */ +ALLOWED_ON_ABSENT_FS =2 <<0 ,/* ops processed on absent fs */ +ALLOWED_AS_FIRST_OP =3 <<0 ,/* ops reqired first in compound */ +};struct nfsd4_operation {nfsd4op_func op_func;u32 op_flags; -/* Most ops require a valid current filehandle; a few don't: */ -#define ALLOWED_WITHOUT_FH 1 -/* GETATTR and ops not listed as returning NFS4ERR_MOVED: */ -#define ALLOWED_ON_ABSENT_FS 2char *op_name; };
@@ -864,6 +865,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,if (args->minorversion >NFSD_SUPPORTED_MINOR_VERSION ) goto out; + op = &args->ops[0 ]; +if (args->opcnt >0 && op->status != nfserr_op_illegal && + !(nfsd4_ops[op->opnum].op_flags &ALLOWED_AS_FIRST_OP )) { + op->status = nfserr_sequence_pos; + goto encode_op; + } + status = nfs_ok;while (!status && resp->opcnt < args->opcnt) { op = &args->ops[resp->opcnt++];
@@ -1104,22 +1112,22 @@ static struct nfsd4_operation nfsd4_ops[] = {#if defined(CONFIG_NFSD_V4_1 ) [OP_EXCHANGE_ID] = { .op_func = (nfsd4op_func)nfsd4_exchange_id, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_EXCHANGE_ID", }, [OP_CREATE_SESSION] = { .op_func = (nfsd4op_func)nfsd4_create_session, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_CREATE_SESSION", }, [OP_DESTROY_SESSION] = { .op_func = (nfsd4op_func)nfsd4_destroy_session, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_DESTROY_SESSION", }, [OP_SEQUENCE] = { .op_func = (nfsd4op_func)nfsd4_sequence, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_SEQUENCE", }, #endif /* CONFIG_NFSD_V4_1 */
fs/nfsd/nfs4state.c +4 -0
@@ -1051,10 +1051,14 @@ nfsd4_sequence(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, struct nfsd4_sequence *seq) { + struct nfsd4_compoundres *resp = rqstp->rq_resp;struct nfsd4_session *session;struct nfsd4_slot *slot;int status; +if (resp->opcnt !=1 ) +return nfserr_sequence_pos; +spin_lock (&sessionid_lock); status = nfserr_badsession; session =find_in_sessionid_hashtbl (&seq->sessionid);
Signature · 1 line
1.6.2.1
Re: [PATCH v2 18/47] nfsd41: enforce NFS4ERR_SEQUENCE_POS operation order rules
There are a number of other ordering requirements too:
- EXCHANGE_ID must be the only op if there's no sequence
- DESTROY_SESSION must be the last op in its compound, I think?
Are there others? And are these enforced somewhere as well?
--b.
Quoted 96 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 24 ++++++++++++++++-------- fs/nfsd/nfs4state.c | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-)fs/nfsd/nfs4proc.c +16
-8@@ -811,14 +811,15 @@ static inline void nfsd4_increment_op_stats(u32 opnum)typedef __be32 (*nfsd4op_func )(struct svc_rqst *,struct nfsd4_compound_state *,void *); +enum nfsd4_op_flags { +ALLOWED_WITHOUT_FH =1 <<0 ,/* No current filehandle required */ +ALLOWED_ON_ABSENT_FS =2 <<0 ,/* ops processed on absent fs */ +ALLOWED_AS_FIRST_OP =3 <<0 ,/* ops reqired first in compound */ +};struct nfsd4_operation {nfsd4op_func op_func;u32 op_flags; -/* Most ops require a valid current filehandle; a few don't: */ -#define ALLOWED_WITHOUT_FH 1 -/* GETATTR and ops not listed as returning NFS4ERR_MOVED: */ -#define ALLOWED_ON_ABSENT_FS 2char *op_name; };@@ -864,6 +865,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,if (args->minorversion >NFSD_SUPPORTED_MINOR_VERSION ) goto out; + op = &args->ops[0 ]; +if (args->opcnt >0 && op->status != nfserr_op_illegal && + !(nfsd4_ops[op->opnum].op_flags &ALLOWED_AS_FIRST_OP )) { + op->status = nfserr_sequence_pos; + goto encode_op; + } + status = nfs_ok;while (!status && resp->opcnt < args->opcnt) { op = &args->ops[resp->opcnt++];@@ -1104,22 +1112,22 @@ static struct nfsd4_operation nfsd4_ops[] = {#if defined(CONFIG_NFSD_V4_1 ) [OP_EXCHANGE_ID] = { .op_func = (nfsd4op_func)nfsd4_exchange_id, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_EXCHANGE_ID", }, [OP_CREATE_SESSION] = { .op_func = (nfsd4op_func)nfsd4_create_session, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_CREATE_SESSION", }, [OP_DESTROY_SESSION] = { .op_func = (nfsd4op_func)nfsd4_destroy_session, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_DESTROY_SESSION", }, [OP_SEQUENCE] = { .op_func = (nfsd4op_func)nfsd4_sequence, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_SEQUENCE", }, #endif /* CONFIG_NFSD_V4_1 */fs/nfsd/nfs4state.c +4
-0@@ -1051,10 +1051,14 @@ nfsd4_sequence(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, struct nfsd4_sequence *seq) { + struct nfsd4_compoundres *resp = rqstp->rq_resp;struct nfsd4_session *session;struct nfsd4_slot *slot;int status; +if (resp->opcnt !=1 ) +return nfserr_sequence_pos; +spin_lock (&sessionid_lock); status = nfserr_badsession; session =find_in_sessionid_hashtbl (&seq->sessionid);Signature · 1 line
1.6.2.1
Re: [PATCH v2 18/47] nfsd41: enforce NFS4ERR_SEQUENCE_POS operation order rules
Quoted 4 lines · J. Bruce Fields
There are a number of other ordering requirements too:
-
EXCHANGE_IDmust be the only op if there's no sequence
-DESTROY_SESSIONmust be the last op in its compound, I think?
Right on the spot (with one reservation).
If the COMPOUND request starts with SEQUENCE, and if the sessionids specified in SEQUENCE and DESTROY_SESSION are the same, then
o DESTROY_SESSION MUST be the final operation in the COMPOUND request.
Though I'm not sure what error should the server return in this case, NFS4ERR_BADXDR maybe? But even if we don't enforce it, any op referring to the destroyed session coming after DESTROY_SESSION must fail on NFS4ERR_BADSESSION. An interesting case will be CREATE_SESSION following DESTROY_SESSION in a COMPOUND starting with SEQUENCE... :-)
Quoted 2 lines
Are there others? And are these enforced somewhere as well?
Good catch! These aren't enforced yet (note to self - Doc). Other than that, I see:
| NFS4ERR_NOT_ONLY_OP | BIND_CONN_TO_SESSION, | | | CREATE_SESSION, | | | DESTROY_CLIENTID, | | | DESTROY_SESSION, EXCHANGE_ID |
- If CREATE_SESSION is sent without a
preceding SEQUENCE, then it MUST be the only operation in the COMPOUND procedure's request.
Benny
Quoted 100 lines
--b.
Quoted 96 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 24 ++++++++++++++++-------- fs/nfsd/nfs4state.c | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-)fs/nfsd/nfs4proc.c +16
-8@@ -811,14 +811,15 @@ static inline void nfsd4_increment_op_stats(u32 opnum)typedef __be32 (*nfsd4op_func )(struct svc_rqst *,struct nfsd4_compound_state *,void *); +enum nfsd4_op_flags { +ALLOWED_WITHOUT_FH =1 <<0 ,/* No current filehandle required */ +ALLOWED_ON_ABSENT_FS =2 <<0 ,/* ops processed on absent fs */ +ALLOWED_AS_FIRST_OP =3 <<0 ,/* ops reqired first in compound */ +};struct nfsd4_operation {nfsd4op_func op_func;u32 op_flags; -/* Most ops require a valid current filehandle; a few don't: */ -#define ALLOWED_WITHOUT_FH 1 -/* GETATTR and ops not listed as returning NFS4ERR_MOVED: */ -#define ALLOWED_ON_ABSENT_FS 2char *op_name; };@@ -864,6 +865,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,if (args->minorversion >NFSD_SUPPORTED_MINOR_VERSION ) goto out; + op = &args->ops[0 ]; +if (args->opcnt >0 && op->status != nfserr_op_illegal && + !(nfsd4_ops[op->opnum].op_flags &ALLOWED_AS_FIRST_OP )) { + op->status = nfserr_sequence_pos; + goto encode_op; + } + status = nfs_ok;while (!status && resp->opcnt < args->opcnt) { op = &args->ops[resp->opcnt++];@@ -1104,22 +1112,22 @@ static struct nfsd4_operation nfsd4_ops[] = {#if defined(CONFIG_NFSD_V4_1 ) [OP_EXCHANGE_ID] = { .op_func = (nfsd4op_func)nfsd4_exchange_id, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_EXCHANGE_ID", }, [OP_CREATE_SESSION] = { .op_func = (nfsd4op_func)nfsd4_create_session, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_CREATE_SESSION", }, [OP_DESTROY_SESSION] = { .op_func = (nfsd4op_func)nfsd4_destroy_session, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_DESTROY_SESSION", }, [OP_SEQUENCE] = { .op_func = (nfsd4op_func)nfsd4_sequence, - .op_flags = ALLOWED_WITHOUT_FH, + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, .op_name = "OP_SEQUENCE", }, #endif /* CONFIG_NFSD_V4_1 */fs/nfsd/nfs4state.c +4
-0@@ -1051,10 +1051,14 @@ nfsd4_sequence(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, struct nfsd4_sequence *seq) { + struct nfsd4_compoundres *resp = rqstp->rq_resp;struct nfsd4_session *session;struct nfsd4_slot *slot;int status; +if (resp->opcnt !=1 ) +return nfserr_sequence_pos; +spin_lock (&sessionid_lock); status = nfserr_badsession; session =find_in_sessionid_hashtbl (&seq->sessionid);Signature · 1 line
1.6.2.1
PATCH v2 19/47 nfsd41: DRC save, restore, and clear functions
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Cache all the result pages, including the rpc header in rq_respages[0], for a request in the slot table cache entry.
Cache the statp pointer from nfsd_dispatch which points into rq_respages[0] just past the rpc header. When setting a cache entry, calculate and save the length of the nfs data minus the rpc header for rq_respages[0].
When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the cached results first page. In that case, use the cached rpc header.
The sessions fore channel maxresponse size cached is set to NFSD_PAGES_PER_SLOT
* PAGE_SIZE. For compounds we are cacheing with operations such as READDIR that use the xdr_buf->pages to hold data, we choose to cache the extra page of data rather than copying data from xdr_buf->pages into the xdr_buf->head page.
--- fs/nfsd/nfs4state.c | 142 ++++++++++++++++++++++++++++++++++++++++++++ fs/nfsd/nfssvc.c | 4 + include/linux/nfsd/cache.h | 5 ++ include/linux/nfsd/state.h | 13 ++++ include/linux/nfsd/xdr4.h | 4 + 5 files changed, 168 insertions(+), 0 deletions(-)
fs/nfsd/nfs4state.c +142 -0
@@ -860,6 +860,148 @@ out_err: }#if defined(CONFIG_NFSD_V4_1 ) +void +nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) +{ +struct nfsd4_compoundres *resp = rqstp->rq_resp; + + resp->cstate.statp = statp; +} + +/* +* Dereference the result pages. +*/ +static void +nfsd4_release_respages (struct page **respages,short resused) +{ +int page_no; + +dprintk ("--> %s\n" , __func__); +for (page_no =0 ; page_no < resused; page_no++) { +if (!respages[page_no]) +continue ; +put_page (respages[page_no]); + respages[page_no] =NULL ; + } +} + +static void +nfsd4_move_pages (struct page **topages,struct page **frompages,short count) +{ +int page_no; + +for (page_no =0 ; page_no < count; page_no++) { + topages[page_no] = frompages[page_no]; +if (!topages[page_no]) +continue ; +get_page (topages[page_no]); + } +} + +/* +* Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing the previous +* pages. We add a page to NFSD_PAGES_PER_SLOT for the case where the total +* length of the XDR response is less than se_fmaxresp_cached +* (NFSD_PAGES_PER_SLOT * PAGE_SIZE) but the xdr_buf pages is used for a +* of the reply (e.g. readdir). +* +* Store the base and length of the rq_req.head[0] page +* of the NFSv4.1 data, just past the rpc header. +*/ +void +nfsd4_set_cache_entry (struct nfsd4_compoundres *resp) +{ +struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry; +struct svc_rqst *rqstp = resp->rqstp; +struct kvec *resv = &rqstp->rq_res.head[0 ]; + +dprintk ("--> %s entry %p\n" , __func__, entry); + +/* Don't cache a failed OP_SEQUENCE */ +if (resp->opcnt ==1 && resp->cstate.status) +return ; +nfsd4_release_respages (entry->ce_respages, entry->ce_resused); + entry->ce_resused = rqstp->rq_resused; +if (entry->ce_resused >NFSD_PAGES_PER_SLOT +1 ) + entry->ce_resused =NFSD_PAGES_PER_SLOT +1 ; +nfsd4_move_pages (entry->ce_respages, rqstp->rq_respages, + entry->ce_resused); + entry->ce_status = resp->cstate.status; + entry->ce_datav.iov_base = resp->cstate.statp; + entry->ce_datav.iov_len = resv->iov_len - ((char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ])); + entry->ce_opcnt = resp->opcnt; +/* Current request rpc header length*/ + entry->ce_rpchdrlen = (char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ]); +} + +/* +* Copy the cached NFSv4.1 reply skipping the cached rpc header into the +* replay result res.head[0] past the rpc header to end up with replay +* rpc header and cached NFSv4.1 reply. +*/ +static int +nfsd41_copy_replay_data (struct nfsd4_compoundres *resp, +struct nfsd4_cache_entry *entry) +{ +struct svc_rqst *rqstp = resp->rqstp; +struct kvec *resv = &resp->rqstp->rq_res.head[0 ]; +int len; + +/* Current request rpc header length*/ + len = (char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ]); +if (entry->ce_datav.iov_len + len >PAGE_SIZE ) { +dprintk ("%s v41 cached reply too large (%Zd).\n" , __func__, + entry->ce_datav.iov_len); +return 0 ; + } +/* copy the cached reply nfsd data past the current rpc header */ +memcpy ((char *)resv->iov_base + len, entry->ce_datav.iov_base, + entry->ce_datav.iov_len); + resv->iov_len = len + entry->ce_datav.iov_len; +return 1 ; +} + +/* +* Keep the first page of the replay. Copy the NFSv4.1 data from the first +* cached page. Replace any futher replay pages from the cache. +*/ +__be32 +nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp) +{ +struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry; +__be32 status; + +dprintk ("--> %s entry %p\n" , __func__, entry); + + +if (!nfsd41_copy_replay_data (resp, entry)) { +/* +* Not enough room to use the replay rpc header, send the +* cached header. Release all the allocated result pages. +*/ +svc_free_res_pages (resp->rqstp); +nfsd4_move_pages (resp->rqstp->rq_respages, entry->ce_respages, + entry->ce_resused); + }else { +/* Release all but the first allocated result page */ + + resp->rqstp->rq_resused--; +svc_free_res_pages (resp->rqstp); + +nfsd4_move_pages (&resp->rqstp->rq_respages[1 ], + &entry->ce_respages[1 ], + entry->ce_resused -1 ); + } + + resp->rqstp->rq_resused = entry->ce_resused; + status = entry->ce_status; + +return status; +} +/* * Set the exchange_id flags returned by the server. */
fs/nfsd/nfssvc.c +4 -0
@@ -515,6 +515,10 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) + rqstp->rq_res.head[0 ].iov_len; rqstp->rq_res.head[0 ].iov_len +=sizeof (__be32); +/* NFSv4.1 DRC requires statp */ +if (rqstp->rq_vers ==4 ) +nfsd4_set_statp (rqstp, statp); +/* Now call the procedure handler, and encode NFS status. */ nfserr = proc->pc_func (rqstp, rqstp->rq_argp, rqstp->rq_resp); nfserr =map_new_errors (rqstp->rq_vers, nfserr);
include/linux/nfsd/cache.h +5 -0
@@ -75,5 +75,10 @@ int nfsd_reply_cache_init(void);void nfsd_reply_cache_shutdown (void );int nfsd_cache_lookup (struct svc_rqst *,int );void nfsd_cache_update (struct svc_rqst *,int ,__be32 *); +#ifdef CONFIG_NFSD_V4_1 +void nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp); +#else /* CONFIG_NFSD_V4_1 */ +static inline void nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) {} +#endif /* CONFIG_NFSD_V4_1 */ #endif /* NFSCACHE_H */
include/linux/nfsd/state.h +13 -0
@@ -99,10 +99,23 @@ struct nfs4_callback {struct rpc_clnt * cb_client; }; +/* Maximum number of pages per slot cache entry */ +#define NFSD_PAGES_PER_SLOT 1 + +struct nfsd4_cache_entry { +__be32 ce_status; +struct kvec ce_datav;/* encoded NFSv4.1 data in rq_res.head[0] */ +struct page *ce_respages[NFSD_PAGES_PER_SLOT +1 ]; +short ce_resused; +int ce_opcnt; +int ce_rpchdrlen; +}; +struct nfsd4_slot {bool sl_inuse;struct nfsd4_session *sl_session;u32 sl_seqid; +struct nfsd4_cache_entry sl_cache_entry; };struct nfsd4_session {
include/linux/nfsd/xdr4.h +4 -0
@@ -50,6 +50,8 @@ struct nfsd4_compound_state {struct nfs4_stateowner *replay_owner;/* For sessions DRC */ struct nfsd4_slot *slot; +__be32 *statp; +u32 status; };struct nfsd4_change_info {
@@ -490,6 +492,8 @@ extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *, struct nfsd4_setclientid_confirm *setclientid_confirm);#if defined(CONFIG_NFSD_V4_1 ) +extern void nfsd4_set_cache_entry (struct nfsd4_compoundres *resp); +extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp);extern __be32 nfsd4_exchange_id (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_exchange_id *);
Signature · 1 line
1.6.2.1
Re: [PATCH v2 19/47] nfsd41: DRC save, restore, and clear functions
This one scares me.
Quoted 57 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Cache all the result pages, including the rpc header in rq_respages[0], for a request in the slot table cache entry.
Cache the statp pointer from
nfsd_dispatchwhich points into rq_respages[0] just past the rpc header. When setting a cache entry, calculate and save the length of the nfs data minus the rpc header for rq_respages[0].When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the cached results first page. In that case, use the cached rpc header.
The sessions fore channel maxresponse size cached is set to
NFSD_PAGES_PER_SLOT
*PAGE_SIZE. For compounds we are cacheing with operations such as READDIR that use thexdr_buf->pagesto hold data, we choose to cache the extra page of data rather than copying data fromxdr_buf->pagesinto thexdr_buf->headpage.[nfsd41: limit cache to maxresponsesize_cached]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: mv nfsd4_set_statp under CONFIG_NFSD_V4_1]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4state.c | 142 ++++++++++++++++++++++++++++++++++++++++++++ fs/nfsd/nfssvc.c | 4 + include/linux/nfsd/cache.h | 5 ++ include/linux/nfsd/state.h | 13 ++++ include/linux/nfsd/xdr4.h | 4 + 5 files changed, 168 insertions(+), 0 deletions(-)fs/nfsd/nfs4state.c +17
-0@@ -860,6 +860,148 @@ out_err: }#if defined(CONFIG_NFSD_V4_1 ) +void +nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) +{ +struct nfsd4_compoundres *resp = rqstp->rq_resp; + + resp->cstate.statp = statp; +} + +/* +* Dereference the result pages. +*/ +static void +nfsd4_release_respages (struct page **respages,short resused) +{ +int page_no; + +dprintk ("--> %s\n" , __func__);
fs/nfsd/nfs4state.c out_err: · line 889
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+for (page_no =0 ; page_no < resused; page_no++) { +if (!respages[page_no]) +continue ; +put_page (respages[page_no]); + respages[page_no] =NULL ; + } +} + +static void +nfsd4_move_pages (struct page **topages,struct page **frompages,short count)
s/move/copy/; we're not removing anything from the source.
fs/nfsd/nfs4state.c out_err: · line 891
Quoted 2 lines
fs/nfsd/nfs4state.c +2
-0+{ +int page_no;
As a general matter of style, I'd rather any loop variable in a function this short and simple be named "i". "j" if you need another....
Quoted 5 lines
fs/nfsd/nfs4state.c +5
-0+ +for (page_no =0 ; page_no < count; page_no++) { + topages[page_no] = frompages[page_no]; +if (!topages[page_no]) +continue ;
fs/nfsd/nfs4state.c out_err: · line 906
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+get_page (topages[page_no]); + } +} + +/* +* Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing the previous +* pages. We add a page to NFSD_PAGES_PER_SLOT for the case where the total +* length of the XDR response is less than se_fmaxresp_cached +* (NFSD_PAGES_PER_SLOT * PAGE_SIZE) but the xdr_buf pages is used for a +* of the reply (e.g. readdir).
That comment isn't very clear.
Is one page really sufficient? Consider, for example, a 2-byte read which spans a page boundary:
first page: rpc header, compound header, putfh reply, etc. second page: 1st byte of read data
third page: 2nd byte of read data
fourth page: 2 bytes of padding, rest of reply.
That's for a reply of total length less than a page.
fs/nfsd/nfs4state.c out_err: · line 912
Quoted 6 lines
fs/nfsd/nfs4state.c +6
-0+* +* Store the base and length of the rq_req.head[0] page +* of the NFSv4.1 data, just past the rpc header. +*/ +void +nfsd4_set_cache_entry (struct nfsd4_compoundres *resp)
I find "set" a little vague. How about "store"?
Quoted 7 lines
fs/nfsd/nfs4state.c +7
-0+{ +struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry; +struct svc_rqst *rqstp = resp->rqstp; +struct kvec *resv = &rqstp->rq_res.head[0 ]; + +dprintk ("--> %s entry %p\n" , __func__, entry); +
fs/nfsd/nfs4state.c out_err: · line 929
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+/* Don't cache a failed OP_SEQUENCE */ +if (resp->opcnt ==1 && resp->cstate.status) +return ; +nfsd4_release_respages (entry->ce_respages, entry->ce_resused); + entry->ce_resused = rqstp->rq_resused; +if (entry->ce_resused >NFSD_PAGES_PER_SLOT +1 ) + entry->ce_resused =NFSD_PAGES_PER_SLOT +1 ; +nfsd4_move_pages (entry->ce_respages, rqstp->rq_respages, + entry->ce_resused); + entry->ce_status = resp->cstate.status;
Don't we need to track rq_res.page_base, page_len, etc.? Try testing replays of small unaligned reads.
fs/nfsd/nfs4state.c out_err: · line 933
Quoted 4 lines
fs/nfsd/nfs4state.c +4
-0+ entry->ce_datav.iov_base = resp->cstate.statp; + entry->ce_datav.iov_len = resv->iov_len - ((char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ])); + entry->ce_opcnt = resp->opcnt;
Why do we need to save and restore the number of operations?
In general--I'd rather functions and data structures got introduced in the same patch as their users; they're harder to judge on their own.
fs/nfsd/nfs4state.c out_err: · line 936
Quoted 3 lines
fs/nfsd/nfs4state.c +3
-0+/* Current request rpc header length*/ + entry->ce_rpchdrlen = (char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ]);
I don't believe we need to save ce_rpchdrlen.
fs/nfsd/nfs4state.c out_err: · line 942
Quoted 6 lines
fs/nfsd/nfs4state.c +6
-0+} + +/* +* Copy the cached NFSv4.1 reply skipping the cached rpc header into the +* replay result res.head[0] past the rpc header to end up with replay +* rpc header and cached NFSv4.1 reply.
This comment could be clearer; how about just:
We keep the rpc header, but take the nfs reply from the reply cache.
?
fs/nfsd/nfs4state.c out_err: · line 954
Quoted 12 lines
fs/nfsd/nfs4state.c +12
-0+*/ +static int +nfsd41_copy_replay_data (struct nfsd4_compoundres *resp, +struct nfsd4_cache_entry *entry) +{ +struct svc_rqst *rqstp = resp->rqstp; +struct kvec *resv = &resp->rqstp->rq_res.head[0 ]; +int len; + +/* Current request rpc header length*/ + len = (char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ]);
Could write just resv->iov_base for for the second term there, I beleive.
fs/nfsd/nfs4state.c out_err: · line 955
Quoted 1 line
fs/nfsd/nfs4state.c +1
-0+if (entry->ce_datav.iov_len + len >PAGE_SIZE ) {
This should depend on NFSD_MAX_PAGES_PER_SLOT, or something--we shouldn't be hard-wiring the assumption that the maximum cached reply size is PAGE_SIZE.
fs/nfsd/nfs4state.c out_err: · line 961
Quoted 6 lines
fs/nfsd/nfs4state.c +6
-0+dprintk ("%s v41 cached reply too large (%Zd).\n" , __func__, + entry->ce_datav.iov_len); +return 0 ; + } +/* copy the cached reply nfsd data past the current rpc header */ + memcpy((char *)resv->iov_base + len, entry->ce_datav.iov_base,
That first argument could just be resp->cstate.statp.
Quoted 13 lines
fs/nfsd/nfs4state.c +13
-0+ entry->ce_datav.iov_len); + resv->iov_len = len + entry->ce_datav.iov_len; +return 1 ; +} + +/* +* Keep the first page of the replay. Copy the NFSv4.1 data from the first +* cached page. Replace any futher replay pages from the cache. +*/ +__be32 +nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp) +{ +struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;
fs/nfsd/nfs4state.c out_err: · line 984
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+__be32 status; + +dprintk ("--> %s entry %p\n" , __func__, entry); + + +if (!nfsd41_copy_replay_data (resp, entry)) { +/* +* Not enough room to use the replay rpc header, send the +* cached header. Release all the allocated result pages. +*/
No, we can't do this. The protocol requires that we use the rpc header from the replay.
--b.
Quoted 106 lines
fs/nfsd/nfs4state.c +20
-0+svc_free_res_pages (resp->rqstp); +nfsd4_move_pages (resp->rqstp->rq_respages, entry->ce_respages, + entry->ce_resused); + }else { +/* Release all but the first allocated result page */ + + resp->rqstp->rq_resused--; +svc_free_res_pages (resp->rqstp); + +nfsd4_move_pages (&resp->rqstp->rq_respages[1 ], + &entry->ce_respages[1 ], + entry->ce_resused -1 ); + } + + resp->rqstp->rq_resused = entry->ce_resused; + status = entry->ce_status; + +return status; +} +/* * Set the exchange_id flags returned by the server. */ fs/nfsd/nfssvc.c +4
-0@@ -515,6 +515,10 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) + rqstp->rq_res.head[0 ].iov_len; rqstp->rq_res.head[0 ].iov_len +=sizeof (__be32); +/* NFSv4.1 DRC requires statp */ +if (rqstp->rq_vers ==4 ) +nfsd4_set_statp (rqstp, statp); +/* Now call the procedure handler, and encode NFS status. */ nfserr = proc->pc_func (rqstp, rqstp->rq_argp, rqstp->rq_resp); nfserr =map_new_errors (rqstp->rq_vers, nfserr);include/linux/nfsd/cache.h +5
-0@@ -75,5 +75,10 @@ int nfsd_reply_cache_init(void);void nfsd_reply_cache_shutdown (void );int nfsd_cache_lookup (struct svc_rqst *,int );void nfsd_cache_update (struct svc_rqst *,int ,__be32 *); +#ifdef CONFIG_NFSD_V4_1 +void nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp); +#else /* CONFIG_NFSD_V4_1 */ +static inline void nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) {} +#endif /* CONFIG_NFSD_V4_1 */ #endif /* NFSCACHE_H */ include/linux/nfsd/state.h +13
-0@@ -99,10 +99,23 @@ struct nfs4_callback {struct rpc_clnt * cb_client; }; +/* Maximum number of pages per slot cache entry */ +#define NFSD_PAGES_PER_SLOT 1 + +struct nfsd4_cache_entry { +__be32 ce_status; +struct kvec ce_datav;/* encoded NFSv4.1 data in rq_res.head[0] */ +struct page *ce_respages[NFSD_PAGES_PER_SLOT +1 ]; +short ce_resused; +int ce_opcnt; +int ce_rpchdrlen; +}; +struct nfsd4_slot {bool sl_inuse;struct nfsd4_session *sl_session;u32 sl_seqid; +struct nfsd4_cache_entry sl_cache_entry; };struct nfsd4_session {include/linux/nfsd/xdr4.h +4
-0@@ -50,6 +50,8 @@ struct nfsd4_compound_state {struct nfs4_stateowner *replay_owner;/* For sessions DRC */ struct nfsd4_slot *slot; +__be32 *statp; +u32 status; };struct nfsd4_change_info {@@ -490,6 +492,8 @@ extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *, struct nfsd4_setclientid_confirm *setclientid_confirm);#if defined(CONFIG_NFSD_V4_1 ) +extern void nfsd4_set_cache_entry (struct nfsd4_compoundres *resp); +extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp);extern __be32 nfsd4_exchange_id (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_exchange_id *);Signature · 1 line
1.6.2.1
Re: [PATCH v2 19/47] nfsd41: DRC save, restore, and clear functions
Quoted 106 lines · J. Bruce Fields
This one scares me.
Quoted 60 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Cache all the result pages, including the rpc header in rq_respages[0], for a request in the slot table cache entry.
Cache the statp pointer from
nfsd_dispatchwhich points into rq_respages[0] just past the rpc header. When setting a cache entry, calculate and save the length of the nfs data minus the rpc header for rq_respages[0].When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the cached results first page. In that case, use the cached rpc header.
The sessions fore channel maxresponse size cached is set to
NFSD_PAGES_PER_SLOT
*PAGE_SIZE. For compounds we are cacheing with operations such as READDIR that use thexdr_buf->pagesto hold data, we choose to cache the extra page of data rather than copying data fromxdr_buf->pagesinto the xdr_buf-Quoted 1 line
head page.
[nfsd41: limit cache to maxresponsesize_cached]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: mv nfsd4_set_statp under CONFIG_NFSD_V4_1]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>---
fs/nfsd/nfs4state.c| 142 ++++++++++++++++++++++++++++++++++
++++++++++fs/nfsd/nfssvc.c | 4 + include/linux/nfsd/cache.h | 5 ++ include/linux/nfsd/state.h | 13 ++++ include/linux/nfsd/xdr4.h | 4 + 5 files changed, 168 insertions(+), 0 deletions(-)fs/nfsd/nfs4state.c +18
-0@@ -860,6 +860,148 @@ out_err: }#if defined(CONFIG_NFSD_V4_1 ) +void +nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) +{ +struct nfsd4_compoundres *resp = rqstp->rq_resp; + + resp->cstate.statp = statp; +} + +/* +* Dereference the result pages. +*/ +static void +nfsd4_release_respages (struct page **respages,short resused) +{ +int page_no; + +dprintk ("--> %s\n" , __func__); +for (page_no =0 ; page_no < resused; page_no++) {fs/nfsd/nfs4state.c out_err: · line 890
Quoted 10 lines
fs/nfsd/nfs4state.c +9
-0+if (!respages[page_no]) +continue ; +put_page (respages[page_no]); + respages[page_no] =NULL ; + } +} + +static void +nfsd4_move_pages (struct page **topages,struct page **frompages,short count)s/move/copy/; we're not removing anything from the source.
fs/nfsd/nfs4state.c out_err: · line 892
Quoted 2 lines
fs/nfsd/nfs4state.c +2
-0+{ +int page_no;As a general matter of style, I'd rather any loop variable in a function this short and simple be named "i". "j" if you need another....
Quoted 11 lines
fs/nfsd/nfs4state.c +11
-0+ +for (page_no =0 ; page_no < count; page_no++) { + topages[page_no] = frompages[page_no]; +if (!topages[page_no]) +continue ; +get_page (topages[page_no]); + } +} + +/* +* Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing Quoted 7 lines
the previous
+ * pages. We add a page toNFSD_PAGES_PER_SLOTfor the case where the total
+ * length of the XDR response is less thanse_fmaxresp_cached
+ * (NFSD_PAGES_PER_SLOT*PAGE_SIZE) but thexdr_bufpages is used for a
+ * of the reply (e.g. readdir).That comment isn't very clear.
Is one page really sufficient? Consider, for example, a 2-byte read which spans a page boundary:
Quoted 6 lines
first page: rpc header, compound header, putfh reply, etc. second page: 1st byte of read data
third page: 2nd byte of read data
fourth page: 2 bytes of padding, rest of reply.That's for a reply of total length less than a page.
I didn't realize the VFS returned read data in this manner. I thought a 2 byte read would end up as the first two bytes in the first page of the iovec presented to vfs_readv. Does the server actually send 4 pages of data for a two byte read??
-->Andy
Quoted 242 lines
fs/nfsd/nfs4state.c
Quoted 8 lines
+ *
+ * Store the base and length of the rq_req.head[0] page
+ * of the NFSv4.1 data, just past the rpc header.
+ */fs/nfsd/nfs4state.c +2
-0+void +nfsd4_set_cache_entry (struct nfsd4_compoundres *resp)I find "set" a little vague. How about "store"?
Quoted 8 lines
fs/nfsd/nfs4state.c +2
-0+{ + struct nfsd4_cache_entry *entry = &resp->cstate.slot-Quoted 1 line
sl_cache_entry;fs/nfsd/nfs4state.c +5
-0+struct svc_rqst *rqstp = resp->rqstp; +struct kvec *resv = &rqstp->rq_res.head[0 ]; + +dprintk ("--> %s entry %p\n" , __func__, entry); +fs/nfsd/nfs4state.c out_err: · line 929
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+/* Don't cache a failed OP_SEQUENCE */ +if (resp->opcnt ==1 && resp->cstate.status) +return ; +nfsd4_release_respages (entry->ce_respages, entry->ce_resused); + entry->ce_resused = rqstp->rq_resused; +if (entry->ce_resused >NFSD_PAGES_PER_SLOT +1 ) + entry->ce_resused =NFSD_PAGES_PER_SLOT +1 ; +nfsd4_move_pages (entry->ce_respages, rqstp->rq_respages, + entry->ce_resused); + entry->ce_status = resp->cstate.status;Don't we need to track rq_res.page_base,
page_len, etc.? Try testing replays of small unaligned reads.fs/nfsd/nfs4state.c out_err: · line 933
Quoted 5 lines
fs/nfsd/nfs4state.c +2
-0+ entry->ce_datav.iov_base = resp->cstate.statp; + entry->ce_datav.iov_len = resv->iov_len - ((char *)resp-Quoted 1 line
cstate.statp -
fs/nfsd/nfs4state.c +2
-0+ (char *)page_address(rqstp->rq_respages[0])); + entry->ce_opcnt = resp->opcnt;Why do we need to save and restore the number of operations?
In general--I'd rather functions and data structures got introduced in the same patch as their users; they're harder to judge on their own.
fs/nfsd/nfs4state.c out_err: · line 936
Quoted 3 lines
fs/nfsd/nfs4state.c +3
-0+/* Current request rpc header length*/ + entry->ce_rpchdrlen = (char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ]);I don't believe we need to save
ce_rpchdrlen.Quoted 8 lines
fs/nfsd/nfs4state.c +4
-0+} + +/* +* Copy the cached NFSv4.1 reply skipping the cached rpc header into the
+ * replay result res.head[0] past the rpc header to end up with replay
+ * rpc header and cached NFSv4.1 reply.This comment could be clearer; how about just:
We keep the rpc header, but take the nfs reply from the reply cache.
?
fs/nfsd/nfs4state.c out_err: · line 954
Quoted 12 lines
+ */
fs/nfsd/nfs4state.c +11
-0+static int +nfsd41_copy_replay_data (struct nfsd4_compoundres *resp, +struct nfsd4_cache_entry *entry) +{ +struct svc_rqst *rqstp = resp->rqstp; +struct kvec *resv = &resp->rqstp->rq_res.head[0 ]; +int len; + +/* Current request rpc header length*/ + len = (char *)resp->cstate.statp - + (char *)page_address (rqstp->rq_respages[0 ]);Could write just
resv->iov_basefor for the second term there, I beleive.fs/nfsd/nfs4state.c out_err: · line 955
Quoted 1 line
fs/nfsd/nfs4state.c +1
-0+if (entry->ce_datav.iov_len + len >PAGE_SIZE ) {This should depend on
NFSD_MAX_PAGES_PER_SLOT, or something--we shouldn't be hard-wiring the assumption that the maximum cached reply size isPAGE_SIZE.fs/nfsd/nfs4state.c out_err: · line 961
Quoted 6 lines
fs/nfsd/nfs4state.c +6
-0+dprintk ("%s v41 cached reply too large (%Zd).\n" , __func__, + entry->ce_datav.iov_len); +return 0 ; + } +/* copy the cached reply nfsd data past the current rpc header */ + memcpy((char *)resv->iov_base + len, entry->ce_datav.iov_base,That first argument could just be
resp->cstate.statp.Quoted 15 lines
fs/nfsd/nfs4state.c +7
-0+ entry->ce_datav.iov_len); + resv->iov_len = len + entry->ce_datav.iov_len; +return 1 ; +} + +/* +* Keep the first page of the replay. Copy the NFSv4.1 data from the first
+ * cached page. Replace any futher replay pages from the cache.
+ */fs/nfsd/nfs4state.c +4
-0+__be32 +nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp) +{ + struct nfsd4_cache_entry *entry = &resp->cstate.slot-Quoted 1 line
sl_cache_entry;fs/nfsd/nfs4state.c out_err: · line 984
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+__be32 status; + +dprintk ("--> %s entry %p\n" , __func__, entry); + + +if (!nfsd41_copy_replay_data (resp, entry)) { +/* +* Not enough room to use the replay rpc header, send the +* cached header. Release all the allocated result pages. +*/ No, we can't do this. The protocol requires that we use the rpc header from the replay.
--b.
Quoted 105 lines
fs/nfsd/nfs4state.c +20
-0+svc_free_res_pages (resp->rqstp); +nfsd4_move_pages (resp->rqstp->rq_respages, entry->ce_respages, + entry->ce_resused); + }else { +/* Release all but the first allocated result page */ + + resp->rqstp->rq_resused--; +svc_free_res_pages (resp->rqstp); + +nfsd4_move_pages (&resp->rqstp->rq_respages[1 ], + &entry->ce_respages[1 ], + entry->ce_resused -1 ); + } + + resp->rqstp->rq_resused = entry->ce_resused; + status = entry->ce_status; + +return status; +} +/*
* Set theexchange_idflags returned by the server. */fs/nfsd/nfssvc.c +4
-0@@ -515,6 +515,10 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) + rqstp->rq_res.head[0 ].iov_len; rqstp->rq_res.head[0 ].iov_len +=sizeof (__be32); +/* NFSv4.1 DRC requires statp */ +if (rqstp->rq_vers ==4 ) +nfsd4_set_statp (rqstp, statp); +/* Now call the procedure handler, and encode NFS status. */ nfserr = proc->pc_func (rqstp, rqstp->rq_argp, rqstp->rq_resp);nfserr = map_new_errors(rqstp->rq_vers, nfserr);include/linux/nfsd/cache.h +5
-0@@ -75,5 +75,10 @@ int nfsd_reply_cache_init(void);void nfsd_reply_cache_shutdown (void );int nfsd_cache_lookup (struct svc_rqst *,int );void nfsd_cache_update (struct svc_rqst *,int ,__be32 *); +#ifdef CONFIG_NFSD_V4_1 +void nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp); +#else /* CONFIG_NFSD_V4_1 */ +static inline void nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) {} +#endif /* CONFIG_NFSD_V4_1 */ #endif /*
NFSCACHE_H*/include/linux/nfsd/state.h +13
-0@@ -99,10 +99,23 @@ struct nfs4_callback {struct rpc_clnt * cb_client; }; +/* Maximum number of pages per slot cache entry */ +#define NFSD_PAGES_PER_SLOT 1 + +struct nfsd4_cache_entry { +__be32 ce_status; +struct kvec ce_datav;/* encoded NFSv4.1 data in rq_res.head[0] */ +struct page *ce_respages[NFSD_PAGES_PER_SLOT +1 ]; +short ce_resused; +int ce_opcnt; +int ce_rpchdrlen; +}; +struct nfsd4_slot {bool sl_inuse;struct nfsd4_session *sl_session;u32 sl_seqid; +struct nfsd4_cache_entry sl_cache_entry; };struct nfsd4_session {include/linux/nfsd/xdr4.h +4
-0@@ -50,6 +50,8 @@ struct nfsd4_compound_state {struct nfs4_stateowner *replay_owner;/* For sessions DRC */ struct nfsd4_slot *slot; +__be32 *statp; +u32 status; };struct nfsd4_change_info {@@ -490,6 +492,8 @@ extern __be32 nfsd4_setclientid_confirm(structsvc_rqst *rqstp, struct nfsd4_compound_state *, struct nfsd4_setclientid_confirm *setclientid_confirm);#if defined(CONFIG_NFSD_V4_1 ) +extern void nfsd4_set_cache_entry (struct nfsd4_compoundres *resp); +extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp); extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,Quoted 5 lines
struct
nfsd4_compound_state*,
structnfsd4_exchange_id*);Signature · 1 line
1.6.2.1--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 19/47] nfsd41: DRC save, restore, and clear functions
Quoted 122 lines · Andy Adamson
Quoted 119 lines · J. Bruce Fields
This one scares me.
Quoted 67 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Cache all the result pages, including the rpc header in rq_respages[0],
for a request in the slot table cache entry.Cache the statp pointer from
nfsd_dispatchwhich points into rq_respages[0]
just past the rpc header. When setting a cache entry, calculate and save the
length of the nfs data minus the rpc header for rq_respages[0].When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the
cached results first page. In that case, use the cached rpc header.The sessions fore channel maxresponse size cached is set to
NFSD_PAGES_PER_SLOT
*PAGE_SIZE. For compounds we are cacheing with operations such as READDIR
that use thexdr_buf->pagesto hold data, we choose to cache the extra page of
data rather than copying data fromxdr_buf->pagesinto the xdr_buf-Quoted 1 line
head page.
[nfsd41: limit cache to maxresponsesize_cached]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: mv nfsd4_set_statp under CONFIG_NFSD_V4_1]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>---
fs/nfsd/nfs4state.c| 142 ++++++++++++++++++++++++++++++++++
++++++++++fs/nfsd/nfssvc.c | 4 + include/linux/nfsd/cache.h | 5 ++ include/linux/nfsd/state.h | 13 ++++ include/linux/nfsd/xdr4.h | 4 + 5 files changed, 168 insertions(+), 0 deletions(-)fs/nfsd/nfs4state.c +18
-0@@ -860,6 +860,148 @@ out_err: }#if defined(CONFIG_NFSD_V4_1 ) +void +nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) +{ +struct nfsd4_compoundres *resp = rqstp->rq_resp; + + resp->cstate.statp = statp; +} + +/* +* Dereference the result pages. +*/ +static void +nfsd4_release_respages (struct page **respages,short resused) +{ +int page_no; + +dprintk ("--> %s\n" , __func__); +for (page_no =0 ; page_no < resused; page_no++) {fs/nfsd/nfs4state.c out_err: · line 890
Quoted 10 lines
fs/nfsd/nfs4state.c +9
-0+if (!respages[page_no]) +continue ; +put_page (respages[page_no]); + respages[page_no] =NULL ; + } +} + +static void +nfsd4_move_pages (struct page **topages,struct page **frompages,short count)s/move/copy/; we're not removing anything from the source.
fs/nfsd/nfs4state.c out_err: · line 892
Quoted 2 lines
fs/nfsd/nfs4state.c +2
-0+{ +int page_no;As a general matter of style, I'd rather any loop variable in a function
this short and simple be named "i". "j" if you need another....Quoted 11 lines
fs/nfsd/nfs4state.c +11
-0+ +for (page_no =0 ; page_no < count; page_no++) { + topages[page_no] = frompages[page_no]; +if (!topages[page_no]) +continue ; +get_page (topages[page_no]); + } +} + +/* +* Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing Quoted 7 lines
the previous
+ * pages. We add a page toNFSD_PAGES_PER_SLOTfor the case where the total
+ * length of the XDR response is less thanse_fmaxresp_cached
+ * (NFSD_PAGES_PER_SLOT*PAGE_SIZE) but thexdr_bufpages is used for a
+ * of the reply (e.g. readdir).That comment isn't very clear.
Is one page really sufficient? Consider, for example, a 2-byte read which spans a page boundary:
first page: rpc header, compound header, putfh reply, etc. second page: 1st byte of read data
third page: 2nd byte of read data
fourth page: 2 bytes of padding, rest of reply.
Quoted 6 lines
Quoted 1 line
That's for a reply of total length less than a page.
I didn't realize the VFS returned read data in this manner. I thought a 2 byte read would end up as the first two bytes in the first page of the iovec presented to
vfs_readv. Does the server actually send 4 pages of data for a two byte read??
Whoops, sorry, I forgot this question--email's coming out of my ears.
In nfsd_vfs_read() there are two cases, one using splice, and one readv. Trace through it and see that in the splice case nfsd_splice_actor() is called, which just takes references to pages in the page cache and sets page_base and page_len appropriately. The kvec passed into nfsd4_encode_read isn't used in that case.
So, yes, if you do a 2-byte read from offset 1023 into a file (for example), I believe you get a case like the above.
And the splice case is important to performance--we shouldn't just bypass it for 4.1.
--b.
Re: [pnfs] [PATCH v2 19/47] nfsd41: DRC save, restore, and clear functions
Quoted 123 lines · J. Bruce Fields
Quoted 122 lines · Andy Adamson
Quoted 119 lines · J. Bruce Fields
This one scares me.
Quoted 67 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Cache all the result pages, including the rpc header in rq_respages[0],
for a request in the slot table cache entry.Cache the statp pointer from
nfsd_dispatchwhich points into rq_respages[0]
just past the rpc header. When setting a cache entry, calculate and save the
length of the nfs data minus the rpc header for rq_respages[0].When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the
cached results first page. In that case, use the cached rpc header.The sessions fore channel maxresponse size cached is set to
NFSD_PAGES_PER_SLOT
*PAGE_SIZE. For compounds we are cacheing with operations such as READDIR
that use thexdr_buf->pagesto hold data, we choose to cache the extra page of
data rather than copying data fromxdr_buf->pagesinto the xdr_buf-Quoted 1 line
head page.
[nfsd41: limit cache to maxresponsesize_cached]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: mv nfsd4_set_statp under CONFIG_NFSD_V4_1]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>---
fs/nfsd/nfs4state.c| 142 ++++++++++++++++++++++++++++++++++
++++++++++fs/nfsd/nfssvc.c | 4 + include/linux/nfsd/cache.h | 5 ++ include/linux/nfsd/state.h | 13 ++++ include/linux/nfsd/xdr4.h | 4 + 5 files changed, 168 insertions(+), 0 deletions(-)fs/nfsd/nfs4state.c +18
-0@@ -860,6 +860,148 @@ out_err: }#if defined(CONFIG_NFSD_V4_1 ) +void +nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) +{ +struct nfsd4_compoundres *resp = rqstp->rq_resp; + + resp->cstate.statp = statp; +} + +/* +* Dereference the result pages. +*/ +static void +nfsd4_release_respages (struct page **respages,short resused) +{ +int page_no; + +dprintk ("--> %s\n" , __func__); +for (page_no =0 ; page_no < resused; page_no++) {fs/nfsd/nfs4state.c out_err: · line 890
Quoted 10 lines
fs/nfsd/nfs4state.c +9
-0+if (!respages[page_no]) +continue ; +put_page (respages[page_no]); + respages[page_no] =NULL ; + } +} + +static void +nfsd4_move_pages (struct page **topages,struct page **frompages,short count)s/move/copy/; we're not removing anything from the source.
fs/nfsd/nfs4state.c out_err: · line 892
Quoted 2 lines
fs/nfsd/nfs4state.c +2
-0+{ +int page_no;As a general matter of style, I'd rather any loop variable in a function
this short and simple be named "i". "j" if you need another....Quoted 11 lines
fs/nfsd/nfs4state.c +11
-0+ +for (page_no =0 ; page_no < count; page_no++) { + topages[page_no] = frompages[page_no]; +if (!topages[page_no]) +continue ; +get_page (topages[page_no]); + } +} + +/* +* Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing Quoted 7 lines
the previous
+ * pages. We add a page toNFSD_PAGES_PER_SLOTfor the case where the total
+ * length of the XDR response is less thanse_fmaxresp_cached
+ * (NFSD_PAGES_PER_SLOT*PAGE_SIZE) but thexdr_bufpages is used for a
+ * of the reply (e.g. readdir).That comment isn't very clear.
Is one page really sufficient? Consider, for example, a 2-byte read which spans a page boundary:
first page: rpc header, compound header, putfh reply, etc. second page: 1st byte of read data
third page: 2nd byte of read data
fourth page: 2 bytes of padding, rest of reply.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
That's for a reply of total length less than a page.
I didn't realize the VFS returned read data in this manner. I thought a 2 byte read would end up as the first two bytes in the first page of the iovec presented to
vfs_readv. Does the server actually send 4 pages of data for a two byte read??Whoops, sorry, I forgot this question--email's coming out of my ears.
That's ok!
Quoted 7 lines
In
nfsd_vfs_read()there are two cases, one using splice, and one readv. Trace through it and see that in the splice casenfsd_splice_actor()is called, which just takes references to pages in the page cache and setspage_baseandpage_lenappropriately. The kvec passed intonfsd4_encode_readisn't used in that case.
Quoted 5 lines
So, yes, if you do a 2-byte read from offset 1023 into a file (for example), I believe you get a case like the above.
And the splice case is important to performance--we shouldn't just bypass it for 4.1.
OK. I've come to see that I've done this bas-akwards. I'm caching the original page with rpc header and data, then copying the new rpc header (which may not fit AKK) into the replay page replacing the old rpc header.
What I should be doing is saving the encoded operations (not including the sequence op as you suggested) and copying the cached encoded operations into the new reply page. This will also let us get past the nfsd_splice_actor() case 'cause we can just cache the actual data (the two bytes in the above example).
I probably won't be able to reliably code all this tonight, although I will give it a whirl !!
I hope that if I address the other comments and keep the current bas-akwards code you will consider accepting it to allow me to bug fix it in the 2.6.30-rcX series. I promise to do so.
-->Andy
Quoted 7 lines
--b.
_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
A message that is not in the archive (sent off-list or not yet received): 89c397150904021429i6731a9c0ibe064a0828941d16-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [pnfs] [PATCH v2 19/47] nfsd41: DRC save, restore, and clear functions
Quoted 153 lines · William A. (Andy) Adamson
Quoted 123 lines · J. Bruce Fields
Quoted 122 lines · Andy Adamson
Quoted 119 lines · J. Bruce Fields
This one scares me.
Quoted 67 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Cache all the result pages, including the rpc header in rq_respages[0],
for a request in the slot table cache entry.Cache the statp pointer from
nfsd_dispatchwhich points into rq_respages[0]
just past the rpc header. When setting a cache entry, calculate and save the
length of the nfs data minus the rpc header for rq_respages[0].When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the
cached results first page. In that case, use the cached rpc header.The sessions fore channel maxresponse size cached is set to
NFSD_PAGES_PER_SLOT
*PAGE_SIZE. For compounds we are cacheing with operations such as READDIR
that use thexdr_buf->pagesto hold data, we choose to cache the extra page of
data rather than copying data fromxdr_buf->pagesinto the xdr_buf-Quoted 1 line
head page.
[nfsd41: limit cache to maxresponsesize_cached]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: mv nfsd4_set_statp under CONFIG_NFSD_V4_1]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>---
fs/nfsd/nfs4state.c| 142 ++++++++++++++++++++++++++++++++++
++++++++++fs/nfsd/nfssvc.c | 4 + include/linux/nfsd/cache.h | 5 ++ include/linux/nfsd/state.h | 13 ++++ include/linux/nfsd/xdr4.h | 4 + 5 files changed, 168 insertions(+), 0 deletions(-)fs/nfsd/nfs4state.c +18
-0@@ -860,6 +860,148 @@ out_err: }#if defined(CONFIG_NFSD_V4_1 ) +void +nfsd4_set_statp (struct svc_rqst *rqstp,__be32 *statp) +{ +struct nfsd4_compoundres *resp = rqstp->rq_resp; + + resp->cstate.statp = statp; +} + +/* +* Dereference the result pages. +*/ +static void +nfsd4_release_respages (struct page **respages,short resused) +{ +int page_no; + +dprintk ("--> %s\n" , __func__); +for (page_no =0 ; page_no < resused; page_no++) {fs/nfsd/nfs4state.c out_err: · line 890
Quoted 10 lines
fs/nfsd/nfs4state.c +9
-0+if (!respages[page_no]) +continue ; +put_page (respages[page_no]); + respages[page_no] =NULL ; + } +} + +static void +nfsd4_move_pages (struct page **topages,struct page **frompages,short count)s/move/copy/; we're not removing anything from the source.
fs/nfsd/nfs4state.c out_err: · line 892
Quoted 2 lines
fs/nfsd/nfs4state.c +2
-0+{ +int page_no;As a general matter of style, I'd rather any loop variable in a function
this short and simple be named "i". "j" if you need another....Quoted 11 lines
fs/nfsd/nfs4state.c +11
-0+ +for (page_no =0 ; page_no < count; page_no++) { + topages[page_no] = frompages[page_no]; +if (!topages[page_no]) +continue ; +get_page (topages[page_no]); + } +} + +/* +* Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing Quoted 7 lines
the previous
+ * pages. We add a page toNFSD_PAGES_PER_SLOTfor the case where the total
+ * length of the XDR response is less thanse_fmaxresp_cached
+ * (NFSD_PAGES_PER_SLOT*PAGE_SIZE) but thexdr_bufpages is used for a
+ * of the reply (e.g. readdir).That comment isn't very clear.
Is one page really sufficient? Consider, for example, a 2-byte read which spans a page boundary:
first page: rpc header, compound header, putfh reply, etc. second page: 1st byte of read data
third page: 2nd byte of read data
fourth page: 2 bytes of padding, rest of reply.Quoted 8 lines
Quoted 6 lines
Quoted 1 line
That's for a reply of total length less than a page.
I didn't realize the VFS returned read data in this manner. I thought a 2 byte read would end up as the first two bytes in the first page of the iovec presented to
vfs_readv. Does the server actually send 4 pages of data for a two byte read??Whoops, sorry, I forgot this question--email's coming out of my ears.
That's ok!
Quoted 7 lines
In
nfsd_vfs_read()there are two cases, one using splice, and one readv. Trace through it and see that in the splice casenfsd_splice_actor()is called, which just takes references to pages in the page cache and setspage_baseandpage_lenappropriately. The kvec passed intonfsd4_encode_readisn't used in that case.Quoted 5 lines
So, yes, if you do a 2-byte read from offset 1023 into a file (for example), I believe you get a case like the above.
And the splice case is important to performance--we shouldn't just bypass it for 4.1.
OK. I've come to see that I've done this bas-akwards. I'm caching the original page with rpc header and data, then copying the new rpc header (which may not fit AKK) into the replay page replacing the old rpc header.
Quoted 5 lines
What I should be doing is saving the encoded operations (not including the sequence op as you suggested) and copying the cached encoded operations into the new reply page. This will also let us get past the
nfsd_splice_actor()case 'cause we can just cache the actual data (the two bytes in the above example).
I think that's right....
Quoted 6 lines
I probably won't be able to reliably code all this tonight, although I will give it a whirl !!
I hope that if I address the other comments and keep the current bas-akwards code you will consider accepting it to allow me to bug fix it in the 2.6.30-rcX series. I promise to do so.
I won't worry--it would be better to stick to trivial fixes and just send me what you guys have now.
--b.
PATCH v2 20/47 nfsd41: hard page limit for DRC
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Use no more than 1/128th of the number of free pages at nfsd startup for the v4.1 DRC.
This is an arbitrary default which should probably end up under the control of an administrator.
--- fs/nfsd/nfssvc.c | 25 +++++++++++++++++++++++++ include/linux/nfsd/nfsd.h | 7 +++++++ include/linux/sunrpc/svc.h | 4 ++++ 3 files changed, 36 insertions(+), 0 deletions(-)
fs/nfsd/nfssvc.c +25 -0
@@ -22,6 +22,7 @@#include <linux/freezer.h> #include <linux/fs_struct.h> #include <linux/kthread.h> +#include <linux/swap.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/stats.h>
@@ -197,6 +198,28 @@ void nfsd_reset_versions(void) } } +/* +* Each session guarantees a negotiated per slot memory cache for replies +* which in turn consumes memory beyond the v2/v3/v4.0 server. A dedicated +* NFSv4.1 server might want to use more memory for a DRC than a machine +* with mutiple services. +* +* Impose a hard limit on the number of pages for the DRC which varies +* according to the machines free pages. This is of course only a default. +* +* For now this is a #defined shift which could be under admin control +* in the future. +*/ +static void set_max_drc (void ) +{ +#ifdef CONFIG_NFSD_V4_1 + nfsd_serv->sv_drc_max_pages =nr_free_buffer_pages () + >>NFSD_DRC_SIZE_SHIFT ; + nfsd_serv->sv_drc_pages_used =0 ; +dprintk ("%s svc_drc_max_pages %u\n" , __func__, + nfsd_serv->sv_drc_max_pages); +#endif /* CONFIG_NFSD_V4_1 */ +}int nfsd_create_serv (void ) {
@@ -229,6 +252,8 @@ int nfsd_create_serv(void) nfsd_last_thread, nfsd, THIS_MODULE);if (nfsd_serv ==NULL ) err = -ENOMEM ; +else +set_max_drc ();do_gettimeofday (&nfssvc_boot);/* record boot time */ return err;
include/linux/nfsd/nfsd.h +7 -0
@@ -361,6 +361,13 @@ extern struct timeval nfssvc_boot; | FATTR4_WORD1_TIME_DELTA | FATTR4_WORD1_TIME_METADATA \ | FATTR4_WORD1_TIME_MODIFY | FATTR4_WORD1_TIME_MODIFY_SET | FATTR4_WORD1_MOUNTED_ON_FILEID) +#if defined(CONFIG_NFSD_V4_1 ) + +/* The percent of nr_free_buffer_pages used by the V4.1 server DRC */ +#define NFSD_DRC_SIZE_SHIFT 7 + +#endif /* CONFIG_NFSD_V4_1 */ +/* These will return ERR_INVAL if specified in GETATTR or READDIR. */ #define NFSD_WRITEONLY_ATTRS_WORD1 \ (FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)
include/linux/sunrpc/svc.h +4 -0
@@ -95,6 +95,10 @@ struct svc_serv {struct module * sv_module;/* optional module to count when * adding threads */ svc_thread_fn sv_function;/* main function for threads */ +#if defined(CONFIG_NFSD_V4_1 ) +unsigned int sv_drc_max_pages;/* Total pages for DRC */ +unsigned int sv_drc_pages_used;/* DRC pages used */ +#endif /* CONFIG_NFSD_V4_1 */ };/*
Signature · 1 line
1.6.2.1
PATCH v2 21/47 nfsd41: nfsd DRC logic
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Replay a request in nfsd4_sequence.
Add a minorversion to struct nfsd4_compound_state.
Pass the current slot to nfs4svc_encode_compound res via struct nfsd4_compoundres to set an NFSv4.1 DRC entry.
--- fs/nfsd/nfs4proc.c | 7 +++++++ fs/nfsd/nfs4state.c | 6 ++++++ fs/nfsd/nfs4xdr.c | 13 +++++++++++++ include/linux/nfsd/xdr4.h | 1 + 4 files changed, 27 insertions(+), 0 deletions(-)
fs/nfsd/nfs4proc.c +7 -0
@@ -920,6 +920,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,BUG_ON (op->status == nfs_ok); encode_op: +/* Only from SEQUENCE or CREATE_SESSION */ +if (resp->cstate.status == nfserr_replay_cache) { +dprintk ("%s NFS4.1 replay from cache\n" , __func__); + status = op->status; + goto out; + }if (op->status == nfserr_replay_me) { op->replay = &cstate->replay_owner->so_replay;nfsd4_encode_replay (resp, op);
@@ -948,6 +954,7 @@ encode_op: status = nfserr_jukebox; } + resp->cstate.status = status;fh_put (&resp->cstate.current_fh);fh_put (&resp->cstate.save_fh);BUG_ON (resp->cstate.replay_owner);
fs/nfsd/nfs4state.c +6 -0
@@ -997,6 +997,8 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp) } resp->rqstp->rq_resused = entry->ce_resused; + resp->opcnt = entry->ce_opcnt; + resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen; status = entry->ce_status;return status;
@@ -1217,6 +1219,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, status =check_slot_seqid (seq->seqid, slot);if (status == nfserr_replay_cache) { cstate->slot = slot; +/* Return the cached reply status and set cstate->status +* for nfsd4_svc_encode_compoundres processing*/ + status =nfsd4_replay_cache_entry (resp); + cstate->status = nfserr_replay_cache; goto replay_cache; }if (status)
fs/nfsd/nfs4xdr.c +13 -0
@@ -3059,6 +3059,19 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov = &rqstp->rq_res.head[0 ]; iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE ); +#ifdef CONFIG_NFSD_V4_1 +if (resp->cstate.slot !=NULL ) { +if (resp->cstate.status == nfserr_replay_cache) { + iov->iov_len = resp->cstate.iovlen; + }else { +nfsd4_set_cache_entry (resp); +dprintk ("%s: SET SLOT STATE TO AVAILABLE\n" , __func__); + resp->cstate.slot->sl_inuse =0 ; + } +if (resp->cstate.slot->sl_session) +nfsd4_put_session (resp->cstate.slot->sl_session); + } +#endif /* CONFIG_NFSD_V4_1 */ return 1 ; }
include/linux/nfsd/xdr4.h +1 -0
@@ -51,6 +51,7 @@ struct nfsd4_compound_state {/* For sessions DRC */ struct nfsd4_slot *slot;__be32 *statp; +size_t iovlen;u32 status; };
Signature · 1 line
1.6.2.1
Re: [PATCH v2 21/47] nfsd41: nfsd DRC logic
Quoted 76 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Replay a request in
nfsd4_sequence.
Add a minorversion to structnfsd4_compound_state.Pass the current slot to
nfs4svc_encode_compoundres via structnfsd4_compoundresto set an NFSv4.1 DRC entry.Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 7 +++++++ fs/nfsd/nfs4state.c | 6 ++++++ fs/nfsd/nfs4xdr.c | 13 +++++++++++++ include/linux/nfsd/xdr4.h | 1 + 4 files changed, 27 insertions(+), 0 deletions(-)fs/nfsd/nfs4proc.c +7
-0@@ -920,6 +920,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,BUG_ON (op->status == nfs_ok); encode_op: +/* Only from SEQUENCE or CREATE_SESSION */ +if (resp->cstate.status == nfserr_replay_cache) { +dprintk ("%s NFS4.1 replay from cache\n" , __func__); + status = op->status; + goto out; + }if (op->status == nfserr_replay_me) { op->replay = &cstate->replay_owner->so_replay;nfsd4_encode_replay (resp, op);@@ -948,6 +954,7 @@ encode_op: status = nfserr_jukebox; } + resp->cstate.status = status;fh_put (&resp->cstate.current_fh);fh_put (&resp->cstate.save_fh);BUG_ON (resp->cstate.replay_owner);fs/nfsd/nfs4state.c +6
-0@@ -997,6 +997,8 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp) } resp->rqstp->rq_resused = entry->ce_resused; + resp->opcnt = entry->ce_opcnt; + resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen; status = entry->ce_status;return status;@@ -1217,6 +1219,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, status =check_slot_seqid (seq->seqid, slot);if (status == nfserr_replay_cache) { cstate->slot = slot; +/* Return the cached reply status and set cstate->status +* for nfsd4_svc_encode_compoundres processing*/ + status =nfsd4_replay_cache_entry (resp); + cstate->status = nfserr_replay_cache; goto replay_cache; }if (status)fs/nfsd/nfs4xdr.c +0
-0@@ -3059,6 +3059,19 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov = &rqstp->rq_res.head[0 ]; iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE );
fs/nfsd/nfs4xdr.c nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo · line 3071
Quoted 10 lines
fs/nfsd/nfs4xdr.c +10
-0+#ifdef CONFIG_NFSD_V4_1 +if (resp->cstate.slot !=NULL ) { +if (resp->cstate.status == nfserr_replay_cache) { + iov->iov_len = resp->cstate.iovlen; + }else { +nfsd4_set_cache_entry (resp); +dprintk ("%s: SET SLOT STATE TO AVAILABLE\n" , __func__); + resp->cstate.slot->sl_inuse =0 ; + } +if (resp->cstate.slot->sl_session)
There's no way that sl_session could ever be NULL, so this check is unneeded.
While we're at it: let's just eliminate the sl_session pointer from the slot. I think all that would be needed would be a pointer to the session from the cstate, in addition to the pointer to the slot.
--b.
Quoted 21 lines
fs/nfsd/nfs4xdr.c +3
-0+ nfsd4_put_session(resp->cstate.slot->sl_session); + } +#endif /* CONFIG_NFSD_V4_1 */ return 1 ; }include/linux/nfsd/xdr4.h +1
-0@@ -51,6 +51,7 @@ struct nfsd4_compound_state {/* For sessions DRC */ struct nfsd4_slot *slot;__be32 *statp; +size_t iovlen;u32 status; };Signature · 1 line
1.6.2.1
Re: [pnfs] [PATCH v2 21/47] nfsd41: nfsd DRC logic
Quoted 82 lines · J. Bruce Fields
Quoted 81 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Replay a request in
nfsd4_sequence.
Add a minorversion to structnfsd4_compound_state.Pass the current slot to
nfs4svc_encode_compoundres via structnfsd4_compoundresto set an NFSv4.1 DRC entry.Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 7 +++++++ fs/nfsd/nfs4state.c | 6 ++++++ fs/nfsd/nfs4xdr.c | 13 +++++++++++++ include/linux/nfsd/xdr4.h | 1 + 4 files changed, 27 insertions(+), 0 deletions(-)fs/nfsd/nfs4proc.c +7
-0@@ -920,6 +920,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,BUG_ON (op->status == nfs_ok); encode_op: +/* Only from SEQUENCE or CREATE_SESSION */ +if (resp->cstate.status == nfserr_replay_cache) { +dprintk ("%s NFS4.1 replay from cache\n" , __func__); + status = op->status; + goto out; + }if (op->status == nfserr_replay_me) { op->replay = &cstate->replay_owner->so_replay;nfsd4_encode_replay (resp, op);@@ -948,6 +954,7 @@ encode_op: status = nfserr_jukebox; } + resp->cstate.status = status;fh_put (&resp->cstate.current_fh);fh_put (&resp->cstate.save_fh);BUG_ON (resp->cstate.replay_owner);fs/nfsd/nfs4state.c +6
-0@@ -997,6 +997,8 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp) } resp->rqstp->rq_resused = entry->ce_resused; + resp->opcnt = entry->ce_opcnt; + resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen; status = entry->ce_status;return status;@@ -1217,6 +1219,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, status =check_slot_seqid (seq->seqid, slot);if (status == nfserr_replay_cache) { cstate->slot = slot; +/* Return the cached reply status and set cstate->status +* for nfsd4_svc_encode_compoundres processing*/ + status =nfsd4_replay_cache_entry (resp); + cstate->status = nfserr_replay_cache; goto replay_cache; }if (status)fs/nfsd/nfs4xdr.c +5
-0@@ -3059,6 +3059,19 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov = &rqstp->rq_res.head[0 ]; iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE ); +#ifdef CONFIG_NFSD_V4_1 +if (resp->cstate.slot !=NULL ) { +if (resp->cstate.status == nfserr_replay_cache) { + iov->iov_len = resp->cstate.iovlen; + }else {
Quoted 8 lines
fs/nfsd/nfs4xdr.c nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo · line 3071
Quoted 5 lines
fs/nfsd/nfs4xdr.c +5
-0+nfsd4_set_cache_entry (resp); +dprintk ("%s: SET SLOT STATE TO AVAILABLE\n" , __func__); + resp->cstate.slot->sl_inuse =0 ; + } +if (resp->cstate.slot->sl_session)There's no way that
sl_sessioncould ever be NULL, so this check is unneeded.
There should have been a comment.CREATE_SESSION sets cstate->slot using the nfs4_client->cl_slot, a single slot which it uses for the CREATE_SESSION replay cache. It does not have a session.
Quoted 4 lines
While we're at it: let's just eliminate the
sl_sessionpointer from the slot. I think all that would be needed would be a pointer to the session from the cstate, in addition to the pointer to the slot.
OK.
Quoted 29 lines
--b.
Quoted 19 lines
fs/nfsd/nfs4xdr.c +3
-0+ nfsd4_put_session(resp->cstate.slot->sl_session); + } +#endif /* CONFIG_NFSD_V4_1 */ return 1 ; }include/linux/nfsd/xdr4.h +1
-1@@ -51,6 +51,7 @@ struct nfsd4_compound_state {/* For sessions DRC */ struct nfsd4_slot *slot;__be32 *statp; +size_t iovlen;u32 status; }; --Quoted 2 lines
1.6.2.1
_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
A message that is not in the archive (sent off-list or not yet received): 89c397150904011201j3cc19794x4a017d4e97bcd8f5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [pnfs] [PATCH v2 21/47] nfsd41: nfsd DRC logic
Quoted 92 lines · William A. (Andy) Adamson
Quoted 82 lines · J. Bruce Fields
Quoted 81 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Replay a request in
nfsd4_sequence.
Add a minorversion to structnfsd4_compound_state.Pass the current slot to
nfs4svc_encode_compoundres via structnfsd4_compoundresto set an NFSv4.1 DRC entry.Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 7 +++++++ fs/nfsd/nfs4state.c | 6 ++++++ fs/nfsd/nfs4xdr.c | 13 +++++++++++++ include/linux/nfsd/xdr4.h | 1 + 4 files changed, 27 insertions(+), 0 deletions(-)fs/nfsd/nfs4proc.c +7
-0@@ -920,6 +920,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,BUG_ON (op->status == nfs_ok); encode_op: +/* Only from SEQUENCE or CREATE_SESSION */ +if (resp->cstate.status == nfserr_replay_cache) { +dprintk ("%s NFS4.1 replay from cache\n" , __func__); + status = op->status; + goto out; + }if (op->status == nfserr_replay_me) { op->replay = &cstate->replay_owner->so_replay;nfsd4_encode_replay (resp, op);@@ -948,6 +954,7 @@ encode_op: status = nfserr_jukebox; } + resp->cstate.status = status;fh_put (&resp->cstate.current_fh);fh_put (&resp->cstate.save_fh);BUG_ON (resp->cstate.replay_owner);fs/nfsd/nfs4state.c +6
-0@@ -997,6 +997,8 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp) } resp->rqstp->rq_resused = entry->ce_resused; + resp->opcnt = entry->ce_opcnt; + resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen; status = entry->ce_status;return status;@@ -1217,6 +1219,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, status =check_slot_seqid (seq->seqid, slot);if (status == nfserr_replay_cache) { cstate->slot = slot; +/* Return the cached reply status and set cstate->status +* for nfsd4_svc_encode_compoundres processing*/ + status =nfsd4_replay_cache_entry (resp); + cstate->status = nfserr_replay_cache; goto replay_cache; }if (status)fs/nfsd/nfs4xdr.c +5
-0@@ -3059,6 +3059,19 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov = &rqstp->rq_res.head[0 ]; iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE ); +#ifdef CONFIG_NFSD_V4_1 +if (resp->cstate.slot !=NULL ) { +if (resp->cstate.status == nfserr_replay_cache) { + iov->iov_len = resp->cstate.iovlen; + }else {Quoted 8 lines
fs/nfsd/nfs4xdr.c nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo · line 3071
Quoted 5 lines
fs/nfsd/nfs4xdr.c +5
-0+nfsd4_set_cache_entry (resp); +dprintk ("%s: SET SLOT STATE TO AVAILABLE\n" , __func__); + resp->cstate.slot->sl_inuse =0 ; + } +if (resp->cstate.slot->sl_session)There's no way that
sl_sessioncould ever be NULL, so this check is unneeded.
Quoted 4 lines
There should have been a comment.
CREATE_SESSIONsetscstate->slotusing thenfs4_client->cl_slot, a single slot which it uses for theCREATE_SESSIONreplay cache. It does not have a session.
Hm. In that case, there's no reference count on the client that holds the cl_slot structure, so is there anything preventing the cl_slot from being freed out from under us by a concurrent expire_client()?
If that's correct: I'm not sure how to solve that problem with a minimum of special-casing.
--b.
Quoted 38 lines
Quoted 6 lines
While we're at it: let's just eliminate the
sl_sessionpointer from the slot. I think all that would be needed would be a pointer to the session from the cstate, in addition to the pointer to the slot.OK.
Quoted 29 lines
--b.
Quoted 19 lines
fs/nfsd/nfs4xdr.c +3
-0+ nfsd4_put_session(resp->cstate.slot->sl_session); + } +#endif /* CONFIG_NFSD_V4_1 */ return 1 ; }include/linux/nfsd/xdr4.h +1
-1@@ -51,6 +51,7 @@ struct nfsd4_compound_state {/* For sessions DRC */ struct nfsd4_slot *slot;__be32 *statp; +size_t iovlen;u32 status; }; --Quoted 2 lines
1.6.2.1
_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
Re: [pnfs] [PATCH v2 21/47] nfsd41: nfsd DRC logic
Quoted 93 lines · J. Bruce Fields
Quoted 92 lines · William A. (Andy) Adamson
Quoted 90 lines · J. Bruce Fields
Quoted 76 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Replay a request in
nfsd4_sequence.
Add a minorversion to structnfsd4_compound_state.Pass the current slot to
nfs4svc_encode_compoundres via structnfsd4_compoundresto set an NFSv4.1 DRC entry.Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 7 +++++++ fs/nfsd/nfs4state.c | 6 ++++++ fs/nfsd/nfs4xdr.c | 13 +++++++++++++ include/linux/nfsd/xdr4.h | 1 + 4 files changed, 27 insertions(+), 0 deletions(-)fs/nfsd/nfs4proc.c +7
-0@@ -920,6 +920,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,BUG_ON (op->status == nfs_ok); encode_op: +/* Only from SEQUENCE or CREATE_SESSION */ +if (resp->cstate.status == nfserr_replay_cache) { +dprintk ("%s NFS4.1 replay from cache\n" , __func__); + status = op->status; + goto out; + }if (op->status == nfserr_replay_me) { op->replay = &cstate->replay_owner->so_replay;nfsd4_encode_replay (resp, op);@@ -948,6 +954,7 @@ encode_op: status = nfserr_jukebox; } + resp->cstate.status = status;fh_put (&resp->cstate.current_fh);fh_put (&resp->cstate.save_fh);BUG_ON (resp->cstate.replay_owner);fs/nfsd/nfs4state.c +6
-0@@ -997,6 +997,8 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp) } resp->rqstp->rq_resused = entry->ce_resused; + resp->opcnt = entry->ce_opcnt; + resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen; status = entry->ce_status;return status;@@ -1217,6 +1219,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, status =check_slot_seqid (seq->seqid, slot);if (status == nfserr_replay_cache) { cstate->slot = slot; +/* Return the cached reply status and set cstate->status +* for nfsd4_svc_encode_compoundres processing*/ + status =nfsd4_replay_cache_entry (resp); + cstate->status = nfserr_replay_cache; goto replay_cache; }if (status)fs/nfsd/nfs4xdr.c +0
-0@@ -3059,6 +3059,19 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov = &rqstp->rq_res.head[0 ]; iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE );fs/nfsd/nfs4xdr.c nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo · line 3071
Quoted 10 lines
fs/nfsd/nfs4xdr.c +10
-0+#ifdef CONFIG_NFSD_V4_1 +if (resp->cstate.slot !=NULL ) { +if (resp->cstate.status == nfserr_replay_cache) { + iov->iov_len = resp->cstate.iovlen; + }else { +nfsd4_set_cache_entry (resp); +dprintk ("%s: SET SLOT STATE TO AVAILABLE\n" , __func__); + resp->cstate.slot->sl_inuse =0 ; + } +if (resp->cstate.slot->sl_session)There's no way that
sl_sessioncould ever be NULL, so this check is unneeded.
Quoted 8 lines
Quoted 4 lines
There should have been a comment.
CREATE_SESSIONsetscstate->slotusing thenfs4_client->cl_slot, a single slot which it uses for theCREATE_SESSIONreplay cache. It does not have a session.Hm. In that case, there's no reference count on the client that holds the
cl_slotstructure, so is there anything preventing thecl_slotfrom being freed out from under us by a concurrentexpire_client()?
That is true, we don't bump the client cl_count....
Quoted 3 lines
If that's correct: I'm not sure how to solve that problem with a minimum of special-casing.
Hmm. I see what you mean. We would like to take a reference to the nfs4_client in nfsd4_create_session and drop it in nfs4svc_encode_compoundres if the session pointer is NULL.
if (resp->cstate->session)
nfsd4_put_session(resp>cstate->session)
else
nfsd4_put_client(???)but - we currently have no nfs4_client back pointer (except in the session which is null.......)
-->Andy
Quoted 42 lines
--b.
Quoted 38 lines
Quoted 6 lines
While we're at it: let's just eliminate the
sl_sessionpointer from the slot. I think all that would be needed would be a pointer to the session from the cstate, in addition to the pointer to the slot.OK.
Quoted 29 lines
--b.
Quoted 19 lines
fs/nfsd/nfs4xdr.c +3
-0+ nfsd4_put_session(resp->cstate.slot->sl_session); + } +#endif /* CONFIG_NFSD_V4_1 */ return 1 ; }include/linux/nfsd/xdr4.h +1
-1@@ -51,6 +51,7 @@ struct nfsd4_compound_state {/* For sessions DRC */ struct nfsd4_slot *slot;__be32 *statp; +size_t iovlen;u32 status; }; --Quoted 2 lines
1.6.2.1
_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
PATCH v2 22/47 nfsd41: clear DRC cache on free_session
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
--- fs/nfsd/nfs4state.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
fs/nfsd/nfs4state.c +7 -0
@@ -442,12 +442,19 @@ release_session(struct nfsd4_session *ses)nfsd4_put_session (ses); } +static void nfsd4_release_respages (struct page **respages,short resused); +void free_session (struct kref *kref) {struct nfsd4_session *ses; +int i; ses = container_of(kref, struct nfsd4_session, se_ref); +for (i =0 ; i < ses->se_fnumslots; i++) { +struct nfsd4_cache_entry *e = &ses->se_slots[i].sl_cache_entry; +nfsd4_release_respages (e->ce_respages, e->ce_resused); + }kfree (ses->se_slots);kfree (ses); }
Signature · 1 line
1.6.2.1
PATCH v2 23/47 nfsd41: create_session operation
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Implement the create_session operation confoming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26
Look up the client id (generated by the server on exchange_id, given by the client on create_session).
If neither a confirmed or unconfirmed client is found then the client id is stale
If a confirmed cilent is found (i.e. we already received create_session for it) then compare the sequence id to determine if it's a replay or possibly a mis-ordered rpc. If the seqid is in order, update the confirmed client seqid and procedd with updating the session parameters.
If an unconfirmed client_id is found then verify the creds and seqid. If both match move the client id to confirmed state and proceed with processing the create_session.
Currently, we do not support persistent sessions, and RDMA.
alloc_init_session generates a new sessionid and creates a session structure.
NFSD_PAGES_PER_SLOT is used for the max response cached calculation, and for the counting of DRC pages using the hard limits set in struct srv_serv.
A note on NFSD_PAGES_PER_SLOT:
Other patches in this series allow for NFSD_PAGES_PER_SLOT + 1 pages to be cached in a DRC slot when the response size is less than NFSD_PAGES_PER_SLOT * PAGE_SIZE but xdr_buf pages are used. e.g. a READDIR operation will encode a small amount of data in the xdr_buf head, and then the READDIR in the xdr_buf pages. So, the hard limit calculation use of pages by a session is underestimated by the number of cached operations using the xdr_buf pages.
Yet another patch caches no pages for the solo sequence operation, or any compound where cache_this is False. So the hard limit calculation use of pages by a session is overestimated by the number of these operations in the cache.
TODO: improve resource pre-allocation and negotiate session parameters accordingly. Respect and possibly adjust backchannel attributes.
Our client and server only support a headerpadsz of 0.
--- fs/nfsd/nfs4state.c | 197 +++++++++++++++++++++++++++++++++++++++++++- fs/nfsd/nfs4xdr.c | 147 ++++++++++++++++++++++++++++++++- include/linux/nfsd/state.h | 7 ++ include/linux/nfsd/xdr4.h | 21 +++++- 4 files changed, 368 insertions(+), 4 deletions(-)
fs/nfsd/nfs4state.c +196 -1
@@ -68,6 +68,9 @@ static u32 current_delegid = 1;static u32 nfs4_init;static stateid_t zerostateid;/* bits all 0 */ static stateid_t onestateid;/* bits all 1 */ +#ifdef CONFIG_NFSD_V4_1 +static u64 current_sessionid =1 ; +#endif /* CONFIG_NFSD_V4_1 */ #define ZERO_STATEID (stateid) (!memcmp((stateid), &zerostateid, sizeof(stateid_t)))#define ONE_STATEID (stateid) (!memcmp((stateid), &onestateid, sizeof(stateid_t)))
@@ -402,6 +405,138 @@ dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid)dprintk ("%s: %u:%u:%u:%u\n" , fn, ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); } +static void +gen_sessionid (struct nfsd4_session *ses) +{ +struct nfs4_client *clp = ses->se_client; +struct nfsd4_sessionid *sid; + + sid = (struct nfsd4_sessionid *)ses->se_sessionid.data; + sid->clientid = clp->cl_clientid; + sid->sequence = current_sessionid++; + sid->reserved =0 ; +} + +/* +* Give the client the number of slots it requests bound by +* NFSD_MAX_SLOTS_PER_SESSION and by sv_drc_max_pages. +* +* If we run out of pages (sv_drc_pages_used == sv_drc_max_pages) we +* should (up to a point) re-negotiate active sessions and reduce their +* slot usage to make rooom for new connections. For now we just fail the +* create session. +*/ +static int set_forechannel_maxreqs (struct nfsd4_channel_attrs *fchan) +{ +int status =0 , np = fchan->maxreqs *NFSD_PAGES_PER_SLOT ; + +spin_lock (&nfsd_serv->sv_lock); +if (np + nfsd_serv->sv_drc_pages_used > nfsd_serv->sv_drc_max_pages) + np = nfsd_serv->sv_drc_max_pages - nfsd_serv->sv_drc_pages_used; + nfsd_serv->sv_drc_pages_used += np; +spin_unlock (&nfsd_serv->sv_lock); + +if (np <=0 ) { + status = nfserr_resource; + fchan->maxreqs =0 ; + }else + fchan->maxreqs = np /NFSD_PAGES_PER_SLOT ; + +return status; +} + +/* +* fchan holds the client values on input, and the server values on output +*/ +static int init_forechannel_attrs (struct svc_rqst *rqstp, +struct nfsd4_session *session, +struct nfsd4_channel_attrs *fchan) +{ +int status =0 ; +__u32 maxcount =svc_max_payload (rqstp); + +/* headerpadsz set to zero in encode routine*/ + +/* Use the client's max request and max response size if possible */ +if (fchan->maxreq_sz > maxcount) + fchan->maxreq_sz = maxcount; + session->se_fmaxreq_sz = fchan->maxreq_sz; + +if (fchan->maxresp_sz > maxcount) + fchan->maxresp_sz = maxcount; + session->se_fmaxresp_sz = fchan->maxresp_sz; + +/* Set the max response cached size our default which is +* a multiple of PAGE_SIZE and small */ + session->se_fmaxresp_cached =NFSD_PAGES_PER_SLOT *PAGE_SIZE ; + fchan->maxresp_cached = session->se_fmaxresp_cached; + +/* Use the client's maxops if possible */ +if (fchan->maxops >NFSD_MAX_OPS_PER_COMPOUND ) + fchan->maxops =NFSD_MAX_OPS_PER_COMPOUND ; + session->se_fmaxops = fchan->maxops; + +/* try to use the client requested number of slots */ +if (fchan->maxreqs >NFSD_MAX_SLOTS_PER_SESSION ) + fchan->maxreqs =NFSD_MAX_SLOTS_PER_SESSION ; + +/* FIXME: Error means no more DRC pages so the server should +* recover pages from existing sessions. For now fail session +* creation. +*/ + status =set_forechannel_maxreqs (fchan); + + session->se_fnumslots = fchan->maxreqs; +return status; +} + +static int +alloc_init_session (struct svc_rqst *rqstp,struct nfs4_client *clp, +struct nfsd4_create_session *cses) +{ +struct nfsd4_session *new; +int idx, status = nfserr_resource, slotsize, i; + + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (!new) + goto out; + +/* FIXME: For now, we just accept the client back channel attributes. */ + status =init_forechannel_attrs (rqstp, new, &cses->fore_channel); +if (status) + goto out_free; + + slotsize = new->se_fnumslots *sizeof (struct nfsd4_slot ); + new->se_slots =kzalloc (slotsize,GFP_KERNEL ); +if (!new->se_slots) + goto out_free; + +for (i =0 ; i < new->se_fnumslots; i++) + new->se_slots[i].sl_session = new; + + new->se_client = clp; +gen_sessionid (new); + idx =hash_sessionid (&new->se_sessionid); +memcpy (clp->cl_sessionid.data, new->se_sessionid.data, +NFS4_MAX_SESSIONID_LEN ); + + new->se_flags = cses->flags; +kref_init (&new->se_ref); +INIT_LIST_HEAD (&new->se_hash); +INIT_LIST_HEAD (&new->se_perclnt); +spin_lock (&sessionid_lock); +list_add (&new->se_hash, &sessionid_hashtbl[idx]); +list_add (&new->se_perclnt, &clp->cl_sessions); +spin_unlock (&sessionid_lock); + + status = nfs_ok; +out: +return status; +out_free: +kfree (new); + goto out; +} +/* caller must hold sessionid_lock */ static struct nfsd4_session *find_in_sessionid_hashtbl (struct nfs4_sessionid *sessionid)
@@ -1186,7 +1321,67 @@ nfsd4_create_session(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, struct nfsd4_create_session *cr_ses) { -return -1 ;/* stub */ + u32 ip_addr = svc_addr_in(rqstp)->sin_addr.s_addr; +struct nfs4_client *conf, *unconf; +int status =0 ; + +nfs4_lock_state (); + unconf =find_unconfirmed_client (&cr_ses->clientid); + conf =find_confirmed_client (&cr_ses->clientid); + +if (conf) { + status = nfs_ok; +if (conf->cl_seqid == cr_ses->seqid) { +dprintk ("Got a create_session replay! seqid= %d\n" , + conf->cl_seqid); + goto out_replay; + }else if (cr_ses->seqid != conf->cl_seqid +1 ) { + status = nfserr_seq_misordered; +dprintk ("Sequence misordered!\n" ); +dprintk ("Expected seqid= %d but got seqid= %d\n" , + conf->cl_seqid, cr_ses->seqid); + goto out; + } + conf->cl_seqid++; + }else if (unconf) { +if (!same_creds (&unconf->cl_cred, &rqstp->rq_cred) || + (ip_addr != unconf->cl_addr)) { + status = nfserr_clid_inuse; + goto out; + } + +if (unconf->cl_seqid != cr_ses->seqid) { + status = nfserr_seq_misordered; + goto out; + } + +move_to_confirmed (unconf); + +/* +* We do not support RDMA or persistent sessions +*/ + cr_ses->flags &= ~SESSION4_PERSIST ; + cr_ses->flags &= ~SESSION4_RDMA ; + + conf = unconf; + }else { + status = nfserr_stale_clientid; + goto out; + } + + status =alloc_init_session (rqstp, conf, cr_ses); +if (status) + goto out; + +out_replay: +memcpy (cr_ses->sessionid.data, conf->cl_sessionid.data, +NFS4_MAX_SESSIONID_LEN ); + cr_ses->seqid = conf->cl_seqid; + +out: +nfs4_unlock_state (); +dprintk ("%s returns %d\n" , __func__,ntohl (status)); +return status; } __be32
fs/nfsd/nfs4xdr.c +145 -2
159 lines not on this page · raw message
include/linux/nfsd/state.h +7 -0
@@ -99,8 +99,12 @@ struct nfs4_callback {struct rpc_clnt * cb_client; }; +/* Maximum number of slots per session. 128 is useful for long haul TCP */ +#define NFSD_MAX_SLOTS_PER_SESSION 128/* Maximum number of pages per slot cache entry */ #define NFSD_PAGES_PER_SLOT 1 +/* Maximum number of operations per session compound */ +#define NFSD_MAX_OPS_PER_COMPOUND 16struct nfsd4_cache_entry {__be32 ce_status;
@@ -188,6 +192,9 @@ struct nfs4_client {struct list_head cl_sessions;u32 cl_seqid;/* seqid for create_session */ u32 cl_exchange_flags; +struct nfs4_sessionid cl_sessionid; + +struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ #endif /* CONFIG_NFSD_V4_1 */ };
include/linux/nfsd/xdr4.h +20 -1
@@ -360,8 +360,27 @@ struct nfsd4_exchange_id {int spa_how; }; +struct nfsd4_channel_attrs { +u32 headerpadsz; +u32 maxreq_sz; +u32 maxresp_sz; +u32 maxresp_cached; +u32 maxops; +u32 maxreqs; +u32 nr_rdma_attrs; +u32 rdma_attrs; +}; +struct nfsd4_create_session { -int foo;/* stub */ +clientid_t clientid; +struct nfs4_sessionid sessionid; +u32 seqid; +u32 flags; +struct nfsd4_channel_attrs fore_channel; +struct nfsd4_channel_attrs back_channel; +u32 callback_prog; +u32 uid; +u32 gid; };struct nfsd4_sequence {
Signature · 1 line
1.6.2.1
Re: [PATCH v2 23/47] nfsd41: create_session operation
Quoted 15 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
create_sessionoperation confoming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26Look up the client id (generated by the server on
exchange_id, given by the client oncreate_session).
If neither a confirmed or unconfirmed client is found then the client id is stale
If a confirmed cilent is found (i.e. we already receivedcreate_sessionfor it) then compare the sequence id to determine if it's a replay or possibly a mis-ordered rpc. If the seqid is in order, update the confirmed client seqid and procedd with updating the session parameters.
Quoted 3 lines
If an unconfirmed
client_idis found then verify the creds and seqid. If both match move the client id to confirmed state and proceed with processing thecreate_session.
The above two paragraphs just summarize the code step-by-step; that doesn't belong in the commit message.
Quoted 9 lines
Currently, we do not support persistent sessions, and RDMA.
alloc_init_sessiongenerates a new sessionid and creates a session structure.
NFSD_PAGES_PER_SLOTis used for the max response cached calculation, and for the counting of DRC pages using the hard limits set in structsrv_serv.
Quoted 8 lines
A note on
NFSD_PAGES_PER_SLOT:Other patches in this series allow for
NFSD_PAGES_PER_SLOT+ 1 pages to be cached in a DRC slot when the response size is less thanNFSD_PAGES_PER_SLOT*PAGE_SIZEbutxdr_bufpages are used. e.g. a READDIR operation will encode a small amount of data in thexdr_bufhead, and then the READDIR in thexdr_bufpages. So, the hard limit calculation use of pages by a session is underestimated by the number of cached operations using thexdr_bufpages.
I think this might all be clearer if we started with a #define for the maximum cached response size, and then calculated NFSD_PAGES_PER_SLOT from that. Also, factor in the +1 (or +3, or whatever it should be) into the PAGES_PER_SLOT so we don't have to remember to do that everywhere.
Quoted 65 lines
Yet another patch caches no pages for the solo sequence operation, or any compound where
cache_thisis False. So the hard limit calculation use of pages by a session is overestimated by the number of these operations in the cache.TODO: improve resource pre-allocation and negotiate session parameters accordingly. Respect and possibly adjust backchannel attributes.
Signed-off-by Marc Eshel <[email protected]>Signed-off-by Dean Hildebrand <[email protected]>[nfsd41: remove headerpadsz from channel attributes]Our client and server only support a headerpadsz of 0.
[nfsd41: use DRC limits in fore channel init][nfsd41: do not change CREATE_SESSION back channel attrs]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[use sessionid_lock spin lock][nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4state.c | 197 +++++++++++++++++++++++++++++++++++++++++++- fs/nfsd/nfs4xdr.c | 147 ++++++++++++++++++++++++++++++++- include/linux/nfsd/state.h | 7 ++ include/linux/nfsd/xdr4.h | 21 +++++- 4 files changed, 368 insertions(+), 4 deletions(-)fs/nfsd/nfs4state.c +23
-0@@ -68,6 +68,9 @@ static u32 current_delegid = 1;static u32 nfs4_init;static stateid_t zerostateid;/* bits all 0 */ static stateid_t onestateid;/* bits all 1 */ +#ifdef CONFIG_NFSD_V4_1 +static u64 current_sessionid =1 ; +#endif /* CONFIG_NFSD_V4_1 */ #define ZERO_STATEID (stateid) (!memcmp((stateid), &zerostateid, sizeof(stateid_t)))#define ONE_STATEID (stateid) (!memcmp((stateid), &onestateid, sizeof(stateid_t)))@@ -402,6 +405,138 @@ dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid)dprintk ("%s: %u:%u:%u:%u\n" , fn, ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); } +static void +gen_sessionid (struct nfsd4_session *ses) +{ +struct nfs4_client *clp = ses->se_client; +struct nfsd4_sessionid *sid; + + sid = (struct nfsd4_sessionid *)ses->se_sessionid.data; + sid->clientid = clp->cl_clientid; + sid->sequence = current_sessionid++; + sid->reserved =0 ; +} + +/* +* Give the client the number of slots it requests bound by +* NFSD_MAX_SLOTS_PER_SESSION and by sv_drc_max_pages. +* +* If we run out of pages (sv_drc_pages_used == sv_drc_max_pages) we +* should (up to a point) re-negotiate active sessions and reduce their +* slot usage to make rooom for new connections. For now we just fail the +* create session.
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 437
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+*/ +static int set_forechannel_maxreqs (struct nfsd4_channel_attrs *fchan) +{ +int status =0 , np = fchan->maxreqs *NFSD_PAGES_PER_SLOT ; + +spin_lock (&nfsd_serv->sv_lock); +if (np + nfsd_serv->sv_drc_pages_used > nfsd_serv->sv_drc_max_pages) + np = nfsd_serv->sv_drc_max_pages - nfsd_serv->sv_drc_pages_used; + nfsd_serv->sv_drc_pages_used += np; +spin_unlock (&nfsd_serv->sv_lock);
Don't use the sv_lock for this.
(I greatly appreciate any help with the locking, but the difficult part isn't adding lock calls, but developing and explaining clear rules about what locks are taken where, and why.)
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 439
Quoted 2 lines
fs/nfsd/nfs4state.c +2
-0+ +if (np <=0 ) {
It's too late--we've already increased sv_drc_pages_used. This check needs to happen earlier.
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 443
Quoted 4 lines
fs/nfsd/nfs4state.c +4
-0+ status = nfserr_resource; + fchan->maxreqs =0 ; + }else + fchan->maxreqs = np /NFSD_PAGES_PER_SLOT ;
Check to make sure that's not zero?
Quoted 5 lines
fs/nfsd/nfs4state.c +5
-0+ +return status; +} + +/*
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 458
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+* fchan holds the client values on input, and the server values on output +*/ +static int init_forechannel_attrs (struct svc_rqst *rqstp, +struct nfsd4_session *session, +struct nfsd4_channel_attrs *fchan) +{ +int status =0 ; +__u32 maxcount =svc_max_payload (rqstp); + +/* headerpadsz set to zero in encode routine*/
Space after "routine".
Quoted 34 lines
fs/nfsd/nfs4state.c +34
-0+ +/* Use the client's max request and max response size if possible */ +if (fchan->maxreq_sz > maxcount) + fchan->maxreq_sz = maxcount; + session->se_fmaxreq_sz = fchan->maxreq_sz; + +if (fchan->maxresp_sz > maxcount) + fchan->maxresp_sz = maxcount; + session->se_fmaxresp_sz = fchan->maxresp_sz; + +/* Set the max response cached size our default which is +* a multiple of PAGE_SIZE and small */ + session->se_fmaxresp_cached =NFSD_PAGES_PER_SLOT *PAGE_SIZE ; + fchan->maxresp_cached = session->se_fmaxresp_cached; + +/* Use the client's maxops if possible */ +if (fchan->maxops >NFSD_MAX_OPS_PER_COMPOUND ) + fchan->maxops =NFSD_MAX_OPS_PER_COMPOUND ; + session->se_fmaxops = fchan->maxops; + +/* try to use the client requested number of slots */ +if (fchan->maxreqs >NFSD_MAX_SLOTS_PER_SESSION ) + fchan->maxreqs =NFSD_MAX_SLOTS_PER_SESSION ; + +/* FIXME: Error means no more DRC pages so the server should +* recover pages from existing sessions. For now fail session +* creation. +*/ + status =set_forechannel_maxreqs (fchan); + + session->se_fnumslots = fchan->maxreqs; +return status; +} +
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 502
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+static int +alloc_init_session (struct svc_rqst *rqstp,struct nfs4_client *clp, +struct nfsd4_create_session *cses) +{ +struct nfsd4_session *new; +int idx, status = nfserr_resource, slotsize, i; + + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (!new) + goto out;
Just return.
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 512
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+ +/* FIXME: For now, we just accept the client back channel attributes. */ + status =init_forechannel_attrs (rqstp, new, &cses->fore_channel); +if (status) + goto out_free; + + slotsize = new->se_fnumslots *sizeof (struct nfsd4_slot ); + new->se_slots =kzalloc (slotsize,GFP_KERNEL ); +if (!new->se_slots) + goto out_free;
Let's just allocate the session and slot table as one chunk of size (sizeof(struct nfsd4_session)+ numslots * sizeof(struct nfsd4_slot).
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 515
Quoted 3 lines
fs/nfsd/nfs4state.c +3
-0+ +for (i =0 ; i < new->se_fnumslots; i++) + new->se_slots[i].sl_session = new;
And let's get rid of sl_session.
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 526
Quoted 11 lines
fs/nfsd/nfs4state.c +11
-0+ + new->se_client = clp; +gen_sessionid (new); + idx =hash_sessionid (&new->se_sessionid); +memcpy (clp->cl_sessionid.data, new->se_sessionid.data, +NFS4_MAX_SESSIONID_LEN ); + + new->se_flags = cses->flags; +kref_init (&new->se_ref); +INIT_LIST_HEAD (&new->se_hash); +INIT_LIST_HEAD (&new->se_perclnt);
These INIT_LIST_HEAD's are redundant given the immediately following list_add's.
Quoted 313 lines
fs/nfsd/nfs4state.c +74
-1+spin_lock (&sessionid_lock); +list_add (&new->se_hash, &sessionid_hashtbl[idx]); +list_add (&new->se_perclnt, &clp->cl_sessions); +spin_unlock (&sessionid_lock); + + status = nfs_ok; +out: +return status; +out_free: +kfree (new); + goto out; +} +/* caller must hold sessionid_lock */ static struct nfsd4_session *find_in_sessionid_hashtbl (struct nfs4_sessionid *sessionid)@@ -1186,7 +1321,67 @@ nfsd4_create_session(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, struct nfsd4_create_session *cr_ses) { -return -1 ;/* stub */ + u32 ip_addr = svc_addr_in(rqstp)->sin_addr.s_addr; +struct nfs4_client *conf, *unconf; +int status =0 ; + +nfs4_lock_state (); + unconf =find_unconfirmed_client (&cr_ses->clientid); + conf =find_confirmed_client (&cr_ses->clientid); + +if (conf) { + status = nfs_ok; +if (conf->cl_seqid == cr_ses->seqid) { +dprintk ("Got a create_session replay! seqid= %d\n" , + conf->cl_seqid); + goto out_replay; + }else if (cr_ses->seqid != conf->cl_seqid +1 ) { + status = nfserr_seq_misordered; +dprintk ("Sequence misordered!\n" ); +dprintk ("Expected seqid= %d but got seqid= %d\n" , + conf->cl_seqid, cr_ses->seqid); + goto out; + } + conf->cl_seqid++; + }else if (unconf) { +if (!same_creds (&unconf->cl_cred, &rqstp->rq_cred) || + (ip_addr != unconf->cl_addr)) { + status = nfserr_clid_inuse; + goto out; + } + +if (unconf->cl_seqid != cr_ses->seqid) { + status = nfserr_seq_misordered; + goto out; + } + +move_to_confirmed (unconf); + +/* +* We do not support RDMA or persistent sessions +*/ + cr_ses->flags &= ~SESSION4_PERSIST ; + cr_ses->flags &= ~SESSION4_RDMA ; + + conf = unconf; + }else { + status = nfserr_stale_clientid; + goto out; + } + + status =alloc_init_session (rqstp, conf, cr_ses); +if (status) + goto out; + +out_replay: +memcpy (cr_ses->sessionid.data, conf->cl_sessionid.data, +NFS4_MAX_SESSIONID_LEN ); + cr_ses->seqid = conf->cl_seqid; + +out: +nfs4_unlock_state (); +dprintk ("%s returns %d\n" , __func__,ntohl (status)); +return status; } __be32fs/nfsd/nfs4xdr.c +145
-2@@ -1100,7 +1100,108 @@ static __be32 nfsd4_decode_create_session(struct nfsd4_compoundargs *argp, struct nfsd4_create_session *sess) { - return nfserr_opnotsupp; /* stub */ +DECODE_HEAD ; + +u32 dummy; +char *machine_name; +int i; +int nr_secflavs; + +READ_BUF (16 ); +COPYMEM (&sess->clientid,8 ); +READ32 (sess->seqid); +READ32 (sess->flags); + +/* Fore channel attrs */ +READ_BUF (28 ); +READ32 (dummy);/* headerpadsz is always 0 */ +READ32 (sess->fore_channel.maxreq_sz); +READ32 (sess->fore_channel.maxresp_sz); +READ32 (sess->fore_channel.maxresp_cached); +READ32 (sess->fore_channel.maxops); +READ32 (sess->fore_channel.maxreqs); +READ32 (sess->fore_channel.nr_rdma_attrs); +if (sess->fore_channel.nr_rdma_attrs ==1 ) { +READ_BUF (4 ); +READ32 (sess->fore_channel.rdma_attrs); + }else if (sess->fore_channel.nr_rdma_attrs >1 ) { +dprintk ("Too many fore channel attr bitmaps!\n" ); + goto xdr_error; + } + +/* Back channel attrs */ +READ_BUF (28 ); +READ32 (dummy);/* headerpadsz is always 0 */ +READ32 (sess->back_channel.maxreq_sz); +READ32 (sess->back_channel.maxresp_sz); +READ32 (sess->back_channel.maxresp_cached); +READ32 (sess->back_channel.maxops); +READ32 (sess->back_channel.maxreqs); +READ32 (sess->back_channel.nr_rdma_attrs); +if (sess->back_channel.nr_rdma_attrs ==1 ) { +READ_BUF (4 ); +READ32 (sess->back_channel.rdma_attrs); + }else if (sess->back_channel.nr_rdma_attrs >1 ) { +dprintk ("Too many back channel attr bitmaps!\n" ); + goto xdr_error; + } + +READ_BUF (8 ); +READ32 (sess->callback_prog); + +/* callback_sec_params4 */ +READ32 (nr_secflavs); +for (i =0 ; i < nr_secflavs; ++i) { +READ_BUF (4 ); +READ32 (dummy); +switch (dummy) { +case RPC_AUTH_NULL : +/* Nothing to read */ +break ; +case RPC_AUTH_UNIX : +READ_BUF (8 ); +/* stamp */ +READ32 (dummy); + +/* machine name */ +READ32 (dummy); +READ_BUF (dummy); +SAVEMEM (machine_name, dummy); + +/* uid, gid */ +READ_BUF (8 ); +READ32 (sess->uid); +READ32 (sess->gid); + +/* more gids */ +READ_BUF (4 ); +READ32 (dummy); +READ_BUF (dummy *4 ); +for (i =0 ; i < dummy; ++i) +READ32 (dummy); +break ; +case RPC_AUTH_GSS : +dprintk ("RPC_AUTH_GSS callback secflavor " +"not supported!\n" ); +READ_BUF (8 ); +/* gcbp_service */ +READ32 (dummy); +/* gcbp_handle_from_server */ +READ32 (dummy); +READ_BUF (dummy); + p +=XDR_QUADLEN (dummy); +/* gcbp_handle_from_client */ +READ_BUF (4 ); +READ32 (dummy); +READ_BUF (dummy); + p +=XDR_QUADLEN (dummy); +break ; +default : +dprintk ("Illegal callback secflavor\n" ); +return nfserr_inval; + } + } +DECODE_TAIL ; } static __be32@@ -2829,7 +2930,49 @@ static __be32 nfsd4_encode_create_session(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_create_session *sess) { - /* stub */ +ENCODE_HEAD ; + +if (nfserr) + goto out; + +RESERVE_SPACE (24 ); +WRITEMEM (sess->sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (sess->seqid); +WRITE32 (sess->flags); +ADJUST_ARGS (); + +RESERVE_SPACE (28 ); +WRITE32 (0 );/* headerpadsz */ +WRITE32 (sess->fore_channel.maxreq_sz); +WRITE32 (sess->fore_channel.maxresp_sz); +WRITE32 (sess->fore_channel.maxresp_cached); +WRITE32 (sess->fore_channel.maxops); +WRITE32 (sess->fore_channel.maxreqs); +WRITE32 (sess->fore_channel.nr_rdma_attrs); +ADJUST_ARGS (); + +if (sess->fore_channel.nr_rdma_attrs) { +RESERVE_SPACE (4 ); +WRITE32 (sess->fore_channel.rdma_attrs); +ADJUST_ARGS (); + } + +RESERVE_SPACE (28 ); +WRITE32 (0 );/* headerpadsz */ +WRITE32 (sess->back_channel.maxreq_sz); +WRITE32 (sess->back_channel.maxresp_sz); +WRITE32 (sess->back_channel.maxresp_cached); +WRITE32 (sess->back_channel.maxops); +WRITE32 (sess->back_channel.maxreqs); +WRITE32 (sess->back_channel.nr_rdma_attrs); +ADJUST_ARGS (); + +if (sess->back_channel.nr_rdma_attrs) { +RESERVE_SPACE (4 ); +WRITE32 (sess->back_channel.rdma_attrs); +ADJUST_ARGS (); + } +out:return nfserr; }include/linux/nfsd/state.h +7
-0@@ -99,8 +99,12 @@ struct nfs4_callback {struct rpc_clnt * cb_client; }; +/* Maximum number of slots per session. 128 is useful for long haul TCP */ +#define NFSD_MAX_SLOTS_PER_SESSION 128/* Maximum number of pages per slot cache entry */ #define NFSD_PAGES_PER_SLOT 1 +/* Maximum number of operations per session compound */ +#define NFSD_MAX_OPS_PER_COMPOUND 16struct nfsd4_cache_entry {__be32 ce_status;@@ -188,6 +192,9 @@ struct nfs4_client {struct list_head cl_sessions;u32 cl_seqid;/* seqid for create_session */ u32 cl_exchange_flags; +struct nfs4_sessionid cl_sessionid; + +struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ #endif /* CONFIG_NFSD_V4_1 */ };include/linux/nfsd/xdr4.h +20
-1@@ -360,8 +360,27 @@ struct nfsd4_exchange_id {int spa_how; }; +struct nfsd4_channel_attrs { +u32 headerpadsz; +u32 maxreq_sz; +u32 maxresp_sz; +u32 maxresp_cached; +u32 maxops; +u32 maxreqs; +u32 nr_rdma_attrs; +u32 rdma_attrs; +}; +struct nfsd4_create_session { -int foo;/* stub */ +clientid_t clientid; +struct nfs4_sessionid sessionid; +u32 seqid; +u32 flags; +struct nfsd4_channel_attrs fore_channel; +struct nfsd4_channel_attrs back_channel; +u32 callback_prog; +u32 uid; +u32 gid; };struct nfsd4_sequence {Signature · 1 line
1.6.2.1
Re: [PATCH v2 23/47] nfsd41: create_session operation
In reply to Benny HalevyQuoted 185 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
create_sessionoperation confoming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26Look up the client id (generated by the server on
exchange_id, given by the client oncreate_session).
If neither a confirmed or unconfirmed client is found then the client id is stale
If a confirmed cilent is found (i.e. we already receivedcreate_sessionfor it) then compare the sequence id to determine if it's a replay or possibly a mis-ordered rpc. If the seqid is in order, update the confirmed client seqid and procedd with updating the session parameters.If an unconfirmed
client_idis found then verify the creds and seqid. If both match move the client id to confirmed state and proceed with processing thecreate_session.Currently, we do not support persistent sessions, and RDMA.
alloc_init_sessiongenerates a new sessionid and creates a session structure.
NFSD_PAGES_PER_SLOTis used for the max response cached calculation, and for the counting of DRC pages using the hard limits set in structsrv_serv.A note on
NFSD_PAGES_PER_SLOT:Other patches in this series allow for
NFSD_PAGES_PER_SLOT+ 1 pages to be cached in a DRC slot when the response size is less thanNFSD_PAGES_PER_SLOT*PAGE_SIZEbutxdr_bufpages are used. e.g. a READDIR operation will encode a small amount of data in thexdr_bufhead, and then the READDIR in thexdr_bufpages. So, the hard limit calculation use of pages by a session is underestimated by the number of cached operations using thexdr_bufpages.Yet another patch caches no pages for the solo sequence operation, or any compound where
cache_thisis False. So the hard limit calculation use of pages by a session is overestimated by the number of these operations in the cache.TODO: improve resource pre-allocation and negotiate session parameters accordingly. Respect and possibly adjust backchannel attributes.
Signed-off-by Marc Eshel <[email protected]>Signed-off-by Dean Hildebrand <[email protected]>[nfsd41: remove headerpadsz from channel attributes]Our client and server only support a headerpadsz of 0.
[nfsd41: use DRC limits in fore channel init][nfsd41: do not change CREATE_SESSION back channel attrs]Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>[use sessionid_lock spin lock][nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4state.c | 197 +++++++++++++++++++++++++++++++++++++++++++- fs/nfsd/nfs4xdr.c | 147 ++++++++++++++++++++++++++++++++- include/linux/nfsd/state.h | 7 ++ include/linux/nfsd/xdr4.h | 21 +++++- 4 files changed, 368 insertions(+), 4 deletions(-)fs/nfsd/nfs4state.c +107
-0@@ -68,6 +68,9 @@ static u32 current_delegid = 1;static u32 nfs4_init;static stateid_t zerostateid;/* bits all 0 */ static stateid_t onestateid;/* bits all 1 */ +#ifdef CONFIG_NFSD_V4_1 +static u64 current_sessionid =1 ; +#endif /* CONFIG_NFSD_V4_1 */ #define ZERO_STATEID (stateid) (!memcmp((stateid), &zerostateid, sizeof(stateid_t)))#define ONE_STATEID (stateid) (!memcmp((stateid), &onestateid, sizeof(stateid_t)))@@ -402,6 +405,138 @@ dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid)dprintk ("%s: %u:%u:%u:%u\n" , fn, ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); } +static void +gen_sessionid (struct nfsd4_session *ses) +{ +struct nfs4_client *clp = ses->se_client; +struct nfsd4_sessionid *sid; + + sid = (struct nfsd4_sessionid *)ses->se_sessionid.data; + sid->clientid = clp->cl_clientid; + sid->sequence = current_sessionid++; + sid->reserved =0 ; +} + +/* +* Give the client the number of slots it requests bound by +* NFSD_MAX_SLOTS_PER_SESSION and by sv_drc_max_pages. +* +* If we run out of pages (sv_drc_pages_used == sv_drc_max_pages) we +* should (up to a point) re-negotiate active sessions and reduce their +* slot usage to make rooom for new connections. For now we just fail the +* create session. +*/ +static int set_forechannel_maxreqs (struct nfsd4_channel_attrs *fchan) +{ +int status =0 , np = fchan->maxreqs *NFSD_PAGES_PER_SLOT ; + +spin_lock (&nfsd_serv->sv_lock); +if (np + nfsd_serv->sv_drc_pages_used > nfsd_serv->sv_drc_max_pages) + np = nfsd_serv->sv_drc_max_pages - nfsd_serv->sv_drc_pages_used; + nfsd_serv->sv_drc_pages_used += np; +spin_unlock (&nfsd_serv->sv_lock); + +if (np <=0 ) { + status = nfserr_resource; + fchan->maxreqs =0 ; + }else + fchan->maxreqs = np /NFSD_PAGES_PER_SLOT ; + +return status; +} + +/* +* fchan holds the client values on input, and the server values on output +*/ +static int init_forechannel_attrs (struct svc_rqst *rqstp, +struct nfsd4_session *session, +struct nfsd4_channel_attrs *fchan) +{ +int status =0 ; +__u32 maxcount =svc_max_payload (rqstp); + +/* headerpadsz set to zero in encode routine*/ + +/* Use the client's max request and max response size if possible */ +if (fchan->maxreq_sz > maxcount) + fchan->maxreq_sz = maxcount; + session->se_fmaxreq_sz = fchan->maxreq_sz; + +if (fchan->maxresp_sz > maxcount) + fchan->maxresp_sz = maxcount; + session->se_fmaxresp_sz = fchan->maxresp_sz; + +/* Set the max response cached size our default which is +* a multiple of PAGE_SIZE and small */ + session->se_fmaxresp_cached =NFSD_PAGES_PER_SLOT *PAGE_SIZE ; + fchan->maxresp_cached = session->se_fmaxresp_cached; + +/* Use the client's maxops if possible */ +if (fchan->maxops >NFSD_MAX_OPS_PER_COMPOUND ) + fchan->maxops =NFSD_MAX_OPS_PER_COMPOUND ; + session->se_fmaxops = fchan->maxops; + +/* try to use the client requested number of slots */ +if (fchan->maxreqs >NFSD_MAX_SLOTS_PER_SESSION ) + fchan->maxreqs =NFSD_MAX_SLOTS_PER_SESSION ; + +/* FIXME: Error means no more DRC pages so the server should +* recover pages from existing sessions. For now fail session +* creation. +*/ + status =set_forechannel_maxreqs (fchan); + + session->se_fnumslots = fchan->maxreqs; +return status; +} + +static int +alloc_init_session (struct svc_rqst *rqstp,struct nfs4_client *clp, +struct nfsd4_create_session *cses) +{ +struct nfsd4_session *new; +int idx, status = nfserr_resource, slotsize, i; + + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (!new) + goto out; + +/* FIXME: For now, we just accept the client back channel attributes. */ + status =init_forechannel_attrs (rqstp, new, &cses->fore_channel); +if (status) + goto out_free; + + slotsize = new->se_fnumslots *sizeof (struct nfsd4_slot ); + new->se_slots =kzalloc (slotsize,GFP_KERNEL ); +if (!new->se_slots)
fs/nfsd/nfs4state.c dump_sessionid(const char *fn, struct nfs4_sessionid *sessionid) · line 521
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+ goto out_free; + +for (i =0 ; i < new->se_fnumslots; i++) + new->se_slots[i].sl_session = new; + + new->se_client = clp; +gen_sessionid (new); + idx =hash_sessionid (&new->se_sessionid); +memcpy (clp->cl_sessionid.data, new->se_sessionid.data, +NFS4_MAX_SESSIONID_LEN );
The sessionid should be part of the new session, not the client, right?
Quoted 41 lines
fs/nfsd/nfs4state.c +33
-1+ + new->se_flags = cses->flags; +kref_init (&new->se_ref); +INIT_LIST_HEAD (&new->se_hash); +INIT_LIST_HEAD (&new->se_perclnt); +spin_lock (&sessionid_lock); +list_add (&new->se_hash, &sessionid_hashtbl[idx]); +list_add (&new->se_perclnt, &clp->cl_sessions); +spin_unlock (&sessionid_lock); + + status = nfs_ok; +out: +return status; +out_free: +kfree (new); + goto out; +} +/* caller must hold sessionid_lock */ static struct nfsd4_session *find_in_sessionid_hashtbl (struct nfs4_sessionid *sessionid)@@ -1186,7 +1321,67 @@ nfsd4_create_session(struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, struct nfsd4_create_session *cr_ses) { -return -1 ;/* stub */ + u32 ip_addr = svc_addr_in(rqstp)->sin_addr.s_addr; +struct nfs4_client *conf, *unconf; +int status =0 ; + +nfs4_lock_state (); + unconf =find_unconfirmed_client (&cr_ses->clientid); + conf =find_confirmed_client (&cr_ses->clientid); + +if (conf) { + status = nfs_ok; +if (conf->cl_seqid == cr_ses->seqid) { +dprintk ("Got a create_session replay! seqid= %d\n" , + conf->cl_seqid); + goto out_replay; + }else if (cr_ses->seqid != conf->cl_seqid +1 ) {
fs/nfsd/nfs4state.c nfsd4_create_session(struct svc_rqst *rqstp, · line 1348
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+ status = nfserr_seq_misordered; +dprintk ("Sequence misordered!\n" ); +dprintk ("Expected seqid= %d but got seqid= %d\n" , + conf->cl_seqid, cr_ses->seqid); + goto out; + } + conf->cl_seqid++; + }else if (unconf) { +if (!same_creds (&unconf->cl_cred, &rqstp->rq_cred) || + (ip_addr != unconf->cl_addr)) {
Again, I don't believe the nfsv4/4.1 specs require the client to keep to a single ip address, so we shouldn't be doing ip address checks.
--b.
Quoted 11 lines
fs/nfsd/nfs4state.c +11
-0+ status = nfserr_clid_inuse; + goto out; + } + +if (unconf->cl_seqid != cr_ses->seqid) { + status = nfserr_seq_misordered; + goto out; + } + +move_to_confirmed (unconf); +
fs/nfsd/nfs4state.c nfsd4_create_session(struct svc_rqst *rqstp, · line 1369
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+/* +* We do not support RDMA or persistent sessions +*/ + cr_ses->flags &= ~SESSION4_PERSIST ; + cr_ses->flags &= ~SESSION4_RDMA ; + + conf = unconf; + }else { + status = nfserr_stale_clientid; + goto out;
Is this the right error?
--b.
Quoted 246 lines
fs/nfsd/nfs4state.c +15
-0+ } + + status =alloc_init_session (rqstp, conf, cr_ses); +if (status) + goto out; + +out_replay: +memcpy (cr_ses->sessionid.data, conf->cl_sessionid.data, +NFS4_MAX_SESSIONID_LEN ); + cr_ses->seqid = conf->cl_seqid; + +out: +nfs4_unlock_state (); +dprintk ("%s returns %d\n" , __func__,ntohl (status)); +return status; } __be32fs/nfsd/nfs4xdr.c +145
-2@@ -1100,7 +1100,108 @@ static __be32 nfsd4_decode_create_session(struct nfsd4_compoundargs *argp, struct nfsd4_create_session *sess) { - return nfserr_opnotsupp; /* stub */ +DECODE_HEAD ; + +u32 dummy; +char *machine_name; +int i; +int nr_secflavs; + +READ_BUF (16 ); +COPYMEM (&sess->clientid,8 ); +READ32 (sess->seqid); +READ32 (sess->flags); + +/* Fore channel attrs */ +READ_BUF (28 ); +READ32 (dummy);/* headerpadsz is always 0 */ +READ32 (sess->fore_channel.maxreq_sz); +READ32 (sess->fore_channel.maxresp_sz); +READ32 (sess->fore_channel.maxresp_cached); +READ32 (sess->fore_channel.maxops); +READ32 (sess->fore_channel.maxreqs); +READ32 (sess->fore_channel.nr_rdma_attrs); +if (sess->fore_channel.nr_rdma_attrs ==1 ) { +READ_BUF (4 ); +READ32 (sess->fore_channel.rdma_attrs); + }else if (sess->fore_channel.nr_rdma_attrs >1 ) { +dprintk ("Too many fore channel attr bitmaps!\n" ); + goto xdr_error; + } + +/* Back channel attrs */ +READ_BUF (28 ); +READ32 (dummy);/* headerpadsz is always 0 */ +READ32 (sess->back_channel.maxreq_sz); +READ32 (sess->back_channel.maxresp_sz); +READ32 (sess->back_channel.maxresp_cached); +READ32 (sess->back_channel.maxops); +READ32 (sess->back_channel.maxreqs); +READ32 (sess->back_channel.nr_rdma_attrs); +if (sess->back_channel.nr_rdma_attrs ==1 ) { +READ_BUF (4 ); +READ32 (sess->back_channel.rdma_attrs); + }else if (sess->back_channel.nr_rdma_attrs >1 ) { +dprintk ("Too many back channel attr bitmaps!\n" ); + goto xdr_error; + } + +READ_BUF (8 ); +READ32 (sess->callback_prog); + +/* callback_sec_params4 */ +READ32 (nr_secflavs); +for (i =0 ; i < nr_secflavs; ++i) { +READ_BUF (4 ); +READ32 (dummy); +switch (dummy) { +case RPC_AUTH_NULL : +/* Nothing to read */ +break ; +case RPC_AUTH_UNIX : +READ_BUF (8 ); +/* stamp */ +READ32 (dummy); + +/* machine name */ +READ32 (dummy); +READ_BUF (dummy); +SAVEMEM (machine_name, dummy); + +/* uid, gid */ +READ_BUF (8 ); +READ32 (sess->uid); +READ32 (sess->gid); + +/* more gids */ +READ_BUF (4 ); +READ32 (dummy); +READ_BUF (dummy *4 ); +for (i =0 ; i < dummy; ++i) +READ32 (dummy); +break ; +case RPC_AUTH_GSS : +dprintk ("RPC_AUTH_GSS callback secflavor " +"not supported!\n" ); +READ_BUF (8 ); +/* gcbp_service */ +READ32 (dummy); +/* gcbp_handle_from_server */ +READ32 (dummy); +READ_BUF (dummy); + p +=XDR_QUADLEN (dummy); +/* gcbp_handle_from_client */ +READ_BUF (4 ); +READ32 (dummy); +READ_BUF (dummy); + p +=XDR_QUADLEN (dummy); +break ; +default : +dprintk ("Illegal callback secflavor\n" ); +return nfserr_inval; + } + } +DECODE_TAIL ; } static __be32@@ -2829,7 +2930,49 @@ static __be32 nfsd4_encode_create_session(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_create_session *sess) { - /* stub */ +ENCODE_HEAD ; + +if (nfserr) + goto out; + +RESERVE_SPACE (24 ); +WRITEMEM (sess->sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (sess->seqid); +WRITE32 (sess->flags); +ADJUST_ARGS (); + +RESERVE_SPACE (28 ); +WRITE32 (0 );/* headerpadsz */ +WRITE32 (sess->fore_channel.maxreq_sz); +WRITE32 (sess->fore_channel.maxresp_sz); +WRITE32 (sess->fore_channel.maxresp_cached); +WRITE32 (sess->fore_channel.maxops); +WRITE32 (sess->fore_channel.maxreqs); +WRITE32 (sess->fore_channel.nr_rdma_attrs); +ADJUST_ARGS (); + +if (sess->fore_channel.nr_rdma_attrs) { +RESERVE_SPACE (4 ); +WRITE32 (sess->fore_channel.rdma_attrs); +ADJUST_ARGS (); + } + +RESERVE_SPACE (28 ); +WRITE32 (0 );/* headerpadsz */ +WRITE32 (sess->back_channel.maxreq_sz); +WRITE32 (sess->back_channel.maxresp_sz); +WRITE32 (sess->back_channel.maxresp_cached); +WRITE32 (sess->back_channel.maxops); +WRITE32 (sess->back_channel.maxreqs); +WRITE32 (sess->back_channel.nr_rdma_attrs); +ADJUST_ARGS (); + +if (sess->back_channel.nr_rdma_attrs) { +RESERVE_SPACE (4 ); +WRITE32 (sess->back_channel.rdma_attrs); +ADJUST_ARGS (); + } +out:return nfserr; }include/linux/nfsd/state.h +7
-0@@ -99,8 +99,12 @@ struct nfs4_callback {struct rpc_clnt * cb_client; }; +/* Maximum number of slots per session. 128 is useful for long haul TCP */ +#define NFSD_MAX_SLOTS_PER_SESSION 128/* Maximum number of pages per slot cache entry */ #define NFSD_PAGES_PER_SLOT 1 +/* Maximum number of operations per session compound */ +#define NFSD_MAX_OPS_PER_COMPOUND 16struct nfsd4_cache_entry {__be32 ce_status;@@ -188,6 +192,9 @@ struct nfs4_client {struct list_head cl_sessions;u32 cl_seqid;/* seqid for create_session */ u32 cl_exchange_flags; +struct nfs4_sessionid cl_sessionid; + +struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ #endif /* CONFIG_NFSD_V4_1 */ };include/linux/nfsd/xdr4.h +20
-1@@ -360,8 +360,27 @@ struct nfsd4_exchange_id {int spa_how; }; +struct nfsd4_channel_attrs { +u32 headerpadsz; +u32 maxreq_sz; +u32 maxresp_sz; +u32 maxresp_cached; +u32 maxops; +u32 maxreqs; +u32 nr_rdma_attrs; +u32 rdma_attrs; +}; +struct nfsd4_create_session { -int foo;/* stub */ +clientid_t clientid; +struct nfs4_sessionid sessionid; +u32 seqid; +u32 flags; +struct nfsd4_channel_attrs fore_channel; +struct nfsd4_channel_attrs back_channel; +u32 callback_prog; +u32 uid; +u32 gid; };struct nfsd4_sequence {Signature · 1 line
1.6.2.1
PATCH v2 24/47 nfsd41: Add a create session replay cache
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Replace the nfs4_client cl_seqid field with a single struct nfs41_slot used for the create session replay cache.
The CREATE_SESSION slot sets the sl_session pointer to NULL. Otherwise, the slot and it's replay cache are used just like the session slots.
Fix unconfirmed create_session replay response by initializing the create_session slot sequence id to 0.
A future patch will set the CREATE_SESSION cache when a SEQUENCE operation preceeds the CREATE_SESSION operation. This compound is currently only cached in the session slot table.
--- fs/nfsd/nfs4state.c | 47 ++++++++++++++++++++++++++++++------------- include/linux/nfsd/state.h | 2 +- 2 files changed, 34 insertions(+), 15 deletions(-)
fs/nfsd/nfs4state.c +33 -14
@@ -662,6 +662,10 @@ static inline void free_client(struct nfs4_client *clp) {shutdown_callback_client (clp); +#if defined(CONFIG_NFSD_V4_1 ) +nfsd4_release_respages (clp->cl_slot.sl_cache_entry.ce_respages, + clp->cl_slot.sl_cache_entry.ce_resused); +#endif /* CONFIG_NFSD_V4_1 */ if (clp->cl_cred.cr_group_info)put_group_info (clp->cl_cred.cr_group_info);kfree (clp->cl_principal);
@@ -1055,12 +1059,14 @@ nfsd4_set_cache_entry(struct nfsd4_compoundres *resp) {struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;struct svc_rqst *rqstp = resp->rqstp; +struct nfsd4_compoundargs *args = rqstp->rq_argp; +struct nfsd4_op *op = &args->ops[resp->opcnt];struct kvec *resv = &rqstp->rq_res.head[0 ];dprintk ("--> %s entry %p\n" , __func__, entry); -/* Don't cache a failed OP_SEQUENCE */ -if (resp->opcnt ==1 && resp->cstate.status) +/* Don't cache a failed OP_SEQUENCE. */ +if (resp->opcnt ==1 && op->opnum ==OP_SEQUENCE && resp->cstate.status)return ;nfsd4_release_respages (entry->ce_respages, entry->ce_resused); entry->ce_resused = rqstp->rq_resused;
@@ -1276,11 +1282,12 @@ out_copy: exid->clientid.cl_boot = new->cl_clientid.cl_boot; exid->clientid.cl_id = new->cl_clientid.cl_id; - new->cl_seqid = exid->seqid =1 ; + new->cl_slot.sl_seqid =0 ; + exid->seqid =1 ;nfsd4_set_ex_flags (new, exid);dprintk ("nfsd4_exchange_id seqid %d flags %x\n" , - new->cl_seqid, new->cl_exchange_flags); + new->cl_slot.sl_seqid, new->cl_exchange_flags); status = nfs_ok; out:
@@ -1322,7 +1329,9 @@ nfsd4_create_session(struct svc_rqst *rqstp, struct nfsd4_create_session *cr_ses) {u32 ip_addr =svc_addr_in (rqstp)->sin_addr.s_addr; +struct nfsd4_compoundres *resp = rqstp->rq_resp;struct nfs4_client *conf, *unconf; +struct nfsd4_slot *slot =NULL ;int status =0 ;nfs4_lock_state ();
@@ -1330,19 +1339,24 @@ nfsd4_create_session(struct svc_rqst *rqstp, conf =find_confirmed_client (&cr_ses->clientid);if (conf) { - status = nfs_ok; -if (conf->cl_seqid == cr_ses->seqid) { + slot = &conf->cl_slot; + status =check_slot_seqid (cr_ses->seqid, slot); +if (status == nfserr_replay_cache) {dprintk ("Got a create_session replay! seqid= %d\n" , - conf->cl_seqid); - goto out_replay; - }else if (cr_ses->seqid != conf->cl_seqid +1 ) { + slot->sl_seqid); + cstate->slot = slot; + cstate->status = status; +/* Return the cached reply status */ + status =nfsd4_replay_cache_entry (resp); + goto out; + }else if (cr_ses->seqid != conf->cl_slot.sl_seqid +1 ) { status = nfserr_seq_misordered;dprintk ("Sequence misordered!\n" );dprintk ("Expected seqid= %d but got seqid= %d\n" , - conf->cl_seqid, cr_ses->seqid); + slot->sl_seqid, cr_ses->seqid); goto out; } - conf->cl_seqid++; + conf->cl_slot.sl_seqid++; }else if (unconf) {if (!same_creds (&unconf->cl_cred, &rqstp->rq_cred) || (ip_addr != unconf->cl_addr)) {
@@ -1350,11 +1364,15 @@ nfsd4_create_session(struct svc_rqst *rqstp, goto out; } -if (unconf->cl_seqid != cr_ses->seqid) { + slot = &unconf->cl_slot; + status =check_slot_seqid (cr_ses->seqid, slot); +if (status) { +/* an unconfirmed replay returns misordered */ status = nfserr_seq_misordered; goto out; } + slot->sl_seqid++;/* from 0 to 1 */ move_to_confirmed (unconf);/*
@@ -1373,11 +1391,12 @@ nfsd4_create_session(struct svc_rqst *rqstp,if (status) goto out; -out_replay:memcpy (cr_ses->sessionid.data, conf->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); - cr_ses->seqid = conf->cl_seqid; + cr_ses->seqid = slot->sl_seqid; + slot->sl_inuse = true; + cstate->slot = slot; out:nfs4_unlock_state ();dprintk ("%s returns %d\n" , __func__,ntohl (status));
include/linux/nfsd/state.h +1 -1
@@ -190,7 +190,7 @@ struct nfs4_client {u32 cl_firststate;/* recovery dir creation */ #ifdef CONFIG_NFSD_V4_1 struct list_head cl_sessions; -u32 cl_seqid;/* seqid for create_session */ +struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid;
Signature · 1 line
1.6.2.1
Re: [PATCH v2 24/47] nfsd41: Add a create session replay cache
Quoted 29 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Replace the
nfs4_clientcl_seqidfield with a single structnfs41_slotused for the create session replay cache.The
CREATE_SESSIONslot sets thesl_sessionpointer to NULL. Otherwise, the slot and it's replay cache are used just like the session slots.Fix unconfirmed
create_sessionreplay response by initializing thecreate_sessionslot sequence id to 0.A future patch will set the
CREATE_SESSIONcache when a SEQUENCE operation preceeds theCREATE_SESSIONoperation. This compound is currently only cached in the session slot table.Signed-off-by Andy Adamson<[email protected]>Signed-off-by Benny Halevy <[email protected]>[nfsd41: use bool inuse for slot state]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4state.c | 47 ++++++++++++++++++++++++++++++------------- include/linux/nfsd/state.h | 2 +- 2 files changed, 34 insertions(+), 15 deletions(-)fs/nfsd/nfs4state.c +0
-0
fs/nfsd/nfs4state.c static inline void · line 668
Quoted 7 lines
fs/nfsd/nfs4state.c +4
-0@@ -662,6 +662,10 @@ static inline void free_client(struct nfs4_client *clp) {shutdown_callback_client (clp); +#if defined(CONFIG_NFSD_V4_1 ) +nfsd4_release_respages (clp->cl_slot.sl_cache_entry.ce_respages, + clp->cl_slot.sl_cache_entry.ce_resused); +#endif /* CONFIG_NFSD_V4_1 */
Hide these ifdef's somehow. And maybe make a free_slot that does this and that's called from here and free_session.
Quoted 7 lines
fs/nfsd/nfs4state.c +0
-0if (clp->cl_cred.cr_group_info)put_group_info (clp->cl_cred.cr_group_info);kfree (clp->cl_principal);@@ -1055,12 +1059,14 @@ nfsd4_set_cache_entry(struct nfsd4_compoundres *resp) {struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;struct svc_rqst *rqstp = resp->rqstp;
fs/nfsd/nfs4state.c nfsd4_set_cache_entry(struct nfsd4_compoundres *resp) · line 1069
Quoted 10 lines
fs/nfsd/nfs4state.c +4
-2+struct nfsd4_compoundargs *args = rqstp->rq_argp; +struct nfsd4_op *op = &args->ops[resp->opcnt];struct kvec *resv = &rqstp->rq_res.head[0 ];dprintk ("--> %s entry %p\n" , __func__, entry); -/* Don't cache a failed OP_SEQUENCE */ -if (resp->opcnt ==1 && resp->cstate.status) +/* Don't cache a failed OP_SEQUENCE. */ +if (resp->opcnt ==1 && op->opnum ==OP_SEQUENCE && resp->cstate.status)
Why is this in this patch?
--b.
Quoted 108 lines
fs/nfsd/nfs4state.c +25
-12return ;nfsd4_release_respages (entry->ce_respages, entry->ce_resused); entry->ce_resused = rqstp->rq_resused;@@ -1276,11 +1282,12 @@ out_copy: exid->clientid.cl_boot = new->cl_clientid.cl_boot; exid->clientid.cl_id = new->cl_clientid.cl_id; - new->cl_seqid = exid->seqid =1 ; + new->cl_slot.sl_seqid =0 ; + exid->seqid =1 ;nfsd4_set_ex_flags (new, exid);dprintk ("nfsd4_exchange_id seqid %d flags %x\n" , - new->cl_seqid, new->cl_exchange_flags); + new->cl_slot.sl_seqid, new->cl_exchange_flags); status = nfs_ok; out:@@ -1322,7 +1329,9 @@ nfsd4_create_session(struct svc_rqst *rqstp, struct nfsd4_create_session *cr_ses) {u32 ip_addr =svc_addr_in (rqstp)->sin_addr.s_addr; +struct nfsd4_compoundres *resp = rqstp->rq_resp;struct nfs4_client *conf, *unconf; +struct nfsd4_slot *slot =NULL ;int status =0 ;nfs4_lock_state ();@@ -1330,19 +1339,24 @@ nfsd4_create_session(struct svc_rqst *rqstp, conf =find_confirmed_client (&cr_ses->clientid);if (conf) { - status = nfs_ok; -if (conf->cl_seqid == cr_ses->seqid) { + slot = &conf->cl_slot; + status =check_slot_seqid (cr_ses->seqid, slot); +if (status == nfserr_replay_cache) {dprintk ("Got a create_session replay! seqid= %d\n" , - conf->cl_seqid); - goto out_replay; - }else if (cr_ses->seqid != conf->cl_seqid +1 ) { + slot->sl_seqid); + cstate->slot = slot; + cstate->status = status; +/* Return the cached reply status */ + status =nfsd4_replay_cache_entry (resp); + goto out; + }else if (cr_ses->seqid != conf->cl_slot.sl_seqid +1 ) { status = nfserr_seq_misordered;dprintk ("Sequence misordered!\n" );dprintk ("Expected seqid= %d but got seqid= %d\n" , - conf->cl_seqid, cr_ses->seqid); + slot->sl_seqid, cr_ses->seqid); goto out; } - conf->cl_seqid++; + conf->cl_slot.sl_seqid++; }else if (unconf) {if (!same_creds (&unconf->cl_cred, &rqstp->rq_cred) || (ip_addr != unconf->cl_addr)) {@@ -1350,11 +1364,15 @@ nfsd4_create_session(struct svc_rqst *rqstp, goto out; } -if (unconf->cl_seqid != cr_ses->seqid) { + slot = &unconf->cl_slot; + status =check_slot_seqid (cr_ses->seqid, slot); +if (status) { +/* an unconfirmed replay returns misordered */ status = nfserr_seq_misordered; goto out; } + slot->sl_seqid++;/* from 0 to 1 */ move_to_confirmed (unconf);/* @@ -1373,11 +1391,12 @@ nfsd4_create_session(struct svc_rqst *rqstp,if (status) goto out; -out_replay:memcpy (cr_ses->sessionid.data, conf->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); - cr_ses->seqid = conf->cl_seqid; + cr_ses->seqid = slot->sl_seqid; + slot->sl_inuse = true; + cstate->slot = slot; out:nfs4_unlock_state ();dprintk ("%s returns %d\n" , __func__,ntohl (status));include/linux/nfsd/state.h +1
-1@@ -190,7 +190,7 @@ struct nfs4_client {u32 cl_firststate;/* recovery dir creation */ #ifdef CONFIG_NFSD_V4_1 struct list_head cl_sessions; -u32 cl_seqid;/* seqid for create_session */ +struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid;Signature · 1 line
1.6.2.1
PATCH v2 25/47 nfsd41: non-page DRC for solo sequence responses
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
A session inactivity time compound (lease renewal) or a compound where the sequence operation has sa_cachethis set to FALSE do not require any pages to be held in the v4.1 DRC. This is because struct nfsd4_slot is already caching the session information.
Add logic to the nfs41 server to not cache response pages for solo sequence responses.
Return nfserr_replay_uncached_rep on the operation following the sequence operation when sa_cachethis is FALSE.
--- fs/nfsd/nfs4proc.c | 34 +++++++++++++++++++++++++++++- fs/nfsd/nfs4state.c | 47 ++++++++++++++++++++++++++++++++++++++----- fs/nfsd/nfs4xdr.c | 5 ++- include/linux/nfsd/state.h | 1 + include/linux/nfsd/xdr4.h | 15 +++++++++++++- 5 files changed, 91 insertions(+), 11 deletions(-)
fs/nfsd/nfs4proc.c +32 -2
@@ -828,6 +828,34 @@ static struct nfsd4_operation nfsd4_ops[];static const char *nfsd4_op_name (unsigned opnum);/* +* This is a replay of a compound for which no cache entry pages +* were used. Encode the sequence operation, and if cachethis is FALSE +* encode the uncache rep error on the next operation. +*/ +static __be32 +nfsd4_enc_no_page_replay (struct nfsd4_compoundargs *args, +struct nfsd4_compoundres *resp) +{ +struct nfsd4_op *op; + +dprintk ("--> %s resp->opcnt %d ce_cachethis %u \n" , __func__, + resp->opcnt, resp->cstate.slot->sl_cache_entry.ce_cachethis); + +/* Encode the replayed sequence operation */ +BUG_ON (resp->opcnt !=1 ); + op = &args->ops[resp->opcnt -1 ]; +nfsd4_encode_operation (resp, op); + +/*return nfserr_retry_uncached_rep in next operation. */ +if (resp->cstate.slot->sl_cache_entry.ce_cachethis ==0 ) { + op = &args->ops[resp->opcnt++]; + op->status = nfserr_retry_uncached_rep; +nfsd4_encode_operation (resp, op); + } +return op->status; +} + +/* * COMPOUND call. */ static __be32
@@ -879,7 +907,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,dprintk ("nfsv4 compound op #%d/%d: %d (%s)\n" , resp->opcnt, args->opcnt, op->opnum,nfsd4_op_name (op->opnum)); -/* * The XDR decode routines may have pre-set op->status; * for example, if there is a miscellaneous XDR error
@@ -923,7 +950,10 @@ encode_op:/* Only from SEQUENCE or CREATE_SESSION */ if (resp->cstate.status == nfserr_replay_cache) {dprintk ("%s NFS4.1 replay from cache\n" , __func__); - status = op->status; +if (nfsd4_no_page_in_cache (resp)) + status =nfsd4_enc_no_page_replay (args, resp); +else + status = op->status; goto out; }if (op->status == nfserr_replay_me) {
fs/nfsd/nfs4state.c +41 -6
98 lines not on this page · raw message
fs/nfsd/nfs4xdr.c +3 -2
@@ -2984,7 +2984,7 @@ nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, int nfserr,return nfserr; } -static __be32 +__be32 nfsd4_encode_sequence (struct nfsd4_compoundres *resp,int nfserr,struct nfsd4_sequence *seq) {
@@ -3204,7 +3204,8 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compoBUG_ON (iov->iov_len >PAGE_SIZE );#ifdef CONFIG_NFSD_V4_1 if (resp->cstate.slot !=NULL ) { -if (resp->cstate.status == nfserr_replay_cache) { +if (resp->cstate.status == nfserr_replay_cache && + !nfsd4_no_page_in_cache (resp)) { iov->iov_len = resp->cstate.iovlen; }else {nfsd4_set_cache_entry (resp);
include/linux/nfsd/state.h +1 -0
@@ -110,6 +110,7 @@ struct nfsd4_cache_entry {__be32 ce_status;struct kvec ce_datav;/* encoded NFSv4.1 data in rq_res.head[0] */ struct page *ce_respages[NFSD_PAGES_PER_SLOT +1 ]; +int ce_cachethis;short ce_resused;int ce_opcnt;int ce_rpchdrlen;
include/linux/nfsd/xdr4.h +14 -1
@@ -482,6 +482,18 @@ struct nfsd4_compoundres {struct nfsd4_compound_state cstate; }; +static inline u32 nfsd4_is_solo_sequence (struct nfsd4_compoundres *resp) +{ +struct nfsd4_compoundargs *args = resp->rqstp->rq_argp; +return args->opcnt ==1 ?1 :0 ; +} + +static inline u32 nfsd4_no_page_in_cache (struct nfsd4_compoundres *resp) +{ +return (resp->cstate.slot->sl_cache_entry.ce_cachethis ==0 || +nfsd4_is_solo_sequence (resp)); +} +#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) static inline void
@@ -513,7 +525,8 @@ extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm);#if defined(CONFIG_NFSD_V4_1 )extern void nfsd4_set_cache_entry (struct nfsd4_compoundres *resp); -extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp); +extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp, +struct nfsd4_sequence *seq);extern __be32 nfsd4_exchange_id (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_exchange_id *);
Signature · 1 line
1.6.2.1
Re: [PATCH v2 25/47] nfsd41: non-page DRC for solo sequence responses
Quoted 44 lines · Benny Halevy
From: Andy Adamson <[email protected]>
A session inactivity time compound (lease renewal) or a compound where the sequence operation has
sa_cachethisset to FALSE do not require any pages to be held in the v4.1 DRC. This is because structnfsd4_slotis already caching the session information.Add logic to the nfs41 server to not cache response pages for solo sequence responses.
Return
nfserr_replay_uncached_repon the operation following the sequence operation whensa_cachethisis FALSE.Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 34 +++++++++++++++++++++++++++++- fs/nfsd/nfs4state.c | 47 ++++++++++++++++++++++++++++++++++++++----- fs/nfsd/nfs4xdr.c | 5 ++- include/linux/nfsd/state.h | 1 + include/linux/nfsd/xdr4.h | 15 +++++++++++++- 5 files changed, 91 insertions(+), 11 deletions(-)fs/nfsd/nfs4proc.c +13
-0@@ -828,6 +828,34 @@ static struct nfsd4_operation nfsd4_ops[];static const char *nfsd4_op_name (unsigned opnum);/* +* This is a replay of a compound for which no cache entry pages +* were used. Encode the sequence operation, and if cachethis is FALSE +* encode the uncache rep error on the next operation. +*/ +static __be32 +nfsd4_enc_no_page_replay (struct nfsd4_compoundargs *args, +struct nfsd4_compoundres *resp) +{ +struct nfsd4_op *op; + +dprintk ("--> %s resp->opcnt %d ce_cachethis %u \n" , __func__, + resp->opcnt, resp->cstate.slot->sl_cache_entry.ce_cachethis); +
fs/nfsd/nfs4proc.c static struct nfsd4_operation nfsd4_ops[]; · line 853
Quoted 10 lines
fs/nfsd/nfs4proc.c +10
-0+/* Encode the replayed sequence operation */ +BUG_ON (resp->opcnt !=1 ); + op = &args->ops[resp->opcnt -1 ]; +nfsd4_encode_operation (resp, op); + +/*return nfserr_retry_uncached_rep in next operation. */ +if (resp->cstate.slot->sl_cache_entry.ce_cachethis ==0 ) { + op = &args->ops[resp->opcnt++]; + op->status = nfserr_retry_uncached_rep; +nfsd4_encode_operation (resp, op);
Encoding both operations here makes me very nervous, but I haven't thought it through.
Quoted 17 lines
fs/nfsd/nfs4proc.c +5
-1+ } +return op->status; +} + +/* * COMPOUND call. */ static __be32@@ -879,7 +907,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,dprintk ("nfsv4 compound op #%d/%d: %d (%s)\n" , resp->opcnt, args->opcnt, op->opnum,nfsd4_op_name (op->opnum)); -/* * The XDR decode routines may have pre-set op->status; * for example, if there is a miscellaneous XDR error
fs/nfsd/nfs4proc.c encode_op: · line 953
Quoted 5 lines
fs/nfsd/nfs4proc.c +1
-1@@ -923,7 +950,10 @@ encode_op:/* Only from SEQUENCE or CREATE_SESSION */ if (resp->cstate.status == nfserr_replay_cache) {dprintk ("%s NFS4.1 replay from cache\n" , __func__); - status = op->status; +if (nfsd4_no_page_in_cache (resp))
Why not just call that nfsd4_not_cached()?
fs/nfsd/nfs4proc.c encode_op: · line 954
Quoted 1 line
fs/nfsd/nfs4proc.c +1
-0+ status =nfsd4_enc_no_page_replay (args, resp);
and nfsd4_enc_uncached_replay()? (The "no_page" this is a technical detail of the current caching implementation.)
Quoted 20 lines
fs/nfsd/nfs4proc.c +2
-0+else + status = op->status; goto out; }if (op->status == nfserr_replay_me) {fs/nfsd/nfs4state.c +6
-0@@ -1068,17 +1068,31 @@ nfsd4_set_cache_entry(struct nfsd4_compoundres *resp)/* Don't cache a failed OP_SEQUENCE. */ if (resp->opcnt ==1 && op->opnum ==OP_SEQUENCE && resp->cstate.status)return ; +nfsd4_release_respages (entry->ce_respages, entry->ce_resused); + entry->ce_opcnt = resp->opcnt; + entry->ce_status = resp->cstate.status; + +/* +* Don't need a page to cache just the sequence operation - the slot
fs/nfsd/nfs4state.c nfsd4_set_cache_entry(struct nfsd4_compoundres *resp) · line 1087
Quoted 10 lines
fs/nfsd/nfs4state.c +10
-0+* does this for us! +*/ + +if (nfsd4_no_page_in_cache (resp)) { + entry->ce_resused =0 ; + entry->ce_rpchdrlen =0 ; +dprintk ("%s Just cache SEQUENCE. ce_cachethis %d\n" , __func__, + resp->cstate.slot->sl_cache_entry.ce_cachethis); +return ; + }
Do we *ever* actually need to cache the initial sequence op? Should we only be storing subsequent ops in the reply cache?
Quoted 62 lines
fs/nfsd/nfs4state.c +19
-4entry->ce_resused = rqstp->rq_resused;if (entry->ce_resused >NFSD_PAGES_PER_SLOT +1 ) entry->ce_resused =NFSD_PAGES_PER_SLOT +1 ;nfsd4_move_pages (entry->ce_respages, rqstp->rq_respages, entry->ce_resused); - entry->ce_status = resp->cstate.status; entry->ce_datav.iov_base = resp->cstate.statp; entry->ce_datav.iov_len = resv->iov_len - ((char *)resp->cstate.statp - (char *)page_address (rqstp->rq_respages[0 ])); - entry->ce_opcnt = resp->opcnt;/* Current request rpc header length*/ entry->ce_rpchdrlen = (char *)resp->cstate.statp - (char *)page_address (rqstp->rq_respages[0 ]);@@ -1117,13 +1131,28 @@ nfsd41_copy_replay_data(struct nfsd4_compoundres *resp,* cached page. Replace any futher replay pages from the cache. */ __be32 -nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp) +nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp, +struct nfsd4_sequence *seq) {struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;__be32 status;dprintk ("--> %s entry %p\n" , __func__, entry); +/* +* If this is just the sequence operation, we did not keep +* a page in the cache entry because we can just use the +* slot info stored in struct nfsd4_sequence that was checked +* against the slot in nfsd4_sequence(). +* +* This occurs when seq->cachethis is FALSE, or when the client +* session inactivity timer fires and a solo sequence operation +* is sent (lease renewal). +*/ +if (seq &&nfsd4_no_page_in_cache (resp)) { + seq->maxslots = resp->cstate.slot->sl_session->se_fnumslots; +return nfs_ok; + }if (!nfsd41_copy_replay_data (resp, entry)) {/* @@ -1347,7 +1376,7 @@ nfsd4_create_session(struct svc_rqst *rqstp, cstate->slot = slot; cstate->status = status;/* Return the cached reply status */ - status =nfsd4_replay_cache_entry (resp); + status =nfsd4_replay_cache_entry (resp,NULL ); goto out; }else if (cr_ses->seqid != conf->cl_slot.sl_seqid +1 ) { status = nfserr_seq_misordered;@@ -1397,6 +1426,8 @@ nfsd4_create_session(struct svc_rqst *rqstp, slot->sl_inuse = true; cstate->slot = slot; +/* Ensure a page is used for the cache */ + slot->sl_cache_entry.ce_cachethis =1 ; out:nfs4_unlock_state ();dprintk ("%s returns %d\n" , __func__,ntohl (status));
fs/nfsd/nfs4state.c nfsd4_sequence(struct svc_rqst *rqstp, · line 1475
Quoted 6 lines
fs/nfsd/nfs4state.c +1
-2@@ -1441,8 +1472,8 @@ nfsd4_sequence(struct svc_rqst *rqstp,if (status == nfserr_replay_cache) { cstate->slot = slot;/* Return the cached reply status and set cstate->status -* for nfsd4_svc_encode_compoundres processing*/ - status =nfsd4_replay_cache_entry (resp); +* for nfsd4_svc_encode_compoundres processing */
The comment typo-fix doesn't belong in this patch.
Quoted 55 lines
fs/nfsd/nfs4state.c +5
-0+ status =nfsd4_replay_cache_entry (resp, seq); cstate->status = nfserr_replay_cache; goto replay_cache; }@@ -1452,6 +1483,10 @@ nfsd4_sequence(struct svc_rqst *rqstp,/* Success! bump slot seqid */ slot->sl_inuse = true; slot->sl_seqid = seq->seqid; + slot->sl_cache_entry.ce_cachethis = seq->cachethis; +/* Always set the cache entry cachethis for solo sequence */ +if (nfsd4_is_solo_sequence (resp)) + slot->sl_cache_entry.ce_cachethis =1 ; cstate->slot = slot;fs/nfsd/nfs4xdr.c +3
-2@@ -2984,7 +2984,7 @@ nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, int nfserr,return nfserr; } -static __be32 +__be32 nfsd4_encode_sequence (struct nfsd4_compoundres *resp,int nfserr,struct nfsd4_sequence *seq) {@@ -3204,7 +3204,8 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compoBUG_ON (iov->iov_len >PAGE_SIZE );#ifdef CONFIG_NFSD_V4_1 if (resp->cstate.slot !=NULL ) { -if (resp->cstate.status == nfserr_replay_cache) { +if (resp->cstate.status == nfserr_replay_cache && + !nfsd4_no_page_in_cache (resp)) { iov->iov_len = resp->cstate.iovlen; }else {nfsd4_set_cache_entry (resp);include/linux/nfsd/state.h +1
-0@@ -110,6 +110,7 @@ struct nfsd4_cache_entry {__be32 ce_status;struct kvec ce_datav;/* encoded NFSv4.1 data in rq_res.head[0] */ struct page *ce_respages[NFSD_PAGES_PER_SLOT +1 ]; +int ce_cachethis;short ce_resused;int ce_opcnt;int ce_rpchdrlen;include/linux/nfsd/xdr4.h +0
-0
include/linux/nfsd/xdr4.h struct nfsd4_compoundres { · line 488
Quoted 7 lines
include/linux/nfsd/xdr4.h +4
-0@@ -482,6 +482,18 @@ struct nfsd4_compoundres {struct nfsd4_compound_state cstate; }; +static inline u32 nfsd4_is_solo_sequence (struct nfsd4_compoundres *resp) +{ +struct nfsd4_compoundargs *args = resp->rqstp->rq_argp; +return args->opcnt ==1 ?1 :0 ;
Drop the redundant "? 1: 0", and make the return int (or boolean, if you want).
include/linux/nfsd/xdr4.h struct nfsd4_compoundres { · line 491
Quoted 3 lines
include/linux/nfsd/xdr4.h +3
-0+} + +static inline u32 nfsd4_no_page_in_cache (struct nfsd4_compoundres *resp)
Ditto on the return type.
include/linux/nfsd/xdr4.h struct nfsd4_compoundres { · line 494
Quoted 3 lines
include/linux/nfsd/xdr4.h +3
-0+{ +return (resp->cstate.slot->sl_cache_entry.ce_cachethis ==0 || +nfsd4_is_solo_sequence (resp));
Drop the extra parentheses.
--b.
Quoted 18 lines
include/linux/nfsd/xdr4.h +4
-1+} +#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) static inline void@@ -513,7 +525,8 @@ extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm);#if defined(CONFIG_NFSD_V4_1 )extern void nfsd4_set_cache_entry (struct nfsd4_compoundres *resp); -extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp); +extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp, +struct nfsd4_sequence *seq);extern __be32 nfsd4_exchange_id (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_exchange_id *);Signature · 1 line
1.6.2.1
Re: [pnfs] [PATCH v2 25/47] nfsd41: non-page DRC for solo sequence responses
Quoted 50 lines · J. Bruce Fields
Quoted 49 lines · Benny Halevy
From: Andy Adamson <[email protected]>
A session inactivity time compound (lease renewal) or a compound where the sequence operation has
sa_cachethisset to FALSE do not require any pages to be held in the v4.1 DRC. This is because structnfsd4_slotis already caching the session information.Add logic to the nfs41 server to not cache response pages for solo sequence responses.
Return
nfserr_replay_uncached_repon the operation following the sequence operation whensa_cachethisis FALSE.Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 34 +++++++++++++++++++++++++++++- fs/nfsd/nfs4state.c | 47 ++++++++++++++++++++++++++++++++++++++----- fs/nfsd/nfs4xdr.c | 5 ++- include/linux/nfsd/state.h | 1 + include/linux/nfsd/xdr4.h | 15 +++++++++++++- 5 files changed, 91 insertions(+), 11 deletions(-)fs/nfsd/nfs4proc.c +18
-0@@ -828,6 +828,34 @@ static struct nfsd4_operation nfsd4_ops[];static const char *nfsd4_op_name (unsigned opnum);/* +* This is a replay of a compound for which no cache entry pages +* were used. Encode the sequence operation, and if cachethis is FALSE +* encode the uncache rep error on the next operation. +*/ +static __be32 +nfsd4_enc_no_page_replay (struct nfsd4_compoundargs *args, +struct nfsd4_compoundres *resp) +{ +struct nfsd4_op *op; + +dprintk ("--> %s resp->opcnt %d ce_cachethis %u \n" , __func__, + resp->opcnt, resp->cstate.slot->sl_cache_entry.ce_cachethis); + +/* Encode the replayed sequence operation */ +BUG_ON (resp->opcnt !=1 ); + op = &args->ops[resp->opcnt -1 ]; +nfsd4_encode_operation (resp, op); +
Quoted 8 lines
fs/nfsd/nfs4proc.c static struct nfsd4_operation nfsd4_ops[]; · line 853
Quoted 5 lines
fs/nfsd/nfs4proc.c +5
-0+/*return nfserr_retry_uncached_rep in next operation. */ +if (resp->cstate.slot->sl_cache_entry.ce_cachethis ==0 ) { + op = &args->ops[resp->opcnt++]; + op->status = nfserr_retry_uncached_rep; +nfsd4_encode_operation (resp, op);Encoding both operations here makes me very nervous, but I haven't thought it through.
We only encode the sequence operation here, and set the error in the next operation which gets encoded in the next nfsd4_proc_compound loop.
Quoted 17 lines
Quoted 17 lines
fs/nfsd/nfs4proc.c +5
-1+ } +return op->status; +} + +/* * COMPOUND call. */ static __be32@@ -879,7 +907,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,dprintk ("nfsv4 compound op #%d/%d: %d (%s)\n" , resp->opcnt, args->opcnt, op->opnum,nfsd4_op_name (op->opnum)); -/* * The XDR decode routines may have pre-set op->status; * for example, if there is a miscellaneous XDR error
Quoted 8 lines
fs/nfsd/nfs4proc.c encode_op: · line 953
Quoted 6 lines
fs/nfsd/nfs4proc.c +1
-1@@ -923,7 +950,10 @@ encode_op:/* Only from SEQUENCE or CREATE_SESSION */ if (resp->cstate.status == nfserr_replay_cache) {dprintk ("%s NFS4.1 replay from cache\n" , __func__); - status = op->status; +if (nfsd4_no_page_in_cache (resp))Why not just call that
nfsd4_not_cached()?
OK
Quoted 5 lines
fs/nfsd/nfs4proc.c encode_op: · line 954
Quoted 2 lines
fs/nfsd/nfs4proc.c +1
-0+ status =nfsd4_enc_no_page_replay (args, resp);and
nfsd4_enc_uncached_replay()? (The "no_page" this is a technical detail of the current caching implementation.)
OK
Quoted 26 lines
Quoted 26 lines
fs/nfsd/nfs4proc.c +2
-0+else + status = op->status; goto out; }if (op->status == nfserr_replay_me) {fs/nfsd/nfs4state.c +11
-0@@ -1068,17 +1068,31 @@ nfsd4_set_cache_entry(struct nfsd4_compoundres *resp)/* Don't cache a failed OP_SEQUENCE. */ if (resp->opcnt ==1 && op->opnum ==OP_SEQUENCE && resp->cstate.status)return ; +nfsd4_release_respages (entry->ce_respages, entry->ce_resused); + entry->ce_opcnt = resp->opcnt; + entry->ce_status = resp->cstate.status; + +/* +* Don't need a page to cache just the sequence operation - the slot +* does this for us! +*/ + +if (nfsd4_no_page_in_cache (resp)) { + entry->ce_resused =0 ;
Quoted 8 lines
fs/nfsd/nfs4state.c nfsd4_set_cache_entry(struct nfsd4_compoundres *resp) · line 1087
Quoted 5 lines
fs/nfsd/nfs4state.c +5
-0+ entry->ce_rpchdrlen =0 ; +dprintk ("%s Just cache SEQUENCE. ce_cachethis %d\n" , __func__, + resp->cstate.slot->sl_cache_entry.ce_cachethis); +return ; + }Do we *ever* actually need to cache the initial sequence op? Should we only be storing subsequent ops in the reply cache?
We cache encoded pages, or not. If we did not do this, then we would be mucking with each and every reply just to cache it. e.g. we would be doing a copy of all the other subsequent ops out of the page into some other storage. We also need the rpc header of the reply so that we have the choice later on to compare the original principal with the incoming replay principal.
To me it makes a lot more sense to do the least amount of work in the common no-replay case, which is to simply store the page or two of the reply.
Quoted 55 lines
Quoted 55 lines
fs/nfsd/nfs4state.c +17
-4entry->ce_resused = rqstp->rq_resused;if (entry->ce_resused >NFSD_PAGES_PER_SLOT +1 ) entry->ce_resused =NFSD_PAGES_PER_SLOT +1 ;nfsd4_move_pages (entry->ce_respages, rqstp->rq_respages, entry->ce_resused); - entry->ce_status = resp->cstate.status; entry->ce_datav.iov_base = resp->cstate.statp; entry->ce_datav.iov_len = resv->iov_len - ((char *)resp->cstate.statp - (char *)page_address (rqstp->rq_respages[0 ])); - entry->ce_opcnt = resp->opcnt;/* Current request rpc header length*/ entry->ce_rpchdrlen = (char *)resp->cstate.statp - (char *)page_address (rqstp->rq_respages[0 ]);@@ -1117,13 +1131,28 @@ nfsd41_copy_replay_data(struct nfsd4_compoundres *resp,* cached page. Replace any futher replay pages from the cache. */ __be32 -nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp) +nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp, +struct nfsd4_sequence *seq) {struct nfsd4_cache_entry *entry = &resp->cstate.slot->sl_cache_entry;__be32 status;dprintk ("--> %s entry %p\n" , __func__, entry); +/* +* If this is just the sequence operation, we did not keep +* a page in the cache entry because we can just use the +* slot info stored in struct nfsd4_sequence that was checked +* against the slot in nfsd4_sequence(). +* +* This occurs when seq->cachethis is FALSE, or when the client +* session inactivity timer fires and a solo sequence operation +* is sent (lease renewal). +*/ +if (seq &&nfsd4_no_page_in_cache (resp)) { + seq->maxslots = resp->cstate.slot->sl_session->se_fnumslots; +return nfs_ok; + }if (!nfsd41_copy_replay_data (resp, entry)) {/* @@ -1347,7 +1376,7 @@ nfsd4_create_session(struct svc_rqst *rqstp, cstate->slot = slot; cstate->status = status;/* Return the cached reply status */ - status =nfsd4_replay_cache_entry (resp); + status =nfsd4_replay_cache_entry (resp,NULL ); goto out; }else if (cr_ses->seqid != conf->cl_slot.sl_seqid +1 ) { status = nfserr_seq_misordered;@@ -1397,6 +1426,8 @@ nfsd4_create_session(struct svc_rqst *rqstp,
Quoted 16 lines
Quoted 8 lines
fs/nfsd/nfs4state.c +2
-0slot->sl_inuse = true; cstate->slot = slot; +/* Ensure a page is used for the cache */ + slot->sl_cache_entry.ce_cachethis =1 ; out:nfs4_unlock_state ();dprintk ("%s returns %d\n" , __func__,ntohl (status));fs/nfsd/nfs4state.c nfsd4_sequence(struct svc_rqst *rqstp, · line 1475
Quoted 6 lines
fs/nfsd/nfs4state.c +1
-2@@ -1441,8 +1472,8 @@ nfsd4_sequence(struct svc_rqst *rqstp,if (status == nfserr_replay_cache) { cstate->slot = slot;/* Return the cached reply status and set cstate->status -* for nfsd4_svc_encode_compoundres processing*/ - status =nfsd4_replay_cache_entry (resp); +* for nfsd4_svc_encode_compoundres processing */ The comment typo-fix doesn't belong in this patch.
OK
Quoted 59 lines
Quoted 59 lines
fs/nfsd/nfs4state.c +5
-0+ status =nfsd4_replay_cache_entry (resp, seq); cstate->status = nfserr_replay_cache; goto replay_cache; }@@ -1452,6 +1483,10 @@ nfsd4_sequence(struct svc_rqst *rqstp,/* Success! bump slot seqid */ slot->sl_inuse = true; slot->sl_seqid = seq->seqid; + slot->sl_cache_entry.ce_cachethis = seq->cachethis; +/* Always set the cache entry cachethis for solo sequence */ +if (nfsd4_is_solo_sequence (resp)) + slot->sl_cache_entry.ce_cachethis =1 ; cstate->slot = slot;fs/nfsd/nfs4xdr.c +3
-2@@ -2984,7 +2984,7 @@ nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, int nfserr,return nfserr; } -static __be32 +__be32 nfsd4_encode_sequence (struct nfsd4_compoundres *resp,int nfserr,struct nfsd4_sequence *seq) {@@ -3204,7 +3204,8 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compoBUG_ON (iov->iov_len >PAGE_SIZE );#ifdef CONFIG_NFSD_V4_1 if (resp->cstate.slot !=NULL ) { -if (resp->cstate.status == nfserr_replay_cache) { +if (resp->cstate.status == nfserr_replay_cache && + !nfsd4_no_page_in_cache (resp)) { iov->iov_len = resp->cstate.iovlen; }else {nfsd4_set_cache_entry (resp);include/linux/nfsd/state.h +1
-0@@ -110,6 +110,7 @@ struct nfsd4_cache_entry {__be32 ce_status;struct kvec ce_datav;/* encoded NFSv4.1 data in rq_res.head[0] */ struct page *ce_respages[NFSD_PAGES_PER_SLOT +1 ]; +int ce_cachethis;short ce_resused;int ce_opcnt;int ce_rpchdrlen;include/linux/nfsd/xdr4.h +0
-0@@ -482,6 +482,18 @@ struct nfsd4_compoundres {struct nfsd4_compound_state cstate; };
Quoted 7 lines
include/linux/nfsd/xdr4.h struct nfsd4_compoundres { · line 488
Quoted 4 lines
include/linux/nfsd/xdr4.h +4
-0+static inline u32 nfsd4_is_solo_sequence (struct nfsd4_compoundres *resp) +{ +struct nfsd4_compoundargs *args = resp->rqstp->rq_argp; +return args->opcnt ==1 ?1 :0 ;Drop the redundant "? 1: 0", and make the return int (or boolean, if you want).
OK
Quoted 6 lines
include/linux/nfsd/xdr4.h struct nfsd4_compoundres { · line 491
Quoted 4 lines
include/linux/nfsd/xdr4.h +3
-0+} + +static inline u32 nfsd4_no_page_in_cache (struct nfsd4_compoundres *resp)Ditto on the return type.
OK
Quoted 6 lines
include/linux/nfsd/xdr4.h struct nfsd4_compoundres { · line 494
Quoted 4 lines
include/linux/nfsd/xdr4.h +3
-0+{ +return (resp->cstate.slot->sl_cache_entry.ce_cachethis ==0 || +nfsd4_is_solo_sequence (resp));Drop the extra parentheses.
OK
Quoted 26 lines
--b.
Quoted 16 lines
include/linux/nfsd/xdr4.h +4
-2+} +#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) static inline void@@ -513,7 +525,8 @@ extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm);#if defined(CONFIG_NFSD_V4_1 )extern void nfsd4_set_cache_entry (struct nfsd4_compoundres *resp); -extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp); +extern __be32 nfsd4_replay_cache_entry (struct nfsd4_compoundres *resp, +struct nfsd4_sequence *seq);extern __be32 nfsd4_exchange_id (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_exchange_id *); --Quoted 2 lines
1.6.2.1
_______________________________________________
pNFS mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
PATCH v2 26/47 nfsd41: destroy_session operation
In reply to Benny HalevyImplement the destory_session operation confoming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26
--- fs/nfsd/nfs4state.c | 29 ++++++++++++++++++++++++++++- fs/nfsd/nfs4xdr.c | 7 +++++-- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-)
fs/nfsd/nfs4state.c +28 -1
@@ -1439,7 +1439,34 @@ nfsd4_destroy_session(struct svc_rqst *r,struct nfsd4_compound_state *cstate, struct nfsd4_destroy_session *sessionid) { -return -1 ;/* stub */ + struct nfsd4_session *ses; +u32 status = nfserr_badsession; + +/* Notes: +* - The confirmed nfs4_client->cl_sessionid holds destroyed sessinid +* - Should we return nfserr_back_chan_busy if waiting for +* callbacks on to-be-destroyed session? +* - Do we need to clear any callback info from previous session? +*/ + +dump_sessionid (__func__, &sessionid->sessionid); +spin_lock (&sessionid_lock); + ses =find_in_sessionid_hashtbl (&sessionid->sessionid); +if (!ses) { +spin_unlock (&sessionid_lock); + goto out; + } + +unhash_session (ses); +spin_unlock (&sessionid_lock); + +/* wait for callbacks */ +shutdown_callback_client (ses->se_client); +nfsd4_put_session (ses); + status = nfs_ok; +out: +dprintk ("%s returns %d\n" , __func__,ntohl (status)); +return status; } __be32
fs/nfsd/nfs4xdr.c +5 -2
@@ -1208,7 +1208,11 @@ static __be32 nfsd4_decode_destroy_session(struct nfsd4_compoundargs *argp, struct nfsd4_destroy_session *destroy_session) { - return nfserr_opnotsupp; /* stub */ +DECODE_HEAD ; +READ_BUF (NFS4_MAX_SESSIONID_LEN ); +COPYMEM (destroy_session->sessionid.data,NFS4_MAX_SESSIONID_LEN ); + +DECODE_TAIL ; } static __be32
@@ -2980,7 +2984,6 @@ static __be32 nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_destroy_session *destroy_session) { - /* stub */ return nfserr; }
include/linux/nfsd/xdr4.h +1 -1
@@ -396,7 +396,7 @@ struct nfsd4_sequence { };struct nfsd4_destroy_session { -int foo;/* stub */ +struct nfs4_sessionid sessionid; };#endif /* CONFIG_NFSD_V4_1 */
Signature · 1 line
1.6.2.1
PATCH v2 27/47 nfsd41: stateid handling
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
When sessions are used, stateful operation sequenceid and stateid handling are not used. When sessions are used, on the first open set the seqid to 1, mark state confirmed and skip seqid processing.
When sessionas are used the stateid generation number is ignored when it is zero whereas without sessions bad_stateid or stale stateid is returned.
Add flags to propagate session use to all stateful ops and down to check_stateid_generation.
--- fs/nfsd/nfs4proc.c | 17 ++++++++-- fs/nfsd/nfs4state.c | 70 ++++++++++++++++++++++++++++++++++--------- fs/nfsd/nfs4xdr.c | 2 +- include/linux/nfsd/state.h | 1 + include/linux/nfsd/xdr4.h | 8 ++++- 5 files changed, 77 insertions(+), 21 deletions(-)
fs/nfsd/nfs4proc.c +13 -4
@@ -179,7 +179,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,nfs4_lock_state ();/* check seqid for replay. set nfs4_owner */ - status =nfsd4_process_open1 (open); + status =nfsd4_process_open1 (rqstp, open);if (status == nfserr_replay_me) {struct nfs4_replay *rp = &open->op_stateowner->so_replay;fh_put (&cstate->current_fh);
@@ -504,6 +504,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_read *read) {__be32 status; +int flags =RD_STATE ;/* no need to check permission - this will be done in nfsd_read() */
@@ -511,11 +512,13 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (read->rd_offset >=OFFSET_MAX )return nfserr_inval; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state ();/* check stateid */ if ((status =nfs4_preprocess_stateid_op (&cstate->current_fh, &read->rd_stateid, -RD_STATE , &read->rd_filp))) { + flags, &read->rd_filp))) {dprintk ("NFSD: nfsd4_read: couldn't process stateid!\n" ); goto out; }
@@ -643,11 +646,14 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_setattr *setattr) {__be32 status = nfs_ok; +int flags =WR_STATE ; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;if (setattr->sa_iattr.ia_valid &ATTR_SIZE ) {nfs4_lock_state (); status =nfs4_preprocess_stateid_op (&cstate->current_fh, - &setattr->sa_stateid,WR_STATE ,NULL ); + &setattr->sa_stateid, flags,NULL );nfs4_unlock_state ();if (status) {dprintk ("NFSD: nfsd4_setattr: couldn't process stateid!\n" );
@@ -679,15 +685,18 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,u32 *p;__be32 status = nfs_ok;unsigned long cnt; +int flags =WR_STATE ;/* no need to check permission - this will be done in nfsd_write() */ if (write->wr_offset >=OFFSET_MAX )return nfserr_inval; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state (); status =nfs4_preprocess_stateid_op (&cstate->current_fh, stateid, -WR_STATE , &filp); + flags, &filp);if (filp)get_file (filp);nfs4_unlock_state ();
fs/nfsd/nfs4state.c +55 -15
237 lines not on this page · raw message
fs/nfsd/nfs4xdr.c +1 -1
@@ -3206,7 +3206,7 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE );#ifdef CONFIG_NFSD_V4_1 -if (resp->cstate.slot !=NULL ) { +if (nfsd4_has_session (&resp->cstate)) {if (resp->cstate.status == nfserr_replay_cache && !nfsd4_no_page_in_cache (resp)) { iov->iov_len = resp->cstate.iovlen;
include/linux/nfsd/state.h +1 -0
@@ -323,6 +323,7 @@ struct nfs4_stateid { };/* flags for preprocess_seqid_op() */ +#define HAS_SESSION 0x00000001#define CONFIRM 0x00000002#define OPEN_STATE 0x00000004#define LOCK_STATE 0x00000008
include/linux/nfsd/xdr4.h +7 -1
@@ -55,6 +55,11 @@ struct nfsd4_compound_state {u32 status; }; +static inline bool nfsd4_has_session (struct nfsd4_compound_state *cs) +{ +return cs->slot !=NULL ; +} +struct nfsd4_change_info {u32 atomic;u32 before_ctime_sec;
@@ -540,7 +545,8 @@ extern __be32 nfsd4_destroy_session(struct svc_rqst *, struct nfsd4_compound_state *, struct nfsd4_destroy_session *);#endif /* CONFIG_NFSD_V4_1 */ -extern __be32 nfsd4_process_open1 (struct nfsd4_open *open); +extern __be32 nfsd4_process_open1 (struct svc_rqst *rqstp, +struct nfsd4_open *open);extern __be32 nfsd4_process_open2 (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open); extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
Signature · 1 line
1.6.2.1
Re: [PATCH v2 27/47] nfsd41: stateid handling
Quoted 29 lines · Benny Halevy
From: Andy Adamson <[email protected]>
When sessions are used, stateful operation sequenceid and stateid handling are not used. When sessions are used, on the first open set the seqid to 1, mark state confirmed and skip seqid processing.
When sessionas are used the stateid generation number is ignored when it is zero whereas without sessions
bad_stateidor stale stateid is returned.Add flags to propagate session use to all stateful ops and down to
check_stateid_generation.Signed-off-by Benny Halevy <[email protected]>Signed-off-by Andy Adamson <[email protected]>[nfsd4_has_session should return a boolean, not u32]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4proc.c | 17 ++++++++-- fs/nfsd/nfs4state.c | 70 ++++++++++++++++++++++++++++++++++--------- fs/nfsd/nfs4xdr.c | 2 +- include/linux/nfsd/state.h | 1 + include/linux/nfsd/xdr4.h | 8 ++++- 5 files changed, 77 insertions(+), 21 deletions(-)fs/nfsd/nfs4proc.c +0
-0
fs/nfsd/nfs4proc.c nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, · line 182
Quoted 5 lines
fs/nfsd/nfs4proc.c +1
-1@@ -179,7 +179,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,nfs4_lock_state ();/* check seqid for replay. set nfs4_owner */ - status =nfsd4_process_open1 (open); + status =nfsd4_process_open1 (rqstp, open);
Seems all your using is the cstate--maybe pass that instead?
Quoted 12 lines
fs/nfsd/nfs4proc.c +1
-0if (status == nfserr_replay_me) {struct nfs4_replay *rp = &open->op_stateowner->so_replay;fh_put (&cstate->current_fh);@@ -504,6 +504,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_read *read) {__be32 status; +int flags =RD_STATE ;/* no need to check permission - this will be done in nfsd_read() */
fs/nfsd/nfs4proc.c nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, · line 519
Quoted 8 lines
fs/nfsd/nfs4proc.c +2
-0@@ -511,11 +512,13 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (read->rd_offset >=OFFSET_MAX )return nfserr_inval; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state ();/* check stateid */ if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh,
You could pass the cstate to preprocess_stateid_op instead of current_fh, and let it do the nfsd4_has_session check instead of making all the callers do it.
--b.
Quoted 358 lines
fs/nfsd/nfs4proc.c +9
-3&read->rd_stateid, - RD_STATE, &read->rd_filp))) { + flags, &read->rd_filp))) {dprintk ("NFSD: nfsd4_read: couldn't process stateid!\n" ); goto out; }@@ -643,11 +646,14 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_setattr *setattr) {__be32 status = nfs_ok; +int flags =WR_STATE ; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;if (setattr->sa_iattr.ia_valid &ATTR_SIZE ) {nfs4_lock_state (); status =nfs4_preprocess_stateid_op (&cstate->current_fh, - &setattr->sa_stateid,WR_STATE ,NULL ); + &setattr->sa_stateid, flags,NULL );nfs4_unlock_state ();if (status) {dprintk ("NFSD: nfsd4_setattr: couldn't process stateid!\n" );@@ -679,15 +685,18 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,u32 *p;__be32 status = nfs_ok;unsigned long cnt; +int flags =WR_STATE ;/* no need to check permission - this will be done in nfsd_write() */ if (write->wr_offset >=OFFSET_MAX )return nfserr_inval; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state (); status =nfs4_preprocess_stateid_op (&cstate->current_fh, stateid, -WR_STATE , &filp); + flags, &filp);if (filp)get_file (filp);nfs4_unlock_state ();fs/nfsd/nfs4state.c +55
-15@@ -2199,12 +2199,13 @@ static struct lock_manager_operations nfsd_lease_mng_ops = {__be32 -nfsd4_process_open1 (struct nfsd4_open *open) +nfsd4_process_open1 (struct svc_rqst *rqstp,struct nfsd4_open *open) {clientid_t *clientid = &open->op_clientid;struct nfs4_client *clp =NULL ;unsigned int strhashval;struct nfs4_stateowner *sop =NULL ; +struct nfsd4_compoundres *resp = rqstp->rq_resp;if (!check_name (open->op_owner))return nfserr_inval;@@ -2222,6 +2223,9 @@ nfsd4_process_open1(struct nfsd4_open *open)return nfserr_expired; goto renew; } +/* When sessions are used, skip open sequenceid processing */ +if (nfsd4_has_session (&resp->cstate)) + goto renew;if (!sop->so_confirmed) {/* Replace unconfirmed owners without checking for replay. */ clp = sop->so_client;@@ -2499,6 +2503,7 @@ out:__be32 nfsd4_process_open2 (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open) { +struct nfsd4_compoundres *resp = rqstp->rq_resp;struct nfs4_file *fp =NULL ;struct inode *ino = current_fh->fh_dentry->d_inode;struct nfs4_stateid *stp =NULL ;@@ -2557,9 +2562,14 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfrelease_open_stateid (stp); goto out; } +if (nfsd4_has_session (&resp->cstate)) +update_stateid (&stp->st_stateid); }memcpy (&open->op_stateid, &stp->st_stateid,sizeof (stateid_t)); +if (nfsd4_has_session (&resp->cstate)) + open->op_stateowner->so_confirmed =1 ; +/* * Attempt to hand out a delegation. No error return, because the * OPEN succeeds even if we fail. @@ -2580,7 +2590,8 @@ out:* To finish the open response, we just need to set the rflags. */ open->op_rflags =NFS4_OPEN_RESULT_LOCKTYPE_POSIX ; -if (!open->op_stateowner->so_confirmed) +if (!open->op_stateowner->so_confirmed && + !nfsd4_has_session (&resp->cstate)) open->op_rflags |=NFS4_OPEN_RESULT_CONFIRM ;return status;@@ -2797,8 +2808,15 @@ grace_disallows_io(struct inode *inode)return locks_in_grace () &&mandatory_lock (inode); } -static int check_stateid_generation (stateid_t *in,stateid_t *ref) +static int check_stateid_generation (stateid_t *in,stateid_t *ref,int flags) { +/* +* When sessions are used the stateid generation number is ignored +* when it is zero. +*/ +if ((flags &HAS_SESSION ) && in->si_generation ==0 ) + goto out; +/* If the client sends us a stateid from the future, it's buggy: */ if (in->si_generation > ref->si_generation)return nfserr_bad_stateid;@@ -2814,6 +2832,7 @@ static int check_stateid_generation(stateid_t *in, stateid_t *ref)*/ if (in->si_generation < ref->si_generation)return nfserr_old_stateid; +out:return nfs_ok; }@@ -2851,7 +2870,8 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl dp =find_delegation_stateid (ino, stateid);if (!dp) goto out; - status =check_stateid_generation (stateid, &dp->dl_stateid); + status =check_stateid_generation (stateid, &dp->dl_stateid, + flags);if (status) goto out; status =nfs4_check_delegmode (dp, flags);@@ -2868,7 +2888,8 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl goto out;if (!stp->st_stateowner->so_confirmed) goto out; - status =check_stateid_generation (stateid, &stp->st_stateid); + status =check_stateid_generation (stateid, &stp->st_stateid, + flags);if (status) goto out; status =nfs4_check_openmode (stp, flags);@@ -2971,7 +2992,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei* For the moment, we ignore the possibility of * generation number wraparound. */ -if (seqid != sop->so_seqid) +if (!(flags &HAS_SESSION ) && seqid != sop->so_seqid) goto check_replay;if (sop->so_confirmed && flags &CONFIRM ) {@@ -2984,7 +3005,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei " confirmed yet!\n");return nfserr_bad_stateid; } - status =check_stateid_generation (stateid, &stp->st_stateid); + status =check_stateid_generation (stateid, &stp->st_stateid, flags);if (status)return status;renew_client (sop->so_client);@@ -3080,6 +3101,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,__be32 status;struct nfs4_stateid *stp;unsigned int share_access; +int flags =OPEN_STATE ; dprintk("NFSD: nfsd4_open_downgrade on file %.*s\n", (int)cstate->current_fh.fh_dentry->d_name.len,@@ -3089,11 +3111,13 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, || !deny_valid(od->od_share_deny))return nfserr_inval; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state ();if ((status =nfs4_preprocess_seqid_op (&cstate->current_fh, od->od_seqid, &od->od_stateid, -OPEN_STATE , + flags, &od->od_stateowner, &stp,NULL ))) goto out;@@ -3136,17 +3160,20 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, {__be32 status;struct nfs4_stateid *stp; +int flags =OPEN_STATE |CLOSE_STATE ;dprintk ("NFSD: nfsd4_close on file %.*s\n" , (int )cstate->current_fh.fh_dentry->d_name.len, cstate->current_fh.fh_dentry->d_name.name); +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state ();/* check close_lru for replay */ if ((status =nfs4_preprocess_seqid_op (&cstate->current_fh, close->cl_seqid, &close->cl_stateid, -OPEN_STATE |CLOSE_STATE , + flags, &close->cl_stateowner, &stp,NULL ))) goto out; status = nfs_ok;@@ -3179,11 +3206,14 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,stateid_t *stateid = &dr->dr_stateid;struct inode *inode;__be32 status; +int flags =0 ;if ((status =fh_verify (rqstp, &cstate->current_fh,S_IFREG ,0 )))return status; inode = cstate->current_fh.fh_dentry->d_inode; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state (); status = nfserr_bad_stateid;if (ZERO_STATEID (stateid) ||ONE_STATEID (stateid))@@ -3197,7 +3227,7 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, dp =find_delegation_stateid (inode, stateid);if (!dp) goto out; - status =check_stateid_generation (stateid, &dp->dl_stateid); + status =check_stateid_generation (stateid, &dp->dl_stateid, flags);if (status) goto out;renew_client (dp->dl_client);@@ -3459,7 +3489,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,__be32 status =0 ;unsigned int strhashval;unsigned int cmd; -int err; +int err, flags =0 ; dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", (long long) lock->lk_offset,@@ -3489,11 +3519,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (STALE_CLIENTID (&lock->lk_new_clientid)) goto out; + flags =OPEN_STATE ; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ; +/* validate and update open stateid and open seqid */ status =nfs4_preprocess_seqid_op (&cstate->current_fh, lock->lk_new_open_seqid, &lock->lk_new_open_stateid, -OPEN_STATE , + flags, &lock->lk_replay_owner, &open_stp, lock);if (status)@@ -3516,11 +3550,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (lock_stp ==NULL ) goto out; }else { + flags =LOCK_STATE ; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ; +/* lock (lock owner + lock stateid) already exists */ status =nfs4_preprocess_seqid_op (&cstate->current_fh, lock->lk_old_lock_seqid, &lock->lk_old_lock_stateid, -LOCK_STATE , + flags, &lock->lk_replay_owner, &lock_stp, lock);if (status) goto out;@@ -3702,7 +3740,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,struct file *filp =NULL ;struct file_lock file_lock;__be32 status; -int err; +int err, flags =LOCK_STATE ; dprintk("NFSD: nfsd4_locku: start=%Ld length=%Ld\n", (long long) locku->lu_offset,@@ -3711,12 +3749,14 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (check_lock_length (locku->lu_offset, locku->lu_length))return nfserr_inval; +if (nfsd4_has_session (cstate)) + flags |=HAS_SESSION ;nfs4_lock_state ();if ((status =nfs4_preprocess_seqid_op (&cstate->current_fh, locku->lu_seqid, &locku->lu_stateid, -LOCK_STATE , + flags, &locku->lu_stateowner, &stp,NULL ))) goto out;fs/nfsd/nfs4xdr.c +1
-1@@ -3206,7 +3206,7 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo iov->iov_len = ((char *)resp->p) - (char *)iov->iov_base;BUG_ON (iov->iov_len >PAGE_SIZE );#ifdef CONFIG_NFSD_V4_1 -if (resp->cstate.slot !=NULL ) { +if (nfsd4_has_session (&resp->cstate)) {if (resp->cstate.status == nfserr_replay_cache && !nfsd4_no_page_in_cache (resp)) { iov->iov_len = resp->cstate.iovlen;include/linux/nfsd/state.h +1
-0@@ -323,6 +323,7 @@ struct nfs4_stateid { };/* flags for preprocess_seqid_op() */ +#define HAS_SESSION 0x00000001#define CONFIRM 0x00000002#define OPEN_STATE 0x00000004#define LOCK_STATE 0x00000008include/linux/nfsd/xdr4.h +7
-1@@ -55,6 +55,11 @@ struct nfsd4_compound_state {u32 status; }; +static inline bool nfsd4_has_session (struct nfsd4_compound_state *cs) +{ +return cs->slot !=NULL ; +} +struct nfsd4_change_info {u32 atomic;u32 before_ctime_sec;@@ -540,7 +545,8 @@ extern __be32 nfsd4_destroy_session(struct svc_rqst *, struct nfsd4_compound_state *, struct nfsd4_destroy_session *);#endif /* CONFIG_NFSD_V4_1 */ -extern __be32 nfsd4_process_open1 (struct nfsd4_open *open); +extern __be32 nfsd4_process_open1 (struct svc_rqst *rqstp, +struct nfsd4_open *open);extern __be32 nfsd4_process_open2 (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open); extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,Signature · 1 line
1.6.2.1
PATCH v2 28/47 nfsd41: check encode size for sessions maxresponse cached
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Calculate the space the compound response has taken after encoding the current operation.
pad: add on 8 bytes for the next operation's op_code and status so that there is room to cache a failure on the next operation.
Compare this length to the session se_fmaxresp_cached and return nfserr_rep_too_big_to_cache if the length is too large.
Our se_fmaxresp_cached will always be a multiple of PAGE_SIZE, and so will be at least a page and will therefore hold the xdr_buf head.
--- fs/nfsd/nfs4xdr.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-)
fs/nfsd/nfs4xdr.c +58 -0
@@ -3089,6 +3089,61 @@ static nfsd4_enc nfsd4_enc_ops[] = {#endif /* CONFIG_NFSD_V4_1 */ }; +#if defined(CONFIG_NFSD_V4_1 ) +/* +* Calculate the total amount of memory that the compound response has taken +* after encoding the current operation. +* +* pad: add on 8 bytes for the next operation's op_code and status so that +* there is room to cache a failure on the next operation. +* +* Compare this length to the session se_fmaxresp_cached. +* +* Our se_fmaxresp_cached will always be a multiple of PAGE_SIZE, and so +* will be at least a page and will therefore hold the xdr_buf head. +*/ +static int nfsd4_check_drc_limit (struct nfsd4_compoundres *resp) +{ +int status =0 ; +struct xdr_buf *xb = &resp->rqstp->rq_res; +struct nfsd4_compoundargs *args = resp->rqstp->rq_argp; +struct nfsd4_session *session =NULL ; +struct nfsd4_slot *slot = resp->cstate.slot; +u32 length, tlen =0 , pad =8 ; + +if (!nfsd4_has_session (&resp->cstate)) +return status; + + session = slot->sl_session; +if (session ==NULL || slot->sl_cache_entry.ce_cachethis ==0 ) +return status; + +if (resp->opcnt >= args->opcnt) + pad =0 ;/* this is the last operation */ + +if (xb->page_len ==0 ) { + length = (char *)resp->p - (char *)xb->head[0 ].iov_base + pad; + }else { +if (xb->tail[0 ].iov_base && xb->tail[0 ].iov_len >0 ) + tlen = (char *)resp->p - (char *)xb->tail[0 ].iov_base; + + length = xb->head[0 ].iov_len + xb->page_len + tlen + pad; + } +dprintk ("%s length %u, xb->page_len %u tlen %u pad %u\n" , __func__, + length, xb->page_len, tlen, pad); + +if (length <= session->se_fmaxresp_cached) +return status; +else +return nfserr_rep_too_big_to_cache; +} +#else /* CONFIG_NFSD_V4_1 */ +static inline int nfsd4_check_drc_limit (struct nfsd4_compoundres *resp) +{ +return 0 ; +} +#endif /* CONFIG_NFSD_V4_1 */ +void nfsd4_encode_operation (struct nfsd4_compoundres *resp,struct nfsd4_op *op) {
@@ -3105,6 +3160,9 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)BUG_ON (op->opnum <0 || op->opnum >=ARRAY_SIZE (nfsd4_enc_ops) || !nfsd4_enc_ops[op->opnum]); op->status = nfsd4_enc_ops[op->opnum](resp, op->status, &op->u); +/* nfsd4_check_drc_limit guarantees enough room for error status */ +if (!op->status &&nfsd4_check_drc_limit (resp)) + op->status = nfserr_rep_too_big_to_cache; status:/* * Note: We write the status directly, instead of using WRITE32(),
Signature · 1 line
1.6.2.1
Re: [PATCH v2 28/47] nfsd41: check encode size for sessions maxresponse cached
Quoted 7 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Calculate the space the compound response has taken after encoding the current operation.
pad: add on 8 bytes for the next operation's
op_codeand status so that there is room to cache a failure on the next operation.
Looks like setattr always has a bitmap regardless of status, so that should be at least 12. There might be some other odd case like that too--someone should look through the xdr and check.
Quoted 28 lines
Compare this length to the session
se_fmaxresp_cachedand returnnfserr_rep_too_big_to_cacheif the length is too large.Our
se_fmaxresp_cachedwill always be a multiple ofPAGE_SIZE, and so will be at least a page and will therefore hold thexdr_bufhead.Signed-off-by Andy Adamson <[email protected]>[nfsd41: non-page DRC for solo sequence responses][fixed nfsd4_check_drc_limit cosmetics]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4xdr.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-)fs/nfsd/nfs4xdr.c +6
-0@@ -3089,6 +3089,61 @@ static nfsd4_enc nfsd4_enc_ops[] = {#endif /* CONFIG_NFSD_V4_1 */ }; +#if defined(CONFIG_NFSD_V4_1 ) +/* +* Calculate the total amount of memory that the compound response has taken +* after encoding the current operation. +* +* pad: add on 8 bytes for the next operation's op_code and status so that
fs/nfsd/nfs4xdr.c static nfsd4_enc nfsd4_enc_ops[] = { · line 3107
Quoted 10 lines
fs/nfsd/nfs4xdr.c +10
-0+* there is room to cache a failure on the next operation. +* +* Compare this length to the session se_fmaxresp_cached. +* +* Our se_fmaxresp_cached will always be a multiple of PAGE_SIZE, and so +* will be at least a page and will therefore hold the xdr_buf head. +*/ +static int nfsd4_check_drc_limit (struct nfsd4_compoundres *resp) +{ +int status =0 ;
Note that status and the return value should be __be32.
Ditto for anything holding an nfs error or the server side. I haven't been checking for this as I've been reading these.
Probably we should be running sparse regularly (install it, then build the kernel with 'make C=1' or 'C=2')--I think it checks for this.
Quoted 43 lines
fs/nfsd/nfs4xdr.c +39
-0+struct xdr_buf *xb = &resp->rqstp->rq_res; +struct nfsd4_compoundargs *args = resp->rqstp->rq_argp; +struct nfsd4_session *session =NULL ; +struct nfsd4_slot *slot = resp->cstate.slot; +u32 length, tlen =0 , pad =8 ; + +if (!nfsd4_has_session (&resp->cstate)) +return status; + + session = slot->sl_session; +if (session ==NULL || slot->sl_cache_entry.ce_cachethis ==0 ) +return status; + +if (resp->opcnt >= args->opcnt) + pad =0 ;/* this is the last operation */ + +if (xb->page_len ==0 ) { + length = (char *)resp->p - (char *)xb->head[0 ].iov_base + pad; + }else { +if (xb->tail[0 ].iov_base && xb->tail[0 ].iov_len >0 ) + tlen = (char *)resp->p - (char *)xb->tail[0 ].iov_base; + + length = xb->head[0 ].iov_len + xb->page_len + tlen + pad; + } +dprintk ("%s length %u, xb->page_len %u tlen %u pad %u\n" , __func__, + length, xb->page_len, tlen, pad); + +if (length <= session->se_fmaxresp_cached) +return status; +else + return nfserr_rep_too_big_to_cache; +} +#else /* CONFIG_NFSD_V4_1 */ +static inline int nfsd4_check_drc_limit (struct nfsd4_compoundres *resp) +{ +return 0 ; +} +#endif /* CONFIG_NFSD_V4_1 */ +void nfsd4_encode_operation (struct nfsd4_compoundres *resp,struct nfsd4_op *op) {
fs/nfsd/nfs4xdr.c nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) · line 3164
Quoted 5 lines
fs/nfsd/nfs4xdr.c +2
-0@@ -3105,6 +3160,9 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)BUG_ON (op->opnum <0 || op->opnum >=ARRAY_SIZE (nfsd4_enc_ops) || !nfsd4_enc_ops[op->opnum]); op->status = nfsd4_enc_ops[op->opnum](resp, op->status, &op->u); +/* nfsd4_check_drc_limit guarantees enough room for error status */ +if (!op->status &&nfsd4_check_drc_limit (resp))
Hm, but note you aren't actually using the return value from nfsd4_check_drc_limit().
fs/nfsd/nfs4xdr.c nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) · line 3165
Quoted 1 line
fs/nfsd/nfs4xdr.c +1
-0+ op->status = nfserr_rep_too_big_to_cache;
This means you can end up writing the error after you've already encoded a succesful reply. That doesn't work--the result will be invalid xdr.
I think there's no alternative but to estimate the size of the result before actually performing the operation, because once we decide to process an operation which the client has asked us to cache, we're committed to caching the result.
Maybe add a field to struct nfsd4_operation consisting of a function like
estimate_reply_size(void *arg)
which does the calculation for each op. Or maybe there's some clever way to avoid duplicating a lot of information that's already implicit in the xdr-encoding routines.
Am I missing something?
--b.
Quoted 6 lines
fs/nfsd/nfs4xdr.c +0
-0status:/* * Note: We write the status directly, instead of using WRITE32(), Signature · 1 line
1.6.2.1
PATCH v2 29/47 nfsd41: clientid handling
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Extract the clientid from sessionid to set the op_clientid on open. Verify that the clid for other stateful ops is zero for minorversion != 0 Do all other checks for stateful ops without sessions.
--- fs/nfsd/nfs4proc.c | 12 ++++++++++++ fs/nfsd/nfs4state.c | 14 ++++++++------ fs/nfsd/nfs4xdr.c | 9 +++++++++ 3 files changed, 29 insertions(+), 6 deletions(-)
fs/nfsd/nfs4proc.c +12 -0
@@ -162,6 +162,15 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_return status; } +static void +copy_clientid (clientid_t *clid,struct nfsd4_session *session) +{ +struct nfsd4_sessionid *sid = + (struct nfsd4_sessionid *)session->se_sessionid.data; + + clid->cl_boot = sid->clientid.cl_boot; + clid->cl_id = sid->clientid.cl_id; +} static __be32 nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
@@ -176,6 +185,9 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (open->op_create && open->op_claim_type !=NFS4_OPEN_CLAIM_NULL )return nfserr_inval; +if (nfsd4_has_session (cstate)) +copy_clientid (&open->op_clientid, cstate->slot->sl_session); +nfs4_lock_state ();/* check seqid for replay. set nfs4_owner */
fs/nfsd/nfs4state.c +8 -6
@@ -616,8 +616,8 @@ STALE_CLIENTID(clientid_t *clid) {if (clid->cl_boot == boot_time)return 0 ; -dprintk ("NFSD stale clientid (%08x/%08x)\n" , - clid->cl_boot, clid->cl_id); +dprintk ("NFSD stale clientid (%08x/%08x) boot_time %08lx\n" , + clid->cl_boot, clid->cl_id, boot_time);return 1 ; }
@@ -2968,8 +2968,9 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateiif (lock->lk_is_new) {if (!sop->so_is_open_owner)return nfserr_bad_stateid; -if (!same_clid (&clp->cl_clientid, lockclid)) -return nfserr_bad_stateid; +if (!(flags &HAS_SESSION ) && + !same_clid (&clp->cl_clientid, lockclid)) +return nfserr_bad_stateid;/* stp is the open stateid */ status =nfs4_check_openmode (stp, lkflg);if (status)
@@ -3516,7 +3517,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,struct nfs4_file *fp; status = nfserr_stale_clientid; -if (STALE_CLIENTID (&lock->lk_new_clientid)) +if (!nfsd4_has_session (cstate) && +STALE_CLIENTID (&lock->lk_new_clientid)) goto out; flags =OPEN_STATE ;
@@ -3678,7 +3680,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,nfs4_lock_state (); status = nfserr_stale_clientid; -if (STALE_CLIENTID (&lockt->lt_clientid)) +if (!nfsd4_has_session (cstate) &&STALE_CLIENTID (&lockt->lt_clientid)) goto out;if ((status =fh_verify (rqstp, &cstate->current_fh,S_IFREG ,0 ))) {
fs/nfsd/nfs4xdr.c +9 -0
@@ -189,6 +189,11 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes)return p; } +static int zero_clientid (clientid_t *clid) +{ +return (clid->cl_boot ==0 ) && (clid->cl_id ==0 ); +} +static int defer_free (struct nfsd4_compoundargs *argp,void (*release)(const void *),void *p)
@@ -584,6 +589,8 @@ nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt)READ_BUF (lockt->lt_owner.len);READMEM (lockt->lt_owner.data, lockt->lt_owner.len); +if (argp->minorversion && !zero_clientid (&lockt->lt_clientid)) +return nfserr_inval;DECODE_TAIL ; }
@@ -994,6 +1001,8 @@ nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_relREAD_BUF (rlockowner->rl_owner.len);READMEM (rlockowner->rl_owner.data, rlockowner->rl_owner.len); +if (argp->minorversion && !zero_clientid (&rlockowner->rl_clientid)) +return nfserr_inval;DECODE_TAIL ; }
Signature · 1 line
1.6.2.1
PATCH v2 30/47 nfsd41: access_valid
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
For nfs41, the open share flags are used also for delegation "wants" and "signals". Check that they are valid.
--- fs/nfsd/nfs4proc.c | 1 + fs/nfsd/nfs4state.c | 20 +++++++++++++++----- include/linux/nfsd/xdr4.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-)
fs/nfsd/nfs4proc.c +1 -0
@@ -901,6 +901,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, resp->tag = args->tag; resp->opcnt =0 ; resp->rqstp = rqstp; + resp->cstate.minorversion = args->minorversion; resp->cstate.replay_owner =NULL ;fh_init (&resp->cstate.current_fh,NFS4_FHSIZE );fh_init (&resp->cstate.save_fh,NFS4_FHSIZE );
fs/nfsd/nfs4state.c +15 -5
@@ -1959,11 +1959,21 @@ find_file(struct inode *ino)return NULL ; } -static inline int access_valid (u32 x) +static inline int access_valid (u32 x,u32 minorversion) { -if (x <NFS4_SHARE_ACCESS_READ ) +if ((x &NFS4_SHARE_ACCESS_MASK ) <NFS4_SHARE_ACCESS_READ )return 0 ; -if (x >NFS4_SHARE_ACCESS_BOTH ) +if ((x &NFS4_SHARE_ACCESS_MASK ) >NFS4_SHARE_ACCESS_BOTH ) +return 0 ; + x &= ~NFS4_SHARE_ACCESS_MASK ; +if (minorversion && x) { +if ((x &NFS4_SHARE_WANT_MASK ) >NFS4_SHARE_WANT_CANCEL ) +return 0 ; +if ((x &NFS4_SHARE_WHEN_MASK ) >NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED ) +return 0 ; + x &= ~(NFS4_SHARE_WANT_MASK |NFS4_SHARE_WHEN_MASK ); + } +if (x)return 0 ;return 1 ; }
@@ -2511,7 +2521,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf__be32 status; status = nfserr_inval; -if (!access_valid (open->op_share_access) +if (!access_valid (open->op_share_access, resp->cstate.minorversion) || !deny_valid (open->op_share_deny)) goto out;/*
@@ -3108,7 +3118,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, (int )cstate->current_fh.fh_dentry->d_name.len, cstate->current_fh.fh_dentry->d_name.name); -if (!access_valid (od->od_share_access) +if (!access_valid (od->od_share_access, cstate->minorversion) || !deny_valid (od->od_share_deny))return nfserr_inval;
include/linux/nfsd/xdr4.h +1 -0
@@ -52,6 +52,7 @@ struct nfsd4_compound_state {struct nfsd4_slot *slot;__be32 *statp;size_t iovlen; +u32 minorversion;u32 status; };
Signature · 1 line
1.6.2.1
PATCH v2 31/47 nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Separate the access bits from the want bits and enable __set_bit to work correctly with st_access_bmap.
--- fs/nfsd/nfs4state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
fs/nfsd/nfs4state.c +2 -1
@@ -1905,7 +1905,8 @@ init_stateid(struct nfs4_stateid *stp, struct nfs4_file *fp, struct nfsd4_open * stp->st_stateid.si_generation =0 ; stp->st_access_bmap =0 ; stp->st_deny_bmap =0 ; -__set_bit (open->op_share_access, &stp->st_access_bmap); +__set_bit (open->op_share_access & ~NFS4_SHARE_WANT_MASK , + &stp->st_access_bmap);__set_bit (open->op_share_deny, &stp->st_deny_bmap); stp->st_openstp =NULL ; }
Signature · 1 line
1.6.2.1
PATCH v2 32/47 nfsd41: provide support for minor version 1 at rpc level
In reply to Benny HalevyFrom: Marc Eshel <[email protected]>
--- include/linux/nfsd/nfsd.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
include/linux/nfsd/nfsd.h +4 -0
@@ -23,7 +23,11 @@/* * nfsd version */ +#if defined(CONFIG_NFSD_V4_1 ) +#define NFSD_SUPPORTED_MINOR_VERSION 1 +#else /* CONFIG_NFSD_V4_1 */ #define NFSD_SUPPORTED_MINOR_VERSION 0 +#endif /* CONFIG_NFSD_V4_1 */ /* * Flags for nfsd_permission
Signature · 1 line
1.6.2.1
PATCH v2 33/47 nfsd: cleanup nfs4.0 callback encode routines
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Mimic the client and prepare to share the back channel xdr with NFSv4.1. Bump the number of operations in each encode routine, then backfill the number of operations.
--- fs/nfsd/nfs4callback.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-)
fs/nfsd/nfs4callback.c +16 -8
@@ -140,8 +140,9 @@ struct nfs4_cb_compound_hdr {int status;u32 ident;u32 nops; +__be32 *nops_p;u32 taglen; -char * tag; +char *tag; }; static struct {
@@ -201,7 +202,7 @@ nfs_cb_stat_to_errno(int stat)* XDR encode */ -static int +static void encode_cb_compound_hdr (struct xdr_stream *xdr,struct nfs4_cb_compound_hdr *hdr) {__be32 * p;
@@ -210,12 +211,18 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)WRITE32 (0 );/* tag length is always 0 */ WRITE32 (NFS4_MINOR_VERSION );WRITE32 (hdr->ident); + hdr->nops_p = p;WRITE32 (hdr->nops); -return 0 ; } -static int -encode_cb_recall (struct xdr_stream *xdr,struct nfs4_cb_recall *cb_rec) +static void encode_cb_nops (struct nfs4_cb_compound_hdr *hdr) +{ + *hdr->nops_p =htonl (hdr->nops); +} + +static void +encode_cb_recall (struct xdr_stream *xdr,struct nfs4_cb_recall *cb_rec, +struct nfs4_cb_compound_hdr *hdr) {__be32 *p;int len = cb_rec->cbr_fh.fh_size;
@@ -227,7 +234,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec)WRITE32 (cb_rec->cbr_trunc);WRITE32 (len);WRITEMEM (&cb_rec->cbr_fh.fh_base, len); -return 0 ; + hdr->nops++; } static int
@@ -246,12 +253,13 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_cb_recall *astruct xdr_stream xdr;struct nfs4_cb_compound_hdr hdr = { .ident = args->cbr_ident, - .nops =1 , };xdr_init_encode (&xdr, &req->rq_snd_buf, p);encode_cb_compound_hdr (&xdr, &hdr); -return (encode_cb_recall (&xdr, args)); +encode_cb_recall (&xdr, args, &hdr); +encode_cb_nops (&hdr); +return 0 ; }
Signature · 1 line
1.6.2.1
PATCH v2 34/47 sunrpc: add cl_private field to struct rpc_clnt
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Note: Both the NFSv4.1 client and server use this pointer.
The client uses cl_private to determine the minorversion (via a struct nfs_client *) to be set in the compound header, and to know when to generate a SEQUENCE op. Similarly, the server puts a struct nfs4_callback * in there for callback compounds' CB_COMPOUND and CB_SEQUENCE.
--- include/linux/sunrpc/clnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/sunrpc/clnt.h +1 -0
@@ -53,6 +53,7 @@ struct rpc_clnt {char cl_pathname[30 ];/* Path in rpc_pipe_fs */ struct vfsmount * cl_vfsmnt;struct dentry * cl_dentry;/* inode */ +void *cl_private;/* private data */ struct rpc_clnt * cl_parent;/* Points to parent of clones */ struct rpc_rtt cl_rtt_default;struct rpc_timeout cl_timeout_default;
Signature · 1 line
1.6.2.1
PATCH v2 35/47 nfsd: minorversion support for the back channel
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Prepare to share backchannel code with NFSv4.1.
--- fs/nfsd/nfs4callback.c | 7 ++++++- fs/nfsd/nfs4state.c | 1 + include/linux/nfsd/state.h | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)
fs/nfsd/nfs4callback.c +6 -1
@@ -141,6 +141,7 @@ struct nfs4_cb_compound_hdr {u32 ident;u32 nops;__be32 *nops_p; +u32 minorversion;u32 taglen;char *tag; };
@@ -209,7 +210,7 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)RESERVE_SPACE (16 );WRITE32 (0 );/* tag length is always 0 */ -WRITE32 (NFS4_MINOR_VERSION ); +WRITE32 (hdr->minorversion);WRITE32 (hdr->ident); hdr->nops_p = p;WRITE32 (hdr->nops);
@@ -251,8 +252,11 @@ static int nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_cb_recall *args) { struct xdr_stream xdr; +struct nfs4_callback *cb = + (struct nfs4_callback *)req->rq_task->tk_client->cl_private;struct nfs4_cb_compound_hdr hdr = { .ident = args->cbr_ident, + .minorversion = cb->cb_minorversion, };xdr_init_encode (&xdr, &req->rq_snd_buf, p);
@@ -436,6 +440,7 @@ static int do_probe_callback(void *data) goto out_release_client; cb->cb_client = client; + client->cl_private = cb;atomic_set (&cb->cb_set,1 );put_nfs4_client (clp);return 0 ;
fs/nfsd/nfs4state.c +1 -0
@@ -994,6 +994,7 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se)if ( !(parse_ipv4 (se->se_callback_addr_len, se->se_callback_addr_val, &cb->cb_addr, &cb->cb_port))) goto out_err; + cb->cb_minorversion =0 ; cb->cb_prog = se->se_callback_prog; cb->cb_ident = se->se_callback_ident;return ;
include/linux/nfsd/state.h +2 -1
@@ -93,7 +93,8 @@ struct nfs4_callback {u32 cb_addr;unsigned short cb_port;u32 cb_prog; -u32 cb_ident; +u32 cb_minorversion; +u32 cb_ident;/* minorversion 0 only */ /* RPC client info */ atomic_t cb_set;/* successful CB_NULL call */ struct rpc_clnt * cb_client;
Signature · 1 line
1.6.2.1
PATCH v2 36/47 nfsd41: sunrpc: Added rpc server-side backchannel handling
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
FIXME: bhalevy: write up commit message
When the call direction is a reply, copy the xid and call direction into the req->rq_private_buf.head[0].iov_base otherwise rpc_verify_header returns rpc_garbage.
--- include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/svcsock.h | 1 + include/linux/sunrpc/xprt.h | 4 + net/sunrpc/clnt.c | 1 + net/sunrpc/svcsock.c | 81 +++++++++++ net/sunrpc/xprt.c | 41 ++++++- net/sunrpc/xprtsock.c | 286 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 405 insertions(+), 10 deletions(-)
include/linux/sunrpc/clnt.h +1 -0
@@ -111,6 +111,7 @@ struct rpc_create_args {rpc_authflavor_t authflavor;unsigned long flags;char *client_name; +struct svc_sock *bc_sock;/* NFSv4.1 backchannel */ };/* Values for "flags" field */
include/linux/sunrpc/svcsock.h +1 -0
@@ -28,6 +28,7 @@ struct svc_sock {/* private TCP part */ u32 sk_reclen;/* length of record */ u32 sk_tcplen;/* current read length */ +struct rpc_xprt *sk_bc_xprt;/* NFSv4.1 backchannel xprt */ };/*
include/linux/sunrpc/xprt.h +4 -0
@@ -174,6 +174,9 @@ struct rpc_xprt {spinlock_t reserve_lock;/* lock slot table */ u32 xid;/* Next XID value to use */ struct rpc_task * snd_task;/* Task blocked in send */ +#if defined(CONFIG_NFSD_V4_1 ) +struct svc_sock *bc_sock;/* NFSv4.1 backchannel */ +#endif /* CONFIG_NFSD_V4_1 */ struct list_head recv;struct {
@@ -197,6 +200,7 @@ struct xprt_create {struct sockaddr * srcaddr;/* optional local address */ struct sockaddr * dstaddr;/* remote peer address */ size_t addrlen; +struct svc_sock *bc_sock;/* NFSv4.1 backchannel */ };struct xprt_class {
net/sunrpc/clnt.c +1 -0
@@ -266,6 +266,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) .srcaddr = args->saddress, .dstaddr = args->address, .addrlen = args->addrsize, + .bc_sock = args->bc_sock, };char servername[48 ];
net/sunrpc/svcsock.c +81 -0
117 lines not on this page · raw message
net/sunrpc/xprt.c +38 -3
59 lines not on this page · raw message
net/sunrpc/xprtsock.c +279 -7
323 lines not on this page · raw message
Signature · 1 line
1.6.2.1
Re: [PATCH v2 36/47] nfsd41: sunrpc: Added rpc server-side backchannel handling
Quoted 3 lines · Benny Halevy
From: Andy Adamson <[email protected]>
FIXME: bhalevy: write up commit message
?--b.
Quoted 606 lines
Signed-off-by Mike Sager <[email protected]>Signed-off-by Marc Eshel <[email protected]>Signed-off-by Benny Halevy <[email protected]>When the call direction is a reply, copy the xid and call direction into the req->rq_private_buf.head[0].iov_base otherwise
rpc_verify_headerreturnsrpc_garbage.Signed-off-by Andy Adamson <[email protected]>Signed-off-by Benny Halevy <[email protected]>--- include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/svcsock.h | 1 + include/linux/sunrpc/xprt.h | 4 + net/sunrpc/clnt.c | 1 + net/sunrpc/svcsock.c | 81 +++++++++++ net/sunrpc/xprt.c | 41 ++++++- net/sunrpc/xprtsock.c | 286 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 405 insertions(+), 10 deletions(-)include/linux/sunrpc/clnt.h +1
-0@@ -111,6 +111,7 @@ struct rpc_create_args {rpc_authflavor_t authflavor;unsigned long flags;char *client_name; +struct svc_sock *bc_sock;/* NFSv4.1 backchannel */ };/* Values for "flags" field */ include/linux/sunrpc/svcsock.h +1
-0@@ -28,6 +28,7 @@ struct svc_sock {/* private TCP part */ u32 sk_reclen;/* length of record */ u32 sk_tcplen;/* current read length */ +struct rpc_xprt *sk_bc_xprt;/* NFSv4.1 backchannel xprt */ };/* include/linux/sunrpc/xprt.h +4
-0@@ -174,6 +174,9 @@ struct rpc_xprt {spinlock_t reserve_lock;/* lock slot table */ u32 xid;/* Next XID value to use */ struct rpc_task * snd_task;/* Task blocked in send */ +#if defined(CONFIG_NFSD_V4_1 ) +struct svc_sock *bc_sock;/* NFSv4.1 backchannel */ +#endif /* CONFIG_NFSD_V4_1 */ struct list_head recv;struct {@@ -197,6 +200,7 @@ struct xprt_create {struct sockaddr * srcaddr;/* optional local address */ struct sockaddr * dstaddr;/* remote peer address */ size_t addrlen; +struct svc_sock *bc_sock;/* NFSv4.1 backchannel */ };struct xprt_class {net/sunrpc/clnt.c +1
-0@@ -266,6 +266,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) .srcaddr = args->saddress, .dstaddr = args->address, .addrlen = args->addrsize, + .bc_sock = args->bc_sock, };char servername[48 ];net/sunrpc/svcsock.c +81
-0@@ -49,6 +49,7 @@#include <linux/sunrpc/msg_prot.h> #include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/stats.h> +#include <linux/sunrpc/xprt.h> #define RPCDBG_FACILITY RPCDBG_SVCXPRT@@ -790,6 +791,9 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)int len;struct kvec *vec;int pnum, vlen; +#if defined(CONFIG_NFSD_V4_1 ) +struct rpc_rqst *req =NULL ; +#endif dprintk("svc: tcp_recv %p data %d conn %d close %d\n", svsk, test_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags),@@ -856,12 +860,73 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) len = svsk->sk_reclen;set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); +/* +* We have enough data for the whole tcp record. Let's try and read the +* first 8 bytes to get the xid and the call direction. We can use this +* to figure out if this is a call or a reply to a callback. If +* sk_reclen is < 8 (xid and calldir), then this is a malformed packet. +* In that case, don't bother with the calldir and just read the data. +* It will be rejected in svc_process. +*/ + vec = rqstp->rq_vec; vec[0 ] = rqstp->rq_arg.head[0 ]; vlen =PAGE_SIZE ; + +if (len >=8 ) { +u32 *p; +u32 xid; +u32 calldir; + + len =svc_recvfrom (rqstp, vec,1 ,8 ); +if (len <0 ) + goto error; + + p = (u32 *)rqstp->rq_arg.head[0 ].iov_base; + xid = *p++; + calldir = *p; + +#if defined(CONFIG_NFSD_V4_1 ) +if (calldir) { +/* REPLY */ +if (svsk->sk_bc_xprt) + req =xprt_lookup_rqst (svsk->sk_bc_xprt, xid); +if (req) { +memcpy (&req->rq_private_buf, &req->rq_rcv_buf, +sizeof (struct xdr_buf )); +/* copy the xid and call direction */ +memcpy (req->rq_private_buf.head[0 ].iov_base, + rqstp->rq_arg.head[0 ].iov_base,8 ); + vec[0 ] = req->rq_private_buf.head[0 ]; + }else +printk (KERN_NOTICE +"%s: Got unrecognized reply: " +"calldir 0x%x sk_bc_xprt %p xid %08x\n" , + __func__,ntohl (calldir), + svsk->sk_bc_xprt, xid); + } + +if (!calldir || !req) + vec[0 ] = rqstp->rq_arg.head[0 ]; + +#else /* CONFIG_NFSD_V4_1 */ + vec[0 ] = rqstp->rq_arg.head[0 ]; +#endif /* CONFIG_NFSD_V4_1 */ + vec[0 ].iov_base +=8 ; + vec[0 ].iov_len -=8 ; + len = svsk->sk_reclen -8 ; + vlen -=8 ; + } + pnum =1 ;while (vlen < len) { +#if defined(CONFIG_NFSD_V4_1 ) + vec[pnum].iov_base = (req) ? +page_address (req->rq_private_buf.pages[pnum -1 ]) : +page_address (rqstp->rq_pages[pnum]); +#else /* CONFIG_NFSD_V4_1 */ vec[pnum].iov_base =page_address (rqstp->rq_pages[pnum]); +#endif /* CONFIG_NFSD_V4_1 */ vec[pnum].iov_len =PAGE_SIZE ; pnum++; vlen +=PAGE_SIZE ;@@ -873,6 +938,18 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len <0 ) goto error; +/* +* Account for the 8 bytes we read earlier +*/ + len +=8 ; + +#if defined(CONFIG_NFSD_V4_1 ) +if (req) { +xprt_complete_rqst (req->rq_task, len); + len =0 ; + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ dprintk ("svc: TCP complete record (%d bytes)\n" , len); rqstp->rq_arg.len = len; rqstp->rq_arg.page_base =0 ;@@ -886,6 +963,10 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) rqstp->rq_xprt_ctxt =NULL ; rqstp->rq_prot =IPPROTO_TCP ; +#if defined(CONFIG_NFSD_V4_1 ) +out: +#endif /* CONFIG_NFSD_V4_1 */ +/* Reset TCP read info */ svsk->sk_reclen =0 ; svsk->sk_tcplen =0 ;net/sunrpc/xprt.c +38
-3@@ -998,6 +998,27 @@ void xprt_release(struct rpc_task *task)spin_unlock (&xprt->reserve_lock); } +/* +* The autoclose function for the back channel +* +* The callback channel should never close the channel, +* let the forechannel do that. +*/ +static void bc_autoclose (struct work_struct *work) +{ +return ; +} + + +/* +* The autodisconnect routine for the back channel. We never disconnect +*/ +static void +bc_init_autodisconnect (unsigned long data) +{ +return ; +} +/** * xprt_create_transport - create an RPC transport * @args: rpc transport creation arguments @@ -1034,9 +1055,16 @@ found:INIT_LIST_HEAD (&xprt->free);INIT_LIST_HEAD (&xprt->recv); -INIT_WORK (&xprt->task_cleanup, xprt_autoclose); -setup_timer (&xprt->timer, xprt_init_autodisconnect, - (unsigned long )xprt); +if (args->bc_sock) { +INIT_WORK (&xprt->task_cleanup, bc_autoclose); +setup_timer (&xprt->timer, bc_init_autodisconnect, + (unsigned long )xprt); + }else { +INIT_WORK (&xprt->task_cleanup, xprt_autoclose); +setup_timer (&xprt->timer, xprt_init_autodisconnect, + (unsigned long )xprt); + } + xprt->last_used = jiffies; xprt->cwnd =RPC_INITCWND ; xprt->bind_index =0 ;@@ -1056,6 +1084,13 @@ found:dprintk ("RPC: created transport %p with %u slots\n" , xprt, xprt->max_reqs); +/* +* Since we don't want connections for the backchannel, we set +* the xprt status to connected +*/ +if (args->bc_sock) +xprt_set_connected (xprt); +return xprt; }net/sunrpc/xprtsock.c +279
-7@@ -32,6 +32,7 @@#include <linux/tcp.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/sched.h> +#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/xprtsock.h> #include <linux/file.h> @@ -1884,6 +1885,221 @@ static void xs_tcp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq) xprt->stat.bklog_u); } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* The connect worker for the backchannel +* This should never be called as we should never need to connect +*/ +static void bc_connect_worker (struct work_struct *work) +{ +BUG (); +} + +/* +* The set_port routine of the rpc_xprt_ops. This is related to the portmapper +* and should never be called +*/ + +static void bc_set_port (struct rpc_xprt *xprt,unsigned short port) +{ +BUG (); +} + +/* +* The connect routine for the backchannel rpc_xprt ops +* Again, should never be called! +*/ + +static void bc_connect (struct rpc_task *task) +{ +BUG (); +} + +struct rpc_buffer { +size_t len; +char data[]; +}; +/* +* Allocate a bunch of pages for a scratch buffer for the rpc code. The reason +* we allocate pages instead doing a kmalloc like rpc_malloc is because we want +* to use the server side send routines. +*/ +void *bc_malloc (struct rpc_task *task,size_t size) +{ +struct page *page; +struct rpc_buffer *buf; + +BUG_ON (size >PAGE_SIZE -sizeof (struct rpc_buffer )); + page =alloc_page (GFP_KERNEL ); + +if (!page) +return NULL ; + + buf =page_address (page); + buf->len =PAGE_SIZE ; + +return buf->data; +} + +/* +* Free the space allocated in the bc_alloc routine +*/ +void bc_free (void *buffer) +{ +struct rpc_buffer *buf; + +if (!buffer) +return ; + + buf = container_of(buffer, struct rpc_buffer, data); +free_pages ((unsigned long )buf,get_order (buf->len)); +} + +/* +* Use the svc_sock to send the callback. Must be called with svsk->sk_mutex +* held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request. +*/ +static int bc_sendto (struct rpc_rqst *req) +{ +int total_len; +int len; +int size; +int result; +struct xdr_buf *xbufp = &req->rq_snd_buf; +struct page **pages = xbufp->pages; +unsigned int flags =MSG_MORE ; +unsigned int pglen = xbufp->page_len; +size_t base = xbufp->page_base; +struct rpc_xprt *xprt = req->rq_xprt; +struct sock_xprt *transport = + container_of(xprt, struct sock_xprt, xprt); +struct socket *sock = transport->sock; + + total_len = xbufp->len; + +/* +* Set up the rpc header and record marker stuff +*/ +xs_encode_tcp_record_marker (xbufp); + +/* +* The RPC message is divided into 3 pieces: +* - The header: This is what most of the smaller RPC messages consist +* of. Often the whole message is in this. +* +* - xdr->pages: This is a list of pages that contain data, for +* example in a write request or while using rpcsec gss +* +* - The tail: This is the rest of the rpc message +* +* First we send the header, then the pages and then finally the tail. +* The code borrows heavily from svc_sendto. +*/ + +/* +* Send the head +*/ +if (total_len == xbufp->head[0 ].iov_len) + flags =0 ; + + len = sock->ops->sendpage (sock,virt_to_page (xbufp->head[0 ].iov_base), + (unsigned long )xbufp->head[0 ].iov_base & ~PAGE_MASK , + xbufp->head[0 ].iov_len, flags); + +if (len != xbufp->head[0 ].iov_len) + goto out; + +/* +* send page data +* +* Check the amount of data to be sent. If it is less than the +* remaining page, then send it else send the current page +*/ + + size =PAGE_SIZE - base < pglen ?PAGE_SIZE - base : pglen; +while (pglen >0 ) { +if (total_len == size) + flags =0 ; + result = sock->ops->sendpage (sock, *pages, base, size, flags); +if (result >0 ) + len += result; +if (result != size) + goto out; + total_len -= size; + pglen -= size; + size =PAGE_SIZE < pglen ?PAGE_SIZE : pglen; + base =0 ; + pages++; + } +/* +* send tail +*/ +if (xbufp->tail[0 ].iov_len) { + result = sock->ops->sendpage (sock, + xbufp->tail[0 ].iov_base, + (unsigned long )xbufp->tail[0 ].iov_base & ~PAGE_MASK , + xbufp->tail[0 ].iov_len, +0 ); + +if (result >0 ) + len += result; + } +out: +if (len != xbufp->len) +printk (KERN_NOTICE "Error sending entire callback!\n" ); + +return len; +} + +/* +* The send routine. Borrows from svc_send +*/ +static int bc_send_request (struct rpc_task *task) +{ +struct rpc_rqst *req = task->tk_rqstp; +struct rpc_xprt *bc_xprt = req->rq_xprt; +struct svc_xprt *xprt; +struct svc_sock *svsk; +u32 len; + +dprintk ("sending request with xid: %08x\n" ,ntohl (req->rq_xid)); +/* +* Get the server socket associated with this callback xprt +*/ + svsk = bc_xprt->bc_sock; + xprt = &svsk->sk_xprt; + +mutex_lock (&xprt->xpt_mutex); +if (test_bit (XPT_DEAD , &xprt->xpt_flags)) + len = -ENOTCONN ; +else + len =bc_sendto (req); +mutex_unlock (&xprt->xpt_mutex); + +return 0 ; + +} + +/* +* The close routine. Since this is client initiated, we do nothing +*/ + +static void bc_close (struct rpc_xprt *xprt) +{ +return ; +} + +/* +* The xprt destroy routine. Again, because this connection is client +* initiated, we do nothing +*/ + +static void bc_destroy (struct rpc_xprt *xprt) +{ +return ; +} +#endif /* CONFIG_NFSD_V4_1 */ +static struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, .reserve_xprt = xprt_reserve_xprt_cong,@@ -1917,6 +2133,26 @@ static struct rpc_xprt_ops xs_tcp_ops = { .print_stats = xs_tcp_print_stats, }; +#if defined(CONFIG_NFSD_V4_1 ) +/* +* The rpc_xprt_ops for the server backchannel +*/ + +static struct rpc_xprt_ops bc_tcp_ops = { + .reserve_xprt = xprt_reserve_xprt, + .release_xprt = xprt_release_xprt, + .set_port = bc_set_port, + .connect = bc_connect, + .buf_alloc = bc_malloc, + .buf_free = bc_free, + .send_request = bc_send_request, + .set_retrans_timeout = xprt_set_retrans_timeout_def, + .close = bc_close, + .destroy = bc_destroy, + .print_stats = xs_tcp_print_stats, +}; +#endif /* CONFIG_NFSD_V4_1 */ +static struct rpc_xprt *xs_setup_xprt (struct xprt_create *args,unsigned int slot_table_size) {@@ -2049,13 +2285,31 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) xprt->tsh_size =sizeof (rpc_fraghdr) /sizeof (u32); xprt->max_payload =RPC_MAX_FRAGMENT_SIZE ; - xprt->bind_timeout =XS_BIND_TO ; - xprt->connect_timeout =XS_TCP_CONN_TO ; - xprt->reestablish_timeout =XS_TCP_INIT_REEST_TO ; - xprt->idle_timeout =XS_IDLE_DISC_TO ; +#ifdef CONFIG_NFSD_V4_1 +if (args->bc_sock) { +/* backchannel */ +xprt_set_bound (xprt); +INIT_DELAYED_WORK (&transport->connect_worker, + bc_connect_worker); + xprt->bind_timeout =0 ; + xprt->connect_timeout =0 ; + xprt->reestablish_timeout =0 ; + xprt->idle_timeout = (~0 ); - xprt->ops = &xs_tcp_ops; - xprt->timeout = &xs_tcp_default_timeout; +/* +* The backchannel uses the same socket connection as the +* forechannel +*/ + xprt->bc_sock = args->bc_sock; + xprt->bc_sock->sk_bc_xprt = xprt; + transport->sock = xprt->bc_sock->sk_sock; + transport->inet = xprt->bc_sock->sk_sk; + + xprt->ops = &bc_tcp_ops; + + goto next; + } +#endif /* CONFIG_NFSD_V4_1 */ switch (addr->sa_family) {case AF_INET :@@ -2063,13 +2317,31 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)xprt_set_bound (xprt);INIT_DELAYED_WORK (&transport->connect_worker, xs_tcp_connect_worker4); -xs_format_ipv4_peer_addresses (xprt,"tcp" ,RPCBIND_NETID_TCP );break ;case AF_INET6 :if (((struct sockaddr_in6 *)addr)->sin6_port !=htons (0 ))xprt_set_bound (xprt);INIT_DELAYED_WORK (&transport->connect_worker, xs_tcp_connect_worker6); +break ; + } + xprt->bind_timeout =XS_BIND_TO ; + xprt->connect_timeout =XS_TCP_CONN_TO ; + xprt->reestablish_timeout =XS_TCP_INIT_REEST_TO ; + xprt->idle_timeout =XS_IDLE_DISC_TO ; + + xprt->ops = &xs_tcp_ops; + +#ifdef CONFIG_NFSD_V4_1 +next: +#endif /* CONFIG_NFSD_V4_1 */ + xprt->timeout = &xs_tcp_default_timeout; + +switch (addr->sa_family) { +case AF_INET : +xs_format_ipv4_peer_addresses (xprt,"tcp" ,RPCBIND_NETID_TCP ); +break ; +case AF_INET6 :xs_format_ipv6_peer_addresses (xprt,"tcp" ,RPCBIND_NETID_TCP6 );break ;default :Signature · 1 line
1.6.2.1
PATCH v2 37/47 nfsd41: callback infrastructure
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Keep the xprt used for create_session in cl_cb_xprt. Mark cl_callback.cb_minorversion = 1 and remember the client provided cl_callback.cb_prog rpc program number. Use it to probe the callback path.
Define xdr sizes and code nfs4_cb_compound header to be able to send a null callback rpc.
--- fs/nfsd/nfs4callback.c | 35 ++++++++++++++++++++++++++++++++--- fs/nfsd/nfs4state.c | 10 ++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-)
fs/nfsd/nfs4callback.c +32 -3
@@ -43,6 +43,7 @@#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/svc.h> #include <linux/sunrpc/clnt.h> +#include <linux/sunrpc/svcsock.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/state.h> #include <linux/sunrpc/sched.h>
@@ -52,16 +53,19 @@#define NFSPROC4_CB_NULL 0#define NFSPROC4_CB_COMPOUND 1 +#define NFS4_STATEID_SIZE 16/* Index of predefined Linux callback client operations */ enum { -NFSPROC4_CLNT_CB_NULL =0 , +NFSPROC4_CLNT_CB_NULL =0 ,NFSPROC4_CLNT_CB_RECALL , +NFSPROC4_CLNT_CB_SEQUENCE , };enum nfs_cb_opnum4 {OP_CB_RECALL =4 , +OP_CB_SEQUENCE =11 , };#define NFS4_MAXTAGLEN 20
@@ -70,15 +74,22 @@ enum nfs_cb_opnum4 {#define NFS4_dec_cb_null_sz 0#define cb_compound_enc_hdr_sz 4#define cb_compound_dec_hdr_sz (3 + (NFS4_MAXTAGLEN >> 2)) +#define sessionid_sz (NFS4_MAX_SESSIONID_LEN >> 2) +#define cb_sequence_enc_sz (sessionid_sz + 4 + \ + 1 /* no referring calls list yet */) +#define cb_sequence_dec_sz (op_dec_sz + sessionid_sz + 4) +#define op_enc_sz 1#define op_dec_sz 2#define enc_nfs4_fh_sz (1 + (NFS4_FHSIZE >> 2))#define enc_stateid_sz (NFS4_STATEID_SIZE >> 2)#define NFS4_enc_cb_recall_sz (cb_compound_enc_hdr_sz + \ + cb_sequence_enc_sz + \ 1 + enc_stateid_sz + \ enc_nfs4_fh_sz)#define NFS4_dec_cb_recall_sz (cb_compound_dec_hdr_sz + \ + cb_sequence_dec_sz + \ op_dec_sz)/*
@@ -135,13 +146,19 @@ xdr_error: \return -EIO ; \ } \ } while (0) +#define COPYMEM (x, nbytes) do { \ + memcpy((x), p, nbytes); \ + p += XDR_QUADLEN(nbytes); \ +} while (0)struct nfs4_cb_compound_hdr { -int status; -u32 ident; +/* args */ +u32 ident;/* minorversion 0 only */ u32 nops;__be32 *nops_p;u32 minorversion; +/* res */ +int status;u32 taglen;char *tag; };
@@ -405,6 +422,17 @@ static struct rpc_clnt *setup_callback_client(struct nfs4_client *clp) addr.sin_family =AF_INET ; addr.sin_port =htons (cb->cb_port); addr.sin_addr.s_addr =htonl (cb->cb_addr); +#if defined(CONFIG_NFSD_V4_1 ) +if (cb->cb_minorversion) { +BUG_ON (cb->cb_minorversion !=1 ); + args.bc_sock = container_of(clp->cl_cb_xprt, struct svc_sock, + sk_xprt); + } +#endif /* CONFIG_NFSD_V4_1 */ + +dprintk ("%s: program %s 0x%x nrvers %u version %u minorversion %u\n" , + __func__, args.program->name, args.prognumber, + args.program->nrvers, args.version, cb->cb_minorversion);/* Create RPC client */ client =rpc_create (&args);
@@ -445,6 +473,7 @@ static int do_probe_callback(void *data)put_nfs4_client (clp);return 0 ; out_release_client: +dprintk ("NFSD: synchronous CB_NULL failed. status=%d\n" , status);rpc_shutdown_client (client); out_err: dprintk("NFSD: warning: no callback path to client %.*s: error %d\n",
fs/nfsd/nfs4state.c +10 -0
@@ -663,6 +663,8 @@ free_client(struct nfs4_client *clp) {shutdown_callback_client (clp);#if defined(CONFIG_NFSD_V4_1 ) +if (clp->cl_cb_xprt) +svc_xprt_put (clp->cl_cb_xprt);nfsd4_release_respages (clp->cl_slot.sl_cache_entry.ce_respages, clp->cl_slot.sl_cache_entry.ce_resused);#endif /* CONFIG_NFSD_V4_1 */
@@ -1411,6 +1413,14 @@ nfsd4_create_session(struct svc_rqst *rqstp, cr_ses->flags &= ~SESSION4_PERSIST ; cr_ses->flags &= ~SESSION4_RDMA ; +if (cr_ses->flags &SESSION4_BACK_CHAN ) { + unconf->cl_cb_xprt = rqstp->rq_xprt; +svc_xprt_get (unconf->cl_cb_xprt); + unconf->cl_callback.cb_minorversion =1 ; + unconf->cl_cb_seq_nr =0 ; + unconf->cl_callback.cb_prog = cr_ses->callback_prog; +nfsd4_probe_callback (unconf); + } conf = unconf; }else { status = nfserr_stale_clientid;
Signature · 1 line
1.6.2.1
PATCH v2 38/47 nfsd41: Remember the auth flavor to use for callbacks
In reply to Benny HalevyFrom: Ricardo Labiaga <[email protected]>
The callbacks will be sent using the same authentication flavor that was used during session creation. We'll add code to remember the principal in the case RPCSEC_GSS in a separate patch.
--- fs/nfsd/nfs4state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/nfsd/nfs4state.c +1 -0
@@ -1307,6 +1307,7 @@ out_new:copy_verf (new, &verf);copy_cred (&new->cl_cred, &rqstp->rq_cred); new->cl_addr = ip_addr; + new->cl_flavor = rqstp->rq_flavor;gen_clid (new);gen_confirm (new);add_to_unconfirmed (new, strhashval);
Signature · 1 line
1.6.2.1
PATCH v2 39/47 nfsd41: introduce cl_cb_mutex
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
To be used for serializing nfs41 callbacks.
--- fs/nfsd/nfs4state.c | 1 + include/linux/nfsd/state.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
fs/nfsd/nfs4state.c +1 -0
@@ -741,6 +741,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir)INIT_LIST_HEAD (&clp->cl_delegations);#if defined(CONFIG_NFSD_V4_1 )INIT_LIST_HEAD (&clp->cl_sessions); +mutex_init (&clp->cl_cb_mutex);#endif /* CONFIG_NFSD_V4_1 */ INIT_LIST_HEAD (&clp->cl_lru);return clp;
include/linux/nfsd/state.h +1 -0
@@ -197,6 +197,7 @@ struct nfs4_client {struct nfs4_sessionid cl_sessionid;struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ +struct mutex cl_cb_mutex;#endif /* CONFIG_NFSD_V4_1 */ };
Signature · 1 line
1.6.2.1
PATCH v2 40/47 nfsd41: cb_sequence callback
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Implement the cb_sequence callback conforming to draft-ietf-nfsv4-minorversion1
--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)
fs/nfsd/nfs4callback.c +118 -0
@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; + +if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 ); + +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ +WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {
@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 +if (memcmp (id.data, res->cbs_clp->cl_sessionid.data, +NFS4_MAX_SESSIONID_LEN )) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ +READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {
@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots +*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex); + args->cbs_clp = clp; + clp->cl_cb_seq_nr++; +return 0 ; +} + +static void +nfs41_cb_sequence_done (struct nfs4_client *clp,struct nfsd4_cb_sequence *res) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +/* FIXME: support multiple callback slots */ +mutex_unlock (&clp->cl_cb_mutex); +} +#endif /* CONFIG_NFSD_V4_1 */ +/* * called with dp->dl_count inc'ed. */
include/linux/nfsd/state.h +6 -1
@@ -61,6 +61,10 @@ typedef struct {#define si_stateownerid si_opaque.so_stateownerid#define si_fileid si_opaque.so_fileid +struct nfsd4_cb_sequence { +/* args/res */ +struct nfs4_client *cbs_clp; +};struct nfs4_cb_recall {u32 cbr_ident;
@@ -195,7 +199,8 @@ struct nfs4_client {struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid; - +/* We currently support a single back channel with a single slot */ +u32 cl_cb_seq_nr;struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ struct mutex cl_cb_mutex;#endif /* CONFIG_NFSD_V4_1 */
Signature · 1 line
1.6.2.1
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 28 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to draft-ietf-nfsv4-minorversion1Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1 framework.]Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +6
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; +
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 ); + +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */
This whole function should be under CONFIG_NFSD_V4_1.
Quoted 46 lines
fs/nfsd/nfs4callback.c +39
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 + if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+ NFS4_MAX_SESSIONID_LEN)) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */
Ditto.
Quoted 32 lines
fs/nfsd/nfs4callback.c +25
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots
fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);
We shouldn't be holding a mutex across a callback. Why is this needed?
--b.
Quoted 49 lines
fs/nfsd/nfs4callback.c +18
-0+ args->cbs_clp = clp; + clp->cl_cb_seq_nr++; + return 0; +} + +static void +nfs41_cb_sequence_done (struct nfs4_client *clp,struct nfsd4_cb_sequence *res) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +/* FIXME: support multiple callback slots */ +mutex_unlock (&clp->cl_cb_mutex); +} +#endif /* CONFIG_NFSD_V4_1 */ +/* * called with dp->dl_count inc'ed. */ include/linux/nfsd/state.h +6
-1@@ -61,6 +61,10 @@ typedef struct {#define si_stateownerid si_opaque.so_stateownerid#define si_fileid si_opaque.so_fileid +struct nfsd4_cb_sequence { +/* args/res */ +struct nfs4_client *cbs_clp; +};struct nfs4_cb_recall {u32 cbr_ident;@@ -195,7 +199,8 @@ struct nfs4_client {struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid; - +/* We currently support a single back channel with a single slot */ +u32 cl_cb_seq_nr;struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ struct mutex cl_cb_mutex;#endif /* CONFIG_NFSD_V4_1 */ Signature · 1 line
1.6.2.1
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 33 lines · J. Bruce Fields
Quoted 32 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to draft-ietf-nfsv4-minorversion1Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1 framework.]Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +10
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; + +if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 );
Quoted 8 lines
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 6 lines
fs/nfsd/nfs4callback.c +6
-0+ +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ This whole function should be under
CONFIG_NFSD_V4_1.
Right. I wonder how it got to this state.
Will fix.
Benny
Quoted 156 lines
Quoted 47 lines
fs/nfsd/nfs4callback.c +39
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 + if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+ NFS4_MAX_SESSIONID_LEN)) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ Ditto.
Quoted 32 lines
fs/nfsd/nfs4callback.c +25
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
--b.
Quoted 49 lines
fs/nfsd/nfs4callback.c +18
-0+ args->cbs_clp = clp; + clp->cl_cb_seq_nr++; + return 0; +} + +static void +nfs41_cb_sequence_done (struct nfs4_client *clp,struct nfsd4_cb_sequence *res) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +/* FIXME: support multiple callback slots */ +mutex_unlock (&clp->cl_cb_mutex); +} +#endif /* CONFIG_NFSD_V4_1 */ +/* * called with dp->dl_count inc'ed. */ include/linux/nfsd/state.h +6
-1@@ -61,6 +61,10 @@ typedef struct {#define si_stateownerid si_opaque.so_stateownerid#define si_fileid si_opaque.so_fileid +struct nfsd4_cb_sequence { +/* args/res */ +struct nfs4_client *cbs_clp; +};struct nfs4_cb_recall {u32 cbr_ident;@@ -195,7 +199,8 @@ struct nfs4_client {struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid; - +/* We currently support a single back channel with a single slot */ +u32 cl_cb_seq_nr;struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ struct mutex cl_cb_mutex;#endif /* CONFIG_NFSD_V4_1 */ Signature · 1 line
1.6.2.1
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 43 lines · Benny Halevy
Quoted 33 lines · J. Bruce Fields
Quoted 32 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to draft-ietf-nfsv4-minorversion1Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1 framework.]Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +10
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; + +if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 );Quoted 8 lines
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 6 lines
fs/nfsd/nfs4callback.c +6
-0+ +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ This whole function should be under
CONFIG_NFSD_V4_1.
Quoted 2 lines
Right. I wonder how it got to this state.
Will fix.
Thanks. I'm more curious about the mutex question.
But I'm inclined to defer the callback changes to 2.6.31, so that's not urgent.
--b.
Quoted 159 lines
Benny
Quoted 156 lines
Quoted 47 lines
fs/nfsd/nfs4callback.c +39
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 + if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+ NFS4_MAX_SESSIONID_LEN)) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ Ditto.
Quoted 32 lines
fs/nfsd/nfs4callback.c +25
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
--b.
Quoted 49 lines
fs/nfsd/nfs4callback.c +18
-0+ args->cbs_clp = clp; + clp->cl_cb_seq_nr++; + return 0; +} + +static void +nfs41_cb_sequence_done (struct nfs4_client *clp,struct nfsd4_cb_sequence *res) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +/* FIXME: support multiple callback slots */ +mutex_unlock (&clp->cl_cb_mutex); +} +#endif /* CONFIG_NFSD_V4_1 */ +/* * called with dp->dl_count inc'ed. */ include/linux/nfsd/state.h +6
-1@@ -61,6 +61,10 @@ typedef struct {#define si_stateownerid si_opaque.so_stateownerid#define si_fileid si_opaque.so_fileid +struct nfsd4_cb_sequence { +/* args/res */ +struct nfs4_client *cbs_clp; +};struct nfs4_cb_recall {u32 cbr_ident;@@ -195,7 +199,8 @@ struct nfs4_client {struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid; - +/* We currently support a single back channel with a single slot */ +u32 cl_cb_seq_nr;struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ struct mutex cl_cb_mutex;#endif /* CONFIG_NFSD_V4_1 */ Signature · 1 line
1.6.2.1
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
In reply to J. Bruce FieldsQuoted 129 lines · J. Bruce Fields
Quoted 28 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to draft-ietf-nfsv4-minorversion1Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1 framework.]Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +6
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; +fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 ); + +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ This whole function should be under
CONFIG_NFSD_V4_1.Quoted 46 lines
fs/nfsd/nfs4callback.c +39
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 + if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+ NFS4_MAX_SESSIONID_LEN)) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ Ditto.
Quoted 28 lines
fs/nfsd/nfs4callback.c +21
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; }
Quoted 16 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
Benny
Quoted 52 lines
--b.
Quoted 49 lines
fs/nfsd/nfs4callback.c +18
-0+ args->cbs_clp = clp; + clp->cl_cb_seq_nr++; + return 0; +} + +static void +nfs41_cb_sequence_done (struct nfs4_client *clp,struct nfsd4_cb_sequence *res) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +/* FIXME: support multiple callback slots */ +mutex_unlock (&clp->cl_cb_mutex); +} +#endif /* CONFIG_NFSD_V4_1 */ +/* * called with dp->dl_count inc'ed. */ include/linux/nfsd/state.h +6
-1@@ -61,6 +61,10 @@ typedef struct {#define si_stateownerid si_opaque.so_stateownerid#define si_fileid si_opaque.so_fileid +struct nfsd4_cb_sequence { +/* args/res */ +struct nfs4_client *cbs_clp; +};struct nfs4_cb_recall {u32 cbr_ident;@@ -195,7 +199,8 @@ struct nfs4_client {struct nfsd4_slot cl_slot;/* create_session slot */ u32 cl_exchange_flags;struct nfs4_sessionid cl_sessionid; - +/* We currently support a single back channel with a single slot */ +u32 cl_cb_seq_nr;struct svc_xprt *cl_cb_xprt;/* 4.1 callback transport */ struct mutex cl_cb_mutex;#endif /* CONFIG_NFSD_V4_1 */ Signature · 1 line
1.6.2.1
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 147 lines · Benny Halevy
Quoted 129 lines · J. Bruce Fields
Quoted 28 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to draft-ietf-nfsv4-minorversion1Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1 framework.]Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +6
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; +fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 ); + +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ This whole function should be under
CONFIG_NFSD_V4_1.Quoted 46 lines
fs/nfsd/nfs4callback.c +39
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 + if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+ NFS4_MAX_SESSIONID_LEN)) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ Ditto.
Quoted 28 lines
fs/nfsd/nfs4callback.c +21
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; }Quoted 16 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent. How is the client side currently waiting on slots?
--b.
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 144 lines · J. Bruce Fields
Quoted 143 lines · Benny Halevy
Quoted 142 lines · J. Bruce Fields
Quoted 28 lines · Benny Halevy
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to draft-ietf-nfsv4-minorversion1Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1 framework.]Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +6
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, hdr->nops++; } +static void +encode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *args, +struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; +fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 ); + +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 +WRITEMEM (args->cbs_clp->cl_sessionid.data,NFS4_MAX_SESSIONID_LEN ); +WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ This whole function should be under
CONFIG_NFSD_V4_1.Quoted 46 lines
fs/nfsd/nfs4callback.c +39
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel +* with a single slot. +*/ +static int +decode_cb_sequence (struct xdr_stream *xdr,struct nfsd4_cb_sequence *res, +struct rpc_rqst *rqstp) +{ +struct nfs4_callback *cb = + (struct nfs4_callback *)rqstp->rq_task->tk_client->cl_private; +struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 ) +return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID, slotID or +* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 + if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+ NFS4_MAX_SESSIONID_LEN)) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { +dprintk ("%s Invalid sequence number\n" , __func__); + goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ Ditto.
Quoted 32 lines
fs/nfsd/nfs4callback.c +25
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid highest slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid target highest slotid\n" , __func__); + goto out; + } + status =0 ; +out: +return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
Quoted 4 lines
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent.
OK.
Quoted 1 line
How is the client side currently waiting on slots?
Currently it has a single slot and a single (NFS41_BC_MIN_CALLBACKS) preallocated rpc_rqst. If it gets more calls than that, concurrently, it will drop its end of the line using set_bit(XPRT_CLOSE_WAIT, &xprt->state)
(Ricardo, please keep me honest :)
Benny
Quoted 2 lines
--b.
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 31 lines · Benny Halevy
Quoted 21 lines · J. Bruce Fields
Quoted 20 lines · Benny Halevy
Quoted 19 lines · J. Bruce Fields
Quoted 8 lines
fs/nfsd/nfs4callback.c +4
-0@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
Quoted 4 lines
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent.
OK.
Quoted 1 line
How is the client side currently waiting on slots?
Quoted 7 lines
Currently it has a single slot and a single (
NFS41_BC_MIN_CALLBACKS) preallocatedrpc_rqst. If it gets more calls than that, concurrently, it will drop its end of the line usingset_bit(XPRT_CLOSE_WAIT, &xprt->state)(Ricardo, please keep me honest :)
I was wondering about the rpc client as used on the nfs client, not the nfs client/callback server.
--b.
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 35 lines · J. Bruce Fields
Quoted 34 lines · Benny Halevy
Quoted 21 lines · J. Bruce Fields
Quoted 20 lines · Benny Halevy
Quoted 19 lines · J. Bruce Fields
Quoted 8 lines
fs/nfsd/nfs4callback.c +4
-0@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and +* multiple slots fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
fs/nfsd/nfs4callback.c +10
-0+*/ +static int +nfs41_cb_sequence_setup (struct nfs4_client *clp,struct nfsd4_cb_sequence *args) +{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
Quoted 3 lines
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent.
OK.
Quoted 1 line
How is the client side currently waiting on slots?
Currently it has a single slot and a single (
NFS41_BC_MIN_CALLBACKS) preallocatedrpc_rqst. If it gets more calls than that, concurrently, it will drop its end of the line usingset_bit(XPRT_CLOSE_WAIT, &xprt->state)
Quoted 3 lines
Quoted 1 line
(Ricardo, please keep me honest :)
I was wondering about the rpc client as used on the nfs client, not the
you mean rpc client as used on the nfs server? :)
Quoted 3 lines
nfs client/callback server.
--b.
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 36 lines · Benny Halevy
Quoted 35 lines · J. Bruce Fields
Quoted 34 lines · Benny Halevy
Quoted 21 lines · J. Bruce Fields
Quoted 20 lines · Benny Halevy
Quoted 19 lines · J. Bruce Fields
Quoted 8 lines
(quoted diff) +4
-0@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client *clp) return; } +#if defined(CONFIG_NFSD_V4_1) +/* + * FIXME: cb_sequence should support referring call lists, cachethis, and + * multiple slotsReview nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 10 lines
(quoted diff) +10
-0+ */ +static int +nfs41_cb_sequence_setup(struct nfs4_client *clp, struct nfsd4_cb_sequence *args) +{ + u32 *ptr = (u32 *)clp->cl_sessionid.data; + + dprintk("%s: %u:%u:%u:%u\n", __func__, + ptr[0], ptr[1], ptr[2], ptr[3]); + + mutex_lock(&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this needed?
Quoted 3 lines
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent.
OK.
Quoted 1 line
How is the client side currently waiting on slots?
Currently it has a single slot and a single (
NFS41_BC_MIN_CALLBACKS) preallocatedrpc_rqst. If it gets more calls than that, concurrently, it will drop its end of the line usingset_bit(XPRT_CLOSE_WAIT, &xprt->state)
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
(Ricardo, please keep me honest :)
I was wondering about the rpc client as used on the nfs client, not the
you mean rpc client as used on the nfs server? :)
I meant the rpc client on the nfs client: when the nfs client sends an rpc on the forechannel it has to wait for a session slot. How does it do it (is it putting the rpc task on some queue?), and can the callback client (on the nfs server) do the same thing?
--b.
RE: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 9 lines
-----Original Message-----
From: J. Bruce Fields [mailto:[email protected]]
Sent: Thursday, April 02, 2009 1:54 PM
To: Benny Halevy
Cc: [email protected]; [email protected]; Labiaga, Ricardo
Subject: Re: [PATCH v2 40/47] nfsd41:cb_sequencecallbackQuoted 1 line · Benny Halevy
On Apr. 02, 2009, 22:27 +0300, "J. Bruce Fields"
Quoted 16 lines
Quoted 2 lines · wrote:
Quoted 2 lines · Benny Halevy
Quoted 1 line
On Apr. 02, 2009, 21:51 +0300, "J. Bruce Fields"
Quoted 2 lines · <[email protected]> wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines · Benny Halevy
Quoted 1 line
On Apr. 01, 2009, 7:39 +0300, "J. Bruce Fields"
Quoted 1 line · <[email protected]> wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review nfsd4_probe_callback(struct nfs4_client
Quoted 1 line
(quoted diff) +0
-0@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client*clp)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Review nfsd4_probe_callback(struct nfs4_client · line 594
Quoted 6 lines
(quoted diff) +3
-0return; } +#if defined(CONFIG_NFSD_V4_1) +/* + * FIXME: cb_sequence should support referring call lists,cachethis, and
Quoted 13 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review nfsd4_probe_callback(struct nfs4_client · line 598
Quoted 4 lines
(quoted diff) +4
-0+ * multiple slots + */ +static int +nfs41_cb_sequence_setup(struct nfs4_client *clp, struct
nfsd4_cb_sequence*args)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review nfsd4_probe_callback(struct nfs4_client · line 605
Quoted 7 lines
(quoted diff) +7
-0+{ + u32 *ptr = (u32 *)clp->cl_sessionid.data; + + dprintk("%s: %u:%u:%u:%u\n", __func__, + ptr[0], ptr[1], ptr[2], ptr[3]); + + mutex_lock(&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is
this
Quoted 16 lines
needed?
Quoted 15 lines
Quoted 15 lines
Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent.
OK.
Quoted 8 lines
Quoted 1 line
How is the client side currently waiting on slots?
Currently it has a single slot and a single (
NFS41_BC_MIN_CALLBACKS) preallocatedrpc_rqst. If it gets more calls than that, concurrently, it will drop its end of the line usingset_bit(XPRT_CLOSE_WAIT, &xprt->state)(Ricardo, please keep me honest :)
I was wondering about the rpc client as used on the nfs client,
not
Quoted 7 lines
the
Quoted 2 lines
you mean rpc client as used on the nfs server? :)
I meant the rpc client on the nfs client: when the nfs client sends an rpc on the forechannel it has to wait for a session slot. How does it do it (is it putting the rpc task on some queue?), and can the
callback
Quoted 2 lines
client (on the nfs server) do the same thing?
Yes, the NFS client uses a slot table for the forechannel 'struct nfs4_slot_table' and a slot table for the backchannel. Tasks sleep on an rpc_wait_queue if there are no available slots. Used/ unused slots are tracked with a bit map array. When the reply is received on a slot, the next available task is awaken.
Yes, the callback client can certainly do the same thing. Today, the Linux client backchannel only advertises a single slot (need to check what Solaris does). So against Linux, having more than one slot doesn't buy the server much right now.
Is this something that can be addressed as an enhancement later on, or do you need this implemented right away?
- ricardo
A message that is not in the archive (sent off-list or not yet received): 273FE88A07F5D445824060902F70034405026F00-hX7t0kiaRRpT+ZUat5FNkAK/[email protected]
Re: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 6 lines · Ricardo
Yes, the NFS client uses a slot table for the forechannel 'struct
nfs4_slot_table' and a slot table for the backchannel. Tasks sleep on anrpc_wait_queueif there are no available slots. Used/ unused slots are tracked with a bit map array. When the reply is received on a slot, the next available task is awaken.
Quoted 7 lines
Yes, the callback client can certainly do the same thing. Today, the Linux client backchannel only advertises a single slot (need to check what Solaris does). So against Linux, having more than one slot doesn't buy the server much right now.
Is this something that can be addressed as an enhancement later on, or do you need this implemented right away?
I'm dropping the backchannel patches for 2.6.30, so it isn't urgent, but this is something to work on over the next month or two.
I'd just like an asynchronous solution, so no big mutexes. I'm fine with the single-slot limitation if it helps, but maybe the simplest thing will be just to imitate the nfs-client code?
--b.
RE: [PATCH v2 40/47] nfsd41: cb_sequence callback
Quoted 10 lines
-----Original Message-----
From: J. Bruce Fields [mailto:[email protected]]
Sent: Thursday, April 02, 2009 7:34 PM
To: Labiaga, Ricardo
Cc: Benny Halevy; [email protected]; [email protected]
Subject: Re: [PATCH v2 40/47] nfsd41:cb_sequencecallbackQuoted 2 lines · Ricardo
Yes, the NFS client uses a slot table for the forechannel 'struct
nfs4_slot_table' and a slot table for the backchannel. Tasks sleep
on
Quoted 1 line
Quoted 1 line
an
rpc_wait_queueif there are no available slots. Used/ unused
slots
Quoted 1 line
Quoted 1 line
are tracked with a bit map array. When the reply is received on a
slot,
Quoted 3 lines
Quoted 3 lines
the next available task is awaken.
Yes, the callback client can certainly do the same thing. Today,
the
Quoted 1 line
Quoted 1 line
Linux client backchannel only advertises a single slot (need to
check
Quoted 1 line
Quoted 1 line
what Solaris does). So against Linux, having more than one slot
doesn't
Quoted 3 lines
Quoted 3 lines
buy the server much right now.
Is this something that can be addressed as an enhancement later on,
or
Quoted 3 lines
Quoted 1 line
do you need this implemented right away?
I'm dropping the backchannel patches for 2.6.30, so it isn't urgent,
but
Quoted 6 lines
this is something to work on over the next month or two.
I'd just like an asynchronous solution, so no big mutexes. I'm fine with the single-slot limitation if it helps, but maybe the simplest thing will be just to imitate the nfs-client code?
Sounds good, I can work on this.
- ricardo
RE: [PATCH v2 40/47] nfsd41: cb_sequence callback
In reply to Benny HalevyQuoted 8 lines
-----Original Message-----
From: Benny Halevy [mailto:[email protected]]
Sent: Thursday, April 02, 2009 12:20 PM
To: J. Bruce Fields
Cc: [email protected]; [email protected]; Labiaga, Ricardo
Subject: Re: [PATCH v2 40/47] nfsd41:cb_sequencecallbackOn Apr. 02, 2009, 21:51 +0300, "J. Bruce Fields"
Quoted 3 lines
Quoted 2 lines · wrote:
Quoted 1 line · Benny Halevy
On Apr. 01, 2009, 7:39 +0300, "J. Bruce Fields"
Quoted 5 lines
Quoted 4 lines · wrote:
Quoted 4 lines
Quoted 4 lines · Benny Halevy
Quoted 3 lines
From: Andy Adamson <[email protected]>
Implement the
cb_sequencecallback conforming to
draft-ietf-nfsv4-
Quoted 11 lines
minorversion1
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Signed-off-by Benny Halevy <[email protected]>[Rework the back channel xdr using the shared v4.0 and v4.1
framework.]
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Signed-off-by Andy Adamson <[email protected]>[fixed indentation]Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4callback.c | 118++++++++++++++++++++++++++++++++++++++++++++
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr,
Quoted 8 lines
include/linux/nfsd/state.h | 7 ++- 2 files changed, 124 insertions(+), 1 deletions(-)fs/nfsd/nfs4callback.c +0
-0@@ -255,6 +255,29 @@ encode_cb_recall(struct xdr_stream *xdr,
struct
Quoted 6 lines
nfs4_cb_recall*cb_rec,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec,
Quoted 5 lines
fs/nfsd/nfs4callback.c +2
-0hdr->nops++; } +static void +encode_cb_sequence(struct xdr_stream *xdr, struct
nfsd4_cb_sequence
Quoted 18 lines
*args,
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+ struct nfs4_cb_compound_hdr *hdr) +{ +__be32 *p; +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec,
Quoted 8 lines
fs/nfsd/nfs4callback.c +8
-0+if (hdr->minorversion ==0 ) +return ; + +RESERVE_SPACE (1 +NFS4_MAX_SESSIONID_LEN +20 ); + +WRITE32 (OP_CB_SEQUENCE ); +#ifdef CONFIG_NFSD_V4_1 + WRITEMEM(args->cbs_clp->cl_sessionid.data,
NFS4_MAX_SESSIONID_LEN);Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec, · line 273
Quoted 2 lines
fs/nfsd/nfs4callback.c +2
-0+WRITE32 (args->cbs_clp->cl_cb_seq_nr); +#endif /* CONFIG_NFSD_V4_1 */ This whole function should be under
CONFIG_NFSD_V4_1.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr,
Quoted 11 lines
fs/nfsd/nfs4callback.c +7
-0+WRITE32 (0 );/* slotid, always 0 */ +WRITE32 (0 );/* highest slotid always 0 */ +WRITE32 (0 );/* cachethis always 0 */ +WRITE32 (0 );/* FIXME: support referring_call_lists */ + hdr->nops++; +} +static int nfs4_xdr_enc_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -319,6 +342,69 @@ decode_cb_op_hdr(struct xdr_stream *xdr,
enum
Quoted 11 lines
nfs_opnum4expected)Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 5 lines
fs/nfsd/nfs4callback.c +2
-0return 0 ; } +/* +* Our current back channel implmentation supports a single backchannel
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+* with a single slot. +*/ +static int +decode_cb_sequence(struct xdr_stream *xdr, struct
nfsd4_cb_sequence
Quoted 5 lines
*res,
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+ struct rpc_rqst *rqstp) +{ + struct nfs4_callback *cb = + (struct nfs4_callback
*)rqstp->rq_task->tk_client-
Quoted 15 lines
Quoted 15 lines
cl_private;Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
fs/nfsd/nfs4callback.c +6
-0+struct nfs4_sessionid id; +int status; +u32 dummy; +__be32 *p; + +if (cb->cb_minorversion ==0 )Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 8 lines
fs/nfsd/nfs4callback.c +8
-0+return 0 ; + + status =decode_cb_op_hdr (xdr,OP_CB_SEQUENCE ); +if (status) +return status; + +/* +* If the server returns different values for sessionID,
slotID
Quoted 16 lines
or
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
fs/nfsd/nfs4callback.c +7
-0+* sequence number, the server is looney tunes. +*/ + status = -ESERVERFAULT ; + +READ_BUF (NFS4_MAX_SESSIONID_LEN +16 ); +COPYMEM (id.data,NFS4_MAX_SESSIONID_LEN ); +#ifdef CONFIG_NFSD_V4_1 Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 8 lines
fs/nfsd/nfs4callback.c +8
-0+if (memcmp (id.data, res->cbs_clp->cl_sessionid.data, +NFS4_MAX_SESSIONID_LEN )) { +dprintk ("%s Invalid session id\n" , __func__); + goto out; + } +READ32 (dummy); +if (dummy != res->cbs_clp->cl_cb_seq_nr) { + dprintk("%s Invalid sequence number\n",
__func__);
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) · line 386
Quoted 3 lines
fs/nfsd/nfs4callback.c +3
-0+ goto out; + } +#endif /* CONFIG_NFSD_V4_1 */ Ditto.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 8 lines
fs/nfsd/nfs4callback.c +8
-0+READ32 (dummy);/* slotid must be 0 */ +if (dummy !=0 ) { +dprintk ("%s Invalid slotid\n" , __func__); + goto out; + } +READ32 (dummy);/* highest slotid must be 0 */ +if (dummy !=0 ) { + dprintk("%s Invalid highest slotid\n",
__func__);
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
fs/nfsd/nfs4callback.c decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
Quoted 5 lines
fs/nfsd/nfs4callback.c +5
-0+ goto out; + } +READ32 (dummy);/* target highest slotid must be 0 */ +if (dummy !=0 ) { + dprintk("%s Invalid target highest slotid\n",
__func__);
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+ goto out; + } + status =0 ; +out:
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client
Quoted 8 lines
fs/nfsd/nfs4callback.c +4
-0+return status; +} + +static int nfs4_xdr_dec_cb_null (struct rpc_rqst *req,__be32 *p) {@@ -503,6 +589,38 @@ nfsd4_probe_callback(struct nfs4_client
*clp)
Quoted 28 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp)
Quoted 6 lines
fs/nfsd/nfs4callback.c +3
-0return ; } +#if defined(CONFIG_NFSD_V4_1 ) +/* +* FIXME: cb_sequence should support referring call lists, cachethis, and
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp)
Quoted 4 lines
fs/nfsd/nfs4callback.c +4
-0+* multiple slots +*/ +static int +nfs41_cb_sequence_setup(struct nfs4_client *clp, struct
nfsd4_cb_sequence*args)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/nfsd/nfs4callback.c nfsd4_probe_callback(struct nfs4_client *clp) · line 605
Quoted 7 lines
fs/nfsd/nfs4callback.c +7
-0+{ +u32 *ptr = (u32 *)clp->cl_sessionid.data; + +dprintk ("%s: %u:%u:%u:%u\n" , __func__, + ptr[0 ], ptr[1 ], ptr[2 ], ptr[3 ]); + +mutex_lock (&clp->cl_cb_mutex);We shouldn't be holding a mutex across a callback. Why is this
needed?
Quoted 4 lines
Quoted 2 lines
Just a simple way to limit concurrency to 1 and not deal with multiple slots on the callback path.
OK. We should work out some sort of asynchronous equivalent.
OK.
Quoted 7 lines
Quoted 1 line
How is the client side currently waiting on slots?
Currently it has a single slot and a single (
NFS41_BC_MIN_CALLBACKS) preallocatedrpc_rqst. If it gets more calls than that, concurrently, it will drop its end of the line usingset_bit(XPRT_CLOSE_WAIT, &xprt->state)
That's correct. The assumption here is that the server had violated the session contract and it should reestablish it.
- ricardo
Quoted 6 lines
(Ricardo, please keep me honest :)
Benny
Quoted 2 lines
--b.
PATCH v2 41/47 nfsd41: introduce nfs4_cb_call_sync for nfs4 and nfs41
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
For nfs41 callbacks we need to setup the cb_sequence args and process the result. This will be called by code common to nfs4 and nfs41.
--- fs/nfsd/nfs4callback.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-)
fs/nfsd/nfs4callback.c +50 -0
@@ -92,6 +92,15 @@ enum nfs_cb_opnum4 { cb_sequence_dec_sz + \ op_dec_sz) +struct nfs4_rpc_args { +void *args_op; +struct nfsd4_cb_sequence *args_seq; +}; + +struct nfs4_rpc_res { +struct nfsd4_cb_sequence *res_seq; +}; +/* * Generic encode routines from fs/nfs/nfs4xdr.c */
@@ -589,6 +598,12 @@ nfsd4_probe_callback(struct nfs4_client *clp)return ; } +static int _nfsd4_cb_sync (struct nfs4_client *clp, +const struct rpc_message *msg,int flags) +{ +return rpc_call_sync (clp->cl_callback.cb_client, msg,RPC_TASK_SOFT ); +} +#if defined(CONFIG_NFSD_V4_1 )/* * FIXME: cb_sequence should support referring call lists, cachethis, and
@@ -619,6 +634,41 @@ nfs41_cb_sequence_done(struct nfs4_client *clp, struct nfsd4_cb_sequence *res)/* FIXME: support multiple callback slots */ mutex_unlock (&clp->cl_cb_mutex); } + +static int _nfsd41_cb_sync (struct nfs4_client *clp, +struct rpc_message *msg,int flags) +{ +struct nfsd4_cb_sequence seq; +struct nfs4_rpc_args *args; +struct nfs4_rpc_res res; +int status; + + args = msg->rpc_argp; + args->args_seq = &seq; + + res.res_seq = &seq; + msg->rpc_resp = &res; + +nfs41_cb_sequence_setup (clp, &seq); + status =_nfsd4_cb_sync (clp, msg, flags); +nfs41_cb_sequence_done (clp, &seq); + +return status; +} + +static int nfsd4_cb_sync (struct nfs4_client *clp, +struct rpc_message *msg,int flags) +{ +return clp->cl_callback.cb_minorversion ? +_nfsd41_cb_sync (clp, msg, flags) : +_nfsd4_cb_sync (clp, msg, flags); +} +#else /* CONFIG_NFSD_V4_1 */ +static int nfsd4_cb_sync (struct nfs4_client *clp, +struct rpc_message *msg,int flags) +{ +return _nfsd4_cb_sync (clp, msg, flags); +}#endif /* CONFIG_NFSD_V4_1 */ /*
Signature · 1 line
1.6.2.1
PATCH v2 42/47 nfsd41: cb_recall callback
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Implement the cb_recall callback conforming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26
--- fs/nfsd/nfs4callback.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-)
fs/nfsd/nfs4callback.c +19 -6
@@ -298,9 +298,11 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p) }static int -nfs4_xdr_enc_cb_recall (struct rpc_rqst *req,__be32 *p,struct nfs4_cb_recall *args) +nfs4_xdr_enc_cb_recall (struct rpc_rqst *req,__be32 *p, +struct nfs4_rpc_args *rpc_args) {struct xdr_stream xdr; +struct nfs4_cb_recall *args = rpc_args->args_op;struct nfs4_callback *cb = (struct nfs4_callback *)req->rq_task->tk_client->cl_private;struct nfs4_cb_compound_hdr hdr = {
@@ -310,6 +312,7 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_cb_recall *axdr_init_encode (&xdr, &req->rq_snd_buf, p);encode_cb_compound_hdr (&xdr, &hdr); +encode_cb_sequence (&xdr, rpc_args->args_seq, &hdr);encode_cb_recall (&xdr, args, &hdr);encode_cb_nops (&hdr);return 0 ;
@@ -421,7 +424,8 @@ nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p) }static int -nfs4_xdr_dec_cb_recall (struct rpc_rqst *rqstp,__be32 *p) +nfs4_xdr_dec_cb_recall (struct rpc_rqst *rqstp,__be32 *p, +struct nfs4_rpc_res *rpc_res) {struct xdr_stream xdr;struct nfs4_cb_compound_hdr hdr;
@@ -431,6 +435,9 @@ nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p) status =decode_cb_compound_hdr (&xdr, &hdr);if (status) goto out; + status =decode_cb_sequence (&xdr, rpc_res->res_seq, rqstp); +if (status) + goto out; status =decode_cb_op_hdr (&xdr,OP_CB_RECALL ); out:return status;
@@ -678,19 +685,23 @@ void nfsd4_cb_recall(struct nfs4_delegation *dp) {struct nfs4_client *clp = dp->dl_client; -struct rpc_clnt *clnt = clp->cl_callback.cb_client;struct nfs4_cb_recall *cbr = &dp->dl_recall; +struct nfs4_rpc_args args = { + .args_op = cbr, + };struct rpc_message msg = { .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL ], - .rpc_argp = cbr, + .rpc_argp = &args, };int retries =1 ;int status =0 ; +dprintk ("%s: dp %p\n" , __func__, dp); + cbr->cbr_trunc =0 ;/* XXX need to implement truncate optimization */ cbr->cbr_dp = dp; - status =rpc_call_sync (clnt, &msg,RPC_TASK_SOFT ); + status =nfsd4_cb_sync (clp, &msg,RPC_TASK_SOFT );while (retries--) {switch (status) {case -EIO :
@@ -705,13 +716,15 @@ nfsd4_cb_recall(struct nfs4_delegation *dp) goto out_put_cred; }ssleep (2 ); - status =rpc_call_sync (clnt, &msg,RPC_TASK_SOFT ); + status =nfsd4_cb_sync (clp, &msg,RPC_TASK_SOFT ); } out_put_cred:/* * Success or failure, now we're either waiting for lease expiration * or deleg_return. */ +dprintk ("%s: dp %p dl_flock %p dl_count %d\n" , + __func__, dp, dp->dl_flock,atomic_read (&dp->dl_count));put_nfs4_client (clp);nfs4_put_delegation (dp);return ;
Signature · 1 line
1.6.2.1
PATCH v2 43/47 nfsd41: pass writable attrs mask to nfsd4_decode_fattr
In reply to Benny HalevyIn preparation for EXCLUSIVE4_1
--- fs/nfsd/nfs4xdr.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
fs/nfsd/nfs4xdr.c +15 -6
@@ -251,9 +251,14 @@ nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval)DECODE_TAIL ; } +static u32 nfsd_attrmask[] = { +NFSD_WRITEABLE_ATTRS_WORD0 , +NFSD_WRITEABLE_ATTRS_WORD1 +}; +static __be32 -nfsd4_decode_fattr (struct nfsd4_compoundargs *argp,u32 *bmval,struct iattr *iattr, -struct nfs4_acl **acl) +nfsd4_decode_fattr (struct nfsd4_compoundargs *argp,u32 *bmval,u32 *writable, +struct iattr *iattr,struct nfs4_acl **acl) {int expected_len, len =0 ;u32 dummy32;
@@ -271,7 +276,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia*/ if ((bmval[0 ] & ~NFSD_SUPPORTED_ATTRS_WORD0 ) || (bmval[1 ] & ~NFSD_SUPPORTED_ATTRS_WORD1 ))return nfserr_attrnotsupp; -if ((bmval[0 ] & ~NFSD_WRITEABLE_ATTRS_WORD0 ) || (bmval[1 ] & ~NFSD_WRITEABLE_ATTRS_WORD1 )) +if ((bmval[0 ] & ~writable[0 ]) || (bmval[1 ] & ~writable[1 ]))return nfserr_inval;READ_BUF (4 );
@@ -499,7 +504,9 @@ nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *createif ((status =check_filename (create->cr_name, create->cr_namelen, nfserr_inval)))return status; -if ((status =nfsd4_decode_fattr (argp, create->cr_bmval, &create->cr_iattr, &create->cr_acl))) + status =nfsd4_decode_fattr (argp, create->cr_bmval, nfsd_attrmask, + &create->cr_iattr, &create->cr_acl); +if (status) goto out;DECODE_TAIL ;
@@ -660,7 +667,9 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)switch (open->op_createmode) {case NFS4_CREATE_UNCHECKED :case NFS4_CREATE_GUARDED : -if ((status =nfsd4_decode_fattr (argp, open->op_bmval, &open->op_iattr, &open->op_acl))) + status =nfsd4_decode_fattr (argp, open->op_bmval, + nfsd_attrmask, &open->op_iattr, &open->op_acl); +if (status) goto out;break ;case NFS4_CREATE_EXCLUSIVE :
@@ -859,7 +868,7 @@ nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *seta status =nfsd4_decode_stateid (argp, &setattr->sa_stateid);if (status)return status; -return nfsd4_decode_fattr (argp, setattr->sa_bmval, +return nfsd4_decode_fattr (argp, setattr->sa_bmval, nfsd_attrmask, &setattr->sa_iattr, &setattr->sa_acl); }
Signature · 1 line
1.6.2.1
PATCH v2 44/47 nfsd41: support for 3-word long attribute bitmask
In reply to Benny HalevyFrom: Andy Adamson <[email protected]>
Also, use client minorversion to generate supported attrs
--- fs/nfsd/nfs4proc.c | 15 +++++++---- fs/nfsd/nfs4xdr.c | 59 +++++++++++++++++++++++++++++++++++--------- include/linux/nfsd/nfsd.h | 48 +++++++++++++++++++++++++++++++++++- include/linux/nfsd/xdr4.h | 12 ++++---- 4 files changed, 108 insertions(+), 26 deletions(-)
fs/nfsd/nfs4proc.c +9 -6
@@ -460,8 +460,9 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (getattr->ga_bmval[1 ] &NFSD_WRITEONLY_ATTRS_WORD1 )return nfserr_inval; - getattr->ga_bmval[0 ] &=NFSD_SUPPORTED_ATTRS_WORD0 ; - getattr->ga_bmval[1 ] &=NFSD_SUPPORTED_ATTRS_WORD1 ; + getattr->ga_bmval[0 ] &=nfsd_suppattrs0 (cstate->minorversion); + getattr->ga_bmval[1 ] &=nfsd_suppattrs1 (cstate->minorversion); + getattr->ga_bmval[2 ] &=nfsd_suppattrs2 (cstate->minorversion); getattr->ga_fhp = &cstate->current_fh;return nfs_ok;
@@ -556,8 +557,9 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (readdir->rd_bmval[1 ] &NFSD_WRITEONLY_ATTRS_WORD1 )return nfserr_inval; - readdir->rd_bmval[0 ] &=NFSD_SUPPORTED_ATTRS_WORD0 ; - readdir->rd_bmval[1 ] &=NFSD_SUPPORTED_ATTRS_WORD1 ; + readdir->rd_bmval[0 ] &=nfsd_suppattrs0 (cstate->minorversion); + readdir->rd_bmval[1 ] &=nfsd_suppattrs1 (cstate->minorversion); + readdir->rd_bmval[2 ] &=nfsd_suppattrs2 (cstate->minorversion);if ((cookie > ~(u32 )0 ) || (cookie ==1 ) || (cookie ==2 ) || (cookie ==0 &&memcmp (readdir->rd_verf.data, zeroverf.data,NFS4_VERIFIER_SIZE )))
@@ -754,8 +756,9 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (status)return status; -if ((verify->ve_bmval[0 ] & ~NFSD_SUPPORTED_ATTRS_WORD0 ) - || (verify->ve_bmval[1 ] & ~NFSD_SUPPORTED_ATTRS_WORD1 )) +if ((verify->ve_bmval[0 ] & ~nfsd_suppattrs0 (cstate->minorversion)) + || (verify->ve_bmval[1 ] & ~nfsd_suppattrs1 (cstate->minorversion)) + || (verify->ve_bmval[2 ] & ~nfsd_suppattrs2 (cstate->minorversion)))return nfserr_attrnotsupp;if ((verify->ve_bmval[0 ] &FATTR4_WORD0_RDATTR_ERROR ) || (verify->ve_bmval[1 ] &NFSD_WRITEONLY_ATTRS_WORD1 ))
fs/nfsd/nfs4xdr.c +47 -12
127 lines not on this page · raw message
include/linux/nfsd/nfsd.h +46 -2
77 lines not on this page · raw message
include/linux/nfsd/xdr4.h +6 -6
@@ -101,7 +101,7 @@ struct nfsd4_create {u32 specdata2; } dev;/* NF4BLK, NF4CHR */ } u; -u32 cr_bmval[2 ];/* request */ +u32 cr_bmval[3 ];/* request */ struct iattr cr_iattr;/* request */ struct nfsd4_change_info cr_cinfo;/* response */ struct nfs4_acl *cr_acl;
@@ -116,7 +116,7 @@ struct nfsd4_delegreturn { };struct nfsd4_getattr { -u32 ga_bmval[2 ];/* request */ +u32 ga_bmval[3 ];/* request */ struct svc_fh *ga_fhp;/* response */ };
@@ -217,7 +217,7 @@ struct nfsd4_open {stateid_t op_delegate_stateid;/* request - response */ u32 op_create;/* request */ u32 op_createmode;/* request */ -u32 op_bmval[2 ];/* request */ +u32 op_bmval[3 ];/* request */ union {/* request */ struct iattr iattr;/* UNCHECKED4,GUARDED4 */ nfs4_verifier verf;/* EXCLUSIVE4 */
@@ -270,7 +270,7 @@ struct nfsd4_readdir {nfs4_verifier rd_verf;/* request */ u32 rd_dircount;/* request */ u32 rd_maxcount;/* request */ -u32 rd_bmval[2 ];/* request */ +u32 rd_bmval[3 ];/* request */ struct svc_rqst *rd_rqstp;/* response */ struct svc_fh * rd_fhp;/* response */
@@ -312,7 +312,7 @@ struct nfsd4_secinfo {struct nfsd4_setattr {stateid_t sa_stateid;/* request */ -u32 sa_bmval[2 ];/* request */ +u32 sa_bmval[3 ];/* request */ struct iattr sa_iattr;/* request */ struct nfs4_acl *sa_acl; };
@@ -338,7 +338,7 @@ struct nfsd4_setclientid_confirm {/* also used for NVERIFY */ struct nfsd4_verify { -u32 ve_bmval[2 ];/* request */ +u32 ve_bmval[3 ];/* request */ u32 ve_attrlen;/* request */ char * ve_attrval;/* request */ };
Signature · 1 line
1.6.2.1
PATCH v2 45/47 nfsd41: SUPPATTR_EXCLCREAT attribute
In reply to Benny HalevyReturn bitmask for supported EXCLUSIVE4_1 create attributes.
--- fs/nfsd/nfs4xdr.c | 7 ++++++- include/linux/nfs4.h | 2 ++ include/linux/nfsd/nfsd.h | 14 +++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-)
fs/nfsd/nfs4xdr.c +6 -1
@@ -2154,7 +2154,12 @@ out_acl: }WRITE64 (stat.ino); } -BUG_ON (bmval2);/* FIXME: not implemented yet */ +if (bmval2 &FATTR4_WORD2_SUPPATTR_EXCLCREAT ) { +WRITE32 (3 ); +WRITE32 (NFSD_SUPPATTR_EXCLCREAT_WORD0 ); +WRITE32 (NFSD_SUPPATTR_EXCLCREAT_WORD1 ); +WRITE32 (NFSD_SUPPATTR_EXCLCREAT_WORD2 ); + } *attrlenp =htonl ((char *)p - (char *)attrlenp -4 ); *countp = p - buffer;
include/linux/nfs4.h +2 -0
@@ -404,6 +404,8 @@ enum lock_type4 {#define FATTR4_WORD0_UNIQUE_HANDLES (1UL << 9)#define FATTR4_WORD0_LEASE_TIME (1UL << 10)#define FATTR4_WORD0_RDATTR_ERROR (1UL << 11) +/* Mandatory in NFSv4.1 */ +#define FATTR4_WORD2_SUPPATTR_EXCLCREAT (1UL << 11)/* Recommended Attributes */ #define FATTR4_WORD0_ACL (1UL << 12)
include/linux/nfsd/nfsd.h +13 -1
@@ -374,7 +374,7 @@ extern struct timeval nfssvc_boot; NFSD4_SUPPORTED_ATTRS_WORD1#define NFSD4_1_SUPPORTED_ATTRS_WORD2 \ - NFSD4_SUPPORTED_ATTRS_WORD2 + (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)#if defined(CONFIG_NFSD_V4_1 )
@@ -427,6 +427,18 @@ static inline u32 nfsd_suppattrs2(u32 minorversion) | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)#define NFSD_WRITEABLE_ATTRS_WORD2 0 +#define NFSD_SUPPATTR_EXCLCREAT_WORD0 \ + NFSD_WRITEABLE_ATTRS_WORD0 +/* +* we currently store the exclusive create verifier in the v_{a,m}time +* attributes so the client can't set these at create time using EXCLUSIVE4_1 +*/ +#define NFSD_SUPPATTR_EXCLCREAT_WORD1 \ + (NFSD_WRITEABLE_ATTRS_WORD1 & \ + ~(FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)) +#define NFSD_SUPPATTR_EXCLCREAT_WORD2 \ + NFSD_WRITEABLE_ATTRS_WORD2 +#endif /* CONFIG_NFSD_V4 */ #endif /* LINUX_NFSD_NFSD_H */
Signature · 1 line
1.6.2.1
PATCH v2 46/47 nfsd41: CREATE_EXCLUSIVE4_1
In reply to Benny HalevyImplement the CREATE_EXCLUSIVE4_1 open mode conforming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26
This mode allows the client to atomically create a file if it doesn't exist while setting some of its attributes.
It must be implemented if the server supports persistent reply cache and/or pnfs.
--- fs/nfsd/nfs4proc.c | 15 +++++++++++++++ fs/nfsd/nfs4xdr.c | 17 +++++++++++++++++ include/linux/nfs4.h | 8 +++++++- include/linux/nfsd/xdr4.h | 10 ++++------ 4 files changed, 43 insertions(+), 7 deletions(-)
fs/nfsd/nfs4proc.c +15 -0
@@ -93,6 +93,21 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o open->op_truncate =0 ;if (open->op_create) { +/* FIXME: check session persistence and pnfs flags. +* The nfsv4.1 spec requires the following semantics: +* +* Persistent | pNFS | Server REQUIRED | Client Allowed +* Reply Cache | server | | +* -------------+--------+-----------------+-------------------- +* no | no | EXCLUSIVE4_1 | EXCLUSIVE4_1 +* | | | (SHOULD) +* | | and EXCLUSIVE4 | or EXCLUSIVE4 +* | | | (SHOULD NOT) +* no | yes | EXCLUSIVE4_1 | EXCLUSIVE4_1 +* yes | no | GUARDED4 | GUARDED4 +* yes | yes | GUARDED4 | GUARDED4 +*/ +/* * Note: create modes (UNCHECKED,GUARDED...) are the same * in NFSv4 as in v3.
fs/nfsd/nfs4xdr.c +17 -0
@@ -260,6 +260,12 @@ static u32 nfsd_attrmask[] = { NFSD_WRITEABLE_ATTRS_WORD2 }; +static u32 nfsd41_ex_attrmask[] = { +NFSD_SUPPATTR_EXCLCREAT_WORD0 , +NFSD_SUPPATTR_EXCLCREAT_WORD1 , +NFSD_SUPPATTR_EXCLCREAT_WORD2 +}; +static __be32 nfsd4_decode_fattr (struct nfsd4_compoundargs *argp,u32 *bmval,u32 *writable,struct iattr *iattr,struct nfs4_acl **acl)
@@ -684,6 +690,17 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)READ_BUF (8 );COPYMEM (open->op_verf.data,8 );break ; +case NFS4_CREATE_EXCLUSIVE4_1 : +if (argp->minorversion <1 ) + goto xdr_error; +READ_BUF (8 ); +COPYMEM (open->op_verf.data,8 ); + status =nfsd4_decode_fattr (argp, open->op_bmval, + nfsd41_ex_attrmask, &open->op_iattr, + &open->op_acl); +if (status) + goto out; +break ;default : goto xdr_error; }
include/linux/nfs4.h +7 -1
@@ -368,7 +368,13 @@ enum opentype4 {enum createmode4 {NFS4_CREATE_UNCHECKED =0 ,NFS4_CREATE_GUARDED =1 , -NFS4_CREATE_EXCLUSIVE =2 +NFS4_CREATE_EXCLUSIVE =2 , +/* +* New to NFSv4.1. If session is persistent, +* GUARDED4 MUST be used. Otherwise, use +* EXCLUSIVE4_1 instead of EXCLUSIVE4. +*/ +NFS4_CREATE_EXCLUSIVE4_1 =3 };enum limit_by4 {
include/linux/nfsd/xdr4.h +4 -6
@@ -218,10 +218,8 @@ struct nfsd4_open {u32 op_create;/* request */ u32 op_createmode;/* request */ u32 op_bmval[3 ];/* request */ -union {/* request */ -struct iattr iattr;/* UNCHECKED4,GUARDED4 */ -nfs4_verifier verf;/* EXCLUSIVE4 */ - } u; +struct iattr iattr;/* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */ +nfs4_verifier verf;/* EXCLUSIVE4 */ clientid_t op_clientid;/* request */ struct xdr_netobj op_owner;/* request */ u32 op_seqid;/* request */
@@ -235,8 +233,8 @@ struct nfsd4_open {struct nfs4_stateowner *op_stateowner;/* used during processing */ struct nfs4_acl *op_acl; }; -#define op_iattr u.iattr -#define op_verf u.verf +#define op_iattr iattr +#define op_verf verfstruct nfsd4_open_confirm {stateid_t oc_req_stateid/* request */ ;
Signature · 1 line
1.6.2.1
PATCH v2 47/47 nfsd41: Documentation/filesystems/nfs41-server.txt
In reply to Benny HalevyInitial nfs41 server write up describing the status of the linux server implementation.
--- Documentation/filesystems/nfs41-server.txt | 148 ++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/nfs41-server.txt
Documentation/filesystems/nfs41-server.txt new file +148 -0
@@ -0,0 +1,148 @@ +NFSv4.1 Server Implementation + +The NFSv4 minorversion 1 (NFSv4.1) implementation in nfsd is based +on the latest NFSv4.1 Internet Draft: +http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-29 + +If you're a developer or just eager to test the code, set +CONFIG_NFSD_V4_1 to 'y' in your kernel configuration file. +This will allow the server to serve both NFSv4 and NFSv4.1 +clients concurrently. + +From the many new features in NFSv4.1 the current implementation +focuses on the mandatory-to-implement NFSv4.1 Sessions, providing +"exactly once" semantics and better control and throttling of the +resources allocated for each client. + +Other NFSv4.1 features, Parallel NFS operations in particular, +are still under development out of tree. +See http://wiki.linux-nfs.org/wiki/index.php/PNFS_prototype_design +for more information. + +The table below, taken from the NFSv4.1 document, lists +the operations that are mandatory to implement (REQ), optional +(OPT), and NFSv4.0 operations that are required not to implement (MNI) +in minor version 1. The first column indicates the operations that +are not supported yet by the linux server implementation. + +The OPTIONAL features identified and their abbreviations are as follows: + pNFS Parallel NFS + FDELG File Delegations + DDELG Directory Delegations + +The following abbreviations indicate the linux server implementation status. + I Implemented NFSv4.1 operations. + NS Not Supported. + NS* unimplemented optional feature. + P pNFS features implemented out of tree. + PNS pNFS features that are not supported yet (out of tree). + +Operations + + +----------------------+------------+--------------+----------------+ + | Operation | REQ, REC, | Feature | Definition | + | | OPT, or | (REQ, REC, | | + | | MNI | or OPT) | | + +----------------------+------------+--------------+----------------+ + | ACCESS | REQ | | Section 18.1 | +NS | BACKCHANNEL_CTL | REQ | | Section 18.33 | +NS | BIND_CONN_TO_SESSION | REQ | | Section 18.34 | + | CLOSE | REQ | | Section 18.2 | + | COMMIT | REQ | | Section 18.3 | + | CREATE | REQ | | Section 18.4 | +I | CREATE_SESSION | REQ | | Section 18.36 | +NS*| DELEGPURGE | OPT | FDELG (REQ) | Section 18.5 | + | DELEGRETURN | OPT | FDELG, | Section 18.6 | + | | | DDELG, pNFS | | + | | | (REQ) | | +NS | DESTROY_CLIENTID | REQ | | Section 18.50 | +I | DESTROY_SESSION | REQ | | Section 18.37 | +I | EXCHANGE_ID | REQ | | Section 18.35 | +NS | FREE_STATEID | REQ | | Section 18.38 | + | GETATTR | REQ | | Section 18.7 | +P | GETDEVICEINFO | OPT | pNFS (REQ) | Section 18.40 | +P | GETDEVICELIST | OPT | pNFS (OPT) | Section 18.41 | + | GETFH | REQ | | Section 18.8 | +NS*| GET_DIR_DELEGATION | OPT | DDELG (REQ) | Section 18.39 | +P | LAYOUTCOMMIT | OPT | pNFS (REQ) | Section 18.42 | +P | LAYOUTGET | OPT | pNFS (REQ) | Section 18.43 | +P | LAYOUTRETURN | OPT | pNFS (REQ) | Section 18.44 | + | LINK | OPT | | Section 18.9 | + | LOCK | REQ | | Section 18.10 | + | LOCKT | REQ | | Section 18.11 | + | LOCKU | REQ | | Section 18.12 | + | LOOKUP | REQ | | Section 18.13 | + | LOOKUPP | REQ | | Section 18.14 | + | NVERIFY | REQ | | Section 18.15 | + | OPEN | REQ | | Section 18.16 | +NS*| OPENATTR | OPT | | Section 18.17 | + | OPEN_CONFIRM | MNI | | N/A | + | OPEN_DOWNGRADE | REQ | | Section 18.18 | + | PUTFH | REQ | | Section 18.19 | + | PUTPUBFH | REQ | | Section 18.20 | + | PUTROOTFH | REQ | | Section 18.21 | + | READ | REQ | | Section 18.22 | + | READDIR | REQ | | Section 18.23 | + | READLINK | OPT | | Section 18.24 | +NS | RECLAIM_COMPLETE | REQ | | Section 18.51 | + | RELEASE_LOCKOWNER | MNI | | N/A | + | REMOVE | REQ | | Section 18.25 | + | RENAME | REQ | | Section 18.26 | + | RENEW | MNI | | N/A | + | RESTOREFH | REQ | | Section 18.27 | + | SAVEFH | REQ | | Section 18.28 | + | SECINFO | REQ | | Section 18.29 | +NS | SECINFO_NO_NAME | REC | pNFS files | Section 18.45, | + | | | layout (REQ) | Section 13.12 | +I | SEQUENCE | REQ | | Section 18.46 | + | SETATTR | REQ | | Section 18.30 | + | SETCLIENTID | MNI | | N/A | + | SETCLIENTID_CONFIRM | MNI | | N/A | +NS | SET_SSV | REQ | | Section 18.47 | +NS | TEST_STATEID | REQ | | Section 18.48 | + | VERIFY | REQ | | Section 18.31 | +NS*| WANT_DELEGATION | OPT | FDELG (OPT) | Section 18.49 | + | WRITE | REQ | | Section 18.32 | + +Callback Operations + + +-------------------------+-----------+-------------+---------------+ + | Operation | REQ, REC, | Feature | Definition | + | | OPT, or | (REQ, REC, | | + | | MNI | or OPT) | | + +-------------------------+-----------+-------------+---------------+ + | CB_GETATTR | OPT | FDELG (REQ) | Section 20.1 | +P | CB_LAYOUTRECALL | OPT | pNFS (REQ) | Section 20.3 | +NS*| CB_NOTIFY | OPT | DDELG (REQ) | Section 20.4 | +P | CB_NOTIFY_DEVICEID | OPT | pNFS (OPT) | Section 20.12 | +NS*| CB_NOTIFY_LOCK | OPT | | Section 20.11 | +NS*| CB_PUSH_DELEG | OPT | FDELG (OPT) | Section 20.5 | + | CB_RECALL | OPT | FDELG, | Section 20.2 | + | | | DDELG, pNFS | | + | | | (REQ) | | +NS*| CB_RECALL_ANY | OPT | FDELG, | Section 20.6 | + | | | DDELG, pNFS | | + | | | (REQ) | | +NS | CB_RECALL_SLOT | REQ | | Section 20.8 | +NS*| CB_RECALLABLE_OBJ_AVAIL | OPT | DDELG, pNFS | Section 20.7 | + | | | (REQ) | | +I | CB_SEQUENCE | OPT | FDELG, | Section 20.9 | + | | | DDELG, pNFS | | + | | | (REQ) | | +NS*| CB_WANTS_CANCELLED | OPT | FDELG, | Section 20.10 | + | | | DDELG, pNFS | | + | | | (REQ) | | + +-------------------------+-----------+-------------+---------------+ + +Implementation notes: + +EXCHANGE_ID: +* only SP4_NONE state protection supported +* implementation ids are ignored + +CREATE_SESSION: +* backchannel attributes are ignored +* backchannel security parameters are ignored + +SEQUENCE: +* no support for dynamic slot table renegotiation (optional)
Signature · 1 line
1.6.2.1
Quoted 11 lines · Benny Halevy
Quoted 10 lines · J. Bruce Fields
Quoted 8 lines · Benny Halevy
Hi Bruce,
Here's the latest server patches implementing the NFSv4.1 Sessions features.
This patchset is based over your for-2.6.30 branch and is also available from
git://linux-nfs.org/~bhalevy/linux-pnfs.gitnfsd41-for-2.6.30
Quoted 8 lines
Quoted 6 lines
There's a few merge conflicts with my current for-2.6.30--probably my fault for not pushing that out recently enough, apologies. Would you mind updating?
--b.
Sure. Here's a rebased version with two minor changes (see below)
Got it, thanks! Reading....
--b.
Quoted 11 lines · Benny Halevy
Quoted 10 lines · J. Bruce Fields
Quoted 8 lines · Benny Halevy
Hi Bruce,
Here's the latest server patches implementing the NFSv4.1 Sessions features.
This patchset is based over your for-2.6.30 branch and is also available from
git://linux-nfs.org/~bhalevy/linux-pnfs.gitnfsd41-for-2.6.30
Quoted 8 lines
Quoted 6 lines
There's a few merge conflicts with my current for-2.6.30--probably my fault for not pushing that out recently enough, apologies. Would you mind updating?
--b.
Sure. Here's a rebased version with two minor changes (see below)
On the latest version of nfsd41-for-2.6.30 (a564667..) I'm getting a new NULL dereference in the callback code. Looks like it probably happened while running connectathon over NFSv4.0 with krb5p. That's all I've figured out so far.
--b.
BUG: unable to handle kernel NULL pointer dereference at (null) IP: [<c03e4e1e>] nfs4_xdr_dec_cb_recall+0x4e/0x200 *pde = 00000000 Oops: 0000 [#1] PREEMPT last sysfs file: /sys/kernel/uevent_seqnum Modules linked in:
Pid: 3949, comm: nfs4_cb_recall Not tainted (2.6.29-rc8-00312-ga564667 #39)
EIP: 0060:[<c03e4e1e>] EFLAGS: 00010286 CPU: 0
EIP is at nfs4_xdr_dec_cb_recall+0x4e/0x200
EAX: c7bb22a0 EBX: c7bb2298 ECX: c7bb22a0 EDX: c7bb22a4
ESI: 00000000 EDI: c66e3000 EBP: c5281ea4 ESP: c5281e6c
DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
Process nfs4_cb_recall (pid: 3949, ti=c5280000 task=c66a6b60 task.ti=c5280000)
Stack: c66a6b60 00000000 c5281eb4 c086cab4 c0aa0380 00000001 c11bd4a4 c7bb22a4 c66e302c c7bb22ac c66e302c 00000000 c6cf14e8 c66e3000 c5281ecc c08199c3 c0819aae 00000000 c5281ee8 c5281ef0 c03e4dd0 c6cf14e8 c7bb2298 c03e4dd0 Call Trace: [<c086cab4>] ? schedule+0x354/0x540 [<c08199c3>] ? rpcauth_unwrap_resp+0x63/0x90 [<c0819aae>] ? rpcauth_checkverf+0x2e/0x70 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c08122ce>] ? call_decode+0x1ae/0x820 [<c086d125>] ? out_of_line_wait_on_bit+0x65/0x80 [<c0818720>] ? rpc_wait_bit_killable+0x0/0x40 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c0818e62>] ? __rpc_execute+0x92/0x290 [<c086f4fc>] ? _spin_unlock+0x2c/0x50 [<c08186c7>] ? rpc_set_active+0x67/0x80 [<c081907e>] ? rpc_execute+0x1e/0x30 [<c08129e5>] ? rpc_run_task+0x35/0x70 [<c0812b40>] ? rpc_call_sync+0x40/0x70 [<c03e51e0>] ? nfsd4_cb_recall+0x70/0x130 [<c086cab4>] ? schedule+0x354/0x540 [<c0247d1b>] ? trace_hardirqs_on+0xb/0x10 [<c03dfd40>] ? do_recall+0x0/0x20 [<c03dfd54>] ? do_recall+0x14/0x20 [<c023941f>] ? kthread+0x3f/0x70 [<c02393e0>] ? kthread+0x0/0x70 [<c0203b67>] ? kernel_thread_helper+0x7/0x10 Code: 43 00 ba 08 00 00 00 8d 45 e4 e8 0e c1 43 00 85 c0 74 3a 8b 50 04 8d 45 e4 0f ca 83 c2 04 e8 fa c0 43 00 85 c0 0f 84 8a 00 00 00 <8b> 06 8b 00 85 c0 75 32 ba 04 00 00 00 8d 45 e4 e8 cd fe ff ff EIP: [<c03e4e1e>] nfs4_xdr_dec_cb_recall+0x4e/0x200 SS:ESP 0068:c5281e6c ---[ end trace 2724475d9856cb6c ]---
Quoted 19 lines · bfields
Quoted 18 lines · Benny Halevy
Quoted 16 lines · J. Bruce Fields
Quoted 8 lines · Benny Halevy
Hi Bruce,
Here's the latest server patches implementing the NFSv4.1 Sessions features.
This patchset is based over your for-2.6.30 branch and is also available from
git://linux-nfs.org/~bhalevy/linux-pnfs.gitnfsd41-for-2.6.30There's a few merge conflicts with my current for-2.6.30--probably my fault for not pushing that out recently enough, apologies. Would you mind updating?
--b.
Quoted 6 lines
Quoted 1 line
Sure. Here's a rebased version with two minor changes (see below)
On the latest version of nfsd41-for-2.6.30 (a564667..) I'm getting a new NULL dereference in the callback code. Looks like it probably happened while running connectathon over NFSv4.0 with krb5p. That's all I've figured out so far.
Nevermind about the krb5p, that can't be right. Perhaps cbs_minorversion just isn't getting set correctly, and it's trying to access an uninitialized cbs_clp?
--b.
Quoted 49 lines
--b.
BUG: unable to handle kernel NULL pointer dereference at (null) IP: [<c03e4e1e>] nfs4_xdr_dec_cb_recall+0x4e/0x200 *pde = 00000000 Oops: 0000 [#1] PREEMPT last sysfs file: /sys/kernel/uevent_seqnum Modules linked in:Pid: 3949, comm:
nfs4_cb_recallNot tainted (2.6.29-rc8-00312-ga564667 #39)
EIP: 0060:[<c03e4e1e>] EFLAGS: 00010286 CPU: 0
EIP is atnfs4_xdr_dec_cb_recall+0x4e/0x200
EAX:c7bb22a0EBX:c7bb2298ECX:c7bb22a0EDX:c7bb22a4
ESI: 00000000 EDI:c66e3000EBP:c5281ea4ESP:c5281e6c
DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
Processnfs4_cb_recall(pid: 3949, ti=c5280000 task=c66a6b60 task.ti=c5280000)Stack: c66a6b60 00000000 c5281eb4 c086cab4 c0aa0380 00000001 c11bd4a4 c7bb22a4 c66e302c c7bb22ac c66e302c 00000000 c6cf14e8 c66e3000 c5281ecc c08199c3 c0819aae 00000000 c5281ee8 c5281ef0 c03e4dd0 c6cf14e8 c7bb2298 c03e4dd0 Call Trace: [<c086cab4>] ? schedule+0x354/0x540 [<c08199c3>] ? rpcauth_unwrap_resp+0x63/0x90 [<c0819aae>] ? rpcauth_checkverf+0x2e/0x70 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c08122ce>] ? call_decode+0x1ae/0x820 [<c086d125>] ? out_of_line_wait_on_bit+0x65/0x80 [<c0818720>] ? rpc_wait_bit_killable+0x0/0x40 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c0818e62>] ? __rpc_execute+0x92/0x290 [<c086f4fc>] ? _spin_unlock+0x2c/0x50 [<c08186c7>] ? rpc_set_active+0x67/0x80 [<c081907e>] ? rpc_execute+0x1e/0x30 [<c08129e5>] ? rpc_run_task+0x35/0x70 [<c0812b40>] ? rpc_call_sync+0x40/0x70 [<c03e51e0>] ? nfsd4_cb_recall+0x70/0x130 [<c086cab4>] ? schedule+0x354/0x540 [<c0247d1b>] ? trace_hardirqs_on+0xb/0x10 [<c03dfd40>] ? do_recall+0x0/0x20 [<c03dfd54>] ? do_recall+0x14/0x20 [<c023941f>] ? kthread+0x3f/0x70 [<c02393e0>] ? kthread+0x0/0x70 [<c0203b67>] ? kernel_thread_helper+0x7/0x10 Code: 43 00 ba 08 00 00 00 8d 45 e4 e8 0e c1 43 00 85 c0 74 3a 8b 50 04 8d 45 e4 0f ca 83 c2 04 e8 fa c0 43 00 85 c0 0f 84 8a 00 00 00 <8b> 06 8b 00 85 c0 75 32 ba 04 00 00 00 8d 45 e4 e8 cd fe ff ff EIP: [<c03e4e1e>] nfs4_xdr_dec_cb_recall+0x4e/0x200 SS:ESP 0068:c5281e6c ---[ end trace 2724475d9856cb6c ]---
Quoted 15 lines · J. Bruce Fields
Quoted 14 lines · Benny Halevy
Quoted 13 lines · J. Bruce Fields
Quoted 8 lines · Benny Halevy
Hi Bruce,
Here's the latest server patches implementing the NFSv4.1 Sessions features.
This patchset is based over your for-2.6.30 branch and is also available from
git://linux-nfs.org/~bhalevy/linux-pnfs.gitnfsd41-for-2.6.30There's a few merge conflicts with my current for-2.6.30--probably my fault for not pushing that out recently enough, apologies. Would you mind updating?
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
--b.
Sure. Here's a rebased version with two minor changes (see below)
On the latest version of nfsd41-for-2.6.30 (a564667..) I'm getting a new NULL dereference in the callback code. Looks like it probably happened while running connectathon over NFSv4.0 with krb5p. That's all I've figured out so
Weird. nfs4_xdr_dec_cb_recall+0x4e doesn't seem like a valid IP for nfsd.ko @a564667. Bruce, can you please send me you .config file?
We know the current implementation is still incorrect for krb5, but I don't think it's supposed to crash either. Ricardo, have you run into this by any chance?
Benny
Quoted 50 lines
far.
--b.
BUG: unable to handle kernel NULL pointer dereference at (null) IP: [<c03e4e1e>] nfs4_xdr_dec_cb_recall+0x4e/0x200 *pde = 00000000 Oops: 0000 [#1] PREEMPT last sysfs file: /sys/kernel/uevent_seqnum Modules linked in:Pid: 3949, comm:
nfs4_cb_recallNot tainted (2.6.29-rc8-00312-ga564667 #39)
EIP: 0060:[<c03e4e1e>] EFLAGS: 00010286 CPU: 0
EIP is atnfs4_xdr_dec_cb_recall+0x4e/0x200
EAX:c7bb22a0EBX:c7bb2298ECX:c7bb22a0EDX:c7bb22a4
ESI: 00000000 EDI:c66e3000EBP:c5281ea4ESP:c5281e6c
DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
Processnfs4_cb_recall(pid: 3949, ti=c5280000 task=c66a6b60 task.ti=c5280000)Stack: c66a6b60 00000000 c5281eb4 c086cab4 c0aa0380 00000001 c11bd4a4 c7bb22a4 c66e302c c7bb22ac c66e302c 00000000 c6cf14e8 c66e3000 c5281ecc c08199c3 c0819aae 00000000 c5281ee8 c5281ef0 c03e4dd0 c6cf14e8 c7bb2298 c03e4dd0 Call Trace: [<c086cab4>] ? schedule+0x354/0x540 [<c08199c3>] ? rpcauth_unwrap_resp+0x63/0x90 [<c0819aae>] ? rpcauth_checkverf+0x2e/0x70 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c08122ce>] ? call_decode+0x1ae/0x820 [<c086d125>] ? out_of_line_wait_on_bit+0x65/0x80 [<c0818720>] ? rpc_wait_bit_killable+0x0/0x40 [<c03e4dd0>] ? nfs4_xdr_dec_cb_recall+0x0/0x200 [<c0818e62>] ? __rpc_execute+0x92/0x290 [<c086f4fc>] ? _spin_unlock+0x2c/0x50 [<c08186c7>] ? rpc_set_active+0x67/0x80 [<c081907e>] ? rpc_execute+0x1e/0x30 [<c08129e5>] ? rpc_run_task+0x35/0x70 [<c0812b40>] ? rpc_call_sync+0x40/0x70 [<c03e51e0>] ? nfsd4_cb_recall+0x70/0x130 [<c086cab4>] ? schedule+0x354/0x540 [<c0247d1b>] ? trace_hardirqs_on+0xb/0x10 [<c03dfd40>] ? do_recall+0x0/0x20 [<c03dfd54>] ? do_recall+0x14/0x20 [<c023941f>] ? kthread+0x3f/0x70 [<c02393e0>] ? kthread+0x0/0x70 [<c0203b67>] ? kernel_thread_helper+0x7/0x10 Code: 43 00 ba 08 00 00 00 8d 45 e4 e8 0e c1 43 00 85 c0 74 3a 8b 50 04 8d 45 e4 0f ca 83 c2 04 e8 fa c0 43 00 85 c0 0f 84 8a 00 00 00 <8b> 06 8b 00 85 c0 75 32 ba 04 00 00 00 8d 45 e4 e8 cd fe ff ff EIP: [<c03e4e1e>] nfs4_xdr_dec_cb_recall+0x4e/0x200 SS:ESP 0068:c5281e6c ---[ end trace 2724475d9856cb6c ]---
Quoted 19 lines · Benny Halevy
Quoted 17 lines · J. Bruce Fields
Quoted 16 lines · Benny Halevy
Quoted 15 lines · J. Bruce Fields
Quoted 8 lines · Benny Halevy
Hi Bruce,
Here's the latest server patches implementing the NFSv4.1 Sessions features.
This patchset is based over your for-2.6.30 branch and is also available from
git://linux-nfs.org/~bhalevy/linux-pnfs.gitnfsd41-for-2.6.30There's a few merge conflicts with my current for-2.6.30--probably my fault for not pushing that out recently enough, apologies. Would you mind updating?
--b.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Sure. Here's a rebased version with two minor changes (see below)
On the latest version of nfsd41-for-2.6.30 (a564667..) I'm getting a new NULL dereference in the callback code. Looks like it probably happened while running connectathon over NFSv4.0 with krb5p. That's all I've figured out so
Weird.
nfs4_xdr_dec_cb_recall+0x4edoesn't seem like a valid IP for nfsd.ko @a564667. Bruce, can you please send me you .config file?
I'm building without CONFIG_NFSD_V4_1 for now; .config appended.
Start of my nfs4_xdr_dec_cb_recall, for what it's worth:
c03e4dd0 <nfs4_xdr_dec_cb_recall>:
c03e4dd0: 55 push %ebp c03e4dd1: 89 e5 mov %esp,%ebp c03e4dd3: 83 ec 38 sub $0x38,%esp c03e4dd6: 89 5d f4 mov %ebx,-0xc(%ebp) c03e4dd9: 89 75 f8 mov %esi,-0x8(%ebp) c03e4ddc: 89 7d fc mov %edi,-0x4(%ebp) c03e4ddf: e8 8c ed e1 ff call c0203b70 <mcount> c03e4de4: 89 d3 mov %edx,%ebx c03e4de6: 89 ce mov %ecx,%esi c03e4de8: 8d 50 2c lea 0x2c(%eax),%edx c03e4deb: 89 d9 mov %ebx,%ecx c03e4ded: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4df0: e8 eb c0 43 00 call c0820ee0 <xdr_init_decode> c03e4df5: ba 08 00 00 00 mov $0x8,%edx c03e4dfa: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4dfd: e8 0e c1 43 00 call c0820f10 <xdr_inline_decode> c03e4e02: 85 c0 test %eax,%eax c03e4e04: 74 3a je c03e4e40 <nfs4_xdr_dec_cb_recall+0x70> c03e4e06: 8b 50 04 mov 0x4(%eax),%edx c03e4e09: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4e0c: 0f ca bswap %edx c03e4e0e: 83 c2 04 add $0x4,%edx c03e4e11: e8 fa c0 43 00 call c0820f10 <xdr_inline_decode> c03e4e16: 85 c0 test %eax,%eax c03e4e18: 0f 84 8a 00 00 00 je c03e4ea8 <nfs4_xdr_dec_cb_recall+0xd8> --> c03e4e1e: 8b 06 mov (%esi),%eax c03e4e20: 8b 00 mov (%eax),%eax c03e4e22: 85 c0 test %eax,%eax c03e4e24: 75 32 jne c03e4e58 <nfs4_xdr_dec_cb_recall+0x88> c03e4e26: ba 04 00 00 00 mov $0x4,%edx c03e4e2b: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4e2e: e8 cd fe ff ff call c03e4d00 <decode_cb_op_hdr> c03e4e33: 8b 5d f4 mov -0xc(%ebp),%ebx c03e4e36: 8b 75 f8 mov -0x8(%ebp),%esi c03e4e39: 8b 7d fc mov -0x4(%ebp),%edi c03e4e3c: 89 ec mov %ebp,%esp c03e4e3e: 5d pop %ebp c03e4e3f: c3 ret
...
--b.
#
# Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc8
# Mon Mar 30 14:07:10 2009
#
# CONFIG_64BIT is not setCONFIG_X86_32=y
# CONFIG_X86_64 is not setCONFIG_X86=y CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_GENERIC_TIME=yCONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_FAST_CMPXCHG_LOCAL=yCONFIG_MMU=yCONFIG_ZONE_DMA=yCONFIG_GENERIC_ISA_DMA=yCONFIG_GENERIC_IOMAP=yCONFIG_GENERIC_BUG=yCONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y
# CONFIG_GENERIC_TIME_VSYSCALL is not set CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ZONE_DMA32 is not set CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_AUDIT_ARCH is not set CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_X86_BIOS_REBOOT=yCONFIG_KTIME_SCALAR=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# General setup
#CONFIG_EXPERIMENTAL=yCONFIG_BROKEN_ON_SMP=yCONFIG_LOCK_KERNEL=yCONFIG_INIT_ENV_ARG_LIMIT=32CONFIG_LOCALVERSION=""CONFIG_LOCALVERSION_AUTO=yCONFIG_SWAP=yCONFIG_SYSVIPC=yCONFIG_SYSVIPC_SYSCTL=yCONFIG_POSIX_MQUEUE=yCONFIG_BSD_PROCESS_ACCT=yCONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
#
# RCU Subsystem
#CONFIG_CLASSIC_RCU=y
# CONFIG_TREE_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_PREEMPT_RCU_TRACE is not setCONFIG_IKCONFIG=yCONFIG_IKCONFIG_PROC=yCONFIG_LOG_BUF_SHIFT=20CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=yCONFIG_GROUP_SCHED=yCONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not setCONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set
# CONFIG_CGROUPS is not setCONFIG_SYSFS_DEPRECATED=yCONFIG_SYSFS_DEPRECATED_V2=yCONFIG_RELAY=yCONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_IPC_NS is not set
# CONFIG_USER_NS is not set
# CONFIG_PID_NS is not set
# CONFIG_NET_NS is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not setCONFIG_SYSCTL=yCONFIG_ANON_INODES=y
# CONFIG_EMBEDDED is not setCONFIG_UID16=yCONFIG_SYSCTL_SYSCALL=yCONFIG_KALLSYMS=yCONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not setCONFIG_HOTPLUG=yCONFIG_PRINTK=yCONFIG_BUG=yCONFIG_ELF_CORE=yCONFIG_PCSPKR_PLATFORM=yCONFIG_BASE_FULL=yCONFIG_FUTEX=yCONFIG_EPOLL=yCONFIG_SIGNALFD=yCONFIG_TIMERFD=yCONFIG_EVENTFD=yCONFIG_SHMEM=yCONFIG_AIO=yCONFIG_VM_EVENT_COUNTERS=yCONFIG_PCI_QUIRKS=yCONFIG_COMPAT_BRK=yCONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not setCONFIG_PROFILING=yCONFIG_TRACEPOINTS=yCONFIG_MARKERS=yCONFIG_OPROFILE=yCONFIG_HAVE_OPROFILE=yCONFIG_KPROBES=yCONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=yCONFIG_KRETPROBES=yCONFIG_HAVE_IOREMAP_PROT=yCONFIG_HAVE_KPROBES=yCONFIG_HAVE_KRETPROBES=yCONFIG_HAVE_ARCH_TRACEHOOK=yCONFIG_HAVE_GENERIC_DMA_COHERENT=yCONFIG_SLABINFO=yCONFIG_RT_MUTEXES=yCONFIG_BASE_SMALL=0CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not setCONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not setCONFIG_BLOCK=yCONFIG_LBD=y
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
#
# IO Schedulers
#CONFIG_IOSCHED_NOOP=yCONFIG_IOSCHED_AS=yCONFIG_IOSCHED_DEADLINE=yCONFIG_IOSCHED_CFQ=yCONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not setCONFIG_DEFAULT_IOSCHED="anticipatory"CONFIG_FREEZER=y
#
# Processor type and features
#
# CONFIG_NO_HZ is not set
# CONFIG_HIGH_RES_TIMERS is not setCONFIG_GENERIC_CLOCKEVENTS_BUILD=y
# CONFIG_SMP is not setCONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_VSMP is not set
# CONFIG_X86_RDC321X is not setCONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_MEMTEST is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
# CONFIG_M586MMX is not setCONFIG_M686=y
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MEFFICEON is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
# CONFIG_GENERIC_CPU is not set
# CONFIG_X86_GENERIC is not setCONFIG_X86_CPU=yCONFIG_X86_CMPXCHG=yCONFIG_X86_L1_CACHE_SHIFT=5CONFIG_X86_XADD=y
# CONFIG_X86_PPRO_FENCE is not setCONFIG_X86_WP_WORKS_OK=yCONFIG_X86_INVLPG=yCONFIG_X86_BSWAP=yCONFIG_X86_POPAD_OK=yCONFIG_X86_USE_PPRO_CHECKSUM=yCONFIG_X86_TSC=yCONFIG_X86_CMOV=yCONFIG_X86_MINIMUM_CPU_FAMILY=4CONFIG_X86_DEBUGCTLMSR=yCONFIG_CPU_SUP_INTEL=yCONFIG_CPU_SUP_CYRIX_32=yCONFIG_CPU_SUP_AMD=yCONFIG_CPU_SUP_CENTAUR_32=yCONFIG_CPU_SUP_TRANSMETA_32=yCONFIG_CPU_SUP_UMC_32=yCONFIG_X86_DS=yCONFIG_X86_PTRACE_BTS=yCONFIG_HPET_TIMER=yCONFIG_HPET_EMULATE_RTC=yCONFIG_DMI=y
# CONFIG_IOMMU_HELPER is not set
# CONFIG_IOMMU_API is not setCONFIG_NR_CPUS=1
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not setCONFIG_PREEMPT=y
# CONFIG_X86_UP_APIC is not setCONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not setCONFIG_VM86=y
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set
# CONFIG_NOHIGHMEM is not setCONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not setCONFIG_PAGE_OFFSET=0xC0000000CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not setCONFIG_NEED_NODE_MEMMAP_SIZE=yCONFIG_ARCH_FLATMEM_ENABLE=yCONFIG_ARCH_SPARSEMEM_ENABLE=yCONFIG_ARCH_SELECT_MEMORY_MODEL=yCONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_FLATMEM_MANUAL is not set
# CONFIG_DISCONTIGMEM_MANUAL is not setCONFIG_SPARSEMEM_MANUAL=yCONFIG_SPARSEMEM=yCONFIG_HAVE_MEMORY_PRESENT=yCONFIG_SPARSEMEM_STATIC=y
# CONFIG_MEMORY_HOTPLUG is not setCONFIG_PAGEFLAGS_EXTENDED=yCONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not setCONFIG_ZONE_DMA_FLAG=1CONFIG_BOUNCE=yCONFIG_VIRT_TO_BUS=yCONFIG_UNEVICTABLE_LRU=y
# CONFIG_HIGHPTE is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not setCONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_MATH_EMULATION is not setCONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
# CONFIG_X86_PAT is not set
# CONFIG_EFI is not setCONFIG_SECCOMP=y
# CONFIG_HZ_100 is not setCONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not setCONFIG_HZ=250
# CONFIG_SCHED_HRTICK is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not setCONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not setCONFIG_PHYSICAL_ALIGN=0x200000CONFIG_COMPAT_VDSO=y
# CONFIG_CMDLINE_BOOL is not setCONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
# Power management and ACPI options
#CONFIG_PM=y
# CONFIG_PM_DEBUG is not setCONFIG_PM_SLEEP=yCONFIG_SUSPEND=yCONFIG_SUSPEND_FREEZER=y
# CONFIG_HIBERNATION is not setCONFIG_ACPI=yCONFIG_ACPI_SLEEP=yCONFIG_ACPI_PROCFS=yCONFIG_ACPI_PROCFS_POWER=yCONFIG_ACPI_SYSFS_POWER=yCONFIG_ACPI_PROC_EVENT=yCONFIG_ACPI_AC=yCONFIG_ACPI_BATTERY=yCONFIG_ACPI_BUTTON=yCONFIG_ACPI_FAN=yCONFIG_ACPI_DOCK=yCONFIG_ACPI_PROCESSOR=yCONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_CUSTOM_DSDT is not setCONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
# CONFIG_ACPI_PCI_SLOT is not setCONFIG_X86_PM_TIMER=y
# CONFIG_ACPI_CONTAINER is not set
# CONFIG_ACPI_SBS is not set
# CONFIG_APM is not set
#
# CPU Frequency scaling
#CONFIG_CPU_FREQ=yCONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
#
# CPUFreq processor drivers
#
# CONFIG_X86_ACPI_CPUFREQ is not set
# CONFIG_X86_POWERNOW_K6 is not set
# CONFIG_X86_POWERNOW_K7 is not set
# CONFIG_X86_POWERNOW_K8 is not set
# CONFIG_X86_GX_SUSPMOD is not setCONFIG_X86_SPEEDSTEP_CENTRINO=yCONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
# CONFIG_X86_SPEEDSTEP_ICH is not set
# CONFIG_X86_SPEEDSTEP_SMI is not set
# CONFIG_X86_P4_CLOCKMOD is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_LONGRUN is not set
# CONFIG_X86_LONGHAUL is not set
# CONFIG_X86_E_POWERSAVER is not set
#
# shared options # # CONFIG_X86_SPEEDSTEP_LIB is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y
#
# Bus options (PCI etc.)
#CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOOLPC is not setCONFIG_PCI_GOANY=yCONFIG_PCI_BIOS=yCONFIG_PCI_DIRECT=yCONFIG_PCI_MMCONFIG=yCONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_ARCH_SUPPORTS_MSI is not setCONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_STUB is not setCONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
# CONFIG_OLPC is not setCONFIG_K8_NB=yCONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not setCONFIG_PCMCIA=yCONFIG_PCMCIA_LOAD_CIS=yCONFIG_PCMCIA_IOCTL=yCONFIG_CARDBUS=y
#
# PC-card bridges
#CONFIG_YENTA=yCONFIG_YENTA_O2=yCONFIG_YENTA_RICOH=yCONFIG_YENTA_TI=yCONFIG_YENTA_ENE_TUNE=yCONFIG_YENTA_TOSHIBA=y
# CONFIG_PD6729 is not set
# CONFIG_I82092 is not setCONFIG_PCCARD_NONSTATIC=yCONFIG_HOTPLUG_PCI=y
# CONFIG_HOTPLUG_PCI_FAKE is not set
# CONFIG_HOTPLUG_PCI_COMPAQ is not set
# CONFIG_HOTPLUG_PCI_ACPI is not set
# CONFIG_HOTPLUG_PCI_CPCI is not setCONFIG_HOTPLUG_PCI_SHPC=y
#
# Executable file formats / Emulations
#CONFIG_BINFMT_ELF=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not setCONFIG_HAVE_AOUT=y
# CONFIG_BINFMT_AOUT is not setCONFIG_BINFMT_MISC=yCONFIG_HAVE_ATOMIC_IOMAP=yCONFIG_NET=y
#
# Networking options
#CONFIG_COMPAT_NET_DEV_OPS=yCONFIG_PACKET=yCONFIG_PACKET_MMAP=yCONFIG_UNIX=yCONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_STATISTICS is not set CONFIG_NET_KEY=y
# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=yCONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set CONFIG_INET_TUNNEL=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set CONFIG_INET_DIAG=yCONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not setCONFIG_IPV6=y
# CONFIG_IPV6_PRIVACY is not set
# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
# CONFIG_INET6_AH is not set
# CONFIG_INET6_ESP is not set
# CONFIG_INET6_IPCOMP is not set
# CONFIG_IPV6_MIP6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set CONFIG_INET6_XFRM_MODE_TRANSPORT=y CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_INET6_XFRM_MODE_BEET=y
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set CONFIG_IPV6_SIT=y CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y
#
# Core Netfilter Configuration
#
# CONFIG_NETFILTER_NETLINK_QUEUE is not set
# CONFIG_NETFILTER_NETLINK_LOG is not set
# CONFIG_NF_CONNTRACK is not setCONFIG_NETFILTER_XTABLES=y
# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
# CONFIG_NETFILTER_XT_TARGET_MARK is not set
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
# CONFIG_NETFILTER_XT_MATCH_ESP is not set
# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
# CONFIG_NETFILTER_XT_MATCH_TIME is not set
# CONFIG_NETFILTER_XT_MATCH_U32 is not set
# CONFIG_IP_VS is not set
#
# IP: Netfilter Configuration
#
# CONFIG_NF_DEFRAG_IPV4 is not setCONFIG_IP_NF_QUEUE=yCONFIG_IP_NF_IPTABLES=y
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
# CONFIG_IP_NF_MATCH_AH is not set
# CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_TTL is not set
# CONFIG_IP_NF_FILTER is not set
# CONFIG_IP_NF_TARGET_LOG is not set
# CONFIG_IP_NF_TARGET_ULOG is not set
# CONFIG_IP_NF_MANGLE is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_SECURITY is not set
# CONFIG_IP_NF_ARPTABLES is not set
#
# IPv6: Netfilter Configuration
#
# CONFIG_IP6_NF_QUEUE is not set
# CONFIG_IP6_NF_IPTABLES is not set
# CONFIG_IP_DCCP is not setCONFIG_IP_SCTP=y
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
# CONFIG_SCTP_HMAC_SHA1 is not setCONFIG_SCTP_HMAC_MD5=y
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_NET_TCPPROBE is not set
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_PHONET is not setCONFIG_WIRELESS=y
# CONFIG_CFG80211 is not setCONFIG_WIRELESS_OLD_REGULATORY=yCONFIG_WIRELESS_EXT=yCONFIG_WIRELESS_EXT_SYSFS=y
# CONFIG_LIB80211 is not set
# CONFIG_MAC80211 is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
#
# Device Drivers
#
#
# Generic Driver Options
#CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"CONFIG_STANDALONE=yCONFIG_PREVENT_FIRMWARE_BUILD=yCONFIG_FW_LOADER=yCONFIG_FIRMWARE_IN_KERNEL=yCONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not setCONFIG_PARPORT=yCONFIG_PARPORT_PC=y
# CONFIG_PARPORT_SERIAL is not setCONFIG_PARPORT_PC_FIFO=yCONFIG_PARPORT_PC_SUPERIO=y
# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_AX88796 is not setCONFIG_PARPORT_1284=yCONFIG_PNP=yCONFIG_PNP_DEBUG_MESSAGES=y
#
# Protocols
#CONFIG_PNPACPI=yCONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not setCONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_CDROM_PKTCDVD is not setCONFIG_ATA_OVER_ETH=y
# CONFIG_VIRTIO_BLK is not set
# CONFIG_BLK_DEV_HD is not setCONFIG_MISC_DEVICES=y
# CONFIG_IBM_ASM is not set
# CONFIG_PHANTOM is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_HP_ILO is not set
# CONFIG_C2PORT is not set
#
# EEPROM support
#
# CONFIG_EEPROM_AT24 is not set
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_93CX6 is not setCONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
#
# SCSI device support
#
# CONFIG_RAID_ATTRS is not setCONFIG_SCSI=yCONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not setCONFIG_SCSI_PROC_FS=y
#
# SCSI support type (disk, tape, CD-ROM)
#CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not setCONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not setCONFIG_CHR_DEV_SG=y
# CONFIG_CHR_DEV_SCH is not set
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs #CONFIG_SCSI_MULTI_LUN=yCONFIG_SCSI_CONSTANTS=yCONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_SCAN_ASYNC is not set CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
#
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not setCONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
# CONFIG_SCSI_CXGB3_ISCSI is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_LIBFC is not set
# CONFIG_FCOE is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
# CONFIG_SCSI_MVSAS is not set
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_QLA_ISCSI is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
# CONFIG_SCSI_DH is not setCONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not setCONFIG_ATA_ACPI=yCONFIG_SATA_PMP=yCONFIG_SATA_AHCI=y
# CONFIG_SATA_SIL24 is not setCONFIG_ATA_SFF=y
# CONFIG_SATA_SVW is not setCONFIG_ATA_PIIX=y
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CS5536 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not setCONFIG_ATA_GENERIC=y
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not setCONFIG_PATA_MPIIX=y
# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_NS87415 is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PCMCIA is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PATA_SCH is not set
# CONFIG_MD is not set
# CONFIG_FUSION is not set
#
# IEEE 1394 (FireWire) support
#
#
# Enable only one of the two stacks, unless you know what you are doing #
# CONFIG_FIREWIRE is not setCONFIG_IEEE1394=yCONFIG_IEEE1394_OHCI1394=y
# CONFIG_IEEE1394_PCILYNX is not setCONFIG_IEEE1394_SBP2=yCONFIG_IEEE1394_SBP2_PHYS_DMA=y
# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
# CONFIG_IEEE1394_ETH1394 is not set
# CONFIG_IEEE1394_RAWIO is not set
# CONFIG_IEEE1394_VIDEO1394 is not set
# CONFIG_IEEE1394_DV1394 is not set
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_I2O is not set
# CONFIG_MACINTOSH_DRIVERS is not setCONFIG_NETDEVICES=yCONFIG_DUMMY=y
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not setCONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
# CONFIG_PHYLIB is not setCONFIG_NET_ETHERNET=yCONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not setCONFIG_NET_VENDOR_3COM=yCONFIG_VORTEX=y
# CONFIG_TYPHOON is not set
# CONFIG_DNET is not set
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_IBM_NEW_EMAC_RGMII is not set
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not setCONFIG_8139CP=yCONFIG_8139TOO=y
# CONFIG_8139TOO_PIO is not set CONFIG_8139TOO_TUNE_TWISTER=yCONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
# CONFIG_R6040 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SMSC9420 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set
# CONFIG_NET_POCKET is not set
# CONFIG_ATL2 is not setCONFIG_NETDEV_1000=yCONFIG_ACENIC=y
# CONFIG_ACENIC_OMIT_TIGON_I is not set
# CONFIG_DL2K is not setCONFIG_E1000=y
# CONFIG_E1000E is not set
# CONFIG_IP1000 is not set
# CONFIG_IGB is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
# CONFIG_ATL1E is not set
# CONFIG_ATL1C is not set
# CONFIG_JME is not setCONFIG_NETDEV_10000=y
# CONFIG_CHELSIO_T1 is not setCONFIG_CHELSIO_T3_DEPENDS=y
# CONFIG_CHELSIO_T3 is not set
# CONFIG_ENIC is not set
# CONFIG_IXGBE is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set
# CONFIG_NETXEN_NIC is not set
# CONFIG_NIU is not set
# CONFIG_MLX4_EN is not set
# CONFIG_MLX4_CORE is not set
# CONFIG_TEHUTI is not set
# CONFIG_BNX2X is not set
# CONFIG_QLGE is not set
# CONFIG_SFC is not set
# CONFIG_BE2NET is not set
# CONFIG_TR is not set
#
# Wireless LAN
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_IWLWIFI_LEDS is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers #
#
# USB Network Adapters
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not setCONFIG_NET_PCMCIA=y
# CONFIG_PCMCIA_3C589 is not set
# CONFIG_PCMCIA_3C574 is not set
# CONFIG_PCMCIA_FMVJ18X is not set
# CONFIG_PCMCIA_PCNET is not set
# CONFIG_PCMCIA_NMCLAN is not set
# CONFIG_PCMCIA_SMC91C92 is not set
# CONFIG_PCMCIA_XIRC2PS is not set
# CONFIG_PCMCIA_AXNET is not set
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not setCONFIG_PPP=y
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
# CONFIG_PPP_ASYNC is not set
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
# CONFIG_PPP_BSDCOMP is not set
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_PPPOL2TP is not set
# CONFIG_SLIP is not setCONFIG_SLHC=y
# CONFIG_NET_FC is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not setCONFIG_VIRTIO_NET=y
# CONFIG_ISDN is not set
# CONFIG_PHONE is not set
#
# Input device support
#CONFIG_INPUT=yCONFIG_INPUT_FF_MEMLESS=m
# CONFIG_INPUT_POLLDEV is not set
#
# Userland interfaces
#CONFIG_INPUT_MOUSEDEV=yCONFIG_INPUT_MOUSEDEV_PSAUX=yCONFIG_INPUT_MOUSEDEV_SCREEN_X=1024CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not setCONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
#CONFIG_INPUT_KEYBOARD=yCONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not setCONFIG_INPUT_MOUSE=yCONFIG_MOUSE_PS2=yCONFIG_MOUSE_PS2_ALPS=yCONFIG_MOUSE_PS2_LOGIPS2PP=yCONFIG_MOUSE_PS2_SYNAPTICS=yCONFIG_MOUSE_PS2_LIFEBOOK=yCONFIG_MOUSE_PS2_TRACKPOINT=y
# CONFIG_MOUSE_PS2_ELANTECH is not set
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_APPLETOUCH is not set
# CONFIG_MOUSE_BCM5974 is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not setCONFIG_INPUT_MISC=yCONFIG_INPUT_PCSPKR=y
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_ATLAS_BTNS is not set
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
# CONFIG_INPUT_KEYSPAN_REMOTE is not set
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_UINPUT is not set
#
# Hardware I/O ports
#CONFIG_SERIO=yCONFIG_SERIO_I8042=yCONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not setCONFIG_SERIO_LIBPS2=yCONFIG_SERIO_RAW=y
# CONFIG_GAMEPORT is not set
#
# Character devices
#CONFIG_VT=yCONFIG_CONSOLE_TRANSLATIONS=yCONFIG_VT_CONSOLE=yCONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not setCONFIG_DEVKMEM=y
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NOZOMI is not set
#
# Serial drivers
#CONFIG_SERIAL_8250=yCONFIG_SERIAL_8250_CONSOLE=yCONFIG_FIX_EARLYCON_MEM=yCONFIG_SERIAL_8250_PCI=yCONFIG_SERIAL_8250_PNP=y
# CONFIG_SERIAL_8250_CS is not setCONFIG_SERIAL_8250_NR_UARTS=4CONFIG_SERIAL_8250_RUNTIME_UARTS=4CONFIG_SERIAL_8250_EXTENDED=yCONFIG_SERIAL_8250_MANY_PORTS=y
# CONFIG_SERIAL_8250_SHARE_IRQ is not setCONFIG_SERIAL_8250_DETECT_IRQ=y
# CONFIG_SERIAL_8250_RSA is not set
#
# Non-8250 serial port support
#CONFIG_SERIAL_CORE=yCONFIG_SERIAL_CORE_CONSOLE=yCONFIG_CONSOLE_POLL=y
# CONFIG_SERIAL_JSM is not setCONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not setCONFIG_LEGACY_PTYS=yCONFIG_LEGACY_PTY_COUNT=256
# CONFIG_PRINTER is not set
# CONFIG_PPDEV is not set
# CONFIG_VIRTIO_CONSOLE is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not setCONFIG_NVRAM=yCONFIG_RTC=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set
#
# PCMCIA character devices
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_IPWIRELESS is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_CS5535_GPIO is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not setCONFIG_DEVPORT=yCONFIG_I2C=yCONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_CHARDEV is not setCONFIG_I2C_HELPER_AUTO=yCONFIG_I2C_ALGOBIT=y
#
# I2C Hardware Bus support
#
#
# PC SMBus host controller drivers
#
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not setCONFIG_I2C_I801=y
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
#
# I2C system bus drivers (mostly embedded / system-on-chip) #
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_SIMTEC is not set
#
# External I2C/SMBus adapter drivers
#
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_TINY_USB is not set
#
# Graphics adapter I2C/DDC channel drivers
#
# CONFIG_I2C_VOODOO3 is not set
#
# Other I2C/SMBus bus drivers
#
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_STUB is not set
# CONFIG_SCx200_ACB is not set
#
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_SPI is not setCONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_GPIOLIB is not set
# CONFIG_W1 is not setCONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_BQ27x00 is not setCONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
# CONFIG_SENSORS_ABITUGURU is not set
# CONFIG_SENSORS_ABITUGURU3 is not set
# CONFIG_SENSORS_AD7414 is not set
# CONFIG_SENSORS_AD7418 is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
# CONFIG_SENSORS_ADM1029 is not set
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ADM9240 is not set
# CONFIG_SENSORS_ADT7462 is not set
# CONFIG_SENSORS_ADT7470 is not set
# CONFIG_SENSORS_ADT7473 is not set
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_K8TEMP is not set
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_F71882FG is not set
# CONFIG_SENSORS_F75375S is not set
# CONFIG_SENSORS_FSCHER is not set
# CONFIG_SENSORS_FSCPOS is not set
# CONFIG_SENSORS_FSCHMD is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_CORETEMP is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM75 is not set
# CONFIG_SENSORS_LM77 is not set
# CONFIG_SENSORS_LM78 is not set
# CONFIG_SENSORS_LM80 is not set
# CONFIG_SENSORS_LM83 is not set
# CONFIG_SENSORS_LM85 is not set
# CONFIG_SENSORS_LM87 is not set
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_LM93 is not set
# CONFIG_SENSORS_LTC4245 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_MAX6650 is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_SIS5595 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_ADS7828 is not set
# CONFIG_SENSORS_THMC50 is not set
# CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_VT8231 is not set
# CONFIG_SENSORS_W83781D is not set
# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_SENSORS_HDAPS is not set
# CONFIG_SENSORS_LIS3LV02D is not set
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_HWMON_DEBUG_CHIP is not setCONFIG_THERMAL=y
# CONFIG_THERMAL_HWMON is not set
# CONFIG_WATCHDOG is not setCONFIG_SSB_POSSIBLE=y
#
# Sonics Silicon Backplane
#
# CONFIG_SSB is not set
#
# Multifunction device drivers
#
# CONFIG_MFD_CORE is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_PMIC_DA903X is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_REGULATOR is not set
#
# Multimedia devices
#
#
# Multimedia core support
#
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB_CORE is not set
# CONFIG_VIDEO_MEDIA is not set
#
# Multimedia drivers
#CONFIG_DAB=y
# CONFIG_USB_DABUSB is not set
#
# Graphics support
#CONFIG_AGP=y
# CONFIG_AGP_ALI is not set
# CONFIG_AGP_ATI is not set
# CONFIG_AGP_AMD is not setCONFIG_AGP_AMD64=yCONFIG_AGP_INTEL=y
# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_EFFICEON is not setCONFIG_DRM=y
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not setCONFIG_DRM_RADEON=yCONFIG_DRM_I810=yCONFIG_DRM_I830=y
# CONFIG_DRM_I915 is not set
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_VIA is not set
# CONFIG_DRM_SAVAGE is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
# CONFIG_FB is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Display device support
#
# CONFIG_DISPLAY_SUPPORT is not set
#
# Console display driver support
#CONFIG_VGA_CONSOLE=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not setCONFIG_DUMMY_CONSOLE=yCONFIG_SOUND=yCONFIG_SOUND_OSS_CORE=yCONFIG_SND=yCONFIG_SND_TIMER=yCONFIG_SND_PCM=yCONFIG_SND_RAWMIDI=yCONFIG_SND_SEQUENCER=yCONFIG_SND_SEQ_DUMMY=yCONFIG_SND_OSSEMUL=yCONFIG_SND_MIXER_OSS=yCONFIG_SND_PCM_OSS=yCONFIG_SND_PCM_OSS_PLUGINS=yCONFIG_SND_SEQUENCER_OSS=yCONFIG_SND_RTCTIMER=yCONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not setCONFIG_SND_SUPPORT_OLD_API=yCONFIG_SND_VERBOSE_PROCFS=yCONFIG_SND_VERBOSE_PRINTK=y
# CONFIG_SND_DEBUG is not setCONFIG_SND_VMASTER=yCONFIG_SND_AC97_CODEC=yCONFIG_SND_DRIVERS=y
# CONFIG_SND_DUMMY is not setCONFIG_SND_VIRMIDI=y
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_MTS64 is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
# CONFIG_SND_PORTMAN2X4 is not set
# CONFIG_SND_AC97_POWER_SAVE is not setCONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AW2 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
# CONFIG_SND_CS5535AUDIO is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_GINA24 is not set
# CONFIG_SND_LAYLA24 is not set
# CONFIG_SND_MONA is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INDIGOIO is not set
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDA_INTEL is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_HIFIER is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not setCONFIG_SND_INTEL8X0=y
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RIPTIDE is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SIS7019 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VIRTUOSO is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not setCONFIG_SND_USB=y
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_USB_USX2Y is not set
# CONFIG_SND_USB_CAIAQ is not set
# CONFIG_SND_USB_US122L is not setCONFIG_SND_PCMCIA=y
# CONFIG_SND_VXPOCKET is not set
# CONFIG_SND_PDAUDIOCF is not set
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not setCONFIG_AC97_BUS=yCONFIG_HID_SUPPORT=yCONFIG_HID=y
# CONFIG_HID_DEBUG is not set
# CONFIG_HIDRAW is not set
#
# USB Input Devices
#CONFIG_USB_HID=y
# CONFIG_HID_PID is not set
# CONFIG_USB_HIDDEV is not set
#
# Special HID drivers
#CONFIG_HID_COMPAT=yCONFIG_HID_A4TECH=yCONFIG_HID_APPLE=yCONFIG_HID_BELKIN=yCONFIG_HID_CHERRY=yCONFIG_HID_CHICONY=yCONFIG_HID_CYPRESS=yCONFIG_HID_EZKEY=yCONFIG_HID_GYRATION=yCONFIG_HID_LOGITECH=y
# CONFIG_LOGITECH_FF is not set
# CONFIG_LOGIRUMBLEPAD2_FF is not setCONFIG_HID_MICROSOFT=yCONFIG_HID_MONTEREY=yCONFIG_HID_NTRIG=yCONFIG_HID_PANTHERLORD=y
# CONFIG_PANTHERLORD_FF is not setCONFIG_HID_PETALYNX=yCONFIG_HID_SAMSUNG=yCONFIG_HID_SONY=yCONFIG_HID_SUNPLUS=y
# CONFIG_GREENASIA_FF is not setCONFIG_HID_TOPSEED=yCONFIG_THRUSTMASTER_FF=mCONFIG_ZEROPLUS_FF=mCONFIG_USB_SUPPORT=yCONFIG_USB_ARCH_HAS_HCD=yCONFIG_USB_ARCH_HAS_OHCI=yCONFIG_USB_ARCH_HAS_EHCI=yCONFIG_USB=y
# CONFIG_USB_DEBUG is not set
# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
#
# Miscellaneous USB options
#CONFIG_USB_DEVICEFS=yCONFIG_USB_DEVICE_CLASS=yCONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_SUSPEND is not set
# CONFIG_USB_OTG is not setCONFIG_USB_MON=y
# CONFIG_USB_WUSB is not set
# CONFIG_USB_WUSB_CBAF is not set
#
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not setCONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not setCONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not setCONFIG_USB_OHCI_LITTLE_ENDIAN=yCONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_WHCI_HCD is not set
# CONFIG_USB_HWA_HCD is not set
#
# USB Device Class drivers
#
# CONFIG_USB_ACM is not setCONFIG_USB_PRINTER=y
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
#
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; #
#
# see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set # CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_LIBUSUAL is not set
#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
#
# USB port drivers
#
# CONFIG_USB_USS720 is not set
# CONFIG_USB_SERIAL is not set
#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_ADUTUX is not set
# CONFIG_USB_SEVSEG is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_BERRY_CHARGE is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_PHIDGET is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_VST is not set
# CONFIG_USB_GADGET is not set
#
# OTG and related infrastructure
#
# CONFIG_UWB is not set
# CONFIG_MMC is not set
# CONFIG_MEMSTICK is not set
# CONFIG_NEW_LEDS is not set
# CONFIG_ACCESSIBILITY is not setCONFIG_INFINIBAND=y
# CONFIG_INFINIBAND_USER_MAD is not set
# CONFIG_INFINIBAND_USER_ACCESS is not setCONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_MTHCA is not set
# CONFIG_INFINIBAND_AMSO1100 is not set
# CONFIG_MLX4_INFINIBAND is not set
# CONFIG_INFINIBAND_NES is not set
# CONFIG_INFINIBAND_IPOIB is not set
# CONFIG_INFINIBAND_SRP is not set
# CONFIG_INFINIBAND_ISER is not setCONFIG_EDAC=y
#
# Reporting subsystems
#
# CONFIG_EDAC_DEBUG is not setCONFIG_EDAC_MM_EDAC=y
# CONFIG_EDAC_AMD76X is not set
# CONFIG_EDAC_E7XXX is not set
# CONFIG_EDAC_E752X is not set
# CONFIG_EDAC_I82875P is not set
# CONFIG_EDAC_I82975X is not set
# CONFIG_EDAC_I3000 is not set
# CONFIG_EDAC_X38 is not set
# CONFIG_EDAC_I5400 is not set
# CONFIG_EDAC_I82860 is not set
# CONFIG_EDAC_R82600 is not set
# CONFIG_EDAC_I5000 is not set
# CONFIG_EDAC_I5100 is not set
# CONFIG_RTC_CLASS is not set
# CONFIG_DMADEVICES is not set
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not setCONFIG_X86_PLATFORM_DEVICES=y
# CONFIG_ASUS_LAPTOP is not set
# CONFIG_TC1100_WMI is not set
# CONFIG_SONY_LAPTOP is not set
# CONFIG_THINKPAD_ACPI is not set
# CONFIG_INTEL_MENLOW is not set
# CONFIG_EEEPC_LAPTOP is not set
# CONFIG_ACPI_WMI is not set
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_TOSHIBA is not set
#
# Firmware Drivers
#
# CONFIG_EDD is not setCONFIG_FIRMWARE_MEMMAP=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not setCONFIG_DMIID=y
# CONFIG_ISCSI_IBFT_FIND is not set
#
# File systems
#CONFIG_EXT2_FS=yCONFIG_EXT2_FS_XATTR=yCONFIG_EXT2_FS_POSIX_ACL=yCONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not setCONFIG_EXT3_FS=yCONFIG_EXT3_FS_XATTR=yCONFIG_EXT3_FS_POSIX_ACL=yCONFIG_EXT3_FS_SECURITY=yCONFIG_EXT4_FS=y
# CONFIG_EXT4DEV_COMPAT is not setCONFIG_EXT4_FS_XATTR=yCONFIG_EXT4_FS_POSIX_ACL=yCONFIG_EXT4_FS_SECURITY=yCONFIG_JBD=yCONFIG_JBD_DEBUG=yCONFIG_JBD2=yCONFIG_JBD2_DEBUG=yCONFIG_FS_MBCACHE=yCONFIG_REISERFS_FS=y
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not setCONFIG_REISERFS_FS_XATTR=yCONFIG_REISERFS_FS_POSIX_ACL=y
# CONFIG_REISERFS_FS_SECURITY is not setCONFIG_JFS_FS=yCONFIG_JFS_POSIX_ACL=y
# CONFIG_JFS_SECURITY is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not setCONFIG_FS_POSIX_ACL=yCONFIG_FILE_LOCKING=yCONFIG_XFS_FS=y
# CONFIG_XFS_QUOTA is not setCONFIG_XFS_POSIX_ACL=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not setCONFIG_OCFS2_FS=yCONFIG_OCFS2_FS_O2CB=yCONFIG_OCFS2_FS_USERSPACE_CLUSTER=yCONFIG_OCFS2_FS_STATS=yCONFIG_OCFS2_DEBUG_MASKLOG=y
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_FS_POSIX_ACL is not set
# CONFIG_BTRFS_FS is not setCONFIG_DNOTIFY=yCONFIG_INOTIFY=yCONFIG_INOTIFY_USER=yCONFIG_QUOTA=y
# CONFIG_QUOTA_NETLINK_INTERFACE is not setCONFIG_PRINT_QUOTA_WARNING=yCONFIG_QUOTA_TREE=y
# CONFIG_QFMT_V1 is not setCONFIG_QFMT_V2=yCONFIG_QUOTACTL=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_FUSE_FS is not set
#
# CD-ROM/DVD Filesystems
#CONFIG_ISO9660_FS=yCONFIG_JOLIET=yCONFIG_ZISOFS=yCONFIG_UDF_FS=yCONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
#CONFIG_FAT_FS=yCONFIG_MSDOS_FS=yCONFIG_VFAT_FS=yCONFIG_FAT_DEFAULT_CODEPAGE=437CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
#
# Pseudo filesystems
#CONFIG_PROC_FS=yCONFIG_PROC_KCORE=yCONFIG_PROC_SYSCTL=yCONFIG_PROC_PAGE_MONITOR=yCONFIG_SYSFS=yCONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not setCONFIG_CONFIGFS_FS=yCONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ECRYPT_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not setCONFIG_NETWORK_FILESYSTEMS=yCONFIG_NFS_FS=yCONFIG_NFS_V3=yCONFIG_NFS_V3_ACL=yCONFIG_NFS_V4=yCONFIG_NFSD=yCONFIG_NFSD_V2_ACL=yCONFIG_NFSD_V3=yCONFIG_NFSD_V3_ACL=yCONFIG_NFSD_V4=y
# CONFIG_NFSD_V4_1 is not setCONFIG_LOCKD=yCONFIG_LOCKD_V4=yCONFIG_EXPORTFS=yCONFIG_NFS_ACL_SUPPORT=yCONFIG_NFS_COMMON=yCONFIG_SUNRPC=yCONFIG_SUNRPC_GSS=yCONFIG_SUNRPC_XPRT_RDMA=y
# CONFIG_SUNRPC_REGISTER_V4 is not setCONFIG_RPCSEC_GSS_KRB5=yCONFIG_RPCSEC_GSS_SPKM3=y
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
#
# Partition Types
#CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not setCONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_SYSV68_PARTITION is not setCONFIG_NLS=yCONFIG_NLS_DEFAULT="iso8859-1"CONFIG_NLS_CODEPAGE_437=y
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not setCONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not setCONFIG_DLM=yCONFIG_DLM_DEBUG=y
#
# Kernel hacking
#CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024CONFIG_MAGIC_SYSRQ=yCONFIG_UNUSED_SYMBOLS=yCONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=yCONFIG_SCHEDSTATS=y
# CONFIG_TIMER_STATS is not set CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set CONFIG_DEBUG_OBJECTS_FREE=y CONFIG_DEBUG_OBJECTS_TIMERS=y CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 CONFIG_DEBUG_SLAB=yCONFIG_DEBUG_SLAB_LEAK=y CONFIG_DEBUG_PREEMPT=y CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_PI_LIST=y
# CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=yCONFIG_LOCKDEP=y
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_LOCKDEP is not set CONFIG_TRACE_IRQFLAGS=y CONFIG_DEBUG_SPINLOCK_SLEEP=y
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=yCONFIG_DEBUG_INFO=yCONFIG_DEBUG_VM=y
# CONFIG_DEBUG_VIRTUAL is not set CONFIG_DEBUG_WRITECOUNT=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEBUG_LIST=yCONFIG_DEBUG_SG=y
# CONFIG_DEBUG_NOTIFIERS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_KPROBES_SANITY_TEST is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_LKDTM is not set CONFIG_FAULT_INJECTION=yCONFIG_FAILSLAB=yCONFIG_FAIL_PAGE_ALLOC=y CONFIG_FAIL_MAKE_REQUEST=y
# CONFIG_FAIL_IO_TIMEOUT is not set CONFIG_FAULT_INJECTION_DEBUG_FS=y
# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set CONFIG_LATENCYTOP=y CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_HW_BRANCH_TRACER=y CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=yCONFIG_TRACING=y
#
# Tracers
#CONFIG_FUNCTION_TRACER=yCONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_PREEMPT_TRACER is not setCONFIG_SYSPROF_TRACER=yCONFIG_SCHED_TRACER=yCONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_BOOT_TRACER is not set
# CONFIG_TRACE_BRANCH_PROFILING is not set
# CONFIG_POWER_TRACER is not setCONFIG_STACK_TRACER=y
# CONFIG_HW_BRANCH_TRACER is not setCONFIG_DYNAMIC_FTRACE=yCONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_MMIOTRACE is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not setCONFIG_DYNAMIC_PRINTK_DEBUG=y
# CONFIG_SAMPLES is not setCONFIG_HAVE_ARCH_KGDB=yCONFIG_KGDB=yCONFIG_KGDB_SERIAL_CONSOLE=y
# CONFIG_KGDB_TESTS is not set
# CONFIG_STRICT_DEVMEM is not setCONFIG_X86_VERBOSE_BOOTUP=yCONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not setCONFIG_DEBUG_STACKOVERFLOW=yCONFIG_DEBUG_STACK_USAGE=y
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_X86_PTDUMP is not setCONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_4KSTACKS is not setCONFIG_DOUBLEFAULT=yCONFIG_HAVE_MMIOTRACE_SUPPORT=yCONFIG_IO_DELAY_TYPE_0X80=0CONFIG_IO_DELAY_TYPE_0XED=1CONFIG_IO_DELAY_TYPE_UDELAY=2CONFIG_IO_DELAY_TYPE_NONE=3
# CONFIG_IO_DELAY_0X80 is not setCONFIG_IO_DELAY_0XED=y
# CONFIG_IO_DELAY_UDELAY is not set
# CONFIG_IO_DELAY_NONE is not setCONFIG_DEFAULT_IO_DELAY_TYPE=1
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
# CONFIG_OPTIMIZE_INLINING is not set
#
# Security options
#CONFIG_KEYS=yCONFIG_KEYS_DEBUG_PROC_KEYS=yCONFIG_SECURITY=y
# CONFIG_SECURITYFS is not set
# CONFIG_SECURITY_NETWORK is not set
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
# CONFIG_SECURITY_ROOTPLUG is not setCONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0CONFIG_CRYPTO=y
#
# Crypto core or helper
#
# CONFIG_CRYPTO_FIPS is not setCONFIG_CRYPTO_ALGAPI=yCONFIG_CRYPTO_ALGAPI2=yCONFIG_CRYPTO_AEAD2=yCONFIG_CRYPTO_BLKCIPHER=yCONFIG_CRYPTO_BLKCIPHER2=yCONFIG_CRYPTO_HASH=yCONFIG_CRYPTO_HASH2=yCONFIG_CRYPTO_RNG2=yCONFIG_CRYPTO_MANAGER=yCONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_CRYPTD is not set
# CONFIG_CRYPTO_AUTHENC is not set
# CONFIG_CRYPTO_TEST is not set
#
# Authenticated Encryption with Associated Data
#
# CONFIG_CRYPTO_CCM is not set
# CONFIG_CRYPTO_GCM is not set
# CONFIG_CRYPTO_SEQIV is not set
#
# Block modes
#CONFIG_CRYPTO_CBC=y
# CONFIG_CRYPTO_CTR is not set
# CONFIG_CRYPTO_CTS is not setCONFIG_CRYPTO_ECB=y
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_PCBC is not set
# CONFIG_CRYPTO_XTS is not set
#
# Hash modes
#CONFIG_CRYPTO_HMAC=y
# CONFIG_CRYPTO_XCBC is not set
#
# Digest
#CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CRC32C_INTEL is not set
# CONFIG_CRYPTO_MD4 is not setCONFIG_CRYPTO_MD5=yCONFIG_CRYPTO_MICHAEL_MIC=y
# CONFIG_CRYPTO_RMD128 is not set
# CONFIG_CRYPTO_RMD160 is not set
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not setCONFIG_CRYPTO_SHA1=y
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_WP512 is not set
#
# Ciphers
#CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_AES_586 is not set
# CONFIG_CRYPTO_ANUBIS is not setCONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_CAMELLIA is not setCONFIG_CRYPTO_CAST5=y
# CONFIG_CRYPTO_CAST6 is not setCONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_SALSA20 is not set
# CONFIG_CRYPTO_SALSA20_586 is not set
# CONFIG_CRYPTO_SEED is not set
# CONFIG_CRYPTO_SERPENT is not set
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
#
# Compression
#
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_LZO is not set
#
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not setCONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_PADLOCK is not set
# CONFIG_CRYPTO_DEV_GEODE is not set
# CONFIG_CRYPTO_DEV_HIFN_795X is not setCONFIG_HAVE_KVM=yCONFIG_VIRTUALIZATION=y
# CONFIG_KVM is not set
# CONFIG_LGUEST is not setCONFIG_VIRTIO=yCONFIG_VIRTIO_RING=yCONFIG_VIRTIO_PCI=y
# CONFIG_VIRTIO_BALLOON is not set
#
# Library routines
#CONFIG_BITREVERSE=yCONFIG_GENERIC_FIND_FIRST_BIT=yCONFIG_GENERIC_FIND_NEXT_BIT=yCONFIG_GENERIC_FIND_LAST_BIT=y
# CONFIG_CRC_CCITT is not setCONFIG_CRC16=yCONFIG_CRC_T10DIF=yCONFIG_CRC_ITU_T=yCONFIG_CRC32=y
# CONFIG_CRC7 is not setCONFIG_LIBCRC32C=yCONFIG_ZLIB_INFLATE=yCONFIG_PLIST=yCONFIG_HAS_IOMEM=yCONFIG_HAS_IOPORT=yCONFIG_HAS_DMA=y
Quoted 19 lines · J. Bruce Fields
Quoted 18 lines · Benny Halevy
Quoted 17 lines · J. Bruce Fields
Quoted 16 lines · Benny Halevy
Quoted 15 lines · J. Bruce Fields
Quoted 8 lines · Benny Halevy
Hi Bruce,
Here's the latest server patches implementing the NFSv4.1 Sessions features.
This patchset is based over your for-2.6.30 branch and is also available from
git://linux-nfs.org/~bhalevy/linux-pnfs.gitnfsd41-for-2.6.30There's a few merge conflicts with my current for-2.6.30--probably my fault for not pushing that out recently enough, apologies. Would you mind updating?
--b.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Sure. Here's a rebased version with two minor changes (see below)
On the latest version of nfsd41-for-2.6.30 (a564667..) I'm getting a new NULL dereference in the callback code. Looks like it probably happened while running connectathon over NFSv4.0 with krb5p. That's all I've figured out so
Weird.
nfs4_xdr_dec_cb_recall+0x4edoesn't seem like a valid IP for nfsd.ko @a564667. Bruce, can you please send me you .config file?I'm building without
CONFIG_NFSD_V4_1for now; .config appended.
It looks like rpc_res would be NULL without CONFIG_NFSD_V4_1. Does the following patch help?
Benny
git diff --stat -p
fs/nfsd/nfs4callback.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
fs/nfsd/nfs4callback.c +5 -3
@@ -441,9 +441,11 @@ nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p, status =decode_cb_compound_hdr (&xdr, &hdr);if (status) goto out; - status =decode_cb_sequence (&xdr, rpc_res->res_seq, rqstp); -if (status) - goto out; +if (rpc_res && rpc_res->res_seq) { + status =decode_cb_sequence (&xdr, rpc_res->res_seq, rqstp); +if (status) + goto out; + } status =decode_cb_op_hdr (&xdr,OP_CB_RECALL ); out:return status;
Quoted 2,206 lines
Start of my
nfs4_xdr_dec_cb_recall, for what it's worth:
c03e4dd0<nfs4_xdr_dec_cb_recall>:c03e4dd0: 55 push %ebp c03e4dd1: 89 e5 mov %esp,%ebp c03e4dd3: 83 ec 38 sub $0x38,%esp c03e4dd6: 89 5d f4 mov %ebx,-0xc(%ebp) c03e4dd9: 89 75 f8 mov %esi,-0x8(%ebp) c03e4ddc: 89 7d fc mov %edi,-0x4(%ebp) c03e4ddf: e8 8c ed e1 ff call c0203b70 <mcount> c03e4de4: 89 d3 mov %edx,%ebx c03e4de6: 89 ce mov %ecx,%esi c03e4de8: 8d 50 2c lea 0x2c(%eax),%edx c03e4deb: 89 d9 mov %ebx,%ecx c03e4ded: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4df0: e8 eb c0 43 00 call c0820ee0 <xdr_init_decode> c03e4df5: ba 08 00 00 00 mov $0x8,%edx c03e4dfa: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4dfd: e8 0e c1 43 00 call c0820f10 <xdr_inline_decode> c03e4e02: 85 c0 test %eax,%eax c03e4e04: 74 3a je c03e4e40 <nfs4_xdr_dec_cb_recall+0x70> c03e4e06: 8b 50 04 mov 0x4(%eax),%edx c03e4e09: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4e0c: 0f ca bswap %edx c03e4e0e: 83 c2 04 add $0x4,%edx c03e4e11: e8 fa c0 43 00 call c0820f10 <xdr_inline_decode> c03e4e16: 85 c0 test %eax,%eax c03e4e18: 0f 84 8a 00 00 00 je c03e4ea8 <nfs4_xdr_dec_cb_recall+0xd8> --> c03e4e1e: 8b 06 mov (%esi),%eax c03e4e20: 8b 00 mov (%eax),%eax c03e4e22: 85 c0 test %eax,%eax c03e4e24: 75 32 jne c03e4e58 <nfs4_xdr_dec_cb_recall+0x88> c03e4e26: ba 04 00 00 00 mov $0x4,%edx c03e4e2b: 8d 45 e4 lea -0x1c(%ebp),%eax c03e4e2e: e8 cd fe ff ff call c03e4d00 <decode_cb_op_hdr> c03e4e33: 8b 5d f4 mov -0xc(%ebp),%ebx c03e4e36: 8b 75 f8 mov -0x8(%ebp),%esi c03e4e39: 8b 7d fc mov -0x4(%ebp),%edi c03e4e3c: 89 ec mov %ebp,%esp c03e4e3e: 5d pop %ebp c03e4e3f: c3 ret...
--b.
#
# Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc8
# Mon Mar 30 14:07:10 2009
#
#CONFIG_64BITis not setCONFIG_X86_32=y
#CONFIG_X86_64is not setCONFIG_X86=yCONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"CONFIG_GENERIC_TIME=yCONFIG_GENERIC_CMOS_UPDATE=yCONFIG_CLOCKSOURCE_WATCHDOG=yCONFIG_GENERIC_CLOCKEVENTS=yCONFIG_LOCKDEP_SUPPORT=yCONFIG_STACKTRACE_SUPPORT=yCONFIG_HAVE_LATENCYTOP_SUPPORT=yCONFIG_FAST_CMPXCHG_LOCAL=yCONFIG_MMU=yCONFIG_ZONE_DMA=yCONFIG_GENERIC_ISA_DMA=yCONFIG_GENERIC_IOMAP=yCONFIG_GENERIC_BUG=yCONFIG_GENERIC_HWEIGHT=yCONFIG_ARCH_MAY_HAVE_PC_FDC=y
#CONFIG_RWSEM_GENERIC_SPINLOCKis not setCONFIG_RWSEM_XCHGADD_ALGORITHM=yCONFIG_ARCH_HAS_CPU_IDLE_WAIT=yCONFIG_GENERIC_CALIBRATE_DELAY=y
#CONFIG_GENERIC_TIME_VSYSCALLis not setCONFIG_ARCH_HAS_CPU_RELAX=yCONFIG_ARCH_HAS_DEFAULT_IDLE=yCONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
#CONFIG_HAVE_SETUP_PER_CPU_AREAis not set
#CONFIG_HAVE_CPUMASK_OF_CPU_MAPis not setCONFIG_ARCH_HIBERNATION_POSSIBLE=yCONFIG_ARCH_SUSPEND_POSSIBLE=y
#CONFIG_ZONE_DMA32is not setCONFIG_ARCH_POPULATES_NODE_MAP=y
#CONFIG_AUDIT_ARCHis not setCONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=yCONFIG_GENERIC_HARDIRQS=yCONFIG_GENERIC_IRQ_PROBE=yCONFIG_X86_BIOS_REBOOT=yCONFIG_KTIME_SCALAR=yCONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"#
# General setup
#CONFIG_EXPERIMENTAL=yCONFIG_BROKEN_ON_SMP=yCONFIG_LOCK_KERNEL=yCONFIG_INIT_ENV_ARG_LIMIT=32CONFIG_LOCALVERSION=""CONFIG_LOCALVERSION_AUTO=yCONFIG_SWAP=yCONFIG_SYSVIPC=yCONFIG_SYSVIPC_SYSCTL=yCONFIG_POSIX_MQUEUE=yCONFIG_BSD_PROCESS_ACCT=yCONFIG_BSD_PROCESS_ACCT_V3=y
#CONFIG_TASKSTATSis not set
#CONFIG_AUDITis not set#
# RCU Subsystem
#CONFIG_CLASSIC_RCU=y
#CONFIG_TREE_RCUis not set
#CONFIG_PREEMPT_RCUis not set
#CONFIG_TREE_RCU_TRACEis not set
#CONFIG_PREEMPT_RCU_TRACEis not setCONFIG_IKCONFIG=yCONFIG_IKCONFIG_PROC=yCONFIG_LOG_BUF_SHIFT=20CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=yCONFIG_GROUP_SCHED=yCONFIG_FAIR_GROUP_SCHED=y
#CONFIG_RT_GROUP_SCHEDis not setCONFIG_USER_SCHED=y
#CONFIG_CGROUP_SCHEDis not set
#CONFIG_CGROUPSis not setCONFIG_SYSFS_DEPRECATED=yCONFIG_SYSFS_DEPRECATED_V2=yCONFIG_RELAY=yCONFIG_NAMESPACES=y
#CONFIG_UTS_NSis not set
#CONFIG_IPC_NSis not set
#CONFIG_USER_NSis not set
#CONFIG_PID_NSis not set
#CONFIG_NET_NSis not set
#CONFIG_BLK_DEV_INITRDis not set
#CONFIG_CC_OPTIMIZE_FOR_SIZEis not setCONFIG_SYSCTL=yCONFIG_ANON_INODES=y
#CONFIG_EMBEDDEDis not setCONFIG_UID16=yCONFIG_SYSCTL_SYSCALL=yCONFIG_KALLSYMS=yCONFIG_KALLSYMS_ALL=y
#CONFIG_KALLSYMS_EXTRA_PASSis not setCONFIG_HOTPLUG=yCONFIG_PRINTK=yCONFIG_BUG=yCONFIG_ELF_CORE=yCONFIG_PCSPKR_PLATFORM=yCONFIG_BASE_FULL=yCONFIG_FUTEX=yCONFIG_EPOLL=yCONFIG_SIGNALFD=yCONFIG_TIMERFD=yCONFIG_EVENTFD=yCONFIG_SHMEM=yCONFIG_AIO=yCONFIG_VM_EVENT_COUNTERS=yCONFIG_PCI_QUIRKS=yCONFIG_COMPAT_BRK=yCONFIG_SLAB=y
#CONFIG_SLUBis not set
#CONFIG_SLOBis not setCONFIG_PROFILING=yCONFIG_TRACEPOINTS=yCONFIG_MARKERS=yCONFIG_OPROFILE=yCONFIG_HAVE_OPROFILE=yCONFIG_KPROBES=yCONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=yCONFIG_KRETPROBES=yCONFIG_HAVE_IOREMAP_PROT=yCONFIG_HAVE_KPROBES=yCONFIG_HAVE_KRETPROBES=yCONFIG_HAVE_ARCH_TRACEHOOK=yCONFIG_HAVE_GENERIC_DMA_COHERENT=yCONFIG_SLABINFO=yCONFIG_RT_MUTEXES=yCONFIG_BASE_SMALL=0CONFIG_MODULES=y
#CONFIG_MODULE_FORCE_LOADis not setCONFIG_MODULE_UNLOAD=y
#CONFIG_MODULE_FORCE_UNLOADis not set
#CONFIG_MODVERSIONSis not set
#CONFIG_MODULE_SRCVERSION_ALLis not setCONFIG_BLOCK=yCONFIG_LBD=y
#CONFIG_BLK_DEV_IO_TRACEis not set
#CONFIG_BLK_DEV_BSGis not set
#CONFIG_BLK_DEV_INTEGRITYis not set#
# IO Schedulers
#CONFIG_IOSCHED_NOOP=yCONFIG_IOSCHED_AS=yCONFIG_IOSCHED_DEADLINE=yCONFIG_IOSCHED_CFQ=yCONFIG_DEFAULT_AS=y
#CONFIG_DEFAULT_DEADLINEis not set
#CONFIG_DEFAULT_CFQis not set
#CONFIG_DEFAULT_NOOPis not setCONFIG_DEFAULT_IOSCHED="anticipatory"CONFIG_FREEZER=y#
# Processor type and features
#
#CONFIG_NO_HZis not set
#CONFIG_HIGH_RES_TIMERSis not setCONFIG_GENERIC_CLOCKEVENTS_BUILD=y
#CONFIG_SMPis not setCONFIG_X86_PC=y
#CONFIG_X86_ELANis not set
#CONFIG_X86_VOYAGERis not set
#CONFIG_X86_GENERICARCHis not set
#CONFIG_X86_VSMPis not set
#CONFIG_X86_RDC321Xis not setCONFIG_SCHED_OMIT_FRAME_POINTER=y
#CONFIG_PARAVIRT_GUESTis not set
#CONFIG_MEMTESTis not set
#CONFIG_M386is not set
#CONFIG_M486is not set
#CONFIG_M586is not set
#CONFIG_M586TSCis not set
#CONFIG_M586MMXis not setCONFIG_M686=y
#CONFIG_MPENTIUMIIis not set
#CONFIG_MPENTIUMIIIis not set
#CONFIG_MPENTIUMMis not set
#CONFIG_MPENTIUM4is not set
#CONFIG_MK6is not set
#CONFIG_MK7is not set
#CONFIG_MK8is not set
#CONFIG_MCRUSOEis not set
#CONFIG_MEFFICEONis not set
#CONFIG_MWINCHIPC6is not set
#CONFIG_MWINCHIP3Dis not set
#CONFIG_MGEODEGX1is not set
#CONFIG_MGEODE_LXis not set
#CONFIG_MCYRIXIIIis not set
#CONFIG_MVIAC3_2is not set
#CONFIG_MVIAC7is not set
#CONFIG_MPSCis not set
#CONFIG_MCORE2is not set
#CONFIG_GENERIC_CPUis not set
#CONFIG_X86_GENERICis not setCONFIG_X86_CPU=yCONFIG_X86_CMPXCHG=yCONFIG_X86_L1_CACHE_SHIFT=5CONFIG_X86_XADD=y
#CONFIG_X86_PPRO_FENCEis not setCONFIG_X86_WP_WORKS_OK=yCONFIG_X86_INVLPG=yCONFIG_X86_BSWAP=yCONFIG_X86_POPAD_OK=yCONFIG_X86_USE_PPRO_CHECKSUM=yCONFIG_X86_TSC=yCONFIG_X86_CMOV=yCONFIG_X86_MINIMUM_CPU_FAMILY=4CONFIG_X86_DEBUGCTLMSR=yCONFIG_CPU_SUP_INTEL=yCONFIG_CPU_SUP_CYRIX_32=yCONFIG_CPU_SUP_AMD=yCONFIG_CPU_SUP_CENTAUR_32=yCONFIG_CPU_SUP_TRANSMETA_32=yCONFIG_CPU_SUP_UMC_32=yCONFIG_X86_DS=yCONFIG_X86_PTRACE_BTS=yCONFIG_HPET_TIMER=yCONFIG_HPET_EMULATE_RTC=yCONFIG_DMI=y
#CONFIG_IOMMU_HELPERis not set
#CONFIG_IOMMU_APIis not setCONFIG_NR_CPUS=1
#CONFIG_PREEMPT_NONEis not set
#CONFIG_PREEMPT_VOLUNTARYis not setCONFIG_PREEMPT=y
#CONFIG_X86_UP_APICis not setCONFIG_X86_MCE=y
#CONFIG_X86_MCE_NONFATALis not setCONFIG_VM86=y
#CONFIG_TOSHIBAis not set
#CONFIG_I8Kis not set
#CONFIG_X86_REBOOTFIXUPSis not set
#CONFIG_MICROCODEis not set
#CONFIG_X86_MSRis not set
#CONFIG_X86_CPUIDis not set
#CONFIG_NOHIGHMEMis not setCONFIG_HIGHMEM4G=y
#CONFIG_HIGHMEM64Gis not setCONFIG_PAGE_OFFSET=0xC0000000CONFIG_HIGHMEM=y
#CONFIG_ARCH_PHYS_ADDR_T_64BITis not setCONFIG_NEED_NODE_MEMMAP_SIZE=yCONFIG_ARCH_FLATMEM_ENABLE=yCONFIG_ARCH_SPARSEMEM_ENABLE=yCONFIG_ARCH_SELECT_MEMORY_MODEL=yCONFIG_SELECT_MEMORY_MODEL=y
#CONFIG_FLATMEM_MANUALis not set
#CONFIG_DISCONTIGMEM_MANUALis not setCONFIG_SPARSEMEM_MANUAL=yCONFIG_SPARSEMEM=yCONFIG_HAVE_MEMORY_PRESENT=yCONFIG_SPARSEMEM_STATIC=y
#CONFIG_MEMORY_HOTPLUGis not setCONFIG_PAGEFLAGS_EXTENDED=yCONFIG_SPLIT_PTLOCK_CPUS=4
#CONFIG_PHYS_ADDR_T_64BITis not setCONFIG_ZONE_DMA_FLAG=1CONFIG_BOUNCE=yCONFIG_VIRT_TO_BUS=yCONFIG_UNEVICTABLE_LRU=y
#CONFIG_HIGHPTEis not set
#CONFIG_X86_CHECK_BIOS_CORRUPTIONis not setCONFIG_X86_RESERVE_LOW_64K=y
#CONFIG_MATH_EMULATIONis not setCONFIG_MTRR=y
#CONFIG_MTRR_SANITIZERis not set
#CONFIG_X86_PATis not set
#CONFIG_EFIis not setCONFIG_SECCOMP=y
#CONFIG_HZ_100is not setCONFIG_HZ_250=y
#CONFIG_HZ_300is not set
#CONFIG_HZ_1000is not setCONFIG_HZ=250
#CONFIG_SCHED_HRTICKis not set
#CONFIG_KEXECis not set
#CONFIG_CRASH_DUMPis not setCONFIG_PHYSICAL_START=0x100000
#CONFIG_RELOCATABLEis not setCONFIG_PHYSICAL_ALIGN=0x200000CONFIG_COMPAT_VDSO=y
#CONFIG_CMDLINE_BOOLis not setCONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y#
# Power management and ACPI options
#CONFIG_PM=y
#CONFIG_PM_DEBUGis not setCONFIG_PM_SLEEP=yCONFIG_SUSPEND=yCONFIG_SUSPEND_FREEZER=y
#CONFIG_HIBERNATIONis not setCONFIG_ACPI=yCONFIG_ACPI_SLEEP=yCONFIG_ACPI_PROCFS=yCONFIG_ACPI_PROCFS_POWER=yCONFIG_ACPI_SYSFS_POWER=yCONFIG_ACPI_PROC_EVENT=yCONFIG_ACPI_AC=yCONFIG_ACPI_BATTERY=yCONFIG_ACPI_BUTTON=yCONFIG_ACPI_FAN=yCONFIG_ACPI_DOCK=yCONFIG_ACPI_PROCESSOR=yCONFIG_ACPI_THERMAL=y
#CONFIG_ACPI_CUSTOM_DSDTis not setCONFIG_ACPI_BLACKLIST_YEAR=0
#CONFIG_ACPI_DEBUGis not set
#CONFIG_ACPI_PCI_SLOTis not setCONFIG_X86_PM_TIMER=y
#CONFIG_ACPI_CONTAINERis not set
#CONFIG_ACPI_SBSis not set
#CONFIG_APMis not set#
# CPU Frequency scaling
#CONFIG_CPU_FREQ=yCONFIG_CPU_FREQ_TABLE=y
#CONFIG_CPU_FREQ_DEBUGis not setCONFIG_CPU_FREQ_STAT=y
#CONFIG_CPU_FREQ_STAT_DETAILSis not setCONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
#CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVEis not set #CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACEis not set #CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMANDis not set #CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVEis not setCONFIG_CPU_FREQ_GOV_PERFORMANCE=y
#CONFIG_CPU_FREQ_GOV_POWERSAVEis not set
#CONFIG_CPU_FREQ_GOV_USERSPACEis not set
#CONFIG_CPU_FREQ_GOV_ONDEMANDis not set
#CONFIG_CPU_FREQ_GOV_CONSERVATIVEis not set#
# CPUFreq processor drivers
#
#CONFIG_X86_ACPI_CPUFREQis not set
#CONFIG_X86_POWERNOW_K6is not set
#CONFIG_X86_POWERNOW_K7is not set
#CONFIG_X86_POWERNOW_K8is not set
#CONFIG_X86_GX_SUSPMODis not setCONFIG_X86_SPEEDSTEP_CENTRINO=yCONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
#CONFIG_X86_SPEEDSTEP_ICHis not set
#CONFIG_X86_SPEEDSTEP_SMIis not set
#CONFIG_X86_P4_CLOCKMODis not set
#CONFIG_X86_CPUFREQ_NFORCE2is not set
#CONFIG_X86_LONGRUNis not set
#CONFIG_X86_LONGHAULis not set
#CONFIG_X86_E_POWERSAVERis not set#
# shared options # # CONFIG_X86_SPEEDSTEP_LIB is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y#
# Bus options (PCI etc.)
#CONFIG_PCI=y
#CONFIG_PCI_GOBIOSis not set
#CONFIG_PCI_GOMMCONFIGis not set
#CONFIG_PCI_GODIRECTis not set
#CONFIG_PCI_GOOLPCis not setCONFIG_PCI_GOANY=yCONFIG_PCI_BIOS=yCONFIG_PCI_DIRECT=yCONFIG_PCI_MMCONFIG=yCONFIG_PCI_DOMAINS=y
#CONFIG_PCIEPORTBUSis not set
#CONFIG_ARCH_SUPPORTS_MSIis not setCONFIG_PCI_LEGACY=y
#CONFIG_PCI_DEBUGis not set
#CONFIG_PCI_STUBis not setCONFIG_ISA_DMA_API=y
#CONFIG_ISAis not set
#CONFIG_MCAis not set
#CONFIG_SCx200is not set
#CONFIG_OLPCis not setCONFIG_K8_NB=yCONFIG_PCCARD=y
#CONFIG_PCMCIA_DEBUGis not setCONFIG_PCMCIA=yCONFIG_PCMCIA_LOAD_CIS=yCONFIG_PCMCIA_IOCTL=yCONFIG_CARDBUS=y#
# PC-card bridges
#CONFIG_YENTA=yCONFIG_YENTA_O2=yCONFIG_YENTA_RICOH=yCONFIG_YENTA_TI=yCONFIG_YENTA_ENE_TUNE=yCONFIG_YENTA_TOSHIBA=y
#CONFIG_PD6729is not set
#CONFIG_I82092is not setCONFIG_PCCARD_NONSTATIC=yCONFIG_HOTPLUG_PCI=y
#CONFIG_HOTPLUG_PCI_FAKEis not set
#CONFIG_HOTPLUG_PCI_COMPAQis not set
#CONFIG_HOTPLUG_PCI_ACPIis not set
#CONFIG_HOTPLUG_PCI_CPCIis not setCONFIG_HOTPLUG_PCI_SHPC=y#
# Executable file formats / Emulations
#CONFIG_BINFMT_ELF=y
#CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERSis not setCONFIG_HAVE_AOUT=y
#CONFIG_BINFMT_AOUTis not setCONFIG_BINFMT_MISC=yCONFIG_HAVE_ATOMIC_IOMAP=yCONFIG_NET=y#
# Networking options
#CONFIG_COMPAT_NET_DEV_OPS=yCONFIG_PACKET=yCONFIG_PACKET_MMAP=yCONFIG_UNIX=yCONFIG_XFRM=y
#CONFIG_XFRM_USERis not set
#CONFIG_XFRM_SUB_POLICYis not set
#CONFIG_XFRM_MIGRATEis not set
#CONFIG_XFRM_STATISTICSis not setCONFIG_NET_KEY=y
#CONFIG_NET_KEY_MIGRATEis not setCONFIG_INET=yCONFIG_IP_MULTICAST=y
#CONFIG_IP_ADVANCED_ROUTERis not setCONFIG_IP_FIB_HASH=y
#CONFIG_IP_PNPis not set
#CONFIG_NET_IPIPis not set
#CONFIG_NET_IPGREis not set
#CONFIG_IP_MROUTEis not set
#CONFIG_ARPDis not set
#CONFIG_SYN_COOKIESis not set
#CONFIG_INET_AHis not set
#CONFIG_INET_ESPis not set
#CONFIG_INET_IPCOMPis not set
#CONFIG_INET_XFRM_TUNNELis not setCONFIG_INET_TUNNEL=yCONFIG_INET_XFRM_MODE_TRANSPORT=yCONFIG_INET_XFRM_MODE_TUNNEL=yCONFIG_INET_XFRM_MODE_BEET=y
#CONFIG_INET_LROis not setCONFIG_INET_DIAG=yCONFIG_INET_TCP_DIAG=y
#CONFIG_TCP_CONG_ADVANCEDis not setCONFIG_TCP_CONG_CUBIC=yCONFIG_DEFAULT_TCP_CONG="cubic"
#CONFIG_TCP_MD5SIGis not setCONFIG_IPV6=y
#CONFIG_IPV6_PRIVACYis not set
#CONFIG_IPV6_ROUTER_PREFis not set
#CONFIG_IPV6_OPTIMISTIC_DADis not set
#CONFIG_INET6_AHis not set
#CONFIG_INET6_ESPis not set
#CONFIG_INET6_IPCOMPis not set
#CONFIG_IPV6_MIP6is not set
#CONFIG_INET6_XFRM_TUNNELis not set
#CONFIG_INET6_TUNNELis not setCONFIG_INET6_XFRM_MODE_TRANSPORT=yCONFIG_INET6_XFRM_MODE_TUNNEL=yCONFIG_INET6_XFRM_MODE_BEET=y
#CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATIONis not setCONFIG_IPV6_SIT=yCONFIG_IPV6_NDISC_NODETYPE=y
#CONFIG_IPV6_TUNNELis not set
#CONFIG_IPV6_MULTIPLE_TABLESis not set
#CONFIG_IPV6_MROUTEis not set
#CONFIG_NETLABELis not set
#CONFIG_NETWORK_SECMARKis not setCONFIG_NETFILTER=y
#CONFIG_NETFILTER_DEBUGis not setCONFIG_NETFILTER_ADVANCED=y#
# Core Netfilter Configuration
#
#CONFIG_NETFILTER_NETLINK_QUEUEis not set
#CONFIG_NETFILTER_NETLINK_LOGis not set
#CONFIG_NF_CONNTRACKis not setCONFIG_NETFILTER_XTABLES=y
#CONFIG_NETFILTER_XT_TARGET_CLASSIFYis not set
#CONFIG_NETFILTER_XT_TARGET_MARKis not set
#CONFIG_NETFILTER_XT_TARGET_NFLOGis not set
#CONFIG_NETFILTER_XT_TARGET_NFQUEUEis not set
#CONFIG_NETFILTER_XT_TARGET_RATEESTis not set
#CONFIG_NETFILTER_XT_TARGET_TCPMSSis not set
#CONFIG_NETFILTER_XT_MATCH_COMMENTis not set
#CONFIG_NETFILTER_XT_MATCH_DCCPis not set
#CONFIG_NETFILTER_XT_MATCH_DSCPis not set
#CONFIG_NETFILTER_XT_MATCH_ESPis not set
#CONFIG_NETFILTER_XT_MATCH_HASHLIMITis not set
#CONFIG_NETFILTER_XT_MATCH_IPRANGEis not set
#CONFIG_NETFILTER_XT_MATCH_LENGTHis not set
#CONFIG_NETFILTER_XT_MATCH_LIMITis not set
#CONFIG_NETFILTER_XT_MATCH_MACis not set
#CONFIG_NETFILTER_XT_MATCH_MARKis not set
#CONFIG_NETFILTER_XT_MATCH_MULTIPORTis not set
#CONFIG_NETFILTER_XT_MATCH_OWNERis not set
#CONFIG_NETFILTER_XT_MATCH_POLICYis not set
#CONFIG_NETFILTER_XT_MATCH_PKTTYPEis not set
#CONFIG_NETFILTER_XT_MATCH_QUOTAis not set
#CONFIG_NETFILTER_XT_MATCH_RATEESTis not set
#CONFIG_NETFILTER_XT_MATCH_REALMis not set
#CONFIG_NETFILTER_XT_MATCH_RECENTis not set
#CONFIG_NETFILTER_XT_MATCH_SCTPis not set
#CONFIG_NETFILTER_XT_MATCH_STATISTICis not set
#CONFIG_NETFILTER_XT_MATCH_STRINGis not set
#CONFIG_NETFILTER_XT_MATCH_TCPMSSis not set
#CONFIG_NETFILTER_XT_MATCH_TIMEis not set
#CONFIG_NETFILTER_XT_MATCH_U32is not set
#CONFIG_IP_VSis not set#
# IP: Netfilter Configuration
#
#CONFIG_NF_DEFRAG_IPV4is not setCONFIG_IP_NF_QUEUE=yCONFIG_IP_NF_IPTABLES=y
#CONFIG_IP_NF_MATCH_ADDRTYPEis not set
#CONFIG_IP_NF_MATCH_AHis not set
#CONFIG_IP_NF_MATCH_ECNis not set
#CONFIG_IP_NF_MATCH_TTLis not set
#CONFIG_IP_NF_FILTERis not set
#CONFIG_IP_NF_TARGET_LOGis not set
#CONFIG_IP_NF_TARGET_ULOGis not set
#CONFIG_IP_NF_MANGLEis not set
#CONFIG_IP_NF_RAWis not set
#CONFIG_IP_NF_SECURITYis not set
#CONFIG_IP_NF_ARPTABLESis not set#
# IPv6: Netfilter Configuration
#
#CONFIG_IP6_NF_QUEUEis not set
#CONFIG_IP6_NF_IPTABLESis not set
#CONFIG_IP_DCCPis not setCONFIG_IP_SCTP=y
#CONFIG_SCTP_DBG_MSGis not set
#CONFIG_SCTP_DBG_OBJCNTis not set
#CONFIG_SCTP_HMAC_NONEis not set
#CONFIG_SCTP_HMAC_SHA1is not setCONFIG_SCTP_HMAC_MD5=y
#CONFIG_TIPCis not set
#CONFIG_ATMis not set
#CONFIG_BRIDGEis not set
#CONFIG_NET_DSAis not set
#CONFIG_VLAN_8021Qis not set
#CONFIG_DECNETis not set
#CONFIG_LLC2is not set
#CONFIG_IPXis not set
#CONFIG_ATALKis not set
#CONFIG_X25is not set
#CONFIG_LAPBis not set
#CONFIG_ECONETis not set
#CONFIG_WAN_ROUTERis not set
#CONFIG_NET_SCHEDis not set
#CONFIG_DCBis not set#
# Network testing
#
#CONFIG_NET_PKTGENis not set
#CONFIG_NET_TCPPROBEis not set
#CONFIG_HAMRADIOis not set
#CONFIG_CANis not set
#CONFIG_IRDAis not set
#CONFIG_BTis not set
#CONFIG_AF_RXRPCis not set
#CONFIG_PHONETis not setCONFIG_WIRELESS=y
#CONFIG_CFG80211is not setCONFIG_WIRELESS_OLD_REGULATORY=yCONFIG_WIRELESS_EXT=yCONFIG_WIRELESS_EXT_SYSFS=y
#CONFIG_LIB80211is not set
#CONFIG_MAC80211is not set
#CONFIG_WIMAXis not set
#CONFIG_RFKILLis not set
#CONFIG_NET_9Pis not set#
# Device Drivers
##
# Generic Driver Options
#CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"CONFIG_STANDALONE=yCONFIG_PREVENT_FIRMWARE_BUILD=yCONFIG_FW_LOADER=yCONFIG_FIRMWARE_IN_KERNEL=yCONFIG_EXTRA_FIRMWARE=""
#CONFIG_DEBUG_DRIVERis not set
#CONFIG_DEBUG_DEVRESis not set
#CONFIG_SYS_HYPERVISORis not set
#CONFIG_CONNECTORis not set
#CONFIG_MTDis not setCONFIG_PARPORT=yCONFIG_PARPORT_PC=y
#CONFIG_PARPORT_SERIALis not setCONFIG_PARPORT_PC_FIFO=yCONFIG_PARPORT_PC_SUPERIO=y
#CONFIG_PARPORT_PC_PCMCIAis not set
#CONFIG_PARPORT_GSCis not set
#CONFIG_PARPORT_AX88796is not setCONFIG_PARPORT_1284=yCONFIG_PNP=yCONFIG_PNP_DEBUG_MESSAGES=y#
# Protocols
#CONFIG_PNPACPI=yCONFIG_BLK_DEV=y
#CONFIG_BLK_DEV_FDis not set
#CONFIG_PARIDEis not set
#CONFIG_BLK_CPQ_DAis not set
#CONFIG_BLK_CPQ_CISS_DAis not set
#CONFIG_BLK_DEV_DAC960is not set
#CONFIG_BLK_DEV_UMEMis not set
#CONFIG_BLK_DEV_COW_COMMONis not setCONFIG_BLK_DEV_LOOP=y
#CONFIG_BLK_DEV_CRYPTOLOOPis not set
#CONFIG_BLK_DEV_NBDis not set
#CONFIG_BLK_DEV_SX8is not set
#CONFIG_BLK_DEV_UBis not set
#CONFIG_BLK_DEV_RAMis not set
#CONFIG_CDROM_PKTCDVDis not setCONFIG_ATA_OVER_ETH=y
#CONFIG_VIRTIO_BLKis not set
#CONFIG_BLK_DEV_HDis not setCONFIG_MISC_DEVICES=y
#CONFIG_IBM_ASMis not set
#CONFIG_PHANTOMis not set
#CONFIG_SGI_IOC4is not set
#CONFIG_TIFM_COREis not set
#CONFIG_ICS932S401is not set
#CONFIG_ENCLOSURE_SERVICESis not set
#CONFIG_HP_ILOis not set
#CONFIG_C2PORTis not set#
# EEPROM support
#
#CONFIG_EEPROM_AT24is not set
#CONFIG_EEPROM_LEGACYis not set
#CONFIG_EEPROM_93CX6is not setCONFIG_HAVE_IDE=y
#CONFIG_IDEis not set#
# SCSI device support
#
#CONFIG_RAID_ATTRSis not setCONFIG_SCSI=yCONFIG_SCSI_DMA=y
#CONFIG_SCSI_TGTis not set
#CONFIG_SCSI_NETLINKis not setCONFIG_SCSI_PROC_FS=y#
# SCSI support type (disk, tape, CD-ROM)
#CONFIG_BLK_DEV_SD=y
#CONFIG_CHR_DEV_STis not set
#CONFIG_CHR_DEV_OSSTis not setCONFIG_BLK_DEV_SR=y
#CONFIG_BLK_DEV_SR_VENDORis not setCONFIG_CHR_DEV_SG=y
#CONFIG_CHR_DEV_SCHis not set#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs #CONFIG_SCSI_MULTI_LUN=yCONFIG_SCSI_CONSTANTS=yCONFIG_SCSI_LOGGING=y
#CONFIG_SCSI_SCAN_ASYNCis not setCONFIG_SCSI_WAIT_SCAN=m#
# SCSI Transports
#
#CONFIG_SCSI_SPI_ATTRSis not set
#CONFIG_SCSI_FC_ATTRSis not set
#CONFIG_SCSI_ISCSI_ATTRSis not set
#CONFIG_SCSI_SAS_LIBSASis not set
#CONFIG_SCSI_SRP_ATTRSis not setCONFIG_SCSI_LOWLEVEL=y
#CONFIG_ISCSI_TCPis not set
#CONFIG_SCSI_CXGB3_ISCSIis not set
#CONFIG_BLK_DEV_3W_XXXX_RAIDis not set
#CONFIG_SCSI_3W_9XXXis not set
#CONFIG_SCSI_ACARDis not set
#CONFIG_SCSI_AACRAIDis not set
#CONFIG_SCSI_AIC7XXXis not set
#CONFIG_SCSI_AIC7XXX_OLDis not set
#CONFIG_SCSI_AIC79XXis not set
#CONFIG_SCSI_AIC94XXis not set
#CONFIG_SCSI_DPT_I2Ois not set
#CONFIG_SCSI_ADVANSYSis not set
#CONFIG_SCSI_ARCMSRis not set
#CONFIG_MEGARAID_NEWGENis not set
#CONFIG_MEGARAID_LEGACYis not set
#CONFIG_MEGARAID_SASis not set
#CONFIG_SCSI_HPTIOPis not set
#CONFIG_SCSI_BUSLOGICis not set
#CONFIG_LIBFCis not set
#CONFIG_FCOEis not set
#CONFIG_SCSI_DMX3191Dis not set
#CONFIG_SCSI_EATAis not set
#CONFIG_SCSI_FUTURE_DOMAINis not set
#CONFIG_SCSI_GDTHis not set
#CONFIG_SCSI_IPSis not set
#CONFIG_SCSI_INITIOis not set
#CONFIG_SCSI_INIA100is not set
#CONFIG_SCSI_PPAis not set
#CONFIG_SCSI_IMMis not set
#CONFIG_SCSI_MVSASis not set
#CONFIG_SCSI_STEXis not set
#CONFIG_SCSI_SYM53C8XX_2is not set
#CONFIG_SCSI_IPRis not set
#CONFIG_SCSI_QLOGIC_1280is not set
#CONFIG_SCSI_QLA_FCis not set
#CONFIG_SCSI_QLA_ISCSIis not set
#CONFIG_SCSI_LPFCis not set
#CONFIG_SCSI_DC395xis not set
#CONFIG_SCSI_DC390Tis not set
#CONFIG_SCSI_NSP32is not set
#CONFIG_SCSI_DEBUGis not set
#CONFIG_SCSI_SRPis not set
#CONFIG_SCSI_LOWLEVEL_PCMCIAis not set
#CONFIG_SCSI_DHis not setCONFIG_ATA=y
#CONFIG_ATA_NONSTANDARDis not setCONFIG_ATA_ACPI=yCONFIG_SATA_PMP=yCONFIG_SATA_AHCI=y
#CONFIG_SATA_SIL24is not setCONFIG_ATA_SFF=y
#CONFIG_SATA_SVWis not setCONFIG_ATA_PIIX=y
#CONFIG_SATA_MVis not set
#CONFIG_SATA_NVis not set
#CONFIG_PDC_ADMAis not set
#CONFIG_SATA_QSTORis not set
#CONFIG_SATA_PROMISEis not set
#CONFIG_SATA_SX4is not set
#CONFIG_SATA_SILis not set
#CONFIG_SATA_SISis not set
#CONFIG_SATA_ULIis not set
#CONFIG_SATA_VIAis not set
#CONFIG_SATA_VITESSEis not set
#CONFIG_SATA_INIC162Xis not set
#CONFIG_PATA_ACPIis not set
#CONFIG_PATA_ALIis not set
#CONFIG_PATA_AMDis not set
#CONFIG_PATA_ARTOPis not set
#CONFIG_PATA_ATIIXPis not set
#CONFIG_PATA_CMD640_PCIis not set
#CONFIG_PATA_CMD64Xis not set
#CONFIG_PATA_CS5520is not set
#CONFIG_PATA_CS5530is not set
#CONFIG_PATA_CS5535is not set
#CONFIG_PATA_CS5536is not set
#CONFIG_PATA_CYPRESSis not set
#CONFIG_PATA_EFARis not setCONFIG_ATA_GENERIC=y
#CONFIG_PATA_HPT366is not set
#CONFIG_PATA_HPT37Xis not set
#CONFIG_PATA_HPT3X2Nis not set
#CONFIG_PATA_HPT3X3is not set
#CONFIG_PATA_IT821Xis not set
#CONFIG_PATA_IT8213is not set
#CONFIG_PATA_JMICRONis not set
#CONFIG_PATA_TRIFLEXis not set
#CONFIG_PATA_MARVELLis not setCONFIG_PATA_MPIIX=y
#CONFIG_PATA_OLDPIIXis not set
#CONFIG_PATA_NETCELLis not set
#CONFIG_PATA_NINJA32is not set
#CONFIG_PATA_NS87410is not set
#CONFIG_PATA_NS87415is not set
#CONFIG_PATA_OPTIis not set
#CONFIG_PATA_OPTIDMAis not set
#CONFIG_PATA_PCMCIAis not set
#CONFIG_PATA_PDC_OLDis not set
#CONFIG_PATA_RADISYSis not set
#CONFIG_PATA_RZ1000is not set
#CONFIG_PATA_SC1200is not set
#CONFIG_PATA_SERVERWORKSis not set
#CONFIG_PATA_PDC2027Xis not set
#CONFIG_PATA_SIL680is not set
#CONFIG_PATA_SISis not set
#CONFIG_PATA_VIAis not set
#CONFIG_PATA_WINBONDis not set
#CONFIG_PATA_SCHis not set
#CONFIG_MDis not set
#CONFIG_FUSIONis not set#
# IEEE 1394 (FireWire) support
##
# Enable only one of the two stacks, unless you know what you are doing #
#CONFIG_FIREWIREis not setCONFIG_IEEE1394=yCONFIG_IEEE1394_OHCI1394=y
#CONFIG_IEEE1394_PCILYNXis not setCONFIG_IEEE1394_SBP2=yCONFIG_IEEE1394_SBP2_PHYS_DMA=y
#CONFIG_IEEE1394_ETH1394_ROM_ENTRYis not set
#CONFIG_IEEE1394_ETH1394is not set
#CONFIG_IEEE1394_RAWIOis not set
#CONFIG_IEEE1394_VIDEO1394is not set
#CONFIG_IEEE1394_DV1394is not set
#CONFIG_IEEE1394_VERBOSEDEBUGis not set
#CONFIG_I2Ois not set
#CONFIG_MACINTOSH_DRIVERSis not setCONFIG_NETDEVICES=yCONFIG_DUMMY=y
#CONFIG_BONDINGis not set
#CONFIG_MACVLANis not set
#CONFIG_EQUALIZERis not setCONFIG_TUN=y
#CONFIG_VETHis not set
#CONFIG_NET_SB1000is not set
#CONFIG_ARCNETis not set
#CONFIG_PHYLIBis not setCONFIG_NET_ETHERNET=yCONFIG_MII=y
#CONFIG_HAPPYMEALis not set
#CONFIG_SUNGEMis not set
#CONFIG_CASSINIis not setCONFIG_NET_VENDOR_3COM=yCONFIG_VORTEX=y
#CONFIG_TYPHOONis not set
#CONFIG_DNETis not set
#CONFIG_NET_TULIPis not set
#CONFIG_HP100is not set
#CONFIG_IBM_NEW_EMAC_ZMIIis not set
#CONFIG_IBM_NEW_EMAC_RGMIIis not set
#CONFIG_IBM_NEW_EMAC_TAHis not set
#CONFIG_IBM_NEW_EMAC_EMAC4is not set
#CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRLis not set
#CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTATis not set
#CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERRis not setCONFIG_NET_PCI=y
#CONFIG_PCNET32is not set
#CONFIG_AMD8111_ETHis not set
#CONFIG_ADAPTEC_STARFIREis not set
#CONFIG_B44is not set
#CONFIG_FORCEDETHis not set
#CONFIG_E100is not set
#CONFIG_FEALNXis not set
#CONFIG_NATSEMIis not set
#CONFIG_NE2K_PCIis not setCONFIG_8139CP=yCONFIG_8139TOO=y
#CONFIG_8139TOO_PIOis not setCONFIG_8139TOO_TUNE_TWISTER=yCONFIG_8139TOO_8129=y
#CONFIG_8139_OLD_RX_RESETis not set
#CONFIG_R6040is not set
#CONFIG_SIS900is not set
#CONFIG_EPIC100is not set
#CONFIG_SMSC9420is not set
#CONFIG_SUNDANCEis not set
#CONFIG_TLANis not set
#CONFIG_VIA_RHINEis not set
#CONFIG_SC92031is not set
#CONFIG_NET_POCKETis not set
#CONFIG_ATL2is not setCONFIG_NETDEV_1000=yCONFIG_ACENIC=y
#CONFIG_ACENIC_OMIT_TIGON_Iis not set
#CONFIG_DL2Kis not setCONFIG_E1000=y
#CONFIG_E1000Eis not set
#CONFIG_IP1000is not set
#CONFIG_IGBis not set
#CONFIG_NS83820is not set
#CONFIG_HAMACHIis not set
#CONFIG_YELLOWFINis not set
#CONFIG_R8169is not set
#CONFIG_SIS190is not set
#CONFIG_SKGEis not set
#CONFIG_SKY2is not set
#CONFIG_VIA_VELOCITYis not set
#CONFIG_TIGON3is not set
#CONFIG_BNX2is not set
#CONFIG_QLA3XXXis not set
#CONFIG_ATL1is not set
#CONFIG_ATL1Eis not set
#CONFIG_ATL1Cis not set
#CONFIG_JMEis not setCONFIG_NETDEV_10000=y
#CONFIG_CHELSIO_T1is not setCONFIG_CHELSIO_T3_DEPENDS=y
#CONFIG_CHELSIO_T3is not set
#CONFIG_ENICis not set
#CONFIG_IXGBEis not set
#CONFIG_IXGBis not set
#CONFIG_S2IOis not set
#CONFIG_MYRI10GEis not set
#CONFIG_NETXEN_NICis not set
#CONFIG_NIUis not set
#CONFIG_MLX4_ENis not set
#CONFIG_MLX4_COREis not set
#CONFIG_TEHUTIis not set
#CONFIG_BNX2Xis not set
#CONFIG_QLGEis not set
#CONFIG_SFCis not set
#CONFIG_BE2NETis not set
#CONFIG_TRis not set#
# Wireless LAN
#
#CONFIG_WLAN_PRE80211is not set
#CONFIG_WLAN_80211is not set
#CONFIG_IWLWIFI_LEDSis not set#
# Enable WiMAX (Networking options) to see the WiMAX drivers ##
# USB Network Adapters
#
#CONFIG_USB_CATCis not set
#CONFIG_USB_KAWETHis not set
#CONFIG_USB_PEGASUSis not set
#CONFIG_USB_RTL8150is not set
#CONFIG_USB_USBNETis not setCONFIG_NET_PCMCIA=y
#CONFIG_PCMCIA_3C589is not set
#CONFIG_PCMCIA_3C574is not set
#CONFIG_PCMCIA_FMVJ18Xis not set
#CONFIG_PCMCIA_PCNETis not set
#CONFIG_PCMCIA_NMCLANis not set
#CONFIG_PCMCIA_SMC91C92is not set
#CONFIG_PCMCIA_XIRC2PSis not set
#CONFIG_PCMCIA_AXNETis not set
#CONFIG_WANis not set
#CONFIG_FDDIis not set
#CONFIG_HIPPIis not set
#CONFIG_PLIPis not setCONFIG_PPP=y
#CONFIG_PPP_MULTILINKis not set
#CONFIG_PPP_FILTERis not set
#CONFIG_PPP_ASYNCis not set
#CONFIG_PPP_SYNC_TTYis not set
#CONFIG_PPP_DEFLATEis not set
#CONFIG_PPP_BSDCOMPis not set
#CONFIG_PPP_MPPEis not set
#CONFIG_PPPOEis not set
#CONFIG_PPPOL2TPis not set
#CONFIG_SLIPis not setCONFIG_SLHC=y
#CONFIG_NET_FCis not set
#CONFIG_NETCONSOLEis not set
#CONFIG_NETPOLLis not set
#CONFIG_NET_POLL_CONTROLLERis not setCONFIG_VIRTIO_NET=y
#CONFIG_ISDNis not set
#CONFIG_PHONEis not set#
# Input device support
#CONFIG_INPUT=yCONFIG_INPUT_FF_MEMLESS=m
#CONFIG_INPUT_POLLDEVis not set#
# Userland interfaces
#CONFIG_INPUT_MOUSEDEV=yCONFIG_INPUT_MOUSEDEV_PSAUX=yCONFIG_INPUT_MOUSEDEV_SCREEN_X=1024CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
#CONFIG_INPUT_JOYDEVis not setCONFIG_INPUT_EVDEV=y
#CONFIG_INPUT_EVBUGis not set#
# Input Device Drivers
#CONFIG_INPUT_KEYBOARD=yCONFIG_KEYBOARD_ATKBD=y
#CONFIG_KEYBOARD_SUNKBDis not set
#CONFIG_KEYBOARD_LKKBDis not set
#CONFIG_KEYBOARD_XTKBDis not set
#CONFIG_KEYBOARD_NEWTONis not set
#CONFIG_KEYBOARD_STOWAWAYis not setCONFIG_INPUT_MOUSE=yCONFIG_MOUSE_PS2=yCONFIG_MOUSE_PS2_ALPS=yCONFIG_MOUSE_PS2_LOGIPS2PP=yCONFIG_MOUSE_PS2_SYNAPTICS=yCONFIG_MOUSE_PS2_LIFEBOOK=yCONFIG_MOUSE_PS2_TRACKPOINT=y
#CONFIG_MOUSE_PS2_ELANTECHis not set
#CONFIG_MOUSE_PS2_TOUCHKITis not set
#CONFIG_MOUSE_SERIALis not set
#CONFIG_MOUSE_APPLETOUCHis not set
#CONFIG_MOUSE_BCM5974is not set
#CONFIG_MOUSE_VSXXXAAis not set
#CONFIG_INPUT_JOYSTICKis not set
#CONFIG_INPUT_TABLETis not set
#CONFIG_INPUT_TOUCHSCREENis not setCONFIG_INPUT_MISC=yCONFIG_INPUT_PCSPKR=y
#CONFIG_INPUT_WISTRON_BTNSis not set
#CONFIG_INPUT_ATLAS_BTNSis not set
#CONFIG_INPUT_ATI_REMOTEis not set
#CONFIG_INPUT_ATI_REMOTE2is not set
#CONFIG_INPUT_KEYSPAN_REMOTEis not set
#CONFIG_INPUT_POWERMATEis not set
#CONFIG_INPUT_YEALINKis not set
#CONFIG_INPUT_CM109is not set
#CONFIG_INPUT_UINPUTis not set#
# Hardware I/O ports
#CONFIG_SERIO=yCONFIG_SERIO_I8042=yCONFIG_SERIO_SERPORT=y
#CONFIG_SERIO_CT82C710is not set
#CONFIG_SERIO_PARKBDis not set
#CONFIG_SERIO_PCIPS2is not setCONFIG_SERIO_LIBPS2=yCONFIG_SERIO_RAW=y
#CONFIG_GAMEPORTis not set#
# Character devices
#CONFIG_VT=yCONFIG_CONSOLE_TRANSLATIONS=yCONFIG_VT_CONSOLE=yCONFIG_HW_CONSOLE=y
#CONFIG_VT_HW_CONSOLE_BINDINGis not setCONFIG_DEVKMEM=y
#CONFIG_SERIAL_NONSTANDARDis not set
#CONFIG_NOZOMIis not set#
# Serial drivers
#CONFIG_SERIAL_8250=yCONFIG_SERIAL_8250_CONSOLE=yCONFIG_FIX_EARLYCON_MEM=yCONFIG_SERIAL_8250_PCI=yCONFIG_SERIAL_8250_PNP=y
#CONFIG_SERIAL_8250_CSis not setCONFIG_SERIAL_8250_NR_UARTS=4CONFIG_SERIAL_8250_RUNTIME_UARTS=4CONFIG_SERIAL_8250_EXTENDED=yCONFIG_SERIAL_8250_MANY_PORTS=y
#CONFIG_SERIAL_8250_SHARE_IRQis not setCONFIG_SERIAL_8250_DETECT_IRQ=y
#CONFIG_SERIAL_8250_RSAis not set#
# Non-8250 serial port support
#CONFIG_SERIAL_CORE=yCONFIG_SERIAL_CORE_CONSOLE=yCONFIG_CONSOLE_POLL=y
#CONFIG_SERIAL_JSMis not setCONFIG_UNIX98_PTYS=y
#CONFIG_DEVPTS_MULTIPLE_INSTANCESis not setCONFIG_LEGACY_PTYS=yCONFIG_LEGACY_PTY_COUNT=256
#CONFIG_PRINTERis not set
#CONFIG_PPDEVis not set
#CONFIG_VIRTIO_CONSOLEis not set
#CONFIG_IPMI_HANDLERis not set
#CONFIG_HW_RANDOMis not setCONFIG_NVRAM=yCONFIG_RTC=y
#CONFIG_R3964is not set
#CONFIG_APPLICOMis not set
#CONFIG_SONYPIis not set#
# PCMCIA character devices
#
#CONFIG_SYNCLINK_CSis not set
#CONFIG_CARDMAN_4000is not set
#CONFIG_CARDMAN_4040is not set
#CONFIG_IPWIRELESSis not set
#CONFIG_MWAVEis not set
#CONFIG_PC8736x_GPIOis not set
#CONFIG_NSC_GPIOis not set
#CONFIG_CS5535_GPIOis not set
#CONFIG_RAW_DRIVERis not set
#CONFIG_HPETis not set
#CONFIG_HANGCHECK_TIMERis not set
#CONFIG_TCG_TPMis not set
#CONFIG_TELCLOCKis not setCONFIG_DEVPORT=yCONFIG_I2C=yCONFIG_I2C_BOARDINFO=y
#CONFIG_I2C_CHARDEVis not setCONFIG_I2C_HELPER_AUTO=yCONFIG_I2C_ALGOBIT=y#
# I2C Hardware Bus support
##
# PC SMBus host controller drivers
#
#CONFIG_I2C_ALI1535is not set
#CONFIG_I2C_ALI1563is not set
#CONFIG_I2C_ALI15X3is not set
#CONFIG_I2C_AMD756is not set
#CONFIG_I2C_AMD8111is not setCONFIG_I2C_I801=y
#CONFIG_I2C_ISCHis not set
#CONFIG_I2C_PIIX4is not set
#CONFIG_I2C_NFORCE2is not set
#CONFIG_I2C_SIS5595is not set
#CONFIG_I2C_SIS630is not set
#CONFIG_I2C_SIS96Xis not set
#CONFIG_I2C_VIAis not set
#CONFIG_I2C_VIAPROis not set#
# I2C system bus drivers (mostly embedded / system-on-chip) #
#CONFIG_I2C_OCORESis not set
#CONFIG_I2C_SIMTECis not set#
# External I2C/SMBus adapter drivers
#
#CONFIG_I2C_PARPORTis not set
#CONFIG_I2C_PARPORT_LIGHTis not set
#CONFIG_I2C_TAOS_EVMis not set
#CONFIG_I2C_TINY_USBis not set#
# Graphics adapter I2C/DDC channel drivers
#
#CONFIG_I2C_VOODOO3is not set#
# Other I2C/SMBus bus drivers
#
#CONFIG_I2C_PCA_PLATFORMis not set
#CONFIG_I2C_STUBis not set
#CONFIG_SCx200_ACBis not set#
# Miscellaneous I2C Chip support
#
#CONFIG_DS1682is not set
#CONFIG_SENSORS_PCF8574is not set
#CONFIG_PCF8575is not set
#CONFIG_SENSORS_PCA9539is not set
#CONFIG_SENSORS_PCF8591is not set
#CONFIG_SENSORS_MAX6875is not set
#CONFIG_SENSORS_TSL2550is not set
#CONFIG_I2C_DEBUG_COREis not set
#CONFIG_I2C_DEBUG_ALGOis not set
#CONFIG_I2C_DEBUG_BUSis not set
#CONFIG_I2C_DEBUG_CHIPis not set
#CONFIG_SPIis not setCONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
#CONFIG_GPIOLIBis not set
#CONFIG_W1is not setCONFIG_POWER_SUPPLY=y
#CONFIG_POWER_SUPPLY_DEBUGis not set
#CONFIG_PDA_POWERis not set
#CONFIG_BATTERY_DS2760is not set
#CONFIG_BATTERY_BQ27x00is not setCONFIG_HWMON=y
#CONFIG_HWMON_VIDis not set
#CONFIG_SENSORS_ABITUGURUis not set
#CONFIG_SENSORS_ABITUGURU3is not set
#CONFIG_SENSORS_AD7414is not set
#CONFIG_SENSORS_AD7418is not set
#CONFIG_SENSORS_ADM1021is not set
#CONFIG_SENSORS_ADM1025is not set
#CONFIG_SENSORS_ADM1026is not set
#CONFIG_SENSORS_ADM1029is not set
#CONFIG_SENSORS_ADM1031is not set
#CONFIG_SENSORS_ADM9240is not set
#CONFIG_SENSORS_ADT7462is not set
#CONFIG_SENSORS_ADT7470is not set
#CONFIG_SENSORS_ADT7473is not set
#CONFIG_SENSORS_ADT7475is not set
#CONFIG_SENSORS_K8TEMPis not set
#CONFIG_SENSORS_ASB100is not set
#CONFIG_SENSORS_ATXP1is not set
#CONFIG_SENSORS_DS1621is not set
#CONFIG_SENSORS_I5K_AMBis not set
#CONFIG_SENSORS_F71805Fis not set
#CONFIG_SENSORS_F71882FGis not set
#CONFIG_SENSORS_F75375Sis not set
#CONFIG_SENSORS_FSCHERis not set
#CONFIG_SENSORS_FSCPOSis not set
#CONFIG_SENSORS_FSCHMDis not set
#CONFIG_SENSORS_GL518SMis not set
#CONFIG_SENSORS_GL520SMis not set
#CONFIG_SENSORS_CORETEMPis not set
#CONFIG_SENSORS_IT87is not set
#CONFIG_SENSORS_LM63is not set
#CONFIG_SENSORS_LM75is not set
#CONFIG_SENSORS_LM77is not set
#CONFIG_SENSORS_LM78is not set
#CONFIG_SENSORS_LM80is not set
#CONFIG_SENSORS_LM83is not set
#CONFIG_SENSORS_LM85is not set
#CONFIG_SENSORS_LM87is not set
#CONFIG_SENSORS_LM90is not set
#CONFIG_SENSORS_LM92is not set
#CONFIG_SENSORS_LM93is not set
#CONFIG_SENSORS_LTC4245is not set
#CONFIG_SENSORS_MAX1619is not set
#CONFIG_SENSORS_MAX6650is not set
#CONFIG_SENSORS_PC87360is not set
#CONFIG_SENSORS_PC87427is not set
#CONFIG_SENSORS_SIS5595is not set
#CONFIG_SENSORS_DME1737is not set
#CONFIG_SENSORS_SMSC47M1is not set
#CONFIG_SENSORS_SMSC47M192is not set
#CONFIG_SENSORS_SMSC47B397is not set
#CONFIG_SENSORS_ADS7828is not set
#CONFIG_SENSORS_THMC50is not set
#CONFIG_SENSORS_VIA686Ais not set
#CONFIG_SENSORS_VT1211is not set
#CONFIG_SENSORS_VT8231is not set
#CONFIG_SENSORS_W83781Dis not set
#CONFIG_SENSORS_W83791Dis not set
#CONFIG_SENSORS_W83792Dis not set
#CONFIG_SENSORS_W83793is not set
#CONFIG_SENSORS_W83L785TSis not set
#CONFIG_SENSORS_W83L786NGis not set
#CONFIG_SENSORS_W83627HFis not set
#CONFIG_SENSORS_W83627EHFis not set
#CONFIG_SENSORS_HDAPSis not set
#CONFIG_SENSORS_LIS3LV02Dis not set
#CONFIG_SENSORS_APPLESMCis not set
#CONFIG_HWMON_DEBUG_CHIPis not setCONFIG_THERMAL=y
#CONFIG_THERMAL_HWMONis not set
#CONFIG_WATCHDOGis not setCONFIG_SSB_POSSIBLE=y#
# Sonics Silicon Backplane
#
#CONFIG_SSBis not set#
# Multifunction device drivers
#
#CONFIG_MFD_COREis not set
#CONFIG_MFD_SM501is not set
#CONFIG_HTC_PASIC3is not set
#CONFIG_TWL4030_COREis not set
#CONFIG_MFD_TMIOis not set
#CONFIG_PMIC_DA903Xis not set
#CONFIG_MFD_WM8400is not set
#CONFIG_MFD_WM8350_I2Cis not set
#CONFIG_MFD_PCF50633is not set
#CONFIG_REGULATORis not set#
# Multimedia devices
##
# Multimedia core support
#
#CONFIG_VIDEO_DEVis not set
#CONFIG_DVB_COREis not set
#CONFIG_VIDEO_MEDIAis not set#
# Multimedia drivers
#CONFIG_DAB=y
#CONFIG_USB_DABUSBis not set#
# Graphics support
#CONFIG_AGP=y
#CONFIG_AGP_ALIis not set
#CONFIG_AGP_ATIis not set
#CONFIG_AGP_AMDis not setCONFIG_AGP_AMD64=yCONFIG_AGP_INTEL=y
#CONFIG_AGP_NVIDIAis not set
#CONFIG_AGP_SISis not set
#CONFIG_AGP_SWORKSis not set
#CONFIG_AGP_VIAis not set
#CONFIG_AGP_EFFICEONis not setCONFIG_DRM=y
#CONFIG_DRM_TDFXis not set
#CONFIG_DRM_R128is not setCONFIG_DRM_RADEON=yCONFIG_DRM_I810=yCONFIG_DRM_I830=y
#CONFIG_DRM_I915is not set
#CONFIG_DRM_MGAis not set
#CONFIG_DRM_SISis not set
#CONFIG_DRM_VIAis not set
#CONFIG_DRM_SAVAGEis not set
#CONFIG_VGASTATEis not set
#CONFIG_VIDEO_OUTPUT_CONTROLis not set
#CONFIG_FBis not set
#CONFIG_BACKLIGHT_LCD_SUPPORTis not set#
# Display device support
#
#CONFIG_DISPLAY_SUPPORTis not set#
# Console display driver support
#CONFIG_VGA_CONSOLE=y
#CONFIG_VGACON_SOFT_SCROLLBACKis not setCONFIG_DUMMY_CONSOLE=yCONFIG_SOUND=yCONFIG_SOUND_OSS_CORE=yCONFIG_SND=yCONFIG_SND_TIMER=yCONFIG_SND_PCM=yCONFIG_SND_RAWMIDI=yCONFIG_SND_SEQUENCER=yCONFIG_SND_SEQ_DUMMY=yCONFIG_SND_OSSEMUL=yCONFIG_SND_MIXER_OSS=yCONFIG_SND_PCM_OSS=yCONFIG_SND_PCM_OSS_PLUGINS=yCONFIG_SND_SEQUENCER_OSS=yCONFIG_SND_RTCTIMER=yCONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
#CONFIG_SND_DYNAMIC_MINORSis not setCONFIG_SND_SUPPORT_OLD_API=yCONFIG_SND_VERBOSE_PROCFS=yCONFIG_SND_VERBOSE_PRINTK=y
#CONFIG_SND_DEBUGis not setCONFIG_SND_VMASTER=yCONFIG_SND_AC97_CODEC=yCONFIG_SND_DRIVERS=y
#CONFIG_SND_DUMMYis not setCONFIG_SND_VIRMIDI=y
#CONFIG_SND_MTPAVis not set
#CONFIG_SND_MTS64is not set
#CONFIG_SND_SERIAL_U16550is not set
#CONFIG_SND_MPU401is not set
#CONFIG_SND_PORTMAN2X4is not set
#CONFIG_SND_AC97_POWER_SAVEis not setCONFIG_SND_PCI=y
#CONFIG_SND_AD1889is not set
#CONFIG_SND_ALS300is not set
#CONFIG_SND_ALS4000is not set
#CONFIG_SND_ALI5451is not set
#CONFIG_SND_ATIIXPis not set
#CONFIG_SND_ATIIXP_MODEMis not set
#CONFIG_SND_AU8810is not set
#CONFIG_SND_AU8820is not set
#CONFIG_SND_AU8830is not set
#CONFIG_SND_AW2is not set
#CONFIG_SND_AZT3328is not set
#CONFIG_SND_BT87Xis not set
#CONFIG_SND_CA0106is not set
#CONFIG_SND_CMIPCIis not set
#CONFIG_SND_OXYGENis not set
#CONFIG_SND_CS4281is not set
#CONFIG_SND_CS46XXis not set
#CONFIG_SND_CS5530is not set
#CONFIG_SND_CS5535AUDIOis not set
#CONFIG_SND_DARLA20is not set
#CONFIG_SND_GINA20is not set
#CONFIG_SND_LAYLA20is not set
#CONFIG_SND_DARLA24is not set
#CONFIG_SND_GINA24is not set
#CONFIG_SND_LAYLA24is not set
#CONFIG_SND_MONAis not set
#CONFIG_SND_MIAis not set
#CONFIG_SND_ECHO3Gis not set
#CONFIG_SND_INDIGOis not set
#CONFIG_SND_INDIGOIOis not set
#CONFIG_SND_INDIGODJis not set
#CONFIG_SND_EMU10K1is not set
#CONFIG_SND_EMU10K1Xis not set
#CONFIG_SND_ENS1370is not set
#CONFIG_SND_ENS1371is not set
#CONFIG_SND_ES1938is not set
#CONFIG_SND_ES1968is not set
#CONFIG_SND_FM801is not set
#CONFIG_SND_HDA_INTELis not set
#CONFIG_SND_HDSPis not set
#CONFIG_SND_HDSPMis not set
#CONFIG_SND_HIFIERis not set
#CONFIG_SND_ICE1712is not set
#CONFIG_SND_ICE1724is not setCONFIG_SND_INTEL8X0=y
#CONFIG_SND_INTEL8X0Mis not set
#CONFIG_SND_KORG1212is not set
#CONFIG_SND_MAESTRO3is not set
#CONFIG_SND_MIXARTis not set
#CONFIG_SND_NM256is not set
#CONFIG_SND_PCXHRis not set
#CONFIG_SND_RIPTIDEis not set
#CONFIG_SND_RME32is not set
#CONFIG_SND_RME96is not set
#CONFIG_SND_RME9652is not set
#CONFIG_SND_SIS7019is not set
#CONFIG_SND_SONICVIBESis not set
#CONFIG_SND_TRIDENTis not set
#CONFIG_SND_VIA82XXis not set
#CONFIG_SND_VIA82XX_MODEMis not set
#CONFIG_SND_VIRTUOSOis not set
#CONFIG_SND_VX222is not set
#CONFIG_SND_YMFPCIis not setCONFIG_SND_USB=y
#CONFIG_SND_USB_AUDIOis not set
#CONFIG_SND_USB_USX2Yis not set
#CONFIG_SND_USB_CAIAQis not set
#CONFIG_SND_USB_US122Lis not setCONFIG_SND_PCMCIA=y
#CONFIG_SND_VXPOCKETis not set
#CONFIG_SND_PDAUDIOCFis not set
#CONFIG_SND_SOCis not set
#CONFIG_SOUND_PRIMEis not setCONFIG_AC97_BUS=yCONFIG_HID_SUPPORT=yCONFIG_HID=y
#CONFIG_HID_DEBUGis not set
#CONFIG_HIDRAWis not set#
# USB Input Devices
#CONFIG_USB_HID=y
#CONFIG_HID_PIDis not set
#CONFIG_USB_HIDDEVis not set#
# Special HID drivers
#CONFIG_HID_COMPAT=yCONFIG_HID_A4TECH=yCONFIG_HID_APPLE=yCONFIG_HID_BELKIN=yCONFIG_HID_CHERRY=yCONFIG_HID_CHICONY=yCONFIG_HID_CYPRESS=yCONFIG_HID_EZKEY=yCONFIG_HID_GYRATION=yCONFIG_HID_LOGITECH=y
#CONFIG_LOGITECH_FFis not set
#CONFIG_LOGIRUMBLEPAD2_FFis not setCONFIG_HID_MICROSOFT=yCONFIG_HID_MONTEREY=yCONFIG_HID_NTRIG=yCONFIG_HID_PANTHERLORD=y
#CONFIG_PANTHERLORD_FFis not setCONFIG_HID_PETALYNX=yCONFIG_HID_SAMSUNG=yCONFIG_HID_SONY=yCONFIG_HID_SUNPLUS=y
#CONFIG_GREENASIA_FFis not setCONFIG_HID_TOPSEED=yCONFIG_THRUSTMASTER_FF=mCONFIG_ZEROPLUS_FF=mCONFIG_USB_SUPPORT=yCONFIG_USB_ARCH_HAS_HCD=yCONFIG_USB_ARCH_HAS_OHCI=yCONFIG_USB_ARCH_HAS_EHCI=yCONFIG_USB=y
#CONFIG_USB_DEBUGis not set
#CONFIG_USB_ANNOUNCE_NEW_DEVICESis not set#
# Miscellaneous USB options
#CONFIG_USB_DEVICEFS=yCONFIG_USB_DEVICE_CLASS=yCONFIG_USB_DYNAMIC_MINORS=y
#CONFIG_USB_SUSPENDis not set
#CONFIG_USB_OTGis not setCONFIG_USB_MON=y
#CONFIG_USB_WUSBis not set
#CONFIG_USB_WUSB_CBAFis not set#
# USB Host Controller Drivers
#
#CONFIG_USB_C67X00_HCDis not setCONFIG_USB_EHCI_HCD=y
#CONFIG_USB_EHCI_ROOT_HUB_TTis not set
#CONFIG_USB_EHCI_TT_NEWSCHEDis not set
#CONFIG_USB_OXU210HP_HCDis not set
#CONFIG_USB_ISP116X_HCDis not set
#CONFIG_USB_ISP1760_HCDis not setCONFIG_USB_OHCI_HCD=y
#CONFIG_USB_OHCI_BIG_ENDIAN_DESCis not set
#CONFIG_USB_OHCI_BIG_ENDIAN_MMIOis not setCONFIG_USB_OHCI_LITTLE_ENDIAN=yCONFIG_USB_UHCI_HCD=y
#CONFIG_USB_SL811_HCDis not set
#CONFIG_USB_R8A66597_HCDis not set
#CONFIG_USB_WHCI_HCDis not set
#CONFIG_USB_HWA_HCDis not set#
# USB Device Class drivers
#
#CONFIG_USB_ACMis not setCONFIG_USB_PRINTER=y
#CONFIG_USB_WDMis not set
#CONFIG_USB_TMCis not set#
# NOTE:USB_STORAGEdepends on SCSI butBLK_DEV_SDmay also be needed; ##
# see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set # CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_LIBUSUAL is not set#
# USB Imaging devices
#
#CONFIG_USB_MDC800is not set
#CONFIG_USB_MICROTEKis not set#
# USB port drivers
#
#CONFIG_USB_USS720is not set
#CONFIG_USB_SERIALis not set#
# USB Miscellaneous drivers
#
#CONFIG_USB_EMI62is not set
#CONFIG_USB_EMI26is not set
#CONFIG_USB_ADUTUXis not set
#CONFIG_USB_SEVSEGis not set
#CONFIG_USB_RIO500is not set
#CONFIG_USB_LEGOTOWERis not set
#CONFIG_USB_LCDis not set
#CONFIG_USB_BERRY_CHARGEis not set
#CONFIG_USB_LEDis not set
#CONFIG_USB_CYPRESS_CY7C63is not set
#CONFIG_USB_CYTHERMis not set
#CONFIG_USB_PHIDGETis not set
#CONFIG_USB_IDMOUSEis not set
#CONFIG_USB_FTDI_ELANis not set
#CONFIG_USB_APPLEDISPLAYis not set
#CONFIG_USB_SISUSBVGAis not set
#CONFIG_USB_LDis not set
#CONFIG_USB_TRANCEVIBRATORis not set
#CONFIG_USB_IOWARRIORis not set
#CONFIG_USB_TESTis not set
#CONFIG_USB_ISIGHTFWis not set
#CONFIG_USB_VSTis not set
#CONFIG_USB_GADGETis not set#
# OTG and related infrastructure
#
#CONFIG_UWBis not set
#CONFIG_MMCis not set
#CONFIG_MEMSTICKis not set
#CONFIG_NEW_LEDSis not set
#CONFIG_ACCESSIBILITYis not setCONFIG_INFINIBAND=y
#CONFIG_INFINIBAND_USER_MADis not set
#CONFIG_INFINIBAND_USER_ACCESSis not setCONFIG_INFINIBAND_ADDR_TRANS=y
#CONFIG_INFINIBAND_MTHCAis not set
#CONFIG_INFINIBAND_AMSO1100is not set
#CONFIG_MLX4_INFINIBANDis not set
#CONFIG_INFINIBAND_NESis not set
#CONFIG_INFINIBAND_IPOIBis not set
#CONFIG_INFINIBAND_SRPis not set
#CONFIG_INFINIBAND_ISERis not setCONFIG_EDAC=y#
# Reporting subsystems
#
#CONFIG_EDAC_DEBUGis not setCONFIG_EDAC_MM_EDAC=y
#CONFIG_EDAC_AMD76Xis not set
#CONFIG_EDAC_E7XXXis not set
#CONFIG_EDAC_E752Xis not set
#CONFIG_EDAC_I82875Pis not set
#CONFIG_EDAC_I82975Xis not set
#CONFIG_EDAC_I3000is not set
#CONFIG_EDAC_X38is not set
#CONFIG_EDAC_I5400is not set
#CONFIG_EDAC_I82860is not set
#CONFIG_EDAC_R82600is not set
#CONFIG_EDAC_I5000is not set
#CONFIG_EDAC_I5100is not set
#CONFIG_RTC_CLASSis not set
#CONFIG_DMADEVICESis not set
#CONFIG_AUXDISPLAYis not set
#CONFIG_UIOis not set
#CONFIG_STAGINGis not setCONFIG_X86_PLATFORM_DEVICES=y
#CONFIG_ASUS_LAPTOPis not set
#CONFIG_TC1100_WMIis not set
#CONFIG_SONY_LAPTOPis not set
#CONFIG_THINKPAD_ACPIis not set
#CONFIG_INTEL_MENLOWis not set
#CONFIG_EEEPC_LAPTOPis not set
#CONFIG_ACPI_WMIis not set
#CONFIG_ACPI_ASUSis not set
#CONFIG_ACPI_TOSHIBAis not set#
# Firmware Drivers
#
#CONFIG_EDDis not setCONFIG_FIRMWARE_MEMMAP=y
#CONFIG_DELL_RBUis not set
#CONFIG_DCDBASis not setCONFIG_DMIID=y
#CONFIG_ISCSI_IBFT_FINDis not set#
# File systems
#CONFIG_EXT2_FS=yCONFIG_EXT2_FS_XATTR=yCONFIG_EXT2_FS_POSIX_ACL=yCONFIG_EXT2_FS_SECURITY=y
#CONFIG_EXT2_FS_XIPis not setCONFIG_EXT3_FS=yCONFIG_EXT3_FS_XATTR=yCONFIG_EXT3_FS_POSIX_ACL=yCONFIG_EXT3_FS_SECURITY=yCONFIG_EXT4_FS=y
#CONFIG_EXT4DEV_COMPATis not setCONFIG_EXT4_FS_XATTR=yCONFIG_EXT4_FS_POSIX_ACL=yCONFIG_EXT4_FS_SECURITY=yCONFIG_JBD=yCONFIG_JBD_DEBUG=yCONFIG_JBD2=yCONFIG_JBD2_DEBUG=yCONFIG_FS_MBCACHE=yCONFIG_REISERFS_FS=y
#CONFIG_REISERFS_CHECKis not set
#CONFIG_REISERFS_PROC_INFOis not setCONFIG_REISERFS_FS_XATTR=yCONFIG_REISERFS_FS_POSIX_ACL=y
#CONFIG_REISERFS_FS_SECURITYis not setCONFIG_JFS_FS=yCONFIG_JFS_POSIX_ACL=y
#CONFIG_JFS_SECURITYis not set
#CONFIG_JFS_DEBUGis not set
#CONFIG_JFS_STATISTICSis not setCONFIG_FS_POSIX_ACL=yCONFIG_FILE_LOCKING=yCONFIG_XFS_FS=y
#CONFIG_XFS_QUOTAis not setCONFIG_XFS_POSIX_ACL=y
#CONFIG_XFS_RTis not set
#CONFIG_XFS_DEBUGis not set
#CONFIG_GFS2_FSis not setCONFIG_OCFS2_FS=yCONFIG_OCFS2_FS_O2CB=yCONFIG_OCFS2_FS_USERSPACE_CLUSTER=yCONFIG_OCFS2_FS_STATS=yCONFIG_OCFS2_DEBUG_MASKLOG=y
#CONFIG_OCFS2_DEBUG_FSis not set
#CONFIG_OCFS2_FS_POSIX_ACLis not set
#CONFIG_BTRFS_FSis not setCONFIG_DNOTIFY=yCONFIG_INOTIFY=yCONFIG_INOTIFY_USER=yCONFIG_QUOTA=y
#CONFIG_QUOTA_NETLINK_INTERFACEis not setCONFIG_PRINT_QUOTA_WARNING=yCONFIG_QUOTA_TREE=y
#CONFIG_QFMT_V1is not setCONFIG_QFMT_V2=yCONFIG_QUOTACTL=y
#CONFIG_AUTOFS_FSis not set
#CONFIG_AUTOFS4_FSis not set
#CONFIG_FUSE_FSis not set#
# CD-ROM/DVD Filesystems
#CONFIG_ISO9660_FS=yCONFIG_JOLIET=yCONFIG_ZISOFS=yCONFIG_UDF_FS=yCONFIG_UDF_NLS=y#
# DOS/FAT/NT Filesystems
#CONFIG_FAT_FS=yCONFIG_MSDOS_FS=yCONFIG_VFAT_FS=yCONFIG_FAT_DEFAULT_CODEPAGE=437CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
#CONFIG_NTFS_FSis not set#
# Pseudo filesystems
#CONFIG_PROC_FS=yCONFIG_PROC_KCORE=yCONFIG_PROC_SYSCTL=yCONFIG_PROC_PAGE_MONITOR=yCONFIG_SYSFS=yCONFIG_TMPFS=y
#CONFIG_TMPFS_POSIX_ACLis not set
#CONFIG_HUGETLBFSis not set
#CONFIG_HUGETLB_PAGEis not setCONFIG_CONFIGFS_FS=yCONFIG_MISC_FILESYSTEMS=y
#CONFIG_ADFS_FSis not set
#CONFIG_AFFS_FSis not set
#CONFIG_ECRYPT_FSis not set
#CONFIG_HFS_FSis not set
#CONFIG_HFSPLUS_FSis not set
#CONFIG_BEFS_FSis not set
#CONFIG_BFS_FSis not set
#CONFIG_EFS_FSis not set
#CONFIG_CRAMFSis not set
#CONFIG_SQUASHFSis not set
#CONFIG_VXFS_FSis not set
#CONFIG_MINIX_FSis not set
#CONFIG_OMFS_FSis not set
#CONFIG_HPFS_FSis not set
#CONFIG_QNX4FS_FSis not set
#CONFIG_ROMFS_FSis not set
#CONFIG_SYSV_FSis not set
#CONFIG_UFS_FSis not setCONFIG_NETWORK_FILESYSTEMS=yCONFIG_NFS_FS=yCONFIG_NFS_V3=yCONFIG_NFS_V3_ACL=yCONFIG_NFS_V4=yCONFIG_NFSD=yCONFIG_NFSD_V2_ACL=yCONFIG_NFSD_V3=yCONFIG_NFSD_V3_ACL=yCONFIG_NFSD_V4=y
#CONFIG_NFSD_V4_1is not setCONFIG_LOCKD=yCONFIG_LOCKD_V4=yCONFIG_EXPORTFS=yCONFIG_NFS_ACL_SUPPORT=yCONFIG_NFS_COMMON=yCONFIG_SUNRPC=yCONFIG_SUNRPC_GSS=yCONFIG_SUNRPC_XPRT_RDMA=y
#CONFIG_SUNRPC_REGISTER_V4is not setCONFIG_RPCSEC_GSS_KRB5=yCONFIG_RPCSEC_GSS_SPKM3=y
#CONFIG_SMB_FSis not set
#CONFIG_CIFSis not set
#CONFIG_NCP_FSis not set
#CONFIG_CODA_FSis not set
#CONFIG_AFS_FSis not set#
# Partition Types
#CONFIG_PARTITION_ADVANCED=y
#CONFIG_ACORN_PARTITIONis not set
#CONFIG_OSF_PARTITIONis not set
#CONFIG_AMIGA_PARTITIONis not set
#CONFIG_ATARI_PARTITIONis not set
#CONFIG_MAC_PARTITIONis not setCONFIG_MSDOS_PARTITION=y
#CONFIG_BSD_DISKLABELis not set
#CONFIG_MINIX_SUBPARTITIONis not set
#CONFIG_SOLARIS_X86_PARTITIONis not set
#CONFIG_UNIXWARE_DISKLABELis not set
#CONFIG_LDM_PARTITIONis not set
#CONFIG_SGI_PARTITIONis not set
#CONFIG_ULTRIX_PARTITIONis not set
#CONFIG_SUN_PARTITIONis not set
#CONFIG_KARMA_PARTITIONis not set
#CONFIG_EFI_PARTITIONis not set
#CONFIG_SYSV68_PARTITIONis not setCONFIG_NLS=yCONFIG_NLS_DEFAULT="iso8859-1"CONFIG_NLS_CODEPAGE_437=y
#CONFIG_NLS_CODEPAGE_737is not set
#CONFIG_NLS_CODEPAGE_775is not set
#CONFIG_NLS_CODEPAGE_850is not set
#CONFIG_NLS_CODEPAGE_852is not set
#CONFIG_NLS_CODEPAGE_855is not set
#CONFIG_NLS_CODEPAGE_857is not set
#CONFIG_NLS_CODEPAGE_860is not set
#CONFIG_NLS_CODEPAGE_861is not set
#CONFIG_NLS_CODEPAGE_862is not set
#CONFIG_NLS_CODEPAGE_863is not set
#CONFIG_NLS_CODEPAGE_864is not set
#CONFIG_NLS_CODEPAGE_865is not set
#CONFIG_NLS_CODEPAGE_866is not set
#CONFIG_NLS_CODEPAGE_869is not set
#CONFIG_NLS_CODEPAGE_936is not set
#CONFIG_NLS_CODEPAGE_950is not set
#CONFIG_NLS_CODEPAGE_932is not set
#CONFIG_NLS_CODEPAGE_949is not set
#CONFIG_NLS_CODEPAGE_874is not set
#CONFIG_NLS_ISO8859_8is not set
#CONFIG_NLS_CODEPAGE_1250is not set
#CONFIG_NLS_CODEPAGE_1251is not set
#CONFIG_NLS_ASCIIis not setCONFIG_NLS_ISO8859_1=y
#CONFIG_NLS_ISO8859_2is not set
#CONFIG_NLS_ISO8859_3is not set
#CONFIG_NLS_ISO8859_4is not set
#CONFIG_NLS_ISO8859_5is not set
#CONFIG_NLS_ISO8859_6is not set
#CONFIG_NLS_ISO8859_7is not set
#CONFIG_NLS_ISO8859_9is not set
#CONFIG_NLS_ISO8859_13is not set
#CONFIG_NLS_ISO8859_14is not set
#CONFIG_NLS_ISO8859_15is not set
#CONFIG_NLS_KOI8_Ris not set
#CONFIG_NLS_KOI8_Uis not set
#CONFIG_NLS_UTF8is not setCONFIG_DLM=yCONFIG_DLM_DEBUG=y#
# Kernel hacking
#CONFIG_TRACE_IRQFLAGS_SUPPORT=y
#CONFIG_PRINTK_TIMEis not setCONFIG_ENABLE_WARN_DEPRECATED=yCONFIG_ENABLE_MUST_CHECK=yCONFIG_FRAME_WARN=1024CONFIG_MAGIC_SYSRQ=yCONFIG_UNUSED_SYMBOLS=yCONFIG_DEBUG_FS=y
#CONFIG_HEADERS_CHECKis not setCONFIG_DEBUG_KERNEL=y
#CONFIG_DEBUG_SHIRQis not setCONFIG_DETECT_SOFTLOCKUP=y
#CONFIG_BOOTPARAM_SOFTLOCKUP_PANICis not setCONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0CONFIG_SCHED_DEBUG=yCONFIG_SCHEDSTATS=y
#CONFIG_TIMER_STATSis not setCONFIG_DEBUG_OBJECTS=y
#CONFIG_DEBUG_OBJECTS_SELFTESTis not setCONFIG_DEBUG_OBJECTS_FREE=yCONFIG_DEBUG_OBJECTS_TIMERS=yCONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1CONFIG_DEBUG_SLAB=yCONFIG_DEBUG_SLAB_LEAK=yCONFIG_DEBUG_PREEMPT=yCONFIG_DEBUG_RT_MUTEXES=yCONFIG_DEBUG_PI_LIST=y
#CONFIG_RT_MUTEX_TESTERis not setCONFIG_DEBUG_SPINLOCK=yCONFIG_DEBUG_MUTEXES=yCONFIG_DEBUG_LOCK_ALLOC=yCONFIG_PROVE_LOCKING=yCONFIG_LOCKDEP=y
#CONFIG_LOCK_STATis not set
#CONFIG_DEBUG_LOCKDEPis not setCONFIG_TRACE_IRQFLAGS=yCONFIG_DEBUG_SPINLOCK_SLEEP=y
#CONFIG_DEBUG_LOCKING_API_SELFTESTSis not setCONFIG_STACKTRACE=y
#CONFIG_DEBUG_KOBJECTis not set
#CONFIG_DEBUG_HIGHMEMis not setCONFIG_DEBUG_BUGVERBOSE=yCONFIG_DEBUG_INFO=yCONFIG_DEBUG_VM=y
#CONFIG_DEBUG_VIRTUALis not setCONFIG_DEBUG_WRITECOUNT=yCONFIG_DEBUG_MEMORY_INIT=yCONFIG_DEBUG_LIST=yCONFIG_DEBUG_SG=y
#CONFIG_DEBUG_NOTIFIERSis not setCONFIG_ARCH_WANT_FRAME_POINTERS=yCONFIG_FRAME_POINTER=y
#CONFIG_BOOT_PRINTK_DELAYis not set
#CONFIG_RCU_TORTURE_TESTis not set
#CONFIG_RCU_CPU_STALL_DETECTORis not set
#CONFIG_KPROBES_SANITY_TESTis not set
#CONFIG_BACKTRACE_SELF_TESTis not set
#CONFIG_DEBUG_BLOCK_EXT_DEVTis not set
#CONFIG_LKDTMis not setCONFIG_FAULT_INJECTION=yCONFIG_FAILSLAB=yCONFIG_FAIL_PAGE_ALLOC=yCONFIG_FAIL_MAKE_REQUEST=y
#CONFIG_FAIL_IO_TIMEOUTis not setCONFIG_FAULT_INJECTION_DEBUG_FS=y
#CONFIG_FAULT_INJECTION_STACKTRACE_FILTERis not setCONFIG_LATENCYTOP=yCONFIG_SYSCTL_SYSCALL_CHECK=yCONFIG_USER_STACKTRACE_SUPPORT=yCONFIG_NOP_TRACER=yCONFIG_HAVE_FUNCTION_TRACER=yCONFIG_HAVE_FUNCTION_GRAPH_TRACER=yCONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=yCONFIG_HAVE_DYNAMIC_FTRACE=yCONFIG_HAVE_FTRACE_MCOUNT_RECORD=yCONFIG_HAVE_HW_BRANCH_TRACER=yCONFIG_TRACER_MAX_TRACE=yCONFIG_RING_BUFFER=yCONFIG_TRACING=y#
# Tracers
#CONFIG_FUNCTION_TRACER=yCONFIG_FUNCTION_GRAPH_TRACER=y
#CONFIG_IRQSOFF_TRACERis not set
#CONFIG_PREEMPT_TRACERis not setCONFIG_SYSPROF_TRACER=yCONFIG_SCHED_TRACER=yCONFIG_CONTEXT_SWITCH_TRACER=y
#CONFIG_BOOT_TRACERis not set
#CONFIG_TRACE_BRANCH_PROFILINGis not set
#CONFIG_POWER_TRACERis not setCONFIG_STACK_TRACER=y
#CONFIG_HW_BRANCH_TRACERis not setCONFIG_DYNAMIC_FTRACE=yCONFIG_FTRACE_MCOUNT_RECORD=y
#CONFIG_FTRACE_STARTUP_TESTis not set
#CONFIG_MMIOTRACEis not set
#CONFIG_PROVIDE_OHCI1394_DMA_INITis not setCONFIG_DYNAMIC_PRINTK_DEBUG=y
#CONFIG_SAMPLESis not setCONFIG_HAVE_ARCH_KGDB=yCONFIG_KGDB=yCONFIG_KGDB_SERIAL_CONSOLE=y
#CONFIG_KGDB_TESTSis not set
#CONFIG_STRICT_DEVMEMis not setCONFIG_X86_VERBOSE_BOOTUP=yCONFIG_EARLY_PRINTK=y
#CONFIG_EARLY_PRINTK_DBGPis not setCONFIG_DEBUG_STACKOVERFLOW=yCONFIG_DEBUG_STACK_USAGE=y
#CONFIG_DEBUG_PAGEALLOCis not set
#CONFIG_X86_PTDUMPis not setCONFIG_DEBUG_RODATA=y
#CONFIG_DEBUG_RODATA_TESTis not set
#CONFIG_DEBUG_NX_TESTis not set
#CONFIG_4KSTACKSis not setCONFIG_DOUBLEFAULT=yCONFIG_HAVE_MMIOTRACE_SUPPORT=yCONFIG_IO_DELAY_TYPE_0X80=0CONFIG_IO_DELAY_TYPE_0XED=1CONFIG_IO_DELAY_TYPE_UDELAY=2CONFIG_IO_DELAY_TYPE_NONE=3
#CONFIG_IO_DELAY_0X80is not setCONFIG_IO_DELAY_0XED=y
#CONFIG_IO_DELAY_UDELAYis not set
#CONFIG_IO_DELAY_NONEis not setCONFIG_DEFAULT_IO_DELAY_TYPE=1
#CONFIG_DEBUG_BOOT_PARAMSis not set
#CONFIG_CPA_DEBUGis not set
#CONFIG_OPTIMIZE_INLININGis not set#
# Security options
#CONFIG_KEYS=yCONFIG_KEYS_DEBUG_PROC_KEYS=yCONFIG_SECURITY=y
#CONFIG_SECURITYFSis not set
#CONFIG_SECURITY_NETWORKis not set
#CONFIG_SECURITY_PATHis not set
#CONFIG_SECURITY_FILE_CAPABILITIESis not set
#CONFIG_SECURITY_ROOTPLUGis not setCONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0CONFIG_CRYPTO=y#
# Crypto core or helper
#
#CONFIG_CRYPTO_FIPSis not setCONFIG_CRYPTO_ALGAPI=yCONFIG_CRYPTO_ALGAPI2=yCONFIG_CRYPTO_AEAD2=yCONFIG_CRYPTO_BLKCIPHER=yCONFIG_CRYPTO_BLKCIPHER2=yCONFIG_CRYPTO_HASH=yCONFIG_CRYPTO_HASH2=yCONFIG_CRYPTO_RNG2=yCONFIG_CRYPTO_MANAGER=yCONFIG_CRYPTO_MANAGER2=y
#CONFIG_CRYPTO_GF128MULis not set
#CONFIG_CRYPTO_NULLis not set
#CONFIG_CRYPTO_CRYPTDis not set
#CONFIG_CRYPTO_AUTHENCis not set
#CONFIG_CRYPTO_TESTis not set#
# Authenticated Encryption with Associated Data
#
#CONFIG_CRYPTO_CCMis not set
#CONFIG_CRYPTO_GCMis not set
#CONFIG_CRYPTO_SEQIVis not set#
# Block modes
#CONFIG_CRYPTO_CBC=y
#CONFIG_CRYPTO_CTRis not set
#CONFIG_CRYPTO_CTSis not setCONFIG_CRYPTO_ECB=y
#CONFIG_CRYPTO_LRWis not set
#CONFIG_CRYPTO_PCBCis not set
#CONFIG_CRYPTO_XTSis not set#
# Hash modes
#CONFIG_CRYPTO_HMAC=y
#CONFIG_CRYPTO_XCBCis not set#
# Digest
#CONFIG_CRYPTO_CRC32C=y
#CONFIG_CRYPTO_CRC32C_INTELis not set
#CONFIG_CRYPTO_MD4is not setCONFIG_CRYPTO_MD5=yCONFIG_CRYPTO_MICHAEL_MIC=y
#CONFIG_CRYPTO_RMD128is not set
#CONFIG_CRYPTO_RMD160is not set
#CONFIG_CRYPTO_RMD256is not set
#CONFIG_CRYPTO_RMD320is not setCONFIG_CRYPTO_SHA1=y
#CONFIG_CRYPTO_SHA256is not set
#CONFIG_CRYPTO_SHA512is not set
#CONFIG_CRYPTO_TGR192is not set
#CONFIG_CRYPTO_WP512is not set#
# Ciphers
#CONFIG_CRYPTO_AES=y
#CONFIG_CRYPTO_AES_586is not set
#CONFIG_CRYPTO_ANUBISis not setCONFIG_CRYPTO_ARC4=y
#CONFIG_CRYPTO_BLOWFISHis not set
#CONFIG_CRYPTO_CAMELLIAis not setCONFIG_CRYPTO_CAST5=y
#CONFIG_CRYPTO_CAST6is not setCONFIG_CRYPTO_DES=y
#CONFIG_CRYPTO_FCRYPTis not set
#CONFIG_CRYPTO_KHAZADis not set
#CONFIG_CRYPTO_SALSA20is not set
#CONFIG_CRYPTO_SALSA20_586is not set
#CONFIG_CRYPTO_SEEDis not set
#CONFIG_CRYPTO_SERPENTis not set
#CONFIG_CRYPTO_TEAis not set
#CONFIG_CRYPTO_TWOFISHis not set
#CONFIG_CRYPTO_TWOFISH_586is not set#
# Compression
#
#CONFIG_CRYPTO_DEFLATEis not set
#CONFIG_CRYPTO_LZOis not set#
# Random Number Generation
#
#CONFIG_CRYPTO_ANSI_CPRNGis not setCONFIG_CRYPTO_HW=y
#CONFIG_CRYPTO_DEV_PADLOCKis not set
#CONFIG_CRYPTO_DEV_GEODEis not set
#CONFIG_CRYPTO_DEV_HIFN_795Xis not setCONFIG_HAVE_KVM=yCONFIG_VIRTUALIZATION=y
#CONFIG_KVMis not set
#CONFIG_LGUESTis not setCONFIG_VIRTIO=yCONFIG_VIRTIO_RING=yCONFIG_VIRTIO_PCI=y
#CONFIG_VIRTIO_BALLOONis not set#
# Library routines
#CONFIG_BITREVERSE=yCONFIG_GENERIC_FIND_FIRST_BIT=yCONFIG_GENERIC_FIND_NEXT_BIT=yCONFIG_GENERIC_FIND_LAST_BIT=y
#CONFIG_CRC_CCITTis not setCONFIG_CRC16=yCONFIG_CRC_T10DIF=yCONFIG_CRC_ITU_T=yCONFIG_CRC32=y
#CONFIG_CRC7is not setCONFIG_LIBCRC32C=yCONFIG_ZLIB_INFLATE=yCONFIG_PLIST=yCONFIG_HAS_IOMEM=yCONFIG_HAS_IOPORT=yCONFIG_HAS_DMA=y