jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DEVEL15-rx-do-not-race-current-packet-20090105

Browse Source 
LICENSE MIT

Throughout rx_rdwr.c functions allocate a register variable 'cp'
which is used to optimize access to call->currentPacket.
Unfortunately, if the call->lock is dropped (for example, CV_WAIT)
the synchronization between the two is lost.  This delta re-syncs
'cp' and call->currentPacket after each location where the call->lock
may be dropped.


(cherry picked from commit 423ab97eee35f57beeb481cac2159d28dea20577)
This commit is contained in:
Jeffrey Altman 2009-01-05 23:13:08 +00:00 committed by Jeffrey Altman
parent d97ef4b087
commit bd46d35b07
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rx/rx_rdwr.c
View File

@ -241,6 +241,8 @@ MTUXXX doesn't there need to be an "else" here ???
osi_rxSleep(&call->rq);
#endif
}
/* cp is no longer valid since we may have given up the lock */
cp = call->currentPacket;
call->startWait = 0;
#ifdef RX_ENABLE_LOCKS
@ -1116,7 +1118,7 @@ rx_WritevAlloc(struct rx_call *call, struct iovec *iov, int *nio, int maxio,
int
rxi_WritevProc(struct rx_call *call, struct iovec *iov, int nio, int nbytes)
{
struct rx_packet *cp = call->currentPacket;
struct rx_packet *cp = NULL;
struct rx_call *p, *np;
int nextio;
int requestCount;
@ -1143,6 +1145,8 @@ rxi_WritevProc(struct rx_call *call, struct iovec *iov, int nio, int nbytes)
#endif /* RX_ENABLE_LOCKS */
}
#endif /* AFS_GLOBAL_RXLOCK_KERNEL */
/* cp is no longer valid since we may have given up the lock */
cp = call->currentPacket;
if (call->error) {
if (cp) {
@ -1278,6 +1282,8 @@ rxi_WritevProc(struct rx_call *call, struct iovec *iov, int nio, int nbytes)
#endif
call->startWait = 0;
}
/* cp is no longer valid since we may have given up the lock */
cp = call->currentPacket;
if (call->error) {
if (cp) {
@ -1310,7 +1316,7 @@ rx_WritevProc(struct rx_call *call, struct iovec *iov, int nio, int nbytes)
void
rxi_FlushWrite(register struct rx_call *call)
{
register struct rx_packet *cp = call->currentPacket;
register struct rx_packet *cp = NULL;
/* Free any packets from the last call to ReadvProc/WritevProc */
if (queue_IsNotEmpty(&call->iovq)) {
@ -1353,6 +1359,9 @@ rxi_FlushWrite(register struct rx_call *call)
}
#endif /* AFS_GLOBAL_RXLOCK_KERNEL */
/* cp is no longer valid since we may have given up the lock */
cp = call->currentPacket;
if (cp) {
/* cp->length is only supposed to be the user's data */
/* cp->length was already set to (then-current)