From patchwork Tue Nov 10 19:53:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 11895261 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 907ED1391 for ; Tue, 10 Nov 2020 19:55:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6426D20809 for ; Tue, 10 Nov 2020 19:55:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="flV6IdZG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731608AbgKJTzQ (ORCPT ); Tue, 10 Nov 2020 14:55:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731795AbgKJTym (ORCPT ); Tue, 10 Nov 2020 14:54:42 -0500 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42BC1C0613D3 for ; Tue, 10 Nov 2020 11:54:42 -0800 (PST) Received: by mail-io1-xd42.google.com with SMTP id j12so15617804iow.0 for ; Tue, 10 Nov 2020 11:54:42 -0800 (PST) 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=xWxbIjIf+vWKJo79DR0sywcSwRmgT7ZEf6uLSBEfNR0=; b=flV6IdZGFhQPLx7ZwnwS7uioxSxosm+o02QJQzMYIRIOd3L/HEbKJhIg4eskEe2KZQ hdXsuzLFGPpQqhP8Fn6fVE8mdgGRgoBfBHcfCgeNz1qdEj6G1bz82tNvfPK377Wgksyo xYkWpbFuekomYgRPo+XmX6B0xcNKwomwlw+lc= 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=xWxbIjIf+vWKJo79DR0sywcSwRmgT7ZEf6uLSBEfNR0=; b=t/ez7W36mrv7FGN0Fd4Nyh9OVDfWl/NAP15Dv+KgD8g0HvLiCTkKHujoTZ1So2ImrV Q61NdoZNYIXiM4HTyMESeIM0UBdqXG6LspP16GSgMQmG1q5opvcoDQXh7XzDuBgXcFWj 1kLNXHx0GGd8VS3t4YJT5Bk0AvLLhXeP9b7DHPlNKglHX6VmCJ9DqZdaWZsqKOLeMMZc XrPcd2BhlN5cYUDGloAlME/zmCWozb86BaJ/fxgkHUpLs12WJtfdJWqhzbbnhUSidZ6x jwuaLyXs7zzZQkHRMxITgDj6imYUV+Cm3HgdLzFiEy9QTxvAkikHbhD16db/+wV1v9U/ lAeQ== X-Gm-Message-State: AOAM531XLYhjASJAdxYYDVPTozKwRmIYA2vbpmVvaFk1xRBSvSD9BWGs iP0kptkYdEktzJCKKTzMUbAHxw== X-Google-Smtp-Source: ABdhPJy5fAdT9pZhgE3p9mue05R+UCcS/j9Sl3yD1PHrqSbJ9zD7VYHobfbBG7GUvO/yoscgh1G8XQ== X-Received: by 2002:a6b:3c10:: with SMTP id k16mr16048505iob.209.1605038081698; Tue, 10 Nov 2020 11:54:41 -0800 (PST) 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 o14sm123971ilg.71.2020.11.10.11.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:54:41 -0800 (PST) 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, peterz@infradead.org Cc: Shuah Khan , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/13] drivers/edac: convert pci counters to seqnum_ops Date: Tue, 10 Nov 2020 12:53:33 -0700 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org seqnum_ops api is introduced to be used when a variable is used as a sequence/stat counter and doesn't guard object lifetimes. This clearly differentiates atomic_t usages that guard object lifetimes. seqnum32 variables wrap around to INT_MIN 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 seqnum_ops. 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..33b33e62c37f 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 seqnum32 pe_count; + struct seqnum32 npe_count; }; /* diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c index 53042af7262e..96f950fb39b0 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 seqnum32 pci_parity_count = SEQNUM_INIT(0); +static struct seqnum32 pci_nonparity_count = SEQNUM_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", seqnum32_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", seqnum32_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); + seqnum32_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); + seqnum32_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); + seqnum32_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); + seqnum32_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); + seqnum32_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); + seqnum32_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 = seqnum32_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 != seqnum32_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); + seqnum32_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); + seqnum32_inc(&pci->counters.npe_count); if (edac_pci_get_log_npe()) edac_pci_printk(pci, KERN_WARNING,