afs: Fix EIO error when reading a 4G or larger file

When reading a file with a file length of >= 4G, the cache manager is
failing the read with an EIO error.

In afs_GetDCache, the call to IsDCacheSizeOK is passed a parameter that
contains only the lower 32bits of the file length (which requires a 64
bit value). This results in the EIO error if the length is over 2^32 -1.

The AFSFetchStatus.Length member needs to be combined with the
AFSFetchStatus.Length_hi to obtain the full 64bit file length.

Fix the calls to IsDCacheSizeOK to use the full 64bit file length.

Commit "afs: Check dcache size when checking DVs
7c60a0fba11dd24494a5f383df8bea5fdbabbdd7" - gerrit 13436 - added the
IsDCacheSizeOK function and the associated calls.

As a note, the AFSFetchStatus.DataVersion is the lower 32 bits of the
full 64bit version number, AFSFetchStatus.dataVersionHigh contains
the high order 32bits.  The function IsDCacheSizeOK is passed just the
32bit component, the only use of the parameter is in an error message.

Reviewed-on: https://gerrit.openafs.org/14002
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit bebae936b4ef3bf47624c0ff0baae5521bad804e)

Change-Id: I68f3ee04af25c7e99e0795804226ba5075af0ea8
Reviewed-on: https://gerrit.openafs.org/15535
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Cheyenne Wills 2020-01-02 11:18:16 -07:00 committed by Stephan Wiesand
parent 652211e8d0
commit ee32460bf2

View File

@ -2606,6 +2606,8 @@ afs_GetDCache(struct vcache *avc, afs_size_t abyte,
* validPos is updated by CacheFetchProc, and can only be * validPos is updated by CacheFetchProc, and can only be
* modifed under a dcache write lock, which we've blocked out * modifed under a dcache write lock, which we've blocked out
*/ */
afs_size_t length;
size = tdc->validPos - Position; /* actual segment size */ size = tdc->validPos - Position; /* actual segment size */
if (size < 0) if (size < 0)
size = 0; size = 0;
@ -2613,8 +2615,9 @@ afs_GetDCache(struct vcache *avc, afs_size_t abyte,
/* Check that the amount of data that we fetched for the /* Check that the amount of data that we fetched for the
* dcache makes sense. */ * dcache makes sense. */
FillInt64(length, tsmall->OutStatus.Length_hi, tsmall->OutStatus.Length);
if (!IsDCacheSizeOK(tdc, avc, size, if (!IsDCacheSizeOK(tdc, avc, size,
tsmall->OutStatus.Length, length,
tsmall->OutStatus.DataVersion, 1)) { tsmall->OutStatus.DataVersion, 1)) {
code = EIO; code = EIO;
} }