From patchwork Tue Dec 31 09:53:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1216629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47n8l15XzYz9sQp; Tue, 31 Dec 2019 20:53:49 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1imEDf-0002FR-3L; Tue, 31 Dec 2019 09:53:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1imEDb-0002Ew-0e for kernel-team@lists.ubuntu.com; Tue, 31 Dec 2019 09:53:39 +0000 Received: from mail-pg1-f197.google.com ([209.85.215.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1imEDa-0007zf-Jz for kernel-team@lists.ubuntu.com; Tue, 31 Dec 2019 09:53:38 +0000 Received: by mail-pg1-f197.google.com with SMTP id x189so11915274pgd.9 for ; Tue, 31 Dec 2019 01:53:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+qmy0NCiktruxVQLqvfoVxEGcpKooHLU5LBPA28o118=; b=WrO+ORMM+2qhDvbXmG/lNDiCuyI/3uIGHFQzNWP78NbVMOgmTBfc5vduzu+gnxXA5U FJ+u7iPFbo6kkoxOYGHchOBEnFBgVhgHviIWAmj2z691iFgn8ELag+WZEN7JNKgXVJrd bTWBSILpP50B4lQ8+i7U4ypMiELD7xRJtoUkCErkWclLSOyhjY9EqhRuxGc+TRlkR771 eCIR2k8holBEVW8Uj4jXpugCPvD9Wk9wk6i+RBE2QU+xY4ZRe4FvBFzAFHc8QV0EpMnj SO7FHTGs2F6IV7Jo6avUkXJBZlLE+SVAr2Qay0YUzyvyYtWoDVkE8WdcEC6/eVbe3PXh VpaQ== X-Gm-Message-State: APjAAAUA8ak5hB55yFdcrNFg1ma86epk26+zyZUDUMyj8OFUiMkh3VwI ERInGkM5K01fng9VoYa47JxinZTpSF1oV9dXFbljsX5T9PHfDAaAAvOwnqs2PBkatUfDB1ExNS0 bvxP7uTNnXgM4hP8IsIcQmHKTIQ7X9BF/vQ5u7Aw9 X-Received: by 2002:a17:902:247:: with SMTP id 65mr23493835plc.108.1577786016884; Tue, 31 Dec 2019 01:53:36 -0800 (PST) X-Google-Smtp-Source: APXvYqycqaHNpWbl21JQieWc9LVX6/PgsV6xE7Sx6ZGY7Q9w6mlcEfsAP7NcDViHPODJ6AQ4o2PmwA== X-Received: by 2002:a17:902:247:: with SMTP id 65mr23493820plc.108.1577786016491; Tue, 31 Dec 2019 01:53:36 -0800 (PST) Received: from Leggiero.taipei.internal (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id n26sm53961083pgd.46.2019.12.31.01.53.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 01:53:35 -0800 (PST) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [Disco][SRU][PATCH 1/2] RAS/CEC: Increment cec_entered under the mutex lock Date: Tue, 31 Dec 2019 17:53:25 +0800 Message-Id: <20191231095326.15578-2-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191231095326.15578-1-po-hsu.lin@canonical.com> References: <20191231095326.15578-1-po-hsu.lin@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: WANG Chao BugLink: https://bugs.launchpad.net/bugs/1857413 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 (cherry picked from commit 09cbd2197e9291d6a3d3f42873f06ca1f388c1a4) Signed-off-by: Po-Hsu Lin --- 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 5d2b2c02..f5795ad 100644 --- a/drivers/ras/cec.c +++ b/drivers/ras/cec.c @@ -290,10 +290,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));