From nobody Fri Jan 16 19:41:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dt9FX3wH0z6NlXW for ; Fri, 16 Jan 2026 19:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9FW6wxfz3xMc for ; Fri, 16 Jan 2026 19:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9zlnxLAO/o0GH5VgGhdxuI0oDsngcDhRJzPe2V4rQo=; b=BbmaxEaQX+zKPzN93ebQm+YM1LzlESmt/U0xXHk8b2o2EQFjyXVWIEOF3Ks/Ubf8JVdNSR KAxP0ZU6w0afj4u2v0C1K4o4WvuZLC/KzExma3FkfF4Njvt1H7vW4c7ux3dZlbC1ZKUm/k knj0P7TwT1IBhgBx1MY18gQe0dtt/Ge9icRA8JqiJAP+W1k187aHOIn2+u3y5VnAmYpWVX /2k29ehpNIqOmq1jl1NrZ9w9Ogu0wMR50kNW4NMDxDQGPVWnhpKdevL6SeGG4V78pJefOQ upCikpzC0+MsA0sR+LdGRbJ4Nc/3R5sjaKAgtnfeAAUhKTCDLa23JYQXS2j8NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9zlnxLAO/o0GH5VgGhdxuI0oDsngcDhRJzPe2V4rQo=; b=Wjqzk+TBj7wjQK5uzc3q5PQqmFxhEriz/4V47EBAYf2lBX9AwJOP2z0B4Q5kE0EZ0t1Sq1 3Ot2BLqqfWuL/u7Zdw6SLGPueqosy7IpQDKR5xyiNIv3k1Z3VZ/zqAixgpv9E6sEVLoDh7 BxPgE4BHmPiQmILVhd3O49YQ8FEYuvxu3KogOKTjk2hO2xo4xPaDD1ZI4lC5qfHPPqOQBL FG+Jz6FYu8Hwhd4A49006R2LBwLJjaj3Dxql5g9Ea+6AjbzeAdQU60daJbxKGvI66QLOyO LTskzG4BDvALATPfvPFEIr2XC4xymfkDxnFEZmmd4F5TKhEDQDrhNK78wgGLFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592464; a=rsa-sha256; cv=none; b=MOxndKtKpsqEq4hAFuInfjT1ZE5Zi0+Nd7ZVeVodTpp1n7R+n+Es8cvrRAFRvdjenjS18/ GKXqSBYqyFPWvp8XYNs3y9/V/TrLAivZLAyqZ5QSWVGo2yo/kBAIlnqR2DteqCDHQWoWqL tFcAZlM8SxIS7IwO4mEJ+rNljLRn8CHND8iaNB8jT02tqopLrliv47d5gt93Tg4IRQ6erK p4cAfVXtvuWCGW6l2pyRCB6LtHtl6fjRSUCzSOVmYAJngBqPuevdDwcY+iotwE/MNqRiC2 /LK43K9UcI8zMkCCCC6XIzTd9CBzVYnCKjUsmhDWWV3cYXrOXVZqBnUHWe3Tew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dt9FW6SX1zCdw for ; Fri, 16 Jan 2026 19:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cc4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:41:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 62d86be3d64d - stable/14 - LinuxKPI: devres: divorce dem_kfree from lkpi_devm_kmalloc_release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62d86be3d64d65ba207f81f18d0dbf38f57935ee Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:41:03 +0000 Message-Id: <696a944f.cc4e.263431b3@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=62d86be3d64d65ba207f81f18d0dbf38f57935ee commit 62d86be3d64d65ba207f81f18d0dbf38f57935ee Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:28:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:49 +0000 LinuxKPI: devres: divorce dem_kfree from lkpi_devm_kmalloc_release dem_kfree() is called from all over the place and should actually do something; contrary to lkpi_devm_kmalloc_release() it can also take a const void *. We have to __DECONST() that though as the entire devres framework does otherwise not take a const argument. This was discovered during the rtw89 update to 6.16. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52082 (cherry picked from commit 4ab64e34911ab06e567caaf07ed18f7770a61cc8) (cherry picked from commit f20a09e161f07874c3a01b1579e8a5d2356df8ce) --- sys/compat/linuxkpi/common/include/linux/device.h | 5 +++-- sys/compat/linuxkpi/common/src/linux_devres.c | 26 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index de7e66d9a4ad..ab53add4be54 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -4,7 +4,7 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. - * Copyright (c) 2021-2022 The FreeBSD Foundation + * Copyright (c) 2021-2025 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -282,7 +282,8 @@ int lkpi_devres_destroy(struct device *, void(*release)(struct device *, void *) void lkpi_devres_release_free_list(struct device *); void lkpi_devres_unlink(struct device *, void *); void lkpi_devm_kmalloc_release(struct device *, void *); -#define devm_kfree(_d, _p) lkpi_devm_kmalloc_release(_d, _p) +void lkpi_devm_kfree(struct device *, const void *); +#define devm_kfree(_d, _p) lkpi_devm_kfree(_d, _p) static inline const char * dev_driver_string(const struct device *dev) diff --git a/sys/compat/linuxkpi/common/src/linux_devres.c b/sys/compat/linuxkpi/common/src/linux_devres.c index 84f03ba0dd7d..23c91cb5ab2f 100644 --- a/sys/compat/linuxkpi/common/src/linux_devres.c +++ b/sys/compat/linuxkpi/common/src/linux_devres.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * This software was developed by Bj\xc3\xb6rn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -223,6 +223,30 @@ lkpi_devm_kmalloc_release(struct device *dev __unused, void *p __unused) /* Nothing to do. Freed with the devres. */ } +static int +lkpi_devm_kmalloc_match(struct device *dev __unused, void *p, void *mp) +{ + return (p == mp); +} + +void +lkpi_devm_kfree(struct device *dev, const void *p) +{ + void *mp; + int error; + + if (p == NULL) + return; + + /* I assume Linux simply casts the const away... */ + mp = __DECONST(void *, p); + error = lkpi_devres_destroy(dev, lkpi_devm_kmalloc_release, + lkpi_devm_kmalloc_match, mp); + if (error != 0) + dev_warn(dev, "%s: lkpi_devres_destroy failed with %d\n", + __func__, error); +} + struct devres_action { void *data; void (*action)(void *);