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: [tip:ras/core] RAS/CEC: Increment cec_entered under the mutex lock From: tip-bot for Borislav Petkov Message-Id: Date: Sat, 20 Apr 2019 03:22:03 -0700 To: linux-tip-commits@vger.kernel.org Cc: tglx@linutronix.de, mingo@kernel.org, tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, chao.wang@ucloud.cn, hpa@zytor.com, bp@suse.de List-ID: Q29tbWl0LUlEOiAgMDljYmQyMTk3ZTkyOTFkNmEzZDNmNDI4NzNmMDZjYTFmMzg4YzFhNApHaXR3 ZWI6ICAgICBodHRwczovL2dpdC5rZXJuZWwub3JnL3RpcC8wOWNiZDIxOTdlOTI5MWQ2YTNkM2Y0 Mjg3M2YwNmNhMWYzODhjMWE0CkF1dGhvcjogICAgIFdBTkcgQ2hhbyA8Y2hhby53YW5nQHVjbG91 ZC5jbj4KQXV0aG9yRGF0ZTogVGh1LCAxOCBBcHIgMjAxOSAwMzo0MToxNCArMDAwMApDb21taXR0 ZXI6ICBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNvbW1pdERhdGU6IFNhdCwgMjAgQXBy IDIwMTkgMTI6MTY6NTIgKzAyMDAKClJBUy9DRUM6IEluY3JlbWVudCBjZWNfZW50ZXJlZCB1bmRl ciB0aGUgbXV0ZXggbG9jawoKTW9kaWZ5IC0+Y2VjX2VudGVyZWQgaW4gdGhlIGNyaXRpY2FsIHNl Y3Rpb24gb2YgdGhlIG11dGV4LgoKU2lnbmVkLW9mZi1ieTogV0FORyBDaGFvIDxjaGFvLndhbmdA dWNsb3VkLmNuPgpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNj OiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5jb20+CkNjOiBsaW51eC1lZGFjIDxsaW51eC1l ZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0cHM6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE5 MDQxODAzNDExNS43NTk1NC0yLWNoYW8ud2FuZ0B1Y2xvdWQuY24KLS0tCiBkcml2ZXJzL3Jhcy9j ZWMuYyB8IDQgKystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3Jhcy9jZWMuYyBiL2RyaXZlcnMvcmFzL2NlYy5j CmluZGV4IDJkOWVjMzc4YThiYy4uODhlNGYzZmYwY2I4IDEwMDY0NAotLS0gYS9kcml2ZXJzL3Jh cy9jZWMuYworKysgYi9kcml2ZXJzL3Jhcy9jZWMuYwpAQCAtMjg2LDEwICsyODYsMTAgQEAgaW50 IGNlY19hZGRfZWxlbSh1NjQgcGZuKQogCWlmICghY2VfYXJyLmFycmF5IHx8IGNlX2Fyci5kaXNh YmxlZCkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKLQljYS0+Y2VzX2VudGVyZWQrKzsKLQogCW11dGV4 X2xvY2soJmNlX211dGV4KTsKIAorCWNhLT5jZXNfZW50ZXJlZCsrOworCiAJaWYgKGNhLT5uID09 IE1BWF9FTEVNUykKIAkJV0FSTl9PTighZGVsX2xydV9lbGVtX3VubG9ja2VkKGNhKSk7CiAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAC63C282E2 for ; Sat, 20 Apr 2019 10:27:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8483E2183F for ; Sat, 20 Apr 2019 10:27:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="WQnhJ0rQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726251AbfDTK1W (ORCPT ); Sat, 20 Apr 2019 06:27:22 -0400 Received: from terminus.zytor.com ([198.137.202.136]:57935 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbfDTK1V (ORCPT ); Sat, 20 Apr 2019 06:27:21 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x3KAM4ht685109 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 20 Apr 2019 03:22:04 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 terminus.zytor.com x3KAM4ht685109 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2019041745; t=1555755725; bh=uDgvLofMZlbsAdT4mzJGmcMQunBDeqaTtSvXsT1dPiU=; h=Date:From:Cc:Reply-To:In-Reply-To:References:To:Subject:From; b=WQnhJ0rQVAz37oh3qsp51p8WWIN4l6+XECONzOUumFQO2VC9XIvgkLzk0MwY55HJL 2pEAih/4RzSDT+AW1zjYxcZHdc3UyYWoNE8i/ypD7/pTvpBTfpTe/R/vnC6U4vCQLC zY0GS9BX6v/kIX0FZug1IkwlXzrVm2Zm8GvbGVR3ReYaUTRObMd3BA5xfeg6+nms2A h6ynJtHnC3gTE7ovl+KpywrdhyLVrXDfg7C6G0aOk5/92Db6ZUW+Oeu7vmCsL5Bx4R d9REY2tmrhMV2vEYPzjueRVGka2hdRdXR0/HygwhIzm27e7BRcsG16UG3aOEKhVgyJ 2xQkYHkCuoTeQ== Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x3KAM3ds685106; Sat, 20 Apr 2019 03:22:03 -0700 Date: Sat, 20 Apr 2019 03:22:03 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for WANG Chao Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, chao.wang@ucloud.cn, hpa@zytor.com, bp@suse.de Reply-To: tony.luck@intel.com, linux-edac@vger.kernel.org, chao.wang@ucloud.cn, bp@suse.de, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20190418034115.75954-2-chao.wang@ucloud.cn> References: <20190418034115.75954-2-chao.wang@ucloud.cn> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] RAS/CEC: Increment cec_entered under the mutex lock Git-Commit-ID: 09cbd2197e9291d6a3d3f42873f06ca1f388c1a4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Message-ID: <20190420102203.73kzq1fVkI_NPsYJrAVpKh2_dwf3Aa9l1Caw39YXNvY@z> Commit-ID: 09cbd2197e9291d6a3d3f42873f06ca1f388c1a4 Gitweb: https://git.kernel.org/tip/09cbd2197e9291d6a3d3f42873f06ca1f388c1a4 Author: WANG Chao AuthorDate: Thu, 18 Apr 2019 03:41:14 +0000 Committer: Borislav Petkov CommitDate: Sat, 20 Apr 2019 12:16:52 +0200 RAS/CEC: Increment cec_entered under the mutex lock Modify ->cec_entered in the critical section of the mutex. Signed-off-by: WANG Chao Signed-off-by: Borislav Petkov Cc: Tony Luck Cc: linux-edac Link: https://lkml.kernel.org/r/20190418034115.75954-2-chao.wang@ucloud.cn --- drivers/ras/cec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c index 2d9ec378a8bc..88e4f3ff0cb8 100644 --- a/drivers/ras/cec.c +++ b/drivers/ras/cec.c @@ -286,10 +286,10 @@ int cec_add_elem(u64 pfn) if (!ce_arr.array || ce_arr.disabled) return -ENODEV; - ca->ces_entered++; - mutex_lock(&ce_mutex); + ca->ces_entered++; + if (ca->n == MAX_ELEMS) WARN_ON(!del_lru_elem_unlocked(ca));