From patchwork Mon Jul 13 14:59:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11660019 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3BC913B4 for ; Mon, 13 Jul 2020 15:01:24 +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 CCB8A20578 for ; Mon, 13 Jul 2020 15:01:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZU3LHalE"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="TjuSWxVQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCB8A20578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fiUtmXFt6cvxjJWtGYiGdsNDLEmv8ijnCQJNf1WCcZk=; b=ZU3LHalENExZhsVbTucxfoq5H ++U+Gfb1BF9TxnBCLDeRyAkMXD9BHC1oI6/nvxPHSjGBbFPecGBtBPyQvR8krfmMQKtN5jExFG1oN JOffs5233aZg7d6kyj/qteaTAiy4OcJcG9umHmE7jz5icJpKfOzfnuGM/1fVTBu5mDXF6L2empypR CDDpyzwshvYj6+2Ck+MsxCRDuv3SIplH0jwCf7ULCVTuqirbM+c9BO5MfOZB8QePeV3uA7ZCF+DSe X6vV3IcMvowf46srxSu7cu9WvpTkWaOV+Cdp5zIZxfP5rKS6iHU2b6NosOs8Um42tFHCZHrHskUOE u3anK07JQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juzvy-00088G-3M; Mon, 13 Jul 2020 14:59:58 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juzvp-000856-Iv for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2020 14:59:51 +0000 Received: by mail-wr1-x443.google.com with SMTP id f18so16928293wrs.0 for ; Mon, 13 Jul 2020 07:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2K0+WpAjA/clN2fcxfwCJnR+PHkjcGu57v68HdMeUGs=; b=TjuSWxVQpca2khBzPDyHDbnK38Uj8WWXhdul0NXSoye176axPOsOxp6kAwga6KNvsq jDt5y35XtzO+Ru/Z3SWAdx8kFmXIx4IU8Kf6x0ZeQliyfyCNQ97egkeuE9nGJXvovFq3 7MUiVkzlQSLGagLRSSQpzeYAjvyrYCIXkQgjKjBOBEsY8ESj8G3gvYSZmCCLqvBtSsM+ 7MQhvUDvz6v7xsGvdpeakrqoypfNhkSsQ9UDcN1f3OrIAGvmTLVv9MbA9YRFWid8l/oB 5xXcp2P7I50sZp8L114/DIbu/CveOtr/aty1Ljvh92SqdseqIoeC0p/U8690QqKpYFE9 k+dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2K0+WpAjA/clN2fcxfwCJnR+PHkjcGu57v68HdMeUGs=; b=Y22yfwrmFqjnlIPXejZLC0HZB5D86yeOwo1zwtoQ3d3XpSo05Nm8zV486ohl6JL89M DE9rA4CYAb1br9i8jJCH8gdYupw7D97RGdTjoyfHiPiCnqqN074K0TJlrqlintTO0Kn/ Vg/fQ2fgussuCoxoxltSaQaoA9k4u91L6kjECToSRZEXyxgPfExECn7ognzyhpJWys+M /n8Jfte+lganfCae7DUAejgBzeHhKj0pmvWMRPuPv9tzF1ZnfNTX6vKYfQMHCRskyBZI EB0AIalJSFg5ugIVmUYRPoyKOzRjctcPgFXQxiWV4s0fbDeA6JmYZCP8fIOlbX6Jc24P RP7g== X-Gm-Message-State: AOAM530H+NKk8tcpqIcDMtodrnI3UqGjgpUXy5SKGWZ9QCoOStYSyl58 XMscm1ZfO/U9ZblQncaT6AdJfg== X-Google-Smtp-Source: ABdhPJynbnzJegf5dNDoEbDXw70BU9CgzBs8/kZqPTPdIxehdfqK950VzM4VPnHZxExJobVenj5B+Q== X-Received: by 2002:a5d:6803:: with SMTP id w3mr79063986wru.200.1594652387098; Mon, 13 Jul 2020 07:59:47 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id u20sm21991145wmm.15.2020.07.13.07.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:59:46 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko Subject: [PATCH v4 1/3] devres: provide devm_krealloc() Date: Mon, 13 Jul 2020 16:59:32 +0200 Message-Id: <20200713145934.18243-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200713145934.18243-1-brgl@bgdev.pl> References: <20200713145934.18243-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200713_105949_655050_5FFD7A20 X-CRM114-Status: GOOD ( 18.03 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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-iio@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 + * 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()). 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; __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,