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,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 2666DC55ABD for ; Tue, 10 Nov 2020 19:55:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4D4F206E3 for ; Tue, 10 Nov 2020 19:55:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VOwVQkMa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732008AbgKJTzC (ORCPT ); Tue, 10 Nov 2020 14:55:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731711AbgKJTyv (ORCPT ); Tue, 10 Nov 2020 14:54:51 -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 E0772C0613D4 for ; Tue, 10 Nov 2020 11:54:50 -0800 (PST) Received: by mail-io1-xd42.google.com with SMTP id r12so15598695iot.4 for ; Tue, 10 Nov 2020 11:54:50 -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=xTKuC7gZQNS77KmJ7VNzzgNSnao5Q0E26RN9NxbyMxw=; b=VOwVQkMaw/lCmPWCMsWEI6ZADPL6i01TnjtIRlgEZzx94jwj6jsMZOqnw4YuaYilYV W31FCYWWgBXL5uMHmEeVzoMckg2AqgGx4qu6aRt5EtBuX/1LWCH0vQyZCiAk1FK0qX1u HLt4VyYFTvaGMtrPbtGHqTavsa97UOISZXAHE= 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=xTKuC7gZQNS77KmJ7VNzzgNSnao5Q0E26RN9NxbyMxw=; b=ejyHjq1zr0OusJkNQYanZE+Lg8fBEitdKFEC3EWKITSPlUUQ+I8ktzAJT2LvvRT+F0 aEIrrAjTbFEMRQ4EwZZekYV0yJ/wNikNnVY50X/dDNol781JujJ/prr5zM3cB8D6IECZ Rg1Ymfs+HSO9ZmA6Px54IfUnfLmQI6wc8G1JL5YcQakF9XBHM7HL0CvvBXutBobcOj41 kaJigC7PNoWHaEbRMiVOyJcUWVKW/j2878znsX9ZFwJVqeQ2FeMQCljZmuhvCugsKrrR 5QKb5fHvN0H96uL7DA4chqnV12AHUf+XLtW2I678B/2gH3qKx1/v8nqNWjSXY2OqnCVc 8p9g== X-Gm-Message-State: AOAM531uOxKqtbpck3I2W2wSCp+yh9v/wMhkWQKe6iC1cWZ4S0kwTZWL /RW3EarCTPnob3WSvE6v22fXfw== X-Google-Smtp-Source: ABdhPJyHNOyow41LnhkXLPULiUgFR9/L/j0V6ZPdNQdqQYkX2JvaR4O3pMIt00+dq2tAHnFxgvU8EQ== X-Received: by 2002:a6b:7947:: with SMTP id j7mr15464767iop.143.1605038090309; Tue, 10 Nov 2020 11:54:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:54:49 -0800 (PST) From: Shuah Khan To: david.kershner@unisys.com, gregkh@linuxfoundation.org, keescook@chromium.org, peterz@infradead.org Cc: Shuah Khan , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/13] drivers/staging/unisys/visorhba: convert stats to use seqnum_ops Date: Tue, 10 Nov 2020 12:53:38 -0700 Message-Id: <6fb679d23de785bbd1be6a528127e29f8ee6abd7.1605027593.git.skhan@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 error_count and ios_threshold are atomic counters and guarded by max. values. No change to the behavior with this change. Signed-off-by: Shuah Khan --- .../staging/unisys/visorhba/visorhba_main.c | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 7ae5306b92fe..3209958b8aaa 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -41,8 +42,8 @@ MODULE_ALIAS("visorbus:" VISOR_VHBA_CHANNEL_GUID_STR); struct visordisk_info { struct scsi_device *sdev; u32 valid; - atomic_t ios_threshold; - atomic_t error_count; + struct seqnum32 ios_threshold; + struct seqnum32 error_count; struct visordisk_info *next; }; @@ -374,10 +375,10 @@ static int visorhba_abort_handler(struct scsi_cmnd *scsicmd) scsidev = scsicmd->device; vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) - atomic_inc(&vdisk->error_count); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) + seqnum32_inc(&vdisk->error_count); else - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); rtn = forward_taskmgmt_command(TASK_MGMT_ABORT_TASK, scsidev); if (rtn == SUCCESS) { scsicmd->result = DID_ABORT << 16; @@ -401,10 +402,10 @@ static int visorhba_device_reset_handler(struct scsi_cmnd *scsicmd) scsidev = scsicmd->device; vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) - atomic_inc(&vdisk->error_count); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) + seqnum32_inc(&vdisk->error_count); else - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); rtn = forward_taskmgmt_command(TASK_MGMT_LUN_RESET, scsidev); if (rtn == SUCCESS) { scsicmd->result = DID_RESET << 16; @@ -429,10 +430,10 @@ static int visorhba_bus_reset_handler(struct scsi_cmnd *scsicmd) scsidev = scsicmd->device; shost_for_each_device(scsidev, scsidev->host) { vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) - atomic_inc(&vdisk->error_count); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) + seqnum32_inc(&vdisk->error_count); else - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); } rtn = forward_taskmgmt_command(TASK_MGMT_BUS_RESET, scsidev); if (rtn == SUCCESS) { @@ -803,9 +804,9 @@ static void do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, return; /* Okay see what our error_count is here.... */ vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) { - atomic_inc(&vdisk->error_count); - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) { + seqnum32_inc(&vdisk->error_count); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); } } @@ -881,10 +882,10 @@ static void do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, kfree(buf); } else { vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->ios_threshold) > 0) { - atomic_dec(&vdisk->ios_threshold); - if (atomic_read(&vdisk->ios_threshold) == 0) - atomic_set(&vdisk->error_count, 0); + if (seqnum32_read(&vdisk->ios_threshold) > 0) { + seqnum32_dec(&vdisk->ios_threshold); + if (seqnum32_read(&vdisk->ios_threshold) == 0) + seqnum32_set(&vdisk->error_count, 0); } } } -- 2.27.0 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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 A1F06C388F7 for ; Tue, 10 Nov 2020 19:55:00 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CC17206D8 for ; Tue, 10 Nov 2020 19:54:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VOwVQkMa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CC17206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1FDD485AE4; Tue, 10 Nov 2020 19:54:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JEtMpCas7OBG; Tue, 10 Nov 2020 19:54:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6CDC185BB8; Tue, 10 Nov 2020 19:54:56 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C3E3B1BF30A for ; Tue, 10 Nov 2020 19:54:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7AAEE22EC9 for ; Tue, 10 Nov 2020 19:54:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G6cnImXAUUEz for ; Tue, 10 Nov 2020 19:54:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by silver.osuosl.org (Postfix) with ESMTPS id E7D2C203C4 for ; Tue, 10 Nov 2020 19:54:50 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id n129so15594334iod.5 for ; Tue, 10 Nov 2020 11:54:50 -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=xTKuC7gZQNS77KmJ7VNzzgNSnao5Q0E26RN9NxbyMxw=; b=VOwVQkMaw/lCmPWCMsWEI6ZADPL6i01TnjtIRlgEZzx94jwj6jsMZOqnw4YuaYilYV W31FCYWWgBXL5uMHmEeVzoMckg2AqgGx4qu6aRt5EtBuX/1LWCH0vQyZCiAk1FK0qX1u HLt4VyYFTvaGMtrPbtGHqTavsa97UOISZXAHE= 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=xTKuC7gZQNS77KmJ7VNzzgNSnao5Q0E26RN9NxbyMxw=; b=OR39AZoc6rvOLmOpBrLVjJxU9lYcmp47xH3xhSSS97XR90W2WwWH68kkpvHM7+j81T 6SuFGi+Oo48+F2g7f6RsJ5QQzVKTxZUEFmJwS7c4Z8nNqwycs5AIqgHF8En5J0DJnqfW PlYIwjkpiDASd4VGmxbHKTCg99CZvbIYlpNghBFB4GKb6jTXZEO+ZXj0C/MxM/hrfFlU Y3QCYW+ZlO9mfV4y4iNMisUDSM6CEqwZROkhf8QceDGNqIc4Sgu8odM4Gm6B6o5PrtBj 5uuNt5ZLE/qgzPXP8EWYfPLo3dcmN9X6v4GpmgOn35GKQWlKry+Y7Vb0/phcQEaltZVp wuUQ== X-Gm-Message-State: AOAM530jMRv3w1bMZNgK2zeye+NNWA34GOSEi9qDNRjLEZC6BLiPY7Lo 3Auwen9yHCXAqsrrjR7ZuMrO+Q== X-Google-Smtp-Source: ABdhPJyHNOyow41LnhkXLPULiUgFR9/L/j0V6ZPdNQdqQYkX2JvaR4O3pMIt00+dq2tAHnFxgvU8EQ== X-Received: by 2002:a6b:7947:: with SMTP id j7mr15464767iop.143.1605038090309; Tue, 10 Nov 2020 11:54:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:54:49 -0800 (PST) From: Shuah Khan To: david.kershner@unisys.com, gregkh@linuxfoundation.org, keescook@chromium.org, peterz@infradead.org Subject: [PATCH 12/13] drivers/staging/unisys/visorhba: convert stats to use seqnum_ops Date: Tue, 10 Nov 2020 12:53:38 -0700 Message-Id: <6fb679d23de785bbd1be6a528127e29f8ee6abd7.1605027593.git.skhan@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Shuah Khan Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" 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 error_count and ios_threshold are atomic counters and guarded by max. values. No change to the behavior with this change. Signed-off-by: Shuah Khan --- .../staging/unisys/visorhba/visorhba_main.c | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 7ae5306b92fe..3209958b8aaa 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -41,8 +42,8 @@ MODULE_ALIAS("visorbus:" VISOR_VHBA_CHANNEL_GUID_STR); struct visordisk_info { struct scsi_device *sdev; u32 valid; - atomic_t ios_threshold; - atomic_t error_count; + struct seqnum32 ios_threshold; + struct seqnum32 error_count; struct visordisk_info *next; }; @@ -374,10 +375,10 @@ static int visorhba_abort_handler(struct scsi_cmnd *scsicmd) scsidev = scsicmd->device; vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) - atomic_inc(&vdisk->error_count); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) + seqnum32_inc(&vdisk->error_count); else - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); rtn = forward_taskmgmt_command(TASK_MGMT_ABORT_TASK, scsidev); if (rtn == SUCCESS) { scsicmd->result = DID_ABORT << 16; @@ -401,10 +402,10 @@ static int visorhba_device_reset_handler(struct scsi_cmnd *scsicmd) scsidev = scsicmd->device; vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) - atomic_inc(&vdisk->error_count); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) + seqnum32_inc(&vdisk->error_count); else - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); rtn = forward_taskmgmt_command(TASK_MGMT_LUN_RESET, scsidev); if (rtn == SUCCESS) { scsicmd->result = DID_RESET << 16; @@ -429,10 +430,10 @@ static int visorhba_bus_reset_handler(struct scsi_cmnd *scsicmd) scsidev = scsicmd->device; shost_for_each_device(scsidev, scsidev->host) { vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) - atomic_inc(&vdisk->error_count); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) + seqnum32_inc(&vdisk->error_count); else - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); } rtn = forward_taskmgmt_command(TASK_MGMT_BUS_RESET, scsidev); if (rtn == SUCCESS) { @@ -803,9 +804,9 @@ static void do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, return; /* Okay see what our error_count is here.... */ vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) { - atomic_inc(&vdisk->error_count); - atomic_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); + if (seqnum32_read(&vdisk->error_count) < VISORHBA_ERROR_COUNT) { + seqnum32_inc(&vdisk->error_count); + seqnum32_set(&vdisk->ios_threshold, IOS_ERROR_THRESHOLD); } } @@ -881,10 +882,10 @@ static void do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, kfree(buf); } else { vdisk = scsidev->hostdata; - if (atomic_read(&vdisk->ios_threshold) > 0) { - atomic_dec(&vdisk->ios_threshold); - if (atomic_read(&vdisk->ios_threshold) == 0) - atomic_set(&vdisk->error_count, 0); + if (seqnum32_read(&vdisk->ios_threshold) > 0) { + seqnum32_dec(&vdisk->ios_threshold); + if (seqnum32_read(&vdisk->ios_threshold) == 0) + seqnum32_set(&vdisk->error_count, 0); } } } -- 2.27.0 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel