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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 D9DACC4320A for ; Mon, 9 Aug 2021 03:32:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBA0761019 for ; Mon, 9 Aug 2021 03:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232894AbhHIDdO (ORCPT ); Sun, 8 Aug 2021 23:33:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232861AbhHIDdL (ORCPT ); Sun, 8 Aug 2021 23:33:11 -0400 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6890FC061757; Sun, 8 Aug 2021 20:32:51 -0700 (PDT) Received: by mail-oi1-x22e.google.com with SMTP id w6so21734420oiv.11; Sun, 08 Aug 2021 20:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OX+fGhBFKu5FC8W1LaNx83ZClAd+GqNacmx+NCQZpPI=; b=WCC40AOnAGPJCaly+0XFVIQEEX64WmZgZhhQF5zRUV4r4HOd8anG3DBtybTrc7soJe tGoCQUJTuST/3+LB8ERWMX41+GufyjY5NIgQAhP/BZqvyzELNQ098BPqituW4QSQq/FH ba+s+ygjJ/OfjWLGzE86crAdG56hD6CDqqFMRYOLLnVKmQWSTJbRJx9OWaZFv0QYNTQd qTssijziug4kor5ryPvtorh5aLHZnjZCON27lHp7zHcHhxsyDYsOPjsXoMD8eDQGoWmU GhmFz3/wN1XECvJTvjkp+D7xG0614KsXnhfui935r7yY3ksjGn2+I98ZG+Pf11Dg9qLu n1jQ== 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=OX+fGhBFKu5FC8W1LaNx83ZClAd+GqNacmx+NCQZpPI=; b=LrW+cH5Eeopi0Cx75GDz7JRyWltCGl2F263kA/CmmF0CdQg3Z/rYXXycXSiooiRcJl 2SgAJTH2C8mT6HZhr/jeQ/+kCQ6FerFFqq4/MhPCSVymf2OcY48TnidNzMTZaKF/uqob 5NfxlE12BMTIK3kE75ukqgs6f8EOE2FpOq+VSYfUWIQPfAqvu2zFjxboYkZGKILeKqSc G3Zg6NtMsXY38mqizOvEp4CbLEe7hCEvDMT5+prtsV5cglomcY7QdHswrXAKTCiqP89f QiRQek+Y61kYGJG2jvP5n4tcENJAhrNWwCCvtIzVS9DRYC1H39MgHhjTQyi5zM8HZbXo RyGQ== X-Gm-Message-State: AOAM530fW/AlCX3nKVy2S6NjL1gLulgRRN6PirlT1Wu6eacX+Xw79lIR NcbYrEc08yp9Qc+jLube5lCPyiosDjL6SPew X-Google-Smtp-Source: ABdhPJxsUg7gwG7M3FvrqmDHa42XuVGQE62q8ZQUKn9I3VhNuZ7da2cDoNa5fykXMIwI1js9pyQSsQ== X-Received: by 2002:aca:b757:: with SMTP id h84mr4870760oif.77.1628479970869; Sun, 08 Aug 2021 20:32:50 -0700 (PDT) Received: from ian.penurio.us ([47.184.51.90]) by smtp.gmail.com with ESMTPSA id r7sm1463646oij.14.2021.08.08.20.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Aug 2021 20:32:50 -0700 (PDT) From: Ian Pilcher To: linux-block@vger.kernel.org, linux-leds@vger.kernel.org Cc: axboe@kernel.dk, pavel@ucw.cz, linux-kernel@vger.kernel.org, kernelnewbies@kernelnewbies.org Subject: [RFC PATCH v2 04/10] block: Add functions to set & clear block device LEDs Date: Sun, 8 Aug 2021 22:32:11 -0500 Message-Id: <20210809033217.1113444-5-arequipeno@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210809033217.1113444-1-arequipeno@gmail.com> References: <20210809033217.1113444-1-arequipeno@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Create a symlink from /sys/class/leds//block_devices to each block device that is associated with that LED Ensure device LED is cleared when device is removed Signed-off-by: Ian Pilcher --- block/blk-ledtrig.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-ledtrig.h | 3 ++ block/genhd.c | 1 + 3 files changed, 97 insertions(+) diff --git a/block/blk-ledtrig.c b/block/blk-ledtrig.c index c5ad57ed9c3b..280fa9edc2dd 100644 --- a/block/blk-ledtrig.c +++ b/block/blk-ledtrig.c @@ -6,9 +6,13 @@ * Copyright 2021 Ian Pilcher */ +#include #include #include +#include "blk-ledtrig.h" + + /* * * Trigger mutex and LED list @@ -46,3 +50,92 @@ static struct blk_ledtrig_led *blk_ledtrig_find(const char *const led_name, return NULL; } + + +/* + * + * Clear a block device's LED + * + */ + +// Also called from blk_ledtrig_dev_set() +static void blk_ledtrig_dev_cleanup(struct gendisk *const disk, + struct blk_ledtrig_led *const old_led) +{ + sysfs_remove_link(old_led->dir, disk->disk_name); + list_del(&disk->led_dev_list_node); +} + +// Also called from blk_ledtrig_deactivate() +static void blk_ledtrig_dev_clear_locked(struct gendisk *const disk, + struct blk_ledtrig_led *const old_led) +{ + RCU_INIT_POINTER(disk->led, NULL); + if (old_led != NULL) + blk_ledtrig_dev_cleanup(disk, old_led); +} + +// Also called from genhd.c:del_gendisk() +void blk_ledtrig_dev_clear(struct gendisk *const disk) +{ + struct blk_ledtrig_led *old_led; + + mutex_lock(&blk_ledtrig_mutex); + old_led = rcu_dereference_protected(disk->led, + lockdep_is_held(&blk_ledtrig_mutex)); + blk_ledtrig_dev_clear_locked(disk, old_led); + mutex_unlock(&blk_ledtrig_mutex); +} + + +/* + * + * Set a block device's LED + * + */ + +static int blk_ledtrig_dev_set(struct gendisk *const disk, + const char *const led_name, + const size_t name_len) +{ + struct blk_ledtrig_led *new_led, *old_led; + int ret; + + ret = mutex_lock_interruptible(&blk_ledtrig_mutex); + if (ret != 0) + goto led_set_exit_return; + + new_led = blk_ledtrig_find(led_name, name_len); + if (new_led == NULL) { + pr_info("no LED named %.*s associated with blkdev trigger\n", + (int)name_len, led_name); + ret = -ENODEV; + goto led_set_exit_unlock; + } + + old_led = rcu_dereference_protected(disk->led, + lockdep_is_held(&blk_ledtrig_mutex)); + + if (old_led == new_led) { + ret = 0; + goto led_set_exit_unlock; + } + + ret = sysfs_create_link(new_led->dir, &disk_to_dev(disk)->kobj, + disk->disk_name); + if (ret != 0) + goto led_set_exit_unlock; + + if (old_led != NULL) + blk_ledtrig_dev_cleanup(disk, old_led); + + rcu_assign_pointer(disk->led, new_led); + list_add(&disk->led_dev_list_node, &new_led->dev_list); + + ret = 0; + +led_set_exit_unlock: + mutex_unlock(&blk_ledtrig_mutex); +led_set_exit_return: + return ret; +} diff --git a/block/blk-ledtrig.h b/block/blk-ledtrig.h index 95a79d2fe447..66a1302a4174 100644 --- a/block/blk-ledtrig.h +++ b/block/blk-ledtrig.h @@ -16,9 +16,12 @@ static inline void blk_ledtrig_disk_init(struct gendisk *const disk) RCU_INIT_POINTER(disk->led, NULL); } +void blk_ledtrig_dev_clear(struct gendisk *const disk); + #else // CONFIG_BLK_LED_TRIGGERS static inline void blk_ledtrig_disk_init(const struct gendisk *disk) {} +static inline void blk_ledtrig_dev_clear(const struct gendisk *disk) {} #endif // CONFIG_BLK_LED_TRIGGERS diff --git a/block/genhd.c b/block/genhd.c index b168172e664b..9fa734aeab0f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -583,6 +583,7 @@ void del_gendisk(struct gendisk *disk) if (WARN_ON_ONCE(!disk->queue)) return; + blk_ledtrig_dev_clear(disk); blk_integrity_del(disk); disk_del_events(disk); -- 2.31.1 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 2DA78C4338F for ; Mon, 9 Aug 2021 03:35:42 +0000 (UTC) Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) (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 C1D6E60F38 for ; Mon, 9 Aug 2021 03:35:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C1D6E60F38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kernelnewbies.org Received: from localhost ([::1] helo=shelob.surriel.com) by shelob.surriel.com with esmtp (Exim 4.94.2) (envelope-from ) id 1mCw4b-0007wy-8Q; Sun, 08 Aug 2021 23:35:33 -0400 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by shelob.surriel.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1mCw1z-0003bc-GY for kernelnewbies@kernelnewbies.org; Sun, 08 Aug 2021 23:32:51 -0400 Received: by mail-oi1-x22e.google.com with SMTP id s13so12448431oie.10 for ; Sun, 08 Aug 2021 20:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OX+fGhBFKu5FC8W1LaNx83ZClAd+GqNacmx+NCQZpPI=; b=WCC40AOnAGPJCaly+0XFVIQEEX64WmZgZhhQF5zRUV4r4HOd8anG3DBtybTrc7soJe tGoCQUJTuST/3+LB8ERWMX41+GufyjY5NIgQAhP/BZqvyzELNQ098BPqituW4QSQq/FH ba+s+ygjJ/OfjWLGzE86crAdG56hD6CDqqFMRYOLLnVKmQWSTJbRJx9OWaZFv0QYNTQd qTssijziug4kor5ryPvtorh5aLHZnjZCON27lHp7zHcHhxsyDYsOPjsXoMD8eDQGoWmU GhmFz3/wN1XECvJTvjkp+D7xG0614KsXnhfui935r7yY3ksjGn2+I98ZG+Pf11Dg9qLu n1jQ== 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=OX+fGhBFKu5FC8W1LaNx83ZClAd+GqNacmx+NCQZpPI=; b=Xct71ZOvveEJ7kHpgPIPz9KwQ0s+E0aeb+iQ3RDl83IlWTy2Rkby7VXbpe/RIWywiD IMWZ6q36hOmYrgWz5DO2KdFfm3jbbZ4pZ5gqOWflETnbB0oR9KKxlsZb6q5Zwwvog5WJ IiNvlqQw6NqmZLbf6SdJ3Ngd8id+5VOtIioHoy2UdyULjRsJ9nGDj1Y/jgc3zFmVgOko L/LlF3+cGKub6dGr0T7VHlx4wIyArre27emehyoB3tMZBxsp120cQ4GQHDloXyngNMNT cNWCCTzsiLg1g++WcEJyEEiyRVCci/88VJ+McBVH6bAU0KHgr50dMt6KL0fGNe4RF9m/ EjEw== X-Gm-Message-State: AOAM5337X3LlPyjSzW+SPrl7fdlic4CN/6JxLk7hYI8iBCxrCXnUwMqF Eb+gHrv3+yNjVRUgRLVdoKgjMYNTUNavym/J X-Google-Smtp-Source: ABdhPJxsUg7gwG7M3FvrqmDHa42XuVGQE62q8ZQUKn9I3VhNuZ7da2cDoNa5fykXMIwI1js9pyQSsQ== X-Received: by 2002:aca:b757:: with SMTP id h84mr4870760oif.77.1628479970869; Sun, 08 Aug 2021 20:32:50 -0700 (PDT) Received: from ian.penurio.us ([47.184.51.90]) by smtp.gmail.com with ESMTPSA id r7sm1463646oij.14.2021.08.08.20.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Aug 2021 20:32:50 -0700 (PDT) From: Ian Pilcher To: linux-block@vger.kernel.org, linux-leds@vger.kernel.org Subject: [RFC PATCH v2 04/10] block: Add functions to set & clear block device LEDs Date: Sun, 8 Aug 2021 22:32:11 -0500 Message-Id: <20210809033217.1113444-5-arequipeno@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210809033217.1113444-1-arequipeno@gmail.com> References: <20210809033217.1113444-1-arequipeno@gmail.com> MIME-Version: 1.0 Cc: axboe@kernel.dk, linux-kernel@vger.kernel.org, pavel@ucw.cz, kernelnewbies@kernelnewbies.org X-BeenThere: kernelnewbies@kernelnewbies.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Learn about the Linux kernel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kernelnewbies-bounces@kernelnewbies.org Create a symlink from /sys/class/leds//block_devices to each block device that is associated with that LED Ensure device LED is cleared when device is removed Signed-off-by: Ian Pilcher --- block/blk-ledtrig.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-ledtrig.h | 3 ++ block/genhd.c | 1 + 3 files changed, 97 insertions(+) diff --git a/block/blk-ledtrig.c b/block/blk-ledtrig.c index c5ad57ed9c3b..280fa9edc2dd 100644 --- a/block/blk-ledtrig.c +++ b/block/blk-ledtrig.c @@ -6,9 +6,13 @@ * Copyright 2021 Ian Pilcher */ +#include #include #include +#include "blk-ledtrig.h" + + /* * * Trigger mutex and LED list @@ -46,3 +50,92 @@ static struct blk_ledtrig_led *blk_ledtrig_find(const char *const led_name, return NULL; } + + +/* + * + * Clear a block device's LED + * + */ + +// Also called from blk_ledtrig_dev_set() +static void blk_ledtrig_dev_cleanup(struct gendisk *const disk, + struct blk_ledtrig_led *const old_led) +{ + sysfs_remove_link(old_led->dir, disk->disk_name); + list_del(&disk->led_dev_list_node); +} + +// Also called from blk_ledtrig_deactivate() +static void blk_ledtrig_dev_clear_locked(struct gendisk *const disk, + struct blk_ledtrig_led *const old_led) +{ + RCU_INIT_POINTER(disk->led, NULL); + if (old_led != NULL) + blk_ledtrig_dev_cleanup(disk, old_led); +} + +// Also called from genhd.c:del_gendisk() +void blk_ledtrig_dev_clear(struct gendisk *const disk) +{ + struct blk_ledtrig_led *old_led; + + mutex_lock(&blk_ledtrig_mutex); + old_led = rcu_dereference_protected(disk->led, + lockdep_is_held(&blk_ledtrig_mutex)); + blk_ledtrig_dev_clear_locked(disk, old_led); + mutex_unlock(&blk_ledtrig_mutex); +} + + +/* + * + * Set a block device's LED + * + */ + +static int blk_ledtrig_dev_set(struct gendisk *const disk, + const char *const led_name, + const size_t name_len) +{ + struct blk_ledtrig_led *new_led, *old_led; + int ret; + + ret = mutex_lock_interruptible(&blk_ledtrig_mutex); + if (ret != 0) + goto led_set_exit_return; + + new_led = blk_ledtrig_find(led_name, name_len); + if (new_led == NULL) { + pr_info("no LED named %.*s associated with blkdev trigger\n", + (int)name_len, led_name); + ret = -ENODEV; + goto led_set_exit_unlock; + } + + old_led = rcu_dereference_protected(disk->led, + lockdep_is_held(&blk_ledtrig_mutex)); + + if (old_led == new_led) { + ret = 0; + goto led_set_exit_unlock; + } + + ret = sysfs_create_link(new_led->dir, &disk_to_dev(disk)->kobj, + disk->disk_name); + if (ret != 0) + goto led_set_exit_unlock; + + if (old_led != NULL) + blk_ledtrig_dev_cleanup(disk, old_led); + + rcu_assign_pointer(disk->led, new_led); + list_add(&disk->led_dev_list_node, &new_led->dev_list); + + ret = 0; + +led_set_exit_unlock: + mutex_unlock(&blk_ledtrig_mutex); +led_set_exit_return: + return ret; +} diff --git a/block/blk-ledtrig.h b/block/blk-ledtrig.h index 95a79d2fe447..66a1302a4174 100644 --- a/block/blk-ledtrig.h +++ b/block/blk-ledtrig.h @@ -16,9 +16,12 @@ static inline void blk_ledtrig_disk_init(struct gendisk *const disk) RCU_INIT_POINTER(disk->led, NULL); } +void blk_ledtrig_dev_clear(struct gendisk *const disk); + #else // CONFIG_BLK_LED_TRIGGERS static inline void blk_ledtrig_disk_init(const struct gendisk *disk) {} +static inline void blk_ledtrig_dev_clear(const struct gendisk *disk) {} #endif // CONFIG_BLK_LED_TRIGGERS diff --git a/block/genhd.c b/block/genhd.c index b168172e664b..9fa734aeab0f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -583,6 +583,7 @@ void del_gendisk(struct gendisk *disk) if (WARN_ON_ONCE(!disk->queue)) return; + blk_ledtrig_dev_clear(disk); blk_integrity_del(disk); disk_del_events(disk); -- 2.31.1 _______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies