From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 641FC1DF733 for ; Sun, 19 Jan 2025 16:57:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737305860; cv=none; b=WdnVipFbKEbYDVtP73gsn5Rmq5AHeGjZjcxWYwBtVWx/JcFE0BZDmIfQ2kPrvODsOcJlNnCstQyrTQveKXzQSLaV5vUNTXNa4pOeLSt67LgOb8ipVU9pWfAHyezbtKAxgnM9KUtr37wakEyVCnYBrL7TGhsm6C7JtJbngNuRjy0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737305860; c=relaxed/simple; bh=OXYO0T7rIEvVXR1OPVg2/XaOdqsk7JqB0nHWGkAq3C0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LKLZcwf2RE3dsY7zjh4UCM0w/dO/MAvlMPEDZf0bKPdIMhS1CWHYV0rD/+Q2Z7bk0yJB9B+OJAqvT4J0z4FtElYRI8jra/w27YNshDnH1nCm6qKjw8RDSJrxQOo8xR+8Mfd5asTUneeZp5ecihb2k4e4x7K+zl+uyenevvK7icc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=QytANKqB; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="QytANKqB" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-435f8f29f8aso25582005e9.2 for ; Sun, 19 Jan 2025 08:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737305856; x=1737910656; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=qmmb4zqZ9p+siFdSZXdznAkxBlMcr3SpDaxiDo2SWyU=; b=QytANKqBNlhgeQUeujFznb2OissSo02RNtBCnzCZxx27YQD1qgVOA54c1ckXBlg52o mDxOkRy44Z8/XgLS9EGVHplM+Geljq/TzsFx3nlZm/jwhxNO8Xdatcc6v8Vnol0f37It MPpeEcwPk+wQ2XNUbV1XsMC0qZRDCFr88GA9zNEc5nNf18zzI48cBPz0Uk9BvKntt1l3 pACuYSykRTCEWjvDeHle2pue/ky27x/fpcdp/3B/hoArQ0Wex9Kz3JBtSMtdgvYqsvpV rjGquyAnKyHH90txJXEPm0uFMGQR1qP0IKs9/FXAq3Afget/dL5LlhY09WOUtrfB98Ev IBtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737305856; x=1737910656; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qmmb4zqZ9p+siFdSZXdznAkxBlMcr3SpDaxiDo2SWyU=; b=HwsY2AS4g1ZD2gcE5bjkXi7wiPrU1ZlDBvjjLa2jqfzxjLKQxrpQbG8Nz8BbZB1gBK zRPubvk4MHtAX5RybgBF22wKf5Yh7JmSSUgV9IFPaE6GvJhLGsYqoOMyCgQA8o45UAZZ SKzld8L7ILtGTeDNsjV4y17yjlJnhIHRPcF8QsAJXAULVHZJJNiGa8xl04oUMHtm2KBA 9YRTDpu+AZOWgLFt5W7rcIxhkoJz8fayClzCZxWeQspdaI4LRHRK5f4jvDkZVgJiD/9z EkM+DwyHocKxBWyudrHZ2aYF2ytCdqOlTot3qfj94FT+5gk8HqfS8XqrAAcveECPJ+Ji dH2A== X-Forwarded-Encrypted: i=1; AJvYcCWO5UtIarPTAKRkymoXQ+Sz9f4hk+LErlpRPwUH/qyR7RLT4uycoLSjHz7uMWZNVpseELruDuvZ09k=@vger.kernel.org X-Gm-Message-State: AOJu0Yyryl6W67y2WBq36ZP2BnWx9CXePCb/euNV/RQ47xR93YI5kbGL aAgc1OqhxC0syokm2Y4A58OqyJ6uiFlc+BvZay4Uo6SZeurp9bpbrZeQqnZLX0U= X-Gm-Gg: ASbGncsacvZ6TNEogcQNwXhKpfxZ7gzkyYkCSrx2QwMFdKFVU2P9qAYQQ71uknH6U+m 0QTcGRCWM6YcgZHRRJOPi0PKL+BzmQpA6dTW8+ADbKBjFqOoLNuh18HAPG+t+Wj1ND8W9/KbZ06 692WTQuJBho3HHS4QnWmyuKz2h73HlfbYY1B4d46HL0OcI/7fcjxloB2ZpstH1n5uo7W+S0sOq9 IoZUWeTbtdqk6JuJOSLmnNndBTdyXtdesMbO6v3ygzXGE6KCCtJLYZk1+hT8DoabvXN X-Google-Smtp-Source: AGHT+IFIEiBSMQ4j5lMnpSAdnhTiXrPNymMtDHfM0cHBf/ZM58+IWBa3SM92dBvbDqsFvOWiTieU0Q== X-Received: by 2002:a05:600c:510c:b0:434:a1e7:27b0 with SMTP id 5b1f17b1804b1-438913ccd4amr117549975e9.11.1737305855586; Sun, 19 Jan 2025 08:57:35 -0800 (PST) Received: from linaro.org ([86.123.96.125]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4389041fe29sm107187745e9.22.2025.01.19.08.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 08:57:34 -0800 (PST) Date: Sun, 19 Jan 2025 18:57:32 +0200 From: Abel Vesa To: Tudor Ambarus Cc: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com Subject: Re: [PATCH v2 1/4] soc: qcom: ice: introduce devm_of_qcom_ice_get Message-ID: References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> <20250117-qcom-ice-fix-dev-leak-v2-1-1ffa5b6884cb@linaro.org> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-1-1ffa5b6884cb@linaro.org> On 25-01-17 14:18:50, Tudor Ambarus wrote: > Callers of of_qcom_ice_get() leak the device reference taken by > of_find_device_by_node(). Introduce devm variant for of_qcom_ice_get(). > Existing consumers need the ICE instance for the entire life of their > device, thus exporting qcom_ice_put() is not required. > > Signed-off-by: Tudor Ambarus Good catch. LGTM. Reviewed-by: Abel Vesa > --- > drivers/soc/qcom/ice.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ > include/soc/qcom/ice.h | 2 ++ > 2 files changed, 50 insertions(+) > > diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c > index 393d2d1d275f..79e04bff3e33 100644 > --- a/drivers/soc/qcom/ice.c > +++ b/drivers/soc/qcom/ice.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -324,6 +325,53 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) > } > EXPORT_SYMBOL_GPL(of_qcom_ice_get); > > +static void qcom_ice_put(const struct qcom_ice *ice) > +{ > + struct platform_device *pdev = to_platform_device(ice->dev); > + > + if (!platform_get_resource_byname(pdev, IORESOURCE_MEM, "ice")) > + platform_device_put(pdev); > +} > + > +static void devm_of_qcom_ice_put(struct device *dev, void *res) > +{ > + qcom_ice_put(*(struct qcom_ice **)res); > +} > + > +/** > + * devm_of_qcom_ice_get() - Devres managed helper to get an ICE instance from > + * a DT node. > + * @dev: device pointer for the consumer device. > + * > + * This function will provide an ICE instance either by creating one for the > + * consumer device if its DT node provides the 'ice' reg range and the 'ice' > + * clock (for legacy DT style). On the other hand, if consumer provides a > + * phandle via 'qcom,ice' property to an ICE DT, the ICE instance will already > + * be created and so this function will return that instead. > + * > + * Return: ICE pointer on success, NULL if there is no ICE data provided by the > + * consumer or ERR_PTR() on error. > + */ > +struct qcom_ice *devm_of_qcom_ice_get(struct device *dev) > +{ > + struct qcom_ice *ice, **dr; > + > + dr = devres_alloc(devm_of_qcom_ice_put, sizeof(*dr), GFP_KERNEL); > + if (!dr) > + return ERR_PTR(-ENOMEM); > + > + ice = of_qcom_ice_get(dev); > + if (!IS_ERR_OR_NULL(ice)) { > + *dr = ice; > + devres_add(dev, dr); > + } else { > + devres_free(dr); > + } > + > + return ice; > +} > +EXPORT_SYMBOL_GPL(devm_of_qcom_ice_get); > + > static int qcom_ice_probe(struct platform_device *pdev) > { > struct qcom_ice *engine; > diff --git a/include/soc/qcom/ice.h b/include/soc/qcom/ice.h > index 5870a94599a2..d5f6a228df65 100644 > --- a/include/soc/qcom/ice.h > +++ b/include/soc/qcom/ice.h > @@ -34,4 +34,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, > int slot); > int qcom_ice_evict_key(struct qcom_ice *ice, int slot); > struct qcom_ice *of_qcom_ice_get(struct device *dev); > +struct qcom_ice *devm_of_qcom_ice_get(struct device *dev); > + > #endif /* __QCOM_ICE_H__ */ > > -- > 2.48.0.rc2.279.g1de40edade-goog >