Author: jah
Date: Sat Feb 4 06:24:49 2017
New Revision: 313193
URL: https://svnweb.freebsd.org/changeset/base/313193
Log:
Revert r313037
The switch to get_pcpu() in MI code seems to cause hangs on MIPS.
Back out until we can get a better idea of what's happening there.
Reported by: kan, lidl
Modified:
head/sys/amd64/include/pcpu.h
head/sys/kern/kern_rmlock.c
head/sys/mips/include/pcpu.h
head/sys/net/netisr.c
head/sys/powerpc/include/cpufunc.h
head/sys/powerpc/include/pcpu.h
head/sys/sparc64/include/pcpu.h
Modified: head/sys/amd64/include/pcpu.h
==============================================================================
--- head/sys/amd64/include/pcpu.h Sat Feb 4 06:12:48 2017
(r313192)
+++ head/sys/amd64/include/pcpu.h Sat Feb 4 06:24:49 2017
(r313193)
@@ -78,7 +78,6 @@
extern struct pcpu *pcpup;
-#define get_pcpu() (pcpup)
#define PCPU_GET(member) (pcpup->pc_ ## member)
#define PCPU_ADD(member, val) (pcpup->pc_ ## member += (val))
#define PCPU_INC(member) PCPU_ADD(member, 1)
@@ -204,15 +203,6 @@ extern struct pcpu *pcpup;
} \
}
-#define get_pcpu() __extension__ ({
\
- struct pcpu *__pc; \
- \
- __asm __volatile("movq %%gs:%1,%0" \
- : "=r" (__pc) \
- : "m" (*(struct pcpu *)(__pcpu_offset(pc_prvspace)))); \
- __pc; \
-})
-
#define PCPU_GET(member) __PCPU_GET(pc_ ## member)
#define PCPU_ADD(member, val) __PCPU_ADD(pc_ ## member, val)
#define PCPU_INC(member) __PCPU_INC(pc_ ## member)
Modified: head/sys/kern/kern_rmlock.c
==============================================================================
--- head/sys/kern/kern_rmlock.c Sat Feb 4 06:12:48 2017 (r313192)
+++ head/sys/kern/kern_rmlock.c Sat Feb 4 06:24:49 2017 (r313193)
@@ -156,7 +156,7 @@ unlock_rm(struct lock_object *lock)
*/
critical_enter();
td = curthread;
- pc = get_pcpu();
+ pc = pcpu_find(curcpu);
for (queue = pc->pc_rm_queue.rmq_next;
queue != &pc->pc_rm_queue; queue = queue->rmq_next) {
tracker = (struct rm_priotracker *)queue;
@@ -258,7 +258,7 @@ rm_cleanIPI(void *arg)
struct rmlock *rm = arg;
struct rm_priotracker *tracker;
struct rm_queue *queue;
- pc = get_pcpu();
+ pc = pcpu_find(curcpu);
for (queue = pc->pc_rm_queue.rmq_next; queue != &pc->pc_rm_queue;
queue = queue->rmq_next) {
@@ -355,7 +355,7 @@ _rm_rlock_hard(struct rmlock *rm, struct
struct pcpu *pc;
critical_enter();
- pc = get_pcpu();
+ pc = pcpu_find(curcpu);
/* Check if we just need to do a proper critical_exit. */
if (!CPU_ISSET(pc->pc_cpuid, &rm->rm_writecpus)) {
@@ -416,7 +416,7 @@ _rm_rlock_hard(struct rmlock *rm, struct
}
critical_enter();
- pc = get_pcpu();
+ pc = pcpu_find(curcpu);
CPU_CLR(pc->pc_cpuid, &rm->rm_writecpus);
rm_tracker_add(pc, tracker);
sched_pin();
@@ -641,7 +641,7 @@ _rm_rlock_debug(struct rmlock *rm, struc
#ifdef INVARIANTS
if (!(rm->lock_object.lo_flags & LO_RECURSABLE) && !trylock) {
critical_enter();
- KASSERT(rm_trackers_present(get_pcpu(), rm,
+ KASSERT(rm_trackers_present(pcpu_find(curcpu), rm,
curthread) == 0,
("rm_rlock: recursed on non-recursive rmlock %s @ %s:%d\n",
rm->lock_object.lo_name, file, line));
@@ -771,7 +771,7 @@ _rm_assert(const struct rmlock *rm, int
}
critical_enter();
- count = rm_trackers_present(get_pcpu(), rm, curthread);
+ count = rm_trackers_present(pcpu_find(curcpu), rm, curthread);
critical_exit();
if (count == 0)
@@ -797,7 +797,7 @@ _rm_assert(const struct rmlock *rm, int
rm->lock_object.lo_name, file, line);
critical_enter();
- count = rm_trackers_present(get_pcpu(), rm, curthread);
+ count = rm_trackers_present(pcpu_find(curcpu), rm, curthread);
critical_exit();
if (count != 0)
Modified: head/sys/mips/include/pcpu.h
==============================================================================
--- head/sys/mips/include/pcpu.h Sat Feb 4 06:12:48 2017
(r313192)
+++ head/sys/mips/include/pcpu.h Sat Feb 4 06:24:49 2017
(r313193)
@@ -65,7 +65,6 @@ extern char pcpu_space[MAXCPU][PAGE_SIZE
extern struct pcpu *pcpup;
#define PCPUP pcpup
-#define get_pcpu() (pcpup)
#define PCPU_ADD(member, value) (PCPUP->pc_ ## member += (value))
#define PCPU_GET(member) (PCPUP->pc_ ## member)
#define PCPU_INC(member) PCPU_ADD(member, 1)
Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c Sat Feb 4 06:12:48 2017 (r313192)
+++ head/sys/net/netisr.c Sat Feb 4 06:24:49 2017 (r313193)
@@ -1268,7 +1268,9 @@ netisr_start_swi(u_int cpuid, struct pcp
static void
netisr_init(void *arg)
{
+#ifdef EARLY_AP_STARTUP
struct pcpu *pc;
+#endif
NETISR_LOCK_INIT();
if (netisr_maxthreads == 0 || netisr_maxthreads < -1 )
@@ -1306,8 +1308,7 @@ netisr_init(void *arg)
netisr_start_swi(pc->pc_cpuid, pc);
}
#else
- pc = get_pcpu();
- netisr_start_swi(pc->pc_cpuid, pc);
+ netisr_start_swi(curcpu, pcpu_find(curcpu));
#endif
}
SYSINIT(netisr_init, SI_SUB_SOFTINTR, SI_ORDER_FIRST, netisr_init, NULL);
Modified: head/sys/powerpc/include/cpufunc.h
==============================================================================
--- head/sys/powerpc/include/cpufunc.h Sat Feb 4 06:12:48 2017
(r313192)
+++ head/sys/powerpc/include/cpufunc.h Sat Feb 4 06:24:49 2017
(r313193)
@@ -201,7 +201,7 @@ intr_restore(register_t msr)
}
static __inline struct pcpu *
-get_pcpu(void)
+powerpc_get_pcpup(void)
{
struct pcpu *ret;
Modified: head/sys/powerpc/include/pcpu.h
==============================================================================
--- head/sys/powerpc/include/pcpu.h Sat Feb 4 06:12:48 2017
(r313192)
+++ head/sys/powerpc/include/pcpu.h Sat Feb 4 06:24:49 2017
(r313193)
@@ -142,7 +142,7 @@ struct pvo_entry;
#ifdef _KERNEL
-#define pcpup (get_pcpu())
+#define pcpup ((struct pcpu *) powerpc_get_pcpup())
static __inline __pure2 struct thread *
__curthread(void)
Modified: head/sys/sparc64/include/pcpu.h
==============================================================================
--- head/sys/sparc64/include/pcpu.h Sat Feb 4 06:12:48 2017
(r313192)
+++ head/sys/sparc64/include/pcpu.h Sat Feb 4 06:24:49 2017
(r313193)
@@ -74,7 +74,6 @@ struct pcpu;
register struct pcb *curpcb __asm__(__XSTRING(PCB_REG));
register struct pcpu *pcpup __asm__(__XSTRING(PCPU_REG));
-#define get_pcpu() (pcpup)
#define PCPU_GET(member) (pcpup->pc_ ## member)
static __inline __pure2 struct thread *
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
