Re: svn commit: r363060 - in head: stand/defaults sys/amd64/amd64 sys/powerpc/aim sys/vm
On Thu, Jul 9, 2020 at 4:54 PM Oliver Pinter wrote:
>
>
> On Friday, July 10, 2020, Scott Long wrote:
>
>> Author: scottl
>> Date: Thu Jul 9 22:38:36 2020
>> New Revision: 363060
>> URL: https://svnweb.freebsd.org/changeset/base/363060
>>
>> Log:
>> Revert r362998, r326999 while a better compatibility strategy is
>> devised.
>>
>> Modified:
>> head/stand/defaults/loader.conf
>> head/sys/amd64/amd64/pmap.c
>> head/sys/powerpc/aim/mmu_radix.c
>> head/sys/vm/vm_page.c
>> head/sys/vm/vm_page.h
>>
>> Modified: head/stand/defaults/loader.conf
>>
>> ==
>> --- head/stand/defaults/loader.conf Thu Jul 9 20:55:18 2020
>> (r363059)
>> +++ head/stand/defaults/loader.conf Thu Jul 9 22:38:36 2020
>> (r363060)
>> @@ -53,7 +53,7 @@ entropy_cache_type="boot_entropy_cache" #
>> Required for
>> ram_excludelist_load="NO" # Set this to YES to load a file
>> # containing a list of addresses
>> to
>> # exclude from the running system.
>> -ram_excludelist_name="/boot/excludelist.txt" # Set this to the name of
>> the file
>> +ram_excludeist_name="/boot/excludelist.txt" # Set this to the name of
>> the file
>
>
> Hi!
>
> This part of the revert seems still broken.
>
I think youre correct. Can you look at
https://reviews.freebsd.org/D25606
please and let me know if you think that's right?
Warner
>
>
>> ram_excludelist_type="ram_excludelist" # Required for the kernel to find
>> # the blacklist module
>>
>>
>> Modified: head/sys/amd64/amd64/pmap.c
>>
>> ==
>> --- head/sys/amd64/amd64/pmap.c Thu Jul 9 20:55:18 2020(r363059)
>> +++ head/sys/amd64/amd64/pmap.c Thu Jul 9 22:38:36 2020(r363060)
>> @@ -2060,7 +2060,7 @@ pmap_init(void)
>> int error, i, ret, skz63;
>>
>> /* L1TF, reserve page @0 unconditionally */
>> - vm_page_excludelist_add(0, bootverbose);
>> + vm_page_blacklist_add(0, bootverbose);
>>
>> /* Detect bare-metal Skylake Server and Skylake-X. */
>> if (vm_guest == VM_GUEST_NO && cpu_vendor_id == CPU_VENDOR_INTEL
>> &&
>> @@ -2081,7 +2081,7 @@ pmap_init(void)
>> printf("SKZ63: skipping 4M RAM starting "
>> "at physical 1G\n");
>> for (i = 0; i < atop(0x40); i++) {
>> - ret = vm_page_excludelist_add(0x4000 +
>> + ret = vm_page_blacklist_add(0x4000 +
>> ptoa(i), FALSE);
>> if (!ret && bootverbose)
>> printf("page at %#lx already
>> used\n",
>>
>> Modified: head/sys/powerpc/aim/mmu_radix.c
>>
>> ==
>> --- head/sys/powerpc/aim/mmu_radix.cThu Jul 9 20:55:18 2020
>> (r363059)
>> +++ head/sys/powerpc/aim/mmu_radix.cThu Jul 9 22:38:36 2020
>> (r363060)
>> @@ -3557,7 +3557,7 @@ mmu_radix_init()
>> int error, i, pv_npg;
>>
>> /* L1TF, reserve page @0 unconditionally */
>> - vm_page_excludelist_add(0, bootverbose);
>> + vm_page_blacklist_add(0, bootverbose);
>>
>> zone_radix_pgd = uma_zcache_create("radix_pgd_cache",
>> RADIX_PGD_SIZE, NULL, NULL,
>>
>> Modified: head/sys/vm/vm_page.c
>>
>> ==
>> --- head/sys/vm/vm_page.c Thu Jul 9 20:55:18 2020(r363059)
>> +++ head/sys/vm/vm_page.c Thu Jul 9 22:38:36 2020(r363060)
>> @@ -155,11 +155,10 @@ vm_page_t vm_page_array;
>> long vm_page_array_size;
>> long first_page;
>>
>> -static TAILQ_HEAD(, vm_page) excludelist_head;
>> -static int sysctl_vm_page_excludelist(SYSCTL_HANDLER_ARGS);
>> -SYSCTL_PROC(_vm, OID_AUTO, page_excludelist, CTLTYPE_STRING | CTLFLAG_RD
>> |
>> -CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_page_excludelist, "A",
>> -"Blacklist pages");
>> +static TAILQ_HEAD(, vm_page) blacklist_head;
>> +static int sysctl_vm_page_blacklist(SYSCTL_HANDLER_ARGS);
>> +SYSCTL_PROC(_vm, OID_AUTO, page_blacklist, CTLTYPE_STRING | CTLFLAG_RD |
>> +CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_page_blacklist, "A", "Blacklist
>> pages");
>>
>> static uma_zone_t fakepg_zone;
>>
>> @@ -259,16 +258,16 @@ vm_set_page_size(void)
>> }
>>
>> /*
>> - * vm_page_excludelist_next:
>> + * vm_page_blacklist_next:
>> *
>> - * Find the next entry in the provided string of excludelist
>> + * Find the next entry in the provided string of blacklist
>> * addresses. Entries are separated by space, comma, or newline.
>> * If an invalid integer is encountered then the rest of the
>> * string is skipped.
Re: svn commit: r363060 - in head: stand/defaults sys/amd64/amd64 sys/powerpc/aim sys/vm
On Friday, July 10, 2020, Scott Long wrote:
> Author: scottl
> Date: Thu Jul 9 22:38:36 2020
> New Revision: 363060
> URL: https://svnweb.freebsd.org/changeset/base/363060
>
> Log:
> Revert r362998, r326999 while a better compatibility strategy is devised.
>
> Modified:
> head/stand/defaults/loader.conf
> head/sys/amd64/amd64/pmap.c
> head/sys/powerpc/aim/mmu_radix.c
> head/sys/vm/vm_page.c
> head/sys/vm/vm_page.h
>
> Modified: head/stand/defaults/loader.conf
>
> ==
> --- head/stand/defaults/loader.conf Thu Jul 9 20:55:18 2020
> (r363059)
> +++ head/stand/defaults/loader.conf Thu Jul 9 22:38:36 2020
> (r363060)
> @@ -53,7 +53,7 @@ entropy_cache_type="boot_entropy_cache" #
> Required for
> ram_excludelist_load="NO" # Set this to YES to load a file
> # containing a list of addresses to
> # exclude from the running system.
> -ram_excludelist_name="/boot/excludelist.txt" # Set this to the name of
> the file
> +ram_excludeist_name="/boot/excludelist.txt" # Set this to the name of
> the file
Hi!
This part of the revert seems still broken.
> ram_excludelist_type="ram_excludelist" # Required for the kernel to find
> # the blacklist module
>
>
> Modified: head/sys/amd64/amd64/pmap.c
>
> ==
> --- head/sys/amd64/amd64/pmap.c Thu Jul 9 20:55:18 2020(r363059)
> +++ head/sys/amd64/amd64/pmap.c Thu Jul 9 22:38:36 2020(r363060)
> @@ -2060,7 +2060,7 @@ pmap_init(void)
> int error, i, ret, skz63;
>
> /* L1TF, reserve page @0 unconditionally */
> - vm_page_excludelist_add(0, bootverbose);
> + vm_page_blacklist_add(0, bootverbose);
>
> /* Detect bare-metal Skylake Server and Skylake-X. */
> if (vm_guest == VM_GUEST_NO && cpu_vendor_id == CPU_VENDOR_INTEL &&
> @@ -2081,7 +2081,7 @@ pmap_init(void)
> printf("SKZ63: skipping 4M RAM starting "
> "at physical 1G\n");
> for (i = 0; i < atop(0x40); i++) {
> - ret = vm_page_excludelist_add(0x4000 +
> + ret = vm_page_blacklist_add(0x4000 +
> ptoa(i), FALSE);
> if (!ret && bootverbose)
> printf("page at %#lx already
> used\n",
>
> Modified: head/sys/powerpc/aim/mmu_radix.c
>
> ==
> --- head/sys/powerpc/aim/mmu_radix.cThu Jul 9 20:55:18 2020
> (r363059)
> +++ head/sys/powerpc/aim/mmu_radix.cThu Jul 9 22:38:36 2020
> (r363060)
> @@ -3557,7 +3557,7 @@ mmu_radix_init()
> int error, i, pv_npg;
>
> /* L1TF, reserve page @0 unconditionally */
> - vm_page_excludelist_add(0, bootverbose);
> + vm_page_blacklist_add(0, bootverbose);
>
> zone_radix_pgd = uma_zcache_create("radix_pgd_cache",
> RADIX_PGD_SIZE, NULL, NULL,
>
> Modified: head/sys/vm/vm_page.c
>
> ==
> --- head/sys/vm/vm_page.c Thu Jul 9 20:55:18 2020(r363059)
> +++ head/sys/vm/vm_page.c Thu Jul 9 22:38:36 2020(r363060)
> @@ -155,11 +155,10 @@ vm_page_t vm_page_array;
> long vm_page_array_size;
> long first_page;
>
> -static TAILQ_HEAD(, vm_page) excludelist_head;
> -static int sysctl_vm_page_excludelist(SYSCTL_HANDLER_ARGS);
> -SYSCTL_PROC(_vm, OID_AUTO, page_excludelist, CTLTYPE_STRING | CTLFLAG_RD |
> -CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_page_excludelist, "A",
> -"Blacklist pages");
> +static TAILQ_HEAD(, vm_page) blacklist_head;
> +static int sysctl_vm_page_blacklist(SYSCTL_HANDLER_ARGS);
> +SYSCTL_PROC(_vm, OID_AUTO, page_blacklist, CTLTYPE_STRING | CTLFLAG_RD |
> +CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_page_blacklist, "A", "Blacklist
> pages");
>
> static uma_zone_t fakepg_zone;
>
> @@ -259,16 +258,16 @@ vm_set_page_size(void)
> }
>
> /*
> - * vm_page_excludelist_next:
> + * vm_page_blacklist_next:
> *
> - * Find the next entry in the provided string of excludelist
> + * Find the next entry in the provided string of blacklist
> * addresses. Entries are separated by space, comma, or newline.
> * If an invalid integer is encountered then the rest of the
> * string is skipped. Updates the list pointer to the next
> * character, or NULL if the string is exhausted or invalid.
> */
> static vm_paddr_t
> -vm_page_excludelist_next(char **list, char *end)
> +vm_page_blacklist_next(char **list, char *end)
> {
> vm_paddr_t bad;
> char *cp, *pos;
> @@ -315,13 +314,13 @@
svn commit: r363060 - in head: stand/defaults sys/amd64/amd64 sys/powerpc/aim sys/vm
Author: scottl
Date: Thu Jul 9 22:38:36 2020
New Revision: 363060
URL: https://svnweb.freebsd.org/changeset/base/363060
Log:
Revert r362998, r326999 while a better compatibility strategy is devised.
Modified:
head/stand/defaults/loader.conf
head/sys/amd64/amd64/pmap.c
head/sys/powerpc/aim/mmu_radix.c
head/sys/vm/vm_page.c
head/sys/vm/vm_page.h
Modified: head/stand/defaults/loader.conf
==
--- head/stand/defaults/loader.conf Thu Jul 9 20:55:18 2020
(r363059)
+++ head/stand/defaults/loader.conf Thu Jul 9 22:38:36 2020
(r363060)
@@ -53,7 +53,7 @@ entropy_cache_type="boot_entropy_cache" # Required for
ram_excludelist_load="NO" # Set this to YES to load a file
# containing a list of addresses to
# exclude from the running system.
-ram_excludelist_name="/boot/excludelist.txt" # Set this to the name of the file
+ram_excludeist_name="/boot/excludelist.txt" # Set this to the name of the file
ram_excludelist_type="ram_excludelist" # Required for the kernel to find
# the blacklist module
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Thu Jul 9 20:55:18 2020(r363059)
+++ head/sys/amd64/amd64/pmap.c Thu Jul 9 22:38:36 2020(r363060)
@@ -2060,7 +2060,7 @@ pmap_init(void)
int error, i, ret, skz63;
/* L1TF, reserve page @0 unconditionally */
- vm_page_excludelist_add(0, bootverbose);
+ vm_page_blacklist_add(0, bootverbose);
/* Detect bare-metal Skylake Server and Skylake-X. */
if (vm_guest == VM_GUEST_NO && cpu_vendor_id == CPU_VENDOR_INTEL &&
@@ -2081,7 +2081,7 @@ pmap_init(void)
printf("SKZ63: skipping 4M RAM starting "
"at physical 1G\n");
for (i = 0; i < atop(0x40); i++) {
- ret = vm_page_excludelist_add(0x4000 +
+ ret = vm_page_blacklist_add(0x4000 +
ptoa(i), FALSE);
if (!ret && bootverbose)
printf("page at %#lx already used\n",
Modified: head/sys/powerpc/aim/mmu_radix.c
==
--- head/sys/powerpc/aim/mmu_radix.cThu Jul 9 20:55:18 2020
(r363059)
+++ head/sys/powerpc/aim/mmu_radix.cThu Jul 9 22:38:36 2020
(r363060)
@@ -3557,7 +3557,7 @@ mmu_radix_init()
int error, i, pv_npg;
/* L1TF, reserve page @0 unconditionally */
- vm_page_excludelist_add(0, bootverbose);
+ vm_page_blacklist_add(0, bootverbose);
zone_radix_pgd = uma_zcache_create("radix_pgd_cache",
RADIX_PGD_SIZE, NULL, NULL,
Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c Thu Jul 9 20:55:18 2020(r363059)
+++ head/sys/vm/vm_page.c Thu Jul 9 22:38:36 2020(r363060)
@@ -155,11 +155,10 @@ vm_page_t vm_page_array;
long vm_page_array_size;
long first_page;
-static TAILQ_HEAD(, vm_page) excludelist_head;
-static int sysctl_vm_page_excludelist(SYSCTL_HANDLER_ARGS);
-SYSCTL_PROC(_vm, OID_AUTO, page_excludelist, CTLTYPE_STRING | CTLFLAG_RD |
-CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_page_excludelist, "A",
-"Blacklist pages");
+static TAILQ_HEAD(, vm_page) blacklist_head;
+static int sysctl_vm_page_blacklist(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_vm, OID_AUTO, page_blacklist, CTLTYPE_STRING | CTLFLAG_RD |
+CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_page_blacklist, "A", "Blacklist pages");
static uma_zone_t fakepg_zone;
@@ -259,16 +258,16 @@ vm_set_page_size(void)
}
/*
- * vm_page_excludelist_next:
+ * vm_page_blacklist_next:
*
- * Find the next entry in the provided string of excludelist
+ * Find the next entry in the provided string of blacklist
* addresses. Entries are separated by space, comma, or newline.
* If an invalid integer is encountered then the rest of the
* string is skipped. Updates the list pointer to the next
* character, or NULL if the string is exhausted or invalid.
*/
static vm_paddr_t
-vm_page_excludelist_next(char **list, char *end)
+vm_page_blacklist_next(char **list, char *end)
{
vm_paddr_t bad;
char *cp, *pos;
@@ -315,13 +314,13 @@ vm_page_excludelist_next(char **list, char *end)
*list = cp;
return (trunc_page(bad));
}
- printf("Garbage in RAM excludelist, skipping\n");
+ printf("Garbage in RAM blacklist, skipping\n");
*list = NULL;
return (0);
}
