From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8374EC433E1 for ; Mon, 13 Jul 2020 19:30:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 57AB020663 for ; Mon, 13 Jul 2020 19:30:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xQHX9hhV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57AB020663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3YPy5E37Yr9YW3jlWNeaS6BI4cjuwzgMpC4Od9P/WT0=; b=xQHX9hhVTLgD7q0tmi1CEY1F2 fW/+VvH+WuVLk5CjKyGp6diQ+9VnGh/Vnn1LMxlKwv3QGCZufMB7Q5xJUtve4h5wkwhZqRyuCiHb4 GPNx3pk0AQ9+zAHTAkkIr1rN8FVeiy/n437FXfjO+jfB9yJB4BjJLezBbvavd4NR1ylnK9HTbte0i KQvDgQHCOCaR7Y0dxhxK6+MeDF2yPi3FL9n6LGn6VYTs23j2ovnGLogfCvAI+IzC0rFkPU+nsez25 6tadGJNjMxWf6dw0td4ZA9MRJmE9kKAZT+Rke8RNQguw+bCqzVHfNVx2td00jiKvNOjacSIy+eKDv ze2zp6A3A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jv48Y-0006MS-SF; Mon, 13 Jul 2020 19:29:14 +0000 Received: from mga11.intel.com ([192.55.52.93]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jv48S-0006L8-3m for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2020 19:29:09 +0000 IronPort-SDR: mf0yh/gZKah1BID45XBkE9ZVQ4wZBUPqLG/Mf1xH4sJOE10aZdvh5g8N6TlilJwUMd9dw2/Y19 VkfSaeO8ltug== X-IronPort-AV: E=McAfee;i="6000,8403,9681"; a="146734693" X-IronPort-AV: E=Sophos;i="5.75,348,1589266800"; d="scan'208";a="146734693" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2020 12:29:04 -0700 IronPort-SDR: 7nnU7K24gRkjFEh2UkU1jeypUQx/rdcI1r7cJKYuqWXmY/BpvD9uFLeYYhdapQ2GcjQoBslpu0 A9E/PUCiX57A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,348,1589266800"; d="scan'208";a="485605105" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by fmsmga005.fm.intel.com with ESMTP; 13 Jul 2020 12:29:01 -0700 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1jv48L-001eBY-Aq; Mon, 13 Jul 2020 22:29:01 +0300 Date: Mon, 13 Jul 2020 22:29:01 +0300 From: Andy Shevchenko To: Bartosz Golaszewski Subject: Re: [PATCH v4 1/3] devres: provide devm_krealloc() Message-ID: <20200713192901.GD3703480@smile.fi.intel.com> References: <20200713145934.18243-1-brgl@bgdev.pl> <20200713145934.18243-2-brgl@bgdev.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200713145934.18243-2-brgl@bgdev.pl> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200713_152908_391996_96EB5065 X-CRM114-Status: GOOD ( 28.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Lars-Peter Clausen , linux-iio@vger.kernel.org, Greg Kroah-Hartman , Michal Simek , linux-kernel@vger.kernel.org, Bartosz Golaszewski , Guenter Roeck , Peter Meerwald-Stadler , Hartmut Knaack , Jonathan Cameron Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jul 13, 2020 at 04:59:32PM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > Implement the managed variant of krealloc(). This function works with > all memory allocated by devm_kmalloc() (or devres functions using it > implicitly like devm_kmemdup(), devm_kstrdup() etc.). > > Managed realloc'ed chunks can be manually released with devm_kfree(). > > Signed-off-by: Bartosz Golaszewski > --- > .../driver-api/driver-model/devres.rst | 1 + > drivers/base/devres.c | 67 +++++++++++++++++++ > include/linux/device.h | 2 + > 3 files changed, 70 insertions(+) > > diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst > index eaaaafc21134f..f318a5c0033c1 100644 > --- a/Documentation/driver-api/driver-model/devres.rst > +++ b/Documentation/driver-api/driver-model/devres.rst > @@ -354,6 +354,7 @@ MEM > devm_kmalloc() > devm_kmalloc_array() > devm_kmemdup() > + devm_krealloc() > devm_kstrdup() > devm_kvasprintf() > devm_kzalloc() > diff --git a/drivers/base/devres.c b/drivers/base/devres.c > index ed615d3b9cf15..1775d35462300 100644 > --- a/drivers/base/devres.c > +++ b/drivers/base/devres.c > @@ -837,6 +837,73 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) > } > EXPORT_SYMBOL_GPL(devm_kmalloc); > > +/** > + * devm_krealloc - Resource-managed krealloc() > + * @dev: Device to re-allocate memory for > + * @ptr: Pointer to the memory chunk to re-allocate > + * @new_size: New allocation size > + * @gfp: Allocation gfp flags > + * > + * Managed krealloc(). Resizes the memory chunk allocated with devm_kmalloc(). > + * Behaves similarly to regular krealloc(): if @ptr is NULL or ZERO_SIZE_PTR, > + * it's the equivalent of devm_kmalloc(). If new_size is zero, it returns 'it frees the previously allocated memory and returns' > + * ZERO_SIZE_PTR. This function doesn't change the order in which the release > + * callback for the re-alloc'ed devres will be called (except when falling back > + * to devm_kmalloc() 'or when freeing resources when new_size is zero' > ). The contents of the memory are preserved up to the > + * lesser of new and old sizes. > + */ > +void *devm_krealloc(struct device *dev, void *ptr, size_t new_size, gfp_t gfp) > +{ > + struct devres *old_dr, *new_dr; > + struct list_head old_head; > + unsigned long flags; > + size_t total_size; > + void *ret = NULL; > + > + if (unlikely(!new_size)) { > + devm_kfree(dev, ptr); > + return ZERO_SIZE_PTR; > + } > + > + if (unlikely(ZERO_OR_NULL_PTR(ptr))) > + return devm_kmalloc(dev, new_size, gfp); > + > + if (WARN_ON(is_kernel_rodata((unsigned long)ptr))) > + /* > + * We cannot reliably realloc a const string returned by > + * devm_kstrdup_const(). > + */ > + return NULL; > + > + if (!check_dr_size(new_size, &total_size)) > + return NULL; > + > + spin_lock_irqsave(&dev->devres_lock, flags); > + > + old_dr = find_dr(dev, devm_kmalloc_release, devm_kmalloc_match, ptr); > + if (!old_dr) { > + spin_unlock_irqrestore(&dev->devres_lock, flags); > + WARN(1, "Memory chunk not managed or managed by a different device."); > + return NULL; > + } > + > + old_head = old_dr->node.entry; > + > + new_dr = krealloc(old_dr, total_size, gfp); > + if (!new_dr) { > + spin_unlock_irqrestore(&dev->devres_lock, flags); > + return NULL; > + } > + > + if (new_dr != old_dr) > + list_replace(&old_head, &new_dr->node.entry); > + > + ret = new_dr->data; > + spin_unlock_irqrestore(&dev->devres_lock, flags); > + return ret; > +} > +EXPORT_SYMBOL_GPL(devm_krealloc); > + > /** > * devm_kstrdup - Allocate resource managed space and > * copy an existing string into that. > diff --git a/include/linux/device.h b/include/linux/device.h > index 7322c51e9c0c7..f64f408431593 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -206,6 +206,8 @@ int devres_release_group(struct device *dev, void *id); > > /* managed devm_k.alloc/kfree for device drivers */ > void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) __malloc; > +void *devm_krealloc(struct device *dev, void *ptr, size_t size, > + gfp_t gfp) __must_check; Strange indentation, also you can move __must_check to the beginning of the declaration. > __printf(3, 0) char *devm_kvasprintf(struct device *dev, gfp_t gfp, > const char *fmt, va_list ap) __malloc; > __printf(3, 4) char *devm_kasprintf(struct device *dev, gfp_t gfp, > -- > 2.26.1 > -- With Best Regards, Andy Shevchenko _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel