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.8 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 CD62FC433DF for ; Fri, 9 Oct 2020 15:56:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 946B922261 for ; Fri, 9 Oct 2020 15:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602259002; bh=QKQq56wR5oDk6YDKRC5Kbm8udTin2vKWHe2qnqRNOZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O4/OcrF/P/KtN3kCULylXOiMgaV19BOsUIerkdRxoTX5B0xfSpWtaF63I2hKF4qpB +C9ud+VedPOzt+LVuKrwUCWAWilZGxl8hxMacG2ZPWubu5EaKLPc1WXIxd7dSMvA/Z XMQZMAWfxgbgU5eU98hf8olkl7tQ0WGZP71r0M5M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389571AbgJIP4l (ORCPT ); Fri, 9 Oct 2020 11:56:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389516AbgJIP4V (ORCPT ); Fri, 9 Oct 2020 11:56:21 -0400 Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EF5EC0613D2 for ; Fri, 9 Oct 2020 08:56:21 -0700 (PDT) Received: by mail-ot1-x343.google.com with SMTP id e20so8972195otj.11 for ; Fri, 09 Oct 2020 08:56:21 -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=EQZSqb+q2NIMLD8HKWAS71e0EoHQnHuxUDwKhD+3v64=; b=KYQVrIuVamkCl4wmRZvWUGOCYyQ0o7QP/CzWDiMOBfTmLuQChs0A3x+sR//ZHKaZV5 caJDNWB6bvqkG05NEScd8WUxHJ1Jc1ftT73rSMAPLlHDGHnGPrD1pTJJY0wyvjqTcv21 phMFi1lph9tct5FPyx+ElvhnhVpxrmKHGC/ZE= 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=EQZSqb+q2NIMLD8HKWAS71e0EoHQnHuxUDwKhD+3v64=; b=R9XNcJlO3dkvhn8q/1KYth72PxW1vS6Iwxn7YwMQvo+Ppg+0uVHJ4TkWShgczmJg3x lnVtceQGzjohCv+j7Wrl3xOGboEZe3RGclpOGvCeyscDgcSVbUmMdZIGQ6Y7cXyi4jbh wH0kZeItgh/JCAP7eix0/v0Madc9eC+L/isBEPmCnQomoBs4MBcG/xOJLKT8tkhh4RyL vZmKPROFmK+ymxoBSRNQcdTprXfENBqdg+/wW+SHBwqmKMR5cPBevBoAmgOxIrLIpgwC 5G2cBDXJS6V7ctwQmMyBl83+DDNrBBzv4drXvOHGuyc/y3rkUAuLacDzaUfTDHvsBGfm eQrA== X-Gm-Message-State: AOAM533zUOESL/tAyiZ1d5RvjbVv+bP1cRoMY+Y3fc6aSCsgyaU8L/gh wTn/DKaEFL3jznHysuW8s/M2rA== X-Google-Smtp-Source: ABdhPJwJHib5yWqv1BXp+Zzi/VaS24/4Hs+ciZ9vsYRmbFyqT/hLeXP30QrNxqcYTRTfk4/ylankuQ== X-Received: by 2002:a9d:3f06:: with SMTP id m6mr8540816otc.173.1602258980809; Fri, 09 Oct 2020 08:56:20 -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 e7sm7347246oia.9.2020.10.09.08.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 08:56:20 -0700 (PDT) From: Shuah Khan To: minyard@acm.org, arnd@arndb.de, gregkh@linuxfoundation.org, keescook@chromium.org Cc: Shuah Khan , openipmi-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, Corey Minyard Subject: [PATCH v3 09/11] drivers/char/ipmi: convert stats to use counter_atomic32 Date: Fri, 9 Oct 2020 09:56:04 -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-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 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 stats are atomic counters. Overflow will wrap around and reset the stats and no change with the conversion. Convert them to use counter_atomic32. Reviewed-by: Corey Minyard Reviewed-by: Kees Cook Signed-off-by: Shuah Khan --- drivers/char/ipmi/ipmi_msghandler.c | 9 +++++---- drivers/char/ipmi/ipmi_si_intf.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 737c0b6b24ea..36c0b1be22fb 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -34,6 +34,7 @@ #include #include #include +#include #define IPMI_DRIVER_VERSION "39.2" @@ -584,7 +585,7 @@ struct ipmi_smi { struct ipmi_my_addrinfo addrinfo[IPMI_MAX_CHANNELS]; bool channels_ready; - atomic_t stats[IPMI_NUM_STATS]; + struct counter_atomic32 stats[IPMI_NUM_STATS]; /* * run_to_completion duplicate of smb_info, smi_info @@ -630,9 +631,9 @@ static LIST_HEAD(smi_watchers); static DEFINE_MUTEX(smi_watchers_mutex); #define ipmi_inc_stat(intf, stat) \ - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat]) + counter_atomic32_inc(&(intf)->stats[IPMI_STAT_ ## stat]) #define ipmi_get_stat(intf, stat) \ - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat])) + ((unsigned int) counter_atomic32_read(&(intf)->stats[IPMI_STAT_ ## stat])) static const char * const addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI", "ACPI", "SMBIOS", "PCI", @@ -3448,7 +3449,7 @@ int ipmi_add_smi(struct module *owner, INIT_LIST_HEAD(&intf->cmd_rcvrs); init_waitqueue_head(&intf->waitq); for (i = 0; i < IPMI_NUM_STATS; i++) - atomic_set(&intf->stats[i], 0); + counter_atomic32_set(&intf->stats[i], 0); mutex_lock(&ipmi_interfaces_mutex); /* Look for a hole in the numbers. */ diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 77b8d551ae7f..0909a3461f05 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -43,6 +43,7 @@ #include "ipmi_si_sm.h" #include #include +#include /* Measure times between events in the driver. */ #undef DEBUG_TIMING @@ -237,7 +238,7 @@ struct smi_info { bool dev_group_added; /* Counters and things for the proc filesystem. */ - atomic_t stats[SI_NUM_STATS]; + struct counter_atomic32 stats[SI_NUM_STATS]; struct task_struct *thread; @@ -245,9 +246,9 @@ struct smi_info { }; #define smi_inc_stat(smi, stat) \ - atomic_inc(&(smi)->stats[SI_STAT_ ## stat]) + counter_atomic32_inc(&(smi)->stats[SI_STAT_ ## stat]) #define smi_get_stat(smi, stat) \ - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat])) + ((unsigned int) counter_atomic32_read(&(smi)->stats[SI_STAT_ ## stat])) #define IPMI_MAX_INTFS 4 static int force_kipmid[IPMI_MAX_INTFS]; @@ -2013,7 +2014,7 @@ static int try_smi_init(struct smi_info *new_smi) atomic_set(&new_smi->req_events, 0); new_smi->run_to_completion = false; for (i = 0; i < SI_NUM_STATS; i++) - atomic_set(&new_smi->stats[i], 0); + counter_atomic32_set(&new_smi->stats[i], 0); new_smi->interrupt_disabled = true; atomic_set(&new_smi->need_watch, 0); -- 2.25.1