Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1601333 > unrolled thread

[PATCH 1/2] soc: qcom: smsm: Handle probe deferral

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] soc: qcom: smsm: Handle probe deferral Jonathan Neuschäfer <j.neuschaefer@gmx.net> - 2017-03-15 12:50 +0100
    [PATCH 2/2] soc: qcom: smsm: Avoid the use of an uninitialized value Jonathan Neuschäfer <j.neuschaefer@gmx.net> - 2017-03-15 12:50 +0100
    Re: [PATCH 1/2] soc: qcom: smsm: Handle probe deferral Jonathan Neuschäfer <j.neuschaefer@gmx.net> - 2017-03-17 15:10 +0100

#1601333 — [PATCH 1/2] soc: qcom: smsm: Handle probe deferral

If qcom_smem_get or qcom_smem_alloc return -EPROBE_DEFER, let the caller
the caller handle it, instead of treating it as an error.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

---
v1:
- TODO: Reading qcom_smsm_probe, I noticed memory leaks in error paths:
  smsm, smsm->entries, etc. are allocated (with devm_kzalloc), but not
  freed when the function returns early. This should be addressed at
  some point (in a separate patch).
---
 drivers/soc/qcom/smsm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index d0337b2a71c8..3918645e5708 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -439,7 +439,9 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
 	} *info;
 
 	info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
-	if (PTR_ERR(info) == -ENOENT || size != sizeof(*info)) {
+	if (PTR_ERR(info) == -EPROBE_DEFER) {
+		return PTR_ERR(info);
+	} else if (PTR_ERR(info) == -ENOENT || size != sizeof(*info)) {
 		dev_warn(smsm->dev, "no smsm size info, using defaults\n");
 		smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
 		smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
@@ -515,7 +517,9 @@ static int qcom_smsm_probe(struct platform_device *pdev)
 	/* Acquire the main SMSM state vector */
 	ret = qcom_smem_alloc(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SHARED_STATE,
 			      smsm->num_entries * sizeof(u32));
-	if (ret < 0 && ret != -EEXIST) {
+	if (ret == -EPROBE_DEFER) {
+		return ret;
+	} else if (ret < 0 && ret != -EEXIST) {
 		dev_err(&pdev->dev, "unable to allocate shared state entry\n");
 		return ret;
 	}
-- 
2.11.0

[toc] | [next] | [standalone]

#1601337 — [PATCH 2/2] soc: qcom: smsm: Avoid the use of an uninitialized value

If qcom_smem_get returns an error besides -EPROBE_DEFER or -ENOENT,
don't assume that size has been set.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/soc/qcom/smsm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index 3918645e5708..632c060c9cc0 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -441,7 +441,8 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
 	info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
 	if (PTR_ERR(info) == -EPROBE_DEFER) {
 		return PTR_ERR(info);
-	} else if (PTR_ERR(info) == -ENOENT || size != sizeof(*info)) {
+	} else if (PTR_ERR(info) == -ENOENT ||
+			(!IS_ERR(info) && size != sizeof(*info))) {
 		dev_warn(smsm->dev, "no smsm size info, using defaults\n");
 		smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
 		smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1603345

[Multipart message — attachments visible in raw view] — view raw

On Wed, Mar 15, 2017 at 12:43:56PM +0100, Jonathan Neuschäfer wrote:
[...]
> - TODO: Reading qcom_smsm_probe, I noticed memory leaks in error paths:
>   smsm, smsm->entries, etc. are allocated (with devm_kzalloc), but not
>   freed when the function returns early. This should be addressed at
>   some point (in a separate patch).

This is not actually true (see Documentation/driver-model/devres.txt).
Sorry for the noise.


Jonathan Neuschäfer

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web