d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tmpfs: manage tm_pages_used with atomics

Browse Source 
Reviewed by:	kib (previous version)
This commit is contained in:
Mateusz Guzik 2017-01-14 06:20:36 +00:00
parent 792bbaba98
commit ed2159c92c
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/tmpfs/tmpfs.h
View File

@ -312,12 +312,12 @@ struct tmpfs_mount {
/* Maximum number of memory pages available for use by the file
* system, set during mount time. This variable must never be
* used directly as it may be bigger than the current amount of
* free memory; in the extreme case, it will hold the SIZE_MAX
* free memory; in the extreme case, it will hold the ULONG_MAX
* value. */
size_t tm_pages_max;
u_long tm_pages_max;
/* Number of pages in use by the file system. */
size_t tm_pages_used;
u_long tm_pages_used;
/* Pointer to the node representing the root directory of this
* file system. */

10
sys/fs/tmpfs/tmpfs_subr.c
View File

@ -129,7 +129,7 @@ tmpfs_pages_check_avail(struct tmpfs_mount *tmp, size_t req_pages)
if (tmpfs_mem_avail() < req_pages)
return (0);
if (tmp->tm_pages_max != SIZE_MAX &&
if (tmp->tm_pages_max != ULONG_MAX &&
tmp->tm_pages_max < req_pages + tmpfs_pages_used(tmp))
return (0);
@ -327,9 +327,7 @@ tmpfs_free_node(struct tmpfs_mount *tmp, struct tmpfs_node *node)
case VREG:
uobj = node->tn_reg.tn_aobj;
if (uobj != NULL) {
TMPFS_LOCK(tmp);
tmp->tm_pages_used -= uobj->size;
TMPFS_UNLOCK(tmp);
atomic_subtract_long(&tmp->tm_pages_used, uobj->size);
KASSERT((uobj->flags & OBJ_TMPFS) == 0,
("leaked OBJ_TMPFS node %p vm_obj %p", node, uobj));
vm_object_deallocate(uobj);
@ -1417,9 +1415,7 @@ retry:
uobj->size = newpages;
VM_OBJECT_WUNLOCK(uobj);
TMPFS_LOCK(tmp);
tmp->tm_pages_used += (newpages - oldpages);
TMPFS_UNLOCK(tmp);
atomic_add_long(&tmp->tm_pages_used, newpages - oldpages);
node->tn_size = newsize;
return (0);

2
sys/fs/tmpfs/tmpfs_vfsops.c
View File

@ -397,7 +397,7 @@ tmpfs_statfs(struct mount *mp, struct statfs *sbp)
sbp->f_bsize = PAGE_SIZE;
used = tmpfs_pages_used(tmp);
if (tmp->tm_pages_max != SIZE_MAX)
if (tmp->tm_pages_max != ULONG_MAX)
sbp->f_blocks = tmp->tm_pages_max;
else
sbp->f_blocks = used + tmpfs_mem_avail();