Skip to contentSkip to conversation

kernel: mark all struct k_clock instances const

PATCH In review Christoph Hellwig 2 participants 5 messages May 15, 2017 – May 23, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel: mark all struct k_clock instances const

And keep a pointer to it instead of a copy in the posix_clocks array.

Based on similar changes in the Grsecurity patchset, but redone from scratch including a few tweaks.

---
 drivers/char/mmtimer.c         |   4 +-
 include/linux/posix-timers.h   |   7 +-
 kernel/time/alarmtimer.c       |  19 +++---
 kernel/time/posix-clock.c      |   2 +-
 kernel/time/posix-cpu-timers.c |  29 ++++----
 kernel/time/posix-timers.c     | 150 ++++++++++++++++++++++-------------------
 6 files changed, 111 insertions(+), 100 deletions(-)
drivers/char/mmtimer.c +2 -2
index 0e7fcb04f01e..e501403dd860 100644
@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");
 
 #define RTC_BITS 55 /* 55 bits for this implementation */
 
-static struct k_clock sgi_clock;
+static const struct k_clock sgi_clock;
 
 extern unsigned long sn_rtc_cycles_per_second;
 
@@ -772,7 +772,7 @@ static int sgi_clock_getres(const clockid_t which_clock, struct timespec64 *tp)
 	return 0;
 }
 
-static struct k_clock sgi_clock = {
+static const struct k_clock sgi_clock = {
 	.clock_set	= sgi_clock_set,
 	.clock_get	= sgi_clock_get,
 	.clock_getres	= sgi_clock_getres,
include/linux/posix-timers.h +4 -3
index 8c1e43ab14a9..5166393e19d7 100644
@@ -105,10 +105,11 @@ struct k_clock {
 			   struct itimerspec64 *cur_setting);
 };
 
-extern struct k_clock clock_posix_cpu;
-extern struct k_clock clock_posix_dynamic;
+extern const struct k_clock clock_posix_cpu;
+extern const struct k_clock clock_posix_dynamic;
 
-void posix_timers_register_clock(const clockid_t clock_id, struct k_clock *new_clock);
+void posix_timers_register_clock(const clockid_t clock_id,
+		const struct k_clock *new_clock);
 
 /* function to call to trigger timer event */
 int posix_timer_event(struct k_itimer *timr, int si_private);
kernel/time/alarmtimer.c +10 -9
index 5cb5b0008d97..3a5206ee50c1 100644
@@ -860,6 +860,16 @@ static struct platform_driver alarmtimer_driver = {
 	}
 };
 
