From patchwork Mon Mar 8 08:14:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12121741 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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 EAF4CC433E0 for ; Mon, 8 Mar 2021 08:15:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E4516513A for ; Mon, 8 Mar 2021 08:15:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbhCHIPK (ORCPT ); Mon, 8 Mar 2021 03:15:10 -0500 Received: from mail-lj1-f182.google.com ([209.85.208.182]:38289 "EHLO mail-lj1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231156AbhCHIOi (ORCPT ); Mon, 8 Mar 2021 03:14:38 -0500 Received: by mail-lj1-f182.google.com with SMTP id 2so14948324ljr.5; Mon, 08 Mar 2021 00:14:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BsY7YkuLSTkyifbDrF2JneCtTyzv1UBxYFrackx4xR8=; b=YTiiDJY12idIvV5K6HY8/qDaqt67/BybdmHTXpQgax2SEqMPgIYBEjsM5BvUy+rf7d FEZehutzb1rRmBuJCOstWUU9S6qTQBihhpJRqAyFoAf/7C6q40rxAS2EOA09Fy5HE9pW hcXOHtxvnA2ne3vD4PWmcKlxXkKnBtcxdaZ9nCRLy/Ax657orZDbRXzz3qU2Rot7+cam 9eVX6iJ9EjgN2fPx1dsotdMK8ZhGvizqOoMiaOxyvo+WwDbSlwVA9kj5vQZyCalKnXAe DVm0ajKsW/cKydlO3WP0OA0YkOyIDfiWVbuQVeToVXpz7lWfct8qtorIK0EpjCtEki0q DeBg== X-Gm-Message-State: AOAM532IG3DKq2+gZBD4/UvzhEU/gcOpUbKm1vjZfLSLpT4pCur5GsgH Qza8gyjTxwGODuCHK0GDRT4= X-Google-Smtp-Source: ABdhPJy4xumvg0xGCoOKqEE8DnfFdePx7FGRoHfszIvelo6PtIuYKRw2B90h39CtVR+4XQkHZwtqzQ== X-Received: by 2002:a2e:2f0c:: with SMTP id v12mr12577254ljv.367.1615191276436; Mon, 08 Mar 2021 00:14:36 -0800 (PST) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id d3sm1271836lfq.249.2021.03.08.00.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 00:14:36 -0800 (PST) Date: Mon, 8 Mar 2021 10:14:29 +0200 From: Matti Vaittinen To: matti.vaittinen@fi.rohmeurope.com, mazziesaccount@gmail.com Cc: MyungJoo Ham , Chanwoo Choi , Andy Gross , Bjorn Andersson , Jean Delvare , Guenter Roeck , Hans de Goede , Mark Gross , Sebastian Reichel , Chen-Yu Tsai , Liam Girdwood , Mark Brown , Wim Van Sebroeck , Matti Vaittinen , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-hwmon@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC PATCH v2 1/8] workqueue: Add resource managed version of delayed work init Message-ID: <2ff44816b72a43f715d58552d2fadc1470e167d0.1615187284.git.matti.vaittinen@fi.rohmeurope.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org A few drivers which need a delayed work-queue must cancel work at driver detach. Some of those implement remove() solely for this purpose. Help drivers to avoid unnecessary remove and error-branch implementation by adding managed verision of delayed work initialization. This will also help drivers to avoid mixing manual and devm based unwinding when other resources are handled by devm. Signed-off-by: Matti Vaittinen --- include/linux/devm-helpers.h | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 include/linux/devm-helpers.h diff --git a/include/linux/devm-helpers.h b/include/linux/devm-helpers.h new file mode 100644 index 000000000000..f64e0c9f3763 --- /dev/null +++ b/include/linux/devm-helpers.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __LINUX_DEVM_HELPERS_H +#define __LINUX_DEVM_HELPERS_H + +/* + * Functions which do automatically cancel operations or release resources upon + * driver detach. + * + * These should be helpful to avoid mixing the manual and devm-based resource + * management which can be source of annoying, rarely occurring, + * hard-to-reproduce bugs. + * + * Please take into account that devm based cancellation may be performed some + * time after the remove() is ran. + * + * Thus mixing devm and manual resource management can easily cause problems + * when unwinding operations with dependencies. IRQ scheduling a work in a queue + * is typical example where IRQs are often devm-managed and WQs are manually + * cleaned at remove(). If IRQs are not manually freed at remove() (and this is + * often the case when we use devm for IRQs) we have a period of time after + * remove() - and before devm managed IRQs are freed - where new IRQ may fire + * and schedule a work item which won't be cancelled because remove() was + * already ran. + */ + +#include +#include + +static inline void devm_delayed_work_drop(void *res) +{ + cancel_delayed_work_sync(res); +} + +/** + * devm_delayed_work_autocancel - Resource-managed work allocation + * @dev: Device which lifetime work is bound to + * @pdata: work to be cancelled when driver is detached + * + * Initialize work which is automatically cancelled when driver is detached. + * A few drivers need delayed work which must be cancelled before driver + * is detached to avoid accessing removed resources. + * devm_delayed_work_autocancel() can be used to omit the explicit + * cancelleation when driver is detached. + */ +static inline int devm_delayed_work_autocancel(struct device *dev, + struct delayed_work *w, + work_func_t worker) +{ + INIT_DELAYED_WORK(w, worker); + return devm_add_action(dev, devm_delayed_work_drop, w); +} + +#endif From patchwork Mon Mar 8 08:14:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12121743 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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 102EAC43332 for ; Mon, 8 Mar 2021 08:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9FFA650BB for ; Mon, 8 Mar 2021 08:15:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231709AbhCHIPL (ORCPT ); Mon, 8 Mar 2021 03:15:11 -0500 Received: from mail-lf1-f50.google.com ([209.85.167.50]:37876 "EHLO mail-lf1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230432AbhCHIOz (ORCPT ); Mon, 8 Mar 2021 03:14:55 -0500 Received: by mail-lf1-f50.google.com with SMTP id n16so19647839lfb.4; Mon, 08 Mar 2021 00:14:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=lCgeptqSMyKzW16UNWHWlgRoMtG+0iEIlO7nDP/oAFQ=; b=PgxP9QJTKXP2ulLWZptsVxtY0m3WwYNdWmAdiJcepCb9IdHIfHARTOduy1n6r4qcjL P2aEuvez+BVM1Tua/cLSHSTx0cZpwP1vMm/L8PaAiPDrMSyCyACwoEnxIS2+q7D9VfQx fASsIvwGeA8tygnpDm3b6LM8Od2Bic9tdPVf6ltbWfcMdo+1qNS4ri99NZV2UL5gz4Mb nyWMsq06wpmSXLBEJRyvTHK+vvYs6/nOfVkcGZmwKualjiR1VXAcR9sVNoZSP913nFXM mcwibVd5ZrFiUScIvPXIDg/wb26XiI/dZyBInEjbU2a3EzSF3H3YTxdR9rwS8n70r+DT Z5Ng== X-Gm-Message-State: AOAM530PxgvNLmnTBPhGkZYr1UWP/R3gJU9xtaag1Go5OhNe0FSpTD3n EoLXE5lU1WYbl56TDd3q7uU= X-Google-Smtp-Source: ABdhPJxQR6J2M4jgCmS7cRIRCbb+O5S1AbJyi70ot4XILJuJUhaUfi87OLkijIb5wu0ckRZOrq68+g== X-Received: by 2002:a19:ed8:: with SMTP id 207mr13196925lfo.164.1615191293579; Mon, 08 Mar 2021 00:14:53 -0800 (PST) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id z4sm1261722lfd.172.2021.03.08.00.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 00:14:53 -0800 (PST) Date: Mon, 8 Mar 2021 10:14:46 +0200 From: Matti Vaittinen To: matti.vaittinen@fi.rohmeurope.com, mazziesaccount@gmail.com Cc: MyungJoo Ham , Chanwoo Choi , Andy Gross , Bjorn Andersson , Jean Delvare , Guenter Roeck , Hans de Goede , Mark Gross , Sebastian Reichel , Chen-Yu Tsai , Liam Girdwood , Mark Brown , Wim Van Sebroeck , Matti Vaittinen , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-hwmon@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC PATCH v2 2/8] MAINTAINERS: Add entry for devm helpers Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Devm helper header containing small inline helpers was added. Hans promised to maintain it. Add Hans as maintainer and myself as designated reviewer. Signed-off-by: Matti Vaittinen --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d92f85ca831d..ffcb00006e14 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5169,6 +5169,12 @@ M: Torben Mathiasen S: Maintained W: http://lanana.org/docs/device-list/index.html +DEVICE RESOURCE MANAGEMENT HELPERS +M: Hans de Goede +R: Matti Vaittinen +S: Maintained +F: include/linux/devm-helpers.h + DEVICE-MAPPER (LVM) M: Alasdair Kergon M: Mike Snitzer From patchwork Mon Mar 8 08:43:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12121779 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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D2B5CC433E0 for ; Mon, 8 Mar 2021 08:44:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9667B600EF for ; Mon, 8 Mar 2021 08:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231573AbhCHIni (ORCPT ); Mon, 8 Mar 2021 03:43:38 -0500 Received: from mail-lf1-f53.google.com ([209.85.167.53]:43458 "EHLO mail-lf1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231629AbhCHInY (ORCPT ); Mon, 8 Mar 2021 03:43:24 -0500 Received: by mail-lf1-f53.google.com with SMTP id d3so19681630lfg.10; Mon, 08 Mar 2021 00:43:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ufjH8UXytToswCfYagSqIAjTWmllgUhOGrl0yZoSiKw=; b=XXkHb6+WCWfwJb9A8v/lO1MJONztlKuzPJ73RFM0StzHis5VjVT3S9Vo235Z1imX3R NLOYYNLVkvkBmvZDPWh12B2k2QOzx81GsGaD1FBL3G/4+iDTcxhJbPccGqoLF8flwN7W HtI5fUZBU3nZSlBUItJ1EuEpT1y4391ywnl55vNXBA5hjJefqGMv3UjYrttaGcrLI7gy oQdvx60gbr/sqYgiv0b2gLOpyI85s+Eld9ynmMmhQ7tKesnMdewzSDzEKYo1R2QOqnC1 cQaSVhTQt8QNHa5mnNo2cH/NF3ve/yjHItTC9rUal6ASmWBcCf9GJwhhPlLvm0c2jhNb 5+9g== X-Gm-Message-State: AOAM532Oorn8yxh3F+8V5xlEWEGtdhucys5C0DLcjwo4NCq1vbs57jNk c3rnWlzLUT8faU85T+MzGlw= X-Google-Smtp-Source: ABdhPJzsooBoCEMkMrGt+rNFS5VhSKpxeb3jqdVpf1Dfmq0VCuxcNAnJstSaPcK1ooyoRTGLkZn1qg== X-Received: by 2002:a05:6512:405:: with SMTP id u5mr13229589lfk.574.1615193003216; Mon, 08 Mar 2021 00:43:23 -0800 (PST) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id f26sm1275775lfe.118.2021.03.08.00.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 00:43:22 -0800 (PST) Date: Mon, 8 Mar 2021 10:43:16 +0200 From: Matti Vaittinen To: matti.vaittinen@fi.rohmeurope.com, mazziesaccount@gmail.com Cc: Guenter Roeck , Hans de Goede , Wim Van Sebroeck , Matti Vaittinen , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC PATCH v2 8/8] watchdog: retu_wdt: Clean-up by using managed work init Message-ID: <8c1a5a62490b6a3d165784ce9ad07b9ab6e13e53.1615187284.git.matti.vaittinen@fi.rohmeurope.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Few drivers implement remove call-back only for ensuring a delayed work gets cancelled prior driver removal. Clean-up these by switching to use devm_delayed_work_autocancel() instead. This change is compile-tested only. All testing is appreciated. Signed-off-by: Matti Vaittinen --- drivers/watchdog/retu_wdt.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c index 258dfcf9cbda..2b9017e1cd91 100644 --- a/drivers/watchdog/retu_wdt.c +++ b/drivers/watchdog/retu_wdt.c @@ -8,6 +8,7 @@ * Rewritten by Aaro Koskinen. */ +#include #include #include #include @@ -127,9 +128,12 @@ static int retu_wdt_probe(struct platform_device *pdev) wdev->rdev = rdev; wdev->dev = &pdev->dev; - INIT_DELAYED_WORK(&wdev->ping_work, retu_wdt_ping_work); + ret = devm_delayed_work_autocancel(&pdev->dev, &wdev->ping_work, + retu_wdt_ping_work); + if (ret) + return ret; - ret = watchdog_register_device(retu_wdt); + ret = devm_watchdog_register_device(&pdev->dev, retu_wdt); if (ret < 0) return ret; @@ -138,25 +142,11 @@ static int retu_wdt_probe(struct platform_device *pdev) else retu_wdt_ping_enable(wdev); - platform_set_drvdata(pdev, retu_wdt); - - return 0; -} - -static int retu_wdt_remove(struct platform_device *pdev) -{ - struct watchdog_device *wdog = platform_get_drvdata(pdev); - struct retu_wdt_dev *wdev = watchdog_get_drvdata(wdog); - - watchdog_unregister_device(wdog); - cancel_delayed_work_sync(&wdev->ping_work); - return 0; } static struct platform_driver retu_wdt_driver = { .probe = retu_wdt_probe, - .remove = retu_wdt_remove, .driver = { .name = "retu-wdt", },