linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robherring2@gmail.com>
To: Grant Likely <grant.likely@linaro.org>
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Rob Herring <robh+dt@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jakub Sitnicki <jsitnicki@gmail.com>,
	Vivek Goyal <vgoyal@redhat.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Jiang Liu <jiang.liu@linux.intel.com>,
	Mike Travis <travis@sgi.com>, Thierry Reding <treding@nvidia.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [PATCH v5 2/4] base/platform: Continue on insert_resource() error
Date: Thu, 4 Jun 2015 17:07:52 -0500	[thread overview]
Message-ID: <CAL_JsqLWddtdKpuJpep5g291X+rKXuu-rq1SXX5JCAD8YRpq7g@mail.gmail.com> (raw)
In-Reply-To: <20150604075425.BC0E7C406CA@trevor.secretlab.ca>

On Thu, Jun 4, 2015 at 2:54 AM, Grant Likely <grant.likely@linaro.org> wrote:
> On Tue, 26 May 2015 09:31:24 +0200
> , Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>  wrote:
>> insert_resource() can fail when the resource added  overlaps
>> (partially or fully) with another.
>>
>> Device tree and AMBA devices may contain resources that overlap, so they
>> could not call platform_device_add (see 02bbde7849e6 ('Revert "of:
>> use platform_device_add"'))"
>>
>> On the other hand, device trees are released using
>> platform_device_unregister(). This function calls platform_device_del(),
>> which calls release_resource(), that crashes when the resource has not
>> been added with with insert_resource. This was not an issue when the
>> device tree could not be modified online, but this is not the case
>> anymore.
>>
>> This patch let the flow continue when there is an insert error, after
>> notifying the user with a dev_err(). r->parent is set to NULL, so
>> platform_device_del() knows that the resource was not added, and
>> therefore it should not be released.
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> ---
>>  drivers/base/platform.c | 26 +++++++++++++++-----------
>>  1 file changed, 15 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
>> index 46a56f694cec..5a29387e5ff6 100644
>> --- a/drivers/base/platform.c
>> +++ b/drivers/base/platform.c
>> @@ -332,7 +332,7 @@ int platform_device_add(struct platform_device *pdev)
>>                */
>>               ret = ida_simple_get(&platform_devid_ida, 0, 0, GFP_KERNEL);
>>               if (ret < 0)
>> -                     goto err_out;
>> +                     return ret;
>>               pdev->id = ret;
>>               pdev->id_auto = true;
>>               dev_set_name(&pdev->dev, "%s.%d.auto", pdev->name, pdev->id);
>> @@ -340,7 +340,7 @@ int platform_device_add(struct platform_device *pdev)
>>       }
>>
>>       for (i = 0; i < pdev->num_resources; i++) {
>> -             struct resource *p, *r = &pdev->resource[i];
>> +             struct resource *conflict, *p, *r = &pdev->resource[i];
>>               unsigned long type = resource_type(r);
>>
>>               if (r->name == NULL)
>> @@ -357,11 +357,14 @@ int platform_device_add(struct platform_device *pdev)
>>                               p = &ioport_resource;
>>               }
>>
>> -             if (insert_resource(p, r)) {
>> -                     dev_err(&pdev->dev, "failed to claim resource %d\n", i);
>> -                     ret = -EBUSY;
>> -                     goto failed;
>> -             }
>> +             conflict = insert_resource_conflict(p, r);
>> +             if (!conflict)
>> +                     continue;
>> +
>> +             dev_err(&pdev->dev,
>> +                     "ignoring resource %pR (conflicts with %s %pR)\n",
>> +                     r, conflict->name, conflict);
>> +             p->parent = NULL;
>
> I'm pretty sure this is going to break some platforms. I described it in
> my earlier email today, but I'll summarize here too since this is the
> latest patch set.
>
> Making this change allows the registration of devices to continue, but
> it will still break device drivers that do a request_resource() on a
> region that another device managed to claim with insert_resource(). The
> only way around this is to not do insert_resource() at all, or to remove
> the request_resource() from all drivers (not feasible).

Do we have some clue as to which platforms have problems? I seem to
recall some i.MX platform.

> I think we have to deal with it by making resource insertion optional.
> I'd like to make the default be to do the insertion, and be able to
> blacklist platforms that have issues.

Yes, otherwise we'll never put this issue to bed.

Rob

  parent reply	other threads:[~2015-06-04 22:08 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26  7:31 [PATCH v5 0/4] Fix null pointer deference when calling of_platform_depopulate Ricardo Ribalda Delgado
2015-05-26  7:31 ` [PATCH v5 1/4] base/platform: Only insert MEM and IO resources Ricardo Ribalda Delgado
2015-05-26  7:31 ` [PATCH v5 2/4] base/platform: Continue on insert_resource() error Ricardo Ribalda Delgado
2015-06-04  7:54   ` Grant Likely
2015-06-04  8:47     ` Ricardo Ribalda Delgado
2015-06-04 22:07     ` Rob Herring [this message]
2015-05-26  7:31 ` [PATCH v5 3/4] of/platform: Use platform_device interface Ricardo Ribalda Delgado
2015-05-26  7:31 ` [PATCH v5 4/4] base/platform: Remove code duplication Ricardo Ribalda Delgado

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAL_JsqLWddtdKpuJpep5g291X+rKXuu-rq1SXX5JCAD8YRpq7g@mail.gmail.com \
    --to=robherring2@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jiang.liu@linux.intel.com \
    --cc=jsitnicki@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ricardo.ribalda@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=travis@sgi.com \
    --cc=treding@nvidia.com \
    --cc=vgoyal@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).