+static const struct k_clock alarm_clock = {
+	.clock_getres	= alarm_clock_getres,
+	.clock_get	= alarm_clock_get,
+	.timer_create	= alarm_timer_create,
+	.timer_set	= alarm_timer_set,
+	.timer_del	= alarm_timer_del,
+	.timer_get	= alarm_timer_get,
+	.nsleep		= alarm_timer_nsleep,
+};
+
 /**
  * alarmtimer_init - Initialize alarm timer code
  *
@@ -871,15 +881,6 @@ static int __init alarmtimer_init(void)
 	struct platform_device *pdev;
 	int error = 0;
 	int i;
-	struct k_clock alarm_clock = {
-		.clock_getres	= alarm_clock_getres,
-		.clock_get	= alarm_clock_get,
-		.timer_create	= alarm_timer_create,
-		.timer_set	= alarm_timer_set,
-		.timer_del	= alarm_timer_del,
-		.timer_get	= alarm_timer_get,
-		.nsleep		= alarm_timer_nsleep,
-	};
 
 	alarmtimer_rtc_timer_init();
 
kernel/time/posix-clock.c +1 -1
index 31d588d37a17..7e453005e078 100644
@@ -434,7 +434,7 @@ static int pc_timer_settime(struct k_itimer *kit, int flags,
 	return err;
 }
 
-struct k_clock clock_posix_dynamic = {
+const struct k_clock clock_posix_dynamic = {
 	.clock_getres	= pc_clock_getres,
 	.clock_set	= pc_clock_settime,
 	.clock_get	= pc_clock_gettime,
kernel/time/posix-cpu-timers.c +15 -14
index 1370f067fb51..ba79aa955137 100644
@@ -1413,7 +1413,7 @@ static int thread_cpu_timer_create(struct k_itimer *timer)
 	return posix_cpu_timer_create(timer);
 }
 
-struct k_clock clock_posix_cpu = {
+const struct k_clock clock_posix_cpu = {
 	.clock_getres	= posix_cpu_clock_getres,
 	.clock_set	= posix_cpu_clock_set,
 	.clock_get	= posix_cpu_clock_get,
@@ -1425,21 +1425,22 @@ struct k_clock clock_posix_cpu = {
 	.timer_get	= posix_cpu_timer_get,
 };
 
+static const struct k_clock process = {
+	.clock_getres	= process_cpu_clock_getres,
+	.clock_get	= process_cpu_clock_get,
+	.timer_create	= process_cpu_timer_create,
+	.nsleep		= process_cpu_nsleep,
+	.nsleep_restart	= process_cpu_nsleep_restart,
+};
+
+static const struct k_clock thread = {
+	.clock_getres	= thread_cpu_clock_getres,
+	.clock_get	= thread_cpu_clock_get,
+	.timer_create	= thread_cpu_timer_create,
+};
+
 static __init int init_posix_cpu_timers(void)
 {
-	struct k_clock process = {
-		.clock_getres	= process_cpu_clock_getres,
-		.clock_get	= process_cpu_clock_get,
-		.timer_create	= process_cpu_timer_create,
-		.nsleep		= process_cpu_nsleep,
-		.nsleep_restart	= process_cpu_nsleep_restart,
-	};
-	struct k_clock thread = {
-		.clock_getres	= thread_cpu_clock_getres,
-		.clock_get	= thread_cpu_clock_get,
-		.timer_create	= thread_cpu_timer_create,
-	};
-
 	posix_timers_register_clock(CLOCK_PROCESS_CPUTIME_ID, &process);
 	posix_timers_register_clock(CLOCK_THREAD_CPUTIME_ID, &thread);
 
kernel/time/posix-timers.c +79 -71

251 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw
Quoted 4 lines · Christoph Hellwig

And keep a pointer to it instead of a copy in the posix_clocks array.

Based on similar changes in the Grsecurity patchset, but redone from scratch including a few tweaks.

Hmm, that adds another level of indirection, but yes, we can do it.

drivers/char/mmtimer.c MODULE_LICENSE("GPL"); · line 56

Quoted 10 lines
drivers/char/mmtimer.c +1 -1
index 0e7fcb04f01e..e501403dd860 100644
@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");
 
 #define RTC_BITS 55 /* 55 bits for this implementation */
 
-static struct k_clock sgi_clock;
+static const struct k_clock sgi_clock;

Bah. This mmtimer which is used by 3 people in the world requires that we keep the register_clock() function around after init and even export it.

In fact it makes no sense at all to keep that register function around with your changes. The patch below makes all of this const in the !MMTIMER case. If MMTIMER is enabled the thing is equaly secure as now.

Thanks,

tglx
8<-----------------

drivers/char/mmtimer.c +3 -3
@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");
 
 #define RTC_BITS 55 /* 55 bits for this implementation */
 
-static struct k_clock sgi_clock;
+static const struct k_clock sgi_clock;
 
 extern unsigned long sn_rtc_cycles_per_second;
 
@@ -772,7 +772,7 @@ static int sgi_clock_getres(const clocki
 	return 0;
 }
 
-static struct k_clock sgi_clock = {
+static const struct k_clock sgi_clock = {
 	.clock_set	= sgi_clock_set,
 	.clock_get	= sgi_clock_get,
 	.clock_getres	= sgi_clock_getres,
@@ -840,7 +840,7 @@ static int __init mmtimer_init(void)
 	}
 
 	sgi_clock_period = NSEC_PER_SEC / sn_rtc_cycles_per_second;
-	posix_timers_register_clock(CLOCK_SGI_CYCLE, &sgi_clock);
+	posix_clocks[CLOCK_SGI_CYCLE] = &sgi_clock;
 
 	printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION,
 	       sn_rtc_cycles_per_second/(unsigned long)1E6);
