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=-14.3 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=ham 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 58687C4741F for ; Wed, 23 Sep 2020 01:44:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18C302395C for ; Wed, 23 Sep 2020 01:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600825476; bh=sKJ2aNeDwCuEE9g0d+S1x9lOgXvmQFx4gzsQjiTZ3jw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0MHa0uZlq27RTv4+2SSY8SuKOP74yHYGKi+t+ggd2FRz5b3WZP8emwFlyxEVizIMI tkIKCVw/pFitEG9aLXvADYSwSz2KH42CUARdm6bnicqcQyrcBLRe1okdq1w9x5ywoU p5REt0TsXmjgWr9nQA9+5q/VCX7aAK0ocEWzwMdE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727114AbgIWBof (ORCPT ); Tue, 22 Sep 2020 21:44:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727184AbgIWBoa (ORCPT ); Tue, 22 Sep 2020 21:44:30 -0400 Received: from mail-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDA35C0613D2 for ; Tue, 22 Sep 2020 18:44:30 -0700 (PDT) Received: by mail-ot1-x341.google.com with SMTP id m13so13011667otl.9 for ; Tue, 22 Sep 2020 18:44:30 -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=PhDUyHqCIu4uPCM+8KRbXSEFJZNF2umKv6lLUi+x/ds=; b=HPWfdKe6qNcrw1ApAb0B0CUBAjNAjj6NMM97LCUGtmtXXcYkhyrr7hoZHlSCJ4mC3V KPliGbHnVv50WGIzDCrpoOIceTjiPsLSrwgSwTQeX3ZkPtRIPHoIEBvZ+xuFLY+gBJkQ ZLJJVsnn1RuXYJSo+S2c7H7DWbLjIWZl1qOEk= 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=PhDUyHqCIu4uPCM+8KRbXSEFJZNF2umKv6lLUi+x/ds=; b=i85miRBb7nku0w4k4FArrKoqDPPhuxWhRoiyKmcJFl1P9w4GGXEN43lEsRl3uJnBoP xt+QJSXvQZNvmvbJ/PbC8kgtAp8T4IVKBWpL+ei3jp4lMpNptkjwWT9coFWb4e0ILhs1 5pKaFo6RQmAnATB4F67DLtkaT7mbd3JltqY2HIOEuAbMqoJ7b8rtyjEIpCa4tjqorNa7 Ql2TVjPKiR+7qbSC8e+SRiAkTu0fkuLPvecZq9CmZwM036Tm26oaINoddUuGNoL7KMpG yxLUoSTbAiaA0aHQUt1dbuCWsnDonaP2sejN31t/x0xawH1ExVTnYZN0r3RLPdO1yegL OwXw== X-Gm-Message-State: AOAM531m4UL35RHmSaRzxIrpK8JF69MXHmrMyWuLWzAX4pw1yRvk11YA UkZA4VvII7ZCtElYWWrNr3uDHw== X-Google-Smtp-Source: ABdhPJxEGDYVJjyieJbBrSKOediUHxJcMw6iJRyoNuLN1WfZJS2DRAnhP8rtYAyeWdJwE5pSI2QoGA== X-Received: by 2002:a9d:d15:: with SMTP id 21mr2948237oti.264.1600825470186; Tue, 22 Sep 2020 18:44:30 -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 y23sm8801820ooj.34.2020.09.22.18.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 18:44:29 -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 Subject: [RFC PATCH 11/11] drivers/edac: convert pci counters to counter_atomic Date: Tue, 22 Sep 2020 19:43:40 -0600 Message-Id: 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-edac@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. Overflow will wrap around and reset the counts as was the case prior to the conversion. 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..2f8a21e56377 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_atomic pe_count; + struct counter_atomic npe_count; }; /* diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c index 53042af7262e..fccec2677907 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_atomic pci_parity_count = COUNTER_ATOMIC_INIT(0); +static struct counter_atomic 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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_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_atomic_inc(&pci->counters.npe_count); if (edac_pci_get_log_npe()) edac_pci_printk(pci, KERN_WARNING, -- 2.25.1