Module Name: src
Committed By: cherry
Date: Thu Dec 22 08:15:20 UTC 2016
Modified Files:
src/sys/uvm: uvm_physseg.c uvm_physseg.h
src/tests/sys/uvm: t_uvm_physseg.c t_uvm_physseg_load.c
Log Message:
convention about function names for predicate checking:
s/uvm_physseg_valid()/uvm_physseg_valid_p()/
per. matt@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/uvm_physseg.c src/sys/uvm/uvm_physseg.h
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/uvm/t_uvm_physseg.c \
src/tests/sys/uvm/t_uvm_physseg_load.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_physseg.c
diff -u src/sys/uvm/uvm_physseg.c:1.1 src/sys/uvm/uvm_physseg.c:1.2
--- src/sys/uvm/uvm_physseg.c:1.1 Mon Dec 19 12:21:29 2016
+++ src/sys/uvm/uvm_physseg.c Thu Dec 22 08:15:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.c,v 1.1 2016/12/19 12:21:29 cherry Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.2 2016/12/22 08:15:20 cherry Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -417,7 +417,7 @@ uvm_physseg_t
uvm_physseg_get_next(uvm_physseg_t upm)
{
/* next of invalid is invalid, not fatal */
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return UVM_PHYSSEG_TYPE_INVALID;
return (uvm_physseg_t) rb_tree_iterate(&(uvm_physseg_graph.rb_tree), upm,
@@ -428,7 +428,7 @@ uvm_physseg_t
uvm_physseg_get_prev(uvm_physseg_t upm)
{
/* prev of invalid is invalid, not fatal */
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return UVM_PHYSSEG_TYPE_INVALID;
return (uvm_physseg_t) rb_tree_iterate(&(uvm_physseg_graph.rb_tree), upm,
@@ -603,7 +603,7 @@ int
uvm_physseg_get_next(uvm_physseg_t lcv)
{
/* next of invalid is invalid, not fatal */
- if (uvm_physseg_valid(lcv) == false)
+ if (uvm_physseg_valid_p(lcv) == false)
return UVM_PHYSSEG_TYPE_INVALID;
return (lcv + 1);
@@ -613,7 +613,7 @@ int
uvm_physseg_get_prev(uvm_physseg_t lcv)
{
/* prev of invalid is invalid, not fatal */
- if (uvm_physseg_valid(lcv) == false)
+ if (uvm_physseg_valid_p(lcv) == false)
return UVM_PHYSSEG_TYPE_INVALID;
return (lcv - 1);
@@ -778,7 +778,7 @@ uvm_physseg_plug(paddr_t pfn, size_t pag
uvm_physseg_t upm;
upm = uvm_physseg_find(pfn, &off);
- if (uvm_physseg_valid(upm)) /* XXX; do we allow "update" plugs ? */
+ if (uvm_physseg_valid_p(upm)) /* XXX; do we allow "update" plugs ? */
return false;
#endif
@@ -972,7 +972,7 @@ vm_physseg_find_linear(struct uvm_physse
#endif /* UVM_HOTPLUG */
bool
-uvm_physseg_valid(uvm_physseg_t upm)
+uvm_physseg_valid_p(uvm_physseg_t upm)
{
struct uvm_physseg *ps;
@@ -1007,7 +1007,7 @@ uvm_physseg_valid(uvm_physseg_t upm)
paddr_t
uvm_physseg_get_start(uvm_physseg_t upm)
{
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return (paddr_t) -1;
return HANDLE_TO_PHYSSEG_NODE(upm)->start;
@@ -1016,7 +1016,7 @@ uvm_physseg_get_start(uvm_physseg_t upm)
paddr_t
uvm_physseg_get_end(uvm_physseg_t upm)
{
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return (paddr_t) -1;
return HANDLE_TO_PHYSSEG_NODE(upm)->end;
@@ -1025,7 +1025,7 @@ uvm_physseg_get_end(uvm_physseg_t upm)
paddr_t
uvm_physseg_get_avail_start(uvm_physseg_t upm)
{
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return (paddr_t) -1;
return HANDLE_TO_PHYSSEG_NODE(upm)->avail_start;
@@ -1034,7 +1034,7 @@ uvm_physseg_get_avail_start(uvm_physseg_
paddr_t
uvm_physseg_get_avail_end(uvm_physseg_t upm)
{
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return (paddr_t) -1;
return HANDLE_TO_PHYSSEG_NODE(upm)->avail_end;
@@ -1043,7 +1043,7 @@ uvm_physseg_get_avail_end(uvm_physseg_t
struct vm_page *
uvm_physseg_get_pg(uvm_physseg_t upm, paddr_t idx)
{
- KASSERT(uvm_physseg_valid(upm));
+ KASSERT(uvm_physseg_valid_p(upm));
return &HANDLE_TO_PHYSSEG_NODE(upm)->pgs[idx];
}
@@ -1051,7 +1051,7 @@ uvm_physseg_get_pg(uvm_physseg_t upm, pa
struct pmap_physseg *
uvm_physseg_get_pmseg(uvm_physseg_t upm)
{
- KASSERT(uvm_physseg_valid(upm));
+ KASSERT(uvm_physseg_valid_p(upm));
return &(HANDLE_TO_PHYSSEG_NODE(upm)->pmseg);
}
#endif
@@ -1059,21 +1059,21 @@ uvm_physseg_get_pmseg(uvm_physseg_t upm)
int
uvm_physseg_get_free_list(uvm_physseg_t upm)
{
- KASSERT(uvm_physseg_valid(upm));
+ KASSERT(uvm_physseg_valid_p(upm));
return HANDLE_TO_PHYSSEG_NODE(upm)->free_list;
}
u_int
uvm_physseg_get_start_hint(uvm_physseg_t upm)
{
- KASSERT(uvm_physseg_valid(upm));
+ KASSERT(uvm_physseg_valid_p(upm));
return HANDLE_TO_PHYSSEG_NODE(upm)->start_hint;
}
bool
uvm_physseg_set_start_hint(uvm_physseg_t upm, u_int start_hint)
{
- if (uvm_physseg_valid(upm) == false)
+ if (uvm_physseg_valid_p(upm) == false)
return false;
HANDLE_TO_PHYSSEG_NODE(upm)->start_hint = start_hint;
@@ -1227,7 +1227,7 @@ uvm_physseg_unplug(paddr_t pfn, size_t p
upm = uvm_physseg_find(pfn, &off);
- if (!uvm_physseg_valid(upm)) {
+ if (!uvm_physseg_valid_p(upm)) {
printf("%s: Tried to unplug from unknown offset\n", __func__);
return false;
}
Index: src/sys/uvm/uvm_physseg.h
diff -u src/sys/uvm/uvm_physseg.h:1.1 src/sys/uvm/uvm_physseg.h:1.2
--- src/sys/uvm/uvm_physseg.h:1.1 Mon Dec 19 12:21:29 2016
+++ src/sys/uvm/uvm_physseg.h Thu Dec 22 08:15:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.h,v 1.1 2016/12/19 12:21:29 cherry Exp $ */
+/* $NetBSD: uvm_physseg.h,v 1.2 2016/12/22 08:15:20 cherry Exp $ */
/*
* Consolidated API from uvm_page.c and others.
@@ -25,7 +25,7 @@
/*
* These are specific values of invalid constants for uvm_physseg_t.
- * uvm_physseg_valid() == false on any of the below constants.
+ * uvm_physseg_valid_p() == false on any of the below constants.
*
* Specific invalid constants encapsulate specific explicit failure
* scenarios (see the comments next to them)
@@ -43,7 +43,7 @@ typedef struct uvm_physseg * uvm_physseg
/*
* These are specific values of invalid constants for uvm_physseg_t.
- * uvm_physseg_valid() == false on any of the below constants.
+ * uvm_physseg_valid_p() == false on any of the below constants.
*
* Specific invalid constants encapsulate specific explicit failure
* scenarios (see the comments next to them)
@@ -58,7 +58,7 @@ typedef int uvm_physseg_t;
void uvm_physseg_init(void);
-bool uvm_physseg_valid(uvm_physseg_t);
+bool uvm_physseg_valid_p(uvm_physseg_t);
/*
* Return start/end pfn of given segment
Index: src/tests/sys/uvm/t_uvm_physseg.c
diff -u src/tests/sys/uvm/t_uvm_physseg.c:1.1 src/tests/sys/uvm/t_uvm_physseg.c:1.2
--- src/tests/sys/uvm/t_uvm_physseg.c:1.1 Mon Dec 19 12:21:29 2016
+++ src/tests/sys/uvm/t_uvm_physseg.c Thu Dec 22 08:15:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.1 2016/12/19 12:21:29 cherry Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.2 2016/12/22 08:15:20 cherry Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,28 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.1 2016/12/19 12:21:29 cherry Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.2 2016/12/22 08:15:20 cherry Exp $");
+
+/*
+ * If this line is commented out tests related to uvm_physseg_get_pmseg()
+ * wont run.
+ *
+ * Have a look at machine/uvm_physseg.h for more details.
+ */
+#define __HAVE_PMAP_PHYSSEG
+
+/*
+ * This is a dummy struct used for testing purposes
+ *
+ * In reality this struct would exist in the MD part of the code residing in
+ * machines/vmparam.h
+ */
+
+#ifdef __HAVE_PMAP_PHYSSEG
+struct pmap_physseg {
+ int dummy_variable; /* Dummy variable use for testing */
+};
+#endif
/* Testing API - assumes userland */
/* Provide Kernel API equivalents */
@@ -60,30 +81,8 @@ typedef unsigned long paddr_t;
typedef unsigned long psize_t;
typedef unsigned long vsize_t;
-#include <uvm/uvm_page.h>
-
-/*
- * If this line is commented out tests related to uvm_physseg_get_pmseg()
- * wont run.
- *
- * Have a look at machine/uvm_physseg.h for more details.
- */
-#define __HAVE_PMAP_PHYSSEG
-
#include <uvm/uvm_physseg.h>
-
-/*
- * This is a dummy struct used for testing purposes
- *
- * In reality this struct would exist in the MD part of the code residing in
- * machines/vmparam.h
- */
-
-#ifdef __HAVE_PMAP_PHYSSEG
-struct pmap_physseg {
- bool dummy_variable; /* Dummy variable use for testing */
-};
-#endif
+#include <uvm/uvm_page.h>
#ifndef DIAGNOSTIC
#define KASSERTMSG(e, msg, ...) /* NOTHING */
@@ -434,7 +433,7 @@ uvm_page_init_fake(struct vm_page *pagea
for (bank = uvm_physseg_get_first(),
uvm_physseg_seg_chomp_slab(bank, pagearray, pagecount);
- uvm_physseg_valid(bank);
+ uvm_physseg_valid_p(bank);
bank = uvm_physseg_get_next(bank)) {
n = uvm_physseg_get_end(bank) - uvm_physseg_get_start(bank);
@@ -584,13 +583,13 @@ ATF_TC_BODY(uvm_physseg_unplug, tc)
upm = uvm_physseg_find(atop(TWOFIFTYSIX_KILO + FIVEONETWO_KILO), NULL);
- ATF_REQUIRE(uvm_physseg_valid(upm));
+ ATF_REQUIRE(uvm_physseg_valid_p(upm));
/* Now unplug the tail fragment - should swallow the complete entry */
ATF_REQUIRE_EQ(true, uvm_physseg_unplug(atop(TWOFIFTYSIX_KILO + FIVEONETWO_KILO), atop(TWOFIFTYSIX_KILO)));
/* The "swallow" above should have invalidated the handle */
- ATF_REQUIRE_EQ(false, uvm_physseg_valid(upm));
+ ATF_REQUIRE_EQ(false, uvm_physseg_valid_p(upm));
/* Only the first one is left now */
ATF_REQUIRE_EQ(1, uvm_physseg_get_entries());
@@ -643,7 +642,7 @@ ATF_TC_BODY(uvm_page_physload_preload, t
VALID_AVAIL_START_PFN_1, VALID_AVAIL_END_PFN_1, VM_FREELIST_DEFAULT);
/* Should return a valid handle */
- ATF_REQUIRE(uvm_physseg_valid(upm));
+ ATF_REQUIRE(uvm_physseg_valid_p(upm));
/* No pages should be allocated yet */
ATF_REQUIRE_EQ(0, uvmexp.npages);
@@ -657,7 +656,7 @@ ATF_TC_BODY(uvm_page_physload_preload, t
VALID_AVAIL_START_PFN_2, VALID_AVAIL_END_PFN_2, VM_FREELIST_DEFAULT);
/* Should return a valid handle */
- ATF_REQUIRE(uvm_physseg_valid(upm));
+ ATF_REQUIRE(uvm_physseg_valid_p(upm));
ATF_REQUIRE_EQ(0, uvmexp.npages);
@@ -687,7 +686,7 @@ ATF_TC_BODY(uvm_page_physload_postboot,
VALID_AVAIL_START_PFN_1, VALID_AVAIL_END_PFN_1, VM_FREELIST_DEFAULT);
/* Should return a valid handle */
- ATF_REQUIRE(uvm_physseg_valid(upm));
+ ATF_REQUIRE(uvm_physseg_valid_p(upm));
/* No pages should be allocated yet */
ATF_REQUIRE_EQ(0, uvmexp.npages);
@@ -705,7 +704,7 @@ ATF_TC_BODY(uvm_page_physload_postboot,
VALID_AVAIL_START_PFN_2, VALID_AVAIL_END_PFN_2, VM_FREELIST_DEFAULT);
/* Should return a valid handle */
- ATF_REQUIRE(uvm_physseg_valid(upm));
+ ATF_REQUIRE(uvm_physseg_valid_p(upm));
ATF_REQUIRE_EQ(npages1 + npages2, uvmexp.npages);
@@ -1487,7 +1486,7 @@ ATF_TC(uvm_physseg_valid);
ATF_TC_HEAD(uvm_physseg_valid, tc)
{
atf_tc_set_md_var(tc, "descr", "Tests the pointer value for current \
- segment is valid using the uvm_physseg_valid() call.");
+ segment is valid using the uvm_physseg_valid_p() call.");
}
ATF_TC_BODY(uvm_physseg_valid, tc)
{
@@ -1509,14 +1508,14 @@ ATF_TC_BODY(uvm_physseg_valid, tc)
ATF_REQUIRE_EQ(PAGE_COUNT_1M, uvmexp.npages);
- ATF_CHECK_EQ(true, uvm_physseg_valid(upm));
+ ATF_CHECK_EQ(true, uvm_physseg_valid_p(upm));
}
ATF_TC(uvm_physseg_valid_invalid);
ATF_TC_HEAD(uvm_physseg_valid_invalid, tc)
{
atf_tc_set_md_var(tc, "descr", "Tests the pointer value for current \
- segment is invalid using the uvm_physseg_valid() call.");
+ segment is invalid using the uvm_physseg_valid_p() call.");
}
ATF_TC_BODY(uvm_physseg_valid_invalid, tc)
{
@@ -1532,13 +1531,13 @@ ATF_TC_BODY(uvm_physseg_valid_invalid, t
ATF_REQUIRE_EQ(true, uvm.page_init_done);
/* Invalid uvm_physseg_t */
- ATF_CHECK_EQ(false, uvm_physseg_valid(UVM_PHYSSEG_TYPE_INVALID));
+ ATF_CHECK_EQ(false, uvm_physseg_valid_p(UVM_PHYSSEG_TYPE_INVALID));
/*
* Without any pages initialized for segment, it is considered
* invalid
*/
- ATF_CHECK_EQ(false, uvm_physseg_valid(upm));
+ ATF_CHECK_EQ(false, uvm_physseg_valid_p(upm));
}
ATF_TC(uvm_physseg_get_highest);
Index: src/tests/sys/uvm/t_uvm_physseg_load.c
diff -u src/tests/sys/uvm/t_uvm_physseg_load.c:1.1 src/tests/sys/uvm/t_uvm_physseg_load.c:1.2
--- src/tests/sys/uvm/t_uvm_physseg_load.c:1.1 Mon Dec 19 12:21:29 2016
+++ src/tests/sys/uvm/t_uvm_physseg_load.c Thu Dec 22 08:15:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg_load.c,v 1.1 2016/12/19 12:21:29 cherry Exp $ */
+/* $NetBSD: t_uvm_physseg_load.c,v 1.2 2016/12/22 08:15:20 cherry Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,28 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_uvm_physseg_load.c,v 1.1 2016/12/19 12:21:29 cherry Exp $");
+__RCSID("$NetBSD: t_uvm_physseg_load.c,v 1.2 2016/12/22 08:15:20 cherry Exp $");
+
+/*
+ * If this line is commented out tests related touvm_physseg_get_pmseg()
+ * wont run.
+ *
+ * Have a look at machine/uvm_physseg.h for more details.
+ */
+#define __HAVE_PMAP_PHYSSEG
+
+/*
+ * This is a dummy struct used for testing purposes
+ *
+ * In reality this struct would exist in the MD part of the code residing in
+ * machines/vmparam.h
+ */
+
+#ifdef __HAVE_PMAP_PHYSSEG
+struct pmap_physseg {
+ int dummy_variable; /* Dummy variable use for testing */
+};
+#endif
/* Testing API - assumes userland */
/* Provide Kernel API equivalents */
@@ -60,30 +81,8 @@ typedef unsigned long paddr_t;
typedef unsigned long psize_t;
typedef unsigned long vsize_t;
-#include <uvm/uvm_page.h>
-
-/*
- * If this line is commented out tests related touvm_physseg_get_pmseg()
- * wont run.
- *
- * Have a look at machine/uvm_physseg.h for more details.
- */
-#define __HAVE_PMAP_PHYSSEG
-
#include <uvm/uvm_physseg.h>
-
-/*
- * This is a dummy struct used for testing purposes
- *
- * In reality this struct would exist in the MD part of the code residing in
- * machines/vmparam.h
- */
-
-#ifdef __HAVE_PMAP_PHYSSEG
-struct pmap_physseg {
- bool dummy_variable; /* Dummy variable use for testing */
-};
-#endif
+#include <uvm/uvm_page.h>
#ifndef DIAGNOSTIC
#define KASSERTMSG(e, msg, ...) /* NOTHING */
@@ -260,7 +259,7 @@ uvm_page_init_fake(struct vm_page *pagea
for (bank = uvm_physseg_get_first(),
uvm_physseg_seg_chomp_slab(bank, pagearray, pagecount);
- uvm_physseg_valid(bank);
+ uvm_physseg_valid_p(bank);
bank = uvm_physseg_get_next(bank)) {
n = uvm_physseg_get_end(bank) - uvm_physseg_get_start(bank);
