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

Provide string functions for use before ifuncs get resolved.

Browse Source 
The change is a no-op for architectures which don't ifunc memset,
memcpy nor memmove.

Convert places which need them. Xen bits by royger.

Reviewed by:	kib
Approved by:	re (gjb)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D17487
This commit is contained in:
Mateusz Guzik 2018-10-11 23:28:04 +00:00
parent f38828cbc7
commit 3f102f5881
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/include/cpu.h
View File

@ -92,6 +92,10 @@ get_cyclecount(void)
return (rdtsc()); return (rdtsc());
} }
#define MEMSET_EARLY_FUNC memset_std
#define MEMCPY_EARLY_FUNC memcpy_std
#define MEMMOVE_EARLY_FUNC memmove_std
#endif #endif
#endif /* !_MACHINE_CPU_H_ */ #endif /* !_MACHINE_CPU_H_ */

1
sys/conf/files
View File

@ -3876,6 +3876,7 @@ kern/subr_compressor.c standard \
kern/subr_counter.c standard kern/subr_counter.c standard
kern/subr_devstat.c standard kern/subr_devstat.c standard
kern/subr_disk.c standard kern/subr_disk.c standard
kern/subr_early.c standard
kern/subr_epoch.c standard kern/subr_epoch.c standard
kern/subr_eventhandler.c standard kern/subr_eventhandler.c standard
kern/subr_fattime.c standard kern/subr_fattime.c standard

6
sys/kern/link_elf.c
View File

@ -1682,14 +1682,10 @@ link_elf_ireloc(caddr_t kmdp)
{ {
struct elf_file eff; struct elf_file eff;
elf_file_t ef; elf_file_t ef;
volatile char *c;
size_t i;
ef = &eff; ef = &eff;
/* Do not use bzero/memset before ireloc is done. */ bzero_early(ef, sizeof(*ef));
for (c = (char *)ef, i = 0; i < sizeof(*ef); i++)
c[i] = 0;
ef->modptr = kmdp; ef->modptr = kmdp;
ef->dynamic = (Elf_Dyn *)&_DYNAMIC; ef->dynamic = (Elf_Dyn *)&_DYNAMIC;

6
sys/sys/systm.h
View File

@ -324,6 +324,12 @@ void *memmove(void * _Nonnull dest, const void * _Nonnull src, size_t n);
int memcmp(const void *b1, const void *b2, size_t len); int memcmp(const void *b1, const void *b2, size_t len);
#define memcmp(b1, b2, len) __builtin_memcmp((b1), (b2), (len)) #define memcmp(b1, b2, len) __builtin_memcmp((b1), (b2), (len))
void *memset_early(void * _Nonnull buf, int c, size_t len);
#define bzero_early(buf, len) memset_early((buf), 0, (len))
void *memcpy_early(void * _Nonnull to, const void * _Nonnull from, size_t len);
void *memmove_early(void * _Nonnull dest, const void * _Nonnull src, size_t n);
#define bcopy_early(from, to, len) memmove_early((to), (from), (len))
int copystr(const void * _Nonnull __restrict kfaddr, int copystr(const void * _Nonnull __restrict kfaddr,
void * _Nonnull __restrict kdaddr, size_t len, void * _Nonnull __restrict kdaddr, size_t len,
size_t * __restrict lencopied); size_t * __restrict lencopied);

3
sys/x86/x86/ucode.c
View File

@ -355,8 +355,7 @@ ucode_load_bsp(uintptr_t free)
if (match != NULL) { if (match != NULL) {
addr = map_ucode(free, len); addr = map_ucode(free, len);
/* We can't use memcpy() before ifunc resolution. */ /* We can't use memcpy() before ifunc resolution. */
for (i = 0; i < len; i++) memcpy_early(addr, match, len);
addr[i] = ((volatile uint8_t *)match)[i];
match = addr; match = addr;
error = ucode_loader->load(match, false, &nrev, &orev); error = ucode_loader->load(match, false, &nrev, &orev);

4
sys/x86/xen/pv.c
View File

@ -259,7 +259,7 @@ hammer_time_xen_legacy(start_info_t *si, uint64_t xenstack)
*/ */
kenv = (void *)(physfree + KERNBASE); kenv = (void *)(physfree + KERNBASE);
physfree += PAGE_SIZE; physfree += PAGE_SIZE;
bzero(kenv, PAGE_SIZE); bzero_early(kenv, PAGE_SIZE);
init_static_kenv(kenv, PAGE_SIZE); init_static_kenv(kenv, PAGE_SIZE);
/* Set the hooks for early functions that diverge from bare metal */ /* Set the hooks for early functions that diverge from bare metal */
@ -320,7 +320,7 @@ hammer_time_xen(vm_paddr_t start_info_paddr)
*/ */
kenv = (void *)(physfree + KERNBASE); kenv = (void *)(physfree + KERNBASE);
physfree += PAGE_SIZE; physfree += PAGE_SIZE;
bzero(kenv, PAGE_SIZE); bzero_early(kenv, PAGE_SIZE);
init_static_kenv(kenv, PAGE_SIZE); init_static_kenv(kenv, PAGE_SIZE);
if (start_info->modlist_paddr != 0) { if (start_info->modlist_paddr != 0) {