i386_set_ldt() is not available when running 32 bit binaries on amd64
kernels. Use the recently exposed direct-set routines instead. This is only activated for when we compile i386 support libraries on amd64.
This commit is contained in:
parent
2cdea9a39f
commit
9e6d5a03d4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=137295
@ -76,7 +76,9 @@ _tcb_dtor(struct tcb *tcb)
|
||||
struct kcb *
|
||||
_kcb_ctor(struct kse *kse)
|
||||
{
|
||||
#ifndef COMPAT_32BIT
|
||||
union descriptor ldt;
|
||||
#endif
|
||||
struct kcb *kcb;
|
||||
|
||||
kcb = malloc(sizeof(struct kcb));
|
||||
@ -84,6 +86,7 @@ _kcb_ctor(struct kse *kse)
|
||||
bzero(kcb, sizeof(struct kcb));
|
||||
kcb->kcb_self = kcb;
|
||||
kcb->kcb_kse = kse;
|
||||
#ifndef COMPAT_32BIT
|
||||
ldt.sd.sd_hibase = (unsigned int)kcb >> 24;
|
||||
ldt.sd.sd_lobase = (unsigned int)kcb & 0xFFFFFF;
|
||||
ldt.sd.sd_hilimit = (sizeof(struct kcb) >> 16) & 0xF;
|
||||
@ -99,6 +102,7 @@ _kcb_ctor(struct kse *kse)
|
||||
free(kcb);
|
||||
return (NULL);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return (kcb);
|
||||
}
|
||||
@ -106,9 +110,11 @@ _kcb_ctor(struct kse *kse)
|
||||
void
|
||||
_kcb_dtor(struct kcb *kcb)
|
||||
{
|
||||
#ifndef COMPAT_32BIT
|
||||
if (kcb->kcb_ldt >= 0) {
|
||||
i386_set_ldt(kcb->kcb_ldt, NULL, 1);
|
||||
kcb->kcb_ldt = -1; /* just in case */
|
||||
}
|
||||
#endif
|
||||
free(kcb);
|
||||
}
|
||||
|
@ -32,7 +32,9 @@
|
||||
#define _PTHREAD_MD_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/kse.h>
|
||||
#include <machine/sysarch.h>
|
||||
#include <ucontext.h>
|
||||
|
||||
extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *);
|
||||
@ -150,10 +152,15 @@ void _kcb_dtor(struct kcb *);
|
||||
static __inline void
|
||||
_kcb_set(struct kcb *kcb)
|
||||
{
|
||||
#ifndef COMPAT_32BIT
|
||||
int val;
|
||||
|
||||
val = (kcb->kcb_ldt << 3) | 7;
|
||||
__asm __volatile("movl %0, %%gs" : : "r" (val));
|
||||
#else
|
||||
_amd64_set_gsbase(kcb);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/* Get the current kcb. */
|
||||
|
@ -76,7 +76,9 @@ _tcb_dtor(struct tcb *tcb)
|
||||
struct kcb *
|
||||
_kcb_ctor(struct kse *kse)
|
||||
{
|
||||
#ifndef COMPAT_32BIT
|
||||
union descriptor ldt;
|
||||
#endif
|
||||
struct kcb *kcb;
|
||||
|
||||
kcb = malloc(sizeof(struct kcb));
|
||||
@ -84,6 +86,7 @@ _kcb_ctor(struct kse *kse)
|
||||
bzero(kcb, sizeof(struct kcb));
|
||||
kcb->kcb_self = kcb;
|
||||
kcb->kcb_kse = kse;
|
||||
#ifndef COMPAT_32BIT
|
||||
ldt.sd.sd_hibase = (unsigned int)kcb >> 24;
|
||||
ldt.sd.sd_lobase = (unsigned int)kcb & 0xFFFFFF;
|
||||
ldt.sd.sd_hilimit = (sizeof(struct kcb) >> 16) & 0xF;
|
||||
@ -99,6 +102,7 @@ _kcb_ctor(struct kse *kse)
|
||||
free(kcb);
|
||||
return (NULL);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return (kcb);
|
||||
}
|
||||
@ -106,9 +110,11 @@ _kcb_ctor(struct kse *kse)
|
||||
void
|
||||
_kcb_dtor(struct kcb *kcb)
|
||||
{
|
||||
#ifndef COMPAT_32BIT
|
||||
if (kcb->kcb_ldt >= 0) {
|
||||
i386_set_ldt(kcb->kcb_ldt, NULL, 1);
|
||||
kcb->kcb_ldt = -1; /* just in case */
|
||||
}
|
||||
#endif
|
||||
free(kcb);
|
||||
}
|
||||
|
@ -32,7 +32,9 @@
|
||||
#define _PTHREAD_MD_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/kse.h>
|
||||
#include <machine/sysarch.h>
|
||||
#include <ucontext.h>
|
||||
|
||||
extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *);
|
||||
@ -150,10 +152,15 @@ void _kcb_dtor(struct kcb *);
|
||||
static __inline void
|
||||
_kcb_set(struct kcb *kcb)
|
||||
{
|
||||
#ifndef COMPAT_32BIT
|
||||
int val;
|
||||
|
||||
val = (kcb->kcb_ldt << 3) | 7;
|
||||
__asm __volatile("movl %0, %%gs" : : "r" (val));
|
||||
#else
|
||||
_amd64_set_gsbase(kcb);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/* Get the current kcb. */
|
||||
|
Loading…
Reference in New Issue
Block a user