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=-13.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 CB863C3279D for ; Tue, 6 Oct 2020 20:46:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90F2A20866 for ; Tue, 6 Oct 2020 20:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602017177; bh=rmG96d3vr86mFt/186pvkfkRpXrps+ziN8lgQWQ0DF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Rqv5veLqzebp0V4RxHXFwYefLteWupkBAcO+gtVz9keWDd7AJMgKQ0iGI+3u8GUb8 pPlzvc2lMw7QNPzWo1G6FUzX2BQYh2Xq24UoGR1V4qPUqXPx9EAi+xCPeUiSkExG6p fmrjts8kkh/+JaeYAIsTXwNZafYaOALzktIEIJ1E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727442AbgJFUqP (ORCPT ); Tue, 6 Oct 2020 16:46:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727391AbgJFUqE (ORCPT ); Tue, 6 Oct 2020 16:46:04 -0400 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EA0FC0613D3 for ; Tue, 6 Oct 2020 13:46:04 -0700 (PDT) Received: by mail-il1-x143.google.com with SMTP id t18so89764ilo.12 for ; Tue, 06 Oct 2020 13:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bv+5GiaG/LcuKTT3iu5LLoZTiwRc7KlRllwmZiSrosw=; b=FL8PP2NVW1HIPVO0IhjN7z+q8LP6474DNBoj6mJ2Xe/zmlZ5SBxBZKeP8wTK0EA4m9 RVkR5yD5ZzEOrrZRc1AU6QSUAUlgm0zC1pTD9wl/S/brmd6Bxo3qDwTgPVyF9v5A5Kpr Z2fcw3h193wXNzMBc6N8GeXXP+IXPaNOZ3a+Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bv+5GiaG/LcuKTT3iu5LLoZTiwRc7KlRllwmZiSrosw=; b=hOB31epMKe2+dx/9mNWmO6Yd6qN8b6DOG/lOrlCjdQRR8M2M8x2wUtE62n6K/pQfSK xMUZvUGzrtk4kAT/zUhZxIoDCvI1qMPFKk0dVB47xsYHG2AxU9kgCIyChAPxcUlgE6OV XG7N49ydRhwxbeSOwavuNc47Muwl4zIY0XSo4nhlIPCoziP82NlIJ/+VzPBd59LIGx6C tuQpPw3NW1DvnOXfx3Pr7IVChzyZ+xkOC7+NQWqod3uTE0xDwy4eP9E2MI1G6wCNFYUN YMoZKx3pQ2jE+TU/9nlIRQIjRdSDx6DDEbep1ByaDEXbTN2JeUXDTF1ovunpLR/E/0/1 cvdg== X-Gm-Message-State: AOAM530U/GlmVY5XW/RQCWvtYB6j/Wc7KAglB1xyae2tl5vXpZjbfZ9U sXeEgrAcjlon8UygbmP1C987VA== X-Google-Smtp-Source: ABdhPJy7xF551ziYXOReG4BPUfTRZBAq199bpzKm3MbF/0nJHFcRodAHVwJxtWbsU8uC4/CbzkcL1Q== X-Received: by 2002:a05:6e02:54d:: with SMTP id i13mr4975410ils.219.1602017163833; Tue, 06 Oct 2020 13:46:03 -0700 (PDT) Received: from shuah-t480s.internal (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id s69sm1665627ili.54.2020.10.06.13.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 13:46:03 -0700 (PDT) From: Shuah Khan To: bp@alien8.de, mchehab@kernel.org, tony.luck@intel.com, james.morse@arm.com, rric@kernel.org, gregkh@linuxfoundation.org, keescook@chromium.org Cc: Shuah Khan , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov Subject: [PATCH v2 11/11] drivers/edac: convert pci counters to counter_atomic32 Date: Tue, 6 Oct 2020 14:44:42 -0600 Message-Id: <03dc29c130e6522448a4328b1cfa8fbf7c9a8c97.1602011710.git.skhan@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org counter_atomic* is introduced to be used when a variable is used as a simple counter and doesn't guard object lifetimes. This clearly differentiates atomic_t usages that guard object lifetimes. counter_atomic* variables will wrap around to 0 when it overflows and should not be used to guard resource lifetimes, device usage and open counts that control state changes, and pm states. atomic_t variables used for pci counters keep track of pci parity and non-parity errors. Convert them to use counter_atomic32. Overflow will wrap around and reset the counts as was the case prior to the conversion. Acked-by: Borislav Petkov Signed-off-by: Shuah Khan --- drivers/edac/edac_pci.h | 5 +++-- drivers/edac/edac_pci_sysfs.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/edac/edac_pci.h b/drivers/edac/edac_pci.h index 5175f5724cfa..797b25a6afc0 100644 --- a/drivers/edac/edac_pci.h +++ b/drivers/edac/edac_pci.h @@ -30,12 +30,13 @@ #include #include #include +#include #ifdef CONFIG_PCI struct edac_pci_counter { - atomic_t pe_count; - atomic_t npe_count; + struct counter_atomic32 pe_count; + struct counter_atomic32 npe_count; }; /* diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c index 53042af7262e..d33a726234c0 100644 --- a/drivers/edac/edac_pci_sysfs.c +++ b/drivers/edac/edac_pci_sysfs.c @@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */ static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */ static int edac_pci_poll_msec = 1000; /* one second workq period */ -static atomic_t pci_parity_count = ATOMIC_INIT(0); -static atomic_t pci_nonparity_count = ATOMIC_INIT(0); +static struct counter_atomic32 pci_parity_count = COUNTER_ATOMIC_INIT(0); +static struct counter_atomic32 pci_nonparity_count = COUNTER_ATOMIC_INIT(0); static struct kobject *edac_pci_top_main_kobj; static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0); @@ -58,13 +58,13 @@ int edac_pci_get_poll_msec(void) /**************************** EDAC PCI sysfs instance *******************/ static ssize_t instance_pe_count_show(struct edac_pci_ctl_info *pci, char *data) { - return sprintf(data, "%u\n", atomic_read(&pci->counters.pe_count)); + return sprintf(data, "%u\n", counter_atomic32_read(&pci->counters.pe_count)); } static ssize_t instance_npe_count_show(struct edac_pci_ctl_info *pci, char *data) { - return sprintf(data, "%u\n", atomic_read(&pci->counters.npe_count)); + return sprintf(data, "%u\n", counter_atomic32_read(&pci->counters.npe_count)); } #define to_instance(k) container_of(k, struct edac_pci_ctl_info, kobj) @@ -553,7 +553,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) edac_printk(KERN_CRIT, EDAC_PCI, "Signaled System Error on %s\n", pci_name(dev)); - atomic_inc(&pci_nonparity_count); + counter_atomic32_inc(&pci_nonparity_count); } if (status & (PCI_STATUS_PARITY)) { @@ -561,7 +561,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Master Data Parity Error on %s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + counter_atomic32_inc(&pci_parity_count); } if (status & (PCI_STATUS_DETECTED_PARITY)) { @@ -569,7 +569,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Detected Parity Error on %s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + counter_atomic32_inc(&pci_parity_count); } } @@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " "Signaled System Error on %s\n", pci_name(dev)); - atomic_inc(&pci_nonparity_count); + counter_atomic32_inc(&pci_nonparity_count); } if (status & (PCI_STATUS_PARITY)) { @@ -600,7 +600,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Master Data Parity Error on " "%s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + counter_atomic32_inc(&pci_parity_count); } if (status & (PCI_STATUS_DETECTED_PARITY)) { @@ -608,7 +608,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Detected Parity Error on %s\n", pci_name(dev)); - atomic_inc(&pci_parity_count); + counter_atomic32_inc(&pci_parity_count); } } } @@ -646,7 +646,7 @@ void edac_pci_do_parity_check(void) if (!check_pci_errors) return; - before_count = atomic_read(&pci_parity_count); + before_count = counter_atomic32_read(&pci_parity_count); /* scan all PCI devices looking for a Parity Error on devices and * bridges. @@ -658,7 +658,7 @@ void edac_pci_do_parity_check(void) /* Only if operator has selected panic on PCI Error */ if (edac_pci_get_panic_on_pe()) { /* If the count is different 'after' from 'before' */ - if (before_count != atomic_read(&pci_parity_count)) + if (before_count != counter_atomic32_read(&pci_parity_count)) panic("EDAC: PCI Parity Error"); } } @@ -686,7 +686,7 @@ void edac_pci_handle_pe(struct edac_pci_ctl_info *pci, const char *msg) { /* global PE counter incremented by edac_pci_do_parity_check() */ - atomic_inc(&pci->counters.pe_count); + counter_atomic32_inc(&pci->counters.pe_count); if (edac_pci_get_log_pe()) edac_pci_printk(pci, KERN_WARNING, @@ -711,7 +711,7 @@ void edac_pci_handle_npe(struct edac_pci_ctl_info *pci, const char *msg) { /* global NPE counter incremented by edac_pci_do_parity_check() */ - atomic_inc(&pci->counters.npe_count); + counter_atomic32_inc(&pci->counters.npe_count); if (edac_pci_get_log_npe()) edac_pci_printk(pci, KERN_WARNING, -- 2.25.1