Skip to contentSkip to conversation

i386-pda updates

PATCH Applied Jeremy Fitzhardinge 2 participants 5 messages Sep 9, 2006 – Sep 10, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386-pda updates

Updates to i386-pda:

- fix typo
- add a self-pointer to the PDA, so that finding its linear address is easy
- add type checking to PDA write operations
- add byte-sized read/writes to the PDA

---
arch/i386/kernel/cpu/common.c | 4 +++-
include/asm-i386/pda.h | 19 +++++++++++++++++++

2 files changed, 22 insertions(+), 1 deletion(-)
arch/i386/kernel/cpu/common.c +0 -0
diff -r 69614542c834 arch/i386/kernel/cpu/common.c
@@ -588,7 +588,7 @@ void __init early_cpu_init(void)

#endif
}

-/* Make sure %gs it initialized properly in idle threads */ +/* Make sure %gs is initialized properly in idle threads */ struct pt_regs * __devinit idle_regs(struct pt_regs *regs)

{
	memset(regs, 0, sizeof(struct pt_regs));

@@ -648,6 +648,8 @@ static __cpuinit void pda_init(int cpu,

	memset(pda, 0, sizeof(*pda));

+ pda->_pda = pda;
+

	pda->cpu_number = cpu;
	pda->pcurrent = curr;
include/asm-i386/pda.h +0 -0
diff -r 69614542c834 include/asm-i386/pda.h
@@ -3,6 +3,8 @@
 

struct i386_pda
{
+ struct i386_pda *_pda; /* pointer to self */
+

	struct task_struct *pcurrent;	/* current process */
	int cpu_number;
};
@@ -20,7 +22,14 @@ extern struct i386_pda _proxy_pda;
#define pda_to_op(op,field,val)						\
	do {								\
		typedef typeof(_proxy_pda.field) T__;			\
+		if (0) { T__ tmp__; tmp__ = (val); }			\
		switch (sizeof(_proxy_pda.field)) {			\

+ case 1: \
+ asm(op "b %1,%%gs:%c2" \
+ : "+m" (_proxy_pda.field) \
+ :"ri" ((T__)val), \
+ "i"(pda_offset(field))); \

+			break;						\
		case 2:							\
			asm(op "w %1,%%gs:%c2"				\
			    : "+m" (_proxy_pda.field)			\
@@ -41,6 +50,12 @@ extern struct i386_pda _proxy_pda;
	({								\
		typeof(_proxy_pda.field) ret__;				\
		switch (sizeof(_proxy_pda.field)) {			\

+ case 1: \
+ asm(op "b %%gs:%c1,%0" \
+ : "=r" (ret__) \
+ : "i" (pda_offset(field)), \
+ "m" (_proxy_pda.field)); \

+			break;						\
		case 2:							\
			asm(op "w %%gs:%c1,%0"				\
			    : "=r" (ret__)				\
@@ -57,6 +72,10 @@ extern struct i386_pda _proxy_pda;
		}							\
		ret__; })

+/* Return a pointer to a pda field */
+#define pda_addr(field) \
+ ((typeof(_proxy_pda.field) *)((unsigned char *)read_pda(_pda) + \
+ pda_offset(field)))

#define read_pda(field) pda_from_op("mov",field) #define write_pda(field,val) pda_to_op("mov",field,val)

Applied
#1 lore raw

Review

Quoted 3 lines · Jeremy Fitzhardinge
(quoted diff) +1 -1
-/* Make sure %gs it initialized properly in idle threads */
+/* Make sure %gs is initialized properly in idle threads */

Merged

Review extern struct i386_pda _proxy_pda; · line 25

Quoted 6 lines

};

(quoted diff) +1 -0
@@ -20,7 +22,14 @@ extern struct i386_pda _proxy_pda;
 #define pda_to_op(op,field,val)					 \
 	do {								\
 		typedef typeof(_proxy_pda.field) T__;			\
+		if (0) { T__ tmp__; tmp__ = (val); }			\

Merged into original patch

Quoted 24 lines
(quoted diff) +12 -0
 		switch (sizeof(_proxy_pda.field)) {			\
+		case 1:							\
+			asm(op "b %1,%%gs:%c2"				\
+			    : "+m" (_proxy_pda.field)			\
+			    :"ri" ((T__)val),				\
+			     "i"(pda_offset(field)));			\
+			break;						\
 		case 2:							\
 			asm(op "w %1,%%gs:%c2"				\
 			    : "+m" (_proxy_pda.field)			\
@@ -41,6 +50,12 @@ extern struct i386_pda _proxy_pda;
 	({								\
 		typeof(_proxy_pda.field) ret__;				\
 		switch (sizeof(_proxy_pda.field)) {			\
+		case 1:							\
+			asm(op "b %%gs:%c1,%0"				\
+			    : "=r" (ret__)				\
+			    : "i" (pda_offset(field)),			\
+			      "m" (_proxy_pda.field));			\
+			break;						\
 		case 2:							\
 			asm(op "w %%gs:%c1,%0"				\
 			    : "=r" (ret__)				\

Review extern struct i386_pda _proxy_pda; · line 78

Quoted 7 lines
(quoted diff) +4 -0
@@ -57,6 +72,10 @@ extern struct i386_pda _proxy_pda;
 		}							\
 		ret__; })
 
+/* Return a pointer to a pda field */
+#define pda_addr(field)						 \
+	((typeof(_proxy_pda.field) *)((unsigned char *)read_pda(_pda) + \
+				      pda_offset(field)))

I think i would prefer to merge that and the 1 byte one only with actual users (x86-64 hasn't needed either for a long time)

-Andi

#2 lore raw
Quoted 2 lines · Andi Kleen

I think i would prefer to merge that and the 1 byte one only with actual users (x86-64 hasn't needed either for a long time)

Taking the address of a PDA field is pretty useful. And it is going to be important for a subsequent patch.

J

#3 lore raw
In reply to Andi Kleen
Quoted 9 lines · Andi Kleen

Review extern struct i386_pda _proxy_pda; · line 26

Quoted 6 lines
(quoted diff) +1 -0
@@ -20,7 +22,14 @@ extern struct i386_pda _proxy_pda;
 #define pda_to_op(op,field,val)					 \
 	do {								\
 		typedef typeof(_proxy_pda.field) T__;			\
+		if (0) { T__ tmp__; tmp__ = (val); }			\
 

Merged into original patch

BTW, do you mean you already had this in i386, or that you folded it into the existing patch? I don't think I had sent out my version of this before.

J

#4 lore raw
Quoted 10 lines · Jeremy Fitzhardinge
Quoted 9 lines · Andi Kleen

Review extern struct i386_pda _proxy_pda; · line 26

Quoted 6 lines
(quoted diff) +1 -0
@@ -20,7 +22,14 @@ extern struct i386_pda _proxy_pda;
 #define pda_to_op(op,field,val)					 \
 	do {								\
 		typedef typeof(_proxy_pda.field) T__;			\
+		if (0) { T__ tmp__; tmp__ = (val); }			\
 

Merged into original patch

Quoted 3 lines

BTW, do you mean you already had this in i386, or that you folded it into the existing patch? I don't think I had sent out my version of this before.

I folded it into the existing patch.

-Andi