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=-12.8 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, USER_AGENT_GIT 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 942D8C433E3 for ; Fri, 10 Jul 2020 16:16:55 +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 65A7920657 for ; Fri, 10 Jul 2020 16:16:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G8rwv2qU"; 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="HPME4aFf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65A7920657 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+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: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=R5YtCWmhqAg8FDR93iKqXMCiAKJLGFJC0Bq3uj0N5vE=; b=G8rwv2qUzsAnxFVbl4xtd1NuZ QJYvYPo0H3M2ZPUmsvhkMqpoZU1syOiAK4u4hHsHCz7SIBewbPvVDzTYjZ9bgbpj5aTh+oKPpDDoa dzVI0yERaOSgS6s4u0QMbSlLG+AVHB/D4QRXy36dE3pzAGteA74sTx3q4VWVXtiWKSj+tm6cte5ia 8vshLQZmLY5XihF/nFt+8dIQdOBYX9MJfkv9wSMw61TlZ+mHVL7AkGVYEYEQ/HkpXUNS6NLwHaciB PyG6JnN3KszHqI9IStHqKGESMZM+DzACagI8BikZb4nxhDBvPSLNU7T9q0ieaQXx6q/+f0tNZ2LnO bAzFGoJvg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtvgP-0007gn-NL; Fri, 10 Jul 2020 16:15:29 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtvgK-0007fI-UI for linux-arm-kernel@lists.infradead.org; Fri, 10 Jul 2020 16:15:26 +0000 Received: by mail-wr1-x444.google.com with SMTP id q5so6549071wru.6 for ; Fri, 10 Jul 2020 09:15:24 -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=6VeY2q2ARwtwhxTnriPNqujWGB2wBtqSPVx5GyBvhlc=; b=HPME4aFfN5DAGO/hNKu8shxMBOKpjiUHJbJOGhTo99xKJ62hrdqOCo/1gYMqtetwLI joIHG5DbBNPLurDw77w69rKt2TzzTHMFPef7Ae9YSPcdFckr7QDEwgkiZSeS4B4mZiG4 Aye0brfxunFa1P3lI0bGf7BUjcvDs5NNH95uxOXPNNQ5uWE6yXFQW35oy5RmGrkaXj3W XT6uOuXIJnTF8VBQGfzVTwbqDOAC6IeVDifSeblH7eo4eSXXeg9RYJ36eMPX14bSLbpY 28NWQ+9Wf7ij9n9AdZsXnM7MJLn6IUHpsq1r7gEoEGKjKZwAfhB5p5uKOWdGmEep1g3A epRQ== 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=6VeY2q2ARwtwhxTnriPNqujWGB2wBtqSPVx5GyBvhlc=; b=iTrHatnIGPoriPySgmhYinZJ+NHTuX8ovIRnhZOgoqd/zj6zvl5yy8AfSSuJIXR43V G2lOAl3YFwD4lh7xw9e7u6f+F70VHjf2e8vWa755DB7+M2hnlrZQmfvIMaHifDqsbUT9 lBFdvwS2TCnen1Ms6U0J1L+42oqBUNy/BNkPhmE06Tk9rZvt8qRdJpl9f+FjtjR50DVE Wt2RnIY6KrT5aPs4ii8510DMJXtmSr0+is0l8O0wLskW94pcUylKpBK9jXiUSrQZGk2A Enc5Bxaz6zbnOpEuUmgfEb2iAessyzSAQ6kJ1zjwnALTCK7PjUxZOwq6KjFtUoVbcnvd tfiA== X-Gm-Message-State: AOAM533yVvVuY3nJ5tostPRM5QwM+OiGh5/G999U1MJ17RVSuJVtRWlh HDLhCOkei2c2H5gC7O/ZeEeLGA== X-Google-Smtp-Source: ABdhPJwOtOzdkUiP2GCCTb1YJ3mjOhhSDr/YjLUB5Z33mCbFNZoBuRBbEqo72XYreuJPsOb9S088+A== X-Received: by 2002:a5d:4d0b:: with SMTP id z11mr38646926wrt.24.1594397723839; Fri, 10 Jul 2020 09:15:23 -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 e8sm11179359wrp.26.2020.07.10.09.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 09:15:23 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck Subject: [PATCH v3 1/3] devres: provide devm_krealloc() Date: Fri, 10 Jul 2020 18:15:14 +0200 Message-Id: <20200710161516.11625-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200710161516.11625-1-brgl@bgdev.pl> References: <20200710161516.11625-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200710_121525_092719_154D038A X-CRM114-Status: GOOD ( 15.32 ) 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 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 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 | 50 +++++++++++++++++++ include/linux/device.h | 2 + 3 files changed, 53 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index eaaaafc21134..aa08f5162524 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -353,6 +353,7 @@ MEM devm_kfree() devm_kmalloc() devm_kmalloc_array() + devm_krealloc() devm_kmemdup() devm_kstrdup() devm_kvasprintf() diff --git a/drivers/base/devres.c b/drivers/base/devres.c index ed615d3b9cf1..4b8870ef6a3f 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -837,6 +837,56 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) } EXPORT_SYMBOL_GPL(devm_kmalloc); +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; + void *ret = NULL; + size_t tot_size; + + 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, &tot_size)) + return NULL; + + spin_lock_irqsave(&dev->devres_lock, flags); + + old_dr = find_dr(dev, devm_kmalloc_release, devm_kmalloc_match, ptr); + if (WARN_ON(!old_dr)) + /* Memory chunk not managed or managed by a different device. */ + goto out; + + old_head = old_dr->node.entry; + + new_dr = krealloc(old_dr, tot_size, gfp); + if (!new_dr) + goto out; + + if (new_dr != old_dr) + list_replace(&old_head, &new_dr->node.entry); + + ret = new_dr->data; + +out: + 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 7322c51e9c0c..f64f40843159 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, -- 2.26.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel