NFS: Remove bad delegations during open recovery
Subsystems (2)
PATCH 1/2 NFS: Remove bad delegations during open recovery
From: Bryan Schumaker <[email protected]>
I put the client into an open recovery loop by:
Client: Open file
read half
Server: Expire client (echo 0 > /sys/kernel/debug/nfsd/forget_clients)
Client: Drop vm cache (echo 3 > /proc/sys/vm/drop_caches)
finish reading file
This causes a loop because the client never updates the nfs4_state after discovering that the delegation is invalid. This means it will keep trying to read using the bad delegation rather than attempting to re-open the file.
--- fs/nfs/nfs4proc.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/nfs4proc.c +2 -0
@@ -1774,7 +1774,9 @@ static void nfs41_clear_delegation_stateid(struct nfs4_state *state)* informs us the stateid is unrecognized. */ if (status != -NFS4ERR_BAD_STATEID )nfs41_free_stateid (server, stateid); +nfs_remove_bad_delegation (state->inode); +nfs4_stateid_copy (&state->stateid, &state->open_stateid);clear_bit (NFS_DELEGATED_STATE , &state->flags); } }
Signature · 1 line
1.7.12.1
PATCH 2/2 NFS: Always use the open stateid when checking for expired opens
From: Bryan Schumaker <[email protected]>
If we are reading through a delegation, and the delegation is OK then state->stateid will still point to a delegation stateid and not an open stateid.
--- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4proc.c +1 -1
@@ -1792,7 +1792,7 @@ static void nfs41_clear_delegation_stateid(struct nfs4_state *state)static int nfs41_check_open_stateid (struct nfs4_state *state) {struct nfs_server *server =NFS_SERVER (state->inode); -nfs4_stateid *stateid = &state->stateid; +nfs4_stateid *stateid = &state->open_stateid;int status;/* If a state reset has been done, test_stateid is unneeded */
Signature · 1 line
1.7.12.1
T24gV2VkLCAyMDEyLTA5LTI2IGF0IDEzOjEyIC0wNDAwLCBianNjaHVtYUBuZXRhcHAuY29tIHdy b3RlOg0KPiBGcm9tOiBCcnlhbiBTY2h1bWFrZXIgPGJqc2NodW1hQG5ldGFwcC5jb20+DQo+IA0K PiBJIHB1dCB0aGUgY2xpZW50IGludG8gYW4gb3BlbiByZWNvdmVyeSBsb29wIGJ5Og0KPiAJQ2xp ZW50OiBPcGVuIGZpbGUNCj4gCQlyZWFkIGhhbGYNCj4gCVNlcnZlcjogRXhwaXJlIGNsaWVudCAo ZWNobyAwID4gL3N5cy9rZXJuZWwvZGVidWcvbmZzZC9mb3JnZXRfY2xpZW50cykNCj4gCUNsaWVu dDogRHJvcCB2bSBjYWNoZSAoZWNobyAzID4gL3Byb2Mvc3lzL3ZtL2Ryb3BfY2FjaGVzKQ0KPiAJ CWZpbmlzaCByZWFkaW5nIGZpbGUNCj4gDQo+IFRoaXMgY2F1c2VzIGEgbG9vcCBiZWNhdXNlIHRo ZSBjbGllbnQgbmV2ZXIgdXBkYXRlcyB0aGUgbmZzNF9zdGF0ZSBhZnRlcg0KPiBkaXNjb3Zlcmlu ZyB0aGF0IHRoZSBkZWxlZ2F0aW9uIGlzIGludmFsaWQuICBUaGlzIG1lYW5zIGl0IHdpbGwga2Vl cA0KPiB0cnlpbmcgdG8gcmVhZCB1c2luZyB0aGUgYmFkIGRlbGVnYXRpb24gcmF0aGVyIHRoYW4g YXR0ZW1wdGluZyB0byByZS1vcGVuDQo+IHRoZSBmaWxlLg0KPiANCj4gU2lnbmVkLW9mZi1ieTog QnJ5YW4gU2NodW1ha2VyIDxianNjaHVtYUBuZXRhcHAuY29tPg0KPiAtLS0NCj4gIGZzL25mcy9u ZnM0cHJvYy5jIHwgMiArKw0KPiAgMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKQ0KPiAN Cj4gZGlmZiAtLWdpdCBhL2ZzL25mcy9uZnM0cHJvYy5jIGIvZnMvbmZzL25mczRwcm9jLmMNCj4g aW5kZXggMWU1MDMyNi4uZTQ3ZWM1NSAxMDA2NDQNCj4gLS0tIGEvZnMvbmZzL25mczRwcm9jLmMN Cj4gKysrIGIvZnMvbmZzL25mczRwcm9jLmMNCj4gQEAgLTE3NzQsNyArMTc3NCw5IEBAIHN0YXRp YyB2b2lkIG5mczQxX2NsZWFyX2RlbGVnYXRpb25fc3RhdGVpZChzdHJ1Y3QgbmZzNF9zdGF0ZSAq c3RhdGUpDQo+ICAJCSAqIGluZm9ybXMgdXMgdGhlIHN0YXRlaWQgaXMgdW5yZWNvZ25pemVkLiAq Lw0KPiAgCQlpZiAoc3RhdHVzICE9IC1ORlM0RVJSX0JBRF9TVEFURUlEKQ0KPiAgCQkJbmZzNDFf ZnJlZV9zdGF0ZWlkKHNlcnZlciwgc3RhdGVpZCk7DQo+ICsJCW5mc19yZW1vdmVfYmFkX2RlbGVn YXRpb24oc3RhdGUtPmlub2RlKTsNCj4gIA0KPiArCQluZnM0X3N0YXRlaWRfY29weSgmc3RhdGUt PnN0YXRlaWQsICZzdGF0ZS0+b3Blbl9zdGF0ZWlkKTsNCg0KbmZzNF9zdGF0ZWlkX2NvcHkgbmVl ZHMgdG8gYmUgd3JpdGUtcHJvdGVjdGVkIGJ5IHRoZSBzdGF0ZS0+c2VxbG9jaw0KaGVyZS4NCg0K PiAgCQljbGVhcl9iaXQoTkZTX0RFTEVHQVRFRF9TVEFURSwgJnN0YXRlLT5mbGFncyk7DQo+ICAJ fQ0KPiAgfQ0KDQotLSANClRyb25kIE15a2xlYnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFp bmVyDQoNCk5ldEFwcA0KVHJvbmQuTXlrbGVidXN0QG5ldGFwcC5jb20NCnd3dy5uZXRhcHAuY29t DQo=