From patchwork Wed May 4 15:40:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 1626522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=JjZy8Xex; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ktp8j6Z61z9sFx for ; Thu, 5 May 2022 06:19:49 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Ktp8j5hT0z3cKV for ; Thu, 5 May 2022 06:19:49 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=JjZy8Xex; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=bootlin.com (client-ip=2001:4b98:dc4:8::240; helo=mslow1.mail.gandi.net; envelope-from=clement.leger@bootlin.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=JjZy8Xex; dkim-atps=neutral X-Greylist: delayed 516 seconds by postgrey-1.36 at boromir; Thu, 05 May 2022 01:50:46 AEST Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [IPv6:2001:4b98:dc4:8::240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KthBG5JgTz3bbn for ; Thu, 5 May 2022 01:50:46 +1000 (AEST) Received: from relay2-d.mail.gandi.net (unknown [217.70.183.194]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 67BE7C96AC for ; Wed, 4 May 2022 15:42:14 +0000 (UTC) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id D8BE24000A; Wed, 4 May 2022 15:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1651678923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dFR/cZ65JwgdZVMkvZg/YmpG/iKhVh2sQRCQhIxlsQ8=; b=JjZy8XexHUA1gZsjew6jPWKrCNwK+Wpk/oxw1b4dKvOZ3XH49/AaSdrJM1HDYBGbQHrxlx 049C6weABksmUtq83S/O3EIZ8SuIjbg0zSjt/IF7e0KeHQ3EuXQnpHxKZv5b1ICQeMlgcq jnNOnfweQxYickQYtr9G+Elffmdr4yKIwT0ef/t7CQMtf5hTgIU8y99qXReksommTUHcFh 48nvQimX1PbdDHsbYSoBCwCiLbJWGv4h3xdsTSsuPDhP536EHbQ36hSOegS1tjuHa1O5Rf aEHcf7rvt6li44WPVNk1jtHARsjpQbugQZYeJuQOSNTdOwB0b85sJIWSPu2UTQ== From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Rob Herring , Frank Rowand , Nathan Lynch , Laurent Dufour , Daniel Henrique Barboza , David Gibson , Andrew Morton , David Hildenbrand , Ohhoon Kwon , "Aneesh Kumar K.V" , YueHaibing Subject: [PATCH 1/3] of: dynamic: add of_property_alloc() and of_property_free() Date: Wed, 4 May 2022 17:40:31 +0200 Message-Id: <20220504154033.750511-2-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220504154033.750511-1-clement.leger@bootlin.com> References: <20220504154033.750511-1-clement.leger@bootlin.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 05 May 2022 06:17:57 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Steen Hegelund , linux-kernel@vger.kernel.org, Allan Nielsen , Thomas Petazzoni , linuxppc-dev@lists.ozlabs.org, Horatiu Vultur Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- 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 * @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. */ - new->name = kstrdup(prop->name, allocflags); - new->value = kmemdup(prop->value, prop->length, allocflags); - new->length = prop->length; - if (!new->name || !new->value) - goto err_free; + if (!alloc_len) + alloc_len = 1; - /* mark the property as dynamic */ - of_property_set_flag(new, OF_DYNAMIC); + prop->value = kzalloc(alloc_len, allocflags); + if (!prop->value) + goto out_err; - return new; + if (value) + memcpy(prop->value, value, value_len); + + prop->length = len; + of_property_set_flag(prop, OF_DYNAMIC); + + return prop; + +out_err: + of_property_free(prop); - err_free: - kfree(new->name); - kfree(new->value); - kfree(new); return NULL; } +EXPORT_SYMBOL(of_property_alloc); + +/** + * __of_prop_dup - Copy a property dynamically. + * @prop: Property to copy + * @allocflags: Allocation flags (typically pass GFP_KERNEL) + * + * Copy 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) +{ + return of_property_alloc(prop->name, prop->value, prop->length, + prop->length, allocflags); +} /** * __of_node_dup() - Duplicate or create an empty device node dynamically. @@ -447,9 +492,7 @@ struct device_node *__of_node_dup(const struct device_node *np, if (!new_pp) goto err_prop; if (__of_add_property(node, new_pp)) { - kfree(new_pp->name); - kfree(new_pp->value); - kfree(new_pp); + of_property_free(new_pp); goto err_prop; } } diff --git a/include/linux/of.h b/include/linux/of.h index 04971e85fbc9..6b345eb71c19 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1463,6 +1463,11 @@ enum of_reconfig_change { }; #ifdef CONFIG_OF_DYNAMIC +extern struct property *of_property_alloc(const char *name, const void *value, + int value_len, int len, + gfp_t allocflags); +extern void of_property_free(const struct property *prop); + extern int of_reconfig_notifier_register(struct notifier_block *); extern int of_reconfig_notifier_unregister(struct notifier_block *); extern int of_reconfig_notify(unsigned long, struct of_reconfig_data *rd); @@ -1507,6 +1512,17 @@ static inline int of_changeset_update_property(struct of_changeset *ocs, return of_changeset_action(ocs, OF_RECONFIG_UPDATE_PROPERTY, np, prop); } #else /* CONFIG_OF_DYNAMIC */ + +static inline struct property *of_property_alloc(const char *name, + const void *value, + int value_len, int len, + gfp_t allocflags) +{ + return NULL; +} + +static inline void of_property_free(const struct property *prop) {} + static inline int of_reconfig_notifier_register(struct notifier_block *nb) { return -EINVAL; From patchwork Wed May 4 15:40:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 1626521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=PhUpM53t; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ktp890M32z9sFx for ; Thu, 5 May 2022 06:19:20 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Ktp884mcMz3c7b for ; Thu, 5 May 2022 06:19:20 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=PhUpM53t; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=bootlin.com (client-ip=2001:4b98:dc4:8::240; helo=mslow1.mail.gandi.net; envelope-from=clement.leger@bootlin.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=PhUpM53t; dkim-atps=neutral Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [IPv6:2001:4b98:dc4:8::240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KthBG6MLBz3bfR for ; Thu, 5 May 2022 01:50:46 +1000 (AEST) Received: from relay2-d.mail.gandi.net (unknown [217.70.183.194]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 85CF5C9627 for ; Wed, 4 May 2022 15:42:13 +0000 (UTC) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 8DEA440007; Wed, 4 May 2022 15:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1651678924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wmqzHg+nLgBRemjIW3lNzV3pSBBaY49ErNMMa/e8tLQ=; b=PhUpM53tbZtMWJGrm+4iEQAgfeYhHsOTCGMCt2OtvAbNoqiI7Nu43nuiKw2hxUsl8AKYMF BacEpfvIH7dtRAXxUL1PPofJlQlho0tVJEEDt5P5KEA8lDw0b8ZsLHIYjN3zmwJYFwuV3S 5n6GBecdolsiH871iOevPvakUvAXKEoRzJxY4XiOJ/HSqOp+v+fj+6+WD/i6SEshWhaoio Zuns8KG/SBKAkhSVVoSt42XtRRyEhs/Qi9OBsuad/MTSd9ibPuooBLEA+cWpl804bgKF2/ 23GMQrhJTPcz8Way9E/BYiMdnd9mkDgZQBMPtf3HvDOZjLy7UXlgrCNEel81nQ== From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Rob Herring , Frank Rowand , Nathan Lynch , Laurent Dufour , Daniel Henrique Barboza , David Gibson , Andrew Morton , David Hildenbrand , Ohhoon Kwon , "Aneesh Kumar K.V" , YueHaibing Subject: [PATCH 2/3] of: dynamic: add of_node_alloc() and of_node_free() Date: Wed, 4 May 2022 17:40:32 +0200 Message-Id: <20220504154033.750511-3-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220504154033.750511-1-clement.leger@bootlin.com> References: <20220504154033.750511-1-clement.leger@bootlin.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 05 May 2022 06:17:57 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Steen Hegelund , linux-kernel@vger.kernel.org, Allan Nielsen , Thomas Petazzoni , linuxppc-dev@lists.ozlabs.org, Horatiu Vultur Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add functions which allows to create and free nodes. Signed-off-by: Clément Léger --- drivers/of/dynamic.c | 59 ++++++++++++++++++++++++++++++++++++-------- include/linux/of.h | 9 +++++++ 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index e8700e509d2e..ec28e5ba2969 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -455,6 +455,54 @@ struct property *__of_prop_dup(const struct property *prop, gfp_t allocflags) prop->length, allocflags); } +/** + * of_node_free - Free a node allocated dynamically. + * @node: Node to be freed + */ +void of_node_free(const struct device_node *node) +{ + kfree(node->full_name); + kfree(node->data); + kfree(node); +} +EXPORT_SYMBOL(of_node_free); + +/** + * of_node_alloc - Allocate a node dynamically. + * @name: Node name + * @allocflags: Allocation flags (typically pass GFP_KERNEL) + * + * Create a node by dynamically allocating the memory of both the + * node structure and the node name & contents. The node's + * flags have the OF_DYNAMIC & OF_DETACHED bit set so that we can + * differentiate between dynamically allocated nodes and not. + * + * Return: The newly allocated node or NULL on out of memory error. + */ +struct device_node *of_node_alloc(const char *name, gfp_t allocflags) +{ + struct device_node *node; + + node = kzalloc(sizeof(*node), allocflags); + if (!node) + return NULL; + + if (name) { + node->full_name = kstrdup(name, allocflags); + if (!node->full_name) { + kfree(node); + return NULL; + } + } + + of_node_set_flag(node, OF_DYNAMIC); + of_node_set_flag(node, OF_DETACHED); + of_node_init(node); + + return node; +} +EXPORT_SYMBOL(of_node_alloc); + /** * __of_node_dup() - Duplicate or create an empty device node dynamically. * @np: if not NULL, contains properties to be duplicated in new node @@ -471,18 +519,9 @@ struct device_node *__of_node_dup(const struct device_node *np, { struct device_node *node; - node = kzalloc(sizeof(*node), GFP_KERNEL); + node = of_node_alloc(NULL, GFP_KERNEL); if (!node) return NULL; - node->full_name = kstrdup(full_name, GFP_KERNEL); - if (!node->full_name) { - kfree(node); - return NULL; - } - - of_node_set_flag(node, OF_DYNAMIC); - of_node_set_flag(node, OF_DETACHED); - of_node_init(node); /* Iterate over and duplicate all properties */ if (np) { diff --git a/include/linux/of.h b/include/linux/of.h index 6b345eb71c19..749ac07f4960 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1463,6 +1463,8 @@ enum of_reconfig_change { }; #ifdef CONFIG_OF_DYNAMIC +extern struct device_node *of_node_alloc(const char *name, gfp_t allocflags); +extern void of_node_free(const struct device_node *node); extern struct property *of_property_alloc(const char *name, const void *value, int value_len, int len, gfp_t allocflags); @@ -1512,6 +1514,13 @@ static inline int of_changeset_update_property(struct of_changeset *ocs, return of_changeset_action(ocs, OF_RECONFIG_UPDATE_PROPERTY, np, prop); } #else /* CONFIG_OF_DYNAMIC */ +static inline struct device_node *of_node_alloc(const char *name, + gfp_t allocflags) +{ + return NULL; +} + +static inline void of_node_free(const struct device_node *node) {} static inline struct property *of_property_alloc(const char *name, const void *value, From patchwork Wed May 4 15:40:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 1626520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=c6C+7W6X; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ktp7W6F0Jz9sFx for ; Thu, 5 May 2022 06:18:47 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Ktp7W5M1Hz3brW for ; Thu, 5 May 2022 06:18:47 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=c6C+7W6X; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=bootlin.com (client-ip=2001:4b98:dc4:8::240; helo=mslow1.mail.gandi.net; envelope-from=clement.leger@bootlin.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=c6C+7W6X; dkim-atps=neutral Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [IPv6:2001:4b98:dc4:8::240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KthBG5VkLz3bd7 for ; Thu, 5 May 2022 01:50:46 +1000 (AEST) Received: from relay2-d.mail.gandi.net (unknown [217.70.183.194]) by mslow1.mail.gandi.net (Postfix) with ESMTP id BBD4AC9662 for ; Wed, 4 May 2022 15:42:13 +0000 (UTC) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 092EC40003; Wed, 4 May 2022 15:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1651678926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=syVh6bmaMn5ntdtGN7GpyAnxiKbIllExQJN9dKGkNJ0=; b=c6C+7W6XFAo/WW8FtCv6SSTsY/cs+sDCqpqwwTuow7Lz0ga7x4bSWSHJOLdnPyiHyfHhDI vOeXRsUNeXFEJTswTiSC+HliR3Y0CF/L6v0eqC1vT9WlWO61Vq2+4T4xvK4oUaRhrgysqw nrO/ooCzJJvXJzZr+/vF3Dpwfa9cUmTeJWqLBL1ydy6/qNM8u6IqQPyEAeDkk7LQvKfF5I wX9BNb9qbwfUSDvBpVg+S90rtW5Y2N75WrIsr4fF0wKBGYlfxNJqzbgL0HLZdM9CtB5RSA PuclVajdpob5X8Yg/J/Wc+M3clTTtw/WpRde9qzfG9MDLG1Dm4m82/0hNrPI7g== From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Rob Herring , Frank Rowand , Nathan Lynch , Laurent Dufour , Daniel Henrique Barboza , David Gibson , Andrew Morton , David Hildenbrand , Ohhoon Kwon , "Aneesh Kumar K.V" , YueHaibing Subject: [PATCH 3/3] powerpc/pseries: use of_property_*() and of_node_*() functions Date: Wed, 4 May 2022 17:40:33 +0200 Message-Id: <20220504154033.750511-4-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220504154033.750511-1-clement.leger@bootlin.com> References: <20220504154033.750511-1-clement.leger@bootlin.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 05 May 2022 06:17:57 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Steen Hegelund , linux-kernel@vger.kernel.org, Allan Nielsen , Thomas Petazzoni , linuxppc-dev@lists.ozlabs.org, Horatiu Vultur Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Use of_property_alloc/free() and of_node_alloc/free() to create and free device-tree nodes and properties. Signed-off-by: Clément Léger --- arch/powerpc/platforms/pseries/dlpar.c | 51 +++---------------- .../platforms/pseries/hotplug-memory.c | 27 +--------- arch/powerpc/platforms/pseries/reconfig.c | 44 ++++------------ 3 files changed, 20 insertions(+), 102 deletions(-) diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index b1f01ac0c29e..ebecde6c7256 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c @@ -39,61 +39,25 @@ struct cc_workarea { __be32 prop_offset; }; -void dlpar_free_cc_property(struct property *prop) -{ - kfree(prop->name); - kfree(prop->value); - kfree(prop); -} - static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa) { - struct property *prop; - char *name; - char *value; - - prop = kzalloc(sizeof(*prop), GFP_KERNEL); - if (!prop) - return NULL; + int length; + char *name, *value; name = (char *)ccwa + be32_to_cpu(ccwa->name_offset); - prop->name = kstrdup(name, GFP_KERNEL); - if (!prop->name) { - dlpar_free_cc_property(prop); - return NULL; - } - - prop->length = be32_to_cpu(ccwa->prop_length); + length = be32_to_cpu(ccwa->prop_length); value = (char *)ccwa + be32_to_cpu(ccwa->prop_offset); - prop->value = kmemdup(value, prop->length, GFP_KERNEL); - if (!prop->value) { - dlpar_free_cc_property(prop); - return NULL; - } - return prop; + return of_property_alloc(name, value, length, length, GFP_KERNEL); } static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa) { - struct device_node *dn; const char *name; - dn = kzalloc(sizeof(*dn), GFP_KERNEL); - if (!dn) - return NULL; - name = (const char *)ccwa + be32_to_cpu(ccwa->name_offset); - dn->full_name = kstrdup(name, GFP_KERNEL); - if (!dn->full_name) { - kfree(dn); - return NULL; - } - - of_node_set_flag(dn, OF_DYNAMIC); - of_node_init(dn); - return dn; + return of_node_alloc(name, GFP_KERNEL); } static void dlpar_free_one_cc_node(struct device_node *dn) @@ -103,11 +67,10 @@ static void dlpar_free_one_cc_node(struct device_node *dn) while (dn->properties) { prop = dn->properties; dn->properties = prop->next; - dlpar_free_cc_property(prop); + of_property_free(prop); } - kfree(dn->full_name); - kfree(dn); + of_node_free(dn); } void dlpar_free_cc_nodes(struct device_node *dn) diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 91cf23495ccb..591727b05f36 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -70,34 +70,11 @@ unsigned long pseries_memory_block_size(void) return memblock_size; } -static void dlpar_free_property(struct property *prop) -{ - kfree(prop->name); - kfree(prop->value); - kfree(prop); -} - static struct property *dlpar_clone_property(struct property *prop, u32 prop_size) { - struct property *new_prop; - - new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL); - if (!new_prop) - return NULL; - - new_prop->name = kstrdup(prop->name, GFP_KERNEL); - new_prop->value = kzalloc(prop_size, GFP_KERNEL); - if (!new_prop->name || !new_prop->value) { - dlpar_free_property(new_prop); - return NULL; - } - - memcpy(new_prop->value, prop->value, prop->length); - new_prop->length = prop_size; - - of_property_set_flag(new_prop, OF_DYNAMIC); - return new_prop; + return of_property_alloc(prop->name, prop->value, prop->length, + prop_size, GFP_KERNEL); } static bool find_aa_index(struct device_node *dr_node, diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index 7f7369fec46b..08c2f9088537 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c @@ -25,17 +25,9 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist struct device_node *np; int err = -ENOMEM; - np = kzalloc(sizeof(*np), GFP_KERNEL); + np = of_node_alloc(kbasename(path), GFP_KERNEL); if (!np) - goto out_err; - - np->full_name = kstrdup(kbasename(path), GFP_KERNEL); - if (!np->full_name) - goto out_err; - - np->properties = proplist; - of_node_set_flag(np, OF_DYNAMIC); - of_node_init(np); + return -ENOMEM; np->parent = pseries_of_derive_parent(path); if (IS_ERR(np->parent)) { @@ -56,8 +48,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist out_err: if (np) { of_node_put(np->parent); - kfree(np->full_name); - kfree(np); + of_node_free(np); } return err; } @@ -92,9 +83,7 @@ static void release_prop_list(const struct property *prop) struct property *next; for (; prop; prop = next) { next = prop->next; - kfree(prop->name); - kfree(prop->value); - kfree(prop); + of_property_free(prop); } } @@ -168,27 +157,16 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length static struct property *new_property(const char *name, const int length, const unsigned char *value, struct property *last) { - struct property *new = kzalloc(sizeof(*new), GFP_KERNEL); + struct property *prop; - if (!new) + prop = of_property_alloc(name, value, length, length + 1, GFP_KERNEL); + if (!prop) return NULL; - if (!(new->name = kstrdup(name, GFP_KERNEL))) - goto cleanup; - if (!(new->value = kmalloc(length + 1, GFP_KERNEL))) - goto cleanup; - - memcpy(new->value, value, length); - *(((char *)new->value) + length) = 0; - new->length = length; - new->next = last; - return new; - -cleanup: - kfree(new->name); - kfree(new->value); - kfree(new); - return NULL; + *(((char *)prop->value) + length) = 0; + prop->next = last; + + return prop; } static int do_add_node(char *buf, size_t bufsize)