include/linux/posix-timers.h +8 -3
@@ -105,10 +105,15 @@ struct k_clock {
 			   struct itimerspec64 *cur_setting);
 };
 
-extern struct k_clock clock_posix_cpu;
-extern struct k_clock clock_posix_dynamic;
+extern const struct k_clock clock_posix_cpu;
+extern const struct k_clock clock_posix_dynamic;
+extern const struct k_clock clock_process;
+extern const struct k_clock clock_thread;
+extern const struct k_clock alarm_clock;
 
-void posix_timers_register_clock(const clockid_t clock_id, struct k_clock *new_clock);
+#ifdef CONFIG_MMTIMER
+extern const struct k_clock *posix_clocks[MAX_CLOCKS];
+#endif
 
 /* function to call to trigger timer event */
 int posix_timer_event(struct k_itimer *timr, int si_private);
kernel/time/alarmtimer.c +12 -14
@@ -860,6 +860,18 @@ static struct platform_driver alarmtimer
 	}
 };
 
+#ifdef CONFIG_POSIX_TIMERS
+const struct k_clock alarm_clock = {
+	.clock_getres	= alarm_clock_getres,
+	.clock_get	= alarm_clock_get,
+	.timer_create	= alarm_timer_create,
+	.timer_set	= alarm_timer_set,
+	.timer_del	= alarm_timer_del,
+	.timer_get	= alarm_timer_get,
+	.nsleep		= alarm_timer_nsleep,
+};
+#endif
+
 /**
  * alarmtimer_init - Initialize alarm timer code
  *
@@ -871,23 +883,9 @@ static int __init alarmtimer_init(void)
 	struct platform_device *pdev;
 	int error = 0;
 	int i;
-	struct k_clock alarm_clock = {
-		.clock_getres	= alarm_clock_getres,
-		.clock_get	= alarm_clock_get,
-		.timer_create	= alarm_timer_create,
-		.timer_set	= alarm_timer_set,
-		.timer_del	= alarm_timer_del,
-		.timer_get	= alarm_timer_get,
-		.nsleep		= alarm_timer_nsleep,
-	};
 
 	alarmtimer_rtc_timer_init();
 
-	if (IS_ENABLED(CONFIG_POSIX_TIMERS)) {
-		posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock);
-		posix_timers_register_clock(CLOCK_BOOTTIME_ALARM, &alarm_clock);
-	}
-
 	/* Initialize alarm bases */
 	alarm_bases[ALARM_REALTIME].base_clockid = CLOCK_REALTIME;
 	alarm_bases[ALARM_REALTIME].gettime = &ktime_get_real;
kernel/time/posix-clock.c +1 -1
@@ -434,7 +434,7 @@ static int pc_timer_settime(struct k_iti
 	return err;
 }
 
