Skip to contentSkip to conversation

x86: cleanup - rename VM_MASK to X86_VM_MASK

DISCUSSION David Woodhouse 6 participants 16 messages Apr 23, 2008 – Apr 27, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 24 lines · Linux Kernel Mailing List
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7
Commit:     6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7
Parent:     6093015db2bd9e70cf20cdd23be1a50733baafdd
Author:     [email protected] <[email protected]>
AuthorDate: Fri Mar 28 17:56:57 2008 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu Apr 17 17:41:33 2008 +0200

x86: cleanup - rename VM_MASK to X86_VM_MASK

This patch renames VM_MASK to X86_VM_MASK (which in turn defined as alias to X86_EFLAGS_VM) to better distinguish from virtual memory flags. We can't just use X86_EFLAGS_VM instead because it is also used for conditional compilation

include/asm-x86/vm86.h +0 -0
@@ -17,9 +17,9 @@
 #define IOPL_MASK	0x00003000

include/asm-x86/vm86.h line 25

Quoted 10 lines
include/asm-x86/vm86.h +2 -2
 #define NT_MASK		0x00004000
 #ifdef CONFIG_VM86
-#define VM_MASK		0x00020000
+#define X86_VM_MASK	X86_EFLAGS_VM
 #else
-#define VM_MASK		0 /* ignored */
+#define X86_VM_MASK	0 /* No VM86 support */
 #endif
 #define AC_MASK		0x00040000
 #define VIF_MASK	0x00080000	/* virtual interrupt flag */

This is user-visible. Yet we're changing the name and also making it depend on #ifdef CONFIG_VM86, which is not going to be set in userspace. Perhaps it should be within #ifdef __KERNEL__?

Signature · 1 line
dwmw2
#2 lore raw
Quoted 40 lines · David Woodhouse
Quoted 24 lines · Linux Kernel Mailing List
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7
Commit:     6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7
Parent:     6093015db2bd9e70cf20cdd23be1a50733baafdd
Author:     [email protected] <[email protected]>
AuthorDate: Fri Mar 28 17:56:57 2008 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu Apr 17 17:41:33 2008 +0200

x86: cleanup - rename VM_MASK to X86_VM_MASK

This patch renames VM_MASK to X86_VM_MASK (which in turn defined as alias to X86_EFLAGS_VM) to better distinguish from virtual memory flags. We can't just use X86_EFLAGS_VM instead because it is also used for conditional compilation

include/asm-x86/vm86.h +0 -0
@@ -17,9 +17,9 @@
 #define IOPL_MASK    0x00003000

include/asm-x86/vm86.h line 25

Quoted 10 lines
include/asm-x86/vm86.h +2 -2
 #define NT_MASK              0x00004000
 #ifdef CONFIG_VM86
-#define VM_MASK              0x00020000
+#define X86_VM_MASK  X86_EFLAGS_VM
 #else
-#define VM_MASK              0 /* ignored */
+#define X86_VM_MASK  0 /* No VM86 support */
 #endif
 #define AC_MASK              0x00040000
 #define VIF_MASK     0x00080000      /* virtual interrupt flag */

This is user-visible. Yet we're changing the name and also making it depend on #ifdef CONFIG_VM86, which is not going to be set in userspace. Perhaps it should be within #ifdef __KERNEL__?

Quoted 4 lines

--
dwmw2

