From nobody Wed Jul 03 13:20:19 2024 X-Original-To: dev-commits-src-main@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 4WDgPc0FpJz5PHH7; Wed, 03 Jul 2024 13:20:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WDgPb6562z4pHr; Wed, 3 Jul 2024 13:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720012819; 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=PRhfPY1RFIpV30VE6KFzPUDAFemOiEoqdGoGqFg6+8g=; b=sOLOupCCVNBjPgErtXjRBXnYW7wIL3GtO0qkbnjFdRu+nkSifyj9/Eh7F/BIdH9zy8Y7xs ZJhRofxMAlEH9CGyMgy8dU7IXjXdtL8K/+BaBjGBGnYUa/SyIJF44FM/+NrBiY/vEmt7dd YfbVgkFyteK1/cAZnR3L0lHJRA5WklOE4lSviEE1Cske6UAJQI/WiBYGHssOGRVveAGDnB B+/c9rZanVeS6uIEwpIhc6ToUw0exQmesW+sVnEGpksw0tJBhM+evkClE7gfakT6Oebn7S zT4GAMK00rv8cpX2HpvR669XyyPeCtJtU147Jrsk4uglPEWrFx8OQmQf6EVuwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720012819; a=rsa-sha256; cv=none; b=TVihAR6hvB8yd/zI9amBjBZCO0ldBvoQ2mCqVRhsfNw12aaKsv4ieN20HjAI7VUIJPKN2a vTVfnGP1JdIGu4/3JRGAOUxsfwIhPiK1LHO3U65umeDn/tqTQbayxA8ywMzbh/yhOEvoSk 65P7g2iRzUBMx0Jw48FlCAydoG+unteQAkJbP47NsZg636xtgavCfZnwuCwJwczeO7YwAn 12QCApgpa0oFIKVkatCNn835QNuS9/tVEbCsbcJQ1igePbgHeQHWfid2RniSFLzNpZKUJU p5lJR71p4J4ZdCYFMC5ahzKuydUjZtgQdLRhGWw5z822e01zb5usPu72Yl+jyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720012819; 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=PRhfPY1RFIpV30VE6KFzPUDAFemOiEoqdGoGqFg6+8g=; b=RPHgFPU4zukDbICAzKQYFPqCnJ48Jj9RCduWwa2rzYwd3fuIM/xnMyfi106bkRHL0y2iR2 oDDiyKfNqOvlEAUaM4HD0YOHEONpo7iXnHa2DmGse0J4N31TfrTD/FFsVJEgbp8mpqYFbd 90z9Y/rPaj/YVCj6i7NM0N4P1P1m3i5PpeLEM1EY8uv/XzHYSa9A1LuY1B4lm6taRSBOHC TFcWKcOevVGnhhAHIszfdFRZEfJL5Ol9njP25jNPnnq7S6R0IXvxu2PV9QlQbIKdSJzR9x n9vOYAyIhJfz4W3eCIT4zYA7UhDcu6G8KFq9nGDTVRAE/lqOC8DFDKfyx1ZA9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WDgPb5ZBwzYXS; Wed, 3 Jul 2024 13:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 463DKJCH047373; Wed, 3 Jul 2024 13:20:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 463DKJLa047370; Wed, 3 Jul 2024 13:20:19 GMT (envelope-from git) Date: Wed, 3 Jul 2024 13:20:19 GMT Message-Id: <202407031320.463DKJLa047370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: a2cac544a668 - main - if_clone: Allow maxunit to be zero List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: a2cac544a668d2834ed41986aca32b44b9819c89 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a2cac544a668d2834ed41986aca32b44b9819c89 commit a2cac544a668d2834ed41986aca32b44b9819c89 Author: Zhenlei Huang AuthorDate: 2024-07-03 13:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-07-03 13:14:08 +0000 if_clone: Allow maxunit to be zero Some drivers, e.g. if_enc(4), only allow one instance to be created, but the KPI ifc_attach_cloner() treat zero value of maxunit as not limited, aka IF_MAXUNIT. Introduce a new flag IFC_F_LIMITUNIT to indicate that the requested maxunit is limited and should be respected. Consumers should use the new flag if there is an intended limit. Reviewed by: glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D45757 --- sys/net/if_clone.c | 13 +++++++++---- sys/net/if_clone.h | 5 +++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 8f1bad56d14e..13d89e4e2c59 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -483,12 +483,13 @@ if_clone_alloc(const char *name, int maxunit) struct if_clone *ifc; KASSERT(name != NULL, ("%s: no name\n", __func__)); + MPASS(maxunit >= 0); ifc = malloc(sizeof(struct if_clone), M_CLONE, M_WAITOK | M_ZERO); strncpy(ifc->ifc_name, name, IFCLOSIZ-1); IF_CLONE_LOCK_INIT(ifc); IF_CLONE_ADDREF(ifc); - ifc->ifc_maxunit = maxunit ? maxunit : IF_MAXUNIT; + ifc->ifc_maxunit = maxunit; ifc->ifc_unrhdr = new_unrhdr(0, ifc->ifc_maxunit, &ifc->ifc_mtx); LIST_INIT(&ifc->ifc_iflist); @@ -521,12 +522,16 @@ if_clone_attach(struct if_clone *ifc) struct if_clone * ifc_attach_cloner(const char *name, struct if_clone_addreq *req) { + int maxunit; + struct if_clone *ifc; + if (req->create_f == NULL || req->destroy_f == NULL) return (NULL); if (strnlen(name, IFCLOSIZ) >= (IFCLOSIZ - 1)) return (NULL); - struct if_clone *ifc = if_clone_alloc(name, req->maxunit); + maxunit = (req->flags & IFC_F_LIMITUNIT) ? req->maxunit : IF_MAXUNIT; + ifc = if_clone_alloc(name, maxunit); ifc->ifc_match = req->match_f != NULL ? req->match_f : ifc_simple_match; ifc->ifc_create = req->create_f; ifc->ifc_destroy = req->destroy_f; @@ -584,7 +589,7 @@ if_clone_advanced(const char *name, u_int maxunit, ifc_match_t match, { struct if_clone *ifc; - ifc = if_clone_alloc(name, maxunit); + ifc = if_clone_alloc(name, maxunit ? maxunit : IF_MAXUNIT); ifc->ifc_match = match; ifc->ifc_create = ifc_advanced_create_wrapper; ifc->ifc_destroy = ifc_advanced_destroy_wrapper; @@ -629,7 +634,7 @@ if_clone_simple(const char *name, ifcs_create_t create, ifcs_destroy_t destroy, struct if_clone *ifc; u_int unit; - ifc = if_clone_alloc(name, 0); + ifc = if_clone_alloc(name, IF_MAXUNIT); ifc->ifc_match = ifc_simple_match; ifc->ifc_create = ifc_simple_create_wrapper; ifc->ifc_destroy = ifc_simple_destroy_wrapper; diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h index 45a6d4144230..e11fc5c8cdd7 100644 --- a/sys/net/if_clone.h +++ b/sys/net/if_clone.h @@ -101,6 +101,11 @@ struct if_clone_addreq_v2 { #define IFC_F_SYSSPACE 0x04 /* Cloner callback: params pointer is in kernel memory */ #define IFC_F_FORCE 0x08 /* Deletion flag: force interface deletion */ #define IFC_F_CREATE 0x10 /* Creation flag: indicate creation request */ +#define IFC_F_LIMITUNIT 0x20 /* Creation flag: the unit number is limited */ + +_Static_assert(offsetof(struct if_clone_addreq, destroy_f) == + offsetof(struct if_clone_addreq_v2, destroy_f), + "destroy_f in if_clone_addreq and if_clone_addreq_v2 are at different offset"); struct if_clone *ifc_attach_cloner(const char *name, struct if_clone_addreq *req); void ifc_detach_cloner(struct if_clone *ifc);