From: Tyrel Datwyler <tyreld@linux.ibm.com>
To: Rob Herring <robh@kernel.org>
Cc: "Clément Léger" <clement.leger@bootlin.com>,
"Nathan Lynch" <nathanl@linux.ibm.com>,
devicetree@vger.kernel.org,
"Ohhoon Kwon" <ohoono.kwon@samsung.com>,
"David Hildenbrand" <david@redhat.com>,
"Steen Hegelund" <steen.hegelund@microchip.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
YueHaibing <yuehaibing@huawei.com>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Paul Mackerras" <paulus@samba.org>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Allan Nielsen" <allan.nielsen@microchip.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Laurent Dufour" <ldufour@linux.ibm.com>,
"Frank Rowand" <frowand.list@gmail.com>,
"Horatiu Vultur" <horatiu.vultur@microchip.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH 1/3] of: dynamic: add of_property_alloc() and of_property_free()
Date: Thu, 2 Jun 2022 11:07:36 -0700 [thread overview]
Message-ID: <eaa1ba60-2e2c-bcc0-5207-41392eada9c7@linux.ibm.com> (raw)
In-Reply-To: <CAL_JsqJ5MN9VGMFiDQx-1dod_=n=6HP4pvizpZ6qbcz89+hyXQ@mail.gmail.com>
On 6/2/22 07:06, Rob Herring wrote:
> On Wed, Jun 1, 2022 at 5:31 PM Tyrel Datwyler <tyreld@linux.ibm.com> wrote:
>>
>> On 5/5/22 12:37, Rob Herring wrote:
>>> On Wed, May 04, 2022 at 05:40:31PM +0200, Clément Léger wrote:
>>>> Add function which allows to dynamically allocate and free properties.
>>>> Use this function internally for all code that used the same logic
>>>> (mainly __of_prop_dup()).
>>>>
>>>> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
>>>> ---
>>>> drivers/of/dynamic.c | 101 ++++++++++++++++++++++++++++++-------------
>>>> include/linux/of.h | 16 +++++++
>>>> 2 files changed, 88 insertions(+), 29 deletions(-)
>>>>
>>>> diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
>>>> index cd3821a6444f..e8700e509d2e 100644
>>>> --- a/drivers/of/dynamic.c
>>>> +++ b/drivers/of/dynamic.c
>>>> @@ -313,9 +313,7 @@ static void property_list_free(struct property *prop_list)
>>>>
>>>> for (prop = prop_list; prop != NULL; prop = next) {
>>>> next = prop->next;
>>>> - kfree(prop->name);
>>>> - kfree(prop->value);
>>>> - kfree(prop);
>>>> + of_property_free(prop);
>>>> }
>>>> }
>>>>
>>>> @@ -367,48 +365,95 @@ void of_node_release(struct kobject *kobj)
>>>> }
>>>>
>>>> /**
>>>> - * __of_prop_dup - Copy a property dynamically.
>>>> - * @prop: Property to copy
>>>> + * of_property_free - Free a property allocated dynamically.
>>>> + * @prop: Property to be freed
>>>> + */
>>>> +void of_property_free(const struct property *prop)
>>>> +{
>>>> + kfree(prop->value);
>>>> + kfree(prop->name);
>>>> + kfree(prop);
>>>> +}
>>>> +EXPORT_SYMBOL(of_property_free);
>>>> +
>>>> +/**
>>>> + * of_property_alloc - Allocate a property dynamically.
>>>> + * @name: Name of the new property
>>>> + * @value: Value that will be copied into the new property value
>>>> + * @value_len: length of @value to be copied into the new property value
>>>> + * @len: Length of new property value, must be greater than @value_len
>>>
>>> What's the usecase for the lengths being different? That doesn't seem
>>> like a common case, so perhaps handle it with a NULL value and
>>> non-zero length. Then the caller has to deal with populating
>>> prop->value.
>>>
>>>> * @allocflags: Allocation flags (typically pass GFP_KERNEL)
>>>> *
>>>> - * Copy a property by dynamically allocating the memory of both the
>>>> + * Create a property by dynamically allocating the memory of both the
>>>> * property structure and the property name & contents. The property's
>>>> * flags have the OF_DYNAMIC bit set so that we can differentiate between
>>>> * dynamically allocated properties and not.
>>>> *
>>>> * Return: The newly allocated property or NULL on out of memory error.
>>>> */
>>>> -struct property *__of_prop_dup(const struct property *prop, gfp_t allocflags)
>>>> +struct property *of_property_alloc(const char *name, const void *value,
>>>> + int value_len, int len, gfp_t allocflags)
>>>> {
>>>> - struct property *new;
>>>> + int alloc_len = len;
>>>> + struct property *prop;
>>>> +
>>>> + if (len < value_len)
>>>> + return NULL;
>>>>
>>>> - new = kzalloc(sizeof(*new), allocflags);
>>>> - if (!new)
>>>> + prop = kzalloc(sizeof(*prop), allocflags);
>>>> + if (!prop)
>>>> return NULL;
>>>>
>>>> + prop->name = kstrdup(name, allocflags);
>>>> + if (!prop->name)
>>>> + goto out_err;
>>>> +
>>>> /*
>>>> - * NOTE: There is no check for zero length value.
>>>> - * In case of a boolean property, this will allocate a value
>>>> - * of zero bytes. We do this to work around the use
>>>> - * of of_get_property() calls on boolean values.
>>>> + * Even if the property has no value, it must be set to a
>>>> + * non-null value since of_get_property() is used to check
>>>> + * some values that might or not have a values (ranges for
>>>> + * instance). Moreover, when the node is released, prop->value
>>>> + * is kfreed so the memory must come from kmalloc.
>>>
>>> Allowing for NULL value didn't turn out well...
>>>
>>> We know that we can do the kfree because OF_DYNAMIC is set IIRC...
>>>
>>> If we do 1 allocation for prop and value, then we can test
>>> for "prop->value == prop + 1" to determine if we need to free or not.
>>
>> If its a single allocation do we even need a test? Doesn't kfree(prop) take care
>> of the property and the trailing memory allocated for the value?
>
> Yes, it does when it's a single alloc, but it's testing for when
> prop->value is not a single allocation because we could have either.
>
Ok, that is the part I was missing. Thanks for the clarification.
-Tyrel
next prev parent reply other threads:[~2022-06-02 18:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 15:40 [PATCH 0/3] of: add of_property_alloc/free() and of_node_alloc/free() Clément Léger
2022-05-04 15:40 ` [PATCH 1/3] of: dynamic: add of_property_alloc() and of_property_free() Clément Léger
[not found] ` <9e470414-67a5-10ce-95eb-f8093fde70d4@csgroup.eu>
2022-05-05 9:47 ` Clément Léger
2022-05-05 17:37 ` Rob Herring
2022-05-06 7:43 ` Clément Léger
2022-05-05 19:37 ` Rob Herring
2022-05-06 7:49 ` Clément Léger
2022-06-01 22:30 ` Tyrel Datwyler
2022-06-02 14:06 ` Rob Herring
2022-06-02 18:07 ` Tyrel Datwyler [this message]
2022-05-04 15:40 ` [PATCH 2/3] of: dynamic: add of_node_alloc() and of_node_free() Clément Léger
2022-05-05 19:43 ` Rob Herring
2022-05-06 10:43 ` Clément Léger
2022-05-09 16:55 ` Rob Herring
2022-05-04 15:40 ` [PATCH 3/3] powerpc/pseries: use of_property_*() and of_node_*() functions Clément Léger
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=eaa1ba60-2e2c-bcc0-5207-41392eada9c7@linux.ibm.com \
--to=tyreld@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=allan.nielsen@microchip.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=clement.leger@bootlin.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=ldufour@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=nathanl@linux.ibm.com \
--cc=ohoono.kwon@samsung.com \
--cc=paulus@samba.org \
--cc=robh@kernel.org \
--cc=steen.hegelund@microchip.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=yuehaibing@huawei.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).