summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2004-03-16 19:04:28 +0000
committeralc <alc@FreeBSD.org>2004-03-16 19:04:28 +0000
commita2e820d27ba39950df6b8aae95fdca17e3eeb69d (patch)
tree23b7ae48f580ace96e1510d279da96896036cc35
parent71c3a1c44c43ab6da664e5414fb5ae531038d5c5 (diff)
downloadFreeBSD-src-a2e820d27ba39950df6b8aae95fdca17e3eeb69d.zip
FreeBSD-src-a2e820d27ba39950df6b8aae95fdca17e3eeb69d.tar.gz
Refactor the existing machine-dependent sf_buf_free() into a machine-
dependent function by the same name and a machine-independent function, sf_buf_mext(). Aside from the virtue of making more of the code machine- independent, this change also makes the interface more logical. Before, sf_buf_free() did more than simply undo an sf_buf_alloc(); it also unwired and if necessary freed the page. That is now the purpose of sf_buf_mext(). Thus, sf_buf_alloc() and sf_buf_free() can now be used as a general-purpose emphemeral map cache.
Diffstat
-rw-r--r--sys/alpha/alpha/vm_machdep.c19
-rw-r--r--sys/amd64/amd64/vm_machdep.c19
-rw-r--r--sys/i386/i386/vm_machdep.c24
-rw-r--r--sys/ia64/ia64/vm_machdep.c19
-rw-r--r--sys/kern/uipc_cow.c2
-rw-r--r--sys/kern/uipc_syscalls.c26
-rw-r--r--sys/powerpc/aim/vm_machdep.c21
-rw-r--r--sys/powerpc/powerpc/vm_machdep.c21
-rw-r--r--sys/sparc64/sparc64/vm_machdep.c21
-rw-r--r--sys/sys/sf_buf.h3
10 files changed, 48 insertions, 127 deletions
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index da95586..26f3365 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -437,27 +437,12 @@ sf_buf_alloc(struct vm_page *m)
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
- m = sf->m;
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can
- * happen since we don't hold a reference to it.
- * If so, we're responsible for freeing the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
- sf->m = NULL;
mtx_lock(&sf_freelist.sf_lock);
SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
nsfbufsused--;
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 550cae0..215c825 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -490,27 +490,12 @@ sf_buf_alloc(struct vm_page *m)
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
- m = sf->m;
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can
- * happen since we don't hold a reference to it.
- * If so, we're responsible for freeing the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
- sf->m = NULL;
mtx_lock(&sf_freelist.sf_lock);
SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
nsfbufsused--;
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 919f33f..9828918 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -653,36 +653,24 @@ done:
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Remove a reference from the given sf_buf, adding it to the free
+ * list when its reference count reaches zero. A freed sf_buf still,
+ * however, retains its virtual-to-physical mapping until it is
+ * recycled or reactivated by sf_buf_alloc(9).
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
mtx_lock(&sf_buf_lock);
- m = sf->m;
sf->ref_count--;
if (sf->ref_count == 0) {
- nsfbufsused--;
TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry);
+ nsfbufsused--;
if (sf_buf_alloc_want > 0)
wakeup_one(&sf_buf_freelist);
}
mtx_unlock(&sf_buf_lock);
-
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can
- * happen since we don't hold a reference to it.
- * If so, we're responsible for freeing the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
}
/*
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index 0b72dee..027010d 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/vm_machdep.c
@@ -374,27 +374,12 @@ sf_buf_alloc(struct vm_page *m)
}
/*
- * Detach mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
- m = sf->m;
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can happen since we
- * don't hold a reference to it. If so, we're responsible for freeing
- * the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
- sf->m = NULL;
mtx_lock(&sf_freelist.sf_lock);
SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
nsfbufsused--;
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c
index ca6b2d8..8c00ffe 100644
--- a/sys/kern/uipc_cow.c
+++ b/sys/kern/uipc_cow.c
@@ -85,7 +85,7 @@ socow_iodone(void *addr, void *args)
vm_page_unlock_queues();
splx(s);
/* note that sf_buf_free() unwires the page for us*/
- sf_buf_free(addr, args);
+ sf_buf_mext(addr, args);
socow_stats.iodone++;
}
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 78405a7..9827021 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1632,6 +1632,28 @@ getsockaddr(namp, uaddr, len)
}
/*
+ * Detatch mapped page and release resources back to the system.
+ */
+void
+sf_buf_mext(void *addr, void *args)
+{
+ vm_page_t m;
+
+ m = sf_buf_page(args);
+ sf_buf_free(args);
+ vm_page_lock_queues();
+ vm_page_unwire(m, 0);
+ /*
+ * Check for the object going away on us. This can
+ * happen since we don't hold a reference to it.
+ * If so, we're responsible for freeing the page.
+ */
+ if (m->wire_count == 0 && m->object == NULL)
+ vm_page_free(m);
+ vm_page_unlock_queues();
+}
+
+/*
* sendfile(2)
*
* MPSAFE
@@ -1917,14 +1939,14 @@ retry_lookup:
MGETHDR(m, M_TRYWAIT, MT_DATA);
if (m == NULL) {
error = ENOBUFS;
- sf_buf_free((void *)sf_buf_kva(sf), sf);
+ sf_buf_mext((void *)sf_buf_kva(sf), sf);
sbunlock(&so->so_snd);
goto done;
}
/*
* Setup external storage for mbuf.
*/
- MEXTADD(m, sf_buf_kva(sf), PAGE_SIZE, sf_buf_free, sf, M_RDONLY,
+ MEXTADD(m, sf_buf_kva(sf), PAGE_SIZE, sf_buf_mext, sf, M_RDONLY,
EXT_SFBUF);
m->m_data = (char *)sf_buf_kva(sf) + pgoff;
m->m_pkthdr.len = m->m_len = xfsize;
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 857822c..d174bc9 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -292,28 +292,13 @@ sf_buf_alloc(struct vm_page *m)
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
- pmap_qremove((vm_offset_t)addr, 1);
- m = sf->m;
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can
- * happen since we don't hold a reference to it.
- * If so, we're responsible for freeing the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
- sf->m = NULL;
+ pmap_qremove(sf->kva, 1);
mtx_lock(&sf_freelist.sf_lock);
SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
nsfbufsused--;
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 857822c..d174bc9 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -292,28 +292,13 @@ sf_buf_alloc(struct vm_page *m)
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
- pmap_qremove((vm_offset_t)addr, 1);
- m = sf->m;
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can
- * happen since we don't hold a reference to it.
- * If so, we're responsible for freeing the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
- sf->m = NULL;
+ pmap_qremove(sf->kva, 1);
mtx_lock(&sf_freelist.sf_lock);
SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
nsfbufsused--;
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index 2a780749..4ef0ed9 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -419,28 +419,13 @@ sf_buf_alloc(struct vm_page *m)
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- struct sf_buf *sf;
- struct vm_page *m;
- sf = args;
- pmap_qremove((vm_offset_t)addr, 1);
- m = sf->m;
- vm_page_lock_queues();
- vm_page_unwire(m, 0);
- /*
- * Check for the object going away on us. This can
- * happen since we don't hold a reference to it.
- * If so, we're responsible for freeing the page.
- */
- if (m->wire_count == 0 && m->object == NULL)
- vm_page_free(m);
- vm_page_unlock_queues();
- sf->m = NULL;
+ pmap_qremove(sf->kva, 1);
mtx_lock(&sf_freelist.sf_lock);
SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
nsfbufsused--;
diff --git a/sys/sys/sf_buf.h b/sys/sys/sf_buf.h
index f0655d2..e179df9 100644
--- a/sys/sys/sf_buf.h
+++ b/sys/sys/sf_buf.h
@@ -39,6 +39,7 @@ extern int nsfbufsused; /* Number of sendfile(2) bufs in use */
struct sf_buf *
sf_buf_alloc(struct vm_page *m);
-void sf_buf_free(void *addr, void *args);
+void sf_buf_free(struct sf_buf *sf);
+void sf_buf_mext(void *addr, void *args);
#endif /* !_SYS_SF_BUF_H_ */
OpenPOWER on IntegriCloud