Thanks David, will check it today evening (i'm in office now)

#3 lore raw
Quoted 42 lines · Cyrill Gorcunov
Quoted 40 lines · David Woodhouse
Quoted 24 lines · Linux Kernel Mailing List
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7
Commit:     6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7
Parent:     6093015db2bd9e70cf20cdd23be1a50733baafdd
Author:     [email protected] <[email protected]>
AuthorDate: Fri Mar 28 17:56:57 2008 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu Apr 17 17:41:33 2008 +0200

x86: cleanup - rename VM_MASK to X86_VM_MASK

This patch renames VM_MASK to X86_VM_MASK (which in turn defined as alias to X86_EFLAGS_VM) to better distinguish from virtual memory flags. We can't just use X86_EFLAGS_VM instead because it is also used for conditional compilation

include/asm-x86/vm86.h +0 -0
@@ -17,9 +17,9 @@
 #define IOPL_MASK    0x00003000

include/asm-x86/vm86.h line 25

Quoted 10 lines
include/asm-x86/vm86.h +2 -2
 #define NT_MASK              0x00004000
 #ifdef CONFIG_VM86
-#define VM_MASK              0x00020000
+#define X86_VM_MASK  X86_EFLAGS_VM
 #else
-#define VM_MASK              0 /* ignored */
+#define X86_VM_MASK  0 /* No VM86 support */
 #endif
 #define AC_MASK              0x00040000
 #define VIF_MASK     0x00080000      /* virtual interrupt flag */

This is user-visible. Yet we're changing the name and also making it depend on #ifdef CONFIG_VM86, which is not going to be set in userspace. Perhaps it should be within #ifdef __KERNEL__?

Quoted 7 lines
Quoted 4 lines

--
dwmw2

Thanks David, will check it today evening (i'm in office now)

Hi David,

actually, this CONFIG_VM86 was there even before the renaming was done. The main questions (imo) - is there any user space application who uses these flags? If they are - then even the idea of this patch was a bit bogus, and I should *not* remove all these VM86 specific flags but better define them as aliases on flags from processor-flags.h.

Ingo? Peter?

#4 lore raw
Quoted 9 lines · Cyrill Gorcunov

Hi David,

actually, this CONFIG_VM86 was there even before the renaming was done. The main questions (imo) - is there any user space application who uses these flags? If they are - then even the idea of this patch was a bit bogus, and I should *not* remove all these VM86 specific flags but better define them as aliases on flags from processor-flags.h.

Hard to know. VM86 is only used by a handful of applications (DOSEMU, X.org, others?) but it's hard to know what exactly they are.

The fact that noone hollered when that CONFIG_VM86 went in is probably a good hint that they don't matter, but it's hard to say for sure.

-hpa

#5 lore raw

[H. Peter Anvin - Wed, Apr 23, 2008 at 11:12:33AM -0700]

Quoted 10 lines
Quoted 8 lines · Cyrill Gorcunov

Hi David,
actually, this CONFIG_VM86 was there even before the renaming was done. The main questions (imo) - is there any user space application who uses these flags? If they are - then even the idea of this patch was a bit bogus,
and I should *not* remove all these VM86 specific flags but better define them
as aliases on flags from processor-flags.h.

Quoted 8 lines

Hard to know. VM86 is only used by a handful of applications (DOSEMU, X.org, others?) but it's hard to know what exactly they are.

The fact that noone hollered when that CONFIG_VM86 went in is probably a good hint that they don't matter, but it's hard to say for sure.

-hpa

Actually, being google a bit I found that most of emulators redefine their own equvalence of these flags. So I think we could remain all as is. But if we wanna be sure I could make a patch like this

...
#define CF_MASK X86_EFLAGS_CF
...

- Cyrill -

#6 lore raw
In reply to H. Peter Anvin

[H. Peter Anvin - Wed, Apr 23, 2008 at 11:12:33AM -0700]

Quoted 10 lines
Quoted 8 lines · Cyrill Gorcunov

Hi David,
actually, this CONFIG_VM86 was there even before the renaming was done. The main questions (imo) - is there any user space application who uses these flags? If they are - then even the idea of this patch was a bit bogus,
and I should *not* remove all these VM86 specific flags but better define them
as aliases on flags from processor-flags.h.

Quoted 8 lines

Hard to know. VM86 is only used by a handful of applications (DOSEMU, X.org, others?) but it's hard to know what exactly they are.

The fact that noone hollered when that CONFIG_VM86 went in is probably a good hint that they don't matter, but it's hard to say for sure.

-hpa

Peter, Ingo,

any objections on the patch like that?

---
From: Cyrill Gorcunov <[email protected]>
Subject: [PATCH] reintroduce old VM86 flags for userlang backward compatibility

---

include/asm-x86/vm86.h +12 -0
Index: linux-2.6.git/include/asm-x86/vm86.h
===================================================================
@@ -14,6 +14,18 @@
 
 #include <asm/processor-flags.h>
 
+/* backward compatibility for userland */
+#ifndef __KERNEL__
+#define TF_MASK		X86_EFLAGS_TF
+#define IF_MASK		X86_EFLAGS_IF
+#define IOPL_MASK	X86_EFLAGS_IOPL
+#define NT_MASK		X86_EFLAGS_NT
+#define AC_MASK		X86_EFLAGS_AC
+#define VIF_MASK	X86_EFLAGS_VIF
+#define VIP_MASK	X86_EFLAGS_VIP
+#define ID_MASK		X86_EFLAGS_ID
+#endif
+
 #ifdef CONFIG_VM86
 #define X86_VM_MASK	X86_EFLAGS_VM
 #else
#7 lore raw
Quoted 5 lines · Cyrill Gorcunov

Peter, Ingo,

any objections on the patch like that?

Well, I would prefer to try to get rid of them; as you said, most userland don't rely on these, and if they aren't used they are just namespace pollution, and rather bad such.

-hpa

#8 lore raw
Quoted 10 lines · H. Peter Anvin
Quoted 5 lines · Cyrill Gorcunov

Peter, Ingo,

any objections on the patch like that?

Well, I would prefer to try to get rid of them; as you said, most userland don't rely on these, and if they aren't used they are just namespace pollution, and rather bad such.

Yeah, I'd prefer just to kill them off if we think we can get away with it. These are hardware-defined flags, not Linux-specific, so userspace should probably get them from elsewhere anyway.

Signature · 1 line
dwmw2
#10 lore raw
Quoted 1 line · Cyrill Gorcunov

Ok, lets drop these all and forget :)

We still want to shift the definition of X86_VM_MASK inside __KERNEL__, don't we?

Signature · 1 line
dwmw2
#11 lore raw
Quoted 5 lines · David Woodhouse
Quoted 1 line · Cyrill Gorcunov

Ok, lets drop these all and forget :)

