From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: x86/mce: Convert timers to use timer_setup() From: Kees Cook Message-Id: <20171005005425.GA23950@beast> Date: Wed, 4 Oct 2017 17:54:25 -0700 To: linux-kernel@vger.kernel.org Cc: Tony Luck , Borislav Petkov , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-edac@vger.kernel.org, Thomas Gleixner List-ID: SW4gcHJlcGFyYXRpb24gZm9yIHVuY29uZGl0aW9uYWxseSBwYXNzaW5nIHRoZSBzdHJ1Y3QgdGlt ZXJfbGlzdCBwb2ludGVyIHRvCmFsbCB0aW1lciBjYWxsYmFja3MsIHN3aXRjaCB0byB1c2luZyB0 aGUgbmV3IHRpbWVyX3NldHVwKCkgYW5kIGZyb21fdGltZXIoKQp0byBwYXNzIHRoZSB0aW1lciBw b2ludGVyIGV4cGxpY2l0bHkuIEFkanVzdCBzYW5pdHktY2hlY2sgV0FSTiB0byBtYWtlIHN1cmUK dGhlIHRyaWdnZXJpbmcgdGltZXIgbWF0Y2hlcyB0aGUgY3VycmVudCBDUFUgdGltZXIuCgpDYzog VG9ueSBMdWNrIDx0b255Lmx1Y2tAaW50ZWwuY29tPgpDYzogQm9yaXNsYXYgUGV0a292IDxicEBh bGllbjguZGU+CkNjOiBJbmdvIE1vbG5hciA8bWluZ29AcmVkaGF0LmNvbT4KQ2M6ICJILiBQZXRl ciBBbnZpbiIgPGhwYUB6eXRvci5jb20+CkNjOiB4ODZAa2VybmVsLm9yZwpDYzogbGludXgtZWRh Y0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRl PgpTaWduZWQtb2ZmLWJ5OiBLZWVzIENvb2sgPGtlZXNjb29rQGNocm9taXVtLm9yZz4KLS0tClRo aXMgcmVxdWlyZXMgY29tbWl0IDY4NmZlZjkyOGJiYSAoInRpbWVyOiBQcmVwYXJlIHRvIGNoYW5n ZSB0aW1lcgpjYWxsYmFjayBhcmd1bWVudCB0eXBlIikgaW4gdjQuMTQtcmMzLCBidXQgc2hvdWxk IGJlIG90aGVyd2lzZQpzdGFuZC1hbG9uZS4KLS0tCiBhcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVj ay9tY2UuYyB8IDEzICsrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMo KyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2NwdS9tY2hl Y2svbWNlLmMgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2UuYwppbmRleCAzYjQxMzA2 NWM2MTMuLmIxZDYxNmQwOGVlZSAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2NwdS9tY2hl Y2svbWNlLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2NwdS9tY2hlY2svbWNlLmMKQEAgLTEzNjcs MTMgKzEzNjcsMTIgQEAgc3RhdGljIHZvaWQgX19zdGFydF90aW1lcihzdHJ1Y3QgdGltZXJfbGlz dCAqdCwgdW5zaWduZWQgbG9uZyBpbnRlcnZhbCkKIAlsb2NhbF9pcnFfcmVzdG9yZShmbGFncyk7 CiB9CiAKLXN0YXRpYyB2b2lkIG1jZV90aW1lcl9mbih1bnNpZ25lZCBsb25nIGRhdGEpCitzdGF0 aWMgdm9pZCBtY2VfdGltZXJfZm4oc3RydWN0IHRpbWVyX2xpc3QgKnQpCiB7Ci0Jc3RydWN0IHRp bWVyX2xpc3QgKnQgPSB0aGlzX2NwdV9wdHIoJm1jZV90aW1lcik7Ci0JaW50IGNwdSA9IHNtcF9w cm9jZXNzb3JfaWQoKTsKKwlzdHJ1Y3QgdGltZXJfbGlzdCAqY3B1X3QgPSB0aGlzX2NwdV9wdHIo Jm1jZV90aW1lcik7CiAJdW5zaWduZWQgbG9uZyBpdjsKIAotCVdBUk5fT04oY3B1ICE9IGRhdGEp OworCVdBUk5fT04oY3B1X3QgIT0gdCk7CiAKIAlpdiA9IF9fdGhpc19jcHVfcmVhZChtY2VfbmV4 dF9pbnRlcnZhbCk7CiAKQEAgLTE3NjMsMTcgKzE3NjIsMTUgQEAgc3RhdGljIHZvaWQgbWNlX3N0 YXJ0X3RpbWVyKHN0cnVjdCB0aW1lcl9saXN0ICp0KQogc3RhdGljIHZvaWQgX19tY2hlY2tfY3B1 X3NldHVwX3RpbWVyKHZvaWQpCiB7CiAJc3RydWN0IHRpbWVyX2xpc3QgKnQgPSB0aGlzX2NwdV9w dHIoJm1jZV90aW1lcik7Ci0JdW5zaWduZWQgaW50IGNwdSA9IHNtcF9wcm9jZXNzb3JfaWQoKTsK IAotCXNldHVwX3Bpbm5lZF90aW1lcih0LCBtY2VfdGltZXJfZm4sIGNwdSk7CisJdGltZXJfc2V0 dXAodCwgbWNlX3RpbWVyX2ZuLCBUSU1FUl9QSU5ORUQpOwogfQogCiBzdGF0aWMgdm9pZCBfX21j aGVja19jcHVfaW5pdF90aW1lcih2b2lkKQogewogCXN0cnVjdCB0aW1lcl9saXN0ICp0ID0gdGhp c19jcHVfcHRyKCZtY2VfdGltZXIpOwotCXVuc2lnbmVkIGludCBjcHUgPSBzbXBfcHJvY2Vzc29y X2lkKCk7CiAKLQlzZXR1cF9waW5uZWRfdGltZXIodCwgbWNlX3RpbWVyX2ZuLCBjcHUpOworCXRp bWVyX3NldHVwKHQsIG1jZV90aW1lcl9mbiwgVElNRVJfUElOTkVEKTsKIAltY2Vfc3RhcnRfdGlt ZXIodCk7CiB9CiAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbdJEAyi (ORCPT ); Wed, 4 Oct 2017 20:54:38 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:49964 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbdJEAy2 (ORCPT ); Wed, 4 Oct 2017 20:54:28 -0400 X-Google-Smtp-Source: AOwi7QC10cPL7O6ISP2DT9OCgvS7EEyrVbjLjHygDiz6ABOrN3IVvZmAiK9VbXEKeMO2WWxnd6Rvuw== Date: Wed, 4 Oct 2017 17:54:25 -0700 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Tony Luck , Borislav Petkov , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-edac@vger.kernel.org, Thomas Gleixner Subject: [PATCH] x86/mce: Convert timers to use timer_setup() Message-ID: <20171005005425.GA23950@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Adjust sanity-check WARN to make sure the triggering timer matches the current CPU timer. Cc: Tony Luck Cc: Borislav Petkov Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: linux-edac@vger.kernel.org Cc: Thomas Gleixner Signed-off-by: Kees Cook --- This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone. --- arch/x86/kernel/cpu/mcheck/mce.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 3b413065c613..b1d616d08eee 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1367,13 +1367,12 @@ static void __start_timer(struct timer_list *t, unsigned long interval) local_irq_restore(flags); } -static void mce_timer_fn(unsigned long data) +static void mce_timer_fn(struct timer_list *t) { - struct timer_list *t = this_cpu_ptr(&mce_timer); - int cpu = smp_processor_id(); + struct timer_list *cpu_t = this_cpu_ptr(&mce_timer); unsigned long iv; - WARN_ON(cpu != data); + WARN_ON(cpu_t != t); iv = __this_cpu_read(mce_next_interval); @@ -1763,17 +1762,15 @@ static void mce_start_timer(struct timer_list *t) static void __mcheck_cpu_setup_timer(void) { struct timer_list *t = this_cpu_ptr(&mce_timer); - unsigned int cpu = smp_processor_id(); - setup_pinned_timer(t, mce_timer_fn, cpu); + timer_setup(t, mce_timer_fn, TIMER_PINNED); } static void __mcheck_cpu_init_timer(void) { struct timer_list *t = this_cpu_ptr(&mce_timer); - unsigned int cpu = smp_processor_id(); - setup_pinned_timer(t, mce_timer_fn, cpu); + timer_setup(t, mce_timer_fn, TIMER_PINNED); mce_start_timer(t); } -- 2.7.4 -- Kees Cook Pixel Security