From nobody Sat Feb 12 16:47:12 2022 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 68EF819483D3; Sat, 12 Feb 2022 16:47:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JwxGm2XHsz4lnh; Sat, 12 Feb 2022 16:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644684432; 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=MrGZeGNClpis5bzGKzZz4Tt43cXL6m8gaI6H1ALQ7WA=; b=hae3fL3QB+o474QvERwlgaeVoHCxNQPNY/ULpFdXDHaqi+vDBsQ8kVSKmtZgPl60R8IrWq +SoX+C6aGQsI2ARZDohxbBjri6qQJJeRM6dNl80x1wOrDYBMsjv1gHd2h0LeHVOWUwck6A K0c5az9IQ5ryJO3pr5Wu0PzK7svarwLS74JvYGP49XMgi7IzimgAMuUp3hIju/rbosnWu2 8kUfJCyeP8+tzcf5wRgmk1ngW0PmzWLXxFdod+KszT7yC32OeJ1OGGGhGryWplvC6I6ayv fwmv7Lvlrso/uHRGxOfEecOhiEMDzG2gjXlurOBOtVVNwCrK7/U+Ri7+dd8H5Q== 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 3299F3385; Sat, 12 Feb 2022 16:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21CGlCqS042335; Sat, 12 Feb 2022 16:47:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21CGlCeH042334; Sat, 12 Feb 2022 16:47:12 GMT (envelope-from git) Date: Sat, 12 Feb 2022 16:47:12 GMT Message-Id: <202202121647.21CGlCeH042334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 371633ece3ae - stable/13 - Annotate geom_md with MODULE_VERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 371633ece3ae88e3b3d7a028c372d4ac4f72b503 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644684432; 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=MrGZeGNClpis5bzGKzZz4Tt43cXL6m8gaI6H1ALQ7WA=; b=HxLPiIRSUThNxLJctVjMdj4dj6hLdZ6JuQa2+ryrlNywaVXuhQfh4rKVDZ6CUul9kT9w8E UUDJ1VXnlsyfMjpty5Ok1NDwazLwYtfHg2A0K4+BEmTukUBY36yxusGK/TsK5mEPrBu/Pj hA5ctMQ2D7pIVHLHw1Q7q4jj5RrMyP7XckfrYPqzeGV4BQvLkLZMnJg5jCAlfxAOyRvhWR jmd++ftXySgYLmugKrdYfJIIMwTJ4bN0LmKxGSoDvd9aid2N/f8qIyrQjPls/TX/NLwy+c bed9Gys5OdZ5/l2piJCHMVJ+c+XZKjWXx/bCV0oylHbgT9y7qAVN+SmfSInRiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644684432; a=rsa-sha256; cv=none; b=ELJN8EobEFQOs6MsCAmmE14lTwyawOXjniCNXu9q7+eq4aPtZAVvdE9XHnA6aTQEiFu0vW sa2C+p0aFUUWtl8d7Z9j2gJt5+y0bHC6FUVyR4mL0/+tl5u+roolC+P4blL9OX+fgcFL2o 9z9+yomr44sB47V5qXPCbJC7R88eSliVHGZi8dkraV7SECtAZ7B0/ELf9kG8yWKA6uPDLZ rSE/Hxx+3iIEe7CUvPpbn13D05MCVPMHFr8U+q9FaQZ/8lUlBS4Ox6v/CSpHq/nYcLjreX wIL+K7yzGu5TwPftHcYicbUob/cHjuwb+wSrJ0LkoqE0cffVhwoHVNex2ZbEZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=371633ece3ae88e3b3d7a028c372d4ac4f72b503 commit 371633ece3ae88e3b3d7a028c372d4ac4f72b503 Author: Kyle Evans AuthorDate: 2022-02-10 06:15:29 +0000 Commit: Kyle Evans CommitDate: 2022-02-12 16:46:45 +0000 Annotate geom_md with MODULE_VERSION This was missed in 74d6c131cbe2 where other geom modules were annotated with MODULE_VERSION. Again, the problem is the same: we can't detect that geom_md is loaded into the kernel without it. This was noticed in release builds on the cluster; mdconfig attempts to load geom_md because it can't detect it in the kernel, but the cluster config includes md(4) and does not build the kmod. This problem would have been masked on hosts with the kmod built, as the kmod attempts to register the g_md module and fails. With this commit, mdconfig would not even try to load it again. (cherry picked from commit b9c92d631cfb06c12b0d2d9ad29a9f3f0b856237) --- sys/dev/md/md.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 308374f49f14..de0cc9626954 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -223,6 +223,7 @@ struct g_class g_md_class = { }; DECLARE_GEOM_CLASS(g_md_class, g_md); +MODULE_VERSION(geom_md, 0); static LIST_HEAD(, md_s) md_softc_list = LIST_HEAD_INITIALIZER(md_softc_list);