We still want to shift the definition of X86_VM_MASK inside __KERNEL__, don't we?

Yes.

-hpa

#12 lore raw

[H. Peter Anvin - Wed, Apr 23, 2008 at 10:34:26PM -0700]

Quoted 10 lines
Quoted 4 lines · David Woodhouse
Quoted 1 line · Cyrill Gorcunov

Ok, lets drop these all and forget :)

We still want to shift the definition of X86_VM_MASK inside __KERNEL__, don't we?

Yes.

-hpa

I've just posted the patch, please review (i'm to go out of my work machine so if there would be any objections I read them today evening, thanks)

- Cyrill -

#13 lore raw
In reply to H. Peter Anvin
Quoted 15 lines · H. Peter Anvin
Quoted 13 lines · Cyrill Gorcunov

Hi David,

actually, this CONFIG_VM86 was there even before the renaming was done.
The main questions (imo) - is there any user space application who uses
these flags? If they are - then even the idea of this patch was a bit bogus,
and I should *not* remove all these VM86 specific flags but better define them
as aliases on flags from processor-flags.h.

Quoted 3 lines

Hard to know. VM86 is only used by a handful of applications (DOSEMU, X.org, others?) but it's hard to know what exactly they are.

I believe vbetool and thus s2ram uses vm86, too.

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#14 lore raw
Quoted 16 lines · Pavel Machek
Quoted 15 lines · H. Peter Anvin
Quoted 13 lines · Cyrill Gorcunov

Hi David,

actually, this CONFIG_VM86 was there even before the renaming was done.
The main questions (imo) - is there any user space application who uses
these flags? If they are - then even the idea of this patch was a bit bogus,
and I should *not* remove all these VM86 specific flags but better define them
as aliases on flags from processor-flags.h.

Quoted 5 lines
Quoted 3 lines

Hard to know. VM86 is only used by a handful of applications (DOSEMU, X.org, others?) but it's hard to know what exactly they are.

I believe vbetool and thus s2ram uses vm86, too.

Well, I think so too. Matthew?

Rafael

#15 lore raw
Quoted 4 lines · Rafael J. Wysocki
Quoted 1 line · Pavel Machek

I believe vbetool and thus s2ram uses vm86, too.

Well, I think so too. Matthew?

Yes, though I don't think any of them use these internal flags.

Signature · 1 line
Matthew Garrett | [email protected]
#16 lore raw

[Matthew Garrett - Sun, Apr 27, 2008 at 12:55:37PM +0100]

| On Sun, Apr 27, 2008 at 01:31:17PM +0200, Rafael J. Wysocki wrote:
| > On Sunday, 27 of April 2008, Pavel Machek wrote:
| > > I believe vbetool and thus s2ram uses vm86, too.
| > 
| > Well, I think so too. Matthew?
| 
| Yes, though I don't think any of them use these internal flags.
| 
| -- 
| Matthew Garrett | [email protected]
| 

Originally this flag was bounded by CONFIG_VM86 which is kernel internal feature and if userland program relies on this it's a bit buggy assumption meguess. Anyway, i've posted second version of the patch (don't remember lkml.org link for that).
- Cyrill -