#include <osi.h>
#include "afsd.h"
+#include "smb.h"
#ifdef DEBUG
extern void afsi_log(char *pattern, ...);
#define USE_RX_IOVEC 1
-/* we can access connp->serverp without holding a lock because that
- never changes since the connection is made. */
-#define SERVERHAS64BIT(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NO64BIT))
-#define SET_SERVERHASNO64BIT(connp) (cm_SetServerNo64Bit((connp)->serverp, TRUE))
-
/* functions called back from the buffer package when reading or writing data,
* or when holding or releasing a vnode pointer.
*/
long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags,
cm_user_t *userp, cm_req_t *reqp)
{
- /* store the data back from this buffer; the buffer is locked and held,
- * but the vnode involved isn't locked, yet. It is held by its
- * reference from the buffer, which won't change until the buffer is
- * released by our caller. Thus, we don't have to worry about holding
- * bufp->scp.
+ /*
+ * store the data back from this buffer; the buffer is locked and held,
+ * but the vnode involved may or may not be locked depending on whether
+ * or not the CM_BUF_WRITE_SCP_LOCKED flag is set.
*/
long code, code1;
cm_scache_t *scp = vscp;
afs_int32 nbytes;
afs_int32 save_nbytes;
+ cm_scache_t save_scache;
long temp;
AFSFetchStatus outStatus;
AFSStoreStatus inStatus;
int require_64bit_ops = 0;
int call_was_64bit = 0;
int scp_locked = flags & CM_BUF_WRITE_SCP_LOCKED;
+ int storedata_excl = 0;
osi_assertx(userp != NULL, "null cm_user_t");
osi_assertx(scp != NULL, "null cm_scache_t");
memset(&volSync, 0, sizeof(volSync));
- /* now, the buffer may or may not be filled with good data (buf_GetNewLocked
+ /*
+ * now, the buffer may or may not be filled with good data (buf_GetNewLocked
* drops lots of locks, and may indeed return a properly initialized
* buffer, although more likely it will just return a new, empty, buffer.
*/
/* Serialize StoreData RPC's; for rationale see cm_scache.c */
(void) cm_SyncOp(scp, NULL, userp, reqp, 0, CM_SCACHESYNC_STOREDATA_EXCL);
+ storedata_excl = 1;
code = cm_SetupStoreBIOD(scp, offsetp, length, &biod, userp, reqp);
if (code) {
if (biod.length == 0) {
osi_Log0(afsd_logp, "cm_SetupStoreBIOD length 0");
cm_ReleaseBIOD(&biod, 1, 0, 1); /* should be a NOOP */
- cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_STOREDATA_EXCL);
- if (!scp_locked)
- lock_ReleaseWrite(&scp->rw);
- return 0;
+ code = 0;
+ goto exit_storedata_excl;
}
/* prepare the output status for the store */
require_64bit_ops = 1;
}
+ /* now we're ready to do the store operation */
+ retry_rpc:
+ InterlockedIncrement(&scp->activeRPCs);
lock_ReleaseWrite(&scp->rw);
- /* now we're ready to do the store operation */
save_nbytes = nbytes;
+ save_scache = *scp;
+
do {
code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp);
if (code)
temp = rx_Writev(rxcallp, tiov, tnio, vbytes);
if (temp != vbytes) {
osi_Log3(afsd_logp, "rx_Writev failed bp 0x%p, %d != %d", bufp, temp, vbytes);
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
break;
}
}
nbytes -= wbytes;
#endif /* USE_RX_IOVEC */
+
+ /*
+ * Rx supports an out of band signalling mechanism that permits
+ * RPC specific status information to be communicated in the
+ * reverse direction of the channel. For RXAFS_StoreData, the
+ * 0-bit is set once all of the permission checks have completed
+ * and the volume/vnode locks have been obtained by the file
+ * server. The signal is intended to notify the Unix afs client
+ * that is performing store-on-close that it is safe to permit
+ * the close operation to complete while the store continues
+ * in the background. All of the callbacks have been broken
+ * and the locks will not be dropped until the RPC completes
+ * which prevents any other operation from being initiated on
+ * the vnode until the store is finished.
+ *
+ * The Windows client does not perform store-on-close. Instead
+ * it uses the CM_SCACHESYNC_STOREDATA_EXCL request flag and
+ * CM_SCACHEFLAG_DATASTORING scache state to ensure that store
+ * operations are serialized. The 0-bit signal permits the
+ * CM_SCACHEFLAG_DATASTORING state to the dropped which in
+ * turn permits another thread to prep its own BIOD in parallel.
+ * This is safe because it is impossible for that second store
+ * RPC to complete before this one does.
+ */
+ if ( storedata_excl && (rx_GetRemoteStatus(rxcallp) & 1)) {
+ lock_ObtainWrite(&scp->rw);
+ cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_STOREDATA_EXCL);
+ lock_ReleaseWrite(&scp->rw);
+ storedata_excl = 0;
+ }
} /* while more bytes to write */
} /* if RPC started successfully */
nbytes = save_nbytes;
goto retry;
}
-
- /* Prefer StoreData error over rx_EndCall error */
- if (code1 != 0)
+ /* Prefer rx_EndCall error over StoreData error */
+ if (code1 != 0) {
+ osi_Log2(afsd_logp, "rx_EndCall converted 0x%x to 0x%x", code, code1);
code = code1;
- } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code));
+ }
+ } while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, 1, &outStatus, &volSync, NULL, NULL, code));
code = cm_MapRPCError(code, reqp);
/* now, clean up our state */
lock_ObtainWrite(&scp->rw);
- cm_ReleaseBIOD(&biod, 1, code, 1);
-
if (code == 0) {
osi_hyper_t t;
/* now, here's something a little tricky: in AFS 3, a dirty
if (LargeIntegerGreaterThanOrEqualTo(t, scp->length))
_InterlockedAnd(&scp->mask, ~CM_SCACHEMASK_LENGTH);
- cm_MergeStatus(NULL, scp, &outStatus, &volSync, userp, reqp, CM_MERGEFLAG_STOREDATA);
+ code = cm_MergeStatus(NULL, scp, &outStatus, &volSync, userp, reqp, CM_MERGEFLAG_STOREDATA);
} else {
+ InterlockedDecrement(&scp->activeRPCs);
if (code == CM_ERROR_SPACE)
_InterlockedOr(&scp->flags, CM_SCACHEFLAG_OUTOFSPACE);
else if (code == CM_ERROR_QUOTA)
_InterlockedOr(&scp->flags, CM_SCACHEFLAG_OVERQUOTA);
}
- cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_STOREDATA_EXCL);
+
+ if ( cm_verifyData )
+ {
+ if (!cm_VerifyStoreData(&biod, &save_scache)) {
+ /* file server content doesn't match what we sent. */
+ nbytes = save_nbytes;
+ goto retry_rpc;
+ }
+ }
+
+ cm_ReleaseBIOD(&biod, 1, code, 1);
+
+ exit_storedata_excl:
+ if (storedata_excl)
+ cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_STOREDATA_EXCL);
if (!scp_locked)
lock_ReleaseWrite(&scp->rw);
require_64bit_ops = 1;
}
+ InterlockedIncrement(&scp->activeRPCs);
lock_ReleaseWrite(&scp->rw);
cm_AFSFidFromFid(&tfid, &scp->fid);
/* prefer StoreData error over rx_EndCall error */
if (code == 0 && code1 != 0)
code = code1;
- } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code));
+ } while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, 1, &outStatus, &volSync, NULL, NULL, code));
code = cm_MapRPCError(code, reqp);
/* now, clean up our state */
if (LargeIntegerGreaterThanOrEqualTo(t, scp->length))
_InterlockedAnd(&scp->mask, ~CM_SCACHEMASK_LENGTH);
- cm_MergeStatus(NULL, scp, &outStatus, &volSync, userp, reqp, CM_MERGEFLAG_STOREDATA);
+ code = cm_MergeStatus(NULL, scp, &outStatus, &volSync, userp, reqp, CM_MERGEFLAG_STOREDATA);
+ } else {
+ InterlockedDecrement(&scp->activeRPCs);
}
cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_STOREDATA_EXCL);
bp = buf_Find(&scp->fid, &tbase);
/* We cheat slightly by not locking the bp mutex. */
if (bp) {
- if ((bp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING | CM_BUF_CMBKGFETCH)) == 0
+ if ((bp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING)) == 0
&& (bp->dataVersion < scp->bufDataVersionLow || bp->dataVersion > scp->dataVersion))
stop = 1;
buf_Release(bp);
afs_int32
cm_BkgStore(cm_scache_t *scp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4,
- cm_user_t *userp)
+ cm_user_t *userp, cm_req_t *reqp)
{
osi_hyper_t toffset;
long length;
- cm_req_t req;
long code = 0;
+ afs_uint32 req_flags = reqp->flags;
if (scp->flags & CM_SCACHEFLAG_DELETED) {
osi_Log4(afsd_logp, "Skipping BKG store - Deleted scp 0x%p, offset 0x%x:%08x, length 0x%x", scp, p2, p1, p3);
} else {
- cm_InitReq(&req);
-
/* Retries will be performed by the BkgDaemon thread if appropriate */
- req.flags |= CM_REQ_NORETRY;
+ reqp->flags |= CM_REQ_NORETRY;
toffset.LowPart = p1;
toffset.HighPart = p2;
osi_Log4(afsd_logp, "Starting BKG store scp 0x%p, offset 0x%x:%08x, length 0x%x", scp, p2, p1, p3);
- code = cm_BufWrite(scp, &toffset, length, /* flags */ 0, userp, &req);
+ code = cm_BufWrite(scp, &toffset, length, /* flags */ 0, userp, reqp);
osi_Log4(afsd_logp, "Finished BKG store scp 0x%p, offset 0x%x:%08x, code 0x%x", scp, p2, p1, code);
+
+ reqp->flags = req_flags;
}
/*
cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_ASYNCSTORE);
lock_ReleaseWrite(&scp->rw);
}
+
return code;
}
* because there is no harm done. */
afs_int32
cm_BkgPrefetch(cm_scache_t *scp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4,
- cm_user_t *userp)
+ cm_user_t *userp, cm_req_t *reqp)
{
osi_hyper_t length;
osi_hyper_t base;
afs_int32 code;
int rxheld = 0;
cm_buf_t *bp = NULL;
- cm_req_t req;
-
- cm_InitReq(&req);
+ afs_uint32 req_flags;
/* Retries will be performed by the BkgDaemon thread if appropriate */
- req.flags |= CM_REQ_NORETRY;
+ req_flags = reqp->flags;
+ reqp->flags |= CM_REQ_NORETRY;
fetched.LowPart = 0;
fetched.HighPart = 0;
rxheld = 0;
}
- code = buf_Get(scp, &offset, &req, &bp);
+ code = buf_Get(scp, &offset, reqp, &bp);
if (code)
break;
lock_ObtainWrite(&scp->rw);
rxheld = 1;
}
- _InterlockedAnd(&bp->cmFlags, ~CM_BUF_CMBKGFETCH);
buf_Release(bp);
bp = NULL;
continue;
rxheld = 1;
}
- code = cm_GetBuffer(scp, bp, NULL, userp, &req);
+ code = cm_GetBuffer(scp, bp, NULL, userp, reqp);
if (code == 0)
fetched = LargeIntegerAdd(fetched, tblocksize);
buf_Release(bp);
- _InterlockedAnd(&bp->cmFlags, ~CM_BUF_CMBKGFETCH);
}
if (!rxheld) {
rxheld = 1;
}
- /* Clear flag from any remaining buffers */
- for ( ;
- LargeIntegerLessThan(offset, end);
- offset = LargeIntegerAdd(offset, tblocksize) )
- {
- bp = buf_Find(scp, &offset);
- if (bp) {
- _InterlockedAnd(&bp->cmFlags, ~CM_BUF_CMBKGFETCH);
- buf_Release(bp);
- }
- }
cm_ClearPrefetchFlag(LargeIntegerGreaterThanZero(fetched) ? 0 : code,
scp, &base, &fetched);
/* wakeup anyone who is waiting */
- if (scp->flags & CM_SCACHEFLAG_WAITING) {
+ if (!osi_QIsEmpty(&scp->waitQueueH)) {
osi_Log1(afsd_logp, "CM BkgPrefetch Waking scp 0x%p", scp);
osi_Wakeup((LONG_PTR) &scp->flags);
}
osi_Log4(afsd_logp, "Ending BKG prefetch scp 0x%p code 0x%x fetched 0x%x:%x",
scp, code, fetched.HighPart, fetched.LowPart);
+
+ reqp->flags = req_flags;
return code;
}
osi_hyper_t readBase;
osi_hyper_t readLength;
osi_hyper_t readEnd;
- osi_hyper_t offset;
osi_hyper_t tblocksize; /* a long long temp variable */
- cm_buf_t *bp;
tblocksize = ConvertLongToLargeInteger(cm_data.buf_blockSize);
readEnd = LargeIntegerAdd(realBase, readLength);
- /*
- * Mark each buffer in the range as queued for a
- * background fetch
- */
- for ( offset = realBase;
- LargeIntegerLessThan(offset, readEnd);
- offset = LargeIntegerAdd(offset, tblocksize) )
- {
- if (rwheld) {
- lock_ReleaseWrite(&scp->rw);
- rwheld = 0;
- }
-
- bp = buf_Find(scp, &offset);
- if (!bp)
- continue;
-
- if (!rwheld) {
- lock_ObtainWrite(&scp->rw);
- rwheld = 1;
- }
-
- _InterlockedOr(&bp->cmFlags, CM_BUF_CMBKGFETCH);
- buf_Release(bp);
- }
-
if (rwheld)
lock_ReleaseWrite(&scp->rw);
cm_QueueBKGRequest(scp, cm_BkgPrefetch,
realBase.LowPart, realBase.HighPart,
readLength.LowPart, readLength.HighPart,
- userp);
+ userp, reqp);
}
/* scp must be locked; temporarily unlocked during processing.
/* clear things out */
biop->scp = scp; /* do not hold; held by caller */
+ biop->userp = userp; /* do not hold; held by caller */
+ biop->reqp = reqp;
biop->offset = *inOffsetp;
biop->length = 0;
biop->bufListp = NULL;
/* reserve a chunk's worth of buffers */
lock_ReleaseWrite(&scp->rw);
- buf_ReserveBuffers(cm_chunkSize / cm_data.buf_blockSize);
+ biop->reserved = (cm_chunkSize / cm_data.buf_blockSize);
+ buf_ReserveBuffers(biop->reserved);
lock_ObtainWrite(&scp->rw);
bufp = NULL;
}
}
- biop->reserved = 1;
-
/* if we get here, if bufp is null, we didn't find any dirty buffers
* that weren't already being stored back, so we just quit now.
*/
/* put this element in the list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, bufp);
+
+ if ( cm_verifyData )
+ buf_ComputeCheckSum(bufp);
+
/* don't have to hold bufp, since held by buf_Find above */
osi_QAddH((osi_queue_t **) &biop->bufListp,
(osi_queue_t **) &biop->bufListEndp,
biop->offset = firstModOffset;
bufp = NULL; /* this buffer and reference added to the queue */
- /* compute the window surrounding *inOffsetp of size cm_chunkSize */
- scanStart = *inOffsetp;
+ /* compute the window surrounding firstModOffset of size cm_chunkSize */
+ scanStart = firstModOffset;
scanStart.LowPart &= (-cm_chunkSize);
thyper = ConvertLongToLargeInteger(cm_chunkSize);
scanEnd = LargeIntegerAdd(scanStart, thyper);
flags = CM_SCACHESYNC_GETSTATUS
| CM_SCACHESYNC_STOREDATA
- | CM_SCACHESYNC_BUFLOCKED
- | CM_SCACHESYNC_NOWAIT;
+ | CM_SCACHESYNC_BUFLOCKED;
/* start by looking backwards until scanStart */
/* hyper version of cm_data.buf_blockSize */
*/
qdp = osi_QDAlloc();
osi_SetQData(qdp, bufp);
+
+ if ( cm_verifyData )
+ buf_ComputeCheckSum(bufp);
+
/* no buf_hold necessary, since we have it held from buf_Find */
osi_QAddT((osi_queue_t **) &biop->bufListp,
(osi_queue_t **) &biop->bufListEndp,
*/
qdp = osi_QDAlloc();
osi_SetQData(qdp, bufp);
+
+ if ( cm_verifyData )
+ buf_ComputeCheckSum(bufp);
+
/* no buf_hold necessary, since we have it held from buf_Find */
osi_QAddH((osi_queue_t **) &biop->bufListp,
(osi_queue_t **) &biop->bufListEndp,
tblocksize = ConvertLongToLargeInteger(cm_data.buf_blockSize);
biop->scp = scp; /* do not hold; held by caller */
+ biop->userp = userp; /* do not hold; held by caller */
+ biop->reqp = reqp;
biop->offset = *offsetp;
/* null out the list of buffers */
biop->bufListp = biop->bufListEndp = NULL;
osi_queueData_t *qdp;
osi_queueData_t *nqdp;
int flags;
+ int reportErrorToRedir = 0;
/* Give back reserved buffers */
if (biop->reserved)
- buf_UnreserveBuffers(cm_chunkSize / cm_data.buf_blockSize);
+ buf_UnreserveBuffers(biop->reserved);
if (isStore)
flags = CM_SCACHESYNC_STOREDATA;
case CM_ERROR_TOOBIG:
case CM_ERROR_READONLY:
case CM_ERROR_NOSUCHPATH:
+ case EIO:
+ case CM_ERROR_INVAL_NET_RESP:
+ case CM_ERROR_UNKNOWN:
/*
* Apply the fatal error to this buffer.
*/
_InterlockedAnd(&bufp->flags, ~CM_BUF_DIRTY);
_InterlockedOr(&bufp->flags, CM_BUF_ERROR);
- bufp->dirty_offset = 0;
bufp->dirty_length = 0;
bufp->error = code;
bufp->dataVersion = CM_BUF_VERSION_BAD;
bufp->dirtyCounter++;
+ reportErrorToRedir = 1;
break;
case CM_ERROR_TIMEDOUT:
case CM_ERROR_ALLDOWN:
buf_Release(bufp);
bufp = NULL;
}
+
+ if (RDR_Initialized && reportErrorToRedir) {
+ DWORD status;
+ smb_MapNTError(cm_MapRPCError(code, biop->reqp), &status, TRUE);
+ RDR_SetFileStatus( &scp->fid, &biop->userp->authgroup, status);
+ }
} else {
if (!scp_locked)
lock_ObtainWrite(&scp->rw);
afs_uint32 nbytes; /* bytes in transfer */
afs_uint32 nbytes_hi = 0; /* high-order 32 bits of bytes in transfer */
afs_uint64 length_found = 0;
- long rbytes; /* bytes in rx_Read call */
+ long rxbytes; /* bytes in rx_Read call */
long temp;
AFSFetchStatus afsStatus;
AFSCallBack callback;
int first_read = 1;
int scp_locked = 1;
+ memset(&afsStatus, 0, sizeof(afsStatus));
+ memset(&callback, 0, sizeof(callback));
memset(&volSync, 0, sizeof(volSync));
/* now, the buffer may or may not be filled with good data (buf_GetNewLocked
code = cm_SetupFetchBIOD(scp, &bufp->offset, &biod, userp, reqp);
if (code) {
/* couldn't even get the first page setup properly */
- osi_Log1(afsd_logp, "GetBuffer: SetupFetchBIOD failure code %d", code);
+ osi_Log1(afsd_logp, "cm_GetBuffer: SetupFetchBIOD failure code %d", code);
return code;
}
* We can lose a race condition and end up with biod.length zero, in
* which case we just retry.
*/
- if (bufp->dataVersion <= scp->dataVersion && bufp->dataVersion >= scp->bufDataVersionLow || biod.length == 0) {
- if ((bufp->dataVersion == CM_BUF_VERSION_BAD || bufp->dataVersion < scp->bufDataVersionLow) &&
- LargeIntegerGreaterThanOrEqualTo(bufp->offset, scp->serverLength))
- {
- osi_Log4(afsd_logp, "Bad DVs 0x%x != (0x%x -> 0x%x) or length 0x%x",
- bufp->dataVersion, scp->bufDataVersionLow, scp->dataVersion, biod.length);
- if (bufp->dataVersion == CM_BUF_VERSION_BAD)
- memset(bufp->datap, 0, cm_data.buf_blockSize);
- bufp->dataVersion = scp->dataVersion;
+ if (bufp->dataVersion <= scp->dataVersion && bufp->dataVersion >= scp->bufDataVersionLow) {
+ /* We obtained the buffer while we were waiting */
+ goto release_biod;
+ }
+
+ if (biod.length == 0) {
+ osi_Log2(afsd_logp, "cm_GetBuffer BIOD length 0 scp 0x%p bufp 0x%p",
+ scp, bufp);
+ goto release_biod;
+ }
+
+ /* Check for buffers we can fill locally */
+ for (qdp = biod.bufListEndp;
+ qdp;
+ qdp = (osi_queueData_t *) osi_QPrev(&qdp->q)) {
+ tbufp = osi_GetQData(qdp);
+
+ if ( tbufp->dataVersion == CM_BUF_VERSION_BAD ||
+ tbufp->dataVersion < scp->bufDataVersionLow ||
+ tbufp->dataVersion > scp->dataVersion) {
+
+ osi_Log4(afsd_logp, "cm_GetBuffer bufp 0x%p DVs 0x%x != (0x%x -> 0x%x)",
+ tbufp, tbufp->dataVersion, scp->bufDataVersionLow, scp->dataVersion);
+
+ if (LargeIntegerGreaterThanOrEqualTo(tbufp->offset, scp->length))
+ {
+ if (tbufp->dataVersion == CM_BUF_VERSION_BAD)
+ memset(tbufp->datap, 0, cm_data.buf_blockSize);
+ tbufp->dataVersion = scp->dataVersion;
+ }
+
+ if ((scp->mask & CM_SCACHEMASK_TRUNCPOS) &&
+ LargeIntegerGreaterThanOrEqualTo(tbufp->offset, scp->truncPos)) {
+ memset(tbufp->datap, 0, cm_data.buf_blockSize);
+ tbufp->dataVersion = scp->dataVersion;
+ }
}
- cm_ReleaseBIOD(&biod, 0, 0, 1);
- return 0;
- } else if ((bufp->dataVersion == CM_BUF_VERSION_BAD || bufp->dataVersion < scp->bufDataVersionLow)
- && (scp->mask & CM_SCACHEMASK_TRUNCPOS) &&
- LargeIntegerGreaterThanOrEqualTo(bufp->offset, scp->truncPos)) {
- memset(bufp->datap, 0, cm_data.buf_blockSize);
- bufp->dataVersion = scp->dataVersion;
- cm_ReleaseBIOD(&biod, 0, 0, 1);
- return 0;
}
+ if (bufp->dataVersion <= scp->dataVersion && bufp->dataVersion >= scp->bufDataVersionLow) {
+ /* We locally populated the buffer we wanted */
+ goto release_biod;
+ }
+
+ InterlockedIncrement(&scp->activeRPCs);
lock_ReleaseWrite(&scp->rw);
scp_locked = 0;
* the network round trip by allocating zeroed buffers and
* faking the status info.
*/
- if (biod.offset.QuadPart >= scp->length.QuadPart) {
+ if (biod.offset.QuadPart >= scp->serverLength.QuadPart ||
+ ((scp->mask & CM_SCACHEMASK_TRUNCPOS) && biod.offset.QuadPart > scp->truncPos.QuadPart)) {
osi_Log5(afsd_logp, "SKIP FetchData64 scp 0x%p, off 0x%x:%08x > length 0x%x:%08x",
scp, biod.offset.HighPart, biod.offset.LowPart,
scp->length.HighPart, scp->length.LowPart);
nbytes_hi = ntohl(nbytes_hi);
} else {
nbytes_hi = 0;
- code = rxcallp->error;
+ code = rx_Error(rxcallp);
code1 = rx_EndCall(rxcallp, code);
rxcallp = NULL;
}
}
} else {
osi_Log1(afsd_logp, "cm_GetBuffer rx_Read32 returns %d != 4", temp);
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
}
}
/* for the moment, nbytes_hi will always be 0 if code == 0
* length_found and continue as if the file server said
* it was sending us zero octets of data.
*/
- if (fs_fetchdata_offset_bug && first_read)
+ if (fs_fetchdata_offset_bug && first_read) {
length_found = 0;
- else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
- break;
+ break;
+ } else if (temp <= 0) {
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
+ break;
+ }
}
iov = 0;
iov_offset = 0;
- rbytes = temp;
+ rxbytes = temp;
- while (rbytes > 0) {
+ while (rxbytes > 0) {
afs_int32 len;
osi_assertx(bufferp != NULL, "null cm_buf_t");
- len = MIN(tiov[iov].iov_len - iov_offset, cm_data.buf_blockSize - buffer_offset);
+ len = min(tiov[iov].iov_len - iov_offset, cm_data.buf_blockSize - buffer_offset);
memcpy(bufferp + buffer_offset, tiov[iov].iov_base + iov_offset, len);
iov_offset += len;
buffer_offset += len;
- rbytes -= len;
+ rxbytes -= len;
if (iov_offset == tiov[iov].iov_len) {
iov++;
*/
_InterlockedOr(&tbufp->cmFlags, CM_BUF_CMFULLYFETCHED);
lock_ObtainWrite(&scp->rw);
- if (scp->flags & CM_SCACHEFLAG_WAITING) {
+ if (!osi_QIsEmpty(&scp->waitQueueH)) {
osi_Log1(afsd_logp, "CM GetBuffer Waking scp 0x%p", scp);
osi_Wakeup((LONG_PTR) &scp->flags);
}
*/
osi_assertx(bufferp != NULL, "null cm_buf_t");
- /* read rbytes of data */
- rbytes = (afs_uint32)(length_found > cm_data.buf_blockSize ? cm_data.buf_blockSize : length_found);
- temp = rx_Read(rxcallp, bufferp, rbytes);
- if (temp < rbytes) {
+ /* read rxbytes of data */
+ rxbytes = (afs_uint32)(length_found > cm_data.buf_blockSize ? cm_data.buf_blockSize : length_found);
+ temp = rx_Read(rxcallp, bufferp, rxbytes);
+ if (temp < rxbytes) {
/*
* If the file server returned (filesize - offset),
* then the first rx_Read will return zero octets of data.
* length_found and continue as if the file server said
* it was sending us zero octets of data.
*/
- if (fs_fetchdata_offset_bug && first_read)
+ if (fs_fetchdata_offset_bug && first_read) {
length_found = 0;
- else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
- break;
+ break;
+ } else if (temp <= 0) {
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
+ break;
+ }
}
first_read = 0;
*/
_InterlockedOr(&tbufp->cmFlags, CM_BUF_CMFULLYFETCHED);
lock_ObtainWrite(&scp->rw);
- if (scp->flags & CM_SCACHEFLAG_WAITING) {
+ if (!osi_QIsEmpty(&scp->waitQueueH)) {
osi_Log1(afsd_logp, "CM GetBuffer Waking scp 0x%p", scp);
osi_Wakeup((LONG_PTR) &scp->flags);
}
* all of the rest of the pages.
*/
#ifdef USE_RX_IOVEC
- rbytes = cm_data.buf_blockSize - buffer_offset;
+ rxbytes = cm_data.buf_blockSize - buffer_offset;
bufferp = tbufp->datap + buffer_offset;
#else /* USE_RX_IOVEC */
/* bytes fetched */
osi_assertx((bufferp - tbufp->datap) < LONG_MAX, "data >= LONG_MAX");
- rbytes = (long) (bufferp - tbufp->datap);
+ rxbytes = (long) (bufferp - tbufp->datap);
/* bytes left to zero */
- rbytes = cm_data.buf_blockSize - rbytes;
+ rxbytes = cm_data.buf_blockSize - rxbytes;
#endif /* USE_RX_IOVEC */
while(qdp) {
- if (rbytes != 0)
- memset(bufferp, 0, rbytes);
+ if (rxbytes != 0)
+ memset(bufferp, 0, rxbytes);
qdp = (osi_queueData_t *) osi_QPrev(&qdp->q);
if (qdp == NULL)
break;
tbufp = osi_GetQData(qdp);
bufferp = tbufp->datap;
/* bytes to clear in this page */
- rbytes = cm_data.buf_blockSize;
+ rxbytes = cm_data.buf_blockSize;
}
}
code = code1;
osi_Log0(afsd_logp, "CALL FetchData DONE");
- } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code));
+ } while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, 0, &afsStatus, &volSync, NULL, NULL, code));
fetchingcompleted:
code = cm_MapRPCError(code, reqp);
}
}
+ if (code == 0)
+ code = cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, reqp, CM_MERGEFLAG_FETCHDATA);
+ else
+ InterlockedDecrement(&scp->activeRPCs);
+
+ release_biod:
/* release scatter/gather I/O structure (buffers, locks) */
cm_ReleaseBIOD(&biod, 0, code, 1);
- if (code == 0)
- cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, reqp, CM_MERGEFLAG_FETCHDATA);
-
return code;
}
afs_uint64 length_found = 0;
char *bufferp = datap;
afs_uint32 buffer_offset = 0;
- long rbytes; /* bytes in rx_Read call */
+ long rxbytes; /* bytes in rx_Read call */
long temp;
AFSFetchStatus afsStatus;
AFSCallBack callback;
int first_read = 1;
int scp_locked = 1;
+ memset(&afsStatus, 0, sizeof(afsStatus));
+ memset(&callback, 0, sizeof(callback));
memset(&volSync, 0, sizeof(volSync));
/* now, the buffer may or may not be filled with good data (buf_GetNewLocked
require_64bit_ops = 1;
}
+ InterlockedIncrement(&scp->activeRPCs);
osi_Log2(afsd_logp, "cm_GetData: fetching data scp %p DV 0x%x", scp, scp->dataVersion);
#ifdef AFS_FREELANCE_CLIENT
nbytes_hi = ntohl(nbytes_hi);
} else {
nbytes_hi = 0;
- code = rxcallp->error;
+ code = rx_Error(rxcallp);
code1 = rx_EndCall(rxcallp, code);
rxcallp = NULL;
}
}
} else {
osi_Log1(afsd_logp, "cm_GetData rx_Read32 returns %d != 4", temp);
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
}
}
/* for the moment, nbytes_hi will always be 0 if code == 0
* length_found and continue as if the file server said
* it was sending us zero octets of data.
*/
- if (fs_fetchdata_offset_bug && first_read)
+ if (fs_fetchdata_offset_bug && first_read) {
length_found = 0;
- else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
- break;
+ break;
+ } else if (temp <= 0) {
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
+ break;
+ }
}
iov = 0;
iov_offset = 0;
- rbytes = temp;
+ rxbytes = temp;
- while (rbytes > 0) {
+ while (rxbytes > 0) {
afs_int32 len;
osi_assertx(bufferp != NULL, "null cm_buf_t");
- len = MIN(tiov[iov].iov_len - iov_offset, data_length - buffer_offset);
+ len = min(tiov[iov].iov_len - iov_offset, data_length - buffer_offset);
memcpy(bufferp + buffer_offset, tiov[iov].iov_base + iov_offset, len);
iov_offset += len;
buffer_offset += len;
- rbytes -= len;
+ rxbytes -= len;
if (iov_offset == tiov[iov].iov_len) {
iov++;
*/
osi_assertx(bufferp != NULL, "null cm_buf_t");
- /* read rbytes of data */
- rbytes = (afs_uint32)(length_found > data_length ? data_length : length_found);
- temp = rx_Read(rxcallp, bufferp, rbytes);
- if (temp < rbytes) {
+ /* read rxbytes of data */
+ rxbytes = (afs_uint32)(length_found > data_length ? data_length : length_found);
+ temp = rx_Read(rxcallp, bufferp, rxbytes);
+ if (temp < rxbytes) {
/*
* If the file server returned (filesize - offset),
* then the first rx_Read will return zero octets of data.
* length_found and continue as if the file server said
* it was sending us zero octets of data.
*/
- if (fs_fetchdata_offset_bug && first_read)
+ if (fs_fetchdata_offset_bug && first_read) {
length_found = 0;
- else
- code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR;
- break;
+ break;
+ } else if (temp <= 0) {
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
+ break;
+ }
}
first_read = 0;
* all of the rest of the pages.
*/
#ifdef USE_RX_IOVEC
- rbytes = data_length - buffer_offset;
+ rxbytes = data_length - buffer_offset;
bufferp = datap + buffer_offset;
#else /* USE_RX_IOVEC */
/* bytes fetched */
osi_assertx((bufferp - datap) < LONG_MAX, "data >= LONG_MAX");
- rbytes = (long) (bufferp - datap);
+ rxbytes = (long) (bufferp - datap);
/* bytes left to zero */
- rbytes = data_length - rbytes;
+ rxbytes = data_length - rxbytes;
#endif /* USE_RX_IOVEC */
- if (rbytes != 0)
- memset(bufferp, 0, rbytes);
+ if (rxbytes != 0)
+ memset(bufferp, 0, rxbytes);
}
if (code == 0) {
code = code1;
osi_Log0(afsd_logp, "CALL FetchData DONE");
- } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code));
+ } while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, 0, &afsStatus, &volSync, NULL, NULL, code));
fetchingcompleted:
code = cm_MapRPCError(code, reqp);
lock_ObtainWrite(&scp->rw);
if (code == 0)
- cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, reqp, CM_MERGEFLAG_FETCHDATA);
+ code = cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, reqp, CM_MERGEFLAG_FETCHDATA);
+ else
+ InterlockedDecrement(&scp->activeRPCs);
return code;
}
+
+/*
+ * cm_VerifyStoreData. Function passed a rw locked cm_scache_t and a store data biod.
+ *
+ * Return 1 if the data verifies; 0 if not.
+ */
+
+long
+cm_VerifyStoreData(cm_bulkIO_t *biod, cm_scache_t *savedScp)
+{
+ long code=0, code1=0;
+ afs_uint32 nbytes; /* bytes in transfer */
+ afs_uint32 nbytes_hi = 0; /* high-order 32 bits of bytes in transfer */
+ afs_uint64 length_found = 0;
+ long rxbytes; /* bytes in rx_Read call */
+ long temp;
+ AFSFetchStatus afsStatus;
+ AFSCallBack callback;
+ AFSVolSync volSync;
+ AFSFid tfid;
+ struct rx_call *rxcallp;
+ struct rx_connection *rxconnp;
+ cm_conn_t *connp;
+ int require_64bit_ops = 0;
+ int call_was_64bit = 0;
+ int fs_fetchdata_offset_bug = 0;
+ int first_read = 1;
+ int scp_locked = 1;
+ char * bufferp = malloc(biod->length);
+ long verified = 0;
+ cm_scache_t *scp = biod->scp;
+ cm_user_t *userp = biod->userp;
+ cm_req_t *reqp = biod->reqp;
+ afs_uint64 dataVersion = scp->dataVersion;
+
+ memset(&afsStatus, 0, sizeof(afsStatus));
+ memset(&callback, 0, sizeof(callback));
+ memset(&volSync, 0, sizeof(volSync));
+ memset(bufferp, 0, biod->length);
+
+ cm_AFSFidFromFid(&tfid, &scp->fid);
+
+ if (LargeIntegerGreaterThan(LargeIntegerAdd(biod->offset,
+ ConvertLongToLargeInteger(biod->length)),
+ ConvertLongToLargeInteger(LONG_MAX))) {
+ require_64bit_ops = 1;
+ }
+
+ InterlockedIncrement(&scp->activeRPCs);
+ osi_Log2(afsd_logp, "cm_VerifyStoreData: fetching data scp %p DV 0x%x", scp, scp->dataVersion);
+
+ if (scp_locked) {
+ lock_ReleaseWrite(&scp->rw);
+ scp_locked = 0;
+ }
+
+ /* now make the call */
+ do {
+ code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp);
+ if (code)
+ continue;
+
+ rxconnp = cm_GetRxConn(connp);
+ rxcallp = rx_NewCall(rxconnp);
+ rx_PutConnection(rxconnp);
+
+ nbytes = nbytes_hi = 0;
+
+ if (SERVERHAS64BIT(connp)) {
+ call_was_64bit = 1;
+
+ osi_Log4(afsd_logp, "CALL FetchData64 scp 0x%p, off 0x%x:%08x, size 0x%x",
+ scp, biod->offset.HighPart, biod->offset.LowPart, biod->length);
+
+ code = StartRXAFS_FetchData64(rxcallp, &tfid, biod->offset.QuadPart, biod->length);
+
+ if (code == 0) {
+ temp = rx_Read32(rxcallp, &nbytes_hi);
+ if (temp == sizeof(afs_int32)) {
+ nbytes_hi = ntohl(nbytes_hi);
+ } else {
+ nbytes_hi = 0;
+ code = rx_Error(rxcallp);
+ code1 = rx_EndCall(rxcallp, code);
+ rxcallp = NULL;
+ }
+ }
+ } else {
+ call_was_64bit = 0;
+ }
+
+ if (code == RXGEN_OPCODE || !SERVERHAS64BIT(connp)) {
+ if (require_64bit_ops) {
+ osi_Log0(afsd_logp, "Skipping FetchData. Operation requires FetchData64");
+ code = CM_ERROR_TOOBIG;
+ } else {
+ if (!rxcallp) {
+ rxconnp = cm_GetRxConn(connp);
+ rxcallp = rx_NewCall(rxconnp);
+ rx_PutConnection(rxconnp);
+ }
+
+ osi_Log3(afsd_logp, "CALL FetchData scp 0x%p, off 0x%x, size 0x%x",
+ scp, biod->offset.LowPart, biod->length);
+
+ code = StartRXAFS_FetchData(rxcallp, &tfid, biod->offset.LowPart, biod->length);
+
+ SET_SERVERHASNO64BIT(connp);
+ }
+ }
+
+ if (code == 0) {
+ temp = rx_Read32(rxcallp, &nbytes);
+ if (temp == sizeof(afs_int32)) {
+ nbytes = ntohl(nbytes);
+ FillInt64(length_found, nbytes_hi, nbytes);
+ if (length_found > biod->length) {
+ /*
+ * prior to 1.4.12 and 1.5.65 the file server would return
+ * (filesize - offset) if the requested offset was greater than
+ * the filesize. The correct return value would have been zero.
+ * Force a retry by returning an RX_PROTOCOL_ERROR. If the cause
+ * is a race between two RPCs issues by this cache manager, the
+ * correct thing will happen the second time.
+ */
+ osi_Log0(afsd_logp, "cm_GetData length_found > biod.length");
+ fs_fetchdata_offset_bug = 1;
+ }
+ } else {
+ osi_Log1(afsd_logp, "cm_GetData rx_Read32 returns %d != 4", temp);
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
+ }
+ }
+ /* for the moment, nbytes_hi will always be 0 if code == 0
+ because data_length is a 32-bit quantity. */
+
+ if (code == 0) {
+ /* fill length_found of data from the pipe into the pages.
+ * When we stop, qdp will point at the last page we're
+ * dealing with, and bufferp will tell us where we
+ * stopped. We'll need this info below when we clear
+ * the remainder of the last page out (and potentially
+ * clear later pages out, if we fetch past EOF).
+ */
+ while (length_found > 0) {
+ /* assert that there are still more buffers;
+ * our check above for length_found being less than
+ * data_length should ensure this.
+ */
+ osi_assertx(bufferp != NULL, "null cm_buf_t");
+
+ /* read rxbytes of data */
+ rxbytes = (afs_uint32)(length_found > biod->length ? biod->length : length_found);
+ temp = rx_Read(rxcallp, bufferp, rxbytes);
+ if (temp < rxbytes) {
+ /*
+ * If the file server returned (filesize - offset),
+ * then the first rx_Read will return zero octets of data.
+ * If it does, do not treat it as an error. Correct the
+ * length_found and continue as if the file server said
+ * it was sending us zero octets of data.
+ */
+ if (fs_fetchdata_offset_bug && first_read) {
+ length_found = 0;
+ break;
+ } else if (temp <= 0) {
+ code = (rx_Error(rxcallp) < 0) ? rx_Error(rxcallp) : RX_PROTOCOL_ERROR;
+ break;
+ }
+ }
+ first_read = 0;
+
+ /* and adjust counters */
+ length_found -= temp;
+ }
+ }
+
+ if (code == 0) {
+ if (call_was_64bit)
+ code = EndRXAFS_FetchData64(rxcallp, &afsStatus, &callback, &volSync);
+ else
+ code = EndRXAFS_FetchData(rxcallp, &afsStatus, &callback, &volSync);
+ } else {
+ if (call_was_64bit)
+ osi_Log1(afsd_logp, "CALL EndRXAFS_FetchData64 skipped due to error %d", code);
+ else
+ osi_Log1(afsd_logp, "CALL EndRXAFS_FetchData skipped due to error %d", code);
+ }
+
+ if (rxcallp)
+ code1 = rx_EndCall(rxcallp, code);
+
+ if (code1 == RXKADUNKNOWNKEY)
+ osi_Log0(afsd_logp, "CALL EndCall returns RXKADUNKNOWNKEY");
+
+ /* If we are avoiding a file server bug, ignore the error state */
+ if (fs_fetchdata_offset_bug && first_read && length_found == 0 && code == -451) {
+ /* Clone the current status info and clear the error state */
+ scp_locked = cm_CloneStatus(scp, userp, scp_locked, &afsStatus, &volSync);
+ if (scp_locked) {
+ lock_ReleaseWrite(&scp->rw);
+ scp_locked = 0;
+ }
+ code = 0;
+ /* Prefer the error value from FetchData over rx_EndCall */
+ } else if (code == 0 && code1 != 0)
+ code = code1;
+ osi_Log0(afsd_logp, "CALL FetchData DONE");
+
+ } while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, 0, &afsStatus, &volSync, NULL, NULL, code));
+
+ fetchingcompleted:
+ code = cm_MapRPCError(code, reqp);
+
+ if (!scp_locked)
+ lock_ObtainWrite(&scp->rw);
+
+ if (code == 0)
+ code = cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, reqp, CM_MERGEFLAG_FETCHDATA);
+ else
+ InterlockedDecrement(&scp->activeRPCs);
+
+ if (code == 0)
+ {
+ if (dataVersion == scp->dataVersion)
+ {
+ osi_queueData_t *qdp = NULL;
+ cm_buf_t *bufp;
+ afs_uint32 buf_offset;
+ afs_uint32 bytes_compared = 0;
+ afs_uint32 cmp_length;
+ int md5_match = 1;
+
+ verified = 1;
+
+ while ( bytes_compared < biod->length )
+ {
+ if (qdp == NULL) {
+ qdp = biod->bufListEndp;
+ buf_offset = biod->offset.LowPart % cm_data.buf_blockSize;
+ } else {
+ qdp = (osi_queueData_t *) osi_QPrev(&qdp->q);
+ buf_offset = 0;
+ }
+ cmp_length = cm_data.buf_blockSize - buf_offset;
+
+ osi_assertx(qdp != NULL, "null osi_queueData_t");
+ bufp = osi_GetQData(qdp);
+
+ if (memcmp(bufferp+bytes_compared, bufp->datap+buf_offset, cmp_length) != 0)
+ {
+ verified = 0;
+ md5_match = buf_ValidateCheckSum(bufp);
+
+ osi_Log5(afsd_logp, "cm_VerifyDataStore verification failed scp 0x%p bufp 0x%p offset 0x%x:%08x md5 %s",
+ scp, bufp, bufp->offset.HighPart, bufp->offset.LowPart, md5_match ? "match" : "no-match");
+ }
+ bytes_compared += cmp_length;
+ }
+ } else {
+ osi_Log4(afsd_logp, "cm_VerifyStoreData unable to verify due to data version change scp 0x%p, off 0x%x:%08x, size 0x%x",
+ scp, biod->offset.HighPart, biod->offset.LowPart, biod->length);
+ }
+ }
+
+ if (bufferp)
+ free(bufferp);
+
+ return verified;
+}
git://git.openafs.org / openafs.git / blobdiff