-struct k_clock clock_posix_dynamic = {
+const struct k_clock clock_posix_dynamic = {
 	.clock_getres	= pc_clock_getres,
 	.clock_set	= pc_clock_settime,
 	.clock_get	= pc_clock_gettime,
kernel/time/posix-cpu-timers.c +13 -21
@@ -1413,7 +1413,7 @@ static int thread_cpu_timer_create(struc
 	return posix_cpu_timer_create(timer);
 }
 
-struct k_clock clock_posix_cpu = {
+const struct k_clock clock_posix_cpu = {
 	.clock_getres	= posix_cpu_clock_getres,
 	.clock_set	= posix_cpu_clock_set,
 	.clock_get	= posix_cpu_clock_get,
@@ -1425,24 +1425,16 @@ struct k_clock clock_posix_cpu = {
 	.timer_get	= posix_cpu_timer_get,
 };
 
-static __init int init_posix_cpu_timers(void)
-{
-	struct k_clock process = {
-		.clock_getres	= process_cpu_clock_getres,
-		.clock_get	= process_cpu_clock_get,
-		.timer_create	= process_cpu_timer_create,
-		.nsleep		= process_cpu_nsleep,
-		.nsleep_restart	= process_cpu_nsleep_restart,
-	};
-	struct k_clock thread = {
-		.clock_getres	= thread_cpu_clock_getres,
-		.clock_get	= thread_cpu_clock_get,
-		.timer_create	= thread_cpu_timer_create,
-	};
-
-	posix_timers_register_clock(CLOCK_PROCESS_CPUTIME_ID, &process);
-	posix_timers_register_clock(CLOCK_THREAD_CPUTIME_ID, &thread);
+const struct k_clock clock_process = {
+	.clock_getres	= process_cpu_clock_getres,
+	.clock_get	= process_cpu_clock_get,
+	.timer_create	= process_cpu_timer_create,
+	.nsleep		= process_cpu_nsleep,
+	.nsleep_restart	= process_cpu_nsleep_restart,
+};
 
-	return 0;
-}
-__initcall(init_posix_cpu_timers);
+const struct k_clock clock_thread = {
+	.clock_getres	= thread_cpu_clock_getres,
+	.clock_get	= thread_cpu_clock_get,
+	.timer_create	= thread_cpu_timer_create,
+};
kernel/time/posix-timers.c +101 -101

297 lines not on this page · raw message

#2 lore raw
Quoted 15 lines · Thomas Gleixner
Quoted 4 lines · Christoph Hellwig

And keep a pointer to it instead of a copy in the posix_clocks array.

Based on similar changes in the Grsecurity patchset, but redone from scratch including a few tweaks.

Hmm, that adds another level of indirection, but yes, we can do it.

Quoted 6 lines
drivers/char/mmtimer.c +0 -0
index 0e7fcb04f01e..e501403dd860 100644
@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");
 
Quoted 7 lines

drivers/char/mmtimer.c MODULE_LICENSE("GPL"); · line 56

Quoted 4 lines
drivers/char/mmtimer.c +1 -1
 #define RTC_BITS 55 /* 55 bits for this implementation */
 
-static struct k_clock sgi_clock;
+static const struct k_clock sgi_clock;

Bah. This mmtimer which is used by 3 people in the world requires that we keep the register_clock() function around after init and even export it.

We can require the driver to be built into the kernel, which seems pretty reasonable for a timer. It's only selectable on IA64 anyway.

#3 lore raw
Quoted 18 lines · Christoph Hellwig
Quoted 17 lines · Thomas Gleixner
Quoted 4 lines · Christoph Hellwig

And keep a pointer to it instead of a copy in the posix_clocks array.

Based on similar changes in the Grsecurity patchset, but redone from scratch including a few tweaks.

Hmm, that adds another level of indirection, but yes, we can do it.

Quoted 8 lines
drivers/char/mmtimer.c +0 -0
index 0e7fcb04f01e..e501403dd860 100644
@@ -53,7 +53,7 @@ MODULE_LICENSE("GPL");
 
 #define RTC_BITS 55 /* 55 bits for this implementation */
 
Quoted 8 lines
Quoted 5 lines

drivers/char/mmtimer.c MODULE_LICENSE("GPL"); · line 56

Quoted 2 lines
drivers/char/mmtimer.c +1 -1
-static struct k_clock sgi_clock;
+static const struct k_clock sgi_clock;

Bah. This mmtimer which is used by 3 people in the world requires that we keep the register_clock() function around after init and even export it.

We can require the driver to be built into the kernel, which seems pretty reasonable for a timer. It's only selectable on IA64 anyway.

That still requires that we "register" the clock as it's SN2 specific and we don't want to end up with a non initialized clock ....

Thanks,

tglx

#4 lore raw
Quoted 5 lines · Thomas Gleixner
Quoted 2 lines

We can require the driver to be built into the kernel, which seems pretty reasonable for a timer. It's only selectable on IA64 anyway.

That still requires that we "register" the clock as it's SN2 specific and we don't want to end up with a non initialized clock ....

I'd much rather have a call to mmtimer_init from the core clock code than having to conditionally export the array..

But maybe we can actually drop the mmtimer now - IA64-based Altix systems haven't been built for a while and anyone requiring its special clock will run a distro of sorts anyway.