static struct afs_slotlist *afs_freeSlotList = NULL;
/* Forward declarations */
-static afs_int32 afs_QueueVCB(struct vcache *avc);
+static afs_int32 afs_QueueVCB(struct vcache *avc, int *slept);
/*!
* Generate an index into the hash table for a given Fid.
#endif
afs_FreeAllAxs(&(avc->Access));
if (!afs_shuttingdown)
- afs_QueueVCB(avc);
+ afs_QueueVCB(avc, slept);
ObtainWriteLock(&afs_xcbhash, 460);
afs_DequeueCallback(avc); /* remove it from queued callbacks list */
avc->f.states &= ~(CStatd | CUnique);
struct afs_cbr *tsp;
int i;
- if (!afs_cbrSpace) {
- afs_osi_CancelWait(&AFS_WaitHandler); /* trigger FlushVCBs asap */
-
+ while (!afs_cbrSpace) {
if (afs_stats_cmperf.CallBackAlloced >= sizeof(afs_cbrHeads)/sizeof(afs_cbrHeads[0])) {
/* don't allocate more than 16 * AFS_NCBRS for now */
- tsp = (struct afs_cbr *)osi_AllocSmallSpace(sizeof(*tsp));
- tsp->dynalloc = 1;
- tsp->next = NULL;
+ afs_FlushVCBs(0);
afs_stats_cmperf.CallBackFlushes++;
} else {
/* try allocating */
osi_Assert(tsp != NULL);
for (i = 0; i < AFS_NCBRS - 1; i++) {
tsp[i].next = &tsp[i + 1];
- tsp[i].dynalloc = 0;
}
tsp[AFS_NCBRS - 1].next = 0;
- tsp[AFS_NCBRS - 1].dynalloc = 0;
- afs_cbrSpace = tsp->next;
+ afs_cbrSpace = tsp;
afs_cbrHeads[afs_stats_cmperf.CallBackAlloced] = tsp;
afs_stats_cmperf.CallBackAlloced++;
}
- } else {
- tsp = afs_cbrSpace;
- afs_cbrSpace = tsp->next;
}
+ tsp = afs_cbrSpace;
+ afs_cbrSpace = tsp->next;
return tsp;
}
if (asp->hash_next)
asp->hash_next->hash_pprev = asp->hash_pprev;
- if (asp->dynalloc) {
- osi_FreeSmallSpace(asp);
- } else {
- asp->next = afs_cbrSpace;
- afs_cbrSpace = asp;
- }
+ asp->next = afs_cbrSpace;
+ afs_cbrSpace = asp;
return 0;
}
*/
if (lockit == 2)
- afs_LoopServers(2, NULL, 0, FlushAllVCBs, NULL);
+ afs_LoopServers(AFS_LS_ALL, NULL, 0, FlushAllVCBs, NULL);
ObtainReadLock(&afs_xserver);
for (i = 0; i < NSERVERS; i++) {
tcount = 0; /* number found so far */
for (safety2 = 0; safety2 < afs_cacheStats; safety2++) {
if (tcount >= AFS_MAXCBRSCALL || !tsp->cbrs) {
+ struct rx_connection *rxconn;
/* if buffer is full, or we've queued all we're going
* to from this server, we should flush out the
* callbacks.
for (safety3 = 0; safety3 < AFS_MAXHOSTS * 2; safety3++) {
tc = afs_ConnByHost(tsp, tsp->cell->fsport,
tsp->cell->cellNum, &treq, 0,
- SHARED_LOCK);
+ SHARED_LOCK, &rxconn);
if (tc) {
XSTATS_START_TIME
(AFS_STATS_FS_RPCIDX_GIVEUPCALLBACKS);
RX_AFS_GUNLOCK();
code =
- RXAFS_GiveUpCallBacks(tc->id, &fidArray,
+ RXAFS_GiveUpCallBacks(rxconn, &fidArray,
&cbArray);
RX_AFS_GLOCK();
XSTATS_END_TIME;
} else
code = -1;
if (!afs_Analyze
- (tc, code, 0, &treq,
+ (tc, rxconn, code, 0, &treq,
AFS_STATS_FS_RPCIDX_GIVEUPCALLBACKS, SHARED_LOCK,
tsp->cell)) {
break;
* Environment:
* Locks the xvcb lock.
* Called when the xvcache lock is already held.
+ * RACE: afs_xvcache may be dropped and reacquired
*
* \param avc vcache entry
+ * \param slep Set to 1 if we dropped afs_xvcache
* \return 1 if queued, 0 otherwise
*/
static afs_int32
-afs_QueueVCB(struct vcache *avc)
+afs_QueueVCB(struct vcache *avc, int *slept)
{
int queued = 0;
struct server *tsp;
struct afs_cbr *tcbp;
+ int reacquire = 0;
AFS_STATCNT(afs_QueueVCB);
/* The callback is really just a struct server ptr. */
tsp = (struct server *)(avc->callback);
+ if (!afs_cbrSpace) {
+ /* If we don't have CBR space, AllocCBR may block or hit the net for
+ * clearing up CBRs. Hitting the net may involve a fileserver
+ * needing to contact us, so we must drop xvcache so we don't block
+ * those requests from going through. */
+ reacquire = *slept = 1;
+ ReleaseWriteLock(&afs_xvcache);
+ }
+
/* we now have a pointer to the server, so we just allocate
* a queue entry and queue it.
*/
done:
/* now release locks and return */
ReleaseWriteLock(&afs_xvcb);
+
+ if (reacquire) {
+ /* make sure this is after dropping xvcb, for locking order */
+ ObtainWriteLock(&afs_xvcache, 279);
+ }
return queued;
}
#endif
}
+void
+afs_FlushAllVCaches(void)
+{
+ int i;
+ struct vcache *tvc, *nvc;
+
+ ObtainWriteLock(&afs_xvcache, 867);
+
+ retry:
+ for (i = 0; i < VCSIZE; i++) {
+ for (tvc = afs_vhashT[i]; tvc; tvc = nvc) {
+ int slept;
+
+ nvc = tvc->hnext;
+ if (afs_FlushVCache(tvc, &slept)) {
+ afs_warn("Failed to flush vcache 0x%lx\n", (unsigned long)(uintptrsz)tvc);
+ }
+ if (slept) {
+ goto retry;
+ }
+ tvc = nvc;
+ }
+ }
+
+ ReleaseWriteLock(&afs_xvcache);
+}
+
/*!
* This routine is responsible for allocating a new cache entry
* from the free list. It formats the cache entry and inserts it
tvc->flockCount)) panic("Dead vnode has core/unlinkedel/flock");
#endif
if (doflocks && tvc->flockCount != 0) {
+ struct rx_connection *rxconn;
/* if this entry has an flock, send a keep-alive call out */
osi_vnhold(tvc, 0);
ReleaseReadLock(&afs_xvcache);
afs_InitReq(&treq, afs_osi_credp);
treq.flags |= O_NONBLOCK;
- tc = afs_Conn(&tvc->f.fid, &treq, SHARED_LOCK);
+ tc = afs_Conn(&tvc->f.fid, &treq, SHARED_LOCK, &rxconn);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_EXTENDLOCK);
RX_AFS_GUNLOCK();
code =
- RXAFS_ExtendLock(tc->id,
+ RXAFS_ExtendLock(rxconn,
(struct AFSFid *)&tvc->f.fid.Fid,
&tsync);
RX_AFS_GLOCK();
} else
code = -1;
} while (afs_Analyze
- (tc, code, &tvc->f.fid, &treq,
+ (tc, rxconn, code, &tvc->f.fid, &treq,
AFS_STATS_FS_RPCIDX_EXTENDLOCK, SHARED_LOCK, NULL));
ReleaseWriteLock(&tvc->lock);
struct afs_conn *tc;
struct AFSFetchStatus OutStatus;
struct AFSVolSync tsync;
+ struct rx_connection *rxconn;
XSTATS_DECLS;
AFS_STATCNT(afs_WriteVCache);
afs_Trace2(afs_iclSetp, CM_TRACE_WVCACHE, ICL_TYPE_POINTER, avc,
ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->f.m.Length));
do {
- tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK);
+ tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK, &rxconn);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_STORESTATUS);
RX_AFS_GUNLOCK();
code =
- RXAFS_StoreStatus(tc->id, (struct AFSFid *)&avc->f.fid.Fid,
+ RXAFS_StoreStatus(rxconn, (struct AFSFid *)&avc->f.fid.Fid,
astatus, &OutStatus, &tsync);
RX_AFS_GLOCK();
XSTATS_END_TIME;
} else
code = -1;
} while (afs_Analyze
- (tc, code, &avc->f.fid, areq, AFS_STATS_FS_RPCIDX_STORESTATUS,
+ (tc, rxconn, code, &avc->f.fid, areq, AFS_STATS_FS_RPCIDX_STORESTATUS,
SHARED_LOCK, NULL));
UpgradeSToWLock(&avc->lock, 20);
struct AFSFetchStatus *astat, struct vrequest *areq)
{
afs_size_t length;
+#ifdef AFS_DARWIN80_ENV
+ int fixup = 0;
+#endif
AFS_STATCNT(afs_ProcessFS);
#ifdef AFS_64BIT_CLIENT
avc->f.m.Group = astat->Group;
avc->f.m.LinkCount = astat->LinkCount;
if (astat->FileType == File) {
+#ifdef AFS_DARWIN80_ENV
+ if (avc->f.m.Type != VREG)
+ fixup = 1;
+#endif
vSetType(avc, VREG);
avc->f.m.Mode |= S_IFREG;
} else if (astat->FileType == Directory) {
+#ifdef AFS_DARWIN80_ENV
+ if (avc->f.m.Type != VDIR)
+ fixup = 1;
+#endif
vSetType(avc, VDIR);
avc->f.m.Mode |= S_IFDIR;
} else if (astat->FileType == SymbolicLink) {
if (afs_fakestat_enable && (avc->f.m.Mode & 0111) == 0) {
+#ifdef AFS_DARWIN80_ENV
+ if (avc->f.m.Type != VDIR)
+ fixup = 1;
+#endif
vSetType(avc, VDIR);
avc->f.m.Mode |= S_IFDIR;
} else {
+#ifdef AFS_DARWIN80_ENV
+ if (avc->f.m.Type != VLNK)
+ fixup = 1;
+#endif
vSetType(avc, VLNK);
avc->f.m.Mode |= S_IFLNK;
}
avc->mvstat = 1;
}
}
+#ifdef AFS_DARWIN80_ENV
+ if (fixup)
+ printf("found mistyped vnode!\n");
+#endif
avc->f.anyAccess = astat->AnonymousAccess;
#ifdef badidea
if ((astat->CallerAccess & ~astat->AnonymousAccess))
struct AFSVolSync *tsyncp)
{
afs_int32 code;
- afs_uint32 start;
struct afs_conn *tc;
+ struct rx_connection *rxconn;
struct AFSFetchStatus OutDirStatus;
XSTATS_DECLS;
if (!name)
name = ""; /* XXX */
do {
- tc = afs_Conn(afid, areq, SHARED_LOCK);
+ tc = afs_Conn(afid, areq, SHARED_LOCK, &rxconn);
if (tc) {
if (serverp)
*serverp = tc->parent->srvr->server;
- start = osi_Time();
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_XLOOKUP);
RX_AFS_GUNLOCK();
code =
- RXAFS_Lookup(tc->id, (struct AFSFid *)&afid->Fid, name,
+ RXAFS_Lookup(rxconn, (struct AFSFid *)&afid->Fid, name,
(struct AFSFid *)&nfid->Fid, OutStatusp,
&OutDirStatus, CallBackp, tsyncp);
RX_AFS_GLOCK();
} else
code = -1;
} while (afs_Analyze
- (tc, code, afid, areq, AFS_STATS_FS_RPCIDX_XLOOKUP, SHARED_LOCK,
+ (tc, rxconn, code, afid, areq, AFS_STATS_FS_RPCIDX_XLOOKUP, SHARED_LOCK,
NULL));
return code;
}
#ifdef AFS_DARWIN80_ENV
if (tvc->f.states & CDeadVnode) {
- if (!(tvc->f.states & CBulkFetching)) {
- ReleaseSharedLock(&afs_xvcache);
- afs_osi_Sleep(&tvc->f.states);
- goto rootvc_loop;
- }
+ ReleaseSharedLock(&afs_xvcache);
+ afs_osi_Sleep(&tvc->f.states);
+ goto rootvc_loop;
}
tvp = AFSTOV(tvc);
if (vnode_get(tvp)) /* this bumps ref count */
AFS_GLOCK();
continue;
}
- if (tvc->f.states & (CBulkFetching|CDeadVnode)) {
- AFS_GUNLOCK();
- vnode_recycle(AFSTOV(tvc));
- AFS_GLOCK();
- }
#endif
break;
}
struct afs_conn *tc;
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
+ struct rx_connection *rxconn;
XSTATS_DECLS;
do {
- tc = afs_Conn(afid, areq, SHARED_LOCK);
+ tc = afs_Conn(afid, areq, SHARED_LOCK, &rxconn);
avc->dchint = NULL; /* invalidate hints */
if (tc) {
avc->callback = tc->parent->srvr->server;
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_FETCHSTATUS);
RX_AFS_GUNLOCK();
code =
- RXAFS_FetchStatus(tc->id, (struct AFSFid *)&afid->Fid, Outsp,
+ RXAFS_FetchStatus(rxconn, (struct AFSFid *)&afid->Fid, Outsp,
&CallBack, &tsync);
RX_AFS_GLOCK();
} else
code = -1;
} while (afs_Analyze
- (tc, code, afid, areq, AFS_STATS_FS_RPCIDX_FETCHSTATUS,
+ (tc, rxconn, code, afid, areq, AFS_STATS_FS_RPCIDX_FETCHSTATUS,
SHARED_LOCK, NULL));
if (!code) {
static void
findvc_sleep(struct vcache *avc, int flag)
{
- int fstates = avc->f.states;
if (flag & IS_SLOCK) {
ReleaseSharedLock(&afs_xvcache);
} else {
ReleaseReadLock(&afs_xvcache);
}
}
- if (flag & FIND_CDEAD) {
- ObtainWriteLock(&afs_xvcache, 342);
- afs_FlushReclaimedVcaches();
- if (fstates == avc->f.states) {
- ReleaseWriteLock(&afs_xvcache);
- afs_osi_Sleep(&avc->f.states);
- } else
- ReleaseWriteLock(&afs_xvcache);
- } else
- afs_osi_Sleep(&avc->f.states);
+ afs_osi_Sleep(&avc->f.states);
if (flag & IS_SLOCK) {
ObtainSharedLock(&afs_xvcache, 341);
} else {
i = VCHash(afid);
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
if (FidMatches(afid, tvc)) {
-#ifdef AFS_DARWIN80_ENV
- if (flag & FIND_CDEAD) {
- if (tvc->f.states & (CDeadVnode|CBulkFetching)) {
- deadvc = tvc;
- continue;
- }
- } else {
- if (tvc->f.states & CDeadVnode)
- if ((tvc->f.states & CBulkFetching) &&
- !(flag & FIND_BULKDEAD))
- continue;
- }
-#endif
if (tvc->f.states & CVInit) {
findvc_sleep(tvc, flag);
goto findloop;
findvc_sleep(tvc, flag);
goto findloop;
}
- if (flag & FIND_CDEAD) {
- livevc = tvc;
- continue;
- }
#endif
break;
}
}
-#ifdef AFS_DARWIN80_ENV
- if (flag & FIND_CDEAD) {
- if (livevc && deadvc) {
- /* discard deadvc */
- AFS_GUNLOCK();
- vnode_recycle(AFSTOV(deadvc));
- vnode_put(AFSTOV(deadvc));
- vnode_rele(AFSTOV(deadvc));
- AFS_GLOCK();
- deadvc = NULL;
- }
-
- /* return what's left */
- tvc = livevc ? livevc : deadvc;
- }
-#endif
/* should I have a read lock on the vnode here? */
if (tvc) {
AFS_GLOCK();
tvp = NULL;
}
- if (tvp && (tvc->f.states & (CBulkFetching|CDeadVnode))) {
- AFS_GUNLOCK();
- vnode_recycle(AFSTOV(tvc));
- AFS_GLOCK();
- }
if (!tvp) {
tvc = NULL;
return tvc;
}
#ifdef AFS_DARWIN80_ENV
if (tvc->f.states & CDeadVnode) {
- if (!(tvc->f.states & CBulkFetching)) {
- ReleaseSharedLock(&afs_xvcache);
- afs_osi_Sleep(&tvc->f.states);
- goto loop;
- }
+ ReleaseSharedLock(&afs_xvcache);
+ afs_osi_Sleep(&tvc->f.states);
+ goto loop;
}
tvp = AFSTOV(tvc);
if (vnode_get(tvp)) {
AFS_GLOCK();
continue;
}
- if (tvc->f.states & (CBulkFetching|CDeadVnode)) {
- AFS_GUNLOCK();
- vnode_recycle(AFSTOV(tvc));
- AFS_GLOCK();
- }
#endif /* AFS_DARWIN80_ENV */
count++;
if (found_tvc) {
ObtainWriteLock(&afs_xvcache, 1002); /* XXX - should be a unique number */
+ retry:
/* Somehow, walk the set of vcaches, with each one coming out as tvc */
for (i = 0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
- if (afs_QueueVCB(tvc)) {
+ int slept = 0;
+ if (afs_QueueVCB(tvc, &slept)) {
tvc->callback = NULL;
nq++;
}
+ if (slept) {
+ goto retry;
+ }
}
}