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: [4.4,20/63] x86/MCE: Serialize sysfs changes From: Greg Kroah-Hartman Message-Id: <20180316152302.324771621@linuxfoundation.org> Date: Fri, 16 Mar 2018 16:22:52 +0100 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Seunghun Han , Borislav Petkov , Thomas Gleixner , Tony Luck , linux-edac List-ID: NC40LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IFNldW5naHVuIEhh biA8a2thbWFndWlAZ21haWwuY29tPgoKY29tbWl0IGIzYjdjNDc5NWNjYWI1YmU3MWYwODA3NzRj NDViYmJjYzc1YzJhYWYgdXBzdHJlYW0uCgpUaGUgY2hlY2tfaW50ZXJ2YWwgZmlsZSBpbgoKICAv c3lzL2RldmljZXMvc3lzdGVtL21hY2hpbmVjaGVjay9tYWNoaW5lY2hlY2s8Y3B1IG51bWJlcj4K CmRpcmVjdG9yeSBpcyBhIGdsb2JhbCB0aW1lciB2YWx1ZSBmb3IgTUNFIHBvbGxpbmcuIElmIGl0 IGlzIGNoYW5nZWQgYnkgb25lCkNQVSwgbWNlX3Jlc3RhcnQoKSBicm9hZGNhc3RzIHRoZSBldmVu dCB0byBvdGhlciBDUFVzIHRvIGRlbGV0ZSBhbmQgcmVzdGFydAp0aGUgTUNFIHBvbGxpbmcgdGlt ZXIgYW5kIF9fbWNoZWNrX2NwdV9pbml0X3RpbWVyKCkgcmVpbml0aWFsaXplcyB0aGUKbWNlX3Rp bWVyIHZhcmlhYmxlLgoKSWYgbW9yZSB0aGFuIG9uZSBDUFUgd3JpdGVzIGEgc3BlY2lmaWMgdmFs dWUgdG8gdGhlIGNoZWNrX2ludGVydmFsIGZpbGUKY29uY3VycmVudGx5LCBtY2VfdGltZXIgaXMg bm90IHByb3RlY3RlZCBmcm9tIHN1Y2ggY29uY3VycmVudCBhY2Nlc3NlcyBhbmQKYWxsIGtpbmRz IG9mIGV4cGxvc2lvbnMgaGFwcGVuLiBTaW5jZSBvbmx5IHJvb3QgY2FuIHdyaXRlIHRvIHRob3Nl IHN5c2ZzCnZhcmlhYmxlcywgdGhlIGlzc3VlIGlzIG5vdCBhIGJpZyBkZWFsIHNlY3VyaXR5LXdp c2UuCgpIb3dldmVyLCBjb25jdXJyZW50IHdyaXRlcyB0byB0aGVzZSBjb25maWd1cmF0aW9uIHZh cmlhYmxlcyBpcyB2b2lkIG9mCnJlYXNvbiBzbyB0aGUgcHJvcGVyIHRoaW5nIHRvIGRvIGlzIHRv IHNlcmlhbGl6ZSB0aGUgYWNjZXNzIHdpdGggYSBtdXRleC4KCkJvcmlzOgoKIC0gTWFrZSBzdG9y ZV9pbnRfd2l0aF9yZXN0YXJ0KCkgdXNlIGRldmljZV9zdG9yZV91bG9uZygpIHRvIGZpbHRlciBv dXQKICAgbmVnYXRpdmUgaW50ZXJ2YWxzCiAtIExpbWl0IG1pbiBpbnRlcnZhbCB0byAxIHNlY29u ZAogLSBDb3JyZWN0IGxvY2tpbmcKIC0gTWFzc2FnZSBjb21taXQgbWVzc2FnZQoKU2lnbmVkLW9m Zi1ieTogU2V1bmdodW4gSGFuIDxra2FtYWd1aUBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IEJv cmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogVGhvbWFzIEdsZWl4bmVy IDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNjOiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51 eGZvdW5kYXRpb24ub3JnPgpDYzogVG9ueSBMdWNrIDx0b255Lmx1Y2tAaW50ZWwuY29tPgpDYzog bGludXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+CkNjOiBzdGFibGVAdmdlci5r ZXJuZWwub3JnCkxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MDMwMjIwMjcwNi45 NDM0LTEta2thbWFndWlAZ21haWwuY29tClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1h biA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+Ci0tLQogYXJjaC94ODYva2VybmVsL2NwdS9t Y2hlY2svbWNlLmMgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2Vk LCAyMSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgoKCi0tClRvIHVuc3Vic2NyaWJlIGZy b20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1lZGFjIiBpbgp0 aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1h am9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0 bWwKCi0tLSBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZS5jCisrKyBiL2FyY2gveDg2 L2tlcm5lbC9jcHUvbWNoZWNrL21jZS5jCkBAIC02MCw2ICs2MCw5IEBAIHN0YXRpYyBERUZJTkVf TVVURVgobWNlX2NocmRldl9yZWFkX211dGUKIAlzbXBfbG9hZF9hY3F1aXJlKCYocCkpOyBcCiB9 KQogCisvKiBzeXNmcyBzeW5jaHJvbml6YXRpb24gKi8KK3N0YXRpYyBERUZJTkVfTVVURVgobWNl X3N5c2ZzX211dGV4KTsKKwogI2RlZmluZSBDUkVBVEVfVFJBQ0VfUE9JTlRTCiAjaW5jbHVkZSA8 dHJhY2UvZXZlbnRzL21jZS5oPgogCkBAIC0yMjIwLDYgKzIyMjMsNyBAQCBzdGF0aWMgc3NpemVf dCBzZXRfaWdub3JlX2NlKHN0cnVjdCBkZXZpCiAJaWYgKGtzdHJ0b3U2NChidWYsIDAsICZuZXcp IDwgMCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKKwltdXRleF9sb2NrKCZtY2Vfc3lzZnNfbXV0ZXgp OwogCWlmIChtY2FfY2ZnLmlnbm9yZV9jZSBeICEhbmV3KSB7CiAJCWlmIChuZXcpIHsKIAkJCS8q IGRpc2FibGUgY2UgZmVhdHVyZXMgKi8KQEAgLTIyMzIsNiArMjIzNiw4IEBAIHN0YXRpYyBzc2l6 ZV90IHNldF9pZ25vcmVfY2Uoc3RydWN0IGRldmkKIAkJCW9uX2VhY2hfY3B1KG1jZV9lbmFibGVf Y2UsICh2b2lkICopMSwgMSk7CiAJCX0KIAl9CisJbXV0ZXhfdW5sb2NrKCZtY2Vfc3lzZnNfbXV0 ZXgpOworCiAJcmV0dXJuIHNpemU7CiB9CiAKQEAgLTIyNDQsNiArMjI1MCw3IEBAIHN0YXRpYyBz c2l6ZV90IHNldF9jbWNpX2Rpc2FibGVkKHN0cnVjdAogCWlmIChrc3RydG91NjQoYnVmLCAwLCAm bmV3KSA8IDApCiAJCXJldHVybiAtRUlOVkFMOwogCisJbXV0ZXhfbG9jaygmbWNlX3N5c2ZzX211 dGV4KTsKIAlpZiAobWNhX2NmZy5jbWNpX2Rpc2FibGVkIF4gISFuZXcpIHsKIAkJaWYgKG5ldykg ewogCQkJLyogZGlzYWJsZSBjbWNpICovCkBAIC0yMjU1LDYgKzIyNjIsOCBAQCBzdGF0aWMgc3Np emVfdCBzZXRfY21jaV9kaXNhYmxlZChzdHJ1Y3QKIAkJCW9uX2VhY2hfY3B1KG1jZV9lbmFibGVf Y2UsIE5VTEwsIDEpOwogCQl9CiAJfQorCW11dGV4X3VubG9jaygmbWNlX3N5c2ZzX211dGV4KTsK KwogCXJldHVybiBzaXplOwogfQogCkBAIC0yMjYyLDggKzIyNzEsMTkgQEAgc3RhdGljIHNzaXpl X3Qgc3RvcmVfaW50X3dpdGhfcmVzdGFydChzdAogCQkJCSAgICAgIHN0cnVjdCBkZXZpY2VfYXR0 cmlidXRlICphdHRyLAogCQkJCSAgICAgIGNvbnN0IGNoYXIgKmJ1Ziwgc2l6ZV90IHNpemUpCiB7 Ci0Jc3NpemVfdCByZXQgPSBkZXZpY2Vfc3RvcmVfaW50KHMsIGF0dHIsIGJ1Ziwgc2l6ZSk7CisJ dW5zaWduZWQgbG9uZyBvbGRfY2hlY2tfaW50ZXJ2YWwgPSBjaGVja19pbnRlcnZhbDsKKwlzc2l6 ZV90IHJldCA9IGRldmljZV9zdG9yZV91bG9uZyhzLCBhdHRyLCBidWYsIHNpemUpOworCisJaWYg KGNoZWNrX2ludGVydmFsID09IG9sZF9jaGVja19pbnRlcnZhbCkKKwkJcmV0dXJuIHJldDsKKwor CWlmIChjaGVja19pbnRlcnZhbCA8IDEpCisJCWNoZWNrX2ludGVydmFsID0gMTsKKworCW11dGV4 X2xvY2soJm1jZV9zeXNmc19tdXRleCk7CiAJbWNlX3Jlc3RhcnQoKTsKKwltdXRleF91bmxvY2so Jm1jZV9zeXNmc19tdXRleCk7CisKIAlyZXR1cm4gcmV0OwogfQogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3552852-1521221605-2-10655961368557143526 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521221604; b=Q/GCUpxVhO1Gd+jn/Vp6Q3YczshN6FT721dSDqxAnLsEfib 3PjxgQjByyNzfT3JsHvvHN3sB4uD6QfvZ1XSdZdOWWGaXtrR7lRT+J+AqKicjcQA +banNVylbvF35HKi0xusO3gKKjE4+wTKNBxC0EGoWLA6TMaPEOpc/F4oEzob/ww+ 2FvUf/cTMHztUPim+Ayik8sA0Q5mGt7g8cLXRPFrj7gE12QZxg6EZSnfnU3pIkz1 OZFUlLPppevRuBVE2q1QCCChU6Jh5vF/jtRuQ93mlZoVj+Koxh88sDgSIT82tqrp fGWwFXouJJpXDsqc28L3XKdJniN0dWsArwSAsQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1521221604; bh=jsgowv+yTcENjUYygusZDe63NN UJ9hxZpKJHkrNERwQ=; b=XOE2jmcWKldad+PNzjeiogkN4ytyTHnThP8fehoU6p RehFIeuB3PNgwRhtVfajAxKKVpxtJjPUS0BkQOQheNlnqFd/M9CyDaKXPGCu0dfv s4X3QnUt2p301E1fyCdTplZW/6UZ6wlRdyX0rXTZuDo28L1NYMGHv3BB8yPfgWZu mddqlUPRN6FHEKD/NueySgiqcT5HrC4WSVGe1koaekR2KHn2BuqUoBsxyZPNr59I BY6BLEtwxGkvpvAHfpiJmLndUxrVYYXx3Z/6ZkIITPK0o9ZQwUCXqJjP/WnK6jMI aUuxFEUN1o4/oMxIFbiD/rQcOLIVcBndlbQyfdr2hmdg== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932645AbeCPRdK (ORCPT ); Fri, 16 Mar 2018 13:33:10 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34164 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753464AbeCPP1U (ORCPT ); Fri, 16 Mar 2018 11:27:20 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Seunghun Han , Borislav Petkov , Thomas Gleixner , Tony Luck , linux-edac Subject: [PATCH 4.4 20/63] x86/MCE: Serialize sysfs changes Date: Fri, 16 Mar 2018 16:22:52 +0100 Message-Id: <20180316152302.324771621@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152259.964532775@linuxfoundation.org> References: <20180316152259.964532775@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Seunghun Han commit b3b7c4795ccab5be71f080774c45bbbcc75c2aaf upstream. The check_interval file in /sys/devices/system/machinecheck/machinecheck directory is a global timer value for MCE polling. If it is changed by one CPU, mce_restart() broadcasts the event to other CPUs to delete and restart the MCE polling timer and __mcheck_cpu_init_timer() reinitializes the mce_timer variable. If more than one CPU writes a specific value to the check_interval file concurrently, mce_timer is not protected from such concurrent accesses and all kinds of explosions happen. Since only root can write to those sysfs variables, the issue is not a big deal security-wise. However, concurrent writes to these configuration variables is void of reason so the proper thing to do is to serialize the access with a mutex. Boris: - Make store_int_with_restart() use device_store_ulong() to filter out negative intervals - Limit min interval to 1 second - Correct locking - Massage commit message Signed-off-by: Seunghun Han Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: Greg Kroah-Hartman Cc: Tony Luck Cc: linux-edac Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20180302202706.9434-1-kkamagui@gmail.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -60,6 +60,9 @@ static DEFINE_MUTEX(mce_chrdev_read_mute smp_load_acquire(&(p)); \ }) +/* sysfs synchronization */ +static DEFINE_MUTEX(mce_sysfs_mutex); + #define CREATE_TRACE_POINTS #include @@ -2220,6 +2223,7 @@ static ssize_t set_ignore_ce(struct devi if (kstrtou64(buf, 0, &new) < 0) return -EINVAL; + mutex_lock(&mce_sysfs_mutex); if (mca_cfg.ignore_ce ^ !!new) { if (new) { /* disable ce features */ @@ -2232,6 +2236,8 @@ static ssize_t set_ignore_ce(struct devi on_each_cpu(mce_enable_ce, (void *)1, 1); } } + mutex_unlock(&mce_sysfs_mutex); + return size; } @@ -2244,6 +2250,7 @@ static ssize_t set_cmci_disabled(struct if (kstrtou64(buf, 0, &new) < 0) return -EINVAL; + mutex_lock(&mce_sysfs_mutex); if (mca_cfg.cmci_disabled ^ !!new) { if (new) { /* disable cmci */ @@ -2255,6 +2262,8 @@ static ssize_t set_cmci_disabled(struct on_each_cpu(mce_enable_ce, NULL, 1); } } + mutex_unlock(&mce_sysfs_mutex); + return size; } @@ -2262,8 +2271,19 @@ static ssize_t store_int_with_restart(st struct device_attribute *attr, const char *buf, size_t size) { - ssize_t ret = device_store_int(s, attr, buf, size); + unsigned long old_check_interval = check_interval; + ssize_t ret = device_store_ulong(s, attr, buf, size); + + if (check_interval == old_check_interval) + return ret; + + if (check_interval < 1) + check_interval = 1; + + mutex_lock(&mce_sysfs_mutex); mce_restart(); + mutex_unlock(&mce_sysfs_mutex); + return ret; }