Skip to contentSkip to conversation

Constify struct mtrr_ops for v2.6.33-rc6

PATCH H. Peter Anvin 2 participants 2 messages Feb 1, 2010 1 message not in the archive x86

lore
Share & tools
lore

H. Peter Anvin

author reviewer
#1 lore raw
In reply to a message not in the archive
Quoted 17 lines · Emese Revfy

From: Emese Revfy <[email protected]>

Constify struct mtrr_ops.

This is part of the ops structure constification
effort started by Arjan van de Ven et al.

Benefits of this constification:

* prevents modification of data that is shared
(referenced) by many other structure instances
at runtime

* detects/prevents accidental (but not intentional) modification attempts on archs that enforce read-only kernel data at runtime

Quoted 8 lines

* potentially better optimized code as the compiler can assume that the const data cannot be changed

* the compiler/linker move const data into .rodata and therefore exclude them from false sharing

Yes, but this doesn't exactly seem like 2.6.33 matter. I will put it in -tip for 2.6.34.

-hpa

#2 lore raw

[tip:x86/mtrr] x86, mtrr: Constify struct mtrr_ops

In reply to a message not in the archive
Commit-ID:  3b9cfc0a99f88c0db7c72363620584a9b40b4543
Gitweb:     http://git.kernel.org/tip/3b9cfc0a99f88c0db7c72363620584a9b40b4543
Author:     Emese Revfy <[email protected]>
AuthorDate: Sun, 31 Jan 2010 20:16:34 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 1 Feb 2010 11:20:43 -0800

x86, mtrr: Constify struct mtrr_ops

This is part of the ops structure constification effort started by Arjan van de Ven et al.

Benefits of this constification:

* prevents modification of data that is shared (referenced) by many other structure instances at runtime

* detects/prevents accidental (but not intentional) modification attempts on archs that enforce read-only kernel data at runtime

* potentially better optimized code as the compiler can assume that the const data cannot be changed

* the compiler/linker move const data into .rodata and therefore exclude them from false sharing

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/cpu/mtrr/amd.c     |    2 +-
 arch/x86/kernel/cpu/mtrr/centaur.c |    2 +-
 arch/x86/kernel/cpu/mtrr/cyrix.c   |    2 +-
 arch/x86/kernel/cpu/mtrr/generic.c |    2 +-
 arch/x86/kernel/cpu/mtrr/main.c    |    6 +++---
 arch/x86/kernel/cpu/mtrr/mtrr.h    |    6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/mtrr/amd.c +1 -1
index 33af141..92ba9cd 100644
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base, unsigned long size, unsigned int type)
 	return 0;
 }
 
-static struct mtrr_ops amd_mtrr_ops = {
+static const struct mtrr_ops amd_mtrr_ops = {
 	.vendor            = X86_VENDOR_AMD,
 	.set               = amd_set_mtrr,
 	.get               = amd_get_mtrr,
arch/x86/kernel/cpu/mtrr/centaur.c +1 -1
index de89f14..316fe3e 100644
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long base, unsigned long size, unsigned int t
 	return 0;
 }
 
-static struct mtrr_ops centaur_mtrr_ops = {
+static const struct mtrr_ops centaur_mtrr_ops = {
 	.vendor            = X86_VENDOR_CENTAUR,
 	.set               = centaur_set_mcr,
 	.get               = centaur_get_mcr,
arch/x86/kernel/cpu/mtrr/cyrix.c +1 -1
index 228d982..68a3343 100644
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
 	post_set();
 }
 
-static struct mtrr_ops cyrix_mtrr_ops = {
+static const struct mtrr_ops cyrix_mtrr_ops = {
 	.vendor            = X86_VENDOR_CYRIX,
 	.set_all	   = cyrix_set_all,
 	.set               = cyrix_set_arr,
arch/x86/kernel/cpu/mtrr/generic.c +1 -1
index 55da0c5..4d75584 100644
@@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
 /*
  * Generic structure...
  */
-struct mtrr_ops generic_mtrr_ops = {
+const struct mtrr_ops generic_mtrr_ops = {
 	.use_intel_if		= 1,
 	.set_all		= generic_set_all,
 	.get			= generic_get_mtrr,
arch/x86/kernel/cpu/mtrr/main.c +3 -3
index 84e83de..fe4622e 100644
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
 u64 size_or_mask, size_and_mask;
 static bool mtrr_aps_delayed_init;
 
-static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
 
-struct mtrr_ops *mtrr_if;
+const struct mtrr_ops *mtrr_if;
 
 static void set_mtrr(unsigned int reg, unsigned long base,
 		     unsigned long size, mtrr_type type);
 
-void set_mtrr_ops(struct mtrr_ops *ops)
+void set_mtrr_ops(const struct mtrr_ops *ops)
 {
 	if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
 		mtrr_ops[ops->vendor] = ops;
arch/x86/kernel/cpu/mtrr/mtrr.h +3 -3
index a501dee..df5e41f 100644
@@ -32,7 +32,7 @@ extern int generic_get_free_region(unsigned long base, unsigned long size,
 extern int generic_validate_add_page(unsigned long base, unsigned long size,
 				     unsigned int type);
 
-extern struct mtrr_ops generic_mtrr_ops;
+extern const struct mtrr_ops generic_mtrr_ops;
 
 extern int positive_have_wrcomb(void);
 
@@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int index,
 		u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
 void get_mtrr_state(void);
 
-extern void set_mtrr_ops(struct mtrr_ops *ops);
+extern void set_mtrr_ops(const struct mtrr_ops *ops);
 
 extern u64 size_or_mask, size_and_mask;
-extern struct mtrr_ops *mtrr_if;
+extern const struct mtrr_ops *mtrr_if;
 
 #define is_cpu(vnd)	(mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
 #define use_intel()	(mtrr_if && mtrr_if->use_intel_if == 1)