From nobody Fri Nov 20 10:10:48 2026 X-Original-To: dev-commits-src-all@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 4jWB1P2l7Xz71W6v for ; Fri, 20 Nov 2026 10:10:49 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jWB1P0LCDz4tNr for ; Fri, 20 Nov 2026 10:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795169449; 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; bh=BcCVRgMe78sqA3LUE3k+OQqbfAlRzacpRUA3gJ7uMfE=; b=FjZkInPMkYIYIymUSAj5//RUHuVJBRnT/g3m97shd4ERAdhCnWCh3er4I2vmv27Wp933Wj IBfLcmRu2RlEWr4bl1PwLOG5wZmfa7AsSHxj3DHqBcfe6SDO6EoScNudRIfqC1H1FP+jjS TN/pmIDbyUH92e14A2X85uq7xQ1/fwgt04zFb0LPEIlmGRvDO5CsnKopoEUoYE8irHoGgv PV33aXAktLYCrQrG1Bc9p7VzQ+VuB24z9Os+vFglY43NoeaAJhUYG4tXt0iDnOsyjbN/PY 7c2dTZHniBMASLU8DNn1bDgrXYLPWLZTKim7deOHNTcPdgJj49ZixTIqy5ZdCg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795169449; b=PKtK+nG3STADFlMxWAorPIEEdWPM/RnsN+8iSzgqniy4fGCEJQBmWQeOOYielcqz8fSVFN aQQ6+0ICeT3eTXYOpETTpFkwNwqctvzALXrdp4Un1S1lqJBoLSHDuMGhQrjWK3Uxg2pEaV aqSB89Nj+VHzwzmFBc3ffwhDQm5KdsW4tkzkE2ZKon/B2y2L21WE5I9bOfPw0dgkDUo/fe jbNI4AqwhVSEegXAX0lkclfPwl0S9J9qhOsoixHscDEfKWpVxmMFCyD2Vbt7SoDeyf0jLx zuNYArjpimHpC+FK0nFbckk3W6SgK9fptoFz0VfAz04ScvAlqQsPQ+CQEpzCTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795169449; 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; bh=BcCVRgMe78sqA3LUE3k+OQqbfAlRzacpRUA3gJ7uMfE=; b=SI1sCzTIUs0ae0x8ZAMRgS1JAqxyUILOTNQwroVrRu5+pp5EGjTm3hrQdXuCZ1YGhJhm0p t0jR3AytLPkROX+E7AideZ6dqHZsGneu+pkNQmeG5/bft5hSYRzsUT5XH8Ks2lDyggvk4e HoZeEiwKFuu6qtqM2irvgqEM7ZxxD8DMpPKVVim25HZvDr1VwMuF4XzWSxL8Al3KPPhK5P RmtNZfhdkWR9WkrJT6aUww9HmRqSPSJzbH2dI09HSXWSFPUjy1IkYgbO38LE8p+9zzDnsM d6r9O5FcD+ou/ENtLrrZXVXUaLXndxoHwA21fcc/0ujNbkPL4q9qds3oWRS5zw== 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 4jWB1N5mn6zl1K for ; Fri, 20 Nov 2026 10:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 17a65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 10:10:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Elliott Mitchell From: Zhenlei Huang Subject: git: bf362c1b41c8 - main - kobj: convert KOBJOPLOOKUP() to returning pointer to function List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf362c1b41c803c7320147b89915bd6588dd6071 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 10:10:48 +0000 Message-Id: <6b001ca8.17a65.140055b6@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bf362c1b41c803c7320147b89915bd6588dd6071 commit bf362c1b41c803c7320147b89915bd6588dd6071 Author: Elliott Mitchell AuthorDate: 2025-01-10 00:45:05 +0000 Commit: Zhenlei Huang CommitDate: 2026-11-20 10:09:02 +0000 kobj: convert KOBJOPLOOKUP() to returning pointer to function This makes KOBJOPLOOKUP() rather more suitable for purposes outside the macros generated by makeobjops.awk. Of note other callers can lookup the function on their parent class and call that explicitly. Reviewed by: zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48408 --- sys/sys/kobj.h | 20 ++++++++++---------- sys/tools/makeobjops.awk | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h index 890ad1d39a13..3cdbf14d124c 100644 --- a/sys/sys/kobj.h +++ b/sys/sys/kobj.h @@ -247,30 +247,30 @@ extern u_int kobj_lookup_misses; * slow way. */ #ifdef KOBJ_STATS -#define KOBJOPLOOKUP(OPS,OP) do { \ +#define KOBJOPLOOKUP(OBJ, OP) __extension__ ({ \ kobjop_desc_t _desc = &OP##_##desc; \ kobj_method_t **_cep = \ - &OPS->cache[_desc->id & (KOBJ_CACHE_SIZE-1)]; \ + &(OBJ)->ops->cache[_desc->id & (KOBJ_CACHE_SIZE-1)];\ kobj_method_t *_ce = *_cep; \ if (_ce->desc != _desc) { \ - _ce = kobj_lookup_method(OPS->cls, \ + _ce = kobj_lookup_method((OBJ)->ops->cls, \ _cep, _desc); \ kobj_lookup_misses++; \ } else \ kobj_lookup_hits++; \ - _m = _ce->func; \ -} while (0) + (OP##_t *)(_ce->func); \ +}) #else -#define KOBJOPLOOKUP(OPS,OP) do { \ +#define KOBJOPLOOKUP(OBJ, OP) __extension__ ({ \ kobjop_desc_t _desc = &OP##_##desc; \ kobj_method_t **_cep = \ - &OPS->cache[_desc->id & (KOBJ_CACHE_SIZE-1)]; \ + &(OBJ)->ops->cache[_desc->id & (KOBJ_CACHE_SIZE-1)];\ kobj_method_t *_ce = *_cep; \ if (_ce->desc != _desc) \ - _ce = kobj_lookup_method(OPS->cls, \ + _ce = kobj_lookup_method((OBJ)->ops->cls, \ _cep, _desc); \ - _m = _ce->func; \ -} while (0) + (OP##_t *)(_ce->func); \ +}) #endif kobj_method_t* kobj_lookup_method(kobj_class_t cls, diff --git a/sys/tools/makeobjops.awk b/sys/tools/makeobjops.awk index 522fb04ec4d1..f36a9166efbd 100644 --- a/sys/tools/makeobjops.awk +++ b/sys/tools/makeobjops.awk @@ -320,16 +320,16 @@ function handle_method (static, doc) line_width, length(prototype))); } printh("{"); - printh("\tkobjop_t _m;"); + printh("\t" mname "_t *_m;"); if (ret != "void") printh("\t" ret " rc;"); if (!static) firstvar = "((kobj_t)" firstvar ")"; if (prolog != "") printh(prolog); - printh("\tKOBJOPLOOKUP(" firstvar "->ops, " mname ");"); + printh("\t_m = KOBJOPLOOKUP(" firstvar ", " mname ");"); rceq = (ret != "void") ? "rc = " : ""; - printh("\t" rceq "((" mname "_t *) _m)(" varname_list ");"); + printh("\t" rceq "(*_m)(" varname_list ");"); if (epilog != "") printh(epilog); if (ret != "void")