diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-09-19 19:25:41 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-10-04 16:25:01 -0400 |
| commit | de766e570413bd0484af0b580299b495ada625c3 (patch) | |
| tree | e878d184e21f22b5ef2bc67346e17b6bf07b3259 /fs | |
| parent | 44d8660d3bb0a1c8363ebcb906af2343ea8e15f6 (diff) | |
| download | linux-stable-de766e570413bd0484af0b580299b495ada625c3.tar.gz linux-stable-de766e570413bd0484af0b580299b495ada625c3.tar.bz2 linux-stable-de766e570413bd0484af0b580299b495ada625c3.zip | |
nfsd: give out fewer session slots as limit approaches
Instead of granting client's full requests until we hit our DRC size
limit and then failing CREATE_SESSIONs (and hence mounts) completely,
start granting clients smaller slot tables as we approach the limit.
The factor chosen here is pretty much arbitrary.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0c04f81aa63b..9db8a19cceaa 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1472,6 +1472,11 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca) spin_lock(&nfsd_drc_lock); avail = min((unsigned long)NFSD_MAX_MEM_PER_SESSION, nfsd_drc_max_mem - nfsd_drc_mem_used); + /* + * Never use more than a third of the remaining memory, + * unless it's the only way to give this client a slot: + */ + avail = clamp_t(int, avail, slotsize, avail/3); num = min_t(int, num, avail / slotsize); nfsd_drc_mem_used += num * slotsize; spin_unlock(&nfsd_drc_lock); |