From nobody Mon Dec 30 00:41:22 2024 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 4YLy2p6S4Xz5j590; Mon, 30 Dec 2024 00:41:22 +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 4YLy2p4hPwz4nf4; Mon, 30 Dec 2024 00:41:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735519282; 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=TB3k9eOMTFW6o413ZUVr3tmxqhC3P0pZuGakuuey9iE=; b=bTHS6WIZS2trtidOU2I/lIx9N0mzJqPXbIW4nTPMzqvd+KZwei01psaRloZu2VnmhQzQMy dLMfMgXnqPsX7XuX/Jbt7tVn769s33S1KvMeJgZvI6ZJqvnTMMpXCW6HzfmX9JCrlmC956 qY9Zlhh7iUW0lRT7lss3ogyOuFEOO1Iq0zJKvODvgvWo9uH3cYJ5MvddW0I2+ApcjSwIcO IEQfAdoXByMyyEfI6uh8gHphR13NoFbtWhi9VwAkDoGl963yLIqFtx9xDSkbHiYRurbG4W JJOFiJA+TXXd5qSQ/ksaOhEoyPKCXc2+PjzF6tWjT22gf8LG1emJimCQXoLTaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735519282; 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=TB3k9eOMTFW6o413ZUVr3tmxqhC3P0pZuGakuuey9iE=; b=NRFZYFmanefAgFV1c3Gj6DfvfyzbZ84YG3A0jpNOYZLnnATeKJdFHqSR3a7KtJDNYgYBpb 9q4luMqHc9e+fJR1A9jpr2VAAnzUeSVaUbfUF9cEioFQ7J0nd3LhX98bfhV0gcygYpy9/5 BnHeuHMGs68VQVVG4joJhZ94nxTVHFsFFb5vFZEu2lF+phR+aZYc0Jn2KwR33OpYEIIH84 YLu7++a8dLQdp0jEJdo98go9etkl0LlNOcPh6vTi3uiXjHicnGxeVOJ+VW/Q9yxIRkaNXx F8OwwgDV9BI3EgrM2V69uxAC80hf9BH4LOpORlCgSVeh87spuoSuDqHcmGM0aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735519282; a=rsa-sha256; cv=none; b=S5bi2CjPRnoosEGKJlAKM51GsWdBLJSNX1RLO135GPeUPCIo9GDdAlViKQ45lwd8IW7VPQ YfPjd9DJYefmLFBjowGXL5nc8C30sVmd9P76JI3VbDSzbK7x9kgXTD/qSnZhKZQW0UvrMu A1K/idSVi/uonkdD/7jYpUJ/37D7Z63EQkyu4P/jjUTTi4KrheZLZgV6xdkLeWURObbL+W fgqokmra18qBptzIES3XcsFeQimmfE4hk+4uaaCXZ9zHqng/f7vRPLyGD1+2gNFRE/Z/4N Urx3jmnsaqCsc0ArUMe9vXT9pDeSjy7r/6LV/pZfzF8CCXtI20AHWxM3289ocw== 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 4YLy2p4Hk4zY7J; Mon, 30 Dec 2024 00:41:22 +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 4BU0fMnB076874; Mon, 30 Dec 2024 00:41:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BU0fMO3076871; Mon, 30 Dec 2024 00:41:22 GMT (envelope-from git) Date: Mon, 30 Dec 2024 00:41:22 GMT Message-Id: <202412300041.4BU0fMO3076871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: a314c60625af - main - mount(8): Avoid truncation when fstab-formatting unionfs mount info 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a314c60625af1829b7e12c3a4cedb74d7f69d074 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=a314c60625af1829b7e12c3a4cedb74d7f69d074 commit a314c60625af1829b7e12c3a4cedb74d7f69d074 Author: Jason A. Harmening AuthorDate: 2024-12-22 06:36:30 +0000 Commit: Jason A. Harmening CommitDate: 2024-12-30 00:39:49 +0000 mount(8): Avoid truncation when fstab-formatting unionfs mount info When displaying unionfs mounts in fstab format (`mount -p`), mount(8) currently uses strlcpy to remove the disposition prefix from the mount name returned by getmntinfo(3). But strlcpy, like strcpy before it, does not guarantee correct behavior if the source and destination buffers overlap. Just offset the buffer and avoid the destructive copy in the first place. PR: 283420 Reviewed by: imp (previous version), olce MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48177 --- sbin/mount/mount.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 1b8eceb9a6ed..cf603a63e394 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -892,9 +892,11 @@ void putfsent(struct statfs *ent) { struct fstab *fst; + const char *mntfromname; char *opts, *rw; int l; + mntfromname = ent->f_mntfromname; opts = NULL; /* flags2opts() doesn't return the "rw" option. */ if ((ent->f_flags & MNT_RDONLY) != 0) @@ -905,16 +907,14 @@ putfsent(struct statfs *ent) opts = flags2opts(ent->f_flags); opts = catopt(rw, opts); - if (strncmp(ent->f_mntfromname, "", 7) == 0 || - strncmp(ent->f_mntfromname, "", 7) == 0) { - strlcpy(ent->f_mntfromname, - (strnstr(ent->f_mntfromname, ":", 8) +1), - sizeof(ent->f_mntfromname)); + if (strncmp(mntfromname, ":", 8) == 0 || + strncmp(mntfromname, ":", 8) == 0) { + mntfromname += 8; } - l = strlen(ent->f_mntfromname); + l = strlen(mntfromname); xo_emit("{:device}{P:/%s}{P:/%s}{P:/%s}", - ent->f_mntfromname, + mntfromname, l < 8 ? "\t" : "", l < 16 ? "\t" : "", l < 24 ? "\t" : " "); @@ -930,7 +930,7 @@ putfsent(struct statfs *ent) l < 8 ? "\t" : " "); free(opts); - if ((fst = getfsspec(ent->f_mntfromname))) + if ((fst = getfsspec(mntfromname))) xo_emit("{P:\t}{n:dump/%u}{P: }{n:pass/%u}\n", fst->fs_freq, fst->fs_passno); else if ((fst = getfsfile(ent->f_mntonname))) From nobody Mon Dec 30 14:59:33 2024 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 4YMK51694sz5k3JY; Mon, 30 Dec 2024 14:59:33 +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 4YMK515NLmz4fnQ; Mon, 30 Dec 2024 14:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735570773; 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=YbTT5K0dYJniKh/nuKpPks5klM3fPsAqBOBnktojVp8=; b=p8llVD6OFIj1BTmm81Eh8bJjYRP/n7PdfpDgvypcrK++vfyuCVPodQbVe0N/MqOhIWo9Qt EeiajO4DBFfWicwtRMYyLMNyenA8mNq0nnb/9ZaDi98DGdmUBE93VNrQrbHFa2ozgmAlPN pMn+jNG+iwanlPDZB6saQ5Wu5zhgounB40sRb+VNIvjVkRjX/XD6e8yZKKdBXSpdBCkKp9 JK4b9pkvknge/zF2Gu4WX4LXyP80G1jKdhC4eBAj8EVLySsh6BUlwXphrZOqFzzSmuUPU/ NWPHN1xwIGtKV1PSHhAj8umiKtnOI1zuyum4+z7YAS+pCSZxgBev1UQ0jFLTVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735570773; 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=YbTT5K0dYJniKh/nuKpPks5klM3fPsAqBOBnktojVp8=; b=nNgUBOZEJaRapDbLeDeWQxPtJ1DqyRBrLvPst0KgjjBcvF0gkXHv/W1/iByfVPsbgADDOk A45OoFiCl9nQhaO2RtY6TYmzWlr6X9o99zutmqeQtdLoNAKKulkv5OFAvMorC82TLLVIaY 4AUU/zVLevZIHNzuR3PNg3mw6BdH2RXI3Q3mDOrydbqmwqpkpRnkeFxqzw6lCFk8zxOreS mytlWTaMabfe3BVJLae66F0F84GYBgOkDeNA8jDd1By7WtnOa4fVEzQANZA8NF1PC71XiJ ItSX9qJaQKmR2TzIy2JwFlvvhPfoSGXFagZWIzvCrzbx/ua4WgiLsouJAkqXZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735570773; a=rsa-sha256; cv=none; b=kluLVKgPCfFxmUK/K8oVoDFRK4x3l7cwBAb9MYnJeqC8cBrHstgSrRkvqX0KaVnJqytX32 eTkm1NJJ+9T6ZILk5MInx8PQg4/aP8TkfNPI0B6TVvhGdOMREIZ3O6Ho1KZ9XcQIbDyOSX HkQ8YfQouCT+MoLyfv9fRED/zTrBUam7G/MuV7Nfa/bIifHlO3DkfQLaCEgOV+PlkZ/eBM 9dWWd5q5KapEqyuikqaxuQNSCxsn1QvatN96mY8z0cExn/nVMz72rUnDSaa/LsBIf3hbp6 ahilokrBanI9RZBZLLbBBieTtwCjswe6RSlheiQqPv4UtiJa/vgxYSWWFw+O4A== 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 4YMK514sCczyVL; Mon, 30 Dec 2024 14:59:33 +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 4BUExXfP066719; Mon, 30 Dec 2024 14:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUExXsb066715; Mon, 30 Dec 2024 14:59:33 GMT (envelope-from git) Date: Mon, 30 Dec 2024 14:59:33 GMT Message-Id: <202412301459.4BUExXsb066715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 895347fc10c5 - main - TCP BBR: remove assignments without effect 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 895347fc10c5b06bddadcc2937fdcf298c7e1114 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=895347fc10c5b06bddadcc2937fdcf298c7e1114 commit 895347fc10c5b06bddadcc2937fdcf298c7e1114 Author: Michael Tuexen AuthorDate: 2024-12-30 14:57:11 +0000 Commit: Michael Tuexen CommitDate: 2024-12-30 14:57:11 +0000 TCP BBR: remove assignments without effect No functional change intended. Reviewed by: rrs CID: 1523772 CID: 1523777 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48215 --- sys/netinet/tcp_stacks/bbr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 01a864f59bbe..24c3685f139a 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7324,11 +7324,9 @@ bbr_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, p_maxseg = min(bbr->r_ctl.rc_pace_max_segs, maxseg); th_ack = th->th_ack; if (SEQ_GT(th_ack, tp->snd_una)) { - acked = th_ack - tp->snd_una; bbr_log_progress_event(bbr, tp, ticks, PROGRESS_UPDATE, __LINE__); bbr->rc_tp->t_acktime = ticks; - } else - acked = 0; + } if (SEQ_LEQ(th_ack, tp->snd_una)) { /* Only sent here for sack processing */ goto proc_sack; From nobody Mon Dec 30 15:02:12 2024 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 4YMK841swXz5k47Z; Mon, 30 Dec 2024 15:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMK841H4Lz4gWH; Mon, 30 Dec 2024 15:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735570932; 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=yDaF4OiPU/jBz1WixIDw4xNz0RUgT+73Hs3RtmzPJxk=; b=B+s9VyKMKsno47CC2FIKUURuD6AdAoe2wpCnDZ+U2m/zq0tboVaOgPGWUKta0GOeNREmXZ fmPh8j/ILdH1BLn/Sr//bQ7PbT0YfNt29QlNrEDuiyGgKQOCsh5T+kBwRjvJHRujvXEZg4 vt9/kGzd6hWve6Cw/0qqTlWjMPVdrRGcgNOmW9Z8ZvySRw7v+jo7MU7oSQeqBXL1NZYu56 sMLhsrbv884a9GJd7EMHNtcEPqmuIDcojnzyWdDqI35Z5sgNfssTId/OoouzqKADZ5nJMt ZNNB8MCz+EmV4Sr+Eq3Q5bEoQV1ARAKIsGSdSl+c2m9OSeqbpPWr7OaqLbiF3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735570932; 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=yDaF4OiPU/jBz1WixIDw4xNz0RUgT+73Hs3RtmzPJxk=; b=GfDwAmISyuY27jlY4QJfJMlDvOzp67hXviqZbH1QY9/95pwhguiOvZ2FIqtq988hyv5ugm 3GWB2/R0elMdANMQZ90vWdQpVhka520Lu2p5n4R06k9xqRUBWt8tEzS9k2wTtmWJydJWbJ fB/sZlh23V4XE+NNgD14H5DJ1vLQpGhx/l+fyPZ6s5tF+TZWcUjUGUsWBAWGG3GufjcrKN HxyC3+Rhc4aMcbnQx4uKY1AXnk0ob9n88o3R7OYd7ZX1GWpDiC4nuHHAE7tufUcCq3pIMo d9xMJnsPldqv2S5mfRtgVY0jlHUsMXOr+kY3F3bn5pcHm/n/Inwb4PdG44kubw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735570932; a=rsa-sha256; cv=none; b=Te+1Hz/nU1Fd+YYrRK6oDPeD1H13tVjCki/QXje1nr/dsNnVH+fVVAuBME7goIUeV3h4OW ax1l2WlfY7cds07q7uLN/mCv3Rv/OQQ91KtEoNmBckrClWV/C48NO0wteOjFkn6A26bUai 0fBFpJfXwteOx8Zgnv5As7WsIdYPFcyncY9k0sy2jtkEdxkkgd3lZeu7vawSByvTc6Uue+ G1UiI/eXSsSMh74VS7BW8KBBTh2tvplYQKBoQZm0dm7aJkwHtGRr4DIG5Atci2fV1esbNa 5uNz+PrG6WfDe/Ojyg534dhbpXhwSqCOStwR+7dWcE+iyu8JyCX3sEOHQiCAvQ== 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 4YMK840sjvzyVx; Mon, 30 Dec 2024 15:02:12 +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 4BUF2Cqg084167; Mon, 30 Dec 2024 15:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUF2CIw084164; Mon, 30 Dec 2024 15:02:12 GMT (envelope-from git) Date: Mon, 30 Dec 2024 15:02:12 GMT Message-Id: <202412301502.4BUF2CIw084164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 16e8e99f1d41 - main - TCP RACK: remove redundant check 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16e8e99f1d412103d8f42e5ed740555c545bffc5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=16e8e99f1d412103d8f42e5ed740555c545bffc5 commit 16e8e99f1d412103d8f42e5ed740555c545bffc5 Author: Michael Tuexen AuthorDate: 2024-12-30 15:00:11 +0000 Commit: Michael Tuexen CommitDate: 2024-12-30 15:00:11 +0000 TCP RACK: remove redundant check No functional change intended. Reviewed by: rrs CID: 1523811 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48216 --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 9561c957bb00..da68060dd1d2 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -22978,7 +22978,7 @@ rack_process_option(struct tcpcb *tp, struct tcp_rack *rack, int sopt_name, switch (sopt_name) { case TCP_RACK_SET_RXT_OPTIONS: - if ((optval >= 0) && (optval <= 2)) { + if (optval <= 2) { rack_init_retransmit_value(rack, optval); } else { /* From nobody Mon Dec 30 15:04:49 2024 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 4YMKC55gnsz5k48f; Mon, 30 Dec 2024 15:04: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 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 4YMKC54mtnz4gdW; Mon, 30 Dec 2024 15:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735571089; 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=YoFA9ruGMOI16Zampn2QVo9OHmDdP9+Ts9alsPMeWCc=; b=a3BdzJ2CKkolrvnyIwhgKcCFCVXiErj9ClhMNr1q5jcQ1n/mZDO2pbBR7H9CUcAo4Ib/t1 kRy7PrruGPHAKPBFtnH78LieCrcLQOqAroSm81OyuVZIAIuzI3yEhVLgIWxMDDxd/euSko nZrg4rUQkNenrAd+floACTPo60H+QSfDhe6owcaF+qXrhV/Wz+gL/MsPW10OmEMeEMzfmp 7MYmVXTgAajzM1XOZrHcVK5zJbiRPYvDIBtwHc1G+ucBDvCtjwQ/vSeeBpyd2CKN5SUIow +6U5TvVWvV9ZyTrah4RPnXYM547VC3tmSRma6ANxOYmsUdsap47/s82wmW4iXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735571089; 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=YoFA9ruGMOI16Zampn2QVo9OHmDdP9+Ts9alsPMeWCc=; b=juui1LX91P9drdXnZYKP4TxU23PdV4H/THXRp3WUCR4BkUyuHvsnsvOoIDwgboP/NXvCwK QlKot5iQkc+pBeuiVRG4gUrhoR0Iqw00mXjuQSm+Ced9ZwBTuQkgQez0m9j49Ci+AT+N8R NAcn1WGQRznyl8JmRvQXDof9t+J9fR9EMD3Ny94cV2YivO01eohkiBv3nnlD0msGrUtWaD 1yd+zndiKwstI78T3q1A9LldtfJLsts1SJvfalfZtTxKXnYtPVs7AhGuTmbAELtW4JuFEV RK5hlwBQKC0Jz3ZvAWFQ0nNgiuU8kqvstVvS0ExNWazab/64GoOK/MHo7AwaJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735571089; a=rsa-sha256; cv=none; b=nr0zoYRgqq+L282g6+P0lqEk7Zk3kO8nb0SjBecczenFOLTX8tqooLjm8IHwORdrLsiZ3H hFcl8eSONCccAS6Hr12/eE2YC0eRzcAhkJJmdoL58Hd+wpABXC7t2fmLn3Y/kBQHgYNnC4 +6NEoFu3DY8grGqzHx/1WUdMqS9y0VFQGP2nE3GOQTCmmy3mLxxh2VlR7hjTwFB0GNMTZJ tCtIyN8OYqw+yxMOcvmY1tWTYDjh8xXpLWwDbNJ4XQuFX3Sjjjz6o/OA2uqdQKAkV91abc Wmng5MuM+UMApnjoZnl7nd1m/+jG4vw1MuOJNS4EKKsd/W034k/CvtOSs+oELA== 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 4YMKC53zhKzyxJ; Mon, 30 Dec 2024 15:04:49 +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 4BUF4nDn084990; Mon, 30 Dec 2024 15:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUF4nM3084987; Mon, 30 Dec 2024 15:04:49 GMT (envelope-from git) Date: Mon, 30 Dec 2024 15:04:49 GMT Message-Id: <202412301504.4BUF4nM3084987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b5739c8b1222 - main - TCP RACK, BBR: ensure return value is always ininitialized 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5739c8b12226c791bc8e7a4ac6e48965333509a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b5739c8b12226c791bc8e7a4ac6e48965333509a commit b5739c8b12226c791bc8e7a4ac6e48965333509a Author: Michael Tuexen AuthorDate: 2024-12-30 15:02:43 +0000 Commit: Michael Tuexen CommitDate: 2024-12-30 15:02:43 +0000 TCP RACK, BBR: ensure return value is always ininitialized Do not return an uninitialized value from ctf_do_queued_segments() in case no packets are actually processed (all are skipped). Reviewed by: rrs CID: 1523774 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48217 --- sys/netinet/tcp_stacks/rack_bbr_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 150298f8413f..156091feeb30 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -478,7 +478,7 @@ skipped_pkt: if (no_vn == 0) { CURVNET_RESTORE(); } - return(retval); + return (0); } int From nobody Mon Dec 30 17:32:34 2024 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 4YMNTb1KsSz5hVD2; Mon, 30 Dec 2024 17:32:35 +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 4YMNTb0n7Pz3wng; Mon, 30 Dec 2024 17:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735579955; 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=BbCmA9sKiZpuoFXlB0HfO6YfIoOlwgruPT2q/cLlcdQ=; b=eI3T67YsUmD5iFunX0s+JN/+6OPfyY+aHmQWDDDm7eTJW6IF370xZ7etAfdAv/M4ypnniq 3+ACXuOh3E5HUvj8I8LMYcA7rGjJJAVY8dVmqz2kyUMnzv2H6aIcjO8Ye05vCLqJ0RUKZ2 INzLX2aqatQgNO0iobc1FqD6JQJNfQWXazVjmAktr1e2RHplClqL0nsK4mqETCTZzeK4np 6JyuuxW0deN8znuNC6PnS+DN4B0HR4Ub53F/6PanbgsoSuEHq/TpkzFQHhIMIcIKx1XhTe /BrobQElh8Y+5OueJE4XvvR5enL1dslVrO7qAF/i56i9Ck3ghmR7gOYKcTsbPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735579955; 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=BbCmA9sKiZpuoFXlB0HfO6YfIoOlwgruPT2q/cLlcdQ=; b=PUVFwvJIOR50CQR4QR43wqNNyN1no+hlfvHPPAEH9e/JvyQiexkiiqoMoRL8QHfAVM9kI/ 8aw2K+QuCIwC0/FXzFglAqTZUy6w4tmMy7ZRgCeQRioAj10knPqr47k1+OgwFmN5L2Hytd 0uErisBYAuE+aP4E0BLV0PE+lcaJuYyyYMvFlNVKY2N+WMVBrQ4KgQRVNAGbmDNCwsev20 pB27DqhPeoHftE35Wt4QPOq6acQl8Kj+FI2fgdU/HeyDQxNz11fFAsuxRvClu+1QlDERmi IdkR3hnTOIGgwfa38dj8krrdDz0iANaQ4oDMTVDH8p50n+l0quFM0ihwPEuxZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735579955; a=rsa-sha256; cv=none; b=hYhafOhydxmjxCkiQyK0Cz6+Icm/uHGiAnWaP+CcMD3hQlbIhIP7TOaAuJHKkmiYk9vSVs z0ZSgMdPUOLXkjxTYlFKWENp8njGT2jQdJcpewoYMZHN//gBfgrPGRhjL3IIqoEF6zqls5 CP8wGl7MiH9iW+GfkvMBpTxDQYGR/JB9UdzfhedyjXbxzqWJ+6OV2x2iAMI2Qsz7nj1gJN nuUjB/fAHxamIHIOLP/faKXhUHc0lqMkIUAwJloN/OyCfDFIv0ryYGb2UA7FuRlIMPjwaR BTA45T/J+4vZMt7/94696douJXyH0XqUClmpcRAmYQ1F7etBXSpqkrMiUwUYxg== 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 4YMNTb0NH5z13pn; Mon, 30 Dec 2024 17:32:35 +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 4BUHWYTH062999; Mon, 30 Dec 2024 17:32:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUHWYKU062996; Mon, 30 Dec 2024 17:32:34 GMT (envelope-from git) Date: Mon, 30 Dec 2024 17:32:34 GMT Message-Id: <202412301732.4BUHWYKU062996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 10fa3f2518d4 - main - certctl: Set METALOG ownership to root:wheel 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10fa3f2518d4582c98d74527f79af9f30b1eceab Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10fa3f2518d4582c98d74527f79af9f30b1eceab commit 10fa3f2518d4582c98d74527f79af9f30b1eceab Author: Pat Maddox AuthorDate: 2024-12-15 09:20:24 +0000 Commit: Ed Maste CommitDate: 2024-12-30 17:32:23 +0000 certctl: Set METALOG ownership to root:wheel This sets the correct ownership values when building base.txz PR: 283340 Reviewed by: allanjude Pull request: https://github.com/freebsd/freebsd-src/pull/1550 Signed-off-by: Pat Maddox --- usr.sbin/certctl/certctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index f95b4561d852..d336a02fd4ea 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -5,7 +5,7 @@ # Copyright 2018 Allan Jude # # Redistribution and use in source and binary forms, with or without -# modification, are permitted providing that the following conditions +# modification, are permitted providing that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. @@ -334,7 +334,7 @@ fi : ${METALOG:=${DESTDIR}/METALOG} INSTALLFLAGS= if "$UNPRIV" ; then - INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}" + INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR} -N ${DESTDIR}${DISTBASE}/etc -o root -g wheel" fi : ${LOCALBASE:=$(sysctl -n user.localbase)} : ${TRUSTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs} From nobody Mon Dec 30 18:52:41 2024 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 4YMQG1473Zz5hc0F; Mon, 30 Dec 2024 18:52:41 +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 4YMQG13Ydrz455b; Mon, 30 Dec 2024 18:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735584761; 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=CT45DGUxeTccbRpCYSCmQoARWpH9G8UnPBbQ6ydEyAU=; b=MIpWzQC4QuJHn5KKu/uuMTMiopY4gx2Uv1Nt0VKu/AhwhZtnemqnxNZQhsEgzqFb5YaMhR 5syBKdNNqvV8q+GhBjhnKsr8VKpgqes5xKOpI3OawE/AJWxYx+4r5IHBCLhigbN4Fod6g+ StKgPq0t7N3q8BfhviON7XtaCxpq0NMnkLYtxBSQz7uPdlRRr11tmejLFupusFj32xJs5a XF9V6/9sC1w7MPhUtfYWocLpi47acXLnwnXDP81yqnoT+GqtU2L70qF1nue7+/+u+daGIP lu7YbD0Js6W7UIgtFZO8MPYEjtbFdrUnkdYB2yX1FSCD1JFGZkWwruI6gJdyqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735584761; 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=CT45DGUxeTccbRpCYSCmQoARWpH9G8UnPBbQ6ydEyAU=; b=bjbS5IwlQjNi9efX5qIvelB31UtzbIFADnSPRgaKAg04YsmOAPPVSuph2SLyOaqJExNfZF e7Qz8l4tuc6O7ObTa1jow/G07i5AlkRvZlxOHc2LG3kz4HcrWrcIzXfPVgfitbbf0akPKD KRUDsuTUSBViyQWFo/SRJDBVBm99uLuIttA6aSqR/pwWApgJhxq49GRuRcsLy1W5S5XvHW 1T5Fxje1o+Peer+2SzdGu9YwvRCTEz0989SYXiSWexxGzVGaZ8HgDba3bwK0vS9MIROO5R zKyCne+2QnzkKWfS7QoY1vT8N6H5Ob/QOh2q3ILFdBo7Lyhpn5QBxROR2QHpJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735584761; a=rsa-sha256; cv=none; b=M4RCtdBwl4DHX3hfnynl/DgusATGP9UsJ4zx6V9IJ95WWVTnTd4gBrIcuYLSnXuJXAnX7J YX9Y+IM86gGdJ1NIRdEZR5B30sFlA0r7axO8pqK9sFPj1gxxTaaH3qehScejwC7k91kOkp Ipa+mIft6mAjbOjMyeLGtab6aepqHPTwNjWYi8H5OESSmhNcUTbl5Z41PJjomm5bVfHy3A BOlpZigIDaNA/xlLt3HGdDp86yWiLVPWkRGCo6Vq0sRwqanpdaAx2DJiar23YnuPR5yQ6L SKe2HmRlW8DY1gC11cTHM7nsxo3AgfW3a+kuW1p1/Xr9TbbA5gJOsJzbqAlb1w== 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 4YMQG138gjz14w1; Mon, 30 Dec 2024 18:52:41 +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 4BUIqfk1012407; Mon, 30 Dec 2024 18:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUIqfIm012404; Mon, 30 Dec 2024 18:52:41 GMT (envelope-from git) Date: Mon, 30 Dec 2024 18:52:41 GMT Message-Id: <202412301852.4BUIqfIm012404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8a50aa09019a - main - nv: Add header for nvlist_t declaration 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a50aa09019a4230374f48c2f7411342f26b7475 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8a50aa09019a4230374f48c2f7411342f26b7475 commit 8a50aa09019a4230374f48c2f7411342f26b7475 Author: John Baldwin AuthorDate: 2024-12-30 18:51:48 +0000 Commit: John Baldwin CommitDate: 2024-12-30 18:51:48 +0000 nv: Add header for nvlist_t declaration This can be useful for headers that wish to use nvlist_t pointers in a structure or function argument without pulling in all of the headers from . Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48229 --- sys/sys/_nv.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cnv.h | 8 +------- sys/sys/dnv.h | 8 +------- sys/sys/nv.h | 8 +------- tools/build/Makefile | 1 + 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/sys/sys/_nv.h b/sys/sys/_nv.h new file mode 100644 index 000000000000..2baac37f7715 --- /dev/null +++ b/sys/sys/_nv.h @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2009-2013 The FreeBSD Foundation + * + * This software was developed by Pawel Jakub Dawidek under sponsorship from + * the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __NV_H_ +#define __NV_H_ + +#ifndef _KERNEL +#include +#endif + +#ifndef _NVLIST_T_DECLARED +#define _NVLIST_T_DECLARED +struct nvlist; + +typedef struct nvlist nvlist_t; +#endif + +#endif /* !__NV_H_ */ diff --git a/sys/sys/cnv.h b/sys/sys/cnv.h index 7741a64b9037..095533d08351 100644 --- a/sys/sys/cnv.h +++ b/sys/sys/cnv.h @@ -30,6 +30,7 @@ #define _CNV_H_ #include +#include #ifndef _KERNEL #include @@ -39,13 +40,6 @@ #include #endif -#ifndef _NVLIST_T_DECLARED -#define _NVLIST_T_DECLARED -struct nvlist; - -typedef struct nvlist nvlist_t; -#endif - __BEGIN_DECLS /* diff --git a/sys/sys/dnv.h b/sys/sys/dnv.h index 93ba9429bfc6..8ef10a184ad6 100644 --- a/sys/sys/dnv.h +++ b/sys/sys/dnv.h @@ -32,6 +32,7 @@ #define _DNV_H_ #include +#include #ifndef _KERNEL #include @@ -41,13 +42,6 @@ #include #endif -#ifndef _NVLIST_T_DECLARED -#define _NVLIST_T_DECLARED -struct nvlist; - -typedef struct nvlist nvlist_t; -#endif - __BEGIN_DECLS /* diff --git a/sys/sys/nv.h b/sys/sys/nv.h index 6219eac6a827..fe7e6ac10891 100644 --- a/sys/sys/nv.h +++ b/sys/sys/nv.h @@ -34,6 +34,7 @@ #define _NV_H_ #include +#include #ifndef _KERNEL #include @@ -43,13 +44,6 @@ #include #endif -#ifndef _NVLIST_T_DECLARED -#define _NVLIST_T_DECLARED -struct nvlist; - -typedef struct nvlist nvlist_t; -#endif - #define NV_NAME_MAX 2048 #define NV_TYPE_NONE 0 diff --git a/tools/build/Makefile b/tools/build/Makefile index faf130f3d99c..f4bb383693a8 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -275,6 +275,7 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h # Needed to build config (since it uses libnv) +SYSINCS+= ${SRCTOP}/sys/sys/_nv.h SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ ${SRCTOP}/sys/sys/dnv.h ${SRCTOP}/sys/sys/nv_namespace.h From nobody Mon Dec 30 18:52:42 2024 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 4YMQG26h9fz5hc2g; Mon, 30 Dec 2024 18:52:42 +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 4YMQG24YWbz455c; Mon, 30 Dec 2024 18:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735584762; 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=d3F6hoiRo9CBSnACxaI8HYELyVD17URMNEpKrCKEejY=; b=JXOOAYYZtP+gXTRK42lXmguKKFml+jn5zsKgW6slGf7OmkyO4+E1ZNcm3tvz+A8WrzGEG4 Cu43rUO2muEnb0cUYLzWd8EzvtXpetByLFuu4iiO0APraeMWMY9OeVL1Qad+IGv4L8IYD8 ZOZ/r4nrk/1k4ldRLOjKiEbzYt3b24kHPCHxaDpIF9Dvhhip2oAzIt2/K+lnM2kNHRWaOw 9z+V+2TDPsUpYEF8iE9u0OJNMz8BkPU+T9w7mR8uMlzkf2CkpuPKvqCYIVAE1aklOQ//4Y CttawlX5uvT3PPyQQP5QduEpvr4TagW/x7v5QqGB9W30PkjYmwPOA7nVKZxavA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735584762; 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=d3F6hoiRo9CBSnACxaI8HYELyVD17URMNEpKrCKEejY=; b=Zn1RHnBh9ix/pWW4mQmEJqxP3mDaLydeSkswHJeES99DU6I1ZBY/amnZ0Elv9esQmr8xah jjC0WJBXy4Y5UXM75wn73D0dzqFD3F+pkVJsTeg22cXqVHPKimHPWIeiFdQx5+g7SmV4uV d+T5OH5cvEy0twqL3ZXuy7sZKxYS3TGRTXz9wXl8HV89nQmBoa6CWzzGf/zRzSaNin5qi0 4uJQj0RBwhiUffEho/B6Sc5YAMK2f4AWR9u9ZvT9RO9U2dSKKncuZRWAc/ciVU5/GnWVGA TQkgmKoORv8UNYeqbR6CuGtnlarHzdTiwyW2pUg55Ssu4ownaTJ8qNWtzHqqWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735584762; a=rsa-sha256; cv=none; b=E9D8bJXRWRWDXiQbTmdD8sndooUiD03l413CqxJZr/tk3OiiH2NZ7huS3Fw06GFh+aELfr rBJKExpO9rDSuNSzQTUykz+2qvpCyR5Y49lT+Mh4BaSjasMPOZ41ktXHca/B+Jsl+1TbQ1 tg9BaIkOKw9QriQxpw3sCeLqs0z/f1WiyIqk4jgPJeDCH09OouO/4DsENRAAqoqkU1FZoz t4hb+HLysINjbYq5xysucYMIkRLHDwNbHm7wUlg4OCS8vKZsO2goeA2T1rpO+x2vz6P3bN LGQ8Ix2VKY/BhaIAsSm/3lbZh83CvYTLy9Q7hx8qHuSGwOgxLtQJdY9zJhInFw== 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 4YMQG249Mzz161y; Mon, 30 Dec 2024 18:52:42 +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 4BUIqgXT012477; Mon, 30 Dec 2024 18:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUIqgA7012474; Mon, 30 Dec 2024 18:52:42 GMT (envelope-from git) Date: Mon, 30 Dec 2024 18:52:42 GMT Message-Id: <202412301852.4BUIqgA7012474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 365b89e8ea4a - main - nvmf: Switch several ioctls to using nvlists 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 365b89e8ea4af34a05f68aa28e77573e89fa00b2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=365b89e8ea4af34a05f68aa28e77573e89fa00b2 commit 365b89e8ea4af34a05f68aa28e77573e89fa00b2 Author: John Baldwin AuthorDate: 2024-12-30 18:52:21 +0000 Commit: John Baldwin CommitDate: 2024-12-30 18:52:21 +0000 nvmf: Switch several ioctls to using nvlists For requests that handoff queues from userspace to the kernel as well as the request to fetch reconnect parameters from the kernel, switch from using flat structures to nvlists. In particular, this will permit adding support for additional transports in the future without breaking the ABI of the structures. Note that this is an ABI break for the ioctls used by nvmf(4) and nvmft(4). Since this is only present in main I did not bother implementing compatability shims. Inspired by: imp (suggestion on a different review) Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48230 --- lib/libnvmf/Makefile | 2 + lib/libnvmf/internal.h | 10 +- lib/libnvmf/libnvmf.h | 9 +- lib/libnvmf/nvmf_controller.c | 21 ++- lib/libnvmf/nvmf_host.c | 87 ++++++++---- lib/libnvmf/nvmf_tcp.c | 23 ++-- lib/libnvmf/nvmf_transport.c | 47 +++++-- rescue/rescue/Makefile | 2 +- sbin/nvmecontrol/reconnect.c | 18 ++- share/mk/src.libnames.mk | 1 + sys/cam/ctl/ctl_ioctl.h | 2 +- sys/dev/nvmf/controller/ctl_frontend_nvmf.c | 58 +++++--- sys/dev/nvmf/controller/nvmft_controller.c | 19 ++- sys/dev/nvmf/controller/nvmft_qpair.c | 15 +-- sys/dev/nvmf/controller/nvmft_var.h | 11 +- sys/dev/nvmf/host/nvmf.c | 197 ++++++++++++++++------------ sys/dev/nvmf/host/nvmf_ctldev.c | 13 +- sys/dev/nvmf/host/nvmf_qpair.c | 21 +-- sys/dev/nvmf/host/nvmf_var.h | 13 +- sys/dev/nvmf/nvmf.h | 100 ++++++++------ sys/dev/nvmf/nvmf_tcp.c | 40 ++++-- sys/dev/nvmf/nvmf_transport.c | 92 ++++++++++++- sys/dev/nvmf/nvmf_transport.h | 24 +++- sys/dev/nvmf/nvmf_transport_internal.h | 3 +- usr.sbin/nvmfd/ctl.c | 4 +- 25 files changed, 557 insertions(+), 275 deletions(-) diff --git a/lib/libnvmf/Makefile b/lib/libnvmf/Makefile index dbba6b476510..b01f5ab82cac 100644 --- a/lib/libnvmf/Makefile +++ b/lib/libnvmf/Makefile @@ -14,6 +14,8 @@ SRCS= gsb_crc32.c \ nvmf_transport.c \ nvmft_subr.c +LIBADD= nv + CFLAGS+= -I${SRCTOP}/sys/dev/nvmf/controller CFLAGS+= -I${SRCTOP}/sys/dev/nvmf diff --git a/lib/libnvmf/internal.h b/lib/libnvmf/internal.h index cf45c15ba2f0..7b3d4fbb03ef 100644 --- a/lib/libnvmf/internal.h +++ b/lib/libnvmf/internal.h @@ -8,6 +8,7 @@ #ifndef __LIBNVMF_INTERNAL_H__ #define __LIBNVMF_INTERNAL_H__ +#include #include struct nvmf_transport_ops { @@ -23,9 +24,8 @@ struct nvmf_transport_ops { const struct nvmf_qpair_params *params); void (*free_qpair)(struct nvmf_qpair *qp); - /* Create params for kernel handoff. */ - int (*kernel_handoff_params)(struct nvmf_qpair *qp, - struct nvmf_handoff_qpair_params *qparams); + /* Add params for kernel handoff. */ + void (*kernel_handoff_params)(struct nvmf_qpair *qp, nvlist_t *nvl); /* Capsule operations. */ struct nvmf_capsule *(*allocate_capsule)(struct nvmf_qpair *qp); @@ -110,7 +110,7 @@ extern struct nvmf_transport_ops tcp_ops; void na_clear_error(struct nvmf_association *na); void na_error(struct nvmf_association *na, const char *fmt, ...); -int nvmf_kernel_handoff_params(struct nvmf_qpair *qp, - struct nvmf_handoff_qpair_params *qparams); +int nvmf_kernel_handoff_params(struct nvmf_qpair *qp, nvlist_t **nvlp); +int nvmf_pack_ioc_nvlist(struct nvmf_ioc_nv *nv, nvlist_t *nvl); #endif /* !__LIBNVMF_INTERNAL_H__ */ diff --git a/lib/libnvmf/libnvmf.h b/lib/libnvmf/libnvmf.h index f15277a02621..44f13fda5ddd 100644 --- a/lib/libnvmf/libnvmf.h +++ b/lib/libnvmf/libnvmf.h @@ -8,6 +8,7 @@ #ifndef __LIBNVMF_H__ #define __LIBNVMF_H__ +#include #include #include #include @@ -249,7 +250,8 @@ uint64_t nvmf_get_log_page_offset(const struct nvme_command *cmd); /* Prepare to handoff a controller qpair. */ int nvmf_handoff_controller_qpair(struct nvmf_qpair *qp, - struct nvmf_handoff_controller_qpair *h); + const struct nvmf_fabric_connect_cmd *cmd, + const struct nvmf_fabric_connect_data *data, struct nvmf_ioc_nv *nv); /* Host-specific APIs. */ @@ -348,9 +350,10 @@ int nvmf_disconnect_all(void); /* * Fetch reconnect parameters from an existing kernel host to use for - * establishing a new association. + * establishing a new association. The caller must destroy the + * returned nvlist. */ -int nvmf_reconnect_params(int fd, struct nvmf_reconnect_params *rparams); +int nvmf_reconnect_params(int fd, nvlist_t **nvlp); /* * Handoff active host association to an existing host in the kernel. diff --git a/lib/libnvmf/nvmf_controller.c b/lib/libnvmf/nvmf_controller.c index 0e0126040ee4..971dccbe039e 100644 --- a/lib/libnvmf/nvmf_controller.c +++ b/lib/libnvmf/nvmf_controller.c @@ -457,8 +457,23 @@ nvmf_get_log_page_offset(const struct nvme_command *cmd) int nvmf_handoff_controller_qpair(struct nvmf_qpair *qp, - struct nvmf_handoff_controller_qpair *h) + const struct nvmf_fabric_connect_cmd *cmd, + const struct nvmf_fabric_connect_data *data, struct nvmf_ioc_nv *nv) { - h->trtype = qp->nq_association->na_trtype; - return (nvmf_kernel_handoff_params(qp, &h->params)); + nvlist_t *nvl, *nvl_qp; + int error; + + error = nvmf_kernel_handoff_params(qp, &nvl_qp); + if (error) + return (error); + + nvl = nvlist_create(0); + nvlist_add_number(nvl, "trtype", qp->nq_association->na_trtype); + nvlist_move_nvlist(nvl, "params", nvl_qp); + nvlist_add_binary(nvl, "cmd", cmd, sizeof(*cmd)); + nvlist_add_binary(nvl, "data", data, sizeof(*data)); + + error = nvmf_pack_ioc_nvlist(nv, nvl); + nvlist_destroy(nvl); + return (error); } diff --git a/lib/libnvmf/nvmf_host.c b/lib/libnvmf/nvmf_host.c index a0d95470d8ee..c3668600c463 100644 --- a/lib/libnvmf/nvmf_host.c +++ b/lib/libnvmf/nvmf_host.c @@ -767,15 +767,16 @@ is_queue_pair_idle(struct nvmf_qpair *qp) } static int -prepare_queues_for_handoff(struct nvmf_handoff_host *hh, - struct nvmf_qpair *admin_qp, u_int num_queues, - struct nvmf_qpair **io_queues, const struct nvme_controller_data *cdata) +prepare_queues_for_handoff(struct nvmf_ioc_nv *nv, struct nvmf_qpair *admin_qp, + u_int num_queues, struct nvmf_qpair **io_queues, + const struct nvme_controller_data *cdata) { - struct nvmf_handoff_qpair_params *io; + nvlist_t *nvl, *nvl_qp; u_int i; int error; - memset(hh, 0, sizeof(*hh)); + if (num_queues == 0) + return (EINVAL); /* All queue pairs must be idle. */ if (!is_queue_pair_idle(admin_qp)) @@ -785,34 +786,40 @@ prepare_queues_for_handoff(struct nvmf_handoff_host *hh, return (EBUSY); } + nvl = nvlist_create(0); + nvlist_add_number(nvl, "trtype", admin_qp->nq_association->na_trtype); + nvlist_add_number(nvl, "kato", admin_qp->nq_kato); + /* First, the admin queue. */ - hh->trtype = admin_qp->nq_association->na_trtype; - hh->kato = admin_qp->nq_kato; - error = nvmf_kernel_handoff_params(admin_qp, &hh->admin); - if (error) + error = nvmf_kernel_handoff_params(admin_qp, &nvl_qp); + if (error) { + nvlist_destroy(nvl); return (error); + } + nvlist_move_nvlist(nvl, "admin", nvl_qp); /* Next, the I/O queues. */ - hh->num_io_queues = num_queues; - io = calloc(num_queues, sizeof(*io)); for (i = 0; i < num_queues; i++) { - error = nvmf_kernel_handoff_params(io_queues[i], &io[i]); + error = nvmf_kernel_handoff_params(io_queues[i], &nvl_qp); if (error) { - free(io); + nvlist_destroy(nvl); return (error); } + nvlist_append_nvlist_array(nvl, "io", nvl_qp); } - hh->io = io; - hh->cdata = cdata; - return (0); + nvlist_add_binary(nvl, "cdata", cdata, sizeof(*cdata)); + + error = nvmf_pack_ioc_nvlist(nv, nvl); + nvlist_destroy(nvl); + return (error); } int nvmf_handoff_host(struct nvmf_qpair *admin_qp, u_int num_queues, struct nvmf_qpair **io_queues, const struct nvme_controller_data *cdata) { - struct nvmf_handoff_host hh; + struct nvmf_ioc_nv nv; u_int i; int error, fd; @@ -822,14 +829,14 @@ nvmf_handoff_host(struct nvmf_qpair *admin_qp, u_int num_queues, goto out; } - error = prepare_queues_for_handoff(&hh, admin_qp, num_queues, io_queues, + error = prepare_queues_for_handoff(&nv, admin_qp, num_queues, io_queues, cdata); if (error != 0) goto out; - if (ioctl(fd, NVMF_HANDOFF_HOST, &hh) == -1) + if (ioctl(fd, NVMF_HANDOFF_HOST, &nv) == -1) error = errno; - free(hh.io); + free(nv.data); out: if (fd >= 0) @@ -882,30 +889,56 @@ out: return (error); } -int -nvmf_reconnect_params(int fd, struct nvmf_reconnect_params *rparams) +static int +nvmf_read_ioc_nv(int fd, u_long com, nvlist_t **nvlp) { - if (ioctl(fd, NVMF_RECONNECT_PARAMS, rparams) == -1) + struct nvmf_ioc_nv nv; + nvlist_t *nvl; + int error; + + memset(&nv, 0, sizeof(nv)); + if (ioctl(fd, com, &nv) == -1) return (errno); + + nv.data = malloc(nv.len); + nv.size = nv.len; + if (ioctl(fd, com, &nv) == -1) { + error = errno; + free(nv.data); + return (error); + } + + nvl = nvlist_unpack(nv.data, nv.len, 0); + free(nv.data); + if (nvl == NULL) + return (EINVAL); + + *nvlp = nvl; return (0); } +int +nvmf_reconnect_params(int fd, nvlist_t **nvlp) +{ + return (nvmf_read_ioc_nv(fd, NVMF_RECONNECT_PARAMS, nvlp)); +} + int nvmf_reconnect_host(int fd, struct nvmf_qpair *admin_qp, u_int num_queues, struct nvmf_qpair **io_queues, const struct nvme_controller_data *cdata) { - struct nvmf_handoff_host hh; + struct nvmf_ioc_nv nv; u_int i; int error; - error = prepare_queues_for_handoff(&hh, admin_qp, num_queues, io_queues, + error = prepare_queues_for_handoff(&nv, admin_qp, num_queues, io_queues, cdata); if (error != 0) goto out; - if (ioctl(fd, NVMF_RECONNECT_HOST, &hh) == -1) + if (ioctl(fd, NVMF_RECONNECT_HOST, &nv) == -1) error = errno; - free(hh.io); + free(nv.data); out: for (i = 0; i < num_queues; i++) diff --git a/lib/libnvmf/nvmf_tcp.c b/lib/libnvmf/nvmf_tcp.c index 264a5bb154a0..3f794b5d9750 100644 --- a/lib/libnvmf/nvmf_tcp.c +++ b/lib/libnvmf/nvmf_tcp.c @@ -1129,22 +1129,19 @@ tcp_free_qpair(struct nvmf_qpair *nq) free(qp); } -static int -tcp_kernel_handoff_params(struct nvmf_qpair *nq, - struct nvmf_handoff_qpair_params *qparams) +static void +tcp_kernel_handoff_params(struct nvmf_qpair *nq, nvlist_t *nvl) { struct nvmf_tcp_qpair *qp = TQP(nq); - qparams->tcp.fd = qp->s; - qparams->tcp.rxpda = qp->rxpda; - qparams->tcp.txpda = qp->txpda; - qparams->tcp.header_digests = qp->header_digests; - qparams->tcp.data_digests = qp->data_digests; - qparams->tcp.maxr2t = qp->maxr2t; - qparams->tcp.maxh2cdata = qp->maxh2cdata; - qparams->tcp.max_icd = qp->max_icd; - - return (0); + nvlist_add_number(nvl, "fd", qp->s); + nvlist_add_number(nvl, "rxpda", qp->rxpda); + nvlist_add_number(nvl, "txpda", qp->txpda); + nvlist_add_bool(nvl, "header_digests", qp->header_digests); + nvlist_add_bool(nvl, "data_digests", qp->data_digests); + nvlist_add_number(nvl, "maxr2t", qp->maxr2t); + nvlist_add_number(nvl, "maxh2cdata", qp->maxh2cdata); + nvlist_add_number(nvl, "max_icd", qp->max_icd); } static struct nvmf_capsule * diff --git a/lib/libnvmf/nvmf_transport.c b/lib/libnvmf/nvmf_transport.c index 1a8505f2a993..fa3826b8c50d 100644 --- a/lib/libnvmf/nvmf_transport.c +++ b/lib/libnvmf/nvmf_transport.c @@ -236,16 +236,27 @@ nvmf_send_controller_data(const struct nvmf_capsule *nc, const void *buf, } int -nvmf_kernel_handoff_params(struct nvmf_qpair *qp, - struct nvmf_handoff_qpair_params *qparams) +nvmf_kernel_handoff_params(struct nvmf_qpair *qp, nvlist_t **nvlp) { - memset(qparams, 0, sizeof(*qparams)); - qparams->admin = qp->nq_admin; - qparams->sq_flow_control = qp->nq_flow_control; - qparams->qsize = qp->nq_qsize; - qparams->sqhd = qp->nq_sqhd; - qparams->sqtail = qp->nq_sqtail; - return (qp->nq_association->na_ops->kernel_handoff_params(qp, qparams)); + nvlist_t *nvl; + int error; + + nvl = nvlist_create(0); + nvlist_add_bool(nvl, "admin", qp->nq_admin); + nvlist_add_bool(nvl, "sq_flow_control", qp->nq_flow_control); + nvlist_add_number(nvl, "qsize", qp->nq_qsize); + nvlist_add_number(nvl, "sqhd", qp->nq_sqhd); + if (!qp->nq_association->na_controller) + nvlist_add_number(nvl, "sqtail", qp->nq_sqtail); + qp->nq_association->na_ops->kernel_handoff_params(qp, nvl); + error = nvlist_error(nvl); + if (error != 0) { + nvlist_destroy(nvl); + return (error); + } + + *nvlp = nvl; + return (0); } const char * @@ -267,3 +278,21 @@ nvmf_transport_type(uint8_t trtype) return (buf); } } + +int +nvmf_pack_ioc_nvlist(struct nvmf_ioc_nv *nv, nvlist_t *nvl) +{ + int error; + + memset(nv, 0, sizeof(*nv)); + + error = nvlist_error(nvl); + if (error) + return (error); + + nv->data = nvlist_pack(nvl, &nv->size); + if (nv->data == NULL) + return (ENOMEM); + + return (0); +} diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 4474a0af050f..797daf3d2f14 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -143,7 +143,7 @@ CRUNCH_PROGS_usr.sbin+= zdb # CRUNCH_PROGS+= devd CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma -CRUNCH_LIBS_camcontrol+= ${LIBNVMF} +CRUNCH_LIBS_camcontrol+= ${LIBNVMF} ${LIBNV} .if ${MK_ZFS} != "no" CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl -lrt CRUNCH_LIBS_zfs+= ${LIBBE} \ diff --git a/sbin/nvmecontrol/reconnect.c b/sbin/nvmecontrol/reconnect.c index b606409eea90..4c9277bd34cb 100644 --- a/sbin/nvmecontrol/reconnect.c +++ b/sbin/nvmecontrol/reconnect.c @@ -5,6 +5,7 @@ * Written by: John Baldwin */ +#include #include #include #include @@ -60,7 +61,7 @@ reconnect_nvm_controller(int fd, enum nvmf_trtype trtype, int adrfam, { struct nvme_controller_data cdata; struct nvmf_association_params aparams; - struct nvmf_reconnect_params rparams; + nvlist_t *rparams; struct nvmf_qpair *admin, **io; int error; @@ -70,6 +71,13 @@ reconnect_nvm_controller(int fd, enum nvmf_trtype trtype, int adrfam, return (EX_IOERR); } + if (!nvlist_exists_number(rparams, "cntlid") || + !nvlist_exists_string(rparams, "subnqn")) { + nvlist_destroy(rparams); + warnx("Missing required reconnect parameters"); + return (EX_IOERR); + } + memset(&aparams, 0, sizeof(aparams)); aparams.sq_flow_control = opt.flow_control; switch (trtype) { @@ -77,18 +85,22 @@ reconnect_nvm_controller(int fd, enum nvmf_trtype trtype, int adrfam, tcp_association_params(&aparams); break; default: + nvlist_destroy(rparams); warnx("Unsupported transport %s", nvmf_transport_type(trtype)); return (EX_UNAVAILABLE); } io = calloc(opt.num_io_queues, sizeof(*io)); error = connect_nvm_queues(&aparams, trtype, adrfam, address, port, - rparams.cntlid, rparams.subnqn, opt.hostnqn, opt.kato, &admin, io, - opt.num_io_queues, opt.queue_size, &cdata); + nvlist_get_number(rparams, "cntlid"), + nvlist_get_string(rparams, "subnqn"), opt.hostnqn, opt.kato, + &admin, io, opt.num_io_queues, opt.queue_size, &cdata); if (error != 0) { free(io); + nvlist_destroy(rparams); return (error); } + nvlist_destroy(rparams); error = nvmf_reconnect_host(fd, admin, opt.num_io_queues, io, &cdata); if (error != 0) { diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 588291d8ec9c..786ad9a6f9a5 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -346,6 +346,7 @@ _DP_mp= crypto _DP_memstat= kvm _DP_magic= z _DP_mt= sbuf bsdxml +_DP_nvmf= nv _DP_ldns= ssl crypto _DP_lua= m _DP_lutok= lua diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h index 326e4c931f93..c7070b63eb09 100644 --- a/sys/cam/ctl/ctl_ioctl.h +++ b/sys/cam/ctl/ctl_ioctl.h @@ -800,7 +800,7 @@ struct ctl_nvmf_terminate_params { }; union ctl_nvmf_data { - struct nvmf_handoff_controller_qpair handoff; + struct nvmf_ioc_nv handoff; struct ctl_nvmf_list_params list; struct ctl_nvmf_terminate_params terminate; }; diff --git a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c index 8a4538e5056a..75b36b4834f5 100644 --- a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c +++ b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c @@ -923,29 +923,55 @@ nvmft_port_remove(struct ctl_req *req) static void nvmft_handoff(struct ctl_nvmf *cn) { - struct nvmf_fabric_connect_cmd cmd; - struct nvmf_handoff_controller_qpair *handoff; - struct nvmf_fabric_connect_data *data; + const struct nvmf_fabric_connect_cmd *cmd; + const struct nvmf_fabric_connect_data *data; + const nvlist_t *params; struct nvmft_port *np; + nvlist_t *nvl; + size_t len; + enum nvmf_trtype trtype; int error; np = NULL; - data = NULL; - handoff = &cn->data.handoff; - error = copyin(handoff->cmd, &cmd, sizeof(cmd)); + error = nvmf_unpack_ioc_nvlist(&cn->data.handoff, &nvl); if (error != 0) { cn->status = CTL_NVMF_ERROR; snprintf(cn->error_str, sizeof(cn->error_str), - "Failed to copyin CONNECT SQE"); + "Failed to copyin and unpack handoff arguments"); return; } - data = malloc(sizeof(*data), M_NVMFT, M_WAITOK); - error = copyin(handoff->data, data, sizeof(*data)); - if (error != 0) { + if (!nvlist_exists_number(nvl, "trtype") || + !nvlist_exists_nvlist(nvl, "params") || + !nvlist_exists_binary(nvl, "cmd") || + !nvlist_exists_binary(nvl, "data")) { + cn->status = CTL_NVMF_ERROR; + snprintf(cn->error_str, sizeof(cn->error_str), + "Handoff arguments missing required value"); + goto out; + } + + params = nvlist_get_nvlist(nvl, "params"); + if (!nvmf_validate_qpair_nvlist(params, true)) { + cn->status = CTL_NVMF_ERROR; + snprintf(cn->error_str, sizeof(cn->error_str), + "Invalid queue pair parameters"); + goto out; + } + + cmd = nvlist_get_binary(nvl, "cmd", &len); + if (len != sizeof(*cmd)) { + cn->status = CTL_NVMF_ERROR; + snprintf(cn->error_str, sizeof(cn->error_str), + "Wrong size for CONNECT SQE"); + goto out; + } + + data = nvlist_get_binary(nvl, "data", &len); + if (len != sizeof(*data)) { cn->status = CTL_NVMF_ERROR; snprintf(cn->error_str, sizeof(cn->error_str), - "Failed to copyin CONNECT data"); + "Wrong size for CONNECT data"); goto out; } @@ -976,8 +1002,10 @@ nvmft_handoff(struct ctl_nvmf *cn) nvmft_port_ref(np); sx_sunlock(&nvmft_ports_lock); - if (handoff->params.admin) { - error = nvmft_handoff_admin_queue(np, handoff, &cmd, data); + trtype = nvlist_get_number(nvl, "trtype"); + if (nvlist_get_bool(params, "admin")) { + error = nvmft_handoff_admin_queue(np, trtype, params, cmd, + data); if (error != 0) { cn->status = CTL_NVMF_ERROR; snprintf(cn->error_str, sizeof(cn->error_str), @@ -985,7 +1013,7 @@ nvmft_handoff(struct ctl_nvmf *cn) goto out; } } else { - error = nvmft_handoff_io_queue(np, handoff, &cmd, data); + error = nvmft_handoff_io_queue(np, trtype, params, cmd, data); if (error != 0) { cn->status = CTL_NVMF_ERROR; snprintf(cn->error_str, sizeof(cn->error_str), @@ -998,7 +1026,7 @@ nvmft_handoff(struct ctl_nvmf *cn) out: if (np != NULL) nvmft_port_rele(np); - free(data, M_NVMFT); + nvlist_destroy(nvl); } static void diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c index 3c10fea75c9d..83a156d9b92a 100644 --- a/sys/dev/nvmf/controller/nvmft_controller.c +++ b/sys/dev/nvmf/controller/nvmft_controller.c @@ -107,9 +107,8 @@ nvmft_keep_alive_timer(void *arg) } int -nvmft_handoff_admin_queue(struct nvmft_port *np, - const struct nvmf_handoff_controller_qpair *handoff, - const struct nvmf_fabric_connect_cmd *cmd, +nvmft_handoff_admin_queue(struct nvmft_port *np, enum nvmf_trtype trtype, + const nvlist_t *params, const struct nvmf_fabric_connect_cmd *cmd, const struct nvmf_fabric_connect_data *data) { struct nvmft_controller *ctrlr; @@ -120,8 +119,7 @@ nvmft_handoff_admin_queue(struct nvmft_port *np, if (cmd->qid != htole16(0)) return (EINVAL); - qp = nvmft_qpair_init(handoff->trtype, &handoff->params, 0, - "admin queue"); + qp = nvmft_qpair_init(trtype, params, 0, "admin queue"); if (qp == NULL) { printf("NVMFT: Failed to setup admin queue from %.*s\n", (int)sizeof(data->hostnqn), data->hostnqn); @@ -151,7 +149,7 @@ nvmft_handoff_admin_queue(struct nvmft_port *np, nvmft_printf(ctrlr, "associated with %.*s\n", (int)sizeof(data->hostnqn), data->hostnqn); ctrlr->admin = qp; - ctrlr->trtype = handoff->trtype; + ctrlr->trtype = trtype; /* * The spec requires a non-zero KeepAlive timer, but allow a @@ -175,9 +173,8 @@ nvmft_handoff_admin_queue(struct nvmft_port *np, } int -nvmft_handoff_io_queue(struct nvmft_port *np, - const struct nvmf_handoff_controller_qpair *handoff, - const struct nvmf_fabric_connect_cmd *cmd, +nvmft_handoff_io_queue(struct nvmft_port *np, enum nvmf_trtype trtype, + const nvlist_t *params, const struct nvmf_fabric_connect_cmd *cmd, const struct nvmf_fabric_connect_data *data) { struct nvmft_controller *ctrlr; @@ -191,7 +188,7 @@ nvmft_handoff_io_queue(struct nvmft_port *np, cntlid = le16toh(data->cntlid); snprintf(name, sizeof(name), "I/O queue %u", qid); - qp = nvmft_qpair_init(handoff->trtype, &handoff->params, qid, name); + qp = nvmft_qpair_init(trtype, params, qid, name); if (qp == NULL) { printf("NVMFT: Failed to setup I/O queue %u from %.*s\n", qid, (int)sizeof(data->hostnqn), data->hostnqn); @@ -235,7 +232,7 @@ nvmft_handoff_io_queue(struct nvmft_port *np, return (EINVAL); } - /* XXX: Require handoff->trtype == ctrlr->trtype? */ + /* XXX: Require trtype == ctrlr->trtype? */ mtx_lock(&ctrlr->lock); if (ctrlr->shutdown) { diff --git a/sys/dev/nvmf/controller/nvmft_qpair.c b/sys/dev/nvmf/controller/nvmft_qpair.c index e66d98f38225..73c7bb280780 100644 --- a/sys/dev/nvmf/controller/nvmft_qpair.c +++ b/sys/dev/nvmf/controller/nvmft_qpair.c @@ -31,7 +31,6 @@ struct nvmft_qpair { uint16_t qid; u_int qsize; uint16_t sqhd; - uint16_t sqtail; volatile u_int qp_refs; /* Internal references on 'qp'. */ struct task datamove_task; @@ -102,26 +101,24 @@ nvmft_receive_capsule(void *arg, struct nvmf_capsule *nc) } struct nvmft_qpair * -nvmft_qpair_init(enum nvmf_trtype trtype, - const struct nvmf_handoff_qpair_params *handoff, uint16_t qid, +nvmft_qpair_init(enum nvmf_trtype trtype, const nvlist_t *params, uint16_t qid, const char *name) { struct nvmft_qpair *qp; qp = malloc(sizeof(*qp), M_NVMFT, M_WAITOK | M_ZERO); - qp->admin = handoff->admin; - qp->sq_flow_control = handoff->sq_flow_control; - qp->qsize = handoff->qsize; + qp->admin = nvlist_get_bool(params, "admin"); + qp->sq_flow_control = nvlist_get_bool(params, "sq_flow_control"); + qp->qsize = nvlist_get_number(params, "qsize"); qp->qid = qid; - qp->sqhd = handoff->sqhd; - qp->sqtail = handoff->sqtail; + qp->sqhd = nvlist_get_number(params, "sqhd"); strlcpy(qp->name, name, sizeof(qp->name)); mtx_init(&qp->lock, "nvmft qp", NULL, MTX_DEF); qp->cids = BITSET_ALLOC(NUM_CIDS, M_NVMFT, M_WAITOK | M_ZERO); STAILQ_INIT(&qp->datamove_queue); TASK_INIT(&qp->datamove_task, 0, nvmft_datamove_task, qp); - qp->qp = nvmf_allocate_qpair(trtype, true, handoff, nvmft_qpair_error, + qp->qp = nvmf_allocate_qpair(trtype, true, params, nvmft_qpair_error, qp, nvmft_receive_capsule, qp); if (qp->qp == NULL) { mtx_destroy(&qp->lock); diff --git a/sys/dev/nvmf/controller/nvmft_var.h b/sys/dev/nvmf/controller/nvmft_var.h index 4fda297c8a85..7a1748d5999e 100644 --- a/sys/dev/nvmf/controller/nvmft_var.h +++ b/sys/dev/nvmf/controller/nvmft_var.h @@ -9,6 +9,7 @@ #define __NVMFT_VAR_H__ #include +#include #include #include @@ -125,20 +126,18 @@ void nvmft_handle_admin_command(struct nvmft_controller *ctrlr, void nvmft_handle_io_command(struct nvmft_qpair *qp, uint16_t qid, struct nvmf_capsule *nc); int nvmft_handoff_admin_queue(struct nvmft_port *np, - const struct nvmf_handoff_controller_qpair *handoff, + enum nvmf_trtype trtype, const nvlist_t *params, const struct nvmf_fabric_connect_cmd *cmd, const struct nvmf_fabric_connect_data *data); -int nvmft_handoff_io_queue(struct nvmft_port *np, - const struct nvmf_handoff_controller_qpair *handoff, - const struct nvmf_fabric_connect_cmd *cmd, +int nvmft_handoff_io_queue(struct nvmft_port *np, enum nvmf_trtype trtype, + const nvlist_t *params, const struct nvmf_fabric_connect_cmd *cmd, const struct nvmf_fabric_connect_data *data); int nvmft_printf(struct nvmft_controller *ctrlr, const char *fmt, ...) __printflike(2, 3); /* nvmft_qpair.c */ struct nvmft_qpair *nvmft_qpair_init(enum nvmf_trtype trtype, - const struct nvmf_handoff_qpair_params *handoff, uint16_t qid, - const char *name); + const nvlist_t *params, uint16_t qid, const char *name); void nvmft_qpair_shutdown(struct nvmft_qpair *qp); void nvmft_qpair_destroy(struct nvmft_qpair *qp); struct nvmft_controller *nvmft_qpair_ctrlr(struct nvmft_qpair *qp); diff --git a/sys/dev/nvmf/host/nvmf.c b/sys/dev/nvmf/host/nvmf.c index c726e36e1fae..09d5cecdfad6 100644 --- a/sys/dev/nvmf/host/nvmf.c +++ b/sys/dev/nvmf/host/nvmf.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -15,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -196,90 +198,100 @@ nvmf_send_keep_alive(void *arg) } int -nvmf_init_ivars(struct nvmf_ivars *ivars, struct nvmf_handoff_host *hh) +nvmf_copyin_handoff(const struct nvmf_ioc_nv *nv, nvlist_t **nvlp) { - size_t len; - u_int i; + const nvlist_t *const *io; + const nvlist_t *admin; + nvlist_t *nvl; + size_t i, num_io_queues; + uint32_t qsize; int error; - memset(ivars, 0, sizeof(*ivars)); - - if (!hh->admin.admin || hh->num_io_queues < 1) - return (EINVAL); - - ivars->cdata = malloc(sizeof(*ivars->cdata), M_NVMF, M_WAITOK); - error = copyin(hh->cdata, ivars->cdata, sizeof(*ivars->cdata)); - if (error != 0) - goto out; - nvme_controller_data_swapbytes(ivars->cdata); - - len = hh->num_io_queues * sizeof(*ivars->io_params); - ivars->io_params = malloc(len, M_NVMF, M_WAITOK); - error = copyin(hh->io, ivars->io_params, len); + error = nvmf_unpack_ioc_nvlist(nv, &nvl); if (error != 0) - goto out; - for (i = 0; i < hh->num_io_queues; i++) { - if (ivars->io_params[i].admin) { - error = EINVAL; - goto out; - } + return (error); - /* Require all I/O queues to be the same size. */ - if (ivars->io_params[i].qsize != ivars->io_params[0].qsize) { - error = EINVAL; - goto out; - } + if (!nvlist_exists_number(nvl, "trtype") || + !nvlist_exists_nvlist(nvl, "admin") || + !nvlist_exists_nvlist_array(nvl, "io") || + !nvlist_exists_binary(nvl, "cdata")) + goto invalid; + + admin = nvlist_get_nvlist(nvl, "admin"); + if (!nvmf_validate_qpair_nvlist(admin, false)) + goto invalid; + if (!nvlist_get_bool(admin, "admin")) + goto invalid; + + io = nvlist_get_nvlist_array(nvl, "io", &num_io_queues); + if (num_io_queues < 1) + goto invalid; + for (i = 0; i < num_io_queues; i++) { + if (!nvmf_validate_qpair_nvlist(io[i], false)) + goto invalid; } - ivars->hh = hh; - return (0); + /* Require all I/O queues to be the same size. */ + qsize = nvlist_get_number(io[0], "qsize"); + for (i = 1; i < num_io_queues; i++) { + if (nvlist_get_number(io[i], "qsize") != qsize) + goto invalid; + } -out: - free(ivars->io_params, M_NVMF); - free(ivars->cdata, M_NVMF); - return (error); -} + nvlist_get_binary(nvl, "cdata", &i); + if (i != sizeof(struct nvme_controller_data)) + goto invalid; -void -nvmf_free_ivars(struct nvmf_ivars *ivars) -{ - free(ivars->io_params, M_NVMF); - free(ivars->cdata, M_NVMF); + *nvlp = nvl; + return (0); +invalid: + nvlist_destroy(nvl); + return (EINVAL); } static int nvmf_probe(device_t dev) { - struct nvmf_ivars *ivars = device_get_ivars(dev); + const nvlist_t *nvl = device_get_ivars(dev); + const struct nvme_controller_data *cdata; - if (ivars == NULL) + if (nvl == NULL) return (ENXIO); - device_set_descf(dev, "Fabrics: %.256s", ivars->cdata->subnqn); + cdata = nvlist_get_binary(nvl, "cdata", NULL); + device_set_descf(dev, "Fabrics: %.256s", cdata->subnqn); return (BUS_PROBE_DEFAULT); } static int -nvmf_establish_connection(struct nvmf_softc *sc, struct nvmf_ivars *ivars) +nvmf_establish_connection(struct nvmf_softc *sc, const nvlist_t *nvl) { + const nvlist_t *const *io; + const nvlist_t *admin; + uint64_t kato; + size_t num_io_queues; + enum nvmf_trtype trtype; char name[16]; + trtype = nvlist_get_number(nvl, "trtype"); + admin = nvlist_get_nvlist(nvl, "admin"); + io = nvlist_get_nvlist_array(nvl, "io", &num_io_queues); + kato = dnvlist_get_number(nvl, "kato", 0); + /* Setup the admin queue. */ - sc->admin = nvmf_init_qp(sc, ivars->hh->trtype, &ivars->hh->admin, - "admin queue", 0); + sc->admin = nvmf_init_qp(sc, trtype, admin, "admin queue", 0); if (sc->admin == NULL) { device_printf(sc->dev, "Failed to setup admin queue\n"); return (ENXIO); } /* Setup I/O queues. */ - sc->io = malloc(ivars->hh->num_io_queues * sizeof(*sc->io), M_NVMF, + sc->io = malloc(num_io_queues * sizeof(*sc->io), M_NVMF, M_WAITOK | M_ZERO); - sc->num_io_queues = ivars->hh->num_io_queues; + sc->num_io_queues = num_io_queues; for (u_int i = 0; i < sc->num_io_queues; i++) { snprintf(name, sizeof(name), "I/O queue %u", i); - sc->io[i] = nvmf_init_qp(sc, ivars->hh->trtype, - &ivars->io_params[i], name, i); + sc->io[i] = nvmf_init_qp(sc, trtype, io[i], name, i); if (sc->io[i] == NULL) { device_printf(sc->dev, "Failed to setup I/O queue %u\n", i + 1); @@ -288,10 +300,10 @@ nvmf_establish_connection(struct nvmf_softc *sc, struct nvmf_ivars *ivars) } /* Start KeepAlive timers. */ - if (ivars->hh->kato != 0) { + if (kato != 0) { sc->ka_traffic = NVMEV(NVME_CTRLR_DATA_CTRATT_TBKAS, sc->cdata->ctratt) != 0; - sc->ka_rx_sbt = mstosbt(ivars->hh->kato); + sc->ka_rx_sbt = mstosbt(kato); sc->ka_tx_sbt = sc->ka_rx_sbt / 2; callout_reset_sbt(&sc->ka_rx_timer, sc->ka_rx_sbt, 0, nvmf_check_keep_alive, sc, C_HARDCLOCK); @@ -299,6 +311,9 @@ nvmf_establish_connection(struct nvmf_softc *sc, struct nvmf_ivars *ivars) nvmf_send_keep_alive, sc, C_HARDCLOCK); } + memcpy(sc->cdata, nvlist_get_binary(nvl, "cdata", NULL), + sizeof(*sc->cdata)); + return (0); } @@ -452,17 +467,18 @@ nvmf_attach(device_t dev) { struct make_dev_args mda; struct nvmf_softc *sc = device_get_softc(dev); - struct nvmf_ivars *ivars = device_get_ivars(dev); + const nvlist_t *nvl = device_get_ivars(dev); + const nvlist_t * const *io; struct sysctl_oid *oid; uint64_t val; u_int i; int error; - if (ivars == NULL) + if (nvl == NULL) return (ENXIO); sc->dev = dev; *** 743 LINES SKIPPED *** From nobody Mon Dec 30 19:10:10 2024 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 4YMQfC0FNgz5hcqk; Mon, 30 Dec 2024 19:10:11 +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 4YMQfB6PH0z4611; Mon, 30 Dec 2024 19:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735585810; 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=25xep2v8RdOk/mBK+/wMNMmdBSwj/mMPiOj4m04JCZQ=; b=VtXnx8zT95z7JLgCVEAps6sIXtIrWwuTQW3ob79qxG0jNOyRbLOt6kCbMuUfnHwkC0V2FY m4YsP0EqauxlMeHjDjYMdoQzeVYZ3EBkoQSMWX7FxLiVzQtGYGxQINc5tJuM3ROqn6iqna x8qlFV5jsofpujQT8+OLGqkBWYTpnTG/5Q8doB4lbJgFCAGG7q4PZ/lb9XAkclYq9xXtpS AFgFqbQOVj+QD2IbkYas98aNbjJVihDibWF/L3XMHaQ5JRHBthKvZngFhsQm/POA1CnzoA 4z0fQhwbx0y2GJfslFIIIh/KIBG1AN5wOEwVE/+v8w9Rf3BFJKxHabGU1iv/YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735585810; 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=25xep2v8RdOk/mBK+/wMNMmdBSwj/mMPiOj4m04JCZQ=; b=TdT7JNtIF3M8PWvtL7PuKgziKJ+KIc1iIydboFzQmytkQ21xN9CR5fQsQWbM6LMA4rulP5 VLvysdXvot4uyCS5tkw0hExU02hopGrYAZHnXAd9LhC0/Q8Pc0nnbX2I9mGrNqw1nEb/32 Ow+c16rUyQwyOkmsbVKoaswgqhqmTJauqtC6uiiv7P95sx54XiPoGxOpNgYGPbz1OUfMcg Omz4BUt+BDJ0c3DIJphvnVtZU9CcfOxpMV+kk5bbZ3qIL7dOBRGqHJrZKc/J/Z6BYKM+ku g5ALQLSbuZqx/SK1FFhzTR6YyFgGYFvIJlnzB/FCeqcoktU5+//oWmZVSAe+WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735585810; a=rsa-sha256; cv=none; b=X+jkgpnctN0zO/vx4CCmfd+6jiZ9j7H0lH0lovqyNrY1Cht8zLlH13HWMKGsKpsXr92+TI 7fPkrN8s+TDB/cR3O7EO0BWpbxQL5qHrH/e0D6kEkIO5G6FUNYfGrDX+SfSLy/joipB9WE Eb7dQodTgGpwP6GFxo9ltdIqus01hvOd0RbHnWhQbgzepVx+NLuGewACxIDqYdbSFTthmh s+yUDzKGR86Pyd1A1FIRdLESua4u0WgJxKog+K7p6KoS05rOsSt4d2T9NskI6hSwWO00R0 8a2NevtdY67kpSKJUvQ50otJiO29TZVBmTHFIVgeKCsX7GLfDGqqsHJ34f0rhg== 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 4YMQfB5syYz15nm; Mon, 30 Dec 2024 19:10:10 +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 4BUJAADA038693; Mon, 30 Dec 2024 19:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUJAAOg038687; Mon, 30 Dec 2024 19:10:10 GMT (envelope-from git) Date: Mon, 30 Dec 2024 19:10:10 GMT Message-Id: <202412301910.4BUJAAOg038687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9b1585384d53 - main - kqueue.2: Editorial pass 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b1585384d53d0f9cc4585a6efd8cc95116407d7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9b1585384d53d0f9cc4585a6efd8cc95116407d7 commit 9b1585384d53d0f9cc4585a6efd8cc95116407d7 Author: John Baldwin AuthorDate: 2024-12-30 19:09:48 +0000 Commit: John Baldwin CommitDate: 2024-12-30 19:09:48 +0000 kqueue.2: Editorial pass - Use consistent language to describe user values unchanged by the kernel. - Replace passive language with active in a few places. - Add a history note for kqueuex() and kqueue1(). - Add an MLINK and synopsis for kqueue1(). - Various wording and markup tweaks. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D48203 --- lib/libsys/Makefile.sys | 1 + lib/libsys/kqueue.2 | 65 +++++++++++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 24 deletions(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 29c40eb334ba..b38cd5935e2f 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -454,6 +454,7 @@ MLINKS+=jail.2 jail_attach.2 \ jail.2 jail_set.2 MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kqueue.2 kevent.2 \ + kqueue.2 kqueue1.2 \ kqueue.2 kqueuex.2 \ kqueue.2 EV_SET.3 MLINKS+=link.2 linkat.2 diff --git a/lib/libsys/kqueue.2 b/lib/libsys/kqueue.2 index 066ad717111a..d6e949baa24c 100644 --- a/lib/libsys/kqueue.2 +++ b/lib/libsys/kqueue.2 @@ -38,6 +38,8 @@ .Ft int .Fn kqueuex "u_int flags" .Ft int +.Fn kqueue1 "int flags" +.Ft int .Fo kevent .Fa "int kq" .Fa "const struct kevent *changelist" @@ -92,26 +94,35 @@ which will allow sharing of the kqueue between two processes. The .Fn kqueuex system call also creates a new kernel event queue, and additionally takes -the +a .Fa flags argument, which is a bitwise-inclusive OR of the following flags: .Bl -tag -width "KQUEUE_CLOEXEC" -.It Fa KQUEUE_CLOEXEC +.It Dv KQUEUE_CLOEXEC The returned file descriptor is automatically closed on .Xr execve 2 .El +.Pp The -.Ql fd = kqueue() -call is equivalent to -.Ql fd = kqueuex(0) . +.Fn kqueue +system call is equivalent to calling +.Fn kqueuex +with +.Fa flags +set to 0. .Pp -For compatibility with -.Nx , -the +The .Fn kqueue1 -function is provided, which accepts the -.Dv O_CLOEXEC -flag with the expected semantic. +function exists for compatibility with +.Nx . +The +.Fa flags +argument accepts zero or more of the following values: +.Bl -tag -width O_CLOEXEC +.It Dv O_CLOEXEC +The returned file descriptor is automatically closed on +.Xr execve 2 +.El .Pp The .Fn kevent @@ -211,24 +222,25 @@ Filter-specific data value. Opaque user-defined value passed through the kernel unchanged. .It Fa ext Extended data passed to and from kernel. -The +The meaning of the .Fa ext[0] and .Fa ext[1] -members use is defined by the filter. -If the filter does not use them, the members are copied unchanged. +members is defined by the filter. +If a filter does not use them, +these members are passed through the kernel unchanged. The .Fa ext[2] and .Fa ext[3] -members are always passed through the kernel as-is, -making additional context available to application. +members are always passed through the kernel unchanged, +providing additional user-defined values. .El .Pp The .Va flags field can contain the following values: -.Bl -tag -width EV_DISPATCH +.Bl -tag -width EV_KEEPUDATA .It Dv EV_ADD Adds the event to the kqueue. Re-adding an existing event @@ -270,12 +282,12 @@ to hold the .Dv EV_ERROR event, then subsequent changes will not get processed. .It Dv EV_ONESHOT -Causes the event to return only the first occurrence of the filter +Return only the first occurrence of the filter being triggered. After the user retrieves the event from the kqueue, it is deleted. .It Dv EV_CLEAR -After the event is retrieved by the user, its state is reset. +Reset the state of the event after it is retrieved by the user. This is useful for filters which report state transitions instead of the current state. Note that some filters may automatically @@ -287,18 +299,16 @@ See .Sx RETURN VALUES below. .It Dv EV_KEEPUDATA -Causes -.Fn kevent -to leave unchanged any +Preserve the .Fa udata associated with an existing event. This allows other aspects of the event to be modified without requiring the caller to know the .Fa udata -value presently associated. +value previously registered with the event. This is especially useful with .Dv NOTE_TRIGGER -or flags like +or .Dv EV_ENABLE . This flag may not be used with .Dv EV_ADD . @@ -872,6 +882,13 @@ and .Fn kevent system calls first appeared in .Fx 4.1 . +The +.Fn kqueuex +system call +and +.Fn kevent1 +function first appeared in +.Fx 14.0 . .Sh AUTHORS The .Fn kqueue From nobody Mon Dec 30 19:20:59 2024 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 4YMQtg2Nv3z5hdJ7; Mon, 30 Dec 2024 19:20:59 +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 4YMQtg1xPyz471t; Mon, 30 Dec 2024 19:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735586459; 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=T527QbRPlgTESnqGavE+WZgCtkflQ6tf7r1dXqhFu98=; b=v/e1yVIMi76EIh5Tcb/OXmUSpHgNNZ/QgnO6x2egrpdGHryCPiCruey/xqXhpp9dHSt7ns UFLm/eMoLgAifnnpJDnl+9ibXBDdcrWa8NlbUNSOtLEH+PyTbu0p4qKt/BWqmx8kWNlgEy bua4fwWRxK2By3K+zsKkO9Sw1iXQ6J/mSdH0/jUEZRn1hO3MEbgWHnwBqtEkjPBbuhPQ0h 4xFdBuPq+KGOdMt/Y+QxwxNPxrfqzcAkYPEJbzLcCjuJNEl7XdsEBlC/ue8BTEkLhM7WQY MSYE9q9JoQsNHJ+GUImo4FNNefbEhq4UhzeYGhHCkhHCXQruqTatIDbfsmNmyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735586459; 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=T527QbRPlgTESnqGavE+WZgCtkflQ6tf7r1dXqhFu98=; b=jeqWHk+68/2hxwGH7oNZIHpaRYF+xE0l8/8XUUjSzIK86ywXQqAlMVUprIrQPNgYOg/bu4 slDUaR6wPfgQer3Ulhpz7ulbgLqH8tLpxdvy5q5uNnCVeuSRbd+mK5wy1655YiM+w1v/aY +6XBRqNHHvHLLOe3qqojfa1BEigs7IroG7cN8JWPRHagYQVIzYIuZgDglOQvRRNuFlo8rm vCus2q8qvMq12+0tZrKpM0ZyOg+wLsAVcRa+ehl8OwH1UevhTluT0VnAH9GDyy2xfKVKPG mqI1236W5S/OSQVvptsd+hIJwRoB7AaIFyBtMI9NMG614jc+AMusHiFK3Avvbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735586459; a=rsa-sha256; cv=none; b=Hz1kKTJcDp0NWA5aBzGfQDi2s+4vepl26JliSitpjJEvAO5afZTEIJIWoNuoWOi2sqH3Nu x/8Vn2aiHvsoQarRbF/hJQxUHgz4cML5UK2hPhFwXXZZvyD9NcJlfJwkRaGGfO05hPk5lX 9iYV9yIjkyq0ejGikcRoTflse3WzS2a4o80EGvym34Cb/Efqys9rDvZauXsyrd0B+kbptv oa+rlioWq7a66oG+hIUmdFd4l1uEMEl6mVri0dtcwhAGDSG6+1GqnAxKFK7Er19TnY3aki tSPi7+MEyjzSEVNaMXf99a8aSHz0xwP/kJfw5ZGJhs35DmfIriGR57eO6mvlhQ== 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 4YMQtg1Y1Bz16Hp; Mon, 30 Dec 2024 19:20:59 +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 4BUJKxE1063684; Mon, 30 Dec 2024 19:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUJKxAV063681; Mon, 30 Dec 2024 19:20:59 GMT (envelope-from git) Date: Mon, 30 Dec 2024 19:20:59 GMT Message-Id: <202412301920.4BUJKxAV063681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7d6ae5874ede - stable/14 - bsdinstall zfsboot: Add an option to edit the ZFS pool creation options 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d6ae5874ede58771d8979049bf742086658cf82 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7d6ae5874ede58771d8979049bf742086658cf82 commit 7d6ae5874ede58771d8979049bf742086658cf82 Author: Craig Leres AuthorDate: 2024-12-26 14:42:11 +0000 Commit: Dimitry Andric CommitDate: 2024-12-30 19:20:13 +0000 bsdinstall zfsboot: Add an option to edit the ZFS pool creation options This allows the default options (-O compress=lz4 -O atime=off) to be overridden, before the ZFS boot pool is created. For example, to set the compression algorithm to something different. Reviewed by: jhb, dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47478 (cherry picked from commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b) --- usr.sbin/bsdinstall/scripts/zfsboot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index e7fd59d5c8b3..93d9490f972a 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -324,6 +324,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" +msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_zfs_options_name="ZFS Pool Options" +msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" ############################################################ FUNCTIONS @@ -374,6 +377,8 @@ dialog_menu_main() '$msg_swap_mirror_help' 'W $msg_swap_encrypt' '$swapgeli' '$msg_swap_encrypt_help' + 'O $msg_zfs_options_name' '$ZFSBOOT_POOL_CREATE_OPTIONS' + '$msg_zfs_options_name_help' " # END-QUOTE local defaultitem= # Calculated below local hline="$hline_alnum_arrows_punc_tab_enter" @@ -1853,6 +1858,13 @@ while :; do ZFSBOOT_SWAP_ENCRYPTION=1 fi ;; + ?" $msg_zfs_options_name") + # Prompt the user to input/change the pool options + f_dialog_input input \ + "$msg_please_enter_options_for_your_zpool" \ + "$ZFSBOOT_POOL_CREATE_OPTIONS" && + ZFSBOOT_POOL_CREATE_OPTIONS="$input" + ;; esac done From nobody Mon Dec 30 19:21:19 2024 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 4YMQv31x6sz5hdP1; Mon, 30 Dec 2024 19:21:19 +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 4YMQv31TyNz473S; Mon, 30 Dec 2024 19:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735586479; 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=7rirQUJNbxmKQhK69J/QCOizbjCZhN3JoQnveZvMKfQ=; b=KRbrdAw9ej8JaTULeJB7/9JbJyGdc25EpbNbIJYvkARMm6yZlZAbFb7eE5PBHLXl7Vx1R+ 8yZFpW1eISPM0q5DIJXr4zeLvLfgiCq48JfmQKF13+aCiBM85WmMu10kD8nNPg2IRoza6v 6atW1BatwpzjfIZ/ZLSK4A6RGd8L2Op2JUfkmkEw7TKigbRiOxmg+JGRikQ94iH/Qhdtol qUTz1NbOo9YwBLGKwQamwBDWtFInPCPI6hJNacEdSJL4BUEcIkP6GuZuxYCMEGE5dgmzKT twogMYcedpCX4et3ANMAsA4JfcStHkhYHPo7raX/ZUKS6zN+YpeZym6Wutfymg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735586479; 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=7rirQUJNbxmKQhK69J/QCOizbjCZhN3JoQnveZvMKfQ=; b=tRVaWjgRYqKylk0PLY7uCceIDjf0HwRGEgxUpG025xkPmZ7BQv6mBRe/eHt1MiTWS1Oghs h1OMGEZhjXBWzskKs4ney3AZUXNy2dNIsz2vexihy/HO080rUij9sHSsdxrUN01tmlsJQ1 G96lZb+mOJjKY2EtETFVKnXgDHkBA4h2hz2qwnspzM7sbHF1K5/1pk0kV1IFpd3Wv9qHHZ GDc2C0+0RKAcFp8f4x75ptD0cSNC92AVltgg14ljd2wqIXbmp/AWfULnh6xnjm9DmquUXN SyTXgtVT/+U6RJ/cEOI0WbISYizCM1K/OV/E+m9rvB6kMwHaUbPfHmdPDRtmkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735586479; a=rsa-sha256; cv=none; b=ksBlAKKXh3bLjAC0TuIjvP0kGTf58coJQZsysqyW9JVkSM/xbqi6U7hA/32Y9FHll8rSvb 2ReBoj++kI40L3/2lE7XoDp5Vy6BX8IWWPcpnmI5zlnn8khuhyuQM+/n/CdM7qgyNaGpyV 7w9R49/UeK34+Nj4SvWO6e05HeYv7TBHIlVHpSLpaDrFrjFwdXs9gGQ9FmMb8a9vzjx9Uj ZaFU3KYQaDJxHwz1YKRPOn3e34DD6M+KK35LTcb+Ckt0Pr5F4zN3T4N5viXQjsMXxmBYTq bp3TYAi8Qjmi/sOD0Va8ZQwu655pWUfk2mFjVTGDA3SaVi3OLHxy1SkQgPxvNA== 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 4YMQv315BTz16V5; Mon, 30 Dec 2024 19:21: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 4BUJLJGK064860; Mon, 30 Dec 2024 19:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUJLJxr064857; Mon, 30 Dec 2024 19:21:19 GMT (envelope-from git) Date: Mon, 30 Dec 2024 19:21:19 GMT Message-Id: <202412301921.4BUJLJxr064857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 6258b5bf0670 - stable/13 - bsdinstall zfsboot: Add an option to edit the ZFS pool creation options 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6258b5bf0670ba0c280ae1e387fcb0f3ba9f3e32 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6258b5bf0670ba0c280ae1e387fcb0f3ba9f3e32 commit 6258b5bf0670ba0c280ae1e387fcb0f3ba9f3e32 Author: Craig Leres AuthorDate: 2024-12-26 14:42:11 +0000 Commit: Dimitry Andric CommitDate: 2024-12-30 19:20:17 +0000 bsdinstall zfsboot: Add an option to edit the ZFS pool creation options This allows the default options (-O compress=lz4 -O atime=off) to be overridden, before the ZFS boot pool is created. For example, to set the compression algorithm to something different. Reviewed by: jhb, dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47478 (cherry picked from commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b) --- usr.sbin/bsdinstall/scripts/zfsboot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index bd7db75dc5e5..117782763267 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -318,6 +318,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" +msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_zfs_options_name="ZFS Pool Options" +msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" ############################################################ FUNCTIONS @@ -368,6 +371,8 @@ dialog_menu_main() '$msg_swap_mirror_help' 'W $msg_swap_encrypt' '$swapgeli' '$msg_swap_encrypt_help' + 'O $msg_zfs_options_name' '$ZFSBOOT_POOL_CREATE_OPTIONS' + '$msg_zfs_options_name_help' " # END-QUOTE local defaultitem= # Calculated below local hline="$hline_alnum_arrows_punc_tab_enter" @@ -1805,6 +1810,13 @@ while :; do ZFSBOOT_SWAP_ENCRYPTION=1 fi ;; + ?" $msg_zfs_options_name") + # Prompt the user to input/change the pool options + f_dialog_input input \ + "$msg_please_enter_options_for_your_zpool" \ + "$ZFSBOOT_POOL_CREATE_OPTIONS" && + ZFSBOOT_POOL_CREATE_OPTIONS="$input" + ;; esac done From nobody Mon Dec 30 19:50:20 2024 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 4YMRXX5LpMz5hgJY; Mon, 30 Dec 2024 19:50: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 4YMRXX37bPz4CdF; Mon, 30 Dec 2024 19:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735588220; 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=uPJ3C3Gpo/fvl9fv0nVrkNZC7oXH04qNep/QYNjplxw=; b=H7yjyj+nukOaM3uv52XOp++uTR+pBVeLaB2WB104XT6c3pmlfYc04asIobWU6r4Ikh4UPO xUFSPc55WQUbY9SLnr5VoFCqyZikeGFTdESkkJ0q7TbJQXRIqeSd3O+v/A5F45maEcCCjk qCdWg6UiPKTvRLWL9qvhckHvgZbSmtnyiKlz0DWQc7U5lQzOhLAQjbonvoN7sALcwsB4aK owHS/w2F59RfEoB/P9Tih7F8V32+0O7jsJ3obdvv1jwr9K9DS+V6SMcj9usiEhdVghzXSP fFOa3GQeSzwXjWVVnGKxUto/SP/DczPVa7bT9tXELkWTMiAB3nfU8hTqO/500A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735588220; 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=uPJ3C3Gpo/fvl9fv0nVrkNZC7oXH04qNep/QYNjplxw=; b=yu6tVRhpj/5NxvHbdBj67ERzrzN1tyQmHCWxyVyl4zdZRFg9ppHjFu89b2q4CnoT5togY3 1QLb9uli4tlAe6m0LBpwFLzGx1g4cfv8GaKcPv+wZ1De56EXbOrhPlyDjOnAuGi40Rvqeb 8ZCdeiaPyQsVbhbcGrxbLHUwjXIgGDYnc9nYYJ+Hk+fSIQUI3vCeqDX/Tu1CVA7QNnC84m 0+aAAH0TlZAF5O/pmbbQSNXnbAEY39SfETMGACLU5eRE5/pkvxApQBJ5A2e2P4c3WtUgnz 5XTlkZSUKIqbgLuwRV0qhV5LeyJHFydh9GeQEt/c0a/XT8ebyF8v1KtO8HFa2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735588220; a=rsa-sha256; cv=none; b=B1xHYBd8Enc+OvXrwhr9IldFyevoR8x/aCMxX9T7v7NnXS0nfNaqPHK6SQe/xhK/G4VYcc pMe6eDhlWFE0wl10Jo9sYnQe0qCFLtKDjgFWtkMFR4BSqUwboJqINN8rRd2DoV5uO52fgl dtWqb5oB9ZSzYc1cTPRotB8NdNsE+Z98BHxnF6YD2UK60Ke9FIuYXqGw3lludKGt6lz3o/ EKfFKs53rgWQI6UNV0Ra1xNhlPJT6t3NaETGpYrpEX74RgPhOVkM/6OU6IJMs8qfAz5w8m /jMOyXz7Tar6mzEU0L0oKJtdRkWV0vGvVEG3YGFrTwVaMoIBc8DnuG4/g80hNQ== 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 4YMRXX2b9Yz172S; Mon, 30 Dec 2024 19:50:20 +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 4BUJoKW2017399; Mon, 30 Dec 2024 19:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUJoKha017396; Mon, 30 Dec 2024 19:50:20 GMT (envelope-from git) Date: Mon, 30 Dec 2024 19:50:20 GMT Message-Id: <202412301950.4BUJoKha017396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1f31d4374280 - main - makefs: Fix cd9660 duplicate directory names 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f31d437428014e864bcce1223cf7017180e2608 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f31d437428014e864bcce1223cf7017180e2608 commit 1f31d437428014e864bcce1223cf7017180e2608 Author: Ed Maste AuthorDate: 2024-12-30 15:01:06 +0000 Commit: Ed Maste CommitDate: 2024-12-30 19:48:44 +0000 makefs: Fix cd9660 duplicate directory names Previously we could create cd9660 images with duplicate short (level 2) names. cd9660_level2_convert_filename used a 30-character limit (for files and directories), not including the '.' separator. cd9660_rename_filename used a 31-character limit, including the '.'. Directory names 31 characters or longer (without '.') were shortened to 30 characters, and if a collision occurred cd9660_rename_filename uniquified them starting with the 31st character. Unfortunately the directory record's name_len was already set, so the unique part of the name was stripped off. Directories are up to 31 d-characters (i.e., A-Z 0-9 and _); there is no provision for a '.' in a directory name. Increase the name length limit to 31 for directories, and exclude '.'s. This name mapping and deduplication code is still fragile and convoluted and would beenfit from a more holistic effort. PR: 283238, 283112 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48251 --- usr.sbin/makefs/cd9660.c | 5 ++-- usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 39 ++++++++++++++++++++++++++-- usr.sbin/makefs/tests/makefs_tests_common.sh | 2 +- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 63f2e33b978b..687bfe46ac27 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1638,14 +1638,15 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, * File version number (5 characters, 1-32767) * 1 <= Sum of File name and File name extension <= 30 */ + int maxlen = is_file ? 30 : 31; int namelen = 0; int extlen = 0; int found_ext = 0; char *orignewname = newname; - while (*oldname != '\0' && namelen + extlen < 30) { + while (*oldname != '\0' && namelen + extlen < maxlen) { /* Handle period first, as it is special */ - if (*oldname == '.') { + if (*oldname == '.' && is_file) { if (found_ext) { if (diskStructure->allow_multidot) { *newname++ = '.'; diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh index 2fdf47f76a4c..066a9d6ec0e0 100644 --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh @@ -51,8 +51,8 @@ common_cleanup() check_base_iso9660_image_contents() { # Symlinks are treated like files when rockridge support isn't - # specified - check_image_contents "$@" -X c + # specified, and directories cannot contain a '.'. + check_image_contents "$@" -X c -X .g -X _g atf_check -e empty -o empty -s exit:0 test -L $TEST_INPUTS_DIR/c atf_check -e empty -o empty -s exit:0 test -f $TEST_MOUNT_DIR/c @@ -374,6 +374,39 @@ o_flag_rockridge_dev_nodes_cleanup() common_cleanup } +atf_test_case duplicate_names cleanup +duplicate_names_head() +{ + atf_set "descr" "Ensure shortened directory names are unique (PR283238)" +} +duplicate_names_body() +{ + check_cd9660_support + create_test_dirs + + # Create three directories which are identical in the first 31 characters. + dir_prefix="this_directory_name_is_31_chars" + mkdir -p $TEST_INPUTS_DIR/${dir_prefix}1 + mkdir -p $TEST_INPUTS_DIR/${dir_prefix}2 + mkdir -p $TEST_INPUTS_DIR/${dir_prefix}3 + + atf_check -e empty -o empty -s exit:0 \ + $MAKEFS -o rockridge $TEST_IMAGE $TEST_INPUTS_DIR + + # Disable Rock Ridge extensions to read the plain ISO Level 2 names. + mount_image -r + + # The specific way the short names are made unique is not important. + # We verify only that there are three unique names and that the unique + # part is at the end of the name. + atf_check_equal $(ls -1 $TEST_MOUNT_DIR | sort | uniq | wc -l) 3 + atf_check_equal $(ls -1 $TEST_MOUNT_DIR | cut -c -29 | sort | uniq | wc -l) 1 +} +duplicate_names_cleanup() +{ + common_cleanup +} + atf_init_test_cases() { atf_add_test_case D_flag @@ -392,4 +425,6 @@ atf_init_test_cases() atf_add_test_case o_flag_publisher atf_add_test_case o_flag_rockridge atf_add_test_case o_flag_rockridge_dev_nodes + + atf_add_test_case duplicate_names } diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh index 12c7c7c84fb7..b418cafc90a6 100644 --- a/usr.sbin/makefs/tests/makefs_tests_common.sh +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh @@ -138,6 +138,6 @@ mount_image() atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \ mdconfig -a -f $TEST_IMAGE atf_check -e empty -o empty -s exit:0 \ - $MOUNT /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR + $MOUNT ${1} /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR } From nobody Mon Dec 30 20:38:47 2024 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 4YMScS0GX5z5hyxV; Mon, 30 Dec 2024 20:38:48 +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 4YMScR6RWjz4HMx; Mon, 30 Dec 2024 20:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591127; 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=ClNF21y9YcL5yIHrDc9RMtIj/UrYIOINx3w4ClE6sT8=; b=hGSOC4oh5Eigy68Efs8O3WKUg1wP69oHPOziJTmH/BuBdd7XdtiSOqi6bEf695HlhZPkri nJAvlZpKrPRMLTXTfcIc2kiJ62DhtpIJUTFFi96bfBsOvKpI0DydTqSrQQMbiuMqER7vBX f0GXDPSudllcFVS3ZWdvGYG+dVIJFESG+EOz7E4PaGsH5VveYZy2lgKTSd+/plcCIuUA0X H7lYOhUNq97yPFgMUazZC3yHi6A2t88vjvT3ylQ5VcWXGPZiDmL7w6nPVtKBdRF5QoFLOm pqTrIqRL/3mW1icnQLmeZyUGyHv8sJfnbHIJfFzo+96yBVh/qpGi6IbZrwY8NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591127; 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=ClNF21y9YcL5yIHrDc9RMtIj/UrYIOINx3w4ClE6sT8=; b=Z4QmA0Bx2Z/vW8G2DJTto7NKHuIIdkNbvonqz59uX4SjaYmrNM1nxdhJD7qFn2CuJKqxtk e5X0NTm8UKBhceCXXTQN45y4DBqW78NFk2TI04RAulgbgb09dpHopthkbk/lVsVMBC+byJ ZnQbG16hJ0nhmdjjuYVVvxoC4cwnrItbv5I2antXUS4UK8AORldfTDXIAZQIYNodjDRTWF vDBxI9dWeri74G6aBTDFcX2gknnbfu8hn0g0CVCulIgqOwX3dJ1pn3ymBPRQ/Pv4JEbODW TmuNp37i4BEbXwBhandEdEJ+qmt7vohM2lGn9KZ2QwmsEjq069mtwV16KcjTtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591127; a=rsa-sha256; cv=none; b=qtP/8jFgpedsJmjZ/lJdYFxHkH4cdCsEmj8olwLZq52ioW96R9Vqq2GcXazsYuvs5EnNRV R/n6nN8B9n7H9mK4PG3GmCW8FOh3+WKDNzvPED85ytdq2KaOT3lZjocKL6nGh9e2JAcWC0 g1O19RHfhKeVYPzH7a0g4+bosed4jY0C6nkyp44Ce7uC2UFOOJRst58Xcy2cvIc8Ssmggv 46SHT78t3DaFh4/NZ6Zk7DfBPDl8ngWtebtVaSI4ENMVAZqwShhpxMGC3Ui/A0yrVJ8AAT it0tcbQ4QkgvffeBhLAAFQVne17DnM0Kx2n2mzBhJ/OAz1EtHLkq19V+xkCodg== 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 4YMScR5qdHz18ct; Mon, 30 Dec 2024 20:38:47 +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 4BUKcl18002284; Mon, 30 Dec 2024 20:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKclMv002281; Mon, 30 Dec 2024 20:38:47 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:38:47 GMT Message-Id: <202412302038.4BUKclMv002281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6553c31c969d - main - endian.h: Update comments now that POSIX Issue 8 is POSIX.1-2024 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6553c31c969d13ef58eb1de48f7525654b1fbf08 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6553c31c969d13ef58eb1de48f7525654b1fbf08 commit 6553c31c969d13ef58eb1de48f7525654b1fbf08 Author: Warner Losh AuthorDate: 2024-12-30 20:30:18 +0000 Commit: Warner Losh CommitDate: 2024-12-30 20:38:39 +0000 endian.h: Update comments now that POSIX Issue 8 is POSIX.1-2024 Now that Issue 8 has been published, replace the informal Issue 8 language with the more typical POSIX.1-xxxx citation. Sponsored by: Netflix --- include/endian.h | 7 ++++--- sys/sys/endian.h | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/endian.h b/include/endian.h index 87ec7866c791..337309fd3a6f 100644 --- a/include/endian.h +++ b/include/endian.h @@ -12,11 +12,12 @@ #define _ENDIAN_H_ /* - * POSIX Issue 8 requires that endian.h define uint{16,32,64}_t. Although POSIX + * POSIX.1-2024 requires that endian.h define uint{16,32,64}_t. Although POSIX * allows stdint.h symbols here, be conservative and only define there required * ones. FreeBSD's sys/_endian.h doesn't need to expose those types since it * implements all the [bl]eXtoh hto[bl]eX interfaces as macros calling builtin - * functions. POSIX allows functions, macros or both. We opt for macros only. + * functions. POSIX.1-2024 allows functions, macros or both. We opt for macros + * only. */ #include @@ -37,7 +38,7 @@ typedef __uint64_t uint64_t; /* * FreeBSD's sys/_endian.h is very close to the interface provided on Linux by - * glibc's endian.h as well as POSIX Issue 8's endian.h. + * glibc's endian.h as well as POSIX.1-2024's endian.h. */ #include diff --git a/sys/sys/endian.h b/sys/sys/endian.h index e8af78513e4a..b51616b8d83c 100644 --- a/sys/sys/endian.h +++ b/sys/sys/endian.h @@ -56,7 +56,9 @@ typedef __uint64_t uint64_t; /* * Note: While tempting to try to avoid namespace pollution from this file, * several software packages assume these marcos are defined, even when it - * defines _POSIX_C_SOURCE to request an unpolluted namespace. + * defines _POSIX_C_SOURCE to request an unpolluted namespace. + * is not defined by any version of POSIX.1, so we don't have to be + * careful. No POSIX.1 defined header file includes on FreeBSD. */ /* From nobody Mon Dec 30 20:44:51 2024 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 4YMSlS2GkTz5j0V6; Mon, 30 Dec 2024 20:44:52 +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 4YMSlS0McSz4J4J; Mon, 30 Dec 2024 20:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591492; 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=LXZ5QD9sTK9rYoIUccl0PWxMmxdEOJnIv+IKDYYmuUg=; b=kblfZaGCDW9wIa3q0VymboS2DEwUOB8uRZkLqWwNcwueOnh5BX9JSsFovSgJVa3cq9nCJq da8CcJFV/BPscCw6G0M2zX1GOv1ohzYqgZ6/s0wC+G99RMQjDZY+U1oJW7ZiCVqWnmOni3 aDBYklvRh8MWN6LvzhPg9n55LdkUEAYCNSoA/bUNYoHxZ0DHDvZG7xC6Mx91Ocin/xTRTn obb07hGMW+cDAFAHuaIzwvjXL3kR/yjpGUTq9I6mVgkhkyZlLqabKuPq9lgtz5jSjw5eZZ X7UgRD8BHckY/PtqoChFpJHA0EfW2asfrqhXwMHXZuWskt3ftOQgQsuNm+79JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591492; 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=LXZ5QD9sTK9rYoIUccl0PWxMmxdEOJnIv+IKDYYmuUg=; b=uV2bBNs0aQ9Ou43S7u+TMStrltvA1dtWgnnZJSlHlf7UbtbC6wWT91k4vUWACwOLLZgCEr XkqWVYydlD/tWDbaN9KRAJLHSLuc9xeQlr6GiB2gn+hK04kiTXPRf1tyc2kBf8DjfR7ScH iqCwUdJLIIngdJqFll0Ka34gjx2kvMgRicZltq8Ff0pNiRZvTNq6FuM+dxEBw7f7zkjLsi tuTp9jjfKCuwnUMIy4tsqLsEAAsKx0Mm75VL96prGdheBpMN/frnZJsGL4ykXC3SDL2r5X DtQQQjAhB/Zb4X7oCQfZnrygTkAupfs1jHxFUl6KHMCxhVEfQC5iWCLNrKhYCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591492; a=rsa-sha256; cv=none; b=Ggaa++e3/ly4vnSIIBSb1LWt+lpczf/cnkvJ0istOjWBUr6DTJHtfGbHpgDOWB1NsdQTwM 4mz5wjUzFNgMkTGfeHmUQqSz7RnsQykbly7D06qhbmo15O9MxwAqRpH2WyrYOWvwkDMd6A OA2cG1QGbjCml+D0cY0dnORobYrsLumOsWT/FGR6ZGT0+Q+bBeDyzeoKFCOU67ZYQGT16X H7wjgawfMbZebmQLOdjwOku4fnGFnnCPQR4b1tYRZuB2+676yW9XvESHwItZHi+ROiynQi sLk1HqXUBeaX5Cdf3ym8v1Ga2JiB8aEVLsduzCeGG/Kk/NesGMCVSn5Qdv/tfw== 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 4YMSlR74lyz18hG; Mon, 30 Dec 2024 20:44:51 +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 4BUKip2j020047; Mon, 30 Dec 2024 20:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKippC020044; Mon, 30 Dec 2024 20:44:51 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:44:51 GMT Message-Id: <202412302044.4BUKippC020044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ec30ca2e13ae - main - pf: remove impossible condition 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec30ca2e13aec6c1778a008f2ca404bca8d7575f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec30ca2e13aec6c1778a008f2ca404bca8d7575f commit ec30ca2e13aec6c1778a008f2ca404bca8d7575f Author: Kristof Provost AuthorDate: 2024-12-28 16:00:39 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:12 +0000 pf: remove impossible condition There's no need to account for pd->af == pd->naf in this section of pf_state_key_setup() because we only get here if pd->af != pd->naf (i.e. nat64). Pointed out by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 695ecfc0269d..cd557a9614d1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1706,12 +1706,10 @@ pf_state_key_setup(struct pf_pdesc *pd, u_int16_t sport, u_int16_t dport, bzero(&(*nk)->addr[0], sizeof((*nk)->addr[0])); bzero(&(*nk)->addr[1], sizeof((*nk)->addr[1])); - PF_ACPY(&(*nk)->addr[pd->af == pd->naf ? pd->sidx : pd->didx], - &pd->nsaddr, pd->naf); - PF_ACPY(&(*nk)->addr[pd->af == pd->naf ? pd->didx : pd->sidx], - &pd->ndaddr, pd->naf); - (*nk)->port[pd->af == pd->naf ? pd->sidx : pd->didx] = pd->nsport; - (*nk)->port[pd->af == pd->naf ? pd->didx : pd->sidx] = pd->ndport; + PF_ACPY(&(*nk)->addr[pd->didx], &pd->nsaddr, pd->naf); + PF_ACPY(&(*nk)->addr[pd->sidx], &pd->ndaddr, pd->naf); + (*nk)->port[pd->didx] = pd->nsport; + (*nk)->port[pd->sidx] = pd->ndport; switch (pd->proto) { case IPPROTO_ICMP: (*nk)->proto = IPPROTO_ICMPV6; From nobody Mon Dec 30 20:44:53 2024 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 4YMSlT3Jq5z5j0RJ; Mon, 30 Dec 2024 20:44:53 +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 4YMSlT1DYyz4J4K; Mon, 30 Dec 2024 20:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591493; 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=f3CiL1GLp/dfr+8FLINsaRCR6IZhwHqnwH+25+7WxEw=; b=MJMNieGzZ/yhABQ+eJB3jwX64QjjyU+fmfZoJNRmV7rX834Xngn0fLyFHAwPgeqlUL4ESt TywGT0UjuSLrHKq3OOAxKDRfYxKYFlbN7USUq/th6Y8LFKU2rS2gPYdH/kVaQ5cQKEt//a IsI5wDr8S86NutZWWQHumOAndliWGGPi+8OYoLN0D6TF96fV/ZduiCx/RetIXFU4N95/1i xZk9PUmKNpR+ggJLuX85Hk7fIaB1FW5WViQDFThE2/qTj4bojII595Lqk5GAxPO+fZdmUq wWwp3B9agkNL8074luHQw83c94KM/VAuEVVSSBb/TYyKHn/XFpJe/P+L4v3JhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591493; 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=f3CiL1GLp/dfr+8FLINsaRCR6IZhwHqnwH+25+7WxEw=; b=QxJbeOEBU0g+Y3f435dfrCzCFonJwCcYRKf3Y1PZgs6NwZVv+EqJHXZELMauuVgSDfDiGe DCIkscSYskvthUqVwfBRd/1PyORLF9cFT/tD6yDiX8ig4lqnJkdNC7FQprRmfOVp4YaVP/ sFm6wOiCS7EmQ1F9rcm8Cf/KF01PdRwwgEwxp/fmAgJb2SFrG0kSud7+hIqktRXJDpglNQ 2pNjRVogeZF5PKMH/mYdEUSJu7HP/0TY01HYc4b7Z30eKKX7o1OQvBmlW0mDjSp5tXdCHH i2+t+MfbBICnN9Z5JS5AqCPHpDtGdvsKZ3ViJnhH3lAUlNfu3lCSlUA93N9GzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591493; a=rsa-sha256; cv=none; b=jv1a4ykUf+Za5o31lFoe5Ur6ds8jZvP0bjXt4wxKgltMk7TGVZAW1t/6+5ALmeWJ168vO3 1HZAZQiqwCwU22AncV8B6UPMQR2vo6Lw9vAn9f73J+4MQeV1kviwfEGsfS5HWAo1j0bh8U T8wPepTzgPP9pjtrDd4JxvYrhCnXc+9hID7DtN+j/79rCr4MMtxBCVbIpsHs5RMXDR4OnN oytR0sngZfzZw8yfLZGhDrI2LZj5idspAzybCYpFluhA/8YiUL5eeNX6TA0E7Uy06yExP/ qEwIWquvzrP4bQMOuNcG9LBDgp9ayHsn3ZtcChJigjIcRO2zppgy3Emll0FMvQ== 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 4YMSlT0r3Sz18Nm; Mon, 30 Dec 2024 20:44:53 +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 4BUKir7E020092; Mon, 30 Dec 2024 20:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKiroP020089; Mon, 30 Dec 2024 20:44:53 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:44:53 GMT Message-Id: <202412302044.4BUKiroP020089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 54ead732cf08 - main - pf: deduplicate IPPROTO_ICMPV6 and IPPROTO_ICMP handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54ead732cf08ee0a8ac915e9f9ad9a5709d3bc97 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=54ead732cf08ee0a8ac915e9f9ad9a5709d3bc97 commit 54ead732cf08ee0a8ac915e9f9ad9a5709d3bc97 Author: Kristof Provost AuthorDate: 2024-12-28 16:02:05 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:13 +0000 pf: deduplicate IPPROTO_ICMPV6 and IPPROTO_ICMP handling These blocks were nearly identical, so handle them with the same code. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index cd557a9614d1..761839715011 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -10306,28 +10306,16 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 break; } - case IPPROTO_ICMP: { - if (af != AF_INET) { + case IPPROTO_ICMP: + case IPPROTO_ICMPV6: { + if (pd.virtual_proto == IPPROTO_ICMP && af != AF_INET) { action = PF_DROP; REASON_SET(&reason, PFRES_NORM); DPFPRINTF(PF_DEBUG_MISC, ("dropping IPv6 packet with ICMPv4 payload")); goto done; } - action = pf_test_state_icmp(&s, &pd, &reason); - if (action == PF_PASS || action == PF_AFRT) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule; - a = s->anchor; - } else if (s == NULL) - action = pf_test_rule(&r, &s, &pd, - &a, &ruleset, inp); - break; - } - - case IPPROTO_ICMPV6: { - if (af != AF_INET6) { + if (pd.virtual_proto == IPPROTO_ICMPV6 && af != AF_INET6) { action = PF_DROP; REASON_SET(&reason, PFRES_NORM); DPFPRINTF(PF_DEBUG_MISC, From nobody Mon Dec 30 20:44:54 2024 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 4YMSlV4ht2z5j0J5; Mon, 30 Dec 2024 20:44:54 +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 4YMSlV2dckz4Hhq; Mon, 30 Dec 2024 20:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591494; 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=DEecFoDLJZNDDYsdZmSiHAncxQ4k8hcp/IfmixyjBNc=; b=P2GqrAyr1IL7pRlj7tydLKzK530gbG5ZxoJcAvi67JuxyAXiLOrtnJ0qhULeas4BsLS+cJ nrJa1OC4kfQw9Sly7lMGCRiLzp8wiBvmPKAFh5XwWXxTb+KCYT5G2pXRAqiGX215NXy2aq /2PEYQeQd1P5g6Cw4FXz2N6UcbItsap76AX156rWmOO5uUqDWKvlMlLlgqROddyhpb6Eh3 XNpjkNdd1C9ZJTUXg0Nl3uiiVSnDM3OqX7SFjyi/li4jbsCg/gnqVvRNjMfOqy+pIlASGH ftw4jnDhvycggdUcACIW8WEqRPwHEg14zs9JFDF6AqqutMVIP6wb3+Zz0as7Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591494; 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=DEecFoDLJZNDDYsdZmSiHAncxQ4k8hcp/IfmixyjBNc=; b=eeeW23sIG7iw5tYClWNY8CYGwNjdGp4kJkG+Vjl5Jzr17oRGEv2mpo2qjPixJihTqOAU0J yhhGSirsHdKRwK+ofiYVh3H/qLr8MMnRCHIFqRByqiz504ae8GpBIP1scoUg/hwI/QOMBT C98rqJ6CCB1d7JCO/UkB8H0njNeYK3AeWhchBd6R98z0HlEAyyptFOm8/ekXQ1X3wuM375 DkB1GRgrZhMg91z6HcpGB43+Y0+iPvfj3dr4xpkIBhDjQ3CR/kZbmaaL+hLlLVB3Xv0Orl 7bTfzynbK1pcTTr5w50hyUzpqXtOmr/H/DR/DJmEKnVDiaLyqoFtmS6qzMfmdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591494; a=rsa-sha256; cv=none; b=unEb1Ue6UN3241mf4jgTZ2swWqICkyPDTZJIBE+YQEJ8SdGgtM49culdNWuJx2Fl+56U5L HEjUFTKmYiM19QRJsexRnEJkRDhzhSTgtWATAzJuocFGhkl65YWlEjno2E9Kvyl7YMU5Tq fQxkSLvJm2U5toxpBE5SrtLicoz/CtYgazNs5v3TQatHvxgxfCIiDNHFA5mgO2iqRzLQH+ 3Lpx5eaEH10jBwaaEmCebYqZU/nRfkuPvUfgwHmECKtQN5KGbW/qIqDr50Q4eIN3XQf+N2 niRrFfp8pqVtY8EkayDJnewomUe2rVBIoJIdFWHw+EHEQoCyq2ZRR/fMqCXBdA== 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 4YMSlV1yHgz18hH; Mon, 30 Dec 2024 20:44:54 +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 4BUKisTU020147; Mon, 30 Dec 2024 20:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKisCi020144; Mon, 30 Dec 2024 20:44:54 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:44:54 GMT Message-Id: <202412302044.4BUKisCi020144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 07579e2110b3 - main - pf: sprinkle const over function arguments 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07579e2110b3c00acafd1b692a3ce9a80fb3104b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=07579e2110b3c00acafd1b692a3ce9a80fb3104b commit 07579e2110b3c00acafd1b692a3ce9a80fb3104b Author: Kristof Provost AuthorDate: 2024-12-28 16:04:24 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:13 +0000 pf: sprinkle const over function arguments Document that these are not supposed to modify their arguments. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 10 +++++----- sys/netpfil/pf/pf.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index d22f715d6a27..3432f8dc99e1 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2376,7 +2376,7 @@ VNET_DECLARE(struct ifnet *, sync_ifp); #define V_sync_ifp VNET(sync_ifp); VNET_DECLARE(struct pf_krule, pf_default_rule); #define V_pf_default_rule VNET(pf_default_rule) -extern void pf_addrcpy(struct pf_addr *, struct pf_addr *, +extern void pf_addrcpy(struct pf_addr *, const struct pf_addr *, sa_family_t); void pf_free_rule(struct pf_krule *); @@ -2417,10 +2417,10 @@ void pf_patch_16_unaligned(struct mbuf *, u_int16_t *, void *, u_int16_t, void pf_patch_32_unaligned(struct mbuf *, u_int16_t *, void *, u_int32_t, bool, u_int8_t); void pf_send_deferred_syn(struct pf_kstate *); -int pf_match_addr(u_int8_t, struct pf_addr *, struct pf_addr *, - struct pf_addr *, sa_family_t); -int pf_match_addr_range(struct pf_addr *, struct pf_addr *, - struct pf_addr *, sa_family_t); +int pf_match_addr(u_int8_t, const struct pf_addr *, + const struct pf_addr *, const struct pf_addr *, sa_family_t); +int pf_match_addr_range(const struct pf_addr *, const struct pf_addr *, + const struct pf_addr *, sa_family_t); int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); void pf_normalize_init(void); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 761839715011..2a0dd2c3933a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -774,7 +774,7 @@ pf_set_protostate(struct pf_kstate *s, int which, u_int8_t newstate) #ifdef INET6 void -pf_addrcpy(struct pf_addr *dst, struct pf_addr *src, sa_family_t af) +pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) { switch (af) { #ifdef INET @@ -4365,8 +4365,8 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, * are different. */ int -pf_match_addr(u_int8_t n, struct pf_addr *a, struct pf_addr *m, - struct pf_addr *b, sa_family_t af) +pf_match_addr(u_int8_t n, const struct pf_addr *a, const struct pf_addr *m, + const struct pf_addr *b, sa_family_t af) { int match = 0; @@ -4401,8 +4401,8 @@ pf_match_addr(u_int8_t n, struct pf_addr *a, struct pf_addr *m, * Return 1 if b <= a <= e, otherwise return 0. */ int -pf_match_addr_range(struct pf_addr *b, struct pf_addr *e, - struct pf_addr *a, sa_family_t af) +pf_match_addr_range(const struct pf_addr *b, const struct pf_addr *e, + const struct pf_addr *a, sa_family_t af) { switch (af) { #ifdef INET From nobody Mon Dec 30 20:44:55 2024 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 4YMSlW5wm0z5j0Z4; Mon, 30 Dec 2024 20:44:55 +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 4YMSlW36y0z4Hkt; Mon, 30 Dec 2024 20:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591495; 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=ElTtG1WBM3okvXeycUOv6prh1+3gqjO2mkOMZjNFYxY=; b=atkSnf44KetntgFSJ8F/4GRMlDi2fUKdblys1ptZ953jRn6Y31wEG5GTSXERtNcDgEifs5 2jBxGOav7+/xqYhm5CJVTxwYM3vEVtFBlwYDyuxFD3553sFQknD6K9KgkPDSyDPeV140VQ Uy62nsrA9U9OslZJL8oBWww52zK+D8GzbFyE+R/C1V5KYEtiQaJRd4QIMI/mxG1IoRFATn WjgNQvNOcLt/SEmVahx5fKv4igsMbBf8U/lZtK2rNL+jViKyedx8E2H4Kagz29y7DSAjwB YzNK0Tajg8klAB4dQWUNExDN1wmHqHX47GU2owbWjmUpulRracdkh8CpESyXMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591495; 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=ElTtG1WBM3okvXeycUOv6prh1+3gqjO2mkOMZjNFYxY=; b=xZNxzGVMOVqSHUGpOUYcOrx++RusapIQog+HkzdCg/UsdHU12z3O3entvYMDzO0xAzpWGo An4Sh5ynB7/gzydO5LJWDfnMr1tlnqxKg1YhaqcC7gyBn7AOoyFNLWMPW8+7gcwrETC2V5 vBAyoFEV6Zrq91E7hD9dI/e7PiMt1hJQXXaeWwnG/muBksgaGD2RYpCXRoqaNbPHdKFUR3 T0YhfOm/2A3die3myiCMXfB6GAM1G5yN6JW2HcXhhzKFvY7i3c2jRdsf4JNkyGUt4NWC2V 5UkKKcaPXJrmEew+KWfw7PshmMwlkPiSCCITflFemT19B9rLUWL00lTr7H3MSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591495; a=rsa-sha256; cv=none; b=rTIMJj6Rocb6CbP2xvFGyrQjjO32AN/zXOyZ3mXrSn4qUpOxihFhEOwfVqR2B6TTgfFw7t fEpwcA59a15mAg51+P3OIkh8E3mTIlzSnQ63sAE0/gkqR9YWzYNpI4OHXPdmv4KzdpGhhV mqNZrXzWnWEMKfdiuGQGmiE2P2iyg4VfZwX9+SFcOdf5b6HxDbeLKoUB533k5PGNgPrJY9 zvQH2i2hj2hVdgu1RgVzDDunEfKTIz2QRw5/B5HSNDMHUupVribqUARQ3wZLtrWQJWzO8o 5HEV+p29ygG/JjUa/a3SvyNhmbbKZ0tDPIsYMiJfZCtWrxS8ETEwOj8Jv+LQCQ== 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 4YMSlW2j7Xz18dc; Mon, 30 Dec 2024 20:44:55 +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 4BUKitOO020189; Mon, 30 Dec 2024 20:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKitcm020186; Mon, 30 Dec 2024 20:44:55 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:44:55 GMT Message-Id: <202412302044.4BUKitcm020186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4be8e29e776b - main - pf: initialise addresses in pf_get_transaddr_af() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4be8e29e776b078b43e95c04259ecebdf407481f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4be8e29e776b078b43e95c04259ecebdf407481f commit 4be8e29e776b078b43e95c04259ecebdf407481f Author: Kristof Provost AuthorDate: 2024-12-28 17:52:18 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:13 +0000 pf: initialise addresses in pf_get_transaddr_af() Ensure we fully initialise nsaddr and ndaddr. Reported by: markj, KMSAN Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_lb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 35896bdcf5b1..cb92c724a541 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -994,6 +994,9 @@ pf_get_transaddr_af(struct pf_krule *r, struct pf_pdesc *pd) struct pf_srchash *sh = NULL; struct pf_ksrc_node *sns = NULL; + bzero(&nsaddr, sizeof(nsaddr)); + bzero(&ndaddr, sizeof(ndaddr)); + if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: af-to %s %s, ", pd->naf == AF_INET ? "inet" : "inet6", From nobody Mon Dec 30 20:45:02 2024 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 4YMSlf4WFkz5j04j; Mon, 30 Dec 2024 20:45:02 +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 4YMSlf3SX8z4J6v; Mon, 30 Dec 2024 20:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591502; 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=BVQ/b/3ukhi4im9Fq1Vorb/rvCu4HeZRRZ29D+lVjXA=; b=Loadf9Wc066Ft2X+LR/zS9YBNgUqU+usu9wvq3kXhIp/DZuaT4CL9wuropQF+yHgyxpFat kWQYzXbuB/bDjvvKnbkaPC6D9l7DT4+57B14sN4tcYFbU+oy2un0KmgFXm3eRh8pqXMHu+ Y8t0UIx9OrFN+CcwDbo2wUwK3CZbrFwkyF+IAFjF7nWxBZanPiRtkhqGfH0tLyfoHo/tsM poix47iWHdBseXbn9u/U9wwr62ouk+/wKc9/9GllU+QyN5obNmrCWjOLaKbfhmxZLDVJyR ph8plb66nFE3p5h9M0VBZjhEW6Ws3q6ZkmZKrljJTFarEWNRF8zCf2txq5RGcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591502; 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=BVQ/b/3ukhi4im9Fq1Vorb/rvCu4HeZRRZ29D+lVjXA=; b=pRfcMrkqrGTDy0jnuZlYA6sPN4oHeK6qUXdl9BZT3q0YOnLERoiiOM/47Ei+RrTcYb3Pwg uOl4AIZUs3WyoUK298aOoU8WPDBkEqfOVecYYfhE2SZMpuYk9jLavb/DCujbsEIIaTzLZ7 8rNjN5YLsWhwDuPBw4B9PV5COsAEq166cKQMC6YQRQmQN4VKi+n8/Y6gWZb96DEJ0XxF2Y k4XQjHw4ceOhH1U7LhgQloklnqWqg6x1HH0eLcU2hxVOMG53qFGhUurzPIOckrURnDfRkG 26+7+d/G6dhYIBGmPQnuBK64+oP88vYrDVOaTeL0WZhyMUUq6JSYTy7BYLO8Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591502; a=rsa-sha256; cv=none; b=pDrxkTHAb1+m2tlSMMopm68GXXlr91wxL4714Yt6qSwsKlJZCGZlEs0nc582uZBi4kJhYG 3BvM6sm1B0jJgWmKqlzNRj7egLico0bCEPMcEU0IJ0CmQgnMDjTGOEdrcwa/zOlhccoaDw BxydyrDt/09y5+K+wlmbelOZBVaS+tdMiOpfB4Kv5fpJ5c2zhxm35K/KsM663OoNHsw1B1 TaRUlcU9nQAgSR9QdPhIpcMo2snb0+hODu1cGtt5s1y1+083BxLLqnjWDPE/PU9BL9Jiek rrc7O0+s4Tx8vEZyK0HioWKhn/ABxXdvyeICaQKi4W9QoXFMMiieXLFOyiy3Hg== 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 4YMSlf34wNz18MS; Mon, 30 Dec 2024 20:45:02 +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 4BUKj2Tt020438; Mon, 30 Dec 2024 20:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKj2ab020435; Mon, 30 Dec 2024 20:45:02 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:45:02 GMT Message-Id: <202412302045.4BUKj2ab020435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e2bb5f213a72 - stable/13 - pf: fix double free in pf_state_key_attach() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e2bb5f213a724fd163be4262eb925def0fa8f9fc Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e2bb5f213a724fd163be4262eb925def0fa8f9fc commit e2bb5f213a724fd163be4262eb925def0fa8f9fc Author: Kristof Provost AuthorDate: 2024-12-11 22:27:21 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:33 +0000 pf: fix double free in pf_state_key_attach() In 371bd29d4b we fixed a state key leak, but unintentionally introduced a double free. We pass through the relevant code twice, first for PF_SK_WIRE, then for PF_SK_STACK. If we fail to attach on the second pass we have a more complex cleanup job, handled by pf_detach_state(). We must only free the state keys manually on the first pass, on the second one pf_detach_state() takes care of everything. Tested by: yds Fixes: 371bd29d4b22257a7e92e1e711cca3d94cfbd00d MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 01eb1261443dddcb50a3a278f1278fffdfb0d36e) --- sys/netpfil/pf/pf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2ebfd08b362a..e5cd0b83ac0c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1302,11 +1302,13 @@ keyattach: s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); KEYS_UNLOCK(); - uma_zfree(V_pf_state_key_z, skw); - if (skw != sks) - uma_zfree(V_pf_state_key_z, sks); - if (idx == PF_SK_STACK) + if (idx == PF_SK_WIRE) { + uma_zfree(V_pf_state_key_z, skw); + if (skw != sks) + uma_zfree(V_pf_state_key_z, sks); + } else { pf_detach_state(s); + } return (EEXIST); /* collision! */ } } From nobody Mon Dec 30 20:45:03 2024 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 4YMSlh32p9z5j0PK; Mon, 30 Dec 2024 20:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMSlg6Ldfz4J3R; Mon, 30 Dec 2024 20:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591503; 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=O4gBMpNkXCVOFpXP9ClZ4wSMmrE4JD5XIrchtL7eJx4=; b=Tl8xfJ1sOWYdft2idh9XnY5qtwOaujQgEf7X3J/auoVj5Fd4ua/jd/jkkunT66CUgHwNvp y0OP4rnvYghM1Lj7TG90vFTCsO+vCuhFOwtRLuLhqpJuyx+6r7cjEG35OffEjr7CkEAPiD WcJwt74sWzS4Pz969HwnQsnJp0AH74qDaJD6nOV5AqzEKDoMIMPDvfY2yKXENnjcLO/Mv4 Mkm4035d4aSLmtLdkccWMmnQztdm6dbwZq6JfjnPfTA00s2rjm7xMJdNCd/bMojCor6Lur KzbA46pC9wOeWazsL828DAxqSDANKlLWJE8UQIBrrFdcX9cYcX12J3GM3qLMBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591503; 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=O4gBMpNkXCVOFpXP9ClZ4wSMmrE4JD5XIrchtL7eJx4=; b=dMrgUlyCZRMdl233lURchy/0Asw33Q/Ln1Pz4zB/cQp/7/jVd0zKb0eK2iqFK/S1Cysfnn JExkNcXrAZlfhvdEcfQzF6NSktkDZGWnxu5IgBJYLinsG0iP3bKCVFt9J5TnC5Oyh2mlio jptgmADMkMuGgBXlYgT6KZ8GQDe6cA+rb75rA+jCpyq7vYhHNxjtMrl968zMMGVzmfliGT Tcwl+Sb+gj92kifd8Rd5rgNIfSsjiys1OvbiWX7qUfbaQvLviVYN1vzQJYUlu98KiArvnd qfMAfDO3JcfDIOYYH46pBmYY5Aw10WulODDmcFhIJvlIecQJt1zAMOLZ3G8gFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591503; a=rsa-sha256; cv=none; b=RpXBlylXEVvoULXWeWv/mtQu22pzcHgjBoD02oU8PkH0tvWEAwNZTjzpfvQ7I3c7uuoGOf pjCcESKMS72GhgcneTKsn1b+2CtJxSBrqnxFl4Ba3qDXbh9prW++TK34HHQIjwYcmymPJg LEpN1DtONgpKBJw9H9DJ2nUCNwR9ODUeFj9rNaGcA5o7VlccdU0Btl7cK46ugN0qhv9o/v 2sU54eZ/AUnsgaFQYnDapWlKkCKLKv3nTzYAZE9QAiFCF2tf0pc4snuaHak+d30pPzfdsR gg5AQlOfcpfWVeTnisZrpN+ZT1s1x7m9lmF+72fPtaSij0wqDj7duaUrr8IOUA== 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 4YMSlg5yqVz18MT; Mon, 30 Dec 2024 20:45:03 +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 4BUKj3wW020569; Mon, 30 Dec 2024 20:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKj3Bt020566; Mon, 30 Dec 2024 20:45:03 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:45:03 GMT Message-Id: <202412302045.4BUKj3Bt020566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 0fd06bd44aa0 - stable/14 - pf: fix double free in pf_state_key_attach() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0fd06bd44aa04b4105608ba2bc5fc9d93d0ac056 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0fd06bd44aa04b4105608ba2bc5fc9d93d0ac056 commit 0fd06bd44aa04b4105608ba2bc5fc9d93d0ac056 Author: Kristof Provost AuthorDate: 2024-12-11 22:27:21 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:57 +0000 pf: fix double free in pf_state_key_attach() In 371bd29d4b we fixed a state key leak, but unintentionally introduced a double free. We pass through the relevant code twice, first for PF_SK_WIRE, then for PF_SK_STACK. If we fail to attach on the second pass we have a more complex cleanup job, handled by pf_detach_state(). We must only free the state keys manually on the first pass, on the second one pf_detach_state() takes care of everything. Tested by: yds Fixes: 371bd29d4b22257a7e92e1e711cca3d94cfbd00d MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 01eb1261443dddcb50a3a278f1278fffdfb0d36e) --- sys/netpfil/pf/pf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 53c4fcb492da..163eb2cedc27 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1345,11 +1345,13 @@ keyattach: s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); KEYS_UNLOCK(); - uma_zfree(V_pf_state_key_z, skw); - if (skw != sks) - uma_zfree(V_pf_state_key_z, sks); - if (idx == PF_SK_STACK) + if (idx == PF_SK_WIRE) { + uma_zfree(V_pf_state_key_z, skw); + if (skw != sks) + uma_zfree(V_pf_state_key_z, sks); + } else { pf_detach_state(s); + } return (EEXIST); /* collision! */ } } From nobody Mon Dec 30 20:45:04 2024 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 4YMSlj0xWBz5j0VJ; Mon, 30 Dec 2024 20:45:05 +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 4YMSlh6kKZz4J12; Mon, 30 Dec 2024 20:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591504; 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=/KzM2XCRZlp6/zh2UTPZfbTJz+naX66Zk8KE54EZbQs=; b=Lwstmzj24TL8E238FT5nT2Ph1dGuah8TzrtU4cwBzFKBS1s5cy1D3Hbacl88Dj2LUtTet1 3Z7GeR0tp6gg+40rA3tQTq5VBSIKHjtAwW63bnH2czaAFnI6pXr7P5kW+/LFLAfbw8FEWl j5rHtMWSF2v+MqBbikE9OpcJ62eGxF8P3KWpTOzESuhvmOgBtBkETx4mJI/SZsqBN0p2qP OZekH6GRTjfVJaGvBT3zo3KeiR9sWyh4inneZWCbcohLfK4VaV+T3/ZUoag+wJ+MFBDfMC 57Subfqwgu2QP0HWbSgO85nDDJSELPQqqg8QKMaQKyLZDKy8Hvv1RXAKj1pO9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735591504; 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=/KzM2XCRZlp6/zh2UTPZfbTJz+naX66Zk8KE54EZbQs=; b=u7PRJuXUVuTv5BjDfGjlBdYUsXK0bT0d3I7EZUR+kQVAsLeedJo8bycynFsHBJzqHCj0L6 6HelKNRWzjfGn7Q0kFHFZf7IPuArsupEobuSqiLTchypmzlrcNx3ivD6YLh4BG/PH+kFnz 9VDJvq75ZXbKKDJoXar3wbDQG9gQNGUqG0/VgVIVbHzBLAHiXz5K94w1SMKANqO3DYHy4e +vqrWf0Ph7jst+9ixEAhxD0nDQLFCwlKPyye0pBvkc3RYoH7aXK5RRZmQ4IN0MZKntqbuM 8JliwhHNQ/RG7BWdF/KjE4U4k+q57BU/dXybmbx8c6gzybEf+2m3CD5Vse1Wyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735591504; a=rsa-sha256; cv=none; b=chWpgljZP6s6yv2VgE+1+HKfJjs3JSVvU/BHYQKeL0VxJmZ0ydxZSpJGojBhNKmtQWYppn QcBHAzLgD19+u6yYPIyouy2iS8mWdO/bUlMo4vUcpkWYv76Odd4n5Q5bOnDl4/6XCm+piu J32UaZRAWZTJxQ4bNUlMYx2Av1/XVqpG2Frl5tZgQcFZY6tJJjTq4Qoya/pn6VgdK4X5al 2rFOBQQKUGFmMHti/mHhvNIxl2LL8XVMEwR0yM3oS3lGJX4//FqtvmxYR8AWnqdr4SNyMA voQ2qBgYlhmUjw2lYrrle0cq/Sf//qMGbgvRLbIDVP5fDS+U6AMkIZAoLYt3lA== 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 4YMSlh6HtQz18dd; Mon, 30 Dec 2024 20:45:04 +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 4BUKj4gI020608; Mon, 30 Dec 2024 20:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUKj4YS020605; Mon, 30 Dec 2024 20:45:04 GMT (envelope-from git) Date: Mon, 30 Dec 2024 20:45:04 GMT Message-Id: <202412302045.4BUKj4YS020605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e0a1a2e47fbf - stable/14 - if_ovpn: improve reconnect handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e0a1a2e47fbf1df75e054acced189819eaf7c4e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0a1a2e47fbf1df75e054acced189819eaf7c4e7 commit e0a1a2e47fbf1df75e054acced189819eaf7c4e7 Author: Kristof Provost AuthorDate: 2024-12-18 16:10:29 +0000 Commit: Kristof Provost CommitDate: 2024-12-30 20:42:57 +0000 if_ovpn: improve reconnect handling When a DCO client reconnects (e.g. on server restart) OpenVPN may create a new socket rather than reusing the existing one. This used to be rejected because we expect all peers to use the same socket. However, if there are no peers it's safe to release the previous socket and install the tunnel function on the new one. See also: https://redmine.pfsense.org/issues/15928 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 3624de5394991c0cacd42d5a3b33e35c1a002e09) --- sys/net/if_ovpn.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index be75eff74d34..de7920981027 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -628,8 +628,20 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) } /* Must be the same socket as for other peers on this interface. */ - if (sc->so != NULL && so != sc->so) - goto error_locked; + if (sc->so != NULL && so != sc->so) { + if (! RB_EMPTY(&sc->peers)) { + ret = EBUSY; + goto error_locked; + } + + /* + * If we have no peers we can safely release the socket and accept + * a new one. + */ + ret = udp_set_kernel_tunneling(sc->so, NULL, NULL, NULL); + sorele(sc->so); + sc->so = NULL; + } if (sc->so == NULL) sc->so = so; From nobody Mon Dec 30 22:20:15 2024 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 4YMVsW40Knz5j5vH; Mon, 30 Dec 2024 22:20:15 +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 4YMVsW3Nfkz4QsD; Mon, 30 Dec 2024 22:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735597215; 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=HqJwsr4A7Lr7n3Y4HLOGTmWP7wXIlTtck50RuUfAc48=; b=qlt5u+80Zm+f4i+x38ds/R8U9a076Fv9TFnHkp6av5sfsEVtke4iRwHAfL4KYgyFImeRHN WJ2OZpmTVU0e8h2ed+HOn64rUjAUYCfQ/MsquQZfeqFQkAMbUTcjRHE+YGPk9YbfwhQW7w UZe3BUMyIQF+ENWMr/cpGAs21gjvpLMu8gkXIK3Zs6iuIbyNM4gFagYDZQtvSD9Y+3oF7Y Zp8ucjNV2M94bAuFoRP+ClrTGQZUNFHUsyDedk0JNW8F7ykZVt5m6JE+NlYpQMjrO1oTEW I5kwTXjjzF2PMr2SnrZBRqtkBuymKuWBfgC1dQHFgNSpvgO8SXlur2QnHHbpEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735597215; 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=HqJwsr4A7Lr7n3Y4HLOGTmWP7wXIlTtck50RuUfAc48=; b=pd9uXEZIckiagB/gYM1f2j86IRV3qO9T5PSetDj2b1pNNdP6yplrhunWnvE6Uni6b1jqUD 8lCcZ8sPFLNGK6BMQJm3VTqGOgwsPoS/qJRXxPTeqpecK0ZtjdnchjYS3RJPhFzJ6/jocD fZB9a1soCcqlgMu7x6a3sw3+zIE0Esd2cV96AwWWIVdxNVF+w5lEeTZ8wXb1jOL0ocVjPE REIFA816zp7gw52s7BFjVFxFhSeZJ386eH3lJzPtswPv7nKopK2oRnEhzZPRw/6c8o2qL7 NFaE8nnD7bYPvh4Ir8QG2SFg7tHVHbigqzZp/7SZgP9iSYDMIEFbjWZUBvVutw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735597215; a=rsa-sha256; cv=none; b=HAaEN5lWqQ0kurio25k7QN5mjDj9hWrqMtImlWBEyyESGcfSfWuQXV49k2zr9uIb9gwDaj GEqdL/WbOy1rLOgyTyc+T6AueUuJ2xBH/bFuWCpwmPmbJvaS9yuTq8eGZasx9zX9RRpM7x wxmcEyYaLNeBzvnI+XBjX5N5j0Uhw8+/wiIjHXO8q42EwE9aYJMZFaBhekw4ZqU6X6zMg0 rj7WH0gday7ExXcZmw6EVH7VgNVTsNXM4u2OBdpw1W4cuWYpfccMlVqBgh7QmQGgzVBZuq uOHPn0hyjntYVhld4xfgSKbA5fExj9KTrQH2/7FsS2biIOQuMK+kqacXDOwioA== 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 4YMVsW2sjxz1C5p; Mon, 30 Dec 2024 22:20:15 +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 4BUMKF7K096511; Mon, 30 Dec 2024 22:20:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUMKFCK096502; Mon, 30 Dec 2024 22:20:15 GMT (envelope-from git) Date: Mon, 30 Dec 2024 22:20:15 GMT Message-Id: <202412302220.4BUMKFCK096502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: afb7a85e52c3 - stable/14 - makefs: Exit with error if writing cd image fails 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: afb7a85e52c323aca544f0d235b67123bf87d342 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=afb7a85e52c323aca544f0d235b67123bf87d342 commit afb7a85e52c323aca544f0d235b67123bf87d342 Author: Ed Maste AuthorDate: 2024-12-23 15:54:32 +0000 Commit: Ed Maste CommitDate: 2024-12-30 22:20:04 +0000 makefs: Exit with error if writing cd image fails Obtained from: OpenBSD c8f48d9b1ea9 Sponsored by: The FreeBSD Foundation (cherry picked from commit b45f84cc6213854ead00a4bfc7973332eda65676) --- usr.sbin/makefs/cd9660.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 7ce9a3b6cbb2..bb3a86b7c8b5 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -465,7 +465,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) { int64_t startoffset; - int numDirectories; + int ret, numDirectories; uint64_t pathTableSectors; int64_t firstAvailableSector; int64_t totalSpace; @@ -611,7 +611,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, if (diskStructure->include_padding_areas) diskStructure->totalSectors += 150; - cd9660_write_image(diskStructure, image); + ret = cd9660_write_image(diskStructure, image); if (diskStructure->verbose_level > 1) { debug_print_volume_descriptor_information(diskStructure); @@ -623,7 +623,10 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, cd9660_free_structure(real_root); if (diskStructure->verbose_level > 0) - printf("%s: done\n", __func__); + printf("%s: done ret = %d\n", __func__, ret); + + if (ret == 0) /* cd9660_write_image() failed */ + exit(1); } /* Generic function pointer - implement later */ From nobody Tue Dec 31 01:36:03 2024 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 4YMbCR4mTzz5jLCn; Tue, 31 Dec 2024 01:36:03 +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 4YMbCR2GFxz4hj6; Tue, 31 Dec 2024 01:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608963; 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=x6bGNjmY67dRzrTqqv+cCcNK3goFNAMPERfB04vyXdg=; b=ySsWu4DPG+LZG13vfR7sXVTqsESZCR2k5zoQ4fM7plIjWqqEUxkr0Dkld3CkWTZaC7Kexy PQtbG5b1QL6/kcAoTrxzJ46RFHvUDFm96rfvqxCEQ6+v+gVMw9hrXtfgn0kT2/sDFDZA+V C2uAhASrTfO+rvqXbK4GQ5tErCK4tBhX/CeSiezTEf4w03exOrsppN+603donKpYu82Pgj ibtlXD/6bRWr90SxQiRe1/Y+IMDDWuAmxUQVcjLpvB9ymz2qlETHB85rE+ko06y8+gPZb9 0i7rrZLnmX7ieVdn+oXg9WY4O3LeWXjgLXOT62scZ7UF8G0LCH9orByAG+7u6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608963; 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=x6bGNjmY67dRzrTqqv+cCcNK3goFNAMPERfB04vyXdg=; b=uag0t07Pdoi+HcwANAvHcoviP5WTPYDuDSY8u9Qsc83iDj5dDblDrm84Pdsu0IUJJ1nzAT lzqhunkaBfCgMSuURbKGl3tIflsFMxo+JDvVCmGtE2zq6KR+uKKxmXucED6qPC7etXUnkP sQmi/mA2dgtd5qv5dwNDhCUiegjT6vonPM+96oTp/kFipbyff0gs83qQjkFsdrzVv/Kd9v Zd/G8i427I8n+zcluN4G2gLxsctOMOVX2Z/Vf9E2fXbYP45+rZRSQDJ6qIOIHIHaw9rUSk 8OhLAqdC3KDbffJuj8hVpaVUSESsO9H5FCLRjjqmG1hawiYI+Yeyt2UdA5EkPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735608963; a=rsa-sha256; cv=none; b=HnrKVjgdrrNJwqBe51SzSNR2Nim8q9bJwMwyToSgIoNHY6ga65o2UU+r3JPVQatkdKl5Ym SwEw56wi1d/+1j+yTLaFDu9UtKf+sGouGyARrVlzopF6R58KJrIGAQIBlknVcUX5dG0wji 2+CeHv1DQ2ETmEWQ49xW76w+KmY9pVFM4YWC+UckogNl61KC38yGm8xU6p8YpCSpUDIZ33 t6Na0LZjgbqvp7Yr2c9BPMB32yzvvk+sQKFbCtMiXKl8x50s73eEHM0ibkldxzJgCGCkkT 7WrvIDLLG5SM2taQPiYvQqKwQyfClUBZ8RZYFRqPasYG23KcfouOOqrFDyFAUA== 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 4YMbCR1nVwzJjv; Tue, 31 Dec 2024 01:36:03 +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 4BV1a3x1060731; Tue, 31 Dec 2024 01:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV1a3qC060728; Tue, 31 Dec 2024 01:36:03 GMT (envelope-from git) Date: Tue, 31 Dec 2024 01:36:03 GMT Message-Id: <202412310136.4BV1a3qC060728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 4fad98b5c8d7 - main - rtwn: remove SEQ_SEL, replace with a QOS bit 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fad98b5c8d77c771c2dd14e3d4ce517b4bb92d9 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=4fad98b5c8d77c771c2dd14e3d4ce517b4bb92d9 commit 4fad98b5c8d77c771c2dd14e3d4ce517b4bb92d9 Author: Adrian Chadd AuthorDate: 2024-12-15 18:11:57 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 01:35:13 +0000 rtwn: remove SEQ_SEL, replace with a QOS bit I've reviewed all of the linux vendor and upstream drivers. This SEQ_SEL field isn't a mask and doesn't ever look like it it was; instead this bit is set to tag QoS data frames. In fact, it effectively was set to 0 for STA frames and potentially 1 for broadcast/multicast frames as the STA macid of 0 and broadcast/ multicast macid of 1 maps to that. In AP modes it would be tagged based on bit 0. So, bring it in line with the vendor and linux drivers. Locally tested: * RTL8192CU, STA, hostap * RTL8188EU, STA * RTL8192EU, STA Differential Revision: https://reviews.freebsd.org/D48092 --- sys/dev/rtwn/rtl8192c/r92c_beacon.c | 1 - sys/dev/rtwn/rtl8192c/r92c_tx.c | 12 ++++++------ sys/dev/rtwn/rtl8192c/r92c_tx_desc.h | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_beacon.c b/sys/dev/rtwn/rtl8192c/r92c_beacon.c index 8084d5b69438..4646b9317c2f 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_beacon.c +++ b/sys/dev/rtwn/rtl8192c/r92c_beacon.c @@ -64,7 +64,6 @@ r92c_beacon_init(struct rtwn_softc *sc, void *buf, int id) rtwn_r92c_tx_setup_macid(sc, buf, id); txd->txdw4 |= htole32(R92C_TXDW4_DRVRATE); - txd->txdw4 |= htole32(SM(R92C_TXDW4_SEQ_SEL, id)); txd->txdw4 |= htole32(SM(R92C_TXDW4_PORT_ID, id)); txd->txdw5 |= htole32(SM(R92C_TXDW5_DATARATE, RTWN_RIDX_CCK1)); } diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c index 313f79e216e6..c60081fc675c 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_tx.c +++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c @@ -272,7 +272,13 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, if (ismcast) txd->flags0 |= R92C_FLAGS0_BMCAST; + if (IEEE80211_IS_QOSDATA(wh)) + txd->txdw4 |= htole32(R92C_TXDW4_QOS); + if (!ismcast) { + struct rtwn_node *un = RTWN_NODE(ni); + macid = un->id; + /* Unicast frame, check if an ACK is expected. */ if (!qos || (qos & IEEE80211_QOS_ACKPOLICY) != IEEE80211_QOS_ACKPOLICY_NOACK) { @@ -281,9 +287,6 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, maxretry)); } - struct rtwn_node *un = RTWN_NODE(ni); - macid = un->id; - if (type == IEEE80211_FC0_TYPE_DATA) { qsel = tid % RTWN_MAX_TID; @@ -348,7 +351,6 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, if (!hasqos) { /* Use HW sequence numbering for non-QoS frames. */ rtwn_r92c_tx_setup_hwseq(sc, txd); - txd->txdw4 |= htole32(SM(R92C_TXDW4_SEQ_SEL, uvp->id)); } else { uint16_t seqno; @@ -409,7 +411,6 @@ r92c_fill_tx_desc_raw(struct rtwn_softc *sc, struct ieee80211_node *ni, if (!IEEE80211_QOS_HAS_SEQ(wh)) { /* Use HW sequence numbering for non-QoS frames. */ rtwn_r92c_tx_setup_hwseq(sc, txd); - txd->txdw4 |= htole32(SM(R92C_TXDW4_SEQ_SEL, uvp->id)); } else { /* Set sequence number. */ txd->txdseq |= htole16(M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE); @@ -438,7 +439,6 @@ r92c_fill_tx_desc_null(struct rtwn_softc *sc, void *buf, int is11b, if (!qos) { rtwn_r92c_tx_setup_hwseq(sc, txd); - txd->txdw4 |= htole32(SM(R92C_TXDW4_SEQ_SEL, id)); } } diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h b/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h index 6e546c3da236..33edb975f062 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h +++ b/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h @@ -69,8 +69,7 @@ struct r92c_tx_desc { uint32_t txdw4; #define R92C_TXDW4_RTSRATE_M 0x0000001f #define R92C_TXDW4_RTSRATE_S 0 -#define R92C_TXDW4_SEQ_SEL_M 0x00000040 -#define R92C_TXDW4_SEQ_SEL_S 6 +#define R92C_TXDW4_QOS 0x00000040 /* BIT(6) for 8188cu/8192cu/8723au */ #define R92C_TXDW4_HWSEQ_EN 0x00000080 #define R92C_TXDW4_DRVRATE 0x00000100 #define R92C_TXDW4_CTS2SELF 0x00000800 From nobody Tue Dec 31 01:36:04 2024 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 4YMbCS5LfMz5jL8j; Tue, 31 Dec 2024 01:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMbCS3jlWz4hkd; Tue, 31 Dec 2024 01:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608964; 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=V5GI19VwBEkchj6+CAr3y1/hyqA1y8Ia55UimwzXEI0=; b=E6hjwzqyM624VkysiXunt7R1gZl68R52Nm9T1zdH5zWileVhdmA8EG/7yGNJkfSOGvD3O+ wm6W1zvXEK7+2IFG2zeSlyCcbP8Ko3eIgZgDw86Jsswmigx19qL6aCwBQlEwcHrV7qHlVB TEGhJK0fgOOCd2t8pRtHZOWX6xEKzM0pP+qgdJCmy2W0VZvnzlYPURGsY43gGuHeojLuN/ /XAW184TRu0xfIK5J33GEGidAgvUlqZWMptlauqvdWJIOzn51Bc7qqKbiu1FwzTwHGm0K5 8KSYUPIgxjUj7mjm61XjrFVRhSBkPoHAg2k4vwVCLGUaV5g3xCziU+ZK7jVIqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608964; 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=V5GI19VwBEkchj6+CAr3y1/hyqA1y8Ia55UimwzXEI0=; b=WrOuSnblU9jiZBpaIo5tlSFMBe8CKDeDAhM0u8rysU8idoRaBgdTEkjl9ZS9ZNbiKwMMvJ 3BgoIQSAqYqEqq6QKh/ffzxp2SN9Xl4pw1r6SjpEIYjVtTF4zTLx2M3qBK5PsBdbaZcUEK ZcgQBTRxiDcK2LMxDL2UqaaselIGAr12+nQc1g8YnTyUQPwU4TP4qYqctbn88eBoy7/HW6 Xw4i6TUlE7BVpAN5HgrY6mSWU9QEkPs4nR0MY7WKwc/IlE7bcfkRA5fEDQW//M3Df6eXbZ iyEAu7EbPRKnT1RmUXJdRbfJTbmQK0c2zQOfpgRQfC31kiCEDLJTQpO0zJjLbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735608964; a=rsa-sha256; cv=none; b=YimeOTET8BJKEk22UC1ifCN+DqqZH+703P+JGkxRya8y66JZtPwsr0wHaQt3ZcoudXGknL lLFuFJqHCxpqvNhs0knqleROxtQaKET2Kb/tqbwokxHn9DZOG56TrNv7kIhFEPUY5PKG7G P30xM8ilOrIPaUUT0LvIkLrTndzFy2h4277qAVv+qj3GBU70xPBhbpQZ8Xy2CU5hSieJAR DyTe8R+muwpTABZGALmJ6PhWaLMJJMesWrTw4LDjgsoU07cZowU6EzjSpGKOfCEzF+6JWC 8WQ5470DahzU7EuyKrsj0u2UsqEuh6XdsdYBll9cYQF+SuY8DfJQyXVGJraVCQ== 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 4YMbCS2pCZzJMh; Tue, 31 Dec 2024 01:36:04 +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 4BV1a4BJ060785; Tue, 31 Dec 2024 01:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV1a4HN060782; Tue, 31 Dec 2024 01:36:04 GMT (envelope-from git) Date: Tue, 31 Dec 2024 01:36:04 GMT Message-Id: <202412310136.4BV1a4HN060782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 18fabd338ce7 - main - ath_hal_ar9300: quick refactor of tx/rx chain handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18fabd338ce789cd91f8de255153d9b9d9a86cba Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=18fabd338ce789cd91f8de255153d9b9d9a86cba commit 18fabd338ce789cd91f8de255153d9b9d9a86cba Author: Adrian Chadd AuthorDate: 2024-12-29 05:25:11 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 01:35:37 +0000 ath_hal_ar9300: quick refactor of tx/rx chain handling Use a temporary variable, make the lines shorter. Differential Revision: https://reviews.freebsd.org/D48239 Reviewed by: emaste --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c index 68e5f018cc6c..b6d711a981e7 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c @@ -43,11 +43,10 @@ static void ar9300SetChainMasks(struct ath_hal *ah, uint32_t tx_chainmask, uint32_t rx_chainmask) { + HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps; - AH9300(ah)->ah_tx_chainmask = - tx_chainmask & AH_PRIVATE(ah)->ah_caps.halTxChainMask; - AH9300(ah)->ah_rx_chainmask = - rx_chainmask & AH_PRIVATE(ah)->ah_caps.halRxChainMask; + AH9300(ah)->ah_tx_chainmask = tx_chainmask & pCap->halTxChainMask; + AH9300(ah)->ah_rx_chainmask = rx_chainmask & pCap->halRxChainMask; } static u_int From nobody Tue Dec 31 01:36:05 2024 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 4YMbCT6xQGz5jKyd; Tue, 31 Dec 2024 01:36:05 +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 4YMbCT44zKz4hkf; Tue, 31 Dec 2024 01:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608965; 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=a1YYBn8NhTJNgNLthY9XsCveHvfwlKaQL0p3kAXdsKo=; b=gvehfxN6Npki3/uOWsKlnTIm7b9nCAAsrYIgoNEW6sqi5Qq89LDnbU9prgz3QmDrtSQN4p fAucmWuQkR98p2ShYyBGJN5OJFjy0DaCKXG0ILnISfwIrpkzVGnX5kN73tdaKBX9zQO3X6 2/bViVWJQ3nmPAV0ozhuRXN0PxryhUO2jW10ahULYPVqSSm0flzONp18lCP8rkikdti8At 3lPzpJWYXEaxs3FWHwFm+1JisAVWzRrPCzgAjkvO4yDZAtpw//LgutlbNA+AR81ef0IBf7 Kr4p9ULjd30P4pJR0HQiek6jz9DEHcFzjNTgGfAHz6hllUY8o9SjcrzmrlZqEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608965; 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=a1YYBn8NhTJNgNLthY9XsCveHvfwlKaQL0p3kAXdsKo=; b=hjkYnvoB9LCA/swJcLzbri4BNYZGqy3Zlo6whfy+tZtfpsZG9Ven4eF4S93Qg08rRKmOre OHz36dsmhZIG9Oem15l3mpTxEGGfudhRYr48yMHOIkzjG3bdPTCimOa+iGm8cL/6b1Cm0b SueHCYnIxRoxFLm7+KHQF1WXgLIJLUYnnR8vGqtn9CI8ca/WTPhXSxb7VFGTuddq7UJmQP uSOUWoUsti7/5CTNmaFToZvEqIFMSyuB3RqCxPlSN9xfMlqUjd0+h9lWHzmrbzYSjhMdd0 R4VWsBtVPJYBI/bIhb7nY48zeFjMeaKIRsnIUnfydTmJeBOxhYstyiEsqTLoKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735608965; a=rsa-sha256; cv=none; b=GjuizQBXVbKWakRwF1ixRujWcVAQjYXtG6wPfeActnICDfolbEQMmi8dNd23exh5XX+sbi KA46lUsrvdGr1gg4a6Hz9gCg3DRYS6LrkKAx+/+81V9eR+LtvIA5BHvs5rFYDzzKU1+Z+M TlLtIoY1dZJpXikym0x54cJg7naJpIZjMRxW1ECH3wf2NKYEYLU2A0ML2sEFYOIW4/Y+1c GSSx+/gxvppwhdjkKZwoZpVbM3GzLkSsCZ9w37vRdApNRWwAeuqXwOXOV5I4M+oLiB2Gye XBMXfr+SLZCEjZfgui0P/tbJw+sqyaSeWbYTG+X2kdbl2vk7qGasSdD1G54Bgw== 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 4YMbCT3hw9zJGQ; Tue, 31 Dec 2024 01:36:05 +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 4BV1a5i6060847; Tue, 31 Dec 2024 01:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV1a5FN060844; Tue, 31 Dec 2024 01:36:05 GMT (envelope-from git) Date: Tue, 31 Dec 2024 01:36:05 GMT Message-Id: <202412310136.4BV1a5FN060844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: cc3b7b7e715d - main - ath_hal_ar9300: implement the TX/RX chainmask override for AR9300 HAL 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc3b7b7e715dde516752c479bc67eb93467d86a6 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=cc3b7b7e715dde516752c479bc67eb93467d86a6 commit cc3b7b7e715dde516752c479bc67eb93467d86a6 Author: Adrian Chadd AuthorDate: 2024-12-29 05:25:42 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 01:35:56 +0000 ath_hal_ar9300: implement the TX/RX chainmask override for AR9300 HAL This commit implements the missing capability set handlers for setting the transmit and receive chainmasks. I did this for the AR5416 and later chips years ago, but not for these. This is especially useful when you're only hooking up one or two antennas on a 3 antenna device - or you just want to test it like that. It also requires updating the number of supported transmit/receive streams, so also add them here. Locally Tested: * AR9300, STA mode, 1, 2 and 3 stream TX/RX configuration Differential Revision: https://reviews.freebsd.org/D48240 --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c | 2 +- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c | 29 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c index ca41cae2c5eb..26ef2c67b882 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c @@ -2751,7 +2751,7 @@ ar9300_fill_capability_info(struct ath_hal *ah) /* FreeBSD: Update number of TX/RX streams */ p_cap->halTxStreams = owl_get_ntxchains(p_cap->halTxChainMask); p_cap->halRxStreams = owl_get_ntxchains(p_cap->halRxChainMask); - +#undef owl_get_ntxchains /* * This being a newer chip supports TKIP non-splitmic mode. diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c index 1793cf06378b..94bcc1777f27 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c @@ -968,7 +968,7 @@ ar9300_set_capability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type, u_int32_t capability, u_int32_t setting, HAL_STATUS *status) { struct ath_hal_9300 *ahp = AH9300(ah); - const HAL_CAPABILITIES *p_cap = &AH_PRIVATE(ah)->ah_caps; + HAL_CAPABILITIES *p_cap = &AH_PRIVATE(ah)->ah_caps; u_int32_t v; switch (type) { @@ -1079,6 +1079,33 @@ ar9300_set_capability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type, return AH_TRUE; } return AH_FALSE; + +#define owl_get_ntxchains(_txchainmask) \ + (((_txchainmask >> 2) & 1) + ((_txchainmask >> 1) & 1) + \ + (_txchainmask & 1)) + + case HAL_CAP_RX_CHAINMASK: + setting &= ar9300_eeprom_get(ahp, EEP_RX_MASK); + p_cap->halRxChainMask = setting; + p_cap->halRxStreams = owl_get_ntxchains(setting); + if (p_cap->halRxStreams > 3) + p_cap->halRxStreams = 3; + else if (p_cap->halRxStreams < 1) + p_cap->halRxStreams = 1; + return AH_TRUE; + + case HAL_CAP_TX_CHAINMASK: + setting &= ar9300_eeprom_get(ahp, EEP_TX_MASK); + p_cap->halTxChainMask = setting; + p_cap->halTxStreams = owl_get_ntxchains(setting); + if (p_cap->halTxStreams > 3) + p_cap->halTxStreams = 3; + else if (p_cap->halTxStreams < 1) + p_cap->halTxStreams = 1; + return AH_TRUE; + +#undef owl_get_ntxchains + /* fall thru... */ default: return ath_hal_setcapability(ah, type, capability, setting, status); From nobody Tue Dec 31 01:57:44 2024 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 4YMbhT0YYkz5jMZl; Tue, 31 Dec 2024 01:57:45 +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 4YMbhT01khz4lRT; Tue, 31 Dec 2024 01:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735610265; 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=RRmQq7IsWb9dz3Hk2ki8nAMy0aqMOalCPT4JDmZqC2A=; b=KNxg4UNP/6JwNn19BKLh2M2EFp3DJ5creeTWWoWqpVoVPE4kXA42K0z6gRPA016atCh2ql sOVfSK0dQG1uv8akYoBjAR1ajUeww8EyVp+s84RSIhvBH+MPjchzJwa5qlwHp9V+C2Gcf3 UIM/tpknz9sr9VJtHMBJYiZR/dSsmKQReHlK8vXdoLNl0dPI2v22nf/amWQuNBe2kT4oMY uTjIoO7viEg0vB2KANe+JiCYBuF4V9HpanGGNonXLApN0M7cdRsM1MzRBi2J5zxZQ3MuEf 6flwp0Fbh99NH3t6qsn71STMO4IlHcbxweWJb1tnbGZr7Wud++OLzWxoY6N0pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735610265; 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=RRmQq7IsWb9dz3Hk2ki8nAMy0aqMOalCPT4JDmZqC2A=; b=FMUXeGLo3iZ6KviEpLTn86Rk2nwj+aXKdmQG+rAvP7kXZiXP6MgWZmfs2W96VlgOz2LlSq k/exLV8Am8Qk+KAfpJkdn1AFDmw7z1cuxEliCqkDPTEuG1KCawW0+MUjPkuPG0zzb0oZR8 yFlS6bOYm7xcuOtCKCheW1nwlUGApTwrOP5Bbjulll+pkVCyAUlQ+fak13kYQYZLfdUgND atHqobvL6cezJ6+sXQbC4aSYobMoT/R+25trlCeEjXtWXL3BD0MbsiQZV5zPI9MYGtgWda 7ZHf5V9s+EUaoycWWoSK3o0wyYbTsNNsgdE8aKbFIjQdJvgZjg7fi6Cyp/CAfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735610265; a=rsa-sha256; cv=none; b=IAf9RON90EeAlNFM6xvNaBqRWLM1Dqtpiep8D+IWVK12SUFPpEJ1i8q07OGuZna8Y7BUbM GIgGdIfyM/eTPi4ZL3cOCJ0XwhPARAwwoex3gyFEbHbAd+doIU2UTnW50vQDkMQWR98o5X SVfaAHC/XC9u32iccBDpM73lb88ITqLy7aq0+dCVatsRiLpDoHpwDqAP/J49REDHaDMbJm 2XSxhSW8cW8tG9EFDMr4i9Qw3nm3CpEnC4VufrSQIgWfri4ibMBCa5LbsV8NcIshza6AAt 9hbD7+cYubtLbUItcRFVizGZYc9VbAS+PW3wnBm6rRLBV0uNofSgI48auJb4YQ== 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 4YMbhS6dFczKSW; Tue, 31 Dec 2024 01:57:44 +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 4BV1viZJ097618; Tue, 31 Dec 2024 01:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV1viAw097615; Tue, 31 Dec 2024 01:57:44 GMT (envelope-from git) Date: Tue, 31 Dec 2024 01:57:44 GMT Message-Id: <202412310157.4BV1viAw097615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 9a8e9b2a79e1 - main - RELNOTES: Add an entry for commit 07cd69e272da 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a8e9b2a79e122b8be384d95331593a68ffeba92 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=9a8e9b2a79e122b8be384d95331593a68ffeba92 commit 9a8e9b2a79e122b8be384d95331593a68ffeba92 Author: Rick Macklem AuthorDate: 2024-12-31 01:56:49 +0000 Commit: Rick Macklem CommitDate: 2024-12-31 01:56:49 +0000 RELNOTES: Add an entry for commit 07cd69e272da --- RELNOTES | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELNOTES b/RELNOTES index 96c80bd483ea..5cdb0bde4ac4 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,12 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +07cd69e272da: + Add a new -a command line option to mountd(8). + If this command line option is specified, when + a line in exports(5) has the -alldirs export option, + the directory must be a server file system mount point. + 0e8a36a2ab12: Add a new NFS mount option called "mountport" that may be used to specify the port# for the NFS server's Mount protocol. From nobody Tue Dec 31 09:06:22 2024 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 4YMnC31Cywz5j7xF; Tue, 31 Dec 2024 09:06:23 +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 4YMnC30fglz4NVG; Tue, 31 Dec 2024 09:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735635983; 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=P7dt/ADx9owb2HaGcvWEMHwks2+XQpnYL1BL+78sULg=; b=qerMdaOD18pjR1cBicjfaGeiBdiUUbnRw4YTlmZmp/CZBWOLRjCJPmAfwNQWkJx7O1H96Q DJNOtZ65ftENLT2+zMgy6b/EwX3jjQHFGMZYKnqnhKBOu1D1WT0/DBl9makEwJiosXEt/n MlY5UK5ftAnBiw6VgU9P3uTKIgOX18JrdZQvdvgoSlGrwrZgRuUJpuPmNKGewbIiKl1I2e BuxRmkvFc1hgIhYWPUYCAImgSCN4Ye9lY9S10RFMlZTpvcLNV3qeBUxkwlWjBFoaKuhhpu 0dhyRBLztcD1og85eFN4q0zWBKUl42qNAFeY2KkiINaBBoGHUYBhH/DA6CEfmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735635983; 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=P7dt/ADx9owb2HaGcvWEMHwks2+XQpnYL1BL+78sULg=; b=SDJ37UznmhjXnfN+/e/RbMVPCJ/3W+xR/2uSuX3lcDoUNiJN7BzqmAk1YALRCrYSBhjgsL OOMz86HWym6dhaAO06BYVBJCNbInEvGWomE44PRqY9/zMh9/lpNtKjf4S0YdC4UOJk3Kjf O/z56pjGUi/2YVzXw7FEvrwAQFkVOf32Dk0WJJR+fxMPiZt2ChwfIBaDrXngQV1XB/QRQf me88gfrvyga15FIEebHl/DtliZLnWVbp8+gQrllzf/5fVEuLLNLcWo48fpZJ4XCTPx3HRK SFrfWIiYbun2e5eYSUWVWlGxLvGjKhl6D5pPKXmfXGXOfs7QjnzF4FCX142jEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735635983; a=rsa-sha256; cv=none; b=Gf+D8E3PWsQS2yO9+zRnRcg6ZXFiMd6VFMZiQ1YnjyLEHXA3jJ16cC2sbc1qKlUXHQyPxc LaoWOgCOo2fzYHOMV9FxReGI0D2iTLTtoamkYujSqOQUBd2kjHKglE5VlWB6yJlF5EZT4g hC838zFwt26zUeh6qMu0/FJWaZ08F5FCF8PlrpWdVYk9hPZNIQo+xMXf6lVUE5I36PlHZw RqYKykdLsutZWGbgFBnClHmGWFDvQ9y8l6guB66zaBZM78g1BKj48NFDHNkUHT9pa1YJqX ZAaoz+zXr4m1dUPpXHXLGMyR8OSK6BYTdFBSR36yI7NzFHlgjDwyy83judTJCQ== 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 4YMnC307K6zZ11; Tue, 31 Dec 2024 09:06:23 +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 4BV96MKh002666; Tue, 31 Dec 2024 09:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV96Mbf002663; Tue, 31 Dec 2024 09:06:22 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:06:22 GMT Message-Id: <202412310906.4BV96Mbf002663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yoshihiro Takahashi Subject: git: 41b30bbc1a57 - main - uart: Add support for Brainboxes / Intashield serial cards. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41b30bbc1a57b60afee9acdd6ad240c92ef13790 Auto-Submitted: auto-generated The branch main has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=41b30bbc1a57b60afee9acdd6ad240c92ef13790 commit 41b30bbc1a57b60afee9acdd6ad240c92ef13790 Author: Yoshihiro Takahashi AuthorDate: 2024-12-31 09:04:27 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-12-31 09:04:27 +0000 uart: Add support for Brainboxes / Intashield serial cards. PR: 283226 Reported by: Cameron Williams --- sys/dev/puc/pucdata.c | 422 ++++++++++++++++++++++++++++++++++++++++++++ sys/dev/uart/uart_bus_pci.c | 14 ++ 2 files changed, 436 insertions(+) diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c index f127e27e7b08..e911a407cca9 100644 --- a/sys/dev/puc/pucdata.c +++ b/sys/dev/puc/pucdata.c @@ -493,6 +493,428 @@ const struct puc_cfg puc_pci_devices[] = { .config_function = puc_config_siig }, + { 0x135a, 0x0841, 0xffff, 0, + "Brainboxes UC-268", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0861, 0xffff, 0, + "Brainboxes UC-257", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0862, 0xffff, 0, + "Brainboxes UC-257", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0863, 0xffff, 0, + "Brainboxes UC-257", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0881, 0xffff, 0, + "Brainboxes UC-279", + DEFAULT_RCLK, + PUC_PORT_8S, 0x18, 0, 8, + }, + + { 0x135a, 0x08a1, 0xffff, 0, + "Brainboxes UC-313", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x08a2, 0xffff, 0, + "Brainboxes UC-313", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x08a3, 0xffff, 0, + "Brainboxes UC-313", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x08c1, 0xffff, 0, + "Brainboxes UC-310", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x08e1, 0xffff, 0, + "Brainboxes UC-302", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x08e2, 0xffff, 0, + "Brainboxes UC-302", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x08e3, 0xffff, 0, + "Brainboxes UC-302", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0901, 0xffff, 0, + "Brainboxes UC-431", + DEFAULT_RCLK, + PUC_PORT_3S, 0x18, 0, 8, + }, + + { 0x135a, 0x0921, 0xffff, 0, + "Brainboxes UC-420", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0981, 0xffff, 0, + "Brainboxes UC-475", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0982, 0xffff, 0, + "Brainboxes UC-475", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x09a1, 0xffff, 0, + "Brainboxes UC-607", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x09a2, 0xffff, 0, + "Brainboxes UC-607", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x09a3, 0xffff, 0, + "Brainboxes UC-607", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0a81, 0xffff, 0, + "Brainboxes UC-357", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0a82, 0xffff, 0, + "Brainboxes UC-357", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0a83, 0xffff, 0, + "Brainboxes UC-357", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0ac1, 0xffff, 0, + "Brainboxes UP-189", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0ac2, 0xffff, 0, + "Brainboxes UP-189", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0ac3, 0xffff, 0, + "Brainboxes UP-189", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0b01, 0xffff, 0, + "Brainboxes UC-346", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0b02, 0xffff, 0, + "Brainboxes UC-346", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0b21, 0xffff, 0, + "Brainboxes UP-200", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0b22, 0xffff, 0, + "Brainboxes UP-200", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0b23, 0xffff, 0, + "Brainboxes UP-200", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0ba1, 0xffff, 0, + "Brainboxes UC-101", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0bc1, 0xffff, 0, + "Brainboxes UC-203", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0bc2, 0xffff, 0, + "Brainboxes UC-203", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c01, 0xffff, 0, + "Brainboxes UP-869", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c02, 0xffff, 0, + "Brainboxes UP-869", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c03, 0xffff, 0, + "Brainboxes UP-869", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c21, 0xffff, 0, + "Brainboxes UP-880", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c22, 0xffff, 0, + "Brainboxes UP-880", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c23, 0xffff, 0, + "Brainboxes UP-880", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0c41, 0xffff, 0, + "Brainboxes UC-368", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0ca1, 0xffff, 0, + "Brainboxes UC-253", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0d21, 0xffff, 0, + "Brainboxes UC-260", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0d41, 0xffff, 0, + "Brainboxes UC-836", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0d80, 0xffff, 0, + "Intashield IS-200", + DEFAULT_RCLK, + PUC_PORT_2S, 0x18, 0, 8, + }, + + { 0x135a, 0x0dc0, 0xffff, 0, + "Intashield IS-400", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x0e41, 0xffff, 0, + "Brainboxes PX-279", + DEFAULT_RCLK, + PUC_PORT_8S, 0x18, 0, 8, + }, + + { 0x135a, 0x0e61, 0xffff, 0, + "Brainboxes UC-414", + DEFAULT_RCLK, + PUC_PORT_4S, 0x18, 0, 8, + }, + + { 0x135a, 0x400a, 0xffff, 0, + "Brainboxes PX-260", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x400b, 0xffff, 0, + "Brainboxes PX-320", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x400c, 0xffff, 0, + "Brainboxes PX-313", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x400e, 0xffff, 0, + "Brainboxes PX-310", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x400f, 0xffff, 0, + "Brainboxes PX-346", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4010, 0xffff, 0, + "Brainboxes PX-368", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4011, 0xffff, 0, + "Brainboxes PX-420", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4012, 0xffff, 0, + "Brainboxes PX-431", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4013, 0xffff, 0, + "Brainboxes PX-820", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4014, 0xffff, 0, + "Brainboxes PX-831", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4015, 0xffff, 0, + "Brainboxes PX-257", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4016, 0xffff, 0, + "Brainboxes PX-246", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4017, 0xffff, 0, + "Brainboxes PX-846", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4018, 0xffff, 0, + "Brainboxes PX-857", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4019, 0xffff, 0, + "Brainboxes PX-101", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x401d, 0xffff, 0, + "Brainboxes PX-475", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x401e, 0xffff, 0, + "Brainboxes PX-803", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4027, 0xffff, 0, + "Intashield IX-100", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4028, 0xffff, 0, + "Intashield IX-200", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + + { 0x135a, 0x4029, 0xffff, 0, + "Intashield IX-400", + DEFAULT_RCLK * 0x22, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_oxford_pcie + }, + { 0x135c, 0x0010, 0xffff, 0, "Quatech QSC-100", -3, /* max 8x clock rate */ diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index 5f82ef9307d0..14ac213066b8 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -106,6 +106,20 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x131f, 0x2000, 0xffff, 0, "Siig CyberSerial (1-port) 16550", 0x10 }, { 0x131f, 0x2001, 0xffff, 0, "Siig CyberSerial (1-port) 16650", 0x10 }, { 0x131f, 0x2002, 0xffff, 0, "Siig CyberSerial (1-port) 16850", 0x10 }, +{ 0x135a, 0x0a61, 0xffff, 0, "Brainboxes UC-324", 0x18 }, +{ 0x135a, 0x0aa1, 0xffff, 0, "Brainboxes UC-246", 0x18 }, +{ 0x135a, 0x0aa2, 0xffff, 0, "Brainboxes UC-246", 0x18 }, +{ 0x135a, 0x0d60, 0xffff, 0, "Intashield IS-100", 0x18 }, +{ 0x135a, 0x0da0, 0xffff, 0, "Intashield IS-300", 0x18 }, +{ 0x135a, 0x4000, 0xffff, 0, "Brainboxes PX-420", 0x10 }, +{ 0x135a, 0x4001, 0xffff, 0, "Brainboxes PX-431", 0x10 }, +{ 0x135a, 0x4002, 0xffff, 0, "Brainboxes PX-820", 0x10 }, +{ 0x135a, 0x4003, 0xffff, 0, "Brainboxes PX-831", 0x10 }, +{ 0x135a, 0x4004, 0xffff, 0, "Brainboxes PX-246", 0x10 }, +{ 0x135a, 0x4005, 0xffff, 0, "Brainboxes PX-101", 0x10 }, +{ 0x135a, 0x4006, 0xffff, 0, "Brainboxes PX-257", 0x10 }, +{ 0x135a, 0x4008, 0xffff, 0, "Brainboxes PX-846", 0x10 }, +{ 0x135a, 0x4009, 0xffff, 0, "Brainboxes PX-857", 0x10 }, { 0x135c, 0x0190, 0xffff, 0, "Quatech SSCLP-100", 0x18 }, { 0x135c, 0x01c0, 0xffff, 0, "Quatech SSCLP-200/300", 0x18 }, { 0x135e, 0x7101, 0xffff, 0, "Sealevel Systems Single Port RS-232/422/485/530", From nobody Tue Dec 31 09:33:24 2024 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 4YMnpD45Dpz5j9Sw; Tue, 31 Dec 2024 09:33:24 +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 4YMnpD3RnFz4QLn; Tue, 31 Dec 2024 09:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637604; 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=RoJDg5UjygxaQk3IvpcSut+5Y3zFOVMwsZAo6jmPV40=; b=Wq/xnz3Gu10Ha0WOHIxOloLyUenpTHiqOcb2WuDRQXZ8yZg0qhGQ0JiF35obm2nWGmA8s4 CZBsR/+APLMQnh1Wz+6wV6MzNI98FDt3XzPpQo0ays9HecvHPppdj+e5jXNY6XwNdUjspY 4/IODkj8lyuT2qbiabO2CjYnBkzW2fjGleWBxUK1sCP1SVGbHLtYbKWaj7GyqAyp7478LH it1xcRW+33yv6UP3QLTXRxiH5R29hAg/xWVtBkVp4SxpZmdP7v+gF3L6eewHy28bspC/ci yWNYO4sOz68tQHSFQ9kGy8tttoZPuUe+FW+RY2VKsIrcx7HpL3WxEVLl8tBwZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637604; 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=RoJDg5UjygxaQk3IvpcSut+5Y3zFOVMwsZAo6jmPV40=; b=nHiQKFUpESRzx8Af+ebVxUojssFKiMu6wvehzfHPgk2+fHnlFaSI8lpryaiCO4Ug0UQqRb gbm5xi8xP5V3W3NUe3MJQ3HO6ajaDNuVSaGVcYMGbRpnkGXBGfntSLB94XT0clWfWRE2gP tmtiV86e9NN/UpBRyGVobay4R072N/Nt6R2nIY1DKPtDFVXz7QFF9YlLwGHyiQwqUNMKId jSfbIi8UIofthAEpfPfAXaVXYWeaWewFP39qR1bVlo2U+Bi8qmzUuToLqbQiZGBsLMZsf8 t343z2dKTK1Hq9zUHxjTrO0U4orRLFDppTMrL2CZ+D28y5liLgcjWtWZ4NjJSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637604; a=rsa-sha256; cv=none; b=EU3P8sXBCAkhwMxtL1eQ0PVX+iorCYLkTtkecpMQYDfOdpsqxm6EXT+npfyAjwcrCF3nAK 7zFPoICuX/yAev0hv7Jx3YCZgdA1ODl2zX+a8aYAIok0MxZGs4J/txqH7c0PMQnXYrrcBJ grWzM5z6RTwKYfsdfxrzj0WYwSD2CxCMyDzBQagm5x8wxElkj978yLzvqNThNU8zkKcu0V ns0tgyILlNDCYMIqrxwKEe1F2/LHKJS2tFle+e3B9dk8ALTzA/bbD2D4wUcafHM+6/5DHT BCy6QRRIS2+scUStJeMlMuAIU2N9nYH9SHF9O6GBjFRMNE+UW6t5f2H9mlIxuw== 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 4YMnpD33CFzZWw; Tue, 31 Dec 2024 09:33:24 +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 4BV9XOuG057113; Tue, 31 Dec 2024 09:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9XOax057110; Tue, 31 Dec 2024 09:33:24 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:33:24 GMT Message-Id: <202412310933.4BV9XOax057110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 97e2aea90ab4 - stable/14 - sound(4): Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97e2aea90ab41140ff091b1f8c1fa7017fe24fb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=97e2aea90ab41140ff091b1f8c1fa7017fe24fb2 commit 97e2aea90ab41140ff091b1f8c1fa7017fe24fb2 Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:21 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:31:35 +0000 sound(4): Fix a typo in a source code comment - s/orginally/originally/ (cherry picked from commit d40330306cd000c7c64dc18a3634ac8e04b33fdd) --- sys/dev/sound/pci/csareg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h index a36e36177f5c..3341390f618b 100644 --- a/sys/dev/sound/pci/csareg.h +++ b/sys/dev/sound/pci/csareg.h @@ -34,7 +34,7 @@ #define _CSA_REG_H /* - * The following constats are orginally in the sample by Crystal Semiconductor. + * The following constats are originally in the sample by Crystal Semiconductor. * Copyright (c) 1996-1998 Crystal Semiconductor Corp. */ From nobody Tue Dec 31 09:33:25 2024 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 4YMnpG0ZQYz5j9jN; Tue, 31 Dec 2024 09:33:26 +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 4YMnpF53MKz4QLp; Tue, 31 Dec 2024 09:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637605; 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=2ALehHcJI2H1n4ytYea8Z9TA9cPfqWgDE4W+TvdMva8=; b=oEnqltrxTHMvTDkxEVTzNPHb29wbLIR7IWDwIDc6gRP9Zr5F4s7hKEeu8jGr21S1261Hff +sWXGW7IZpUgBeIaMgrkHOCJnO0tUJMZ5mv+2XguEmW+dBziWPQammBJRHb+7y/4a46HZD M8AWbGxloL+GGdA5xOr897QOzG5+NLflKEqn3iyEm1z8AyDxbTB9SfU8CF1jYMjKYZOsfd ZOtg+JTy1HAk8DmpWCteHSfyXjHAnng/BOdpcDjjDB2ICWn6YeByd+vZtNlV2hxuczvk4+ Y/Smuv0Gi7GFnAXVd/Q8oILybwjTYSzUyb6fQtDZBZC93VJHv1o72vEjIwgH8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637605; 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=2ALehHcJI2H1n4ytYea8Z9TA9cPfqWgDE4W+TvdMva8=; b=CiWgvEzsMPD2N2LznVlMBqbATNhA5uFah7df9x07vAktl+YsJk7M2O5qzl2zejv8J+p9rx 66wdvMoA/dGGTcLxskEK1IYG944mmucCQz0R7AepYdKMKnCuo8Gn016tSVjRe8b9J9VZ6s yBrCbZf0dEk5bYyq8EPHtexfPQEhi0HnNyq4C9WjzcT4DFyXpWxM2xdjEsc+RO7ICriQHw URfza0q95207Jf+7+q2PAOx0m2DJ11zoVuxieuBJZuAhhQGukPfhEfpG8jK74ntkSSoQAH 7VgZ/aNnZ2F2YoTujIBeX9CGJk2rwN+pjnLhQRhmsUAtVMqT3N5tULWsaNy/xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637605; a=rsa-sha256; cv=none; b=fgpf7NQ/UFUQU98KNtdLjii6Mc6GtMg3phAO3gvXcJdwWJFprl7QeKWSnZEjBSQKhzRB7A Z6BbRPg/ub9R3imwH6/sUJm0AbslXFkey3JmfCjONXz+ch9JrlEcftBnHl+GHf373rXKaR Bwap3iLd/gHj6nDnBxy074G1n3AlyA5HRcc2d2kV05854C0+QruLtCr3ORh8xLTHfN6gYp AeLGdCPMpOXcxoLsFaMyxOMRDIWyaXnbzotrF/1F70zMo9FA9ms4uLp8QUUgALFbtFJ0Ht TUrfCfSLdoiZhF1hxAio+//V0RmKSZ8Jh2wVQ4Sv+ZGIz1syVG0x1u8V1zKbXQ== 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 4YMnpF3YgBzZdm; Tue, 31 Dec 2024 09:33:25 +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 4BV9XPH7057175; Tue, 31 Dec 2024 09:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9XPo1057172; Tue, 31 Dec 2024 09:33:25 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:33:25 GMT Message-Id: <202412310933.4BV9XPo1057172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 07afd8991219 - stable/14 - arm/qualcomm: Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07afd89912193fb819c56fb68ff96bc24f6fb93c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=07afd89912193fb819c56fb68ff96bc24f6fb93c commit 07afd89912193fb819c56fb68ff96bc24f6fb93c Author: Gordon Bergling AuthorDate: 2024-12-28 06:37:41 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:32:06 +0000 arm/qualcomm: Fix a typo in a source code comment - s/unneccessary/unnecessary/ (cherry picked from commit fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611) --- sys/arm/qualcomm/ipq4018_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/qualcomm/ipq4018_machdep.c b/sys/arm/qualcomm/ipq4018_machdep.c index 6734383d5b42..ae469fa772c9 100644 --- a/sys/arm/qualcomm/ipq4018_machdep.c +++ b/sys/arm/qualcomm/ipq4018_machdep.c @@ -65,7 +65,7 @@ ipq4018_late_init(platform_t plat) * XXX FIXME This is needed because we're not parsing * the fdt reserved memory regions in a consistent way * between arm/arm64. Once the reserved region parsing - * is fixed up this will become unneccessary. + * is fixed up this will become unnecessary. * * These cover the SRAM/TZ regions that are not fully * accessible from the OS. They're in the ipq4018.dtsi From nobody Tue Dec 31 09:33:26 2024 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 4YMnpG6HsMz5j9jR; Tue, 31 Dec 2024 09:33:26 +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 4YMnpG5HJ6z4Qp9; Tue, 31 Dec 2024 09:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637606; 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=IoCgVcM2hpvRBq4W06ma3dcXUb9JTJIF/FGtg7xdxJ4=; b=WEAdVlDgAiqm6poHYlTccG1FU2uJldTJfny3AOGfX4vBi/6JPOj9smWs4XGO5n5i5D3n+m 7kaC6YXApzhSIO+1yysiWMhM6UkKK97b5fQVakJXpxmFHRMXmCE3gcG5w1fTVmfrZxN51Z gVK9CK+cr6+pPj1G7eyayfeM/OWX0BPp1SUEuhtxyplgC0cT7L/lQR4wy+C2ca/v9FDl2a DtrUJrGV1330twegMmE2z5LHNBp7eQG4cAeD1F7d2C49JuonlAuGp5wVAmUHRcp3RTATaF UcQWuOcFZB6pXcMCuUljtmawmTuN9tyzMWWTIg8NxFQCytlqAN1KpRZ3Rt2J8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637606; 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=IoCgVcM2hpvRBq4W06ma3dcXUb9JTJIF/FGtg7xdxJ4=; b=G1PuJPNl6zLyCCTEe8B4eiqLS2YEt3/YkPYyuEgxgn+LBDGf/El5j0+LL94g8RexJG2KRy Ao7B+qdmb9qe6tymSlolS7xKsDlQmlsB6oNazifcaXjpv5A08bRQi6sCxTIG506Ek9/vdF gZYpQ3syzFK+TUwVRhPYGLipTMLbdoQxCs88/Crhg1E1UxwZPdMsn0Z531ymkR/3TeC0ym MKO2NO6k3ZwlRxKc2d3dPaK56BU3AjzaAfzFin5f3T8SE4TpHhPfPhF0jRFYekGFFpbybg EujbB2N4S8dCl/TXPz+GTEdAicI+s8EBpT11aVB9+rLv0k7pJ9iUk2wKegHeVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637606; a=rsa-sha256; cv=none; b=mv3949AvF6MARNGk+KVhEhLxYZ584v6rVV+6ifQDb8ZL1rVVH4aSgU7It1qTv4p05yvqoA f5lv3tuYdDq6/PK3eb/ae1aypBPC5lgBpsNDVN7Erkz0+oiUMWRhuvZ7jrHnKJzAzYB8HS MvYxDHHFkI1/ITEFPRkOBEkN0xjgKhLbudVUwTXuiD1jN0Ej5TTsK4YIf/ReoxSYPF3kxo +RXyYmBwJXF/hBE66oOp0NLkouQGapHbS27Z1WlQBX+SnUbhuLWphlC5Co+jDP8vK3gptx uMgYQwv5O3eoEFoR8MPHjLNNC06pScvswN2Dqj9JUcrC6z/mMRLTZrQxbCgyuw== 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 4YMnpG4vVXzZcR; Tue, 31 Dec 2024 09:33:26 +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 4BV9XQrt057229; Tue, 31 Dec 2024 09:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9XQXO057226; Tue, 31 Dec 2024 09:33:26 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:33:26 GMT Message-Id: <202412310933.4BV9XQXO057226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 13bd8f011116 - stable/14 - kern: Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 13bd8f011116e29311e300321f002af97cc73667 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=13bd8f011116e29311e300321f002af97cc73667 commit 13bd8f011116e29311e300321f002af97cc73667 Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:50 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:32:24 +0000 kern: Fix a typo in a source code comment - s/explicity/explicitly/ (cherry picked from commit 15ce9a0544e9d850fb332b4bae3313ff38584d61) --- sys/kern/sys_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index a45d5b065382..a6cc9a36643b 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -367,7 +367,7 @@ proc_rwmem(struct proc *p, struct uio *uio) /* * If we are writing, then we request vm_fault() to create a private * copy of each page. Since these copies will not be writeable by the - * process, we must explicity request that they be dirtied. + * process, we must explicitly request that they be dirtied. */ writing = uio->uio_rw == UIO_WRITE; reqprot = writing ? VM_PROT_COPY | VM_PROT_READ : VM_PROT_READ; From nobody Tue Dec 31 09:33:27 2024 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 4YMnpJ1cJWz5j9nv; Tue, 31 Dec 2024 09:33:28 +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 4YMnpH6KzMz4QHv; Tue, 31 Dec 2024 09:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637607; 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=si47lPUYMMl428rk3L7XnfRaoXjkGx+PvSU8aLZ8G/E=; b=J9N74BuzI5gOu7gNsy+fTWKFj5rfEuTLRv65VH3TWpp41KFH7at3zyGBYqEwMh9CJH8dUc D1Xuq4cTaCoWm29nE+yA0IWb6A5VpwhVdSZgSnOgTXKG7iwc5hH0YKwyS3fv4LlzP6bSNt TIl01LpxxHtAOtaEmbyUE/hw46lMo88O9ureg5F/Gi47iaUAtMEQbqpCf/3MkCU5VO/DwP 6sJ2VLi0eNA/jXKNx2qZhdv+9AVeDyaZPcAhs7St323QOu4XIHd1A8P+pRZ0gozIt5/+E1 sdh1/lW5qpWRTvD1xkI6tm06TvTp6W9Uh0rHCGeQo8MjBvziEABMm2eYgYhIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637607; 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=si47lPUYMMl428rk3L7XnfRaoXjkGx+PvSU8aLZ8G/E=; b=rhZLH/EDzOFn5JxY2L7tQv+iYo68n1iGGX1zFwlgCOsc1/ObYkX0tf0jezhsA5GIaab/Mx 8bcmwe/jAzXJClAbsDAMf09NPfLUsVGvTyou6Tpdi5LfPBVkOaxN6rKkQlrzQsQFoX/O5g nwu9qgfPe/5TaPZnCLJnbArYnUda93/KWvXHq/un3oHQ6O4Sb5LLtHywUTyU9NPpFDWNQs kC8ouNiZyLtSvMJ85+fizX5MLTvqAGuYCZ1GoI0DbckY77NAEg55g3zRZ4l0QX2RgzilOo JFN1TCqX3I9eBg0o4VBOn5EItWIRIiGQLde5zZnFjz3+NPPKHmTU/2KyqjNMUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637607; a=rsa-sha256; cv=none; b=wHwTzWJuCfJ8IyX+w2dOkGZC/TBYaADKtQDJYgm3eLBUF7zVhpVDxVzRoGW3Yjl27Tz1z/ xWWosGOvIkAp2k9YFbxgFg0c9AAL4fkuke3pFHmWOhS3eLM7jIDva8wcdK+WPh+ArWzkce e8fVeMksGOu8NPY0TrY5K3fo3II237GfFOqhCeNkFAFKLd73xErP8jrKLiU45453oom4IS ci2GlWA1Uli5KJjlR3zkIyDXWg+klhiPQhKEx1f1bJinDbZVRvrNTVlbA167aWUeiq087E ip1X3F5hoyW60f01Ag4NXdisstYUYOFOsWQHgM3ahovMaQ+bryq1FGHjqIq7fw== 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 4YMnpH5yC8zZNl; Tue, 31 Dec 2024 09:33:27 +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 4BV9XRW3057283; Tue, 31 Dec 2024 09:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9XRuU057280; Tue, 31 Dec 2024 09:33:27 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:33:27 GMT Message-Id: <202412310933.4BV9XRuU057280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9be823d76bd2 - stable/14 - isci(4): Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9be823d76bd2225495bfd73d2c6e9f764f519d91 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9be823d76bd2225495bfd73d2c6e9f764f519d91 commit 9be823d76bd2225495bfd73d2c6e9f764f519d91 Author: Gordon Bergling AuthorDate: 2024-12-28 06:38:33 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:32:43 +0000 isci(4): Fix a typo in a source code comment - s/kength/length/ (cherry picked from commit 3db51fb1720efdddd6e8c2045397f59a398692d3) --- sys/dev/isci/scil/sati_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isci/scil/sati_util.c b/sys/dev/isci/scil/sati_util.c index 22c3111fe9ca..300ecbd5367b 100644 --- a/sys/dev/isci/scil/sati_util.c +++ b/sys/dev/isci/scil/sati_util.c @@ -70,7 +70,7 @@ /** * @brief This method will set the data direction, protocol, and transfer - * kength for an ATA non-data command. + * length for an ATA non-data command. * * @pre It is expected that the user will use this method for setting these * values in a non-data ATA command constuct. From nobody Tue Dec 31 09:36:25 2024 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 4YMnsj50G6z5j9pC; Tue, 31 Dec 2024 09:36:25 +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 4YMnsj4MGgz4RhK; Tue, 31 Dec 2024 09:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637785; 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=s9xJbCH8YAQ1L2ZUsTW25XjDVAaxZmmf/voMPFSB9r0=; b=R1uzD3p9/RJBFjrDRsABhUMpHO/i2BqhHHrNwYof1KeAJGp5rZHgN5PP0GxeDEqvCZQiVu 6H5j/8tM3njwfub80Ma85j67zVL1NaaWRgywpmOcc3w+hwL5dB4zIpntx5Wp/jVgGSF413 Pxnru0pJyohqsh2nCQCCN/KpYMMgoLhMMx+gg2aUQ31kQ4WP/CqAh55gPVeZe2YWV5pHJV Xs128qPrTehMrZbVxtzYNfPp2/MSMFXmq2nKh2tfv98nEcUwzbQIQOCU8F2FEouqpPkwJG 3VkupahK67QedwI0UT1hVzVTVh6fpwm9nHO06ps3GqWdxXghdp1w1SnTJQC9VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637785; 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=s9xJbCH8YAQ1L2ZUsTW25XjDVAaxZmmf/voMPFSB9r0=; b=Ks4viv3IQ+dUUO3uSvnyGGUHPcNcdpg+v/XOCX+fBzitLgBbQRQxpN/kx0a6ox++zlDhMN dwdDMPazqad8StW2CQip/D8uSGQH7bLKnFWL8WUE7OblGavH3jptt2r7brflV3jikfpdNh JXdUTBV3EBgDWdpTSLuFBO6KPzAgZMGRqaPH2p3XKnwzMaPn16ljwfBkRHy0TExuGmNfgr uFRu6EJRhligjpTxYLbM0S+FfeUw9Lwc2gSDS8u6F9uykaPPRo27kORQ1ReM08713fMG9I 17n6Del5DW/Wf2nFJxxlnB+IR1l94RzUGs4bp8jcAxUz5/a9f8JGYecwgTxXMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637785; a=rsa-sha256; cv=none; b=AlBadaCpik+acUPLuSyI803dyKsu4tZJoxzIB0P8QCb4R/2wzBscB2zcjGR7W+WhpN9Jr2 52P19PE7b6muHpVc0S/kgGcQBRFlgBA669zEd67OnMdkyR8d8xbG5FbXBctNpX7U9/7Upi F7vj/Svk9WhYqBAu2Xwyqf3Z6aL2pG7du9sb+pAsTP9z/zCkqctBFnrp/onepcddIo1bpk 5hcll+JpzFyFs8Pmp7mLXWegZtwWTYOFRk1/MOzt/Cd4duuNnWnZr+DzWQwFyrOB2M2VmR omkDnUJ5/JXNH9pj/2ErEfSC4MOcEr60120mGNoDPeXebrDaCKVpseh8ann+jQ== 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 4YMnsj3yfYzZNm; Tue, 31 Dec 2024 09:36:25 +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 4BV9aPFj058324; Tue, 31 Dec 2024 09:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9aP4J058321; Tue, 31 Dec 2024 09:36:25 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:36:25 GMT Message-Id: <202412310936.4BV9aP4J058321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 228b9b37a8df - stable/13 - sound(4): Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 228b9b37a8dfa1e7e965b3913979d12a573e8852 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=228b9b37a8dfa1e7e965b3913979d12a573e8852 commit 228b9b37a8dfa1e7e965b3913979d12a573e8852 Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:21 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:33:58 +0000 sound(4): Fix a typo in a source code comment - s/orginally/originally/ (cherry picked from commit d40330306cd000c7c64dc18a3634ac8e04b33fdd) --- sys/dev/sound/pci/csareg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h index a36e36177f5c..3341390f618b 100644 --- a/sys/dev/sound/pci/csareg.h +++ b/sys/dev/sound/pci/csareg.h @@ -34,7 +34,7 @@ #define _CSA_REG_H /* - * The following constats are orginally in the sample by Crystal Semiconductor. + * The following constats are originally in the sample by Crystal Semiconductor. * Copyright (c) 1996-1998 Crystal Semiconductor Corp. */ From nobody Tue Dec 31 09:36:26 2024 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 4YMnsl1JjGz5j9g7; Tue, 31 Dec 2024 09:36:27 +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 4YMnsk5M6bz4RL8; Tue, 31 Dec 2024 09:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637786; 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=TcZgliFvTP8cDiuzivVZ9NnrrKUn6QjNKEAqo4DsWbs=; b=cGq4mWtuNiug4/PPBiUvpI2g9YfGCnz6fGAiVJFhcO2uT+p8zhlL9R8Z/U45xD2dNSyU4q yVjf/bRqpDgwZeuaYOHhHoGkkauWmaEAko7Kv2oEqRRCVJbxTRxZsUg0FmItAOtICImNAE qPCXXbFnjZvNwgiNU9zAFt7OZoRmLiHQ9MryETnkhsO55FWOJhuFNQQsTkoyBn1bA1Hyno pmaRRPQ3tzcR+9hs+HjIS8EHfol+7sqkANWfapj5quG3bs6NefPo+bv/Y3ce6IPMEYedjS D4BJ0I3DiczDKzyfpsMtYnE9ocpnObrnRfH9OQrMbi9jOgKmuq7MBRyyX0WCGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637786; 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=TcZgliFvTP8cDiuzivVZ9NnrrKUn6QjNKEAqo4DsWbs=; b=u8m/4JlRDnaSDKWHeeP134lXCcW2KDy58Vp5AzVCCF1CcKO8aAunkMHQr1WNWcMey7WHM9 xfteuRpBYzoM6BTrGo7NrJFU8B0/7kF2SmzGq6dTGwPFj3xZbVdkAWUqEqaQtGaTvdMVel hH/3XX+ZCSEXPvdGjJF/gtbr9ScsF9NnoDSZcNFcRX1NTOCYCwTd97lQMFxySQRYJfpHom hrJ6vHZpEGX04GLfqcUdTATENT4jfjZL97W/MwamGcbmRyndVetIP/bU2++w6uYKoR5Ji9 hY8tevaKdgyhq8nCQBSSGMeE2w3NKSKVCto+isLB+z6RNHnDjo+9JmlxkVp7Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637786; a=rsa-sha256; cv=none; b=U7mlqktUqdWiXfRs9KrzKWmlXhUeOrC9DvSEf2qPXB/FyVS0c83nsek1PTEtr7FJkzgJ7v fcfJqUvFqgitikifcccs0rf/Y9/Yw4EVsIGtNzDqq9IUPA05Ln5f++0LnuJXvKJbdf4GJw agK+kpk1qD7tSXKXlc2oLJKjexFb3vG7KEP7AtAbYZhd2sQvEJpKeSLTMLZk9dX5T+5FUB 5jWKcv5b1uODvzhuLTmo2824zBAXwaKQpCH5n+JS15NkvTv7r7zG1dtmCMJw6WBvQGIlWl axuu3f/BCLRS/KuA9GuStZcj86jTzATLXwP0hNr+0YtAog2cN/s7gWL32dBILg== 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 4YMnsk4gflzZNn; Tue, 31 Dec 2024 09:36:26 +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 4BV9aQxE058378; Tue, 31 Dec 2024 09:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9aQ0b058375; Tue, 31 Dec 2024 09:36:26 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:36:26 GMT Message-Id: <202412310936.4BV9aQ0b058375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7d1482319475 - stable/13 - kern: Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d14823194752e41f3a10b9282ff04bb8cff16cd Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7d14823194752e41f3a10b9282ff04bb8cff16cd commit 7d14823194752e41f3a10b9282ff04bb8cff16cd Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:50 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:34:59 +0000 kern: Fix a typo in a source code comment - s/explicity/explicitly/ (cherry picked from commit 15ce9a0544e9d850fb332b4bae3313ff38584d61) --- sys/kern/sys_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 2eaeabb6a5f9..57fa6d0c0323 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -348,7 +348,7 @@ proc_rwmem(struct proc *p, struct uio *uio) /* * If we are writing, then we request vm_fault() to create a private * copy of each page. Since these copies will not be writeable by the - * process, we must explicity request that they be dirtied. + * process, we must explicitly request that they be dirtied. */ writing = uio->uio_rw == UIO_WRITE; reqprot = writing ? VM_PROT_COPY | VM_PROT_READ : VM_PROT_READ; From nobody Tue Dec 31 09:36:27 2024 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 4YMnsm38Psz5j9lM; Tue, 31 Dec 2024 09:36:28 +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 4YMnsl6Rs4z4RYk; Tue, 31 Dec 2024 09:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637787; 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=lEjbMryaeN9BLcIIPwRdP/OQBDEQKqf8YAflvlW/qYo=; b=O7vaF4w/hla2zlb0rZ4YGfia+tk3nEvlKSVvnPPiQAAqtwHUmvgMromYLwnVh6Dgr7oyT5 WX6p1l8bpiIzW9S/3vnl43VLaLV3kXDp+TZOF3igbybQ84ElfIsdzSt+ws3r05Rk8iyb23 B2E+eKGdDcjwQvUiAI4EzgfLn2QAGaBp4YfILHoMA8RpCV8enEkJUlInNZOfBDccvbH7+n rL9xrvfMEtmf/ZPGM6R/5GFqluP20tqPGf8c60jIpnBC+5uAjKA9/XWmi3XinMUlEG4F7K zFwqAh2TmhclSzLW2ojhvorQVnoSZnZYriZMMaoVHNJULLgtaqhp9yLBCRyqPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735637787; 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=lEjbMryaeN9BLcIIPwRdP/OQBDEQKqf8YAflvlW/qYo=; b=aAlfxAVkmSX8K5ka3kkwNfiEr7p9U35lcH1+z4RzsYIU/qlC3WQjjs+OUKkRVkscNTR9Ty l1+PcJONLZnawWGtUlkbWTvreDCrpAR762YzUq87Swpx/OS6+/JF9AHtI6x+MRjJscGwiR 7OuFEfsS1JW7Zqz9zDmPOXBkjAAvuX62r1B2GJKXc7+iDlWbgxK5EkD8Fglra1+76HNby9 5sAOb/W2mFwxeJ6aGmmB0XV/X3MbqFdVqVvvPSh3DQG6cr2tjgEKHdoAp8zlgkvnkzmsws ADs7hp03TFbKfdpF+XrDypd8wjSdEynX2ngv94JYNBt/S+I+92+Yz1pO8+jMhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735637787; a=rsa-sha256; cv=none; b=uznQn1/K/B/hfnA467GrK9BO+TfWwHOYPoZT17uWsr/iS005hfF56utpigSc3JCRHim4nI Z2b7mBvBiwAe9RH5PGexFbEgjrn/kj+v53z2rMXDzhTbS5VAXoKdKB1MS/0zLS6E/sC8il P3xHHZXTZAna0hHL3QJ+5y5HexDWtLwSRxBzH2Fvr1ZjSjmWm5MnnwK1620qY/JxH96XFO blrSPDzgqU1VZ+OR57SeJosVjk/+TPs6tZE13HZou8KVvs6kQd7cNBJqj3Q5akc/CdwNzB w7a3OLmQ+/PD9i+CGquKPx5svMXpTO6j0P0moHLxAp7EJsh0exvNUqxdWFEZcg== 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 4YMnsl5MwczZNp; Tue, 31 Dec 2024 09:36:27 +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 4BV9aRMh058432; Tue, 31 Dec 2024 09:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV9aRtQ058429; Tue, 31 Dec 2024 09:36:27 GMT (envelope-from git) Date: Tue, 31 Dec 2024 09:36:27 GMT Message-Id: <202412310936.4BV9aRtQ058429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 420d4927b311 - stable/13 - isci(4): Fix a typo in a source code comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 420d4927b31170d4b04462e9265519af9e8d764c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=420d4927b31170d4b04462e9265519af9e8d764c commit 420d4927b31170d4b04462e9265519af9e8d764c Author: Gordon Bergling AuthorDate: 2024-12-28 06:38:33 +0000 Commit: Gordon Bergling CommitDate: 2024-12-31 09:35:13 +0000 isci(4): Fix a typo in a source code comment - s/kength/length/ (cherry picked from commit 3db51fb1720efdddd6e8c2045397f59a398692d3) --- sys/dev/isci/scil/sati_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isci/scil/sati_util.c b/sys/dev/isci/scil/sati_util.c index 22c3111fe9ca..300ecbd5367b 100644 --- a/sys/dev/isci/scil/sati_util.c +++ b/sys/dev/isci/scil/sati_util.c @@ -70,7 +70,7 @@ /** * @brief This method will set the data direction, protocol, and transfer - * kength for an ATA non-data command. + * length for an ATA non-data command. * * @pre It is expected that the user will use this method for setting these * values in a non-data ATA command constuct. From nobody Tue Dec 31 12:36:40 2024 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 4YMssh3lMBz5jNsk; Tue, 31 Dec 2024 12:36:40 +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 4YMssh2r7lz4gCc; Tue, 31 Dec 2024 12:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735648600; 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=8aOY6MCza72Up3Ao/PQnR1MLSCvPXKEVtZ6a0v32VGk=; b=W4bAcgoaXjeFH6muilPsogyFdlrQkzadSKXah1lEK8VBDK2ApZbzY1Y0s+lzJK7vfaYbJr BhPpzmvQNGL+eQF0jvKsjwVYpp1eDXmFe39rmuacsYk+T2PxPwe1tQkjpywWZ+xZFqyuvZ yKfSH7HRlMxOxYjAE5/RPwoBfqRv19A0ChvcZPlwB2aB1nVoNrqlaAfoPSNTbBKMXKJgKf ZqQlQNBunkFX1JABHx4s/6yMXuVp2kQju6CFPo4E1xiTGe9yBjW/jfmaEOWoE5qOcGY+mX wnqAzr7hsZH66XOSDHYuyvRDD72b6eUTS7X0xByNMWqnDJbgePZgmlJZNSXBlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735648600; 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=8aOY6MCza72Up3Ao/PQnR1MLSCvPXKEVtZ6a0v32VGk=; b=yETofra56y94BsXoKnc9yZo01nTmlMrF2ZxJ5EFLbNvHYCmamFZ14CqQRNJAz3N8AR/Isw eRADY4Y2mFf6fiPeo/JF6nxCG7AMU4KsaNgVfNJri7bDxvtr+b5zM6jAiFKffaTAWvKlrF 7Mw9+QlNig22W7tmJQ2q7DhCF6QG4+AboqofB6wrwZz34jron84v1V9Eg39MuY6qIuYIIi DSwr8KOAWmEjdFjtDkviwGDOVzZqn+4c/gxomLf/2aLDidWPN9weTYDVDDuyN3pY2KZxKI seEC7rIIstXZDC0iIQJYfVD49ax4A0gQreU4OVb1cHY8uFRK3bhPBhZXyP+paw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735648600; a=rsa-sha256; cv=none; b=n90QIZWUi9vnj1AmELZHFjTgIPX5X4ubT9AYTbKDGgiqrXdlSVknukcxT9H+Vmty9PksP0 GBsFOtjXwsgfEK7PEr5fPsEjptaFzdJ3AbW6S9O3gRzOwsOIHh4uMaX8EqlsxCZxrSNVto nXSYTRJN/vil0wMgNswJKGbDFEjvdPKEvmD23hX2Ue2NW8ksTEq8ZilTbUWqquNO9LIZcv dVVlZ9wosIgPb32p3dRG+cRCTaQwwkTC3CeQouto0ogqFnDLxB++ApWz0bX+CTJNCUVmwh mi7biFwmPwqteeZC25Qz1ag+rEhmmoBPZhDuq7C2FJbgLHk0FI2+UPhp1+0+Mw== 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 4YMssh2PR1zg7c; Tue, 31 Dec 2024 12:36:40 +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 4BVCaeSC093462; Tue, 31 Dec 2024 12:36:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVCae9Q093459; Tue, 31 Dec 2024 12:36:40 GMT (envelope-from git) Date: Tue, 31 Dec 2024 12:36:40 GMT Message-Id: <202412311236.4BVCae9Q093459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 7700d456bff4 - stable/14 - linprocfs: Properly reset error variable for mtab generation 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7700d456bff49383e2e6e8994fd27661757395cf Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=7700d456bff49383e2e6e8994fd27661757395cf commit 7700d456bff49383e2e6e8994fd27661757395cf Author: Michael Osipov AuthorDate: 2024-12-02 13:25:45 +0000 Commit: Michael Osipov CommitDate: 2024-12-31 12:36:18 +0000 linprocfs: Properly reset error variable for mtab generation Both functions linprocfs_domtab() and linprocfs_doprocmountinfo() are logically identical, but the former fails with ECANCELED because error is not reset after the for loop. Reviewed by: jrm, fluffy MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47865 (cherry picked from commit 58c7db14cd71c41f59d80d26d921782c0c27d523) --- sys/compat/linprocfs/linprocfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 5c60d4d8e713..9e69c92dc014 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -539,9 +539,7 @@ linprocfs_domtab(PFS_FILL_ARGS) error = kern_getfsstat(td, &buf, SIZE_T_MAX, &count, UIO_SYSSPACE, MNT_WAIT); if (error != 0) { - free(buf, M_TEMP); - free(flep, M_TEMP); - return (error); + goto out; } for (sp = buf; count > 0; sp++, count--) { @@ -561,6 +559,8 @@ linprocfs_domtab(PFS_FILL_ARGS) sbuf_printf(sb, " 0 0\n"); } + error = 0; +out: free(buf, M_TEMP); free(flep, M_TEMP); return (error); From nobody Tue Dec 31 12:37:54 2024 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 4YMsv66Tb5z5jP9r; Tue, 31 Dec 2024 12:37:54 +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 4YMsv61hLkz4gHf; Tue, 31 Dec 2024 12:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735648674; 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=aEoDpS4QSKAl1FFJ+/5f/Zo/4RwGkA2abX6VaWmpRVQ=; b=kT19jk3ILlSOvpw47K5zf6QuuSomCktZIsrvLJT79eJc3WK7WiwuQy3AF1SRcYp7Xq2KBg 6LHLJNnkVv22UYR5PQuDCrQ73fdkUj+bNN82s8IqfEaN67FxqkPG9B9FIklCf1rvwVbD/Q wwQID3VCGp9nsRakH1ZIOj8SVYDlWfRsWZKU0CbfTudnOyNxU32HWU62YpZlLG1WMcxXvX 4efXfJVEbb1qjMCpFTnskcCYsCCqolOLCGzc/N2JNWCevDxZiZHvLibuE9iAwEp/duxvP5 Ji9sO+i1cg6CjFwG+bBy51lL5Fz2Dhfv21vSky6dgez3RDyYIZE8Sa3Vj8fRrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735648674; 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=aEoDpS4QSKAl1FFJ+/5f/Zo/4RwGkA2abX6VaWmpRVQ=; b=rU7mqERjrjdJa+1Q+WxZamNSZOMob7lDFtOD0bM4gDiJPT/VC6KjyKLNo48n7Gb+e4k/UI kGvf4sYTVcOYLBi0bCeDM2ev0wZeWXGedVjiRATcscMllYOPFIsalsQeW3fSWeTlFgC8Sy lrxSBKNyqxshvT72D1Be/fHa8YBsGUOSFLgDccI863s7bd7fiv290Qpjv6Mkzx7aW52nhB gZp03E5QPpxyn24mx8dB2w72LiXxaV2alTHHL7NodMujh5n3jpBfXRfRJd+bARcP+Hp35H BZ2loCwqxR+U9BGRH4OWmMMo3XqhioGolhweei2MG1hiVfAsu6VFme975jf4Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735648674; a=rsa-sha256; cv=none; b=WkY+8kLR4qFI3WUt8NutZ7xosyWnAPhOZDOmvGKQRbEiTcKerK+v13bkS8CXvu5dXQ7O3u 4eTD2TQdUH3RKnF1RFRGhLQExMH3Culxt17l/4fswjXkyEdKn+iFu+KCu2AzAOP2Miv2oX lOeyNRChfjSBjgIWamF8tmJuOcb84IgBMPnY4fYl5kBFSthqZ/nYRUVtXgRTTKjNfaB/PK WDd+O0qIM+0oazYeWwycYQRWmd4/gjmJYMVOvXeH65D0xs5DrX9VBYIaBFswzcTq+hWy0t 6G2fgJXVHNvTvfsb3+fsa8m79EeuAOuAQm+oX0GMYxQVQzZdgKMj4iyKN4eWyQ== 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 4YMsv60qH1zgB6; Tue, 31 Dec 2024 12:37:54 +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 4BVCbsbV093969; Tue, 31 Dec 2024 12:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVCbscc093966; Tue, 31 Dec 2024 12:37:54 GMT (envelope-from git) Date: Tue, 31 Dec 2024 12:37:54 GMT Message-Id: <202412311237.4BVCbscc093966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 3f00a0678b9d - stable/13 - linprocfs: Properly reset error variable for mtab generation 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f00a0678b9de3657d859e590adb3e646aebb2ae Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=3f00a0678b9de3657d859e590adb3e646aebb2ae commit 3f00a0678b9de3657d859e590adb3e646aebb2ae Author: Michael Osipov AuthorDate: 2024-12-02 13:25:45 +0000 Commit: Michael Osipov CommitDate: 2024-12-31 12:37:39 +0000 linprocfs: Properly reset error variable for mtab generation Both functions linprocfs_domtab() and linprocfs_doprocmountinfo() are logically identical, but the former fails with ECANCELED because error is not reset after the for loop. Reviewed by: jrm, fluffy MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47865 (cherry picked from commit 58c7db14cd71c41f59d80d26d921782c0c27d523) --- sys/compat/linprocfs/linprocfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index f8bbb0d8fbfc..0a471f684680 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -543,9 +543,7 @@ linprocfs_domtab(PFS_FILL_ARGS) error = kern_getfsstat(td, &buf, SIZE_T_MAX, &count, UIO_SYSSPACE, MNT_WAIT); if (error != 0) { - free(buf, M_TEMP); - free(flep, M_TEMP); - return (error); + goto out; } for (sp = buf; count > 0; sp++, count--) { @@ -565,6 +563,8 @@ linprocfs_domtab(PFS_FILL_ARGS) sbuf_printf(sb, " 0 0\n"); } + error = 0; +out: free(buf, M_TEMP); free(flep, M_TEMP); return (error); From nobody Tue Dec 31 13:20:49 2024 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 4YMtrf2h16z5jRg5; Tue, 31 Dec 2024 13:20:50 +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 4YMtrf0FN0z4kQK; Tue, 31 Dec 2024 13:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735651250; 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=km5Smv/wIgt8ipi3RPsfXKRjhujJEzaQzkqjz6GUw0g=; b=qi4q/7uLlsMSszWHE3VY1KfyrkWQpuNiM9jeHxv3T52lifz1wiWNV/1Lmicpuf4nJi2aJg KLgXGa4V9EWeCFEY+zR0v55D7etkyW/AehlRBsicAoASzA2M/+FNf4VCmjP0hqZJYL0E9i PdgaIfgmUzQ/B20QE0y5RoTdgzW/0FUJINiS+5tq/QMWRmXRriMld7eVIWNiGrOiC+/m6P kGIzEPQ0s+HZjZJDz9a/Eue5qxyIh9eINUB9Bhg3EBIe+G7umKXC+12ZBlwyXDq6UAvzNd H0pd/lTB7xPHEL4IqJWYzn7aGfYIiTP1ekipMPlyoXoyKVy/W5McXzcZpdHRhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735651250; 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=km5Smv/wIgt8ipi3RPsfXKRjhujJEzaQzkqjz6GUw0g=; b=PKXlVup410XJZRG4zVIyIGjRbb3CTJNg/Ojqhc9qYwnNA3MLnBzdH3iLczJoam2LS0Ywsr x/qFCxLd2b73yInh86P0uRVhwuWWq56ChYWygh+2nCk8gNvYKIubU/JOYzSUUSo5JGGBvs W7lXD7Xdw+l6ETPTCp+zLwz7nbXBaiSQSAHbQMUOj/m5CaiSi+T+vlDoMYxXA7mylZYyte d/6JI7LXPrnTxscmSa4H4cFVwTCM1bH6VIClttGPF3tEAPSTh5DRGV2dl0aBUiY6pyQjg1 36p44AsGbTzuwm3/VEP9cjbE7ijYCm5C/0dQQEOCycdqXBrHp1nLUGXJREKskg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735651250; a=rsa-sha256; cv=none; b=wYkDxnVdm4Ho9XjyGRtbR80Rnd2bYTxjuObLXXvJw2TqAc3o8iEX1612r1c/wd0Pxl/W9H gtoYWDD0QHxqRCBQd9mEryRg/QZIMJJTt9q4vJ2gMwosH+zvy5BNs4CDob/duCEBdS7ROu XPO2rJsMkpJ8e7aNcegI703Dsbn5NTdrlbT3Wc3ctYkBVRsRx6C6PzmB4JoZTj/Q6cItLW gUHERHR+rIAHMAiT9l/UgBLzlNtusZdp1QgMGMfKgV0e4z7Q4JqW3PVg8J2fF/KrVJWPRH RqxmY9yEO2FIg9fmMEhspG+VPvmCcPsJBZJvrI+FxyvhxwusqeUnfGnn+i7GKA== 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 4YMtrd6ypyzgr8; Tue, 31 Dec 2024 13:20:49 +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 4BVDKnoT078950; Tue, 31 Dec 2024 13:20:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVDKn1H078947; Tue, 31 Dec 2024 13:20:49 GMT (envelope-from git) Date: Tue, 31 Dec 2024 13:20:49 GMT Message-Id: <202412311320.4BVDKn1H078947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 242eb8d4e009 - stable/13 - rc.d/sendmail: Fix error with some configurations 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 242eb8d4e0095f7d922ecec78b7a3c91a6e2d99c Auto-Submitted: auto-generated The branch stable/13 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=242eb8d4e0095f7d922ecec78b7a3c91a6e2d99c commit 242eb8d4e0095f7d922ecec78b7a3c91a6e2d99c Author: Tijl Coosemans AuthorDate: 2024-12-03 10:45:10 +0000 Commit: Tijl Coosemans CommitDate: 2024-12-31 13:17:46 +0000 rc.d/sendmail: Fix error with some configurations The sendmail startup script can run 4 daemons: sendmail, sendmail_submit, sendmail_outbound, and sendmail_msp_queue. Of the first 3 at most one can be enabled. There's a run_rc_command call for each and the ones for sendmail and sendmail_msp_queue run unconditionally. For some rc commands this triggers warnings or errors when sendmail_enable="NO" or sendmail_msp_queue_enable="NO". Since d2e7bb630b83 these errors are propagated and the whole script fails. Fix this by first determining which daemons are enabled, setting ${name} and ${rcvar} accordingly, and then always calling run_rc_command conditionally. Also replace ${name}.cf with sendmail.cf because ${name} isn't always sendmail. PR: 282585 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47757 (cherry picked from commit 6b17d944a1d448dbb797c5fa5b0778242ba02e52) --- libexec/rc/rc.d/sendmail | 49 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index 28d6818eabac..97cd6fcfddce 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -40,11 +40,28 @@ esac if checkyesno sendmail_enable; then sendmail_submit_enable="NO" sendmail_outbound_enable="NO" + _sendmail_run=true fi # If sendmail_submit_enable=yes, don't need outbound daemon if checkyesno sendmail_submit_enable; then + name="sendmail_submit" + rcvar="sendmail_submit_enable" sendmail_outbound_enable="NO" + _sendmail_run=true +fi + +if checkyesno sendmail_outbound_enable; then + name="sendmail_outbound" + rcvar="sendmail_outbound_enable" + _sendmail_run=true +fi + +if checkyesno sendmail_msp_queue_enable; then + _sendmail_msp_queue_run=true +else + # Make sure run_rc_command is called at least once. + _sendmail_run=true fi sendmail_cert_create() @@ -164,8 +181,8 @@ sendmail_precmd() # Die if there's pre-8.10 custom configuration file. This check is # mandatory for smooth upgrade. See NetBSD PR 10100 for details. # - if checkyesno ${rcvar} && [ -f "/etc/${name}.cf" ]; then - if ! cmp -s "/etc/mail/${name}.cf" "/etc/${name}.cf"; then + if checkyesno ${rcvar} && [ -f "/etc/sendmail.cf" ]; then + if ! cmp -s "/etc/mail/sendmail.cf" "/etc/sendmail.cf"; then warn \ "${name} was not started; you have multiple copies of sendmail.cf." return 1 @@ -203,33 +220,19 @@ sendmail_precmd() fi } -run_rc_command "$1" -_ret=$? - -required_files= - -if checkyesno sendmail_submit_enable; then - name="sendmail_submit" - rcvar="sendmail_submit_enable" - _rc_restart_done=false +if ${_sendmail_run:-false}; then run_rc_command "$1" - _ret=$(( _ret > $? ? _ret : $? )) fi +_ret=$? -if checkyesno sendmail_outbound_enable; then - name="sendmail_outbound" - rcvar="sendmail_outbound_enable" +if ${_sendmail_msp_queue_run:-false}; then + name="sendmail_msp_queue" + rcvar="sendmail_msp_queue_enable" + pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" + required_files="/etc/mail/submit.cf" _rc_restart_done=false run_rc_command "$1" _ret=$(( _ret > $? ? _ret : $? )) fi -name="sendmail_msp_queue" -rcvar="sendmail_msp_queue_enable" -pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" -required_files="/etc/mail/submit.cf" -_rc_restart_done=false -run_rc_command "$1" -_ret=$(( _ret > $? ? _ret : $? )) - (exit "$_ret") From nobody Tue Dec 31 13:20:51 2024 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 4YMtrg2FLqz5jRZv; Tue, 31 Dec 2024 13:20:51 +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 4YMtrg1MWSz4kKh; Tue, 31 Dec 2024 13:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735651251; 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=rVa1FKptYiutsznUX7cvIc3iVfSBzFHGaSPVbIRO+SQ=; b=cN5jXmd0Y/JpvtTB1sWENhQjXxTKWA1O1mTrqKfCPMkzjRFLtQ5iz5TxfA+R9/zKIgs51P VNs3LZPhmc26ZQfqVI9ywqXThjPNDrYs2JKva2aiiYtKkbj+LyO5Iub1w6C/2En8X61Rtf MUiHSMfWDjGmwuESolcfW9SUxkdqy31CTg+4vnVBmJK2AT3oNJLUwlk4FzcV/dhWGVGQ82 9qyQ53aYUK8o8w//78fDW4SG0jPINWjATPGJPncZ1WO/v0NNGhEq45jxZzPTIn9NPwmVmb 9DXfBPrpQJWksXZh8jHRbGfeu20AwD7iVJm4nMNPnCPihgCTDr0Cc8O+5B1SBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735651251; 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=rVa1FKptYiutsznUX7cvIc3iVfSBzFHGaSPVbIRO+SQ=; b=aE0mnP163NEj0lRHkrFmD3tqaE+R3FZ8itZwyYo2LHMZlIZhoV0rj0WKuwG5wBPZI2p7I6 GdFvfOyat06vDSpwuSoLniz4ZhysReBYw7BN9WshloFQpqdLe+XB/zZDW0iZ4EZ5u+0N3t emGq+SIiUnOIFBpiTomUStQgOh8p93hKj6VR7sVPa8zyN2Y3e1ILsuSwJYU4bZirbPLgq+ NPxUk/bDQZ0irCdGozCzMmhYKU6tX1RzLSFeJdgbCBzMGBAh5YWJNNQh5rgZV0ZY8P+0oD sTMVVoF32sgdG+1IZDgxGehphovMLHt5CpAD+4Supm3CV7ym5I2y7qLe5Ou7Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735651251; a=rsa-sha256; cv=none; b=Y4NJffcCKSz0qfxE+c799DqGAFWg37bvxbqYTBMuCK9lnYChDqc5xQtiS4wT9KHSAbAi+y f3cfDMzvHe3BzMaJJ1NvreNfdosCWweeYTEoTd7Of/43OP3fZ64HoCKZCt0UHErZES4K1Y 28N+x4PphCtBL3bTWSG2rMrPCBTff1kJbxLCV9wWJP9lLHOPbeYdkQKAi+HZ9EDEJY/Nrv mea5iM+JzHgPXq3+sRriA7HdUo9zHSYWdiyZBD5+hGInornU3XDp5QfRZNy9QTVN0uJ3mc XYiOGWzua+MwAXhlyptsfUxXSnoXrMCMz07Pk1je8bvJrfRrq/X8tHZFq+hRRQ== 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 4YMtrg0ym2zgsm; Tue, 31 Dec 2024 13:20:51 +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 4BVDKpuK079011; Tue, 31 Dec 2024 13:20:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVDKpBU079008; Tue, 31 Dec 2024 13:20:51 GMT (envelope-from git) Date: Tue, 31 Dec 2024 13:20:51 GMT Message-Id: <202412311320.4BVDKpBU079008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: fb3408bb6e5b - stable/14 - rc.d/sendmail: Fix error with some configurations 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb3408bb6e5b7bebe8800d9f08579d9dc6236b81 Auto-Submitted: auto-generated The branch stable/14 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3408bb6e5b7bebe8800d9f08579d9dc6236b81 commit fb3408bb6e5b7bebe8800d9f08579d9dc6236b81 Author: Tijl Coosemans AuthorDate: 2024-12-03 10:45:10 +0000 Commit: Tijl Coosemans CommitDate: 2024-12-31 13:16:10 +0000 rc.d/sendmail: Fix error with some configurations The sendmail startup script can run 4 daemons: sendmail, sendmail_submit, sendmail_outbound, and sendmail_msp_queue. Of the first 3 at most one can be enabled. There's a run_rc_command call for each and the ones for sendmail and sendmail_msp_queue run unconditionally. For some rc commands this triggers warnings or errors when sendmail_enable="NO" or sendmail_msp_queue_enable="NO". Since d2e7bb630b83 these errors are propagated and the whole script fails. Fix this by first determining which daemons are enabled, setting ${name} and ${rcvar} accordingly, and then always calling run_rc_command conditionally. Also replace ${name}.cf with sendmail.cf because ${name} isn't always sendmail. PR: 282585 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47757 (cherry picked from commit 6b17d944a1d448dbb797c5fa5b0778242ba02e52) --- libexec/rc/rc.d/sendmail | 49 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index 28d6818eabac..97cd6fcfddce 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -40,11 +40,28 @@ esac if checkyesno sendmail_enable; then sendmail_submit_enable="NO" sendmail_outbound_enable="NO" + _sendmail_run=true fi # If sendmail_submit_enable=yes, don't need outbound daemon if checkyesno sendmail_submit_enable; then + name="sendmail_submit" + rcvar="sendmail_submit_enable" sendmail_outbound_enable="NO" + _sendmail_run=true +fi + +if checkyesno sendmail_outbound_enable; then + name="sendmail_outbound" + rcvar="sendmail_outbound_enable" + _sendmail_run=true +fi + +if checkyesno sendmail_msp_queue_enable; then + _sendmail_msp_queue_run=true +else + # Make sure run_rc_command is called at least once. + _sendmail_run=true fi sendmail_cert_create() @@ -164,8 +181,8 @@ sendmail_precmd() # Die if there's pre-8.10 custom configuration file. This check is # mandatory for smooth upgrade. See NetBSD PR 10100 for details. # - if checkyesno ${rcvar} && [ -f "/etc/${name}.cf" ]; then - if ! cmp -s "/etc/mail/${name}.cf" "/etc/${name}.cf"; then + if checkyesno ${rcvar} && [ -f "/etc/sendmail.cf" ]; then + if ! cmp -s "/etc/mail/sendmail.cf" "/etc/sendmail.cf"; then warn \ "${name} was not started; you have multiple copies of sendmail.cf." return 1 @@ -203,33 +220,19 @@ sendmail_precmd() fi } -run_rc_command "$1" -_ret=$? - -required_files= - -if checkyesno sendmail_submit_enable; then - name="sendmail_submit" - rcvar="sendmail_submit_enable" - _rc_restart_done=false +if ${_sendmail_run:-false}; then run_rc_command "$1" - _ret=$(( _ret > $? ? _ret : $? )) fi +_ret=$? -if checkyesno sendmail_outbound_enable; then - name="sendmail_outbound" - rcvar="sendmail_outbound_enable" +if ${_sendmail_msp_queue_run:-false}; then + name="sendmail_msp_queue" + rcvar="sendmail_msp_queue_enable" + pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" + required_files="/etc/mail/submit.cf" _rc_restart_done=false run_rc_command "$1" _ret=$(( _ret > $? ? _ret : $? )) fi -name="sendmail_msp_queue" -rcvar="sendmail_msp_queue_enable" -pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" -required_files="/etc/mail/submit.cf" -_rc_restart_done=false -run_rc_command "$1" -_ret=$(( _ret > $? ? _ret : $? )) - (exit "$_ret") From nobody Tue Dec 31 14:47:47 2024 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 4YMwmz5BtHz5jY0V; Tue, 31 Dec 2024 14:47:47 +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 4YMwmz4dJBz4thc; Tue, 31 Dec 2024 14:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735656467; 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=VbzMVwefxyncCSIr8Xbmx1oavjT+kAeEjxXxEVaTDjM=; b=NBCM3Ob4jXJ+kMJ6BHj8mLjxK36f0winERfBlIIKIRNB+VLBkFhnOVEnSQ+O6ewdqO3nWo 7x9GWdmol9ThCaV9e7E3S2f0mt9bBgchTghHDLqgsl9iPicm3YHc9Q64blKNOD+jAwSiIg CO96CTZ7fqKMZrdnoS+qhWyQ6K2cCkVlW4UQOi9s+mzN38gWb9UzhA4cJozODuOItt7x2G d64BJGHUuSsYY8Oqq/Eywke9OinM0z/qWTjBg9f+AW0TcezCipKdc5StRTwitw0h1nmrxi vBKa1/dymMWjnNQ+wnw5Dnxuh0Cg+Nm6xcvhBWPAakmq8NYBKwE78inbF9bYQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735656467; 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=VbzMVwefxyncCSIr8Xbmx1oavjT+kAeEjxXxEVaTDjM=; b=B2U+0awbOqTQLDneFNQJxMrlMUSXEXAmwg4MqHSXmCZwZK6hq0B1tjNw/SCgw69ifQCf99 NhodhPwfhVcxeeyy+Ai8if+weeMKnoyTr5op7zV5CA77MQVb5uIyXEcEMf3GjzKZ9U8t9V Ru9wCq/mN7TmJqynjoABywFTElrOIf4BWGO1RWtCkie/mzGBYzGlSFu1oX4w+uxRFrlITR YANQXBx0crSXNMab9F1yU7rA6gVluaqoiQUznAwqEJZq5BmjDILpRypJVdi5k435RdcWge eEqb2JX3SsPgZbfyEWFn9Wk5RQ+pa24sbPB6ecZRBdPYtvnrOsi9dK3lp94Rkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735656467; a=rsa-sha256; cv=none; b=JE7loWHUw3CgHF6iT1J++puwqDPFC8flxTUynG82D8AX47u03/oz5JhyNYo9UcTwCzwS4N P9d8XC9Yp1TjO7bkhcKf3/VfgBv2mQGXEJxU8a9gUQM9N5k5zhHfJMNheiQRKBmPhcATod MWpi50FxM109kskqJ4IofZEro7Np77CZoq7orWrobr3Ea03YgyV91++Fs66eRBMv9LWiWa QK36mB/ODgQRoknBGkFK0N1mWRLQY9PwyqoV+Lyp3rixCyvr3FrpB8k2T+svewlxs9bsEc XipdS7YMHCGC7Iiipy0dT0M/VPgQolUcdOo8bg6bjoWs3XhIU5XimolMG9N95g== 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 4YMwmz3tpDzkWY; Tue, 31 Dec 2024 14:47:47 +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 4BVEll3D038397; Tue, 31 Dec 2024 14:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVEllWe038394; Tue, 31 Dec 2024 14:47:47 GMT (envelope-from git) Date: Tue, 31 Dec 2024 14:47:47 GMT Message-Id: <202412311447.4BVEllWe038394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 48ef7ed72a02 - main - Clarify net.inet.ip.allow_net240 and allow_net0 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48ef7ed72a023fd9051e0db4e7c8e93b55ec5214 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=48ef7ed72a023fd9051e0db4e7c8e93b55ec5214 commit 48ef7ed72a023fd9051e0db4e7c8e93b55ec5214 Author: Ed Maste AuthorDate: 2024-12-31 14:47:32 +0000 Commit: Ed Maste CommitDate: 2024-12-31 14:47:32 +0000 Clarify net.inet.ip.allow_net240 and allow_net0 The stack has never limited use of addresses in these ranges as an endpoint. The relatively recent sysctls control only forwarding of, and ICMP response to, these addresses. Reviewed by: bz Fixes: efe58855f3ea ("IPv4: experimental changes to allow net 0/8, 240/4, part of 127/8") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48262 --- share/man/man4/inet.4 | 10 +++++----- sys/netinet/in.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4 index c9267558d6f3..08ca67a7edad 100644 --- a/share/man/man4/inet.4 +++ b/share/man/man4/inet.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 8, 2022 +.Dd December 31, 2024 .Dt INET 4 .Os .Sh NAME @@ -169,11 +169,11 @@ The following general variables are defined: .It Va accept_sourceroute Boolean: enable/disable accepting of source-routed IP packets (default false). .It Va allow_net0 -Boolean: allow use of addresses in 0.0.0.0/8 as endpoints, -and allow forwarding of packets with these addresses. +Boolean: allow forwarding of, and ICMP responses to, packets with addresses in +0.0.0.0/8. .It Va allow_net240 -Boolean: allow use of addresses in 240.0.0.0/4 as endpoints, -and allow forwarding of packets with these addresses. +Boolean: allow forwarding of, and ICMP responses to, packets with addresses in +240.0.0.0/4. .It Va curfrags Integer: Current number of IPv4 fragments across all reassembly queues in all VNETs (read-only). diff --git a/sys/netinet/in.c b/sys/netinet/in.c index a6f212e9d3ef..28d3e2093c61 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -102,13 +102,13 @@ VNET_DEFINE(bool, ip_allow_net240) = false; #define V_ip_allow_net240 VNET(ip_allow_net240) SYSCTL_BOOL(_net_inet_ip, OID_AUTO, allow_net240, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip_allow_net240), 0, - "Allow use of Experimental addresses, aka Class E (240/4)"); + "Allow forwarding of and ICMP response to Experimental addresses, aka Class E (240/4)"); /* see https://datatracker.ietf.org/doc/draft-schoen-intarea-unicast-240 */ VNET_DEFINE(bool, ip_allow_net0) = false; SYSCTL_BOOL(_net_inet_ip, OID_AUTO, allow_net0, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip_allow_net0), 0, - "Allow use of addresses in network 0/8"); + "Allow forwarding of and ICMP response to addresses in network 0/8"); /* see https://datatracker.ietf.org/doc/draft-schoen-intarea-unicast-0 */ VNET_DEFINE(uint32_t, in_loopback_mask) = IN_LOOPBACK_MASK_DFLT; From nobody Tue Dec 31 16:04:25 2024 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 4YMyTR37Xdz5jg14; Tue, 31 Dec 2024 16:04:27 +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 4YMyTP741Bz47cw; Tue, 31 Dec 2024 16:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735661066; 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=pO8zLPQO3Bv4Dy1aBijiD5feRvwtU1FviNPnDPHbNl0=; b=gtwa2/hz2j8C74kOiidIJfgB9VtHWQGs7qteLtmokHa+CmIFGTLUCcRG7GXpG5ux51ENwh enaK+zmz9rVjFqCpjimWS6NK6T+moyPk/YtlktzE8iUZTmONmLcrjxUF16K89MRfT3Ssdw LBDAl+nBZB3w66p173e874gvBdbIQ+lQacBUPiOLt2YEUWVubC0I/w3V6DhinS3L5gicqz S4AU71sdE6+nDmRR8Bjxjc+5UaWp67SBurJEZS7dIXjjhXXdFbb3hZGzuE+Tiq0acI9lhv pZ9/T0sqa0aekUYOi5XHnv9ZUqFz4UfEDYk7x8c9mn9S0PJvUU2/49MIFn83wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735661066; 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=pO8zLPQO3Bv4Dy1aBijiD5feRvwtU1FviNPnDPHbNl0=; b=MweME083nQRIjAUfZDsZ4CPSCAi5ADftEuAYWlpRH2M7V/A68eJuppoXU7kUAxwiI7NHhT 9DTa4YcIXqtDb5ezDlOGIBGE9aaplcW2LXOnSyF8xUJgXGdBKU7jnB6wXB7f0jZ9H7xSuc 24nURJ3AVSUYHaWV5TdmNQ1OXpe3K9KXOpuWLjWVbvsVOtifGOmFvq6+PFRKLBVADm1W33 x3ktZRI0JEPWamY6oYBrIoS1G0Fa7pIUyla7Xa6bJ+BB716Xa9H9B/H7zE3OENlea788zV DKcIy5QimnJC4efWQumulkdWqq8fWelXUIe0TeiNmNYark4V2FxSQZvSzQW05Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735661066; a=rsa-sha256; cv=none; b=xwzH+rwDHQrxU9PrlzKLzKfTfglwecub1o3Mx39uY5OqOLAPzMakUmBbamn3mKrzN1g+np rGIqK2Cyn4RRhyGMZzTQ7ozHi0Jc7hjS9UarcAGgRVM66Np0bts1LmbM37+VKKPyDCU4F0 1R7zPq/hkJCIbI5ftGNpi38YjZw6ysTV/Qh337JtsRBmRPeVhvgE/uo1utfVHS1R1yUien TX5yGrzAhpH1ktc6JlYeNx0cGLqgSLmansWQNRXsukMYhf/xJncJQaKsUpPYs2km74aklr hg5ler4zSmOsDZsMknBLWsyos2OlOE8qFZ3GkwpLOzspZWsuWnM2/DkrNylfAA== 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 4YMyTP6BZfzm2b; Tue, 31 Dec 2024 16:04:25 +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 4BVG4Pkl098167; Tue, 31 Dec 2024 16:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVG4PlL098158; Tue, 31 Dec 2024 16:04:25 GMT (envelope-from git) Date: Tue, 31 Dec 2024 16:04:25 GMT Message-Id: <202412311604.4BVG4PlL098158@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: 81f9d3b11f31 - main - sys/sys/kernel.h: Remove SI_SUB_DONE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 81f9d3b11f310b28e4bf8cc2ad2d84e4aadd929d Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=81f9d3b11f310b28e4bf8cc2ad2d84e4aadd929d commit 81f9d3b11f310b28e4bf8cc2ad2d84e4aadd929d Author: Zhenlei Huang AuthorDate: 2024-12-31 16:01:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-31 16:01:21 +0000 sys/sys/kernel.h: Remove SI_SUB_DONE It was not used since 9a7add6d01f3. Reviewed by: mhorne, imp Fixes: 9a7add6d01f3 init_main: Switch from sysinit array to SLIST MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47915 --- sys/sys/kernel.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 0413be7e1f7e..3144b5a50c98 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -85,7 +85,6 @@ extern volatile int ticks; */ enum sysinit_sub_id { SI_SUB_DUMMY = 0x0000000, /* not executed; for linker */ - SI_SUB_DONE = 0x0000001, /* processed */ SI_SUB_TUNABLES = 0x0700000, /* establish tunable values */ SI_SUB_COPYRIGHT = 0x0800001, /* first use of console */ SI_SUB_VM = 0x1000000, /* virtual memory system init */ From nobody Tue Dec 31 16:25:10 2024 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 4YMyxM1L2Kz5jjP9; Tue, 31 Dec 2024 16:25:11 +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 4YMyxL4wKCz4XyD; Tue, 31 Dec 2024 16:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735662310; 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=Gaty92ktzUwaJcLMWSToDBjJpDI0sbpbwLPsIVYA+n8=; b=Ic3bYy1Ib0yn257yamUzW6UkBWDXPUOu24julcwOwO/31/psfB6T1i9FvaBE8oJflAuuqm b2+KBe1qbcArx03vnvPYzm9uUwBBB2YotPB8JaXXuJ0Uan5M7bjIf7ex0xwZM3ysXapkuy DGwlL5sMK/65T6V0YXZAe8HHLZLpRV0RtjKzaQ9dtZri/kpDyPwXDU0LvxWxdM5FHtuWLu toE8o0OZPz5lIDghceZzEyqfRMQJOewLN77zVJaxOWb06OI0nKaDXnKlaMFKA88F3YjQ8A 26JuNHABv08BEYiNJ9eAyvG4V1Rz0NzM9wO+UsoldKXU3q28hmTjtRhqnaCauA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735662310; 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=Gaty92ktzUwaJcLMWSToDBjJpDI0sbpbwLPsIVYA+n8=; b=BmQEtSa90aigoc1iKl63t+PZKt8UMIuhRyS9mobfNQN50bf3ajYRv0sIfuXCvhbQIVY4FJ pmTnZGEkHhTYBflL8BgIY4eUeV/nkhEl+TZ0xf4ZSoTOOLdX2d+jq4DnFgatE925YqNEWL ECqgeRZTDmuhhBilmHA+lz9sGP1gvoa9OenHp1G6F0s4CFiQJqc+cfMQ6ngQjh02Kw8S4L 3lRjSCpLtpHoAv6HkorUQ6vVjMlENkamEJeRhKRccq+kesKx4aehlk5a0ACjowHEUse1Mx mrrFPZLqDM8oBg3pDsRw55PaAX5au7pE7UuEznTo7kGsn2LhSrUXekwPvnndWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735662310; a=rsa-sha256; cv=none; b=ajxNLZG/PbosuZoFBeajU6zEcHLmL6n3tW+np4IXZ5n5yZ18RButxBtgcmJY/7QcMhwaot MbZ2ggTKO4adL0+9JCB8oMq7ct1AYgInYuJKfdP6Y+uBIZRiV8b6bUscef2Eu1GGw5InKf aCShzr84twmx8FudewJ82qT0UwHaKhNKiC8+X3tfhYxHdScXVMyi8QWp5xjZTfNjGYp0D2 G91EwDXrrE5oCoO8KoG22uvSA/UNt5xjWYYRuWqX1wHj4yU1FqGbH+SXMCxAHvHZ74KYnq jN2W3USOqRf1FejhaF7E7m/knkVocl58NWNIwjmKjD7BfbWnRtDPRcm+nKVneA== 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 4YMyxL4XFCznKL; Tue, 31 Dec 2024 16:25:10 +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 4BVGPAJF040649; Tue, 31 Dec 2024 16:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVGPAAf040646; Tue, 31 Dec 2024 16:25:10 GMT (envelope-from git) Date: Tue, 31 Dec 2024 16:25:10 GMT Message-Id: <202412311625.4BVGPAAf040646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4940584bbf0b - main - TCP RACK, BBR: cleanup of ctf_process_inbound_raw() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4940584bbf0b809130f6ac1a7a0c6b00d373af1e Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4940584bbf0b809130f6ac1a7a0c6b00d373af1e commit 4940584bbf0b809130f6ac1a7a0c6b00d373af1e Author: Michael Tuexen AuthorDate: 2024-12-31 16:22:03 +0000 Commit: Michael Tuexen CommitDate: 2024-12-31 16:22:03 +0000 TCP RACK, BBR: cleanup of ctf_process_inbound_raw() Instead of dealing with ifp == NULL, which should never happen, assume that this is not true. Use KASSERT to make this clear. No functional change intended. Reviewed by: glebius, rrs CID: 1523767 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48258 --- sys/netinet/tcp_stacks/rack_bbr_common.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 156091feeb30..da26b8cb1f9b 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -361,26 +361,15 @@ ctf_process_inbound_raw(struct tcpcb *tp, struct mbuf *m, int has_pkt) int32_t retval, nxt_pkt, tlen, off; int etype = 0; uint16_t drop_hdrlen; - uint8_t iptos, no_vn=0; + uint8_t iptos; inp = tptoinpcb(tp); INP_WLOCK_ASSERT(inp); NET_EPOCH_ASSERT(); - - if (m) - ifp = m_rcvif(m); - else - ifp = NULL; - if (ifp == NULL) { - /* - * We probably should not work around - * but kassert, since lro alwasy sets rcvif. - */ - no_vn = 1; - goto skip_vnet; - } + KASSERT(m != NULL, ("ctf_process_inbound_raw: m == NULL")); + ifp = m_rcvif(m); + KASSERT(ifp != NULL, ("ctf_process_inbound_raw: ifp == NULL")); CURVNET_SET(ifp->if_vnet); -skip_vnet: tcp_get_usecs(&tv); while (m) { m_save = m->m_nextpkt; @@ -466,18 +455,14 @@ skip_vnet: m_freem(m); m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); INP_UNLOCK_ASSERT(inp); - return(retval); + return (retval); } skipped_pkt: m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); return (0); } From nobody Tue Dec 31 16:28:55 2024 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 4YMz1g3Ws3z5jjkh; Tue, 31 Dec 2024 16:28:55 +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 4YMz1g2byyz4cGB; Tue, 31 Dec 2024 16:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735662535; 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=/TsU5M0e3Uw/CR0+b5zNBN5/1RUp9lJ0BqDanCTAlZk=; b=tH/GXiGGHDuygKHGm2x86ytZD2Q30Xp2Y/e2VcZbExRb2vFgtMgkH4Y2yWGMagwnVYTxML 587MkM0X62h9uAa0OBAR3r268umdGULmhkyxyCWrEwwT9uBa5dhs7WgzCSJ/iglSj0jpnJ PgB2R7mG7OgsnhrKs+vryBJ5r73krUeiYsp9mDtbWio1BVAdKMtHsZjuH+zH5PIvXcokaR 4l8XQd1u88WeKHvLnpa/+wte0SNUqXMGMLpWp/eUR13cTtUJz9lIbYUtN6mwC2ntbFvbwE zY2Nz51KCdy+rFdBR6aAwjm0/xK949bKaYLEMSou+iLPpdAQs2hVOHXxXUKtGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735662535; 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=/TsU5M0e3Uw/CR0+b5zNBN5/1RUp9lJ0BqDanCTAlZk=; b=RtSXRR9TmVnvskh63i3ITKzJjuD2AnJG5HQzcf1MhPEU3IZXo3HoyLKHJKEo41kfFmYVSm BLw7vTF6yh+/jLdjB0HXHsEkE6ygLlefcMLCTlSYRJxpwdoNZXmdeXQgG5RZPTOY5x8k5D AJ7eqch+ioNILn3FzbF8X6YEd5Tri9mWbCGiH+zO+YCqW0JIQNSY6N3l1ThVH7B234Umi+ 0Wyjog6D8dHyAqL3awsLcOce3s0gVsnrZfE11vpK59qYb7UyR8+SEh4vbUWpKQRiOMwHkf UUT0i9GjLvs1X4ApvCRxlwhKUsd495AFx9yHEx0lwKgDVBOKam4mI2DcrnDWAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735662535; a=rsa-sha256; cv=none; b=XN0WiB7MuZ3MwzIqiTahPd42pxpFCiNE9E5Mf/fOMsXeT24HOZgLR6lxjsCMFGGFTSAj2i AIXoYcJZou9e/Sr26PLiLPACwjVbhmYxq7p5tkVJCSR6MkZJEWFsaGSc0cLPS9hVX6BdcO g791VBM3m+V8MdVqu+GdOzpJc6QnviL5Wbfb2I0t8mWM5cocUUnFvKUVLZz9dQ2336gAOS 3gjHcHdOwEMJi4BtfZ9RXCis3Xqp8LMmkZ+3ybdcRl1QzdhAGcZ3V2aGZ5QZdBuM8HxsRp dBnnN5HeVjAoVyLCO8uxCRFJAvA3N0GaxbuGPwpP3f9pxejN3CtnfJReSwK65A== 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 4YMz1g22wwzmpB; Tue, 31 Dec 2024 16:28:55 +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 4BVGSt9j043478; Tue, 31 Dec 2024 16:28:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVGStTu043475; Tue, 31 Dec 2024 16:28:55 GMT (envelope-from git) Date: Tue, 31 Dec 2024 16:28:55 GMT Message-Id: <202412311628.4BVGStTu043475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4f3a0c719780 - main - TCP RACK: don't use an uninitialized variable 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f3a0c719780fdd57c660ceb353bbc71fc555600 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4f3a0c719780fdd57c660ceb353bbc71fc555600 commit 4f3a0c719780fdd57c660ceb353bbc71fc555600 Author: Michael Tuexen AuthorDate: 2024-12-31 16:26:04 +0000 Commit: Michael Tuexen CommitDate: 2024-12-31 16:26:04 +0000 TCP RACK: don't use an uninitialized variable When storing the old beta values in rack_swap_beta_values(), ensure that the newreno_flags field is initialized appropriately instead of using an uninitialized value. Since the stored newreno_flags aren't actually used, this fix should not have any functional change. Reviewed by: rrs CID: 1523796 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48260 --- sys/netinet/tcp_stacks/rack.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index da68060dd1d2..ef2554926734 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -642,6 +642,7 @@ rack_swap_beta_values(struct tcp_rack *rack, uint8_t flex8) failed = 2; goto out; } + old.newreno_flags = CC_NEWRENO_BETA_ECN_ENABLED; /* Get the current values out */ sopt.sopt_valsize = sizeof(struct cc_newreno_opts); sopt.sopt_dir = SOPT_GET; From nobody Tue Dec 31 16:32:08 2024 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 4YMz5N55Z5z5jkHj; Tue, 31 Dec 2024 16:32:08 +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 4YMz5N2N7Fz4cm1; Tue, 31 Dec 2024 16:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735662728; 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=vFy0NgjfWf3TndN5PwfVPXdqR4uNu9pgiMDeKBnerAM=; b=lCOPW9zwi0hIAZ4/OYUHYigDExknPlkuSukGc9s4wyyFAOdSUZUca6JQXmJ1HeegFR9ho8 9WdOO4ajaSQJS/7Pv2/cLVP7oBNbUd/8WrYQ/MeO4eh3Z6kzFbGhYEdBxzWiJFn8jxIikR xMJblm9Fdf77V357RIgY2UTYk4lSM5/3uXH11+U/46kgZbFkNtrJTt0o721Jr83gYUi0Gq 62H1kPkWV0cWYIQu5cXnCsfNGh4uBaPISWblBzrySkoUnBUk6s0vcIt7t8t4eqgTooRh6l eOiSoEbZYghsYLqg/WL2WXejsHMwrMri88zfO62lXL66Cqig+jjGd4SQL71u3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735662728; 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=vFy0NgjfWf3TndN5PwfVPXdqR4uNu9pgiMDeKBnerAM=; b=eec5HSSv0CnHWBT7mgVdo8PjG9toRtPXw7FsaagqzKJ2updN58WoAAyCse9V8x8DKbrKZD 0gcJBk1iG7Dl/NdEOjf125B6eh7X/4ppjm0/EZwahsB3cr0eB/LTL8GcCiDxt5B1yYqKuT 6OgTYiJ7TfBInXjld5Wmf9mjiXhaedZZsz6SxGU1vuiT7NdtTn0woN3AVXAVXsdBzyziwO kaRMzJeLhmWufgyWup1FzcUauaaEHrQFwfc6aEH6gSu093VxzOIE0NRMkX0SZVb/sMr4Jl 1bUbJCgCmgBDChtb/RwQa5e+LCFyLKIOvObUDQk3Dy2NKN0QryvzAwpVFGcwfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735662728; a=rsa-sha256; cv=none; b=OaRc2Ny5wepcaoak+/3qUWjeO6TkCBgR6UhdMQF4LV+MZu6NcAuHG4xkEpSowJ9ArdQOLn KdD/GtuCcYMIFIEZlHegERVAYDK83w1AKC7CYkUPcu5HDZ+6H+NHSGtA1rOkspdhZtHAtd bOBxBXXdV5x/tDLyEJ7HtiQ0XDLwvtn/79LxXcNNsFhZBb/dBiFfB2wDyWvep6ah7wcPnX YsoWMwU+gh0xkPaR5/2w0tiGykQOUijo4yad7bG8ZVnP69ZzP3OXNYNMDJlTq2dF1jo8Be LuH7nGSBm78iKGUmrzQRuCHSoKHvlryP3K8BVHz9RoEZavrlbxlvPMH12iWFjg== 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 4YMz5N1nMvzn4D; Tue, 31 Dec 2024 16:32:08 +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 4BVGW8db059831; Tue, 31 Dec 2024 16:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVGW83Y059828; Tue, 31 Dec 2024 16:32:08 GMT (envelope-from git) Date: Tue, 31 Dec 2024 16:32:08 GMT Message-Id: <202412311632.4BVGW83Y059828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b47dcb4b1ff1 - main - TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0 commit b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0 Author: Michael Tuexen AuthorDate: 2024-12-31 16:29:04 +0000 Commit: Michael Tuexen CommitDate: 2024-12-31 16:29:04 +0000 TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE Actually implement the IPPROTO_TCP-level socket option TCP_BBR_USEDEL_RATE. Reviewed by: rrs CID: 1523813 CID: 1523814 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48261 --- sys/netinet/tcp_stacks/bbr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 24c3685f139a..f440573ace30 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -14587,6 +14587,7 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) { struct inpcb *inp = tptoinpcb(tp); struct tcp_bbr *bbr; + uint64_t loptval; int32_t error, optval; bbr = (struct tcp_bbr *)tp->t_fb_ptr; @@ -14647,7 +14648,7 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) optval = bbr->rc_loss_exit; break; case TCP_BBR_USEDEL_RATE: - error = EINVAL; + loptval = get_filter_value(&bbr->r_ctl.rc_delrate); break; case TCP_BBR_MIN_RTO: optval = bbr->r_ctl.rc_min_rto_ms; @@ -14731,7 +14732,10 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) break; } INP_WUNLOCK(inp); - error = sooptcopyout(sopt, &optval, sizeof optval); + if (sopt->sopt_name == TCP_BBR_USEDEL_RATE) + error = sooptcopyout(sopt, &loptval, sizeof loptval); + else + error = sooptcopyout(sopt, &optval, sizeof optval); return (error); } From nobody Tue Dec 31 18:49:22 2024 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 4YN27k2mSNz5jsYD; Tue, 31 Dec 2024 18:49:22 +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 4YN27k25fKz4mrR; Tue, 31 Dec 2024 18:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735670962; 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=wFo35ZLkoXyhSCu33LAT8/klJVwTO7R/cC9ypPIaH04=; b=dTFfLV9Gdo6y+Z3yt4Jpkgj/38g9AlECki8zWS+AjHslWDTrJbMeal55ATZccNF/Q8sPNx p6mAPcG/OUV9AKMxBrUO1AG+viucxvPstl7lblC9i66VPiS/zBmoXeSP/6eagW2KkmyETg tx5iUtI4Ne2mLNymgPw3OzeQVeM8GNTKE9TBIqxH8M9wAN0/i/AZTKOa5yqZXlLiWHagw5 O5WjQPsBcWfoBM7wOed7ICSY7kmCiEGNCucQat5sAjCoMn1fhnx2DoN2zKR+N1pt8uNgRq uJ92MyrBerVLzCjGx2YEUFI4tn6HgGUNU7BM6tLTnZuxKNOXTNSomL8AFK+UrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735670962; 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=wFo35ZLkoXyhSCu33LAT8/klJVwTO7R/cC9ypPIaH04=; b=dGko44uOwoc1a1zBgm9cWkkMa7QMTZwUr8//6g7JyJVRyEpH6NLrTOIs/0QtGDvhZtpqsX 8XeVTFEf1e/QdEQAxydp2KI9CZFxTuulltKPjNVyII9iuo2XKv6DCfu0zmXq21+ygX7Uep HBHlj9rdA5sGUlZilh2ZycqZ12edvVX5diYJ26lAGR/zqWXF4DUb2Qkde3+BMoa0F3/AKH lzI/S8HtMGVBHOVxGOrEfCiwijXFNbp+eXqt08pJiSvCoQNcQQ9Xfo/uJOZEwrddNCMgvM f/pfuJXqJbyAOQMfHsClV3cidcvIZuDJu3OledIWH6A5WqfFja0EEpPcP5gmiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735670962; a=rsa-sha256; cv=none; b=u8IyqGBYAL1CMnjl4EsaiKdWyitBXtzO++qgXC/NcfDSb+CavFrmn56aj4jrau40kfxlnq AIYLMxmkb0Fv+KEerJR9mIAWDcLAY0IneV3w2hkZTWTsz0/2KztbNjud725FYl1lvNm6C2 qSGqw39QS+pvUHyITSIeCBz+44Da+Eqr0D68ME8DdWRhaICMtrVWWub4sPW7zsGc2IJV+w 923VaEzxOQlIqy9L+poBVTb3xmTBSsSyXpWSaFd1dDNQQkil5i4JzLTqOW8evEZ7uCy5rD n/6JnBCphi4izOgBTueJ+8W1lUxku3u6CdmzGUG6ciziEG7GgOQrSWAOyhkfow== 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 4YN27k1YSyzrgH; Tue, 31 Dec 2024 18:49:22 +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 4BVInMFC005481; Tue, 31 Dec 2024 18:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVInMtG005478; Tue, 31 Dec 2024 18:49:22 GMT (envelope-from git) Date: Tue, 31 Dec 2024 18:49:22 GMT Message-Id: <202412311849.4BVInMtG005478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 203027b2d5dc - main - Update libexec/rc/debug.sh and hooks.sh 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 203027b2d5dc89fec3a0a7eee195a11cb394587f Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=203027b2d5dc89fec3a0a7eee195a11cb394587f commit 203027b2d5dc89fec3a0a7eee195a11cb394587f Author: Simon J. Gerraty AuthorDate: 2024-12-31 18:47:06 +0000 Commit: Simon J. Gerraty CommitDate: 2024-12-31 18:47:06 +0000 Update libexec/rc/debug.sh and hooks.sh Use local_works() to test if 'local' actually works for current shell. --- libexec/rc/debug.sh | 46 ++++++++++++++++++++++++++++++++-------------- libexec/rc/hooks.sh | 37 +++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/libexec/rc/debug.sh b/libexec/rc/debug.sh index db9ed8c94b6c..b379297a4183 100755 --- a/libexec/rc/debug.sh +++ b/libexec/rc/debug.sh @@ -83,7 +83,7 @@ # Simon J. Gerraty # RCSid: -# $Id: debug.sh,v 1.42 2024/10/30 18:23:19 sjg Exp $ +# $Id: debug.sh,v 1.46 2024/12/13 03:55:52 sjg Exp $ # # @(#) Copyright (c) 1994-2024 Simon J. Gerraty # @@ -107,27 +107,45 @@ DEBUG_DO=: DEBUG_SKIP= export DEBUGGING DEBUG_DO DEBUG_SKIP -case "$isPOSIX_SHELL,$local" in -:,:|:,local|false,:) ;; # sane -*) # this is the bulk of isposix-shell.sh +# have is handy +if test -z "$_HAVE_SH"; then + _HAVE_SH=: + + ## + # have that does not rely on return code of type + # + have() { + case `(type "$1") 2>&1` in + *" found") return 1;; + esac + return 0 + } +fi + +# does local *actually* work? +local_works() { + local _fu +} + +if local_works > /dev/null 2>&1; then + _local=local +else + _local=: +fi +# for backwards compatability +local=$_local + +if test -z "$isPOSIX_SHELL"; then if (echo ${PATH%:*}) > /dev/null 2>&1; then # true should be a builtin, : certainly is isPOSIX_SHELL=: - # you need to eval $local var - local=local - : KSH_VERSION=$KSH_VERSION - case "$KSH_VERSION" in - Version*) local=: ;; # broken - esac else isPOSIX_SHELL=false - local=: false() { return 1 } fi - ;; -esac +fi is_posix_shell() { $isPOSIX_SHELL @@ -142,7 +160,7 @@ is_posix_shell() { # a suffix of :debug_add:tag we will add tag to DEBUG_SH # _debugAdd() { - eval $local tag + eval $_local tag for tag in `IFS=,; echo $DEBUG_SH` do diff --git a/libexec/rc/hooks.sh b/libexec/rc/hooks.sh index 3b0c50f10191..7c478fbeda15 100755 --- a/libexec/rc/hooks.sh +++ b/libexec/rc/hooks.sh @@ -50,7 +50,7 @@ # # RCSid: -# $Id: hooks.sh,v 1.21 2024/09/06 16:53:45 sjg Exp $ +# $Id: hooks.sh,v 1.24 2024/12/13 03:55:52 sjg Exp $ # # @(#)Copyright (c) 2000-2024 Simon J. Gerraty # @@ -64,18 +64,19 @@ # avoid multiple inclusion _HOOKS_SH=: -# We want to use local if we can -# if isposix-shell.sh has been sourced isPOSIX_SHELL will be set -# as will local -case "$local" in -local|:) ;; -*) if (echo ${PATH%:*}) > /dev/null 2>&1; then - local=local - else - local=: - fi - ;; -esac +# does local *actually* work? +local_works() { + local _fu +} + +if local_works > /dev/null 2>&1; then + _local=local +else + _local=: +fi +# for backwards compatability +local=$_local + ## # hooks_add_all list func ... @@ -83,7 +84,7 @@ esac # add "func"s to "list" regardless # hooks_add_all() { - eval $local __h + eval $_local __h __h=$1; shift case "$1" in --first) @@ -100,7 +101,7 @@ hooks_add_all() { # add "func"s to "list" if not already there # hooks_add_once() { - eval $local __h __hh __first + eval $_local __h __hh __first __h=$1; shift case "$1" in --first) shift; __first=:;; @@ -154,7 +155,7 @@ hooks_add() { # return $list # hooks_get() { - eval $local __h __h2 e __l + eval $_local __h __h2 e __l case "$1" in --lifo) __l=LIFO; shift;; esac @@ -178,7 +179,7 @@ hooks_get() { # is func in $list ? # hooks_has() { - eval $local __h + eval $_local __h eval "__h=\$$1" case " $__h " in *" $1 "*) return 0;; @@ -193,7 +194,7 @@ hooks_has() { # Without '--all'; if any return non-zero return that immediately # hooks_run() { - eval $local __a e __h __hl __h2 __l + eval $_local __a e __h __hl __h2 __l __a=return __l= From nobody Tue Dec 31 19:13:32 2024 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 4YN2gd2BL2z5jtWr; Tue, 31 Dec 2024 19:13:33 +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 4YN2gd0Wv8z4pSQ; Tue, 31 Dec 2024 19:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672413; 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=NzhP1+ucsYn0rldWjCUvYAO3HlQDY/edfBDLLFvRaEA=; b=PDkTNHQ8vKRwpt5YFYUuozCHe1mTqPTudXA7UXmPWG/tBntT0cgL21+QVIIeftyyc6KISS vafLpxS6MKoB2zIB6PQmNzCVdpBl97G4DgbxVvv4r92HpLvfq6M6rPSkWHHlkWJDdrt+9Q 6oSttFywY8xuRjXvDYl9Sx5SRJqIZfEG+36W5yEPCCf9YNM8kfHAEsQWgGernB2U/bbJme dJaJsYkSmF5f4DY38HhOF0aB3meTiEhPxlxccx8pG3zHeonyYVgcrLLFhzSlXkkQRyTYrF J2D2Npod5h+FjAbjSv+ImWHsMErBlDnY8YKg6IzEbCILPsprQj8GJn57Mt4+8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672413; 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=NzhP1+ucsYn0rldWjCUvYAO3HlQDY/edfBDLLFvRaEA=; b=K1XLUdWQULAoL+vnITJcN3uHUHpHnjBWra4EDaPwvTeguDt9+VqZLhk5975o5vOftjBsjs ObOz85IhXzT5kRE1BLdxF/oiTw3ifDm87gaIWHYEyiVOPdf3tChkqQSjLs8AZg5JzVn2eZ amAWfaSD/G1tUKo+n2AUtNfiNzXhh/TqyYe1M+zq5mApWjuDZLfhqyk9Eyk/Bw7UR+4Ugb vgjcJQxA98FQ+a8R0V8N5vvlz+3XwVUTuKmfJjBR++Q9Mrn2IsHU/RlRY2M72F6cHM4UjH DyDK0bY+pCkriM0ARrwdUr5L3q/q7B7sD4X6kIJAovqVNves4rrh+fVWz97ztQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735672413; a=rsa-sha256; cv=none; b=EwzKtiN62scZIqIYIWp+oSbJhyjKvf8Wb8MGx2c8v5HovhI1Y1jB3XvkCeTr65shncPvEW wP/pn+ZEZNnRQj7XxeQEoD6WSXExwN2uqt0LBulSOFHDsY/zk3baR/hNtKrNG5J4lqOo2L ZHbqHmW/3CBjJat/xAKynChzlCRZe/oFw1FqFqNjCWHoVYzp17l4+/+FQjEEFogETvBNUK k6+DHSYTp7kNhBz+UCRjmQayf43tXrh9q1Ggd0NzSy3QJDyNHYXgCsbxkZpRZSVyv5R90m XcPBATMj/smEvpKLElx4MVbBB6CcW7DCRMTGONcyzoXqTGL74AKi9eN17+4hOQ== 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 4YN2gd072bzsb0; Tue, 31 Dec 2024 19:13:33 +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 4BVJDWiX060081; Tue, 31 Dec 2024 19:13:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVJDW6G060078; Tue, 31 Dec 2024 19:13:32 GMT (envelope-from git) Date: Tue, 31 Dec 2024 19:13:32 GMT Message-Id: <202412311913.4BVJDW6G060078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: af2e102c4065 - main - rtwn: enable periodic TX reporting support on RTL8188EU NICs. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af2e102c40652156c89029177da7961165ffe4cc Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=af2e102c40652156c89029177da7961165ffe4cc commit af2e102c40652156c89029177da7961165ffe4cc Author: Adrian Chadd AuthorDate: 2024-12-15 04:38:18 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 19:11:33 +0000 rtwn: enable periodic TX reporting support on RTL8188EU NICs. The RTL8188E firmware doesn't have the "full" offload firmware rate control. Instead, the vendor driver has a bunch of logic in the driver for rate probing and selection. Part of this is the periodic TX report - which uploads a summary of multi-rate retries and drops per MAC. Using it drastically cuts down on the TX notifications - it's fired from a timer (defaulting to ~ 1.6 seconds) and is a single receive frame in the normal bulk RX path. I've not ported / reimplemented the whole vendor driver rate adaption code - instead, I'm just using the normal net80211 rate control APIs. It seems to behave OK - I get 25-30mbit down and 20mbit up using TCP/ speedtest. Locally tested: * RTL8188EU, STA mode Differential Revision: https://reviews.freebsd.org/D48088 Reviewed by: fuz, bz Obtained from: https://github.com/lwfinger/rtl8188eu/blob/master/hal/Hal8188ERateAdaptive.c --- sys/dev/rtwn/if_rtwnvar.h | 1 + sys/dev/rtwn/rtl8188e/r88e.h | 1 + sys/dev/rtwn/rtl8188e/r88e_rx.c | 86 ++++++++++++++++++++++++++++++++ sys/dev/rtwn/rtl8188e/r88e_rx_desc.h | 14 ++++++ sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c | 4 +- sys/dev/rtwn/rtl8188e/usb/r88eu_init.c | 15 +++++- sys/dev/rtwn/rtl8192c/r92c_tx.c | 23 ++++++++- 7 files changed, 141 insertions(+), 3 deletions(-) diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h index 570403747392..3913526f8c3c 100644 --- a/sys/dev/rtwn/if_rtwnvar.h +++ b/sys/dev/rtwn/if_rtwnvar.h @@ -401,6 +401,7 @@ struct rtwn_softc { uint16_t rx_dma_size; int macid_limit; + int macid_rpt2_max_num; int cam_entry_limit; int fwsize_limit; int temp_delta; diff --git a/sys/dev/rtwn/rtl8188e/r88e.h b/sys/dev/rtwn/rtl8188e/r88e.h index 488e6ea79d3f..6569b014a5c6 100644 --- a/sys/dev/rtwn/rtl8188e/r88e.h +++ b/sys/dev/rtwn/rtl8188e/r88e.h @@ -86,6 +86,7 @@ int8_t r88e_get_rssi_cck(struct rtwn_softc *, void *); int8_t r88e_get_rssi_ofdm(struct rtwn_softc *, void *); void r88e_get_rx_stats(struct rtwn_softc *, struct ieee80211_rx_stats *, const void *, const void *); +void r88e_ratectl_tx_complete_periodic(struct rtwn_softc *, uint8_t *, int); /* r88e_tx.c */ void r88e_tx_enable_ampdu(void *, int); diff --git a/sys/dev/rtwn/rtl8188e/r88e_rx.c b/sys/dev/rtwn/rtl8188e/r88e_rx.c index 287869885b86..2ff0ee4dae00 100644 --- a/sys/dev/rtwn/rtl8188e/r88e_rx.c +++ b/sys/dev/rtwn/rtl8188e/r88e_rx.c @@ -232,3 +232,89 @@ r88e_get_rx_stats(struct rtwn_softc *sc, struct ieee80211_rx_stats *rxs, rxs->c_band = IEEE80211_CHAN_2GHZ; } } + +void +r88e_ratectl_tx_complete_periodic(struct rtwn_softc *sc, uint8_t *buf, + int len) +{ + const struct r92c_rx_stat *rxs; + uint64_t mac_bitmap; + int macid; + + if (len < sizeof(struct r92c_rx_stat)) + return; + + rxs = (const struct r92c_rx_stat *) buf; + + /* Skip Rx descriptor. */ + buf += sizeof(struct r92c_rx_stat); + len -= sizeof(struct r92c_rx_stat); + + /* + * Note: the valid macid bitmap is rx_desc[5] << 32 | rx_desc[4]; + * Note: rx_desc[5] is the TSF, which isn't valid for this report! + */ + mac_bitmap = ((uint64_t) le32toh(rxs->tsf_low) << 32) + | le32toh(rxs->rxdw4); + + RTWN_DPRINTF(sc, RTWN_DEBUG_RA, + "%s: mac bitmap: 0x%lx\n", __func__, mac_bitmap); + + /* + * Note: the RX reports aren't sparse - invalid entries (ie, + * the bitmap has the macid set to 0) are just populated + * with random data. + */ + for (macid = 0; (macid < 64) && (macid < sc->macid_rpt2_max_num) && + (len >= sizeof(struct r88e_fw_c2h_txreport2_entry)); macid++) { + struct ieee80211_ratectl_tx_stats txs = { 0 }; + const struct r88e_fw_c2h_txreport2_entry *rpt; + uint32_t ntotal, nsuccess, ndrop, nretry, nframes; + + rpt = (const struct r88e_fw_c2h_txreport2_entry *) buf; + buf += sizeof(struct r88e_fw_c2h_txreport2_entry); + len -= sizeof(struct r88e_fw_c2h_txreport2_entry); + + if ((mac_bitmap & (1UL << macid)) == 0) + continue; + + txs.flags = IEEE80211_RATECTL_TX_STATS_NODE | + IEEE80211_RATECTL_TX_STATS_RETRIES; + + /* calculate all the various combinations of things */ + nframes = le16toh(rpt->retry0); + ntotal = nframes + rpt->retry1 + rpt->retry2 + + rpt->retry3 + rpt->retry4 + rpt->drop; + /* + * Note: sometimes this is zero or 1, but the retries + * are all capped out at 255! That means the frame + * transmits are all failing. + */ + nsuccess = ntotal - rpt->drop; + ndrop = rpt->drop; + nretry = rpt->retry1 + rpt->retry2 + rpt->retry3 + + rpt->retry4; + + txs.nretries = nretry + ndrop; + txs.nsuccess = nsuccess; + txs.nframes = ntotal; + + RTWN_DPRINTF(sc, RTWN_DEBUG_RA, + "%s: MAC %d rpt retries %d %d %d %d %d, " + "drop %d\n", + __func__, + macid, + le16toh(rpt->retry0), + rpt->retry1, + rpt->retry2, + rpt->retry3, + rpt->retry4, + rpt->drop); + if (sc->node_list[macid] != NULL) { + struct ieee80211_node *ni; + ni = sc->node_list[macid]; + txs.ni = ni; + ieee80211_ratectl_tx_update(ni->ni_vap, &txs); + } + } +} diff --git a/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h b/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h index f3e1a3c1b9bc..59e885eb4821 100644 --- a/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h +++ b/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h @@ -81,6 +81,20 @@ struct r88e_tx_rpt_ccx { uint8_t rptb7; } __packed; +/* + * The 8188E periodic TX report entries + * (type 2 report.) + */ +struct r88e_fw_c2h_txreport2_entry { + uint16_t retry0; + uint8_t retry1; + uint8_t retry2; + uint8_t retry3; + uint8_t retry4; + uint8_t drop; + uint8_t reserved; +} __packed; + /* Interrupt message format. */ /* XXX recheck */ struct r88e_intr_msg { diff --git a/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c b/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c index 2d4713e92bd2..9ace2396d712 100644 --- a/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c +++ b/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c @@ -138,7 +138,7 @@ r88eu_attach(struct rtwn_usb_softc *uc) sc->sc_get_rssi_ofdm = r88e_get_rssi_ofdm; sc->sc_classify_intr = r88e_classify_intr; sc->sc_handle_tx_report = r88e_ratectl_tx_complete; - sc->sc_handle_tx_report2 = rtwn_nop_softc_uint8_int; + sc->sc_handle_tx_report2 = r88e_ratectl_tx_complete_periodic; sc->sc_handle_c2h_report = r88e_handle_c2h_report; sc->sc_check_frame = rtwn_nop_int_softc_mbuf; sc->sc_rf_read = r92c_rf_read; @@ -212,6 +212,8 @@ r88eu_attach(struct rtwn_usb_softc *uc) sc->rx_dma_size = R88E_RX_DMA_BUFFER_SIZE; sc->macid_limit = R88E_MACID_MAX + 1; + /* XXX this limit may be expanded to R88E_MACID_MAX */ + sc->macid_rpt2_max_num = 2; sc->cam_entry_limit = R92C_CAM_ENTRY_COUNT; sc->fwsize_limit = R92C_MAX_FW_SIZE; sc->temp_delta = R88E_CALIB_THRESHOLD; diff --git a/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c b/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c index f4f936493cda..312e437958ec 100644 --- a/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c +++ b/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c @@ -279,9 +279,22 @@ void r88eu_post_init(struct rtwn_softc *sc) { - /* Enable per-packet TX report. */ + /* Enable per-packet TX report (RPT1) */ rtwn_setbits_1(sc, R88E_TX_RPT_CTRL, 0, R88E_TX_RPT1_ENA); +#ifndef RTWN_WITHOUT_UCODE + /* Enable timer report (RPT2) if requested */ + if (sc->macid_rpt2_max_num > 0) { + rtwn_setbits_1(sc, R88E_TX_RPT_CTRL, 0, + R88E_TX_RPT2_ENA); + + /* Configure how many TX RPT2 entries to populate */ + rtwn_write_1(sc, R88E_TX_RPT_MACID_MAX, + sc->macid_rpt2_max_num); + /* Enable periodic TX report; 32uS units */ + rtwn_write_2(sc, R88E_TX_RPT_TIME, 0xcdf0); + } +#endif /* Disable Tx if MACID is not associated. */ rtwn_write_4(sc, R88E_MACID_NO_LINK, 0xffffffff); rtwn_write_4(sc, R88E_MACID_NO_LINK + 4, 0xffffffff); diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c index c60081fc675c..07a6a184e924 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_tx.c +++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c @@ -236,6 +236,27 @@ r92c_calculate_tx_agg_window(struct rtwn_softc *sc, return (wnd); } +/* + * Check whether to enable the per-packet TX CCX report. + * + * For chipsets that do the RPT2 reports, enabling the TX + * CCX report results in the packet not being counted in + * the RPT2 counts. + */ +static bool +r92c_check_enable_ccx_report(struct rtwn_softc *sc, int macid) +{ + if (sc->sc_ratectl != RTWN_RATECTL_NET80211) + return false; + +#ifndef RTWN_WITHOUT_UCODE + if ((sc->macid_rpt2_max_num != 0) && + (macid < sc->macid_rpt2_max_num)) + return false; +#endif + return true; +} + void r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, struct mbuf *m, void *buf, uint8_t ridx, int maxretry) @@ -298,7 +319,7 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, txd->txdw6 |= htole32(SM(R92C_TXDW6_MAX_AGG, r92c_calculate_tx_agg_window(sc, ni, tid))); } - if (sc->sc_ratectl == RTWN_RATECTL_NET80211) { + if (r92c_check_enable_ccx_report(sc, macid)) { txd->txdw2 |= htole32(R92C_TXDW2_CCX_RPT); sc->sc_tx_n_active++; #ifndef RTWN_WITHOUT_UCODE From nobody Tue Dec 31 19:13:34 2024 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 4YN2gf2MFDz5jtyh; Tue, 31 Dec 2024 19:13:34 +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 4YN2gf1YVRz4pPr; Tue, 31 Dec 2024 19:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672414; 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=GPFkQKYEYbGlVx44cRVnqDLnBFpmdVwq3jQzL7X+W2U=; b=LJiqmS3F84BEqSU7eSxcTEVsnPdgkA/2HG9apzy8+yb9jOyN7nY3zjM3FfCtBFLMmEbkaE cL9Kb0yjCGIBmzHeusUW7kFXzE3gHjtgdxxy9dPTJSUBHQzKhKsk4kdI0K1S/tuRTlZzol bifAKbl8ernOseBt1ExzD1VcO3o/e7PgnNIJHLcmZQyPtT/PWFH8gmrius2hqxJmIIHSiy BeJj/wzTXidsYBgXEyGRcb/6cEXSdjviVt2/1+3/QlWMxFPbcLlfcJW498dlkHEfxPk7lO 8bspTgUJgdeZOGotHNPhp1Gc6KAjbRt8S0bSl6gmlqz/APmFsIyF+R514t3EYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672414; 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=GPFkQKYEYbGlVx44cRVnqDLnBFpmdVwq3jQzL7X+W2U=; b=fW32mu+namO6tM5VGPYRlock9JNuEEyaFtiq2Z9iWpdMR10hncjDWYY7rcbjkGHS8sFOZB Xc83XeXqbOkWSyzYcRI40UrB0NQEeAtFCtQEPVjkqDDBv2HMNon3153brqOQGHHoO+vscc v1NU2ZFenz+VbicuQBAjfGzwW72QOHtzNJmI4WHiIS5bczIyotZPi8T3mh+1vzJ5AunBTv MM0MFSb/JvVe8YNaS02G8Lc+vSiYK0BL9DkhwiEcV+xtO4n/KzsQOuBjaI5oMda0kXZsGW ++6JFEq1PpVG/R65yGbyTsSyWhfysa/VOSQ24Ih0Vr5086YwwB4VxUEzKOy+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735672414; a=rsa-sha256; cv=none; b=coB28a5K8xwrDkma6l48LK0ladBrhE4sJeehxvwwlzdWpLtzSGhwDQcANyxnGw9FF9wkA+ pcBWF6lB3HEhEDJ+UTRVvsWTvkRQPKC4FC5VwxgOeVGIlnocgdhEW0wVynZ1oc6rlAI60+ RPxUOnfVFy5m0avZJIVZr/k/XjCx7nwuVVpndgRjoFa14fcdOfB7r8HlTVrAYSyJuIeh86 BWJ1RPMcazjFwhf3CuxcYskl+kaitpuEDhvJUewxiHhEgY3CSJeIvz1KbxhT1tzodRtx+l Vd3VzoecFmiQg7WS3oXO8tWzT7MdKjqWlzJUqAyPEKGj5zUiT/GT3c00KhIpHw== 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 4YN2gf190tzsHK; Tue, 31 Dec 2024 19:13:34 +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 4BVJDYVF060148; Tue, 31 Dec 2024 19:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVJDYBX060145; Tue, 31 Dec 2024 19:13:34 GMT (envelope-from git) Date: Tue, 31 Dec 2024 19:13:34 GMT Message-Id: <202412311913.4BVJDYBX060145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 307f9c351588 - main - rtwn: only set INIRATE if we're not doing firmware rate control. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 307f9c351588fcfe5a170c61754a5b1394b7dc0a Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=307f9c351588fcfe5a170c61754a5b1394b7dc0a commit 307f9c351588fcfe5a170c61754a5b1394b7dc0a Author: Adrian Chadd AuthorDate: 2024-12-15 21:04:28 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 19:12:57 +0000 rtwn: only set INIRATE if we're not doing firmware rate control. This register (array) controls the initial rate to use for each MACID. There's no need to set it if firmware rate control is enabled - it'll actually be under firmware control (and we can read it back to see what choices the firmware is making.) Locally tested: * RTL8188EU, STA * RTL8192CU, STA * RTL8192EU, STA Differential Revision: https://reviews.freebsd.org/D48094 Reviewed by: bz --- sys/dev/rtwn/rtl8192c/r92c_fw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_fw.c b/sys/dev/rtwn/rtl8192c/r92c_fw.c index 384cd50e901a..58584b3cd020 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_fw.c +++ b/sys/dev/rtwn/rtl8192c/r92c_fw.c @@ -239,7 +239,12 @@ r92c_init_ra(struct rtwn_softc *sc, int macid) } #endif - rtwn_write_1(sc, R92C_INIDATA_RATE_SEL(macid), maxrate); + /* + * There's no need to set this if firmware rate control is + * enabled - the firmware will be controlling this per MACID. + */ + if (sc->sc_ratectl != RTWN_RATECTL_FW) + rtwn_write_1(sc, R92C_INIDATA_RATE_SEL(macid), maxrate); ieee80211_free_node(ni); } From nobody Tue Dec 31 19:13:35 2024 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 4YN2gg5L6Yz5jtYY; Tue, 31 Dec 2024 19:13:35 +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 4YN2gg27Nvz4pST; Tue, 31 Dec 2024 19:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672415; 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=e0ue8KI/umlRCtK0asyBebXcIjG7GIGXfjyvGsJUc8U=; b=GpOvIwtAH7yO1+uSIFUxe4jS8ykrnvp4S2yTfkNJine56NJZmkZdul4A9kGUy7xGOKV3Fe QOIIgzXRfstYx7tsYQpJ5GQTQmO0SznpMn+rbOUZekN6EjknrBG3IAVwUhckf9LzWLmYGQ kb+8P/gjT2kGIgsNZIoEHzrCoSc/8odOG2S/DqWkUidrjSAv+5FcXSLF4+4C+uVApA452i U63h0SQ18PUNM6uprcvX+Y7LTkOd7wL30G54D0tqM03a0CgSNu1+IxAoJ2laV1IO0S839D r0Hym06DIbfYsmSQyOHOARCUhwrith9QM3dbYNAuEaLxJa/PfRG0E0q5x7dB8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672415; 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=e0ue8KI/umlRCtK0asyBebXcIjG7GIGXfjyvGsJUc8U=; b=BGAqT8+UkewpWbLDX9xkD7P7jrtuEdkYGtBf4JrvWXQChvNk5AfW/lq7lluqBp1BiRNwTs 6p2iLnrJnX3/ZuddY9P/39zrxCVij+k925BRwG/qJUg1OWfvdtuJwOYiETI24YgphDtzuj XU0MtaailSQbprCkA4IcU4B+CZYh9naoftcXIzeIw+46hpQC8RVzFVxX9Vb6BM0PA27P4n jzS4KCsCGJgId3+kQ8JEQ+ILzIYsst6r1CiYAsSC5/OhnODP1vJzCXR2xLuBri/YyV0XNf WSFxdfNrIwRKHr6k2v1ld0qcRAi3YE/UoJPV6iyO4GhZWpgBUaI4dtBHiWohbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735672415; a=rsa-sha256; cv=none; b=tg+slFfwR2CYxx++bdU3In24dmDDIDm/3lN3X9CAX2NiXvsk0CKm63WDkJcbRQU/nZfSal zpic60muRglSvKAdnYuC2KbAeAdVitwCm0j5+u9VQyTrD1ofk9oAImeHH/gnKl1zXsuoZ1 at+9RKL9SZhsREjeGv/iwBUzL806ndE9L4pQu8TSdG098QMhhG4yUMtzoMoi8AFO/yIurD wRn7IoYtWIlET679GG0jC7XfCjD4/fKhbDYxeVgFvf7F4Tqt+yFhSXqokA605GLG5wPzBb 3H2Z5Bd4uGBA7KTs+qKSP9xLcTPkn6GmzfFKORPUXLJeOtmIxOHPcG+qQ+gL+A== 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 4YN2gg1lGMzsQS; Tue, 31 Dec 2024 19:13:35 +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 4BVJDZ0I060190; Tue, 31 Dec 2024 19:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVJDZsZ060187; Tue, 31 Dec 2024 19:13:35 GMT (envelope-from git) Date: Tue, 31 Dec 2024 19:13:35 GMT Message-Id: <202412311913.4BVJDZsZ060187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 06b7335701fa - main - rtwn: add rtwn_ctl_vhtrate(), some cleanups 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06b7335701fac54d752445e7d2b2c15c301f90dc Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=06b7335701fac54d752445e7d2b2c15c301f90dc commit 06b7335701fac54d752445e7d2b2c15c301f90dc Author: Adrian Chadd AuthorDate: 2024-12-15 22:58:13 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 19:13:26 +0000 rtwn: add rtwn_ctl_vhtrate(), some cleanups * remove the hard-coded ridx values in rate2ridx(), use the RIDX defines for CCK/OFDM rates * Add a placeholder rtwn_ctl_vhtrate() which returns the dot11rate control rate to use for the given VHT rate index. Since net80211 currently doesn't have any VHT PHY tables, there's no mapping for us to leverage so just return OFDM 12M for now. * Use the new macro to convert rate index to MCS rate * Add a printf() in rate2ridx if it's passed a HT/VHT rate. Differential Revision: https://reviews.freebsd.org/D48098 Reviewed by: bz --- sys/dev/rtwn/if_rtwn_ridx.h | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn_ridx.h b/sys/dev/rtwn/if_rtwn_ridx.h index 6193f9ee2cad..0a1ea35303f1 100644 --- a/sys/dev/rtwn/if_rtwn_ridx.h +++ b/sys/dev/rtwn/if_rtwn_ridx.h @@ -82,20 +82,22 @@ rate2ridx(uint8_t rate) } switch (rate) { /* 11g */ - case 12: return 4; - case 18: return 5; - case 24: return 6; - case 36: return 7; - case 48: return 8; - case 72: return 9; - case 96: return 10; - case 108: return 11; + case 12: return (RTWN_RIDX_OFDM6); + case 18: return (RTWN_RIDX_OFDM9); + case 24: return (RTWN_RIDX_OFDM12); + case 36: return (RTWN_RIDX_OFDM18); + case 48: return (RTWN_RIDX_OFDM24); + case 72: return (RTWN_RIDX_OFDM36); + case 96: return (RTWN_RIDX_OFDM48); + case 108: return (RTWN_RIDX_OFDM54); /* 11b */ - case 2: return 0; - case 4: return 1; - case 11: return 2; - case 22: return 3; - default: return RTWN_RIDX_UNKNOWN; + case 2: return (RTWN_RIDX_CCK1); + case 4: return (RTWN_RIDX_CCK2); + case 11: return (RTWN_RIDX_CCK55); + case 22: return (RTWN_RIDX_CCK11); + default: + printf("%s: called; unknown rate (%d)\n", __func__, rate); + return (RTWN_RIDX_UNKNOWN); } } @@ -108,10 +110,23 @@ rtwn_ctl_mcsrate(const struct ieee80211_rate_table *rt, uint8_t ridx) /* Check if we are using MCS rate. */ KASSERT(RTWN_RATE_IS_HT(ridx), ("bad mcs rate index %d", ridx)); - rate = (ridx - RTWN_RIDX_HT_MCS(0)) | IEEE80211_RATE_MCS; + rate = RTWN_RIDX_TO_MCS(ridx) | IEEE80211_RATE_MCS; cix = rt->info[rt->rateCodeToIndex[rate]].ctlRateIndex; KASSERT(cix != (uint8_t)-1, ("rate %d (%d) has no info", rate, ridx)); - return rt->info[cix].dot11Rate; + return (rt->info[cix].dot11Rate); +} + +/* VHT version of rtwn_ctl_mcsrate */ +/* XXX TODO: also should move this to net80211 */ +static __inline__ uint8_t +rtwn_ctl_vhtrate(const struct ieee80211_rate_table *rt, uint8_t ridx) +{ + + /* Check if we are using VHT MCS rate. */ + KASSERT(RTWN_RATE_IS_VHT(ridx), ("bad mcs rate index %d", ridx)); + + /* TODO: there's no VHT tables, so for now just stick to OFDM12 */ + return (24); } #endif /* IF_RTWN_RIDX_H */ From nobody Tue Dec 31 19:54:27 2024 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 4YN3Zr1gd9z5jwlc; Tue, 31 Dec 2024 19:54:28 +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 4YN3Zr0w5wz4sxY; Tue, 31 Dec 2024 19:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735674868; 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=/7gm6rMaQ12OBcz+hcjSq3MFnwy3ryl1paRWqR69cKU=; b=PMpNq3p64Kr5HX1Gvqo3qAXpQ//7KBSpLuI7WK+fbABZ+GstMywhmw30Mf/8s/JbEVPVRb z6wJGkMuo3DE5Q0OFJ2ngn4Un5OKuK9FenHLB2U7BZTkjFH61VRl7s/7J0FZToXI3iQkeJ 1h7fb/bVRseL1Ct4ajdWDIeste8g1D15oyM1G/369fpnhELG/4tWKl4r6+RJBYviyZ0Rtu h5Md/Rr7K3rvtiGeq6X7od6y3H/72RgloSMhc5NjrTS4b5VsTBV50Qu3pnnAdW6hEn9qD4 MIdMFbYP/l+YinUAGo9HfvQrCBTPDflimlZcNT0ePDIzNT8CKMSOPJ+/Qdh9Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735674868; 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=/7gm6rMaQ12OBcz+hcjSq3MFnwy3ryl1paRWqR69cKU=; b=HLe+UsRL1sQ+imHVPY6FMe7lsK4SVsg8PeTpUEqE7GdZ5+TFz4qY+r5G42GH7lW62MCj1I WfHmgrV2zknVIOC3cJ4WbXlJiaQ7x8QaWMUf9fOpT9x0KQkKmT9PzyIpkftFuJYAcJRFJ6 tKIaQw0WPlsL1XX8EpgXxy3kuiXO+PffpGv8BpGcrtI1fW+SdTG+sPcLkUfdQV4gkZsfs9 n+YeoMsL4dTpU/dCjeu3jhYEgSEjySd7RlH1ueDHJ0xdy2eeqA7KoQVx014uDdfIzEQYa4 aq9hV++xClVofieplpruDE+qrj53BUWwkoSrkvYGfyKTPGwJPHpodror8YA/Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735674868; a=rsa-sha256; cv=none; b=oB38PVce1MpvDZtBlwFpxcUYT4LJwJfUDdcBUAIq4q/mLay1v9WcHEfGM6NB7zHCk//jRO FwQydwKLQnh+hk+CtkYKqewWZwp0iu1/mEO6Hz+Z08RV5Tm+q4WK6aHCUR1si3Cd13urgx ROEKaudBZgnfjPkA4chMvx1mhoSRx1kYTUbq2UKlPWgSjvFMVAFZn8xby8Mt8AUKnwDOyA sisoid1Ye87D0lRslI5lXNwL0Zg1qEyVaOgrG0FP80P6M04dESlqgw7RbPhc7RP6kwJRVQ sonxqAm0IIi4QvXIzKpOO9tcKpecw/Cz0Xq+eCm0nNIvmmlg4ZqOkH/6il49tw== 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 4YN3Zr0PTqztcy; Tue, 31 Dec 2024 19:54:28 +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 4BVJsRGg035907; Tue, 31 Dec 2024 19:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVJsRMM035904; Tue, 31 Dec 2024 19:54:27 GMT (envelope-from git) Date: Tue, 31 Dec 2024 19:54:27 GMT Message-Id: <202412311954.4BVJsRMM035904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: aac74b708b3d - main - libelftc: Fix a typo - FreeBSD's riscv port is little-endian. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aac74b708b3dc49466b0fb5365bc2923b7727a1c Auto-Submitted: auto-generated The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=aac74b708b3dc49466b0fb5365bc2923b7727a1c commit aac74b708b3dc49466b0fb5365bc2923b7727a1c Author: Joseph Koshy AuthorDate: 2024-12-31 17:53:16 +0000 Commit: Joseph Koshy CommitDate: 2024-12-31 19:53:05 +0000 libelftc: Fix a typo - FreeBSD's riscv port is little-endian. This change brings the descriptor for target "elf64-riscv-freebsd" in line with its documentation. I missed this somehow when reviewing https://reviews.freebsd.org/D20768. Reported by: Haowu Ge (on elftoolchain-developers) Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D48271 --- contrib/elftoolchain/libelftc/libelftc_bfdtarget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c b/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c index 5bbf89ba78fa..3f2c23708549 100644 --- a/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c +++ b/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c @@ -334,7 +334,7 @@ struct _Elftc_Bfd_Target _libelftc_targets[] = { { .bt_name = "elf64-riscv-freebsd", .bt_type = ETF_ELF, - .bt_byteorder = ELFDATA2MSB, + .bt_byteorder = ELFDATA2LSB, .bt_elfclass = ELFCLASS64, .bt_machine = EM_RISCV, .bt_osabi = ELFOSABI_FREEBSD, From nobody Tue Dec 31 20:59:51 2024 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 4YN52J02Gkz5k1gw; Tue, 31 Dec 2024 20:59:52 +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 4YN52H6Gxpz4yB0; Tue, 31 Dec 2024 20:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735678791; 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=CUCLJC56UwqDQkARF1ZEu69T0lrVw97OF26VzcBcBnE=; b=gEoXypk1mO9Up4JV7gfndi8Cd5szlP+7sSgNKmnjiZQsN4LRzDAwHBs0yReCnuO+DTKpV4 DU2o9VljuPFlTaAub5pFCxQkQZoIQbpH+3n/VtzI5Joz5JxfMAks+zPAkvYcncqHtjOYgy cvz0T73NSZRzJmzxq7723Hs5lLjdSQQmIGWNQphWyILW7sJDZ1m16xISEq2kEn8YZLlBOQ s6xtTNuA+3BlGKUs5LwH7YJ/8KilYX1c2vMlmAanj05q8QeYzBQFo6rapjwTtxrT07YbqQ /03Cn6cu6/6L/jUeEcN25agFgzSBx9jv5pA2fLvj7vaO8rP05agVSbeLHYUs7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735678791; 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=CUCLJC56UwqDQkARF1ZEu69T0lrVw97OF26VzcBcBnE=; b=YrAUsInKy9zDDQKFvONU0CbOEBQAvE2Y0Wkl1md07/9R5Y+CmWGXstyqcUkTUkmJcOp+mQ hcRaHlynnFjuNzwHNNPyCYCc+cB7RQRp10GLAaD3xXbfAzskOud4ZqBaTsSeIjTR/Wrf/v StygmlF86fV510N7okamUrJ6jM4zN+e1JKwrJMRvh8emj2ZdS/wxHGGN7iTObg913wCTdf uLn6OpjYHyZVdTpOMLZKk+0T68B+4jRgDYFZXPFBy5tCMAoCXDJ7wRLvdQTVSsI0fDiiNK TOw9BMZGw+/AfYHXZI7S5JcUh4+T0qYswWf+kT3iFk31QLrdp+M2ZN+hVPrU+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735678791; a=rsa-sha256; cv=none; b=DmZlMyRseHTERfy8CG1jZZJ2zHcaHPZZsvyP61OztI6/zoY3JvTfQTTjbv2cUVxqWMqWH4 o2GKbrNdsecItIyEDYYImjT+P7FYSiNqHNl4Z48KgQeHN948lK3Msz6ovRTpMtNCw1QGZw m5td9J+Plsbn1SgbigIqW94//3/5i2cmXbCPxZADpBN+3qS2Lt0MnCOJM5vCmHVxcLrc+5 gljX8GFtATRulhPrU9b3VzQUKhFwkLeKWlTLrD8FWqrGGmslyt9EZO8HRWeQpg/KISJ/zV eGJOYXxVZ+5JBLkH2DQkoKKFztYc/Q/1O/+LeY4wsGjYE6E2SPW/420SxYJdkg== 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 4YN52H5dQQzvyP; Tue, 31 Dec 2024 20:59:51 +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 4BVKxpNa048438; Tue, 31 Dec 2024 20:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVKxp2H048435; Tue, 31 Dec 2024 20:59:51 GMT (envelope-from git) Date: Tue, 31 Dec 2024 20:59:51 GMT Message-Id: <202412312059.4BVKxp2H048435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 0ce13b1d580f - main - TCP RACK: add comment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ce13b1d580f05f96e3d85afb0824f672cb0c7a2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0ce13b1d580f05f96e3d85afb0824f672cb0c7a2 commit 0ce13b1d580f05f96e3d85afb0824f672cb0c7a2 Author: Michael Tuexen AuthorDate: 2024-12-31 20:51:58 +0000 Commit: Michael Tuexen CommitDate: 2024-12-31 20:51:58 +0000 TCP RACK: add comment Indicate that the missing of the break is intentionally. Reviewed by: rrs CID: 1523782 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48273 --- sys/netinet/tcp_stacks/rack.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index ef2554926734..acd622814916 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -22445,6 +22445,7 @@ nomore: return (error); case ENETUNREACH: counter_u64_add(rack_saw_enetunreach, 1); + /* FALLTHROUGH */ case EHOSTDOWN: case EHOSTUNREACH: case ENETDOWN: From nobody Tue Dec 31 21:06:28 2024 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 4YN59x0yHtz5k1Yx; Tue, 31 Dec 2024 21:06:29 +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 4YN59x0L0Gz4ypl; Tue, 31 Dec 2024 21:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735679189; 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=RG728KwphI+VAV97dinr11JR2ZIl5dOMj6K+8w444Hs=; b=iM27TCOm+JhqVvlOhsKW2aBUnNpxOq3Mfmw7qBYsQAxl1ZN4DN9eIQae/+sDaMhNKbEIdx h0Sd5jdmMri30MGFXGaqHBrTmaP/BkaGQkE2iOiqbsEODjQ9p2ABpYbdsZygHE/ggor1AO /l7pCSCZ4WyK8OwEU6l3vM36dM6tNKQhSEwB+YWWhW9+LeLk5exV99eiuQUcVI9lBmtXl3 iVK+2SBgx5jHdf4ecLwUtXtvGYdE0xdoSpLM1DYJqgI/rUBFbbrptdIM5N04uTj+uWh3EN 9/HXE95br8Vagv1I4JQ5bUUX8xOSQCGHPUYS+6rIZTzlTm8+wzxSsHmy+Dzvmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735679189; 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=RG728KwphI+VAV97dinr11JR2ZIl5dOMj6K+8w444Hs=; b=NcwHmERvGrY5NX6K1K5Zh/GvXjXDP5Y97ptAMgyehlbI9RyCYKcWxUu7QdckViPgJQrAmU tNacfiJeKi4KMROEONQ6k/D2mLJjvuOPZ7wakisAqjrqDJUxWTX86nX8Cou3y1qzTnM9SA YpsX0nOmicbMcYBIV+l22+664wxchhgs5TiczJVGYf/ysis1xfy9K+w7DldsF30uXEa4/f VVRlCUJAkssgeuruHwZ7dHO2vTGq3MucotiHO4Agt1knI6ToqEwLZklfvatX8opOmphHEn iT+KICWEU30OB/qp6EyssbkY3cS6MVZxY3RKmOZ+e/rAyJ04LQNqTB2pUjS1lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735679189; a=rsa-sha256; cv=none; b=SdHbcub7Zci+jNdx6WMLzsaqtpXZ+9dDk0BQgUJa+OM6Z1bvPhLoKT8QnkMV5xBUwM9b8n YzjjTTlVtwg1qhcgcM/fFdIlbHTvhFzVFxyUtwpYzafFEvCbXo7X6xHnRoWggPI7j3mHTv szDWmQlteslyO/5o+GPtHX3wZzkseHQwtIY1bC+tNELurCUQfZAZ2K5PTV+j7zpu4SOPM9 sbYTCFF1W8yV19xUPsYVZmq7WFV/7Ja11M6G0SRiEaImcf6qXcgh1jmKCfg6dYrOqamnKa 7nS4QtN9kTAhHmPCrFd5j3vIys/a9d4x5xC9wD39xv9B6BFUgy3sQq4qp5msOA== 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 4YN59w6pBWzwKj; Tue, 31 Dec 2024 21:06:28 +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 4BVL6SQS067826; Tue, 31 Dec 2024 21:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVL6SHY067823; Tue, 31 Dec 2024 21:06:28 GMT (envelope-from git) Date: Tue, 31 Dec 2024 21:06:28 GMT Message-Id: <202412312106.4BVL6SHY067823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 5ec914e06c96 - main - TCP BBR: fix condition when sending a tail loss probe 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ec914e06c96ff40bf0e6567359c0de039b59ed2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5ec914e06c96ff40bf0e6567359c0de039b59ed2 commit 5ec914e06c96ff40bf0e6567359c0de039b59ed2 Author: Michael Tuexen AuthorDate: 2024-12-31 21:03:13 +0000 Commit: Michael Tuexen CommitDate: 2024-12-31 21:03:13 +0000 TCP BBR: fix condition when sending a tail loss probe Reviewed by: rrs CID: 1523793 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48274 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index f440573ace30..3c5864007986 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -4614,7 +4614,7 @@ need_retran: */ if (collapsed_win == 0) { rsm = TAILQ_LAST_FAST(&bbr->r_ctl.rc_map, bbr_sendmap, r_next); - if (rsm && (BBR_ACKED | BBR_HAS_FIN)) { + if (rsm && (rsm->r_flags & (BBR_ACKED | BBR_HAS_FIN))) { rsm = bbr_find_high_nonack(bbr, rsm); } if (rsm == NULL) { From nobody Tue Dec 31 21:58:34 2024 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 4YN6L261L5z5k4Kj; Tue, 31 Dec 2024 21:58:34 +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 4YN6L25751z52dg; Tue, 31 Dec 2024 21:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735682314; 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=XyjFgOzkcLtTg3bLxRDBSmomA5oXO3vXzbvs94zKS5s=; b=R1U6akjKWVovLZDpO+h4VstlfAH/3XiuYNzFMNkAQL+Y7IdCXccVyxf5zrWydmNOiIU7AP Rv5JPaY+FXRB04AhulyRBYb6ywZ3Upfsy67kPw8S7z2fz9vF+z1LICUkDZG6uwNI4bEQLs zv8Za4Dhy10I+eoYN9iRt9AfI2i/Gt3guiea1ui3Vu12/MgN75IaxHe6KOLbPwTeijHM+q vbvOEfwHxaQCxRi9BudYFIzrgFMbebMvtdIef7jGLmt6wg81LXH5ANjptdG0THZNq04KsR +yBhHWB7xsekxcwWqcGuS92LA2tNYYRCrpDHK/uRnL/prUdQPKDlZ2Yd/mahvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735682314; 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=XyjFgOzkcLtTg3bLxRDBSmomA5oXO3vXzbvs94zKS5s=; b=ESZQVdqxdVBHXZZE1mv3Y3MLLwvVODXmxv0LI/V397LL5FFWBENzBZ57mIZNypT/oOPE9F fIfxte+h9aWs8JXOqJa9EV1PYcFHNwfj8MlyJMKHQZUpbtxyLHS89K1ro9pSXzDp3Phrmn uh0hjOHlACzpYDKE5hUdpeecb/YyXJC/zz9Q8VLltlUayPtvOEDBfdl3RtF16vGVCcfNTX 8Tvu4niAMxCRzct2FG/RkcNzRaScW+5kXTXhfM+o6YAceAOd8AfoFN9yLLhut2iK5iIcuW AT+AyP1joTkM2Lb939jpt68pnlwWQhijhFi8QU2qxy4c1e2GxNczNA0S7Eu48Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735682314; a=rsa-sha256; cv=none; b=m9H/ZSayU9GhWNXlyJnKyaCji9kp6tjwR64+InAwLvJxTsNw/UsBJHhejot896E08/FFns Seu8YcqhO/Mfr/e7e11bW3JUMh3Kw6ggaS4qFsuFlqyPjtevwBtZJ/fzoXXdvVTZUhfr/y UOs5VF4pv6/GR3GGy/0FM6BFYCTKg4AhgTiSJv7ajVQ3zkuf2LNDYt/nK0218rWJHjdT61 Ke9QFzuNDg0phPQUkcFVaeOU1g1WlUkWLxv7msguB2QDDb3QDAisPTkqvlAx8SJy61k3Xo 8he8H0VusQtTWDByHy3cQ8AqJsBObapADTK2x4TCNUTKShN7KUh0VzOR/3jGcA== 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 4YN6L23YVnzx7q; Tue, 31 Dec 2024 21:58:34 +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 4BVLwY1t060838; Tue, 31 Dec 2024 21:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVLwYn7060835; Tue, 31 Dec 2024 21:58:34 GMT (envelope-from git) Date: Tue, 31 Dec 2024 21:58:34 GMT Message-Id: <202412312158.4BVLwYn7060835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: aa178783710f - main - rtwn: print out the firmware file being loaded 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa178783710f31e3f421065bc17a701abbaf9a18 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=aa178783710f31e3f421065bc17a701abbaf9a18 commit aa178783710f31e3f421065bc17a701abbaf9a18 Author: Adrian Chadd AuthorDate: 2024-12-13 06:01:26 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 21:58:17 +0000 rtwn: print out the firmware file being loaded The firmware version isn't enough; different firmware is loaded for different revisions of a given chip. So print out the file too; it'll make handling reports much easier. Differential Revision: https://reviews.freebsd.org/D48067 Reviewed by: emaste --- sys/dev/rtwn/if_rtwn_fw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/if_rtwn_fw.c b/sys/dev/rtwn/if_rtwn_fw.c index 551adbdb8704..0fc5bac75c82 100644 --- a/sys/dev/rtwn/if_rtwn_fw.c +++ b/sys/dev/rtwn/if_rtwn_fw.c @@ -141,7 +141,8 @@ rtwn_load_firmware(struct rtwn_softc *sc) sc->fwver = le16toh(hdr->version); RTWN_DPRINTF(sc, RTWN_DEBUG_FIRMWARE, - "FW V%u.%u %02u-%02u %02u:%02u\n", + "FW (%s) V%u.%u %02u-%02u %02u:%02u\n", + sc->fwname, le16toh(hdr->version), le16toh(hdr->subversion), hdr->month, hdr->date, hdr->hour, hdr->minute); ptr += sizeof(*hdr); From nobody Tue Dec 31 22:46:42 2024 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 4YN7PZ6Jbyz5k7CW; Tue, 31 Dec 2024 22:46:42 +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 4YN7PZ5V0Bz56J7; Tue, 31 Dec 2024 22:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735685202; 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=l6eX6h7CYS5OPG39h7+lyyoSu+JbkSngjn5UVTgiNSs=; b=Uw2G/BYCZ3LuetY1UJbO93SV4IbeFxWcnfss6JsaqdrejzIGZvJucYXl86Ht4Plk3fvUWU hLiapULkPyPl9qF4V4+d/E4EoPi6GW+YruAG2wazyCh2Q1Dku0WGaO+3lrfy+KkPuSF7MJ vYQuMatGvY1/IuHd+fyFewpYwZEvql+OfXdAFgr2JEPCC93NPCk5NYIutjTatNTLOv5FJC umd3zr3eoLnVsm5NkdpBTCVzcvCmMk7/WEt2lZ96lry5X6uZ19xo1XSCykCej+YYbzGX/C WMVk2gb13Eui61en1AaEAu/s7qllmyG0338hIk5h+NA9g59rXmgIj/ygweE0Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735685202; 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=l6eX6h7CYS5OPG39h7+lyyoSu+JbkSngjn5UVTgiNSs=; b=snU6vM2BNc2ahXTW1i7TPMtD8HKeseF+aOQVeiSbaVzUPBXI18hl3j6fVz8uhbWB+Y/T3z y4yNoRH6c/R4rrX+6oK82aeDy+ERZ7dqqvq3xVVv1ATMhyrc+j3tXuSwmrfog3Zqz/k0PW 2GvCjcnGg+bXvRb0gv3K7oFIR3rn7tACk0pKGfSYx4bApdKo4W5KxIw4+X3wTX5VIekwJG xeOYAuSQ+VOAiu2SEJEyIOZINidBEtyaM5fKNJxzWSr3XnnSpIF431tm5u1sN1WnLsLS7h AiKvm/XaG4SJr/dSCz1t6ELt9AE7oHlAB3WUiSQbbLqLEgErMs5v5qqZSYXoaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735685202; a=rsa-sha256; cv=none; b=Vxg+1+GwtGlTiYxvw+USys5vgOGnBQ6DyOvZFO+Zjek8eyLRq7XHUx/hm+6sLZVwOke7vJ xe2b3V028HczNntb+xzH+LTzCfUv8iA84UkfJiPkY6wGbRg3MHX/0cVmSKEQaaUVIAHsQT DHeEbT2rFD56NUezkBIqccGKY4nc09CzsJA0Ij1rKM0V8cVAaFHkQNuxKQzxOxCcqIPABs 1CpX9fPtXDzaOpU3R5vL41ABbVPU5T2PGshc6kDPD5P2KULzHUmmR//N57bRMc3INNxXOQ xbRrt7mFOdk3KM9yXZ8txKIS77FoUVyCe3+N1yNkydDIRVAvqw8ZCufuOd+sdw== 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 4YN7PZ4yW5zynp; Tue, 31 Dec 2024 22:46:42 +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 4BVMkgQT054028; Tue, 31 Dec 2024 22:46:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVMkg4L054025; Tue, 31 Dec 2024 22:46:42 GMT (envelope-from git) Date: Tue, 31 Dec 2024 22:46:42 GMT Message-Id: <202412312246.4BVMkg4L054025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: cbc331d153cf - main - rtwn: fix builds on non-x86 platforms 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbc331d153cf07ab73217666cfd045d28b31bc00 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=cbc331d153cf07ab73217666cfd045d28b31bc00 commit cbc331d153cf07ab73217666cfd045d28b31bc00 Author: Adrian Chadd AuthorDate: 2024-12-31 22:45:52 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 22:45:52 +0000 rtwn: fix builds on non-x86 platforms The powerpcspe build is spitting out uint64_t != unsigned long, so this fails. Comment out the logging for now to unbreak the build. --- sys/dev/rtwn/rtl8188e/r88e_rx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/rtwn/rtl8188e/r88e_rx.c b/sys/dev/rtwn/rtl8188e/r88e_rx.c index 2ff0ee4dae00..7ea7b2f9e496 100644 --- a/sys/dev/rtwn/rtl8188e/r88e_rx.c +++ b/sys/dev/rtwn/rtl8188e/r88e_rx.c @@ -257,8 +257,10 @@ r88e_ratectl_tx_complete_periodic(struct rtwn_softc *sc, uint8_t *buf, mac_bitmap = ((uint64_t) le32toh(rxs->tsf_low) << 32) | le32toh(rxs->rxdw4); +#if 0 RTWN_DPRINTF(sc, RTWN_DEBUG_RA, "%s: mac bitmap: 0x%lx\n", __func__, mac_bitmap); +#endif /* * Note: the RX reports aren't sparse - invalid entries (ie, From nobody Wed Jan 1 00:04:44 2025 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 4YN97c3w2yz5hyBS; Wed, 01 Jan 2025 00:04:44 +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 4YN97c3Pmrz40yc; Wed, 1 Jan 2025 00:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735689884; 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=Flq8ZWWwaY/uPfMxWWYNLvDJ0TdUUZPxORSfX3csuKs=; b=sA1LdP9R8W+lE5PbN4Uiw7D1s8Du40q8ZdAvcfBVo+Pj12kZlZksm8Krc+0KSZZVc4Pniv N15sWbQGre4tk/veVUsfngqLbWOLOxMvIymM8FhhR4S+nIUO+P4ajzLzwJFzE+iz9eGkfE RKF9/9npIoLbgIw88f6NYwFOy1J5VhoR8BN24p6Z95E9Oyr6HMKq1jNHK+Sn1nY6p4UF3u F96mAmTff9MmQCcE/wkpfNQ+EyJ/QsCEHGykUGNcpEreUDFUcCa22UAbJdKQ0Oq1X0KK1a /xLhM/hm69XeSFXSemMLlZwFDt2IPrVRWxfR8AZaEyTvZfHw5Z9qu7lylsVKKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735689884; 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=Flq8ZWWwaY/uPfMxWWYNLvDJ0TdUUZPxORSfX3csuKs=; b=nLU37FUjb8Qau0gBc2qCp32+p6xFsKV87MJ6efYsfkIkc3iYOaRWs/AxPyobrp7f6dZ/AA 7iExs2P1s4kidHXfwfG94PahiSiDU0Hr5XzNxjevCURAazqr+uUj9LPv/yyCrJftL8+Mm6 eJQp1+tFu/M1UgWVnpajj16pd+ZB3hZYWPJZzPcZgv2l33Dx01fpiLEmWCaEp3Q4dRNDW4 e1DCTkf9IROx/pAIxXt2KpYra7ztQ8UysuM5O1MC23ny33ynTv8qsjxjjef73ztvKxlEwf 2P5ZJlgyqVSiSAwdw/ZQqgC6xHvGlxjoXblXXhS6KUCUemFleMm60Du0kbQGbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735689884; a=rsa-sha256; cv=none; b=e/Tl25Ek9vrYdW3Fg70SyJ2QHT3L9GQ0Or0oN5TPAxyvCBPGuvZl+6vCUMQnn/FvOylRbp QnhMoKvEQyM8hsKUc+wkTdibCSVvvNwJDsKgg1u3ak2XP5PKyCl0HZkqanCuqMXIVovYAS M9o/ETjjLc6je+VEordr0T+/1A+y7vDitAsXdLJw8x12SOeMT3x4dwDe1yHuXtXtgcrutq LSC7pdnEYajQdDDi2DqRSm+hAB2wVCMaQluroNKSilI1VAxbQA8J+/Qi/CsfcTL+2h5q9s GwvIng8r8IdD7ZS7OGELTRz+PSzPtvC6vw2CdIlmyESjDvQQ7fVDX8aIuJjnbw== 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 4YN97c31NTz11j9; Wed, 1 Jan 2025 00:04:44 +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 50104iGY002949; Wed, 1 Jan 2025 00:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50104iWk002946; Wed, 1 Jan 2025 00:04:44 GMT (envelope-from git) Date: Wed, 1 Jan 2025 00:04:44 GMT Message-Id: <202501010004.50104iWk002946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: b55baa8139ce - main - copyright: Happy New Year 2025 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b55baa8139ceecda896695b9bf9a05607e5f5b93 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=b55baa8139ceecda896695b9bf9a05607e5f5b93 commit b55baa8139ceecda896695b9bf9a05607e5f5b93 Author: Xin LI AuthorDate: 2025-01-01 00:04:28 +0000 Commit: Xin LI CommitDate: 2025-01-01 00:04:28 +0000 copyright: Happy New Year 2025 --- COPYRIGHT | 2 +- sys/sys/copyright.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index a91bc042150c..9f8b3d4c01d6 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2024 The FreeBSD Project. +Copyright (c) 1992-2025 The FreeBSD Project. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h index 4b74075c6712..8c89adf7f885 100644 --- a/sys/sys/copyright.h +++ b/sys/sys/copyright.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (C) 1992-2024 The FreeBSD Project. All rights reserved. + * Copyright (C) 1992-2025 The FreeBSD Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,7 +35,7 @@ /* FreeBSD */ #define COPYRIGHT_FreeBSD \ - "Copyright (c) 1992-2024 The FreeBSD Project.\n" + "Copyright (c) 1992-2025 The FreeBSD Project.\n" /* Foundation */ #define TRADEMARK_Foundation \ From nobody Wed Jan 1 00:05:14 2025 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 4YN98B6gQgz5hyXJ; Wed, 01 Jan 2025 00:05:14 +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 4YN98B67VTz41Xk; Wed, 1 Jan 2025 00:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735689914; 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=C4W8q+kHU8LDvwrRbiCZ2Ik9nGHe5SKC/3ATe3wJlig=; b=afi0GEcjaJ6zB038J8ak4Aj4TA82Z1U6lLHhcC68jtpgIm7uvKbzzHJRAsQDBvYs6WWR4g BDpehLNaKReuJX3rRUt11UXsGTMBRWxrCr9RBqWMsRHf/2R/LLBOBJlO395xPazUKUelKP DYp6e7Fve5qW/Kk+bXO1QoYrG1oLS2eH9L2RF/MYInxeS12vQ8jyYu680xQZR2z0GFSvFR HLfYhOdQuL79C0+/ydZbWPB5EXePSDPhe9iUnbeAcR1hAh1hIsu9eGkmahZH/RW7x9Ba4e pLm4161wfH79fXVtCqQ+gThpeAHKmdOd6EFZ4dW2BH9acgskzmuibW/0VhcwTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735689914; 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=C4W8q+kHU8LDvwrRbiCZ2Ik9nGHe5SKC/3ATe3wJlig=; b=vjght6/hid0tXBSgG+4ENJ1jULfCqF1RoS0S/Gu/fphxaMFVwv1/bLA2pwFXVTxdWGqPBO +YzId3Wf/LlspfVmszpkgMxn4LYUq+tU7d8CWdoSQpGF3HRcyxB/BvODHPwbL2K1zW2kcU kUW9DFETgdpnRPtENYm8Jx2atiG4of7V0cTVOjsFCk7HHVxidyIdGUYzxeA3zGH3+hkdq4 77hVS4B4cYrOor/UBZPncqpsToXzhbwDYJic9XWnt2BPlSylJ4NktG8XOLzZrDL4frhpxC FDHk8GhcTImkHL8X26MHHbS+WbXrRSwRChk1/cUW8Xgd5t3MCLNT3AZD/KPaAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735689914; a=rsa-sha256; cv=none; b=ggQ9EkC4iauA1SyBr2ZobBWMRzDdciv6Cnah/48pAjsolOKrQxPbSghbJSgoze5temjXu1 nhxR/W/RKst+ccUk1issqtujEVyPmhECagKPyXJKY3KGMdv/WFhZFblWTS6YfHVQWSpL5v cYCcmLwcvE/LQMXUGXtKtJsVTC04/Bmy4l6OjM5ntTYNCf6CqBnzpizFVPpsCQPBqH8NtU 3dOn+6KR6FQOt819bBqNa3qAC/o9LfiEHTS//moa8L5v7UJZPvBiuVZ6GwG/V420Ybz2lo Ac975uJjspfWuzBQq4SClXWX2UXNdtHjzRB02KvF5ivoXjpL8uDfvHNEn3jjcg== 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 4YN98B5dsgz120h; Wed, 1 Jan 2025 00:05:14 +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 50105EBr003274; Wed, 1 Jan 2025 00:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50105ENB003271; Wed, 1 Jan 2025 00:05:14 GMT (envelope-from git) Date: Wed, 1 Jan 2025 00:05:14 GMT Message-Id: <202501010005.50105ENB003271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4196f227aa84 - main - libdtrace: Be less strict when comparing pointer types 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4196f227aa84448ef3cae9e99678fbe787726cf7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4196f227aa84448ef3cae9e99678fbe787726cf7 commit 4196f227aa84448ef3cae9e99678fbe787726cf7 Author: Mark Johnston AuthorDate: 2024-12-31 19:25:52 +0000 Commit: Mark Johnston CommitDate: 2025-01-01 00:05:03 +0000 libdtrace: Be less strict when comparing pointer types If one of two pointers refers to a forward declaration, let the pointers be compatible so long as the referred types have the same name. Otherwise we can get spurious errors. To give a specific example, this can happen when ipfw_nat.ko is loaded before ipfw.ko and /usr/lib/dtrace/ipfw.d is processed. Currently, ipfw_nat.ko does not have a definition for struct inpcb (i.e., none of its files include in_pcb.h), so in the CTF type graph, struct ip_fw_args' "inp" member refers to a forward declaration, represented in CTF with CTF_K_FORWARD. Then, when libdtrace processes the ipfw_match_info_t translator in ipfw.d, it decides that the "inp" field assignment is incorrect because the two pointers are incompatible. However, there's no harm in allowing this assignment. Add some logic to dt_node_is_ptrcompat() to detect this case and declare the pointers as compatible so long as the name of the thing they refer to is the same, similar to how any pointer is compatible with a void *. Reported by: marck Reviewed by: Domagoj Stolfa MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48254 --- .../opensolaris/lib/libdtrace/common/dt_parser.c | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c index 2b85dd2b26b6..d1ebaa8791da 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c @@ -1130,6 +1130,29 @@ dt_node_is_ptrcompat(const dt_node_t *lp, const dt_node_t *rp, lp_is_void = ctf_type_encoding(lfp, lref, &e) == 0 && IS_VOID(e); rp_is_void = ctf_type_encoding(rfp, rref, &e) == 0 && IS_VOID(e); + /* + * Let a pointer to a forward declaration be compatible with a pointer + * to a struct or union of the same name. + */ + if (lkind == CTF_K_POINTER && rkind == CTF_K_POINTER) { + int lrkind, rrkind; + + lrkind = ctf_type_kind(lfp, lref); + rrkind = ctf_type_kind(rfp, rref); + if (lrkind == CTF_K_FORWARD || rrkind == CTF_K_FORWARD) { + const char *lname, *rname; + char ln[DT_TYPE_NAMELEN], rn[DT_TYPE_NAMELEN]; + + lname = ctf_type_name(lfp, lref, ln, sizeof (ln)); + rname = ctf_type_name(rfp, rref, rn, sizeof (rn)); + if (lname != NULL && rname != NULL && + strcmp(lname, rname) == 0) { + lp_is_void = lrkind == CTF_K_FORWARD; + rp_is_void = rrkind == CTF_K_FORWARD; + } + } + } + /* * The types are compatible if both are pointers to the same type, or * if either pointer is a void pointer. If they are compatible, set From nobody Wed Jan 1 05:46:02 2025 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 4YNJjQ3dTJz5jNYX; Wed, 01 Jan 2025 05:46:02 +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 4YNJjQ37KVz4Njp; Wed, 1 Jan 2025 05:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710362; 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=K/Njmc335T67EvTOohqNY76d75HIzQrJ3CR8ZDLdYj4=; b=aEKRF5SpDRpPFJfhre39rcvlX9vauZeLeayLlzub2jtyFvJ6vP2BtgqxqekqL53yWbXZcR eW8OpRWtNGp3X7t6cjgKSjI6vYLe1Lgadpx8AEbLRl79AQ1WG/rHUewupSgTF4Fz8X6ufK F2HvMkUtJsz8OnBT15HpmjeaQVXON1y4l7FNrA6JM9h6yGM1SrDMa8TP53TFSdLjDnKK5R H2ERTGelEa2BPYIo9ZKrkFxXW1YiuuS714oLDGwIidMQq6yIoIcTlt91lr2G+tHrkHuDtr tjPLkSXnVKrBLw5y+K0MZ4H0IJ/MedWfO+JhI4kd+ZTAmefIgz2mFw9QwYLDKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710362; 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=K/Njmc335T67EvTOohqNY76d75HIzQrJ3CR8ZDLdYj4=; b=e0rNLjNzht2wE8FVWKWjeHS8zxV5aVpECtYlk5n1qMK1p0K6aUXWJV1jXxQwBg603NBT3n mgouJ9V6USWeA48966QVT6HKrjYxMBPi31KaJqgiHXrOuGBZsEyMZc/Ynq02aIA1js32D8 U06IQRTubo11ysI9l8XI1SI3GlFZd6eoXCazWzRJzVmWVXo/huZI//Ip8RkBZfowjOyzZp dpiXeK1qXKne+8fRBMYsT3hAqNzpFr5X2cmdnSBYWrIRYb2slLxJntKU7jUFSuRvd0aoT2 s/4iK1LBrrEe5dn0vIZJsbJFE/Fd3pkEL5FPIe72aNE6kno9CzKuTqvbQKYixQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710362; a=rsa-sha256; cv=none; b=uKCnTd8ovYeW/AW90uCkTaE/Mdjz8BIlNhghVDhdjXPmcmcZHADpoMptxfcFubvEEdMpin aFnoSAauaLNu8PM3OuiqH4MaM2rFWeoRjUmTV7D7XYPDHIIH512qfhqkb+9omQpGeDZyPV igUwZrW6VEU6bU/B1rZ+/d5F3K5SLtpPL6WjVB+7Q1iu0DpyJou+hdGot46Xw+omeyvwpW mi0pKNpiTjEgVr7WzfT8y+J9Le9JikcLYB7vrIStosrvmnp1kKa7g6fHh5fJXggqRL+hC7 Yl21egdWGDr25znrd16W2HFJxE0xRtpjAS9yLgV0QdA7YjcfgEO+oqvP5AVGHA== 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 4YNJjQ2kNYz1BMl; Wed, 1 Jan 2025 05:46:02 +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 5015k2UX038328; Wed, 1 Jan 2025 05:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015k23U038325; Wed, 1 Jan 2025 05:46:02 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:46:02 GMT Message-Id: <202501010546.5015k23U038325@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: 18bbc3c82e13 - stable/14 - release: vmimage: setup the default BE properly 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 18bbc3c82e1343d28a1fcad731f28c889602a363 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=18bbc3c82e1343d28a1fcad731f28c889602a363 commit 18bbc3c82e1343d28a1fcad731f28c889602a363 Author: Kyle Evans AuthorDate: 2024-12-11 01:19:08 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:45:15 +0000 release: vmimage: setup the default BE properly All of the BE datasets need to be set canmount=noauto so that creating a new BE and switching to it can actually work. With the current setup, the zfs rc script will mount the `default` BE over whichever new BE is activated once it runs. Reported by: andrew Reviewed by: andrew, re (cperciva), imp, markj (cherry picked from commit 636d377264f51e3dd33bd7f33ebf03e2e148d40d) --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index c95a6dc82937..3761faf94810 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -190,7 +190,7 @@ buildfs() { -o poolname=zroot -o bootfs=zroot/ROOT/default -o rootpath=/ \ -o fs=zroot\;mountpoint=none \ -o fs=zroot/ROOT\;mountpoint=none \ - -o fs=zroot/ROOT/default\;mountpoint=/ \ + -o fs=zroot/ROOT/default\;mountpoint=/\;canmount=noauto \ -o fs=zroot/home\;mountpoint=/home \ -o fs=zroot/tmp\;mountpoint=/tmp\;exec=on\;setuid=off \ -o fs=zroot/usr\;mountpoint=/usr\;canmount=off \ From nobody Wed Jan 1 05:46:03 2025 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 4YNJjR6BYqz5jNcL; Wed, 01 Jan 2025 05:46:03 +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 4YNJjR3pdQz4P8j; Wed, 1 Jan 2025 05:46:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710363; 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=njE5KD1yuwAexZDp/OcZ+HwVNJiujNDA5uQMemFG0yY=; b=a7zKXmtJCuJUgZ74LVT0/rrsnyNPCTE5cS50aaTFYW5HS4qT4h9l2biZno2JwOOiPlUFvU UaOjPhcNBmTvZVNrXxcaS60+HAxO465FqOiU13nfUpMpCGkoEXR21OO8ayyE8BulBSVPR3 +boGncg2DVl6F+wQj21BkzlYqgSJn7YeLjiXkhi69B2nEELXsIFewEKR+0dvdEzQtMUjc6 bQE3WPrRqxa8J+If11x0HOmi5/gkW7+VmNhS3nx1WFB1/7rssw3liuEOk+tDVLEK9z1FE3 fKsxvd1MBj/UH02DRejtmkxdEbhuWiwiqZo+htJckKKrHaolyce7vIBOVWdwPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710363; 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=njE5KD1yuwAexZDp/OcZ+HwVNJiujNDA5uQMemFG0yY=; b=OdawjK4b6EdE/6Ju6FY8NfgaoRg+xBrNEt8QZfs5BcAcAAGWgJN+C2LkTcFjcbFijgxMUG qeegeF3BkCFbNKjH3LOsNX9U1QmUq8SqtQl1DfS3g4NJE6CPRTQV3oK3CH8Abmx3QBAx9o WB0j0+zAbPcfBCDHD7Fv/fJqeHuRAlm9MYkfv79O1nqXSk13NQzuWeiwWw6Rij1U+91Pvk OMTwrjnmXCgQAMZ7F5J/waFoskH/46uEdcrgSC+UM8M0Sva93cohOY9WA2rbKmVSfaUz8c 7BbfyW4kQARaL5HzeqZZ/fbGZRvgOc0U3Rw0xcUPQzgENW1OoLTe5JwvcKWe7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710363; a=rsa-sha256; cv=none; b=EbZJkcMUVHW6lpBiqy1kpDCsRwN0jdMNe3/Riqyw2adY2hCvREDXemTQJgZ18gPSeg3FBh SVz1LNKjBt75/wmqvv1OgFdL3oc1PIv6aSzAhesYF3lhWw8Lueo+kukdV5Gy7Wt8542dtf Gz4qj21k9/BC2tPyiQtV/E5tJjRiJ5bDZF7jM2Bp1fO2vhX1Aqe+mN8qTLdEh0Po1zfgcm dws4KHTnd/2FzMCy4iw/WDUQ1Tk7acJOc1Uz0COGD2GXb5v8iXnzGhGwQPgEU9+oE/61eP JaLy9Tnf/P31ANxOqxuAmNKPUc5pWUfo+eWfh+xVZmI3JBl9LldspZPJ3dPIJQ== 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 4YNJjR3Q2rz1BKg; Wed, 1 Jan 2025 05:46:03 +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 5015k3fv038380; Wed, 1 Jan 2025 05:46:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015k3G8038376; Wed, 1 Jan 2025 05:46:03 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:46:03 GMT Message-Id: <202501010546.5015k3G8038376@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: 2882d0c61aeb - stable/14 - usb: serial: propagate errors from ucom_queue_command() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 2882d0c61aebab77e8f2cc5b7cace6186bb8cb01 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2882d0c61aebab77e8f2cc5b7cace6186bb8cb01 commit 2882d0c61aebab77e8f2cc5b7cace6186bb8cb01 Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:45:20 +0000 usb: serial: propagate errors from ucom_queue_command() There's only one error that we can get back right now, but future changes will add some more cases that we need to watch out for. Start by returning errors and propagating them back. Reviewed by: kib (cherry picked from commit 51f3d0874f6216907c8971c4af9d6be6c93edf7b) --- sys/dev/usb/serial/usb_serial.c | 49 ++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 300438010c05..11a2e1078a67 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -151,7 +151,7 @@ static int ucom_unit_alloc(void); static void ucom_unit_free(int); static int ucom_attach_tty(struct ucom_super_softc *, struct ucom_softc *); static void ucom_detach_tty(struct ucom_super_softc *, struct ucom_softc *); -static void ucom_queue_command(struct ucom_softc *, +static int ucom_queue_command(struct ucom_softc *, usb_proc_callback_t *, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1); static void ucom_shutdown(struct ucom_softc *); @@ -592,7 +592,7 @@ ucom_set_usb_mode(struct ucom_super_softc *ssc, enum usb_hc_mode usb_mode) } } -static void +static int ucom_queue_command(struct ucom_softc *sc, usb_proc_callback_t *fn, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1) @@ -604,7 +604,7 @@ ucom_queue_command(struct ucom_softc *sc, if (usb_proc_is_gone(&ssc->sc_tq)) { DPRINTF("proc is gone\n"); - return; /* nothing to do */ + return (ENXIO); /* nothing to do */ } /* * NOTE: The task cannot get executed before we drop the @@ -637,6 +637,8 @@ ucom_queue_command(struct ucom_softc *sc, */ if (fn == ucom_cfg_start_transfers) sc->sc_last_start_xfer = &task->hdr; + + return (0); } static void @@ -760,9 +762,8 @@ ucom_open(struct tty *tp) * example if the device is not present: */ error = (sc->sc_callback->ucom_pre_open) (sc); - if (error) { - return (error); - } + if (error != 0) + goto out; } sc->sc_flag |= UCOM_FLAG_HL_READY; @@ -782,14 +783,18 @@ ucom_open(struct tty *tp) sc->sc_jitterbuf_in = 0; sc->sc_jitterbuf_out = 0; - ucom_queue_command(sc, ucom_cfg_open, NULL, + error = ucom_queue_command(sc, ucom_cfg_open, NULL, &sc->sc_open_task[0].hdr, &sc->sc_open_task[1].hdr); + if (error != 0) + goto out; /* Queue transfer enable command last */ - ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, - &sc->sc_start_task[0].hdr, + error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, + &sc->sc_start_task[0].hdr, &sc->sc_start_task[1].hdr); + if (error != 0) + goto out; if (sc->sc_tty == NULL || (sc->sc_tty->t_termios.c_cflag & CNO_RTSDTR) == 0) ucom_modem(tp, SER_DTR | SER_RTS, 0); @@ -800,7 +805,8 @@ ucom_open(struct tty *tp) ucom_status_change(sc); - return (0); +out: + return (error); } static void @@ -836,7 +842,7 @@ ucom_close(struct tty *tp) } ucom_shutdown(sc); - ucom_queue_command(sc, ucom_cfg_close, NULL, + (void)ucom_queue_command(sc, ucom_cfg_close, NULL, &sc->sc_close_task[0].hdr, &sc->sc_close_task[1].hdr); @@ -1077,9 +1083,12 @@ ucom_line_state(struct ucom_softc *sc, sc->sc_pls_set |= set_bits; sc->sc_pls_clr |= clear_bits; - /* defer driver programming */ - ucom_queue_command(sc, ucom_cfg_line_state, NULL, - &sc->sc_line_state_task[0].hdr, + /* + * defer driver programming - we don't propagate any error from + * this call because we'll catch such errors further up the call stack. + */ + (void)ucom_queue_command(sc, ucom_cfg_line_state, NULL, + &sc->sc_line_state_task[0].hdr, &sc->sc_line_state_task[1].hdr); } @@ -1236,7 +1245,7 @@ ucom_status_change(struct ucom_softc *sc) } DPRINTF("\n"); - ucom_queue_command(sc, ucom_cfg_status_change, NULL, + (void)ucom_queue_command(sc, ucom_cfg_status_change, NULL, &sc->sc_status_task[0].hdr, &sc->sc_status_task[1].hdr); } @@ -1310,14 +1319,18 @@ ucom_param(struct tty *tp, struct termios *t) sc->sc_flag &= ~UCOM_FLAG_GP_DATA; /* Queue baud rate programming command first */ - ucom_queue_command(sc, ucom_cfg_param, t, + error = ucom_queue_command(sc, ucom_cfg_param, t, &sc->sc_param_task[0].hdr, &sc->sc_param_task[1].hdr); + if (error != 0) + goto done; /* Queue transfer enable command last */ - ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, - &sc->sc_start_task[0].hdr, + error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, + &sc->sc_start_task[0].hdr, &sc->sc_start_task[1].hdr); + if (error != 0) + goto done; if (t->c_cflag & CRTS_IFLOW) { sc->sc_flag |= UCOM_FLAG_RTS_IFLOW; From nobody Wed Jan 1 05:46:04 2025 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 4YNJjS5k2sz5jNHx; Wed, 01 Jan 2025 05:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNJjS4XdRz4P1w; Wed, 1 Jan 2025 05:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710364; 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=gkPAfhvpBoC9D9JJXt5FryDCprneZk1whUo/cJW5bCo=; b=ppzfPTbsxQF2ojN8HY8XUwJ3XbIlucLNC0Bot6yHTRA8XMMGkLaWV/ZrW3KGkdHGIAfnmN 5UfI2kcuZ3aYpmJ1gyz5VDcEi/wRzwP8w7Jdurcjb8stiusH1aHNadvrCM6q3u30KZhU7d BWjd3l9xAyrloztOoQpPYJoYbo1+ifhEcuaI9E71cOHf0Rcp+cfk0CRiuO/uJhmEIoM32l lWhzOIGvxWnAKdGVlpbGDjpLgdekIkXUn4RfJit9hCdG8mX4cZ87NZr51p6v+1/ZCgsmup vvQw5wC3yyVjtXso0J46oeHxrS5BE7xlmvF8grfq8GHv1tL/djaSUO5G0ugo1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710364; 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=gkPAfhvpBoC9D9JJXt5FryDCprneZk1whUo/cJW5bCo=; b=tBVaHtygXpFTfHPCVdh+AE/x72jMyaO9kGTUVb/4OH1ItOANwu+0tihbOF8H6Tuz/tWgCL JYCssND00AgGICTdGBpkiHdNStMjPEmCqlDLEgfwT76jrcVN3e2R3bWFKKhEOrdaMwOa2w 3WQmv9SrD8jvs9Kf9UckjHlOjcSU/g9rclnbBzmmmjmlLl392ADwpEKDDj4Cfu0b3mn2at VLUbpJ/74Rtlalnmp40aKrYnEnyt93FYe21d6n20am8wl7AndaLrso6ezN98VrDyFBZX74 +10T0/mWQnl+L4D9g8IhrDLc6ct7zowofldRG1Dd4JnUxbDswvcQfs104M7i5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710364; a=rsa-sha256; cv=none; b=gId3X85HZRLLFJBoqegGkwsRUz+9hd0hyajx1CRy7i8FN/CJJTgUMuZzfR6VwnpbIFDt25 aLy0Q+wRA5LniL4r7aoiDE7hm/j0BeqMu1wQTGuerUHiaTVwXpHwyW6EgnzSFPQmajK4Vy fNV7H149oRmsQbyvEgrKjHCmhMHj6ewVufUi+RJ0QmqzvjuPZaiJONSqu2b7edxsV91SQ2 +cY+D2s4soGLdKCf0oiGroPtXpdf3vZRhh9045gegozR8NVhAbnoY0QNe3MZDyeDzS+H2q MA1Ct3AAukbWAU8D9a09BxoKhELbeuWdZ1F/0N3OfvWNbOGhU4ITyxpyIswuxw== 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 4YNJjS48sKz1BlD; Wed, 1 Jan 2025 05:46:04 +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 5015k4JA038436; Wed, 1 Jan 2025 05:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015k4K1038433; Wed, 1 Jan 2025 05:46:04 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:46:04 GMT Message-Id: <202501010546.5015k4K1038433@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: 2ba5217057bd - stable/14 - usb: serial: allow the open/close sleep to be interruptible 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 2ba5217057bdf94a4929dc7644f4e39be06fdef3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba5217057bdf94a4929dc7644f4e39be06fdef3 commit 2ba5217057bdf94a4929dc7644f4e39be06fdef3 Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:45:24 +0000 usb: serial: allow the open/close sleep to be interruptible ucom_queue_command will issue commands for open/close, then wait on them to be finished. In the spirit of playing it safe, allow ucom_queue_command's wait to be interrupted in case the usb process gets jammed up waiting on the hardware -- we can at least recover the user thread that initiated it, even if we can't recover the usb process. Reviewed by: imp, kib (cherry picked from commit 729eb176a465cedc55c5980f116d87be592421f1) --- sys/dev/usb/serial/usb_serial.c | 14 +++++++-- sys/dev/usb/usb_process.c | 69 ++++++++++++++++++++++++++++++++--------- sys/dev/usb/usb_process.h | 1 + sys/dev/usb/usbdi.h | 2 ++ 4 files changed, 69 insertions(+), 17 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 11a2e1078a67..30a0c6203086 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -599,6 +599,7 @@ ucom_queue_command(struct ucom_softc *sc, { struct ucom_super_softc *ssc = sc->sc_super; struct ucom_param_task *task; + int error; UCOM_MTX_ASSERT(sc, MA_OWNED); @@ -628,8 +629,15 @@ ucom_queue_command(struct ucom_softc *sc, /* * Closing or opening the device should be synchronous. */ - if (fn == ucom_cfg_close || fn == ucom_cfg_open) - usb_proc_mwait(&ssc->sc_tq, t0, t1); + if (fn == ucom_cfg_close || fn == ucom_cfg_open) { + error = usb_proc_mwait_sig(&ssc->sc_tq, t0, t1); + + /* usb_proc_mwait_sig may have dropped the tty lock. */ + if (error == 0 && sc->sc_tty != NULL && tty_gone(sc->sc_tty)) + error = ENXIO; + } else { + error = 0; + } /* * In case of multiple configure requests, @@ -638,7 +646,7 @@ ucom_queue_command(struct ucom_softc *sc, if (fn == ucom_cfg_start_transfers) sc->sc_last_start_xfer = &task->hdr; - return (0); + return (error); } static void diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c index d88de92336f2..4507c999f50a 100644 --- a/sys/dev/usb/usb_process.c +++ b/sys/dev/usb/usb_process.c @@ -361,25 +361,21 @@ usb_proc_is_gone(struct usb_process *up) return (0); } -/*------------------------------------------------------------------------* - * usb_proc_mwait - * - * This function will return when the USB process message pointed to - * by "pm" is no longer on a queue. This function must be called - * having "up->up_mtx" locked. - *------------------------------------------------------------------------*/ -void -usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +static int +usb_proc_mwait_impl(struct usb_process *up, void *_pm0, void *_pm1, + bool interruptible) { struct usb_proc_msg *pm0 = _pm0; struct usb_proc_msg *pm1 = _pm1; + int error; /* check if gone */ if (up->up_gone) - return; + return (ENXIO); USB_MTX_ASSERT(up->up_mtx, MA_OWNED); + error = 0; if (up->up_curtd == curthread) { /* Just remove the messages from the queue. */ if (pm0->pm_qentry.tqe_prev) { @@ -391,14 +387,59 @@ usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) pm1->pm_qentry.tqe_prev = NULL; } } else - while (pm0->pm_qentry.tqe_prev || - pm1->pm_qentry.tqe_prev) { + while (error == 0 && (pm0->pm_qentry.tqe_prev || + pm1->pm_qentry.tqe_prev)) { /* check if config thread is gone */ if (up->up_gone) - break; + return (ENXIO); up->up_dsleep = 1; - cv_wait(&up->up_drain, up->up_mtx); + if (interruptible) { + error = cv_wait_sig(&up->up_drain, up->up_mtx); + + /* + * The fact that we were interrupted doesn't + * matter if our goal was accomplished anyways. + */ + if (error != 0 && !USB_PROC_MSG_ENQUEUED(pm0) && + !USB_PROC_MSG_ENQUEUED(pm1)) + error = 0; + } else { + cv_wait(&up->up_drain, up->up_mtx); + } } + + if (error == ERESTART) + error = EINTR; + return (error); +} + +/*------------------------------------------------------------------------* + * usb_proc_mwait + * + * This function will return when the USB process message pointed to + * by "pm" is no longer on a queue. This function must be called + * having "up->up_mtx" locked. + *------------------------------------------------------------------------*/ +void +usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +{ + + (void)usb_proc_mwait_impl(up, _pm0, _pm1, false); +} + +/*------------------------------------------------------------------------* + * usb_proc_mwait_sig + * + * This function will return when the USB process message pointed to + * by "pm" is no longer on a queue. This function must be called + * having "up->up_mtx" locked. This version of usb_proc_mwait is + * interruptible. + *------------------------------------------------------------------------*/ +int +usb_proc_mwait_sig(struct usb_process *up, void *_pm0, void *_pm1) +{ + + return (usb_proc_mwait_impl(up, _pm0, _pm1, true)); } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h index 6a8ac0acda33..745d214d2106 100644 --- a/sys/dev/usb/usb_process.h +++ b/sys/dev/usb/usb_process.h @@ -76,6 +76,7 @@ int usb_proc_create(struct usb_process *up, struct mtx *p_mtx, const char *pmesg, uint8_t prio); void usb_proc_drain(struct usb_process *up); void usb_proc_mwait(struct usb_process *up, void *pm0, void *pm1); +int usb_proc_mwait_sig(struct usb_process *up, void *pm0, void *pm1); void usb_proc_free(struct usb_process *up); void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 5192591281f4..08d130aa2868 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -525,6 +525,8 @@ struct usb_proc_msg { usb_size_t pm_num; }; +#define USB_PROC_MSG_ENQUEUED(msg) ((msg)->pm_qentry.tqe_prev != NULL) + #define USB_FIFO_TX 0 #define USB_FIFO_RX 1 From nobody Wed Jan 1 05:46:05 2025 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 4YNJjV2d2Xz5jNYh; Wed, 01 Jan 2025 05:46:06 +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 4YNJjT6xfkz4PN8; Wed, 1 Jan 2025 05:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710366; 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=1+TxT34WAabwvncHrWhXgyEF85MWQrJXpMog+wkHEDA=; b=ncexmx/pbKkNzSlVF4/uHHqD4w7Q9m8a/JiOjXXhXy8YlHoTBSTNMMyqRKbQNLmx+uiU9T CMhvVQ7WgCbygoE5uFt2vK0croSAUERT0o1R1cQ0mo/CAKdgRZXtt8cE2J/FaR2RtQT5Hg Fr7/fHQyTd/vtMGB2YrTpmifxIuZNp+PQLflSgdEROeEhxMNomeX0KvbnGv3rnYo35BBHu +Syn8J2MuA+n+f1A/9GkikvcRXYQ7vqaPdTloewxf+kEK3JsgcfG40k2ddsw9Qfn3HvmBJ 6hu6BEOVZ372LzzHQYQ7JR5yXl72oF25xvBudtXyVJ4cG12/XigVebdF2xfWiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710366; 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=1+TxT34WAabwvncHrWhXgyEF85MWQrJXpMog+wkHEDA=; b=uM0VfjRRFQS2jsbkw10QZoXImP/9D5gZrsTHbldxLXm5j9p97c+zgS159ZQiZYH9Vr5p7s //SNXIyGoJISwdZLRfoujdfu5JqUoXv22SWvhbPGqzpkKSjiv6qw+Dt99h5AdSc8qOrNW/ xaJ6d3k4/WlH9FeF7QkRhYGoErifUh5kU3nBCKjzV1jGbQcGkuiZOB3pfHCcyqf9cWB6Q+ tZQO0S8QeoYKeFtSERsSMHUsEakIHXiogKsBFQxV448bTOTLmUoowpQ0/9jonouQyBbR5I STT6DIbJwIss7n3t66sX6+jIMGCS2W0afGdpnOH3QzuJMRBkw32HpvlfMI2vRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710366; a=rsa-sha256; cv=none; b=MBvH1bjXQyXa32XaY6uEari5PkPhMW0pvVmOXNjqOH/L9sApfP1drNlZbqEoqWr6mwX+U/ x/HQDi+OxFjHS4N30wEoXxnwMJEivRPCHrKa1T517VQR9Ap+wVvK0Q3gIzSM071pWXVzF9 xCDZu0zXHDpOlPkRz5+LW9hRAi6l74KairABZuJ7ocypi8NeswdRKLcou1eDeeTkjWTR31 dpoxDXguPYQFVE/T/TwWv3nhHP6fLlZEFGHeRj8v4YF+wWlVRX/Y+Or6DbOOoguZ8mOoKI /qzaCPHCVPWYpjZ9IBUJJZewV+0m37x9AMEFWKmugdm8dI3nZ3SNObpoA6AaKg== 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 4YNJjT59GJz1Bhr; Wed, 1 Jan 2025 05:46:05 +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 5015k5qe038489; Wed, 1 Jan 2025 05:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015k52n038486; Wed, 1 Jan 2025 05:46:05 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:46:05 GMT Message-Id: <202501010546.5015k52n038486@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: 4c20884b3735 - stable/14 - usb: serial: make more commands execute synchronously 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 4c20884b3735a17b668bca49a50b8ace4d7fa4ba Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4c20884b3735a17b668bca49a50b8ace4d7fa4ba commit 4c20884b3735a17b668bca49a50b8ace4d7fa4ba Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:45:26 +0000 usb: serial: make more commands execute synchronously The termios layer wants some level of guarantee that we've actually submitted param changes to the hardware when our functions return, so we need to do a little more waiting to avoid violating those guarantees. This is especially important as some hardware has some minimum timing specifications around this stuff, and without being less asynchronous the software dealing with these devices can't reasonably operate the hardware without more excessive delays than they should need. More specifically, we make sure that: - The command to start transfers is finished before we toggle DTR/RTS - The status_change command finishes before we return, which may change some fields in the softc that we need for a subsequent call into usb_serial - cfg_param finishes before we re-enable transfers, and we ensure that RTS is appropriately toggled before we return to userland This has been observed to fix some flakiness in connecting to some ESP32 devices. Tested by: kenrap from Libera Reviewed by: imp, kib (cherry picked from commit 36a80f4264350a2f4f0686eb91ae7f5943d40327) --- sys/dev/usb/serial/usb_serial.c | 69 +++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 30a0c6203086..dfae051ecfd6 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -153,7 +153,7 @@ static int ucom_attach_tty(struct ucom_super_softc *, struct ucom_softc *); static void ucom_detach_tty(struct ucom_super_softc *, struct ucom_softc *); static int ucom_queue_command(struct ucom_softc *, usb_proc_callback_t *, struct termios *pt, - struct usb_proc_msg *t0, struct usb_proc_msg *t1); + struct usb_proc_msg *t0, struct usb_proc_msg *t1, bool wait); static void ucom_shutdown(struct ucom_softc *); static void ucom_ring(struct ucom_softc *, uint8_t); static void ucom_break(struct ucom_softc *, uint8_t); @@ -592,10 +592,43 @@ ucom_set_usb_mode(struct ucom_super_softc *ssc, enum usb_hc_mode usb_mode) } } +static void +ucom_command_barrier_cb(struct usb_proc_msg *msg __unused) +{ + /* NOP */ +} + +/* + * ucom_command_barrier inserts a dummy task and waits for it so that we can be + * certain that previously enqueued tasks are finished before returning back to + * the tty layer. + */ +static int +ucom_command_barrier(struct ucom_softc *sc) +{ + struct ucom_super_softc *ssc = sc->sc_super; + struct usb_proc_msg dummy = { .pm_callback = ucom_command_barrier_cb }; + struct usb_proc_msg *task; + int error; + + UCOM_MTX_ASSERT(sc, MA_OWNED); + + if (usb_proc_is_gone(&ssc->sc_tq)) { + DPRINTF("proc is gone\n"); + return (ENXIO); /* nothing to do */ + } + + task = usb_proc_msignal(&ssc->sc_tq, &dummy, &dummy); + error = usb_proc_mwait_sig(&ssc->sc_tq, task, task); + if (error == 0 && sc->sc_tty != NULL && tty_gone(sc->sc_tty)) + error = ENXIO; + return (error); +} + static int ucom_queue_command(struct ucom_softc *sc, usb_proc_callback_t *fn, struct termios *pt, - struct usb_proc_msg *t0, struct usb_proc_msg *t1) + struct usb_proc_msg *t0, struct usb_proc_msg *t1, bool wait) { struct ucom_super_softc *ssc = sc->sc_super; struct ucom_param_task *task; @@ -629,7 +662,7 @@ ucom_queue_command(struct ucom_softc *sc, /* * Closing or opening the device should be synchronous. */ - if (fn == ucom_cfg_close || fn == ucom_cfg_open) { + if (wait) { error = usb_proc_mwait_sig(&ssc->sc_tq, t0, t1); /* usb_proc_mwait_sig may have dropped the tty lock. */ @@ -793,14 +826,17 @@ ucom_open(struct tty *tp) error = ucom_queue_command(sc, ucom_cfg_open, NULL, &sc->sc_open_task[0].hdr, - &sc->sc_open_task[1].hdr); + &sc->sc_open_task[1].hdr, true); if (error != 0) goto out; - /* Queue transfer enable command last */ + /* + * Queue transfer enable command last, we'll have a barrier later so we + * don't need to wait on this to complete specifically. + */ error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, &sc->sc_start_task[0].hdr, - &sc->sc_start_task[1].hdr); + &sc->sc_start_task[1].hdr, true); if (error != 0) goto out; @@ -813,6 +849,7 @@ ucom_open(struct tty *tp) ucom_status_change(sc); + error = ucom_command_barrier(sc); out: return (error); } @@ -852,7 +889,7 @@ ucom_close(struct tty *tp) (void)ucom_queue_command(sc, ucom_cfg_close, NULL, &sc->sc_close_task[0].hdr, - &sc->sc_close_task[1].hdr); + &sc->sc_close_task[1].hdr, true); sc->sc_flag &= ~(UCOM_FLAG_HL_READY | UCOM_FLAG_RTS_IFLOW); @@ -933,11 +970,15 @@ ucom_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) #endif case TIOCSBRK: ucom_break(sc, 1); - error = 0; + error = ucom_command_barrier(sc); + if (error == ENXIO) + error = ENODEV; break; case TIOCCBRK: ucom_break(sc, 0); - error = 0; + error = ucom_command_barrier(sc); + if (error == ENXIO) + error = ENODEV; break; default: if (sc->sc_callback->ucom_ioctl) { @@ -1097,7 +1138,7 @@ ucom_line_state(struct ucom_softc *sc, */ (void)ucom_queue_command(sc, ucom_cfg_line_state, NULL, &sc->sc_line_state_task[0].hdr, - &sc->sc_line_state_task[1].hdr); + &sc->sc_line_state_task[1].hdr, false); } static void @@ -1255,7 +1296,7 @@ ucom_status_change(struct ucom_softc *sc) (void)ucom_queue_command(sc, ucom_cfg_status_change, NULL, &sc->sc_status_task[0].hdr, - &sc->sc_status_task[1].hdr); + &sc->sc_status_task[1].hdr, true); } static void @@ -1329,14 +1370,14 @@ ucom_param(struct tty *tp, struct termios *t) /* Queue baud rate programming command first */ error = ucom_queue_command(sc, ucom_cfg_param, t, &sc->sc_param_task[0].hdr, - &sc->sc_param_task[1].hdr); + &sc->sc_param_task[1].hdr, true); if (error != 0) goto done; /* Queue transfer enable command last */ error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, &sc->sc_start_task[0].hdr, - &sc->sc_start_task[1].hdr); + &sc->sc_start_task[1].hdr, true); if (error != 0) goto done; @@ -1346,6 +1387,8 @@ ucom_param(struct tty *tp, struct termios *t) sc->sc_flag &= ~UCOM_FLAG_RTS_IFLOW; ucom_modem(tp, SER_RTS, 0); } + + error = ucom_command_barrier(sc); done: if (error) { if (opened) { From nobody Wed Jan 1 05:48:14 2025 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 4YNJly4YZHz5jNfj; Wed, 01 Jan 2025 05:48:14 +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 4YNJly3jTzz4Q69; Wed, 1 Jan 2025 05:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710494; 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=COCvjTS4Hc06E8aCcVhGwrH1DepV1i8RgIf2VGA58fQ=; b=kqg2bp6eZD7zPeknw1N8nmQWz6raT/gtVLykvUaUUPEKxGsnyfrDzmqkd8yBWKBn6R+yCt zpKSiO5UczI2Zt0FQXTKWc9IUlfQsGzpWdDVqet9SKth7uKrxd3OtSXTEs6LwrdsYRXs9p ubQWX1H8A6DPqpIBa9Cx79sKqSevFfnV65/J8JcuYRyc76tXwN7CaL4A3T1q5kUtWDRYa2 j9HeNSI1wyy/7v1zmjX95J7Sag0PIk94FT3nQ+PYLNEk+c/TQeiKWYGN96sACm9AEGTuTF WU1IXLF5vJFnkHTdpwpfwqOQdU7mfS2prG1xbg1IEdXn856ypMLQBXmMb9yWPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710494; 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=COCvjTS4Hc06E8aCcVhGwrH1DepV1i8RgIf2VGA58fQ=; b=QFZHnUyfWZreloG8MMDXB/EpCtMOSVQsoLeeuDBa1nNq8wgtYBXb68sjaFpx2tupkzpZfQ bhmxEHO8B9UqBOAs3XIsQLcZFDa7SYTqU2FcCH26iqpuWsiBL8PsJAPhZ+/T/KMwLjSlMl NUbq8/2qTPYU5/JMzB7T2RqblTVUWRnrf5xRwTGINSgZ40JgvsLmquLK7HxWO7Buwjph9+ fvk2dKrawQ+76PzXIffA+Rasa4Yqg+RYQ6ruZnFeLpm/A7Q9/LAwj2QCWczxrmv9qqN0em ncGOx4ql3IqW4DgMboRyEoEDvq43GpyHL8RNGws/pdi25CIsZK9DWOoBT7E98A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710494; a=rsa-sha256; cv=none; b=grEE7l0PoglAmjFMU0+WFLopouBAGGRXcUYILgIWAembzlXwEbG4jOydURkfAMqA243Cou wqjlQ02JNhJtuTh9xpPHqP4UfjkqwW4dM52DKdlEKWkBJqkUSqbaHQXT7nM70f/1g/edRe D5NAFpoyRqqagTa4JE0dzrJr2v4oVf8W1eP0mrA3tyZpvrDDFA3SE720z30C5iRUnB7Wbz UkOL0kX618YolqPz5w3RlgYWt/yEOqCt8G5cniPIlV/jRhl84AB1lOUs3EwK3OpkhYLDSn rZj3QmsnPTieEw8jotqKgAB3TXIP1bnf9p7jxTVqLVvttGf49FzJlhL9cxiX9A== 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 4YNJly35Z8z1BHQ; Wed, 1 Jan 2025 05:48:14 +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 5015mELO039246; Wed, 1 Jan 2025 05:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015mErc039243; Wed, 1 Jan 2025 05:48:14 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:48:14 GMT Message-Id: <202501010548.5015mErc039243@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: 360d3fe8743d - stable/13 - usb: serial: propagate errors from ucom_queue_command() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 360d3fe8743dbc9dc500b057ccdfd9c36743ef58 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=360d3fe8743dbc9dc500b057ccdfd9c36743ef58 commit 360d3fe8743dbc9dc500b057ccdfd9c36743ef58 Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:47:47 +0000 usb: serial: propagate errors from ucom_queue_command() There's only one error that we can get back right now, but future changes will add some more cases that we need to watch out for. Start by returning errors and propagating them back. Reviewed by: kib (cherry picked from commit 51f3d0874f6216907c8971c4af9d6be6c93edf7b) --- sys/dev/usb/serial/usb_serial.c | 49 ++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 9dc69a7260d2..8787d4fe3381 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -151,7 +151,7 @@ static int ucom_unit_alloc(void); static void ucom_unit_free(int); static int ucom_attach_tty(struct ucom_super_softc *, struct ucom_softc *); static void ucom_detach_tty(struct ucom_super_softc *, struct ucom_softc *); -static void ucom_queue_command(struct ucom_softc *, +static int ucom_queue_command(struct ucom_softc *, usb_proc_callback_t *, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1); static void ucom_shutdown(struct ucom_softc *); @@ -592,7 +592,7 @@ ucom_set_usb_mode(struct ucom_super_softc *ssc, enum usb_hc_mode usb_mode) } } -static void +static int ucom_queue_command(struct ucom_softc *sc, usb_proc_callback_t *fn, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1) @@ -604,7 +604,7 @@ ucom_queue_command(struct ucom_softc *sc, if (usb_proc_is_gone(&ssc->sc_tq)) { DPRINTF("proc is gone\n"); - return; /* nothing to do */ + return (ENXIO); /* nothing to do */ } /* * NOTE: The task cannot get executed before we drop the @@ -637,6 +637,8 @@ ucom_queue_command(struct ucom_softc *sc, */ if (fn == ucom_cfg_start_transfers) sc->sc_last_start_xfer = &task->hdr; + + return (0); } static void @@ -760,9 +762,8 @@ ucom_open(struct tty *tp) * example if the device is not present: */ error = (sc->sc_callback->ucom_pre_open) (sc); - if (error) { - return (error); - } + if (error != 0) + goto out; } sc->sc_flag |= UCOM_FLAG_HL_READY; @@ -782,14 +783,18 @@ ucom_open(struct tty *tp) sc->sc_jitterbuf_in = 0; sc->sc_jitterbuf_out = 0; - ucom_queue_command(sc, ucom_cfg_open, NULL, + error = ucom_queue_command(sc, ucom_cfg_open, NULL, &sc->sc_open_task[0].hdr, &sc->sc_open_task[1].hdr); + if (error != 0) + goto out; /* Queue transfer enable command last */ - ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, - &sc->sc_start_task[0].hdr, + error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, + &sc->sc_start_task[0].hdr, &sc->sc_start_task[1].hdr); + if (error != 0) + goto out; if (sc->sc_tty == NULL || (sc->sc_tty->t_termios.c_cflag & CNO_RTSDTR) == 0) ucom_modem(tp, SER_DTR | SER_RTS, 0); @@ -800,7 +805,8 @@ ucom_open(struct tty *tp) ucom_status_change(sc); - return (0); +out: + return (error); } static void @@ -836,7 +842,7 @@ ucom_close(struct tty *tp) } ucom_shutdown(sc); - ucom_queue_command(sc, ucom_cfg_close, NULL, + (void)ucom_queue_command(sc, ucom_cfg_close, NULL, &sc->sc_close_task[0].hdr, &sc->sc_close_task[1].hdr); @@ -1077,9 +1083,12 @@ ucom_line_state(struct ucom_softc *sc, sc->sc_pls_set |= set_bits; sc->sc_pls_clr |= clear_bits; - /* defer driver programming */ - ucom_queue_command(sc, ucom_cfg_line_state, NULL, - &sc->sc_line_state_task[0].hdr, + /* + * defer driver programming - we don't propagate any error from + * this call because we'll catch such errors further up the call stack. + */ + (void)ucom_queue_command(sc, ucom_cfg_line_state, NULL, + &sc->sc_line_state_task[0].hdr, &sc->sc_line_state_task[1].hdr); } @@ -1236,7 +1245,7 @@ ucom_status_change(struct ucom_softc *sc) } DPRINTF("\n"); - ucom_queue_command(sc, ucom_cfg_status_change, NULL, + (void)ucom_queue_command(sc, ucom_cfg_status_change, NULL, &sc->sc_status_task[0].hdr, &sc->sc_status_task[1].hdr); } @@ -1310,14 +1319,18 @@ ucom_param(struct tty *tp, struct termios *t) sc->sc_flag &= ~UCOM_FLAG_GP_DATA; /* Queue baud rate programming command first */ - ucom_queue_command(sc, ucom_cfg_param, t, + error = ucom_queue_command(sc, ucom_cfg_param, t, &sc->sc_param_task[0].hdr, &sc->sc_param_task[1].hdr); + if (error != 0) + goto done; /* Queue transfer enable command last */ - ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, - &sc->sc_start_task[0].hdr, + error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, + &sc->sc_start_task[0].hdr, &sc->sc_start_task[1].hdr); + if (error != 0) + goto done; if (t->c_cflag & CRTS_IFLOW) { sc->sc_flag |= UCOM_FLAG_RTS_IFLOW; From nobody Wed Jan 1 05:48:15 2025 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 4YNJlz5F6yz5jNhh; Wed, 01 Jan 2025 05:48:15 +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 4YNJlz4Ztwz4Q8P; Wed, 1 Jan 2025 05:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710495; 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=T2bymZ2ZH+NrU/unUp7bk6xyOHxhbOycp2YVE9wFJbY=; b=rKkN/DS0S/wdZORnJW8o+VcAQ2p29dvq71FTuz1NOo0866Kc8AUrPHz9Rr+EOsbISITe4x DsmyFkGhoYJFEziCNfHJV0yPm1GrkyGbzIlI0CenW98R6MPHOO94ZuDmchqZlpz8Yv9kdi +dLMSOedV94BuR4hroJ62U9uiO8gQWezEsG1y47EQVKKzlS3l8SfYyvAfkD3c3JCyKwnYB m7V9h1oHejcpGqy4O8Kb+KG37aRBzqu13RftcH7li9r81FOsfJOPtetwAfa3Tfoca1dEFU /0qVo0JagZpGhN3VYAb6GwvEtGFZBXuvfxUGAqHHJXdNQ0hX9txyEdnYbP5ChQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710495; 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=T2bymZ2ZH+NrU/unUp7bk6xyOHxhbOycp2YVE9wFJbY=; b=lLxH1Lniqs/sLj01eoG7LkYw0xHqu/ykCvBgrtCPLM4reHAU9AQHAWA6OGVaxubqhmJHgk ybw0aq4iRiB8DgdyvM/zrY/flzEXrZcKSHyFxdpGf3UtRz7oavDnJIfYvGNsZONd0cR2DW Go3Y8+VIIGCEPxxyUZukjLdIhkwI43EU1YHsSCUXAj509dCZMT1Owt8YiJiJD6RB0vy/IV qpW0COt7g3v6tLvhbWVsAfEuO5wix23WKXo1Y3AjQYB+JL5L4Jy4u8rx13zd00r8L9R8lg jALZc0mXvEVvn0S6p5ulIrHhjb1njIASkKtglbg9ujC2XIRCswMCfkTP4/J8hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710495; a=rsa-sha256; cv=none; b=BqHj/EwE1JSNuCCWd+PT94ucme0xq5TxW2TcAPzeS70ltWUJid4bD+VqXaw268y/JBlg0V cNZewq5Xaa9Z8TyrIg//Iwf4yrG65E0Vklr7Z/LDwTKFNMSZC3KwNX/VavBkBnI93GS42T tORyht184qe6Cx/51T9XV1Rbxrw8yw9SA7S5Cj3UdsEC4F9Hwi6wwiBNGnDXGOqcYjOu6z x59qEGAXcoTgsWsyGwVfYvl3DU1ndaRuuGjHLm38EoqqYDAzeCHhiZ0V5hM1yYdUW+dwHD G9bn/E8d5ePHwisw6QpUDHtsmVleYVNYRqWV8UOrLppESc7UuHdJteLUFNX3HQ== 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 4YNJlz49rMz1BDb; Wed, 1 Jan 2025 05:48:15 +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 5015mFXc039303; Wed, 1 Jan 2025 05:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015mFes039300; Wed, 1 Jan 2025 05:48:15 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:48:15 GMT Message-Id: <202501010548.5015mFes039300@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: 0fb0a408a13c - stable/13 - usb: serial: allow the open/close sleep to be interruptible 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0fb0a408a13c7ec7ff6834a213aede35b26419fa Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb0a408a13c7ec7ff6834a213aede35b26419fa commit 0fb0a408a13c7ec7ff6834a213aede35b26419fa Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:47:47 +0000 usb: serial: allow the open/close sleep to be interruptible ucom_queue_command will issue commands for open/close, then wait on them to be finished. In the spirit of playing it safe, allow ucom_queue_command's wait to be interrupted in case the usb process gets jammed up waiting on the hardware -- we can at least recover the user thread that initiated it, even if we can't recover the usb process. Reviewed by: imp, kib (cherry picked from commit 729eb176a465cedc55c5980f116d87be592421f1) --- sys/dev/usb/serial/usb_serial.c | 14 +++++++-- sys/dev/usb/usb_process.c | 69 ++++++++++++++++++++++++++++++++--------- sys/dev/usb/usb_process.h | 1 + sys/dev/usb/usbdi.h | 2 ++ 4 files changed, 69 insertions(+), 17 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 8787d4fe3381..ce9e0ec62bb5 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -599,6 +599,7 @@ ucom_queue_command(struct ucom_softc *sc, { struct ucom_super_softc *ssc = sc->sc_super; struct ucom_param_task *task; + int error; UCOM_MTX_ASSERT(sc, MA_OWNED); @@ -628,8 +629,15 @@ ucom_queue_command(struct ucom_softc *sc, /* * Closing or opening the device should be synchronous. */ - if (fn == ucom_cfg_close || fn == ucom_cfg_open) - usb_proc_mwait(&ssc->sc_tq, t0, t1); + if (fn == ucom_cfg_close || fn == ucom_cfg_open) { + error = usb_proc_mwait_sig(&ssc->sc_tq, t0, t1); + + /* usb_proc_mwait_sig may have dropped the tty lock. */ + if (error == 0 && sc->sc_tty != NULL && tty_gone(sc->sc_tty)) + error = ENXIO; + } else { + error = 0; + } /* * In case of multiple configure requests, @@ -638,7 +646,7 @@ ucom_queue_command(struct ucom_softc *sc, if (fn == ucom_cfg_start_transfers) sc->sc_last_start_xfer = &task->hdr; - return (0); + return (error); } static void diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c index d88de92336f2..4507c999f50a 100644 --- a/sys/dev/usb/usb_process.c +++ b/sys/dev/usb/usb_process.c @@ -361,25 +361,21 @@ usb_proc_is_gone(struct usb_process *up) return (0); } -/*------------------------------------------------------------------------* - * usb_proc_mwait - * - * This function will return when the USB process message pointed to - * by "pm" is no longer on a queue. This function must be called - * having "up->up_mtx" locked. - *------------------------------------------------------------------------*/ -void -usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +static int +usb_proc_mwait_impl(struct usb_process *up, void *_pm0, void *_pm1, + bool interruptible) { struct usb_proc_msg *pm0 = _pm0; struct usb_proc_msg *pm1 = _pm1; + int error; /* check if gone */ if (up->up_gone) - return; + return (ENXIO); USB_MTX_ASSERT(up->up_mtx, MA_OWNED); + error = 0; if (up->up_curtd == curthread) { /* Just remove the messages from the queue. */ if (pm0->pm_qentry.tqe_prev) { @@ -391,14 +387,59 @@ usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) pm1->pm_qentry.tqe_prev = NULL; } } else - while (pm0->pm_qentry.tqe_prev || - pm1->pm_qentry.tqe_prev) { + while (error == 0 && (pm0->pm_qentry.tqe_prev || + pm1->pm_qentry.tqe_prev)) { /* check if config thread is gone */ if (up->up_gone) - break; + return (ENXIO); up->up_dsleep = 1; - cv_wait(&up->up_drain, up->up_mtx); + if (interruptible) { + error = cv_wait_sig(&up->up_drain, up->up_mtx); + + /* + * The fact that we were interrupted doesn't + * matter if our goal was accomplished anyways. + */ + if (error != 0 && !USB_PROC_MSG_ENQUEUED(pm0) && + !USB_PROC_MSG_ENQUEUED(pm1)) + error = 0; + } else { + cv_wait(&up->up_drain, up->up_mtx); + } } + + if (error == ERESTART) + error = EINTR; + return (error); +} + +/*------------------------------------------------------------------------* + * usb_proc_mwait + * + * This function will return when the USB process message pointed to + * by "pm" is no longer on a queue. This function must be called + * having "up->up_mtx" locked. + *------------------------------------------------------------------------*/ +void +usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +{ + + (void)usb_proc_mwait_impl(up, _pm0, _pm1, false); +} + +/*------------------------------------------------------------------------* + * usb_proc_mwait_sig + * + * This function will return when the USB process message pointed to + * by "pm" is no longer on a queue. This function must be called + * having "up->up_mtx" locked. This version of usb_proc_mwait is + * interruptible. + *------------------------------------------------------------------------*/ +int +usb_proc_mwait_sig(struct usb_process *up, void *_pm0, void *_pm1) +{ + + return (usb_proc_mwait_impl(up, _pm0, _pm1, true)); } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h index 6a8ac0acda33..745d214d2106 100644 --- a/sys/dev/usb/usb_process.h +++ b/sys/dev/usb/usb_process.h @@ -76,6 +76,7 @@ int usb_proc_create(struct usb_process *up, struct mtx *p_mtx, const char *pmesg, uint8_t prio); void usb_proc_drain(struct usb_process *up); void usb_proc_mwait(struct usb_process *up, void *pm0, void *pm1); +int usb_proc_mwait_sig(struct usb_process *up, void *pm0, void *pm1); void usb_proc_free(struct usb_process *up); void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 5192591281f4..08d130aa2868 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -525,6 +525,8 @@ struct usb_proc_msg { usb_size_t pm_num; }; +#define USB_PROC_MSG_ENQUEUED(msg) ((msg)->pm_qentry.tqe_prev != NULL) + #define USB_FIFO_TX 0 #define USB_FIFO_RX 1 From nobody Wed Jan 1 05:48:16 2025 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 4YNJm12Ggkz5jNZQ; Wed, 01 Jan 2025 05:48:17 +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 4YNJm05bVvz4QC9; Wed, 1 Jan 2025 05:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710496; 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=6sII4LDjYh/4SOGp+PNzJBJzs9tAuGoeo26FbTVrcF8=; b=CmD3nVM/f6Ct9+r5EFQ/KG6ZFD7+xmyZ2YMkYxkjz7Bsarv7LTKq4FjglPsurGy/KY2HkT EQurNjs5Gyx888BJXEzGA0N9ppLwUiKaexugs1DmvrzyxHIuTXWAbZzbWS5VGVcSL5r70j dWQRofuGHSAFIv25Gcvw3nlyb6s/nkXLeW6+P5SCow7ogQnJEJziepDqHURbAdsEBYld9y sbgYP6F4VPajj/gcWjrtd2UmaJ1E2GqSN9r69PddPZSGZDVFQWX/oJY1m+8i0UmBrZf6ah dw7Qi+TQLpfJEaxAWW5U4XkTOr985yVrmJ+kFOfWEomnL8st8e13NMX2LaIMsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735710496; 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=6sII4LDjYh/4SOGp+PNzJBJzs9tAuGoeo26FbTVrcF8=; b=n6nPV8jfxMmF82F0FyvAYid9Bt+WILNK9k7e1LDG06lwQtdUik8JEGwMYzr15tjV5sdFyi QTplhMLTpptGIAUkhtWi/urX9P/pAq++2BxxaNsF68OmZ1dSbq+TK+qkDZCk3X6kgltO4p JOOXD8li3/ixHdxTrSR++e53944oKMeSLaODGxWUKG2id3PC12QpXHhhzqsrQQmyAVyWtz So7iPYWTooR9ORhsrgS/oJDoBrWhF5LW/emba+2+yipoYTwPCcrl33y5rzP5iPUsdXd6xl Va93u/RvBgfT6e+z0v/4N2IVjzRiBEn4lTdlv40gM3l+syBisqIWjG3fWriGhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735710496; a=rsa-sha256; cv=none; b=VTQvCcMcuD55U3MCUo5HNRtKYdFtfQMXX0CHDEjWu09LGM7d+LvLQ9GvM1NA6U4UqQxNSX 2g43z4C3yoVE8llEQ8ew0RJHGW1eaBVcU2cnHnn+S9pfdc0VuRlpvZPzCr4AwB82XYee2h 4mjXarJqlF1J31qCGEyOwvM6iwdaaQltRLy5ZcaZ3Wj8BHuI6Oy1R58+MHTzClA2syQjoH axByzGjiOmtaNFkQJY73Gv5hlVM8FYteQvGTjZfyyORvbz+ECLnukzGR/a1rLqHwOsiotl JQLHH/izKRZulK8I/t/z3lH+rF/WAW/J8BQJGiohejtQl1EZIl1AZSznGqbHcQ== 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 4YNJm05B1dz1BDc; Wed, 1 Jan 2025 05:48:16 +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 5015mGou039357; Wed, 1 Jan 2025 05:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5015mGBk039354; Wed, 1 Jan 2025 05:48:16 GMT (envelope-from git) Date: Wed, 1 Jan 2025 05:48:16 GMT Message-Id: <202501010548.5015mGBk039354@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: e374f096e7b6 - stable/13 - usb: serial: make more commands execute synchronously 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e374f096e7b61c814a2011d881b002cf406a838c Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e374f096e7b61c814a2011d881b002cf406a838c commit e374f096e7b61c814a2011d881b002cf406a838c Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 05:47:48 +0000 usb: serial: make more commands execute synchronously The termios layer wants some level of guarantee that we've actually submitted param changes to the hardware when our functions return, so we need to do a little more waiting to avoid violating those guarantees. This is especially important as some hardware has some minimum timing specifications around this stuff, and without being less asynchronous the software dealing with these devices can't reasonably operate the hardware without more excessive delays than they should need. More specifically, we make sure that: - The command to start transfers is finished before we toggle DTR/RTS - The status_change command finishes before we return, which may change some fields in the softc that we need for a subsequent call into usb_serial - cfg_param finishes before we re-enable transfers, and we ensure that RTS is appropriately toggled before we return to userland This has been observed to fix some flakiness in connecting to some ESP32 devices. Tested by: kenrap from Libera Reviewed by: imp, kib (cherry picked from commit 36a80f4264350a2f4f0686eb91ae7f5943d40327) --- sys/dev/usb/serial/usb_serial.c | 69 +++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index ce9e0ec62bb5..e5c1288166f1 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -153,7 +153,7 @@ static int ucom_attach_tty(struct ucom_super_softc *, struct ucom_softc *); static void ucom_detach_tty(struct ucom_super_softc *, struct ucom_softc *); static int ucom_queue_command(struct ucom_softc *, usb_proc_callback_t *, struct termios *pt, - struct usb_proc_msg *t0, struct usb_proc_msg *t1); + struct usb_proc_msg *t0, struct usb_proc_msg *t1, bool wait); static void ucom_shutdown(struct ucom_softc *); static void ucom_ring(struct ucom_softc *, uint8_t); static void ucom_break(struct ucom_softc *, uint8_t); @@ -592,10 +592,43 @@ ucom_set_usb_mode(struct ucom_super_softc *ssc, enum usb_hc_mode usb_mode) } } +static void +ucom_command_barrier_cb(struct usb_proc_msg *msg __unused) +{ + /* NOP */ +} + +/* + * ucom_command_barrier inserts a dummy task and waits for it so that we can be + * certain that previously enqueued tasks are finished before returning back to + * the tty layer. + */ +static int +ucom_command_barrier(struct ucom_softc *sc) +{ + struct ucom_super_softc *ssc = sc->sc_super; + struct usb_proc_msg dummy = { .pm_callback = ucom_command_barrier_cb }; + struct usb_proc_msg *task; + int error; + + UCOM_MTX_ASSERT(sc, MA_OWNED); + + if (usb_proc_is_gone(&ssc->sc_tq)) { + DPRINTF("proc is gone\n"); + return (ENXIO); /* nothing to do */ + } + + task = usb_proc_msignal(&ssc->sc_tq, &dummy, &dummy); + error = usb_proc_mwait_sig(&ssc->sc_tq, task, task); + if (error == 0 && sc->sc_tty != NULL && tty_gone(sc->sc_tty)) + error = ENXIO; + return (error); +} + static int ucom_queue_command(struct ucom_softc *sc, usb_proc_callback_t *fn, struct termios *pt, - struct usb_proc_msg *t0, struct usb_proc_msg *t1) + struct usb_proc_msg *t0, struct usb_proc_msg *t1, bool wait) { struct ucom_super_softc *ssc = sc->sc_super; struct ucom_param_task *task; @@ -629,7 +662,7 @@ ucom_queue_command(struct ucom_softc *sc, /* * Closing or opening the device should be synchronous. */ - if (fn == ucom_cfg_close || fn == ucom_cfg_open) { + if (wait) { error = usb_proc_mwait_sig(&ssc->sc_tq, t0, t1); /* usb_proc_mwait_sig may have dropped the tty lock. */ @@ -793,14 +826,17 @@ ucom_open(struct tty *tp) error = ucom_queue_command(sc, ucom_cfg_open, NULL, &sc->sc_open_task[0].hdr, - &sc->sc_open_task[1].hdr); + &sc->sc_open_task[1].hdr, true); if (error != 0) goto out; - /* Queue transfer enable command last */ + /* + * Queue transfer enable command last, we'll have a barrier later so we + * don't need to wait on this to complete specifically. + */ error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, &sc->sc_start_task[0].hdr, - &sc->sc_start_task[1].hdr); + &sc->sc_start_task[1].hdr, true); if (error != 0) goto out; @@ -813,6 +849,7 @@ ucom_open(struct tty *tp) ucom_status_change(sc); + error = ucom_command_barrier(sc); out: return (error); } @@ -852,7 +889,7 @@ ucom_close(struct tty *tp) (void)ucom_queue_command(sc, ucom_cfg_close, NULL, &sc->sc_close_task[0].hdr, - &sc->sc_close_task[1].hdr); + &sc->sc_close_task[1].hdr, true); sc->sc_flag &= ~(UCOM_FLAG_HL_READY | UCOM_FLAG_RTS_IFLOW); @@ -933,11 +970,15 @@ ucom_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) #endif case TIOCSBRK: ucom_break(sc, 1); - error = 0; + error = ucom_command_barrier(sc); + if (error == ENXIO) + error = ENODEV; break; case TIOCCBRK: ucom_break(sc, 0); - error = 0; + error = ucom_command_barrier(sc); + if (error == ENXIO) + error = ENODEV; break; default: if (sc->sc_callback->ucom_ioctl) { @@ -1097,7 +1138,7 @@ ucom_line_state(struct ucom_softc *sc, */ (void)ucom_queue_command(sc, ucom_cfg_line_state, NULL, &sc->sc_line_state_task[0].hdr, - &sc->sc_line_state_task[1].hdr); + &sc->sc_line_state_task[1].hdr, false); } static void @@ -1255,7 +1296,7 @@ ucom_status_change(struct ucom_softc *sc) (void)ucom_queue_command(sc, ucom_cfg_status_change, NULL, &sc->sc_status_task[0].hdr, - &sc->sc_status_task[1].hdr); + &sc->sc_status_task[1].hdr, true); } static void @@ -1329,14 +1370,14 @@ ucom_param(struct tty *tp, struct termios *t) /* Queue baud rate programming command first */ error = ucom_queue_command(sc, ucom_cfg_param, t, &sc->sc_param_task[0].hdr, - &sc->sc_param_task[1].hdr); + &sc->sc_param_task[1].hdr, true); if (error != 0) goto done; /* Queue transfer enable command last */ error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, &sc->sc_start_task[0].hdr, - &sc->sc_start_task[1].hdr); + &sc->sc_start_task[1].hdr, true); if (error != 0) goto done; @@ -1346,6 +1387,8 @@ ucom_param(struct tty *tp, struct termios *t) sc->sc_flag &= ~UCOM_FLAG_RTS_IFLOW; ucom_modem(tp, SER_RTS, 0); } + + error = ucom_command_barrier(sc); done: if (error) { if (opened) { From nobody Wed Jan 1 10:38:12 2025 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 4YNRBX6hN9z5jknd; Wed, 01 Jan 2025 10:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNRBX66qLz4h6V; Wed, 1 Jan 2025 10:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727892; 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=9SGTpZrWSqybcYLdMHYxY0R54fTpnddsKXswGeXE/Kk=; b=w30YPEFGML4H/cXu5LqIffxqOcI1BpmO4zvvxn9bxp8FFVZ3TObAc1DLxuipnVMTNx/KNA yps7h+VAzWU3mzPaKElTp3D8P+lTE/Dq/TKtL89lbNqvxOUYiPpORJgse2H8QvCY8/I6zV hmsty1biZMMzihOIDg5FHFDZDruPZv+0vrFKWqyfB3pXeGPJIGaEUVn+PxoV9SL5pNQ7JZ nQRDMc07qVK32FX1rr0Xeg61TFcYInnlUt4oYXHfqWB9gljUbtnFY/xRFAcC8hLz6ZpFJy f/CpiUfuOau/+AXhxlv5notUHugG8MEOQSBsMvNIEiVvCFtbKfarl7wiiW9x3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727892; 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=9SGTpZrWSqybcYLdMHYxY0R54fTpnddsKXswGeXE/Kk=; b=bboEpH22Gd+sZQklH90+riJo9ZgNrAdiISkCfwlBjft6e86o2KNFj7zw3hrJzcDga64hEU FFpIZEs8i7Z/YOJrRDugp39umkF5jPetFY4u5JYR8LbrnWRPItFPl4xfD2vp+6td9RygGK 1QTrQ+Kf64Y5Yo+culgxMeMVagnaD77TyaS2lsX66/VsXwAHLvTLpIXtMP8DJnTqgO43/T UXRaaPtoyLnvxOGmwmHGZay1svJ41dDH+qXjbZC1oFMF+J2EoMjaSWvSfwkJrvOTMvdWuk jEqwsLzZuBvxLWWLPl2125yv+nenvL8Ul3fWhhWbNZaXzR5GhlhDwHKrhlGp7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735727892; a=rsa-sha256; cv=none; b=giV80NGA4SDGyH+DL6Iiy74nfkf2nvZCfKDcMdXP3mDRp61OOuuOXoOxdeqVshCWddwIcH L08xloK8RR9nkZiBb+qDxVbYyXjWV2q/NB5FMvQbWYVw3Kmegrh1JOaAINc2aCoE1R0T4V 3NDLGf3GFUysM9bL72KbATbPqcf5ACsk1FYCUaXZK7CAfOw12fZID23kRQpg5C3XOfpFqR nntqzqJkpIyO1Wt94d03+sgTlSjZNfHUaMWes/ykCWEfd7MTj+Ro9qg+pAYh4AlfxfXHbj Ug9WWgX0RCL6pN9XGe/AYTVtRMKZO0fliIHU0uv2nO1sTJjKzh5WFwgakcg5bQ== 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 4YNRBX5BmMzLPr; Wed, 1 Jan 2025 10:38:12 +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 501AcCC0078757; Wed, 1 Jan 2025 10:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501AcCYD078754; Wed, 1 Jan 2025 10:38:12 GMT (envelope-from git) Date: Wed, 1 Jan 2025 10:38:12 GMT Message-Id: <202501011038.501AcCYD078754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8094b35e5769 - stable/14 - amd64: extract code to print fault details from trap_fatal() into a new helper 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8094b35e5769e6f8848ce4fd929f898cacc81bc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8094b35e5769e6f8848ce4fd929f898cacc81bc6 commit 8094b35e5769e6f8848ce4fd929f898cacc81bc6 Author: Konstantin Belousov AuthorDate: 2024-12-24 16:39:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-01 10:30:19 +0000 amd64: extract code to print fault details from trap_fatal() into a new helper (cherry picked from commit 5e3ab1894e1ef0520925038f8d4e4a451e841345) --- sys/amd64/amd64/trap.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d7e365f6874e..396c2abd3f1f 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -109,6 +109,7 @@ void trap_check(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); static int trap_pfault(struct trapframe *, bool, int *, int *); +static void trap_diag(struct trapframe *, vm_offset_t); static void trap_fatal(struct trapframe *, vm_offset_t); #ifdef KDTRACE_HOOKS static bool trap_user_dtrace(struct trapframe *, @@ -152,6 +153,13 @@ static const char *const trap_msg[] = { [T_DTRACE_RET] = "DTrace pid return trap", }; +static const char * +traptype_to_msg(u_int type) +{ + return (type < nitems(trap_msg) ? trap_msg[type] : + "unknown/reserved trap"); +} + static int uprintf_signal; SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN, &uprintf_signal, 0, @@ -883,15 +891,12 @@ after_vmfault: } static void -trap_fatal(struct trapframe *frame, vm_offset_t eva) +trap_diag(struct trapframe *frame, vm_offset_t eva) { int code, ss; u_int type; struct soft_segment_descriptor softseg; struct user_segment_descriptor *gdt; -#ifdef KDB - bool handled; -#endif code = frame->tf_err; type = frame->tf_trapno; @@ -951,8 +956,20 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) printf("r13: %016lx r14: %016lx r15: %016lx\n", frame->tf_r13, frame->tf_r14, frame->tf_r15); + printf("trap number = %d\n", type); +} + +static void +trap_fatal(struct trapframe *frame, vm_offset_t eva) +{ + u_int type; + + type = frame->tf_trapno; + trap_diag(frame, eva); #ifdef KDB if (debugger_on_trap) { + bool handled; + kdb_why = KDB_WHY_TRAP; handled = kdb_trap(type, 0, frame); kdb_why = KDB_WHY_UNSET; @@ -960,9 +977,7 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) return; } #endif - printf("trap number = %d\n", type); - panic("%s", type < nitems(trap_msg) ? trap_msg[type] : - "unknown/reserved trap"); + panic("%s", traptype_to_msg(type)); } #ifdef KDTRACE_HOOKS From nobody Wed Jan 1 10:38:13 2025 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 4YNRBZ1K17z5jkhr; Wed, 01 Jan 2025 10:38:14 +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 4YNRBY6tPbz4gwH; Wed, 1 Jan 2025 10:38:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727894; 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=vI6K3i0ncorwPJtvhoJnYVKD2ZJqhoeWHJX9sqXBnHM=; b=YkfIkui/Y9qJr4lBkee0ocL3FQkXp08OUldQ6iYzM4S9eN6l3hXTorwqEp0BOPJcKs5fGO KUPv3hIeFr5OiGiK2NV/pYWx9CPbXbvYqQxEp1XB9kiLPGFgFlfSaMO1K7CvtzYsx+Mejj ay3Vqm0MsyO0QpgItqfsxNak89TwMvhsNhOq0t7SY4cA2Xhchm+cdRxmdPJ4DqgRLQMnNO Z3qMslRpNwejnrrrcc8+CSCVECj6VivsSFPS7BjNveEnhN9n7fn1r7sWB8pAsSqZD7gCFC IIvGnAG+g3ktew0Hqv8D4wV+2l0eWRFlMScxL1EAg+yKlciLoHS6zfiy35nvKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727894; 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=vI6K3i0ncorwPJtvhoJnYVKD2ZJqhoeWHJX9sqXBnHM=; b=PDrpeWphIYMUp+eamw6VlFTnKkNvOVz02iaSlsIbYFeeW3nw39SP+wpC1C7TadELvztLYt Qm04KEHsBMDLQ2X+DnS5Wjh4CGIqG91UkkvZ5EOUzKh3eJFvy4Q6s6xCSKb4q6oCkWMBMH l37iqwE2MhTEjOkrXweNxsedrZCK53lU+7wAGaaQSr+uk/wUBVXQI1eq9Di1aQbtzEXwe/ YMSDewhlTXrHDKkl1MI0Err4tmIlTotIbZHgmHWVEbARFqXggtKDg+gvzaePGZUZG9UsKX 0N1yW55hyTWc21BwTdtYYJrHnEsSEcAov2L94TF8YsfO6Vg+XWzVzZFO8Xhkow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735727894; a=rsa-sha256; cv=none; b=krgSVTIXOWqhkBnI2ZcKEcEWed9ZJgz7cJQBQ/5iCpTbBjIHqWPT5969p+NY1KQ2HyTSgX JAbUj3q1uUepmisbR5t9vumHH30MuT/8eUkUZ0SiAiUT+hP7Q+oK66j4EDrKr7GsXxAqnt WnKaS6xahOirDU3LvOn/LO00GxD+0/wsb4jL9xbk/Dv4Ub+FERW6MUdiZeJT5qstlLoWjl 8n2fqIWAzEKJ7my4p7HTli5saoXFQEDyC4CjT+ADxt+6F+zcsIHcnvNtp0jvX+rpvLMPP3 QRVWfKEzxp5TPTOy4cqKTsMiIxH8uWd1RpHeytIyVnFh5U03VS6CHgbMZ9rdJQ== 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 4YNRBY6MyQzLPs; Wed, 1 Jan 2025 10:38:13 +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 501AcDpq078829; Wed, 1 Jan 2025 10:38:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501AcDoO078826; Wed, 1 Jan 2025 10:38:13 GMT (envelope-from git) Date: Wed, 1 Jan 2025 10:38:13 GMT Message-Id: <202501011038.501AcDoO078826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e27089cda589 - stable/14 - amd64: on any fault during call to EFI RT, restore execution and print fault details 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e27089cda5897633545d3df6707cd06970f03fae Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e27089cda5897633545d3df6707cd06970f03fae commit e27089cda5897633545d3df6707cd06970f03fae Author: Konstantin Belousov AuthorDate: 2024-12-24 02:35:16 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-01 10:30:20 +0000 amd64: on any fault during call to EFI RT, restore execution and print fault details (cherry picked from commit dd2b5443644505af51c95503898ab363e7d7c29d) --- sys/amd64/amd64/trap.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 396c2abd3f1f..7f1175da41df 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -445,6 +445,20 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); + + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ + if ((td->td_pflags2 & TDP2_EFIRT) != 0 && + curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { + trap_diag(frame, 0); + printf("EFI RT fault %s\n", traptype_to_msg(type)); + frame->tf_rip = (long)curpcb->pcb_onfault; + return; + } + switch (type) { case T_PAGEFLT: /* page fault */ (void)trap_pfault(frame, false, NULL, NULL); @@ -608,18 +622,6 @@ trap(struct trapframe *frame) * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ case T_BPTFLT: - /* - * Most likely, EFI RT hitting INT3. This - * check prevents kdb from handling - * breakpoints set on the BIOS text, if such - * option is ever needed. - */ - if ((td->td_pflags2 & TDP2_EFIRT) != 0 && - curpcb->pcb_onfault != NULL) { - frame->tf_rip = (long)curpcb->pcb_onfault; - return; - } - /* * If KDB is enabled, let it handle the debugger trap. * Otherwise, debugger traps "can't happen". @@ -883,6 +885,10 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) after_vmfault: if (td->td_intr_nesting_level == 0 && curpcb->pcb_onfault != NULL) { + if ((td->td_pflags2 & TDP2_EFIRT) != 0) { + trap_diag(frame, eva); + printf("EFI RT page fault\n"); + } frame->tf_rip = (long)curpcb->pcb_onfault; return (0); } From nobody Wed Jan 1 10:38:14 2025 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 4YNRBb6l5yz5jkJY; Wed, 01 Jan 2025 10:38:15 +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 4YNRBb1D6Cz4gs8; Wed, 1 Jan 2025 10:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727895; 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=ZpNuV96QA/pK6G6B0dj7PvsPjImHY8NvTOW+fE090+w=; b=tLpC7k4LL01W+kiH51RQa2Qk6DVio68+MzyXH0tNDys4eLyGpkKnrs03dnMrZeRivKGEYq kNjKa1u5F3w3v+QvDgPtD8nvm7bvY/fHMs55GoAoEVbGnigVyIzE9v4o3no5Gg2bnE4pkL iBBZBQKIqg2K2FzCZqXKcU3PcbsslGqhYXtWKH2a8buxrQpYykAqm4I+vT2ZPdDgH1T8Q6 PbGd+8OjDSVZ04q0MSdqEcDFfpreewTvczNMLBlTu0mEAHqKIlV3SrVgf94dRF3Rz0CKZ3 NNA9S9UZsKdrG8DOVY2HtNWazTQjXXJ9tCpdknm/aTfwkzmP5NG7GnlwnI6vsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727895; 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=ZpNuV96QA/pK6G6B0dj7PvsPjImHY8NvTOW+fE090+w=; b=el2fp5VPpfO8JLWa+ZNaAYyhPTxWIg5oFaLvCqBrULAdMiV7sEdolrXdqJfuGZdgCpGdz1 5/5SJOaRr+UNW1gp7Wq3qep8l1h3M5GWcKIUbGtA545s+PHFXm80hKh6jIu6pr33c/K24r Ng9uvZuK+qCrLe5KKFOdd3eSrQcd0jCdBjJH1q013kFxHFLGH9I3brUIN3nxgGxxtORlbl DlKDgGog0sj9YeG8Um+YhEiaXo+4saira0YNeYrLmyHS02+n/wjgCy7gflfIQZs54bf6NW OqPqpNjriMw5iAkIAcx32KtWZh11DwudeuwSzGQk4UzQZyJ/IAi9hBtMuoRiww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735727895; a=rsa-sha256; cv=none; b=o4U8Z/0WtefsYuNoKix1NgR+FRn6pEIUAn8am09NfqmqMIvzgDJ6jKnZ+4z9PKnQXP+8bK 0AuHLUfkQG39w7/GLYpYccQFY/NRiTJCQwROmbefiVQDC3fNG8LhCAbryaXeQSCvRxrS8U YxVkBxtojmiejgRmWqhrXvjdY6YNnBn+aNfqSMNYO/zaApb3TsrceepdBE0z3kNleoNlu2 8YFrtFrmlDaAlmS1aALAc77oGFdC5kKNpEVP48+3xKgEz9AkHY3BctUBQsACAE0vEN2vgR 7UcBpQccKD2zcOwaKZVZenTeut3BvQURZcybcnpQuVgYvK5Vs2/57x9dMyeLoA== 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 4YNRBb0VWTzLCm; Wed, 1 Jan 2025 10:38:14 +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 501AcEOx078880; Wed, 1 Jan 2025 10:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501AcEcp078877; Wed, 1 Jan 2025 10:38:14 GMT (envelope-from git) Date: Wed, 1 Jan 2025 10:38:14 GMT Message-Id: <202501011038.501AcEcp078877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bc3dfb03fd49 - stable/14 - efirt: use correct ABI for runtime EFI functions 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc3dfb03fd4979b50c380c1688cfcc2e3d517361 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3dfb03fd4979b50c380c1688cfcc2e3d517361 commit bc3dfb03fd4979b50c380c1688cfcc2e3d517361 Author: Ahmad Khalifa AuthorDate: 2024-12-21 21:09:54 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-01 10:30:20 +0000 efirt: use correct ABI for runtime EFI functions (cherry picked from commit 3e8f4a30594fad6784504d019613ad815b6c9dc5) --- sys/dev/efidev/efirt.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index a74ce9fa9a06..1fb9b3bb01d1 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -490,31 +490,32 @@ efi_rt_arch_call_nofault(struct efirt_callinfo *ec) switch (ec->ec_argcnt) { case 0: - ec->ec_efi_status = ((register_t (*)(void))ec->ec_fptr)(); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(void)) + ec->ec_fptr)(); break; case 1: - ec->ec_efi_status = ((register_t (*)(register_t))ec->ec_fptr) - (ec->ec_arg1); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t)) + ec->ec_fptr)(ec->ec_arg1); break; case 2: - ec->ec_efi_status = ((register_t (*)(register_t, register_t)) - ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); break; case 3: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, - ec->ec_arg3); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t))ec->ec_fptr)(ec->ec_arg1, + ec->ec_arg2, ec->ec_arg3); break; case 4: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t))ec->ec_fptr)(ec->ec_arg1, - ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t))ec->ec_fptr)( + ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); break; case 5: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t, register_t))ec->ec_fptr)( - ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4, - ec->ec_arg5); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t, register_t)) + ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, + ec->ec_arg4, ec->ec_arg5); break; default: panic("efi_rt_arch_call: %d args", (int)ec->ec_argcnt); From nobody Wed Jan 1 13:20:01 2025 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 4YNVnF5S6Mz5jvwp; Wed, 01 Jan 2025 13:20:01 +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 4YNVnF4wbPz41W7; Wed, 1 Jan 2025 13:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735737601; 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=JP9+P+0O2oG48+gonUOAP/gSLUe9OJsK4E35oRFvOgU=; b=iKyoSC6E0SCIfapb15VU6Mxxo0ElSNDOiJsbxo9xCTURzwT+ii8biNzzXgCXUTAKtxo2w/ +Pg0PV34rzx0RH9/FbO74mwYAFn0OeDp+RTHdZJKO4wexdcKtpmg7naO+aCw8/JBEmMEVA VqQxt38tSeyl29B2Z0Vanc9//R4ZY9R7OwGaL1UZpcflNr2qZw6dQIfprVf4hGfSZ5K6y4 uuFTcpQEi65XtZyXKeuSvHsY7ZGLWcw4uIo/WyWeMTFRQx3BvFIe3aZArcdMdL9MFpBSEC gYGYJlc5w4pUBxA+mrqmdx0Pjdz1z829duDXp91JvjmPCsgrXWvnePVYsPTgCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735737601; 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=JP9+P+0O2oG48+gonUOAP/gSLUe9OJsK4E35oRFvOgU=; b=ShEy6SN4k+cnoyRSOGotY9zlPW1U99enVwzoJDSixKR1gB72OifVm7w/5SimlwK+iuFDBQ hupo/sCNcfTyk4o+qTGzIlTntJsQD0Rdb+1/KGibObMurL6faG3GS/lfbUtuXLgqL0JlaI NM8yz0yoj2Qcqjgj46UUU7o1eIP+AmDm4JBZcz4qUyA2xABwIVrisvkcVUgWV6Aivx+nBA a06JAQ7mLCDl29EKBanC1LL0ttHZKBJWFehOgAIvLqLTP+aJpcTcZPKdovlyoA0pyXgH3m S399hC8Py8uw2Han8N38XtHbhMANfepGK0djAk6je9POSVp2jSdnPRErjo9mYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735737601; a=rsa-sha256; cv=none; b=QDfl0wMvOFBzm0NN7kzZLjYTwaJK4aFx+DMFeCsxIGXkXZms/w/NyQnMg/Fflmzx8R9flR vbcmwAguC5b8cPrDtXEw/gbd9w3GeRVqEgdIx4/4GEJqrJrD52D0PFoeah0w9tmDZ44dwY kwBLk5GewrcxDUJp6xmKQG5jXcgwAxIYsDrqQ6Nw7ZXzHXyzFGl+93wxImYmgH2fPDHMwo tYwWt2fkpQgIxdSTjM2QVj5ZRRWX7nimYFwcFXTMu9gwdaruoYhcYe4FE1SwrHcT2EFtNV cjozwVyug2U+wnTSxwoiIfOU+mU/2gcwVATt6KNxMdMu9hJkDDXNun2je2dDww== 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 4YNVnF4RWnzQ7K; Wed, 1 Jan 2025 13:20:01 +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 501DK1R5087799; Wed, 1 Jan 2025 13:20:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501DK1A8087795; Wed, 1 Jan 2025 13:20:01 GMT (envelope-from git) Date: Wed, 1 Jan 2025 13:20:01 GMT Message-Id: <202501011320.501DK1A8087795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: 4c0435d919b1 - main - mac(4): Mention mac_do(4) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c0435d919b1059a449d97d74abc251c6f526588 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=4c0435d919b1059a449d97d74abc251c6f526588 commit 4c0435d919b1059a449d97d74abc251c6f526588 Author: Juraj Lutter AuthorDate: 2024-12-30 18:02:58 +0000 Commit: Juraj Lutter CommitDate: 2025-01-01 13:18:46 +0000 mac(4): Mention mac_do(4) Mention also mac_do(4) in the mac(4) manual page. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D48255 --- share/man/man4/mac.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4 index 006922a17f2b..134086139f53 100644 --- a/share/man/man4/mac.4 +++ b/share/man/man4/mac.4 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 25, 2023 +.Dd December 30, 2024 .Dt MAC 4 .Os .Sh NAME @@ -54,6 +54,7 @@ Currently, the following MAC policy modules are shipped with .It Xr mac_biba 4 Ta "Biba integrity policy" Ta yes Ta boot only .It Xr mac_bsdextended 4 Ta "File system firewall" Ta no Ta any time .It Xr mac_ddb 4 Ta "ddb(4) interface restrictions" Ta no Ta any time +.It Xr mac_do 4 Ta "Change command's uid/gid" Ta no Ta any time .It Xr mac_ifoff 4 Ta "Interface silencing" Ta no Ta any time .It Xr mac_ipacl 4 Ta "IP Address access control" Ta no Ta any time .It Xr mac_lomac 4 Ta "Low-Watermark MAC policy" Ta yes Ta boot only @@ -203,6 +204,7 @@ man page. .Xr mac_biba 4 , .Xr mac_bsdextended 4 , .Xr mac_ddb 4 , +.Xr mac_do 4 , .Xr mac_ifoff 4 , .Xr mac_ipacl 4 , .Xr mac_lomac 4 , From nobody Wed Jan 1 17:41:34 2025 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 4YNcb31dKkz5hyP0; Wed, 01 Jan 2025 17:41:35 +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 4YNcb30yf6z4RT2; Wed, 1 Jan 2025 17:41:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735753295; 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=4Zqx0ZeCfq7PfArOilvZtFIVK5N7frmHN5bLYcPNcME=; b=ybJpFzpG6UgN0CBm9QS2WSzCqRWSv46kdiBI5wjfFZttmc3hl0LfhqHU2kM970vKuuxNTB X5wBIqccuf95h6ZPuMDWpnCyKVIm/+STQOTPzp4Cjj7MjNF4kordIltlvAQMiJe2I3+k6j xZwnLXzqh7ZB4iaVxVY4oHj0uReloFqlf/clv2YcmIRjuuVsRFiBdhXAVDAyp+MxNzNp4B kaBock0vO7vPZub/trIqP1Q8o6mr8+TAtWrkmcC/dz89bNVX9rSqHOeJzKYWAR/tL8jYxM 7YDNur2QSyi4VHTb+kq837WjYNivgF3Z+6zEgzezCwtu9SYwtFACDI44McGhFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735753295; 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=4Zqx0ZeCfq7PfArOilvZtFIVK5N7frmHN5bLYcPNcME=; b=sDwKBQNUg42qJcBk+ZmYpVXkXJoT+EkjuqfOuXYjUmy6V4e+VDuDbPCd83QteHqv2mtPcF mJqvzMPzkfmMohuPKxbWaql1K5ou9ReGUCGA8DN+2oYs16qo8Ff84HhkJRcBVZSin/lKTE BOqgsV2WlhK+Vy2crRX0XLtndABS6QreWGz/DRjkWc/ZrBMlOA28WnHgqwIrFFK4+aN5ch rSCkbuIeA7pZLtmIAh2BvrZVlP6jBRX05840nDgFZkEHT365YNConVPTg0XeUFBUJSvjen PdvHE/yGTPtYdFj/LI22m1H4km6fqTjdOq2q8bp7QrIUpf97KnjBCZiVX5agyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735753295; a=rsa-sha256; cv=none; b=SuGUvF4ovt460Bxekx1VOEruDSGBzOfGkZymKSCvaTEHxg/3pDkqpCVaphkF3+8bUhozPt 7SvjRk3bOPacXoYoBPUKLlaXRtIC3RdxKszyuHZ2k+l6553elNcBggUW0mrvPDWZFM294r mZW9WNqi4SfWAuoWvdu9vVgd66y3p+DODyBu+NlR53Q78hUXaCVy8WqYHYDUQKsSs5BaQt vg9UfrOWTo5U5DP6EMOzMyTIOP/iOJL19YR+I/nGG/dgCJ0wDqf09DQpI1dD1Q7k5mnmYM Od+0+75Hll889tNdCX1KMUqUqEbeFZK1zWkOI4xGJFUfEfBwqgs14Dlf5nksBg== 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 4YNcb30Z7RzZGX; Wed, 1 Jan 2025 17:41:35 +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 501HfY6n086504; Wed, 1 Jan 2025 17:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501HfYUJ086501; Wed, 1 Jan 2025 17:41:34 GMT (envelope-from git) Date: Wed, 1 Jan 2025 17:41:34 GMT Message-Id: <202501011741.501HfYUJ086501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 1781324db2bc - main - TCP BBR: remove code which is never executed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1781324db2bc22a971a33c5a063036b2775055c6 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1781324db2bc22a971a33c5a063036b2775055c6 commit 1781324db2bc22a971a33c5a063036b2775055c6 Author: Michael Tuexen AuthorDate: 2025-01-01 17:39:23 +0000 Commit: Michael Tuexen CommitDate: 2025-01-01 17:39:23 +0000 TCP BBR: remove code which is never executed USEC_2_TICKS() returns at least 1. Reviewed by: rrs CID: 1523775 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D4827 --- sys/netinet/tcp_stacks/bbr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 3c5864007986..c46a1711c34a 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6329,8 +6329,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) } /* Round it up */ rtt_ticks = USEC_2_TICKS((rtt + (USECS_IN_MSEC - 1))); - if (rtt_ticks == 0) - rtt_ticks = 1; if (tp->t_srtt != 0) { /* * srtt is stored as fixed point with 5 bits after the From nobody Wed Jan 1 17:43:39 2025 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 4YNcdS1JZRz5hycq; Wed, 01 Jan 2025 17:43:40 +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 4YNcdS0ZwVz4SH3; Wed, 1 Jan 2025 17:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735753420; 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=i6JsImf34GShJ1ulzAIg988GAQhNSnR5O0q46RBirXg=; b=wmYyrVHPAdwWmGtohwAmFUfoINfsu8FAr+YuZiqPTpQVuWyyKF1t+8NPyb5pegLWTkhu02 R73eQjaQT5ARhEWuc/DoUG9Ks9hLjc51Ibeu8KyPB+GFdKMBMahpmg7fpVQ0HRRx0hH2Am qMN9Ekjdl+KfdQJ2/f6uBmF6KgEUfHavPmnbBBUivjhSbF/92pLs5HxROoxkI3uIsb6i+z llaa2Das3xi6/dWwzpIww4GUlPcSCY0dowNCGRRujHBh8SLuRW9ajSYV1Tirl0hVtYbbPx amscD2c1zs+IeV/XPqyWus63fkb5to/9TH0sEG2fYcO79rMH7hFSV6ZKN7nLyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735753420; 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=i6JsImf34GShJ1ulzAIg988GAQhNSnR5O0q46RBirXg=; b=YRqU9kIWfNJqWTS2uiamjPqOYTyRTGMKLnD/syWx5w8C1rJtRGiOUDeRjR7IBQZwMh9Pzl VB73O5shzHcHS4lTZjUplExPBzh1AI407kd+Age9enOcaOVATf5/n4+TCvTRs2QuXf2xnd VDZYUICV7tLwascJVqGmjyoutXha4btiJ/Wv9QRXbFmQT9luf++kFV5bRagYcuL8Zl0vSV Q6qWGBXzQdVYCb4q6YqoPS9cHjCDWaCASrHixdkqgRKv4WXFhOlAhfD4ZEZVgmBUlJXRCP yLUuAUxH3DdYReAPT1f92/LICtUoqMJD18xJvBXq+T2YcJu57T4EC6cjxDQUiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735753420; a=rsa-sha256; cv=none; b=Nqbp2q7P1Xz5C8sLRLi21aBTtqkHQ23+HCWdgMpjdCbdWOFGQUtS+C/J2g+z7SrbKSIZVX EXFM2DWb1yBe8COP6DD5q3u6aFA3Vrrya2F5RoJj+G99b/nv1F1LzDEa0jPi/UfF3dPcZM 6jmd3d3OHCkKH9rQtWsZEH+ifhe6E7Llp3Rsb5BTyePjZwhvNrYHY8DDgebR6L5vhFTob1 Rz7MNkiCxVspCd/Yb+6oQDxHhI2ebFgpBj6Dv/3qLzQvWA5EH1G+RrL+43GKUl1HfCQX6o UlvD9CjhDEbk3uq5qdvR2z7IVAipQ+yNVZhSgvtQRMt6+OtAsHgZydsdKpT5cw== 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 4YNcdS0B8FzZHP; Wed, 1 Jan 2025 17:43:40 +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 501HhdEc091096; Wed, 1 Jan 2025 17:43:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501HhdMV091093; Wed, 1 Jan 2025 17:43:39 GMT (envelope-from git) Date: Wed, 1 Jan 2025 17:43:39 GMT Message-Id: <202501011743.501HhdMV091093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3b9da3dcd11f - main - TCP RACK: avoid using uninitialized tot_idle variable 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b9da3dcd11f3d73281383c4ba383a4fcc4b9bbe Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9da3dcd11f3d73281383c4ba383a4fcc4b9bbe commit 3b9da3dcd11f3d73281383c4ba383a4fcc4b9bbe Author: Michael Tuexen AuthorDate: 2025-01-01 17:42:00 +0000 Commit: Michael Tuexen CommitDate: 2025-01-01 17:42:00 +0000 TCP RACK: avoid using uninitialized tot_idle variable Reviewed by: rrs CID: 1540027 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48277 --- sys/netinet/tcp_stacks/rack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index acd622814916..00c373ef0790 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19994,7 +19994,8 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } - } + } else + tot_idle = 0; if (rack_use_fsb && (rack->r_ctl.fsb.tcp_ip_hdr) && (rack->r_fsb_inited == 0) && From nobody Wed Jan 1 20:24:41 2025 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 4YNhCF5YmJz5j96m; Wed, 01 Jan 2025 20:24:41 +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 4YNhCF3KbPz4gfy; Wed, 1 Jan 2025 20:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735763081; 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=QGDThNI06O74hBUfeJ3mprNl22LLkV2NEIsH7EVlTGw=; b=pZxuIAqnpY9o3tiEu2LAtvjt7BNV03SV3Xa+uGkhhQya2hN652n/hC4rRLrGuRmYcDT+RI oEeAPJF8h0vJeeBXSku5YIA595GIvpS20kEzzuPpGxX+zySfYSxaing4iIXTkCjn0V/mI1 ZSLk2/Dk+L06x1ov+ipHKtgbbKpR+7Kex8b2e5UsWbKKnUX9rANaEgPRZCeiLf0vop2gOS YF3ZG/Oc6ezOBTx3jnwmbmX1RESGdM+J2Q52B8BJxk1ev5+/Iits6bV0ISaqMZWH+cq6SL dVqKWq3c3bDUMmKiqHNocsIjTC3LVS+w8sFiyUk6NjwqhPwmIdvHm/mmzmKS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735763081; 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=QGDThNI06O74hBUfeJ3mprNl22LLkV2NEIsH7EVlTGw=; b=fjNdmuRbLpU5r/QdLhasFDyu8Hp4cwyVB7rTs38j5SSXpbWEYZB1isBiPpPYsJXxqcpeUk 9+MtVX7AZIdtXWgKy5CKajGv9x1PZD7n6ya3YkJpP6vlAu0BqwYwhNh04i4QRzULAYb1f7 vRVk6/WcUOgIHtaUAY0v8wkNevrqjzlCeZIbkyrfp67cHkbRCZ9yVi9SHSsDKcG5xeZp65 y3c3xcYf7ASdETzVN5AzaY7nP1tFGjsprqo+ueW4HNAgYMMaxxdACmv/O06iEtO5bT3MTZ WD+SOKyXLhcysrbzvrndvTcf7YMqDdDsPP5ioehbKPn7m2AQOuk5/UzT0z5N7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735763081; a=rsa-sha256; cv=none; b=IeoZ+5jzk8OJIgbfVbnMn2RWVpMZc6Sv4RGVYeH5F6DdxYa7622Wi16JH6DzmU4zWfIJop uOsC5nBaSkn/JlJBB7LOhSBL9lT9Z4DkW4Tl5DpkTieQTL16qzWK3PKrpJ/NGE8nUKMSLO QxCVEjw8mW0tw6UM80VLE0SKnZ+fff/8r1l+2I8S34o2m0MXQ+EzNNrpiX4SLOBYBK+Iha G8yxyIgamyCkdfKUHJuPo595+3VNgBatKp+mAhHAJRLBnJ7XcKEMlXAR9mYEKitx77vu4M 6IvysI7O4zSW1KwOsuRJIUZR78qSZX3CDLnZF+V64963LBXRdt5cRMRuh3Vxww== 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 4YNhCF2d94zfgd; Wed, 1 Jan 2025 20:24:41 +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 501KOfHg090366; Wed, 1 Jan 2025 20:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501KOfOq090363; Wed, 1 Jan 2025 20:24:41 GMT (envelope-from git) Date: Wed, 1 Jan 2025 20:24:41 GMT Message-Id: <202501012024.501KOfOq090363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: d11904b35021 - main - Fix lib/libc/nss/getgr_test with large numbers of groups 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d11904b350214943dedb64c7121d4602799d7afd Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=d11904b350214943dedb64c7121d4602799d7afd commit d11904b350214943dedb64c7121d4602799d7afd Author: Alan Somers AuthorDate: 2024-12-31 20:41:01 +0000 Commit: Alan Somers CommitDate: 2025-01-01 20:23:47 +0000 Fix lib/libc/nss/getgr_test with large numbers of groups These tests create a linked list with one entry for every group on the running system. On a system with about 30,000 groups, the test took 69 seconds to run, and crashed Kyua with the below error: kyua: E: string or blob too big (sqlite op: sqlite3_bind_blob) (sqlite db: /root/.kyua/store/results.usr_tests.20241231-203317-570235.db). Fix the test by limiting it to operating on the first 1024 groups. Apply the same change to getpw_test and getserv_test too, which are vulnerable to the same problem. MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48275 --- lib/libc/tests/nss/getgr_test.c | 4 ++++ lib/libc/tests/nss/getpw_test.c | 4 ++++ lib/libc/tests/nss/getserv_test.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/lib/libc/tests/nss/getgr_test.c b/lib/libc/tests/nss/getgr_test.c index 7c0e265fa6f6..974632d4b7c7 100644 --- a/lib/libc/tests/nss/getgr_test.c +++ b/lib/libc/tests/nss/getgr_test.c @@ -293,6 +293,8 @@ group_fill_test_data(struct group_test_data *td, int (*cb)(struct group *, void *)) { struct group *grp; + const int limit = 1024; + int count = 0; setgroupent(1); while ((grp = getgrent()) != NULL) { @@ -303,6 +305,8 @@ group_fill_test_data(struct group_test_data *td, } else { return (-1); } + if (++count >= limit) + break; } endgrent(); diff --git a/lib/libc/tests/nss/getpw_test.c b/lib/libc/tests/nss/getpw_test.c index 3a44497cf848..434d86a31591 100644 --- a/lib/libc/tests/nss/getpw_test.c +++ b/lib/libc/tests/nss/getpw_test.c @@ -240,6 +240,8 @@ passwd_fill_test_data(struct passwd_test_data *td, int (*cb)(struct passwd *, void *)) { struct passwd *pwd; + const int limit = 1024; + int count = 0; setpassent(1); while ((pwd = getpwent()) != NULL) { @@ -250,6 +252,8 @@ passwd_fill_test_data(struct passwd_test_data *td, } else { return (-1); } + if (++count >= limit) + break; } endpwent(); diff --git a/lib/libc/tests/nss/getserv_test.c b/lib/libc/tests/nss/getserv_test.c index 486a8c20836f..cc66fdb2fa52 100644 --- a/lib/libc/tests/nss/getserv_test.c +++ b/lib/libc/tests/nss/getserv_test.c @@ -283,6 +283,8 @@ static int servent_fill_test_data(struct servent_test_data *td) { struct servent *serv; + const int limit = 1024; + int count = 0; setservent(1); while ((serv = getservent()) != NULL) { @@ -290,6 +292,8 @@ servent_fill_test_data(struct servent_test_data *td) TEST_DATA_APPEND(servent, td, serv); else return (-1); + if (++count >= limit) + break; } endservent(); From nobody Wed Jan 1 21:11:34 2025 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 4YNjFL42WGz5jCgL; Wed, 01 Jan 2025 21:11:34 +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 4YNjFL3Zdsz4jn5; Wed, 1 Jan 2025 21:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765894; 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=DQVBtDeAsu8YHv6zI961qHEpTnF0DC9FC4ePouNL0eI=; b=SJPOcA8rPI76nHzt/qQ+klu77jCM+eDwy27UWFkdgI73I7kDr6ZYkpQ85c1cXQ7lxZ0db5 YVwD7VD7wJzDZTbcXW6G9p6ug16u6/DPN4KjH0Ng4NAgqgjnLR45k/POmP6ldCnDxl32UQ OJtn9m03ACO3rqqDFbglpo+Q3bZiuQHGE5ivYVF0ERHfJ3LKss3qj6tMxpVhWlfPopwWG6 UcZi/AdykfKfYPpIUIENGRwCex2Uiy8COXZRti4DX2v7vH4f+AUNOW3a9gxU96Kbcs+Tug P/QH2rudxdwEpJR6rQ+sYNAXGdFW1BP/tiTQ01Eth7QdbtgUUZ0CyymcrC3XPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765894; 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=DQVBtDeAsu8YHv6zI961qHEpTnF0DC9FC4ePouNL0eI=; b=dlpSULHNelpZDP2zKbvGuF4hb7bGOL08SzaObXFeEe/YMLOpwJD8bhm6uVe+1TVTcfoNeL JmAXK2ZcUR0JDsAcp5r8+MhRaLDX4VPgtDQLzi9GEix5V37LgiygvrnDYshDBL5a0WFWq/ r/J/kJZVUf205ok5Oae3SOARkgUGJwjPwik6lr1oGwo6YzSMdH0wxo/sQouz7YmehAAg1b AQRveB9ghTPJiJ8mz/MdT+pQdZDkf8zow36vPXY12ojx+9ldyxEr4x0PXJ6427zEpMYzKP Cgtez6tNsCpv87GGS8HPePljBRbKmgpBAO16pnUodtrIIZt/lRekfG7xukSLzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765894; a=rsa-sha256; cv=none; b=uI8RwuxP/emXqS4PGn/gSXNPxo9txjJJbnlSEvqKZXLAnGAwpVT7Mw9WIMs7A3cRZolnwu Ij7jZeGe1bX5c0tqKpM0wVF8bE2pHmTuMpRVuE2OD04/z7SM6LfJXKhFH7GLwhfi8cXUIR OP0iMMg/iKvD9yDCbnABiIulTu6SgcxaGVF0O1XjlaS4pLO0Y0RFtD016oXiRELklGIJmZ Ypfrv/0w87LSPbJsZh1un1YS8QgIGvzYkYDbbr7No3lAggr9Q6tRQPLzI6MgUQD7UFcBsp Tdo5gfKoiTtM6BgITvIihVO77XqNc05RizukBJ1nPrrGGVpaS18N4P11pSKgxw== 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 4YNjFL39cdzgGQ; Wed, 1 Jan 2025 21:11:34 +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 501LBYHJ079829; Wed, 1 Jan 2025 21:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBYYE079826; Wed, 1 Jan 2025 21:11:34 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:34 GMT Message-Id: <202501012111.501LBYYE079826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 35c0a8c449fd - main - Add 'contrib/libder/' from commit '9c40c4de4c33b2ba1124fb752ebea0bebaa6013f' 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 35c0a8c449fd2b7f75029ebed5e10852240f0865 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=35c0a8c449fd2b7f75029ebed5e10852240f0865 commit 35c0a8c449fd2b7f75029ebed5e10852240f0865 Merge: d11904b35021 9c40c4de4c33 Author: Kyle Evans AuthorDate: 2025-01-01 21:11:02 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:02 +0000 Add 'contrib/libder/' from commit '9c40c4de4c33b2ba1124fb752ebea0bebaa6013f' git-subtree-dir: contrib/libder git-subtree-mainline: d11904b350214943dedb64c7121d4602799d7afd git-subtree-split: 9c40c4de4c33b2ba1124fb752ebea0bebaa6013f contrib/libder/.cirrus.yml | 16 + contrib/libder/.github/workflows/build.yml | 41 + contrib/libder/.gitignore | 11 + contrib/libder/CMakeLists.txt | 28 + contrib/libder/LICENSE | 22 + contrib/libder/README.md | 28 + contrib/libder/derdump/.gitignore | 1 + contrib/libder/derdump/CMakeLists.txt | 6 + contrib/libder/derdump/derdump.1 | 51 ++ contrib/libder/derdump/derdump.c | 52 ++ contrib/libder/libder/CMakeLists.txt | 12 + contrib/libder/libder/libder.3 | 179 +++++ contrib/libder/libder/libder.c | 119 +++ contrib/libder/libder/libder.h | 181 +++++ contrib/libder/libder/libder_error.c | 76 ++ contrib/libder/libder/libder_obj.3 | 138 ++++ contrib/libder/libder/libder_obj.c | 1192 ++++++++++++++++++++++++++++ contrib/libder/libder/libder_private.h | 178 +++++ contrib/libder/libder/libder_read.3 | 101 +++ contrib/libder/libder/libder_read.c | 864 ++++++++++++++++++++ contrib/libder/libder/libder_type.3 | 71 ++ contrib/libder/libder/libder_type.c | 150 ++++ contrib/libder/libder/libder_write.3 | 54 ++ contrib/libder/libder/libder_write.c | 229 ++++++ contrib/libder/tests/.gitignore | 12 + contrib/libder/tests/CMakeLists.txt | 41 + contrib/libder/tests/fuzz_parallel.c | 111 +++ contrib/libder/tests/fuzz_stream.c | 246 ++++++ contrib/libder/tests/fuzz_write.c | 79 ++ contrib/libder/tests/fuzzers.h | 40 + contrib/libder/tests/make_corpus.c | 137 ++++ contrib/libder/tests/repo.priv | Bin 0 -> 64 bytes contrib/libder/tests/repo.pub | Bin 0 -> 88 bytes contrib/libder/tests/test_common.h | 29 + contrib/libder/tests/test_privkey.c | 175 ++++ contrib/libder/tests/test_pubkey.c | 143 ++++ 36 files changed, 4813 insertions(+) diff --cc contrib/libder/.cirrus.yml index 000000000000,000000000000..a63de71d8bf4 new file mode 100644 --- /dev/null +++ b/contrib/libder/.cirrus.yml @@@ -1,0 -1,0 +1,16 @@@ ++build_task: ++ matrix: ++ - name: FreeBSD 13 ++ freebsd_instance: ++ image: freebsd-13-2-release-amd64 ++ - name: FreeBSD 14 ++ freebsd_instance: ++ image: freebsd-14-0-release-amd64-ufs ++ setup_script: ++ sudo pkg install -y cmake ++ configure_script: ++ - cmake -B build -DCMAKE_BUILD_TYPE=Debug ++ build_script: ++ make -C build ++ test_script: ++ make -C build check diff --cc contrib/libder/.github/workflows/build.yml index 000000000000,a10daa25e38f..a10daa25e38f mode 000000,100644..100644 --- a/contrib/libder/.github/workflows/build.yml +++ b/contrib/libder/.github/workflows/build.yml diff --cc contrib/libder/.gitignore index 000000000000,000000000000..34fb4e06c50b new file mode 100644 --- /dev/null +++ b/contrib/libder/.gitignore @@@ -1,0 -1,0 +1,11 @@@ ++.*.swp ++.depend* ++*.a ++*.so ++*.so.* ++*.o ++*.pico ++*.debug ++*.full ++ ++build/ diff --cc contrib/libder/CMakeLists.txt index 000000000000,cf0d39e32489..cf0d39e32489 mode 000000,100644..100644 --- a/contrib/libder/CMakeLists.txt +++ b/contrib/libder/CMakeLists.txt diff --cc contrib/libder/LICENSE index 000000000000,477af8f22e4c..477af8f22e4c mode 000000,100644..100644 --- a/contrib/libder/LICENSE +++ b/contrib/libder/LICENSE diff --cc contrib/libder/README.md index 000000000000,000000000000..9f700493520d new file mode 100644 --- /dev/null +++ b/contrib/libder/README.md @@@ -1,0 -1,0 +1,28 @@@ ++# libder ++ ++## What is libder? ++ ++libder is a small library for encoding/decoding DER-encoded objects. It is ++expected to be able to decode any BER-encoded buffer, and an attempt to ++re-encode the resulting tree would apply any normalization expected by a DER ++decoder. The author's use is primarily to decode/encode ECC keys for ++interoperability with OpenSSL. ++ ++The authoritative source for this software is located at ++https://git.kevans.dev/kevans/libder, but it's additionally mirrored to ++[GitHub](https://github.com/kevans91/libder) for user-facing interactions. ++Pull requests and issues are open on GitHub. ++ ++## What is libder not? ++ ++libder is not intended to be a general-purpose library for working with DER/BER ++specified objects. It may provide some helpers for building more primitive ++data types, but libder will quickly punt on anything even remotely complex and ++require the library consumer to supply it as a type/payload/size triple that it ++will treat as relatively opaque (modulo some encoding normalization rules that ++can be applied without deeply understanding the data contained within). ++ ++libder also doesn't do strict validation of what it reads in today, for better ++or worse. e.g., a boolean may occupy more than one byte and libder will happily ++present it to the application in that way. It would be normalized on ++re-encoding to 0xff or 0x00 depending on whether any bits are set or not. diff --cc contrib/libder/derdump/.gitignore index 000000000000,a35adcc4b71d..a35adcc4b71d mode 000000,100644..100644 --- a/contrib/libder/derdump/.gitignore +++ b/contrib/libder/derdump/.gitignore diff --cc contrib/libder/derdump/CMakeLists.txt index 000000000000,11657426fbc9..11657426fbc9 mode 000000,100644..100644 --- a/contrib/libder/derdump/CMakeLists.txt +++ b/contrib/libder/derdump/CMakeLists.txt diff --cc contrib/libder/derdump/derdump.1 index 000000000000,414799f3055f..414799f3055f mode 000000,100644..100644 --- a/contrib/libder/derdump/derdump.1 +++ b/contrib/libder/derdump/derdump.1 diff --cc contrib/libder/derdump/derdump.c index 000000000000,7ea3768524d8..7ea3768524d8 mode 000000,100644..100644 --- a/contrib/libder/derdump/derdump.c +++ b/contrib/libder/derdump/derdump.c diff --cc contrib/libder/libder/CMakeLists.txt index 000000000000,8e6f3426d649..8e6f3426d649 mode 000000,100644..100644 --- a/contrib/libder/libder/CMakeLists.txt +++ b/contrib/libder/libder/CMakeLists.txt diff --cc contrib/libder/libder/libder.3 index 000000000000,0e06254ef3fb..0e06254ef3fb mode 000000,100644..100644 --- a/contrib/libder/libder/libder.3 +++ b/contrib/libder/libder/libder.3 diff --cc contrib/libder/libder/libder.c index 000000000000,2d52fedd62bd..2d52fedd62bd mode 000000,100644..100644 --- a/contrib/libder/libder/libder.c +++ b/contrib/libder/libder/libder.c diff --cc contrib/libder/libder/libder.h index 000000000000,4d28aa3052ba..4d28aa3052ba mode 000000,100644..100644 --- a/contrib/libder/libder/libder.h +++ b/contrib/libder/libder/libder.h diff --cc contrib/libder/libder/libder_error.c index 000000000000,6ca0acc83e6d..6ca0acc83e6d mode 000000,100644..100644 --- a/contrib/libder/libder/libder_error.c +++ b/contrib/libder/libder/libder_error.c diff --cc contrib/libder/libder/libder_obj.3 index 000000000000,d7e51da1d2fb..d7e51da1d2fb mode 000000,100644..100644 --- a/contrib/libder/libder/libder_obj.3 +++ b/contrib/libder/libder/libder_obj.3 diff --cc contrib/libder/libder/libder_obj.c index 000000000000,21d39e01fc17..21d39e01fc17 mode 000000,100644..100644 --- a/contrib/libder/libder/libder_obj.c +++ b/contrib/libder/libder/libder_obj.c diff --cc contrib/libder/libder/libder_private.h index 000000000000,3324420ef6d8..3324420ef6d8 mode 000000,100644..100644 --- a/contrib/libder/libder/libder_private.h +++ b/contrib/libder/libder/libder_private.h diff --cc contrib/libder/libder/libder_read.3 index 000000000000,69c9ba8d0d2c..69c9ba8d0d2c mode 000000,100644..100644 --- a/contrib/libder/libder/libder_read.3 +++ b/contrib/libder/libder/libder_read.3 diff --cc contrib/libder/libder/libder_read.c index 000000000000,dba56746be21..dba56746be21 mode 000000,100644..100644 --- a/contrib/libder/libder/libder_read.c +++ b/contrib/libder/libder/libder_read.c diff --cc contrib/libder/libder/libder_type.3 index 000000000000,df577a70f406..df577a70f406 mode 000000,100644..100644 --- a/contrib/libder/libder/libder_type.3 +++ b/contrib/libder/libder/libder_type.3 diff --cc contrib/libder/libder/libder_type.c index 000000000000,dec942ce68f9..dec942ce68f9 mode 000000,100644..100644 --- a/contrib/libder/libder/libder_type.c +++ b/contrib/libder/libder/libder_type.c diff --cc contrib/libder/libder/libder_write.3 index 000000000000,8b1a5aa2bbff..8b1a5aa2bbff mode 000000,100644..100644 --- a/contrib/libder/libder/libder_write.3 +++ b/contrib/libder/libder/libder_write.3 diff --cc contrib/libder/libder/libder_write.c index 000000000000,66ccbcfbf21d..66ccbcfbf21d mode 000000,100644..100644 --- a/contrib/libder/libder/libder_write.c +++ b/contrib/libder/libder/libder_write.c diff --cc contrib/libder/tests/.gitignore index 000000000000,075588a81e75..075588a81e75 mode 000000,100644..100644 --- a/contrib/libder/tests/.gitignore +++ b/contrib/libder/tests/.gitignore diff --cc contrib/libder/tests/CMakeLists.txt index 000000000000,fc366ab88ed7..fc366ab88ed7 mode 000000,100644..100644 --- a/contrib/libder/tests/CMakeLists.txt +++ b/contrib/libder/tests/CMakeLists.txt diff --cc contrib/libder/tests/fuzz_parallel.c index 000000000000,afd4425970a2..afd4425970a2 mode 000000,100644..100644 --- a/contrib/libder/tests/fuzz_parallel.c +++ b/contrib/libder/tests/fuzz_parallel.c diff --cc contrib/libder/tests/fuzz_stream.c index 000000000000,0f7cc6167e7e..0f7cc6167e7e mode 000000,100644..100644 --- a/contrib/libder/tests/fuzz_stream.c +++ b/contrib/libder/tests/fuzz_stream.c diff --cc contrib/libder/tests/fuzz_write.c index 000000000000,2ad5b5eb1764..2ad5b5eb1764 mode 000000,100644..100644 --- a/contrib/libder/tests/fuzz_write.c +++ b/contrib/libder/tests/fuzz_write.c diff --cc contrib/libder/tests/fuzzers.h index 000000000000,0f94bc7f25fb..0f94bc7f25fb mode 000000,100644..100644 --- a/contrib/libder/tests/fuzzers.h +++ b/contrib/libder/tests/fuzzers.h diff --cc contrib/libder/tests/make_corpus.c index 000000000000,68554d7c17de..68554d7c17de mode 000000,100644..100644 --- a/contrib/libder/tests/make_corpus.c +++ b/contrib/libder/tests/make_corpus.c diff --cc contrib/libder/tests/repo.priv index 000000000000,74a030b6802c..74a030b6802c mode 000000,100644..100644 Binary files differ diff --cc contrib/libder/tests/repo.pub index 000000000000,bdcb1a20a1c7..bdcb1a20a1c7 mode 000000,100644..100644 Binary files differ diff --cc contrib/libder/tests/test_common.h index 000000000000,76e850f19128..76e850f19128 mode 000000,100644..100644 --- a/contrib/libder/tests/test_common.h +++ b/contrib/libder/tests/test_common.h diff --cc contrib/libder/tests/test_privkey.c index 000000000000,5e7519f5a715..5e7519f5a715 mode 000000,100644..100644 --- a/contrib/libder/tests/test_privkey.c +++ b/contrib/libder/tests/test_privkey.c diff --cc contrib/libder/tests/test_pubkey.c index 000000000000,9fbd070f0e87..9fbd070f0e87 mode 000000,100644..100644 --- a/contrib/libder/tests/test_pubkey.c +++ b/contrib/libder/tests/test_pubkey.c From nobody Wed Jan 1 21:11:35 2025 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 4YNjFM5rjVz5jCx4; Wed, 01 Jan 2025 21:11:35 +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 4YNjFM4VmVz4k2m; Wed, 1 Jan 2025 21:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765895; 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=nOvqtfVsAztWgutarC191r2j0bz0DKV89Tr0BpAdSWw=; b=w9C0ppjj7ZtLPk4S8BqWYjwc6N/K6o7KWinHuA8Wt7I4p9vNJxFI40StYPAaAhWiGqP/oy ZhlqwwXY0jiye0SkJPYkzBpcYgbGKb8dYwjLYNKzIDkeevMS5d2t33cjH4WwEHCdZ4bv0o 7XezUukufO1/FpT7tFrBgxTaB4Yp0ebnPE7h6EL8skTrzTWlPFt9W4g/LgUu9HDZiKLYuP Zt576qS894VVxmOjgwv7kNX9n9Yk7UwGUMGx/ZRgTHzbn088jeXfyzQ8QY+T3k9EOod+3w f3tU/W6pZqAahJxEwdWI1fYUSoUQypsElLxu15P64jkioM1tV1lFZQv3gCL8JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765895; 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=nOvqtfVsAztWgutarC191r2j0bz0DKV89Tr0BpAdSWw=; b=WpQjE8BHjWLhubVpdHiSGteYsGat1yD3hZdT5LUoFlDTIQGQmYgPJlUy//mRQ7jGkgoPje CKwrAd0ha6MnpQO5nEfCHi043mrrbt2dnjRRTiO4I3kbRSlIgZBKxCAVGIedSwXnZfuNOP iavFSSJVgLuawQTebxtl7Lcfhlr29cFnUOrN9kYzuHlfHPEARG1GHMM44pXMwbRhrPLF3p HSwI7DH5Ofk9842jfaAEHDvDEzynpy7KYCOOBTd5PcmQMPOD8vzV8/cm+AN4QnVL81mOcT 211RnitB0nxInAy+HJGCba1VqukDAzA4GIID48KwqEHV9RzxLpbh66CGEfJV4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765895; a=rsa-sha256; cv=none; b=J9HbsSwurqnWtm/JR78AkA6jKeqS9NmKt7/oqH98vInLLG5w7h24tHsLTi/K2Ldzcmcu/S +7IhMgWiSvQINXBfhoue/JfI6uZQcRXXXUUpwFj0gibX1jPMqp96fiDGwyoPWo6wKDh/kH XfO4REWyWO9LH1QlJG4GVGURcRsfg6Ju1RyJJGnuEDFWKwukFDiVpg11YXfM5++a2U6jEz SMyhND0zOOaH8volhp+6P9R5qWslENiNsuUKLcyKfT3+z2e8NQTzuX/DlUvc28ZIGGRq3R lbzXKrg3P3TTnmY2mR4T7tW42c5D5/72hlJtpeOy8TuRYX0xVlLVn0BLIly3Jw== 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 4YNjFM46Xpzgg6; Wed, 1 Jan 2025 21:11:35 +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 501LBZCL079880; Wed, 1 Jan 2025 21:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBZdG079877; Wed, 1 Jan 2025 21:11:35 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:35 GMT Message-Id: <202501012111.501LBZdG079877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: f59bb61e1eb4 - main - lib: hook libder up to the build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2 commit f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2 Author: Kyle Evans AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:06 +0000 lib: hook libder up to the build libder will be used in upcoming ECC support in the pkg(7) bootstrap to read DER-encoded keys and signatures. Differential Revision: https://reviews.freebsd.org/D48116 --- lib/Makefile | 1 + lib/libder/Makefile | 13 +++++++++++++ share/mk/src.libnames.mk | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index af0079978075..1f69b4208738 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -15,6 +15,7 @@ SUBDIR_BOOTSTRAP= \ libc++ \ libc++experimental \ libcxxrt \ + libder \ libdiff \ libelf \ libssp \ diff --git a/lib/libder/Makefile b/lib/libder/Makefile new file mode 100644 index 000000000000..bdd2225f0ff3 --- /dev/null +++ b/lib/libder/Makefile @@ -0,0 +1,13 @@ + +LIB= der +INTERNALLIB= + +.PATH: ${SRCTOP}/contrib/libder/libder +SRCS+= libder.c \ + libder_error.c \ + libder_obj.c \ + libder_read.c \ + libder_type.c \ + libder_write.c + +.include diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 786ad9a6f9a5..f693e3ae7c16 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -44,6 +44,7 @@ _INTERNALLIBS= \ bsnmptools \ c_nossp_pic \ cron \ + der \ diff \ elftc \ fdt \ @@ -614,6 +615,9 @@ LIBTELNET?= ${LIBTELNETDIR}/libtelnet${PIE_SUFFIX}.a LIBCRONDIR= ${_LIB_OBJTOP}/usr.sbin/cron/lib LIBCRON?= ${LIBCRONDIR}/libcron${PIE_SUFFIX}.a +LIBDERDIR= ${_LIB_OBJTOP}/lib/libder +LIBDER?= ${LIBDERDIR}/libder${PIE_SUFFIX}.a + LIBNTPDIR= ${_LIB_OBJTOP}/usr.sbin/ntp/libntp LIBNTP?= ${LIBNTPDIR}/libntp${PIE_SUFFIX}.a From nobody Wed Jan 1 21:11:36 2025 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 4YNjFQ68B7z5jCpf; Wed, 01 Jan 2025 21:11:38 +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 4YNjFQ2bSJz4jl8; Wed, 1 Jan 2025 21:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765898; 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=CWWwkItKYXkPlXe6VlRLppP44QAvUgTTmXuCrbZfWy4=; b=nMBBD2xRql7lru77dr60TLQgqh17AfirOKTmVfMW5ue1ZdZPWyX71/QmSRtoQPrXIeRTZa pTS5G7Z5OaP819matJ+rw5lNQL2UuCPgWOkUL/ot4VeHXhmJY7rQs8q4OFngq5iRMMaX5Q 6wDYqU1UHqm9BzK7BgArB5pCtkVzqBc16nU6J/DKLrlc74aoCPMZmokSmMdnZ90X5IPg3q vDwjSHb74eWKfm7UJQ2I/4yG40wFoyzucwWno4khU6NFsvLQMslvAAcvoWU7rNInx8LSej LMOykRu8KuJN2ggcWpjse6qGLZ5T/BwGyxNSOLbF7re8UIBvN7FMxWS4K2ODsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765898; 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=CWWwkItKYXkPlXe6VlRLppP44QAvUgTTmXuCrbZfWy4=; b=v+Sl3FCp6O1hnn5I7suqokxrH2ULxAPPkeDmsAyGo7KCDRa8iNqhXOJgNokcAZfqp+atCv FEbmL9qK8MQdCBZIvHrDLgkRshXvuEc5ZNSQNBwbH3DqCIYqp5IMo+BxwXvB5w2BFkl1py obDgikQywtJmFJN8lyZ5SiGY2ZuUF2v0V/m9zav7giVSBc4USMCjFmqfuuMIIzD3v1yVDT j+CtJ5vqqthN3CiHkcQSYYIvIKxB2sL4Hdsq28tESIQURfpMhOjDmjPegCxqhytr85hT3U OgAjTUO1miJktLaPegvUEDqgQMjDJPgbBeMHvFfYKNkGZeWZJWW6rS0khqW4iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765898; a=rsa-sha256; cv=none; b=WYp9bwZl9d6Gm7YSm/gatIFwuapZLKrLni3SxLBDrqbA/QwZmUx8ZcmY4SrO0vLUAzMSN4 m3kxpxPTDmuw+OnaO6iUNA6l5z04t/r/MzOp1emmMM8sSGlY5i+Rxa1iUVUyA9Q0LixwHa IEDg93oKzGArr2dMg5PooIafgeeL4+fHwSGWYBb7N9JTsHZCryN+hL8j6XsG03jYNOMXz+ 9xxs2k6tnamPozMicVMNMiqUZZ21C14TzsxxuG7NO1c/1dRZUDAtecokwEEbim6V80pqcL AMeRFIzMvFMTdHMGBF2yWb8dZf1d0eMWHVY5tPz37tMiLd9pdBguYI4aEB3yLw== 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 4YNjFQ1jqLzgGS; Wed, 1 Jan 2025 21:11:38 +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 501LBcnS079929; Wed, 1 Jan 2025 21:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBaOZ079926; Wed, 1 Jan 2025 21:11:36 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:36 GMT Message-Id: <202501012111.501LBaOZ079926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: f0865ec9906d - main - Add 'crypto/libecc/' from commit '736d663976d1768533badbf06581481d01fade4c' 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: f0865ec9906d5a18fa2a3b61381f22ce16e606ad Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f0865ec9906d5a18fa2a3b61381f22ce16e606ad commit f0865ec9906d5a18fa2a3b61381f22ce16e606ad Merge: f59bb61e1eb4 736d663976d1 Author: Kyle Evans AuthorDate: 2025-01-01 21:11:18 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:18 +0000 Add 'crypto/libecc/' from commit '736d663976d1768533badbf06581481d01fade4c' git-subtree-dir: crypto/libecc git-subtree-mainline: f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2 git-subtree-split: 736d663976d1768533badbf06581481d01fade4c crypto/libecc/.github/workflows/libecc_cifuzz.yml | 26 + .../.github/workflows/libecc_compilation_tests.yml | 57 + .../.github/workflows/libecc_crossarch_tests.yml | 55 + .../libecc/.github/workflows/libecc_examples.yml | 39 + .../.github/workflows/libecc_meson_build.yml | 37 + .../.github/workflows/libecc_python_tests.yml | 43 + .../.github/workflows/libecc_runtime_tests.yml | 39 + crypto/libecc/.gitignore | 4 + crypto/libecc/.travis.yml | 287 + crypto/libecc/LICENSE | 50 + crypto/libecc/Makefile | 175 + crypto/libecc/README.md | 1345 + crypto/libecc/build/.gitignore | 3 + crypto/libecc/common.mk | 349 + crypto/libecc/include/libecc/curves/aff_pt.h | 136 + crypto/libecc/include/libecc/curves/curves.h | 31 + crypto/libecc/include/libecc/curves/curves_list.h | 248 + crypto/libecc/include/libecc/curves/ec_edwards.h | 39 + .../libecc/include/libecc/curves/ec_montgomery.h | 34 + crypto/libecc/include/libecc/curves/ec_params.h | 91 + crypto/libecc/include/libecc/curves/ec_shortw.h | 45 + .../libecc/curves/known/ec_params_bign256v1.h | 315 + .../libecc/curves/known/ec_params_bign384v1.h | 337 + .../libecc/curves/known/ec_params_bign512v1.h | 359 + .../curves/known/ec_params_brainpoolp192r1.h | 334 + .../curves/known/ec_params_brainpoolp192t1.h | 316 + .../curves/known/ec_params_brainpoolp224r1.h | 295 + .../curves/known/ec_params_brainpoolp224t1.h | 333 + .../curves/known/ec_params_brainpoolp256r1.h | 227 + .../curves/known/ec_params_brainpoolp256t1.h | 333 + .../curves/known/ec_params_brainpoolp320r1.h | 350 + .../curves/known/ec_params_brainpoolp320t1.h | 350 + .../curves/known/ec_params_brainpoolp384r1.h | 265 + .../curves/known/ec_params_brainpoolp384t1.h | 367 + .../curves/known/ec_params_brainpoolp512r1.h | 276 + .../curves/known/ec_params_brainpoolp512t1.h | 401 + .../libecc/curves/known/ec_params_external.h | 104 + .../libecc/curves/known/ec_params_frp256v1.h | 233 + .../libecc/curves/known/ec_params_gost256.h | 233 + .../libecc/curves/known/ec_params_gost512.h | 286 + ...c_params_gost_R3410_2001_CryptoPro_A_ParamSet.h | 315 + ...c_params_gost_R3410_2001_CryptoPro_B_ParamSet.h | 324 + ...c_params_gost_R3410_2001_CryptoPro_C_ParamSet.h | 333 + ...arams_gost_R3410_2001_CryptoPro_XchA_ParamSet.h | 315 + ...arams_gost_R3410_2001_CryptoPro_XchB_ParamSet.h | 333 + .../known/ec_params_gost_R3410_2001_TestParamSet.h | 324 + .../ec_params_gost_R3410_2012_256_paramSetA.h | 316 + .../ec_params_gost_R3410_2012_256_paramSetB.h | 315 + .../ec_params_gost_R3410_2012_256_paramSetC.h | 324 + .../ec_params_gost_R3410_2012_256_paramSetD.h | 333 + .../ec_params_gost_R3410_2012_512_paramSetA.h | 359 + .../ec_params_gost_R3410_2012_512_paramSetB.h | 380 + .../ec_params_gost_R3410_2012_512_paramSetC.h | 359 + .../ec_params_gost_R3410_2012_512_paramSetTest.h | 401 + .../libecc/curves/known/ec_params_secp192k1.h | 307 + .../libecc/curves/known/ec_params_secp192r1.h | 312 + .../libecc/curves/known/ec_params_secp224k1.h | 320 + .../libecc/curves/known/ec_params_secp224r1.h | 279 + .../libecc/curves/known/ec_params_secp256k1.h | 318 + .../libecc/curves/known/ec_params_secp256r1.h | 227 + .../libecc/curves/known/ec_params_secp384r1.h | 250 + .../libecc/curves/known/ec_params_secp521r1.h | 327 + .../libecc/curves/known/ec_params_sm2p192test.h | 326 + .../libecc/curves/known/ec_params_sm2p256test.h | 349 + .../libecc/curves/known/ec_params_sm2p256v1.h | 350 + .../libecc/curves/known/ec_params_wei25519.h | 334 + .../include/libecc/curves/known/ec_params_wei448.h | 391 + crypto/libecc/include/libecc/curves/prj_pt.h | 88 + crypto/libecc/include/libecc/ecdh/ecccdh.h | 63 + crypto/libecc/include/libecc/ecdh/ecdh.h | 21 + crypto/libecc/include/libecc/ecdh/x25519_448.h | 62 + crypto/libecc/include/libecc/external_deps/print.h | 34 + crypto/libecc/include/libecc/external_deps/rand.h | 22 + crypto/libecc/include/libecc/external_deps/time.h | 23 + crypto/libecc/include/libecc/fp/fp.h | 98 + crypto/libecc/include/libecc/fp/fp_add.h | 26 + crypto/libecc/include/libecc/fp/fp_config.h | 25 + crypto/libecc/include/libecc/fp/fp_montgomery.h | 30 + crypto/libecc/include/libecc/fp/fp_mul.h | 26 + crypto/libecc/include/libecc/fp/fp_mul_redc1.h | 25 + crypto/libecc/include/libecc/fp/fp_pow.h | 22 + crypto/libecc/include/libecc/fp/fp_rand.h | 22 + crypto/libecc/include/libecc/fp/fp_sqrt.h | 25 + crypto/libecc/include/libecc/hash/bash.h | 162 + crypto/libecc/include/libecc/hash/bash224.h | 64 + crypto/libecc/include/libecc/hash/bash256.h | 64 + crypto/libecc/include/libecc/hash/bash384.h | 64 + crypto/libecc/include/libecc/hash/bash512.h | 64 + crypto/libecc/include/libecc/hash/belt-hash.h | 164 + crypto/libecc/include/libecc/hash/hash_algs.h | 554 + crypto/libecc/include/libecc/hash/hmac.h | 38 + crypto/libecc/include/libecc/hash/keccak.h | 112 + crypto/libecc/include/libecc/hash/ripemd160.h | 73 + crypto/libecc/include/libecc/hash/sha2.h | 219 + crypto/libecc/include/libecc/hash/sha224.h | 79 + crypto/libecc/include/libecc/hash/sha256.h | 79 + crypto/libecc/include/libecc/hash/sha3-224.h | 69 + crypto/libecc/include/libecc/hash/sha3-256.h | 69 + crypto/libecc/include/libecc/hash/sha3-384.h | 69 + crypto/libecc/include/libecc/hash/sha3-512.h | 69 + crypto/libecc/include/libecc/hash/sha3.h | 46 + crypto/libecc/include/libecc/hash/sha384.h | 79 + crypto/libecc/include/libecc/hash/sha512-224.h | 71 + crypto/libecc/include/libecc/hash/sha512-256.h | 71 + crypto/libecc/include/libecc/hash/sha512.h | 71 + crypto/libecc/include/libecc/hash/sha512_core.h | 46 + crypto/libecc/include/libecc/hash/shake.h | 41 + crypto/libecc/include/libecc/hash/shake256.h | 68 + crypto/libecc/include/libecc/hash/sm3.h | 73 + crypto/libecc/include/libecc/hash/streebog.h | 1301 + crypto/libecc/include/libecc/hash/streebog256.h | 65 + crypto/libecc/include/libecc/hash/streebog512.h | 65 + crypto/libecc/include/libecc/lib_ecc_config.h | 134 + crypto/libecc/include/libecc/lib_ecc_types.h | 288 + crypto/libecc/include/libecc/libarith.h | 41 + crypto/libecc/include/libecc/libec.h | 30 + crypto/libecc/include/libecc/libsig.h | 37 + crypto/libecc/include/libecc/meson.build | 156 + crypto/libecc/include/libecc/nn/nn.h | 96 + crypto/libecc/include/libecc/nn/nn_add.h | 32 + crypto/libecc/include/libecc/nn/nn_config.h | 220 + crypto/libecc/include/libecc/nn/nn_div.h | 43 + crypto/libecc/include/libecc/nn/nn_div_public.h | 30 + crypto/libecc/include/libecc/nn/nn_logical.h | 34 + crypto/libecc/include/libecc/nn/nn_mod_pow.h | 23 + crypto/libecc/include/libecc/nn/nn_modinv.h | 26 + crypto/libecc/include/libecc/nn/nn_mul.h | 29 + crypto/libecc/include/libecc/nn/nn_mul_public.h | 24 + crypto/libecc/include/libecc/nn/nn_mul_redc1.h | 26 + crypto/libecc/include/libecc/nn/nn_rand.h | 24 + crypto/libecc/include/libecc/sig/bign.h | 40 + crypto/libecc/include/libecc/sig/bign_common.h | 101 + crypto/libecc/include/libecc/sig/bip0340.h | 73 + crypto/libecc/include/libecc/sig/dbign.h | 40 + crypto/libecc/include/libecc/sig/decdsa.h | 48 + crypto/libecc/include/libecc/sig/ec_key.h | 224 + crypto/libecc/include/libecc/sig/ecdsa.h | 48 + crypto/libecc/include/libecc/sig/ecdsa_common.h | 88 + crypto/libecc/include/libecc/sig/ecfsdsa.h | 94 + crypto/libecc/include/libecc/sig/ecgdsa.h | 85 + crypto/libecc/include/libecc/sig/eckcdsa.h | 84 + crypto/libecc/include/libecc/sig/ecosdsa.h | 69 + crypto/libecc/include/libecc/sig/ecrdsa.h | 85 + crypto/libecc/include/libecc/sig/ecsdsa.h | 81 + crypto/libecc/include/libecc/sig/ecsdsa_common.h | 51 + crypto/libecc/include/libecc/sig/eddsa.h | 134 + crypto/libecc/include/libecc/sig/fuzzing_ecdsa.h | 28 + crypto/libecc/include/libecc/sig/fuzzing_ecgdsa.h | 28 + crypto/libecc/include/libecc/sig/fuzzing_ecrdsa.h | 28 + crypto/libecc/include/libecc/sig/sig_algs.h | 113 + .../libecc/include/libecc/sig/sig_algs_internal.h | 650 + crypto/libecc/include/libecc/sig/sm2.h | 83 + crypto/libecc/include/libecc/utils/dbg_sig.h | 61 + crypto/libecc/include/libecc/utils/print_buf.h | 18 + crypto/libecc/include/libecc/utils/print_curves.h | 28 + crypto/libecc/include/libecc/utils/print_fp.h | 28 + crypto/libecc/include/libecc/utils/print_keys.h | 26 + crypto/libecc/include/libecc/utils/print_nn.h | 24 + crypto/libecc/include/libecc/utils/utils.h | 196 + crypto/libecc/include/libecc/utils/utils_rand.h | 22 + crypto/libecc/include/libecc/words/types.h | 163 + crypto/libecc/include/libecc/words/words.h | 129 + crypto/libecc/include/libecc/words/words_16.h | 73 + crypto/libecc/include/libecc/words/words_32.h | 73 + crypto/libecc/include/libecc/words/words_64.h | 74 + crypto/libecc/meson.build | 282 + crypto/libecc/meson.options | 127 + crypto/libecc/scripts/crossbuild.sh | 315 + crypto/libecc/scripts/crossrun.sh | 124 + crypto/libecc/scripts/expand_libecc.py | 1956 + crypto/libecc/scripts/gen_curves_tests.sh | 89 + crypto/libecc/scripts/gen_openssl_curves_tests.sh | 52 + crypto/libecc/scripts/sha3.py | 115 + crypto/libecc/scripts/test_ec_utils.sh | 82 + crypto/libecc/src/arithmetic_tests/Makefile | 26 + .../libecc/src/arithmetic_tests/arithmetic_tests.c | 1233 + .../arithmetic_tests/arithmetic_tests_generator.py | 2009 + crypto/libecc/src/curves/aff_pt.c | 346 + crypto/libecc/src/curves/aff_pt_edwards.c | 855 + crypto/libecc/src/curves/aff_pt_montgomery.c | 579 + crypto/libecc/src/curves/curves.c | 256 + crypto/libecc/src/curves/ec_edwards.c | 79 + crypto/libecc/src/curves/ec_montgomery.c | 85 + crypto/libecc/src/curves/ec_params.c | 194 + crypto/libecc/src/curves/ec_shortw.c | 107 + crypto/libecc/src/curves/meson.build | 11 + crypto/libecc/src/curves/prj_pt.c | 2113 + crypto/libecc/src/ecdh/ecccdh.c | 242 + crypto/libecc/src/ecdh/meson.build | 4 + crypto/libecc/src/ecdh/x25519_448.c | 435 + crypto/libecc/src/examples/Makefile | 50 + crypto/libecc/src/examples/basic/Makefile | 43 + .../src/examples/basic/curve_basic_examples.c | 401 + crypto/libecc/src/examples/basic/curve_ecdh.c | 284 + .../libecc/src/examples/basic/fp_square_residue.c | 131 + crypto/libecc/src/examples/basic/nn_miller_rabin.c | 223 + crypto/libecc/src/examples/basic/nn_pollard_rho.c | 259 + crypto/libecc/src/examples/hash/Makefile | 37 + crypto/libecc/src/examples/hash/gostr34_11_94.c | 631 + crypto/libecc/src/examples/hash/gostr34_11_94.h | 193 + crypto/libecc/src/examples/hash/hash.c | 510 + crypto/libecc/src/examples/hash/hash.h | 106 + crypto/libecc/src/examples/hash/md2.c | 228 + crypto/libecc/src/examples/hash/md2.h | 63 + crypto/libecc/src/examples/hash/md4.c | 264 + crypto/libecc/src/examples/hash/md4.h | 136 + crypto/libecc/src/examples/hash/md5.c | 265 + crypto/libecc/src/examples/hash/md5.h | 137 + crypto/libecc/src/examples/hash/mdc2.c | 305 + crypto/libecc/src/examples/hash/mdc2.h | 102 + crypto/libecc/src/examples/hash/sha0.c | 264 + crypto/libecc/src/examples/hash/sha0.h | 135 + crypto/libecc/src/examples/hash/sha1.c | 264 + crypto/libecc/src/examples/hash/sha1.h | 135 + crypto/libecc/src/examples/hash/tdes.c | 492 + crypto/libecc/src/examples/hash/tdes.h | 77 + crypto/libecc/src/examples/sig/Makefile | 52 + crypto/libecc/src/examples/sig/common/common.h | 248 + crypto/libecc/src/examples/sig/dsa/Makefile | 34 + crypto/libecc/src/examples/sig/dsa/dsa.c | 555 + crypto/libecc/src/examples/sig/dsa/dsa.h | 75 + .../libecc/src/examples/sig/gostr34_10_94/Makefile | 34 + .../src/examples/sig/gostr34_10_94/gostr34_10_94.c | 521 + .../src/examples/sig/gostr34_10_94/gostr34_10_94.h | 72 + crypto/libecc/src/examples/sig/kcdsa/Makefile | 37 + crypto/libecc/src/examples/sig/kcdsa/kcdsa.c | 759 + crypto/libecc/src/examples/sig/kcdsa/kcdsa.h | 72 + crypto/libecc/src/examples/sig/rsa/Makefile | 36 + crypto/libecc/src/examples/sig/rsa/rsa.c | 2057 + crypto/libecc/src/examples/sig/rsa/rsa.h | 187 + .../libecc/src/examples/sig/rsa/rsa_pkcs1_tests.h | 111724 +++ crypto/libecc/src/examples/sig/rsa/rsa_tests.h | 215 + crypto/libecc/src/examples/sig/sdsa/Makefile | 34 + crypto/libecc/src/examples/sig/sdsa/sdsa.c | 467 + crypto/libecc/src/examples/sig/sdsa/sdsa.h | 72 + crypto/libecc/src/examples/sss/Makefile | 44 + crypto/libecc/src/examples/sss/sss.c | 772 + crypto/libecc/src/examples/sss/sss.h | 98 + crypto/libecc/src/examples/sss/sss_private.h | 30 + crypto/libecc/src/external_deps/meson.build | 5 + crypto/libecc/src/external_deps/print.c | 31 + crypto/libecc/src/external_deps/rand.c | 121 + crypto/libecc/src/external_deps/time.c | 72 + crypto/libecc/src/fp/fp.c | 470 + crypto/libecc/src/fp/fp_add.c | 140 + crypto/libecc/src/fp/fp_montgomery.c | 91 + crypto/libecc/src/fp/fp_mul.c | 138 + crypto/libecc/src/fp/fp_mul_redc1.c | 112 + crypto/libecc/src/fp/fp_pow.c | 79 + crypto/libecc/src/fp/fp_rand.c | 34 + crypto/libecc/src/fp/fp_sqrt.c | 281 + crypto/libecc/src/fp/meson.build | 10 + crypto/libecc/src/hash/bash.c | 138 + crypto/libecc/src/hash/bash224.c | 110 + crypto/libecc/src/hash/bash256.c | 110 + crypto/libecc/src/hash/bash384.c | 114 + crypto/libecc/src/hash/bash512.c | 110 + crypto/libecc/src/hash/belt-hash.c | 471 + crypto/libecc/src/hash/hash_algs.c | 429 + crypto/libecc/src/hash/hmac.c | 185 + crypto/libecc/src/hash/meson.build | 27 + crypto/libecc/src/hash/ripemd160.c | 348 + crypto/libecc/src/hash/sha224.c | 250 + crypto/libecc/src/hash/sha256.c | 241 + crypto/libecc/src/hash/sha3-224.c | 115 + crypto/libecc/src/hash/sha3-256.c | 115 + crypto/libecc/src/hash/sha3-384.c | 119 + crypto/libecc/src/hash/sha3-512.c | 115 + crypto/libecc/src/hash/sha3.c | 116 + crypto/libecc/src/hash/sha384.c | 255 + crypto/libecc/src/hash/sha512-224.c | 124 + crypto/libecc/src/hash/sha512-256.c | 124 + crypto/libecc/src/hash/sha512.c | 125 + crypto/libecc/src/hash/sha512_core.c | 189 + crypto/libecc/src/hash/shake.c | 103 + crypto/libecc/src/hash/shake256.c | 96 + crypto/libecc/src/hash/sm3.c | 360 + crypto/libecc/src/hash/streebog.c | 344 + crypto/libecc/src/nn/meson.build | 11 + crypto/libecc/src/nn/nn.c | 608 + crypto/libecc/src/nn/nn_add.c | 613 + crypto/libecc/src/nn/nn_div.c | 1271 + crypto/libecc/src/nn/nn_div.h | 43 + crypto/libecc/src/nn/nn_logical.c | 577 + crypto/libecc/src/nn/nn_mod_pow.c | 334 + crypto/libecc/src/nn/nn_modinv.c | 587 + crypto/libecc/src/nn/nn_mul.c | 197 + crypto/libecc/src/nn/nn_mul.h | 29 + crypto/libecc/src/nn/nn_mul_redc1.c | 342 + crypto/libecc/src/nn/nn_rand.c | 133 + crypto/libecc/src/sig/bign.c | 79 + crypto/libecc/src/sig/bign_common.c | 1001 + crypto/libecc/src/sig/bip0340.c | 1325 + crypto/libecc/src/sig/dbign.c | 115 + crypto/libecc/src/sig/decdsa.c | 121 + crypto/libecc/src/sig/ec_key.c | 620 + crypto/libecc/src/sig/ecdsa.c | 85 + crypto/libecc/src/sig/ecdsa_common.c | 1039 + crypto/libecc/src/sig/ecfsdsa.c | 1087 + crypto/libecc/src/sig/ecgdsa.c | 621 + crypto/libecc/src/sig/eckcdsa.c | 841 + crypto/libecc/src/sig/ecosdsa.c | 99 + crypto/libecc/src/sig/ecrdsa.c | 623 + crypto/libecc/src/sig/ecsdsa.c | 97 + crypto/libecc/src/sig/ecsdsa_common.c | 632 + crypto/libecc/src/sig/eddsa.c | 2935 + crypto/libecc/src/sig/fuzzing_ecdsa.c | 434 + crypto/libecc/src/sig/fuzzing_ecgdsa.c | 391 + crypto/libecc/src/sig/fuzzing_ecrdsa.c | 425 + crypto/libecc/src/sig/meson.build | 26 + crypto/libecc/src/sig/sig_algs.c | 1112 + crypto/libecc/src/sig/sm2.c | 724 + crypto/libecc/src/tests/bign_test_vectors.h | 448 + crypto/libecc/src/tests/bip0340_test_vectors.h | 204 + crypto/libecc/src/tests/dbign_test_vectors.h | 232 + crypto/libecc/src/tests/decdsa_test_vectors.h | 1362 + crypto/libecc/src/tests/ec_self_tests.c | 302 + crypto/libecc/src/tests/ec_self_tests.h | 21 + crypto/libecc/src/tests/ec_self_tests_core.c | 1975 + crypto/libecc/src/tests/ec_self_tests_core.h | 5757 + crypto/libecc/src/tests/ec_utils.c | 1878 + crypto/libecc/src/tests/ecccdh_test_vectors.h | 3750 + crypto/libecc/src/tests/ed25519_test_vectors.h | 24610 + crypto/libecc/src/tests/ed25519ctx_test_vectors.h | 138 + crypto/libecc/src/tests/ed25519ph_test_vectors.h | 45 + crypto/libecc/src/tests/ed448_test_vectors.h | 317 + crypto/libecc/src/tests/ed448ph_test_vectors.h | 74 + crypto/libecc/src/tests/meson.build | 55 + crypto/libecc/src/tests/x25519_test_vectors.h | 142 + crypto/libecc/src/tests/x448_test_vectors.h | 75 + crypto/libecc/src/utils/meson.build | 15 + crypto/libecc/src/utils/print_buf.c | 31 + crypto/libecc/src/utils/print_curves.c | 76 + crypto/libecc/src/utils/print_fp.c | 65 + crypto/libecc/src/utils/print_keys.c | 42 + crypto/libecc/src/utils/print_nn.c | 37 + crypto/libecc/src/utils/utils.c | 233 + crypto/libecc/src/utils/utils_rand.c | 51 + crypto/libecc/src/utils/utils_rand.h | 22 + crypto/libecc/src/wycheproof_tests/Makefile | 17 + .../src/wycheproof_tests/libecc_wycheproof.c | 838 + .../src/wycheproof_tests/libecc_wycheproof.h | 151 + .../src/wycheproof_tests/libecc_wycheproof_tests.h | 728074 ++++++++++++++++++ crypto/libecc/support/meson/armv7em-noneabi.ini | 17 + 344 files changed, 959066 insertions(+) diff --cc crypto/libecc/.github/workflows/libecc_cifuzz.yml index 000000000000,d315da238fc6..d315da238fc6 mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_cifuzz.yml +++ b/crypto/libecc/.github/workflows/libecc_cifuzz.yml diff --cc crypto/libecc/.github/workflows/libecc_compilation_tests.yml index 000000000000,76aae957f362..76aae957f362 mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_compilation_tests.yml +++ b/crypto/libecc/.github/workflows/libecc_compilation_tests.yml diff --cc crypto/libecc/.github/workflows/libecc_crossarch_tests.yml index 000000000000,93dbca1b5719..93dbca1b5719 mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_crossarch_tests.yml +++ b/crypto/libecc/.github/workflows/libecc_crossarch_tests.yml diff --cc crypto/libecc/.github/workflows/libecc_examples.yml index 000000000000,f50e6da9ee60..f50e6da9ee60 mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_examples.yml +++ b/crypto/libecc/.github/workflows/libecc_examples.yml diff --cc crypto/libecc/.github/workflows/libecc_meson_build.yml index 000000000000,e942ae9c2470..e942ae9c2470 mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_meson_build.yml +++ b/crypto/libecc/.github/workflows/libecc_meson_build.yml diff --cc crypto/libecc/.github/workflows/libecc_python_tests.yml index 000000000000,895760f7369e..895760f7369e mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_python_tests.yml +++ b/crypto/libecc/.github/workflows/libecc_python_tests.yml diff --cc crypto/libecc/.github/workflows/libecc_runtime_tests.yml index 000000000000,2432511a1be0..2432511a1be0 mode 000000,100644..100644 --- a/crypto/libecc/.github/workflows/libecc_runtime_tests.yml +++ b/crypto/libecc/.github/workflows/libecc_runtime_tests.yml diff --cc crypto/libecc/.gitignore index 000000000000,000000000000..da8ab177478b new file mode 100644 --- /dev/null +++ b/crypto/libecc/.gitignore @@@ -1,0 -1,0 +1,4 @@@ ++*.o ++*.d ++*~ ++*.su diff --cc crypto/libecc/.travis.yml index 000000000000,45f70324466f..45f70324466f mode 000000,100644..100644 --- a/crypto/libecc/.travis.yml +++ b/crypto/libecc/.travis.yml diff --cc crypto/libecc/LICENSE index 000000000000,20d677be5596..20d677be5596 mode 000000,100644..100644 --- a/crypto/libecc/LICENSE +++ b/crypto/libecc/LICENSE diff --cc crypto/libecc/Makefile index 000000000000,000000000000..ead3dc3ce3cc new file mode 100644 --- /dev/null +++ b/crypto/libecc/Makefile @@@ -1,0 -1,0 +1,175 @@@ ++.SUFFIXES: ++ ++# Where to put generated objects ++BUILD_DIR ?= build ++# Default to the previous behaviour and keep generated .o & .d files next to the source code ++OBJ_DIR ?=. ++include common.mk ++ ++ ++# Static libraries to build ++LIBS = $(LIBARITH) $(LIBEC) $(LIBSIGN) ++ ++# Compile dynamic libraries if the user asked to ++ifeq ($(WITH_DYNAMIC_LIBS),1) ++LIBS += $(LIBARITH_DYN) $(LIBEC_DYN) $(LIBSIGN_DYN) ++endif ++ ++# Executables to build ++TESTS_EXEC = $(BUILD_DIR)/ec_self_tests $(BUILD_DIR)/ec_utils ++# We also compile executables with dynamic linking if asked to ++ifeq ($(WITH_DYNAMIC_LIBS),1) ++TESTS_EXEC += $(BUILD_DIR)/ec_self_tests_dyn $(BUILD_DIR)/ec_utils_dyn ++endif ++ ++EXEC_TO_CLEAN = $(BUILD_DIR)/ec_self_tests $(BUILD_DIR)/ec_utils $(BUILD_DIR)/ec_self_tests_dyn $(BUILD_DIR)/ec_utils_dyn ++ ++# all and clean, as you might expect ++all: $(LIBS) $(TESTS_EXEC) ++ ++# Default object files extension ++OBJ_FILES_EXTENSION ?= o ++ ++clean: ++ @rm -f $(LIBS) $(EXEC_TO_CLEAN) ++ @find $(OBJ_DIR)/ -name '*.$(OBJ_FILES_EXTENSION)' -exec rm -f '{}' \; ++ @find $(OBJ_DIR)/ -name '*.d' -exec rm -f '{}' \; ++ @find $(BUILD_DIR)/ -name '*.a' -exec rm -f '{}' \; ++ @find $(BUILD_DIR)/ -name '*.so' -exec rm -f '{}' \; ++ @find . -name '*~' -exec rm -f '{}' \; ++ ++ ++ ++# --- Source Code --- ++ ++# external dependencies ++EXT_DEPS_SRC = $(wildcard src/external_deps/*.c) ++ ++# utils module (for the ARITH layer, we only need ++# NN and FP - and not curves - related stuff. Same goes ++# for EC and SIGN. Hence the distinction between three ++# sets of utils objects. ++UTILS_ARITH_SRC = src/utils/utils.c src/utils/utils_rand.c ++UTILS_ARITH_SRC += $(wildcard src/utils/*_nn.c) ++UTILS_ARITH_SRC += $(wildcard src/utils/*_fp.c) ++UTILS_ARITH_SRC += $(wildcard src/utils/*_buf.c) ++UTILS_EC_SRC = $(wildcard src/utils/*_curves.c) ++UTILS_SIGN_SRC = $(wildcard src/utils/*_keys.c) ++ ++# nn module ++NN_SRC = $(wildcard src/nn/n*.c) ++ ++# fp module ++FP_SRC = $(wildcard src/fp/fp*.c) ++ ++# curve module ++CURVES_SRC = $(wildcard src/curves/*.c) ++ ++# Hash module ++HASH_SRC = $(wildcard src/hash/sha*.c) $(wildcard src/hash/bash*.c) src/hash/hash_algs.c src/hash/sm3.c src/hash/streebog.c src/hash/ripemd160.c src/hash/belt-hash.c src/hash/hmac.c ++ ++# Key/Signature/Verification/ECDH module ++SIG_SRC = $(wildcard src/sig/*dsa.c) src/sig/ecdsa_common.c src/sig/ecsdsa_common.c src/sig/sig_algs.c src/sig/sm2.c src/sig/bign_common.c src/sig/bign.c src/sig/dbign.c src/sig/bip0340.c ++ECDH_SRC = $(wildcard src/ecdh/*.c) ++KEY_SRC = src/sig/ec_key.c ++ ++# Test elements ++TESTS_OBJECTS_CORE_SRC = src/tests/ec_self_tests_core.c ++TESTS_OBJECTS_SELF_SRC = src/tests/ec_self_tests.c ++TESTS_OBJECTS_UTILS_SRC = src/tests/ec_utils.c ++ ++ ++ ++# --- Static Libraries --- ++ ++LIBARITH_SRC = $(FP_SRC) $(NN_SRC) $(UTILS_ARITH_SRC) ++LIBARITH_OBJECTS = $(patsubst %,$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION),$(basename $(LIBARITH_SRC))) ++$(LIBARITH): $(LIBARITH_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(AR) $(AR_FLAGS) $@ $^ ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(RANLIB) $(RANLIB_FLAGS) $@ ++ ++LIBEC_SRC = $(LIBARITH_SRC) $(CURVES_SRC) $(UTILS_EC_SRC) ++LIBEC_OBJECTS = $(patsubst %,$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION),$(basename $(LIBEC_SRC))) ++$(LIBEC): $(LIBEC_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(AR) $(AR_FLAGS) $@ $^ ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(RANLIB) $(RANLIB_FLAGS) $@ ++ ++LIBSIGN_SRC = $(LIBEC_SRC) $(HASH_SRC) $(SIG_SRC) $(KEY_SRC) $(UTILS_SIGN_SRC) $(ECDH_SRC) ++LIBSIGN_OBJECTS = $(patsubst %,$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION),$(basename $(LIBSIGN_SRC))) ++$(LIBSIGN): $(LIBSIGN_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(AR) $(AR_FLAGS) $@ $^ ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(RANLIB) $(RANLIB_FLAGS) $@ ++ ++ ++ ++# --- Dynamic Libraries --- ++ ++$(LIBARITH_DYN): $(LIBARITH_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(LIB_CFLAGS) $(LIB_DYN_LDFLAGS) $^ -o $@ ++ ++$(LIBEC_DYN): $(LIBEC_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(LIB_CFLAGS) $(LIB_DYN_LDFLAGS) $^ -o $@ ++ ++$(LIBSIGN_DYN): $(LIBSIGN_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(LIB_CFLAGS) $(LIB_DYN_LDFLAGS) $^ -o $@ ++ ++ ++ ++# --- Executables (Static linkage with libsign object files) --- ++ ++EC_SELF_TESTS_SRC = $(TESTS_OBJECTS_CORE_SRC) $(TESTS_OBJECTS_SELF_SRC) $(EXT_DEPS_SRC) ++EC_SELF_TESTS_OBJECTS = $(patsubst %,$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION),$(basename $(EC_SELF_TESTS_SRC))) ++$(BUILD_DIR)/ec_self_tests: $(EC_SELF_TESTS_OBJECTS) $(LIBSIGN_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) $^ -o $@ ++ ++EC_UTILS_SRC = $(TESTS_OBJECTS_CORE_SRC) $(TESTS_OBJECTS_UTILS_SRC) $(EXT_DEPS_SRC) ++EC_UTILS_OBJECTS = $(patsubst %,$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION),$(basename $(EC_UTILS_SRC))) ++$(BUILD_DIR)/ec_utils: $(EC_UTILS_SRC) $(LIBSIGN_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) -DWITH_STDLIB $^ -o $@ ++ ++ ++ ++# --- Excutables (Dynamic linkage with libsign shared library) --- ++ ++$(BUILD_DIR)/ec_self_tests_dyn: $(EC_SELF_TESTS_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) -L$(BUILD_DIR) $^ -lsign -o $@ ++ ++$(BUILD_DIR)/ec_utils_dyn: $(EC_UTILS_OBJECTS) ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) -L$(BUILD_DIR) -DWITH_STDLIB $^ -lsign -o $@ ++ ++ ++ ++.PHONY: all clean 16 32 64 debug debug16 debug32 debug64 force_arch32 force_arch64 ++ ++# All source files, used to construct general rules ++SRC += $(EXT_DEPS_SRC) $(UTILS_ARITH_SRC) $(UTILS_EC_SRC) $(UTILS_SIGN_SRC) ++SRC += $(NN_SRC) $(FP_SRC) $(CURVES_SRC) $(HASH_SRC) $(SIG_SRC) $(ECDH_SRC) ++SRC += $(KEY_SRC) $(TESTS_OBJECTS_CORE_SRC) $(TESTS_OBJECTS_SELF_SRC) ++SRC += $(TESTS_OBJECTS_UTILS_SRC) ++ ++# All object files ++OBJS = $(patsubst %,$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION),$(basename $(SRC))) ++ ++# General dependency rule between .o and .d files ++DEPS = $(OBJS:.$(OBJ_FILES_EXTENSION)=.d) ++ ++# General rule for creating .o (and .d) file from .c ++$(OBJ_DIR)/%.$(OBJ_FILES_EXTENSION): %.c ++ $(VERBOSE_MAKE)$(CROSS_COMPILE)$(CC) -c $(LIB_CFLAGS) -o $@ $< ++ ++# Populate the directory structure to contain the .o and .d files, if necessary ++$(shell mkdir -p $(dir $(OBJS)) >/dev/null) ++$(shell mkdir -p $(BUILD_DIR) >/dev/null) ++ ++# Make a note of the MAKEFILE_LIST at this stage of parsing the Makefile ++# It is important here to use the ':=' operator so it is evaluated only once, ++# and to do this before all the DEPS files are included as makefiles. ++MAKEFILES:=$(MAKEFILE_LIST) ++ ++# Make object files depend on all makefiles used - this forces a rebuild if any ++# of the makefiles are changed ++$(OBJS) : $(MAKEFILES) ++ ++# Dep files are makefiles that keep track of which header files are used by the ++# c source code. Include them to allow them to work correctly. ++-include $(DEPS) diff --cc crypto/libecc/README.md index 000000000000,000000000000..2972ab1708bb new file mode 100644 --- /dev/null +++ b/crypto/libecc/README.md @@@ -1,0 -1,0 +1,1345 @@@ ++[![compilation](https://github.com/libecc/libecc/actions/workflows/libecc_compilation_tests.yml/badge.svg?branch=master)](https://github.com/libecc/libecc/actions/workflows/libecc_compilation_tests.yml) ++[![runtime](https://github.com/libecc/libecc/actions/workflows/libecc_runtime_tests.yml/badge.svg?branch=master)](https://github.com/libecc/libecc/actions/workflows/libecc_runtime_tests.yml) ++[![crossarch](https://github.com/libecc/libecc/actions/workflows/libecc_crossarch_tests.yml/badge.svg?branch=master)](https://github.com/libecc/libecc/actions/workflows/libecc_crossarch_tests.yml) ++[![python](https://github.com/libecc/libecc/actions/workflows/libecc_python_tests.yml/badge.svg?branch=master)](https://github.com/libecc/libecc/actions/workflows/libecc_python_tests.yml) ++[![examples](https://github.com/libecc/libecc/actions/workflows/libecc_examples.yml/badge.svg?branch=master)](https://github.com/libecc/libecc/actions/workflows/libecc_examples.yml) ++ ++ ++# libecc project ++ ++## Copyright and license ++Copyright (C) 2017-2023 ++ ++This software is licensed under a dual BSD and GPL v2 license. ++See [LICENSE](LICENSE) file at the root folder of the project. ++ ++## Authors ++ ++ * Ryad BENADJILA () ++ * Arnaud EBALARD () ++ * Jean-Pierre FLORI () ++ ++## Contributors ++ * Nicolas VIVET () ++ * Karim KHALFALLAH () ++ * Niels SAMWEL () ++ ++## Description ++This software implements a library for elliptic curves based ++cryptography (ECC). The API supports signature algorithms specified ++in the [ISO 14888-3:2018](https://www.iso.org/standard/76382.html) ++standard and some other signature algorithms as well as ECDH primitives, with the following specific curves and hash functions: ++ ++ * **Signatures**: ++ * Core ISO 14888-3:2018 algorithms: ECDSA, ECKCDSA, ECGDSA, ECRDSA, EC{,O}SDSA, ECFSDSA, SM2. ++ * EdDSA (25519 and 448 as specified in [RFC 8032](https://datatracker.ietf.org/doc/html/rfc8032)). ++ * BIGN (as standardized in [STB 34.101.45-2013](https://github.com/bcrypto/bign)). We allow a more lax usage of ++ BIGN than in the standard as we allow any curve and any hash function. ++ * BIP0340, also known as the "Schnorr" Bitcoin proposal, as specified in [bip-0340](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki). ++ We allow a more lax usage of BIP0340 than the standard as we allow any curve and any hash function (the standard mandates SECP256K1 with SHA-256). ++ ++ * **ECDH**: ++ * ECC-CDH (Elliptic Curve Cryptography Cofactor Diffie-Hellman) as described in [section 5.7.1.2 of the NIST SP 800-56A Rev. 3](https://csrc.nist.gov/publications/detail/sp/800-56a/rev-3/final) standard. ++ * X25519 and X448 as specified in [RFC7748](https://datatracker.ietf.org/doc/html/rfc7748) (with some specificities, see the details below). ++ * **Curves**: SECP{192,224,256,384,521}R1, SECP{192,224,256}K1, BRAINPOOLP{192,224,256,320,384,512}{R1,T1}, ++ FRP256V1, GOST{256,512}, GOSTR3410-2001-CryptoPro{A,B,C,XchA,XchB,Test}-ParamSet, GOSTR3410-2012-{256,512}-ParamSet{A,B,C}, GOSTR3410-2012-256-ParamSetD, GOSTR3410-2012-512-ParamSetTest, SM2P256V1, SM2P{192,256}Test, WEI{25519,448}, BIGN{256,384,512}V1. The library can be easily expanded with ++ user defined curves using a standalone helper script. ++ * **Hash functions**: SHA-2 and SHA-3 hash functions (224, 256, 384, 512), SM3, RIPEMD-160, ++GOST 34.11-2012 as described in [RFC 6986](https://datatracker.ietf.org/doc/html/rfc6986) ++(also known as [Streebog](https://tc26.ru/en/events/research-projects-competition/streebog-competition.html)), ++SHAKE256 in its restricted version with 114 bytes output (mainly for Ed448), BELT-HASH (as standardized in ++[STB 34.101.31-2011](https://github.com/bcrypto/belt)), and BASH-{224,256,384,512} (as standardized in ++[STB 34.101.77-2020](http://apmi.bsu.by/assets/files/std/bash-spec24.pdf)). ++**HMAC** based on any of these hash functions is also included. ++ ++ECDSA comes in two variants: the classical non-deterministic one, and the **deterministic** ECDSA ++as described in [RFC 6979](https://datatracker.ietf.org/doc/html/rfc6979). The deterministic version ++generates nonces using a HMAC-DRBG process, and is suitable for situations where there is ++no RNG or where entropy sources are considered weak (please note that any leak on these nonces ++bits can lead to devastating attacks exploiting the [Hidden Number Problem](https://eprint.iacr.org/2020/615.pdf)). ++On the downside, the deterministic version of ECDSA is susceptible to [fault attacks](https://eprint.iacr.org/2017/1014.pdf). ++Hence, one will have to **carefully select** the suitable version to use depending on the usage and ++attack context (i.e. which of side-channel attacks or fault attacks are easier to perform). ++The same applies to BIGN that comes in two flavours as standardized in [STB 34.101.45-2013](https://github.com/bcrypto/bign): ++non-deterministic and deterministic (following an iterative generation process using the BELT hash function and its underlying block cipher). ++ ++The library also supports EdDSA (Ed25519 and Ed448) as defined in [RFC 8032](https://datatracker.ietf.org/doc/html/rfc8032) with ++all their variants (with context, pre-hashed). ++Since the core of the library supports short Weierstrass curves, and as ++EdDSA uses instead Twisted Edwards curves with dedicated formulas, we use ++**isogenies** as described in the [lwig-curve-representations](https://datatracker.ietf.org/doc/html/draft-ietf-lwig-curve-representations) ++draft. Isogenies are transformations (homomorphisms that are almost isomorphisms) between ++curves models, allowing to implement operations on one model by operating with ++formulas on another model. Concretely, in our case we perform computations on ++the Weierstrass WEI25519 that is isogenic to Ed25519 (Twisted Edwards) ++and Curve25519 (Montgomery) curves. This, of course, induces overheads in computations ++while having the great benefit of keeping the library core mathematical foundations simple ++and keep the defense-in-depth (regarding software security and side-channels) focused on ++a rather limited part: see the discussions below on libecc efforts with regards to security. ++ ++Please note that as for deterministic ECDSA and BIGN, EdDSA signatures are trivially susceptible to ++[fault attacks](https://eprint.iacr.org/2017/1014.pdf) without having a non-deterministic ++variant. Hence, when using EdDSA one will have to either ensure that the usage context naturally prevents ++such attacks, that the platform implements countermeasures (e.g. using secure MCUs, etc.) or that ++other means allow to detect/mitigate such attacks (e.g. on the compilation toolchain side). ++ ++Please refer to [this CFRG thread](https://mailarchive.ietf.org/arch/browse/cfrg/?gbt=1&index=5l3XCLHLCVfOmnkcv4mo2-pEV94) ++for more insight on why deterministic versus non-deterministic EC signature schemes is still an open debate ++and how the usage context and **attack model** is **crucial** when choosing to use one or the other. ++ ++ ++**Batch verification** is implemented for the signature algorithms that support it - the signature schemes ++that preserve some "reversible" projective point coordinate information in the signature value. ++This is the case for some "Schnorr" based schemes, namely ECFSDSA ("full Schnorr" from ISO14888-3), EdDSA and BIP0340. ++Batch verification allows (thanks to the Bos-Coster algorithm) to bring speedups between 2 to 6.5 times ++the regular verification for batches of at least 10 signatures, which is not negligible depending on the usage. ++Beware that for the specific case of BIP0340, results might depend on the underlying prime of the curve, since ++the batch verification makes heavy use of square root residues and the Tonelli-Shanks algorithm complexity ++is sensitive to the prime "form" (e.g. is equal to 1 modulo 4, etc.). Finally, beware that the speedup of ++batch verification comes at an increased memory cost: the Bos-Coster algorithm requires a scratchpad memory space ++that increases linearly with the number of signatures to be checked. ++ ++ ++Regarding the specific case of ECRDSA (the Russian standard), libecc implements by default the ++[RFC 7091](https://datatracker.ietf.org/doc/html/rfc7091) and [draft-deremin-rfc4491-bis](https://datatracker.ietf.org/doc/html/draft-deremin-rfc4491-bis) ++versions to comply with the standard test vectors (provided in the form of X.509 certificates). ++This version of the algorithm **differs** from the ISO/IEC 14888-3 description and test vectors, ++the main difference coming from the way the hash of the message to be signed/verified is processed: ++in the RFCs, the little endian representation of the hash is taken as big number while in ISO/IEC the big endian ++representation is used. This seems (to be confirmed) to be a discrepancy of ISO/IEC 14888-3 algorithm description ++that must be fixed there. In order to allow users to still be able to reproduce the ISO/IEC behavior, we provide ++a compilation toggle that will force this mode `USE_ISO14888_3_ECRDSA=1`: ++ ++
++	$ USE_ISO14888_3_ECRDSA=1 make
++
++ ++**ECDH (Elliptic Curve Diffie-Hellman)** variants are also implemented in the ++library. Classical ECDH over Weierstrass curves is implemented in the form ++of ECC-CDH (Elliptic Curve Cryptography Cofactor Diffie-Hellman) as described ++in [section 5.7.1.2 of the NIST SP 800-56A Rev. 3](https://csrc.nist.gov/publications/detail/sp/800-56a/rev-3/final) standard. Montgomery curves ++based algorithms (Curve25519 and Curve448) are included as specified in [RFC7748](https://datatracker.ietf.org/doc/html/rfc7748), ++although the implementation somehow diverges from the canonical ones as u coordinates on the curve ++quadratic twist are rejected (this is due to the underlying usage of isogenies to ++handle Montgomery curves). This divergence does not impact the ECDH use case though. ++ ++ ++Advanced usages of this library also include the possible implementation ++of elliptic curve based protocols as well as any algorithm ++on top of prime fields based elliptic curves (or prime fields, or rings ++of integers). Many examples are present in the [src/examples](src/examples) ++folder, notable ones being: ++ * Pollard-Rho, Miller-Rabin and square residues over finite fields. ++ * The RSA cryptosystem as defined in the PKCS#1 [RFC8017](https://datatracker.ietf.org/doc/html/rfc8017) ++standard. This implementation also comes with the integration of deprecated hash ++functions such as MD2, MD4, MD5, SHA-0, SHA-1, MDC-2, GOSTR34-11-94 and so on in order to be compliant with existing ++signatures (e.g. in X.509). These primitives are **not** included in the core ++library on purpose: they are **dangerous and broken** and must only be used for ++tests purposes. ++ * The DSA cryptosystem as defined in [FIPS 186-4](https://csrc.nist.gov/publications/detail/fips/186/4/final). ++ * The SDSA (Schnorr DSA) as defined in ISO14888-3 ++ * The KCDSA (Korean DSA) as defined in ISO14888-3 ++ * The GOSTR34-10-94 function as defined in [RFC4491](https://www.rfc-editor.org/rfc/rfc4491) ++ * The SSS (Shamir Secret Sharing) algorithm over a prime field of 256 bits. ++ ++ ++**NOTE**: for all the primitives (specifically relevant for signature primitives), a maximum ++allowed size for big numbers is **4096 bits** with word size **64 bits** (this will be less ++for word sizes 16 and 32 bits). This is due to an internal limitation of libecc ++on big numbers allocation documented [here](include/libecc/nn/nn_config.h). We can live with ++this limitation as the library is primarily intended to focus on ECC based algorithms. ++However, one should be aware that for example RSA with modulus > 4096 will fail (as well ++and DSA and other El-Gamal based algorithms): these primitives are only included as ++examples and should be used with care. ++ ++**NOTE**: handling 4096 bits NN numbers must be explicitly configured at compilation ++time using the `-DUSER_NN_BIT_LEN=4096` toggle in the `CFLAGS` or `EXTRA_CFLAGS` as explained ++in [the dedicated section](https://github.com/ANSSI-FR/libecc#modifying-the-big-numbers-size). ++ ++ ++Compared to other cryptographic libraries providing such ++features, the differentiating points are: ++ ++ * A focus on code readability and auditability. The code is pure C99, ++ with no dynamic allocation and includes pre/post-asserts in the code. ++ Hence, this library is a good candidate for embedded targets (it should be ++ easily portable accross various platforms). ++ * A clean layer separation for all needed mathematical abstractions and ++ operations. Strong typing (as "strong" as C99 allows, of course) of ++ mathematical objects has been used in each layer. ++ * The library has NOT been designed to break performance records, though ++ it does a decent job (see the [performance section discussion](#performance)). Similarly, ++ the library memory footprint (in terms of ROM and RAM usage) is not the ++ smallest achievable one (though some efforts have been made to limit it ++ and fit "common" platforms, see the [dedicated section](#constrained-devices)). ++ * libecc library core has **no external dependency** (not even the standard ++ libc library) to make it portable. See the ++ [section about portability](#compatibility-and-portability) for more information. ++ ++## Building ++ ++### Building the static libraries and the signature self tests ++ ++The main [Makefile](Makefile) is in the root directory, and compiling is as simple as ++executing: ++ ++
++	$ make
++
++ ++By default, compilation is quiet. **Verbose compilation** (i.e. showing all the compilation ++executed commands) can be achieved using the `VERBOSE=1` toggle: ++ ++
++	$ VERBOSE=1 make
++
++ ++This will compile different elements in the [build](build/) directory: ++ ++ * Three **archive** static libraries, each one containing (based on) the previous ones: ++ * **libarith.a**: this library contains the Natural Numbers (NN) and Finite field over primes ++ (Fp) arithmetic layers. ++ * **libec.a**: this library is based on libarith.a and contains the EC curves implementation ++ (points abstraction, point addition/doubling formulas and scalar multiplication). ++ * **libsign.a**: this library is based on libec.a and contains all our ISO 14888-3 signature ++ algorithms over some statically defined curves and hash functions. ++ * Two binaries based on the libsign.a static library: ++ * **ec\_self\_tests**: the self tests for signature/verification algorithm of ISO 14888-3 ++ with known and random test vectors, as well as performance tests. Launching the self tests without ++ an argument will execute the three tests (known and fixed test vectors, random sign/verify ++ checks, and performance measurements). One can also launch each test separately. ++ ++        For known test vectors: ++
++	$ ./build/ec_self_tests vectors
++	======= Known test vectors test ===================
++	[+] ECDSA-SHA224/secp224r1 selftests: known test vectors sig/verif ok
++	[+] ECDSA-SHA256/secp256r1 selftests: known test vectors sig/verif ok
++	[+] ECDSA-SHA512/secp256r1 selftests: known test vectors sig/verif ok
++	...
++
++ ++        For sign/verify checks (with random key pairs and random data): ++ ++
++	$ ./build/ec_self_tests rand
++	======= Random sig/verif test ===================
++	[+]  ECDSA-SHA224/FRP256V1 randtests: random import/export with sig(0)/verif(0) ok
++	[+] ECDSA-SHA224/SECP224R1 randtests: random import/export with sig(0)/verif(0) ok
++	...
++
++ ++        For performance measurements: ++ ++
++	$ ./build/ec_self_tests perf
++	======= Performance test =====================
++	[+]  ECDSA-SHA224/FRP256V1 perf: 462 sign/s and 243 verif/s
++	[+] ECDSA-SHA224/SECP224R1 perf: 533 sign/s and 276 verif/s
++	...
++
++ ++**NOTE**: it is possible to parallelize self tests (known and random) using the ++[OpenMP](https://en.wikipedia.org/wiki/OpenMP) framework (usually packaged with ++most distros) by using the `OPENMP_SELF_TESTS=1` compilation toggle. This requires ++the `WITH_STDLIB` option (as it obviously uses the standard library). Performance ++tests are not parallelized due to possible shared ressources exhaustion between CPUs and cores ++(e.g. caches, Branch Prediction Units, etc.). ++ ++- **ec\_utils**: a tool for signing and verifying user defined files, with a user ++provided signature algorithm/curve/hash function triplet. The tool can also be ++used to generate signature keys. ++ ++        Generate keys for ECKCDSA over the BRAINPOOLP512R1 curve, with ++the 'mykeypair' prefix: ++
++	$ ./build/ec_utils gen_keys BRAINPOOLP512R1 ECKCDSA mykeypair
++
++ ++        This will create four files. Two ++binary '.bin' files corresponding to the private key (mykeypair\_private\_key.bin) ++and the public key (mykeypair\_public\_key.bin). Two header '.h' files are also ++created, corresponding to a C style header version of the keys so that these can ++be included and used in a C program using libecc. Note that both kind of keys ++(public and private) include leading metadata (type, algorithm, curve, etc) for ++possible sanity checks when they are used (e.g. to detect passing of an ECDSA ++private key to an ECKCDSA signature call, etc). ++ ++        Once the key pair has been created, ++one can sign a raw binary file named 'myfile' and store the signature in ++'sig.bin'. In the example below, we use SHA3\_512 as the hash function for ++the signature. BRAINPOOLP512R1 and ECKCDSA are explicitly given (matching the ++type of key we generated during previous step). Note that the call would yield ++an error if invalid parameters were given (thanks to the metadata elements ++described above). ++
++	$ ./build/ec_utils sign BRAINPOOLP512R1 ECKCDSA SHA3_512 myfile mykeypair_private_key.bin sig.bin
++
++        After this, a raw signature is created, mainly consisting of the ECKCDSA (r, s) big ++numbers concatenated (the length of this file should be 1024 bits = 2 x 512 bits). The signature can now be verified with ++the 'verify' command and the public key, the result being either **OK** or **failed**: ++
++	$ ./build/ec_utils verify BRAINPOOLP512R1 ECKCDSA SHA3_512 myfile mykeypair_public_key.bin sig.bin
++	  Signature check of myfile OK
++
++ ++        The ec\_utils tool can also be used to produce/verify **structured binaries** ++containing a header, raw binary and their signature (see the 'struct\_sign' and 'struct\_verify' commands for a help on ++this mode). The rationale behind these commands is to ease the production/verification of self-contained signed images ++(which can be useful when dealing with embedded firmware updates for instance). ++ ++### Building the user examples ++ ++Since it is possible to use libecc as a NN (**positive** Natural Numbers), Fp (Finite field over primes) or EC curve layer library, ++we provide some examples in the [src/examples](src/examples) folder. Compiling these examples is as simple as: ++
++	$ cd src/examples
++	$ make
++
++ ++* NN layer examples: ++ * [src/examples/basic/nn_miller_rabin.c](src/examples/basic/nn_miller_rabin.c): this example implements the ++ [Miller-Rabin](https://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test) composition (or probabilistic primality) test as ++ described in the [Handbook of Applied Cryptography (4.29)](http://cacr.uwaterloo.ca/hac/about/chap4.pdf). ++ * [src/examples/basic/nn_pollard_rho.c](src/examples/nn_pollard_rho.c): this example is a straightforward ++ implementation of the [Pollard's Rho](https://en.wikipedia.org/wiki/Pollard%27s_rho_algorithm) integer factorization ++ algorithm as specified in the [Handbook of Applied Cryptography (3.9)](http://cacr.uwaterloo.ca/hac/about/chap3.pdf). ++ ++* Fp layer examples: ++ * [src/examples/basic/fp_square_residue.c](src/examples/basic/fp_square_residue.c): this is an implementation of ++ the [Tonelli-Shanks](https://en.wikipedia.org/wiki/Tonelli%E2%80%93Shanks_algorithm) algorithm for finding quadratic residues ++ over a prime field Fp. Given a prime field element x, the algorithm finds y so that y2 = x (or informs that there ++ is no solution if this is the case). ++ ++* Curves layer examples: ++ * [src/examples/basic/curve_basic_examples.c](src/examples/basic/curve_basic_examples.c): this example shows basic ++ features of libec for playing with elliptic curves group arithmetic, namely loading defined named curves, generating random points on ++ these curves, checking point addition and doubling formulas as well as scalar multiplication (both Montgomery and non Montgomery based). ++ ++ * [src/examples/basic/curve_ecdh.c](src/examples/basic/curve_ecdh.c): the purpose of this code is to provide a toy example of ++ how to implement an [Elliptic Curve Diffie-Hellman](https://en.wikipedia.org/wiki/Elliptic_curve_Diffie%E2%80%93Hellman) protocol between two ++ entities 'Alice' and 'Bob' in order to produce a shared secret over a public channel. ++ ++**WARNING**: these examples are **toy implementations** not to be used in a production environment (for instance, the code ++has neither been designed to be efficient nor robust against side channel attacks). Their purpose is only to show basic usage of the ++libarith and libec libraries. ++ ++The **public headers** containing the functions to be used by higher level code are [include/libecc/libarith.h](include/libecc/libarith.h), ++[include/libecc/libec.h](include/libecc/libec.h) and [include/libecc/libsig.h](include/libecc/libsig.h): they are respectively used for the NN and Fp arithmetic layers, ++the Elliptic Curves layer, and the signature layer. ++ ++More advanced examples are present in the examples folder: ++ ++* Obsolete hash algorithms as an expansion to libecc core algorithms, in [src/examples/hash](src/examples/hash) (MD2, MD4, MD5, MDC2, SHA-0, ++SHA-1, and TDES for supporting MDC2). Please **be careful** when using them, it is advised to use them as toy primitives in **non-production code** ++(e.g. for checking old protocols and cipher suites). ++ ++* Pre-ECC Signature schemes (based on Fp finite fields discrete logarithm) in [src/examples/sig](src/examples/sig) (RSA, DSA, SDSA, KCDSA, ++GOSTR34-10-94). Beware that for these signatures, you will have to expand the NN size to bigger values than the default (e.g. supporting RSA 4096 ++will need a size of at least 4096 bits for NN, see how to expand the size in the documentation [here](include/libecc/nn/nn_config.h)). Although some ++efforts have been made when developing these signature algorithms, using them in production code should be decided with care (e.g. regarding ++side-channel attack and so on). ++ ++* SSS (Shamir Secret Sharing) in [src/examples/sss](src/examples/sss). ++ ++ ++### Building the NN and Fp arithmetic tests ++ ++libecc is provided with arithmetic random tests for the low level NN and Fp routines (addition, subtraction, logical ++operations, multiplication and Montgomery multiplication, ...). ++ ++These tests are located inside the [src/arithmetic_tests/](src/arithmetic_tests/) folder. More specifically, the tests ++are split in two files: ++ ++* [src/arithmetic_tests/arithmetic_tests.c](src/arithmetic_tests/arithmetic_tests.c): a '.c' file to be compiled and linked with libecc ++static library and performing a set of tests given on the standard input or in a file. The tests have a specific ASCII ++format with expected input/output as big numbers, and crafted **opcodes** defining the operation type (addition over ++NN, over Fp, ...). ++* [src/arithmetic_tests/arithmetic_tests_generator.py](src/arithmetic_tests/arithmetic_tests_generator.py): a python ++script that generates a set of arithmetic tests. ++ ++### Building with the meson build system ++ ++In parallel to the `Makefile` build system, a migration to the newer and more user friendly `meson` build is a ++**work in progress**. Compiling with `meson` can be simply achieved with: ++ ++
++	$ meson setup builddir && cd builddir && meson dist
++
++ ++Please note that you will need `meson`, `ninja` and `dunamai` (that can be installed from the Python `pip` installer). ++ ++Most of libecc compilation options have been migrated, please check the output of the `meson configure` command to get ++a complete list of these (in the 'Project options' category). For instance, compiling libecc with a word size of 32 and ++a debug mode can be triggered with: ++ ++
++	$ meson setup -Dwith_wordsize=32 -Dwith_debug=true builddir && cd builddir && meson dist
++
++ ++## Configuring the libecc library ++ *** 2624 LINES SKIPPED *** From nobody Wed Jan 1 21:11:39 2025 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 4YNjFR5LDhz5jCpj; Wed, 01 Jan 2025 21:11:39 +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 4YNjFR37N8z4jlB; Wed, 1 Jan 2025 21:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765899; 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=mGJtjBPe8g3o6nx3G+H8IR9yfNR+dVvqwQxKrrpMbMs=; b=tKOj2VK5MY6UJYxMhneZ7Ef8fZYNVElA/wyvuWVIpmj49Pii6Z0Y3lDwqI4UlZWf2aMwtI 0QVoZpLqeyfuLas6/yBWSGMjtX7iR17sdBgrpZyWk+QPyIy/hyyUzZqmMN+1rXG8kTRWWx W505KrbNPSPrNcyQzw9sJC1tzSgN+fil4CfsX0OeygTRfhfkHG8j+rjbQaMpWvU3kb2AP4 WR/lXpnZlRLy98kWd7YPKO864Ns1yRjTSZub9qfMakXXDKXjtaPaudOexIJ7MTRNdkEaLF zUUjSE5OC6VXtguapOZVHR1+EIDtY0m6+1/p6UQQYxPJmz5szNcarcfyTtgBZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765899; 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=mGJtjBPe8g3o6nx3G+H8IR9yfNR+dVvqwQxKrrpMbMs=; b=aNTuF7F50wCvswKZWN9vLQ9zFsxmWohZjDI9cILORGngGamkyRRgMWSO4C7Qak/gXWJQKr nTMTc9QoFPG/V5yc1QlZL6XDWabjJdMQMW2cyT0MxEvOatCjFZJb8LLU3RcLKu/99+tiZA o0KzdR2BJHO7PGaydAiGdRFPnv3NsKY3/IlTzhVJ7PUiNX87hJjbjfzTybixhbC4E0Kjwn Cx0TLGsokOXC99Oby5V30CkdUYQMkrbuWe4InJX+wVZO4U+Q85ucFpJ1NmRh5p6kW5RHoM mXBTpr/IviAhSpcnQyO8jNWFH6Lv6vNVr1QcXbuvYiUHWG+t6MzAHaM6aetB9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765899; a=rsa-sha256; cv=none; b=S3tZzutTHnjLdGwxX6FJJAvS9H8ZI+RnFc8q1Kf5SugGEXXibItFEP5SUhg/JVWlR3xEhr PlpW3fFdpE3XItt2Uc9XJaOeg5QJxS/YeBjCFbktIGEzTDNcd746aom7Nm/xv3FX6Ss+iZ 7/IUj4vN7p/3QTdPQeURP6cW4Dp9zWLVMuw4EEHBVGH5HCVSdCrsjrumpSZ1LFzDQex6Rz KVxrOiXTEXz91GawRHepI9oyRmI0+ErYDYbMjBC2w1d97d6vepmAPCe7USZuD7OR36qleu q5oittNQYHF2uonaEyw2Qy4saIrCyMZNkEvMDX0o8TyezxmVBNC9D25e4WJSUw== 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 4YNjFR2htHzh3R; Wed, 1 Jan 2025 21:11:39 +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 501LBdTj079974; Wed, 1 Jan 2025 21:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBdmJ079971; Wed, 1 Jan 2025 21:11:39 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:39 GMT Message-Id: <202501012111.501LBdmJ079971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 05427f4639bc - main - secure: hook up libecc as libpkgecc 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 05427f4639bcf2703329a9be9d25ec09bb782742 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=05427f4639bcf2703329a9be9d25ec09bb782742 commit 05427f4639bcf2703329a9be9d25ec09bb782742 Author: Kyle Evans AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:22 +0000 secure: hook up libecc as libpkgecc libecc is not intended to be general use, other applications should really be using openssl. pkg(7) uses libecc to align with the pkg(8) project and its goals. This will be used in the upcoming support for ECC in pkg(7). Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D48117 --- secure/lib/Makefile | 2 +- secure/lib/libpkgecc/Makefile | 137 +++++++++++++++++++++++++++++++++ secure/lib/libpkgecc/pkg_libecc_rand.c | 22 ++++++ share/mk/src.libnames.mk | 4 + 4 files changed, 164 insertions(+), 1 deletion(-) diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 195fef28501c..6364327d7088 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,6 +1,6 @@ .include -SUBDIR= +SUBDIR= libpkgecc .if ${MK_OPENSSL} != "no" SUBDIR+=libcrypto libssl .if ${MK_OPENSSH} != "no" diff --git a/secure/lib/libpkgecc/Makefile b/secure/lib/libpkgecc/Makefile new file mode 100644 index 000000000000..476cd8635aeb --- /dev/null +++ b/secure/lib/libpkgecc/Makefile @@ -0,0 +1,137 @@ + +# STOP - This is not a general purpose library and is only for use by pkg(7) +# to align with the implementation in pkg(8). +LIB= pkgecc +INTERNALLIB= + +.PATH: $(SRCTOP)/crypto/libecc +SRCS+= pkg_libecc_rand.c + +# curves_mod_src +.PATH: $(SRCTOP)/crypto/libecc/src/curves +SRCS+= aff_pt.c \ + aff_pt_montgomery.c \ + ec_edwards.c \ + ec_montgomery.c \ + ec_params.c \ + ec_shortw.c \ + aff_pt_edwards.c \ + curves.c \ + prj_pt.c + +# utils_ec_src +.PATH: $(SRCTOP)/crypto/libecc/src/utils +SRCS+= print_curves.c + +# fp_mod_src +.PATH: $(SRCTOP)/crypto/libecc/src/fp +SRCS+= fp_add.c \ + fp.c \ + fp_montgomery.c \ + fp_mul.c \ + fp_mul_redc1.c \ + fp_pow.c \ + fp_rand.c \ + fp_sqrt.c + +# nn_mod_src +.PATH: $(SRCTOP)/crypto/libecc/src/nn +SRCS+= nn_add.c \ + nn.c \ + nn_div.c \ + nn_logical.c \ + nn_modinv.c \ + nn_mod_pow.c \ + nn_mul.c \ + nn_mul_redc1.c \ + nn_rand.c + +# utils_arith_src +SRCS+= utils.c \ + utils_rand.c \ + print_buf.c \ + print_fp.c \ + print_nn.c + +## libsign bits +# hash_mod_src +.PATH: $(SRCTOP)/crypto/libecc/src/hash +SRCS+= hash_algs.c \ + sm3.c \ + streebog.c \ + ripemd160.c \ + belt-hash.c \ + hmac.c \ + bash224.c \ + bash256.c \ + bash384.c \ + bash512.c \ + bash.c \ + sha224.c \ + sha256.c \ + sha3-224.c \ + sha3-256.c \ + sha3-384.c \ + sha3-512.c \ + sha384.c \ + sha3.c \ + sha512-224.c \ + sha512-256.c \ + sha512.c \ + sha512_core.c \ + shake256.c \ + shake.c + +# sig_mod_src +.PATH: $(SRCTOP)/crypto/libecc/src/sig +SRCS+= decdsa.c \ + ecdsa.c \ + ecfsdsa.c \ + ecgdsa.c \ + eckcdsa.c \ + ecosdsa.c \ + ecrdsa.c \ + ecsdsa.c \ + eddsa.c \ + fuzzing_ecdsa.c \ + fuzzing_ecgdsa.c \ + fuzzing_ecrdsa.c \ + ecdsa_common.c \ + ecsdsa_common.c \ + sig_algs.c \ + sm2.c \ + bign_common.c \ + bign.c \ + dbign.c \ + bip0340.c + +# key_mod_src +SRCS+= ec_key.c + +# utils_sign_src +.PATH: $(SRCTOP)/crypto/libecc/src/sig +SRCS+= print_keys.c + +# ecdh_mod_src +.PATH: $(SRCTOP)/crypto/libecc/src/ecdh +SRCS+= ecccdh.c \ + x25519_448.c + +# external_deps +.PATH: $(SRCTOP)/crypto/libecc/src/external_deps +SRCS+= print.c + +CONFLICTS= -Dsha256_init=_libecc_sha256_init \ + -Dsha256_update=_libecc_sha256_update \ + -Dsha256_final=_libecc_sha256_final \ + -Dsha512_224_init=_libecc_sha512_224_init \ + -Dsha512_256_init=_libecc_sha512_256_init + +CFLAGS= -I$(SRCTOP)/crypto/libecc/include \ + -ffreestanding \ + -fno-builtin \ + -DUSE_WARN_UNUSED_RET \ + -DWITH_STDLIB \ + $(CONFLICTS) + +.include diff --git a/secure/lib/libpkgecc/pkg_libecc_rand.c b/secure/lib/libpkgecc/pkg_libecc_rand.c new file mode 100644 index 000000000000..c190c9094538 --- /dev/null +++ b/secure/lib/libpkgecc/pkg_libecc_rand.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: Unlicense */ +#include +#include + +#include + +int +get_random(unsigned char *buf, uint16_t len) +{ + + /* + * We need random numbers even in a sandbox, so we can't use + * /dev/urandom as the external_deps version of get_random() does on + * FreeBSD. arc4random_buf() is a better choice because it uses the + * underlying getrandom(2) instead of needing to open a device handle. + * + * We don't have any guarantees that this won't open a device on other + * platforms, but we also don't do any sandboxing on those platforms. + */ + arc4random_buf(buf, len); + return 0; +} diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index f693e3ae7c16..02a495db7711 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -64,6 +64,7 @@ _INTERNALLIBS= \ parse \ pe \ pfctl \ + pkgecc \ pmcstat \ sl \ sm \ @@ -644,6 +645,9 @@ LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools${PIE_SUFFIX}.a LIBBE?= ${LIBBEDIR}/libbe${PIE_SUFFIX}.a +LIBPKGECCDIR= ${_LIB_OBJTOP}/secure/lib/libpkgecc +LIBPKGECC?= ${LIBPKGECCDIR}/libpkgecc${PIE_SUFFIX}.a + LIBPMCSTATDIR= ${_LIB_OBJTOP}/lib/libpmcstat LIBPMCSTAT?= ${LIBPMCSTATDIR}/libpmcstat${PIE_SUFFIX}.a From nobody Wed Jan 1 21:11:41 2025 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 4YNjFV3TNYz5jD12; Wed, 01 Jan 2025 21:11:42 +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 4YNjFT4t60z4k5T; Wed, 1 Jan 2025 21:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765901; 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=qRpJ9Jw5juY/a/2gkU3hAFoiNYZ1fGHyq2j9jyyeseA=; b=mIaudVPNeSbw23IAWH54/sDPkrwt3MUcAHE7S0hFy4ECPFuDZf16X8i7uKK17mOOZCnmFO 9Ndu8oFw1xKdYVFXQtBDbN39sP5qnDC51u7ERro/ZGWWu3S/Q7t8X86feJXF6PLsdpd42v rSA+TIcxEm2FVtsvxCvT6RKFa6Fqtn4mAFNDP64uzjySKar0bxKYlBWmZC8UpJUE3csgdv 0X3CwQmGDbDK78yahTUop/UT8osM/bqYyL0v6QngthgexdXogReWw9OJnTGIua05igDLuU eFSseYuUL1bd9Ek41GU5d8y95KVqRPBEeVN5JrKgqunskmg/zNIYXCgwrbUsXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765901; 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=qRpJ9Jw5juY/a/2gkU3hAFoiNYZ1fGHyq2j9jyyeseA=; b=F7BW/R+EE1M5J8+OPqKMA1r2OJCGO2MntasrXZPoHDvTYAKC0rzuGn8ccCIlGUvPzwiM64 TxiAP3PtxQW5ttWrwV0XN9BWkqiaolG9Z9AFYUrSXxJkX8Yi5orQRUbke612fizk/ECH5a fU1Vp6FGj6s2GRSPefamBanHImVIXzOaWZXhOSk3ExvZICPtAIL/ZRp+9cnitbvCFYNExQ Q5g6ZbEgYg5sK83x7MHxWH0yKgd3cIP5HegeY80he+EAWjIpe+/04fL2jD8uZTfht0U2ug mKsqKwLn5byilBl8nXvpJ6/sQzsClWBx3C/c1zaqDrq084pI0vQouGO5V5kPfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765901; a=rsa-sha256; cv=none; b=AQzLUDNFMb8EGsIorC7JhdcaXhA/cCfAI6/qH4E/16+T6HGtFhiHZ8LAa4nkv43qmtLbG6 DWahm0vsLZxUFnToyiKoV3YRpikqQDR+4JhHUyVn8PwQ1R73K3OQCabiSanXucnP76vezV GoHoUQrx9JPYDpqhVOYBKIDHPEO3UTD4Wy/+GkIfOOMLZwj5vUELszuvmC70ZGA4JbXwbW 1xK8uZq8aYCAdOvGLlYV8no/1WhxyCWj/raUDuKBcQ7PBcxwjuSuxGaYmUELztUzKWOGE8 w22+7uFQbDjPQwowi4z8uwTtX7OOhw90sqt9T56vtG7r2NQifo8NZdy0efSgZg== 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 4YNjFT4MZSzgZQ; Wed, 1 Jan 2025 21:11:41 +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 501LBf2k080074; Wed, 1 Jan 2025 21:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBfZg080071; Wed, 1 Jan 2025 21:11:41 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:41 GMT Message-Id: <202501012111.501LBfZg080071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 5862580ded35 - main - pkg: abstract rsa out behind a pkgsign API 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 5862580ded35e23581291a2e1052f04428369ead Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5862580ded35e23581291a2e1052f04428369ead commit 5862580ded35e23581291a2e1052f04428369ead Author: Kyle Evans AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:23 +0000 pkg: abstract rsa out behind a pkgsign API This mirrors a change we made in pkg(8), and will be used to next add another signer that does ECC. Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D48106 --- usr.sbin/pkg/pkg.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- usr.sbin/pkg/pkg.h | 22 ++++++++++++-- usr.sbin/pkg/rsa.c | 11 +++++-- 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 24a4f6516307..4d476f7653f7 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -54,6 +55,16 @@ #include "config.h" #include "hash.h" +static const struct pkgsign_impl { + const char *pi_name; + const struct pkgsign_ops *pi_ops; +} pkgsign_builtins[] = { + { + .pi_name = "rsa", + .pi_ops = &pkgsign_rsa, + }, +}; + typedef enum { HASH_UNKNOWN, HASH_SHA256, @@ -76,6 +87,61 @@ STAILQ_HEAD(fingerprint_list, fingerprint); static int debug; +static int +pkgsign_new(const char *name, struct pkgsign_ctx **ctx) +{ + const struct pkgsign_impl *impl; + const struct pkgsign_ops *ops; + struct pkgsign_ctx *nctx; + size_t ctx_size; + int ret; + + assert(*ctx == NULL); + ops = NULL; + for (size_t i = 0; i < nitems(pkgsign_builtins); i++) { + impl = &pkgsign_builtins[i]; + + if (strcmp(name, impl->pi_name) == 0) { + ops = impl->pi_ops; + break; + } + } + + if (ops == NULL) + return (ENOENT); + + ctx_size = ops->pkgsign_ctx_size; + if (ctx_size == 0) + ctx_size = sizeof(*nctx); + assert(ctx_size >= sizeof(*nctx)); + + nctx = calloc(1, ctx_size); + if (nctx == NULL) + err(EXIT_FAILURE, "calloc"); + nctx->impl = impl; + + ret = 0; + if (ops->pkgsign_new != NULL) + ret = (*ops->pkgsign_new)(name, nctx); + + if (ret != 0) { + free(nctx); + return (ret); + } + + *ctx = nctx; + return (0); +} + +static bool +pkgsign_verify_cert(const struct pkgsign_ctx *ctx, int fd, const char *sigfile, + const unsigned char *key, int keylen, unsigned char *sig, int siglen) +{ + + return ((*ctx->impl->pi_ops->pkgsign_verify_cert)(ctx, fd, sigfile, + key, keylen, sig, siglen)); +} + static int extract_pkg_static(int fd, char *p, int sz) { @@ -494,10 +560,12 @@ verify_pubsignature(int fd_pkg, int fd_sig) { struct pubkey *pk; const char *pubkey; + struct pkgsign_ctx *sctx; bool ret; pk = NULL; pubkey = NULL; + sctx = NULL; ret = false; if (config_string(PUBKEY, &pubkey) != 0) { warnx("No CONFIG_PUBKEY defined"); @@ -509,9 +577,14 @@ verify_pubsignature(int fd_pkg, int fd_sig) goto cleanup; } + if (pkgsign_new("rsa", &sctx) != 0) { + warnx("Failed to fetch 'rsa' signer"); + goto cleanup; + } + /* Verify the signature. */ printf("Verifying signature with public key %s... ", pubkey); - if (rsa_verify_cert(fd_pkg, pubkey, NULL, 0, pk->sig, + if (pkgsign_verify_cert(sctx, fd_pkg, pubkey, NULL, 0, pk->sig, pk->siglen) == false) { fprintf(stderr, "Signature is not valid\n"); goto cleanup; @@ -534,6 +607,7 @@ verify_signature(int fd_pkg, int fd_sig) struct fingerprint_list *trusted, *revoked; struct fingerprint *fingerprint; struct sig_cert *sc; + struct pkgsign_ctx *sctx; bool ret; int trusted_count, revoked_count; const char *fingerprints; @@ -542,6 +616,7 @@ verify_signature(int fd_pkg, int fd_sig) hash = NULL; sc = NULL; + sctx = NULL; trusted = revoked = NULL; ret = false; @@ -605,10 +680,15 @@ verify_signature(int fd_pkg, int fd_sig) goto cleanup; } + if (pkgsign_new("rsa", &sctx) != 0) { + fprintf(stderr, "Failed to fetch 'rsa' signer\n"); + goto cleanup; + } + /* Verify the signature. */ printf("Verifying signature with trusted certificate %s... ", sc->name); - if (rsa_verify_cert(fd_pkg, NULL, sc->cert, sc->certlen, sc->sig, - sc->siglen) == false) { + if (pkgsign_verify_cert(sctx, fd_pkg, NULL, sc->cert, sc->certlen, + sc->sig, sc->siglen) == false) { fprintf(stderr, "Signature is not valid\n"); goto cleanup; } diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h index 01f69f5a825b..d42f5a95d327 100644 --- a/usr.sbin/pkg/pkg.h +++ b/usr.sbin/pkg/pkg.h @@ -30,6 +30,25 @@ #ifndef _PKG_H #define _PKG_H +#include + +struct pkgsign_ctx { + const struct pkgsign_impl *impl; +}; + +/* Tentatively won't be needing to free any state, all allocated in the ctx. */ +typedef int pkgsign_new_cb(const char *, struct pkgsign_ctx *); +typedef bool pkgsign_verify_cert_cb(const struct pkgsign_ctx *, int, + const char *, const unsigned char *, int, unsigned char *, int); + +struct pkgsign_ops { + size_t pkgsign_ctx_size; + pkgsign_new_cb *pkgsign_new; + pkgsign_verify_cert_cb *pkgsign_verify_cert; +}; + +extern const struct pkgsign_ops pkgsign_rsa; + struct sig_cert { char *name; unsigned char *sig; @@ -44,7 +63,4 @@ struct pubkey { int siglen; }; -bool rsa_verify_cert(int, const char *, const unsigned char *, int, - unsigned char *, int); - #endif /* _PKG_H */ diff --git a/usr.sbin/pkg/rsa.c b/usr.sbin/pkg/rsa.c index afc446a6ad06..b6345cdcecb8 100644 --- a/usr.sbin/pkg/rsa.c +++ b/usr.sbin/pkg/rsa.c @@ -77,9 +77,10 @@ load_public_key_buf(const unsigned char *cert, int certlen) return (pkey); } -bool -rsa_verify_cert(int fd, const char *sigfile, const unsigned char *key, - int keylen, unsigned char *sig, int siglen) +static bool +rsa_verify_cert(const struct pkgsign_ctx *ctx __unused, int fd, + const char *sigfile, const unsigned char *key, int keylen, + unsigned char *sig, int siglen) { EVP_MD_CTX *mdctx; EVP_PKEY *pkey; @@ -153,3 +154,7 @@ cleanup: return (ret); } + +const struct pkgsign_ops pkgsign_rsa = { + .pkgsign_verify_cert = rsa_verify_cert, +}; From nobody Wed Jan 1 21:11:40 2025 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 4YNjFS5Z3sz5jCrY; Wed, 01 Jan 2025 21:11:40 +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 4YNjFS3wnjz4k5F; Wed, 1 Jan 2025 21:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765900; 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=BVu8xYGBgDENB5U7pY9YUvrvvWL1zfwgIAaMxyOfgQc=; b=Y0VZHTsvh4yck0ao32NVJVIbvkFtfyxnI3cLgqpREWJ0xU5ZE/5MtOUfmVPjyzzUttMNix NekZYt43fhTeArZHLbFHJ3+v/Hzw9ebGzIkcyXF/5Bceo01laBj2iOeGXk75V7gmUTwl3S jGpw5ci2cB+RwY9fbuCFJbpwdMpqgN27oFaMxRNQ+CmAhXPfzbO1mPhPtvlHZjgTZRmJgB IqTvLmY4dIREvmkTqHtZXJo7htV6zNRmcM2H04IQ33CHWP9+2+zgIw+5NzKH12R+3+uIhG ZcjpR5dWd9h+baYxrTgPe1Uj0o5yy56r8AKa35P0txZavyzfzxj+IPpAe4hDyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765900; 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=BVu8xYGBgDENB5U7pY9YUvrvvWL1zfwgIAaMxyOfgQc=; b=EPmkzwGpHmDoxHq65ZfwyqNRYO7M86rZL9dKiKdA/IDkpq9+6L5cg9OeYDkCpzuqUrBu7L KM5oVP+cOgP+2QDGPJaHNLPtDKPgsnF4jJJxkWxcwaqBtipM7xXXgGsJHcfuo6BM2KXpF1 3drH4Q9kBswvhjLrCnwqLcSLyOwgAq8BThB/zmRjiCaAH/dRLzjbiIwiXVk5Z/AgAB49uZ R3Sb0zPTCmh+jjw/EJk93FNBlrcgOVOGNzQwD/w+TiUEkDzu/Lr6s+qPMCKfxh0z/UvP6x CzEDniXEVYzMyY/OMEdhWfunJKqfMFAc9AOllaXXKvdCfZlzIxtqs0ExxwExeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765900; a=rsa-sha256; cv=none; b=IstnByF/wKsn2kvAT6qI1t6gAz+iR2drSjbdOxVgA60t3W7YDODyBv7q5comLriRyzyoxQ sprwO20EpbaycpIrTKdZfQi170f6wgdNku/b85IjLME/wz2rxyrOF/ALxPpaAVdS/khl95 qSl0cZ5nmS82yk4V0kFMN8DRXt7u1dQnET6VtJ6O7DLobRRNKJgvfnqgOljqGjxPr3i9j+ /LzjZICDtb37LyEWnlrDRSZuUEQUq/RH5YvHqtW7sR0Kuq9g08rCI2ygUcBsqjGrWIm/DJ 6dcYVu+qYHYl3dnW7CC/JMa7iM96MasMjb44Z14nBcdhl01jsMgP8fCNgpRjww== 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 4YNjFS3VR5zgVQ; Wed, 1 Jan 2025 21:11:40 +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 501LBeOt080023; Wed, 1 Jan 2025 21:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBeLI080020; Wed, 1 Jan 2025 21:11:40 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:40 GMT Message-Id: <202501012111.501LBeLI080020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2629e90dd05f - main - pkg: pull rsa bits out of pkg.c 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 2629e90dd05fb69d767525f960101d7d055ffae0 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2629e90dd05fb69d767525f960101d7d055ffae0 commit 2629e90dd05fb69d767525f960101d7d055ffae0 Author: Kyle Evans AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:22 +0000 pkg: pull rsa bits out of pkg.c We'll eventually add a pkgsign abstraction over these similar to how we do in pkg(8), but start by isolating these parts. Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D48105 --- usr.sbin/pkg/Makefile | 2 +- usr.sbin/pkg/pkg.c | 130 +----------------------------------------- usr.sbin/pkg/pkg.h | 50 ++++++++++++++++ usr.sbin/pkg/rsa.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 207 insertions(+), 130 deletions(-) diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 27d607380006..c7ea68973041 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -21,7 +21,7 @@ CONFSNAME_${PKGCONF}= ${PKGCONF:C/\.conf.+$/.conf/} CONFSDIR= /etc/pkg CONFSMODE= 644 PROG= pkg -SRCS= pkg.c dns_utils.c config.c hash.c +SRCS= pkg.c rsa.c dns_utils.c config.c hash.c MAN= pkg.7 CFLAGS+=-I${SRCTOP}/contrib/libucl/include diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 6138ca37e439..24a4f6516307 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -48,27 +48,12 @@ #include #include -#include -#include +#include "pkg.h" #include "dns_utils.h" #include "config.h" #include "hash.h" -struct sig_cert { - char *name; - unsigned char *sig; - int siglen; - unsigned char *cert; - int certlen; - bool trusted; -}; - -struct pubkey { - unsigned char *sig; - int siglen; -}; - typedef enum { HASH_UNKNOWN, HASH_SHA256, @@ -400,119 +385,6 @@ load_fingerprints(const char *path, int *count) return (fingerprints); } -static EVP_PKEY * -load_public_key_file(const char *file) -{ - EVP_PKEY *pkey; - BIO *bp; - char errbuf[1024]; - - bp = BIO_new_file(file, "r"); - if (!bp) - errx(EXIT_FAILURE, "Unable to read %s", file); - - if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL) - warnx("ici: %s", ERR_error_string(ERR_get_error(), errbuf)); - - BIO_free(bp); - - return (pkey); -} - -static EVP_PKEY * -load_public_key_buf(const unsigned char *cert, int certlen) -{ - EVP_PKEY *pkey; - BIO *bp; - char errbuf[1024]; - - bp = BIO_new_mem_buf(__DECONST(void *, cert), certlen); - - if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL) - warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); - - BIO_free(bp); - - return (pkey); -} - -static bool -rsa_verify_cert(int fd, const char *sigfile, const unsigned char *key, - int keylen, unsigned char *sig, int siglen) -{ - EVP_MD_CTX *mdctx; - EVP_PKEY *pkey; - char *sha256; - char errbuf[1024]; - bool ret; - - sha256 = NULL; - pkey = NULL; - mdctx = NULL; - ret = false; - - SSL_load_error_strings(); - - /* Compute SHA256 of the package. */ - if (lseek(fd, 0, 0) == -1) { - warn("lseek"); - goto cleanup; - } - if ((sha256 = sha256_fd(fd)) == NULL) { - warnx("Error creating SHA256 hash for package"); - goto cleanup; - } - - if (sigfile != NULL) { - if ((pkey = load_public_key_file(sigfile)) == NULL) { - warnx("Error reading public key"); - goto cleanup; - } - } else { - if ((pkey = load_public_key_buf(key, keylen)) == NULL) { - warnx("Error reading public key"); - goto cleanup; - } - } - - /* Verify signature of the SHA256(pkg) is valid. */ - if ((mdctx = EVP_MD_CTX_create()) == NULL) { - warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); - goto error; - } - - if (EVP_DigestVerifyInit(mdctx, NULL, EVP_sha256(), NULL, pkey) != 1) { - warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); - goto error; - } - if (EVP_DigestVerifyUpdate(mdctx, sha256, strlen(sha256)) != 1) { - warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); - goto error; - } - - if (EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) { - warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); - goto error; - } - - ret = true; - printf("done\n"); - goto cleanup; - -error: - printf("failed\n"); - -cleanup: - free(sha256); - if (pkey) - EVP_PKEY_free(pkey); - if (mdctx) - EVP_MD_CTX_destroy(mdctx); - ERR_free_strings(); - - return (ret); -} - static struct pubkey * read_pubkey(int fd) { diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h new file mode 100644 index 000000000000..01f69f5a825b --- /dev/null +++ b/usr.sbin/pkg/pkg.h @@ -0,0 +1,50 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2012-2014 Baptiste Daroussin + * Copyright (c) 2013 Bryan Drewery + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _PKG_H +#define _PKG_H + +struct sig_cert { + char *name; + unsigned char *sig; + int siglen; + unsigned char *cert; + int certlen; + bool trusted; +}; + +struct pubkey { + unsigned char *sig; + int siglen; +}; + +bool rsa_verify_cert(int, const char *, const unsigned char *, int, + unsigned char *, int); + +#endif /* _PKG_H */ diff --git a/usr.sbin/pkg/rsa.c b/usr.sbin/pkg/rsa.c new file mode 100644 index 000000000000..afc446a6ad06 --- /dev/null +++ b/usr.sbin/pkg/rsa.c @@ -0,0 +1,155 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2012-2014 Baptiste Daroussin + * Copyright (c) 2013 Bryan Drewery + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include +#include + +#include +#include + +#include "pkg.h" + +#include "config.h" +#include "hash.h" + +static EVP_PKEY * +load_public_key_file(const char *file) +{ + EVP_PKEY *pkey; + BIO *bp; + char errbuf[1024]; + + bp = BIO_new_file(file, "r"); + if (!bp) + errx(EXIT_FAILURE, "Unable to read %s", file); + + if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL) + warnx("ici: %s", ERR_error_string(ERR_get_error(), errbuf)); + + BIO_free(bp); + + return (pkey); +} + +static EVP_PKEY * +load_public_key_buf(const unsigned char *cert, int certlen) +{ + EVP_PKEY *pkey; + BIO *bp; + char errbuf[1024]; + + bp = BIO_new_mem_buf(__DECONST(void *, cert), certlen); + + if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL) + warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); + + BIO_free(bp); + + return (pkey); +} + +bool +rsa_verify_cert(int fd, const char *sigfile, const unsigned char *key, + int keylen, unsigned char *sig, int siglen) +{ + EVP_MD_CTX *mdctx; + EVP_PKEY *pkey; + char *sha256; + char errbuf[1024]; + bool ret; + + sha256 = NULL; + pkey = NULL; + mdctx = NULL; + ret = false; + + SSL_load_error_strings(); + + /* Compute SHA256 of the package. */ + if (lseek(fd, 0, 0) == -1) { + warn("lseek"); + goto cleanup; + } + if ((sha256 = sha256_fd(fd)) == NULL) { + warnx("Error creating SHA256 hash for package"); + goto cleanup; + } + + if (sigfile != NULL) { + if ((pkey = load_public_key_file(sigfile)) == NULL) { + warnx("Error reading public key"); + goto cleanup; + } + } else { + if ((pkey = load_public_key_buf(key, keylen)) == NULL) { + warnx("Error reading public key"); + goto cleanup; + } + } + + /* Verify signature of the SHA256(pkg) is valid. */ + if ((mdctx = EVP_MD_CTX_create()) == NULL) { + warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); + goto error; + } + + if (EVP_DigestVerifyInit(mdctx, NULL, EVP_sha256(), NULL, pkey) != 1) { + warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); + goto error; + } + if (EVP_DigestVerifyUpdate(mdctx, sha256, strlen(sha256)) != 1) { + warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); + goto error; + } + + if (EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) { + warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); + goto error; + } + + ret = true; + printf("done\n"); + goto cleanup; + +error: + printf("failed\n"); + +cleanup: + free(sha256); + if (pkey) + EVP_PKEY_free(pkey); + if (mdctx) + EVP_MD_CTX_destroy(mdctx); + ERR_free_strings(); + + return (ret); +} From nobody Wed Jan 1 21:11:43 2025 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 4YNjFX5j8Xz5jCrb; Wed, 01 Jan 2025 21:11:44 +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 4YNjFW6t6Nz4k78; Wed, 1 Jan 2025 21:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765904; 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=DyHtgSmtxS7eT+IXO4mo6+KxCQbAf1NDOsYRwEe4NnY=; b=d8GeWhXSRCqYp/U0jwwZ/USpHF2ug/dz2bjmftqemlYjRhFDOIucsv7HI3Umkl8VihgMdX hecol0x/VHjPo63oKRg0/v13w28crNk2kRKb1bnIZAzr9VSlC79bPXYE6Xe2d0yJMsVnQ6 6QYiQ74sezFD43A/bfe8u7hwNK/KL2j6W6AWWnTjCXKYNM+D6lHhL7ZmmB0BkarEB/UgN1 R2/GVFDtzTC4PolPVgpeqgXA2852k7hbXnwupLI9NLHYOwoEvQKpYaCjtYIHAYYsGNviPf Vz3MQ81rEWocW1pNeM12Gt4kVUBOOF8CDwSHKFLv9zGq1mTmHHn1fQJE6JRDhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765904; 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=DyHtgSmtxS7eT+IXO4mo6+KxCQbAf1NDOsYRwEe4NnY=; b=INRbHQxprtSQI3cO96F1ottN7O67GENsJFce86kMeTthwd72mrrDYR+SVLyWCXrETCHfvz Y5R6QHcqlakhSCs243SR3zejeYoZWUmlUNzcWMLA1N7IUkcnaBgqlNiJ4iQkrbysv4dZld +hudfpCehwNLZbbkiNrlkKn297pVvX9uwcSrNZJZ/zUTfxgR/AlpwjNArXrkMttbjkvGna e0RTYSwU2HhiNONjqUZEHbwWpTD5fS3p2nw22CcEu1kRp8DDCvCsvSyKv5fato2giTJTaz zh8qI1gVtt03+kJF9xlKD9i5IwyUwu5kmw/2TzomdRlfNmw5aLxN//c55UNAwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765904; a=rsa-sha256; cv=none; b=M6lUnA/2sksDopFqaehXAUSHa1BslRFtH+P+2WwNdzb8tzO5XsuMuONOGyKCl4m74oqlv9 pChvU2/vnoPmx1gWknqgFpnJ4blYoi0EPwjpPBeNQKEm5IJFu5eAK+SkfOJuhtg/jenl6i Qn7IOewQCpIWhpBy1Oj/baBfpjsqeNwvyxZ5qu+nXaH5Wz7DBK+qRp+XtZf5i1tsjMbOWN aOGP1UjPewSF81C/HGS9rkkdkjt8P8Z3QIN6d6xIAFus+wU1KUDjla2dHl/4mAkvfJnZru GlLIArGtzz7b72SDw2QDtZMgvaKq+b+y+DooKRHageKy5UIocMxIA9f3v64c1A== 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 4YNjFW6QmMzgZS; Wed, 1 Jan 2025 21:11:43 +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 501LBhb0080164; Wed, 1 Jan 2025 21:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBhYg080161; Wed, 1 Jan 2025 21:11:43 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:43 GMT Message-Id: <202501012111.501LBhYg080161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2e065d74a5b0 - main - pkg: add a pkgsign_verify_data callback 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 2e065d74a5b0ea32db7d4f6e3f78eaa17ee7685e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2e065d74a5b0ea32db7d4f6e3f78eaa17ee7685e commit 2e065d74a5b0ea32db7d4f6e3f78eaa17ee7685e Author: Kyle Evans AuthorDate: 2025-01-01 21:10:28 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:23 +0000 pkg: add a pkgsign_verify_data callback This will be used to verify raw payloads, as if signed by pkg-key(8). It will be used specifically in pkg(7) to verify .pubkeysig as published by poudriere. Amend verify_pubsignature() now to use it. For the RSA signer, we need to verify using a sha256 of the data instead of the data itself. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D48109 --- usr.sbin/pkg/pkg.c | 30 +++++++++++++++++++++++++++++- usr.sbin/pkg/pkg.h | 4 ++++ usr.sbin/pkg/rsa.c | 50 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 19 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 6d0a75d2786a..db15e7b6ab22 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -142,6 +142,17 @@ pkgsign_verify_cert(const struct pkgsign_ctx *ctx, int fd, const char *sigfile, key, keylen, sig, siglen)); } +static bool +pkgsign_verify_data(const struct pkgsign_ctx *ctx, const char *data, + size_t datasz, const char *sigfile, const unsigned char *key, int keylen, + unsigned char *sig, int siglen) +{ + + return ((*ctx->impl->pi_ops->pkgsign_verify_data)(ctx, data, datasz, + sigfile, key, keylen, sig, siglen)); +} + + static int extract_pkg_static(int fd, char *p, int sz) { @@ -574,12 +585,15 @@ verify_pubsignature(int fd_pkg, int fd_sig) { struct pubkey *pk; const char *pubkey; + char *data; struct pkgsign_ctx *sctx; + size_t datasz; bool ret; pk = NULL; pubkey = NULL; sctx = NULL; + data = NULL; ret = false; if (config_string(PUBKEY, &pubkey) != 0) { warnx("No CONFIG_PUBKEY defined"); @@ -591,6 +605,19 @@ verify_pubsignature(int fd_pkg, int fd_sig) goto cleanup; } + if (lseek(fd_pkg, 0, SEEK_SET) == -1) { + warn("lseek"); + goto cleanup; + } + + /* Future types shouldn't do this. */ + if ((data = sha256_fd(fd_pkg)) == NULL) { + warnx("Error creating SHA256 hash for package"); + goto cleanup; + } + + datasz = strlen(data); + if (pkgsign_new("rsa", &sctx) != 0) { warnx("Failed to fetch 'rsa' signer"); goto cleanup; @@ -598,7 +625,7 @@ verify_pubsignature(int fd_pkg, int fd_sig) /* Verify the signature. */ printf("Verifying signature with public key %s... ", pubkey); - if (pkgsign_verify_cert(sctx, fd_pkg, pubkey, NULL, 0, pk->sig, + if (pkgsign_verify_data(sctx, data, datasz, pubkey, NULL, 0, pk->sig, pk->siglen) == false) { fprintf(stderr, "Signature is not valid\n"); goto cleanup; @@ -607,6 +634,7 @@ verify_pubsignature(int fd_pkg, int fd_sig) ret = true; cleanup: + free(data); if (pk) { free(pk->sig); free(pk); diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h index 2d0dab96a20f..b9fe9b5fa566 100644 --- a/usr.sbin/pkg/pkg.h +++ b/usr.sbin/pkg/pkg.h @@ -40,11 +40,15 @@ struct pkgsign_ctx { typedef int pkgsign_new_cb(const char *, struct pkgsign_ctx *); typedef bool pkgsign_verify_cert_cb(const struct pkgsign_ctx *, int, const char *, const unsigned char *, int, unsigned char *, int); +typedef bool pkgsign_verify_data_cb(const struct pkgsign_ctx *, + const char *, size_t, const char *, const unsigned char *, int, + unsigned char *, int); struct pkgsign_ops { size_t pkgsign_ctx_size; pkgsign_new_cb *pkgsign_new; pkgsign_verify_cert_cb *pkgsign_verify_cert; + pkgsign_verify_data_cb *pkgsign_verify_data; }; extern const struct pkgsign_ops pkgsign_rsa; diff --git a/usr.sbin/pkg/rsa.c b/usr.sbin/pkg/rsa.c index b6345cdcecb8..b28f44ec1953 100644 --- a/usr.sbin/pkg/rsa.c +++ b/usr.sbin/pkg/rsa.c @@ -78,33 +78,20 @@ load_public_key_buf(const unsigned char *cert, int certlen) } static bool -rsa_verify_cert(const struct pkgsign_ctx *ctx __unused, int fd, - const char *sigfile, const unsigned char *key, int keylen, - unsigned char *sig, int siglen) +rsa_verify_data(const struct pkgsign_ctx *ctx __unused, + const char *data, size_t datasz, const char *sigfile, + const unsigned char *key, int keylen, unsigned char *sig, int siglen) { EVP_MD_CTX *mdctx; EVP_PKEY *pkey; - char *sha256; char errbuf[1024]; bool ret; - sha256 = NULL; pkey = NULL; mdctx = NULL; ret = false; - SSL_load_error_strings(); - /* Compute SHA256 of the package. */ - if (lseek(fd, 0, 0) == -1) { - warn("lseek"); - goto cleanup; - } - if ((sha256 = sha256_fd(fd)) == NULL) { - warnx("Error creating SHA256 hash for package"); - goto cleanup; - } - if (sigfile != NULL) { if ((pkey = load_public_key_file(sigfile)) == NULL) { warnx("Error reading public key"); @@ -127,7 +114,7 @@ rsa_verify_cert(const struct pkgsign_ctx *ctx __unused, int fd, warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); goto error; } - if (EVP_DigestVerifyUpdate(mdctx, sha256, strlen(sha256)) != 1) { + if (EVP_DigestVerifyUpdate(mdctx, data, datasz) != 1) { warnx("%s", ERR_error_string(ERR_get_error(), errbuf)); goto error; } @@ -145,7 +132,6 @@ error: printf("failed\n"); cleanup: - free(sha256); if (pkey) EVP_PKEY_free(pkey); if (mdctx) @@ -155,6 +141,34 @@ cleanup: return (ret); } +static bool +rsa_verify_cert(const struct pkgsign_ctx *ctx __unused, int fd, + const char *sigfile, const unsigned char *key, int keylen, + unsigned char *sig, int siglen) +{ + char *sha256; + bool ret; + + sha256 = NULL; + + /* Compute SHA256 of the package. */ + if (lseek(fd, 0, 0) == -1) { + warn("lseek"); + return (false); + } + if ((sha256 = sha256_fd(fd)) == NULL) { + warnx("Error creating SHA256 hash for package"); + return (false); + } + + ret = rsa_verify_data(ctx, sha256, strlen(sha256), sigfile, key, keylen, + sig, siglen); + free(sha256); + + return (ret); +} + const struct pkgsign_ops pkgsign_rsa = { .pkgsign_verify_cert = rsa_verify_cert, + .pkgsign_verify_data = rsa_verify_data, }; From nobody Wed Jan 1 21:11:42 2025 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 4YNjFW361vz5jCrZ; Wed, 01 Jan 2025 21:11:43 +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 4YNjFV5xn4z4k97; Wed, 1 Jan 2025 21:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765902; 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=L/AzMtGpiVjw9rT4o+XmnzmtOOZf3eNWvwkfMKowPbI=; b=VFewQ0YZiZgT0PmIrOmAmLfim0OqqwTWBM2z93Y38/qmJalnzSw4z610xqU0qetmI6y1Yr FAidTkq6Gnc0xE/YygiZRCCuncXajphCQGOvc1Bt8ldUZey+vvQQ6XMIt1lSTDVoWAxjo7 cnfp7VJ3gsrYdsTCd3112FL1n/HLqwxVyHYuHm5hLuvj/MXTusOgH5LWSa4wJUhYSjZM8I Quyfnn6AuHYsLuHyC0zEzEy67zjunwmZTAbP95062WaVd2I9eKXxpoIAg1L4p0SNTA9Pr1 VHORVY4VbuqkZrAueNcN2b5tNH380A/0o2/hnxZLvjjqN7tODvL0Jp33QDFpAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765902; 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=L/AzMtGpiVjw9rT4o+XmnzmtOOZf3eNWvwkfMKowPbI=; b=pqA5bnNEhpdh2e58a/UFt487OCME8Mv21TFmgi9VR58zBloQIgnHbq2wqfb8ES55c1gRxS kus6wZtmEWWJG+H1Cx+AIJEjtzA9OY1zx/joDiP7KcAN/35ReqHycAxIGCiW5eSv2/NMBb 46FhF4SOkJQrmToxIcL1tF5Pw5gKknsomyAwwLRm542PjvKRn/h4aM66T41VusP8iSMJjP HP0f/25jpQtxsU65/eSpKglwnkEvHT0P8ss9wRE0LJ+mPJAoiNVnAM2/QlvUu8QNmVqxvz v/miyh2GTm91QGVCA1n88tZlyOQeGqwMgLIKCoOKLTgIwE0KvRGJ7TwxX0WQzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765902; a=rsa-sha256; cv=none; b=bVSSnD/5LXw0hejUdHj37HMnP8VJLGFQBbpwRGUqyzQ8DINH2IRLcCZXrtYZA5elYryM+g fqxHKY2LsqyQB7fadQeSkTCRQUzI85wbRJ3/WbJ9JAlcQV1Wl122KwPnZCiiysBAMBETpk 661Cj0wkYCuWsRQNuOFqWkfXwuJWkgd/Sqi+6j+sCYs5Ue0E+6e15d2aJI9CDbnZaWBo8j 4SDf6ARJn1WIdXssCF4IKeFI/JJQK6oojJXrGPOleSE1C0W0BVRukOcVrDnRXJXZHTX9eX bvUEFLFJ98NNVdQgmWsAZ5QonbNEhc/a+aO7/rR2vz7kreQ+jwvsVN4cG474+Q== 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 4YNjFV5K29zgJ7; Wed, 1 Jan 2025 21:11:42 +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 501LBgPB080116; Wed, 1 Jan 2025 21:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBgf9080113; Wed, 1 Jan 2025 21:11:42 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:42 GMT Message-Id: <202501012111.501LBgf9080113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2ecfc040a09f - main - pkg: refactor out a pkg_read_fd() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 2ecfc040a09f8c42f67bbfdcc4bd02ef84dac8b7 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2ecfc040a09f8c42f67bbfdcc4bd02ef84dac8b7 commit 2ecfc040a09f8c42f67bbfdcc4bd02ef84dac8b7 Author: Kyle Evans AuthorDate: 2025-01-01 21:10:28 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:23 +0000 pkg: refactor out a pkg_read_fd() We already have to do this for reading the pubkey, just pull it out for other uses. The ECC signer will use this to verify the bootstrap if the PUBKEY mechanism is used. Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D48107 --- usr.sbin/pkg/pkg.c | 40 +++++++++++++++++++++++++++------------- usr.sbin/pkg/pkg.h | 2 ++ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 4d476f7653f7..6d0a75d2786a 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -451,32 +451,46 @@ load_fingerprints(const char *path, int *count) return (fingerprints); } +char * +pkg_read_fd(int fd, size_t *osz) +{ + char *obuf; + char buf[4096]; + FILE *fp; + ssize_t r; + + obuf = NULL; + *osz = 0; + fp = open_memstream(&obuf, osz); + if (fp == NULL) + err(EXIT_FAILURE, "open_memstream()"); + + while ((r = read(fd, buf, sizeof(buf))) >0) { + fwrite(buf, 1, r, fp); + } + + if (ferror(fp)) + errx(EXIT_FAILURE, "reading file"); + + fclose(fp); + + return (obuf); +} + static struct pubkey * read_pubkey(int fd) { struct pubkey *pk; char *sigb; size_t sigsz; - FILE *sig; - char buf[4096]; - int r; if (lseek(fd, 0, 0) == -1) { warn("lseek"); return (NULL); } - sigsz = 0; - sigb = NULL; - sig = open_memstream(&sigb, &sigsz); - if (sig == NULL) - err(EXIT_FAILURE, "open_memstream()"); - - while ((r = read(fd, buf, sizeof(buf))) >0) { - fwrite(buf, 1, r, sig); - } + sigb = pkg_read_fd(fd, &sigsz); - fclose(sig); pk = calloc(1, sizeof(struct pubkey)); pk->siglen = sigsz; pk->sig = calloc(1, pk->siglen); diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h index d42f5a95d327..2d0dab96a20f 100644 --- a/usr.sbin/pkg/pkg.h +++ b/usr.sbin/pkg/pkg.h @@ -63,4 +63,6 @@ struct pubkey { int siglen; }; +char *pkg_read_fd(int fd, size_t *osz); + #endif /* _PKG_H */ From nobody Wed Jan 1 21:11:44 2025 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 4YNjFY5sjYz5jD15; Wed, 01 Jan 2025 21:11:45 +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 4YNjFY0sLvz4jtZ; Wed, 1 Jan 2025 21:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765905; 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=/nWW0KWnuGGqyFLq1u+uH/q4vHtrnJ/FKWUFNqjcumI=; b=FxKAhPziDFCOhaq39X05CZhg6xwBzAgynxrzuNdUxQLJC6RwAmYKfDjmhVj6/0uv39g7mg ulY33koZri3rgBIs/GSDvm4YMinI+pBvLTI2mBp+xmkDjUXSQKWq1QZXHva1aDONfbQLYw JgrAarAAgs9v/Z9IEKbZ+Yh1Mw/fgKAEGplEt8EpHOPVx0TdKTrTsFubBdkhlID7j/Kp5I bKeQpnoEtqKkoSYqErHK98u7v2raZkzAwyEtd1Hp+AQzeTI0EVpSnr43fdc3Uo8eFj53fe QriXk/oZpwWgdWDdirWer05LYHFlCydQGasY8CAJsoiHOZ9B5UDrkVyMEhC+Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735765905; 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=/nWW0KWnuGGqyFLq1u+uH/q4vHtrnJ/FKWUFNqjcumI=; b=WF3iYIay/5y3X5ZJAMoNbFv9a9KXyQ1zE4KFSBfeAeUoxgu8uS2vlgxWn50GQ0QwExYyWL qrndv6n1+D7EAQdhIakU9QsW4TRXbI/HCEt5xXbRrNkCFPEkfkp7RnfJl6zgEl8LTLezVn BxIw3TbF54QG7E1Z2ho+koCKz/FHdXPQ81NQYfs/Ved1in5+e33rZggx7rWeyaUTTValZJ y9newlAVOn6RNiWbZH3EtV6CZCyat9dqJ47nI4kXwVXtG30Fa0VRA/xz24jIqboNWI8B2S VSsoWkmY62H69dladD5flbH0/FMEP8JdoJVbhcQrxLP5h6MR6M6olb/YsG+ang== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735765905; a=rsa-sha256; cv=none; b=qtI1cxXnT0tkYEaUq2FWDezjODDS+EU4dM8KtsUp07btpDf0+a1BIn4JUJPcOMfrb+Rvyc pucg8z1vM/qq8muJUzjBcrHiJZxugM8WDW6FcZZ0A2gdWuLROvsS8QfxQ1sJmBmejMr+UM +EDKVlRbyt74pkIujOHeOdMNWyB+M/IsVygQKvRvHatUlSE0Ki19J0qvFBBGx8QoPNb/6x eos9hS9UrRpDY7PB/wVdCtvCifWXbVCgks6Ro12ZyzpjJf07ndxM2DDvCKz/daKaRpNWoR WbwR+RMRvonJFO4uOFa+AovhmRB3SopypTgY/RihcuZetG+WBQaC6ErcDR/yyA== 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 4YNjFY041dzgJ8; Wed, 1 Jan 2025 21:11:45 +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 501LBiTn080221; Wed, 1 Jan 2025 21:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501LBiH0080218; Wed, 1 Jan 2025 21:11:44 GMT (envelope-from git) Date: Wed, 1 Jan 2025 21:11:44 GMT Message-Id: <202501012111.501LBiH0080218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 3d0a0dda3a7d - main - pkg: finish adding the ECC signer and signature type bits 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 3d0a0dda3a7d57bbd4eaf65ba8da0f2a36089c0e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3d0a0dda3a7d57bbd4eaf65ba8da0f2a36089c0e commit 3d0a0dda3a7d57bbd4eaf65ba8da0f2a36089c0e Author: Kyle Evans AuthorDate: 2025-01-01 21:10:28 +0000 Commit: Kyle Evans CommitDate: 2025-01-01 21:11:24 +0000 pkg: finish adding the ECC signer and signature type bits Signature types need to be parsed out of the key/signature information that we are presented with from the files we download. We use that to understand whicher signer we need to dispatch to. The ECC signer is more-or-less lifted from pkg(8), with some changes to slim it down for pkg(7). Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D48108 --- usr.sbin/pkg/Makefile | 7 +- usr.sbin/pkg/ecc.c | 606 ++++++++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/pkg/pkg.c | 115 ++++++++-- usr.sbin/pkg/pkg.h | 3 + 4 files changed, 711 insertions(+), 20 deletions(-) diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index c7ea68973041..2fa0dbb053ad 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -21,11 +21,14 @@ CONFSNAME_${PKGCONF}= ${PKGCONF:C/\.conf.+$/.conf/} CONFSDIR= /etc/pkg CONFSMODE= 644 PROG= pkg -SRCS= pkg.c rsa.c dns_utils.c config.c hash.c +SRCS= pkg.c rsa.c dns_utils.c config.c ecc.c hash.c MAN= pkg.7 CFLAGS+=-I${SRCTOP}/contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include -LIBADD= archive fetch ucl crypto ssl util md +LIBADD= archive der fetch pkgecc ucl crypto ssl util md + +CFLAGS+=-I${SRCTOP}/contrib/libder/libder +CFLAGS+=-I${SRCTOP}/crypto/libecc/include .include diff --git a/usr.sbin/pkg/ecc.c b/usr.sbin/pkg/ecc.c new file mode 100644 index 000000000000..01ce020bdba0 --- /dev/null +++ b/usr.sbin/pkg/ecc.c @@ -0,0 +1,606 @@ +/*- + * Copyright (c) 2011-2013 Baptiste Daroussin + * Copyright (c) 2011-2012 Julien Laffaye + * All rights reserved. + * Copyright (c) 2021 Kyle Evans + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define WITH_STDLIB +#include +#undef WITH_STDLIB + +#include "pkg.h" +#include "hash.h" + +/* libpkg shim */ +#define STREQ(l, r) (strcmp(l, r) == 0) + +struct ecc_sign_ctx { + struct pkgsign_ctx sctx; + ec_params params; + ec_key_pair keypair; + ec_alg_type sig_alg; + hash_alg_type sig_hash; + bool loaded; +}; + +/* Grab the ossl context from a pkgsign_ctx. */ +#define ECC_CCTX(c) (__containerof(c, const struct ecc_sign_ctx, sctx)) +#define ECC_CTX(c) (__containerof(c, struct ecc_sign_ctx, sctx)) + +#define PUBKEY_UNCOMPRESSED 0x04 + +#ifndef MAX +#define MAX(a,b) (((a)>(b))?(a):(b)) +#endif + +static const uint8_t oid_ecpubkey[] = \ + { 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01 }; + +static const uint8_t oid_secp[] = \ + { 0x2b, 0x81, 0x04, 0x00 }; +static const uint8_t oid_secp256k1[] = \ + { 0x2b, 0x81, 0x04, 0x00, 0x0a }; +static const uint8_t oid_brainpoolP[] = \ + { 0x2b, 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01 }; + +#define ENTRY(name, params) { #name, sizeof(#name) - 1, params } +static const struct pkgkey_map_entry { + const char *name; + size_t namesz; + const ec_str_params *params; +} pkgkey_map[] = { + ENTRY(WEI25519, &wei25519_str_params), + ENTRY(SECP256K1, &secp256k1_str_params), + ENTRY(SECP384R1, &secp384r1_str_params), + ENTRY(SECP512R1, &secp521r1_str_params), + ENTRY(BRAINPOOLP256R1, &brainpoolp256r1_str_params), + ENTRY(BRAINPOOLP256T1, &brainpoolp256t1_str_params), + ENTRY(BRAINPOOLP320R1, &brainpoolp320r1_str_params), + ENTRY(BRAINPOOLP320T1, &brainpoolp320t1_str_params), + ENTRY(BRAINPOOLP384R1, &brainpoolp384r1_str_params), + ENTRY(BRAINPOOLP384T1, &brainpoolp384t1_str_params), + ENTRY(BRAINPOOLP512R1, &brainpoolp512r1_str_params), + ENTRY(BRAINPOOLP512T1, &brainpoolp512t1_str_params), +}; + +static const char pkgkey_app[] = "pkg"; +static const char pkgkey_signer[] = "ecc"; + +static const ec_str_params * +ecc_pkgkey_params(const uint8_t *curve, size_t curvesz) +{ + const struct pkgkey_map_entry *entry; + + for (size_t i = 0; i < nitems(pkgkey_map); i++) { + entry = &pkgkey_map[i]; + if (curvesz != entry->namesz) + continue; + if (memcmp(curve, entry->name, curvesz) == 0) + return (entry->params); + } + + return (NULL); +} + +static int +ecc_read_pkgkey(struct libder_object *root, ec_params *params, int public, + uint8_t *rawkey, size_t *rawlen) +{ + struct libder_object *obj; + const uint8_t *data; + const ec_str_params *sparams; + size_t datasz; + int ret; + + if (libder_obj_type_simple(root) != BT_SEQUENCE) + return (1); + + /* Application */ + obj = libder_obj_child(root, 0); + if (obj == NULL || libder_obj_type_simple(obj) != BT_UTF8STRING) + return (1); + data = libder_obj_data(obj, &datasz); + if (datasz != sizeof(pkgkey_app) - 1 || + memcmp(data, pkgkey_app, datasz) != 0) + return (1); + + /* Version */ + obj = libder_obj_child(root, 1); + if (obj == NULL || libder_obj_type_simple(obj) != BT_INTEGER) + return (1); + data = libder_obj_data(obj, &datasz); + if (datasz != 1 || *data != 1 /* XXX */) + return (1); + + /* Signer */ + obj = libder_obj_child(root, 2); + if (obj == NULL || libder_obj_type_simple(obj) != BT_UTF8STRING) + return (1); + data = libder_obj_data(obj, &datasz); + if (datasz != sizeof(pkgkey_signer) - 1 || + memcmp(data, pkgkey_signer, datasz) != 0) + return (1); + + /* KeyType (curve) */ + obj = libder_obj_child(root, 3); + if (obj == NULL || libder_obj_type_simple(obj) != BT_UTF8STRING) + return (1); + data = libder_obj_data(obj, &datasz); + sparams = ecc_pkgkey_params(data, datasz); + if (sparams == NULL) + return (1); + + ret = import_params(params, sparams); + if (ret != 0) + return (1); + + /* Public? */ + obj = libder_obj_child(root, 4); + if (obj == NULL || libder_obj_type_simple(obj) != BT_BOOLEAN) + return (1); + data = libder_obj_data(obj, &datasz); + if (datasz != 1 || !data[0] != !public) + return (1); + + /* Key */ + obj = libder_obj_child(root, 5); + if (obj == NULL || libder_obj_type_simple(obj) != BT_BITSTRING) + return (1); + data = libder_obj_data(obj, &datasz); + if (datasz <= 2 || data[0] != 0 || data[1] != PUBKEY_UNCOMPRESSED) + return (1); + + data += 2; + datasz -= 2; + + if (datasz > *rawlen) + return (1); + + + memcpy(rawkey, data, datasz); + *rawlen = datasz; + + return (0); +} + +static int +ecc_extract_signature(const uint8_t *sig, size_t siglen, uint8_t *rawsig, + size_t rawlen) +{ + struct libder_ctx *ctx; + struct libder_object *obj, *root; + const uint8_t *sigdata; + size_t compsz, datasz, sigoff; + int rc; + + ctx = libder_open(); + if (ctx == NULL) + return (1); + + rc = 1; + root = libder_read(ctx, sig, &siglen); + if (root == NULL || libder_obj_type_simple(root) != BT_SEQUENCE) + goto out; + + /* Descend into the sequence's payload, extract both numbers. */ + compsz = rawlen / 2; + sigoff = 0; + for (int i = 0; i < 2; i++) { + obj = libder_obj_child(root, i); + if (libder_obj_type_simple(obj) != BT_INTEGER) + goto out; + + sigdata = libder_obj_data(obj, &datasz); + if (datasz < 2 || datasz > compsz + 1) + goto out; + + /* + * We may see an extra lead byte if our high bit of the first + * byte was set, since these numbers are positive by definition. + */ + if (sigdata[0] == 0 && (sigdata[1] & 0x80) != 0) { + sigdata++; + datasz--; + } + + /* Sanity check: don't overflow the output. */ + if (sigoff + datasz > rawlen) + goto out; + + /* Padding to the significant end if we're too small. */ + if (datasz < compsz) { + memset(&rawsig[sigoff], 0, compsz - datasz); + sigoff += compsz - datasz; + } + + memcpy(&rawsig[sigoff], sigdata, datasz); + sigoff += datasz; + } + + /* Sanity check: must have exactly the required # of signature bits. */ + rc = (sigoff == rawlen) ? 0 : 1; + +out: + libder_obj_free(root); + libder_close(ctx); + return (rc); +} + +static int +ecc_extract_pubkey_string(const uint8_t *data, size_t datalen, uint8_t *rawkey, + size_t *rawlen) +{ + uint8_t prefix, usebit; + + if (datalen <= 2) + return (1); + + usebit = *data++; + datalen--; + + if (usebit != 0) + return (1); + + prefix = *data++; + datalen--; + + if (prefix != PUBKEY_UNCOMPRESSED) + return (1); + + if (datalen > *rawlen) + return (1); + + memcpy(rawkey, data, datalen); + *rawlen = datalen; + + return (0); +} + +static int +ecc_extract_key_params(const uint8_t *oid, size_t oidlen, + ec_params *rawparams) +{ + int ret; + + if (oidlen >= sizeof(oid_secp) && + memcmp(oid, oid_secp, sizeof(oid_secp)) >= 0) { + oid += sizeof(oid_secp); + oidlen -= sizeof(oid_secp); + + if (oidlen != 1) + return (1); + + ret = -1; + switch (*oid) { + case 0x0a: /* secp256k1 */ + ret = import_params(rawparams, &secp256k1_str_params); + break; + case 0x22: /* secp384r1 */ + ret = import_params(rawparams, &secp384r1_str_params); + break; + case 0x23: /* secp521r1 */ + ret = import_params(rawparams, &secp521r1_str_params); + break; + default: + return (1); + } + + if (ret == 0) + return (0); + return (1); + } + + if (oidlen >= sizeof(oid_brainpoolP) && + memcmp(oid, oid_brainpoolP, sizeof(oid_brainpoolP)) >= 0) { + oid += sizeof(oid_brainpoolP); + oidlen -= sizeof(oid_brainpoolP); + + if (oidlen != 1) + return (1); + + ret = -1; + switch (*oid) { + case 0x07: /* brainpoolP256r1 */ + ret = import_params(rawparams, &brainpoolp256r1_str_params); + break; + case 0x08: /* brainpoolP256t1 */ + ret = import_params(rawparams, &brainpoolp256t1_str_params); + break; + case 0x09: /* brainpoolP320r1 */ + ret = import_params(rawparams, &brainpoolp320r1_str_params); + break; + case 0x0a: /* brainpoolP320t1 */ + ret = import_params(rawparams, &brainpoolp320t1_str_params); + break; + case 0x0b: /* brainpoolP384r1 */ + ret = import_params(rawparams, &brainpoolp384r1_str_params); + break; + case 0x0c: /* brainpoolP384t1 */ + ret = import_params(rawparams, &brainpoolp384t1_str_params); + break; + case 0x0d: /* brainpoolP512r1 */ + ret = import_params(rawparams, &brainpoolp512r1_str_params); + break; + case 0x0e: /* brainpoolP512t1 */ + ret = import_params(rawparams, &brainpoolp512t1_str_params); + break; + default: + return (1); + } + + if (ret == 0) + return (0); + return (1); + } + +#ifdef ECC_DEBUG + for (size_t i = 0; i < oidlen; i++) { + fprintf(stderr, "%.02x ", oid[i]); + } + + fprintf(stderr, "\n"); +#endif + + return (1); +} + +/* + * On entry, *rawparams should point to an ec_params that we can import the + * key parameters to. We'll either do that, or we'll set it to NULL if we could + * not deduce the curve. + */ +static int +ecc_extract_pubkey(FILE *keyfp, const uint8_t *key, size_t keylen, + uint8_t *rawkey, size_t *rawlen, ec_params *rawparams) +{ + const uint8_t *oidp; + struct libder_ctx *ctx; + struct libder_object *keydata, *oid, *params, *root; + size_t oidsz; + int rc; + + ctx = libder_open(); + if (ctx == NULL) + return (1); + + rc = 1; + assert((keyfp != NULL) ^ (key != NULL)); + if (keyfp != NULL) { + root = libder_read_file(ctx, keyfp, &keylen); + } else { + root = libder_read(ctx, key, &keylen); + } + + if (root == NULL || libder_obj_type_simple(root) != BT_SEQUENCE) + goto out; + + params = libder_obj_child(root, 0); + + if (params == NULL) { + goto out; + } else if (libder_obj_type_simple(params) != BT_SEQUENCE) { + rc = ecc_read_pkgkey(root, rawparams, 1, rawkey, rawlen); + goto out; + } + + /* Is a sequence */ + keydata = libder_obj_child(root, 1); + if (keydata == NULL || libder_obj_type_simple(keydata) != BT_BITSTRING) + goto out; + + /* Key type */ + oid = libder_obj_child(params, 0); + if (oid == NULL || libder_obj_type_simple(oid) != BT_OID) + goto out; + + oidp = libder_obj_data(oid, &oidsz); + if (oidsz != sizeof(oid_ecpubkey) || + memcmp(oidp, oid_ecpubkey, oidsz) != 0) + return (1); + + /* Curve */ + oid = libder_obj_child(params, 1); + if (oid == NULL || libder_obj_type_simple(oid) != BT_OID) + goto out; + + oidp = libder_obj_data(oid, &oidsz); + if (ecc_extract_key_params(oidp, oidsz, rawparams) != 0) + goto out; + + /* Finally, peel off the key material */ + key = libder_obj_data(keydata, &keylen); + if (ecc_extract_pubkey_string(key, keylen, rawkey, rawlen) != 0) + goto out; + + rc = 0; +out: + libder_obj_free(root); + libder_close(ctx); + return (rc); +} + +struct ecc_verify_cbdata { + const struct pkgsign_ctx *sctx; + FILE *keyfp; + const unsigned char *key; + size_t keylen; + unsigned char *sig; + size_t siglen; +}; + +static int +ecc_verify_internal(struct ecc_verify_cbdata *cbdata, const uint8_t *hash, + size_t hashsz) +{ + ec_pub_key pubkey; + ec_params derparams; + const struct ecc_sign_ctx *keyinfo = ECC_CCTX(cbdata->sctx); + uint8_t keybuf[EC_PUB_KEY_MAX_SIZE]; + uint8_t rawsig[EC_MAX_SIGLEN]; + size_t keysz; + int ret; + uint8_t ecsiglen; + + keysz = MIN(sizeof(keybuf), cbdata->keylen / 2); + + keysz = sizeof(keybuf); + if (ecc_extract_pubkey(cbdata->keyfp, cbdata->key, cbdata->keylen, + keybuf, &keysz, &derparams) != 0) { + warnx("failed to parse key"); + return (1); + } + + ret = ec_get_sig_len(&derparams, keyinfo->sig_alg, keyinfo->sig_hash, + &ecsiglen); + if (ret != 0) + return (1); + + /* + * Signatures are DER-encoded, whether by OpenSSL or pkg. + */ + if (ecc_extract_signature(cbdata->sig, cbdata->siglen, + rawsig, ecsiglen) != 0) { + warnx("failed to decode signature"); + return (1); + } + + ret = ec_pub_key_import_from_aff_buf(&pubkey, &derparams, + keybuf, keysz, keyinfo->sig_alg); + if (ret != 0) { + warnx("failed to import key"); + return (1); + } + + ret = ec_verify(rawsig, ecsiglen, &pubkey, hash, hashsz, keyinfo->sig_alg, + keyinfo->sig_hash, NULL, 0); + if (ret != 0) { + warnx("failed to verify signature"); + return (1); + } + + return (0); +} + +static bool +ecc_verify_data(const struct pkgsign_ctx *sctx, + const char *data, size_t datasz, const char *sigfile, + const unsigned char *key, int keylen, + unsigned char *sig, int siglen) +{ + int ret; + struct ecc_verify_cbdata cbdata; + + ret = 1; + + if (sigfile != NULL) { + cbdata.keyfp = fopen(sigfile, "r"); + if (cbdata.keyfp == NULL) { + warn("fopen: %s", sigfile); + return (false); + } + } else { + cbdata.keyfp = NULL; + cbdata.key = key; + cbdata.keylen = keylen; + } + + cbdata.sctx = sctx; + cbdata.sig = sig; + cbdata.siglen = siglen; + + ret = ecc_verify_internal(&cbdata, data, datasz); + + if (cbdata.keyfp != NULL) + fclose(cbdata.keyfp); + + return (ret == 0); +} + +static bool +ecc_verify_cert(const struct pkgsign_ctx *sctx, int fd, + const char *sigfile, const unsigned char *key, int keylen, + unsigned char *sig, int siglen) +{ + bool ret; + char *sha256; + + ret = false; + if (lseek(fd, 0, SEEK_SET) == -1) { + warn("lseek"); + return (false); + } + + if ((sha256 = sha256_fd(fd)) != NULL) { + ret = ecc_verify_data(sctx, sha256, strlen(sha256), sigfile, key, + keylen, sig, siglen); + free(sha256); + } + + return (ret); +} + +static int +ecc_new(const char *name __unused, struct pkgsign_ctx *sctx) +{ + struct ecc_sign_ctx *keyinfo = ECC_CTX(sctx); + int ret; + + ret = 1; + if (STREQ(name, "ecc") || STREQ(name, "eddsa")) { + keyinfo->sig_alg = EDDSA25519; + keyinfo->sig_hash = SHA512; + ret = import_params(&keyinfo->params, &wei25519_str_params); + } else if (STREQ(name, "ecdsa")) { + keyinfo->sig_alg = ECDSA; + keyinfo->sig_hash = SHA256; + ret = import_params(&keyinfo->params, &secp256k1_str_params); + } + + if (ret != 0) + return (1); + + return (0); +} + +const struct pkgsign_ops pkgsign_ecc = { + .pkgsign_ctx_size = sizeof(struct ecc_sign_ctx), + .pkgsign_new = ecc_new, + .pkgsign_verify_cert = ecc_verify_cert, + .pkgsign_verify_data = ecc_verify_data, +}; diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index db15e7b6ab22..54884dbe0b23 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -55,6 +55,8 @@ #include "config.h" #include "hash.h" +#define PKGSIGN_MARKER "$PKGSIGN:" + static const struct pkgsign_impl { const char *pi_name; const struct pkgsign_ops *pi_ops; @@ -63,6 +65,18 @@ static const struct pkgsign_impl { .pi_name = "rsa", .pi_ops = &pkgsign_rsa, }, + { + .pi_name = "ecc", + .pi_ops = &pkgsign_ecc, + }, + { + .pi_name = "ecdsa", + .pi_ops = &pkgsign_ecc, + }, + { + .pi_name = "eddsa", + .pi_ops = &pkgsign_ecc, + }, }; typedef enum { @@ -488,11 +502,41 @@ pkg_read_fd(int fd, size_t *osz) return (obuf); } +/* + * Returns a copy of the signature type stored on the heap, and advances *bufp + * past the type. + */ +static char * +parse_sigtype(char **bufp, size_t *bufszp) +{ + char *buf = *bufp; + char *endp; + char *sigtype; + size_t bufsz = *bufszp; + + if (bufsz <= sizeof(PKGSIGN_MARKER) - 1 || + strncmp(buf, PKGSIGN_MARKER, sizeof(PKGSIGN_MARKER) - 1) != 0) + goto dflt; + + buf += sizeof(PKGSIGN_MARKER) - 1; + endp = strchr(buf, '$'); + if (endp == NULL) + goto dflt; + + sigtype = strndup(buf, endp - buf); + *bufp = endp + 1; + *bufszp -= *bufp - buf; + + return (sigtype); +dflt: + return (strdup("rsa")); +} + static struct pubkey * read_pubkey(int fd) { struct pubkey *pk; - char *sigb; + char *osigb, *sigb, *sigtype; size_t sigsz; if (lseek(fd, 0, 0) == -1) { @@ -500,13 +544,15 @@ read_pubkey(int fd) return (NULL); } - sigb = pkg_read_fd(fd, &sigsz); + osigb = sigb = pkg_read_fd(fd, &sigsz); + sigtype = parse_sigtype(&sigb, &sigsz); pk = calloc(1, sizeof(struct pubkey)); pk->siglen = sigsz; pk->sig = calloc(1, pk->siglen); memcpy(pk->sig, sigb, pk->siglen); - free(sigb); + pk->sigtype = sigtype; + free(osigb); return (pk); } @@ -515,17 +561,18 @@ static struct sig_cert * parse_cert(int fd) { int my_fd; struct sig_cert *sc; - FILE *fp, *sigfp, *certfp, *tmpfp; + FILE *fp, *sigfp, *certfp, *tmpfp, *typefp; char *line; - char *sig, *cert; - size_t linecap, sigsz, certsz; + char *sig, *cert, *type; + size_t linecap, sigsz, certsz, typesz; ssize_t linelen; + bool end_seen; sc = NULL; line = NULL; linecap = 0; - sig = cert = NULL; - sigfp = certfp = tmpfp = NULL; + sig = cert = type = NULL; + sigfp = certfp = tmpfp = typefp = NULL; if (lseek(fd, 0, 0) == -1) { warn("lseek"); @@ -544,22 +591,30 @@ parse_cert(int fd) { return (NULL); } - sigsz = certsz = 0; + sigsz = certsz = typesz = 0; sigfp = open_memstream(&sig, &sigsz); if (sigfp == NULL) err(EXIT_FAILURE, "open_memstream()"); certfp = open_memstream(&cert, &certsz); if (certfp == NULL) err(EXIT_FAILURE, "open_memstream()"); + typefp = open_memstream(&type, &typesz); + if (typefp == NULL) + err(EXIT_FAILURE, "open_memstream()"); + end_seen = false; while ((linelen = getline(&line, &linecap, fp)) > 0) { if (strcmp(line, "SIGNATURE\n") == 0) { tmpfp = sigfp; continue; + } else if (strcmp(line, "TYPE\n") == 0) { + tmpfp = typefp; + continue; } else if (strcmp(line, "CERT\n") == 0) { tmpfp = certfp; continue; } else if (strcmp(line, "END\n") == 0) { + end_seen = true; break; } if (tmpfp != NULL) @@ -569,11 +624,28 @@ parse_cert(int fd) { fclose(fp); fclose(sigfp); fclose(certfp); + fclose(typefp); sc = calloc(1, sizeof(struct sig_cert)); sc->siglen = sigsz -1; /* Trim out unrelated trailing newline */ sc->sig = sig; + if (typesz == 0) { + sc->type = strdup("rsa"); + free(type); + } else { + assert(type[typesz - 1] == '\n'); + type[typesz - 1] = '\0'; + sc->type = type; + } + + /* + * cert could be DER-encoded rather than PEM, so strip off any trailing + * END marker if we ran over it. + */ + if (!end_seen && certsz > 4 && + strcmp(&cert[certsz - 4], "END\n") == 0) + certsz -= 4; sc->certlen = certsz; sc->cert = cert; @@ -610,16 +682,23 @@ verify_pubsignature(int fd_pkg, int fd_sig) goto cleanup; } - /* Future types shouldn't do this. */ - if ((data = sha256_fd(fd_pkg)) == NULL) { - warnx("Error creating SHA256 hash for package"); - goto cleanup; - } + if (strcmp(pk->sigtype, "rsa") == 0) { + /* Future types shouldn't do this. */ + if ((data = sha256_fd(fd_pkg)) == NULL) { + warnx("Error creating SHA256 hash for package"); + goto cleanup; + } - datasz = strlen(data); + datasz = strlen(data); + } else { + if ((data = pkg_read_fd(fd_pkg, &datasz)) == NULL) { + warnx("Failed to read package data"); + goto cleanup; + } + } - if (pkgsign_new("rsa", &sctx) != 0) { - warnx("Failed to fetch 'rsa' signer"); + if (pkgsign_new(pk->sigtype, &sctx) != 0) { + warnx("Failed to fetch '%s' signer", pk->sigtype); goto cleanup; } @@ -722,7 +801,7 @@ verify_signature(int fd_pkg, int fd_sig) goto cleanup; } - if (pkgsign_new("rsa", &sctx) != 0) { + if (pkgsign_new(sc->type, &sctx) != 0) { fprintf(stderr, "Failed to fetch 'rsa' signer\n"); goto cleanup; } diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h index b9fe9b5fa566..f74f97ce795b 100644 --- a/usr.sbin/pkg/pkg.h +++ b/usr.sbin/pkg/pkg.h @@ -51,10 +51,12 @@ struct pkgsign_ops { pkgsign_verify_data_cb *pkgsign_verify_data; }; +extern const struct pkgsign_ops pkgsign_ecc; extern const struct pkgsign_ops pkgsign_rsa; struct sig_cert { char *name; + char *type; unsigned char *sig; int siglen; unsigned char *cert; @@ -63,6 +65,7 @@ struct sig_cert { }; struct pubkey { + char *sigtype; unsigned char *sig; int siglen; }; From nobody Thu Jan 2 02:15:40 2025 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 4YNr0D52LTz5jppG; Thu, 02 Jan 2025 02:15:40 +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 4YNr0D4Dl6z4Bdf; Thu, 2 Jan 2025 02:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735784140; 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=vkZXXJb2WtKzHdZWUmBsIcjmQfeX/MTtIljFmt/QKY0=; b=tz8FbDulXZFgZIZug/OL7JGg85YJMRmsHeVzZU3WT/kRHAjoQCf6yIkuumQyABOZNS7BKI otsbxoKXd+nyJE8LDfOBjR6yxY86jTyEmi8kcqyeqOXUW9+hZhIdeTM/XDsCHFOKWt54qz 6YcTQKVLnjGkBGkxvW2rl4XtI2tlLfIqv5Cy3UJqHQMF+iTop5Qw3nANEpxDnqmoFYhXGe Kv+qkPca8cwrEXsj9pYo6OIsFjKFM4XQc2TEB5l52d/gh/eewjKfsZxuJFe06B78ju6RLH VOhdkccfgS+dVBytlvKazmv/IJRQEl92ZcujmmR4ZnXQXIIxuFTvOEEzYjqNUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735784140; 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=vkZXXJb2WtKzHdZWUmBsIcjmQfeX/MTtIljFmt/QKY0=; b=MZegdOMPtCGneNetl0O4XSU7ZZFE3blBSHnWinMsVWzbnjH5kZJNnknFwg6Qt5mynWaJuA OfJnd3OqAh9qE5g9jstSCH8U5sguwH0ge9ignNdIEDg6PB05FhGDJME5Rs6j+TdCcIK0eE YHmrBHi4FVf/2eHLEr8A2gQjW0QGwR7CS7zWYLRZxrDn5ANyQVibSMARA7GOxEedeND5r1 4JB2erp0Zl0Za5LfUlMQKIZDIbrQcusJrQsQOop2XmycPa61MqGwsi6Uf7rdxoQuhe5nqQ I6NOCQ9S14ZOjMc7Ivq3hL9k2V6eRuEHYsEPwKKCxKKgvUsYQosMFLNhR+HWkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735784140; a=rsa-sha256; cv=none; b=vVzgo5XIEomLZo8WmOcnHJ8H0wCxqrrKitbTypS35JJjtclX4rm3nteZ4/0y0jDZpHBmDY KLKl10CVsKtVZOWqkJpGetad08SaZFZwMGXr6qwoQM6WUjM/35ekdbFPlOhrc7k5KQ67lR Pr6eLZ/2HjKT0a8MYW68NQkCQmrjiHKkNh/IqZ6tVjVV4GE192xKyBmFQIF0f73BY6myNs MDylC7SyZkX7z8PXnPsGFfjIO5J7E+WaEgEw9yobnlyROwaT2WQkWrx+ogAJZSevQMr3C9 hh5fwpyn1UtO0sP8C5pnxBOHVCRubiMkavl/m6VsuOkZ9qOo82FJ4Q3Da5GS8A== 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 4YNr0D3qyczqBX; Thu, 2 Jan 2025 02:15:40 +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 5022Feci042719; Thu, 2 Jan 2025 02:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5022FeQP042716; Thu, 2 Jan 2025 02:15:40 GMT (envelope-from git) Date: Thu, 2 Jan 2025 02:15:40 GMT Message-Id: <202501020215.5022FeQP042716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: f68ee0e7a1e8 - main - shar: add a deprecation notice 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: f68ee0e7a1e8732f725cad4ac708ec49093782d4 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac708ec49093782d4 commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 Author: Kyle Evans AuthorDate: 2025-01-02 02:15:36 +0000 Commit: Kyle Evans CommitDate: 2025-01-02 02:15:36 +0000 shar: add a deprecation notice The shar(1) program is simple, but the fundamental idea of a sh archive is risky at best and one that we probably shouldn't be promoting as prominently as a program in $PATH and a manpage. Let's deprecate and remove it, since the same functionality can easily be found in tar(1) instead. Reviewed by: emaste, philip Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (previous) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48130 --- usr.bin/shar/shar.1 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 index 903f937491dc..df97021b1bba 100644 --- a/usr.bin/shar/shar.1 +++ b/usr.bin/shar/shar.1 @@ -25,12 +25,24 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 31, 2019 +.Dd January 1, 2025 .Dt SHAR 1 .Os .Sh NAME .Nm shar .Nd create a shell archive of files +.Sh DEPRECATION NOTICE +.Nm +is obsolete and may not be present in +.Fx 15 +and later. +Because shell archives are simultaneously data and code and are typically +interpreted by +.Xr sh 1 , +they can easily be trojan-horsed and pose a significant security risk to users. +The +.Xr tar 1 +utility can still produce shar encodings of files if needed. .Sh SYNOPSIS .Nm .Ar From nobody Thu Jan 2 02:53:59 2025 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 4YNrrW4c04z5jsTq; Thu, 02 Jan 2025 02:54:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNrrW1CjNz4Mb9; Thu, 2 Jan 2025 02:54:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id T3fqtLD8lyLQGTBLWtypoE; Thu, 02 Jan 2025 02:54:02 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id TBLUtr3Pg2M9qTBLVtflwt; Thu, 02 Jan 2025 02:54:02 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=ce5xrWDM c=1 sm=1 tr=0 ts=6775ffca a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=VdSt8ZQiCzkA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=_NtuON-HHJt05S2kecMA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 08BB7A7E; Wed, 01 Jan 2025 18:54:00 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 0235658A; Wed, 01 Jan 2025 18:54:00 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kyle Evans cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice In-reply-to: <202501020215.5022FeQP042716@gitrepo.freebsd.org> References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> Comments: In-reply-to Kyle Evans message dated "Thu, 02 Jan 2025 02:15:40 +0000." 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 01 Jan 2025 18:53:59 -0800 Message-Id: <20250102025400.0235658A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfHeeUPkzqPdcmcR2SbwBPfi10J7WEYWhoeQBPOb/O0zvv+7vHQAS5WlW5TgmuAbcDe+tFTLzDRaR/nLHptdTqjpY0Hv3Ka0St/hjPq2QvZjcLyn2UcyL E2VIkdMQdkx7KzDoyq2uM37X2MW6PzDU2WY+Hh0uXwTKrbh4LnksHtjf04HktY8ThEQQMRhm9Sdj2rymt3er+06Wz3MdVsf1CJhnIInwE4pZKhmESN1g93EH CbkfJJL7E/zkZGE2bDyCu2x/2+XGAQ3WAuVj9D4QVtu+uObmh1SqXDQu+CAdoT3U/rp3trHQ+8TCrWaCDJrJNuMDy8qcMz1ZZkNwMlxM85w= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4YNrrW1CjNz4Mb9 X-Spamd-Bar: ---- In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evans writes : > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac708ec49 > 093782d4 > > commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 > Author: Kyle Evans > AuthorDate: 2025-01-02 02:15:36 +0000 > Commit: Kyle Evans > CommitDate: 2025-01-02 02:15:36 +0000 > > shar: add a deprecation notice > > The shar(1) program is simple, but the fundamental idea of a sh archive > is risky at best and one that we probably shouldn't be promoting as > prominently as a program in $PATH and a manpage. Let's deprecate and > remove it, since the same functionality can easily be found in > tar(1) instead. > > Reviewed by: emaste, philip > Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (previous) > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D48130 > --- > usr.bin/shar/shar.1 | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > index 903f937491dc..df97021b1bba 100644 > --- a/usr.bin/shar/shar.1 > +++ b/usr.bin/shar/shar.1 > @@ -25,12 +25,24 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd January 31, 2019 > +.Dd January 1, 2025 > .Dt SHAR 1 > .Os > .Sh NAME > .Nm shar > .Nd create a shell archive of files > +.Sh DEPRECATION NOTICE > +.Nm > +is obsolete and may not be present in > +.Fx 15 > +and later. > +Because shell archives are simultaneously data and code and are typically > +interpreted by > +.Xr sh 1 , > +they can easily be trojan-horsed and pose a significant security risk to use > rs. > +The > +.Xr tar 1 > +utility can still produce shar encodings of files if needed. > .Sh SYNOPSIS > .Nm > .Ar > We should probably point to the new port or the GNU variant in ports. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jan 2 03:12:21 2025 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 4YNsFf52zxz5jtLZ; Thu, 02 Jan 2025 03:12:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNsFf4cVNz4Qnj; Thu, 2 Jan 2025 03:12:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735787542; 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: in-reply-to:in-reply-to:references:references; bh=2KgHL6xEe8D93ljBnG5RTEd7N3bkB1cr+8cs9jzwKsA=; b=D9Q/NhYT0NW/09lPYcrq5QPUUR0Vesu9EBpg1il2FIpzT8NFs22HVeNVwsQTHY9w0U5FZ5 WWVlpybmRspvaTPs0+9Vv2TmFuQolzMpCAxLqDTOCv9zf/4az7rxT3bx+cimOj5143OT3a 0QPkahtsySNra/DXG467dpp5xvROQU9BcQZp6EnnqIT/zM1NGObEQ6zXziZR4v2ZUltTM3 eG/ujqxIK/jjfBE/AjIvCmMadWefOJZI7o9XJyd4ijT4WCDCrksJNBOVkDii5Otm0Zl1ws 3sukTM0DQ+TDLmxc4rOoXngKa46vQKk9RH5KE7vEXTWXy8PON8Ns2JqWZrJIjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735787542; 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: in-reply-to:in-reply-to:references:references; bh=2KgHL6xEe8D93ljBnG5RTEd7N3bkB1cr+8cs9jzwKsA=; b=btU8TBesNY/gv5V4ni/qqKWKqjZJ76lv8xC0mtlEQJXZBTsF8FWakCIwWcjnxceYuZR/tc yvVsJJFDh2oVW9yKZVoDfPlx9CnyWTpw7Ic5IG3d8hV/1YycSVRBfNhfg6OaH2dKYxgN4v fHABnkYujD/9+8nY3aGFBpL9adR5FmWAVeNpKSE23xQDBINJ6U9tQo/zfhh1Kt18QOXtXA oM3IjCT1J4vmioXz68/oZEf6xM04Yzj1yZ2eozPIVFY7HA7iLjkNf5MVrXMhATSsjue1xD 7pLNJ5YEkhbh4cWdK77t1M/F7vS2F4dYWpKRhcyoOwuv5kNiG1Zr4NzRfAn4fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735787542; a=rsa-sha256; cv=none; b=s2tWE/p7NYCoNQwrnwD/jtrhQmqFHw+47wYhsnq2QXHjBvAaEWbLZrZfTOzaq8rV6mlBfm K+FuIOlSeIsDR9ARYN9rT6V0Rtd/ohuX1X2ugszB76bLn9IItztpSouacji7hEhhOX71bq SghKfHAjR41iNDemU8zwKxsNb+JpE+uG+dsoTOVxf/uvWTdeBI0coW7fBXn43JlUHpFmGF RfOPPmOkL71J49weijfhLQ3VNgzOQQD850jpyuqD18wbwlUHD3khhbAdo90h/TUgPjX3Sr e/ovODYoLdyqLzAEMz6ZOH4oimlwTpdNSLe7cSUwpSApiYD7mwcR1+AF9v4dVw== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YNsFf1g5gzcsL; Thu, 2 Jan 2025 03:12:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Wed, 1 Jan 2025 21:12:21 -0600 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> <20250102025400.0235658A@slippy.cwsent.com> Content-Language: en-US From: Kyle Evans In-Reply-To: <20250102025400.0235658A@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/1/25 20:53, Cy Schubert wrote: > In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evans > writes > : >> The branch main has been updated by kevans: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac708ec49 >> 093782d4 >> >> commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 >> Author: Kyle Evans >> AuthorDate: 2025-01-02 02:15:36 +0000 >> Commit: Kyle Evans >> CommitDate: 2025-01-02 02:15:36 +0000 >> >> shar: add a deprecation notice >> >> The shar(1) program is simple, but the fundamental idea of a sh archive >> is risky at best and one that we probably shouldn't be promoting as >> prominently as a program in $PATH and a manpage. Let's deprecate and >> remove it, since the same functionality can easily be found in >> tar(1) instead. >> >> Reviewed by: emaste, philip >> Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (previous) >> MFC after: 3 days >> Differential Revision: https://reviews.freebsd.org/D48130 >> --- >> usr.bin/shar/shar.1 | 14 +++++++++++++- >> 1 file changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 >> index 903f937491dc..df97021b1bba 100644 >> --- a/usr.bin/shar/shar.1 >> +++ b/usr.bin/shar/shar.1 >> @@ -25,12 +25,24 @@ >> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> .\" SUCH DAMAGE. >> .\" >> -.Dd January 31, 2019 >> +.Dd January 1, 2025 >> .Dt SHAR 1 >> .Os >> .Sh NAME >> .Nm shar >> .Nd create a shell archive of files >> +.Sh DEPRECATION NOTICE >> +.Nm >> +is obsolete and may not be present in >> +.Fx 15 >> +and later. >> +Because shell archives are simultaneously data and code and are typically >> +interpreted by >> +.Xr sh 1 , >> +they can easily be trojan-horsed and pose a significant security risk to use >> rs. >> +The >> +.Xr tar 1 >> +utility can still produce shar encodings of files if needed. >> .Sh SYNOPSIS >> .Nm >> .Ar >> > > We should probably point to the new port or the GNU variant in ports. > Oh, sorry, I didn't realize you had gone ahead with the port. I wouldn't normally recommend a GNU variant, would you be OK with something like: diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 index df97021b1bba..6beb1e84ceab 100644 --- a/usr.bin/shar/shar.1 +++ b/usr.bin/shar/shar.1 @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a significant security risk to users. The .Xr tar 1 utility can still produce shar encodings of files if needed. +The +.Pa sysutils/freebsd-shar +port has been created to maintain this version of +.Nm +past its deprecation in base. .Sh SYNOPSIS .Nm .Ar ? Thanks, Kyle Evans From nobody Thu Jan 2 03:14:52 2025 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 4YNsJb49f6z5jtPb; Thu, 02 Jan 2025 03:14:55 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNsJb30G9z4RDc; Thu, 2 Jan 2025 03:14:55 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id T57rtLHOVyLQGTBfityrEV; Thu, 02 Jan 2025 03:14:54 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id TBfhtBwVxGvSVTBfitw4ch; Thu, 02 Jan 2025 03:14:54 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FpSm/Hrq c=1 sm=1 tr=0 ts=677604ae a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=VdSt8ZQiCzkA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=v1B8Uev-rr01I4T1Y6oA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B0AB3B22; Wed, 01 Jan 2025 19:14:52 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A7E2B455; Wed, 01 Jan 2025 19:14:52 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kyle Evans cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice In-reply-to: References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> <20250102025400.0235658A@slippy.cwsent.com> Comments: In-reply-to Kyle Evans message dated "Wed, 01 Jan 2025 21:12:21 -0600." 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 01 Jan 2025 19:14:52 -0800 Message-Id: <20250102031452.A7E2B455@slippy.cwsent.com> X-CMAE-Envelope: MS4xfF19jVjmGv01ThJx3KnHLUbzlaNmtpZsDlUDGvTKpI/3Yod1Q/85IQhv5eA74nR4B6yX190cUtmuB/TRlw+xhD1B+embRUMNpR8gBX5Toshjio7C4SUp 4N8ua2Icga2yvSNQuzSyHpRtfYjEoiyX7CWEd1S2CYTdxcwpomELT1AuRKflnVse85kdtnrAtQEmoy1YTBf+Num06MlAlqNjLGuOntNBcwfOfZzQlZzbbeqb oGC7Z0EgOlfFpMmFlcextS5gEo/+VnTXmfwplRsMR1d+N81pXxSBpxwhlkJZKHhV2c/oegjfslZ5S64a49nTIQDb0kicdvnEm3MRQrYPql4= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4YNsJb30G9z4RDc X-Spamd-Bar: ---- In message , Kyle Evans write s: > On 1/1/25 20:53, Cy Schubert wrote: > > In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evans > > writes > > : > >> The branch main has been updated by kevans: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac708e > c49 > >> 093782d4 > >> > >> commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 > >> Author: Kyle Evans > >> AuthorDate: 2025-01-02 02:15:36 +0000 > >> Commit: Kyle Evans > >> CommitDate: 2025-01-02 02:15:36 +0000 > >> > >> shar: add a deprecation notice > >> > >> The shar(1) program is simple, but the fundamental idea of a sh archi > ve > >> is risky at best and one that we probably shouldn't be promoting as > >> prominently as a program in $PATH and a manpage. Let's deprecate and > >> remove it, since the same functionality can easily be found in > >> tar(1) instead. > >> > >> Reviewed by: emaste, philip > >> Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (previo > us) > >> MFC after: 3 days > >> Differential Revision: https://reviews.freebsd.org/D48130 > >> --- > >> usr.bin/shar/shar.1 | 14 +++++++++++++- > >> 1 file changed, 13 insertions(+), 1 deletion(-) > >> > >> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > >> index 903f937491dc..df97021b1bba 100644 > >> --- a/usr.bin/shar/shar.1 > >> +++ b/usr.bin/shar/shar.1 > >> @@ -25,12 +25,24 @@ > >> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY > OF > >> .\" SUCH DAMAGE. > >> .\" > >> -.Dd January 31, 2019 > >> +.Dd January 1, 2025 > >> .Dt SHAR 1 > >> .Os > >> .Sh NAME > >> .Nm shar > >> .Nd create a shell archive of files > >> +.Sh DEPRECATION NOTICE > >> +.Nm > >> +is obsolete and may not be present in > >> +.Fx 15 > >> +and later. > >> +Because shell archives are simultaneously data and code and are typically > >> +interpreted by > >> +.Xr sh 1 , > >> +they can easily be trojan-horsed and pose a significant security risk to > use > >> rs. > >> +The > >> +.Xr tar 1 > >> +utility can still produce shar encodings of files if needed. > >> .Sh SYNOPSIS > >> .Nm > >> .Ar > >> > > > > We should probably point to the new port or the GNU variant in ports. > > > > Oh, sorry, I didn't realize you had gone ahead with the port. I > wouldn't normally recommend a GNU variant, would you be OK with > something like: > > diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > index df97021b1bba..6beb1e84ceab 100644 > --- a/usr.bin/shar/shar.1 > +++ b/usr.bin/shar/shar.1 > @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a > significant security risk to users. > The > .Xr tar 1 > utility can still produce shar encodings of files if needed. > +The > +.Pa sysutils/freebsd-shar > +port has been created to maintain this version of > +.Nm > +past its deprecation in base. > .Sh SYNOPSIS > .Nm > .Ar > > ? Yeah, that should do it. > > Thanks, > > Kyle Evans -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jan 2 03:20:22 2025 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 4YNsQv06Btz5jtjC; Thu, 02 Jan 2025 03:20:23 +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 4YNsQt6bh2z4RhK; Thu, 2 Jan 2025 03:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735788022; 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=dtFbI3wjrszz7HfPr6Xkqj/FIcgmLrjW4F93DosvPFA=; b=PRdtvA31v+JNw6baCGStIE510IQCPHeMMIdiq199bhxfNeY5VbJOXeNBsmv9MPS4mMOn6U dYcZ9QaFVjY+/iyl0/nkAGPTm+pZaYded5eEUhAZ4ilvp10ILXrSy42t2yGjgCtL170mFe 4dI0cFSq2JnNHBkOQtcmXgkeV6RwMCDYsEHFyn76W8lZ0mJRIU02+2PjGnPCij8GVvabfS ynvbX/MMIiTzrE+vKP/ZpsdKv52dNaClzkMmJWgpRQSsaYYZwLJP1FLNbigleBloeHhcbb T1lRsix3wcnNR1ktpTe+v2X11IKDq3b7HY7unE0bRpYCHXwLQHYo8kMNrHoNJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735788022; 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=dtFbI3wjrszz7HfPr6Xkqj/FIcgmLrjW4F93DosvPFA=; b=Z/igRGrDqkxVDnTCZwQRvz+MDs+gKIytisVpW9DcCVh8rPHtmuWucCnWlfk8NYVl4iXJZQ ROMH6eN95l5ZEvDI3j7m1lKobQRM1y1/z9BAcCpAriATX2RJgxiAfJd/YOBI0uQMnYyCvH PtpZAhZfMAAUPib6DZCGooIND4bOKc5+V7vYaekRhOOg3m7u7DKNfoW+ZWo4XRhvLcFxY1 lrs9IXWQamJtOcK/tK6dtccBhUt8d2DB+zTzGMRUFq8biVooY/dOr+OlcOu4psp4+4aug4 vEBh6BT+IJtSgRrnzw/tIPhjDPvnoA9GJYIhfuMa02u5tzRJOQK/DHOKlzmuDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735788022; a=rsa-sha256; cv=none; b=T+Nwv71sOGfqVEPfv2Z7cQJTHe+GhNrsBg+GC8g0f4rzCTJNS+59ModaHqDx3MzQEZ1Sty maRRrIlU/pHML9o6ZBfjKiNh3y3zD5AEkXbR1r1jyBy/aEEKggcDyMGy41rC6a2c3ROk3G kGlXghu8uyBMHRVaEPTdW+h1LlYrosKNGA0NbQDQVcR8OCtmtYkB6zE2e2dIANC8mP/m6M xxxsS0do1iBZhmux1HIS6yq45JjSAA1hQveowQoA9MRC9R6XfHfnOyeWyfcM0tXBGUn5ol WtzKqexI8gdUs7NJhFGFNaj2QJQ4Ywqci6d/kVUGqRyzaSeOrrhqsYx2b/RYeQ== 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 4YNsQt6CDRzs4S; Thu, 2 Jan 2025 03:20:22 +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 5023KM1b070603; Thu, 2 Jan 2025 03:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5023KMp2070600; Thu, 2 Jan 2025 03:20:22 GMT (envelope-from git) Date: Thu, 2 Jan 2025 03:20:22 GMT Message-Id: <202501020320.5023KMp2070600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2832af7b4ea2 - main - shar: add a note about the port to the deprecation warning 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 2832af7b4ea256b18ef4dbf2ff97a50765f0609a Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2832af7b4ea256b18ef4dbf2ff97a50765f0609a commit 2832af7b4ea256b18ef4dbf2ff97a50765f0609a Author: Kyle Evans AuthorDate: 2025-01-02 03:18:00 +0000 Commit: Kyle Evans CommitDate: 2025-01-02 03:18:00 +0000 shar: add a note about the port to the deprecation warning cy@ was kind enough to preemptively create a port from the version of this script in base for those that need this exact interface; add a pointer to it so that interested individuals could start installing it sooner rather than later. Noted by: cy MFC after: 3 days --- usr.bin/shar/shar.1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 index df97021b1bba..6beb1e84ceab 100644 --- a/usr.bin/shar/shar.1 +++ b/usr.bin/shar/shar.1 @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a significant security risk to users. The .Xr tar 1 utility can still produce shar encodings of files if needed. +The +.Pa sysutils/freebsd-shar +port has been created to maintain this version of +.Nm +past its deprecation in base. .Sh SYNOPSIS .Nm .Ar From nobody Thu Jan 2 03:21:07 2025 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 4YNsRn1vZ7z5jttL; Thu, 02 Jan 2025 03:21:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNsRn194mz4S5S; Thu, 2 Jan 2025 03:21:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735788069; 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: in-reply-to:in-reply-to:references:references; bh=9lO+P6rYXPbVAjMAoUH+SYg98M5dZgFazRweC+T6vUA=; b=CTfwQdul8NiC0TjYEWVd0TCsL6ORdHHOcefIm5bSzyHHdRZo9saYHEB+5WumSRJx8dNlC7 oYP60dEqpnvEygfubSNimZclK4XiBg9At7/vi56JoC5s3HmMJYODxDEkrp4eNYDutjS5HI OureqgMOhCPjJRVv+aiYbR/mHzWUUoniwCGTuH63Xx9KuFeICuC/xbdVySJ+MAMyXdU6Xt vA+HzArmbGU7FPnyPbvFlCHGxl+MbF/ZKtUD5RnKXS+MonjQJzmU0JK3WfUoK6nWUCPjLS vZwsxzhXALURYTuGHXUpRPIkyfuq7I/a5GvMV0beFmpq1C+otXiDp//OAKlnVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735788069; 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: in-reply-to:in-reply-to:references:references; bh=9lO+P6rYXPbVAjMAoUH+SYg98M5dZgFazRweC+T6vUA=; b=QQhwLucf7ZfXPogw0IzZ6MWClYCDg5PWeRXsbc+Y+DjrnW0D+MEdG5GRC2X1G0SLpEoOXy 9NNBNv1n1w4GU97Y/X57X8FzoCO8eqpAmySEZHxyuigJ0ABXngRoQl+hrau/IX8TXsHiy1 qCw3NlwQichUr6qEFzsRphFRg/d/b7BGVi6ZXSPWEqwQ0MQNEYGJmeobvklCD4Om+SYcS/ V8ukhqUYi3bDU+8Uf7oiVEzouqyRbN8ygXiNM5wapzFgAaH+NJCIddTMV9jCsheoY9ILzn jVUNqooMJ8ihOCV6sI4sBznqTKGAeN8a7iD5GlApaN3phprNOwd74JZlLyEHzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735788069; a=rsa-sha256; cv=none; b=H8Li35cO4rdF67vv4MPUIQ5xnUVcYduvqPbBixwOkZnTDSOWuu50FomV4IU6PCvyeErhO0 W31tfpHlRVjr9xKgzAFX4sfxV2v5Ya+iNHvwurRSQOVT1uz7d1Yt/ydFXUc4jA5Qxf+PHa YLDW/NfNqFvdV4RIHihjtNRUK7rzrMruP9G+9yN6aS/v0yn1W3QiQH42/qUxCkWt2sIVTl d40HxwWNQpXsuVAseLpP7mBur7pyqFAS4eHp0CWWWq+NDVOjY6UZTfGjhCKmMT6wk6ifLL yItfM9uXiq1/vQeDt4HVTvuGdlYFL5SZNCpb2yxPy1K5bNKDNiSbkt3iKPxwOQ== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YNsRm5GVqzb91; Thu, 2 Jan 2025 03:21:08 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org> Date: Wed, 1 Jan 2025 21:21:07 -0600 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> <20250102025400.0235658A@slippy.cwsent.com> <20250102031452.A7E2B455@slippy.cwsent.com> Content-Language: en-US From: Kyle Evans In-Reply-To: <20250102031452.A7E2B455@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/1/25 21:14, Cy Schubert wrote: > In message , Kyle Evans > write > s: >> On 1/1/25 20:53, Cy Schubert wrote: >>> In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evans >>> writes >>> : >>>> The branch main has been updated by kevans: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac708e >> c49 >>>> 093782d4 >>>> >>>> commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 >>>> Author: Kyle Evans >>>> AuthorDate: 2025-01-02 02:15:36 +0000 >>>> Commit: Kyle Evans >>>> CommitDate: 2025-01-02 02:15:36 +0000 >>>> >>>> shar: add a deprecation notice >>>> >>>> The shar(1) program is simple, but the fundamental idea of a sh archi >> ve >>>> is risky at best and one that we probably shouldn't be promoting as >>>> prominently as a program in $PATH and a manpage. Let's deprecate and >>>> remove it, since the same functionality can easily be found in >>>> tar(1) instead. >>>> >>>> Reviewed by: emaste, philip >>>> Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (previo >> us) >>>> MFC after: 3 days >>>> Differential Revision: https://reviews.freebsd.org/D48130 >>>> --- >>>> usr.bin/shar/shar.1 | 14 +++++++++++++- >>>> 1 file changed, 13 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 >>>> index 903f937491dc..df97021b1bba 100644 >>>> --- a/usr.bin/shar/shar.1 >>>> +++ b/usr.bin/shar/shar.1 >>>> @@ -25,12 +25,24 @@ >>>> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY >> OF >>>> .\" SUCH DAMAGE. >>>> .\" >>>> -.Dd January 31, 2019 >>>> +.Dd January 1, 2025 >>>> .Dt SHAR 1 >>>> .Os >>>> .Sh NAME >>>> .Nm shar >>>> .Nd create a shell archive of files >>>> +.Sh DEPRECATION NOTICE >>>> +.Nm >>>> +is obsolete and may not be present in >>>> +.Fx 15 >>>> +and later. >>>> +Because shell archives are simultaneously data and code and are typically >>>> +interpreted by >>>> +.Xr sh 1 , >>>> +they can easily be trojan-horsed and pose a significant security risk to >> use >>>> rs. >>>> +The >>>> +.Xr tar 1 >>>> +utility can still produce shar encodings of files if needed. >>>> .Sh SYNOPSIS >>>> .Nm >>>> .Ar >>>> >>> >>> We should probably point to the new port or the GNU variant in ports. >>> >> >> Oh, sorry, I didn't realize you had gone ahead with the port. I >> wouldn't normally recommend a GNU variant, would you be OK with >> something like: >> >> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 >> index df97021b1bba..6beb1e84ceab 100644 >> --- a/usr.bin/shar/shar.1 >> +++ b/usr.bin/shar/shar.1 >> @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a >> significant security risk to users. >> The >> .Xr tar 1 >> utility can still produce shar encodings of files if needed. >> +The >> +.Pa sysutils/freebsd-shar >> +port has been created to maintain this version of >> +.Nm >> +past its deprecation in base. >> .Sh SYNOPSIS >> .Nm >> .Ar >> >> ? > > Yeah, that should do it. > Pushed as 2832af7b4ea256b18ef4dbf2ff97a50765f0609a, thanks. I'll drop another pointer to the port in UPDATING when it comes time to remove it. Thanks, Kyle Evans From nobody Thu Jan 2 07:44:32 2025 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 4YNzHj13wGz5k9Dc for ; Thu, 02 Jan 2025 07:44:33 +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 4YNzHj0Mzwz4rBZ; Thu, 2 Jan 2025 07:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735803873; 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=1A7rjp3DP25XD7L3g27GoX3dSb7QySweQN/tXvnTRKo=; b=fCCCHNALYe9uzomYYglzpF/j3fu4vIesJDhnGoey5a4zJfNJJIv8dcK/JCtVauSIeU/NLt RLs5cDn0vqAj2i9g7uIiuJmQsZLp+uas8r6Gj+vA/gf+aXqYN6th/gmK6cMw1VFsM3Yxr3 HUa5kCT3K1fjf4XtZqu6AbN1r3fn5l1uVIo6tyKyvHB7obL5wvRb/sbLo7yEe37+eQ+8px x2zXbY5GurhxsUgTX91wb5QpnYosma3tiJj8TnAYOYetn7z0CcZe5ajKOduSOCWLIlCNnO OaHznbvT4odHkg2S6FOCd/P/2QQLs79bWOmLwJ+Hg1KZOptrUGPiAIfxU6tdrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735803873; 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=1A7rjp3DP25XD7L3g27GoX3dSb7QySweQN/tXvnTRKo=; b=L0XWX7BUUxLnD6tn66RY0McuOTcGKP1eSvkGtpVNVhey3qufOuFaPN37qm2gPvVS+MHYKb OONicej/gZrul+tuzc2Q1MurFRQOV0E/wBcmSoWvP+pHoCSFobbPiGkYhFrbG/72V8YWBA T7KyAK4NUdNE2qqtjGrl2EbhxwovP21loFxxkCJ60nVaPFCFOfuiEIyhkB9TlnWdRIV0Yx mmnI66RnAjd3kiNOp5WT/PcCimwpbCxQMeKPQm90t5PfJ4ktjByaWvPQ+09o8JULO26J35 +O3k6J/+r1k357Rfv4xh32EKh/s1wlKSilPhQ3jnaYXTqN7vBM1bHflilN2nDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735803873; a=rsa-sha256; cv=none; b=cY8BNGCdo83dOPx5X+slixSIwkMYASYLMuEWp5Wv8hJPJiq5uOovLLRE0uZtSKD7IIKwt3 g4acrWeri3ADXMh0FifEgbiSAxVo7nGYRZapCE+O7quKtWGbo0VuRs5FHYm72OxppqbYvF 2qvTrx7lKRiNIeARM58N6sD7/d2C71vHtIErRD5ekwDVjw0Yv7uyxIc7t9RcB+84SfIeCc hinv74D0H+z8Y6dEHB8ORnBge6vee7O/5SrGmo9ucdroSJ5BT7u2xXEQ2zTwhCQdLMSj6/ zrW1gTIoej5YBrzBzUApEYPsjAM9oMcbNyTjEJkOCBPucYAyR31Qf5QMU6b+Cg== 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 4YNzHh75HZz10rp; Thu, 2 Jan 2025 07:44:32 +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 5027iWk6063221; Thu, 2 Jan 2025 07:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5027iWBO063220; Thu, 2 Jan 2025 07:44:32 GMT (envelope-from git) Date: Thu, 2 Jan 2025 07:44:32 GMT Message-Id: <202501020744.5027iWBO063220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 14e7644b818f - Create tag vendor/device-tree/6.9 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.9 X-Git-Reftype: annotated tag X-Git-Commit: 14e7644b818f1bac3b4057a78058ddf781c3dda4 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.9 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.9 tag vendor/device-tree/6.9 Tagger: Emmanuel Vadot TaggerDate: 2025-01-02 07:42:58 +0000 Tag devicetree files from Linux 6.9 commit e2e0a4ea3f708df73a339834acf21c2f8ff145d4 Author: Emmanuel Vadot AuthorDate: 2025-01-02 07:42:44 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 07:42:44 +0000 Import device-tree files from Linux 6.9 From nobody Thu Jan 2 08:55:20 2025 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 4YP0sP0NR3z5j0GT for ; Thu, 02 Jan 2025 08:55:21 +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 4YP0sN6vyLz4vvq; Thu, 2 Jan 2025 08:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808121; 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=XepWBJ7up+B4Op1Qi8yxWO0KJBjArOlpI+DXFW1cOQw=; b=XYF3sKEMNrsQiC6RdvJtW+9Iq+pf0Z4pn5B3L7fpb4+N+C97TuLeV+gRL99zDmNzCg5sa1 MfM5Hotm+QQDvmRPDfAI7F3peavCSOzIse1WI7cYRWqZuSQoVHkM+hVFxN+rS2Z/XIY1uq MT1rzIPFAmY5arCsdwjw1ZMTj+1lV9t8EsMVlXAhDO4xUdPZGd8Kjm9P5NAewPzSRfS0sw pH1i+Y6QsM6K3FLIN3ndZEGICAxO+itNHv//3piVICdz+nvdu7fIuJRsjN9Khwb4j31a2g onzdyEqXSytzcFBxqErXStFQMP16HNrkO3WI4HCwCDN+rkirjxqIHx4RXYEn6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808121; 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=XepWBJ7up+B4Op1Qi8yxWO0KJBjArOlpI+DXFW1cOQw=; b=nHvh9Y9+YuioUWVa3jTVHhZaTMh2DzBy5qNvEw7cuHcL25rskOlkPUhcOz+5yP5MQD1zEE CxVKh3g5yT+Rl4Gy+EiWctFUlpYJTwkE3lLm8jNhOo7Tm11TIs1oUzjTB19XH3uDdvbzAl YPid9IZJVu+E5R/yNw/Uzk6n/sIOGi+6T6usaOeIE1vGq0mHhzWfjmQLuwhJrxB1Pj2tbA 359rCQ/mEryqpJoBdMv+wZ3fZP9rbbyuQpzngLYXtPCieARC89opOa+hc5Zjpuzgr2LyVV eT2dXFsfSi+ra5KdE1FvYtXapcz7Yk8HOMExInZiVP3eul7Yg9Y8YSlgbiarjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808121; a=rsa-sha256; cv=none; b=CD1juybYXXQH/p3EotybIvI/f55fREi+sE2ZM/n7VCdBDBXguzNXPqqBGNKGroC2nyU6Jw /sdhaywKX7obqWkMm2Br2f8AXkQUbaP3TAV8Yn02vtwPtxVwyIYilNxLc72Qd8RB74og1I F6FCT595Rt9XlJ8s/8Tmvzkk4Uyycvt+qeu9uASii2vKBcHKBqmBeX6vOYtXLO6eTcpc0c P82D2Gj2ZaoQvHhDiBtmAKcxpavhsnLglAUcaV1ddEumZx5HIogvt5Unl++nApbutHXFpf I19+p8aqsPX6tqbCW+jOBWTpecJzPlsONub2rswlilGlhDQt/z4wX7ObAkQpHQ== 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 4YP0sN6CbXz12gy; Thu, 2 Jan 2025 08:55:20 +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 5028tKSr094053; Thu, 2 Jan 2025 08:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5028tKo9094052; Thu, 2 Jan 2025 08:55:20 GMT (envelope-from git) Date: Thu, 2 Jan 2025 08:55:20 GMT Message-Id: <202501020855.5028tKo9094052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: 16c0a3151e5f..ae7f9696aefd - vendor/nvi - vendor branch updated 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/vendor/nvi X-Git-Reftype: branch X-Git-Commit: ae7f9696aefd6ce7b024af37c4d2c32f6783d106 X-Git-Oldrev: 16c0a3151e5fa4958711f64bbc2f172cfe781743 X-Git-Newrev: ae7f9696aefd6ce7b024af37c4d2c32f6783d106 Auto-Submitted: auto-generated The branch vendor/nvi has been updated by bapt: URL: https://cgit.FreeBSD.org/src/log/?id=16c0a3151e5f..ae7f9696aefd ae7f9696aefd nvi: import version 2.2.1-52c07e8 From nobody Thu Jan 2 08:55:20 2025 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 4YP0sP0RPnz5j0GV for ; Thu, 02 Jan 2025 08:55:21 +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 4YP0sN74lNz4vt1; Thu, 2 Jan 2025 08:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808121; 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=UhqiEU2BDx1Y6K8ovmtNUplD4RbfDc7ubGMy+BH/Sfc=; b=JYJOf/cM+tlM4NI5i4gfK41G/xo3HGiGRqgvMdoYWfyo97ultsnX44qXICbG2aq1WrAMXN RnXLs+zg45r4nEv4YuGtlmGQaSvaNhrZqQFSpgTv4FzCUiJdDcVruZLg2Qmi5VbxZpdsXy R6sn1IWLEJnRwwxHBjSKhdwM1erZVJVYHc49exFIe8EQcJMKEEzCcjSNzjtinqDiPCH2df cNl7M4Hg5cL6VnvUuzK6VJ12X4cHcExP9KSB0uD874ne3R0Ho4iwKAeI9gFmZO9MRniSer bsDB/z7fnNsP1/FC8KhzwVTzGNXB9D8pLC40I/Kww8E4ij0aUbigVAR0Vu6QUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808121; 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=UhqiEU2BDx1Y6K8ovmtNUplD4RbfDc7ubGMy+BH/Sfc=; b=GuwuVQUlK3kveglI1T+F6cZiAI1f32utVsszl1HjPrNjciheaLHOaPeYeoq6JXTJuMlpTV ipNYq0eJ3nDPFepozgM4GPg+HDtwNlLMETk0TZFKfl+WUFOFC2BcN3iT7JNmM8LLQ+/467 EOR+RyP+D34L2ZW0tWjo/a5F7VtwYHsBozY6qGQhyou3HHvlCCIvsMLJKozIe28RAb3qje uM3eVYW3DTEiR9GcHKdSK1uu1hQ1J6VPLT5N4csWritVraNOsi+19B29onOBwYrl9dfAfj 4SLn91ALMX4gGAHiejPEKi31ygSrhxGjXHoh7PIFLDN8m8J5B6aCrcOwL1FpYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808121; a=rsa-sha256; cv=none; b=BuW5vOdaApbPPYIJVG4R49sPVBvQJAddzfM4D5T/WloOABgnGXimAgZK2ej/DrMKt0wYJe RG63+9B6Jnvy1axG30fIhAY0gIhwHKHDhqfaBA7k7WmIQdJRStpqfssXMOguMbmMOVHAWX MBKGckdONEXLqArvmoL7G9BE3BGeWtsZlbALQ7JLV5WZDCEEXF2uKjZxqUuqh/jtwzb3sI YhYAeWFBC+okb8wajvV4xIqRLL70k9b88hkOmv/87xVq1jvIS8HNdoPe/1u60zEfI0j1eB LsUNxBrgdBwIoxX4n0FrcYyYsG+qI7z6mmzn8GxqrPqGUFWvruGEaXvpcqB8Iw== 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 4YP0sN6gzDz12df; Thu, 2 Jan 2025 08:55:20 +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 5028tKx2094072; Thu, 2 Jan 2025 08:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5028tKok094071; Thu, 2 Jan 2025 08:55:20 GMT (envelope-from git) Date: Thu, 2 Jan 2025 08:55:20 GMT Message-Id: <202501020855.5028tKok094071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: 6192c7bad67e - Create tag vendor/nvi/2.2.1-52c07e8 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/tags/vendor/nvi/2.2.1-52c07e8 X-Git-Reftype: annotated tag X-Git-Commit: 6192c7bad67e7a7b92f77e167912bd70e346f8c7 Auto-Submitted: auto-generated The annotated tag vendor/nvi/2.2.1-52c07e8 has been created by bapt: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/nvi/2.2.1-52c07e8 tag vendor/nvi/2.2.1-52c07e8 Tagger: Baptiste Daroussin TaggerDate: 2025-01-02 08:54:39 +0000 nvi: tag import of version 2.2.1-52c07e8 commit ae7f9696aefd6ce7b024af37c4d2c32f6783d106 Author: Baptiste Daroussin AuthorDate: 2025-01-02 08:53:44 +0000 Commit: Baptiste Daroussin CommitDate: 2025-01-02 08:53:44 +0000 nvi: import version 2.2.1-52c07e8 From nobody Thu Jan 2 09:04:27 2025 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 4YP13x5XqBz5j0lQ; Thu, 02 Jan 2025 09:04:29 +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 4YP13x50L8z3xVg; Thu, 2 Jan 2025 09:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808669; 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=VRNXbXksX+0W/O6fsEbVmG+PzteiMB15bUP6P5WdriA=; b=VT9mRCEk5CvvcfiXI7euQS+n6mxpOX9XS3Xaoh3dRyg4V1gRDcHKLAvzFW0wtRyg1wKSOJ iz15plfOr+njRS5DokTIObejA5AdBQUrp3ZPJfwLYmXF3z6i8wBIHRu446AkV8n4Bn66/6 uWdCgO8q9jXUc4ZcvQj6goLw5waBWImQRPGO570hemCg6zPyhln5D7h3DCNL1j9JZRblRe eAWjFELd9QsriqQzn1BtYOJ3FEie6l5Bwyrs3nPRkcC18TI6Dp8PU6CYEj335apSPiVD1W 5zx80PIERp9JAtGb5hBv91bPuemhOP85Ejh15OxYlFh+BvTsNEiiWyXDgw5CAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808669; 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=VRNXbXksX+0W/O6fsEbVmG+PzteiMB15bUP6P5WdriA=; b=QIxfF2j2wf+Yr3UQ3QtDiUHmwHoZD8l6ykjszTNQ3a60+a40c3u8RarGN29FEvcWme6if4 jxD5GW/LrZQYu92LP/H3uat0/hZtQ4o2GtpVKr5CeTU73zxQ0foeNM+9ZLHV6uGpEP7Q4D dJauEDjLvGLxwiH0d7rVFEhgn8DWgh65I1BYCBGFdtrAlha4qoNktXkjKRGAftekJOiDP4 FT0bxfuk+l878lMC7TwQ53IOEUZTTo3sJSunxtta3Z9Hpj91NmcmDM5SxWvBqxacjboaVP NzWug2cfe3RaLAJRHCKSB4+QuQqPl11/CT3S1tHtDvkEO7Dv20datWAbSupG/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808669; a=rsa-sha256; cv=none; b=yY/NYDH3ltYH88wIxzH69CoHNuueiFoxky2bvg0vSPa2eBD+ZEKxKk82Ij0mFqUadUkCp1 4rrsm9j0tL672OoDdCGjEOsHdT5+gN9kjc60srYz3MamlR3pwA51UWRgP72JWIasUCxdoF 8Dz1+fX1eGJd6cCbz7NJ8pYG5Q2XivtgzNp59s8JwSJCiijcv8QKvwnOjp0uKwrki2/D9x QJRAni0Eu08r2KL/i4L+6OIk43U/IkPAvqy4LQ1t9ziuF9+j2y5nktpYoQ7Nrqnwbxdml5 HaHBQPApPOts9Q3JrbR5PRDZ7iB9AjXt49hESjOhj3QIOuiU6kWQ4x/z4Mp59g== 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 4YP13x4bZ1z12vc; Thu, 2 Jan 2025 09:04:29 +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 50294TIJ013111; Thu, 2 Jan 2025 09:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50294RPX013102; Thu, 2 Jan 2025 09:04:27 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:04:27 GMT Message-Id: <202501020904.50294RPX013102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4087ffdbce72 - main - nvi: import version 2.2.1-52c07e8 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4087ffdbce725367566bc3fc60a959292daac99d Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4087ffdbce725367566bc3fc60a959292daac99d commit 4087ffdbce725367566bc3fc60a959292daac99d Merge: 2832af7b4ea2 ae7f9696aefd Author: Baptiste Daroussin AuthorDate: 2025-01-02 08:56:55 +0000 Commit: Baptiste Daroussin CommitDate: 2025-01-02 09:04:12 +0000 nvi: import version 2.2.1-52c07e8 contrib/nvi/CMakeLists.txt | 1 - contrib/nvi/common/common.h | 1 + contrib/nvi/common/log.c | 1 - contrib/nvi/common/options.c | 4 +++- contrib/nvi/man/vi.1 | 51 ++++++++++++++++++++++++-------------------- contrib/nvi/vi/vs_refresh.c | 15 +++++++++---- usr.bin/vi/options_def.h | 51 ++++++++++++++++++++++---------------------- 7 files changed, 69 insertions(+), 55 deletions(-) diff --cc usr.bin/vi/options_def.h index cd6f5ba3eb26,000000000000..15104845c380 mode 100644,000000..100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@@ -1,85 -1,0 +1,86 @@@ +#define O_ALTNOTATION 0 +#define O_ALTWERASE 1 +#define O_AUTOINDENT 2 +#define O_AUTOPRINT 3 +#define O_AUTOWRITE 4 +#define O_BACKUP 5 +#define O_BEAUTIFY 6 +#define O_CDPATH 7 +#define O_CEDIT 8 +#define O_COLUMNS 9 +#define O_COMBINED 10 +#define O_COMMENT 11 +#define O_TMPDIR 12 +#define O_EDCOMPATIBLE 13 +#define O_ERRORBELLS 14 +#define O_ESCAPETIME 15 +#define O_EXPANDTAB 16 +#define O_EXRC 17 +#define O_EXTENDED 18 +#define O_FILEC 19 +#define O_FILEENCODING 20 +#define O_FLASH 21 +#define O_HARDTABS 22 +#define O_ICLOWER 23 +#define O_IGNORECASE 24 +#define O_INPUTENCODING 25 +#define O_KEYTIME 26 +#define O_LEFTRIGHT 27 +#define O_LINES 28 +#define O_LISP 29 +#define O_LIST 30 +#define O_LOCKFILES 31 +#define O_MAGIC 32 +#define O_MATCHCHARS 33 +#define O_MATCHTIME 34 +#define O_MESG 35 +#define O_MODELINE 36 +#define O_MSGCAT 37 +#define O_NOPRINT 38 +#define O_NUMBER 39 +#define O_OCTAL 40 +#define O_OPEN 41 +#define O_OPTIMIZE 42 +#define O_PARAGRAPHS 43 +#define O_PATH 44 +#define O_PRINT 45 +#define O_PROMPT 46 +#define O_READONLY 47 +#define O_RECDIR 48 +#define O_REDRAW 49 +#define O_REMAP 50 +#define O_REPORT 51 +#define O_RULER 52 +#define O_SCROLL 53 +#define O_SEARCHINCR 54 +#define O_SECTIONS 55 +#define O_SECURE 56 +#define O_SHELL 57 +#define O_SHELLMETA 58 +#define O_SHIFTWIDTH 59 - #define O_SHOWMATCH 60 - #define O_SHOWMODE 61 - #define O_SIDESCROLL 62 - #define O_SLOWOPEN 63 - #define O_SOURCEANY 64 - #define O_TABSTOP 65 - #define O_TAGLENGTH 66 - #define O_TAGS 67 - #define O_TERM 68 - #define O_TERSE 69 - #define O_TILDEOP 70 - #define O_TIMEOUT 71 - #define O_TTYWERASE 72 - #define O_VERBOSE 73 - #define O_W1200 74 - #define O_W300 75 - #define O_W9600 76 - #define O_WARN 77 - #define O_WINDOW 78 - #define O_WINDOWNAME 79 - #define O_WRAPLEN 80 - #define O_WRAPMARGIN 81 - #define O_WRAPSCAN 82 - #define O_WRITEANY 83 - #define O_OPTIONCOUNT 84 ++#define O_SHOWFILENAME 60 ++#define O_SHOWMATCH 61 ++#define O_SHOWMODE 62 ++#define O_SIDESCROLL 63 ++#define O_SLOWOPEN 64 ++#define O_SOURCEANY 65 ++#define O_TABSTOP 66 ++#define O_TAGLENGTH 67 ++#define O_TAGS 68 ++#define O_TERM 69 ++#define O_TERSE 70 ++#define O_TILDEOP 71 ++#define O_TIMEOUT 72 ++#define O_TTYWERASE 73 ++#define O_VERBOSE 74 ++#define O_W1200 75 ++#define O_W300 76 ++#define O_W9600 77 ++#define O_WARN 78 ++#define O_WINDOW 79 ++#define O_WINDOWNAME 80 ++#define O_WRAPLEN 81 ++#define O_WRAPMARGIN 82 ++#define O_WRAPSCAN 83 ++#define O_WRITEANY 84 ++#define O_OPTIONCOUNT 85 From nobody Thu Jan 2 09:05:34 2025 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 4YP15B396yz5j0lS for ; Thu, 02 Jan 2025 09:05:34 +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 4YP15B2W4jz3y59; Thu, 2 Jan 2025 09:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808734; 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=+N5KH/2dMxJoF7KV1/l9I5bzJFtwis8vtaHwq5Epl2o=; b=PIoQbMpM7eTryeRBZVwCV4v2pD0vkbhM6LZEyzMJa2eygqURMERiy9+2hekEJ/hhmwrOLt 0ubPsCUyfS4aD7l2IJTEZAPJXLneZfz1rTMRVRkymTgDCjjCcnlh/VtW4U4f8pGo726Dh8 c68mPWPOWLG2cI+oUhu1ryRD4/Cn/rEZFTYJyLOrm+2E5oTMWyEMB8lcLilhA8KGxGZ2mn M9wtxOSCTwPW837THe5sBnXc/jKsoU3ULi7yZtPIGfNSZAZBx+Y+cvHDHbGUpkhOcTAwm3 4k6NuNVw1WMfiJlI4kVts8VCZi7r+vPyyVfBR+IwKyKj0viDAt6PlJBG037S8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808734; 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=+N5KH/2dMxJoF7KV1/l9I5bzJFtwis8vtaHwq5Epl2o=; b=JnC+pEcGCUN/QwcBKdPTJydXS02vFh5OghYnI0Zok3hpqwsq6niFoAVCqrjtJviHvxctvF pl8oe1EUX4LE4xXJAP7aqLfi83XxLeUGTQi0RyCm6LmUjhvH/2Seyi241xS2bYErEWSmSW XrzYYkVF/DDaduXAG+FTQ18gO1EyJbEn4ant/AqfnLrFeldPiGaSrS12ZriE/m/td68lgO n0SRX3QLZu1Ut0qv5iH6lamYifJoEUGuoHO3w1mH31AnGiAAco7+hKic5sb6rfzkLuhf9/ 26MEoeQBrE6IFgKPhkDvUpxPGsATrvMhN0OfEn9y9vdb7X1ESl4SPcrKk/bh6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808734; a=rsa-sha256; cv=none; b=CztTx4KtiQjI8Z/495LGqVHfGdeOeTegRkC43yR6E7ntl2Ksu4MxAcVApZOqtbaSkp/bOF 0tVXm4mH1a5VX6hSSOyHnkMdmcCkZOVNafcevj/AGFQLIZbi6/YPeU1wsmnKIykHxqD2Vu hfWBD90wDIGtf7suZVGIW9L8H9Q12wY61JWuiFKpe76k21OjExV6+XIcIfVxzWz8EQ3eqL 9iCvq0hFPpGbn2puuvINxJi+gbmW7dS1w6Jwm6uj7KbzFOV2Ke26+DnVgtZrOmJU1Tken6 IGI19v6qo1wPJGVeU6kV6iDghhjcTB5i/l38OfgJLvHrMQUFDwAK8/tKMh74og== 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 4YP15B1mtcz12W4; Thu, 2 Jan 2025 09:05:34 +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 50295YwY013517; Thu, 2 Jan 2025 09:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50295YYJ013516; Thu, 2 Jan 2025 09:05:34 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:05:34 GMT Message-Id: <202501020905.50295YYJ013516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 48aa10e06590..e2e0a4ea3f70 - vendor/device-tree - vendor branch updated 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: e2e0a4ea3f708df73a339834acf21c2f8ff145d4 X-Git-Oldrev: 48aa10e065908667e32e3aab09f1c787cd127470 X-Git-Newrev: e2e0a4ea3f708df73a339834acf21c2f8ff145d4 Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=48aa10e06590..e2e0a4ea3f70 e2e0a4ea3f70 Import device-tree files from Linux 6.9 From nobody Thu Jan 2 09:06:53 2025 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 4YP16k0Tr2z5j15W; Thu, 02 Jan 2025 09:06:54 +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 4YP16j6ypKz40n9; Thu, 2 Jan 2025 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808813; 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=V1BM8tRZDm62xa//Sc2bY/DEiRRHcjQA2s/zPgJsfrI=; b=eCrm/eQezDKmk8LGHcNn54h3pX+us1EGF/GNwjuK7adW0ZPqLpYQN06uAHS/MTZUQns86M nWZV1ULuIAuHZ5PCdo86JL+25XO1ZbgGk0U+o9QX2fr9Sk09YCr0g9sjIluzZWN3WzZAqq 3zCF1+RH0zSIUGKlHQcMun69UgQKVBSovSfDt9+kjaT3H+IXvJjmU8ojujVuCt1OG7ou7N ZUWrxvMChbmQsUU+kHyHpVYsRv46iWUqOKP1F3q5xyCtGHoXr8N+avFmH6fOK/y8ZYVEQO TtzkxArYwnEJBmIUbuN8YjpdfT+mynf/VP+fls4sA2X0/QA6Hfvq/PyT0smLxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808813; 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=V1BM8tRZDm62xa//Sc2bY/DEiRRHcjQA2s/zPgJsfrI=; b=etnvQG7g17odGpuPzvdnTAZCLEeWLX7aWHs7ssSjuEiEmQqdodMNIVY7bf6jn0fVW/PskY B9gqS/oJUNjrfu20KbBnrwSILZLfWHUwfgs83KPXAcxbdKE2eK1G/jvc8+648Kp6brIqKi MNmS/m4nSgd6mzY/mkc7WnK4uob4G2GFu3IrVJSzvSO2NgyOm/a3lriP5qjN4kpqCBQKSU cj7TRPghyTJO3y1AvxI/juJ9tOGgHn+ITvruqDu7oiD2yoE1nYg5gVFay9QW5YiYPQiktF YEZr2eRQ5ctdV9vmozhDldJHaacuKlcNdaVurHTUEkCAwJFO96AWGPR9g4VfHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808813; a=rsa-sha256; cv=none; b=XoaJymAm6O5/8Oaw31Z5yJ2yJ4VskbS3IdenDqSRlrft5vQftKm6lrB6iKLZn7gdVnvCiC qQDZBjgqYEx9OdvT3Z+ALgoHcE6j5w0dYQcXeNiYmzppk4W6+tcQ6i8jF1X5bzPZItAxr3 QyLKaYf1Y89SR8u4yVHQc0ZCDIW/IYhW6+CbZlLvWSnV9olB/BJYBO8MS/H4GHsQKmhJHA xjyYW1Gf/rmwcDc1fof1gkO7JknIMElk+RNnsk6rD7D6FkbQXesFG+Csx8ecsnpMjlfonY gMK/hekUIvIiGI/iQiTbm3+3TLSv5oS7OJBExg0/FA6xnsx4ot1EWeWj7YxinQ== 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 4YP16j6FZTz12W5; Thu, 2 Jan 2025 09:06:53 +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 50296raJ014060; Thu, 2 Jan 2025 09:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50296rsw014057; Thu, 2 Jan 2025 09:06:53 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:06:53 GMT Message-Id: <202501020906.50296rsw014057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 01950c46b815 - main - Import device-tree files from Linux 6.9 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01950c46b8155250f64374fb72fc11faa44bf099 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=01950c46b8155250f64374fb72fc11faa44bf099 commit 01950c46b8155250f64374fb72fc11faa44bf099 Merge: 4087ffdbce72 e2e0a4ea3f70 Author: Emmanuel Vadot AuthorDate: 2025-01-02 09:06:22 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 09:06:22 +0000 Import device-tree files from Linux 6.9 sys/contrib/device-tree/Bindings/Makefile | 3 - sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 15 +- .../device-tree/Bindings/arm/arm,realview.yaml | 6 +- .../device-tree/Bindings/arm/atmel-at91.yaml | 6 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 41 +- .../Bindings/arm/marvell/armada-38x.yaml | 70 + sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 198 +- .../Bindings/arm/qcom,coresight-tpdm.yaml | 40 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 58 +- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 71 +- sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 12 + sys/contrib/device-tree/Bindings/arm/syna.txt | 12 - sys/contrib/device-tree/Bindings/arm/tegra.yaml | 8 + .../Bindings/arm/tegra/nvidia,tegra186-pmc.yaml | 58 +- sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 14 + .../Bindings/ata/mediatek,mtk-ahci.yaml | 98 + .../Bindings/auxdisplay/arm,versatile-lcd.yaml | 4 +- .../Bindings/auxdisplay/gpio-7-segment.yaml | 55 + .../Bindings/auxdisplay/hit,hd44780.yaml | 68 +- .../Bindings/auxdisplay/holtek,ht16k33.yaml | 54 +- .../Bindings/auxdisplay/img,ascii-lcd.yaml | 4 +- .../Bindings/auxdisplay/maxim,max6959.yaml | 44 + .../device-tree/Bindings/bus/brcm,gisb-arb.yaml | 1 + .../Bindings/clock/google,gs101-clock.yaml | 28 +- .../device-tree/Bindings/clock/keystone-gate.txt | 2 - .../device-tree/Bindings/clock/keystone-pll.txt | 2 - .../Bindings/clock/mediatek,mt2701-hifsys.yaml | 50 + .../Bindings/clock/mediatek,mt7622-pciesys.yaml | 45 + .../Bindings/clock/mediatek,mt7622-ssusbsys.yaml | 45 + .../Bindings/clock/mobileye,eyeq5-clk.yaml | 51 + .../Bindings/clock/qcom,gcc-sc8180x.yaml | 7 + .../device-tree/Bindings/clock/qcom,gpucc.yaml | 9 + .../device-tree/Bindings/clock/qcom,q6sstopcc.yaml | 2 +- .../Bindings/clock/qcom,sm8450-camcc.yaml | 2 + .../Bindings/clock/qcom,sm8450-gpucc.yaml | 2 + .../Bindings/clock/qcom,sm8550-dispcc.yaml | 7 +- .../Bindings/clock/qcom,sm8550-tcsr.yaml | 1 + .../Bindings/clock/renesas,cpg-mssr.yaml | 1 + .../Bindings/clock/samsung,exynos850-clock.yaml | 42 + .../Bindings/clock/tesla,fsd-clock.yaml | 2 +- .../device-tree/Bindings/clock/ti/adpll.txt | 2 - sys/contrib/device-tree/Bindings/clock/ti/apll.txt | 2 - .../device-tree/Bindings/clock/ti/autoidle.txt | 2 - .../device-tree/Bindings/clock/ti/clockdomain.txt | 2 - .../device-tree/Bindings/clock/ti/composite.txt | 2 - .../device-tree/Bindings/clock/ti/divider.txt | 2 - sys/contrib/device-tree/Bindings/clock/ti/dpll.txt | 2 - .../device-tree/Bindings/clock/ti/fapll.txt | 2 - .../Bindings/clock/ti/fixed-factor-clock.txt | 2 - sys/contrib/device-tree/Bindings/clock/ti/gate.txt | 2 - .../device-tree/Bindings/clock/ti/interface.txt | 2 - sys/contrib/device-tree/Bindings/clock/ti/mux.txt | 2 - .../Bindings/crypto/atmel,at91sam9g46-aes.yaml | 6 +- .../Bindings/crypto/atmel,at91sam9g46-sha.yaml | 6 +- .../Bindings/crypto/atmel,at91sam9g46-tdes.yaml | 6 +- .../Bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + .../device-tree/Bindings/crypto/qcom-qce.yaml | 1 + .../atmel/atmel,hlcdc-display-controller.yaml | 63 + .../display/bridge/fsl,imx8mp-hdmi-tx.yaml | 102 + .../Bindings/display/bridge/ti,sn65dsi86.yaml | 2 +- .../device-tree/Bindings/display/fsl,lcdif.yaml | 8 +- .../Bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml | 84 + .../Bindings/display/msm/dsi-controller-main.yaml | 2 + .../device-tree/Bindings/display/msm/gmu.yaml | 1 + .../device-tree/Bindings/display/msm/gpu.yaml | 6 +- .../Bindings/display/msm/qcom,mdss.yaml | 1 + .../Bindings/display/msm/qcom,sm8150-mdss.yaml | 9 + .../Bindings/display/msm/qcom,sm8650-dpu.yaml | 4 +- .../Bindings/display/msm/qcom,sm8650-mdss.yaml | 4 + .../Bindings/display/msm/qcom,x1e80100-mdss.yaml | 251 ++ .../display/panel/boe,th101mb31ig002-28a.yaml | 58 + .../Bindings/display/panel/himax,hx83112a.yaml | 74 + .../display/panel/leadtek,ltk500hd1829.yaml | 4 +- .../Bindings/display/panel/novatek,nt35510.yaml | 5 +- .../Bindings/display/panel/novatek,nt36672e.yaml | 66 + .../Bindings/display/panel/panel-lvds.yaml | 4 + .../Bindings/display/panel/panel-simple.yaml | 4 + .../display/panel/rocktech,jh057n00900.yaml | 3 + .../Bindings/display/panel/visionox,r66451.yaml | 2 +- .../Bindings/display/panel/visionox,rm69299.yaml | 3 +- .../Bindings/display/renesas,rzg2l-du.yaml | 126 + .../display/rockchip/rockchip,dw-hdmi.yaml | 33 +- .../Bindings/display/solomon,ssd1307fb.yaml | 20 +- .../Bindings/display/solomon,ssd132x.yaml | 12 +- .../Bindings/display/solomon,ssd133x.yaml | 45 + .../Bindings/display/ti/ti,am65x-dss.yaml | 7 +- .../Bindings/dma/allwinner,sun50i-a64-dma.yaml | 12 +- sys/contrib/device-tree/Bindings/dma/fsl,edma.yaml | 2 + .../device-tree/Bindings/dma/fsl,imx-sdma.yaml | 3 +- .../device-tree/Bindings/dma/marvell,mmp-dma.yaml | 72 + .../Bindings/dma/mediatek,mt7622-hsdma.yaml | 63 + .../Bindings/dma/renesas,rcar-dmac.yaml | 1 + .../device-tree/Bindings/dts-coding-style.rst | 2 + sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 5 +- .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 96 +- .../device-tree/Bindings/fpga/fpga-region.yaml | 358 +++ .../Bindings/fpga/xlnx,versal-fpga.yaml | 2 +- .../Bindings/gpio/aspeed,ast2400-gpio.yaml | 148 ++ .../Bindings/gpio/gateworks,pld-gpio.txt | 3 +- .../device-tree/Bindings/gpio/gpio-mvebu.yaml | 2 +- .../device-tree/Bindings/gpio/gpio-pca9570.yaml | 3 + .../device-tree/Bindings/gpio/mrvl-gpio.yaml | 2 +- .../Bindings/gpio/renesas,rcar-gpio.yaml | 1 + .../device-tree/Bindings/gpio/st,nomadik-gpio.yaml | 95 + .../Bindings/gpu/img,powervr-rogue.yaml | 73 + .../device-tree/Bindings/gpu/img,powervr-sgx.yaml | 138 ++ .../device-tree/Bindings/hwmon/adi,adm1177.yaml | 5 +- .../device-tree/Bindings/hwmon/adi,adm1275.yaml | 7 +- .../device-tree/Bindings/hwmon/adi,ltc2945.yaml | 5 +- .../device-tree/Bindings/hwmon/adi,ltc4282.yaml | 159 ++ .../Bindings/hwmon/amphenol,chipcap2.yaml | 77 + .../Bindings/hwmon/aspeed,g6-pwm-tach.yaml | 71 + .../device-tree/Bindings/hwmon/fan-common.yaml | 79 + .../device-tree/Bindings/hwmon/hwmon-common.yaml | 19 + .../device-tree/Bindings/hwmon/lltc,ltc4151.yaml | 5 +- .../device-tree/Bindings/hwmon/lltc,ltc4286.yaml | 9 +- sys/contrib/device-tree/Bindings/hwmon/lm75.yaml | 3 +- .../Bindings/hwmon/nuvoton,nct6775.yaml | 1 + .../Bindings/hwmon/pmbus/infineon,tda38640.yaml | 28 + .../Bindings/hwmon/pmbus/ti,lm25066.yaml | 17 +- .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 11 +- .../device-tree/Bindings/hwmon/ti,tmp513.yaml | 5 +- .../device-tree/Bindings/hwmon/ti,tps23861.yaml | 5 +- .../Bindings/i2c/atmel,at91sam-i2c.yaml | 4 +- .../Bindings/i2c/i2c-demux-pinctrl.yaml | 3 +- .../device-tree/Bindings/i2c/i2c-exynos5.yaml | 1 + .../device-tree/Bindings/i2c/i2c-imx-lpi2c.yaml | 1 + sys/contrib/device-tree/Bindings/i2c/i2c-mpc.yaml | 2 +- .../device-tree/Bindings/i2c/i2c-mux-pca954x.yaml | 30 + sys/contrib/device-tree/Bindings/i2c/i2c-pxa.yaml | 2 +- .../Bindings/i2c/nvidia,tegra186-bpmp-i2c.yaml | 3 +- .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 2 +- .../device-tree/Bindings/i2c/renesas,rcar-i2c.yaml | 1 + .../device-tree/Bindings/i2c/st,nomadik-i2c.yaml | 49 +- .../Bindings/i3c/aspeed,ast2600-i3c.yaml | 2 +- .../device-tree/Bindings/i3c/cdns,i3c-master.yaml | 2 +- sys/contrib/device-tree/Bindings/i3c/i3c.yaml | 6 +- .../device-tree/Bindings/i3c/mipi-i3c-hci.yaml | 2 +- .../Bindings/i3c/silvaco,i3c-master.yaml | 2 +- .../Bindings/i3c/snps,dw-i3c-master.yaml | 2 +- sys/contrib/device-tree/Bindings/iio/adc/adc.yaml | 1 - .../device-tree/Bindings/iio/adc/adi,ad9467.yaml | 4 + .../device-tree/Bindings/iio/adc/adi,axi-adc.yaml | 8 +- .../Bindings/iio/adc/microchip,pac1934.yaml | 120 + .../Bindings/iio/adc/nxp,imx93-adc.yaml | 4 +- .../Bindings/iio/adc/qcom,spmi-vadc.yaml | 1 - .../Bindings/iio/adc/richtek,rtq6056.yaml | 9 +- .../device-tree/Bindings/iio/adc/ti,ads1298.yaml | 80 + .../Bindings/iio/afe/voltage-divider.yaml | 11 + .../Bindings/iio/amplifiers/adi,hmc425a.yaml | 47 +- .../Bindings/iio/frequency/adi,admfm2000.yaml | 127 + .../Bindings/iio/gyroscope/bosch,bmg160.yaml | 8 +- .../Bindings/iio/health/maxim,max30102.yaml | 2 +- .../Bindings/iio/humidity/ti,hdc2010.yaml | 3 + .../Bindings/iio/humidity/ti,hdc3020.yaml | 3 + .../device-tree/Bindings/iio/imu/st,lsm6dsx.yaml | 4 +- .../Bindings/iio/light/ams,as73211.yaml | 7 +- .../Bindings/iio/light/vishay,veml6075.yaml | 1 + .../iio/magnetometer/voltafield,af8133j.yaml | 60 + .../Bindings/iio/pressure/honeywell,hsc030pa.yaml | 3 + .../iio/pressure/honeywell,mprls0025pa.yaml | 98 +- .../Bindings/iio/temperature/ti,tmp117.yaml | 8 + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 1 - .../device-tree/Bindings/input/atmel,captouch.yaml | 59 + .../Bindings/input/dlg,da9062-onkey.yaml | 38 + .../Bindings/input/samsung,s3c6410-keypad.yaml | 121 + .../Bindings/input/touchscreen/fsl,imx6ul-tsc.yaml | 97 + .../Bindings/input/touchscreen/goodix,gt9916.yaml | 95 + .../Bindings/input/touchscreen/goodix.yaml | 5 +- .../input/touchscreen/imagis,ist3038c.yaml | 21 +- .../Bindings/input/touchscreen/melfas,mms114.yaml | 6 +- .../Bindings/input/touchscreen/silead,gsl1680.yaml | 2 +- .../Bindings/interconnect/qcom,rpm.yaml | 3 + .../Bindings/interconnect/qcom,rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm7150-rpmh.yaml | 84 + .../amlogic,meson-gpio-intc.yaml | 1 + .../Bindings/interrupt-controller/atmel,aic.yaml | 89 + .../Bindings/interrupt-controller/fsl,intmux.yaml | 3 + .../mediatek,mt6577-sysirq.yaml | 85 + .../interrupt-controller/renesas,rzg2l-irqc.yaml | 44 +- .../interrupt-controller/starfive,jh8100-intc.yaml | 61 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 20 +- .../Bindings/leds/backlight/kinetic,ktd2801.yaml | 46 + .../Bindings/leds/backlight/qcom-wled.yaml | 4 +- sys/contrib/device-tree/Bindings/leds/common.yaml | 12 + .../device-tree/Bindings/leds/leds-bcm63138.yaml | 4 - .../device-tree/Bindings/leds/leds-bcm6328.yaml | 4 - .../device-tree/Bindings/leds/leds-bcm6358.txt | 2 - .../Bindings/leds/leds-pwm-multicolor.yaml | 4 +- .../device-tree/Bindings/leds/leds-pwm.yaml | 5 - .../device-tree/Bindings/leds/leds-qcom-lpg.yaml | 102 +- .../device-tree/Bindings/leds/onnn,ncp5623.yaml | 96 + .../device-tree/Bindings/mailbox/fsl,mu.yaml | 58 +- .../Bindings/media/i2c/techwell,tw9900.yaml | 2 +- .../Bindings/media/mediatek,vcodec-encoder.yaml | 31 +- .../Bindings/media/mediatek-jpeg-encoder.yaml | 3 +- .../device-tree/Bindings/media/rockchip-isp1.yaml | 37 +- .../Bindings/media/st,stm32mp25-video-codec.yaml | 49 + .../fsl/fsl,imx-weim-peripherals.yaml | 31 + .../memory-controllers/fsl/fsl,imx-weim.yaml | 204 ++ .../memory-controllers/mc-peripheral-props.yaml | 1 + .../memory-controllers/nvidia,tegra20-emc.yaml | 2 +- .../memory-controllers/renesas,rpc-if.yaml | 1 + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 7 +- .../device-tree/Bindings/mfd/atmel,hlcdc.yaml | 99 + .../Bindings/mfd/atmel,sama5d2-flexcom.yaml | 99 + .../device-tree/Bindings/mfd/dlg,da9063.yaml | 251 +- .../device-tree/Bindings/mfd/google,cros-ec.yaml | 7 + sys/contrib/device-tree/Bindings/mfd/iqs62x.yaml | 2 +- .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 2 + sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 3 + sys/contrib/device-tree/Bindings/mfd/ti,twl.yaml | 2 + sys/contrib/device-tree/Bindings/mips/cpus.yaml | 13 +- .../device-tree/Bindings/mips/mobileye.yaml | 32 + .../device-tree/Bindings/misc/qcom,fastrpc.yaml | 2 + .../device-tree/Bindings/misc/xlnx,sd-fec.yaml | 140 ++ .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 11 +- .../device-tree/Bindings/mmc/fsl-imx-mmc.yaml | 12 + .../mmc/hisilicon,hi3798cv200-dw-mshc.yaml | 97 + .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 1 + .../Bindings/mmc/snps,dwcmshc-sdhci.yaml | 2 + .../device-tree/Bindings/mtd/atmel-nand.txt | 1 + .../device-tree/Bindings/mtd/brcm,brcmnand.yaml | 44 +- .../device-tree/Bindings/mtd/davinci-nand.txt | 2 +- .../device-tree/Bindings/mtd/flctl-nand.txt | 2 +- .../device-tree/Bindings/mtd/fsl-upm-nand.txt | 2 +- .../device-tree/Bindings/mtd/gpio-control-nand.txt | 2 +- .../device-tree/Bindings/mtd/gpmi-nand.yaml | 2 +- .../device-tree/Bindings/mtd/hisi504-nand.txt | 2 +- .../device-tree/Bindings/mtd/jedec,spi-nor.yaml | 3 + sys/contrib/device-tree/Bindings/mtd/mtd.yaml | 2 + .../Bindings/mtd/nvidia-tegra20-nand.txt | 2 +- .../device-tree/Bindings/mtd/orion-nand.txt | 2 +- .../Bindings/mtd/partitions/linux,ubi.yaml | 75 + .../Bindings/mtd/partitions/ubi-volume.yaml | 40 + .../device-tree/Bindings/mtd/samsung-s3c2410.txt | 2 +- .../Bindings/mtd/st,stm32-fmc2-nand.yaml | 25 +- .../device-tree/Bindings/mux/mux-controller.yaml | 2 +- .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 8 +- .../device-tree/Bindings/net/brcm,asp-v2.0.yaml | 4 + .../device-tree/Bindings/net/brcm,unimac-mdio.yaml | 1 + .../device-tree/Bindings/net/can/fsl,flexcan.yaml | 3 + .../Bindings/net/can/microchip,mpfs-can.yaml | 6 +- .../device-tree/Bindings/net/can/tcan4x5x.txt | 3 + .../device-tree/Bindings/net/can/xilinx,can.yaml | 5 + .../device-tree/Bindings/net/cdns,macb.yaml | 5 + .../Bindings/net/dsa/microchip,ksz.yaml | 1 + .../device-tree/Bindings/net/dsa/qca,ar9331.yaml | 161 ++ .../device-tree/Bindings/net/dsa/realtek.yaml | 4 +- .../Bindings/net/ethernet-controller.yaml | 1 - .../Bindings/net/ethernet-phy-package.yaml | 52 + sys/contrib/device-tree/Bindings/net/fsl,fec.yaml | 3 + .../device-tree/Bindings/net/mediatek,net.yaml | 22 +- .../device-tree/Bindings/net/nfc/ti,trf7970a.yaml | 2 +- .../device-tree/Bindings/net/qca,qca808x.yaml | 54 + .../device-tree/Bindings/net/qcom,ethqos.yaml | 9 +- sys/contrib/device-tree/Bindings/net/qcom,ipa.yaml | 2 +- .../Bindings/net/qcom,ipq4019-mdio.yaml | 15 + .../device-tree/Bindings/net/qcom,qca807x.yaml | 184 ++ .../device-tree/Bindings/net/renesas,etheravb.yaml | 1 + .../device-tree/Bindings/net/snps,dwmac.yaml | 17 +- .../Bindings/net/starfive,jh7110-dwmac.yaml | 72 +- .../device-tree/Bindings/net/ti,cpsw-switch.yaml | 5 +- .../device-tree/Bindings/net/ti,dp83822.yaml | 34 + .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 +- .../device-tree/Bindings/net/ti,k3-am654-cpts.yaml | 5 +- .../Bindings/net/wireless/mediatek,mt76.yaml | 33 +- .../Bindings/net/wireless/qcom,ath10k.yaml | 1 + .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 1 + .../Bindings/net/wireless/qcom,ath11k.yaml | 1 + .../Bindings/nvmem/layouts/fixed-cell.yaml | 22 +- .../device-tree/Bindings/nvmem/nvmem-provider.yaml | 18 + .../Bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 42 + .../device-tree/Bindings/opp/opp-v2-base.yaml | 2 - .../Bindings/pci/fsl,imx6q-pcie-common.yaml | 17 +- .../Bindings/pci/fsl,imx6q-pcie-ep.yaml | 46 +- .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 49 +- .../device-tree/Bindings/pci/qcom,pcie-common.yaml | 100 + .../Bindings/pci/qcom,pcie-sa8775p.yaml | 166 ++ .../device-tree/Bindings/pci/qcom,pcie-sc7280.yaml | 166 ++ .../Bindings/pci/qcom,pcie-sc8180x.yaml | 170 ++ .../Bindings/pci/qcom,pcie-sc8280xp.yaml | 180 ++ .../device-tree/Bindings/pci/qcom,pcie-sm8150.yaml | 158 ++ .../device-tree/Bindings/pci/qcom,pcie-sm8250.yaml | 173 ++ .../device-tree/Bindings/pci/qcom,pcie-sm8350.yaml | 184 ++ .../device-tree/Bindings/pci/qcom,pcie-sm8450.yaml | 178 ++ .../device-tree/Bindings/pci/qcom,pcie-sm8550.yaml | 171 ++ .../Bindings/pci/qcom,pcie-x1e80100.yaml | 165 ++ .../device-tree/Bindings/pci/qcom,pcie.yaml | 378 +-- .../Bindings/perf/arm,coresight-pmu.yaml | 39 + .../perf/starfive,jh8100-starlink-pmu.yaml | 46 + .../Bindings/phy/mediatek,mt8365-csi-rx.yaml | 79 + .../Bindings/phy/phy-cadence-torrent.yaml | 11 +- .../Bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml | 184 ++ .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 + .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 48 +- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 22 - .../Bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 91 + .../Bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 2 +- .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 2 +- .../amlogic,meson-pinctrl-g12a-periphs.yaml | 2 +- .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 2 +- .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 2 +- .../Bindings/pinctrl/atmel,at91-pinctrl.txt | 2 + .../Bindings/pinctrl/awinic,aw9523-pinctrl.yaml | 139 ++ .../Bindings/pinctrl/cirrus,madera.yaml | 3 +- .../Bindings/pinctrl/cypress,cy8c95x0.yaml | 24 +- .../Bindings/pinctrl/fsl,imx6ul-pinctrl.yaml | 116 + .../Bindings/pinctrl/mobileye,eyeq5-pinctrl.yaml | 242 ++ .../Bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 2 - .../Bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 3 +- .../pinctrl/nvidia,tegra234-pinmux-aon.yaml | 7 +- .../pinctrl/nvidia,tegra234-pinmux-common.yaml | 84 +- .../Bindings/pinctrl/nvidia,tegra234-pinmux.yaml | 7 +- .../device-tree/Bindings/pinctrl/pincfg-node.yaml | 2 +- .../Bindings/pinctrl/qcom,sm4450-tlmm.yaml | 2 +- .../device-tree/Bindings/pinctrl/renesas,pfc.yaml | 1 + .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 + .../Bindings/pinctrl/xlnx,pinctrl-zynq.yaml | 217 ++ .../device-tree/Bindings/power/qcom,rpmpd.yaml | 2 + .../Bindings/power/renesas,rcar-sysc.yaml | 1 + .../device-tree/Bindings/power/wakeup-source.txt | 2 +- .../device-tree/Bindings/pwm/atmel,hlcdc-pwm.yaml | 35 + .../device-tree/Bindings/pwm/marvell,pxa-pwm.yaml | 51 + .../Bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + .../Bindings/pwm/mediatek,pwm-disp.yaml | 3 + .../device-tree/Bindings/pwm/opencores,pwm.yaml | 56 + .../device-tree/Bindings/pwm/pwm-amlogic.yaml | 115 +- .../Bindings/regulator/gpio-regulator.yaml | 4 +- .../Bindings/regulator/infineon,ir38060.yaml | 45 + .../Bindings/regulator/microchip,mcp16502.yaml | 180 ++ .../regulator/qcom,usb-vbus-regulator.yaml | 11 +- .../Bindings/regulator/ti,tps65132.yaml | 84 + .../device-tree/Bindings/remoteproc/mtk,scp.yaml | 4 +- .../Bindings/remoteproc/qcom,glink-rpm-edge.yaml | 1 - .../Bindings/remoteproc/qcom,qcs404-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sc7180-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 2 +- .../Bindings/remoteproc/qcom,sc8180x-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm6115-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm6350-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm6375-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm8150-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm8350-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm8550-pas.yaml | 51 +- .../Bindings/remoteproc/qcom,wcnss-pil.yaml | 2 +- .../Bindings/remoteproc/ti,davinci-rproc.txt | 3 - .../Bindings/reset/mobileye,eyeq5-reset.yaml | 43 + .../device-tree/Bindings/reset/renesas,rst.yaml | 1 + .../Bindings/reset/sophgo,sg2042-reset.yaml | 35 + sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 10 +- .../device-tree/Bindings/riscv/extensions.yaml | 7 + .../device-tree/Bindings/rng/atmel,at91-trng.yaml | 4 + .../device-tree/Bindings/rtc/abracon,abx80x.yaml | 98 + .../Bindings/rtc/atmel,at91sam9260-rtt.yaml | 4 +- .../Bindings/rtc/mediatek,mt2712-rtc.yaml | 39 + .../Bindings/rtc/mediatek,mt7622-rtc.yaml | 52 + .../device-tree/Bindings/rtc/sa1100-rtc.yaml | 2 +- .../device-tree/Bindings/rtc/xlnx,zynqmp-rtc.yaml | 11 +- .../Bindings/serial/atmel,at91-usart.yaml | 2 +- .../device-tree/Bindings/serial/cdns,uart.yaml | 1 + .../device-tree/Bindings/serial/fsl-lpuart.yaml | 1 + .../device-tree/Bindings/serial/renesas,hscif.yaml | 1 + .../device-tree/Bindings/serial/samsung_uart.yaml | 2 + .../device-tree/Bindings/serial/serial.yaml | 2 +- .../device-tree/Bindings/serial/st,asc.yaml | 55 + .../device-tree/Bindings/serial/st,stm32-uart.yaml | 3 + .../Bindings/soc/fsl/fsl,layerscape-dcfg.yaml | 2 +- .../Bindings/soc/fsl/fsl,layerscape-scfg.yaml | 2 +- .../Bindings/soc/imx/fsl,imx-anatop.yaml | 128 + .../Bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml | 18 +- .../Bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 22 +- .../device-tree/Bindings/soc/qcom/qcom,pbs.yaml | 46 + .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 3 + .../Bindings/soc/qcom/qcom,rpm-master-stats.yaml | 2 + .../device-tree/Bindings/soc/qcom/qcom,saw2.yaml | 119 + .../Bindings/soc/renesas/renesas-soc.yaml | 73 + .../device-tree/Bindings/soc/renesas/renesas.yaml | 25 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 23 + .../soc/samsung/samsung,exynos-sysreg.yaml | 2 + .../device-tree/Bindings/soc/xilinx/xilinx.yaml | 70 +- .../Bindings/sound/atmel,asoc-wm8904.yaml | 84 + .../Bindings/sound/atmel,sam9x5-wm8731-audio.yaml | 76 + .../Bindings/sound/atmel,sama5d2-classd.yaml | 7 +- .../Bindings/sound/audio-graph-port.yaml | 2 +- .../device-tree/Bindings/sound/cirrus,cs35l45.yaml | 3 + .../device-tree/Bindings/sound/cirrus,cs42l43.yaml | 11 +- sys/contrib/device-tree/Bindings/sound/cs4341.txt | 2 +- .../device-tree/Bindings/sound/everest,es8326.yaml | 8 +- .../device-tree/Bindings/sound/fsl,easrc.yaml | 4 +- .../device-tree/Bindings/sound/fsl,imx-asrc.yaml | 162 ++ .../device-tree/Bindings/sound/fsl,micfil.yaml | 14 +- .../device-tree/Bindings/sound/fsl,sai.yaml | 6 + .../Bindings/sound/infineon,peb2466.yaml | 2 +- .../Bindings/sound/microchip,sama7g5-i2smcc.yaml | 11 +- .../device-tree/Bindings/sound/qcom,q6usb.yaml | 55 + .../device-tree/Bindings/sound/qcom,sm8250.yaml | 2 +- .../device-tree/Bindings/sound/qcom,wcd938x.yaml | 81 +- .../Bindings/sound/qcom,wcd939x-sdw.yaml | 69 + .../device-tree/Bindings/sound/qcom,wcd939x.yaml | 96 + .../Bindings/sound/qcom,wcd93xx-common.yaml | 95 + .../device-tree/Bindings/sound/qcom,wsa8840.yaml | 11 +- .../device-tree/Bindings/sound/realtek,rt1015.yaml | 41 + sys/contrib/device-tree/Bindings/sound/rt5645.txt | 6 + .../device-tree/Bindings/sound/samsung,tm2.yaml | 7 +- .../Bindings/spi/atmel,at91rm9200-spi.yaml | 1 - .../device-tree/Bindings/spi/samsung,spi.yaml | 4 +- .../device-tree/Bindings/spi/spi-controller.yaml | 27 + .../device-tree/Bindings/spi/spi-fsl-lpspi.yaml | 1 + .../device-tree/Bindings/spi/spi-nxp-fspi.yaml | 18 +- .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +- .../device-tree/Bindings/submitting-patches.rst | 23 +- .../Bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 34 +- .../Bindings/thermal/dlg,da9062-thermal.yaml | 35 + .../Bindings/thermal/qoriq-thermal.yaml | 3 +- .../Bindings/thermal/rcar-gen3-thermal.yaml | 2 + .../Bindings/thermal/thermal-zones.yaml | 2 - .../Bindings/timer/arm,arch_timer_mmio.yaml | 2 +- .../device-tree/Bindings/timer/cdns,ttc.yaml | 22 +- .../device-tree/Bindings/timer/mediatek,timer.yaml | 84 + .../device-tree/Bindings/timer/mrvl,mmp-timer.yaml | 2 +- .../Bindings/timer/nxp,sysctr-timer.yaml | 4 +- .../Bindings/timer/ralink,cevt-systick.yaml | 38 + .../device-tree/Bindings/timer/renesas,ostm.yaml | 2 +- .../device-tree/Bindings/timer/renesas,tmu.yaml | 18 +- .../Bindings/timer/samsung,exynos4210-mct.yaml | 2 + .../device-tree/Bindings/tpm/tcg,tpm_tis-spi.yaml | 1 + .../device-tree/Bindings/trivial-devices.yaml | 87 +- sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 38 +- .../device-tree/Bindings/usb/analogix,anx7411.yaml | 13 - .../device-tree/Bindings/usb/ci-hdrc-usb2.yaml | 2 +- .../device-tree/Bindings/usb/cypress,hx3.yaml | 2 +- .../device-tree/Bindings/usb/fcs,fsa4480.yaml | 12 +- .../device-tree/Bindings/usb/generic-ehci.yaml | 1 + .../device-tree/Bindings/usb/gpio-sbu-mux.yaml | 12 +- .../Bindings/usb/hisilicon,hi3798mv200-dwc3.yaml | 99 + .../device-tree/Bindings/usb/ite,it5205.yaml | 72 + .../device-tree/Bindings/usb/mediatek,mtu3.yaml | 5 +- .../Bindings/usb/microchip,usb5744.yaml | 2 - .../device-tree/Bindings/usb/nxp,ptn36502.yaml | 12 +- .../device-tree/Bindings/usb/nxp,ptn5110.yaml | 6 +- .../device-tree/Bindings/usb/onnn,nb7vpq904m.yaml | 13 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 2 +- .../device-tree/Bindings/usb/qcom,pmic-typec.yaml | 46 +- .../Bindings/usb/qcom,wcd939x-usbss.yaml | 12 +- .../device-tree/Bindings/usb/realtek,rts5411.yaml | 55 + .../device-tree/Bindings/usb/ti,am62-usb.yaml | 8 +- .../device-tree/Bindings/usb/ti,usb8020b.yaml | 69 + .../device-tree/Bindings/usb/usb-nop-xceiv.yaml | 11 +- .../device-tree/Bindings/usb/usb-switch.yaml | 67 + sys/contrib/device-tree/Bindings/usb/usb.yaml | 2 + .../device-tree/Bindings/vendor-prefixes.yaml | 45 + sys/contrib/device-tree/Bindings/w1/w1-uart.yaml | 59 + .../device-tree/Bindings/watchdog/arm,sp805.yaml | 5 + .../Bindings/watchdog/atmel,sama5d4-wdt.yaml | 12 +- .../device-tree/Bindings/watchdog/qcom-wdt.yaml | 2 +- .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 1 + .../Bindings/watchdog/sprd,sp9860-wdt.yaml | 64 + .../Bindings/watchdog/starfive,jh7100-wdt.yaml | 40 +- .../device-tree/Bindings/writing-schema.rst | 30 +- .../device-tree/include/dt-bindings/arm/qcom,ids.h | 5 + .../include/dt-bindings/clock/ast2600-clock.h | 1 + .../include/dt-bindings/clock/exynos850.h | 56 + .../include/dt-bindings/clock/google,gs101.h | 129 + .../dt-bindings/clock/microchip,mpfs-clock.h | 5 + .../include/dt-bindings/clock/mobileye,eyeq5-clk.h | 22 + .../include/dt-bindings/clock/qcom,gcc-msm8953.h | 4 + .../include/dt-bindings/clock/qcom,gcc-sc8180x.h | 2 + .../include/dt-bindings/clock/qcom,gcc-sm8150.h | 3 + .../dt-bindings/clock/qcom,x1e80100-camcc.h | 135 ++ .../dt-bindings/clock/qcom,x1e80100-dispcc.h | 98 + .../dt-bindings/clock/qcom,x1e80100-gpucc.h | 41 + .../include/dt-bindings/clock/qcom,x1e80100-tcsr.h | 23 + .../include/dt-bindings/clock/r8a779g0-cpg-mssr.h | 1 + .../dt-bindings/clock/renesas,r8a779h0-cpg-mssr.h | 96 + .../dt-bindings/clock/rockchip,rk3588-cru.h | 3 +- .../include/dt-bindings/input/linux-event-codes.h | 1 + .../dt-bindings/interconnect/qcom,msm8909.h | 93 + .../dt-bindings/interconnect/qcom,sm7150-rpmh.h | 150 ++ .../dt-bindings/interconnect/qcom,x1e80100-rpmh.h | 24 - .../device-tree/include/dt-bindings/leds/common.h | 4 + .../include/dt-bindings/mfd/stm32f7-rcc.h | 1 + .../include/dt-bindings/power/amlogic,c3-pwrc.h | 2 +- .../include/dt-bindings/power/qcom-rpmpd.h | 7 + .../dt-bindings/power/renesas,r8a779h0-sysc.h | 49 + .../dt-bindings/reset/mediatek,mt7988-resets.h | 6 + .../dt-bindings/reset/qcom,x1e80100-gpucc.h | 19 + .../dt-bindings/reset/sophgo,sg2042-reset.h | 87 + sys/contrib/device-tree/src/arc/axc003.dtsi | 4 +- sys/contrib/device-tree/src/arc/hsdk.dts | 1 - sys/contrib/device-tree/src/arc/vdk_axs10x_mb.dtsi | 2 +- .../src/arm/allwinner/sun8i-r40-feta40i.dtsi | 7 + sys/contrib/device-tree/src/arm/amlogic/meson.dtsi | 6 +- .../device-tree/src/arm/amlogic/meson8.dtsi | 1 - .../device-tree/src/arm/amlogic/meson8b.dtsi | 1 - .../src/arm/arm/arm-realview-pb1176.dts | 2 +- .../src/arm/arm/integratorap-im-pd1.dts | 3 +- .../device-tree/src/arm/arm/versatile-ab.dts | 3 +- .../device-tree/src/arm/arm/vexpress-v2p-ca9.dts | 4 +- .../device-tree/src/arm/broadcom/bcm47622.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm63138.dtsi | 7 +- .../device-tree/src/arm/broadcom/bcm63148.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm63178.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm6756.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm6846.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm6855.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm6878.dtsi | 14 + .../device-tree/src/arm/broadcom/bcm947622.dts | 10 + .../device-tree/src/arm/broadcom/bcm963138.dts | 10 + .../device-tree/src/arm/broadcom/bcm963138dvt.dts | 14 +- .../device-tree/src/arm/broadcom/bcm963148.dts | 10 + .../device-tree/src/arm/broadcom/bcm963178.dts | 10 + .../device-tree/src/arm/broadcom/bcm96756.dts | 10 + .../device-tree/src/arm/broadcom/bcm96846.dts | 10 + .../device-tree/src/arm/broadcom/bcm96855.dts | 10 + .../device-tree/src/arm/broadcom/bcm96878.dts | 10 + .../src/arm/gemini/gemini-dlink-dir-685.dts | 30 +- .../src/arm/gemini/gemini-dlink-dns-313.dts | 4 +- .../device-tree/src/arm/gemini/gemini-sl93512r.dts | 16 +- .../device-tree/src/arm/gemini/gemini-sq201.dts | 16 +- .../device-tree/src/arm/gemini/gemini-wbd111.dts | 6 +- .../device-tree/src/arm/gemini/gemini-wbd222.dts | 6 +- .../src/arm/marvell/armada-385-clearfog-gtr-l8.dts | 38 +- .../src/arm/marvell/armada-385-clearfog-gtr-s4.dts | 2 + .../src/arm/marvell/armada-385-clearfog-gtr.dtsi | 84 +- .../src/arm/marvell/armada-388-clearfog.dts | 5 +- .../device-tree/src/arm/marvell/dove-cubox.dts | 4 +- .../src/arm/marvell/mmp2-brownstone.dts | 2 +- .../src/arm/microchip/at91-sama7g54_curiosity.dts | 482 ++++ .../src/arm/microchip/at91-sama7g5ek.dts | 8 +- .../at91sam9g25-gardena-smart-gateway.dts | 2 + .../src/arm/microchip/at91sam9x5ek.dtsi | 2 + .../device-tree/src/arm/microchip/sam9x60.dtsi | 64 +- .../device-tree/src/arm/microchip/sama7g5.dtsi | 56 +- .../device-tree/src/arm/nvidia/tegra124-nyan.dtsi | 1 + .../src/arm/nvidia/tegra124-venice2.dts | 1 + .../nvidia/tegra30-asus-nexus7-grouper-common.dtsi | 3 + .../device-tree/src/arm/nvidia/tegra30-lg-p880.dts | 489 ++++ .../device-tree/src/arm/nvidia/tegra30-lg-p895.dts | 496 ++++ .../device-tree/src/arm/nvidia/tegra30-lg-x3.dtsi | 1812 ++++++++++++++ .../device-tree/src/arm/nxp/imx/imx1-apf9328.dts | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx1.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx27.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx31.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx35.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx51.dtsi | 2 +- .../src/arm/nxp/imx/imx53-qsb-hdmi.dtso | 87 + .../device-tree/src/arm/nxp/imx/imx6dl-sielaff.dts | 533 ++++ .../src/arm/nxp/imx/imx6dl-yapp4-common.dtsi | 25 +- .../src/arm/nxp/imx/imx6q-apalis-eval-v1.2.dts | 200 ++ .../src/arm/nxp/imx/imx6q-apalis-eval.dts | 108 +- .../src/arm/nxp/imx/imx6q-apalis-eval.dtsi | 120 + .../src/arm/nxp/imx/imx6qdl-hummingboard.dtsi | 7 +- .../src/arm/nxp/imx/imx6qdl-hummingboard2.dtsi | 5 + .../src/arm/nxp/imx/imx6qdl-skov-cpu.dtsi | 10 +- .../device-tree/src/arm/nxp/imx/imx6qdl.dtsi | 2 +- .../src/arm/nxp/imx/imx6sl-tolino-shine2hd.dts | 6 +- .../device-tree/src/arm/nxp/imx/imx6sl.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6sx.dtsi | 2 +- .../src/arm/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6ul-geam.dts | 2 +- .../src/arm/nxp/imx/imx6ul-imx6ull-opos6uldev.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6ul.dtsi | 18 +- .../arm/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi | 4 +- .../src/arm/nxp/imx/imx6ull-dhcom-som.dtsi | 4 +- .../src/arm/nxp/imx/imx6ull-dhcor-som.dtsi | 7 +- .../src/arm/nxp/imx/imx6ull-tarragon-common.dtsi | 1 + .../device-tree/src/arm/nxp/imx/imx6ull.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx7-mba7.dtsi | 325 +-- .../device-tree/src/arm/nxp/imx/imx7-tqma7.dtsi | 144 +- .../device-tree/src/arm/nxp/imx/imx7d-mba7.dts | 94 +- .../device-tree/src/arm/nxp/imx/imx7s-warp.dts | 1 + .../device-tree/src/arm/nxp/ls/ls1021a.dtsi | 2 + .../device-tree/src/arm/nxp/mxs/imx28-evk.dts | 2 +- .../src/arm/qcom/qcom-apq8026-lg-lenok.dts | 38 + .../arm/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 452 +--- .../device-tree/src/arm/qcom/qcom-apq8064.dtsi | 70 +- .../device-tree/src/arm/qcom/qcom-apq8084.dtsi | 13 +- .../src/arm/qcom/qcom-ipq4019-ap.dk01.1.dtsi | 138 +- .../device-tree/src/arm/qcom/qcom-ipq4019.dtsi | 35 +- .../device-tree/src/arm/qcom/qcom-ipq8064.dtsi | 12 +- .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 457 ++++ .../device-tree/src/arm/qcom/qcom-msm8226.dtsi | 736 +++--- .../device-tree/src/arm/qcom/qcom-msm8660.dtsi | 17 +- .../src/arm/qcom/qcom-msm8926-htc-memul.dts | 15 +- .../arm/qcom/qcom-msm8926-samsung-matisselte.dts | 37 + .../src/arm/qcom/qcom-msm8960-pins.dtsi | 21 + .../arm/qcom/qcom-msm8960-samsung-expressatt.dts | 71 +- .../device-tree/src/arm/qcom/qcom-msm8960.dtsi | 48 +- .../device-tree/src/arm/qcom/qcom-msm8974.dtsi | 33 +- .../device-tree/src/arm/qcom/qcom-sdx55.dtsi | 32 +- .../device-tree/src/arm/qcom/qcom-sdx65.dtsi | 48 +- .../src/arm/renesas/r8a73a4-ape6evm.dts | 12 + .../device-tree/src/arm/renesas/r8a73a4.dtsi | 23 +- .../device-tree/src/arm/renesas/r8a7740.dtsi | 2 + .../device-tree/src/arm/renesas/r8a7778.dtsi | 11 +- .../device-tree/src/arm/renesas/r8a7779.dtsi | 9 +- .../src/arm/rockchip/rk3128-xpi-3128.dts | 29 + .../device-tree/src/arm/rockchip/rk3128.dtsi | 60 + .../device-tree/src/arm/rockchip/rk322x.dtsi | 16 +- .../device-tree/src/arm/rockchip/rk3288.dtsi | 16 +- .../src/arm/rockchip/rv1126-sonoff-ihost.dtsi | 10 +- .../src/arm/samsung/exynos4412-i9300.dts | 2 +- .../src/arm/samsung/exynos4412-i9305.dts | 2 +- .../src/arm/samsung/exynos4412-n710x.dts | 2 +- .../src/arm/samsung/exynos4412-p4note.dtsi | 53 +- .../arm/samsung/exynos5420-galaxy-tab-common.dtsi | 34 +- .../src/arm/samsung/exynos5420-peach-pit.dts | 1 + .../arm/samsung/exynos5422-odroidxu3-common.dtsi | 16 +- .../src/arm/samsung/exynos5800-peach-pi.dts | 1 + .../device-tree/src/arm/st/stih407-pinctrl.dtsi | 8 +- .../src/arm/st/stm32f769-disco-mb1166-reva09.dts | 13 + .../device-tree/src/arm/st/stm32f769-disco.dts | 70 +- sys/contrib/device-tree/src/arm/st/stm32f769.dtsi | 20 + sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 7 + .../device-tree/src/arm/st/stm32mp135f-dk.dts | 8 + sys/contrib/device-tree/src/arm/st/stm32mp157.dtsi | 2 +- .../src/arm/st/stm32mp157a-dk1-scmi.dts | 2 +- .../src/arm/st/stm32mp157c-dk2-scmi.dts | 2 +- .../src/arm/st/stm32mp157c-ed1-scmi.dts | 2 +- .../src/arm/st/stm32mp157c-ev1-scmi.dts | 2 +- .../src/arm/st/stm32mp157c-lxa-tac-gen2.dts | 2 +- .../src/arm/st/stm32mp15xc-lxa-tac.dtsi | 6 +- .../device-tree/src/arm/ti/davinci/da850.dtsi | 4 +- .../src/arm/ti/keystone/keystone-clocks.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2e-clocks.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2e-evm.dts | 2 +- .../src/arm/ti/keystone/keystone-k2e-netcp.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2e.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2g-evm.dts | 2 +- .../src/arm/ti/keystone/keystone-k2g-ice.dts | 2 +- .../src/arm/ti/keystone/keystone-k2g-netcp.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2g.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2hk-clocks.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2hk-evm.dts | 2 +- .../src/arm/ti/keystone/keystone-k2hk-netcp.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2hk.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2l-clocks.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2l-evm.dts | 2 +- .../src/arm/ti/keystone/keystone-k2l-netcp.dtsi | 2 +- .../src/arm/ti/keystone/keystone-k2l.dtsi | 2 +- .../device-tree/src/arm/ti/keystone/keystone.dtsi | 2 +- .../src/arm/ti/omap/am335x-baltos-ir2110.dts | 2 +- .../src/arm/ti/omap/am335x-baltos-ir3220.dts | 2 +- .../src/arm/ti/omap/am335x-baltos-ir5221.dts | 2 +- .../src/arm/ti/omap/am335x-baltos-leds.dtsi | 2 +- .../device-tree/src/arm/ti/omap/am335x-baltos.dtsi | 2 +- .../src/arm/ti/omap/am335x-base0033.dts | 2 +- .../src/arm/ti/omap/am335x-bone-common.dtsi | 4 +- .../device-tree/src/arm/ti/omap/am335x-cm-t335.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-evmsk.dts | 2 +- .../src/arm/ti/omap/am335x-guardian.dts | 4 +- .../device-tree/src/arm/ti/omap/am335x-icev2.dts | 2 +- .../src/arm/ti/omap/am335x-igep0033.dtsi | 2 +- .../src/arm/ti/omap/am335x-myirtech-myc.dtsi | 2 +- .../src/arm/ti/omap/am335x-myirtech-myd.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-nano.dts | 2 +- .../src/arm/ti/omap/am335x-netcan-plus-1xx.dts | 2 +- .../src/arm/ti/omap/am335x-netcom-plus-2xx.dts | 2 +- .../src/arm/ti/omap/am335x-netcom-plus-8xx.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-pdu001.dts | 2 +- .../ti/omap/am335x-sancloud-bbe-extended-wifi.dts | 2 +- .../src/arm/ti/omap/am335x-sancloud-bbe-lite.dts | 2 +- .../src/arm/ti/omap/am335x-sbc-t335.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-sl50.dts | 3 +- .../device-tree/src/arm/ti/omap/am33xx-clocks.dtsi | 39 +- .../device-tree/src/arm/ti/omap/am33xx.dtsi | 9 +- .../device-tree/src/arm/ti/omap/am3517.dtsi | 11 +- .../device-tree/src/arm/ti/omap/am35xx-clocks.dtsi | 18 +- .../device-tree/src/arm/ti/omap/am4372.dtsi | 6 + .../device-tree/src/arm/ti/omap/am437x-cm-t43.dts | 2 +- .../device-tree/src/arm/ti/omap/am437x-sbc-t43.dts | 2 +- .../src/arm/ti/omap/am5729-beagleboneai.dts | 2 +- .../src/arm/ti/omap/am57xx-cl-som-am57x.dts | 2 +- .../src/arm/ti/omap/am57xx-sbc-am57x.dts | 2 +- .../src/arm/ti/omap/compulab-sb-som.dtsi | 2 +- .../device-tree/src/arm/ti/omap/dra7-l4.dtsi | 2 +- sys/contrib/device-tree/src/arm/ti/omap/dra7.dtsi | 17 +- .../device-tree/src/arm/ti/omap/dra74x-p.dtsi | 2 +- .../device-tree/src/arm/ti/omap/dra7xx-clocks.dtsi | 2 +- .../src/arm/ti/omap/omap3430es1-clocks.dtsi | 52 +- .../src/arm/ti/omap/omap34xx-omap36xx-clocks.dtsi | 86 +- .../device-tree/src/arm/ti/omap/omap34xx.dtsi | 11 +- .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 28 +- .../src/arm/ti/omap/omap36xx-clocks.dtsi | 7 +- .../ti/omap/omap36xx-omap3430es2plus-clocks.dtsi | 46 +- .../device-tree/src/arm/ti/omap/omap36xx.dtsi | 9 +- .../src/arm/ti/omap/omap3xxx-clocks.dtsi | 510 ++-- .../src/arm/ti/omap/omap4-epson-embt2ws.dts | 1 + .../src/arm/ti/omap/omap4-panda-common.dtsi | 1 + .../device-tree/src/arm/ti/omap/omap4-sdp.dts | 2 +- sys/contrib/device-tree/src/arm/ti/omap/omap4.dtsi | 9 +- .../device-tree/src/arm/ti/omap/omap5-igep0050.dts | 2 +- sys/contrib/device-tree/src/arm/ti/omap/omap5.dtsi | 9 +- .../device-tree/src/arm/ti/omap/twl4030.dtsi | 2 +- .../device-tree/src/arm/ti/omap/twl6030.dtsi | 4 +- .../src/arm64/allwinner/sun50i-h6-beelink-gs1.dts | 2 + .../src/arm64/allwinner/sun50i-h6-tanix.dtsi | 2 + .../device-tree/src/arm64/allwinner/sun50i-h6.dtsi | 7 +- .../sun50i-h616-bigtreetech-cb1-manta.dts | 2 +- .../allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 4 +- .../arm64/allwinner/sun50i-h616-bigtreetech-pi.dts | 2 +- .../src/arm64/allwinner/sun50i-h616.dtsi | 155 ++ .../allwinner/sun50i-h618-longan-module-3h.dtsi | 75 + .../arm64/allwinner/sun50i-h618-longanpi-3h.dts | 144 ++ .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 23 + .../arm64/allwinner/sun50i-h64-remix-mini-pc.dts | 356 +++ .../device-tree/src/arm64/amlogic/amlogic-c3.dtsi | 7 + .../device-tree/src/arm64/amlogic/amlogic-t7.dtsi | 12 +- .../src/arm64/amlogic/meson-a1-ad402.dts | 2 +- .../device-tree/src/arm64/amlogic/meson-a1.dtsi | 2 + .../amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 30 +- .../src/arm64/amlogic/meson-axg-s400.dts | 16 +- .../device-tree/src/arm64/amlogic/meson-axg.dtsi | 8 + .../src/arm64/amlogic/meson-g12-common.dtsi | 3 + .../src/arm64/amlogic/meson-g12a-fbx8am-brcm.dtso | 31 + .../arm64/amlogic/meson-g12a-fbx8am-realtek.dtso | 21 + .../src/arm64/amlogic/meson-g12a-fbx8am.dts | 462 ++++ .../src/arm64/amlogic/meson-g12a-radxa-zero.dts | 12 +- .../src/arm64/amlogic/meson-g12a-sei510.dts | 14 +- .../src/arm64/amlogic/meson-g12a-u200.dts | 16 +- .../src/arm64/amlogic/meson-g12a-x96-max.dts | 14 +- .../src/arm64/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- .../src/arm64/amlogic/meson-g12b-odroid.dtsi | 20 +- .../src/arm64/amlogic/meson-g12b-w400.dtsi | 10 +- .../src/arm64/amlogic/meson-gx-libretech-pc.dtsi | 12 +- .../src/arm64/amlogic/meson-gx-p23x-q20x.dtsi | 8 +- .../src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts | 6 +- .../src/arm64/amlogic/meson-gxbb-odroidc2.dts | 8 +- .../src/arm64/amlogic/meson-gxbb-p200.dts | 4 +- .../src/arm64/amlogic/meson-gxbb-p20x.dtsi | 6 +- .../src/arm64/amlogic/meson-gxbb-vega-s95.dtsi | 8 +- .../src/arm64/amlogic/meson-gxbb-wetek.dtsi | 8 +- .../arm64/amlogic/meson-gxl-s805x-libretech-ac.dts | 8 +- .../src/arm64/amlogic/meson-gxl-s805x-p241.dts | 8 +- .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 8 +- .../amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 6 +- .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 12 +- .../arm64/amlogic/meson-gxl-s905x-libretech-cc.dts | 6 +- .../arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 6 +- .../src/arm64/amlogic/meson-gxl-s905x-p212.dtsi | 8 +- .../src/arm64/amlogic/meson-gxm-khadas-vim2.dts | 8 +- .../arm64/amlogic/meson-gxm-s912-libretech-pc.dts | 2 +- .../src/arm64/amlogic/meson-khadas-vim3.dtsi | 16 +- .../arm64/amlogic/meson-libretech-cottonwood.dtsi | 6 +- .../src/arm64/amlogic/meson-sm1-ac2xx.dtsi | 10 +- .../src/arm64/amlogic/meson-sm1-bananapi.dtsi | 14 +- .../src/arm64/amlogic/meson-sm1-odroid-hc4.dts | 4 +- .../src/arm64/amlogic/meson-sm1-odroid.dtsi | 20 +- .../src/arm64/amlogic/meson-sm1-sei610.dts | 12 +- .../broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 5 + .../bcmbca/bcm4906-tplink-archer-c2300-v1.dts | 5 + .../broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 19 +- .../src/arm64/broadcom/bcmbca/bcm4908.dtsi | 7 +- .../src/arm64/broadcom/bcmbca/bcm4912.dtsi | 14 + .../src/arm64/broadcom/bcmbca/bcm63146.dtsi | 14 + .../src/arm64/broadcom/bcmbca/bcm63158.dtsi | 14 + .../src/arm64/broadcom/bcmbca/bcm6813.dtsi | 14 + .../src/arm64/broadcom/bcmbca/bcm6856.dtsi | 14 + .../src/arm64/broadcom/bcmbca/bcm6858.dtsi | 14 + .../src/arm64/broadcom/bcmbca/bcm94908.dts | 10 + .../src/arm64/broadcom/bcmbca/bcm94912.dts | 10 + .../src/arm64/broadcom/bcmbca/bcm963146.dts | 10 + .../src/arm64/broadcom/bcmbca/bcm963158.dts | 10 + .../src/arm64/broadcom/bcmbca/bcm96813.dts | 10 + .../src/arm64/broadcom/bcmbca/bcm96856.dts | 10 + .../src/arm64/broadcom/bcmbca/bcm96858.dts | 10 + .../device-tree/src/arm64/exynos/exynos850.dtsi | 64 + .../src/arm64/exynos/google/gs101-oriole.dts | 24 + .../src/arm64/exynos/google/gs101-pinctrl.dtsi | 2 +- .../device-tree/src/arm64/exynos/google/gs101.dtsi | 131 +- .../src/arm64/freescale/fsl-ls1012a.dtsi | 10 +- .../src/arm64/freescale/fsl-ls1046a.dtsi | 1 - .../src/arm64/freescale/fsl-ls1088a.dtsi | 6 + .../src/arm64/freescale/fsl-lx2160a.dtsi | 32 +- .../src/arm64/freescale/imx8-apalis-eval-v1.1.dtsi | 26 + .../src/arm64/freescale/imx8-apalis-eval-v1.2.dtsi | 124 + .../src/arm64/freescale/imx8-apalis-eval.dtsi | 22 - .../src/arm64/freescale/imx8-apalis-v1.1.dtsi | 1 - .../src/arm64/freescale/imx8-ss-audio.dtsi | 330 +++ .../src/arm64/freescale/imx8-ss-conn.dtsi | 16 +- .../src/arm64/freescale/imx8-ss-dma.dtsi | 103 +- .../src/arm64/freescale/imx8-ss-gpu0.dtsi | 27 + .../src/arm64/freescale/imx8-ss-lsio.dtsi | 16 +- .../src/arm64/freescale/imx8dxl-evk.dts | 101 + .../src/arm64/freescale/imx8dxl-ss-adma.dtsi | 77 + .../device-tree/src/arm64/freescale/imx8dxl.dtsi | 1 + .../arm64/freescale/imx8dxp-tqma8xdp-mba8xx.dts | 16 + .../src/arm64/freescale/imx8dxp-tqma8xdp.dtsi | 24 + .../device-tree/src/arm64/freescale/imx8dxp.dtsi | 24 + .../src/arm64/freescale/imx8mm-evk.dtsi | 69 + .../arm64/freescale/imx8mm-kontron-bl-osm-s.dts | 294 +-- .../src/arm64/freescale/imx8mm-kontron-bl.dts | 38 +- .../src/arm64/freescale/imx8mm-kontron-osm-s.dtsi | 567 ++++- .../src/arm64/freescale/imx8mm-kontron-sl.dtsi | 4 +- .../arm64/freescale/imx8mm-tqma8mqml-mba8mx.dts | 14 +- .../src/arm64/freescale/imx8mm-venice-gw71xx.dtsi | 40 +- .../src/arm64/freescale/imx8mm-venice-gw7901.dts | 14 +- .../src/arm64/freescale/imx8mn-beacon-kit.dts | 2 - .../src/arm64/freescale/imx8mn-evk.dtsi | 36 + .../src/arm64/freescale/imx8mn-rve-gateway.dts | 2 +- .../freescale/imx8mn-tqma8mqnl-mba8mx-usbotg.dtso | 64 + .../arm64/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 5 +- .../device-tree/src/arm64/freescale/imx8mn.dtsi | 2 +- .../src/arm64/freescale/imx8mp-beacon-som.dtsi | 71 + .../arm64/freescale/imx8mp-data-modul-edm-sbc.dts | 82 +- .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 33 +- .../arm64/freescale/imx8mp-phyboard-pollux-rdk.dts | 107 +- .../src/arm64/freescale/imx8mp-phycore-som.dtsi | 1 - .../src/arm64/freescale/imx8mp-venice-gw71xx.dtsi | 10 +- .../src/arm64/freescale/imx8mp-venice-gw72xx.dtsi | 2 +- .../src/arm64/freescale/imx8mp-venice-gw73xx.dtsi | 2 +- .../src/arm64/freescale/imx8mp-verdin.dtsi | 3 +- .../device-tree/src/arm64/freescale/imx8mp.dtsi | 12 +- .../src/arm64/freescale/imx8mq-tqma8mq-mba8mx.dts | 24 +- .../arm64/freescale/imx8qm-apalis-eval-v1.2.dts | 16 + .../src/arm64/freescale/imx8qm-apalis-eval.dts | 2 +- .../freescale/imx8qm-apalis-v1.1-eval-v1.2.dts | 26 + .../arm64/freescale/imx8qm-apalis-v1.1-eval.dts | 2 +- .../device-tree/src/arm64/freescale/imx8qm-mek.dts | 26 + .../src/arm64/freescale/imx8qm-ss-conn.dtsi | 5 + .../src/arm64/freescale/imx8qm-ss-dma.dtsi | 63 +- .../device-tree/src/arm64/freescale/imx8qm.dtsi | 41 + .../arm64/freescale/imx8qxp-tqma8xqp-mba8xx.dts | 16 + .../src/arm64/freescale/imx8qxp-tqma8xqp.dtsi | 14 + .../device-tree/src/arm64/freescale/imx8qxp.dtsi | 8 + .../src/arm64/freescale/imx8ulp-evk.dts | 2 +- .../src/arm64/freescale/imx93-phyboard-segin.dts | 117 + .../src/arm64/freescale/imx93-phycore-som.dtsi | 126 + .../src/arm64/freescale/imx93-tqma9352.dtsi | 4 +- .../src/arm64/freescale/imx93-var-som-symphony.dts | 351 +++ .../src/arm64/freescale/imx93-var-som.dtsi | 110 + .../device-tree/src/arm64/freescale/imx93.dtsi | 4 +- .../device-tree/src/arm64/freescale/mba8mx.dtsi | 21 +- .../device-tree/src/arm64/freescale/mba8xx.dtsi | 554 +++++ .../device-tree/src/arm64/freescale/tqma8xx.dtsi | 265 ++ .../src/arm64/intel/socfpga_agilex5.dtsi | 4 +- .../src/arm64/marvell/ac5-98dx25xx.dtsi | 31 +- .../src/arm64/marvell/ac5-98dx35xx-rd.dts | 4 + .../device-tree/src/arm64/marvell/armada-37xx.dtsi | 10 +- .../src/arm64/marvell/armada-ap807.dtsi | 3 + .../src/arm64/marvell/armada-cp11x.dtsi | 10 +- .../device-tree/src/arm64/mediatek/mt2712-evb.dts | 12 +- .../device-tree/src/arm64/mediatek/mt2712e.dtsi | 5 +- .../device-tree/src/arm64/mediatek/mt6797.dtsi | 8 +- .../src/arm64/mediatek/mt7622-bananapi-bpi-r64.dts | 13 + .../device-tree/src/arm64/mediatek/mt7622-rfb1.dts | 25 + .../device-tree/src/arm64/mediatek/mt7622.dtsi | 34 +- .../src/arm64/mediatek/mt7981b-xiaomi-ax3000t.dts | 15 + .../device-tree/src/arm64/mediatek/mt7981b.dtsi | 105 + .../arm64/mediatek/mt7986a-acelink-ew-7886cax.dts | 173 ++ .../mediatek/mt7986a-bananapi-bpi-r3-nand.dtso | 2 +- .../src/arm64/mediatek/mt7986a-bananapi-bpi-r3.dts | 8 +- .../device-tree/src/arm64/mediatek/mt7986a-rfb.dts | 31 +- .../device-tree/src/arm64/mediatek/mt7986a.dtsi | 176 +- .../device-tree/src/arm64/mediatek/mt7986b-rfb.dts | 31 +- .../src/arm64/mediatek/mt7988a-bananapi-bpi-r4.dts | 11 + .../device-tree/src/arm64/mediatek/mt7988a.dtsi | 136 ++ .../src/arm64/mediatek/mt8173-elm-hana-rev7.dts | 2 +- .../device-tree/src/arm64/mediatek/mt8173-elm.dtsi | 3 +- .../device-tree/src/arm64/mediatek/mt8173-evb.dts | 2 +- .../device-tree/src/arm64/mediatek/mt8173.dtsi | 19 +- .../arm64/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3 +- .../src/arm64/mediatek/mt8183-kukui-kakadu.dtsi | 4 + .../src/arm64/mediatek/mt8183-kukui-kodama.dtsi | 4 + .../src/arm64/mediatek/mt8183-kukui-krane.dtsi | 4 + .../src/arm64/mediatek/mt8183-kukui.dtsi | 6 +- .../src/arm64/mediatek/mt8183-pumpkin.dts | 2 +- .../device-tree/src/arm64/mediatek/mt8183.dtsi | 12 +- .../src/arm64/mediatek/mt8186-corsola-krabby.dtsi | 129 + .../mediatek/mt8186-corsola-magneton-sku393216.dts | 39 + .../mediatek/mt8186-corsola-magneton-sku393217.dts | 39 + .../mediatek/mt8186-corsola-magneton-sku393218.dts | 26 + .../mediatek/mt8186-corsola-rusty-sku196608.dts | 26 + .../mediatek/mt8186-corsola-steelix-sku131072.dts | 18 + .../mediatek/mt8186-corsola-steelix-sku131073.dts | 18 + .../src/arm64/mediatek/mt8186-corsola-steelix.dtsi | 199 ++ .../mt8186-corsola-tentacool-sku327681.dts | 57 + .../mt8186-corsola-tentacool-sku327683.dts | 24 + .../mt8186-corsola-tentacruel-sku262144.dts | 44 + .../mt8186-corsola-tentacruel-sku262148.dts | 26 + .../src/arm64/mediatek/mt8186-corsola.dtsi | 1681 +++++++++++++ .../device-tree/src/arm64/mediatek/mt8186.dtsi | 93 +- .../src/arm64/mediatek/mt8192-asurada.dtsi | 11 +- .../device-tree/src/arm64/mediatek/mt8192.dtsi | 11 +- .../src/arm64/mediatek/mt8195-cherry-tomato-r1.dts | 4 + .../src/arm64/mediatek/mt8195-cherry-tomato-r2.dts | 4 + .../src/arm64/mediatek/mt8195-cherry-tomato-r3.dts | 4 + .../src/arm64/mediatek/mt8195-cherry.dtsi | 63 +- .../device-tree/src/arm64/mediatek/mt8195-demo.dts | 18 +- .../device-tree/src/arm64/mediatek/mt8195-evb.dts | 12 + .../device-tree/src/arm64/mediatek/mt8195.dtsi | 133 +- .../src/arm64/mediatek/mt8395-genio-1200-evk.dts | 17 +- .../src/arm64/mediatek/mt8395-radxa-nio-12l.dts | 825 +++++++ .../src/arm64/nvidia/tegra132-norrin.dts | 1 + .../src/arm64/nvidia/tegra194-p2888.dtsi | 50 + .../src/arm64/nvidia/tegra194-p2972-0000.dts | 51 +- .../src/arm64/nvidia/tegra194-p3668.dtsi | 27 + .../src/arm64/nvidia/tegra234-p3701.dtsi | 1953 +-------------- .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 - .../src/arm64/nvidia/tegra234-p3767.dtsi | 86 + .../nvidia/tegra234-p3768-0000+p3767-0000.dts | 7 +- .../nvidia/tegra234-p3768-0000+p3767-0005.dts | 12 +- .../src/arm64/nvidia/tegra234-sim-vdk.dts | 1 - .../device-tree/src/arm64/nvidia/tegra234.dtsi | 2544 ++++++++++++++++++-- .../arm64/qcom/apq8016-sbc-d3-camera-mezzanine.dts | 8 +- .../device-tree/src/arm64/qcom/ipq5332.dtsi | 8 +- .../device-tree/src/arm64/qcom/ipq6018.dtsi | 159 ++ .../device-tree/src/arm64/qcom/ipq8074.dtsi | 16 + .../device-tree/src/arm64/qcom/ipq9574.dtsi | 12 +- .../src/arm64/qcom/msm8216-samsung-fortuna3g.dts | 11 + .../arm64/qcom/msm8916-samsung-fortuna-common.dtsi | 203 ++ .../arm64/qcom/msm8916-samsung-gprimeltecan.dts | 27 + .../arm64/qcom/msm8916-samsung-grandprimelte.dts | 16 + .../arm64/qcom/msm8916-samsung-rossa-common.dtsi | 16 + .../src/arm64/qcom/msm8916-samsung-rossa.dts | 16 + .../device-tree/src/arm64/qcom/msm8916.dtsi | 9 + .../device-tree/src/arm64/qcom/msm8939.dtsi | 11 +- .../device-tree/src/arm64/qcom/msm8953.dtsi | 155 +- .../src/arm64/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +- .../arm64/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +- .../device-tree/src/arm64/qcom/msm8994.dtsi | 4 +- .../device-tree/src/arm64/qcom/msm8996.dtsi | 18 +- .../device-tree/src/arm64/qcom/msm8998.dtsi | 26 +- sys/contrib/device-tree/src/arm64/qcom/pm4125.dtsi | 93 + sys/contrib/device-tree/src/arm64/qcom/pm6150.dtsi | 46 + sys/contrib/device-tree/src/arm64/qcom/pmi632.dtsi | 39 + .../device-tree/src/arm64/qcom/qcm2290.dtsi | 7 + .../src/arm64/qcom/qcm6490-fairphone-fp5.dts | 56 +- .../device-tree/src/arm64/qcom/qcm6490-idp.dts | 39 +- sys/contrib/device-tree/src/arm64/qcom/qcs404.dtsi | 16 + .../device-tree/src/arm64/qcom/qcs6490-rb3gen2.dts | 23 +- .../device-tree/src/arm64/qcom/qrb2210-rb1.dts | 96 +- .../device-tree/src/arm64/qcom/qrb4210-rb2.dts | 50 +- .../device-tree/src/arm64/qcom/sa8155p-adp.dts | 30 +- .../device-tree/src/arm64/qcom/sa8295p-adp.dts | 68 + .../device-tree/src/arm64/qcom/sa8540p-ride.dts | 4 +- .../device-tree/src/arm64/qcom/sa8540p.dtsi | 3 + .../device-tree/src/arm64/qcom/sa8775p.dtsi | 119 +- .../device-tree/src/arm64/qcom/sc7180-trogdor.dtsi | 3 + sys/contrib/device-tree/src/arm64/qcom/sc7180.dtsi | 86 +- .../src/arm64/qcom/sc7280-chrome-common.dtsi | 28 + .../src/arm64/qcom/sc7280-herobrine.dtsi | 1 + .../src/arm64/qcom/sc7280-idp-ec-h1.dtsi | 1 + sys/contrib/device-tree/src/arm64/qcom/sc7280.dtsi | 129 +- .../device-tree/src/arm64/qcom/sc8180x.dtsi | 143 +- .../arm64/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 39 +- .../device-tree/src/arm64/qcom/sc8280xp-pmics.dtsi | 39 +- .../device-tree/src/arm64/qcom/sc8280xp.dtsi | 612 ++++- .../src/arm64/qcom/sda660-inforce-ifc6560.dts | 5 + .../src/arm64/qcom/sdm450-motorola-ali.dts | 2 +- sys/contrib/device-tree/src/arm64/qcom/sdm450.dtsi | 14 + .../src/arm64/qcom/sdm630-sony-xperia-nile.dtsi | 16 + sys/contrib/device-tree/src/arm64/qcom/sdm630.dtsi | 62 +- sys/contrib/device-tree/src/arm64/qcom/sdm632.dtsi | 8 + .../src/arm64/qcom/sdm660-xiaomi-lavender.dts | 6 + sys/contrib/device-tree/src/arm64/qcom/sdm670.dtsi | 14 +- .../device-tree/src/arm64/qcom/sdm845-cheza.dtsi | 1 + .../device-tree/src/arm64/qcom/sdm845-db845c.dts | 2 +- .../src/arm64/qcom/sdm845-oneplus-common.dtsi | 8 +- .../src/arm64/qcom/sdm845-shift-axolotl.dts | 2 +- sys/contrib/device-tree/src/arm64/qcom/sdm845.dtsi | 63 +- sys/contrib/device-tree/src/arm64/qcom/sm4450.dtsi | 2 +- sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi | 95 +- sys/contrib/device-tree/src/arm64/qcom/sm6125.dtsi | 17 +- sys/contrib/device-tree/src/arm64/qcom/sm6350.dtsi | 601 ++++- sys/contrib/device-tree/src/arm64/qcom/sm6375.dtsi | 14 +- .../src/arm64/qcom/sm7125-xiaomi-common.dtsi | 26 + .../src/arm64/qcom/sm7125-xiaomi-curtana.dts | 16 + .../src/arm64/qcom/sm7225-fairphone-fp4.dts | 61 +- sys/contrib/device-tree/src/arm64/qcom/sm8150.dtsi | 115 +- .../src/arm64/qcom/sm8250-xiaomi-elish-common.dtsi | 3 +- sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi | 113 +- *** 1421 LINES SKIPPED *** From nobody Thu Jan 2 09:08:25 2025 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 4YP18T73HKz5j0s3 for ; Thu, 02 Jan 2025 09:08:25 +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 4YP18T49K0z41GP; Thu, 2 Jan 2025 09:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808905; 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=aJc9ijdn9g3/FH0GQT4mSa51sGLdy1sJ6EaZd0DNQAk=; b=PoQ2bUmKJwpbm1QAWuDayP+h04Ap4MedgSywGh3kF/ZWWn0/E1TbzT9i2JNs/fb8pmH2gs q+ba1JiqTjWyRpjGxGOEci/G20VwW17bwF0WLtGECEFYshBqwEmhO0IMNsvAC5lnn9IdM7 Z0vTsmJj7OL8AXjEJP0dDQrqLWsYzk516ymgnhCrmSGnqipbjJPL+DMlOTzvfR4FrePw3K UFup9HwiTWui/8uPpRid/vr5P6EQcAhaGt+XuccTRJWb6dJH/5NuyNc2g07j03b+RMMMAV tYV0IQbb1Ee8JkfVEOovXjo7G4BsvgrDTXWN2YOH4GcysoE/VkBtz1lX8za4Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808905; 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=aJc9ijdn9g3/FH0GQT4mSa51sGLdy1sJ6EaZd0DNQAk=; b=pxRPzVE11mafwjReSrq4whwLpWONzbdMkZbnf+laxSVZVrR6VoE7AmNZ5qwrcUKK7CnUEh i08JMJ33aGzTkQWZccC/EZnk+MMVheClqqMDy/vjGELuu00oNi/UdeDWPVNE7DccHqYUy0 WsDsc5EmJbORV/elDsYOipH/m/hl6hExB3qFDNUb+z0k+34uch9JzzRiGRGIhM+CdE0zX8 TBxpUpZnjtadN1PImCjqu1f0yU2Q3r/fenGIInhnWrI3ONcu/fYEhP2ZYrMhIRJsHffNhT 1RT2XRiyaPNE1eQe6vbCYJPUIdNRrMJgub4WdwebhOiuP1riyEqvmqtFy3u2vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808905; a=rsa-sha256; cv=none; b=rXPcBngkAfJZdpVkeB4TlpsprRXROeZI5FQc2Uu1XhCBhhbixhTa0nWCDK8fE/vv3RqzL3 P/fazIG+miO4e5heP/7lOPrJtWdKOyi7+t0pxjAHkp0FBvaPdRwKxc7lppKGsvIIhQwftL 1rEPz7y0OlYT5kriSqVspKxTI0rUMrP6TrQRWwGoNcve4UVzfU5u9oLUB+YdeIvcwSkcxj Ncm72SdzaH4MxAKgIDAu31Z+PCimqfh1Kz/F40JSMCtKlbLwF1Fq4GJlc348YKTnkfJ+WN 0cbVGR8+3Pt4Mzy8aKjbDfOicu2sviZfz3LZ00wgmtEV8ut0bMflIUL9WsEZPw== 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 4YP18T3TmLz12l1; Thu, 2 Jan 2025 09:08:25 +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 50298PGK014607; Thu, 2 Jan 2025 09:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50298P1r014606; Thu, 2 Jan 2025 09:08:25 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:08:25 GMT Message-Id: <202501020908.50298P1r014606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: e2e0a4ea3f70..a8091808915c - vendor/device-tree - vendor branch updated 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: a8091808915c37cd212871d2b3f3a49149a8ddb4 X-Git-Oldrev: e2e0a4ea3f708df73a339834acf21c2f8ff145d4 X-Git-Newrev: a8091808915c37cd212871d2b3f3a49149a8ddb4 Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=e2e0a4ea3f70..a8091808915c a8091808915c Import device-tree files from Linux 6.10 From nobody Thu Jan 2 09:08:45 2025 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 4YP18s4JGmz5j16H for ; Thu, 02 Jan 2025 09:08:45 +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 4YP18s3R8fz41SQ; Thu, 2 Jan 2025 09:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808925; 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=nVTHcZT2fxACDxrrVwibm1gXaGhM6k7FhAUpji0q4NU=; b=qNNRme6TBoEmwyQQaR1p0Knlw/ntSI3ivMSwt2YwOEBExbsxa2EPd4BkGY9ZNcwKv2fP/t 25lQwpOCLiyM1HJTkpUOCI5jfPpqy+VuMZAaXrWREUQZl4/mRxBC0hk6cVL0a9Kkg/cFJP 8m98Ni2F9kiNN7OhtcAXKfr4HAv0gnf+A3dSQBQCUtA7UiO3y6d6Vh6vqp3RUmlNt0mrsX xjSvK5wrQZA9uFx1NcypQL+/vnt5zxoH/slh2EwmOBk5MFixEqFeQ6tA4X0UNNTfdNiMDH +wPoSB7qwMqdo8j7qi8ubriWjTyPobcXOU9HFaq2J2Nm6pSm4ad80qRrbDuZvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808925; 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=nVTHcZT2fxACDxrrVwibm1gXaGhM6k7FhAUpji0q4NU=; b=jF7pgIYDPycOuuKBihcjBZEqbrcILPhNS8K27szfSCDrBPGyzdigVCm11TBvRMSS/In6A0 ynBWOXPu3RFEnJ4yDen8D3PG45nQNXjBZ8WDpN1Q6nfBnyxQR9aG0RNyl2eXCHOIzqojSP iv78tDnUsVk3r5MH1j1Z58BN+mjKdOc4VNL1r20pZjnhkRLi2Jsh/IOIEba+F0+1HgwEAh RRH/tlHbCMBxXEZyDSKtJF4HOuFq7fR0HOYD10kXSQPjQGmBcvat7rRDYkTz9cRK2UKi6u WOgos6o+T3zcx86f/bWeAb4sc6VFPBH/kI3mxk1T9U4jKuvi7ey8+cbijHSAiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808925; a=rsa-sha256; cv=none; b=d+bSUQy1dBBQVEq23lpNeJO5cQD/qtdIAf/JcQUWtk+qbkb4DsqHGt7onmQfKrM/PcyFqh 0UdCSFp458ruB7BhMKUQwjsC7dQfMTYM2qg8g+TNNITWg3ynTH4pJmYDhBj6zfe6US7g3f RL1r6sLvRKPqMHY+d0GI0fEopcOXg381OcyMG9TFta/cHLUuqdaVZXaFDv7qX6cqKgMpVw ig/xt4XeLuYChiM6l2ToLg/btfd5wFdYxzkutohPl4GYCiD6XD4ht7cuyGdPcIYV5TSIVX BMh6jKFJwM9ABYglly6E4HwAon9/PLajwFf4Ac7DhesuV9ri4d02EIbvFhNOyw== 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 4YP18s2hzwz12W6; Thu, 2 Jan 2025 09:08:45 +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 50298jtf014781; Thu, 2 Jan 2025 09:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50298jNI014780; Thu, 2 Jan 2025 09:08:45 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:08:45 GMT Message-Id: <202501020908.50298jNI014780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 7fdfcfce6253 - Create tag vendor/device-tree/6.10 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.10 X-Git-Reftype: annotated tag X-Git-Commit: 7fdfcfce62536af2e977a5b4d293555568241037 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.10 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.10 tag vendor/device-tree/6.10 Tagger: Emmanuel Vadot TaggerDate: 2025-01-02 09:08:00 +0000 Tag device-tree files from Linux 6.10 commit a8091808915c37cd212871d2b3f3a49149a8ddb4 Author: Emmanuel Vadot AuthorDate: 2025-01-02 09:07:48 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 09:07:48 +0000 Import device-tree files from Linux 6.10 From nobody Thu Jan 2 09:09:52 2025 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 4YP1B919s3z5j1M5; Thu, 02 Jan 2025 09:09:53 +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 4YP1B90qvQz41Yg; Thu, 2 Jan 2025 09:09:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808993; 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=43l+ykTPtsBUEP7ewwHXv7zWfp/zVJARcdp+NuDgToM=; b=b3mzX7rEynSOZFwrxHPSbpWROwWuVHjNF1EFD4xPQ/nLs5/GEn10N2HTX2mz366VgxvVhl ISO5h6/LRBMg0CWNCeQUONc8cNt6p2SOJmGKQydzIoU4ungL4YjRo6nOR+Zce05vlB9X0C oi9ST88Dy/drONTqgoB+NuNo75XNcFpyicqDbUPTZKZsW9U4guTONIjLIGBFh+FAmCIWuw TVCUDq5z1gp1hvLYayakAeudZp8sooStLs88eWXuII2pyzQWn1hGcKdBV9KLF5q4O+YsyR sXTmkvtWpEjWrwJAxOf8g3O3iV8SrHyynpP19f/T+Ulijtrpw0mV9VhmWFTBXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808993; 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=43l+ykTPtsBUEP7ewwHXv7zWfp/zVJARcdp+NuDgToM=; b=WpQjrZ23VdqS7ZrU9i5lWpk0CktWGHgh6pr4YyfuIW4SLl48d6anAsfgCT53xJivn/+7cM tIb7LWf+zIZtUiVBuQfI/9VoVGwILT4vn46c2Ic3tbus2U6xTWchzF4D0qKCatyQc6l3WP vCV8/RDjxDRdrEUPgtQ4j9WZxmtMQgYkKY/MW57t7hkc0P8/UT5FiLa+sneZC7d2X6kOE/ BwZD258YilhEB2IUePoE/HgVvCQVrRMZ4oIJAlQRIKynATKiYBbztCKOUSjhh6T3FbVBFn ixO2E4VX7d6PDXtyfvqi8ppAc1n0Bz28/ZTfIynIQbH0phLMMWH1HLQasZEo2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808993; a=rsa-sha256; cv=none; b=TdwOyGIFGV65bg5aCy7nzgkN5w10yq2luHDDQtFQF4dyJbtt3RWFIuEOgbqX/P9tMm8his +kzSj4i02QIv4Qo3Wp31i6q6tIOxMrtkjCvF+MM94BAyVcV/G767vB9sKi8BZ4RI1K2Vax hnfCK6TdKqq0n1Qh9s0Vo4vNEn4Ry1agmcA2AWoLDw5c1SsrsU2w/VB8n0Ij42Fl/PIVbT AQ6VQvz/aINGCqKlyJodu/eNALC/AWCC7ZyOa/4f4dIvZjCPBZNkHlM6BQohRzLS8Y8UGj orPt/Q6HXBL1KNMLbXGJMryBAfppXVgYCWi7Nq08Bi+7JF6uMtz9ilMwrdwl2g== 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 4YP1B90LwTz12vd; Thu, 2 Jan 2025 09:09:53 +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 50299q5h015270; Thu, 2 Jan 2025 09:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50299qUH015267; Thu, 2 Jan 2025 09:09:52 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:09:52 GMT Message-Id: <202501020909.50299qUH015267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7d0873ebb83b - main - Import device-tree files from Linux 6.10 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d0873ebb83b19ba1e8a89e679470d885efe12e3 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0873ebb83b19ba1e8a89e679470d885efe12e3 commit 7d0873ebb83b19ba1e8a89e679470d885efe12e3 Merge: 01950c46b815 a8091808915c Author: Emmanuel Vadot AuthorDate: 2025-01-02 09:09:19 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 09:09:19 +0000 Import device-tree files from Linux 6.10 sys/contrib/device-tree/Bindings/Makefile | 36 +- .../access-controllers/access-controllers.yaml | 84 + sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 13 + .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 6 + .../device-tree/Bindings/arm/bcm/brcm,bcm4708.yaml | 2 + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 30 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 22 +- .../device-tree/Bindings/arm/keystone/ti,sci.yaml | 5 - .../Bindings/arm/qcom,coresight-tpda.yaml | 34 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 18 +- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 48 +- .../device-tree/Bindings/arm/stm32/st,mlahb.yaml | 3 +- sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 25 + .../device-tree/Bindings/ata/fsl,imx-pata.yaml | 42 + .../device-tree/Bindings/ata/ti,da850-ahci.yaml | 39 + .../device-tree/Bindings/bus/st,stm32-etzpc.yaml | 96 + .../Bindings/bus/st,stm32mp25-rifsc.yaml | 105 + .../device-tree/Bindings/cache/qcom,llcc.yaml | 2 +- .../Bindings/clock/airoha,en7523-scu.yaml | 31 +- .../device-tree/Bindings/clock/fixed-clock.yaml | 9 + .../Bindings/clock/fixed-factor-clock.yaml | 9 + .../Bindings/clock/google,gs101-clock.yaml | 55 +- .../Bindings/clock/loongson,ls2k-clk.yaml | 4 +- .../Bindings/clock/nxp,imx95-blk-ctl.yaml | 56 + .../clock/nxp,imx95-display-master-csr.yaml | 64 + .../device-tree/Bindings/clock/qcom,hfpll.yaml | 69 + .../Bindings/clock/renesas,rzg2l-cpg.yaml | 18 +- .../Bindings/clock/samsung,s3c6400-clock.yaml | 57 + .../Bindings/clock/sophgo,cv1800-clk.yaml | 3 +- .../Bindings/clock/st,stm32mp25-rcc.yaml | 172 +- .../Bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 + .../Bindings/crypto/nvidia,tegra234-se-aes.yaml | 52 + .../Bindings/crypto/nvidia,tegra234-se-hash.yaml | 52 + .../Bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + .../device-tree/Bindings/crypto/st,stm32-cryp.yaml | 4 + .../device-tree/Bindings/crypto/st,stm32-hash.yaml | 4 + .../Bindings/crypto/starfive,jh7110-crypto.yaml | 30 +- .../device-tree/Bindings/crypto/ti,omap-sham.yaml | 56 + .../Bindings/display/atmel,lcdc-display.yaml | 103 + .../device-tree/Bindings/display/atmel,lcdc.yaml | 70 + .../Bindings/display/bridge/ite,it6505.yaml | 8 +- .../Bindings/display/bridge/lvds-codec.yaml | 1 + .../display/bridge/microchip,sam9x75-lvds.yaml | 55 + .../Bindings/display/bridge/toshiba,tc358775.yaml | 39 +- .../Bindings/display/mediatek/mediatek,gamma.yaml | 5 + .../Bindings/display/msm/dp-controller.yaml | 1 + .../Bindings/display/msm/qcom,sm6350-mdss.yaml | 9 + .../Bindings/display/panel/abt,y030xx067a.yaml | 4 +- .../display/panel/asus,z00t-tm5p5-nt35596.yaml | 5 +- .../Bindings/display/panel/boe,bf060y8m-aj0.yaml | 4 +- .../Bindings/display/panel/boe,himax8279d.yaml | 4 +- .../display/panel/boe,th101mb31ig002-28a.yaml | 4 +- .../Bindings/display/panel/boe,tv101wum-nl6.yaml | 2 +- .../Bindings/display/panel/elida,kd35t133.yaml | 5 +- .../display/panel/fascontek,fs035vg158.yaml | 3 + .../display/panel/feixin,k101-im2ba02.yaml | 5 +- .../Bindings/display/panel/himax,hx83112a.yaml | 4 +- .../Bindings/display/panel/himax,hx8394.yaml | 3 +- .../Bindings/display/panel/ilitek,ili9163.yaml | 4 +- .../Bindings/display/panel/ilitek,ili9322.yaml | 3 + .../Bindings/display/panel/ilitek,ili9341.yaml | 3 +- .../Bindings/display/panel/ilitek,ili9805.yaml | 4 +- .../Bindings/display/panel/ilitek,ili9881c.yaml | 5 +- .../Bindings/display/panel/innolux,ej030na.yaml | 4 +- .../Bindings/display/panel/innolux,p097pfg.yaml | 4 +- .../Bindings/display/panel/jadard,jd9365da-h3.yaml | 3 +- .../Bindings/display/panel/jdi,lpm102a188a.yaml | 4 +- .../Bindings/display/panel/jdi,lt070me05000.yaml | 4 +- .../display/panel/kingdisplay,kd035g6-54nt.yaml | 4 +- .../display/panel/leadtek,ltk035c5444t.yaml | 3 + .../display/panel/leadtek,ltk050h3146w.yaml | 5 +- .../display/panel/leadtek,ltk500hd1829.yaml | 5 +- .../Bindings/display/panel/lg,lg4573.yaml | 3 +- .../Bindings/display/panel/lg,sw43408.yaml | 62 + .../Bindings/display/panel/lgphilips,lb035q02.yaml | 3 + .../Bindings/display/panel/nec,nl8048hl11.yaml | 4 +- .../Bindings/display/panel/newvision,nv3051d.yaml | 4 +- .../Bindings/display/panel/novatek,nt35510.yaml | 5 +- .../Bindings/display/panel/novatek,nt35950.yaml | 7 +- .../Bindings/display/panel/novatek,nt36523.yaml | 29 +- .../Bindings/display/panel/novatek,nt36672a.yaml | 4 +- .../display/panel/olimex,lcd-olinuxino.yaml | 4 +- .../Bindings/display/panel/panel-common-dual.yaml | 47 + .../Bindings/display/panel/panel-mipi-dbi-spi.yaml | 3 + .../Bindings/display/panel/panel-simple-dsi.yaml | 4 + .../Bindings/display/panel/panel-simple.yaml | 17 +- .../Bindings/display/panel/raydium,rm67191.yaml | 4 +- .../Bindings/display/panel/raydium,rm692e5.yaml | 4 +- .../Bindings/display/panel/raydium,rm69380.yaml | 89 + .../display/panel/rocktech,jh057n00900.yaml | 2 + .../Bindings/display/panel/ronbo,rb070d30.yaml | 2 +- .../display/panel/samsung,amoled-mipi-dsi.yaml | 4 +- .../Bindings/display/panel/samsung,ams495qa01.yaml | 5 +- .../Bindings/display/panel/samsung,ld9040.yaml | 4 +- .../Bindings/display/panel/samsung,lms380kf01.yaml | 3 +- .../Bindings/display/panel/samsung,lms397kf04.yaml | 3 +- .../Bindings/display/panel/samsung,s6d16d0.yaml | 4 +- .../Bindings/display/panel/samsung,s6d27a1.yaml | 3 +- .../Bindings/display/panel/samsung,s6d7aa0.yaml | 3 +- .../Bindings/display/panel/samsung,s6e63m0.yaml | 4 +- .../display/panel/samsung,s6e88a0-ams452ef01.yaml | 5 +- .../Bindings/display/panel/samsung,s6e8aa0.yaml | 4 +- .../Bindings/display/panel/sharp,lq101r1sx01.yaml | 4 +- .../Bindings/display/panel/sharp,ls043t1le01.yaml | 4 +- .../Bindings/display/panel/sharp,ls060t1sx01.yaml | 4 +- .../Bindings/display/panel/sitronix,st7789v.yaml | 4 +- .../Bindings/display/panel/sony,acx424akp.yaml | 5 +- .../Bindings/display/panel/sony,acx565akm.yaml | 3 + .../Bindings/display/panel/sony,td4353-jdi.yaml | 5 +- .../display/panel/sony,tulip-truly-nt35521.yaml | 3 +- .../Bindings/display/panel/synaptics,r63353.yaml | 6 +- .../device-tree/Bindings/display/panel/tpo,td.yaml | 4 +- .../Bindings/display/panel/tpo,tpg110.yaml | 3 +- .../Bindings/display/panel/visionox,rm69299.yaml | 3 +- .../Bindings/display/panel/xinpeng,xpp055c272.yaml | 5 +- .../display/rockchip/rockchip,dw-hdmi.yaml | 5 + .../display/rockchip/rockchip,inno-hdmi.yaml | 5 + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 7 + .../display/samsung/samsung,exynos5-dp.yaml | 163 ++ .../display/tegra/nvidia,tegra20-host1x.yaml | 11 + sys/contrib/device-tree/Bindings/dma/fsl,edma.yaml | 143 +- .../device-tree/Bindings/dma/fsl,imx-sdma.yaml | 1 + .../Bindings/dma/snps,dma-spear1340.yaml | 42 +- .../device-tree/Bindings/dma/snps,dw-axi-dmac.yaml | 1 + .../device-tree/Bindings/dma/st,stm32-dma.yaml | 4 + .../device-tree/Bindings/dma/st,stm32-dmamux.yaml | 4 + .../device-tree/Bindings/firmware/arm,scmi.yaml | 54 +- .../Bindings/fpga/xlnx,fpga-selectmap.yaml | 86 + .../Bindings/gpio/brcm,brcmstb-gpio.yaml | 3 + .../Bindings/gpio/microchip,mpfs-gpio.yaml | 17 +- .../Bindings/gpu/arm,mali-valhall-csf.yaml | 147 + .../device-tree/Bindings/hwmon/adi,adm1275.yaml | 4 +- .../Bindings/hwmon/ibm,opal-sensor.yaml | 37 + .../device-tree/Bindings/hwmon/maxim,max6650.yaml | 70 + .../Bindings/hwmon/pmbus/adi,adp1050.yaml | 49 + .../device-tree/Bindings/hwmon/st,stts751.yaml | 41 + .../device-tree/Bindings/hwmon/syna,as370.yaml | 32 + .../device-tree/Bindings/hwmon/ti,adc128d818.yaml | 63 + .../device-tree/Bindings/hwmon/ti,lm87.yaml | 69 + .../Bindings/i2c/atmel,at91sam-i2c.yaml | 2 +- .../Bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- .../device-tree/Bindings/i2c/nxp,pnx-i2c.yaml | 46 + .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 19 + .../device-tree/Bindings/i2c/renesas,riic.yaml | 19 +- .../device-tree/Bindings/i2c/st,stm32-i2c.yaml | 4 + .../Bindings/iio/accel/adi,adxl345.yaml | 2 + .../device-tree/Bindings/iio/adc/adi,ad7173.yaml | 279 ++ .../device-tree/Bindings/iio/adc/adi,ad7944.yaml | 213 ++ .../device-tree/Bindings/iio/adc/adi,axi-adc.yaml | 5 + .../iio/adc/allwinner,sun20i-d1-gpadc.yaml | 9 +- .../device-tree/Bindings/iio/adc/st,stm32-adc.yaml | 4 + .../Bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + .../device-tree/Bindings/iio/dac/adi,ad3552r.yaml | 2 +- .../device-tree/Bindings/iio/dac/adi,ad9739a.yaml | 95 + .../device-tree/Bindings/iio/dac/adi,axi-dac.yaml | 62 + .../device-tree/Bindings/iio/dac/st,stm32-dac.yaml | 4 + .../device-tree/Bindings/iio/dac/ti,dac5571.yaml | 1 + .../Bindings/iio/health/maxim,max30102.yaml | 12 +- .../Bindings/iio/humidity/ti,hdc3020.yaml | 5 + .../Bindings/iio/imu/invensense,icm42600.yaml | 2 + .../Bindings/iio/imu/invensense,mpu6050.yaml | 17 +- .../Bindings/iio/light/avago,apds9300.yaml | 20 +- .../Bindings/iio/temperature/adi,ltc2983.yaml | 4 + .../device-tree/Bindings/input/azoteq,iqs7222.yaml | 2 +- .../device-tree/Bindings/input/elan,ekth6915.yaml | 19 +- .../device-tree/Bindings/input/ilitek,ili2901.yaml | 66 + .../Bindings/input/qcom,pm8xxx-vib.yaml | 16 +- .../Bindings/input/touchscreen/edt-ft5x06.yaml | 2 + .../allwinner,sun7i-a20-sc-nmi.yaml | 8 +- .../mediatek,mt6577-sysirq.yaml | 2 +- .../interrupt-controller/renesas,irqc.yaml | 1 + .../Bindings/interrupt-controller/riscv,aplic.yaml | 172 ++ .../interrupt-controller/riscv,imsics.yaml | 172 ++ .../interrupt-controller/st,stm32-exti.yaml | 17 +- .../device-tree/Bindings/iommu/qcom,tbu.yaml | 69 + .../Bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + .../device-tree/Bindings/leds/leds-qcom-lpg.yaml | 8 +- .../device-tree/Bindings/leds/nxp,pca963x.yaml | 140 + .../device-tree/Bindings/mailbox/arm,mhuv3.yaml | 224 ++ .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + .../device-tree/Bindings/mailbox/qcom-ipcc.yaml | 1 + .../device-tree/Bindings/media/amphion,vpu.yaml | 2 +- .../Bindings/media/brcm,bcm2835-unicam.yaml | 127 + .../Bindings/media/cec/st,stm32-cec.yaml | 4 + .../Bindings/media/i2c/galaxycore,gc0308.yaml | 2 +- .../Bindings/media/i2c/galaxycore,gc2145.yaml | 2 +- .../Bindings/media/i2c/ovti,ov2680.yaml | 35 +- .../Bindings/media/i2c/ovti,ov8856.yaml | 132 + .../Bindings/media/i2c/sony,imx214.yaml | 2 +- .../Bindings/media/i2c/sony,imx290.yaml | 5 +- .../Bindings/media/i2c/sony,imx415.yaml | 2 +- .../device-tree/Bindings/media/nxp,imx8-isi.yaml | 1 + .../device-tree/Bindings/media/nxp,imx8-jpeg.yaml | 11 + .../Bindings/media/qcom,sc8280xp-camss.yaml | 512 ++++ .../device-tree/Bindings/media/st,stm32-dcmi.yaml | 4 + .../Bindings/media/st,stm32mp25-video-codec.yaml | 4 + .../memory-controllers/samsung,s5pv210-dmc.yaml | 33 + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 4 + .../device-tree/Bindings/mfd/actions,atc260x.yaml | 6 +- .../Bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 14 +- .../Bindings/mfd/aspeed,ast2x00-scu.yaml | 16 +- sys/contrib/device-tree/Bindings/mfd/brcm,cru.yaml | 8 +- .../device-tree/Bindings/mfd/brcm,misc.yaml | 2 +- .../Bindings/mfd/canaan,k210-sysctl.yaml | 6 +- .../device-tree/Bindings/mfd/delta,tn48m-cpld.yaml | 4 +- sys/contrib/device-tree/Bindings/mfd/iqs62x.yaml | 4 +- .../device-tree/Bindings/mfd/kontron,sl28cpld.yaml | 10 +- sys/contrib/device-tree/Bindings/mfd/max77650.yaml | 8 +- .../device-tree/Bindings/mfd/maxim,max77686.yaml | 2 +- .../device-tree/Bindings/mfd/maxim,max77693.yaml | 2 +- .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 4 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 1 + .../device-tree/Bindings/mfd/qcom-pm8xxx.yaml | 1 + .../device-tree/Bindings/mfd/richtek,rt4831.yaml | 4 +- .../device-tree/Bindings/mfd/ricoh,rn5t618.yaml | 6 +- .../device-tree/Bindings/mfd/rockchip,rk805.yaml | 2 +- .../device-tree/Bindings/mfd/rockchip,rk808.yaml | 2 +- .../device-tree/Bindings/mfd/rockchip,rk816.yaml | 274 ++ .../device-tree/Bindings/mfd/rockchip,rk817.yaml | 2 +- .../device-tree/Bindings/mfd/rockchip,rk818.yaml | 2 +- .../Bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- .../Bindings/mfd/rohm,bd71828-pmic.yaml | 13 +- .../Bindings/mfd/rohm,bd71837-pmic.yaml | 2 +- .../device-tree/Bindings/mfd/rohm,bd9571mwv.yaml | 2 +- .../device-tree/Bindings/mfd/rohm,bd9576-pmic.yaml | 2 +- .../device-tree/Bindings/mfd/samsung,s2mpa01.yaml | 2 +- .../device-tree/Bindings/mfd/samsung,s2mps11.yaml | 12 +- .../device-tree/Bindings/mfd/samsung,s5m8767.yaml | 4 +- .../device-tree/Bindings/mfd/st,stm32-lptimer.yaml | 4 + .../device-tree/Bindings/mfd/st,stm32-timers.yaml | 4 + sys/contrib/device-tree/Bindings/mfd/st,stmfx.yaml | 2 +- .../device-tree/Bindings/mfd/st,stpmic1.yaml | 4 +- .../Bindings/mfd/stericsson,ab8500.yaml | 48 +- .../Bindings/mfd/stericsson,db8500-prcmu.yaml | 40 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 16 + .../device-tree/Bindings/mfd/ti,lp8732.yaml | 112 + .../device-tree/Bindings/mfd/ti,tps65086.yaml | 4 +- .../device-tree/Bindings/mfd/ti,tps6594.yaml | 1 + sys/contrib/device-tree/Bindings/mfd/ti,twl.yaml | 72 +- .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 2 + .../device-tree/Bindings/mmc/arm,pl18x.yaml | 4 + .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 3 + .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 39 +- sys/contrib/device-tree/Bindings/mtd/mtd.yaml | 4 +- .../Bindings/mtd/partitions/binman.yaml | 53 + .../Bindings/mtd/partitions/partition.yaml | 72 + .../Bindings/mtd/samsung,s5pv210-onenand.yaml | 65 + .../device-tree/Bindings/net/airoha,en8811h.yaml | 56 + .../net/bluetooth/mediatek,mt7921s-bluetooth.yaml | 55 + .../Bindings/net/broadcom-bluetooth.yaml | 33 +- .../device-tree/Bindings/net/can/bosch,m_can.yaml | 4 + .../device-tree/Bindings/net/fsl,fman-dtsec.yaml | 1 - .../device-tree/Bindings/net/nxp,dwmac-imx.yaml | 4 + .../Bindings/net/pse-pd/microchip,pd692x0.yaml | 176 ++ .../Bindings/net/pse-pd/pse-controller.yaml | 101 +- .../Bindings/net/pse-pd/ti,tps23881.yaml | 113 + .../device-tree/Bindings/net/qcom,ethqos.yaml | 2 + .../Bindings/net/qcom,ipq4019-mdio.yaml | 2 + .../device-tree/Bindings/net/renesas,etheravb.yaml | 12 +- .../device-tree/Bindings/net/renesas,ethertsn.yaml | 33 +- .../Bindings/net/renesas,rzn1-gmac.yaml | 66 + .../device-tree/Bindings/net/rockchip-dwmac.yaml | 4 +- sys/contrib/device-tree/Bindings/net/sff,sfp.yaml | 12 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 20 +- .../Bindings/net/starfive,jh7110-dwmac.yaml | 28 +- .../device-tree/Bindings/net/stm32-dwmac.yaml | 11 + .../device-tree/Bindings/net/ti,cpsw-switch.yaml | 1 - .../device-tree/Bindings/net/ti,icssg-prueth.yaml | 35 +- .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 1 - .../device-tree/Bindings/net/ti,k3-am654-cpts.yaml | 1 - .../Bindings/net/wireless/brcm,bcm4329-fmac.yaml | 1 + .../Bindings/net/wireless/qcom,ath10k.yaml | 6 + .../Bindings/net/wireless/qcom,ath11k.yaml | 3 + .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 4 + .../device-tree/Bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- .../opp/allwinner,sun50i-h6-operating-points.yaml | 87 +- .../device-tree/Bindings/pci/amlogic,axg-pcie.yaml | 2 +- .../device-tree/Bindings/pci/apple,pcie.yaml | 2 +- .../device-tree/Bindings/pci/brcm,iproc-pcie.yaml | 2 +- .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 2 +- .../Bindings/pci/cdns,cdns-pcie-host.yaml | 3 - .../device-tree/Bindings/pci/cdns-pcie-host.yaml | 2 +- .../device-tree/Bindings/pci/faraday,ftpci100.yaml | 2 +- .../Bindings/pci/fsl,layerscape-pcie-ep.yaml | 102 + .../Bindings/pci/fsl,layerscape-pcie.yaml | 167 ++ .../device-tree/Bindings/pci/host-generic-pci.yaml | 2 +- .../device-tree/Bindings/pci/intel,ixp4xx-pci.yaml | 2 +- .../Bindings/pci/intel,keembay-pcie.yaml | 2 +- sys/contrib/device-tree/Bindings/pci/loongson.yaml | 2 +- .../Bindings/pci/mediatek,mt7621-pcie.yaml | 7 +- .../Bindings/pci/mediatek-pcie-gen3.yaml | 2 +- .../Bindings/pci/microchip,pcie-host.yaml | 5 +- .../device-tree/Bindings/pci/qcom,pcie-common.yaml | 2 +- .../device-tree/Bindings/pci/qcom,pcie-sm8350.yaml | 22 - .../device-tree/Bindings/pci/qcom,pcie.yaml | 2 +- .../device-tree/Bindings/pci/rcar-gen4-pci-ep.yaml | 4 +- .../Bindings/pci/rcar-gen4-pci-host.yaml | 4 +- .../device-tree/Bindings/pci/rcar-pci-host.yaml | 5 +- .../Bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- .../Bindings/pci/rockchip,rk3399-pcie.yaml | 3 +- .../device-tree/Bindings/pci/snps,dw-pcie.yaml | 2 +- .../device-tree/Bindings/pci/ti,am65-pci-host.yaml | 22 +- .../Bindings/pci/ti,j721e-pci-host.yaml | 5 + .../device-tree/Bindings/pci/versatile.yaml | 2 +- .../Bindings/pci/xilinx-versal-cpm.yaml | 9 +- .../Bindings/pci/xlnx,axi-pcie-host.yaml | 2 +- .../device-tree/Bindings/pci/xlnx,nwl-pcie.yaml | 4 +- .../device-tree/Bindings/pci/xlnx,xdma-host.yaml | 2 +- .../device-tree/Bindings/phy/brcm,sata-phy.yaml | 8 +- .../Bindings/phy/fsl,imx8mp-hdmi-phy.yaml | 62 + .../Bindings/phy/mediatek,mt7988-xfi-tphy.yaml | 80 + .../Bindings/phy/phy-rockchip-usbdp.yaml | 148 + .../Bindings/phy/phy-stm32-usbphyc.yaml | 4 + .../device-tree/Bindings/phy/qcom,edp-phy.yaml | 1 + .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 28 +- .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 19 +- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + .../Bindings/phy/qcom,snps-eusb2-repeater.yaml | 4 +- .../Bindings/phy/qcom,usb-snps-femto-v2.yaml | 5 +- .../Bindings/phy/rockchip,pcie3-phy.yaml | 10 + .../device-tree/Bindings/phy/samsung,ufs-phy.yaml | 1 + .../Bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 113 +- .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 41 +- .../Bindings/pinctrl/qcom,pmic-mpp.yaml | 1 + .../Bindings/pinctrl/qcom,sm4450-tlmm.yaml | 52 +- .../Bindings/pinctrl/samsung,pinctrl.yaml | 21 + .../Bindings/platform/acer,aspire1-ec.yaml | 60 + .../Bindings/power/supply/maxim,max8903.yaml | 2 +- .../Bindings/pwm/atmel,at91sam-pwm.yaml | 3 + .../Bindings/pwm/google,cros-ec-pwm.yaml | 1 - .../device-tree/Bindings/pwm/marvell,pxa-pwm.yaml | 1 - .../Bindings/pwm/mediatek,mt2712-pwm.yaml | 1 - .../Bindings/pwm/mediatek,pwm-disp.yaml | 2 +- .../device-tree/Bindings/pwm/pwm-bcm2835.yaml | 1 - .../Bindings/pwm/snps,dw-apb-timers-pwm2.yaml | 1 - .../regulator/allwinner,sun20i-d1-system-ldos.yaml | 37 + .../Bindings/regulator/fixed-regulator.yaml | 7 + .../Bindings/regulator/nxp,pca9450-regulator.yaml | 1 + .../regulator/qcom,usb-vbus-regulator.yaml | 1 + .../Bindings/regulator/st,stm32-vrefbuf.yaml | 4 + .../Bindings/regulator/ti,tps62864.yaml | 2 +- .../device-tree/Bindings/remoteproc/mtk,scp.yaml | 2 + .../Bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 1 - .../Bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml | 6 +- .../Bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 6 +- .../Bindings/remoteproc/qcom,sdm845-adsp-pil.yaml | 6 +- .../Bindings/remoteproc/qcom,smd-edge.yaml | 3 +- .../Bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 279 +- .../device-tree/Bindings/riscv/starfive.yaml | 1 + .../Bindings/rng/microsoft,vmgenid.yaml | 49 + .../device-tree/Bindings/rng/st,stm32-rng.yaml | 4 + .../Bindings/rtc/alphascale,asm9260-rtc.yaml | 50 + .../device-tree/Bindings/rtc/fsl,stmp3xxx-rtc.yaml | 51 + .../Bindings/rtc/marvell,armada-380-rtc.yaml | 51 + .../device-tree/Bindings/rtc/marvell,pxa-rtc.yaml | 40 + .../device-tree/Bindings/rtc/nxp,lpc1788-rtc.yaml | 58 + .../device-tree/Bindings/rtc/trivial-rtc.yaml | 21 + .../Bindings/serial/actions,owl-uart.yaml | 48 + .../Bindings/serial/amlogic,meson-uart.yaml | 4 +- .../Bindings/serial/brcm,bcm2835-aux-uart.yaml | 46 + .../device-tree/Bindings/serial/cdns,uart.yaml | 3 + .../Bindings/serial/fsl,s32-linflexuart.yaml | 4 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 1 + .../device-tree/Bindings/serial/st,stm32-uart.yaml | 4 + .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 14 - .../device-tree/Bindings/soc/qcom/qcom,wcnss.yaml | 4 +- .../soc/renesas/renesas,r9a09g057-sys.yaml | 51 + .../device-tree/Bindings/soc/renesas/renesas.yaml | 8 + .../soc/samsung/samsung,exynos-sysreg.yaml | 2 + .../Bindings/soc/tegra/nvidia,tegra20-pmc.yaml | 6 +- .../device-tree/Bindings/sound/davinci-mcbsp.yaml | 113 + .../device-tree/Bindings/sound/fsl,audmix.yaml | 83 + .../device-tree/Bindings/sound/fsl,esai.yaml | 118 + .../device-tree/Bindings/sound/fsl,imx-asrc.yaml | 14 + .../Bindings/sound/fsl,imx-audio-spdif.yaml | 66 + .../device-tree/Bindings/sound/fsl,sai.yaml | 6 +- .../device-tree/Bindings/sound/fsl,spdif.yaml | 35 +- .../device-tree/Bindings/sound/fsl,ssi.yaml | 194 ++ .../device-tree/Bindings/sound/fsl-asoc-card.yaml | 197 ++ .../Bindings/sound/mediatek,mt2701-wm8960.yaml | 54 + .../sound/mt8186-mt6366-da7219-max98357.yaml | 131 +- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 120 +- .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 139 +- .../device-tree/Bindings/sound/mt8195-mt6359.yaml | 134 + .../Bindings/sound/nuvoton,nau8325.yaml | 80 + .../Bindings/sound/nuvoton,nau8821.yaml | 7 + .../Bindings/sound/nvidia,tegra20-ac97.yaml | 82 + .../Bindings/sound/nvidia,tegra20-das.yaml | 36 + .../Bindings/sound/nvidia,tegra30-i2s.yaml | 67 + .../device-tree/Bindings/sound/qcom,sm8250.yaml | 2 + .../device-tree/Bindings/sound/renesas,rsnd.yaml | 5 +- .../Bindings/sound/rockchip,rk3308-codec.yaml | 98 + .../device-tree/Bindings/sound/st,stm32-i2s.yaml | 4 + .../device-tree/Bindings/sound/st,stm32-sai.yaml | 6 +- .../Bindings/sound/st,stm32-spdifrx.yaml | 4 + .../device-tree/Bindings/sound/ti,pcm1681.yaml | 43 + .../device-tree/Bindings/sound/ti,pcm6240.yaml | 177 ++ .../device-tree/Bindings/sound/wlf,wm8776.yaml | 41 + .../device-tree/Bindings/sound/wlf,wm8974.yaml | 41 + .../device-tree/Bindings/sound/xmos,xvf3500.yaml | 63 + .../Bindings/spi/airoha,en7581-snand.yaml | 65 + .../device-tree/Bindings/spi/cdns,qspi-nor.yaml | 8 +- .../Bindings/spi/marvell,armada-3700-spi.yaml | 55 + .../device-tree/Bindings/spi/renesas,sh-msiof.yaml | 1 + .../device-tree/Bindings/spi/st,stm32-qspi.yaml | 4 + .../device-tree/Bindings/spi/st,stm32-spi.yaml | 4 + sys/contrib/device-tree/Bindings/spi/ti,qspi.yaml | 96 + .../spmi/hisilicon,hisi-spmi-controller.yaml | 17 +- .../Bindings/spmi/qcom,spmi-pmic-arb.yaml | 1 + .../Bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 136 + .../Bindings/thermal/amlogic,thermal.yaml | 12 +- .../Bindings/thermal/loongson,ls2k-thermal.yaml | 24 +- .../Bindings/thermal/mediatek,lvts-thermal.yaml | 6 + .../device-tree/Bindings/thermal/qcom-lmh.yaml | 12 +- .../Bindings/thermal/st,stih407-thermal.yaml | 58 + .../device-tree/Bindings/timer/renesas,cmt.yaml | 2 + .../device-tree/Bindings/timer/renesas,ostm.yaml | 2 + .../device-tree/Bindings/timer/renesas,tmu.yaml | 1 + sys/contrib/device-tree/Bindings/tpm/ibm,vtpm.yaml | 4 +- .../device-tree/Bindings/tpm/tcg,tpm-tis-i2c.yaml | 1 + .../device-tree/Bindings/trivial-devices.yaml | 6 + .../Bindings/ufs/samsung,exynos-ufs.yaml | 38 +- .../Bindings/usb/chipidea,usb2-common.yaml | 200 ++ .../Bindings/usb/chipidea,usb2-imx.yaml | 287 ++ .../device-tree/Bindings/usb/ci-hdrc-usb2.yaml | 360 +-- .../device-tree/Bindings/usb/cypress,hx3.yaml | 1 - sys/contrib/device-tree/Bindings/usb/dwc2.yaml | 5 + .../device-tree/Bindings/usb/fsl,usbmisc.yaml | 1 + .../Bindings/usb/mediatek,mtk-xhci.yaml | 1 + .../Bindings/usb/microchip,usb2514.yaml | 63 + .../device-tree/Bindings/usb/qcom,dwc3.yaml | 41 +- .../device-tree/Bindings/usb/qcom,pmic-typec.yaml | 35 +- .../device-tree/Bindings/usb/realtek,rts5411.yaml | 1 + .../device-tree/Bindings/usb/renesas,usbhs.yaml | 6 +- .../Bindings/usb/samsung,exynos-dwc3.yaml | 18 + .../device-tree/Bindings/usb/snps,dwc3.yaml | 13 +- sys/contrib/device-tree/Bindings/usb/usb-uhci.yaml | 75 + .../device-tree/Bindings/vendor-prefixes.yaml | 10 + .../Bindings/watchdog/aspeed,ast2400-wdt.yaml | 142 + .../device-tree/include/dt-bindings/arm/mhuv3-dt.h | 13 + .../device-tree/include/dt-bindings/arm/qcom,ids.h | 1 + .../include/dt-bindings/clock/google,gs101.h | 116 + .../include/dt-bindings/clock/loongson,ls2k-clk.h | 54 +- .../include/dt-bindings/clock/nxp,imx95-clock.h | 28 + .../include/dt-bindings/clock/r8a73a4-clock.h | 4 + .../include/dt-bindings/clock/r9a07g043-cpg.h | 58 +- .../include/dt-bindings/clock/r9a07g044-cpg.h | 58 + .../include/dt-bindings/clock/r9a07g054-cpg.h | 58 + .../include/dt-bindings/clock/r9a08g045-cpg.h | 70 + .../include/dt-bindings/clock/rk3568-cru.h | 1 + .../include/dt-bindings/input/linux-event-codes.h | 2 + .../device-tree/include/dt-bindings/leds/common.h | 4 + .../include/dt-bindings/net/ti-dp83867.h | 4 +- .../include/dt-bindings/net/ti-dp83869.h | 4 +- .../include/dt-bindings/phy/phy-qcom-qmp.h | 4 + .../dt-bindings/reset/rockchip,rk3588-cru.h | 2 + .../include/dt-bindings/reset/st,stm32mp25-rcc.h | 2 +- .../dt-bindings/thermal/mediatek,lvts-thermal.h | 26 + sys/contrib/device-tree/scripts/cronjob | 4 +- sys/contrib/device-tree/scripts/filter.sh | 6 +- sys/contrib/device-tree/scripts/git-filter-branch | 673 +++++ .../allwinner/sun5i-a13-pocketbook-614-plus.dts | 218 ++ .../device-tree/src/arm/allwinner/sun5i-a13.dtsi | 4 +- .../src/arm/allwinner/sun5i-gr8-chip-pro.dts | 2 +- .../src/arm/allwinner/sun5i-r8-chip.dts | 2 +- .../src/arm/allwinner/sun6i-a31-hummingbird.dts | 4 +- .../device-tree/src/arm/allwinner/sun6i-a31.dtsi | 16 +- .../arm/allwinner/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- .../arm/allwinner/sun7i-a20-bananapi-m1-plus.dts | 2 +- .../src/arm/allwinner/sun7i-a20-cubietruck.dts | 2 +- .../src/arm/allwinner/sun7i-a20-hummingbird.dts | 4 +- .../allwinner/sun7i-a20-olimex-som-evb-emmc.dts | 2 +- .../allwinner/sun7i-a20-olimex-som204-evb-emmc.dts | 2 +- .../arm/allwinner/sun7i-a20-olimex-som204-evb.dts | 4 +- .../arm/allwinner/sun7i-a20-olinuxino-lime2.dts | 2 +- .../arm/allwinner/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- .../device-tree/src/arm/allwinner/sun7i-a20.dtsi | 4 +- .../src/arm/allwinner/sun8i-a23-a33.dtsi | 14 +- .../allwinner/sun8i-a23-polaroid-mid2407pxe03.dts | 4 +- .../allwinner/sun8i-a23-polaroid-mid2809pxe04.dts | 4 +- .../src/arm/allwinner/sun8i-a33-ga10h-v1.1.dts | 2 +- .../src/arm/allwinner/sun8i-a33-inet-d978-rev2.dts | 2 +- .../device-tree/src/arm/allwinner/sun8i-a33.dtsi | 10 +- .../src/arm/allwinner/sun8i-a83t-bananapi-m3.dts | 2 +- .../arm/allwinner/sun8i-a83t-cubietruck-plus.dts | 2 +- .../src/arm/allwinner/sun8i-a83t-tbs-a711.dts | 2 +- .../device-tree/src/arm/allwinner/sun8i-a83t.dtsi | 8 +- .../allwinner/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- .../arm/allwinner/sun8i-h2-plus-orangepi-r1.dts | 5 +- .../arm/allwinner/sun8i-h2-plus-orangepi-zero.dts | 6 +- .../src/arm/allwinner/sun8i-h3-beelink-x2.dts | 4 +- .../src/arm/allwinner/sun8i-h3-nanopi-duo2.dts | 4 +- .../src/arm/allwinner/sun8i-h3-nanopi-m1-plus.dts | 4 +- .../src/arm/allwinner/sun8i-h3-nanopi-neo-air.dts | 2 +- .../src/arm/allwinner/sun8i-h3-nanopi-r1.dts | 2 +- .../src/arm/allwinner/sun8i-h3-orangepi-2.dts | 4 +- .../src/arm/allwinner/sun8i-h3-orangepi-lite.dts | 2 +- .../arm/allwinner/sun8i-h3-orangepi-pc-plus.dts | 2 +- .../arm/allwinner/sun8i-h3-orangepi-zero-plus2.dts | 2 +- .../src/arm/allwinner/sun8i-q8-common.dtsi | 4 +- .../src/arm/allwinner/sun8i-r16-bananapi-m2m.dts | 2 +- .../src/arm/allwinner/sun8i-r16-parrot.dts | 2 +- .../arm/allwinner/sun8i-r40-bananapi-m2-ultra.dts | 2 +- .../src/arm/allwinner/sun8i-r40-oka40i-c.dts | 2 +- .../src/arm/allwinner/sun8i-s3-pinecube.dts | 2 +- .../device-tree/src/arm/allwinner/sun8i-v3s.dtsi | 4 +- .../arm/allwinner/sun8i-v40-bananapi-m2-berry.dts | 2 +- .../device-tree/src/arm/allwinner/sun9i-a80.dtsi | 4 +- .../src/arm/allwinner/sunxi-bananapi-m2-plus.dtsi | 2 +- .../arm/allwinner/sunxi-h3-h5-emlid-neutis.dtsi | 2 +- .../device-tree/src/arm/allwinner/sunxi-h3-h5.dtsi | 4 +- .../arm/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 1 - .../src/arm/aspeed/aspeed-bmc-asrock-e3c246d4i.dts | 9 + .../src/arm/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 +++ .../src/arm/aspeed/aspeed-bmc-asrock-romed8hm3.dts | 13 +- .../arm/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 +++ .../src/arm/aspeed/aspeed-bmc-asrock-x570d4u.dts | 360 +++ .../src/arm/aspeed/aspeed-bmc-asus-x4tf.dts | 581 ++++ .../src/arm/aspeed/aspeed-bmc-delta-ahe50dc.dts | 4 +- .../arm/aspeed/aspeed-bmc-facebook-greatlakes.dts | 4 +- .../src/arm/aspeed/aspeed-bmc-facebook-harma.dts | 648 +++++ .../src/arm/aspeed/aspeed-bmc-facebook-minerva.dts | 543 ++++ .../arm/aspeed/aspeed-bmc-facebook-yosemite4.dts | 15 +- .../arm/aspeed/aspeed-bmc-facebook-yosemitev2.dts | 2 +- .../src/arm/aspeed/aspeed-bmc-ibm-bonnell.dts | 8 +- .../src/arm/aspeed/aspeed-bmc-ibm-system1.dts | 1623 +++++++++++ .../device-tree/src/arm/aspeed/aspeed-g6.dtsi | 4 + .../src/arm/aspeed/ibm-power10-dual.dtsi | 2 + .../src/arm/broadcom/bcm2711-rpi-4-b.dts | 29 + .../src/arm/broadcom/bcm2711-rpi-400.dts | 1 + .../src/arm/broadcom/bcm2711-rpi-cm4-io.dts | 33 + .../device-tree/src/arm/broadcom/bcm2711-rpi.dtsi | 34 +- .../device-tree/src/arm/broadcom/bcm2711.dtsi | 12 +- .../src/arm/broadcom/bcm2835-rpi-common.dtsi | 7 - .../device-tree/src/arm/broadcom/bcm2835-rpi.dtsi | 23 +- .../device-tree/src/arm/broadcom/bcm283x.dtsi | 24 + .../src/arm/broadcom/bcm4709-asus-rt-ac3200.dts | 150 ++ .../src/arm/broadcom/bcm47094-asus-rt-ac3100.dts | 13 +- .../src/arm/broadcom/bcm47094-asus-rt-ac3100.dtsi | 133 +- .../src/arm/broadcom/bcm47094-asus-rt-ac5300.dts | 156 ++ .../src/arm/broadcom/bcm47094-asus-rt-ac88u.dts | 65 +- .../src/arm/nvidia/tegra20-colibri.dtsi | 4 +- .../device-tree/src/arm/nvidia/tegra20-paz00.dts | 43 + .../device-tree/src/arm/nxp/imx/e60k02.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/e70k02.dtsi | 2 +- .../arm/nxp/imx/imx27-phytec-phycard-s-som.dtsi | 78 + .../device-tree/src/arm/nxp/imx/imx51-ts4800.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx53-kp-ddc.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx53-kp.dtsi | 10 +- .../device-tree/src/arm/nxp/imx/imx53-m53evk.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx53-mba53.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx53-ppd.dts | 6 +- .../src/arm/nxp/imx/imx53-qsb-common.dtsi | 2 +- .../src/arm/nxp/imx/imx53-qsb-hdmi.dtso | 6 +- .../device-tree/src/arm/nxp/imx/imx53-tqma53.dtsi | 8 - .../src/arm/nxp/imx/imx6dl-aristainetos_4.dts | 3 +- .../src/arm/nxp/imx/imx6dl-aristainetos_7.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx6dl-mamoj.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx6q-ba16.dtsi | 3 +- .../src/arm/nxp/imx/imx6q-bosch-acc.dts | 10 +- .../device-tree/src/arm/nxp/imx/imx6q-kp.dtsi | 6 +- .../device-tree/src/arm/nxp/imx/imx6q-novena.dts | 3 +- .../src/arm/nxp/imx/imx6q-pistachio.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx6q-prti6q.dts | 3 +- .../src/arm/nxp/imx/imx6q-var-dt6customboard.dts | 3 +- .../src/arm/nxp/imx/imx6qdl-apf6dev.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-aristainetos2.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-cubox-i.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6qdl-emcon.dtsi | 9 +- .../src/arm/nxp/imx/imx6qdl-gw52xx.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-gw53xx.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-gw54xx.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-gw560x.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-gw5903.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-gw5904.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6qdl-icore.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6qdl-mba6.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-nit6xlite.dtsi | 6 +- .../src/arm/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 9 +- .../src/arm/nxp/imx/imx6qdl-nitrogen6_som2.dtsi | 6 +- .../src/arm/nxp/imx/imx6qdl-nitrogen6x.dtsi | 6 +- .../src/arm/nxp/imx/imx6qdl-phytec-mira.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-sabreauto.dtsi | 7 +- .../src/arm/nxp/imx/imx6qdl-sabrelite.dtsi | 9 +- .../src/arm/nxp/imx/imx6qdl-sabresd.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-savageboard.dtsi | 3 +- .../src/arm/nxp/imx/imx6qdl-skov-cpu.dtsi | 1 - .../device-tree/src/arm/nxp/imx/imx6qdl-udoo.dtsi | 25 +- .../device-tree/src/arm/nxp/imx/imx6qdl.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6sl-evk.dts | 4 +- .../src/arm/nxp/imx/imx6sl-tolino-shine2hd.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6sll-evk.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6sll.dtsi | 1 - .../src/arm/nxp/imx/imx6sx-nitrogen6sx.dts | 6 +- .../device-tree/src/arm/nxp/imx/imx6sx-sdb.dtsi | 8 +- .../src/arm/nxp/imx/imx6sx-softing-vining-2000.dts | 12 +- .../device-tree/src/arm/nxp/imx/imx6sx.dtsi | 7 +- .../src/arm/nxp/imx/imx6ul-14x14-evk.dtsi | 3 +- .../src/arm/nxp/imx/imx6ul-ccimx6ulsbcpro.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx6ul-geam.dts | 3 +- .../src/arm/nxp/imx/imx6ul-imx6ull-opos6uldev.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6ul-isiot.dtsi | 3 +- .../src/arm/nxp/imx/imx6ul-kontron-bl-43.dts | 3 +- .../src/arm/nxp/imx/imx6ul-kontron-bl-common.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6ul-pico.dtsi | 3 +- .../nxp/imx/imx6ull-seeed-npi-dev-board-emmc.dts | 19 + .../nxp/imx/imx6ull-seeed-npi-dev-board-nand.dts | 19 + .../arm/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi | 424 +++ .../src/arm/nxp/imx/imx6ull-seeed-npi.dtsi | 155 ++ .../src/arm/nxp/imx/imx6ull-tarragon-master.dts | 4 +- .../src/arm/nxp/imx/imx6ull-tarragon-slave.dts | 2 +- .../src/arm/nxp/imx/imx6ull-tarragon-slavext.dts | 2 +- .../src/arm/nxp/imx/imx6ull-uti260b.dts | 566 ++++ sys/contrib/device-tree/src/arm/nxp/imx/imx7s.dtsi | 9 + .../src/arm/qcom/msm8226-motorola-falcon.dts | 359 +++ .../device-tree/src/arm/qcom/qcom-apq8064.dtsi | 12 +- .../device-tree/src/arm/qcom/qcom-apq8084.dtsi | 2 +- .../device-tree/src/arm/qcom/qcom-ipq4019.dtsi | 45 +- .../device-tree/src/arm/qcom/qcom-ipq8064.dtsi | 30 + .../device-tree/src/arm/qcom/qcom-msm8916-smp.dtsi | 2 +- .../device-tree/src/arm/qcom/qcom-msm8974.dtsi | 6 +- .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 818 ++++++ .../src/arm/qcom/qcom-msm8974pro-samsung-klte.dts | 813 +----- .../arm/qcom/qcom-msm8974pro-samsung-kltechn.dts | 16 + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 574 +--- ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 539 ++++ .../qcom-msm8974pro-sony-xperia-shinano-leo.dts | 44 + .../device-tree/src/arm/qcom/qcom-sdx55.dtsi | 10 + .../device-tree/src/arm/renesas/r7s72100.dtsi | 8 + .../device-tree/src/arm/renesas/r8a73a4.dtsi | 37 + .../device-tree/src/arm/renesas/r8a7742.dtsi | 58 + .../device-tree/src/arm/renesas/r8a7743.dtsi | 58 + .../device-tree/src/arm/renesas/r8a7744.dtsi | 58 + .../device-tree/src/arm/renesas/r8a7745.dtsi | 58 + .../device-tree/src/arm/renesas/r8a77470.dtsi | 44 + .../device-tree/src/arm/renesas/r8a7790.dtsi | 58 + .../device-tree/src/arm/renesas/r8a7791.dtsi | 58 + .../device-tree/src/arm/renesas/r8a7792.dtsi | 59 + .../device-tree/src/arm/renesas/r8a7793.dtsi | 58 + .../device-tree/src/arm/renesas/r8a7794.dtsi | 58 + .../device-tree/src/arm/renesas/r9a06g032.dtsi | 1 - .../device-tree/src/arm/rockchip/rk3066a.dtsi | 1 + .../device-tree/src/arm/samsung/exynos3250.dtsi | 2 + .../device-tree/src/arm/samsung/exynos4.dtsi | 3 + .../src/arm/samsung/exynos4210-smdkv310.dts | 2 +- .../src/arm/samsung/exynos4212-tab3.dtsi | 6 + .../src/arm/samsung/exynos4412-origen.dts | 2 +- .../src/arm/samsung/exynos4412-smdk4412.dts | 12 +- .../device-tree/src/arm/samsung/exynos5250.dtsi | 3 + .../device-tree/src/arm/samsung/exynos5420.dtsi | 3 + .../src/arm/samsung/exynos5800-peach-pi.dts | 2 +- .../device-tree/src/arm/samsung/s5pv210.dtsi | 6 +- sys/contrib/device-tree/src/arm/st/stm32f746.dtsi | 17 - sys/contrib/device-tree/src/arm/st/stm32f769.dtsi | 17 + .../device-tree/src/arm/st/stm32mp13-pinctrl.dtsi | 57 + sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 1162 ++++---- sys/contrib/device-tree/src/arm/st/stm32mp133.dtsi | 51 +- sys/contrib/device-tree/src/arm/st/stm32mp135.dtsi | 11 + .../device-tree/src/arm/st/stm32mp135f-dk.dts | 53 + .../device-tree/src/arm/st/stm32mp13xc.dtsi | 19 +- .../device-tree/src/arm/st/stm32mp13xf.dtsi | 19 +- sys/contrib/device-tree/src/arm/st/stm32mp151.dtsi | 2839 ++++++++++---------- sys/contrib/device-tree/src/arm/st/stm32mp153.dtsi | 52 +- .../device-tree/src/arm/st/stm32mp157c-ed1.dts | 12 + .../device-tree/src/arm/st/stm32mp15xc.dtsi | 19 +- .../src/arm/ti/keystone/keystone-k2g.dtsi | 5 - .../device-tree/src/arm/ti/omap/am33xx.dtsi | 8 +- .../device-tree/src/arm/ti/omap/am4372.dtsi | 2 +- .../device-tree/src/arm/ti/omap/dra76x.dtsi | 63 +- .../device-tree/src/arm/ti/omap/dra7xx-clocks.dtsi | 270 +- .../device-tree/src/arm/ti/omap/omap3-n900.dts | 2 +- .../src/arm64/actions/s700-cubieboard7.dts | 2 +- .../arm64/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-olinuxino.dts | 2 +- .../arm64/allwinner/sun50i-a64-orangepi-win.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-pinebook.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-pinephone.dtsi | 16 +- .../src/arm64/allwinner/sun50i-a64-pinetab.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-teres-i.dts | 2 +- .../src/arm64/allwinner/sun50i-a64.dtsi | 18 +- .../src/arm64/allwinner/sun50i-h313-tanix-tx1.dts | 183 ++ .../arm64/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 2 +- .../arm64/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 4 +- .../arm64/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- .../allwinner/sun50i-h5-orangepi-zero-plus.dts | 2 +- .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- .../src/arm64/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- .../src/arm64/allwinner/sun50i-h6-orangepi-3.dts | 2 +- .../arm64/allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- .../src/arm64/allwinner/sun50i-h6-orangepi.dtsi | 2 +- .../arm64/allwinner/sun50i-h6-pine-h64-model-b.dts | 6 +- .../src/arm64/allwinner/sun50i-h6-pine-h64.dts | 2 +- .../device-tree/src/arm64/allwinner/sun50i-h6.dtsi | 2 +- .../allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 5 + .../src/arm64/allwinner/sun50i-h616-cpu-opp.dtsi | 115 + .../arm64/allwinner/sun50i-h616-orangepi-zero2.dts | 5 + .../src/arm64/allwinner/sun50i-h616-x96-mate.dts | 5 + .../src/arm64/allwinner/sun50i-h616.dtsi | 19 +- .../allwinner/sun50i-h618-longan-module-3h.dtsi | 5 + .../allwinner/sun50i-h618-orangepi-zero2w.dts | 5 + .../arm64/allwinner/sun50i-h618-orangepi-zero3.dts | 5 + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 7 +- .../arm64/allwinner/sun50i-h64-remix-mini-pc.dts | 4 +- .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 327 +++ .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 36 + .../allwinner/sun50i-h700-anbernic-rg35xx-plus.dts | 53 + .../src/arm64/altera/socfpga_stratix10.dtsi | 2 +- .../device-tree/src/arm64/amazon/alpine-v2.dtsi | 35 +- .../device-tree/src/arm64/amazon/alpine-v3.dtsi | 12 +- .../device-tree/src/arm64/amd/elba-16core.dtsi | 2 +- .../src/arm64/amd/elba-asic-common.dtsi | 2 +- .../device-tree/src/arm64/amd/elba-asic.dts | 2 +- .../src/arm64/amd/elba-flash-parts.dtsi | 2 +- sys/contrib/device-tree/src/arm64/amd/elba.dtsi | 2 +- .../src/arm64/amlogic/amlogic-a4-a113l2-ba400.dts | 42 + .../src/arm64/amlogic/amlogic-a4-common.dtsi | 66 + .../device-tree/src/arm64/amlogic/amlogic-a4.dtsi | 40 + .../src/arm64/amlogic/amlogic-a5-a113x2-av400.dts | 42 + .../device-tree/src/arm64/amlogic/amlogic-a5.dtsi | 40 + .../src/arm64/amlogic/amlogic-t7-reset.h | 197 ++ .../device-tree/src/arm64/amlogic/amlogic-t7.dtsi | 7 + .../src/arm64/amlogic/meson-g12-common.dtsi | 70 + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 384 +++ .../src/arm64/amlogic/meson-khadas-vim3-ts050.dtso | 108 + .../device-tree/src/arm64/amlogic/meson-s4.dtsi | 13 +- .../device-tree/src/arm64/apm/apm-merlin.dts | 2 +- .../device-tree/src/arm64/apm/apm-mustang.dts | 2 +- .../device-tree/src/arm64/apm/apm-shadowcat.dtsi | 14 +- .../device-tree/src/arm64/apm/apm-storm.dtsi | 15 +- .../device-tree/src/arm64/arm/juno-base.dtsi | 4 +- .../device-tree/src/arm64/arm/juno-scmi.dtsi | 4 +- .../src/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts | 2 +- .../src/arm64/broadcom/bcmbca/bcm4908.dtsi | 1 + .../src/arm64/broadcom/bcmbca/bcm94908.dts | 1 - .../src/arm64/broadcom/northstar2/ns2-svk.dts | 2 +- .../src/arm64/broadcom/northstar2/ns2-xmc.dts | 2 +- .../src/arm64/broadcom/northstar2/ns2.dtsi | 2 +- .../src/arm64/broadcom/stingray/stingray.dtsi | 2 +- .../device-tree/src/arm64/cavium/thunder-88xx.dtsi | 22 +- .../device-tree/src/arm64/cavium/thunder2-99xx.dts | 2 +- .../src/arm64/cavium/thunder2-99xx.dtsi | 3 +- .../device-tree/src/arm64/exynos/exynos5433.dtsi | 5 + .../device-tree/src/arm64/exynos/exynos850.dtsi | 26 + .../device-tree/src/arm64/exynos/exynosautov9.dtsi | 12 + .../src/arm64/exynos/google/gs101-oriole.dts | 46 +- .../device-tree/src/arm64/exynos/google/gs101.dtsi | 919 ++++++- .../src/arm64/freescale/fsl-ls1012a.dtsi | 2 +- .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 2 +- .../freescale/fsl-ls1028a-kontron-sl28-var3.dts | 18 + .../src/arm64/freescale/fsl-ls1028a.dtsi | 20 +- .../src/arm64/freescale/fsl-ls1043a.dtsi | 2 +- .../src/arm64/freescale/fsl-ls2080a.dtsi | 7 + .../src/arm64/freescale/fsl-ls2088a.dtsi | 7 + .../src/arm64/freescale/fsl-ls208xa.dtsi | 5 - .../src/arm64/freescale/fsl-lx2160a.dtsi | 108 +- .../src/arm64/freescale/fsl-lx2162a-clearfog.dts | 1 + .../src/arm64/freescale/fsl-lx2162a-sr-som.dtsi | 9 + .../src/arm64/freescale/imx8-ss-audio.dtsi | 285 +- .../src/arm64/freescale/imx8-ss-cm40.dtsi | 91 + .../src/arm64/freescale/imx8-ss-img.dtsi | 2 - .../src/arm64/freescale/imx8dx-colibri-aster.dts | 16 + .../src/arm64/freescale/imx8dx-colibri-eval-v3.dts | 16 + .../src/arm64/freescale/imx8dx-colibri-iris-v2.dts | 16 + .../src/arm64/freescale/imx8dx-colibri-iris.dts | 16 + .../src/arm64/freescale/imx8dx-colibri.dtsi | 11 + .../device-tree/src/arm64/freescale/imx8dx.dtsi | 13 + .../src/arm64/freescale/imx8dxl-evk.dts | 37 + .../device-tree/src/arm64/freescale/imx8dxl.dtsi | 15 +- .../src/arm64/freescale/imx8mm-evk.dtsi | 19 +- .../arm64/freescale/imx8mm-var-som-symphony.dts | 1 - .../src/arm64/freescale/imx8mm-venice-gw71xx.dtsi | 2 +- .../src/arm64/freescale/imx8mm-venice-gw7901.dts | 2 +- .../src/arm64/freescale/imx8mm-verdin-dahlia.dtsi | 40 +- .../src/arm64/freescale/imx8mm-verdin-dev.dtsi | 7 +- .../src/arm64/freescale/imx8mm-verdin-yavia.dtsi | 5 + .../src/arm64/freescale/imx8mm-verdin.dtsi | 29 +- .../device-tree/src/arm64/freescale/imx8mm.dtsi | 9 +- .../src/arm64/freescale/imx8mn-ddr3l-evk.dts | 16 + .../src/arm64/freescale/imx8mn-ddr4-evk.dts | 16 + .../device-tree/src/arm64/freescale/imx8mn-evk.dts | 16 + .../src/arm64/freescale/imx8mn-evk.dtsi | 45 +- .../arm64/freescale/imx8mn-var-som-symphony.dts | 1 - .../device-tree/src/arm64/freescale/imx8mn.dtsi | 8 +- .../src/arm64/freescale/imx8mp-beacon-kit.dts | 2 +- .../src/arm64/freescale/imx8mp-debix-model-a.dts | 2 - .../arm64/freescale/imx8mp-debix-som-a-bmb-08.dts | 1 - .../src/arm64/freescale/imx8mp-dhcom-pdk3.dts | 10 + .../src/arm64/freescale/imx8mp-dhcom-som.dtsi | 2 +- .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 45 + .../src/arm64/freescale/imx8mp-msc-sm2s.dtsi | 46 +- .../src/arm64/freescale/imx8mp-navqp.dts | 424 +++ .../arm64/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 38 + .../src/arm64/freescale/imx8mp-venice-gw71xx.dtsi | 2 +- .../src/arm64/freescale/imx8mp-venice-gw72xx.dtsi | 36 + .../src/arm64/freescale/imx8mp-venice-gw73xx.dtsi | 38 +- .../freescale/imx8mp-venice-gw74xx-imx219.dtso | 13 + .../src/arm64/freescale/imx8mp-venice-gw74xx.dts | 6 + .../src/arm64/freescale/imx8mp-verdin-dahlia.dtsi | 56 +- .../src/arm64/freescale/imx8mp-verdin-dev.dtsi | 12 +- .../src/arm64/freescale/imx8mp-verdin-mallow.dtsi | 5 + .../src/arm64/freescale/imx8mp-verdin-yavia.dtsi | 10 + .../src/arm64/freescale/imx8mp-verdin.dtsi | 53 +- .../device-tree/src/arm64/freescale/imx8mp.dtsi | 168 +- .../arm64/freescale/imx8mq-hummingboard-pulse.dts | 2 +- .../src/arm64/freescale/imx8mq-librem5-devkit.dts | 2 +- .../device-tree/src/arm64/freescale/imx8mq.dtsi | 7 + .../device-tree/src/arm64/freescale/imx8qm-mek.dts | 88 +- .../src/arm64/freescale/imx8qxp-mek.dts | 140 +- .../device-tree/src/arm64/freescale/imx8qxp.dtsi | 1 + .../src/arm64/freescale/imx8ulp-evk.dts | 84 + .../device-tree/src/arm64/freescale/imx8ulp.dtsi | 94 + .../src/arm64/freescale/imx93-11x11-evk.dts | 398 ++- .../device-tree/src/arm64/freescale/imx93.dtsi | 140 +- .../device-tree/src/arm64/freescale/mba8mx.dtsi | 14 +- .../device-tree/src/arm64/freescale/s32g2.dtsi | 37 +- .../src/arm64/freescale/s32g274a-evb.dts | 6 +- .../src/arm64/freescale/s32g274a-rdb2.dts | 6 +- .../device-tree/src/arm64/freescale/s32g3.dtsi | 233 ++ .../src/arm64/freescale/s32g399a-rdb3.dts | 45 + .../src/arm64/hisilicon/hi3798cv200.dtsi | 43 +- .../src/arm64/hisilicon/hi6220-hikey.dts | 7 +- .../device-tree/src/arm64/hisilicon/hi6220.dtsi | 2 +- .../device-tree/src/arm64/hisilicon/hip05-d02.dts | 4 +- .../device-tree/src/arm64/hisilicon/hip05.dtsi | 12 +- .../device-tree/src/arm64/hisilicon/hip06.dtsi | 88 +- .../device-tree/src/arm64/hisilicon/hip07.dtsi | 84 +- .../device-tree/src/arm64/intel/keembay-soc.dtsi | 2 +- .../src/arm64/intel/socfpga_agilex.dtsi | 2 +- .../device-tree/src/arm64/lg/lg1312-ref.dts | 2 +- .../device-tree/src/arm64/lg/lg1313-ref.dts | 2 +- .../src/arm64/marvell/ac5-98dx25xx.dtsi | 2 +- .../src/arm64/marvell/armada-3720-eDPU.dts | 2 - .../marvell/armada-3720-espressobin-ultra.dts | 98 +- .../src/arm64/marvell/armada-3720-turris-mox.dts | 2 - .../device-tree/src/arm64/marvell/armada-37xx.dtsi | 2 +- .../src/arm64/marvell/armada-ap80x.dtsi | 2 +- .../device-tree/src/arm64/marvell/cn9130-crb.dtsi | 13 +- .../device-tree/src/arm64/marvell/cn9130-db.dtsi | 18 +- .../device-tree/src/arm64/marvell/cn9131-db.dtsi | 8 +- .../device-tree/src/arm64/marvell/cn9132-db.dtsi | 12 +- .../device-tree/src/arm64/mediatek/mt8516.dtsi | 2 +- .../device-tree/src/arm64/microchip/sparx5.dtsi | 4 +- .../src/arm64/microchip/sparx5_pcb134_board.dtsi | 149 +- .../src/arm64/microchip/sparx5_pcb135_board.dtsi | 35 +- .../src/arm64/nuvoton/nuvoton-npcm845-evb.dts | 2 +- .../src/arm64/nvidia/tegra132-norrin.dts | 4 +- .../device-tree/src/arm64/nvidia/tegra132.dtsi | 2 +- .../src/arm64/nvidia/tegra210-smaug.dts | 2 +- .../device-tree/src/arm64/nvidia/tegra210.dtsi | 2 +- .../device-tree/src/arm64/nvidia/tegra234.dtsi | 16 + .../device-tree/src/arm64/qcom/apq8016-sbc.dts | 12 +- .../device-tree/src/arm64/qcom/ipq6018.dtsi | 10 + .../device-tree/src/arm64/qcom/ipq8074-hk10.dtsi | 2 +- .../device-tree/src/arm64/qcom/ipq8074.dtsi | 41 +- .../src/arm64/qcom/msm8916-longcheer-l8150.dts | 2 +- .../device-tree/src/arm64/qcom/msm8916-mtp.dts | 2 +- .../arm64/qcom/msm8916-samsung-a2015-common.dtsi | 6 + .../arm64/qcom/msm8916-samsung-e2015-common.dtsi | 6 + .../arm64/qcom/msm8916-samsung-fortuna-common.dtsi | 83 + .../arm64/qcom/msm8916-samsung-rossa-common.dtsi | 12 + .../src/arm64/qcom/msm8939-samsung-a7.dts | 6 + .../device-tree/src/arm64/qcom/msm8953.dtsi | 14 + .../device-tree/src/arm64/qcom/msm8996.dtsi | 30 + .../arm64/qcom/msm8998-sony-xperia-yoshino.dtsi | 67 +- .../device-tree/src/arm64/qcom/msm8998.dtsi | 10 + sys/contrib/device-tree/src/arm64/qcom/pm6150.dtsi | 8 +- .../device-tree/src/arm64/qcom/pm6150l.dtsi | 10 + .../device-tree/src/arm64/qcom/qcm2290.dtsi | 58 +- .../src/arm64/qcom/qcm6490-fairphone-fp5.dts | 2 + .../device-tree/src/arm64/qcom/qcm6490-idp.dts | 189 ++ .../device-tree/src/arm64/qcom/qcs404-evb.dtsi | 2 +- sys/contrib/device-tree/src/arm64/qcom/qcs404.dtsi | 10 + .../device-tree/src/arm64/qcom/qcs6490-rb3gen2.dts | 251 +- .../device-tree/src/arm64/qcom/qdu1000.dtsi | 18 +- .../device-tree/src/arm64/qcom/qrb2210-rb1.dts | 61 +- .../device-tree/src/arm64/qcom/qrb4210-rb2.dts | 1 + .../device-tree/src/arm64/qcom/sa8155p-adp.dts | 2 +- .../device-tree/src/arm64/qcom/sa8775p.dtsi | 22 +- .../src/arm64/qcom/sc7180-acer-aspire1.dts | 40 +- .../device-tree/src/arm64/qcom/sc7180-trogdor.dtsi | 1 + sys/contrib/device-tree/src/arm64/qcom/sc7180.dtsi | 10 +- sys/contrib/device-tree/src/arm64/qcom/sc7280.dtsi | 24 + .../src/arm64/qcom/sc8180x-lenovo-flex-5g.dts | 59 +- .../device-tree/src/arm64/qcom/sc8180x.dtsi | 64 +- .../device-tree/src/arm64/qcom/sc8280xp-crd.dts | 3 +- .../arm64/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 122 +- .../device-tree/src/arm64/qcom/sc8280xp.dtsi | 189 +- .../src/arm64/qcom/sdm630-sony-xperia-nile.dtsi | 9 + .../src/arm64/qcom/sdm632-fairphone-fp3.dts | 31 +- .../src/arm64/qcom/sdm670-google-sargo.dts | 64 + .../device-tree/src/arm64/qcom/sdm845-db845c.dts | 6 + sys/contrib/device-tree/src/arm64/qcom/sdm845.dtsi | 20 + sys/contrib/device-tree/src/arm64/qcom/sdx75.dtsi | 4 +- sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi | 1 + sys/contrib/device-tree/src/arm64/qcom/sm6350.dtsi | 119 + .../device-tree/src/arm64/qcom/sm8150-hdk.dts | 16 + sys/contrib/device-tree/src/arm64/qcom/sm8150.dtsi | 20 + .../src/arm64/qcom/sm8250-xiaomi-elish-common.dtsi | 11 +- sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi | 30 + .../device-tree/src/arm64/qcom/sm8350-hdk.dts | 1 + sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi | 26 + .../device-tree/src/arm64/qcom/sm8450-hdk.dts | 1 + .../device-tree/src/arm64/qcom/sm8450-qrd.dts | 8 + sys/contrib/device-tree/src/arm64/qcom/sm8450.dtsi | 23 + .../arm64/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 779 ++++++ sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi | 42 +- .../device-tree/src/arm64/qcom/sm8650-mtp.dts | 4 - .../device-tree/src/arm64/qcom/sm8650-qrd.dts | 12 +- sys/contrib/device-tree/src/arm64/qcom/sm8650.dtsi | 255 +- .../device-tree/src/arm64/qcom/x1e80100-crd.dts | 60 +- .../device-tree/src/arm64/qcom/x1e80100-pmics.dtsi | 51 + .../device-tree/src/arm64/qcom/x1e80100-qcp.dts | 36 +- .../device-tree/src/arm64/qcom/x1e80100.dtsi | 56 +- .../device-tree/src/arm64/realtek/rtd129x.dtsi | 2 +- .../device-tree/src/arm64/realtek/rtd139x.dtsi | 2 +- .../device-tree/src/arm64/realtek/rtd16xx.dtsi | 4 +- .../renesas/r8a77970-eagle-function-expansion.dtso | 214 ++ .../src/arm64/renesas/r8a779f4-s4sk.dts | 6 +- .../arm64/renesas/r8a779h0-gray-hawk-single.dts | 27 +- .../device-tree/src/arm64/renesas/r8a779h0.dtsi | 537 +++- .../device-tree/src/arm64/renesas/r9a07g043.dtsi | 3 +- .../device-tree/src/arm64/renesas/r9a07g043u.dtsi | 4 - .../device-tree/src/arm64/renesas/r9a07g044.dtsi | 2 +- .../device-tree/src/arm64/renesas/r9a07g054.dtsi | 2 +- .../src/arm64/renesas/rzg2ul-smarc.dtsi | 58 + .../src/arm64/renesas/rzg3s-smarc-som.dtsi | 6 +- .../src/arm64/rockchip/rk3308-rock-pi-s.dts | 18 +- .../device-tree/src/arm64/rockchip/rk3308.dtsi | 56 + .../src/arm64/rockchip/rk3326-gameforce-chi.dts | 809 ++++++ .../src/arm64/rockchip/rk3328-rock-pi-e.dts | 4 +- .../device-tree/src/arm64/rockchip/rk3328.dtsi | 37 +- .../device-tree/src/arm64/rockchip/rk3368-evb.dtsi | 2 +- .../src/arm64/rockchip/rk3368-orion-r68-meta.dts | 2 +- .../device-tree/src/arm64/rockchip/rk3368-r88.dts | 2 +- .../device-tree/src/arm64/rockchip/rk3368.dtsi | 5 +- .../device-tree/src/arm64/rockchip/rk3399-gru.dtsi | 2 +- .../src/arm64/rockchip/rk3399-pinephone-pro.dts | 2 +- .../src/arm64/rockchip/rk3399-rock-4c-plus.dts | 4 +- .../src/arm64/rockchip/rk3399-rock-pi-4.dtsi | 4 +- .../src/arm64/rockchip/rk3566-anbernic-rg353p.dts | 2 +- .../src/arm64/rockchip/rk3566-anbernic-rg353ps.dts | 2 +- .../src/arm64/rockchip/rk3566-anbernic-rg353v.dts | 2 +- .../src/arm64/rockchip/rk3566-anbernic-rg353vs.dts | 2 +- .../src/arm64/rockchip/rk3566-anbernic-rg503.dts | 2 +- .../src/arm64/rockchip/rk3566-anbernic-rgxx3.dtsi | 5 + .../src/arm64/rockchip/rk3566-powkiddy-rgb30.dts | 2 +- .../src/arm64/rockchip/rk3566-powkiddy-rk2023.dts | 2 +- .../src/arm64/rockchip/rk3566-powkiddy-rk2023.dtsi | 2 + .../src/arm64/rockchip/rk3566-powkiddy-x55.dts | 1 + .../src/arm64/rockchip/rk3566-quartz64-a.dts | 2 +- .../src/arm64/rockchip/rk3566-quartz64-b.dts | 4 +- .../src/arm64/rockchip/rk3566-rock-3c.dts | 726 +++++ .../src/arm64/rockchip/rk3566-soquartz-blade.dts | 2 +- .../src/arm64/rockchip/rk3566-soquartz-cm4.dts | 2 +- .../src/arm64/rockchip/rk3566-soquartz-model-a.dts | 2 +- .../src/arm64/rockchip/rk3566-soquartz.dtsi | 2 +- .../src/arm64/rockchip/rk3568-mecsbc.dts | 404 +++ .../src/arm64/rockchip/rk3568-rock-3a.dts | 16 +- .../rk3568-wolfvision-pf5-io-expander.dtso | 137 + .../src/arm64/rockchip/rk3568-wolfvision-pf5.dts | 528 ++++ .../device-tree/src/arm64/rockchip/rk356x.dtsi | 41 + .../src/arm64/rockchip/rk3588-armsom-sige7.dts | 721 +++++ .../src/arm64/rockchip/rk3588-coolpi-cm5.dtsi | 7 +- .../rockchip/rk3588-edgeble-neu6a-common.dtsi | 4 +- .../arm64/rockchip/rk3588-edgeble-neu6a-io.dtsi | 8 + .../src/arm64/rockchip/rk3588-evb1-v10.dts | 161 ++ .../src/arm64/rockchip/rk3588-fet3588-c.dtsi | 558 ++++ .../src/arm64/rockchip/rk3588-jaguar.dts | 66 +- .../src/arm64/rockchip/rk3588-ok3588-c.dts | 409 +++ .../src/arm64/rockchip/rk3588-orangepi-5-plus.dts | 1 + .../src/arm64/rockchip/rk3588-quartzpro64.dts | 17 +- .../src/arm64/rockchip/rk3588-rock-5b.dts | 25 +- *** 908 LINES SKIPPED *** From nobody Thu Jan 2 09:10:36 2025 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 4YP1C15Mbdz5j1Fj for ; Thu, 02 Jan 2025 09:10:37 +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 4YP1C14FWDz425P; Thu, 2 Jan 2025 09:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809037; 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=1v1h+TKPlXfdPGwxXji6ak4rm7t6A/ByS/3/cu96ayM=; b=yP6F0rMzgS5plaKFaKoQV3E8RzeK10KwqGnkkYkB4/48f27UsBX6efiF1VwWh2OJUVrfFd 4PvI2MwjFOK0aRbnSwpSr54HvBXE0qUCTThluI6TIGcRBZpSBqXL+kQdSpFzxOlsAzU5Cw e6I5qSCfIKHky6dVwA41XgAFpEEZwXZdm4nNMeLig3b7uBrYbcR3ry1AICOyvRTVNzy6tC 7cJcAHUzpDpAZDUurJuA7BYKmLgRZePgwVPwdQ/OYuShZZZja/h6GyQigPXTbiyCqHeFxO J+3/dCL+fsJjOGvakkQhV3AITT0LgmEwvxYtpvDl3EYyW9pxdknfVxKFDTQQ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809037; 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=1v1h+TKPlXfdPGwxXji6ak4rm7t6A/ByS/3/cu96ayM=; b=L+DduP/QoS1TRL7dSAlSlXVJETkoTMRqVuN7acbBsom3mdezgw/Q3/04bPyVXGJyb/09xI mGuANJIYTYsLrtP1nllRnjMkiiMWe9f994JxWbs6GUIEBiq6GBFVA5pDyLwaTwo3Gpqg34 5Rh/lXqhWNrpvl71Xdo/pGjMpRTZi5dKIAmoSdlE80R6Hd6xSWb0igciExGpViHzUZgGyE mjTeCTJNl29PN3VYs0kx0H/MWjkk/PR/C5p3wtLb2OQdB4BNg6ZZ9HBJr9vnrWCFBZUgy1 QvJHT8jJE8A3FITbPKXU7lts90IFvvMryDN6+9KM0aMRUm8zsE5LOisYClhscw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735809037; a=rsa-sha256; cv=none; b=ByCS5PeenvA38pzXYfh6s3VvLmXCTvyWpYj6iw9npZparfI414IzJRxJwXhbVbRmlFPqsf JcQtCYLlobgoHRwRWGTpCJNTMLi/Oglp1MX0Ilw5YAD83sLMlFqSXMkbJgSyvhmypKhA1B s8YJEUR6IZc2EyUbRyyD1FulTZuY0e5xntECypRr2Mpgv9f6luEHPtigO5zdMJHNVnogq+ F0mYUDMRc0vYGcschZF5fR5xNRE/4dxBjfK5fEoTvbzYV1sSQqqCBARXiThuWnfmSr6od1 c/sfWdqG37fPhLa1mcETAS9MoWHodIWffyw9CejL+p5yPlEVCEKxy3tZwPzozg== 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 4YP1C045JPz12vf; Thu, 2 Jan 2025 09:10:36 +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 5029AaFe024129; Thu, 2 Jan 2025 09:10:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5029Aa6J024128; Thu, 2 Jan 2025 09:10:36 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:10:36 GMT Message-Id: <202501020910.5029Aa6J024128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: a8091808915c..beb6e748a901 - vendor/device-tree - vendor branch updated 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: beb6e748a90196469bed9e3900ce618069c652f7 X-Git-Oldrev: a8091808915c37cd212871d2b3f3a49149a8ddb4 X-Git-Newrev: beb6e748a90196469bed9e3900ce618069c652f7 Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=a8091808915c..beb6e748a901 beb6e748a901 Import device-tree files from Linux 6.11 From nobody Thu Jan 2 09:10:43 2025 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 4YP1C85d6pz5j0s9 for ; Thu, 02 Jan 2025 09:10:44 +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 4YP1C83N3Lz41xP; Thu, 2 Jan 2025 09:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809044; 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=GePfg3NgRWdsI2CRfl9aCbTm9cVKAOfdMD87PHmNoCs=; b=HsYAdH1xXNfVGIL4tPw+vBaLeDffbHOHdl6XN609rxFu/h3lVUvMNWQ7CXSY7nqf0JmDKw CMNLPFe+d2mvV6hF9qnK7ypRm8b3vLd/kFOaETHyYt9PeEIOpOWhh9FZ4w5mtfPLjs7kSf 8LbhwVWrbSVdqEvx/4S3LKqEHsxrHk3n9L9gxN3edegSqomVHA8dm7laqKOaObdgvzmIot 25i3MbCw/8xWyYhmnWieRofXP5LQr1X7D7Tat7Kiipo9Tp9TUCxAmQy/FrzfvmN8Zd5Q8K GKsg3aPHVfV6d46G03pxx50KsdLpKDv+d/j4vFPoYBrB8uR9bKoEq9R9dzOhJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809044; 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=GePfg3NgRWdsI2CRfl9aCbTm9cVKAOfdMD87PHmNoCs=; b=w7oy0ysieGz0HsSHb9EuZDAChJQC5i5uj34iDSHHKan5+t5KwdwzG8uPnER8ZKjsOsRuNg ENMkRKukh8eNPlJmiSfqdMaRkXt+hGSal3g4QNEYtqWCEu5RdcuhzYZYojUxkd+u75Xfkx 0zTvyzDHrhIBP487QFS+lSHLRUoFtxqdv9dFE0kP2Qm+TaItWQO6NC76IRRuu8a9eqIR3e H8GG1+3nh8zOukvlN6lVNIgXZhmuhWIQ0gdG6GKyWkgun/1SiFiHuy7ke/7GhDoWt2ij5+ UC1W8A8mTSk3oV6x4DDnTKhUBQK5xS5SbUQ2D6ZsmhLSyvgbBdKt8O20eD9Dgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735809044; a=rsa-sha256; cv=none; b=LpucROnvxGY+cjfGAAc0OAj9Z6i2kKpJvozCHMgEq5oRbvTpCDPguQ12vzdYGkEUYkXhqK Ija24DO7kJ1brXRCPCTWTCmXOlpjII/ECHzY7uTwMLR3aZ2G9ZrJFm5mt5hQYFNFvXY+tY Jf+mAlfSAqbKhr344nH23F+qDCZ6Vlw/9reCPNXflHc2TuteNEl7T5HAU6OvGFC5p5OKRt c8dSsYvR6rEzUr6f4JJZbzpdu+XiL6wLb+hUVDBHp2AaUFONRynUBVCCxcWT4RMwrCDid+ f/q+jvy8amEcSHg3CsnnSivRocDBJyX8zcjeW6BnseEuSea77BNxp/belvuC3w== 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 4YP1C72sbzz12w8; Thu, 2 Jan 2025 09:10:43 +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 5029AhlU024263; Thu, 2 Jan 2025 09:10:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5029AhDm024262; Thu, 2 Jan 2025 09:10:43 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:10:43 GMT Message-Id: <202501020910.5029AhDm024262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: d5760500e428 - Create tag vendor/device-tree/6.11 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.11 X-Git-Reftype: annotated tag X-Git-Commit: d5760500e428c85703b1d316434de8c1fea5df47 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.11 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.11 tag vendor/device-tree/6.11 Tagger: Emmanuel Vadot TaggerDate: 2025-01-02 09:10:15 +0000 Tag device-tree files from Linux 6.11 commit beb6e748a90196469bed9e3900ce618069c652f7 Author: Emmanuel Vadot AuthorDate: 2025-01-02 09:10:08 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 09:10:08 +0000 Import device-tree files from Linux 6.11 From nobody Thu Jan 2 09:11:21 2025 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 4YP1Ct4CCFz5j0sR; Thu, 02 Jan 2025 09:11:22 +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 4YP1Ct30LJz42fc; Thu, 2 Jan 2025 09:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809082; 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=fHjDEETmX57snuPe66HhtRl8PhjM/iJMLaol7fordFM=; b=D3dktFR+kGP2S4YRi0DZ12xWQlzTgapWK6W+M0jtWNNmksJCKV2MMX1HaD2npHZmSFABKL p+lUPHzLWaogiFlo/i0WouLm1kyeKygn59EdHBkekeuuIKK/fG6A6hmxHPj0DizaKLKzcj GHH1aVbcr96VZNs5uPCx1/q8mMEGl3XICMhkcFLvcBlRPyMuM2ydTANDasmizy1O0E4x4/ x9GiqPeVw/BHDekd7fz2ukqMMCfPZkw7aQquR8u+L8gF9AHHHLgDSU+Tp+neliCA9Z0Fxo Za6X2xgL3t685Sj8YbEDenv52ziwNEqV5pxDEd6bPQf9sAqOLR9g8cFrPdAipA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809082; 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=fHjDEETmX57snuPe66HhtRl8PhjM/iJMLaol7fordFM=; b=wok1JGsVNkS55J34gt4FClWkb8zLDyFP1XskqfSo5ydyr5Sd01uvV5IvNm3OtWbqi+BB+A nbKJ6Luo1Wb3LIpXWUKQpBPqkQh1Wv6O5STr4f6V8Gb2aGdftA1CxCbVtvHKzlSyFH4iPh wx8zVSYXcK5VbO0jEgThnSo0dZCLgA/Az5ODku0PAx/4cJ4eTMsW1r9GM3EiKQgN836bQr 7SzkZkx/XLPjoEmaq7Di41QfrqjBhAIF3b42403ETwGfXmnrfCw91iQoZhdVzrx3mHW9dO y+MDL6gPWtJoQr0IdhcsVT1T8VDNp6p7EjbV7NXRln6gkqS5dqeWTGP9jJUlnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735809082; a=rsa-sha256; cv=none; b=Wkk6bewOb/90BtHRlgQ2M1JaAjewYkgjGU6IRVghcdxoZ/Epx5xlKTmmZIfcfFlYt3N1KM h9WO4U4anUmuhbQEN13KMziLUPfnWMc3hOvg5vtWFly/rvR0deYMk1uDImHPFNIRHSfDB0 5Jd6jnD8ud3OTuBc+f/wi7tI37knaz5toYDT8wCBvOCW9kmuaMlrNsFrxim5PHu+X09ITy QqIMpL/754vFkHZo+1QPW8uKIGCBiRFdnUtg/dZwQauouvd2KZ9IB9AN+Zfl3tf+xcABuR QrT04jcgipF6tqtwljDDPPeUWi02zilhArCWgXE0yzTrHMgbbyQyR2YlKMkEpg== 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 4YP1Ct2bKxz12lF; Thu, 2 Jan 2025 09:11:22 +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 5029BMkE028072; Thu, 2 Jan 2025 09:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5029BLSC028063; Thu, 2 Jan 2025 09:11:21 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:11:21 GMT Message-Id: <202501020911.5029BLSC028063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0e8011faf58b - main - Import device-tree files from Linux 6.11 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e8011faf58b743cc652e3b2ad0f7671227610df Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0e8011faf58b743cc652e3b2ad0f7671227610df commit 0e8011faf58b743cc652e3b2ad0f7671227610df Merge: 7d0873ebb83b beb6e748a901 Author: Emmanuel Vadot AuthorDate: 2025-01-02 09:10:48 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 09:10:48 +0000 Import device-tree files from Linux 6.11 sys/contrib/device-tree/Bindings/arm/airoha.yaml | 4 + sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 10 + .../Bindings/arm/arm,coresight-dummy-sink.yaml | 2 +- .../Bindings/arm/arm,coresight-dummy-source.yaml | 2 +- .../Bindings/arm/arm,juno-fpga-apb-regs.yaml | 61 + .../device-tree/Bindings/arm/atmel-sysregs.txt | 29 - sys/contrib/device-tree/Bindings/arm/axis.txt | 16 - .../device-tree/Bindings/arm/bcm/bcm2835.yaml | 6 + .../Bindings/arm/cpu-enable-method/al,alpine-smp | 10 - sys/contrib/device-tree/Bindings/arm/cpus.yaml | 6 + .../Bindings/arm/freescale/fsl,imx7ulp-sim.yaml | 4 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 32 +- .../device-tree/Bindings/arm/keystone/ti,sci.yaml | 2 +- .../Bindings/arm/marvell/armada-7k-8k.yaml | 18 + .../Bindings/arm/marvell/marvell,dove.txt | 15 - sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 24 + sys/contrib/device-tree/Bindings/arm/pmu.yaml | 6 + sys/contrib/device-tree/Bindings/arm/qcom.yaml | 27 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 42 + .../device-tree/Bindings/arm/stm32/stm32.yaml | 6 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 16 +- sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 6 + sys/contrib/device-tree/Bindings/ata/fsl,ahci.yaml | 64 + .../Bindings/ata/rockchip,dwc-ahci.yaml | 3 + .../device-tree/Bindings/cache/qcom,llcc.yaml | 55 +- .../cache/starfive,jh8100-starlink-cache.yaml | 66 + .../Bindings/clock/airoha,en7523-scu.yaml | 25 +- .../clock/amlogic,a1-peripherals-clkc.yaml | 9 +- .../Bindings/clock/amlogic,a1-pll-clkc.yaml | 9 +- .../Bindings/clock/amlogic,axg-audio-clkc.yaml | 201 ++ .../clock/amlogic,c3-peripherals-clkc.yaml | 120 + .../Bindings/clock/amlogic,c3-pll-clkc.yaml | 59 + .../Bindings/clock/fsl,qoriq-clock-legacy.yaml | 84 + .../Bindings/clock/fsl,qoriq-clock.yaml | 207 ++ .../device-tree/Bindings/clock/imx6q-clock.yaml | 3 +- .../device-tree/Bindings/clock/imx6sl-clock.yaml | 3 +- .../device-tree/Bindings/clock/imx6sll-clock.yaml | 3 +- .../device-tree/Bindings/clock/imx6sx-clock.yaml | 3 +- .../device-tree/Bindings/clock/imx6ul-clock.yaml | 3 +- .../device-tree/Bindings/clock/imx7d-clock.yaml | 1 - .../device-tree/Bindings/clock/imx8m-clock.yaml | 3 +- .../Bindings/clock/mediatek,mt7622-pciesys.yaml | 10 +- .../Bindings/clock/mediatek,mt8188-sys-clock.yaml | 3 + .../device-tree/Bindings/clock/milbeaut-clock.yaml | 29 +- .../Bindings/clock/qcom,dispcc-sc8280xp.yaml | 20 +- .../Bindings/clock/qcom,dispcc-sm6350.yaml | 22 +- .../Bindings/clock/qcom,dispcc-sm8x50.yaml | 46 +- .../Bindings/clock/qcom,gcc-apq8064.yaml | 3 +- .../Bindings/clock/qcom,gcc-apq8084.yaml | 1 + .../Bindings/clock/qcom,gcc-ipq4019.yaml | 3 +- .../Bindings/clock/qcom,gcc-ipq6018.yaml | 3 +- .../Bindings/clock/qcom,gcc-ipq8064.yaml | 3 +- .../Bindings/clock/qcom,gcc-ipq8074.yaml | 1 + .../Bindings/clock/qcom,gcc-mdm9607.yaml | 43 + .../Bindings/clock/qcom,gcc-mdm9615.yaml | 50 + .../Bindings/clock/qcom,gcc-msm8660.yaml | 3 +- .../Bindings/clock/qcom,gcc-msm8909.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8916.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8953.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8974.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8976.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8994.yaml | 3 +- .../Bindings/clock/qcom,gcc-msm8996.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8998.yaml | 1 + .../Bindings/clock/qcom,gcc-qcm2290.yaml | 1 + .../Bindings/clock/qcom,gcc-qcs404.yaml | 1 + .../Bindings/clock/qcom,gcc-sc7180.yaml | 1 + .../Bindings/clock/qcom,gcc-sc7280.yaml | 1 + .../Bindings/clock/qcom,gcc-sc8180x.yaml | 1 + .../Bindings/clock/qcom,gcc-sc8280xp.yaml | 1 + .../Bindings/clock/qcom,gcc-sdm660.yaml | 1 + .../Bindings/clock/qcom,gcc-sdm845.yaml | 1 + .../device-tree/Bindings/clock/qcom,gcc-sdx55.yaml | 1 + .../device-tree/Bindings/clock/qcom,gcc-sdx65.yaml | 1 + .../Bindings/clock/qcom,gcc-sm6115.yaml | 1 + .../Bindings/clock/qcom,gcc-sm6125.yaml | 3 +- .../Bindings/clock/qcom,gcc-sm6350.yaml | 3 +- .../Bindings/clock/qcom,gcc-sm8150.yaml | 1 + .../Bindings/clock/qcom,gcc-sm8250.yaml | 1 + .../Bindings/clock/qcom,gcc-sm8350.yaml | 1 + .../Bindings/clock/qcom,gcc-sm8450.yaml | 1 + .../device-tree/Bindings/clock/qcom,gcc.yaml | 1 - .../Bindings/clock/qcom,gpucc-sdm660.yaml | 20 +- .../device-tree/Bindings/clock/qcom,gpucc.yaml | 20 +- .../Bindings/clock/qcom,ipq5018-gcc.yaml | 3 +- .../Bindings/clock/qcom,ipq5332-gcc.yaml | 3 +- .../Bindings/clock/qcom,ipq9574-gcc.yaml | 6 +- .../Bindings/clock/qcom,msm8998-gpucc.yaml | 20 +- .../Bindings/clock/qcom,qca8k-nsscc.yaml | 86 + .../Bindings/clock/qcom,qcm2290-dispcc.yaml | 20 +- .../Bindings/clock/qcom,qcm2290-gpucc.yaml | 77 + .../Bindings/clock/qcom,qdu1000-gcc.yaml | 1 + .../Bindings/clock/qcom,sa8775p-gcc.yaml | 1 + .../Bindings/clock/qcom,sc7180-dispcc.yaml | 20 +- .../Bindings/clock/qcom,sc7280-dispcc.yaml | 20 +- .../Bindings/clock/qcom,sdm845-dispcc.yaml | 20 +- .../device-tree/Bindings/clock/qcom,sdx75-gcc.yaml | 1 + .../Bindings/clock/qcom,sm4450-gcc.yaml | 1 + .../Bindings/clock/qcom,sm6115-dispcc.yaml | 20 +- .../Bindings/clock/qcom,sm6115-gpucc.yaml | 2 +- .../Bindings/clock/qcom,sm6125-gpucc.yaml | 2 +- .../Bindings/clock/qcom,sm6350-camcc.yaml | 2 +- .../Bindings/clock/qcom,sm6375-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sm6375-gcc.yaml | 3 +- .../Bindings/clock/qcom,sm6375-gpucc.yaml | 2 +- .../Bindings/clock/qcom,sm7150-camcc.yaml | 60 + .../Bindings/clock/qcom,sm7150-dispcc.yaml | 75 + .../Bindings/clock/qcom,sm7150-gcc.yaml | 1 + .../Bindings/clock/qcom,sm7150-videocc.yaml | 58 + .../Bindings/clock/qcom,sm8350-videocc.yaml | 2 +- .../Bindings/clock/qcom,sm8450-camcc.yaml | 7 +- .../Bindings/clock/qcom,sm8450-dispcc.yaml | 20 +- .../Bindings/clock/qcom,sm8450-gpucc.yaml | 22 +- .../Bindings/clock/qcom,sm8450-videocc.yaml | 26 +- .../Bindings/clock/qcom,sm8550-dispcc.yaml | 20 +- .../Bindings/clock/qcom,sm8550-gcc.yaml | 1 + .../Bindings/clock/qcom,sm8650-gcc.yaml | 1 + .../device-tree/Bindings/clock/qcom,videocc.yaml | 36 +- .../Bindings/clock/qcom,x1e80100-gcc.yaml | 1 + .../Bindings/clock/renesas,rzg2l-cpg.yaml | 2 +- .../Bindings/clock/sophgo,sg2042-clkgen.yaml | 61 + .../Bindings/clock/sophgo,sg2042-pll.yaml | 53 + .../Bindings/clock/sophgo,sg2042-rpgate.yaml | 49 + .../Bindings/clock/sprd,sc9860-clk.yaml | 159 + .../Bindings/clock/thead,th1520-clk-ap.yaml | 53 + .../device-tree/Bindings/clock/ti,sci-clk.yaml | 2 +- .../device-tree/Bindings/counter/ti-eqep.yaml | 27 +- .../Bindings/crypto/allwinner,sun8i-ce.yaml | 2 + .../Bindings/display/amlogic,meson-dw-hdmi.yaml | 5 + .../Bindings/display/bridge/synopsys,dw-hdmi.yaml | 13 + .../Bindings/display/bridge/toshiba,tc358767.yaml | 2 +- .../Bindings/display/imx/fsl,imx6-hdmi.yaml | 8 - .../Bindings/display/mediatek/mediatek,aal.yaml | 1 + .../Bindings/display/mediatek/mediatek,ccorr.yaml | 3 + .../Bindings/display/mediatek/mediatek,color.yaml | 1 + .../Bindings/display/mediatek/mediatek,dither.yaml | 1 + .../Bindings/display/mediatek/mediatek,dpi.yaml | 4 + .../Bindings/display/mediatek/mediatek,dsi.yaml | 1 + .../Bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../Bindings/display/mediatek/mediatek,ovl.yaml | 1 + .../Bindings/display/mediatek/mediatek,rdma.yaml | 1 + .../Bindings/display/msm/dsi-controller-main.yaml | 19 + .../Bindings/display/msm/dsi-phy-28nm.yaml | 1 + .../device-tree/Bindings/display/msm/gmu.yaml | 4 + .../device-tree/Bindings/display/msm/gpu.yaml | 27 +- .../Bindings/display/msm/qcom,mdp5.yaml | 1 + .../Bindings/display/msm/qcom,mdss.yaml | 1 + .../Bindings/display/msm/qcom,sm6375-mdss.yaml | 2 +- .../Bindings/display/msm/qcom,sm7150-dpu.yaml | 143 + .../Bindings/display/msm/qcom,sm7150-mdss.yaml | 458 +++ .../display/panel/anbernic,rg35xx-plus-panel.yaml | 67 + .../display/panel/asus,z00t-tm5p5-nt35596.yaml | 2 +- .../Bindings/display/panel/boe,tv101wum-nl6.yaml | 2 - .../Bindings/display/panel/himax,hx83102.yaml | 77 + .../Bindings/display/panel/ilitek,ili9806e.yaml | 63 + .../Bindings/display/panel/jadard,jd9365da-h3.yaml | 1 + .../Bindings/display/panel/lg,sw43408.yaml | 4 +- .../Bindings/display/panel/panel-edp-legacy.yaml | 117 + .../Bindings/display/panel/panel-mipi-dbi-spi.yaml | 30 + .../Bindings/display/panel/panel-simple-dsi.yaml | 2 + .../panel/panel-simple-lvds-dual-ports.yaml | 6 + .../Bindings/display/panel/panel-simple.yaml | 60 +- .../Bindings/display/panel/raydium,rm69380.yaml | 5 +- .../Bindings/display/panel/samsung,atna33xc20.yaml | 104 + .../Bindings/display/panel/sony,td4353-jdi.yaml | 2 +- .../display/rockchip/rockchip,dw-hdmi.yaml | 8 - .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + .../Bindings/display/st,stm32mp25-lvds.yaml | 119 + .../device-tree/Bindings/dma/fsl,imx-dma.yaml | 56 + sys/contrib/device-tree/Bindings/dma/fsl-qdma.yaml | 132 + sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 1 + .../device-tree/Bindings/dma/sprd,sc9860-dma.yaml | 92 + .../Bindings/dma/stm32/st,stm32-dma.yaml | 120 + .../Bindings/dma/stm32/st,stm32-dma3.yaml | 135 + .../Bindings/dma/stm32/st,stm32-dmamux.yaml | 57 + .../Bindings/dma/stm32/st,stm32-mdma.yaml | 106 + sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 18 +- sys/contrib/device-tree/Bindings/eeprom/at25.yaml | 1 + .../device-tree/Bindings/firmware/arm,scmi.yaml | 16 +- .../Bindings/firmware/cznic,turris-omnia-mcu.yaml | 86 + .../Bindings/firmware/nxp,imx95-scmi-pinctrl.yaml | 53 + .../device-tree/Bindings/firmware/qcom,scm.yaml | 15 + .../Bindings/fsi/aspeed,ast2600-fsi-master.yaml | 121 + .../device-tree/Bindings/fsi/fsi-controller.yaml | 66 + .../device-tree/Bindings/fsi/ibm,fsi2spi.yaml | 36 +- .../Bindings/fsi/ibm,i2cr-fsi-master.yaml | 5 +- .../Bindings/fsi/ibm,p9-fsi-controller.yaml | 45 + .../device-tree/Bindings/fsi/ibm,p9-occ.yaml | 40 + .../device-tree/Bindings/fsi/ibm,p9-sbefifo.yaml | 46 + .../device-tree/Bindings/fsi/ibm,p9-scom.yaml | 37 + .../Bindings/fuse/renesas,rcar-efuse.yaml | 55 + .../Bindings/fuse/renesas,rcar-otp.yaml | 38 + .../device-tree/Bindings/gpio/aspeed,sgpio.yaml | 10 + .../Bindings/gpio/atmel,at91rm9200-gpio.yaml | 81 + .../device-tree/Bindings/gpio/fsl,qoriq-gpio.yaml | 87 + .../device-tree/Bindings/gpio/fsl-imx-gpio.yaml | 4 +- .../device-tree/Bindings/gpio/gpio-mxs.yaml | 1 - .../device-tree/Bindings/gpio/gpio-pca95xx.yaml | 1 + .../device-tree/Bindings/gpio/gpio-vf610.yaml | 4 + .../device-tree/Bindings/gpio/lsi,zevio-gpio.yaml | 43 + .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 5 +- .../device-tree/Bindings/hwmon/gmt,g762.yaml | 95 + .../device-tree/Bindings/hwmon/maxim,max6639.yaml | 92 + .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 9 + .../device-tree/Bindings/hwmon/ti,tmp108.yaml | 12 + .../Bindings/i2c/amlogic,meson6-i2c.yaml | 3 + .../Bindings/i2c/atmel,at91sam-i2c.yaml | 10 +- .../device-tree/Bindings/i2c/brcm,brcmstb-i2c.yaml | 28 +- .../Bindings/i2c/i2c-demux-pinctrl.yaml | 112 +- .../device-tree/Bindings/i2c/i2c-imx-lpi2c.yaml | 4 +- .../device-tree/Bindings/i2c/i2c-mux-gpio.yaml | 3 + .../device-tree/Bindings/i2c/ibm,i2c-fsi.yaml | 76 + .../Bindings/i2c/nvidia,tegra20-i2c.yaml | 6 - .../device-tree/Bindings/i2c/nxp,lpc1788-i2c.yaml | 54 + .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 20 + .../Bindings/i2c/renesas,iic-emev2.yaml | 14 +- .../device-tree/Bindings/i2c/renesas,rcar-i2c.yaml | 20 +- .../device-tree/Bindings/i2c/renesas,riic.yaml | 34 +- .../Bindings/i2c/renesas,rmobile-iic.yaml | 24 +- .../Bindings/i2c/samsung,s3c2410-i2c.yaml | 6 - .../Bindings/i2c/snps,designware-i2c.yaml | 4 + .../device-tree/Bindings/i2c/st,stm32-i2c.yaml | 66 +- .../device-tree/Bindings/i2c/ti,omap4-i2c.yaml | 64 +- sys/contrib/device-tree/Bindings/i3c/i3c.yaml | 5 +- .../Bindings/i3c/snps,dw-i3c-master.yaml | 11 +- sys/contrib/device-tree/Bindings/iio/adc/adc.yaml | 30 + .../device-tree/Bindings/iio/adc/adi,ad7173.yaml | 194 +- .../device-tree/Bindings/iio/adc/adi,ad7192.yaml | 94 + .../device-tree/Bindings/iio/adc/adi,ad7380.yaml | 148 + .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 5 +- .../Bindings/iio/adc/amlogic,meson-saradc.yaml | 3 + .../Bindings/iio/adc/mediatek,mt6359-auxadc.yaml | 33 + .../Bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + .../device-tree/Bindings/iio/adc/ti,ads1015.yaml | 1 + .../device-tree/Bindings/iio/adc/ti,ads1119.yaml | 155 + .../Bindings/iio/chemical/sciosense,ens160.yaml | 70 + .../device-tree/Bindings/iio/dac/adi,ad3552r.yaml | 43 +- .../Bindings/iio/frequency/adi,adf4350.yaml | 6 + .../Bindings/iio/imu/adi,adis16475.yaml | 31 + .../Bindings/iio/imu/adi,adis16480.yaml | 6 + .../device-tree/Bindings/iio/imu/bosch,bmi160.yaml | 6 +- .../Bindings/iio/light/vishay,veml6075.yaml | 9 +- .../Bindings/iio/magnetometer/fsl,mag3110.yaml | 2 +- .../device-tree/Bindings/iio/st,st-sensors.yaml | 1 + .../device-tree/Bindings/incomplete-devices.yaml | 137 + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 4 +- .../device-tree/Bindings/input/cirrus,cs40l50.yaml | 68 + .../Bindings/input/ti,nspire-keypad.yaml | 74 + .../Bindings/input/touchscreen/ads7846.txt | 1 + .../Bindings/input/touchscreen/edt-ft5x06.yaml | 2 + .../Bindings/input/touchscreen/eeti,exc3000.yaml | 12 +- .../Bindings/input/touchscreen/elan,ektf2127.yaml | 58 + .../Bindings/input/touchscreen/himax,hx83112b.yaml | 1 + .../input/touchscreen/imagis,ist3038c.yaml | 1 + .../Bindings/interconnect/mediatek,mt8183-emi.yaml | 51 + .../Bindings/interconnect/qcom,msm8953.yaml | 101 + .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +- .../Bindings/interconnect/qcom,sc7280-rpmh.yaml | 55 +- .../Bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm8450-rpmh.yaml | 2 +- .../interrupt-controller/fsl,irqsteer.yaml | 23 +- .../interrupt-controller/fsl,ls-extirq.yaml | 1 - .../Bindings/interrupt-controller/fsl,ls-msi.yaml | 79 + .../interrupt-controller/marvell,mpic.yaml | 63 + .../microchip,lan966x-oic.yaml | 55 + .../Bindings/interrupt-controller/qcom,pdc.yaml | 1 + .../interrupt-controller/realtek,rtl-intc.yaml | 20 +- .../interrupt-controller/renesas,rzg2l-irqc.yaml | 17 +- .../interrupt-controller/riscv,cpu-intc.yaml | 73 + .../Bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 7 +- .../device-tree/Bindings/iommu/arm,smmu.yaml | 6 +- .../Bindings/iommu/qcom,apq8064-iommu.yaml | 78 + .../device-tree/Bindings/iommu/qcom,iommu.yaml | 3 +- .../Bindings/leds/backlight/ti,lm3509.yaml | 136 + .../device-tree/Bindings/leds/leds-lp55xx.yaml | 11 + .../device-tree/Bindings/leds/silergy,sy7802.yaml | 100 + .../Bindings/mailbox/mediatek,gce-props.yaml | 52 + .../Bindings/mailbox/qcom,cpucp-mbox.yaml | 49 + .../Bindings/media/i2c/galaxycore,gc05a2.yaml | 112 + .../Bindings/media/i2c/galaxycore,gc08a3.yaml | 112 + .../Bindings/media/i2c/maxim,max96714.yaml | 174 + .../Bindings/media/i2c/maxim,max96717.yaml | 157 + .../Bindings/media/i2c/sony,imx258.yaml | 139 + .../Bindings/media/i2c/sony,imx283.yaml | 107 + .../Bindings/media/img,e5010-jpeg-enc.yaml | 75 + .../Bindings/media/mediatek,mdp3-rdma.yaml | 1 + .../Bindings/media/mediatek,mt7622-cir.yaml | 55 + .../Bindings/media/qcom,msm8996-venus.yaml | 4 +- .../Bindings/media/raspberrypi,pispbe.yaml | 63 + sys/contrib/device-tree/Bindings/media/rc.yaml | 1 + .../Bindings/media/renesas,rzg2l-cru.yaml | 35 +- .../Bindings/media/renesas,rzg2l-csi2.yaml | 1 + .../device-tree/Bindings/media/rockchip-rga.yaml | 1 + .../Bindings/memory-controllers/fsl/fsl,ifc.yaml | 2 +- .../Bindings/memory-controllers/fsl/mmdc.yaml | 4 +- .../Bindings/mfd/marvell,88pm886-a1.yaml | 76 + .../Bindings/mfd/mediatek,mt8195-scpsys.yaml | 2 + sys/contrib/device-tree/Bindings/mfd/mfd.txt | 15 +- .../device-tree/Bindings/mfd/qcom,pm8008.yaml | 144 +- .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 2 + .../device-tree/Bindings/mfd/rockchip,rk817.yaml | 70 +- .../Bindings/mfd/rohm,bd96801-pmic.yaml | 173 + .../device-tree/Bindings/mfd/syscon-common.yaml | 71 + sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 278 +- sys/contrib/device-tree/Bindings/mfd/ti,twl.yaml | 167 +- .../device-tree/Bindings/mips/brcm/soc.yaml | 24 + .../device-tree/Bindings/mips/mobileye.yaml | 5 + sys/contrib/device-tree/Bindings/mips/mscc.txt | 17 - .../device-tree/Bindings/mips/realtek-rtl.yaml | 4 + .../device-tree/Bindings/misc/fsl,qoriq-mc.yaml | 187 ++ .../Bindings/misc/qemu,vcpu-stall-detector.yaml | 6 + .../Bindings/mmc/amlogic,meson-gx-mmc.yaml | 3 + .../Bindings/mmc/brcm,sdhci-brcmstb.yaml | 1 + .../device-tree/Bindings/mmc/fsl,esdhc.yaml | 105 + .../device-tree/Bindings/mmc/mmc-spi-slot.yaml | 16 +- .../device-tree/Bindings/mmc/sdhci-msm.yaml | 1 + .../device-tree/Bindings/mmc/sprd,sdhci-r11.yaml | 112 + .../Bindings/mtd/amlogic,meson-nand.yaml | 18 + .../device-tree/Bindings/mtd/atmel-nand.txt | 9 - .../device-tree/Bindings/mtd/gpmi-nand.yaml | 22 + .../device-tree/Bindings/mtd/qcom,nandc.yaml | 38 +- .../Bindings/net/airoha,en7581-eth.yaml | 143 + .../net/bluetooth/mediatek,mt7622-bluetooth.yaml | 51 + .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 4 + .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 35 +- .../device-tree/Bindings/net/can/xilinx,can.yaml | 2 +- .../device-tree/Bindings/net/cdns,macb.yaml | 1 + .../device-tree/Bindings/net/dsa/lantiq,gswip.yaml | 202 ++ .../Bindings/net/dsa/mediatek,mt7530.yaml | 6 +- .../Bindings/net/dsa/vitesse,vsc73xx.yaml | 162 + .../Bindings/net/ethernet-controller.yaml | 1 + .../device-tree/Bindings/net/ethernet-phy.yaml | 8 + .../device-tree/Bindings/net/fsl,enetc-ierb.yaml | 38 + .../device-tree/Bindings/net/fsl,enetc-mdio.yaml | 57 + .../device-tree/Bindings/net/fsl,enetc.yaml | 66 + .../device-tree/Bindings/net/fsl,fman-mdio.yaml | 123 + .../device-tree/Bindings/net/fsl,fman-muram.yaml | 40 + .../device-tree/Bindings/net/fsl,fman-port.yaml | 75 + sys/contrib/device-tree/Bindings/net/fsl,fman.yaml | 210 ++ .../Bindings/net/fsl,qoriq-mc-dpmac.yaml | 4 + .../device-tree/Bindings/net/fsl-tsec-phy.txt | 2 +- .../Bindings/net/hisilicon-hip04-net.txt | 10 - .../device-tree/Bindings/net/mediatek,net.yaml | 28 +- .../Bindings/net/mediatek-bluetooth.txt | 36 - .../device-tree/Bindings/net/mscc,miim.yaml | 10 + .../device-tree/Bindings/net/nxp,tja11xx.yaml | 62 +- .../device-tree/Bindings/net/pcs/snps,dw-xpcs.yaml | 136 + .../device-tree/Bindings/net/realtek,rtl82xx.yaml | 40 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 148 +- .../device-tree/Bindings/net/stm32-dwmac.yaml | 49 +- .../device-tree/Bindings/net/ti,icss-iep.yaml | 9 + .../device-tree/Bindings/net/ti,icssg-prueth.yaml | 9 + .../Bindings/net/wireless/qcom,ath10k.yaml | 5 + .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 46 + .../Bindings/net/wireless/qcom,ath11k.yaml | 9 - .../Bindings/net/wireless/qcom,ath12k.yaml | 99 + .../Bindings/net/xlnx,gmii-to-rgmii.yaml | 5 + .../Bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 3 + .../device-tree/Bindings/nvmem/imx-iim.yaml | 4 +- .../device-tree/Bindings/nvmem/imx-ocotp.yaml | 4 +- .../device-tree/Bindings/nvmem/mediatek,efuse.yaml | 2 + .../device-tree/Bindings/nvmem/mxs-ocotp.yaml | 4 +- .../Bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 2 +- .../device-tree/Bindings/pci/host-generic-pci.yaml | 6 + .../Bindings/pci/mediatek,mt7621-pcie.yaml | 29 + .../Bindings/pci/microchip,pcie-host.yaml | 55 +- .../Bindings/pci/plda,xpressrich3-axi-common.yaml | 75 + .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 64 +- .../device-tree/Bindings/pci/qcom,pcie-sm8450.yaml | 4 + .../Bindings/pci/qcom,pcie-x1e80100.yaml | 3 +- .../Bindings/pci/rockchip-dw-pcie-common.yaml | 126 + .../Bindings/pci/rockchip-dw-pcie-ep.yaml | 95 + .../device-tree/Bindings/pci/rockchip-dw-pcie.yaml | 93 +- .../device-tree/Bindings/pci/snps,dw-pcie-ep.yaml | 13 +- .../Bindings/pci/starfive,jh7110-pcie.yaml | 120 + .../Bindings/pci/xilinx-versal-cpm.yaml | 2 +- .../device-tree/Bindings/perf/fsl-imx-ddr.yaml | 3 + .../Bindings/phy/airoha,en7581-pcie-phy.yaml | 69 + .../Bindings/phy/amlogic,g12a-usb2-phy.yaml | 3 + .../device-tree/Bindings/phy/fsl,imx8qm-hsio.yaml | 164 + .../phy/marvell,armada-cp110-utmi-phy.yaml | 6 + .../Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 + .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 7 +- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 5 +- .../device-tree/Bindings/phy/qcom,usb-hs-phy.yaml | 2 + .../Bindings/phy/rockchip,rk3399-emmc-phy.yaml | 64 + .../Bindings/phy/samsung,usb3-drd-phy.yaml | 77 +- .../Bindings/phy/starfive,jh7110-dphy-tx.yaml | 68 + .../Bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 169 +- .../Bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 188 +- .../Bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 514 ++- .../Bindings/pinctrl/fsl,imx9-pinctrl.yaml | 87 + .../Bindings/pinctrl/nuvoton,ma35d1-pinctrl.yaml | 178 + .../Bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 22 +- .../Bindings/pinctrl/pinctrl-single.yaml | 17 +- .../Bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 2 +- .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 2 + .../pinctrl/qcom,sm4250-lpass-lpi-pinctrl.yaml | 118 + .../Bindings/pinctrl/qcom,sm6350-tlmm.yaml | 2 +- .../Bindings/pinctrl/qcom,sm6375-tlmm.yaml | 2 +- .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 52 +- .../Bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 349 +- .../Bindings/platform/lenovo,yoga-c630-ec.yaml | 83 + .../Bindings/power/amlogic,meson-sec-pwrc.yaml | 2 + .../Bindings/power/supply/maxim,max17201.yaml | 58 + sys/contrib/device-tree/Bindings/ptp/fsl,ptp.yaml | 144 + .../device-tree/Bindings/pwm/adi,axi-pwmgen.yaml | 48 + .../Bindings/pwm/atmel,at91sam-pwm.yaml | 4 +- .../Bindings/pwm/fsl,vf610-ftm-pwm.yaml | 92 + sys/contrib/device-tree/Bindings/pwm/imx-pwm.yaml | 1 - .../device-tree/Bindings/pwm/imx-tpm-pwm.yaml | 4 +- sys/contrib/device-tree/Bindings/pwm/mxs-pwm.yaml | 1 - sys/contrib/device-tree/Bindings/pwm/pwm-gpio.yaml | 46 + sys/contrib/device-tree/Bindings/pwm/pwm.yaml | 6 +- .../mediatek,mt6873-dvfsrc-regulator.yaml | 43 + .../Bindings/regulator/mt6315-regulator.yaml | 6 +- .../Bindings/regulator/nxp,pca9450-regulator.yaml | 1 - .../Bindings/regulator/qcom,qca6390-pmu.yaml | 185 ++ .../Bindings/regulator/richtek,rtq2208.yaml | 11 +- .../Bindings/regulator/rohm,bd96801-regulator.yaml | 63 + .../Bindings/regulator/sprd,sc2731-regulator.yaml | 67 + .../Bindings/regulator/st,stm32mp1-pwr-reg.yaml | 7 +- .../Bindings/regulator/ti,tps65132.yaml | 3 + .../Bindings/remoteproc/fsl,imx-rproc.yaml | 15 + .../Bindings/remoteproc/qcom,rpm-proc.yaml | 2 +- .../Bindings/remoteproc/qcom,sa8775p-pas.yaml | 160 + .../Bindings/remoteproc/ti,k3-dsp-rproc.yaml | 89 +- .../Bindings/reset/nuvoton,ma35d1-reset.yaml | 3 +- .../Bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 10 + .../device-tree/Bindings/reset/ti,sci-reset.yaml | 2 +- sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 22 +- .../device-tree/Bindings/riscv/extensions.yaml | 132 + .../device-tree/Bindings/riscv/microchip.yaml | 1 + .../device-tree/Bindings/riscv/starfive.yaml | 1 + .../Bindings/rng/amlogic,meson-rng.yaml | 3 + .../Bindings/rng/samsung,exynos5250-trng.yaml | 40 +- .../device-tree/Bindings/rtc/fsl,ls-ftm-alarm.yaml | 73 + .../device-tree/Bindings/rtc/st,stm32-rtc.yaml | 5 +- .../device-tree/Bindings/serial/mediatek,uart.yaml | 1 + .../device-tree/Bindings/serial/nxp,sc16is7xx.yaml | 5 + .../device-tree/Bindings/serial/renesas,scif.yaml | 136 +- .../Bindings/serial/snps-dw-apb-uart.yaml | 18 +- .../Bindings/serial/via,vt8500-uart.yaml | 46 + .../Bindings/soc/fsl/cpm_qe/fsl,qe-firmware.yaml | 48 + .../Bindings/soc/fsl/cpm_qe/fsl,qe-ic.yaml | 47 + .../Bindings/soc/fsl/cpm_qe/fsl,qe-muram.yaml | 71 + .../Bindings/soc/fsl/cpm_qe/fsl,qe-si.yaml | 40 + .../Bindings/soc/fsl/cpm_qe/fsl,qe-siram.yaml | 39 + .../Bindings/soc/fsl/cpm_qe/fsl,qe.yaml | 148 + .../Bindings/soc/fsl/fsl,bman-portal.yaml | 52 + .../device-tree/Bindings/soc/fsl/fsl,bman.yaml | 83 + .../Bindings/soc/fsl/fsl,layerscape-dcfg.yaml | 1 - .../Bindings/soc/fsl/fsl,layerscape-scfg.yaml | 1 - .../Bindings/soc/fsl/fsl,ls1028a-reset.yaml | 56 + .../device-tree/Bindings/soc/fsl/fsl,qman-fqd.yaml | 69 + .../Bindings/soc/fsl/fsl,qman-portal.yaml | 110 + .../device-tree/Bindings/soc/fsl/fsl,qman.yaml | 93 + .../hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml | 46 + .../Bindings/soc/intel/intel,lgm-syscon.yaml | 57 + .../Bindings/soc/mediatek/mediatek,mutex.yaml | 1 + .../soc/microchip/microchip,sparx5-cpu-syscon.yaml | 49 + .../Bindings/soc/mobileye/mobileye,eyeq5-olb.yaml | 374 +++ .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + .../Bindings/soc/qcom/qcom,rpm-master-stats.yaml | 2 +- .../device-tree/Bindings/soc/qcom/qcom,smp2p.yaml | 3 +- .../device-tree/Bindings/soc/qcom/qcom,smsm.yaml | 30 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 26 +- .../Bindings/soc/sprd/sprd,sc9863a-glbregs.yaml | 55 + .../Bindings/soc/sti/st,sti-syscon.yaml | 9 + .../device-tree/Bindings/soc/ti/sci-pm-domain.yaml | 2 +- .../Bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 42 + .../soc/ti/ti,j721e-system-controller.yaml | 114 + .../Bindings/sound/amlogic,g12a-tohdmitx.yaml | 54 + .../Bindings/sound/amlogic,gx-sound-card.yaml | 1 - .../Bindings/sound/asahi-kasei,ak4104.yaml | 49 + .../Bindings/sound/asahi-kasei,ak4375.yaml | 60 + .../Bindings/sound/asahi-kasei,ak4554.yaml | 27 + .../Bindings/sound/asahi-kasei,ak4613.yaml | 59 + .../Bindings/sound/asahi-kasei,ak4619.yaml | 62 + .../Bindings/sound/asahi-kasei,ak4642.yaml | 59 + .../Bindings/sound/audio-graph-card2.yaml | 5 + .../Bindings/sound/audio-graph-port.yaml | 9 + .../device-tree/Bindings/sound/cirrus,cs4270.yaml | 59 + .../device-tree/Bindings/sound/cirrus,cs42xx8.yaml | 81 + .../device-tree/Bindings/sound/cirrus,cs530x.yaml | 85 + .../device-tree/Bindings/sound/everest,es71x4.yaml | 62 + .../device-tree/Bindings/sound/everest,es7241.yaml | 67 + .../device-tree/Bindings/sound/everest,es8316.yaml | 7 +- .../device-tree/Bindings/sound/fsl,mqs.yaml | 2 + .../device-tree/Bindings/sound/fsl,qmc-audio.yaml | 41 +- .../device-tree/Bindings/sound/fsl,rpmsg.yaml | 1 + .../device-tree/Bindings/sound/fsl,sgtl5000.yaml | 113 + .../device-tree/Bindings/sound/fsl,xcvr.yaml | 43 +- .../device-tree/Bindings/sound/fsl-asoc-card.yaml | 53 +- .../device-tree/Bindings/sound/linux,spdif.yaml | 39 + .../device-tree/Bindings/sound/maxim,max98088.yaml | 47 + .../device-tree/Bindings/sound/mscc,zl38060.yaml | 72 + .../Bindings/sound/nuvoton,nau8824.yaml | 8 + .../Bindings/sound/nxp,lpc3220-i2s.yaml | 73 + sys/contrib/device-tree/Bindings/sound/pcm512x.txt | 2 +- .../sound/qcom,msm8916-wcd-digital-codec.yaml | 55 + .../device-tree/Bindings/sound/qcom,sm8250.yaml | 1 + .../device-tree/Bindings/sound/qcom,wcd934x.yaml | 3 +- .../Bindings/sound/qcom,wcd937x-sdw.yaml | 91 + .../device-tree/Bindings/sound/qcom,wcd937x.yaml | 82 + .../device-tree/Bindings/sound/qcom,wcd938x.yaml | 3 +- .../device-tree/Bindings/sound/qcom,wcd939x.yaml | 4 +- .../device-tree/Bindings/sound/qcom,wsa883x.yaml | 8 + .../device-tree/Bindings/sound/qcom,wsa8840.yaml | 8 + .../device-tree/Bindings/sound/realtek,rt1019.yaml | 35 + .../device-tree/Bindings/sound/realtek,rt5514.yaml | 70 + .../device-tree/Bindings/sound/realtek,rt5631.yaml | 67 + .../device-tree/Bindings/sound/realtek,rt5645.yaml | 131 + .../device-tree/Bindings/sound/realtek,rt5659.yaml | 129 + .../device-tree/Bindings/sound/realtek,rt5677.yaml | 135 + .../Bindings/sound/samsung,midas-audio.yaml | 33 + .../Bindings/sound/simple-audio-mux.yaml | 6 + .../device-tree/Bindings/sound/ti,omap4-mcpdm.yaml | 73 + .../device-tree/Bindings/sound/ti,tas2562.yaml | 81 + .../device-tree/Bindings/sound/ti,tas2770.yaml | 87 + .../device-tree/Bindings/sound/ti,tas27xx.yaml | 82 + .../device-tree/Bindings/sound/ti,tas57xx.yaml | 133 + .../device-tree/Bindings/sound/ti,tas5805m.yaml | 57 + .../Bindings/sound/ti,tlv320adc3xxx.yaml | 32 +- .../Bindings/sound/ti,tlv320adcx140.yaml | 209 ++ .../device-tree/Bindings/sound/wlf,wm8750.yaml | 42 + .../device-tree/Bindings/sound/wlf,wm8782.yaml | 47 + .../device-tree/Bindings/sound/wlf,wm8804.yaml | 58 + .../device-tree/Bindings/spi/amlogic,a1-spifc.yaml | 3 + .../Bindings/spi/atmel,at91rm9200-spi.yaml | 8 +- .../device-tree/Bindings/spi/brcm,bcm2835-spi.yaml | 50 + .../Bindings/spi/fsl,dspi-peripheral-props.yaml | 30 + sys/contrib/device-tree/Bindings/spi/fsl,dspi.yaml | 116 + .../device-tree/Bindings/spi/ibm,spi-fsi.yaml | 55 + .../device-tree/Bindings/spi/marvell,mmp2-ssp.yaml | 35 +- .../Bindings/spi/microchip,mpfs-spi.yaml | 29 +- .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 4 + .../device-tree/Bindings/spi/spi-cadence.yaml | 7 + .../device-tree/Bindings/spi/spi-fsl-lpspi.yaml | 4 +- .../Bindings/spi/spi-peripheral-props.yaml | 1 + .../device-tree/Bindings/spi/st,stm32-spi.yaml | 2 +- .../sram/allwinner,sun4i-a10-system-control.yaml | 28 + .../device-tree/Bindings/sram/qcom,imem.yaml | 1 + .../Bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 6 +- .../Bindings/thermal/amlogic,thermal.yaml | 22 +- .../Bindings/thermal/brcm,avs-ro-thermal.yaml | 24 +- .../Bindings/thermal/brcm,avs-tmon.yaml | 17 +- .../Bindings/thermal/brcm,bcm2835-thermal.yaml | 1 - .../Bindings/thermal/fsl,scu-thermal.yaml | 1 - .../Bindings/thermal/generic-adc-thermal.yaml | 5 +- .../Bindings/thermal/hisilicon,tsensor.yaml | 57 + .../device-tree/Bindings/thermal/imx-thermal.yaml | 1 - .../Bindings/thermal/imx8mm-thermal.yaml | 9 +- .../Bindings/thermal/loongson,ls2k-thermal.yaml | 1 - .../Bindings/thermal/mediatek,lvts-thermal.yaml | 1 - .../Bindings/thermal/nvidia,tegra124-soctherm.yaml | 1 - .../thermal/nvidia,tegra186-bpmp-thermal.yaml | 12 +- .../Bindings/thermal/nvidia,tegra30-tsensor.yaml | 9 +- .../Bindings/thermal/qcom,spmi-temp-alarm.yaml | 1 - .../Bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 8 +- .../Bindings/thermal/qcom-spmi-adc-tm5.yaml | 8 +- .../device-tree/Bindings/thermal/qcom-tsens.yaml | 97 +- .../Bindings/thermal/qoriq-thermal.yaml | 9 +- .../Bindings/thermal/rcar-gen3-thermal.yaml | 71 +- .../device-tree/Bindings/thermal/rcar-thermal.yaml | 64 +- .../Bindings/thermal/rockchip-thermal.yaml | 5 +- .../Bindings/thermal/rzg2l-thermal.yaml | 43 +- .../Bindings/thermal/samsung,exynos-thermal.yaml | 3 +- .../thermal/socionext,uniphier-thermal.yaml | 5 +- .../device-tree/Bindings/thermal/sprd-thermal.yaml | 49 +- .../Bindings/thermal/st,stm32-thermal.yaml | 5 +- .../Bindings/thermal/thermal-zones.yaml | 6 +- .../Bindings/thermal/ti,am654-thermal.yaml | 15 +- .../Bindings/thermal/ti,j72xx-thermal.yaml | 5 +- .../Bindings/timer/realtek,otto-timer.yaml | 63 + .../device-tree/Bindings/timer/renesas,tmu.yaml | 13 + .../device-tree/Bindings/timer/sifive,clint.yaml | 1 + .../Bindings/timer/sprd,sc9860-timer.yaml | 68 + .../device-tree/Bindings/trivial-devices.yaml | 16 +- sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 12 +- .../device-tree/Bindings/usb/cdns,usb3.yaml | 15 +- sys/contrib/device-tree/Bindings/usb/dwc2.yaml | 2 +- sys/contrib/device-tree/Bindings/usb/fsl,usb2.yaml | 95 + .../device-tree/Bindings/usb/genesys,gl850g.yaml | 60 +- .../device-tree/Bindings/usb/gpio-sbu-mux.yaml | 8 +- .../Bindings/usb/microchip,mpfs-musb.yaml | 7 + .../Bindings/usb/microchip,usb2514.yaml | 10 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 29 + .../device-tree/Bindings/vendor-prefixes.yaml | 20 + .../Bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 1 + .../Bindings/watchdog/dlg,da9062-watchdog.yaml | 2 +- .../device-tree/Bindings/watchdog/fsl-imx-wdt.yaml | 4 +- .../Bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 +- .../device-tree/Bindings/watchdog/img,pdc-wdt.yaml | 55 + .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 1 + .../device-tree/include/dt-bindings/arm/qcom,ids.h | 2 + .../clock/amlogic,a1-peripherals-clkc.h | 1 + .../dt-bindings/clock/amlogic,a1-pll-clkc.h | 1 + .../clock/amlogic,c3-peripherals-clkc.h | 212 ++ .../dt-bindings/clock/amlogic,c3-pll-clkc.h | 40 + .../dt-bindings/clock/amlogic,c3-scmi-clkc.h | 27 + .../include/dt-bindings/clock/qcom,ipq9574-gcc.h | 4 + .../include/dt-bindings/clock/qcom,qca8k-nsscc.h | 101 + .../include/dt-bindings/clock/qcom,qcm2290-gpucc.h | 32 + .../include/dt-bindings/clock/qcom,sm7150-camcc.h | 113 + .../include/dt-bindings/clock/qcom,sm7150-dispcc.h | 59 + .../dt-bindings/clock/qcom,sm7150-videocc.h | 28 + .../include/dt-bindings/clock/qcom,sm8650-camcc.h | 195 ++ .../dt-bindings/clock/qcom,sm8650-videocc.h | 23 + .../include/dt-bindings/clock/r8a7779-clock.h | 1 - .../include/dt-bindings/clock/rk3128-cru.h | 4 +- .../include/dt-bindings/clock/rk3188-cru-common.h | 2 - .../dt-bindings/clock/sophgo,sg2042-clkgen.h | 111 + .../include/dt-bindings/clock/sophgo,sg2042-pll.h | 14 + .../dt-bindings/clock/sophgo,sg2042-rpgate.h | 58 + .../include/dt-bindings/clock/sun50i-h616-ccu.h | 1 + .../dt-bindings/clock/thead,th1520-clk-ap.h | 96 + .../device-tree/include/dt-bindings/i3c/i3c.h | 16 + .../dt-bindings/iio/adc/mediatek,mt6357-auxadc.h | 21 + .../dt-bindings/iio/adc/mediatek,mt6358-auxadc.h | 22 + .../dt-bindings/iio/adc/mediatek,mt6359-auxadc.h | 22 + .../include/dt-bindings/input/cros-ec-keyboard.h | 104 + .../dt-bindings/interconnect/mediatek,mt8183.h | 23 + .../dt-bindings/interconnect/mediatek,mt8195.h | 44 + .../dt-bindings/interconnect/qcom,ipq9574.h | 59 + .../dt-bindings/interconnect/qcom,msm8953.h | 93 + .../include/dt-bindings/mfd/st,stpmic1.h | 2 +- .../include/dt-bindings/power/amlogic,a4-pwrc.h | 21 + .../include/dt-bindings/power/amlogic,a5-pwrc.h | 21 + .../dt-bindings/regulator/st,stm32mp25-regulator.h | 48 + .../dt-bindings/reset/airoha,en7581-reset.h | 66 + .../include/dt-bindings/reset/qcom,qca8k-nsscc.h | 76 + .../include/dt-bindings/reset/sun50i-h616-ccu.h | 1 + .../include/dt-bindings/sound/audio-graph.h | 26 + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 12 +- .../src/arm/arm/arm-realview-eb-bbrevd.dtsi | 2 +- .../device-tree/src/arm/arm/arm-realview-eb.dtsi | 48 +- .../src/arm/arm/arm-realview-pb1176.dts | 38 +- .../src/arm/arm/arm-realview-pb11mp.dts | 48 +- .../device-tree/src/arm/arm/arm-realview-pbx.dtsi | 48 +- .../src/arm/arm/integratorap-im-pd1.dts | 4 +- .../device-tree/src/arm/arm/integratorap.dts | 14 +- .../device-tree/src/arm/arm/integratorcp.dts | 14 +- sys/contrib/device-tree/src/arm/arm/mps2.dtsi | 48 +- .../device-tree/src/arm/arm/versatile-ab.dts | 8 +- .../device-tree/src/arm/arm/vexpress-v2m-rs1.dtsi | 8 +- .../device-tree/src/arm/arm/vexpress-v2m.dtsi | 16 +- .../src/arm/arm/vexpress-v2p-ca15-tc1.dts | 14 +- .../src/arm/arm/vexpress-v2p-ca15_a7.dts | 22 +- .../device-tree/src/arm/arm/vexpress-v2p-ca5s.dts | 12 +- .../device-tree/src/arm/arm/vexpress-v2p-ca9.dts | 18 +- .../device-tree/src/arm/aspeed/aspeed-g4.dtsi | 28 +- .../device-tree/src/arm/aspeed/aspeed-g5.dtsi | 28 +- .../device-tree/src/arm/aspeed/aspeed-g6.dtsi | 32 +- .../device-tree/src/arm/cirrus/ep7211-edb7211.dts | 2 +- .../arm/intel/ixp/intel-ixp42x-linksys-nslu2.dts | 11 +- .../device-tree/src/arm/marvell/armada-370-xp.dtsi | 1 - .../device-tree/src/arm/marvell/armada-375.dtsi | 1 - .../src/arm/marvell/armada-385-atl-x530.dts | 13 +- .../src/arm/marvell/armada-385-turris-omnia.dts | 35 +- .../device-tree/src/arm/marvell/armada-38x.dtsi | 1 - .../device-tree/src/arm/marvell/armada-39x.dtsi | 1 - .../src/arm/marvell/kirkwood-blackarmor-nas220.dts | 6 +- .../src/arm/marvell/kirkwood-c200-v1.dts | 8 +- .../src/arm/marvell/kirkwood-cloudbox.dts | 8 +- .../device-tree/src/arm/marvell/kirkwood-d2net.dts | 2 +- .../src/arm/marvell/kirkwood-dir665.dts | 22 +- .../src/arm/marvell/kirkwood-dns320.dts | 10 +- .../src/arm/marvell/kirkwood-dns325.dts | 10 +- .../src/arm/marvell/kirkwood-dnskw.dtsi | 8 +- .../src/arm/marvell/kirkwood-dockstar.dts | 4 +- .../src/arm/marvell/kirkwood-dreamplug.dts | 6 +- .../src/arm/marvell/kirkwood-goflexnet.dts | 20 +- .../arm/marvell/kirkwood-guruplug-server-plus.dts | 8 +- .../src/arm/marvell/kirkwood-ib62x0.dts | 12 +- .../src/arm/marvell/kirkwood-iconnect.dts | 20 +- .../src/arm/marvell/kirkwood-iomega_ix2_200.dts | 16 +- .../device-tree/src/arm/marvell/kirkwood-l-50.dts | 20 +- .../src/arm/marvell/kirkwood-laplug.dts | 6 +- .../src/arm/marvell/kirkwood-linkstation.dtsi | 2 - .../src/arm/marvell/kirkwood-linksys-viper.dts | 10 +- .../device-tree/src/arm/marvell/kirkwood-lsxl.dtsi | 18 +- .../src/arm/marvell/kirkwood-mplcec4.dts | 12 +- .../src/arm/marvell/kirkwood-mv88f6281gtw-ge.dts | 12 +- .../src/arm/marvell/kirkwood-netxbig.dtsi | 8 +- .../src/arm/marvell/kirkwood-ns2-common.dtsi | 6 +- .../src/arm/marvell/kirkwood-ns2lite.dts | 2 +- .../src/arm/marvell/kirkwood-nsa310.dts | 20 +- .../src/arm/marvell/kirkwood-nsa310a.dts | 18 +- .../src/arm/marvell/kirkwood-nsa310s.dts | 8 +- .../src/arm/marvell/kirkwood-nsa320.dts | 18 +- .../src/arm/marvell/kirkwood-nsa325.dts | 18 +- .../src/arm/marvell/kirkwood-nsa3x0-common.dtsi | 8 +- .../src/arm/marvell/kirkwood-openblocks_a6.dts | 4 +- .../src/arm/marvell/kirkwood-openblocks_a7.dts | 2 - .../src/arm/marvell/kirkwood-pogo_e02.dts | 4 +- .../src/arm/marvell/kirkwood-pogoplug-series-4.dts | 8 +- .../src/arm/marvell/kirkwood-sheevaplug-esata.dts | 2 +- .../src/arm/marvell/kirkwood-sheevaplug.dts | 4 +- .../src/arm/marvell/kirkwood-synology.dtsi | 58 +- .../device-tree/src/arm/marvell/kirkwood-t5325.dts | 4 +- .../src/arm/marvell/kirkwood-ts219-6281.dts | 6 +- .../src/arm/marvell/kirkwood-ts219-6282.dts | 6 +- .../src/arm/marvell/kirkwood-ts419.dtsi | 6 +- .../arm/marvell/mvebu-linkstation-gpio-simple.dtsi | 2 - .../src/arm/marvell/orion5x-lacie-d2-network.dts | 9 +- .../orion5x-lacie-ethernet-disk-mini-v2.dts | 7 +- .../src/arm/marvell/orion5x-linkstation-lschl.dts | 4 +- .../device-tree/src/arm/marvell/orion5x-lswsgl.dts | 25 +- .../marvell/orion5x-maxtor-shared-storage-2.dts | 7 +- .../src/arm/marvell/orion5x-netgear-wnr854t.dts | 2 +- .../src/arm/marvell/orion5x-rd88f5182-nas.dts | 2 +- .../device-tree/src/arm/mediatek/mt2701-evb.dts | 2 +- .../device-tree/src/arm/mediatek/mt7623.dtsi | 18 +- .../device-tree/src/arm/nspire/nspire-classic.dtsi | 2 +- .../device-tree/src/arm/nspire/nspire-cx.dts | 2 +- sys/contrib/device-tree/src/arm/nspire/nspire.dtsi | 5 +- .../src/arm/nuvoton/nuvoton-npcm730-kudo.dts | 22 +- .../arm/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 22 +- .../device-tree/src/arm/nxp/imx/e60k02.dtsi | 4 + .../device-tree/src/arm/nxp/imx/imx51-apf51dev.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx51-babbage.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx51-ts4800.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx53-m53evk.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx53-m53menlo.dts | 1 + .../src/arm/nxp/imx/imx53-tx53-x03x.dts | 14 +- .../src/arm/nxp/imx/imx53-tx53-x13x.dts | 6 +- .../src/arm/nxp/imx/imx6dl-aristainetos2_4.dts | 5 +- .../src/arm/nxp/imx/imx6dl-aristainetos_4.dts | 4 +- .../src/arm/nxp/imx/imx6dl-aristainetos_7.dts | 4 +- .../src/arm/nxp/imx/imx6dl-kontron-samx6i-ads2.dts | 12 + .../src/arm/nxp/imx/imx6dl-kontron-samx6i.dtsi | 2 +- .../src/arm/nxp/imx/imx6dl-yapp43-common.dtsi | 12 +- .../src/arm/nxp/imx/imx6q-kontron-samx6i-ads2.dts | 12 + .../src/arm/nxp/imx/imx6q-kontron-samx6i.dtsi | 25 +- .../src/arm/nxp/imx/imx6qdl-gw52xx.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-gw53xx.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-gw54xx.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-gw560x.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-gw5903.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-gw5904.dtsi | 2 +- .../arm/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi | 148 + .../src/arm/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 58 +- .../device-tree/src/arm/nxp/imx/imx6qdl-mba6a.dtsi | 12 +- .../device-tree/src/arm/nxp/imx/imx6qdl-mba6b.dtsi | 12 +- .../src/arm/nxp/imx/imx6qdl-sabreauto.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-tx6-lcd.dtsi | 21 +- .../src/arm/nxp/imx/imx6qdl-tx6-lvds.dtsi | 20 +- .../device-tree/src/arm/nxp/imx/imx6ul-tx6ul.dtsi | 14 +- .../device-tree/src/arm/nxp/mxs/imx28-tx28.dts | 6 - .../src/arm/qcom/msm8226-motorola-falcon.dts | 53 + .../arm/qcom/qcom-apq8026-samsung-milletwifi.dts | 573 ++++ .../device-tree/src/arm/qcom/qcom-apq8064.dtsi | 7 +- .../device-tree/src/arm/qcom/qcom-apq8084.dtsi | 2 +- .../device-tree/src/arm/qcom/qcom-ipq4019.dtsi | 1 - .../device-tree/src/arm/qcom/qcom-ipq8064.dtsi | 3 +- .../device-tree/src/arm/qcom/qcom-mdm9615.dtsi | 1 - .../arm/qcom/qcom-msm8226-microsoft-common.dtsi | 4 + .../src/arm/qcom/qcom-msm8226-samsung-ms013g.dts | 386 +++ .../device-tree/src/arm/qcom/qcom-msm8226.dtsi | 4 +- .../device-tree/src/arm/qcom/qcom-msm8660.dtsi | 1 - .../arm/qcom/qcom-msm8926-motorola-peregrine.dts | 121 + .../device-tree/src/arm/qcom/qcom-msm8960.dtsi | 5 +- .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 6 +- .../src/arm/qcom/qcom-msm8974-samsung-hlte.dts | 401 +++ .../device-tree/src/arm/qcom/qcom-msm8974.dtsi | 28 +- .../src/arm/qcom/qcom-msm8974pro-htc-m8.dts | 353 ++ .../qcom-msm8974pro-sony-xperia-shinano-aries.dts | 44 + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 2 + .../device-tree/src/arm/renesas/r8a73a4.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7742.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7743.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7744.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7745.dtsi | 1 + .../device-tree/src/arm/renesas/r8a77470.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7790.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7791.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7792.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7793.dtsi | 1 + .../device-tree/src/arm/renesas/r8a7794.dtsi | 1 + .../device-tree/src/arm/renesas/r9a06g032.dtsi | 19 + .../device-tree/src/arm/rockchip/rk3036.dtsi | 1 + .../device-tree/src/arm/rockchip/rk3066a-mk808.dts | 8 + .../device-tree/src/arm/rockchip/rk3066a.dtsi | 20 +- .../device-tree/src/arm/rockchip/rk3128.dtsi | 128 + .../device-tree/src/arm/rockchip/rk3xxx.dtsi | 7 +- .../src/arm/rockchip/rv1126-edgeble-neu2-io.dts | 3 +- .../device-tree/src/arm/st/stih407-family.dtsi | 6 +- sys/contrib/device-tree/src/arm/st/stih410.dtsi | 1 + sys/contrib/device-tree/src/arm/st/stih418.dtsi | 42 +- sys/contrib/device-tree/src/arm/st/stm32f429.dtsi | 1 + .../device-tree/src/arm/st/stm32mp13-pinctrl.dtsi | 697 ++++ sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 38 + sys/contrib/device-tree/src/arm/st/stm32mp133.dtsi | 31 + .../src/arm/st/stm32mp135f-dhcor-dhsbc.dts | 377 +++ .../device-tree/src/arm/st/stm32mp135f-dk.dts | 128 + .../src/arm/st/stm32mp13xx-dhcor-som.dtsi | 308 ++ sys/contrib/device-tree/src/arm/st/stm32mp151.dtsi | 1 + .../src/arm/st/stm32mp157a-dk1-scmi.dts | 5 + .../src/arm/st/stm32mp157c-dk2-scmi.dts | 5 + .../src/arm/st/stm32mp157c-ed1-scmi.dts | 5 + .../src/arm/st/stm32mp157c-ev1-scmi.dts | 5 + .../src/arm/st/stm32mp157c-osd32mp1-red.dts | 13 - .../src/arm/st/stm32mp15xc-lxa-tac.dtsi | 13 - .../device-tree/src/arm/st/stm32mp15xx-osd32.dtsi | 13 + .../device-tree/src/arm/ti/davinci/da850-evm.dts | 2 +- .../src/arm/ti/omap/am335x-guardian.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-pdu001.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-pepper.dts | 2 +- .../src/arm/ti/omap/am5729-beagleboneai.dts | 1 - .../device-tree/src/arm/ti/omap/omap3-n900.dts | 2 +- .../device-tree/src/arm/vt8500/vt8500-bv07.dts | 2 +- sys/contrib/device-tree/src/arm/vt8500/vt8500.dtsi | 2 +- .../device-tree/src/arm/vt8500/wm8505-ref.dts | 2 +- sys/contrib/device-tree/src/arm/vt8500/wm8505.dtsi | 2 +- .../device-tree/src/arm/vt8500/wm8650-mid.dts | 2 +- sys/contrib/device-tree/src/arm/vt8500/wm8650.dtsi | 2 +- sys/contrib/device-tree/src/arm/vt8500/wm8750.dtsi | 4 +- .../device-tree/src/arm/vt8500/wm8850-w70v2.dts | 2 +- sys/contrib/device-tree/src/arm/vt8500/wm8850.dtsi | 4 +- .../device-tree/src/arm64/airoha/en7581-evb.dts | 26 + .../device-tree/src/arm64/airoha/en7581.dtsi | 154 + .../src/arm64/allwinner/sun50i-a64-pine64-lts.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-pine64-plus.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-pine64.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-pinebook.dts | 2 +- .../allwinner/sun50i-a64-pinetab-early-adopter.dts | 2 +- .../src/arm64/allwinner/sun50i-a64-pinetab.dts | 2 +- .../allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- .../src/arm64/allwinner/sun50i-a64.dtsi | 37 +- .../arm64/allwinner/sun50i-h6-pine-h64-model-b.dts | 2 +- .../src/arm64/allwinner/sun50i-h6-pine-h64.dts | 2 +- .../device-tree/src/arm64/allwinner/sun50i-h6.dtsi | 37 + .../src/arm64/allwinner/sun50i-h616-cpu-opp.dtsi | 25 +- .../src/arm64/allwinner/sun50i-h616.dtsi | 77 + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 4 +- .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 79 + .../src/arm64/altera/socfpga_stratix10.dtsi | 10 + .../src/arm64/altera/socfpga_stratix10_socdk.dts | 2 - .../arm64/altera/socfpga_stratix10_socdk_nand.dts | 2 - .../device-tree/src/arm64/amlogic/amlogic-a4.dtsi | 10 + .../device-tree/src/arm64/amlogic/amlogic-c3.dtsi | 3 +- .../src/arm64/amlogic/meson-a1-ad402.dts | 45 + .../device-tree/src/arm64/amlogic/meson-a1.dtsi | 16 +- .../device-tree/src/arm64/amlogic/meson-axg.dtsi | 24 +- .../src/arm64/amlogic/meson-g12-common.dtsi | 438 +-- .../device-tree/src/arm64/amlogic/meson-g12.dtsi | 4 + .../src/arm64/amlogic/meson-g12a-u200.dts | 2 +- .../src/arm64/amlogic/meson-g12b-bananapi.dtsi | 14 - .../src/arm64/amlogic/meson-g12b-dreambox-one.dts | 17 + .../src/arm64/amlogic/meson-g12b-dreambox-two.dts | 20 + .../src/arm64/amlogic/meson-g12b-dreambox.dtsi | 154 + .../src/arm64/amlogic/meson-g12b-odroid-n2.dtsi | 36 +- .../src/arm64/amlogic/meson-g12b-radxa-zero2.dts | 24 + .../src/arm64/amlogic/meson-gxbb-odroidc2.dts | 2 +- .../device-tree/src/arm64/amlogic/meson-gxbb.dtsi | 10 +- .../src/arm64/amlogic/meson-gxl-s905x-vero4k.dts | 199 ++ .../device-tree/src/arm64/amlogic/meson-gxl.dtsi | 10 +- .../src/arm64/amlogic/meson-gxlx-s905l-p271.dts | 51 + .../device-tree/src/arm64/amlogic/meson-s4.dtsi | 199 ++ .../device-tree/src/arm64/amlogic/meson-sm1.dtsi | 44 +- .../device-tree/src/arm64/apm/apm-merlin.dts | 2 +- .../device-tree/src/arm64/apm/apm-mustang.dts | 2 +- .../device-tree/src/arm64/arm/corstone1000-fvp.dts | 2 +- .../device-tree/src/arm64/arm/corstone1000.dtsi | 6 +- .../device-tree/src/arm64/arm/foundation-v8.dtsi | 6 +- .../device-tree/src/arm64/arm/fvp-base-revc.dts | 1 + .../device-tree/src/arm64/arm/juno-base.dtsi | 1 - .../device-tree/src/arm64/arm/juno-clocks.dtsi | 10 +- .../src/arm64/arm/juno-motherboard.dtsi | 13 +- .../src/arm64/arm/rtsm_ve-motherboard.dtsi | 10 +- .../src/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts | 6 +- .../device-tree/src/arm64/exynos/exynos850.dtsi | 8 + .../src/arm64/exynos/google/gs101-oriole.dts | 9 +- .../device-tree/src/arm64/exynos/google/gs101.dtsi | 22 +- .../src/arm64/freescale/fsl-ls1012a.dtsi | 79 +- .../src/arm64/freescale/fsl-ls1028a-rdb.dts | 31 + .../src/arm64/freescale/fsl-ls1028a.dtsi | 55 +- .../src/arm64/freescale/fsl-ls1043a-qds.dts | 2 +- .../src/arm64/freescale/fsl-ls1043a-rdb.dts | 20 +- .../src/arm64/freescale/fsl-ls1043a.dtsi | 138 +- .../src/arm64/freescale/fsl-ls1046a-qds.dts | 2 +- .../src/arm64/freescale/fsl-ls1046a.dtsi | 49 +- .../src/arm64/freescale/fsl-ls1088a-qds.dts | 2 +- .../src/arm64/freescale/fsl-ls1088a.dtsi | 72 +- .../src/arm64/freescale/fsl-ls2080a.dtsi | 2 +- .../src/arm64/freescale/fsl-ls2088a.dtsi | 2 +- .../src/arm64/freescale/fsl-ls208xa-qds.dtsi | 2 +- .../src/arm64/freescale/fsl-ls208xa-rdb.dtsi | 2 +- .../src/arm64/freescale/fsl-ls208xa.dtsi | 186 +- .../src/arm64/freescale/fsl-lx2160a.dtsi | 56 +- .../src/arm64/freescale/imx8-ss-audio.dtsi | 1 - .../src/arm64/freescale/imx8-ss-cm41.dtsi | 68 + .../src/arm64/freescale/imx8-ss-conn.dtsi | 69 + .../src/arm64/freescale/imx8dxl-evk.dts | 277 ++ .../src/arm64/freescale/imx8dxl-ss-adma.dtsi | 78 + .../src/arm64/freescale/imx8dxl-ss-conn.dtsi | 11 + .../src/arm64/freescale/imx8mm-evk.dtsi | 2 +- .../src/arm64/freescale/imx8mm-iot-gateway.dts | 218 ++ .../imx8mm-phygate-tauri-l-rs232-rs232.dtso | 72 + .../imx8mm-phygate-tauri-l-rs232-rs485.dtso | 76 + .../imx8mm-phygate-tauri-l-rs232-rts-cts.dtso | 41 + .../src/arm64/freescale/imx8mm-phygate-tauri-l.dts | 10 + .../src/arm64/freescale/imx8mm-tqma8mqml.dtsi | 8 +- .../src/arm64/freescale/imx8mm-ucm-som.dtsi | 679 ++++ .../src/arm64/freescale/imx8mm-venice-gw700x.dtsi | 20 + .../src/arm64/freescale/imx8mm-venice-gw7901.dts | 2 - .../src/arm64/freescale/imx8mm-venice-gw7902.dts | 2 - .../src/arm64/freescale/imx8mm-venice-gw7903.dts | 2 - .../src/arm64/freescale/imx8mm-venice-gw7904.dts | 2 - .../src/arm64/freescale/imx8mm-verdin.dtsi | 20 +- .../src/arm64/freescale/imx8mn-tqma8mqnl.dtsi | 8 +- .../src/arm64/freescale/imx8mn-venice-gw7902.dts | 2 - .../src/arm64/freescale/imx8mp-beacon-kit.dts | 24 +- .../src/arm64/freescale/imx8mp-beacon-som.dtsi | 2 - .../src/arm64/freescale/imx8mp-debix-model-a.dts | 47 + .../src/arm64/freescale/imx8mp-dhcom-pdk2.dts | 39 + .../src/arm64/freescale/imx8mp-dhcom-pdk3.dts | 39 + .../src/arm64/freescale/imx8mp-dhcom-som.dtsi | 13 +- .../arm64/freescale/imx8mp-evk-mx8-dlvds-lcd1.dtso | 77 + .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 91 +- .../src/arm64/freescale/imx8mp-msc-sm2s-ep1.dts | 27 + .../freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 906 +++++ .../arm64/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 5 - .../src/arm64/freescale/imx8mp-tqma8mpql.dtsi | 8 +- .../src/arm64/freescale/imx8mp-venice-gw702x.dtsi | 20 + .../src/arm64/freescale/imx8mp-venice-gw74xx.dts | 24 + .../src/arm64/freescale/imx8mp-verdin-dahlia.dtsi | 37 + .../src/arm64/freescale/imx8mp-verdin-dev.dtsi | 37 + .../src/arm64/freescale/imx8mp-verdin-mallow.dtsi | 37 + .../src/arm64/freescale/imx8mp-verdin-nonwifi.dtsi | 3 +- .../src/arm64/freescale/imx8mp-verdin-wifi.dtsi | 3 +- .../src/arm64/freescale/imx8mp-verdin-yavia.dtsi | 37 + .../src/arm64/freescale/imx8mp-verdin.dtsi | 18 +- .../device-tree/src/arm64/freescale/imx8mp.dtsi | 120 +- .../src/arm64/freescale/imx8mq-librem5.dtsi | 2 - .../src/arm64/freescale/imx8mq-tqma8mq.dtsi | 8 +- .../device-tree/src/arm64/freescale/imx8qm-mek.dts | 344 ++ .../src/arm64/freescale/imx8qm-ss-audio.dtsi | 473 +++ .../device-tree/src/arm64/freescale/imx8qm.dtsi | 103 + .../src/arm64/freescale/imx8qxp-mek.dts | 1 + .../src/arm64/freescale/imx93-11x11-evk.dts | 309 +- .../src/arm64/freescale/imx93-9x9-qsb.dts | 492 +++ .../arm64/freescale/imx93-tqma9352-mba93xxca.dts | 73 +- .../arm64/freescale/imx93-tqma9352-mba93xxla.dts | 63 +- .../src/arm64/freescale/imx93-tqma9352.dtsi | 9 +- .../device-tree/src/arm64/freescale/imx93.dtsi | 2 +- .../src/arm64/freescale/imx95-19x19-evk.dts | 289 ++ .../device-tree/src/arm64/freescale/imx95-clock.h | 187 ++ .../src/arm64/freescale/imx95-pinfunc.h | 865 +++++ .../device-tree/src/arm64/freescale/imx95-power.h | 47 + .../device-tree/src/arm64/freescale/imx95.dtsi | 1192 +++++++ .../src/arm64/freescale/qoriq-fman3-0-10g-0.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-10g-1.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-1g-0.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-1g-1.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-1g-2.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-1g-3.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-1g-4.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0-1g-5.dtsi | 2 +- .../src/arm64/freescale/qoriq-fman3-0.dtsi | 4 +- .../device-tree/src/arm64/freescale/tqma8xx.dtsi | 8 +- .../device-tree/src/arm64/hisilicon/hi3660.dtsi | 2 +- .../src/arm64/intel/socfpga_agilex_socdk.dts | 2 - .../src/arm64/intel/socfpga_n5x_socdk.dts | 2 - .../src/arm64/marvell/armada-3720-gl-mv1000.dts | 8 +- .../src/arm64/marvell/cn9130-cf-base.dts | 178 + .../src/arm64/marvell/cn9130-cf-pro.dts | 375 +++ .../device-tree/src/arm64/marvell/cn9130-cf.dtsi | 197 ++ .../src/arm64/marvell/cn9130-sr-som.dtsi | 160 + .../src/arm64/marvell/cn9131-cf-solidwan.dts | 637 ++++ .../src/arm64/marvell/cn9132-clearfog.dts | 673 ++++ .../src/arm64/marvell/cn9132-sr-cex7.dtsi | 712 ++++ *** 2132 LINES SKIPPED *** From nobody Thu Jan 2 09:11:58 2025 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 4YP1Db0BP4z5j1KQ for ; Thu, 02 Jan 2025 09:11:59 +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 4YP1DZ6Bmmz43MK; Thu, 2 Jan 2025 09:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809118; 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=OlOSm6mknLkHFeyKM98DyjYf3gRUTAxfKlPYB8W2g3E=; b=x12m6Ha6j7ENKTkTZrh3bDTDibBscowYCHPkErENYBHk2ZiVFPri3ysoVL1P2HYk1HG/pk uy1poHXEMGwp/IwwfVkJdcgiIk70N53HzuMF8A2nQb5iLnYwuhJPQIdLJExn5M6jN9MTQE jujSU+YNieteMH7Bi9m8EP/R40QJECWj5OtJYx7aoO21Oqpw8aUbHtVZXkG3T6WScRJpBx mY/xJ07cby7Juk8iWxkAszQHr4otM2jIIrqlKk5vvLmCiwzwkAiVzOrt2xWxMhu7aoE88B iDFoFbkabEkPgTn//urs3Kt94ospIhLRe5Tt6vcHyqTQzXusIQ9v9C3HEuwvfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809118; 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=OlOSm6mknLkHFeyKM98DyjYf3gRUTAxfKlPYB8W2g3E=; b=ZEYYTB3rKmH77e+PmhIahPzPfKmhmxGbxrShRp5ZxYpW75HGxRQoVZca9DPhXyj/US5h8Z maFYzNUTmWpAW7FO/ZwHEdz1a4eHDGNhC0edTLUDr0xIlNGIcUYQy67k0KHXjYl9qFGjWv GnNvSn7Z7oI46aqC9WeEdWUbqi9WnI2BosF2u9vVMGgcd6BycD4yAA34To85sBv3Jh4oEp wnzFmriNG+yJItD7Q/BJeJrV1EpeX6ObPggGThLles10SH8umQehQ5+zK3WOS86eRsDWkL ndnNkK60NoJcuiwSUvB49W2NNnuupGlurtQPOeM1gpsp6gNI9sXXDHbCnf3JoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735809118; a=rsa-sha256; cv=none; b=kmAKtzaTuFqcDDlL2kAwAenRyUEX5f5atDuiIW3PMt6B7yeY7h37Y3h3NbhhIXm1aZ2wxa 5csgrWRNF2P5Y/d1YATCgDV58kBFhGQrUFqLe69RX/TVAmsFTJKM0KfJvVmhTyHVGYSUKw m2Q2ydZl3qndL6/Ws9oAGSjNk4qlf03ALSQP2UhzUr1vnBlLqE73/IuT3lTlX/5kQVeF0z UIdwaaxe9Go+wyMVDUi1s2Z7LZ3kiTnJrovW3ej4nYcVdqhT656ypurdoyZtrBLX4+JkOE v1UJqb3m2IfvkWgLuAm9g1WTaidV++Z7ZRPuvwLa4r/wkFW/BSuO6HXvx8CP3Q== 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 4YP1DZ5WBZz13Lr; Thu, 2 Jan 2025 09:11:58 +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 5029Bwwx028345; Thu, 2 Jan 2025 09:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5029Bwh0028344; Thu, 2 Jan 2025 09:11:58 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:11:58 GMT Message-Id: <202501020911.5029Bwh0028344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: beb6e748a901..cd989bfc73f7 - vendor/device-tree - vendor branch updated 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: cd989bfc73f7dff3085b7004c7d4f06396382e6d X-Git-Oldrev: beb6e748a90196469bed9e3900ce618069c652f7 X-Git-Newrev: cd989bfc73f7dff3085b7004c7d4f06396382e6d Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=beb6e748a901..cd989bfc73f7 cd989bfc73f7 Import device-tree files from Linux 6.12 From nobody Thu Jan 2 09:12:47 2025 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 4YP1Qd2Lrpz5hybL; Thu, 02 Jan 2025 09:20:41 +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 4YP1Qd1B3qz3wnL; Thu, 2 Jan 2025 09:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809641; 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=LsnpNx0BpcQtJ7XBZowV01ZUTsR5ovYzgFvbh+1KA3g=; b=TTEZmZNvJjx+awtNkTeh1TpQuny7e7DO5tn8dfc5IiCxvOmbe4jTjSWRQ5QhBJfDIBfDCe A0PPs3/538/DOaRVWFA94iWm/7VygJ5CMpie63aOCxMeX+bkEdoB6gguY2vxz5uKnxZJZh dg2iYr3xF3XEvQIvSoyT+lzV19MrzxDWiMB0FK88T8PbnAgZ9S6aRFGAzOja1YqASE13rp D3fAKsUizg7k3kn0la8vcIgO3nTRAfauH/1X1XiqqVw7NDULApaC8Xdoho6lwlwFTfar5U Ei6MWMSxzbgUlHVtVUHwwb4FyVuBsdyjfXqEguwkD9fNAr1L9TEnlHLavQshmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735809641; 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=LsnpNx0BpcQtJ7XBZowV01ZUTsR5ovYzgFvbh+1KA3g=; b=swGA7wiUxpjVY59nK2fzDxUBeoPn8QBEOmntV0omh7pf/jjDXgSYv3ivynwlM5VSCRlyVU Fmp3a/gTQdaSOPcsk222snRuLU9+6swT+kEPrtwizLuLMdEBBe8s8pOm+r3nrwNQY8d4A5 O90JSXTnpBhgYFv6/fD/1B3+FMlqnMV7mSMGN9ujJkR3GtAqDB/mKCR4CKaFLlfOgr0jHV /EVimRZ10stZirTpKp8ZxUxGu/kTUJQolVf4g8v+Vth5rbmEvk0qm2P7pp+Hjrsr2ghVO/ 6UDqIS9oaBLtmVQ73Xl/q8R1plhaz5k6UYyakbN2vzAVsmbb8ENSR9QLrUxsuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735809641; a=rsa-sha256; cv=none; b=Dw3jQRQIqDujE4rB+r495URf/f6X4xjwN8137z2i9R9wx3nPtoiL7vEdYfd+KQN+Prjdcs TJRehP8BGtAyd+JjlGsedRZnbEHEC0IP1Fr3EymVvsiKxxi1SkkDudR5AeQNSFUQuUbyFo laCGhqMaZAeuedzPOxOBjYU155KoceP3qzoVJx4+rFjQzOElYuBVZ6Xalt/bNKAte2KRE7 CyP1AXqLu4aoxdbssXJhzmwd3zolqSWGdUjdYoMLIMgdS9rB9VMekWvJhpwyJzr3KY4Nmf /yuwH12s4aksXqLiwueK/jpMAjivbcA7dtpEMzGFl4MFiyupSwMtJ4T3nF0J/w== 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 4YP1Qd0NfczDgv; Thu, 2 Jan 2025 09:20:41 +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 5029Clll033263; Thu, 2 Jan 2025 09:12:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5029Cl3V033260; Thu, 2 Jan 2025 09:12:47 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:12:47 GMT Message-Id: <202501020912.5029Cl3V033260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b2d2a78ad80e - main - Import device-tree files from Linux 6.12 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b commit b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b Merge: 0e8011faf58b cd989bfc73f7 Author: Emmanuel Vadot AuthorDate: 2025-01-02 09:12:13 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-02 09:12:13 +0000 Import device-tree files from Linux 6.12 .../device-tree/Bindings/arc/snps,archs-pct.yaml | 33 + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 16 +- .../Bindings/arm/arm,coresight-dummy-source.yaml | 2 +- .../device-tree/Bindings/arm/arm,corstone1000.yaml | 4 +- .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 3 + .../device-tree/Bindings/arm/atmel-sysregs.txt | 6 +- .../Bindings/arm/cirrus/cirrus,ep9301.yaml | 38 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 38 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 19 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 42 +- .../device-tree/Bindings/arm/rockchip/pmu.yaml | 2 + .../device-tree/Bindings/arm/stm32/stm32.yaml | 8 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 9 +- sys/contrib/device-tree/Bindings/arm/tegra.yaml | 42 + sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 1 + .../device-tree/Bindings/ata/ahci-platform.yaml | 33 +- .../Bindings/ata/cirrus,ep9312-pata.yaml | 42 + sys/contrib/device-tree/Bindings/ata/imx-sata.yaml | 47 + .../device-tree/Bindings/board/fsl,bcsr.yaml | 32 + .../Bindings/board/fsl,fpga-qixis-i2c.yaml | 70 + .../device-tree/Bindings/board/fsl,fpga-qixis.yaml | 81 + .../device-tree/Bindings/bus/qcom,ebi2.yaml | 239 ++ .../Bindings/clock/amlogic,c3-pll-clkc.yaml | 7 +- .../Bindings/clock/atmel,at91rm9200-pmc.yaml | 2 + .../Bindings/clock/atmel,at91sam9x5-sckc.yaml | 4 +- .../Bindings/clock/baikal,bt1-ccu-div.yaml | 8 +- .../Bindings/clock/cirrus,lochnagar.yaml | 6 +- .../Bindings/clock/idt,versaclock5.yaml | 2 - .../Bindings/clock/imx8mp-audiomix.yaml | 3 + .../Bindings/clock/mediatek,apmixedsys.yaml | 2 +- .../Bindings/clock/mediatek,infracfg.yaml | 85 + .../Bindings/clock/mediatek,mt8186-clock.yaml | 56 + .../Bindings/clock/mediatek,mt8186-sys-clock.yaml | 57 + .../Bindings/clock/mediatek,mt8192-clock.yaml | 191 + .../Bindings/clock/mediatek,mt8192-sys-clock.yaml | 68 + .../Bindings/clock/mediatek,mt8195-clock.yaml | 238 ++ .../Bindings/clock/mediatek,mt8195-sys-clock.yaml | 76 + .../Bindings/clock/mediatek,pericfg.yaml | 71 + .../Bindings/clock/mediatek,syscon.yaml | 93 + .../Bindings/clock/nxp,imx95-blk-ctl.yaml | 1 + .../Bindings/clock/nxp,lpc3220-clk.yaml | 51 + .../Bindings/clock/nxp,lpc3220-usb-clk.yaml | 35 + .../device-tree/Bindings/clock/qcom,a53pll.yaml | 4 + .../Bindings/clock/qcom,ipq5332-gcc.yaml | 2 + .../Bindings/clock/qcom,qcs404-turingcc.yaml | 47 + .../device-tree/Bindings/clock/qcom,rpmcc.yaml | 2 +- .../Bindings/clock/qcom,sc8280xp-lpasscc.yaml | 13 +- .../Bindings/clock/qcom,sm4450-camcc.yaml | 63 + .../Bindings/clock/qcom,sm4450-dispcc.yaml | 71 + .../Bindings/clock/qcom,sm8150-camcc.yaml | 77 + .../Bindings/clock/qcom,sm8450-camcc.yaml | 19 +- .../Bindings/clock/qcom,sm8450-gpucc.yaml | 2 + .../Bindings/clock/qcom,sm8450-videocc.yaml | 11 +- .../Bindings/clock/renesas,cpg-clocks.yaml | 8 +- .../Bindings/clock/renesas,cpg-mssr.yaml | 1 + .../Bindings/clock/renesas,rzv2h-cpg.yaml | 80 + .../Bindings/clock/rockchip,rk3576-cru.yaml | 56 + .../Bindings/clock/rockchip,rk3588-cru.yaml | 4 - .../Bindings/clock/samsung,exynosautov9-clock.yaml | 19 + .../clock/samsung,exynosautov920-clock.yaml | 162 + .../Bindings/clock/st,stm32mp1-rcc.yaml | 10 +- .../device-tree/Bindings/cpu/idle-states.yaml | 2 +- .../device-tree/Bindings/crypto/fsl,sec-v4.0.yaml | 5 +- .../device-tree/Bindings/crypto/qcom,prng.yaml | 1 + .../Bindings/display/bridge/toshiba,tc358767.yaml | 21 +- .../Bindings/display/elgin,jg10309-01.yaml | 54 + .../device-tree/Bindings/display/fsl,lcdif.yaml | 20 + sys/contrib/device-tree/Bindings/display/lvds.yaml | 2 +- .../Bindings/display/mediatek/mediatek,dpi.yaml | 13 + .../Bindings/display/mediatek/mediatek,split.yaml | 19 + .../device-tree/Bindings/display/msm/hdmi.yaml | 28 +- .../display/panel/boe,th101mb31ig002-28a.yaml | 21 +- .../Bindings/display/panel/boe,tv101wum-ll2.yaml | 63 + .../Bindings/display/panel/himax,hx8394.yaml | 17 +- .../Bindings/display/panel/ilitek,ili9806e.yaml | 1 + .../Bindings/display/panel/jadard,jd9365da-h3.yaml | 1 + .../panel/panel-simple-lvds-dual-ports.yaml | 6 +- .../Bindings/display/panel/panel-simple.yaml | 4 + .../Bindings/display/panel/sitronix,st7701.yaml | 69 +- .../Bindings/display/renesas,rzg2l-du.yaml | 32 +- .../Bindings/dma/cirrus,ep9301-dma-m2m.yaml | 84 + .../Bindings/dma/cirrus,ep9301-dma-m2p.yaml | 144 + .../device-tree/Bindings/dma/fsl,imx-dma.yaml | 14 + .../device-tree/Bindings/dma/fsl,mxs-dma.yaml | 15 + sys/contrib/device-tree/Bindings/dma/fsl-qdma.yaml | 13 +- .../Bindings/dma/loongson,ls1b-apbdma.yaml | 65 + .../device-tree/Bindings/dma/marvell,xor-v2.yaml | 61 + .../Bindings/dma/nxp,lpc3220-dmamux.yaml | 49 + .../device-tree/Bindings/dma/renesas,rz-dmac.yaml | 1 + .../device-tree/Bindings/dma/ti-dma-crossbar.txt | 2 +- .../Bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 4 +- sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 1 + .../Bindings/extcon/extcon-ptn5150.yaml | 11 + .../Bindings/extcon/linux,extcon-usb-gpio.yaml | 37 + .../device-tree/Bindings/firmware/arm,scmi.yaml | 20 +- .../Bindings/firmware/nxp,imx95-scmi.yaml | 43 + .../device-tree/Bindings/gnss/brcm,bcm4751.yaml | 1 + .../device-tree/Bindings/gnss/gnss-common.yaml | 5 - .../device-tree/Bindings/gnss/mediatek.yaml | 1 + .../device-tree/Bindings/gnss/sirfstar.yaml | 1 + .../device-tree/Bindings/gnss/u-blox,neo-6m.yaml | 1 + .../Bindings/gpio/fairchild,74hc595.yaml | 11 - .../device-tree/Bindings/gpio/fcs,fxl6408.yaml | 1 + .../device-tree/Bindings/gpio/fsl-imx-gpio.yaml | 11 - .../device-tree/Bindings/gpio/gpio-davinci.yaml | 2 + .../device-tree/Bindings/gpio/gpio-ep9301.yaml | 9 +- .../device-tree/Bindings/gpio/gpio-pca95xx.yaml | 11 - .../Bindings/gpio/microchip,mpfs-gpio.yaml | 12 - .../Bindings/gpio/nxp,lpc3220-gpio.yaml | 50 + .../Bindings/gpio/socionext,uniphier-gpio.yaml | 11 - .../Bindings/hwlock/sprd,hwspinlock-r3p0.yaml | 50 + .../device-tree/Bindings/hwmon/adt7475.yaml | 37 +- .../device-tree/Bindings/hwmon/lltc,ltc2978.yaml | 94 + .../device-tree/Bindings/hwmon/maxim,max31790.yaml | 70 + .../Bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml | 43 + .../device-tree/Bindings/i2c/aspeed,i2c.yaml | 5 - sys/contrib/device-tree/Bindings/i2c/i2c-rk3x.yaml | 1 + .../Bindings/i2c/nvidia,tegra20-i2c.yaml | 27 +- .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 1 + .../device-tree/Bindings/i2c/renesas,riic.yaml | 4 + .../device-tree/Bindings/i2c/sprd,sc9860-i2c.yaml | 65 + .../device-tree/Bindings/i2c/tsd,mule-i2c-mux.yaml | 69 + .../Bindings/iio/accel/adi,adxl380.yaml | 92 + .../Bindings/iio/accel/kionix,kxcjk1013.yaml | 1 + .../device-tree/Bindings/iio/accel/lis302.txt | 2 +- .../device-tree/Bindings/iio/adc/adi,ad4000.yaml | 197 + .../device-tree/Bindings/iio/adc/adi,ad4695.yaml | 254 ++ .../device-tree/Bindings/iio/adc/adi,ad7192.yaml | 33 +- .../device-tree/Bindings/iio/adc/adi,ad7380.yaml | 34 + .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 123 +- .../device-tree/Bindings/iio/adc/adi,ad9467.yaml | 3 + .../Bindings/iio/adc/microchip,pac1921.yaml | 71 + .../Bindings/iio/adc/rockchip-saradc.yaml | 3 + .../Bindings/iio/adc/sigma-delta-modulator.yaml | 25 +- .../Bindings/iio/adc/sophgo,cv1800b-saradc.yaml | 83 + .../device-tree/Bindings/iio/adc/st,stm32-adc.yaml | 4 +- .../Bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 122 +- .../Bindings/iio/adc/x-powers,axp209-adc.yaml | 12 + .../device-tree/Bindings/iio/dac/adi,ad5686.yaml | 53 +- .../device-tree/Bindings/iio/dac/adi,ad5696.yaml | 3 +- .../device-tree/Bindings/iio/dac/adi,ltc2664.yaml | 181 + .../device-tree/Bindings/iio/dac/adi,ltc2672.yaml | 160 + sys/contrib/device-tree/Bindings/iio/dac/dac.yaml | 50 + .../Bindings/iio/frequency/adi,adf4377.yaml | 10 + .../Bindings/iio/humidity/sciosense,ens210.yaml | 55 + .../Bindings/iio/light/liteon,ltrf216a.yaml | 4 +- .../Bindings/iio/light/rohm,bh1745.yaml | 53 + .../Bindings/iio/light/rohm,bu27034anuc.yaml | 45 + .../device-tree/Bindings/iio/light/stk33xx.yaml | 13 +- .../iio/magnetometer/asahi-kasei,ak8975.yaml | 5 +- .../iio/magnetometer/bosch,bmc150_magn.yaml | 3 + .../Bindings/iio/pressure/sensirion,sdp500.yaml | 46 + .../Bindings/iio/proximity/awinic,aw96103.yaml | 61 + .../Bindings/iio/proximity/tyhx,hx9023s.yaml | 93 + .../device-tree/Bindings/incomplete-devices.yaml | 148 + .../device-tree/Bindings/input/adi,adp5588.yaml | 38 +- .../Bindings/input/cirrus,ep9307-keypad.yaml | 87 + .../device-tree/Bindings/input/elan,ekth6915.yaml | 4 +- .../Bindings/input/qcom,pm8xxx-vib.yaml | 1 + .../device-tree/Bindings/input/rotary-encoder.yaml | 90 + .../Bindings/input/touchscreen/adi,ad7879.yaml | 150 + .../Bindings/input/touchscreen/azoteq,iqs7211.yaml | 4 +- .../Bindings/input/touchscreen/edt-ft5x06.yaml | 2 +- .../Bindings/input/touchscreen/goodix.yaml | 2 +- .../Bindings/input/touchscreen/ti,ads7843.yaml | 183 + .../touchscreen/toradex,vf50-touchscreen.yaml | 77 + .../Bindings/input/touchscreen/zinitix,bt400.yaml | 10 + .../Bindings/interconnect/qcom,msm8939.yaml | 25 +- .../Bindings/interconnect/qcom,msm8953.yaml | 3 +- .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + .../Bindings/interconnect/qcom,rpmh.yaml | 5 +- .../Bindings/interrupt-controller/apple,aic.yaml | 14 +- .../Bindings/interrupt-controller/arm,gic-v3.yaml | 2 +- .../interrupt-controller/aspeed,ast2400-vic.yaml | 62 + .../interrupt-controller/brcm,bcm2836-l1-intc.yaml | 51 + .../interrupt-controller/fsl,irqsteer.yaml | 2 + .../interrupt-controller/fsl,ls-extirq.yaml | 26 +- .../Bindings/interrupt-controller/qcom,pdc.yaml | 1 + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 5 + .../device-tree/Bindings/leds/awinic,aw200xx.yaml | 2 +- sys/contrib/device-tree/Bindings/leds/common.yaml | 2 + .../device-tree/Bindings/leds/nxp,pca995x.yaml | 6 +- .../Bindings/leds/sprd,sc2731-bltc.yaml | 84 + .../device-tree/Bindings/leds/ti.lm36922.yaml | 110 + .../Bindings/mailbox/brcm,iproc-flexrm-mbox.txt | 2 +- .../Bindings/mailbox/mtk,adsp-mbox.yaml | 12 +- .../device-tree/Bindings/mailbox/qcom-ipcc.yaml | 2 + .../Bindings/media/amlogic,gx-vdec.yaml | 3 +- .../Bindings/media/i2c/ovti,og01a1b.yaml | 107 + .../Bindings/media/i2c/sony,imx335.yaml | 4 + .../Bindings/media/i2c/thine,thp7312.yaml | 2 +- .../Bindings/media/qcom,sc7280-venus.yaml | 1 + .../device-tree/Bindings/media/renesas,fcp.yaml | 2 + .../device-tree/Bindings/media/renesas,vin.yaml | 4 + .../device-tree/Bindings/media/renesas,vsp1.yaml | 1 + .../Bindings/media/rockchip,rk3568-vepu.yaml | 1 + .../device-tree/Bindings/media/rockchip-vpu.yaml | 7 +- .../Bindings/media/samsung,exynos4210-fimc.yaml | 2 +- .../memory-controllers/fsl/fsl,imx-weim.yaml | 25 +- .../memory-controllers/renesas,rpc-if.yaml | 4 +- .../device-tree/Bindings/mfd/adi,adp5585.yaml | 99 + .../device-tree/Bindings/mfd/mediatek,mt6357.yaml | 21 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 1 + .../Bindings/mfd/rohm,bd96801-pmic.yaml | 2 +- .../device-tree/Bindings/mfd/samsung,s2mps11.yaml | 2 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 3 + sys/contrib/device-tree/Bindings/mfd/twl6040.txt | 2 +- .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 2 +- .../Bindings/misc/aspeed,ast2400-cvic.yaml | 60 + .../device-tree/Bindings/misc/fsl,qoriq-mc.yaml | 2 +- .../device-tree/Bindings/misc/qcom,fastrpc.yaml | 3 +- .../Bindings/mmc/atmel,sama5d2-sdhci.yaml | 92 + .../Bindings/mmc/nuvoton,ma35d1-sdhci.yaml | 87 + .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 13 +- .../device-tree/Bindings/mmc/rockchip-dw-mshc.yaml | 2 + .../Bindings/mmc/snps,dwcmshc-sdhci.yaml | 95 +- .../device-tree/Bindings/mtd/technologic,nand.yaml | 45 + .../device-tree/Bindings/mtd/ti,gpmc-nand.yaml | 5 +- .../Bindings/net/amlogic,meson-dwmac.yaml | 22 +- .../Bindings/net/bluetooth/amlogic,w155s2-bt.yaml | 63 + .../Bindings/net/bluetooth/brcm,bluetooth.yaml | 163 + .../Bindings/net/bluetooth/marvell,88w8897.yaml | 49 + .../Bindings/net/bluetooth/mediatek,bluetooth.txt | 80 + .../Bindings/net/bluetooth/nokia,h4p-bluetooth.txt | 51 + .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 16 +- .../Bindings/net/bluetooth/realtek,bluetooth.yaml | 68 + .../Bindings/net/bluetooth/ti,bluetooth.yaml | 95 + .../device-tree/Bindings/net/brcm,unimac-mdio.yaml | 1 + .../device-tree/Bindings/net/can/fsl,flexcan.yaml | 8 +- .../Bindings/net/can/microchip,mcp2510.yaml | 70 + .../Bindings/net/can/renesas,rcar-canfd.yaml | 22 +- .../Bindings/net/can/rockchip,rk3568v2-canfd.yaml | 74 + .../Bindings/net/cirrus,ep9301-eth.yaml | 59 + .../Bindings/net/dsa/mediatek,mt7530.yaml | 8 +- .../Bindings/net/dsa/microchip,ksz.yaml | 7 + .../Bindings/net/dsa/vitesse,vsc73xx.yaml | 32 + .../device-tree/Bindings/net/fsl,cpm-enet.yaml | 59 + .../device-tree/Bindings/net/fsl,cpm-mdio.yaml | 55 + .../Bindings/net/fsl,qoriq-mc-dpmac.yaml | 10 +- .../device-tree/Bindings/net/maxim,ds26522.yaml | 40 + sys/contrib/device-tree/Bindings/net/mdio.yaml | 2 +- .../device-tree/Bindings/net/mediatek,net.yaml | 12 +- .../Bindings/net/microchip,lan8650.yaml | 74 + .../Bindings/net/pse-pd/ti,tps23881.yaml | 3 + .../device-tree/Bindings/net/renesas,etheravb.yaml | 29 +- .../device-tree/Bindings/net/rockchip-dwmac.yaml | 2 + .../device-tree/Bindings/net/snps,dwmac.yaml | 1 + .../Bindings/net/socionext,uniphier-ave4.yaml | 8 +- .../device-tree/Bindings/net/ti,cc1352p7.yaml | 7 + .../Bindings/net/wireless/marvell,sd8787.yaml | 93 + .../Bindings/net/xlnx,axi-ethernet.yaml | 5 +- .../Bindings/nvmem/fsl,layerscape-sfp.yaml | 1 + .../device-tree/Bindings/nvmem/imx-ocotp.yaml | 3 +- .../Bindings/nvmem/layouts/nvmem-layout.yaml | 1 + .../Bindings/nvmem/layouts/u-boot,env.yaml | 132 + .../device-tree/Bindings/nvmem/st,stm32-romem.yaml | 3 + .../Bindings/opp/operating-points-v2-ti-cpu.yaml | 2 +- .../Bindings/pci/altr,msi-controller.yaml | 65 + .../Bindings/pci/altr,pcie-root-port.yaml | 114 + .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 40 +- .../Bindings/pci/fsl,imx6q-pcie-ep.yaml | 13 +- .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 16 + .../Bindings/pci/fsl,layerscape-pcie.yaml | 41 +- .../Bindings/pci/hisilicon,kirin-pcie.yaml | 3 +- .../device-tree/Bindings/pci/host-generic-pci.yaml | 2 - .../Bindings/pci/mediatek-pcie-gen3.yaml | 68 +- sys/contrib/device-tree/Bindings/pci/pci-ep.yaml | 14 +- .../device-tree/Bindings/pci/qcom,pcie-common.yaml | 7 +- .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 1 + .../device-tree/Bindings/pci/qcom,pcie-sc7280.yaml | 27 +- .../Bindings/pci/qcom,pcie-sc8280xp.yaml | 3 - .../device-tree/Bindings/pci/qcom,pcie-sm8450.yaml | 10 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 3 + .../device-tree/Bindings/pci/rcar-gen4-pci-ep.yaml | 1 + .../Bindings/pci/rcar-gen4-pci-host.yaml | 1 + .../Bindings/pci/renesas,pci-rcar-gen2.yaml | 8 +- .../Bindings/pci/socionext,uniphier-pcie-ep.yaml | 8 +- .../Bindings/pci/ti,j721e-pci-host.yaml | 10 + .../device-tree/Bindings/pci/xlnx,nwl-pcie.yaml | 7 + .../device-tree/Bindings/pci/xlnx,xdma-host.yaml | 36 +- sys/contrib/device-tree/Bindings/perf/arm,cmn.yaml | 1 + sys/contrib/device-tree/Bindings/perf/arm,ni.yaml | 30 + .../device-tree/Bindings/phy/apm-xgene-phy.txt | 2 +- .../device-tree/Bindings/phy/fsl,mxs-usbphy.yaml | 17 + .../phy/hisilicon,hi3798cv200-combphy.yaml | 56 + .../Bindings/phy/mediatek,mt7988-xfi-tphy.yaml | 2 +- .../device-tree/Bindings/phy/mediatek,tphy.yaml | 2 +- .../Bindings/phy/nuvoton,ma35d1-usb2-phy.yaml | 45 + .../Bindings/phy/qcom,hdmi-phy-qmp.yaml | 1 + .../device-tree/Bindings/phy/qcom,sata-phy.yaml | 55 + .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 8 +- .../Bindings/phy/qcom,snps-eusb2-repeater.yaml | 2 +- .../device-tree/Bindings/phy/renesas,usb2-phy.yaml | 4 +- .../Bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 3 + .../Bindings/phy/socionext,uniphier-ahci-phy.yaml | 8 +- .../Bindings/phy/socionext,uniphier-pcie-phy.yaml | 8 +- .../phy/socionext,uniphier-usb3hs-phy.yaml | 7 +- .../phy/socionext,uniphier-usb3ss-phy.yaml | 7 +- .../Bindings/pinctrl/atmel,at91rm9200-pinctrl.yaml | 184 + .../Bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 70 +- .../device-tree/Bindings/pinctrl/pincfg-node.yaml | 3 + .../Bindings/pinctrl/qcom,apq8064-pinctrl.yaml | 110 + .../Bindings/pinctrl/qcom,apq8084-pinctrl.yaml | 129 + .../Bindings/pinctrl/qcom,ipq4019-pinctrl.yaml | 103 + .../Bindings/pinctrl/qcom,ipq8064-pinctrl.yaml | 108 + .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 1 + .../Bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 1 + .../device-tree/Bindings/pinctrl/renesas,pfc.yaml | 1 + .../Bindings/pinctrl/rockchip,pinctrl.yaml | 1 + .../Bindings/pinctrl/sophgo,cv1800-pinctrl.yaml | 122 + .../Bindings/pinctrl/st,stm32-pinctrl.yaml | 4 +- .../Bindings/platform/microsoft,surface-sam.yaml | 47 + .../Bindings/power/renesas,rcar-sysc.yaml | 1 + .../Bindings/power/rockchip,power-controller.yaml | 1 + .../Bindings/power/rockchip-io-domain.yaml | 24 + .../Bindings/power/supply/sc27xx-fg.yaml | 6 + .../x-powers,axp20x-battery-power-supply.yaml | 7 + .../supply/x-powers,axp20x-usb-power-supply.yaml | 72 +- .../device-tree/Bindings/power/wakeup-source.txt | 4 +- sys/contrib/device-tree/Bindings/ptp/fsl,ptp.yaml | 22 +- .../Bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 9 +- .../Bindings/pwm/cirrus,ep9301-pwm.yaml | 53 + .../device-tree/Bindings/pwm/pwm-amlogic.yaml | 17 + .../device-tree/Bindings/pwm/renesas,pwm-rcar.yaml | 1 + .../device-tree/Bindings/pwm/renesas,tpu-pwm.yaml | 1 + .../regulator/mediatek,mt6397-regulator.yaml | 238 ++ .../Bindings/regulator/microchip,mcp16502.yaml | 20 + .../Bindings/regulator/qcom,qca6390-pmu.yaml | 22 +- .../device-tree/Bindings/remoteproc/mtk,scp.yaml | 2 +- .../Bindings/remoteproc/qcom,glink-rpm-edge.yaml | 2 +- .../Bindings/remoteproc/qcom,rpm-proc.yaml | 4 +- .../Bindings/remoteproc/qcom,sm8550-pas.yaml | 3 + .../Bindings/remoteproc/ti,k3-m4f-rproc.yaml | 125 + .../Bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 1 + .../Bindings/reset/amlogic,meson-reset.yaml | 1 + .../device-tree/Bindings/reset/renesas,rst.yaml | 1 + .../reset/socionext,uniphier-glue-reset.yaml | 8 +- .../device-tree/Bindings/riscv/extensions.yaml | 7 + sys/contrib/device-tree/Bindings/riscv/sophgo.yaml | 5 + .../Bindings/rng/rockchip,rk3568-rng.yaml | 61 + .../device-tree/Bindings/rtc/fsl,ls-ftm-alarm.yaml | 2 +- .../Bindings/rtc/microcrystal,rv3028.yaml | 3 + .../device-tree/Bindings/rtc/sprd,sc2731-rtc.yaml | 49 + .../device-tree/Bindings/rtc/st,stm32-rtc.yaml | 28 + .../device-tree/Bindings/rtc/trivial-rtc.yaml | 9 +- .../device-tree/Bindings/serial/8250_omap.yaml | 1 + .../Bindings/serial/atmel,at91-usart.yaml | 9 +- .../device-tree/Bindings/serial/mediatek,uart.yaml | 1 + .../Bindings/serial/nvidia,tegra20-hsuart.yaml | 2 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 1 + .../device-tree/Bindings/serial/samsung_uart.yaml | 70 +- .../Bindings/serial/serial-peripheral-props.yaml | 41 + .../device-tree/Bindings/serial/serial.yaml | 26 +- .../Bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml | 44 + .../Bindings/soc/cirrus/cirrus,ep9301-syscon.yaml | 94 + .../Bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml | 210 ++ .../Bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml | 197 + .../Bindings/soc/fsl/cpm_qe/fsl,ucc-hdlc.yaml | 140 + .../Bindings/soc/fsl/fsl,layerscape-scfg.yaml | 3 + .../device-tree/Bindings/soc/fsl/fsl,rcpm.yaml | 87 + .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 5 + .../Bindings/soc/qcom/qcom,smd-rpm.yaml | 74 +- .../device-tree/Bindings/soc/qcom/qcom,smd.yaml | 2 +- .../device-tree/Bindings/soc/renesas/renesas.yaml | 14 + .../device-tree/Bindings/soc/rockchip/grf.yaml | 16 + .../Bindings/soc/samsung/exynos-usi.yaml | 15 +- .../Bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 +- .../device-tree/Bindings/soc/ti/ti,pruss.yaml | 20 + .../Bindings/sound/amlogic,axg-sound-card.yaml | 7 + .../Bindings/sound/amlogic,gx-sound-card.yaml | 7 + .../device-tree/Bindings/sound/cirrus,cs4271.yaml | 101 + .../Bindings/sound/cirrus,ep9301-i2s.yaml | 16 + .../Bindings/sound/davinci-mcasp-audio.yaml | 18 +- .../device-tree/Bindings/sound/dlg,da7213.yaml | 103 + .../device-tree/Bindings/sound/everest,es8326.yaml | 2 +- .../Bindings/sound/fsl,imx-audio-es8328.yaml | 111 + .../device-tree/Bindings/sound/fsl,saif.yaml | 83 + .../Bindings/sound/mediatek,mt8365-afe.yaml | 130 + .../Bindings/sound/mediatek,mt8365-mt6357.yaml | 107 + .../Bindings/sound/microchip,sama7g5-spdifrx.yaml | 5 +- .../Bindings/sound/qcom,apq8016-sbc-sndcard.yaml | 205 ++ .../Bindings/sound/qcom,lpass-wsa-macro.yaml | 22 +- .../device-tree/Bindings/sound/qcom,sm8250.yaml | 138 +- .../device-tree/Bindings/sound/realtek,rt5616.yaml | 12 + .../device-tree/Bindings/sound/renesas,rsnd.yaml | 8 +- .../device-tree/Bindings/sound/renesas,rz-ssi.yaml | 4 + .../Bindings/sound/rockchip,rk3308-codec.yaml | 4 + .../device-tree/Bindings/sound/samsung,odroid.yaml | 5 - .../device-tree/Bindings/sound/serial-midi.yaml | 3 + .../device-tree/Bindings/sound/st,sta350.txt | 2 +- .../device-tree/Bindings/sound/ti,pcm512x.yaml | 101 + .../Bindings/sound/ti,tlv320dac3100.yaml | 127 + .../device-tree/Bindings/sound/ti,tpa6130a2.yaml | 55 + .../device-tree/Bindings/spi/cdns,xspi.yaml | 32 +- .../Bindings/spi/cirrus,ep9301-spi.yaml | 70 + .../Bindings/spi/mediatek,spi-mt65xx.yaml | 1 + .../Bindings/spi/microchip,mpfs-spi.yaml | 7 +- .../device-tree/Bindings/spi/nxp,sc18is.yaml | 51 + .../device-tree/Bindings/spi/spi-nxp-fspi.yaml | 1 + .../device-tree/Bindings/spi/spi-rockchip.yaml | 1 + .../Bindings/thermal/amlogic,thermal.yaml | 3 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 3 +- .../Bindings/timer/brcm,bcm2835-system-timer.yaml | 50 + .../device-tree/Bindings/timer/fsl,ftm-timer.yaml | 59 + .../Bindings/timer/nxp,lpc3220-timer.yaml | 55 + .../Bindings/timer/rockchip,rk-timer.yaml | 1 + .../device-tree/Bindings/timer/ti,da830-timer.yaml | 68 + .../device-tree/Bindings/trivial-devices.yaml | 24 +- .../device-tree/Bindings/usb/fsl,ls1028a.yaml | 52 + .../device-tree/Bindings/usb/qcom,dwc3.yaml | 20 +- .../device-tree/Bindings/usb/ti,j721e-usb.yaml | 3 +- .../device-tree/Bindings/vendor-prefixes.yaml | 8 + .../Bindings/watchdog/cirrus,ep9301-wdt.yaml | 42 + .../Bindings/watchdog/nxp,lpc1850-wwdt.yaml | 52 + .../device-tree/Bindings/watchdog/qcom-wdt.yaml | 1 + .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 17 +- .../device-tree/Bindings/watchdog/snps,dw-wdt.yaml | 1 + .../Bindings/watchdog/st,stm32-iwdg.yaml | 6 + .../Bindings/watchdog/ti,davinci-wdt.yaml | 55 + .../Bindings/watchdog/zii,rave-wdt.yaml | 49 + sys/contrib/device-tree/Makefile | 24 +- .../device-tree/include/dt-bindings/arm/qcom,ids.h | 4 + .../device-tree/include/dt-bindings/clock/at91.h | 4 + .../include/dt-bindings/clock/axg-audio-clkc.h | 7 + .../dt-bindings/clock/cirrus,ep9301-syscon.h | 46 + .../include/dt-bindings/clock/exynos7885.h | 32 +- .../include/dt-bindings/clock/exynos850.h | 1 + .../include/dt-bindings/clock/nxp,imx95-clock.h | 3 + .../include/dt-bindings/clock/px30-cru.h | 4 - .../include/dt-bindings/clock/qcom,gcc-msm8998.h | 5 + .../include/dt-bindings/clock/qcom,gcc-sc8180x.h | 5 + .../include/dt-bindings/clock/qcom,sm4450-camcc.h | 106 + .../include/dt-bindings/clock/qcom,sm4450-dispcc.h | 51 + .../include/dt-bindings/clock/qcom,sm4450-gpucc.h | 62 + .../include/dt-bindings/clock/qcom,sm8150-camcc.h | 135 + .../include/dt-bindings/clock/qcom,sm8650-dispcc.h | 7 +- .../dt-bindings/clock/renesas,r9a09g057-cpg.h | 21 + .../include/dt-bindings/clock/rk3036-cru.h | 2 - .../include/dt-bindings/clock/rk3228-cru.h | 2 - .../include/dt-bindings/clock/rk3288-cru.h | 2 - .../include/dt-bindings/clock/rk3308-cru.h | 2 - .../include/dt-bindings/clock/rk3328-cru.h | 2 - .../include/dt-bindings/clock/rk3368-cru.h | 2 - .../include/dt-bindings/clock/rk3399-cru.h | 4 - .../dt-bindings/clock/rockchip,rk3576-cru.h | 592 +++ .../dt-bindings/clock/samsung,exynosautov9.h | 11 + .../dt-bindings/clock/samsung,exynosautov920.h | 191 + .../include/dt-bindings/iio/adi,ad4695.h | 9 + .../dt-bindings/interconnect/qcom,ipq5332.h | 46 + .../dt-bindings/interconnect/qcom,msm8937.h | 93 + .../dt-bindings/interconnect/qcom,msm8976.h | 97 + .../include/dt-bindings/interconnect/qcom,sm8350.h | 10 - .../dt-bindings/interrupt-controller/arm-gic.h | 2 + .../include/dt-bindings/mailbox/qcom-ipcc.h | 2 + .../include/dt-bindings/pinctrl/pinctrl-cv1800b.h | 63 + .../include/dt-bindings/pinctrl/pinctrl-cv1812h.h | 127 + .../include/dt-bindings/pinctrl/pinctrl-cv18xx.h | 19 + .../include/dt-bindings/pinctrl/pinctrl-sg2000.h | 127 + .../include/dt-bindings/pinctrl/pinctrl-sg2002.h | 79 + .../dt-bindings/power/rockchip,rk3576-power.h | 30 + .../dt-bindings/reset/rockchip,rk3576-cru.h | 564 +++ .../include/dt-bindings/soc/qe-fsl,tsa.h | 13 + .../device-tree/src/arm/amlogic/meson8b-ec100.dts | 2 - .../src/arm/arm/arm-realview-eb-mp.dtsi | 2 +- .../src/arm/arm/arm-realview-pb11mp.dts | 2 +- .../device-tree/src/arm/arm/arm-realview-pba8.dts | 2 +- .../src/arm/arm/arm-realview-pbx-a9.dts | 2 +- .../src/arm/aspeed/aspeed-bmc-ampere-mtjade.dts | 20 +- .../arm/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 154 + .../aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 - .../arm/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 12 +- .../src/arm/aspeed/aspeed-bmc-asrock-x570d4u.dts | 4 - .../arm/aspeed/aspeed-bmc-facebook-catalina.dts | 1110 ++++++ .../arm/aspeed/aspeed-bmc-facebook-greatlakes.dts | 2 +- .../src/arm/aspeed/aspeed-bmc-facebook-harma.dts | 177 +- .../src/arm/aspeed/aspeed-bmc-facebook-minerva.dts | 518 ++- .../src/arm/aspeed/aspeed-bmc-ibm-blueridge-4u.dts | 21 + .../src/arm/aspeed/aspeed-bmc-ibm-blueridge.dts | 1686 +++++++++ .../src/arm/aspeed/aspeed-bmc-ibm-bonnell.dts | 5 - .../src/arm/aspeed/aspeed-bmc-ibm-everest.dts | 5 - .../src/arm/aspeed/aspeed-bmc-ibm-fuji.dts | 3876 ++++++++++++++++++++ .../src/arm/aspeed/aspeed-bmc-ibm-rainier.dts | 5 - .../src/arm/aspeed/aspeed-bmc-ibm-system1.dts | 6 +- .../src/arm/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 4 - .../src/arm/aspeed/aspeed-bmc-inspur-on5263m5.dts | 4 - .../src/arm/aspeed/aspeed-bmc-intel-s2600wf.dts | 4 - .../src/arm/aspeed/aspeed-bmc-opp-lanyang.dts | 4 - .../src/arm/aspeed/aspeed-bmc-opp-nicole.dts | 4 - .../src/arm/aspeed/aspeed-bmc-opp-romulus.dts | 4 - .../src/arm/aspeed/aspeed-bmc-opp-swift.dts | 4 - .../src/arm/aspeed/aspeed-bmc-opp-tacoma.dts | 5 - .../src/arm/aspeed/aspeed-bmc-opp-witherspoon.dts | 9 - .../src/arm/aspeed/aspeed-bmc-opp-zaius.dts | 2 - .../arm/aspeed/aspeed-bmc-supermicro-x11spi.dts | 4 - .../device-tree/src/arm/aspeed/aspeed-g4.dtsi | 7 +- .../device-tree/src/arm/aspeed/aspeed-g5.dtsi | 18 +- .../device-tree/src/arm/aspeed/aspeed-g6.dtsi | 29 +- .../src/arm/aspeed/ibm-power11-quad.dtsi | 1539 ++++++++ .../src/arm/broadcom/bcm21664-garnet.dts | 4 + .../device-tree/src/arm/broadcom/bcm21664.dtsi | 342 +- .../src/arm/broadcom/bcm2166x-common.dtsi | 334 ++ .../device-tree/src/arm/broadcom/bcm23550.dtsi | 370 +- .../src/arm/broadcom/bcm2837-rpi-cm3-io3.dts | 2 +- .../device-tree/src/arm/broadcom/bcm2837.dtsi | 2 +- .../src/arm/broadcom/bcm53016-meraki-mr32.dts | 12 +- .../arm/broadcom/bcm958625-meraki-mx6x-common.dtsi | 12 +- .../device-tree/src/arm/cirrus/ep93xx-bk3.dts | 125 + .../device-tree/src/arm/cirrus/ep93xx-edb9302.dts | 181 + .../device-tree/src/arm/cirrus/ep93xx-ts7250.dts | 145 + sys/contrib/device-tree/src/arm/cirrus/ep93xx.dtsi | 444 +++ .../intel/socfpga/socfpga_cyclone5_vining_fpga.dts | 4 +- .../src/arm/marvell/armada-385-clearfog-gtr.dtsi | 8 +- .../src/arm/microchip/at91-sam9x60_curiosity.dts | 2 - .../src/arm/microchip/at91-sam9x60ek.dts | 4 - .../src/arm/microchip/at91-sama5d27_wlsom1.dtsi | 13 + .../src/arm/microchip/at91-sama5d29_curiosity.dts | 13 + .../src/arm/microchip/at91-sama5d2_icp.dts | 13 + .../src/arm/microchip/at91-sama7g54_curiosity.dts | 13 + .../src/arm/microchip/at91-sama7g5ek.dts | 53 + .../device-tree/src/arm/microchip/at91rm9200.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9260.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9261.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9263.dtsi | 2 +- .../src/arm/microchip/at91sam9g20ek_2mmc.dts | 4 +- .../at91sam9g25-gardena-smart-gateway.dts | 24 +- .../device-tree/src/arm/microchip/at91sam9g45.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9n12.dtsi | 2 +- .../src/arm/microchip/at91sam9n12ek.dts | 6 +- .../device-tree/src/arm/microchip/at91sam9rl.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9x5.dtsi | 2 +- .../src/arm/microchip/at91sam9x5cm.dtsi | 4 +- .../device-tree/src/arm/microchip/sam9x60.dtsi | 40 +- .../device-tree/src/arm/microchip/sama5d3.dtsi | 2 +- .../device-tree/src/arm/microchip/sama5d4.dtsi | 2 +- .../device-tree/src/arm/microchip/sama7g5.dtsi | 2 +- .../src/arm/nuvoton/nuvoton-npcm730-kudo.dts | 32 +- .../src/arm/nuvoton/nuvoton-npcm750-evb.dts | 6 +- .../nuvoton-wpcm450-supermicro-x9sci-ln4f.dts | 6 +- .../src/arm/nvidia/tegra114-asus-tf701t.dts | 1602 ++++++-- .../src/arm/nvidia/tegra20-trimslice.dts | 30 +- sys/contrib/device-tree/src/arm/nxp/imx/imx1.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx27.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx53-mba53.dts | 4 +- .../src/arm/nxp/imx/imx53-qsb-hdmi.dtso | 6 - .../device-tree/src/arm/nxp/imx/imx53-tqma53.dtsi | 4 +- .../device-tree/src/arm/nxp/imx/imx6q-cm-fx6.dts | 15 +- .../device-tree/src/arm/nxp/imx/imx6q-prti6q.dts | 15 +- .../device-tree/src/arm/nxp/imx/imx6q-tbs2910.dts | 9 +- .../src/arm/nxp/imx/imx6qdl-apalis.dtsi | 15 +- .../src/arm/nxp/imx/imx6qdl-apf6dev.dtsi | 9 +- .../src/arm/nxp/imx/imx6qdl-aristainetos2.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-colibri.dtsi | 15 +- .../src/arm/nxp/imx/imx6qdl-cubox-i.dtsi | 9 +- .../src/arm/nxp/imx/imx6qdl-gw52xx.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw53xx.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw54xx.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw553x.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw560x.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw5903.dtsi | 10 +- .../src/arm/nxp/imx/imx6qdl-gw5904.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw5910.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-gw5912.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-hummingboard.dtsi | 9 +- .../src/arm/nxp/imx/imx6qdl-icore-rqs.dtsi | 8 +- .../device-tree/src/arm/nxp/imx/imx6qdl-mba6a.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6qdl-mba6b.dtsi | 11 +- .../src/arm/nxp/imx/imx6qdl-sabreauto.dtsi | 13 +- .../device-tree/src/arm/nxp/imx/imx6qdl-tqma6.dtsi | 14 - .../src/arm/nxp/imx/imx6qdl-tqma6a.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-tqma6b.dtsi | 20 +- .../device-tree/src/arm/nxp/imx/imx6qdl-tx6.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-var-dart.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-var-som.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-wandboard.dtsi | 9 +- .../device-tree/src/arm/nxp/imx/imx6sl-evk.dts | 12 +- .../device-tree/src/arm/nxp/imx/imx6sl-warp.dts | 8 +- .../src/arm/nxp/imx/imx6sx-sabreauto.dts | 9 +- .../device-tree/src/arm/nxp/imx/imx6sx-sdb.dtsi | 9 +- .../src/arm/nxp/imx/imx6sx-udoo-neo.dtsi | 5 + .../src/arm/nxp/imx/imx6ul-14x14-evk.dtsi | 4 +- .../src/arm/nxp/imx/imx6ul-ccimx6ulsbcexpress.dts | 4 +- .../src/arm/nxp/imx/imx6ul-ccimx6ulsbcpro.dts | 14 +- .../src/arm/nxp/imx/imx6ul-ccimx6ulsom.dtsi | 4 +- .../device-tree/src/arm/nxp/imx/imx6ul-geam.dts | 6 +- .../device-tree/src/arm/nxp/imx/imx6ul-isiot.dtsi | 4 +- .../src/arm/nxp/imx/imx6ul-kontron-bl-common.dtsi | 2 +- .../src/arm/nxp/imx/imx6ul-liteboard.dts | 2 +- .../nxp/imx/imx6ul-phytec-segin-peb-wlbt-05.dtsi | 4 +- .../src/arm/nxp/imx/imx6ul-phytec-segin.dtsi | 6 +- .../src/arm/nxp/imx/imx6ul-tqma6ul-common.dtsi | 2 +- .../src/arm/nxp/imx/imx6ul-tx6ul-mainboard.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6ul-tx6ul.dtsi | 18 +- .../src/arm/nxp/imx/imx6ull-myir-mys-6ulx.dtsi | 8 +- .../arm/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi | 20 +- .../src/arm/nxp/imx/imx6ull-seeed-npi.dtsi | 6 +- .../src/arm/nxp/imx/imx6ulz-bsh-smm-m2.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx7-colibri.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx7-mba7.dtsi | 8 +- .../src/arm/nxp/imx/imx7d-nitrogen7.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx7d-pico.dtsi | 20 +- .../src/arm/nxp/imx/imx7d-remarkable2.dts | 8 +- .../device-tree/src/arm/nxp/imx/imx7d-sdb-reva.dts | 34 +- .../device-tree/src/arm/nxp/imx/imx7d-sdb.dts | 608 ++- .../device-tree/src/arm/nxp/imx/imx7d-zii-rmu2.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx7s-warp.dts | 4 +- .../device-tree/src/arm/nxp/imx/mba6ulx.dtsi | 6 +- .../src/arm/nxp/lpc/lpc4357-ea4357-devkit.dts | 4 +- .../src/arm/nxp/lpc/lpc4357-myd-lpc4357.dts | 2 +- .../device-tree/src/arm/nxp/mxs/imx23-evk.dts | 4 +- .../src/arm/nxp/mxs/imx23-olinuxino.dts | 4 +- .../device-tree/src/arm/nxp/mxs/imx23-sansa.dts | 4 +- .../src/arm/nxp/mxs/imx23-stmp378x_devb.dts | 4 +- .../device-tree/src/arm/nxp/mxs/imx23-xfi3.dts | 4 +- sys/contrib/device-tree/src/arm/nxp/mxs/imx23.dtsi | 4 +- .../src/arm/nxp/mxs/imx28-apx4devkit.dts | 20 +- .../device-tree/src/arm/nxp/mxs/imx28-cfa10037.dts | 4 +- .../device-tree/src/arm/nxp/mxs/imx28-lwe.dtsi | 38 +- .../device-tree/src/arm/nxp/mxs/imx28-tx28.dts | 2 +- sys/contrib/device-tree/src/arm/nxp/mxs/imx28.dtsi | 4 +- sys/contrib/device-tree/src/arm/qcom/pma8084.dtsi | 16 +- .../src/arm/qcom/qcom-apq8064-asus-nexus7-flo.dts | 4 - .../src/arm/qcom/qcom-apq8064-cm-qs600.dts | 25 +- .../src/arm/qcom/qcom-apq8064-ifc6410.dts | 25 +- .../src/arm/qcom/qcom-apq8064-pins.dtsi | 362 +- .../qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts | 10 +- .../device-tree/src/arm/qcom/qcom-apq8064.dtsi | 39 +- .../device-tree/src/arm/qcom/qcom-apq8084.dtsi | 2 +- .../src/arm/qcom/qcom-ipq4018-ap120c-ac.dtsi | 34 +- .../src/arm/qcom/qcom-ipq4018-jalapeno.dts | 27 +- .../src/arm/qcom/qcom-ipq4019-ap.dk01.1.dtsi | 26 +- .../src/arm/qcom/qcom-ipq4019-ap.dk04.1.dtsi | 14 +- .../src/arm/qcom/qcom-ipq4019-ap.dk07.1-c1.dts | 8 +- .../src/arm/qcom/qcom-ipq4019-ap.dk07.1-c2.dts | 2 +- .../src/arm/qcom/qcom-ipq4019-ap.dk07.1.dtsi | 6 +- .../src/arm/qcom/qcom-ipq8064-ap148.dts | 11 +- .../src/arm/qcom/qcom-ipq8064-rb3011.dts | 76 +- .../device-tree/src/arm/qcom/qcom-ipq8064.dtsi | 116 +- .../arm/qcom/qcom-msm8226-microsoft-common.dtsi | 26 + .../arm/qcom/qcom-msm8226-microsoft-moneypenny.dts | 3 + .../device-tree/src/arm/qcom/qcom-msm8226.dtsi | 136 +- .../src/arm/qcom/qcom-msm8926-microsoft-tesla.dts | 3 + .../device-tree/src/arm/qcom/qcom-msm8974.dtsi | 4 +- .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 13 + .../device-tree/src/arm/rockchip/rk3036-kylin.dts | 4 +- .../device-tree/src/arm/rockchip/rk3036.dtsi | 14 +- .../device-tree/src/arm/rockchip/rk3128.dtsi | 26 +- .../src/arm/rockchip/rv1108-elgin-r1.dts | 4 +- .../src/arm/rockchip/rv1126-pinctrl.dtsi | 256 ++ .../device-tree/src/arm/rockchip/rv1126.dtsi | 151 + .../device-tree/src/arm/st/stm32mp13-pinctrl.dtsi | 20 +- .../src/arm/st/stm32mp135f-dhcor-dhsbc.dts | 44 + .../device-tree/src/arm/st/stm32mp15-pinctrl.dtsi | 3 + .../device-tree/src/arm/st/stm32mp151a-prtt1a.dts | 12 +- .../device-tree/src/arm/st/stm32mp151a-prtt1c.dts | 108 +- .../device-tree/src/arm/st/stm32mp151a-prtt1l.dtsi | 126 +- .../device-tree/src/arm/st/stm32mp151a-prtt1s.dts | 16 +- .../src/arm/st/stm32mp151c-mecio1r0.dts | 48 + .../device-tree/src/arm/st/stm32mp151c-mect1s.dts | 290 ++ .../src/arm/st/stm32mp153c-mecio1r1.dts | 48 + .../src/arm/st/stm32mp15x-mecio1-io.dtsi | 527 +++ .../src/arm/st/stm32mp15xx-dhcom-pdk2.dtsi | 12 +- .../src/arm/ti/omap/am335x-bone-common.dtsi | 66 +- .../src/arm/ti/omap/am335x-boneblue.dts | 12 +- .../device-tree/src/arm/ti/omap/am335x-nano.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-regor.dtsi | 10 +- .../device-tree/src/arm/ti/omap/am335x-wega.dtsi | 7 +- .../src/arm/xilinx/zynq-zturn-common.dtsi | 4 +- .../src/arm64/allwinner/sun50i-a64.dtsi | 16 + .../arm64/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 37 + .../src/arm64/allwinner/sun50i-h616.dtsi | 2 + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 27 +- .../allwinner/sun50i-h700-anbernic-rg35xx-sp.dts | 34 + .../src/arm64/amlogic/amlogic-a4-common.dtsi | 14 + .../device-tree/src/arm64/amlogic/amlogic-a5.dtsi | 10 + .../src/arm64/amlogic/amlogic-c3-c302x-aw409.dts | 231 ++ .../src/arm64/amlogic/amlogic-c3-c308l-aw419.dts | 260 ++ .../device-tree/src/arm64/amlogic/amlogic-c3.dtsi | 503 ++- .../device-tree/src/arm64/amlogic/amlogic-t7.dtsi | 8 + .../src/arm64/amlogic/meson-axg-s400.dts | 4 + .../src/arm64/amlogic/meson-g12a-fbx8am.dts | 4 + .../src/arm64/amlogic/meson-g12a-radxa-zero.dts | 4 + .../src/arm64/amlogic/meson-g12a-sei510.dts | 4 + .../src/arm64/amlogic/meson-g12a-u200.dts | 4 + .../src/arm64/amlogic/meson-g12a-x96-max.dts | 4 + .../amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 4 + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 4 + .../src/arm64/amlogic/meson-g12b-bananapi.dtsi | 4 + .../src/arm64/amlogic/meson-g12b-dreambox.dtsi | 6 + .../src/arm64/amlogic/meson-g12b-gsking-x.dts | 4 + .../src/arm64/amlogic/meson-g12b-gtking-pro.dts | 4 + .../src/arm64/amlogic/meson-g12b-gtking.dts | 4 + .../arm64/amlogic/meson-g12b-odroid-go-ultra.dts | 4 + .../src/arm64/amlogic/meson-g12b-odroid-n2.dtsi | 4 + .../src/arm64/amlogic/meson-g12b-odroid-n2l.dts | 4 + .../src/arm64/amlogic/meson-g12b-radxa-zero2.dts | 4 + .../src/arm64/amlogic/meson-g12b-ugoos-am6.dts | 4 + .../src/arm64/amlogic/meson-gx-libretech-pc.dtsi | 4 + .../src/arm64/amlogic/meson-gx-p23x-q20x.dtsi | 4 + .../src/arm64/amlogic/meson-gxbb-kii-pro.dts | 4 + .../src/arm64/amlogic/meson-gxbb-nanopi-k2.dts | 4 + .../src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts | 4 + .../src/arm64/amlogic/meson-gxbb-odroidc2.dts | 4 + .../src/arm64/amlogic/meson-gxbb-p200.dts | 4 + .../src/arm64/amlogic/meson-gxbb-p201.dts | 4 + .../src/arm64/amlogic/meson-gxbb-vega-s95.dtsi | 4 + .../src/arm64/amlogic/meson-gxbb-wetek-hub.dts | 4 + .../src/arm64/amlogic/meson-gxbb-wetek-play2.dts | 4 + .../arm64/amlogic/meson-gxl-s805x-libretech-ac.dts | 4 + .../src/arm64/amlogic/meson-gxl-s805x-p241.dts | 4 + .../arm64/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 + .../arm64/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 + .../src/arm64/amlogic/meson-gxl-s905x-p212.dts | 4 + .../src/arm64/amlogic/meson-gxl-s905x-vero4k.dts | 5 + .../src/arm64/amlogic/meson-gxlx-s905l-p271.dts | 4 - .../src/arm64/amlogic/meson-gxm-khadas-vim2.dts | 4 + .../src/arm64/amlogic/meson-gxm-nexbox-a1.dts | 4 + .../src/arm64/amlogic/meson-gxm-rbox-pro.dts | 4 + .../src/arm64/amlogic/meson-khadas-vim3.dtsi | 4 + .../arm64/amlogic/meson-libretech-cottonwood.dtsi | 4 + .../src/arm64/amlogic/meson-s4-s805x2-aq222.dts | 145 + .../device-tree/src/arm64/amlogic/meson-s4.dtsi | 136 + .../arm64/amlogic/meson-sm1-a95xf3-air-gbit.dts | 4 + .../src/arm64/amlogic/meson-sm1-a95xf3-air.dts | 4 + .../arm64/amlogic/meson-sm1-bananapi-m2-pro.dts | 4 + .../src/arm64/amlogic/meson-sm1-bananapi-m5.dts | 4 + .../src/arm64/amlogic/meson-sm1-h96-max.dts | 4 + .../src/arm64/amlogic/meson-sm1-odroid.dtsi | 4 + .../src/arm64/amlogic/meson-sm1-sei610.dts | 4 + .../src/arm64/amlogic/meson-sm1-x96-air-gbit.dts | 4 + .../src/arm64/amlogic/meson-sm1-x96-air.dts | 4 + .../device-tree/src/arm64/apm/apm-storm.dtsi | 2 +- .../device-tree/src/arm64/arm/foundation-v8.dtsi | 4 +- .../device-tree/src/arm64/arm/fvp-base-revc.dts | 4 +- .../device-tree/src/arm64/arm/rtsm_ve-aemv8a.dts | 4 +- .../src/arm64/broadcom/bcm2712-rpi-5-b.dts | 64 + .../device-tree/src/arm64/broadcom/bcm2712.dtsi | 283 ++ .../src/arm64/exynos/exynos7885-jackpotlte.dts | 2 +- .../device-tree/src/arm64/exynos/exynosautov9.dtsi | 46 + .../src/arm64/exynos/exynosautov920.dtsi | 40 +- .../device-tree/src/arm64/exynos/google/gs101.dtsi | 15 + .../src/arm64/freescale/fsl-ls1012a-frdm.dts | 12 +- .../src/arm64/freescale/fsl-ls1012a.dtsi | 5 +- .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 12 + .../src/arm64/freescale/fsl-ls1028a.dtsi | 29 +- .../src/arm64/freescale/fsl-ls1043-post.dtsi | 3 + .../src/arm64/freescale/fsl-ls1043a-qds.dts | 2 +- .../src/arm64/freescale/fsl-ls1043a.dtsi | 15 +- .../src/arm64/freescale/fsl-ls1046-post.dtsi | 4 + .../src/arm64/freescale/fsl-ls1046a-qds.dts | 2 +- .../src/arm64/freescale/fsl-ls1046a.dtsi | 13 +- .../src/arm64/freescale/fsl-ls1088a-rdb.dts | 7 + .../src/arm64/freescale/fsl-ls1088a-ten64.dts | 6 +- .../src/arm64/freescale/fsl-ls1088a.dtsi | 17 +- .../src/arm64/freescale/fsl-ls208xa-qds.dtsi | 2 +- .../src/arm64/freescale/fsl-ls208xa.dtsi | 34 +- .../freescale/fsl-lx2160a-tqmlx2160a-mblx2160a.dts | 4 +- .../src/arm64/freescale/fsl-lx2160a.dtsi | 17 +- .../src/arm64/freescale/imx8-ss-dma.dtsi | 18 +- .../src/arm64/freescale/imx8-ss-img.dtsi | 2 - .../src/arm64/freescale/imx8-ss-lvds0.dtsi | 63 + .../src/arm64/freescale/imx8-ss-lvds1.dtsi | 114 + .../src/arm64/freescale/imx8-ss-mipi0.dtsi | 129 + .../src/arm64/freescale/imx8-ss-mipi1.dtsi | 138 + .../src/arm64/freescale/imx8-ss-vpu.dtsi | 4 +- .../src/arm64/freescale/imx8dx-colibri.dtsi | 11 + .../src/arm64/freescale/imx8dxl-evk.dts | 6 - .../arm64/freescale/imx8mm-beacon-baseboard.dtsi | 16 + .../src/arm64/freescale/imx8mm-beacon-kit.dts | 4 +- .../arm64/freescale/imx8mm-data-modul-edm-sbc.dts | 19 +- .../src/arm64/freescale/imx8mm-emtop-baseboard.dts | 48 + .../src/arm64/freescale/imx8mm-evk.dtsi | 15 +- .../arm64/freescale/imx8mm-phyboard-polis-rdk.dts | 1 + .../imx8mm-phygate-tauri-l-rs232-rs232.dtso | 7 +- .../imx8mm-phygate-tauri-l-rs232-rs485.dtso | 7 +- .../imx8mm-phygate-tauri-l-rs232-rts-cts.dtso | 6 - .../src/arm64/freescale/imx8mm-phygate-tauri-l.dts | 1 + .../src/arm64/freescale/imx8mm-tqma8mqml.dtsi | 1 - .../src/arm64/freescale/imx8mm-var-som.dtsi | 1 - .../freescale/imx8mm-venice-gw72xx-0x-imx219.dtso | 16 + .../imx8mm-venice-gw72xx-0x-rs232-rts.dtso | 6 +- .../freescale/imx8mm-venice-gw72xx-0x-rs422.dtso | 8 +- .../freescale/imx8mm-venice-gw72xx-0x-rs485.dtso | 8 +- .../freescale/imx8mm-venice-gw73xx-0x-imx219.dtso | 16 + .../imx8mm-venice-gw73xx-0x-rs232-rts.dtso | 2 +- .../freescale/imx8mm-venice-gw73xx-0x-rs422.dtso | 4 +- .../freescale/imx8mm-venice-gw73xx-0x-rs485.dtso | 4 +- .../arm64/freescale/imx8mm-venice-gw75xx-0x.dts | 28 + .../src/arm64/freescale/imx8mm-venice-gw75xx.dtsi | 303 ++ .../src/arm64/freescale/imx8mm-venice-gw7901.dts | 2 + .../src/arm64/freescale/imx8mm-venice-gw7902.dts | 2 + .../src/arm64/freescale/imx8mm-venice-gw7903.dts | 2 + .../src/arm64/freescale/imx8mm-venice-gw7904.dts | 2 + .../arm64/freescale/imx8mn-beacon-baseboard.dtsi | 16 + .../src/arm64/freescale/imx8mn-beacon-kit.dts | 4 +- .../src/arm64/freescale/imx8mn-evk.dtsi | 15 +- .../src/arm64/freescale/imx8mn-venice-gw7902.dts | 2 + .../src/arm64/freescale/imx8mp-beacon-kit.dts | 48 + .../arm64/freescale/imx8mp-data-modul-edm-sbc.dts | 47 +- .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 46 + .../arm64/freescale/imx8mp-phyboard-pollux-rdk.dts | 78 + .../src/arm64/freescale/imx8mp-phycore-no-eth.dtso | 16 + .../src/arm64/freescale/imx8mp-phycore-som.dtsi | 10 + .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 1 + .../arm64/freescale/imx8mp-var-som-symphony.dts | 11 + .../src/arm64/freescale/imx8mp-var-som.dtsi | 359 ++ .../freescale/imx8mp-venice-gw74xx-imx219.dtso | 16 +- .../arm64/freescale/imx8mp-venice-gw75xx-2x.dts | 28 + .../src/arm64/freescale/imx8mp-venice-gw75xx.dtsi | 309 ++ .../src/arm64/freescale/imx8mp-verdin-dahlia.dtsi | 10 + .../src/arm64/freescale/imx8mp-verdin-dev.dtsi | 10 + .../src/arm64/freescale/imx8mp-verdin-mallow.dtsi | 10 + .../src/arm64/freescale/imx8mp-verdin-wifi.dtsi | 1 - .../src/arm64/freescale/imx8mp-verdin-yavia.dtsi | 10 + .../src/arm64/freescale/imx8mp-verdin.dtsi | 8 + .../device-tree/src/arm64/freescale/imx8mp.dtsi | 73 +- .../device-tree/src/arm64/freescale/imx8mq-evk.dts | 24 +- .../device-tree/src/arm64/freescale/imx8qm-mek.dts | 284 +- .../src/arm64/freescale/imx8qm-ss-lvds.dtsi | 76 + .../src/arm64/freescale/imx8qm-ss-mipi.dtsi | 19 + .../device-tree/src/arm64/freescale/imx8qm.dtsi | 27 + .../src/arm64/freescale/imx8qxp-ss-vpu.dtsi | 8 + .../device-tree/src/arm64/freescale/imx8ulp.dtsi | 2 +- .../src/arm64/freescale/imx8x-colibri-aster.dtsi | 36 + .../src/arm64/freescale/imx8x-colibri-eval-v3.dtsi | 36 + .../src/arm64/freescale/imx8x-colibri-iris.dtsi | 36 + .../src/arm64/freescale/imx8x-colibri.dtsi | 212 +- .../src/arm64/freescale/imx93-11x11-evk.dts | 185 +- .../src/arm64/freescale/imx93-14x14-evk.dts | 468 +++ .../src/arm64/freescale/imx93-9x9-qsb.dts | 2 - .../src/arm64/freescale/imx93-kontron-bl-osm-s.dts | 163 + .../src/arm64/freescale/imx93-kontron-osm-s.dtsi | 628 ++++ .../arm64/freescale/imx93-tqma9352-mba93xxca.dts | 301 +- .../arm64/freescale/imx93-tqma9352-mba93xxla.dts | 320 +- .../src/arm64/freescale/imx93-tqma9352.dtsi | 172 +- .../device-tree/src/arm64/freescale/imx93.dtsi | 47 + .../src/arm64/freescale/imx95-19x19-evk.dts | 340 ++ .../device-tree/src/arm64/freescale/imx95.dtsi | 454 ++- .../device-tree/src/arm64/freescale/mba8mx.dtsi | 9 +- .../src/arm64/freescale/qoriq-fman3-0-10g-0.dtsi | 1 + .../src/arm64/freescale/qoriq-fman3-0-10g-1.dtsi | 1 + .../src/arm64/freescale/qoriq-fman3-0-1g-0.dtsi | 1 + .../src/arm64/freescale/qoriq-fman3-0-1g-1.dtsi | 1 + .../src/arm64/freescale/qoriq-fman3-0-1g-2.dtsi | 1 + .../src/arm64/freescale/qoriq-fman3-0-1g-3.dtsi | 1 + .../src/arm64/freescale/qoriq-fman3-0-1g-4.dtsi | 1 + .../device-tree/src/arm64/freescale/s32g2.dtsi | 50 + .../src/arm64/freescale/s32g274a-evb.dts | 1 + .../src/arm64/freescale/s32g274a-rdb2.dts | 1 + .../device-tree/src/arm64/freescale/s32g3.dtsi | 52 +- .../src/arm64/freescale/s32g399a-rdb3.dts | 3 +- .../device-tree/src/arm64/freescale/s32v234.dtsi | 2 +- .../src/arm64/marvell/cn9130-sr-som.dtsi | 2 +- .../device-tree/src/arm64/mediatek/mt6357.dtsi | 5 + .../device-tree/src/arm64/mediatek/mt6358.dtsi | 5 + .../device-tree/src/arm64/mediatek/mt6359.dtsi | 5 + .../device-tree/src/arm64/mediatek/mt7981b.dtsi | 75 + .../src/arm64/mediatek/mt8183-kukui-jacuzzi.dtsi | 13 +- .../src/arm64/mediatek/mt8183-kukui.dtsi | 26 +- .../device-tree/src/arm64/mediatek/mt8183.dtsi | 13 +- .../src/arm64/mediatek/mt8186-corsola.dtsi | 5 +- .../device-tree/src/arm64/mediatek/mt8186.dtsi | 345 +- .../device-tree/src/arm64/mediatek/mt8188.dtsi | 482 +++ .../src/arm64/mediatek/mt8195-cherry-dojo-r1.dts | 11 +- .../src/arm64/mediatek/mt8195-cherry-tomato-r2.dts | 11 +- .../src/arm64/mediatek/mt8195-cherry-tomato-r3.dts | 11 +- .../src/arm64/mediatek/mt8195-cherry.dtsi | 6 +- .../device-tree/src/arm64/mediatek/mt8195.dtsi | 15 +- .../device-tree/src/arm64/mediatek/mt8365-evk.dts | 86 + .../device-tree/src/arm64/mediatek/mt8365.dtsi | 43 +- .../src/arm64/mediatek/mt8395-genio-1200-evk.dts | 2 - .../mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1 + .../src/arm64/mediatek/mt8395-radxa-nio-12l.dts | 2 + .../src/arm64/nuvoton/ma35d1-iot-512m.dts | 80 +- .../src/arm64/nuvoton/ma35d1-som-256m.dts | 83 +- .../device-tree/src/arm64/nuvoton/ma35d1.dtsi | 151 +- .../src/arm64/nvidia/tegra210-p2180.dtsi | 64 + .../src/arm64/nvidia/tegra210-p2597.dtsi | 53 +- .../src/arm64/nvidia/tegra234-p3701-0000.dtsi | 135 - .../src/arm64/nvidia/tegra234-p3701-0008.dtsi | 142 +- .../src/arm64/nvidia/tegra234-p3701.dtsi | 125 + .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 108 +- .../nvidia/tegra234-p3740-0002+p3701-0008.dts | 230 +- .../nvidia/tegra234-p3768-0000+p3767-0000.dts | 17 - .../arm64/nvidia/tegra234-p3768-0000+p3767.dtsi | 26 + .../device-tree/src/arm64/nvidia/tegra234.dtsi | 33 + .../device-tree/src/arm64/qcom/ipq5332.dtsi | 7 +- .../device-tree/src/arm64/qcom/ipq6018.dtsi | 2 +- .../device-tree/src/arm64/qcom/ipq9574.dtsi | 2 +- .../src/arm64/qcom/msm8916-longcheer-l8910.dts | 27 + .../arm64/qcom/msm8916-samsung-fortuna-common.dtsi | 2 + .../src/arm64/qcom/msm8916-samsung-grandmax.dts | 24 +- .../src/arm64/qcom/msm8916-samsung-gt58.dts | 1 + .../src/arm64/qcom/msm8916-samsung-j3-common.dtsi | 62 + .../src/arm64/qcom/msm8916-samsung-j3ltetw.dts | 31 + .../src/arm64/qcom/msm8916-samsung-rossa.dts | 20 + .../src/arm64/qcom/msm8916-wingtech-wt86518.dts | 87 + .../src/arm64/qcom/msm8916-wingtech-wt86528.dts | 158 + .../src/arm64/qcom/msm8916-wingtech-wt865x8.dtsi | 215 ++ .../device-tree/src/arm64/qcom/msm8916.dtsi | 2 +- .../device-tree/src/arm64/qcom/msm8929-pm8916.dtsi | 162 + .../src/arm64/qcom/msm8929-wingtech-wt82918hd.dts | 17 + .../device-tree/src/arm64/qcom/msm8929.dtsi | 7 + .../src/arm64/qcom/msm8939-longcheer-l9100.dts | 27 + .../src/arm64/qcom/msm8939-samsung-a7.dts | 2 +- .../src/arm64/qcom/msm8939-wingtech-wt82918.dts | 17 + .../src/arm64/qcom/msm8939-wingtech-wt82918.dtsi | 252 ++ .../src/arm64/qcom/msm8939-wingtech-wt82918hd.dts | 17 + .../device-tree/src/arm64/qcom/msm8939.dtsi | 4 +- .../device-tree/src/arm64/qcom/msm8953.dtsi | 2 +- .../device-tree/src/arm64/qcom/msm8976.dtsi | 7 +- .../device-tree/src/arm64/qcom/msm8992-lg-h815.dts | 231 ++ .../device-tree/src/arm64/qcom/msm8994.dtsi | 2 +- .../device-tree/src/arm64/qcom/msm8996.dtsi | 2 +- .../device-tree/src/arm64/qcom/msm8998.dtsi | 29 +- sys/contrib/device-tree/src/arm64/qcom/pm8950.dtsi | 10 +- .../device-tree/src/arm64/qcom/pmi8950.dtsi | 3 +- .../device-tree/src/arm64/qcom/pmi8994.dtsi | 3 + .../device-tree/src/arm64/qcom/qcm2290.dtsi | 2 +- .../device-tree/src/arm64/qcom/qcm6490-idp.dts | 33 + sys/contrib/device-tree/src/arm64/qcom/qcs404.dtsi | 2 +- .../device-tree/src/arm64/qcom/sa8155p.dtsi | 4 + .../device-tree/src/arm64/qcom/sa8295p-adp.dts | 83 + .../device-tree/src/arm64/qcom/sa8775p-ride.dtsi | 25 + .../device-tree/src/arm64/qcom/sa8775p.dtsi | 1006 +++++ .../src/arm64/qcom/sc8180x-lenovo-flex-5g.dts | 38 + .../device-tree/src/arm64/qcom/sc8180x-pmics.dtsi | 18 +- .../device-tree/src/arm64/qcom/sc8180x-primus.dts | 64 + .../device-tree/src/arm64/qcom/sc8180x.dtsi | 181 +- .../device-tree/src/arm64/qcom/sc8280xp-crd.dts | 16 +- .../arm64/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 83 +- sys/contrib/device-tree/src/arm64/qcom/sdm630.dtsi | 2 +- .../device-tree/src/arm64/qcom/sdx75-idp.dts | 6 + sys/contrib/device-tree/src/arm64/qcom/sdx75.dtsi | 65 +- sys/contrib/device-tree/src/arm64/qcom/sm4450.dtsi | 38 + .../src/arm64/qcom/sm6115-fxtec-pro1x.dts | 343 +- sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi | 2 +- sys/contrib/device-tree/src/arm64/qcom/sm6125.dtsi | 2 +- sys/contrib/device-tree/src/arm64/qcom/sm6375.dtsi | 2 +- .../src/arm64/qcom/sm7125-xiaomi-common.dtsi | 2 + .../device-tree/src/arm64/qcom/sm8150-mtp.dts | 5 - sys/contrib/device-tree/src/arm64/qcom/sm8150.dtsi | 13 + sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi | 31 +- sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi | 16 +- sys/contrib/device-tree/src/arm64/qcom/sm8450.dtsi | 2 +- .../device-tree/src/arm64/qcom/sm8550-hdk.dts | 113 +- .../device-tree/src/arm64/qcom/sm8550-qrd.dts | 26 +- sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi | 252 ++ .../device-tree/src/arm64/qcom/sm8650-hdk.dts | 26 +- .../device-tree/src/arm64/qcom/sm8650-qrd.dts | 28 +- sys/contrib/device-tree/src/arm64/qcom/sm8650.dtsi | 291 ++ .../arm64/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 809 ++++ .../src/arm64/qcom/x1e80100-asus-vivobook-s15.dts | 6 +- .../device-tree/src/arm64/qcom/x1e80100-crd.dts | 106 +- .../src/arm64/qcom/x1e80100-lenovo-yoga-slim7x.dts | 23 +- .../src/arm64/qcom/x1e80100-microsoft-romulus.dtsi | 837 +++++ .../arm64/qcom/x1e80100-microsoft-romulus13.dts | 13 + .../arm64/qcom/x1e80100-microsoft-romulus15.dts | 13 + .../device-tree/src/arm64/qcom/x1e80100-pmics.dtsi | 10 + .../device-tree/src/arm64/qcom/x1e80100-qcp.dts | 16 +- .../device-tree/src/arm64/qcom/x1e80100.dtsi | 529 ++- .../device-tree/src/arm64/renesas/r8a774a1.dtsi | 6 + .../device-tree/src/arm64/renesas/r8a774b1.dtsi | 26 + .../device-tree/src/arm64/renesas/r8a774c0.dtsi | 3 + .../device-tree/src/arm64/renesas/r8a774e1.dtsi | 8 + .../device-tree/src/arm64/renesas/r8a77960.dtsi | 2 + .../device-tree/src/arm64/renesas/r8a77961.dtsi | 2 + .../device-tree/src/arm64/renesas/r8a77965.dtsi | 22 + .../device-tree/src/arm64/renesas/r8a77970.dtsi | 1 + .../device-tree/src/arm64/renesas/r8a77980.dtsi | 2 + .../device-tree/src/arm64/renesas/r8a779a0.dtsi | 128 +- .../device-tree/src/arm64/renesas/r8a779g0.dtsi | 207 +- *** 1497 LINES SKIPPED *** From nobody Thu Jan 2 12:35:08 2025 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 4YP5l04yKhz5j975; Thu, 02 Jan 2025 12:35:08 +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 4YP5l0411Cz4FTX; Thu, 2 Jan 2025 12:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735821308; 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=C1Z4x2t7+piejvUOYNB35XXe7zBVdhxPWpWinJyftr0=; b=jPxf7kR7nECvVdUp43l3EA78kNvBr8vv7ME3Bt2E0vMyUYS3QYMufjWyDD0rqRlm3GV0Fx W9TGgTUDZ5rbHm0HP3bZiTqlo9wwLJlA3o8tCzcR6Lg73JRkOaEoBhbvD8Eu+KWQ900mnZ xBD4UvU2dgyBpEA/Bjbn6SI7tE1x+CvfWthSTwI3l72YCKgfnsxZDu0f5FNC1xBLJg0IKW +7eEe+zy3kzvL/0O8XQiFZTgwXD8cJI18zqe9+kavfHLdfPv1NVWjWnAfcFRwHlJnsNi+g WxEg3zYohENPZjsAUvkQ2KWbaHfjqh4Q6Tq/6ARB/jWAOIUg7vVkdYvklZ/S2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735821308; 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=C1Z4x2t7+piejvUOYNB35XXe7zBVdhxPWpWinJyftr0=; b=JgqH3R6VNQ1251ngxdOGyhRgX8JBw8N5Z2aUW8HcK3yzXLI3c3kJtgTONdO0MSg8K1PoYz OVQIvcdfvCCAF1foUnigrAXGpgCWrnMne7yDisvWjzwsHjalOKcSyBvHktSx1kmSNVM8Lp NSEljh79+S6vb/1zgjrNyKc4FVMtC/uX9WBuWRFT6E4ZG5LYqnkUFsbqTR1ivKw3qo9B46 4dmCaodcUP9siaP4G4N3QRPdOrCfuOhM5Ij9GbYrxgxEjtg21Ju0GEhxgle64zSNrkvPfy QUgWckeuPjTZYxOAC54u+mnq+hEgnMkjoC33cEV/NXw0h1pCcGb4yD3NQ076hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735821308; a=rsa-sha256; cv=none; b=jcXorIB8aGfseWUA6LBuA7If7lKoWLkgBvuu67jo8Y+sH8pkwraLiBnDGP26NdFW6xg52W PJ7PpkqVFivIwcIsOUyZawHi+X5KprsmLwiMXtZ/fNjW0Ktgd9Ej1V8hruwT9+Y0egM6Zl KYuks0bHQOrSCzVbR4RjcXcIil2eLyVnVeOdC5BpIpG7tT43KpTsLa0UK77zSmhxzP3Urt 2h6hpm/XWYF/LzQVzmQky4BejARQX7q1TfbBohCK5L6Jk9J1fQugbdXONGPSYg1jCWDy6d CJkO7NZdzSE5jUbqxbqIjBKsPfJ/l55zin+ACmc9t4MNFocn1DxDcPs32YJHYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YP5l03V9kzdWX; Thu, 02 Jan 2025 12:35:08 +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 502CZ8P7007494; Thu, 2 Jan 2025 12:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502CZ81v007491; Thu, 2 Jan 2025 12:35:08 GMT (envelope-from git) Date: Thu, 2 Jan 2025 12:35:08 GMT Message-Id: <202501021235.502CZ81v007491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0749d8134300 - main - pf tests: check cleared time when zeroing stats for table addresses 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0749d8134300b8e3c956e161890ab496247d2542 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0749d8134300b8e3c956e161890ab496247d2542 commit 0749d8134300b8e3c956e161890ab496247d2542 Author: Leonid Evdokimov AuthorDate: 2025-01-02 09:30:06 +0000 Commit: Kristof Provost CommitDate: 2025-01-02 12:34:50 +0000 pf tests: check cleared time when zeroing stats for table addresses Verify that we reset the cleared time when we zero an address' counters in a table. PR: 282877, 282984 Reviewed by: kp MFC after: 2 weeks Signed-off-by: Leonid Evdokimov Differential Revision: https://reviews.freebsd.org/D48242 --- tests/sys/netpfil/pf/table.sh | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 62c9d66d80ce..f655463f3c03 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -116,6 +116,20 @@ zero_one_head() atf_set require.user root } +pft_cleared_ctime() +{ + jexec "$1" pfctl -t "$2" -vvT show | awk -v ip="$3" ' + ($1 == ip) { m = 1 } + ($1 == "Cleared:" && m) { + sub("[[:space:]]*Cleared:[[:space:]]*", ""); print; exit }' +} + +ctime_to_unixtime() +{ + # NB: it's not TZ=UTC, it's TZ=/etc/localtime + date -jf '%a %b %d %H:%M:%S %Y' "$1" '+%s' +} + zero_one_body() { epair_send=$(vnet_mkepair) @@ -145,16 +159,31 @@ zero_one_body() -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ jexec alcatraz pfctl -t foo -T show -vv + local uniq base ts1 ts3 + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal 1 "$uniq" # time they were added + + base=`pft_cleared_ctime alcatraz foo 192.0.2.1` + atf_check -s exit:0 -e ignore \ jexec alcatraz pfctl -t foo -T zero 192.0.2.3 + ts1=`pft_cleared_ctime alcatraz foo 192.0.2.1` + atf_check_equal "$base" "$ts1" + + ts3=`pft_cleared_ctime alcatraz foo 192.0.2.3` + atf_check test "$ts1" != "$ts3" + + ts1=`ctime_to_unixtime "$ts1"` + ts3=`ctime_to_unixtime "$ts3"` + atf_check test $(( "$ts3" - "$ts1" )) -lt 10 # (3 pings * 2) + epsilon + atf_check test "$ts1" -lt "$ts3" + # We now have a zeroed and a non-zeroed counter, so both patterns # should match atf_check -s exit:0 -e ignore \ -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ - jexec alcatraz pfctl -t foo -T show -vv - atf_check -s exit:0 -e ignore \ -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ jexec alcatraz pfctl -t foo -T show -vv From nobody Thu Jan 2 15:19:18 2025 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 4YP9NQ2GmPz5jKvG; Thu, 02 Jan 2025 15:19:18 +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 4YP9NQ1fgLz4S0p; Thu, 2 Jan 2025 15:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735831158; 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=aonabYLFh+cIIJEBCj1+3kZVsjkGACgkVV16mK0lhdk=; b=rkZkxupoS8laGIDuT1ruSSVLniZ+48dqpwP3ErwQ9mAAVme837gi8SiUMXhA83VSKAs7H+ 8r7BI2gyFhWk4SwaE4+rl2D4YG/pXXNCzd3j+bgO51CMtvrVHwb2e7AvG5ZDeo3msfZN+d FpJ6MF2s8k+fxMoT1C4x4aE52GgRtPpfygz6bs/bxeCNO1mCYmv8NuMFl8kVwwQysLsX1o KlNCnKZav6LCKxrUS/871ERR9LCw6l3GoXHdiLkiw6LnXz/4X2ye9v4DkGmBXMg31T+iDe W8M9GkdBK1UYuNGNJv9A6SKfhEZB5pASm4sJrgbmwEXZeBdw+kzAL5+DzH4Krg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735831158; 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=aonabYLFh+cIIJEBCj1+3kZVsjkGACgkVV16mK0lhdk=; b=VDOnWp9i89K2imWjmw3rDbDKXEl/lVjd9SB/OyqysRHGlfJahlqIMdpIfJ5dY4QlMaLINx g27gUO14MmDzYIJ4Ky/ZENaECnqhzKXIZId2y18XmmIOkKbY5pDQWQyEjAq58mOldz5R4r rlaLaKvZA9f1bdLlxGxpyF2MIi5K2foyhxBvIQ4D8X5PIp+WGlSLnfoZVL8eqVsIMSXAVg RMePnj/wxfhjbZPrTxYaKyf1uNHoZfFVxWI5qnLyLH/PbDkaqvlueOE88EUEbOhLs/+b0s 265c6I2IVDX/6mBz6KyZsODr5A3s1AmEMRQp0udzO38lC4cn5tnOL8XSsKTDag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735831158; a=rsa-sha256; cv=none; b=u30HbmhrqLZplGn6U4udtXWNCBaowTkNWc2Lj9QFsyDbr4ITMtzh+vBVY+MiOhVkrbnnS8 I1mQokPDC80weqbCT0foexp4vt5B5eD/ETJ1xQnhdQRDOWie5SOHqmS3Hj4uRo3Z1kK5cT HzxM5MN6vOqsx7lQDGDEklVEBdnqpGPt8Oce8up5W+/a+ANyjl8CfmKnEO4XDYmrg7y8Bf eH9wOG7y8r/xfDnbQ1Baz96hmOqoVpTSF2HUMob+Ml0aMqFxN+TqwuxJ74198WcA4gc3qs IF3tFlriAhePjXRr03eGmMjYogldgdgzHCk6QtHUFBqBBxPSo3hxL6zf3XY1GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YP9NQ1DPSzjJP; Thu, 02 Jan 2025 15:19:18 +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 502FJIZC007699; Thu, 2 Jan 2025 15:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502FJIhJ007696; Thu, 2 Jan 2025 15:19:18 GMT (envelope-from git) Date: Thu, 2 Jan 2025 15:19:18 GMT Message-Id: <202501021519.502FJIhJ007696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c7e81cc04369 - main - TCP BBR: do not log an uninitialized value 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7e81cc04369dd7bdd00519109efe9d75f53375c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e81cc04369dd7bdd00519109efe9d75f53375c commit c7e81cc04369dd7bdd00519109efe9d75f53375c Author: Michael Tuexen AuthorDate: 2025-01-02 15:17:05 +0000 Commit: Michael Tuexen CommitDate: 2025-01-02 15:17:05 +0000 TCP BBR: do not log an uninitialized value Reviewed by: rrs CID: 1523789 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48281 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index c46a1711c34a..fa9953fcd0a3 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -607,7 +607,7 @@ activate_rxt: TCPT_RANGESET_NOSLOP(to, tov, (bbr->r_ctl.rc_min_rto_ms * MS_IN_USEC), (bbr->rc_max_rto_sec * USECS_IN_SECOND)); - bbr_log_timer_var(bbr, 2, cts, 0, srtt, 0, to); + bbr_log_timer_var(bbr, 2, cts, 0, bbr_get_rtt(bbr, BBR_SRTT), 0, to); return (to); } return (0); From nobody Thu Jan 2 15:21:22 2025 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 4YP9Qp29sQz5jLHQ; Thu, 02 Jan 2025 15:21:22 +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 4YP9Qp1c18z4SRm; Thu, 2 Jan 2025 15:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735831282; 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=vJr2evXFCyu/LJUYAlEReZ3Dsq+n8CWGxMogh+BYtNQ=; b=aYx5ZdzzWRdZN5PZndQNM8NroEuhFGfM8DgyA+izZKvIipSISMcCVKIG3PqxwxsPBn3BQl h61whGZI5olKS3wsw/AGHbGHEw8UwaRJxdIY5psBkIKOgO6/EL7kFJUcx7AVk6p6on8+kq O65zpA/9/xPQl5B/gAluOblVHWd6juv2VB/TJcazGxADKThGVup5boW3H4tzFHihoMW0D3 UuROfI5vDOsnXDhTGkafAjuv9SPijCte5SYTVch2fgTws9WxMwj9INpqiNNNec6+TgyF6q qOiR/I+PfCgIUXHv/YWZOx6Dp23IlF+csTd6u4aegTR35cbo08Dd3pIRwnWnmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735831282; 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=vJr2evXFCyu/LJUYAlEReZ3Dsq+n8CWGxMogh+BYtNQ=; b=LoOfZyuTUEZ9bbE1Qbv/e3wwlIG94JNRLSoRBEymgM1Dp/UoclFsnn0L3z7DfXN8gTv06S Y5LYTL2sWcTSlwNvir3xQkM5TsRV+SBLt06gtvWcpHjYDfB0aXt3Q1P6CKyeXirgw9bigt 7XvpVO5TVtiSdPTISPLLJzmhfaNnwYrTaBWxhu7sQBtgotjK5VrBmMSoEy/iJHerpn7rkw lQZNWv9a+A5kqQYNrDgJGGfPVjCcoX6Zw3MrbzEzBaZGcrxfhNwuvIPLIEnakDeIGkag4m TDhTrv0bpANxzTpsk8fagO4zVVUainvt1alt85ja5QElPWLfR+ccUmQWh5w3lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735831282; a=rsa-sha256; cv=none; b=MhxlUSyao1zyabOgPaKAQAF00skCzmUyb4TbZLNfu2fvQH1kPvCV6TdO7B+IKDMTU+TElJ bclEEMUn7vu5UiC1FjgJpzAq/OXvWPNsqej84Lz39VHXX5bR/TimmLcc6TnN9U+TH74N2c 4Bd4iPTo5JpqlpjSHL+4bLPyr/3yfx9/bdHTkdsqkmeen4jVBFaPGCtE+/elfDKFzFfArc IG1oWAk2qfZJwdR6kn5Sc8Jat/qu7R4vYH8dPGjR/6A36G9tTChyYaEPZJ2Kz4MRlXmmBA 57vbfuRCRVKPAcjSw+TFsbmE+itbPjlPx28MnZjW0I3VehFSI/nwpXHCguNLgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YP9Qp10XmzjJh; Thu, 02 Jan 2025 15:21:22 +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 502FLM7o019767; Thu, 2 Jan 2025 15:21:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502FLMB8019764; Thu, 2 Jan 2025 15:21:22 GMT (envelope-from git) Date: Thu, 2 Jan 2025 15:21:22 GMT Message-Id: <202501021521.502FLMB8019764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8471791eb6ee - main - TCP RACK: simplify condition 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8471791eb6eeedaedd4d70e1076cfd143bf12fca Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8471791eb6eeedaedd4d70e1076cfd143bf12fca commit 8471791eb6eeedaedd4d70e1076cfd143bf12fca Author: Michael Tuexen AuthorDate: 2025-01-02 15:19:30 +0000 Commit: Michael Tuexen CommitDate: 2025-01-02 15:19:30 +0000 TCP RACK: simplify condition It is already known that rsm != NULL, so no need to check for it. Reviewed by: rrs CID: 1523815 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48282 --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 00c373ef0790..233513548d72 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18877,7 +18877,7 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma log.u_bbr.pkts_out = tp->t_maxseg; log.u_bbr.timeStamp = cts; log.u_bbr.inflight = ctf_flight_size(rack->rc_tp, rack->r_ctl.rc_sacked); - if (rsm && (rsm->r_rtr_cnt > 0)) { + if (rsm->r_rtr_cnt > 0) { /* * When we have a retransmit we want to log the * burst at send and flight at send from before. From nobody Thu Jan 2 16:05:05 2025 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 4YPBPF2zbhz5jNT3; Thu, 02 Jan 2025 16:05:05 +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 4YPBPF2Gxjz4YnY; Thu, 2 Jan 2025 16:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735833905; 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=VLO+VVCdTjY+9JVe9I8oPQwEQiMa6okzPttpwZlCGnI=; b=KpxAfKBnDhMlICzZl0PayYx/LTeDA3msNJehBfcyC5UcKMq5NKazSC/kH7dWNr1RlreQ2c JaJyVAuDXpwn+DdlCpiyuE4CVaO/BQYZlHSeKlaPwZMZaZuHd9CUTL9/uPTg/GdTIluO6D 2AsPuPLWK7NXQ6UEzkiF5zxhhoB23Qmxii74wXS1vMjb4UeTpIj15WsfC0MQML654J2SZ3 w61LFny73YvVSH70fIbSv0k2w6s7KX9Y9blyQhTycoPnRGRJn5V9m1zT0pzI62o4Nlpihf RjSOqOhTozdZryldzCd7foy0OmAYb9ONiYoKbjKsm2MKlP39jyBJPN18A2zIyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735833905; 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=VLO+VVCdTjY+9JVe9I8oPQwEQiMa6okzPttpwZlCGnI=; b=Id9xiPJf2m9d7m/kV2Wvt96Ojr6wL7+PZFaZl8FAlwwpZmAcBvSbCCfzqlOrtZucbute/a ptqiaUXnh2hrHvC5WCrGH0sgtGk45fK0CxTVuRYoEkx1/Mwq/4wFQ//S/kIw4P3sKu6LGx FoHwKaJfjF1btx+rP5pR3sE8QUYAZvktgPNpbMZs2rsKgmR1PrisnIrKNOXE0jVb4b0Dtd s16Zdml05U0lZ4HqwguRZJD3iwMgRTEUXMg513tNJdCx3ypTDJv5BIlJoPnEFOxkyJiD0W zfmMCk4pG5PPvUS6yBSh6dy/EFvjJuoXvjjbsjrYbiobgujNSR7xJqHVS1ymxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735833905; a=rsa-sha256; cv=none; b=BZQONtMvrtVZYR3t+xUIedRSQ5bQlEhzUN6L8Bv+SL0WKkxjFPX6kRaTMK5WoS/Wa0lKem fMGCPTXLDZc7oEW1RkGu4nf1W0V4m2/D24G8TIFXp3pNcFV4vGlZa9a0lhS01JAbTgHN1x 47zH0SzFV2vF8bOH96mX3XbIGMXsdnZybWUFkGk7QvIrX3+JmIPOqa5FkFYQZ624/09DBL e3kuGB5cx5s5EPuT2XTJsJbu+J6ochQFEIvVHLxyY9zh74G1cenGp6mXF5/vXXaNO9jDlg QFEEIJiUKWdOu3WIyGRS6cs8YKUsMrQxSGuYm1Fa8dLzhHO/0SZAJdDTwdP79g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPBPF1WmtzkXx; Thu, 02 Jan 2025 16:05:05 +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 502G555P000562; Thu, 2 Jan 2025 16:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502G55eR000559; Thu, 2 Jan 2025 16:05:05 GMT (envelope-from git) Date: Thu, 2 Jan 2025 16:05:05 GMT Message-Id: <202501021605.502G55eR000559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 9be0058ea0fc - main - riscv vmm: virtual timer support. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9be0058ea0fc6fd098b9e2ab54f94c86fe7eb69a Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=9be0058ea0fc6fd098b9e2ab54f94c86fe7eb69a commit 9be0058ea0fc6fd098b9e2ab54f94c86fe7eb69a Author: Ruslan Bukin AuthorDate: 2025-01-02 15:42:34 +0000 Commit: Ruslan Bukin CommitDate: 2025-01-02 16:02:39 +0000 riscv vmm: virtual timer support. Add a virtual timer implementation based on SBI Time extension. This is needed for Eswin EIC7700 SoC which does not include the newer SSTC extension. Timer interrupt pending bit (STIP) could not be cleared in the guest system, so rework interrupts handling: add new "interrupts_pending" field. Use it for timer interrupt only for now, but later we can extend to store all pending interrupts (Timer, IPI and External). With this I'm able to boot FreeBSD (SMP) guest on HiFive Premier P550, which is the first real hardware with RISC-V 'H'-spec included. Differential Revision: https://reviews.freebsd.org/D48133 --- sys/conf/files.riscv | 1 + sys/modules/vmm/Makefile | 3 +- sys/riscv/vmm/riscv.h | 5 ++ sys/riscv/vmm/vmm.c | 3 ++ sys/riscv/vmm/vmm_riscv.c | 47 +++++++++++------- sys/riscv/vmm/vmm_sbi.c | 26 ++++++++++ sys/riscv/vmm/vmm_vtimer.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ sys/riscv/vmm/vmm_vtimer.h | 47 ++++++++++++++++++ usr.sbin/bhyve/riscv/fdt.c | 3 +- 9 files changed, 233 insertions(+), 19 deletions(-) diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 6186ae9b3371..534fe5013c56 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -83,6 +83,7 @@ riscv/vmm/vmm_instruction_emul.c optional vmm riscv/vmm/vmm_riscv.c optional vmm riscv/vmm/vmm_sbi.c optional vmm riscv/vmm/vmm_switch.S optional vmm +riscv/vmm/vmm_vtimer.c optional vmm riscv/thead/thead.c standard diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 0ec1147d0d4b..7c34dd92939b 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -154,7 +154,8 @@ svm_genassym.o: offset.inc SRCS+= vmm_aplic.c \ vmm_riscv.c \ vmm_sbi.c \ - vmm_switch.S + vmm_switch.S \ + vmm_vtimer.c .endif diff --git a/sys/riscv/vmm/riscv.h b/sys/riscv/vmm/riscv.h index ed4b65003f94..f3665d33a386 100644 --- a/sys/riscv/vmm/riscv.h +++ b/sys/riscv/vmm/riscv.h @@ -38,6 +38,8 @@ #include #include +#include + struct hypregs { uint64_t hyp_ra; uint64_t hyp_sp; @@ -78,6 +80,8 @@ struct hypctx { bool has_exception; int cpu_id; int ipi_pending; + int interrupts_pending; + struct vtimer vtimer; }; struct hyp { @@ -128,5 +132,6 @@ int vmm_sbi_ecall(struct vcpu *, bool *); void riscv_send_ipi(struct hypctx *hypctx, int hart_id); int riscv_check_ipi(struct hypctx *hypctx, bool clear); +bool riscv_check_interrupts_pending(struct hypctx *hypctx); #endif /* !_VMM_RISCV_H_ */ diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 33a0cb5fe420..0596e0de2e43 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -1414,6 +1414,9 @@ vm_handle_wfi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) if (riscv_check_ipi(vcpu->cookie, false)) break; + if (riscv_check_interrupts_pending(vcpu->cookie)) + break; + if (vcpu_should_yield(vcpu)) break; diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c index e276f8583e37..6ac945dfa1d0 100644 --- a/sys/riscv/vmm/vmm_riscv.c +++ b/sys/riscv/vmm/vmm_riscv.c @@ -107,11 +107,6 @@ vmmops_modinit(void) return (ENXIO); } - if (!has_sstc) { - printf("vmm: riscv hart doesn't support SSTC extension.\n"); - return (ENXIO); - } - return (0); } @@ -229,6 +224,7 @@ vmmops_vcpu_init(void *vmi, struct vcpu *vcpu1, int vcpuid) hyp->ctx[vcpuid] = hypctx; aplic_cpuinit(hypctx); + vtimer_cpuinit(hypctx); return (hypctx); } @@ -561,29 +557,36 @@ riscv_check_ipi(struct hypctx *hypctx, bool clear) return (val); } +bool +riscv_check_interrupts_pending(struct hypctx *hypctx) +{ + + if (hypctx->interrupts_pending) + return (true); + + return (false); +} + static void riscv_sync_interrupts(struct hypctx *hypctx) { int pending; pending = aplic_check_pending(hypctx); - if (pending) hypctx->guest_csrs.hvip |= HVIP_VSEIP; else hypctx->guest_csrs.hvip &= ~HVIP_VSEIP; - csr_write(hvip, hypctx->guest_csrs.hvip); -} - -static void -riscv_sync_ipi(struct hypctx *hypctx) -{ - /* Guest clears VSSIP bit manually. */ if (riscv_check_ipi(hypctx, true)) hypctx->guest_csrs.hvip |= HVIP_VSSIP; + if (riscv_check_interrupts_pending(hypctx)) + hypctx->guest_csrs.hvip |= HVIP_VSTIP; + else + hypctx->guest_csrs.hvip &= ~HVIP_VSTIP; + csr_write(hvip, hypctx->guest_csrs.hvip); } @@ -594,6 +597,7 @@ vmmops_run(void *vcpui, register_t pc, pmap_t pmap, struct vm_eventinfo *evinfo) struct vm_exit *vme; struct vcpu *vcpu; register_t val; + uint64_t hvip; bool handled; hypctx = (struct hypctx *)vcpui; @@ -615,7 +619,8 @@ vmmops_run(void *vcpui, register_t pc, pmap_t pmap, struct vm_eventinfo *evinfo) __asm __volatile("hfence.gvma" ::: "memory"); csr_write(hgatp, pmap->pm_satp); - csr_write(henvcfg, HENVCFG_STCE); + if (has_sstc) + csr_write(henvcfg, HENVCFG_STCE); csr_write(hie, HIE_VSEIE | HIE_VSSIE | HIE_SGEIE); /* TODO: should we trap rdcycle / rdtime? */ csr_write(hcounteren, HCOUNTEREN_CY | HCOUNTEREN_TM); @@ -653,9 +658,7 @@ vmmops_run(void *vcpui, register_t pc, pmap_t pmap, struct vm_eventinfo *evinfo) */ riscv_set_active_vcpu(hypctx); aplic_flush_hwstate(hypctx); - riscv_sync_interrupts(hypctx); - riscv_sync_ipi(hypctx); dprintf("%s: Entering guest VM, vsatp %lx, ss %lx hs %lx\n", __func__, csr_read(vsatp), hypctx->guest_regs.hyp_sstatus, @@ -666,8 +669,18 @@ vmmops_run(void *vcpui, register_t pc, pmap_t pmap, struct vm_eventinfo *evinfo) dprintf("%s: Leaving guest VM, hstatus %lx\n", __func__, hypctx->guest_regs.hyp_hstatus); + /* Guest can clear VSSIP. It can't clear VSTIP or VSEIP. */ + hvip = csr_read(hvip); + if ((hypctx->guest_csrs.hvip ^ hvip) & HVIP_VSSIP) { + if (hvip & HVIP_VSSIP) { + /* TODO: VSSIP was set by guest. */ + } else { + /* VSSIP was cleared by guest. */ + hypctx->guest_csrs.hvip &= ~HVIP_VSSIP; + } + } + aplic_sync_hwstate(hypctx); - riscv_sync_interrupts(hypctx); /* * TODO: deactivate stage 2 pmap here if needed. diff --git a/sys/riscv/vmm/vmm_sbi.c b/sys/riscv/vmm/vmm_sbi.c index 6444b8c9e396..63dcf9b4a7ae 100644 --- a/sys/riscv/vmm/vmm_sbi.c +++ b/sys/riscv/vmm/vmm_sbi.c @@ -95,6 +95,31 @@ vmm_sbi_handle_rfnc(struct vcpu *vcpu, struct hypctx *hypctx) return (0); } +static int +vmm_sbi_handle_time(struct vcpu *vcpu, struct hypctx *hypctx) +{ + uint64_t func_id; + uint64_t next_val; + int ret; + + func_id = hypctx->guest_regs.hyp_a[6]; + next_val = hypctx->guest_regs.hyp_a[0]; + + switch (func_id) { + case SBI_TIME_SET_TIMER: + vtimer_set_timer(hypctx, next_val); + ret = 0; + break; + default: + ret = -1; + break; + } + + hypctx->guest_regs.hyp_a[0] = ret; + + return (0); +} + static int vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx) { @@ -166,6 +191,7 @@ vmm_sbi_ecall(struct vcpu *vcpu, bool *retu) vmm_sbi_handle_rfnc(vcpu, hypctx); break; case SBI_EXT_ID_TIME: + vmm_sbi_handle_time(vcpu, hypctx); break; case SBI_EXT_ID_IPI: vmm_sbi_handle_ipi(vcpu, hypctx); diff --git a/sys/riscv/vmm/vmm_vtimer.c b/sys/riscv/vmm/vmm_vtimer.c new file mode 100644 index 000000000000..0dadc962114f --- /dev/null +++ b/sys/riscv/vmm/vmm_vtimer.c @@ -0,0 +1,117 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Ruslan Bukin + * + * This software was developed by the University of Cambridge Computer + * Laboratory (Department of Computer Science and Technology) under Innovate + * UK project 105694, "Digital Security by Design (DSbD) Technology Platform + * Prototype". + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include "riscv.h" + +#define VTIMER_DEFAULT_FREQ 1000000 + +static int +vtimer_get_timebase(uint32_t *freq) +{ + phandle_t node; + int len; + + node = OF_finddevice("/cpus"); + if (node == -1) + return (ENXIO); + + len = OF_getproplen(node, "timebase-frequency"); + if (len != 4) + return (ENXIO); + + OF_getencprop(node, "timebase-frequency", freq, len); + + return (0); +} + +void +vtimer_cpuinit(struct hypctx *hypctx) +{ + struct vtimer *vtimer; + uint32_t freq; + int error; + + vtimer = &hypctx->vtimer; + mtx_init(&vtimer->mtx, "vtimer callout mutex", NULL, MTX_DEF); + callout_init_mtx(&vtimer->callout, &vtimer->mtx, 0); + + error = vtimer_get_timebase(&freq); + if (error) + freq = VTIMER_DEFAULT_FREQ; + + vtimer->freq = freq; +} + +static void +vtimer_inject_irq_callout(void *arg) +{ + struct hypctx *hypctx; + struct hyp *hyp; + + hypctx = arg; + hyp = hypctx->hyp; + + atomic_set_32(&hypctx->interrupts_pending, HVIP_VSTIP); + vcpu_notify_event(vm_vcpu(hyp->vm, hypctx->cpu_id)); +} + +int +vtimer_set_timer(struct hypctx *hypctx, uint64_t next_val) +{ + struct vtimer *vtimer; + sbintime_t time; + uint64_t curtime; + uint64_t delta; + + vtimer = &hypctx->vtimer; + + curtime = rdtime(); + if (curtime < next_val) { + delta = next_val - curtime; + time = delta * SBT_1S / vtimer->freq; + atomic_clear_32(&hypctx->interrupts_pending, HVIP_VSTIP); + callout_reset_sbt(&vtimer->callout, time, 0, + vtimer_inject_irq_callout, hypctx, 0); + } else + atomic_set_32(&hypctx->interrupts_pending, HVIP_VSTIP); + + return (0); +} diff --git a/sys/riscv/vmm/vmm_vtimer.h b/sys/riscv/vmm/vmm_vtimer.h new file mode 100644 index 000000000000..6deca322ce99 --- /dev/null +++ b/sys/riscv/vmm/vmm_vtimer.h @@ -0,0 +1,47 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Ruslan Bukin + * + * This software was developed by the University of Cambridge Computer + * Laboratory (Department of Computer Science and Technology) under Innovate + * UK project 105694, "Digital Security by Design (DSbD) Technology Platform + * Prototype". + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _VMM_VTIMER_H_ +#define _VMM_VTIMER_H_ + +struct hypctx; + +struct vtimer { + struct callout callout; + struct mtx mtx; + uint32_t freq; +}; + +void vtimer_cpuinit(struct hypctx *hypctx); +int vtimer_set_timer(struct hypctx *hypctx, uint64_t next_val); + +#endif /* !_VMM_VTIMER_H_ */ diff --git a/usr.sbin/bhyve/riscv/fdt.c b/usr.sbin/bhyve/riscv/fdt.c index bef3f64b0c64..81296714e013 100644 --- a/usr.sbin/bhyve/riscv/fdt.c +++ b/usr.sbin/bhyve/riscv/fdt.c @@ -118,7 +118,8 @@ add_cpus(void *fdt, int ncpu, const char *isa) /* XXX: Needed given the root #address-cells? */ fdt_property_u32(fdt, "#address-cells", 1); fdt_property_u32(fdt, "#size-cells", 0); - fdt_property_u32(fdt, "timebase-frequency", 10000000); + /* TODO: take timebase from kernel? */ + fdt_property_u32(fdt, "timebase-frequency", 1000000); for (cpuid = 0; cpuid < ncpu; cpuid++) add_cpu(fdt, cpuid, isa); From nobody Thu Jan 2 16:24:20 2025 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 4YPBqV5znfz5jQ03; Thu, 02 Jan 2025 16:24:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPBqV5Rftz4bcn; Thu, 2 Jan 2025 16:24:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735835062; 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: in-reply-to:in-reply-to:references:references; bh=IRDCo7oxfBrFvEBt2B6x/YYq+qykMPev4NUJzXMTAVg=; b=DWU3UsATLjZMnlEQuz8MfdlulaGJUZ4AQU161ZpTHRQgcESauQQFyDtACtWNAUzy6xEFu3 WlNIzrcccZxLFL7/0+jUIlbDA/XoFr7uuCpjRgg5hVIC70eBeePFuj3wET7FiohYi6c0XG htcitmUdvWWkWM4P2W1BC6nZu2J/pLY1FVtAQyYXWp3A/H0IiRzD5bmqbA7HrBf0C49Pw4 R6Vs6vwESzsPKFTGp+yBbCwnspAAfYW93T2PBmL5aWCtX2eLlA4JqBrte7dLigk+Y0eaVo 30KmIX+tfPndYppxd2q/irXvV2r+Ei94JHI724VwyPG2Xzwd4M8lopsmGeUQ0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735835062; 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: in-reply-to:in-reply-to:references:references; bh=IRDCo7oxfBrFvEBt2B6x/YYq+qykMPev4NUJzXMTAVg=; b=YTce7dqynzoAtF4CGk3cOQeeNjdcj3XR2ea4Z7qTtCUylmrOArYtLd8GyE1g7/1S3CSdiu ecc1H7tR0n31xVcOEh5gQJqGG7bPaF9sSYqJBsBqfhrbSQdCI5JIBTzPM/G0lc+F7K69hM 9t8mmgGZTwx6adFRM9DPi0xvlFgRgcxqvtPFs11TZkieGmrmTqrP2cgJtja49qMvm96Mtx DCoWKiBTOfcM/rQsZypfEt3t6AkycanA9JNuYwdN9h1SpVWr0W7etjt577RIldm46OJmHH NyW7FNLtfdrYtEFw/ytt2XnkUL2zpYZVf77uobSUFbS5jTCyAhvHwFgDVdUDBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735835062; a=rsa-sha256; cv=none; b=h8CWz77JpbrgoaRAls6GpapkgmxtoLbHfJMhDDnNYobxdpBL6vtHauwJ+4Jehi6sBmogvS 1+3bqEzq2mvLuQEzk/2C2xUcXoDV5f8r0FbkfmVcD99y7YAqq4vFQTo32alk85D9gRCX6z yjzFMHOeu+FrfTog2Dat+mB1pCz9xoNL3DanDHm2NmX7ab0yy93gzS4KNuJ1PnB/MdJywc +FdQXd6h+5p6Tjxx2UUTpp5CowjKSpJkznJt91cWI38PYOInHhShNNFt+/G/z0NLaacGKz eaTQ8gX4ThllwEqMBJf4bV0thq4ZK769zFjB08QK92ed7Kp5jBazKCZqM4U+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4200:b830:f914:bf0:4586:27e] (unknown [IPv6:2601:5c0:4200:b830:f914:bf0:4586:27e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YPBqV38K1zr5c; Thu, 02 Jan 2025 16:24:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1a7f916d-ce0d-4ad2-ad8a-6ee75b747341@FreeBSD.org> Date: Thu, 2 Jan 2025 11:24:20 -0500 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 04160e000898 - main - arm64: add a driver for the Apple Interrupt Controller Content-Language: en-US To: Kyle Evans , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412171425.4BHEPuSP010250@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202412171425.4BHEPuSP010250@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/17/24 09:25, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=04160e0008982fa0e03ebcc3747d81bcd547f751 > > commit 04160e0008982fa0e03ebcc3747d81bcd547f751 > Author: Kyle Evans > AuthorDate: 2024-12-17 14:14:54 +0000 > Commit: Kyle Evans > CommitDate: 2024-12-17 14:24:14 +0000 > > arm64: add a driver for the Apple Interrupt Controller > > Some limited support for later multi-die SoC is included, but not at all > tested and not expected to be functional yet. kevans needs to finish > getting his serial boards constructed, as the beefiest AS machine that > actually has multiple die to support in his fleet is currently a > dedicated serial console. > > Reviewed by: andrew > Co-authored-by: Andrew Turner > Co-authored-by: Mike Karels > Differential Revision: https://reviews.freebsd.org/D48079 This doesn't build without `options SMP` so breaks make universe due to the sys/arm64/conf/GENERIC-UP kernel config. The first error is a simple fix in attach (local variable 'cpu' is unused), but I wasn't quite sure what the right thing to do in the bus_setup_intr method was for the AIC_TYPE_IRQ case where sc_cpuids is used unconditionally. -- John Baldwin From nobody Thu Jan 2 16:29:50 2025 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 4YPBxs6MDcz5jPw2; Thu, 02 Jan 2025 16:29:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPBxs3ngDz4by6; Thu, 2 Jan 2025 16:29:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id TMGMtximlIx4rTO52tsF4f; Thu, 02 Jan 2025 16:29:52 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id TO51tEIKlGvSVTO52twiTG; Thu, 02 Jan 2025 16:29:52 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FpSm/Hrq c=1 sm=1 tr=0 ts=6776bf00 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=VdSt8ZQiCzkA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=lSTAGFWfFQbYo5I_suoA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 85C31ED; Thu, 02 Jan 2025 08:29:50 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 514AA288; Thu, 02 Jan 2025 08:29:50 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kyle Evans cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice In-reply-to: <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org> References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> <20250102025400.0235658A@slippy.cwsent.com> <20250102031452.A7E2B455@slippy.cwsent.com> <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org> Comments: In-reply-to Kyle Evans message dated "Wed, 01 Jan 2025 21:21:07 -0600." 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 02 Jan 2025 08:29:50 -0800 Message-Id: <20250102162950.514AA288@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDVJGc5KjeAMo1rpP2tyt1jvQxlr1A2CE8Fx8H2SgWxaWQIeg8wkRX9MvOx5oeLX142315swZU+DncwfCOTLsNeeHjd+CaKOC6URIm3+xTG/WN22AtJo DwrrXKGEyDDzG3TXoE+53KoAfH5+2eYAPdydllmjUdqfocF1dkiqe6IPjn7DGctlYWTLa4D9c9RTuVFFM+e2di5379Md04D4mSRIgD+bnFC5EBKzInA98mV4 QhaisR2IUEF/jGl3gUen/17m/knLrh69VhVpkLyT3kPMX/8rd4y0H9mDEchPQ2sGZJysbvDsZFfhZWCeegnSFTIoE/UfROjiZgE1rBSpI9w= X-Rspamd-Queue-Id: 4YPBxs3ngDz4by6 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org>, Kyle Evans write s: > On 1/1/25 21:14, Cy Schubert wrote: > > In message , Kyle Evans > > write > > s: > >> On 1/1/25 20:53, Cy Schubert wrote: > >>> In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evans > >>> writes > >>> : > >>>> The branch main has been updated by kevans: > >>>> > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac70 > 8e > >> c49 > >>>> 093782d4 > >>>> > >>>> commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 > >>>> Author: Kyle Evans > >>>> AuthorDate: 2025-01-02 02:15:36 +0000 > >>>> Commit: Kyle Evans > >>>> CommitDate: 2025-01-02 02:15:36 +0000 > >>>> > >>>> shar: add a deprecation notice > >>>> > >>>> The shar(1) program is simple, but the fundamental idea of a sh ar > chi > >> ve > >>>> is risky at best and one that we probably shouldn't be promoting a > s > >>>> prominently as a program in $PATH and a manpage. Let's deprecate > and > >>>> remove it, since the same functionality can easily be found in > >>>> tar(1) instead. > >>>> > >>>> Reviewed by: emaste, philip > >>>> Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (pre > vio > >> us) > >>>> MFC after: 3 days > >>>> Differential Revision: https://reviews.freebsd.org/D48130 > >>>> --- > >>>> usr.bin/shar/shar.1 | 14 +++++++++++++- > >>>> 1 file changed, 13 insertions(+), 1 deletion(-) > >>>> > >>>> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > >>>> index 903f937491dc..df97021b1bba 100644 > >>>> --- a/usr.bin/shar/shar.1 > >>>> +++ b/usr.bin/shar/shar.1 > >>>> @@ -25,12 +25,24 @@ > >>>> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI > TY > >> OF > >>>> .\" SUCH DAMAGE. > >>>> .\" > >>>> -.Dd January 31, 2019 > >>>> +.Dd January 1, 2025 > >>>> .Dt SHAR 1 > >>>> .Os > >>>> .Sh NAME > >>>> .Nm shar > >>>> .Nd create a shell archive of files > >>>> +.Sh DEPRECATION NOTICE > >>>> +.Nm > >>>> +is obsolete and may not be present in > >>>> +.Fx 15 > >>>> +and later. > >>>> +Because shell archives are simultaneously data and code and are typical > ly > >>>> +interpreted by > >>>> +.Xr sh 1 , > >>>> +they can easily be trojan-horsed and pose a significant security risk t > o > >> use > >>>> rs. > >>>> +The > >>>> +.Xr tar 1 > >>>> +utility can still produce shar encodings of files if needed. > >>>> .Sh SYNOPSIS > >>>> .Nm > >>>> .Ar > >>>> > >>> > >>> We should probably point to the new port or the GNU variant in ports. > >>> > >> > >> Oh, sorry, I didn't realize you had gone ahead with the port. I > >> wouldn't normally recommend a GNU variant, would you be OK with > >> something like: > >> > >> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > >> index df97021b1bba..6beb1e84ceab 100644 > >> --- a/usr.bin/shar/shar.1 > >> +++ b/usr.bin/shar/shar.1 > >> @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a > >> significant security risk to users. > >> The > >> .Xr tar 1 > >> utility can still produce shar encodings of files if needed. > >> +The > >> +.Pa sysutils/freebsd-shar > >> +port has been created to maintain this version of > >> +.Nm > >> +past its deprecation in base. > >> .Sh SYNOPSIS > >> .Nm > >> .Ar > >> > >> ? > > > > Yeah, that should do it. > > > > Pushed as 2832af7b4ea256b18ef4dbf2ff97a50765f0609a, thanks. I'll drop > another pointer to the port in UPDATING when it comes time to remove it. > > Thanks, > > Kyle Evans As an FYI, I'll patch shar with a couple of patches from NetBSD. They will also be applied to the upstream (my github) repo for the port as well. I'll probably push these sometime next week. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jan 2 16:39:26 2025 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 4YPC8w4rCLz5jR0h; Thu, 02 Jan 2025 16:39:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPC8w3xwTz4hB5; Thu, 2 Jan 2025 16:39:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735835968; 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: in-reply-to:in-reply-to:references:references; bh=+gfcshliEpHqC2UqIusanhQm5jbReDquXBHA6qDDQH4=; b=jibjKt163iyP2/bZYJm+9HFjuyU36b4zfZsmXcjgob3laETpQRgA3kD707Zdmu18ZfY64R Ha++eepRq7r1M1acwqnr+gRCKEKKurj84bh6FOhP3ffYssUBH2p9GhUVpRDcq8Z0qGFgE+ M43VFA1gt7wdde2bjioq8ATYGaopBaE8sSBG6LZkOTEWJdPvcLGFo+Wv53TKkG1KA+02/j DeIdlaKAZrLvRh0Bw5knWJQ7rc+x7DSN4T2VnEaagSg/XRpLTwkXcMjPa6o+fmJ/vSI2WL jZKMzah1a+UhLQsg9vEPNKhGOO/b/fsZzd+d2Kjio2kTZkM/cXML44ubE+2Tlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735835968; 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: in-reply-to:in-reply-to:references:references; bh=+gfcshliEpHqC2UqIusanhQm5jbReDquXBHA6qDDQH4=; b=eA+v1vWE2b5HKQy9cTIS5+/G2gdS86EWXTtws1ifkzkyeIuriwBWQ5uwy+MM8YGCMIqo16 IFRkxXjePHGfhE6BSe4MwxuKTVik3vwWBx2NieYKG3VtFEXmKU6RhBvlzZmnnG3ePh46Fj UhLw43IHLxOUE9hKw50a75ilIVZVsEBX9yuQp4K6B12Kj3t7xoBKnbIwwT/GbVrD2F4oIs ZZym2kcQCBjPodD9mURO/Xxm5inIRhuseBgW1VYKyj7N26TLpnJoBjRlFoQhcMtP4c3XKr Gr2avgozKvxHEB8k5lLwNJxJeFFk3Ui5AA+VCu6na2zB21IGNCnH9LLA7/nHlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735835968; a=rsa-sha256; cv=none; b=dGCbThBgmJ76vVoJWY7jzNYU9fYXsEE1QbphXX8g4bo51x3/3c3udigPAMsV49Yiq0SULv 4NpLfGUq3HTlyLb/GC+wMkWhHuzD6GOF5tp9gu3duj9WJmvT+SAoS1YmpJLY0uJxCY44pU tXbsQvSmWFCq40sVHH8o0BKVEbuQDwOh19Cw3zcFuUk97JyWSb6g779VC83TNnDDcs6ksG PQHh0nIrGq6uZh9cUHrBw6TZgaoV4yrsZ5MF0IdETXidbgtrgM/BQ9k15A6mwYlha1kkbq 6UVUOa7PDYcXnMaJ27lwVD7Zok0ZKxSPm2xgQWm7z4f5q3lDqd+w8d0hmp115Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YPC8w0l5KzrWX; Thu, 02 Jan 2025 16:39:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <6ced2be5-a28d-4c7c-a9c7-bfb8a5336996@FreeBSD.org> Date: Thu, 2 Jan 2025 10:39:26 -0600 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 04160e000898 - main - arm64: add a driver for the Apple Interrupt Controller To: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412171425.4BHEPuSP010250@gitrepo.freebsd.org> <1a7f916d-ce0d-4ad2-ad8a-6ee75b747341@FreeBSD.org> Content-Language: en-US From: Kyle Evans In-Reply-To: <1a7f916d-ce0d-4ad2-ad8a-6ee75b747341@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 1/2/25 10:24, John Baldwin wrote: > On 12/17/24 09:25, Kyle Evans wrote: >> The branch main has been updated by kevans: >> >> URL: https://cgit.FreeBSD.org/src/commit/? >> id=04160e0008982fa0e03ebcc3747d81bcd547f751 >> >> commit 04160e0008982fa0e03ebcc3747d81bcd547f751 >> Author:     Kyle Evans >> AuthorDate: 2024-12-17 14:14:54 +0000 >> Commit:     Kyle Evans >> CommitDate: 2024-12-17 14:24:14 +0000 >> >>      arm64: add a driver for the Apple Interrupt Controller >>      Some limited support for later multi-die SoC is included, but not >> at all >>      tested and not expected to be functional yet.  kevans needs to >> finish >>      getting his serial boards constructed, as the beefiest AS machine >> that >>      actually has multiple die to support in his fleet is currently a >>      dedicated serial console. >>      Reviewed by:    andrew >>      Co-authored-by: Andrew Turner >>      Co-authored-by: Mike Karels >>      Differential Revision:  https://reviews.freebsd.org/D48079 > > This doesn't build without `options SMP` so breaks make universe due to the > sys/arm64/conf/GENERIC-UP kernel config. > > The first error is a simple fix in attach (local variable 'cpu' is unused), > but I wasn't quite sure what the right thing to do in the bus_setup_intr > method was for the AIC_TYPE_IRQ case where sc_cpuids is used > unconditionally. > Sigh, sorry... https://reviews.freebsd.org/D48289 Thanks, Kyle Evans From nobody Thu Jan 2 16:48:08 2025 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 4YPCLx5GJLz5jRfl; Thu, 02 Jan 2025 16:48:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPCLx4HtQz4l13; Thu, 2 Jan 2025 16:48:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735836489; 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: in-reply-to:in-reply-to:references:references; bh=pfTPqK/lMYA9EoOnRD5B5gOp/QdcpdR0k/59o2l5Ps4=; b=jGPUnzEqEldxpuWquRfiBoFg2ZbBTgpYtIZ+VbQb0AmSl4G8dLISijfAQPxjO9k1OIXBOU pus4R+4amGV9zSy8hO13hzaryLEjELbSAXkcaoPig4fWVkZmfxpcMYFzQ8MZHfngohGVv4 oRGFU1ODQVlVYstxkWQJM+U0eAwmq/GFtFKq9qWOBlU7wDbB1peaB3NSG/6ZDJK2gnxh48 YKhr5+mgEjiYYql4P0NPYhBGVCGM4NM19qHvTTXn1Hkjk5P8DRaX2Y9nO8nylZ6GitG9ET NYLdBgfJIyCU72fkBJZ98JFAEzhkslGDK7YlbftU2526Ns0w6fgrJ6XetiVdnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735836489; 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: in-reply-to:in-reply-to:references:references; bh=pfTPqK/lMYA9EoOnRD5B5gOp/QdcpdR0k/59o2l5Ps4=; b=cI65JOcpe5z6YjVtErPTwjzIscMZ5Q7MKfgYPgrCV+i0uXNyoGB1upRcMHzX4HG849Nt84 Fgi2FimZhAHVqjhhfJd09xpsisC65NTOT+OXHvXBl5wlqUi2dadgISoZQQqmyP/8dfcZIt 4NMd49I1X8+9UBI/7xZqYjq3fKz9ZTssq7yh42xrjq9qELmjyUeAvNy+FW78oMtInZYk9D /eDUF/AxVFT7qe0yTcepDpd9GJAcH9HwGqLvCIjMjdk3s57Zo0mp5EwSFNocj2nsdXpTr/ dWu/42/USxriyIzy9TSnovQW0XqgqbWiZXTxI1bALMo0WHLLdbu02tc/pKDC7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735836489; a=rsa-sha256; cv=none; b=H2A0arGY6tmIlBpqEUxoMrfpVdaqpAKiRqXLK1TUgKebnHHiieJIi60dM5sJuzGgscf3DT iGVXaOfFKXEhxz3+trQHhGlL3C3gTWU7hfw9v9syOGLxs5h9UlWKx7yTeJhGgQQOcAT1HL sd/032N6ffpLSXvk6Xo1rVbHfDnaLsDfZNV3+VTpx9OJwIs4XNUSSSFG4XuJztVoZkIwNf puYhv4aRx29GmzAdclhWzdwKMkS6FQ2h9+Ta0nzQt4aU0m+o4cISdQEokUY/3epjjjDIs3 mwm6t4ez9D7CCsdLn9gwBWFovDf5YdO66OmnMWW547ywGVvkup5oHakgsfGAcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YPCLx0kkWzrsb; Thu, 02 Jan 2025 16:48:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Thu, 2 Jan 2025 10:48:08 -0600 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> <20250102025400.0235658A@slippy.cwsent.com> <20250102031452.A7E2B455@slippy.cwsent.com> <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org> <20250102162950.514AA288@slippy.cwsent.com> Content-Language: en-US From: Kyle Evans In-Reply-To: <20250102162950.514AA288@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/2/25 10:29, Cy Schubert wrote: > In message <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org>, Kyle Evans > write > s: >> On 1/1/25 21:14, Cy Schubert wrote: >>> In message , Kyle Evans >>> write >>> s: >>>> On 1/1/25 20:53, Cy Schubert wrote: >>>>> In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evans >>>>> writes >>>>> : >>>>>> The branch main has been updated by kevans: >>>>>> >>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac70 >> 8e >>>> c49 >>>>>> 093782d4 >>>>>> >>>>>> commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 >>>>>> Author: Kyle Evans >>>>>> AuthorDate: 2025-01-02 02:15:36 +0000 >>>>>> Commit: Kyle Evans >>>>>> CommitDate: 2025-01-02 02:15:36 +0000 >>>>>> >>>>>> shar: add a deprecation notice >>>>>> >>>>>> The shar(1) program is simple, but the fundamental idea of a sh ar >> chi >>>> ve >>>>>> is risky at best and one that we probably shouldn't be promoting a >> s >>>>>> prominently as a program in $PATH and a manpage. Let's deprecate >> and >>>>>> remove it, since the same functionality can easily be found in >>>>>> tar(1) instead. >>>>>> >>>>>> Reviewed by: emaste, philip >>>>>> Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (pre >> vio >>>> us) >>>>>> MFC after: 3 days >>>>>> Differential Revision: https://reviews.freebsd.org/D48130 >>>>>> --- >>>>>> usr.bin/shar/shar.1 | 14 +++++++++++++- >>>>>> 1 file changed, 13 insertions(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 >>>>>> index 903f937491dc..df97021b1bba 100644 >>>>>> --- a/usr.bin/shar/shar.1 >>>>>> +++ b/usr.bin/shar/shar.1 >>>>>> @@ -25,12 +25,24 @@ >>>>>> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI >> TY >>>> OF >>>>>> .\" SUCH DAMAGE. >>>>>> .\" >>>>>> -.Dd January 31, 2019 >>>>>> +.Dd January 1, 2025 >>>>>> .Dt SHAR 1 >>>>>> .Os >>>>>> .Sh NAME >>>>>> .Nm shar >>>>>> .Nd create a shell archive of files >>>>>> +.Sh DEPRECATION NOTICE >>>>>> +.Nm >>>>>> +is obsolete and may not be present in >>>>>> +.Fx 15 >>>>>> +and later. >>>>>> +Because shell archives are simultaneously data and code and are typical >> ly >>>>>> +interpreted by >>>>>> +.Xr sh 1 , >>>>>> +they can easily be trojan-horsed and pose a significant security risk t >> o >>>> use >>>>>> rs. >>>>>> +The >>>>>> +.Xr tar 1 >>>>>> +utility can still produce shar encodings of files if needed. >>>>>> .Sh SYNOPSIS >>>>>> .Nm >>>>>> .Ar >>>>>> >>>>> >>>>> We should probably point to the new port or the GNU variant in ports. >>>>> >>>> >>>> Oh, sorry, I didn't realize you had gone ahead with the port. I >>>> wouldn't normally recommend a GNU variant, would you be OK with >>>> something like: >>>> >>>> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 >>>> index df97021b1bba..6beb1e84ceab 100644 >>>> --- a/usr.bin/shar/shar.1 >>>> +++ b/usr.bin/shar/shar.1 >>>> @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a >>>> significant security risk to users. >>>> The >>>> .Xr tar 1 >>>> utility can still produce shar encodings of files if needed. >>>> +The >>>> +.Pa sysutils/freebsd-shar >>>> +port has been created to maintain this version of >>>> +.Nm >>>> +past its deprecation in base. >>>> .Sh SYNOPSIS >>>> .Nm >>>> .Ar >>>> >>>> ? >>> >>> Yeah, that should do it. >>> >> >> Pushed as 2832af7b4ea256b18ef4dbf2ff97a50765f0609a, thanks. I'll drop >> another pointer to the port in UPDATING when it comes time to remove it. >> >> Thanks, >> >> Kyle Evans > > As an FYI, I'll patch shar with a couple of patches from NetBSD. They will > also be applied to the upstream (my github) repo for the port as well. I'll > probably push these sometime next week. > Sounds good, thanks. I don't have immediate plans for a timeline on removal beyond "probably before 15", but it would certainly be after packages are published for a version of the port that you're happy with to provide a smooth transition. Thanks, Kyle Evans From nobody Thu Jan 2 16:54:56 2025 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 4YPCVq5MJKz5jS8x; Thu, 02 Jan 2025 16:54:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPCVq4Dyqz4lKV; Thu, 2 Jan 2025 16:54:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id TNG4txljaIx4rTOTLtsJyF; Thu, 02 Jan 2025 16:54:59 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id TOTJtEOVbGvSVTOTKtwlhD; Thu, 02 Jan 2025 16:54:59 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FpSm/Hrq c=1 sm=1 tr=0 ts=6776c4e3 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=VdSt8ZQiCzkA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=nB-UjOu4FE0favolvpEA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D41431E0; Thu, 02 Jan 2025 08:54:56 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 9B0E538D; Thu, 02 Jan 2025 08:54:56 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kyle Evans cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f68ee0e7a1e8 - main - shar: add a deprecation notice In-reply-to: References: <202501020215.5022FeQP042716@gitrepo.freebsd.org> <20250102025400.0235658A@slippy.cwsent.com> <20250102031452.A7E2B455@slippy.cwsent.com> <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org> <20250102162950.514AA288@slippy.cwsent.com> Comments: In-reply-to Kyle Evans message dated "Thu, 02 Jan 2025 10:48:08 -0600." 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 02 Jan 2025 08:54:56 -0800 Message-Id: <20250102165456.9B0E538D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfPOIkRc10i6+nQwASvVHz6og4WSl5azhAmBgN5ZZnseoe+Vwrqq/WHrJJLgPsFGfyUsOLcWUIprqSltam/eHj6/wb473AtJhVq6YZfZJ8j4tE5qjXlcS WNHAChrag9zp5E0Dj2xRTb6UF6Mqg8E5BkZ+HkENfqwr57Rn5mFtaY96LPekupSMXUZYx/cCXhlGv7ecbgOafjTkzjyz91TZxgi/XvbqoCYOeok8eQ/FT9PU AUSUpsj71hMDOLVvNPsZq3a6zqdrZ0VCWM36dkjP8X0eQi390HCNWa1PEtoe7e7TCLd+Pgz4PiBdrBFyqPzh33VW8PL0ZLCcmEKSxXs0R3A= X-Rspamd-Queue-Id: 4YPCVq4Dyqz4lKV X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message , Kyle Evans write s: > On 1/2/25 10:29, Cy Schubert wrote: > > In message <9156305a-c929-48cf-9619-e23bec6f6897@FreeBSD.org>, Kyle Evans > > write > > s: > >> On 1/1/25 21:14, Cy Schubert wrote: > >>> In message , Kyle Evans > >>> write > >>> s: > >>>> On 1/1/25 20:53, Cy Schubert wrote: > >>>>> In message <202501020215.5022FeQP042716@gitrepo.freebsd.org>, Kyle Evan > s > >>>>> writes > >>>>> : > >>>>>> The branch main has been updated by kevans: > >>>>>> > >>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=f68ee0e7a1e8732f725cad4ac > 70 > >> 8e > >>>> c49 > >>>>>> 093782d4 > >>>>>> > >>>>>> commit f68ee0e7a1e8732f725cad4ac708ec49093782d4 > >>>>>> Author: Kyle Evans > >>>>>> AuthorDate: 2025-01-02 02:15:36 +0000 > >>>>>> Commit: Kyle Evans > >>>>>> CommitDate: 2025-01-02 02:15:36 +0000 > >>>>>> > >>>>>> shar: add a deprecation notice > >>>>>> > >>>>>> The shar(1) program is simple, but the fundamental idea of a sh > ar > >> chi > >>>> ve > >>>>>> is risky at best and one that we probably shouldn't be promotin > g a > >> s > >>>>>> prominently as a program in $PATH and a manpage. Let's depreca > te > >> and > >>>>>> remove it, since the same functionality can easily be found in > >>>>>> tar(1) instead. > >>>>>> > >>>>>> Reviewed by: emaste, philip > >>>>>> Reviewed by: allanjude, brooks, delphij, des, imp, rpokala ( > pre > >> vio > >>>> us) > >>>>>> MFC after: 3 days > >>>>>> Differential Revision: https://reviews.freebsd.org/D48130 > >>>>>> --- > >>>>>> usr.bin/shar/shar.1 | 14 +++++++++++++- > >>>>>> 1 file changed, 13 insertions(+), 1 deletion(-) > >>>>>> > >>>>>> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > >>>>>> index 903f937491dc..df97021b1bba 100644 > >>>>>> --- a/usr.bin/shar/shar.1 > >>>>>> +++ b/usr.bin/shar/shar.1 > >>>>>> @@ -25,12 +25,24 @@ > >>>>>> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIB > ILI > >> TY > >>>> OF > >>>>>> .\" SUCH DAMAGE. > >>>>>> .\" > >>>>>> -.Dd January 31, 2019 > >>>>>> +.Dd January 1, 2025 > >>>>>> .Dt SHAR 1 > >>>>>> .Os > >>>>>> .Sh NAME > >>>>>> .Nm shar > >>>>>> .Nd create a shell archive of files > >>>>>> +.Sh DEPRECATION NOTICE > >>>>>> +.Nm > >>>>>> +is obsolete and may not be present in > >>>>>> +.Fx 15 > >>>>>> +and later. > >>>>>> +Because shell archives are simultaneously data and code and are typic > al > >> ly > >>>>>> +interpreted by > >>>>>> +.Xr sh 1 , > >>>>>> +they can easily be trojan-horsed and pose a significant security risk > t > >> o > >>>> use > >>>>>> rs. > >>>>>> +The > >>>>>> +.Xr tar 1 > >>>>>> +utility can still produce shar encodings of files if needed. > >>>>>> .Sh SYNOPSIS > >>>>>> .Nm > >>>>>> .Ar > >>>>>> > >>>>> > >>>>> We should probably point to the new port or the GNU variant in ports. > >>>>> > >>>> > >>>> Oh, sorry, I didn't realize you had gone ahead with the port. I > >>>> wouldn't normally recommend a GNU variant, would you be OK with > >>>> something like: > >>>> > >>>> diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 > >>>> index df97021b1bba..6beb1e84ceab 100644 > >>>> --- a/usr.bin/shar/shar.1 > >>>> +++ b/usr.bin/shar/shar.1 > >>>> @@ -43,6 +43,11 @@ they can easily be trojan-horsed and pose a > >>>> significant security risk to users. > >>>> The > >>>> .Xr tar 1 > >>>> utility can still produce shar encodings of files if needed. > >>>> +The > >>>> +.Pa sysutils/freebsd-shar > >>>> +port has been created to maintain this version of > >>>> +.Nm > >>>> +past its deprecation in base. > >>>> .Sh SYNOPSIS > >>>> .Nm > >>>> .Ar > >>>> > >>>> ? > >>> > >>> Yeah, that should do it. > >>> > >> > >> Pushed as 2832af7b4ea256b18ef4dbf2ff97a50765f0609a, thanks. I'll drop > >> another pointer to the port in UPDATING when it comes time to remove it. > >> > >> Thanks, > >> > >> Kyle Evans > > > > As an FYI, I'll patch shar with a couple of patches from NetBSD. They will > > also be applied to the upstream (my github) repo for the port as well. I'll > > probably push these sometime next week. > > > > Sounds good, thanks. I don't have immediate plans for a timeline on > removal beyond "probably before 15", but it would certainly be after > packages are published for a version of the port that you're happy with > to provide a smooth transition. I'll keep both in sync and MFC changes as needed. The proposed changes are in the testing branch of https://github.com/cschube r/freebsd-shar.git. I don't plan to make any other changes after this, unless NetBSD fixes something. I can't simply use their shar because we have improvements they don't and they have improvements we don't. > > Thanks, > > Kyle Evans -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jan 2 17:04:15 2025 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 4YPCjX4q2xz5jSHF; Thu, 02 Jan 2025 17:04:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPCjX49jBz4mPB; Thu, 2 Jan 2025 17:04:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735837456; 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: in-reply-to:in-reply-to:references:references; bh=xLCNGn8N5Y3Q2jD7ais65G6NBjdA3l4eUERkmMtXU7s=; b=dRXLMj8ArmFmJtBc6pEGVYox4xWBGhzwTNKRP9KB/lsPdPmPrY4EcBTlLwkx6hv3JgJk1V F4TO447vKpeiYM4g3fyTrU8IrUpcMrbwMIR98oAxBz3lzJ+DpLompcKxp2FEuVpbs4Q2st 7LUUYmZ/AuG0gfkSKDn/STPOMOoIvAdSRiuAJH92sixfGBpaqj1o4jeXQUtozDOeacy1mc NGqhxIBqseqzhf0K4C6A5AKDSoCko2ga55XTCg2uyMGMENSiFlJd6IEtuWLZC+gRAKujE1 euAdAoTs1H5PrhX1H9dvxSFtDPH2txaMKD0sXvsYannbI8xRdUidZiDnbQga3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735837456; 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: in-reply-to:in-reply-to:references:references; bh=xLCNGn8N5Y3Q2jD7ais65G6NBjdA3l4eUERkmMtXU7s=; b=sFUK4C4t1N/BWyKug2r1ssgCWwnyhvTHpq/dsTI670PuZB52ih1CSp3F2obQBonwd7girR GiddawfkIwhN9DEDkOs7Ao4xDL1J8YiyxFrB9BV09fRiw6NMvQRgtl20hEyNzH9btXh9j9 rl4nowFDTGXWBz1+RqS+P0kHKz1+x1akDzi/r306JXGa4qNoQnOXXxdyzfTkKknyhJh0Hp Z64ypmG/Cln9IDtfCKmkkVrOI1y4mPtUhy+0PUvCbPTGceM/DxiRgyU6wd+Kt85YbNQrdB KTwYDD3VrCcvZDeLl4eMriqQjuRHqhsp/2ZP18wawsRl0G3GMBTh3gMmmoZeJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735837456; a=rsa-sha256; cv=none; b=MQsdLtTyVp/2E1UVGsqNv44aCjj8DDPti6x1IzBH/bx4X/SLygbg8m0U1w2f5DbWgiuhvM XXqPw00PuM6xtdV1QTsKFwo0o9GP8IvLUNkUEtsNJvzOlzfn8i+2615L+ADejLC9jnp0zx tHKLVL3WdXP1xuiFNhqN0D3J4gKk6o+vX5FTMdJQjHsgfJqmUXzqcPgtwV9Rc/WtsuB1lz YGJlppDvgrjf/5r77ShFLbxAnPaGsmtMaMMu7+eNrPK+ZqLG0xJwKWDTRPWWbYjGPdhwo5 4MBya2/+Umia7Cqbuo1btE+aH6nacbPQXG7GInCycpDFt4ZV8Lxv/8qJ1l1Jcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4200:b830:f914:bf0:4586:27e] (unknown [IPv6:2601:5c0:4200:b830:f914:bf0:4586:27e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YPCjX21DFzq4S; Thu, 02 Jan 2025 17:04:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <82a48a30-9d7f-42fe-83d4-888719c74471@FreeBSD.org> Date: Thu, 2 Jan 2025 12:04:15 -0500 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: b2d2a78ad80e - main - Import device-tree files from Linux 6.12 Content-Language: en-US To: Emmanuel Vadot , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202501020912.5029Cl3V033260@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202501020912.5029Cl3V033260@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/2/25 04:12, Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b > > commit b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b > Merge: 0e8011faf58b cd989bfc73f7 > Author: Emmanuel Vadot > AuthorDate: 2025-01-02 09:12:13 +0000 > Commit: Emmanuel Vadot > CommitDate: 2025-01-02 09:12:13 +0000 > > Import device-tree files from Linux 6.12 Not sure which update triggered this, but I am now getting this failure building an arm64 GENERIC kernel. The second build "works" but presumably with a busted fdt (I wonder if we have an error there where we need to be removing partially built files on error)? /freebsd/main/sys/tools/fdt/make_dtb.sh /freebsd/main/sys /freebsd/main/sys/contrib/device-tree/src/arm/allwinner/sun8i-h2-plus-orangepi-r1.dts /usr/obj/freebsd/main/arm.armv7/sys/GENERIC/modules/freebsd/main/sys/modules/dtb/allwinner Assertion failed: (sorted_phandles.size() == fixups.size()), function resolve_cross_references, file /freebsd/main/usr.bin/dtc/fdt.cc, line 1421. Abort trap (core dumped) -- John Baldwin From nobody Thu Jan 2 18:12:28 2025 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 4YPFDJ42kzz5jmN5; Thu, 02 Jan 2025 18:12:32 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPFDJ39cwz4s9R; Thu, 2 Jan 2025 18:12:32 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735841552; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VsGS1BNMAk72oK1oCwrd1T6iM5aO8R1wWRqp8vLt8rk=; b=TiYjqiUti2j8dqdBEU4ntBUBT1EekOBNiHFDsw4BrzKLq6QHQcWWkjfjT7ZUCaoWfbbfZ7 8f7gY/+PrIEu1sBrc8njxtVI+ui4pUdwvg6n4x1cjeycWa8RKdmdbqMq3N/JdGYhx5NKP6 pf5X1yYD4DcQ+VFKWRPq+D9DIzbeuoODjtiFSCKrnVWkDtx9jyLeeVUj+rEWzW1UvAza81 fT0jm2luxyrBzeDTnSF+k/cB9LNP6O032s3Qrnc+DCraBzTtDK86gIwnnG32DLLleb2XtW Wm8GA3ZrX0OBgnjCxxslOYOsl5egh9OvaSf/i/Ugqxr9zN69asHrtVxxE9DOQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735841552; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VsGS1BNMAk72oK1oCwrd1T6iM5aO8R1wWRqp8vLt8rk=; b=UFYnX8EGzhG6NDPbRv68QGqng7rJ5xQPIiHYAWcIGnluWohwRnSUZdl2MbJbsabUo61qV+ HWPsDJH+VDdcMf/CQ6voukDqXY3Ge5VRih3o8+Fa829SjUKyS1bHvGnesUWUuFPn2BbitO 5l0PJtiWYgSiDRQvEsICgGWN94uBIH+oqQVMJAwe3puWM+MxGbCPCjo7TnCEaa208K/t2P UJNZCToOJjitegwdeiUHW87zIxDKloaxE7T2pvDlcYcN7TcSoTxhILwyxFz68Qu1qoGiYk pWl4tp5Jt5laZopCkUQy2Y4qh7soAAzUYEy+yZroC41v6fosx7yvCJ/vqPoIGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735841552; a=rsa-sha256; cv=none; b=KBaa2TA2XcY67LBagZje+G2H5w3Ogi+HIduaxniTAHJd/Ch0hD1ablSIh+smykbbyhP+4a ACL5y+Dbavi5TfI1fwC6U+FIRcB9qyRm7uNoUrPjMIfz5FSnazy/KlEBh/i8BVk7p/kSEw XRT9z2VmIchavVHiGJutrec/A5ipVycVskfasU9PfyyB8xKA7um21azyVNZAR/UCKudnym wdxI9cuD7nGz1/OWOOXp1CTh+cuhAWqVDrxtNQm1IL+BBDJxF1+aw+L3CUo7mkWDBig60t w9/Bx0nyH2DyTNeXKvOcMwial4EBhPFXamLpxyomLjcEnEpRxWAns49zXiGI/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2804:f1c:3b:ed00:d41e:94bf:fbf0:1cf3] (unknown [IPv6:2804:f1c:3b:ed00:d41e:94bf:fbf0:1cf3]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YPFDH3s7wzrtV; Thu, 02 Jan 2025 18:12:31 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <12285f6b-22b0-412b-a668-978aba6e4ead@FreeBSD.org> Date: Thu, 2 Jan 2025 15:12:28 -0300 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: git: 1f5c50a86173 - main - pci_host_generic:Add pcib_request_feature on ACPI To: tuexen@freebsd.org, Andrew Turner Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202412121819.4BCIJ6fq097364@gitrepo.freebsd.org> <75B236EB-ECB4-46B5-807D-4B5802E96485__18701.2830095895$1735390362$gmane$org@freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: <75B236EB-ECB4-46B5-807D-4B5802E96485__18701.2830095895$1735390362$gmane$org@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 28/12/24 09:52, tuexen@freebsd.org wrote: > Hi Andrew, > > this commits breaks the booting of my arm64 VM using VMWare fusion on an M1 MacBookPro. > > During booting it reports: Try this one and see if it fixes your issue as well. It worked for me https://reviews.freebsd.org/D48285 -- Renato Botelho From nobody Thu Jan 2 18:28:16 2025 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 4YPFZS5bc7z5jnRN; Thu, 02 Jan 2025 18:28:16 +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 4YPFZS4vhYz4tsP; Thu, 2 Jan 2025 18:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842496; 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=s7+ZPLJyWdC5WBt618vqxL/+0B/WQCq8ULutSDDIpCg=; b=aFryGVEB/E7328EtdrylNe+/942zg6zKLxyBGAzg0TgDmqw+SKka/l+qSvhAIMMfDnCt8s YnhM6Kt5D3moI2XdRBrQYJp6jzKgCnCCo6hUx0V33aa3MVShq01e4vlYa6eF/Kbq8wCVGd 8q/l8ItP5SyfI7+tlzd8Tgeewkjuu03R00a2LTlS82DzDT6gtDnpgy/Ow9NUBJggeBU0KW /T1XSMt77Lb8FsP6WpXjDTCOgE3xocVgE7zjeheRe9NciA8Z9xNiPGjK1+Oa1xwQEwYNM3 PdQHzw8+3HYi+C09rgGKvgQvmmJgGZC4/Dk8XqSi+5rj6t9ekTJkQSH1cxEdzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842496; 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=s7+ZPLJyWdC5WBt618vqxL/+0B/WQCq8ULutSDDIpCg=; b=eFivIaKnn3+fVCURFS8+uPnUdY2JF0ymjzdMB2v712nhq4pQVHa3sDliCItBaBirchF8b/ L65Xk1TIomEcEPenbxKdLY6Ow523I8MVzoy5zmzRbmm9SH/1YIKu/mVIhPApLxxKyMoPiI /Dkz0xQtC8yZxqXewmqNWBb1f4BaTQif8mCUicVomevi2DAcQb+ebPBTWF9QcgyuCHFA6B Ckq6669Q0IDt1GOBRC/kR5QCEH6vTq9Ynm9AezFY9nqY+7E96Ml6pPV2Pv8UHqGc4bHVXZ iSzT+m19XDzS/Wz1gxrjAa2jtajGoCy07aSP8gAUExeN4tTH7PEygF6LnJKH1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842496; a=rsa-sha256; cv=none; b=m3trlanf9qs+FBZj8X1j2xelReP95X+1ABUzDj41enqNwxYBV/U+DANDMAHcZ+EjJVuslC j0TxnK6i5P8OXI0AnpF/gF7M0iCZj7tYuWdISrNRON37C7fy5h/YoLzVythnQmv7HL/qNV BmAj/6SKlePp34Hc4F0Eok7NFaOYJLlokqoYWQk7qHfgb1f4wzzw39qVTKnGOyrw3zTigB R8pczqBMhuNK0VlyYbqZdDAEpQO8GXe4YFimnJ8PjOSHlC1HQKjeNweSDPkSlRFboHt5/p GicDMRw7hmDz3SEGTu/gH+9C/IknYnBTIZ/IKhEDcIhLQHQ90w6VrCiywBjjZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZS4TGnzpJk; Thu, 02 Jan 2025 18:28:16 +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 502ISGgX065987; Thu, 2 Jan 2025 18:28:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISGJ3065984; Thu, 2 Jan 2025 18:28:16 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:16 GMT Message-Id: <202501021828.502ISGJ3065984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e9d3857040a1 - main - Use bus_detach_children instead of bus_generic_detach 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9d3857040a1983f6cf8780783da4da34773f660 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e9d3857040a1983f6cf8780783da4da34773f660 commit e9d3857040a1983f6cf8780783da4da34773f660 Author: John Baldwin AuthorDate: 2025-01-02 18:19:39 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:19:39 +0000 Use bus_detach_children instead of bus_generic_detach These drivers perform additional teardown steps in between detaching child devices and deleting child devices. Differential Revision: https://reviews.freebsd.org/D47957 --- sys/arm/nvidia/tegra_sdhci.c | 2 +- sys/dev/cxgb/cxgb_main.c | 4 ++-- sys/dev/cxgbe/t4_main.c | 2 +- sys/dev/gpio/gpiobus.c | 2 +- sys/dev/gpio/gpioiic.c | 2 +- sys/dev/pci/pci_pci.c | 2 +- sys/dev/sdhci/sdhci_fdt.c | 2 +- sys/dev/sdhci/sdhci_xenon.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c index 4d2eaccf4c27..3bd9a9bb4632 100644 --- a/sys/arm/nvidia/tegra_sdhci.c +++ b/sys/arm/nvidia/tegra_sdhci.c @@ -418,7 +418,7 @@ tegra_sdhci_detach(device_t dev) struct tegra_sdhci_softc *sc = device_get_softc(dev); struct sdhci_slot *slot = &sc->slot; - bus_generic_detach(dev); + bus_detach_children(dev); sdhci_fdt_gpio_teardown(sc->gpio); clk_release(sc->clk); bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie); diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index ed0993f934f1..a19483c7cbbf 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -729,7 +729,7 @@ cxgb_free(struct adapter *sc) /* * Make sure all child devices are gone. */ - bus_generic_detach(sc->dev); + bus_detach_children(sc->dev); for (i = 0; i < (sc)->params.nports; i++) { if (sc->portdev[i] && device_delete_child(sc->dev, sc->portdev[i]) != 0) @@ -1066,7 +1066,7 @@ cxgb_port_attach(device_t dev) /* * cxgb_port_detach() is called via the device_detach methods when - * cxgb_free() calls the bus_generic_detach. It is responsible for + * cxgb_free() calls the bus_detach_children. It is responsible for * removing the device from the view of the kernel, i.e. from all * interfaces lists etc. This routine is only called when the driver is * being unloaded, not when the link goes down. diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 25d5dee8b781..755fd19a3c9c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1789,7 +1789,7 @@ t4_detach_common(device_t dev) } if (device_is_attached(dev)) { - rc = bus_generic_detach(dev); + rc = bus_detach_children(dev); if (rc) { device_printf(dev, "failed to detach child devices: %d\n", rc); diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index bc166f43d398..37371fa4e1cc 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -582,7 +582,7 @@ gpiobus_detach(device_t dev) ("gpiobus mutex not initialized")); GPIOBUS_LOCK_DESTROY(sc); - if ((err = bus_generic_detach(dev)) != 0) + if ((err = bus_detach_children(dev)) != 0) return (err); if ((err = device_delete_children(dev)) != 0) return (err); diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c index 2404e70fc648..2197d238cf2b 100644 --- a/sys/dev/gpio/gpioiic.c +++ b/sys/dev/gpio/gpioiic.c @@ -331,7 +331,7 @@ gpioiic_detach(device_t dev) struct gpioiic_softc *sc = device_get_softc(dev); int err; - if ((err = bus_generic_detach(dev)) != 0) + if ((err = bus_detach_children(dev)) != 0) return (err); gpioiic_cleanup(sc); diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index c4f7814dfee5..44cbf327868c 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -1552,7 +1552,7 @@ pcib_detach(device_t dev) int error; sc = device_get_softc(dev); - error = bus_generic_detach(dev); + error = bus_detach_children(dev); if (error) return (error); #ifdef PCI_HP diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index e7dda316539c..1d8013ee7088 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -666,7 +666,7 @@ sdhci_fdt_detach(device_t dev) struct sdhci_fdt_softc *sc = device_get_softc(dev); int i; - bus_generic_detach(dev); + bus_detach_children(dev); bus_teardown_intr(dev, sc->irq_res, sc->intrhand); bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c index 4a823b896ca8..098412a81148 100644 --- a/sys/dev/sdhci/sdhci_xenon.c +++ b/sys/dev/sdhci/sdhci_xenon.c @@ -592,7 +592,7 @@ sdhci_xenon_detach(device_t dev) { struct sdhci_xenon_softc *sc = device_get_softc(dev); - bus_generic_detach(dev); + bus_detach_children(dev); bus_teardown_intr(dev, sc->irq_res, sc->intrhand); bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); From nobody Thu Jan 2 18:28:17 2025 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 4YPFZT6nFqz5jnTb; Thu, 02 Jan 2025 18:28:17 +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 4YPFZT68bNz4tkL; Thu, 2 Jan 2025 18:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842497; 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=ysIv8SKn1jWTrDV+7yMU5OIgVsdCZft0BLhiREDdtX8=; b=Yy/vTfSi7hQEY+mvc2kQ7tt95ccmBBwJPebLjtfs4UKHweh3ywERsPhcjFNHJL1cFYCxPN tyFbpM7V3D6yu1a0crRDcBwVlLHVUuoU0xUGQ8CaYYQ3zeakK9z/qYnSfYMBZa2Xak0lDb 0Kbz6cYlxDG+rKevEnE+17QefdvwdRRB6Ha/vOSqWuNVq9KiDX8qbzTqmORpxZdYG/o2R3 qsaG3bRzdlMGtIGdY5dDWsTFEhlyjt8Dz8SbIhikUy0oo1nXkwbBmTv4wKahQ3k960kFvD g+voKfjlGvLwf+Dkkpg5wY1qlWbVvU2k/JDCRHlzU899N3DyTU9/5s2tLSVATQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842497; 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=ysIv8SKn1jWTrDV+7yMU5OIgVsdCZft0BLhiREDdtX8=; b=c4XKRPBia60PUMC+KRsixyxC6Oo1uVEMTrSqpw5iJOLi48t91nETuAgPUnnutz5QjssxRR 9m3citjhA9MDqMFef4/VYBGm/2fJDj6OUjsXW/1tPiRr6+B7r5428vEOeVLyipqWYkm831 5ADT0tz9g+9FUj6JImDoMBxKLQLV9KqwDNVTmtkpYhMmuOyHdftJQ6pjYUhRUBpFy97NLd 8pxowEHNib0ewcYa3YvPlplN1hHolxQkCZM2n7ABjT3NM56p/slTZ4+mq0v8Btr/FhV0I/ oZ5uipIdGO7xl0Lp8zQ761e21YXTeg7eNxlHCSIT7QPk49jjQtBpCURMxve6ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842497; a=rsa-sha256; cv=none; b=n2dDAsnztrEx6VWY4dud1zSXRj90gxe/166Bf+10tr7C/ceuqnl0uQq+CMTeIkxZw9xi91 f+578rH4Tf2Vf+53Sg4ox8q96tstJEP4o/nJtw2HjND+sEFKT4Q0J5Bz2C65iXJYaCJ5aX zBZGYvhnE/vZE/CJqdXLCrzWtwUbkFad7pQxqo4oqrMkP5A7c8X5mhNSpnU16p4i5WYxT5 fYdmTWh3Xs+fhmXemGrs3uOO8mvBsWrNAkhF4pf4/B/3bSktDY+cnCVtZTtOPtFqA6bC7s SrnNyMTwu5hfARKI1ohYC7yJF4ZVAvzZIA1Jbz6MJqYQ67QzQjwMI3GeownGgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZT58xCznww; Thu, 02 Jan 2025 18:28:17 +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 502ISHk3066056; Thu, 2 Jan 2025 18:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISHT5066053; Thu, 2 Jan 2025 18:28:17 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:17 GMT Message-Id: <202501021828.502ISHT5066053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 28f5e880e8b2 - main - Use device_delete_children instead of explicit calls to device_delete_child 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28f5e880e8b28d77cf1a4eb6ce2a766d3c5a3926 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=28f5e880e8b28d77cf1a4eb6ce2a766d3c5a3926 commit 28f5e880e8b28d77cf1a4eb6ce2a766d3c5a3926 Author: John Baldwin AuthorDate: 2025-01-02 18:20:21 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:20:21 +0000 Use device_delete_children instead of explicit calls to device_delete_child This is simpler and more robust in the face of potential double-frees (e.g. if called after bus_generic_detach which will delete devices in a future commit). Reviewed by: manu, imp Differential Revision: https://reviews.freebsd.org/D47958 --- sys/arm/allwinner/aw_mmc.c | 8 +------- sys/arm64/broadcom/genet/if_genet.c | 5 +---- sys/dev/intpm/intpm.c | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index 634afdfdfd46..9f61e1560658 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -482,7 +482,6 @@ static int aw_mmc_detach(device_t dev) { struct aw_mmc_softc *sc; - device_t d; sc = device_get_softc(dev); @@ -494,12 +493,7 @@ aw_mmc_detach(device_t dev) callout_drain(&sc->aw_timeoutc); - AW_MMC_LOCK(sc); - d = sc->child; - sc->child = NULL; - AW_MMC_UNLOCK(sc); - if (d != NULL) - device_delete_child(sc->aw_dev, d); + device_delete_children(sc->aw_dev); aw_mmc_teardown_dma(sc); diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index ccc35fe841df..0602f076b257 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -365,10 +365,7 @@ static void gen_destroy(struct gen_softc *sc) { - if (sc->miibus) { /* can't happen */ - device_delete_child(sc->dev, sc->miibus); - sc->miibus = NULL; - } + device_delete_children(sc->dev); bus_teardown_intr(sc->dev, sc->res[_RES_IRQ1], sc->ih); bus_teardown_intr(sc->dev, sc->res[_RES_IRQ2], sc->ih2); gen_bus_dma_teardown(sc); diff --git a/sys/dev/intpm/intpm.c b/sys/dev/intpm/intpm.c index 6fc228ac0cd0..3aa76ff48263 100644 --- a/sys/dev/intpm/intpm.c +++ b/sys/dev/intpm/intpm.c @@ -202,8 +202,7 @@ intsmb_release_resources(device_t dev) { struct intsmb_softc *sc = device_get_softc(dev); - if (sc->smbus) - device_delete_child(dev, sc->smbus); + device_delete_children(dev); if (sc->irq_hand) bus_teardown_intr(dev, sc->irq_res, sc->irq_hand); if (sc->irq_res) From nobody Thu Jan 2 18:28:18 2025 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 4YPFZW0kdMz5jnWv; Thu, 02 Jan 2025 18:28:19 +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 4YPFZV6vF0z4tj1; Thu, 2 Jan 2025 18:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842498; 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=CmH0HCnNmi76i3ZAwQ+hjd/eBFRvqhg9aIFmp8TRrMg=; b=UuEloUJnltx1fE/2UqrbuPQx/SypZurxgPl3+M6iaQ9l1QI2AaHlY/FNqqQAYVU4rDnS70 YOR6y0slpVFYluiVN7PlGN5aGw4YZxk1Z8pDsV7PhN40VffkwCglAMdIy4CFcLOMPK75EO BOyVB1CkYi5E0QOOOvbn3C9r1Ok75Reep2ZWIrYiIggMZmxoGy7rSWhB+S+XpnGm2s56RP /P4xH3NybRDd33/joEmPrRp0/u02RxCmpq+6OoaLuU3MngKnR/y9QXk37Pr3XYUBAsvfoL /atjtyV6jtkb1h/ZRXvlJKUv/Dx3N4nmtTJ0jOTk6/4/wyYdIYR9Cw8c4SPdTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842498; 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=CmH0HCnNmi76i3ZAwQ+hjd/eBFRvqhg9aIFmp8TRrMg=; b=GduIpD/XC8+WwZjGrVrTvLwQhLBDc6FrxnSyCzIrD4LOmXgc06mLFwV0SDhV0PLxM3tzUL n62X3I7L7uXG7aqc1z9IYpEFBoOf/pkgsOQsoheqPE9ARQ4yxohfE/MgcQBsQdgJOI0YrS /Q0l3tE74ra/YRwoNuBghv2QeJoe78mLlgabghhH5gqQbJgfyVYyIyhNduE3dkpXFj335D bqMmWWbKvKwn1SerNTmt9aYAzkV9UJBqk3swHGoAh1U9CfkdYxJ5Br/S7D4nIc1Z3Q+Pj/ tz6TKEvP3yi8ZHT6Wr0LCDUQpJ8OjWHpXg/qqnxpR6nWF1nf726tiMJd8YqokQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842498; a=rsa-sha256; cv=none; b=OjTSodBjscmuWZeDPtt17TzU27UOXrbGLddKLssyQEU0k6WjCcELOFaf8s1C45KwRI6hzb qG7vYxuwHTR0DtT2KV8sgawBBtRsIb5NvH3NmpL8pUSfz4hlbPgYVv6UI8k5fdyWZWYdnl E8HFkuoQrnWN05pYoAqz3ARYrwx3qhJn4TzP15mZXXAjxprjqGSzcFZKI3lwltA7djnsaI nn7mcYwD9DL7mXVwiNUgm/Ul73F8bMu5ZJsMSVEtcVEDx2M8sjaK6SemlhfK108iLQ91sm /aZkaBfbWxs+j57ovOxu1G7XldLIJuehX5s/tIc3ORPEZOxZOD6D8woDDu/Hng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZV6Fg8znl8; Thu, 02 Jan 2025 18:28:18 +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 502ISIAY066103; Thu, 2 Jan 2025 18:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISI8I066100; Thu, 2 Jan 2025 18:28:18 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:18 GMT Message-Id: <202501021828.502ISI8I066100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b196276c20b5 - main - bus_generic_detach: Delete children after detaching them 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b196276c20b577b364372f1aa1a646b9ce34bf5c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b196276c20b577b364372f1aa1a646b9ce34bf5c commit b196276c20b577b364372f1aa1a646b9ce34bf5c Author: John Baldwin AuthorDate: 2025-01-02 18:21:02 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:21:30 +0000 bus_generic_detach: Delete children after detaching them This provides better semantics as a standalone DEVMETHOD for device_attach as bus drivers should remove child devices they created as part of detach cleanup. The implementation calls bus_detach_children() first to permit child devices an opportunity to veto the detach operation. If that succeeds, device_delete_children() is used to delete the child devices. This requires fixing various drivers that were deleting devices explicitly (via a device_t pointer cached in the softc) after calling bus_generic_detach to stop doing that and just rely on bus_generic_detach to remove child devices. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47959 --- sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 2 -- sys/arm/freescale/imx/imx_i2c.c | 3 --- sys/arm/freescale/imx/imx_spi.c | 3 --- sys/arm/mv/a37x0_iic.c | 2 -- sys/arm/nvidia/tegra_i2c.c | 2 -- sys/arm/ti/am335x/am335x_ehrpwm.c | 3 --- sys/arm/ti/cpsw/if_cpsw.c | 10 ++++------ sys/arm/ti/ti_i2c.c | 4 ---- sys/arm/xilinx/zy7_qspi.c | 4 ---- sys/arm/xilinx/zy7_spi.c | 4 ---- sys/dev/bce/if_bce.c | 1 - sys/dev/bfe/if_bfe.c | 2 -- sys/dev/bge/if_bge.c | 1 - sys/dev/bhnd/bhndb/bhndb.c | 4 ---- sys/dev/bhnd/cores/chipc/chipc.c | 3 --- sys/dev/cxgbe/t4_main.c | 2 -- sys/dev/dpaa2/dpaa2_mc.c | 2 -- sys/dev/etherswitch/felix/felix.c | 2 -- sys/dev/firewire/fwohci_pci.c | 5 ----- sys/dev/glxiic/glxiic.c | 7 ++----- sys/dev/ichiic/ig4_iic.c | 10 +++------- sys/dev/ichsmb/ichsmb.c | 1 - sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 7 +------ sys/dev/iicbus/controller/rockchip/rk_i2c.c | 4 ---- sys/dev/iicbus/controller/twsi/twsi.c | 4 ---- sys/dev/iicbus/controller/vybrid/vf_i2c.c | 6 ------ sys/dev/ismt/ismt.c | 2 -- sys/dev/lge/if_lge.c | 1 - sys/dev/ow/ow.c | 13 ------------- sys/dev/pcf/pcf_isa.c | 3 --- sys/dev/pwm/controller/allwinner/aw_pwm.c | 3 --- sys/dev/qcom_qup/qcom_spi.c | 2 -- sys/dev/smbus/smbus.c | 1 - sys/dev/sound/pci/fm801.c | 6 ------ sys/dev/spibus/controller/allwinner/aw_spi.c | 2 -- sys/dev/spibus/controller/rockchip/rk_spi.c | 2 -- sys/dev/viapm/viapm.c | 6 ------ sys/dev/vnic/thunder_mdio.c | 1 - sys/kern/subr_bus.c | 11 ++++++++--- sys/sys/param.h | 2 +- 40 files changed, 19 insertions(+), 134 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c index c7de4df0e8fb..a4cbef7d528f 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c @@ -361,8 +361,6 @@ bcm_bsc_detach(device_t dev) bus_generic_detach(dev); sc = device_get_softc(dev); - if (sc->sc_iicbus != NULL) - device_delete_child(dev, sc->sc_iicbus); mtx_destroy(&sc->sc_mtx); if (sc->sc_intrhand) bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand); diff --git a/sys/arm/freescale/imx/imx_i2c.c b/sys/arm/freescale/imx/imx_i2c.c index c1d5c8c974a8..3190ec294ab4 100644 --- a/sys/arm/freescale/imx/imx_i2c.c +++ b/sys/arm/freescale/imx/imx_i2c.c @@ -494,9 +494,6 @@ i2c_detach(device_t dev) return (error); } - if (sc->iicbus != NULL) - device_delete_child(dev, sc->iicbus); - /* Release bus-recover pins; gpio_pin_release() handles NULL args. */ gpio_pin_release(sc->rb_sclpin); gpio_pin_release(sc->rb_sdapin); diff --git a/sys/arm/freescale/imx/imx_spi.c b/sys/arm/freescale/imx/imx_spi.c index 53d9f739b97c..dac42a800e9e 100644 --- a/sys/arm/freescale/imx/imx_spi.c +++ b/sys/arm/freescale/imx/imx_spi.c @@ -473,9 +473,6 @@ spi_detach(device_t dev) if ((error = bus_generic_detach(sc->dev)) != 0) return (error); - if (sc->spibus != NULL) - device_delete_child(dev, sc->spibus); - for (idx = 0; idx < nitems(sc->cspins); ++idx) { if (sc->cspins[idx] != NULL) gpio_pin_release(sc->cspins[idx]); diff --git a/sys/arm/mv/a37x0_iic.c b/sys/arm/mv/a37x0_iic.c index f9a71b97240a..7d71cac23a40 100644 --- a/sys/arm/mv/a37x0_iic.c +++ b/sys/arm/mv/a37x0_iic.c @@ -249,8 +249,6 @@ a37x0_iic_detach(device_t dev) bus_generic_detach(dev); sc = device_get_softc(dev); - if (sc->sc_iicbus != NULL) - device_delete_child(dev, sc->sc_iicbus); mtx_destroy(&sc->sc_mtx); if (sc->sc_intrhand) bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand); diff --git a/sys/arm/nvidia/tegra_i2c.c b/sys/arm/nvidia/tegra_i2c.c index bed1bf0ed7e3..6c4d20cb78ff 100644 --- a/sys/arm/nvidia/tegra_i2c.c +++ b/sys/arm/nvidia/tegra_i2c.c @@ -757,8 +757,6 @@ tegra_i2c_detach(device_t dev) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res); LOCK_DESTROY(sc); - if (sc->iicbus) - device_delete_child(dev, sc->iicbus); return (0); } diff --git a/sys/arm/ti/am335x/am335x_ehrpwm.c b/sys/arm/ti/am335x/am335x_ehrpwm.c index 95301f9cfed3..59ef0931439d 100644 --- a/sys/arm/ti/am335x/am335x_ehrpwm.c +++ b/sys/arm/ti/am335x/am335x_ehrpwm.c @@ -542,9 +542,6 @@ am335x_ehrpwm_detach(device_t dev) PWM_LOCK(sc); - if (sc->sc_busdev != NULL) - device_delete_child(dev, sc->sc_busdev); - if (sc->sc_mem_res) bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_mem_rid, sc->sc_mem_res); diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 732b5a81857a..674a7ed8575a 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -923,13 +923,11 @@ cpsw_detach(device_t dev) struct cpsw_softc *sc; int error, i; - bus_generic_detach(dev); - sc = device_get_softc(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); - for (i = 0; i < CPSW_PORTS; i++) { - if (sc->port[i].dev) - device_delete_child(dev, sc->port[i].dev); - } + sc = device_get_softc(dev); if (device_is_attached(dev)) { callout_stop(&sc->watchdog.callout); diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c index a6c397a87e8b..e2f114505015 100644 --- a/sys/arm/ti/ti_i2c.c +++ b/sys/arm/ti/ti_i2c.c @@ -913,10 +913,6 @@ ti_i2c_detach(device_t dev) return (rv); } - if (sc->sc_iicbus && - (rv = device_delete_child(dev, sc->sc_iicbus)) != 0) - return (rv); - ti_i2c_deactivate(dev); TI_I2C_LOCK_DESTROY(sc); diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c index c033fd29a7db..53559571f7db 100644 --- a/sys/arm/xilinx/zy7_qspi.c +++ b/sys/arm/xilinx/zy7_qspi.c @@ -616,10 +616,6 @@ zy7_qspi_detach(device_t dev) if (device_is_attached(dev)) bus_generic_detach(dev); - /* Delete child bus. */ - if (sc->child) - device_delete_child(dev, sc->child); - /* Disable hardware. */ if (sc->mem_res != NULL) { /* Disable SPI. */ diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c index a24ce542a860..d032deabf8b7 100644 --- a/sys/arm/xilinx/zy7_spi.c +++ b/sys/arm/xilinx/zy7_spi.c @@ -452,10 +452,6 @@ zy7_spi_detach(device_t dev) if (device_is_attached(dev)) bus_generic_detach(dev); - /* Delete child bus. */ - if (sc->child) - device_delete_child(dev, sc->child); - /* Disable hardware. */ if (sc->mem_res != NULL) { /* Disable SPI. */ diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 226fca16ac28..73af49015e52 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -1544,7 +1544,6 @@ bce_detach(device_t dev) ifmedia_removeall(&sc->bce_ifmedia); else { bus_generic_detach(dev); - device_delete_child(dev, sc->bce_miibus); } /* Release all remaining resources. */ diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c index 817c867862d0..2fb6938fbdc5 100644 --- a/sys/dev/bfe/if_bfe.c +++ b/sys/dev/bfe/if_bfe.c @@ -551,8 +551,6 @@ bfe_detach(device_t dev) BFE_UNLOCK(sc); bus_generic_detach(dev); - if (sc->bfe_miibus != NULL) - device_delete_child(dev, sc->bfe_miibus); bfe_release_resources(sc); bfe_dma_free(sc); diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 6c3301b1473a..cf3084f9b768 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -3949,7 +3949,6 @@ bge_detach(device_t dev) ifmedia_removeall(&sc->bge_ifmedia); else if (sc->bge_miibus != NULL) { bus_generic_detach(dev); - device_delete_child(dev, sc->bge_miibus); } bge_release_resources(sc); diff --git a/sys/dev/bhnd/bhndb/bhndb.c b/sys/dev/bhnd/bhndb/bhndb.c index 511beae0cc25..f9d56a9b9226 100644 --- a/sys/dev/bhnd/bhndb/bhndb.c +++ b/sys/dev/bhnd/bhndb/bhndb.c @@ -624,10 +624,6 @@ bhndb_generic_detach(device_t dev) if ((error = bus_generic_detach(dev))) return (error); - /* Delete children */ - if ((error = device_delete_children(dev))) - return (error); - /* Clean up our service registry */ if ((error = bhnd_service_registry_fini(&sc->services))) return (error); diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c index 09ca4d8884e6..24697a8f0b17 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -244,9 +244,6 @@ chipc_detach(device_t dev) if ((error = bus_generic_detach(dev))) return (error); - if ((error = device_delete_children(dev))) - return (error); - if ((error = bhnd_deregister_provider(dev, BHND_SERVICE_ANY))) return (error); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 755fd19a3c9c..024c97dcb78c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1807,8 +1807,6 @@ t4_detach_common(device_t dev) pi = sc->port[i]; if (pi) { t4_free_vi(sc, sc->mbox, sc->pf, 0, pi->vi[0].viid); - if (pi->dev) - device_delete_child(dev, pi->dev); mtx_destroy(&pi->pi_lock); free(pi->vi, M_CXGBE); diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c index 1d0275127ced..c84b22d1d74d 100644 --- a/sys/dev/dpaa2/dpaa2_mc.c +++ b/sys/dev/dpaa2/dpaa2_mc.c @@ -286,8 +286,6 @@ dpaa2_mc_detach(device_t dev) return (error); sc = device_get_softc(dev); - if (sc->rcdev) - device_delete_child(dev, sc->rcdev); bus_release_resources(dev, dpaa2_mc_spec, sc->res); dinfo = device_get_ivars(dev); diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c index 622cf3bca140..b6fb8cbb67c8 100644 --- a/sys/dev/etherswitch/felix/felix.c +++ b/sys/dev/etherswitch/felix/felix.c @@ -497,8 +497,6 @@ felix_detach(device_t dev) felix_setup(sc); for (i = 0; i < sc->info.es_nports; i++) { - if (sc->ports[i].miibus != NULL) - device_delete_child(dev, sc->ports[i].miibus); if (sc->ports[i].ifp != NULL) if_free(sc->ports[i].ifp); if (sc->ports[i].ifname != NULL) diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index 591503728093..a6f9f50701f0 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -333,11 +333,6 @@ fwohci_pci_detach(device_t self) bus_generic_detach(self); - if (sc->fc.bdev) { - device_delete_child(self, sc->fc.bdev); - sc->fc.bdev = NULL; - } - /* disable interrupts that might have been switched on */ if (sc->bst && sc->bsh) bus_space_write_4(sc->bst, sc->bsh, diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c index 5dfea9acbe4a..ddaa77b6b73c 100644 --- a/sys/dev/glxiic/glxiic.c +++ b/sys/dev/glxiic/glxiic.c @@ -451,11 +451,8 @@ glxiic_detach(device_t dev) error = bus_generic_detach(dev); if (error != 0) - goto out; - if (sc->iicbus != NULL) - error = device_delete_child(dev, sc->iicbus); + return (error); -out: callout_drain(&sc->callout); if (sc->smb_res != NULL) { @@ -479,7 +476,7 @@ out: GLXIIC_LOCK_DESTROY(sc); - return (error); + return (0); } static uint8_t diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index 806b406af326..c9346ff12350 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -1080,13 +1080,9 @@ ig4iic_detach(ig4iic_softc_t *sc) { int error; - if (device_is_attached(sc->dev)) { - error = bus_generic_detach(sc->dev); - if (error) - return (error); - } - if (sc->iicbus) - device_delete_child(sc->dev, sc->iicbus); + error = bus_generic_detach(sc->dev); + if (error) + return (error); if (sc->intr_handle) bus_teardown_intr(sc->dev, sc->intr_res, sc->intr_handle); diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index 063fbf66a75a..28503b9e574d 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -696,7 +696,6 @@ ichsmb_detach(device_t dev) error = bus_generic_detach(dev); if (error) return (error); - device_delete_child(dev, sc->smb); ichsmb_release_resources(sc); mtx_destroy(&sc->mutex); diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c index 3bed24c36070..bf1f88ec9ca5 100644 --- a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c +++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c @@ -626,18 +626,13 @@ cdnc_i2c_detach(device_t dev) { struct cdnc_i2c_softc *sc = device_get_softc(dev); - if (device_is_attached(dev)) - bus_generic_detach(dev); + bus_generic_detach(dev); if (sc->ref_clk != NULL) { clk_release(sc->ref_clk); sc->ref_clk = NULL; } - /* Delete iic bus. */ - if (sc->iicbus) - device_delete_child(dev, sc->iicbus); - /* Disable hardware. */ if (sc->mem_res != NULL) { sc->cfg_reg_shadow = 0; diff --git a/sys/dev/iicbus/controller/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c index 0ef65d1121f5..9317adbcfd98 100644 --- a/sys/dev/iicbus/controller/rockchip/rk_i2c.c +++ b/sys/dev/iicbus/controller/rockchip/rk_i2c.c @@ -686,10 +686,6 @@ rk_i2c_detach(device_t dev) if ((error = bus_generic_detach(dev)) != 0) return (error); - if (sc->iicbus != NULL) - if ((error = device_delete_child(dev, sc->iicbus)) != 0) - return (error); - if (sc->sclk != NULL) clk_release(sc->sclk); if (sc->pclk != NULL) diff --git a/sys/dev/iicbus/controller/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c index 20d39aa7d93b..b5aefbae7d7e 100644 --- a/sys/dev/iicbus/controller/twsi/twsi.c +++ b/sys/dev/iicbus/controller/twsi/twsi.c @@ -835,10 +835,6 @@ twsi_detach(device_t dev) if ((rv = bus_generic_detach(dev)) != 0) return (rv); - if (sc->iicbus != NULL) - if ((rv = device_delete_child(dev, sc->iicbus)) != 0) - return (rv); - if (sc->intrhand != NULL) bus_teardown_intr(sc->dev, sc->res[1], sc->intrhand); diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c.c b/sys/dev/iicbus/controller/vybrid/vf_i2c.c index f6d0eb4c2c59..4735a95cf5cd 100644 --- a/sys/dev/iicbus/controller/vybrid/vf_i2c.c +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c.c @@ -213,12 +213,6 @@ i2c_detach(device_t dev) return (error); } - error = device_delete_child(dev, sc->iicbus); - if (error != 0) { - device_printf(dev, "could not delete iicbus child.\n"); - return (error); - } - mtx_lock(&sc->mutex); if (sc->freq == 0) { diff --git a/sys/dev/ismt/ismt.c b/sys/dev/ismt/ismt.c index 650353c75e9f..4aea93d1f435 100644 --- a/sys/dev/ismt/ismt.c +++ b/sys/dev/ismt/ismt.c @@ -532,8 +532,6 @@ ismt_detach(device_t dev) if (error) return (error); - device_delete_child(dev, sc->smbdev); - if (sc->intr_handle != NULL) { bus_teardown_intr(dev, sc->intr_res, sc->intr_handle); sc->intr_handle = NULL; diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c index 7542b17e19eb..c5cfafc0bd22 100644 --- a/sys/dev/lge/if_lge.c +++ b/sys/dev/lge/if_lge.c @@ -583,7 +583,6 @@ lge_detach(device_t dev) ether_ifdetach(ifp); bus_generic_detach(dev); - device_delete_child(dev, sc->lge_miibus); bus_teardown_intr(dev, sc->lge_irq, sc->lge_intrhand); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lge_irq); diff --git a/sys/dev/ow/ow.c b/sys/dev/ow/ow.c index 9cbd05cd88b1..0325e6b324c8 100644 --- a/sys/dev/ow/ow.c +++ b/sys/dev/ow/ow.c @@ -565,8 +565,6 @@ ow_attach(device_t ndev) static int ow_detach(device_t ndev) { - device_t *children, child; - int nkid, i; struct ow_softc *sc; sc = device_get_softc(ndev); @@ -576,17 +574,6 @@ ow_detach(device_t ndev) */ bus_generic_detach(ndev); - /* - * We delete all the children, and free up the ivars - */ - if (device_get_children(ndev, &children, &nkid) != 0) - return ENOMEM; - for (i = 0; i < nkid; i++) { - child = children[i]; - device_delete_child(ndev, child); - } - free(children, M_TEMP); - OW_LOCK_DESTROY(sc); return 0; } diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c index 190554258c3a..f86caed87e6a 100644 --- a/sys/dev/pcf/pcf_isa.c +++ b/sys/dev/pcf/pcf_isa.c @@ -192,9 +192,6 @@ pcf_isa_detach(device_t dev) if ((rv = bus_generic_detach(dev)) != 0) return (rv); - if ((rv = device_delete_child(dev, sc->iicbus)) != 0) - return (rv); - if (sc->res_irq != 0) { bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); diff --git a/sys/dev/pwm/controller/allwinner/aw_pwm.c b/sys/dev/pwm/controller/allwinner/aw_pwm.c index 0f505957bb1a..117f3ae17e1b 100644 --- a/sys/dev/pwm/controller/allwinner/aw_pwm.c +++ b/sys/dev/pwm/controller/allwinner/aw_pwm.c @@ -211,9 +211,6 @@ aw_pwm_detach(device_t dev) return (error); } - if (sc->busdev != NULL) - device_delete_child(dev, sc->busdev); - if (sc->res != NULL) bus_release_resources(dev, aw_pwm_spec, &sc->res); diff --git a/sys/dev/qcom_qup/qcom_spi.c b/sys/dev/qcom_qup/qcom_spi.c index d3f38dee041f..88341b4d2083 100644 --- a/sys/dev/qcom_qup/qcom_spi.c +++ b/sys/dev/qcom_qup/qcom_spi.c @@ -840,8 +840,6 @@ qcom_spi_detach(device_t dev) int i; bus_generic_detach(sc->sc_dev); - if (sc->spibus != NULL) - device_delete_child(dev, sc->spibus); if (sc->sc_irq_h) bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_irq_h); diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c index 28d1a16e8c96..9a37c482654b 100644 --- a/sys/dev/smbus/smbus.c +++ b/sys/dev/smbus/smbus.c @@ -83,7 +83,6 @@ smbus_detach(device_t dev) error = bus_generic_detach(dev); if (error) return (error); - device_delete_children(dev); mtx_destroy(&sc->lock); return (0); diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 72a476708aa7..3537c7807ded 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -676,12 +676,6 @@ fm801_pci_detach(device_t dev) r = bus_generic_detach(dev); if (r) return r; - if (fm801->radio != NULL) { - r = device_delete_child(dev, fm801->radio); - if (r) - return r; - fm801->radio = NULL; - } r = pcm_unregister(dev); if (r) diff --git a/sys/dev/spibus/controller/allwinner/aw_spi.c b/sys/dev/spibus/controller/allwinner/aw_spi.c index e17152b054d7..34461ab2ba9c 100644 --- a/sys/dev/spibus/controller/allwinner/aw_spi.c +++ b/sys/dev/spibus/controller/allwinner/aw_spi.c @@ -253,8 +253,6 @@ aw_spi_detach(device_t dev) sc = device_get_softc(dev); bus_generic_detach(sc->dev); - if (sc->spibus != NULL) - device_delete_child(dev, sc->spibus); if (sc->clk_mod != NULL) clk_release(sc->clk_mod); diff --git a/sys/dev/spibus/controller/rockchip/rk_spi.c b/sys/dev/spibus/controller/rockchip/rk_spi.c index 2c8093c6dc82..db650763f6e1 100644 --- a/sys/dev/spibus/controller/rockchip/rk_spi.c +++ b/sys/dev/spibus/controller/rockchip/rk_spi.c @@ -354,8 +354,6 @@ rk_spi_detach(device_t dev) sc = device_get_softc(dev); bus_generic_detach(sc->dev); - if (sc->spibus != NULL) - device_delete_child(dev, sc->spibus); if (sc->clk_spi != NULL) clk_release(sc->clk_spi); diff --git a/sys/dev/viapm/viapm.c b/sys/dev/viapm/viapm.c index b19ad478a3ff..36c33422d5b3 100644 --- a/sys/dev/viapm/viapm.c +++ b/sys/dev/viapm/viapm.c @@ -444,9 +444,6 @@ viapm_586b_detach(device_t dev) struct viapm_softc *viapm = (struct viapm_softc *)device_get_softc(dev); bus_generic_detach(dev); - if (viapm->iicbb) { - device_delete_child(dev, viapm->iicbb); - } if (viapm->iores) bus_release_resource(dev, SYS_RES_IOPORT, viapm->iorid, @@ -462,9 +459,6 @@ viapm_pro_detach(device_t dev) struct viapm_softc *viapm = (struct viapm_softc *)device_get_softc(dev); bus_generic_detach(dev); - if (viapm->smbus) { - device_delete_child(dev, viapm->smbus); - } bus_release_resource(dev, SYS_RES_IOPORT, viapm->iorid, viapm->iores); diff --git a/sys/dev/vnic/thunder_mdio.c b/sys/dev/vnic/thunder_mdio.c index 4545fe6658f5..a98e6aff05fd 100644 --- a/sys/dev/vnic/thunder_mdio.c +++ b/sys/dev/vnic/thunder_mdio.c @@ -494,7 +494,6 @@ thunder_mdio_phy_disconnect(device_t dev, int lmacid, int phy) /* Detach miibus */ bus_generic_detach(dev); - device_delete_child(dev, pd->miibus); /* Free fake ifnet */ if_free(pd->ifp); /* Free memory under phy descriptor */ diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 1d04ea496f08..0df0b883a32d 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3496,8 +3496,13 @@ bus_delayed_attach_children(device_t dev) * @brief Helper function for implementing DEVICE_DETACH() * * This function can be used to help implement the DEVICE_DETACH() for - * a bus. It calls device_detach() for each of the device's - * children. + * a bus. It detaches and deletes all children. If an individual + * child fails to detach, this function stops and returns an error. + * + * @param dev the parent device + * + * @retval 0 success + * @retval non-zero a device would not detach */ int bus_generic_detach(device_t dev) @@ -3508,7 +3513,7 @@ bus_generic_detach(device_t dev) if (error != 0) return (error); - return (0); + return (device_delete_children(dev)); } /** diff --git a/sys/sys/param.h b/sys/sys/param.h index f675dd024ee0..d2aad1ff98a1 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500029 +#define __FreeBSD_version 1500030 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Thu Jan 2 18:28:19 2025 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 4YPFZX3N8tz5jnRY; Thu, 02 Jan 2025 18:28: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 4YPFZX0PnBz4tkn; Thu, 2 Jan 2025 18:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842500; 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=SfnsgeHg5AG1ObPzoRmsrcZkOJlBwNgFrEbrK0YY9YE=; b=q/WpzYRgCQS5m/T50pduAEZZxrN6Q0w9ZriiWBNjfdCIFu7PQCxSkt3gIGatTRJsbIMY8s Sou8VfJjU/S8wnCdhqTppo8KohiIIZE+XLXPYxUyINUMfjjixXxYZdgF7GGgPRRpQlI1u/ AnCdmRlmNPN6tEAgMrZV1pCU8/EisgZCxDKPmSUVGhxKagHTFyH/TvBu9TIF45NLfPDg0f cgolMXW2jNlF8BylYTx6R3ua+m9e5JqzwPYN6yksQXUCZQxYrJexF37zuzFQosLEzBROcQ cO9LCUan96WiSuIQCpUM+Zq389J/QG3qjPms7jVsWnYe7OUr9Hy4D1IxYd+GWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842500; 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=SfnsgeHg5AG1ObPzoRmsrcZkOJlBwNgFrEbrK0YY9YE=; b=tBjB8bhf9skUFrHtL8s+nJMdDR04Ee/vr4T4uZT4MfJ4Eo5IelpV3lPJLolKNUf7Y48BXO ro/o0OAMTSKf7SENrmY/bthpHAt+qytqNzDv1yxxvt96ssvy9koMATkep/JY+1cZwQBfMM i0pQsjQEGpil0coibbFsGmrW3KL8J41K3Q8FyPMCOlvKofwC1nu9LvmTeV2y6cR02aTpR/ mBRKbIeiegmpoRsB8T5pVfWYjE/XSVfh6xL/TBLHAwJdH1nBPHY6r7Ym26wjoHvbiOKNvH q4/WimMucrniPhnKB+HqwdymLighHr/58LenLuwK8s4/HxGOm0BCgNIwzbnNWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842500; a=rsa-sha256; cv=none; b=RT/OUUi9GQjz3+LnxLtMWNiyF/7xcsg+3FJ4/1m2JPXQAjjV/wlg5S5U5rNwYxIDLXtFAE ffkOnDuk18A/TfUvSOVZp636/nDI/7hBxlZRTB+U6MVnFY7VGlROzgYjA+9/uZbeLLLn9k vlU8fST9HogZeAPYdCeWGKI0k9aE29sval2BpImBEyaOlSa1sIup6OKpC/3UPEyOH/Pmfc Jczyed2hkRnAWRZ6LZbZxxRCO6eKk2CU62qBxP7f9WeWeWHfH53YzXScVNL12aalV2zgwf 1enJErxFOgcqrqF5J78AJoMSw5RfdznVkCocE3eekjAYoUs7fkzqDErCUF1eEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZW71g9zpRy; Thu, 02 Jan 2025 18:28: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 502ISJSH066160; Thu, 2 Jan 2025 18:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISJ3Y066157; Thu, 2 Jan 2025 18:28:19 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:19 GMT Message-Id: <202501021828.502ISJ3Y066157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: cf416f56eb73 - main - Use the new bus_generic_detach directly in place of home-grown versions 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf416f56eb73006b32f9279da6a848299ede3f1d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cf416f56eb73006b32f9279da6a848299ede3f1d commit cf416f56eb73006b32f9279da6a848299ede3f1d Author: John Baldwin AuthorDate: 2025-01-02 18:22:20 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:22:20 +0000 Use the new bus_generic_detach directly in place of home-grown versions Differential Revision: https://reviews.freebsd.org/D47960 --- sys/dev/bwn/if_bwn_pci.c | 13 +------------ sys/dev/iicbus/iicbb.c | 13 +------------ sys/dev/imcsmb/imcsmb.c | 27 +-------------------------- sys/dev/imcsmb/imcsmb_pci.c | 27 +-------------------------- sys/dev/p2sb/lewisburg_gpiocm.c | 14 +------------- sys/dev/pci/vga_pci.c | 13 +------------ sys/dev/ppbus/ppbconf.c | 17 +---------------- sys/dev/pwm/pwmbus.c | 13 +------------ sys/dev/usb/misc/cp2112.c | 17 ++--------------- 9 files changed, 10 insertions(+), 144 deletions(-) diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c index e2ba15dd67c8..a81284158443 100644 --- a/sys/dev/bwn/if_bwn_pci.c +++ b/sys/dev/bwn/if_bwn_pci.c @@ -189,17 +189,6 @@ bwn_pci_attach(device_t dev) return (0); } -static int -bwn_pci_detach(device_t dev) -{ - int error; - - if ((error = bus_generic_detach(dev))) - return (error); - - return (device_delete_children(dev)); -} - static void bwn_pci_probe_nomatch(device_t dev, device_t child) { @@ -268,7 +257,7 @@ static device_method_t bwn_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, bwn_pci_probe), DEVMETHOD(device_attach, bwn_pci_attach), - DEVMETHOD(device_detach, bwn_pci_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c index dec5e4bc0c7e..c344bda930b0 100644 --- a/sys/dev/iicbus/iicbb.c +++ b/sys/dev/iicbus/iicbb.c @@ -80,7 +80,6 @@ struct iicbb_softc { static int iicbb_attach(device_t); static void iicbb_child_detached(device_t, device_t); -static int iicbb_detach(device_t); static int iicbb_print_child(device_t, device_t); static int iicbb_probe(device_t); @@ -101,7 +100,7 @@ static device_method_t iicbb_methods[] = { /* device interface */ DEVMETHOD(device_probe, iicbb_probe), DEVMETHOD(device_attach, iicbb_attach), - DEVMETHOD(device_detach, iicbb_detach), + DEVMETHOD(device_detach, bus_generic_detach), /* bus interface */ DEVMETHOD(bus_child_detached, iicbb_child_detached), @@ -168,16 +167,6 @@ iicbb_attach(device_t dev) return (0); } -static int -iicbb_detach(device_t dev) -{ - - bus_generic_detach(dev); - device_delete_children(dev); - - return (0); -} - #ifdef FDT static phandle_t iicbb_get_node(device_t bus, device_t dev) diff --git a/sys/dev/imcsmb/imcsmb.c b/sys/dev/imcsmb/imcsmb.c index 2507d948e8e4..50280ad1b0f7 100644 --- a/sys/dev/imcsmb/imcsmb.c +++ b/sys/dev/imcsmb/imcsmb.c @@ -53,7 +53,6 @@ /* Device methods */ static int imcsmb_attach(device_t dev); -static int imcsmb_detach(device_t dev); static int imcsmb_probe(device_t dev); /* SMBus methods */ @@ -106,30 +105,6 @@ out: return (rc); } -/** - * device_detach() method. attach() didn't do any allocations, so all that's - * needed here is to free up any downstream drivers and children. - * - * @author Joe Kloss - * - * @param[in] dev - * Device being detached. - */ -static int -imcsmb_detach(device_t dev) -{ - int rc; - - /* Detach any attached drivers */ - rc = bus_generic_detach(dev); - if (rc == 0) { - /* Remove all children */ - rc = device_delete_children(dev); - } - - return (rc); -} - /** * device_probe() method. All the actual probing was done by the imcsmb_pci * parent, so just report success. @@ -522,7 +497,7 @@ out: static device_method_t imcsmb_methods[] = { /* Device interface */ DEVMETHOD(device_attach, imcsmb_attach), - DEVMETHOD(device_detach, imcsmb_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_probe, imcsmb_probe), /* smbus methods */ diff --git a/sys/dev/imcsmb/imcsmb_pci.c b/sys/dev/imcsmb/imcsmb_pci.c index c6e5d1d690c0..6e9e601989b1 100644 --- a/sys/dev/imcsmb/imcsmb_pci.c +++ b/sys/dev/imcsmb/imcsmb_pci.c @@ -146,7 +146,6 @@ static struct imcsmb_pci_device { /* Device methods. */ static int imcsmb_pci_attach(device_t dev); -static int imcsmb_pci_detach(device_t dev); static int imcsmb_pci_probe(device_t dev); /** @@ -195,30 +194,6 @@ out: return (rc); } -/** - * device_detach() method. attach() didn't do any allocations, so all that's - * needed here is to free up any downstream drivers and children. - * - * @author Joe Kloss - * - * @param[in] dev - * Device being detached. - */ -static int -imcsmb_pci_detach(device_t dev) -{ - int rc; - - /* Detach any attached drivers */ - rc = bus_generic_detach(dev); - if (rc == 0) { - /* Remove all children */ - rc = device_delete_children(dev); - } - - return (rc); -} - /** * device_probe() method. Look for the right PCI vendor/device IDs. * @@ -318,7 +293,7 @@ imcsmb_pci_request_bus(device_t dev) static device_method_t imcsmb_pci_methods[] = { /* Device interface */ DEVMETHOD(device_attach, imcsmb_pci_attach), - DEVMETHOD(device_detach, imcsmb_pci_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_probe, imcsmb_pci_probe), DEVMETHOD_END diff --git a/sys/dev/p2sb/lewisburg_gpiocm.c b/sys/dev/p2sb/lewisburg_gpiocm.c index 7eeab669d625..f5c1792c69e1 100644 --- a/sys/dev/p2sb/lewisburg_gpiocm.c +++ b/sys/dev/p2sb/lewisburg_gpiocm.c @@ -322,23 +322,11 @@ lbggpiocm_attach(device_t dev) return (0); } -static int -lbggpiocm_detach(device_t dev) -{ - int error; - - error = device_delete_children(dev); - if (error) - return (error); - - return (bus_generic_detach(dev)); -} - static device_method_t lbggpiocm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, lbggpiocm_probe), DEVMETHOD(device_attach, lbggpiocm_attach), - DEVMETHOD(device_detach, lbggpiocm_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD_END }; diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 243c0b53dda4..09166c0cbea6 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -378,17 +378,6 @@ vga_pci_attach(device_t dev) return (0); } -static int -vga_pci_detach(device_t dev) -{ - int error; - - error = bus_generic_detach(dev); - if (error == 0) - error = device_delete_children(dev); - return (error); -} - /* Bus interface. */ static int @@ -719,7 +708,7 @@ static device_method_t vga_pci_methods[] = { DEVMETHOD(device_attach, vga_pci_attach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_detach, vga_pci_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c index 17fef1eebde7..2c3f17318747 100644 --- a/sys/dev/ppbus/ppbconf.c +++ b/sys/dev/ppbus/ppbconf.c @@ -419,21 +419,6 @@ ppbus_attach(device_t dev) return (0); } -static int -ppbus_detach(device_t dev) -{ - int error; - - error = bus_generic_detach(dev); - if (error) - return (error); - - /* detach & delete all children */ - device_delete_children(dev); - - return (0); -} - static int ppbus_intr(void *arg) { @@ -578,7 +563,7 @@ static device_method_t ppbus_methods[] = { /* device interface */ DEVMETHOD(device_probe, ppbus_probe), DEVMETHOD(device_attach, ppbus_attach), - DEVMETHOD(device_detach, ppbus_detach), + DEVMETHOD(device_detach, bus_generic_detach), /* bus interface */ DEVMETHOD(bus_add_child, ppbus_add_child), diff --git a/sys/dev/pwm/pwmbus.c b/sys/dev/pwm/pwmbus.c index ae40a23d0d45..c0c07a36c277 100644 --- a/sys/dev/pwm/pwmbus.c +++ b/sys/dev/pwm/pwmbus.c @@ -188,17 +188,6 @@ pwmbus_attach(device_t dev) return (0); } -static int -pwmbus_detach(device_t dev) -{ - int rv; - - if ((rv = bus_generic_detach(dev)) == 0) - rv = device_delete_children(dev); - - return (rv); -} - /* * pwmbus_if methods... */ @@ -249,7 +238,7 @@ static device_method_t pwmbus_methods[] = { /* device_if */ DEVMETHOD(device_probe, pwmbus_probe), DEVMETHOD(device_attach, pwmbus_attach), - DEVMETHOD(device_detach, pwmbus_detach), + DEVMETHOD(device_detach, bus_generic_detach), /* bus_if */ DEVMETHOD(bus_add_child, pwmbus_add_child), diff --git a/sys/dev/usb/misc/cp2112.c b/sys/dev/usb/misc/cp2112.c index 2492eae978bb..e3587241f412 100644 --- a/sys/dev/usb/misc/cp2112.c +++ b/sys/dev/usb/misc/cp2112.c @@ -252,7 +252,6 @@ struct cp2112iic_softc { } io; }; -static int cp2112_detach(device_t dev); static int cp2112gpio_detach(device_t dev); static int cp2112iic_detach(device_t dev); @@ -351,22 +350,10 @@ cp2112_attach(device_t dev) return (0); detach: - cp2112_detach(dev); + bus_generic_detach(dev); return (ENXIO); } -static int -cp2112_detach(device_t dev) -{ - int err; - - err = bus_generic_detach(dev); - if (err != 0) - return (err); - device_delete_children(dev); - return (0); -} - static int cp2112_gpio_read_pin(device_t dev, uint32_t pin_num, bool *on) { @@ -1374,7 +1361,7 @@ cp2112iic_detach(device_t dev) static device_method_t cp2112hid_methods[] = { DEVMETHOD(device_probe, cp2112_probe), DEVMETHOD(device_attach, cp2112_attach), - DEVMETHOD(device_detach, cp2112_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD_END }; From nobody Thu Jan 2 18:28:22 2025 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 4YPFZZ4Yk0z5jnTj; Thu, 02 Jan 2025 18:28:22 +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 4YPFZZ2l2Bz4v43; Thu, 2 Jan 2025 18:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842502; 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=gH48jSvXimyhW/UvDoaxip0HAA14OawPNv9KG76IqDA=; b=lwSmQH7NnvmLjphPXA2UwRnoXh0SBsZAt243RwjMI0wQY3t1Us5aJpUGLYR7bECqD8k2wP lJ3FDrmthx6DYAmJXCVRWyu3kJ+1hBsxTEuDDay2uIuuDpPlpDktrw5xOImd2E7YQNMdTT 6iRswBt9GDTZBg0F1Ku7qxdr8hSCcPqo6Rg1tpIC1UpYQYudHkoxpbVaHENohRbPC/eXa1 qwrzmn5p7uJtvuk9+RclHen2Eg/Zfp8jYDR9W+3/YyfgMiPkDIASPvaYvw8Pl1jdaqidln QEOAsAy2AzQMRXhFfdqhhkYNw6Ot/6myPyQWMv7l0ziXlIU/yvd66H1UIhD+ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842502; 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=gH48jSvXimyhW/UvDoaxip0HAA14OawPNv9KG76IqDA=; b=JmhSA129zRCJUTLkud0xySx7MDdu1g6e/Sip2jNMwiCwrHP7j9oVSB/x3NEuE1/1nYLP8U oUGqCvrwrMo0BvV0LNwdDWhItW2HirYnd+meoHsrLedWij6kBvRRsK8SLplhlULMUiOCZL 7JJmRqesJCl5WEhmon9XcfpmurIcklr1GQwcrSfCEp2JslsDS8AuJbg9Mh63ZxM+h1j7dx XpppF7l4CMoFHQOznbJ2sZzFaNjXiKomDVc8kjcwRcaoRcT3iyce1PkAYpn/4VtvuLSRIG hFbRFclkj8jGVHbMBSlv3OAuk6D1qjkD9YHJl5f84LYUMIgeG44SllsLiUuxKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842502; a=rsa-sha256; cv=none; b=ZeTk5FKrPEp0Rl9MMCBsOsQqWdmRNxk/z4ixaqPiNs6cPstPe01e//vDhL3zY5isBHLRil IaCha4cIRqbTnhz7mHF9p7r98BgqYCXnKqZ6mTCX7QGt1kmpVD36cpg8CQ8VKUGHQ1DozL vmukB2nGZ37Iyq4k8dIStfhvOwi1sSpx4ga5nfMHvaxM6Syl3Rc/grPyOdmSXv7HuKN4np 0Mqf18AMYs1foAOPjJ9SNORXZRrEE5DnA2Sm5rXYQXGO50M1XHHZvSxim+s+1NHHigxyo1 152qIqEerZv9+mB0hF7IfyQseFGf8QFFCDDTjigdcmpDtqpScjB3WHiWVzMthQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZZ2DKzznl9; Thu, 02 Jan 2025 18:28:22 +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 502ISMdZ066286; Thu, 2 Jan 2025 18:28:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISMaw066283; Thu, 2 Jan 2025 18:28:22 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:22 GMT Message-Id: <202501021828.502ISMaw066283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 160179ea3e24 - main - Remove now-redundant calls to device_delete_children 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 160179ea3e24651cd8b15a4fafce519546eac505 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=160179ea3e24651cd8b15a4fafce519546eac505 commit 160179ea3e24651cd8b15a4fafce519546eac505 Author: John Baldwin AuthorDate: 2025-01-02 18:22:50 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:22:50 +0000 Remove now-redundant calls to device_delete_children Earlier calls to bus_generic_detach now take care of deleting children. Differential Revision: https://reviews.freebsd.org/D47962 --- sys/arm/ti/cpsw/if_cpsw.c | 2 +- sys/dev/cardbus/cardbus.c | 2 -- sys/dev/cxgbe/t4_main.c | 1 - sys/dev/dpaa2/dpaa2_mc.c | 2 +- sys/dev/dpaa2/dpaa2_rc.c | 2 +- sys/dev/gpio/gpiobus.c | 10 +--------- sys/dev/hid/hidbus.c | 3 +-- sys/dev/ida/ida.c | 3 --- sys/dev/iicbus/controller/opencores/iicoc_pci.c | 1 - sys/dev/iicbus/iicsmb.c | 1 - sys/dev/nvdimm/nvdimm_acpi.c | 7 +------ sys/dev/pci/pci.c | 4 +--- sys/dev/superio/superio.c | 1 - sys/dev/usb/misc/cp2112.c | 1 - sys/dev/usb/misc/i2ctinyusb.c | 1 - sys/dev/vmd/vmd.c | 3 --- 16 files changed, 7 insertions(+), 37 deletions(-) diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 674a7ed8575a..5b443e6c2712 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -965,7 +965,7 @@ cpsw_detach(device_t dev) if (error != 0) return (error); - return (device_delete_children(dev)); + return (0); } static phandle_t diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index f375eb112cce..21467a11cb68 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -245,8 +245,6 @@ cardbus_detach_card(device_t cbdev) bus_topo_lock(); err = bus_generic_detach(cbdev); - if (err == 0) - err = device_delete_children(cbdev); bus_topo_unlock(); if (err) return (err); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 024c97dcb78c..e4120e76000c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2814,7 +2814,6 @@ cxgbe_detach(device_t dev) rc = bus_generic_detach(dev); if (rc) return (rc); - device_delete_children(dev); sysctl_ctx_free(&pi->ctx); begin_vi_detach(sc, &pi->vi[0]); diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c index c84b22d1d74d..8abfc3bfe1cc 100644 --- a/sys/dev/dpaa2/dpaa2_mc.c +++ b/sys/dev/dpaa2/dpaa2_mc.c @@ -292,7 +292,7 @@ dpaa2_mc_detach(device_t dev) if (dinfo) free(dinfo, M_DPAA2_MC); - return (device_delete_children(dev)); + return (0); } /* diff --git a/sys/dev/dpaa2/dpaa2_rc.c b/sys/dev/dpaa2/dpaa2_rc.c index 7f8eddff1353..d8e15e388bf5 100644 --- a/sys/dev/dpaa2/dpaa2_rc.c +++ b/sys/dev/dpaa2/dpaa2_rc.c @@ -114,7 +114,7 @@ dpaa2_rc_detach(device_t dev) if (dinfo) free(dinfo, M_DPAA2_RC); - return (device_delete_children(dev)); + return (0); } static int diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 37371fa4e1cc..e053adacf457 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -315,16 +315,10 @@ gpiobus_attach_bus(device_t dev) int gpiobus_detach_bus(device_t dev) { - int err; - #ifdef FDT ofw_gpiobus_unregister_provider(dev); #endif - err = bus_generic_detach(dev); - if (err != 0) - return (err); - - return (device_delete_children(dev)); + return (bus_generic_detach(dev)); } int @@ -584,8 +578,6 @@ gpiobus_detach(device_t dev) if ((err = bus_detach_children(dev)) != 0) return (err); - if ((err = device_delete_children(dev)) != 0) - return (err); rman_fini(&sc->sc_intr_rman); if (sc->sc_pins) { diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index 9b8b7fed8887..96d36c8d191d 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -297,8 +297,7 @@ hidbus_detach_children(device_t dev) if (is_bus) { /* If hidbus is passed, delete all children. */ - bus_generic_detach(bus); - device_delete_children(bus); + error = bus_generic_detach(bus); } else { /* * If hidbus child is passed, delete all hidbus children diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index ea231b041e13..fa135b7fc9ed 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -346,9 +346,6 @@ ida_detach(device_t dev) ida = (struct ida_softc *)device_get_softc(dev); error = bus_generic_detach(dev); - if (error) - return (error); - error = device_delete_children(dev); if (error) return (error); diff --git a/sys/dev/iicbus/controller/opencores/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c index cecfa888349b..f01b4514936e 100644 --- a/sys/dev/iicbus/controller/opencores/iicoc_pci.c +++ b/sys/dev/iicbus/controller/opencores/iicoc_pci.c @@ -50,7 +50,6 @@ iicoc_detach(device_t dev) struct iicoc_softc *sc; sc = device_get_softc(dev); - device_delete_children(dev); bus_generic_detach(dev); bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem_res); mtx_destroy(&sc->sc_mtx); diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c index e502ad904070..a5885648632e 100644 --- a/sys/dev/iicbus/iicsmb.c +++ b/sys/dev/iicbus/iicsmb.c @@ -166,7 +166,6 @@ iicsmb_detach(device_t dev) struct iicsmb_softc *sc = (struct iicsmb_softc *)device_get_softc(dev); bus_generic_detach(dev); - device_delete_children(dev); mtx_destroy(&sc->lock); return (0); diff --git a/sys/dev/nvdimm/nvdimm_acpi.c b/sys/dev/nvdimm/nvdimm_acpi.c index b9803c2c3a05..39697e52eebb 100644 --- a/sys/dev/nvdimm/nvdimm_acpi.c +++ b/sys/dev/nvdimm/nvdimm_acpi.c @@ -206,7 +206,6 @@ nvdimm_root_detach(device_t dev) { struct nvdimm_root_dev *root; struct SPA_mapping *spa, *next; - int error; root = device_get_softc(dev); SLIST_FOREACH_SAFE(spa, &root->spas, link, next) { @@ -215,11 +214,7 @@ nvdimm_root_detach(device_t dev) SLIST_REMOVE_HEAD(&root->spas, link); free(spa, M_NVDIMM_ACPI); } - error = bus_generic_detach(dev); - if (error != 0) - return (error); - error = device_delete_children(dev); - return (error); + return (bus_generic_detach(dev)); } static int diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 64bce9f01ea8..251680590747 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -4510,9 +4510,7 @@ pci_detach(device_t dev) return (error); sc = device_get_softc(dev); error = bus_release_resource(dev, PCI_RES_BUS, 0, sc->sc_bus); - if (error) - return (error); - return (device_delete_children(dev)); + return (error); } static void diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c index 7bed7bb510d3..94e97f197a93 100644 --- a/sys/dev/superio/superio.c +++ b/sys/dev/superio/superio.c @@ -740,7 +740,6 @@ superio_detach(device_t dev) return (error); if (sc->chardev != NULL) destroy_dev(sc->chardev); - device_delete_children(dev); bus_release_resource(dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); mtx_destroy(&sc->conf_lock); return (0); diff --git a/sys/dev/usb/misc/cp2112.c b/sys/dev/usb/misc/cp2112.c index e3587241f412..d4776ca342cb 100644 --- a/sys/dev/usb/misc/cp2112.c +++ b/sys/dev/usb/misc/cp2112.c @@ -1345,7 +1345,6 @@ cp2112iic_detach(device_t dev) err = bus_generic_detach(dev); if (err != 0) return (err); - device_delete_children(dev); mtx_lock(&sc->io.lock); usbd_transfer_stop(sc->xfers[CP2112_INTR_IN]); diff --git a/sys/dev/usb/misc/i2ctinyusb.c b/sys/dev/usb/misc/i2ctinyusb.c index 47f27d9383a6..ca40fd5baf5c 100644 --- a/sys/dev/usb/misc/i2ctinyusb.c +++ b/sys/dev/usb/misc/i2ctinyusb.c @@ -193,7 +193,6 @@ i2ctinyusb_detach(device_t dev) err = bus_generic_detach(dev); if (err != 0) return (err); - device_delete_children(dev); mtx_destroy(&sc->sc_mtx); diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 40565eab6f3e..0595a6c5be16 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -399,9 +399,6 @@ vmd_detach(device_t dev) int error; error = bus_generic_detach(dev); - if (error) - return (error); - error = device_delete_children(dev); if (error) return (error); if (sc->vmd_msix_count == 0) From nobody Thu Jan 2 18:28:21 2025 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 4YPFZY5SgDz5jndD; Thu, 02 Jan 2025 18:28:21 +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 4YPFZY1d6Rz4tjM; Thu, 2 Jan 2025 18:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842501; 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=xpR2JSSNDXklbuH/IQDP8G7Y3Ob/2snqattweWEYkTM=; b=H8jecUcy2YpvSHkmhNKXGNKTfbHXHALxG1ylhwxc9rFmx7C+sYEnZSbKzaMMwxmyfvjdpN ZlOFQ24XCWbArEPgf7DXc2EsvOvw3zWG5J3QYECMSEBL+jLKyjYKLMkiBx0J3ZaI+ox9KY EDYRNpnzYbTOUKcoDn3+7c8kZ872kNFUvrPEE0zwuXJGO9oLOHdQF3hXODV3zYgTS4QiGn volPqjHKbriObGVe2HRU2Bo7GBhtZDAkozZJ0UjnvfQEYDwanptwixq1URhnXI9xhdMF74 PWoNwBB3GyFOzMbF4u0V/H6jEcr+9NwEaqcAFMyJI5bsDXPGolIZv0TsiiUCXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842501; 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=xpR2JSSNDXklbuH/IQDP8G7Y3Ob/2snqattweWEYkTM=; b=kbzHsqYrTgQSZWUsnZbLG4cRYFgg/thRamLYJuS6z1njaLxBV3oAvd8md2LtdkGrlXBN2m GGazwHnX6G9XMy1s36gZRj5tqsJPCrHuqfPieYR2cA+xZxjG7q1OL4wif0JPSoyArhqLA9 aBk5BI4GAaiVCaO44rh6L17PbYR+bildRNy0JIMyk9oyjPO+kdiDGMphw8ztgqNQWoWMbj DmLptmovQAdNf/NvgijOuUN3WRJ/qxTinBxGIi9NdojYT9MtIEb2+n7kWMjNIRNyKg+JQx CbzGQYj0QUD8E1EfMH8I8Ad8ZGDbKGAgxqEFGCIjE0GSooN0xt+t0H2K1WHOXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842501; a=rsa-sha256; cv=none; b=leVP5/7/0JB5ma/A/8LmIkbsGJPl8CnYV9gwPauXNdYvN4SnjGs5jhz6IL1zen3oaHm1qS n09pNP3japgT+ttNAMSaV7kkdlfYjkcFIKBN6Y5T4TqywUSqpV52rWEtwodXPqM9EdRm0f oA0rTnfo2tU3X6/8UnM4F72iD5r3TkkR/QhQ79ISbfekmEBgNjumE6Wj3aTwcASGD1kY1c Yeagf4oIbSVLvoKsnkqPBPrJqoz2EaKec+stqjxFJ1/DPJfNA9AdxF+gIAAqW8sfYttI4Y mIgWEC6I9Bwt4lLQQGVlqFjcWe5i9OAqlgxHYhYZ99mlX7199mIj4WbJee1sNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZY19dpzpPS; Thu, 02 Jan 2025 18:28:21 +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 502ISLhJ066208; Thu, 2 Jan 2025 18:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISL4w066205; Thu, 2 Jan 2025 18:28:21 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:21 GMT Message-Id: <202501021828.502ISL4w066205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4e62c3cafa4c - main - Remove now-redundant calls to device_delete_child 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e62c3cafa4c4e41efd6f87b7fe559cf819cf3e4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4e62c3cafa4c4e41efd6f87b7fe559cf819cf3e4 commit 4e62c3cafa4c4e41efd6f87b7fe559cf819cf3e4 Author: John Baldwin AuthorDate: 2025-01-02 18:22:35 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:22:35 +0000 Remove now-redundant calls to device_delete_child Deleting a child explicitly before calling bus_generic_detach is now redundant, so remove those calls and rely on bus_generic_detach to delete children instead. Differential Revision: https://reviews.freebsd.org/D47961 --- sys/arm/allwinner/if_emac.c | 5 +---- sys/dev/ae/if_ae.c | 4 ---- sys/dev/age/if_age.c | 4 ---- sys/dev/alc/if_alc.c | 4 ---- sys/dev/ale/if_ale.c | 4 ---- sys/dev/dc/if_dc.c | 2 -- sys/dev/dwc/if_dwc.c | 4 ---- sys/dev/eqos/if_eqos.c | 2 -- sys/dev/et/if_et.c | 2 -- sys/dev/fxp/if_fxp.c | 2 -- sys/dev/ips/ips.c | 12 +----------- sys/dev/jme/if_jme.c | 4 ---- sys/dev/msk/if_msk.c | 21 +-------------------- sys/dev/nfe/if_nfe.c | 2 -- sys/dev/nge/if_nge.c | 4 ---- sys/dev/pccbb/pccbb.c | 32 +------------------------------- sys/dev/re/if_re.c | 2 -- sys/dev/rl/if_rl.c | 2 -- sys/dev/sge/if_sge.c | 2 -- sys/dev/sis/if_sis.c | 2 -- sys/dev/sk/if_sk.c | 19 +------------------ sys/dev/smc/if_smc.c | 5 +---- sys/dev/ste/if_ste.c | 2 -- sys/dev/stge/if_stge.c | 4 ---- sys/dev/vge/if_vge.c | 2 -- sys/dev/vr/if_vr.c | 2 -- sys/dev/vte/if_vte.c | 4 ---- sys/dev/xl/if_xl.c | 2 -- 28 files changed, 6 insertions(+), 150 deletions(-) diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c index 1db43cbca26c..1fa6691ade1a 100644 --- a/sys/arm/allwinner/if_emac.c +++ b/sys/arm/allwinner/if_emac.c @@ -811,10 +811,7 @@ emac_detach(device_t dev) bus_teardown_intr(sc->emac_dev, sc->emac_irq, sc->emac_intrhand); - if (sc->emac_miibus != NULL) { - device_delete_child(sc->emac_dev, sc->emac_miibus); - bus_generic_detach(sc->emac_dev); - } + bus_generic_detach(sc->emac_dev); if (sc->emac_clk != NULL) clk_disable(sc->emac_clk); diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c index adbb3e48a4e3..2525c7aa4510 100644 --- a/sys/dev/ae/if_ae.c +++ b/sys/dev/ae/if_ae.c @@ -761,10 +761,6 @@ ae_detach(device_t dev) taskqueue_free(sc->tq); sc->tq = NULL; } - if (sc->miibus != NULL) { - device_delete_child(dev, sc->miibus); - sc->miibus = NULL; - } bus_generic_detach(sc->dev); ae_dma_free(sc); if (sc->intrhand != NULL) { diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c index 10f99129401a..c22a41b9c4e3 100644 --- a/sys/dev/age/if_age.c +++ b/sys/dev/age/if_age.c @@ -686,10 +686,6 @@ age_detach(device_t dev) sc->age_tq = NULL; } - if (sc->age_miibus != NULL) { - device_delete_child(dev, sc->age_miibus); - sc->age_miibus = NULL; - } bus_generic_detach(dev); age_dma_free(sc); diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c index 07ba02c33c88..e03cfe590214 100644 --- a/sys/dev/alc/if_alc.c +++ b/sys/dev/alc/if_alc.c @@ -1699,10 +1699,6 @@ alc_detach(device_t dev) sc->alc_tq = NULL; } - if (sc->alc_miibus != NULL) { - device_delete_child(dev, sc->alc_miibus); - sc->alc_miibus = NULL; - } bus_generic_detach(dev); alc_dma_free(sc); diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index e4d61e636f8b..c24ff2ea65cb 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -711,10 +711,6 @@ ale_detach(device_t dev) sc->ale_tq = NULL; } - if (sc->ale_miibus != NULL) { - device_delete_child(dev, sc->ale_miibus); - sc->ale_miibus = NULL; - } bus_generic_detach(dev); ale_dma_free(sc); diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 809feed7855f..bed74c3b6181 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -2539,8 +2539,6 @@ dc_detach(device_t dev) callout_drain(&sc->dc_wdog_ch); ether_ifdetach(ifp); } - if (sc->dc_miibus) - device_delete_child(dev, sc->dc_miibus); bus_generic_detach(dev); if (sc->dc_intrhand) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 17657045b73c..33657b33fe25 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -656,10 +656,6 @@ dwc_detach(device_t dev) ether_ifdetach(sc->ifp); } - if (sc->miibus != NULL) { - device_delete_child(dev, sc->miibus); - sc->miibus = NULL; - } bus_generic_detach(dev); /* Free DMA descriptors */ diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index 6f58c96a10b7..6e2eea2e6c37 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -1216,8 +1216,6 @@ eqos_detach(device_t dev) ether_ifdetach(sc->ifp); } - if (sc->miibus) - device_delete_child(dev, sc->miibus); bus_generic_detach(dev); if (sc->irq_handle) diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index dedd2218b4a8..399c9fa77989 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -370,8 +370,6 @@ et_detach(device_t dev) callout_drain(&sc->sc_tick); } - if (sc->sc_miibus != NULL) - device_delete_child(dev, sc->sc_miibus); bus_generic_detach(dev); if (sc->sc_irq_handle != NULL) diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 7684b94df316..b26879cfa25c 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -933,8 +933,6 @@ fxp_release(struct fxp_softc *sc) FXP_LOCK_ASSERT(sc, MA_NOTOWNED); KASSERT(sc->ih == NULL, ("fxp_release() called with intr handle still active")); - if (sc->miibus) - device_delete_child(sc->dev, sc->miibus); bus_generic_detach(sc->dev); ifmedia_removeall(&sc->sc_media); if (sc->fxp_desc.cbl_list) { diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c index 0079e4183db5..7a73aee2ef49 100644 --- a/sys/dev/ips/ips.c +++ b/sys/dev/ips/ips.c @@ -279,17 +279,7 @@ static int ips_diskdev_init(ips_softc_t *sc) static int ips_diskdev_free(ips_softc_t *sc) { - int i; - int error = 0; - for(i = 0; i < IPS_MAX_NUM_DRIVES; i++){ - if(sc->diskdev[i]) { - error = device_delete_child(sc->dev, sc->diskdev[i]); - if(error) - return error; - } - } - bus_generic_detach(sc->dev); - return 0; + return (bus_generic_detach(sc->dev)); } /* ips_timeout is periodically called to make sure no commands sent diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c index 4f739ec26347..834717d849a0 100644 --- a/sys/dev/jme/if_jme.c +++ b/sys/dev/jme/if_jme.c @@ -928,10 +928,6 @@ jme_detach(device_t dev) sc->jme_tq = NULL; } - if (sc->jme_miibus != NULL) { - device_delete_child(dev, sc->jme_miibus); - sc->jme_miibus = NULL; - } bus_generic_detach(dev); jme_dma_free(sc); diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index 46219c3c9ab2..295eb2584b3e 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -2020,17 +2020,6 @@ msk_detach(device_t dev) MSK_IF_LOCK(sc_if); } - /* - * We're generally called from mskc_detach() which is using - * device_delete_child() to get to here. It's already trashed - * miibus for us, so don't do it here or we'll panic. - * - * if (sc_if->msk_miibus != NULL) { - * device_delete_child(dev, sc_if->msk_miibus); - * sc_if->msk_miibus = NULL; - * } - */ - msk_rx_dma_jfree(sc_if); msk_txrx_dma_free(sc_if); bus_generic_detach(dev); @@ -2058,15 +2047,7 @@ mskc_detach(device_t dev) sc = device_get_softc(dev); KASSERT(mtx_initialized(&sc->msk_mtx), ("msk mutex not initialized")); - if (device_is_alive(dev)) { - if (sc->msk_devs[MSK_PORT_A] != NULL) { - device_delete_child(dev, sc->msk_devs[MSK_PORT_A]); - } - if (sc->msk_devs[MSK_PORT_B] != NULL) { - device_delete_child(dev, sc->msk_devs[MSK_PORT_B]); - } - bus_generic_detach(dev); - } + bus_generic_detach(dev); /* Disable all interrupts. */ CSR_WRITE_4(sc, B0_IMSK, 0); diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index 23a743759bdd..8df4ca27ac9d 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -711,8 +711,6 @@ nfe_detach(device_t dev) nfe_set_macaddr(sc, eaddr); if_free(ifp); } - if (sc->nfe_miibus) - device_delete_child(dev, sc->nfe_miibus); bus_generic_detach(dev); if (sc->nfe_tq != NULL) { taskqueue_drain(sc->nfe_tq, &sc->nfe_int_task); diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index c7c2b3c99d5a..90650bf353a5 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -999,10 +999,6 @@ nge_detach(device_t dev) ether_ifdetach(ifp); } - if (sc->nge_miibus != NULL) { - device_delete_child(dev, sc->nge_miibus); - sc->nge_miibus = NULL; - } bus_generic_detach(dev); if (sc->nge_intrhand != NULL) bus_teardown_intr(dev, sc->nge_irq, sc->nge_intrhand); diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index c40261be4724..b8fb7827dfbf 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -275,42 +275,12 @@ int cbb_detach(device_t brdev) { struct cbb_softc *sc = device_get_softc(brdev); - device_t *devlist; - int tmp, tries, error, numdevs; + int error; - /* - * Before we delete the children (which we have to do because - * attach doesn't check for children busses correctly), we have - * to detach the children. Even if we didn't need to delete the - * children, we have to detach them. - */ error = bus_generic_detach(brdev); if (error != 0) return (error); - /* - * Since the attach routine doesn't search for children before it - * attaches them to this device, we must delete them here in order - * for the kldload/unload case to work. If we failed to do that, then - * we'd get duplicate devices when cbb.ko was reloaded. - */ - tries = 10; - do { - error = device_get_children(brdev, &devlist, &numdevs); - if (error == 0) - break; - /* - * Try hard to cope with low memory. - */ - if (error == ENOMEM) { - pause("cbbnomem", 1); - continue; - } - } while (tries-- > 0); - for (tmp = 0; tmp < numdevs; tmp++) - device_delete_child(brdev, devlist[tmp]); - free(devlist, M_TEMP); - /* Turn off the interrupts */ cbb_set(sc, CBB_SOCKET_MASK, 0); diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 69593e68d36f..f6c28209d504 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -1803,8 +1803,6 @@ re_detach(device_t dev) if_setflagbits(ifp, 0, IFF_UP); ether_ifdetach(ifp); } - if (sc->rl_miibus) - device_delete_child(dev, sc->rl_miibus); bus_generic_detach(dev); /* diff --git a/sys/dev/rl/if_rl.c b/sys/dev/rl/if_rl.c index cd60561ad2d8..4a5f375c2dd3 100644 --- a/sys/dev/rl/if_rl.c +++ b/sys/dev/rl/if_rl.c @@ -882,8 +882,6 @@ rl_detach(device_t dev) #if 0 sc->suspended = 1; #endif - if (sc->rl_miibus) - device_delete_child(dev, sc->rl_miibus); bus_generic_detach(dev); if (sc->rl_intrhand[0]) diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c index c6e8f4790190..80ec0c435ead 100644 --- a/sys/dev/sge/if_sge.c +++ b/sys/dev/sge/if_sge.c @@ -675,8 +675,6 @@ sge_detach(device_t dev) SGE_UNLOCK(sc); callout_drain(&sc->sge_stat_ch); } - if (sc->sge_miibus) - device_delete_child(dev, sc->sge_miibus); bus_generic_detach(dev); if (sc->sge_intrhand) diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c index 64a43b2bf51e..5879674b4fbb 100644 --- a/sys/dev/sis/if_sis.c +++ b/sys/dev/sis/if_sis.c @@ -1146,8 +1146,6 @@ sis_detach(device_t dev) callout_drain(&sc->sis_stat_ch); ether_ifdetach(ifp); } - if (sc->sis_miibus) - device_delete_child(dev, sc->sis_miibus); bus_generic_detach(dev); if (sc->sis_intrhand) diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 643b49119ef1..094211cc3c34 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -1771,15 +1771,6 @@ sk_detach(device_t dev) ether_ifdetach(ifp); SK_IF_LOCK(sc_if); } - /* - * We're generally called from skc_detach() which is using - * device_delete_child() to get to here. It's already trashed - * miibus for us, so don't do it here or we'll panic. - */ - /* - if (sc_if->sk_miibus != NULL) - device_delete_child(dev, sc_if->sk_miibus); - */ bus_generic_detach(dev); sk_dma_jumbo_free(sc_if); sk_dma_free(sc_if); @@ -1798,15 +1789,7 @@ skc_detach(device_t dev) sc = device_get_softc(dev); KASSERT(mtx_initialized(&sc->sk_mtx), ("sk mutex not initialized")); - if (device_is_alive(dev)) { - if (sc->sk_devs[SK_PORT_A] != NULL) { - device_delete_child(dev, sc->sk_devs[SK_PORT_A]); - } - if (sc->sk_devs[SK_PORT_B] != NULL) { - device_delete_child(dev, sc->sk_devs[SK_PORT_B]); - } - bus_generic_detach(dev); - } + bus_generic_detach(dev); if (sc->sk_intrhand) bus_teardown_intr(dev, sc->sk_res[1], sc->sk_intrhand); diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c index 12e903d1af9b..cc05cfd45f67 100644 --- a/sys/dev/smc/if_smc.c +++ b/sys/dev/smc/if_smc.c @@ -450,10 +450,7 @@ smc_detach(device_t dev) if_free(sc->smc_ifp); } - if (sc->smc_miibus != NULL) { - device_delete_child(sc->smc_dev, sc->smc_miibus); - bus_generic_detach(sc->smc_dev); - } + bus_generic_detach(sc->smc_dev); if (sc->smc_reg != NULL) { type = SYS_RES_IOPORT; diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c index 06e25175c617..7b347a97712f 100644 --- a/sys/dev/ste/if_ste.c +++ b/sys/dev/ste/if_ste.c @@ -1074,8 +1074,6 @@ ste_detach(device_t dev) STE_UNLOCK(sc); callout_drain(&sc->ste_callout); } - if (sc->ste_miibus) - device_delete_child(dev, sc->ste_miibus); bus_generic_detach(dev); if (sc->ste_intrhand) diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c index 97c2b751d476..a9a30332358c 100644 --- a/sys/dev/stge/if_stge.c +++ b/sys/dev/stge/if_stge.c @@ -672,10 +672,6 @@ stge_detach(device_t dev) ether_ifdetach(ifp); } - if (sc->sc_miibus != NULL) { - device_delete_child(dev, sc->sc_miibus); - sc->sc_miibus = NULL; - } bus_generic_detach(dev); stge_dma_free(sc); diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index 9f71049a150b..395715e67e48 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -1177,8 +1177,6 @@ vge_detach(device_t dev) VGE_UNLOCK(sc); callout_drain(&sc->vge_watchdog); } - if (sc->vge_miibus) - device_delete_child(dev, sc->vge_miibus); bus_generic_detach(dev); if (sc->vge_intrhand) diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index 02b55ef4f304..47de78166d35 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -838,8 +838,6 @@ vr_detach(device_t dev) taskqueue_drain(taskqueue_fast, &sc->vr_inttask); ether_ifdetach(ifp); } - if (sc->vr_miibus) - device_delete_child(dev, sc->vr_miibus); bus_generic_detach(dev); if (sc->vr_intrhand) diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c index 64da34364341..f32053c36cee 100644 --- a/sys/dev/vte/if_vte.c +++ b/sys/dev/vte/if_vte.c @@ -506,10 +506,6 @@ vte_detach(device_t dev) ether_ifdetach(ifp); } - if (sc->vte_miibus != NULL) { - device_delete_child(dev, sc->vte_miibus); - sc->vte_miibus = NULL; - } bus_generic_detach(dev); if (sc->vte_intrhand != NULL) { diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c index 32f95549b774..8e12ba7d67b2 100644 --- a/sys/dev/xl/if_xl.c +++ b/sys/dev/xl/if_xl.c @@ -1572,8 +1572,6 @@ xl_detach(device_t dev) callout_drain(&sc->xl_tick_callout); ether_ifdetach(ifp); } - if (sc->xl_miibus) - device_delete_child(dev, sc->xl_miibus); bus_generic_detach(dev); ifmedia_removeall(&sc->ifmedia); From nobody Thu Jan 2 18:28:23 2025 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 4YPFZb6L3sz5jnRb; Thu, 02 Jan 2025 18:28:23 +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 4YPFZb3cFCz4tny; Thu, 2 Jan 2025 18:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842503; 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=6vEHZvL4xC0iA2F9HIEnJ+L64fKncgFe86OmPrJGXNo=; b=drsAGFc/YAXkBpFALjl7Lk7K7nJTctHZ8zlYaYwUln8QEgOD1t1mLAzoP/sz2Woij1ubLD bMPhXF0k4sa2nGFrA2Zk/XH27YVQe1LDujFOb53fvv9JrbxWMDiipQ2tkzbYhlXGkSjb2Q VYpVjfyx8C8EvmkRirgmStsAwJxGPsYDu5y8wfGQjhu6Mg4liWzKEGsBrCZ/VnZtTD3ynE m0d3PO08q80GuS78awuPEtY9e5Z2exsaXdwKlwhQ7F1tns9gcSQXwCemGSwXCLLvPXCzhY VA5kxA2MI8VFXkbYBB6BDD1qLF2HXpLyq2LoNMYXFqL2ahXXT/FbsFT2P8PibQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842503; 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=6vEHZvL4xC0iA2F9HIEnJ+L64fKncgFe86OmPrJGXNo=; b=VauMIXpQUd5WUMFhJT5dC1+7Y5wF3dU9+l8W/AiYeCREelWO8e5oFaGlMFSK/zBQeQ7a2l C3Ifd+ZurKYlaqX6ShNrvmco/A8SpWIAy6kzfzbq+NWU6SQKsWUjaqYhYYlgesH4DYM2OS ofFaTtoTccgq3sulaE4H6o5p/FYv5p1rAoOz7AivuPwswl3M1FfpX6tbhDzBrIw+V+1hwC A1E513nroesPAHxHzTupOjpqcn/w0tuweGSvExnJ8FIR6bNh/FW67l514y1VgSc7ZMoORb c6Y4qbpwj8StuJkeaGD6USvOwA3Hbd1RoBwTohGJXQFagTXuENdhmIemL9lz8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842503; a=rsa-sha256; cv=none; b=p4MBEsy76XsYFy0Bzp57Z7hdFxKv3NomxTmSFVTGBNdBg51tzh2T0otEeop5i4+wdjeV1c e8yqj7udoN9r9GQS0g80clCm7Tn7xBOelH8oLmfxa8FB9mWNfd+W6wg78Bz7HVwwMaR+U6 pRq+ySmzFD0jscwq6FdfxhUG4TH2sXsRnRM7cFqYlDKrjSWpxZIbOQTgYZeXTA6xxW7L3N Tn/96yOJOw0a5qTO/yoSf0ZXCcaPCzcnez+I+4eQ9gPTmkTbRaCJxkYOp7SmKn6NIxDx6g PblQodE/yvVtjxhwoaoV/UKnlgLEAJKJIs0g46EmnYgtwrnUcjSTTfLyOOR2/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZb3D7xznlB; Thu, 02 Jan 2025 18:28:23 +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 502ISNlL066331; Thu, 2 Jan 2025 18:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISNs8066328; Thu, 2 Jan 2025 18:28:23 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:23 GMT Message-Id: <202501021828.502ISNs8066328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e74465f1778d - main - cpsw: Remove duplicate call to bus_generic_detach 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e74465f1778dfa0d01c41b592153d36b1dc647ed Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e74465f1778dfa0d01c41b592153d36b1dc647ed commit e74465f1778dfa0d01c41b592153d36b1dc647ed Author: John Baldwin AuthorDate: 2025-01-02 18:23:02 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:23:02 +0000 cpsw: Remove duplicate call to bus_generic_detach Differential Revision: https://reviews.freebsd.org/D47963 --- sys/arm/ti/cpsw/if_cpsw.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 5b443e6c2712..9fc3f414477b 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -960,11 +960,6 @@ cpsw_detach(device_t dev) mtx_destroy(&sc->rx.lock); mtx_destroy(&sc->tx.lock); - /* Detach the switch device, if present. */ - error = bus_generic_detach(dev); - if (error != 0) - return (error); - return (0); } From nobody Thu Jan 2 18:28:24 2025 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 4YPFZd1Jctz5jndK; Thu, 02 Jan 2025 18:28:25 +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 4YPFZc4m2Pz4ttP; Thu, 2 Jan 2025 18:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842504; 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=S2Fccg8uRBNMuoCDIWiPNIEChnoi6bBxQWizrHjlx2c=; b=IixD1XbuYmdwqJzBVgZ1PxkQrTUt1vb6RTX7VTtthY4yJh16aWyIyTtKBm5NBwsB60g34I w9Q6F4cQD9JwSNgqopv2KWE7T7Y4wJ7UE73jSmiycx6cGjECLvXeBUprNeXZwzv6SA9zAa GaLKPbUT5uyVoBefof2TpN40DMeA/NpuYjgAsgpFIoPuF8c+R8lQlCVyAd6Y+7xxv0Gve3 xPWTkrjYxR4/CeZ2AzyU84ulzMm5CB9h4dZwDIHF9aveYiOkFmFSjJ9PkBOXP4Mb/fF8md ovpFuZJBmEFpJs/h81MdphutvCbP3YX9xOc/o/M0HFUeODcXJ3jtEe1l3u9w5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842504; 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=S2Fccg8uRBNMuoCDIWiPNIEChnoi6bBxQWizrHjlx2c=; b=Ek0Wkgkeh4aIzM9t1J4gtGHy7SA9YSu79KuW1s8sdfyXBbwY/4FSgiu+gw7E4LeorTDksR YC6qrhalCfThLF4Ixyxboo8tLsLdaO6gdnOUQWRSo9Abz1dIV7Ta7dedcGLU2FFm4/+LaT b9rB4wWvHsx9ahWr0d/xBoVTB5IGtU0anUTWf4HH7azhIjkISRrKWHXtaiiPP3BvCFKTG7 cCt4Z6UR4NzsauflRdGbuobm1tszW9vMcRhkJ6T2tFjjVH4tNdWXAcoS37Ws+jOlgTHz49 e4PhPATjjjCiY+trMLhcQYh5/m9EeBln4P4fOgVA81c2hhJZZpMla3Vttzu3Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842504; a=rsa-sha256; cv=none; b=xSXTcvIu1vTi2W1mREr9XVWY44+dm78I+p0MrWjHVN4jqziENHAeq0Tnh7z7+8cIVC+ACM mDKUa3ACEpxsdh81pVJwsPRiD7QDiEPAlNDzKDB3t8j0PZwVCEGodUips/WUS7+MYVHjaF +jFp9hs0HBD1i8dggz/QTVi1xkzKmErqi8PgvC5JZJKM/EsHShgcyX1WqcQ7r6q5KqMiih vGptNFZUbfe2kmmZSIFPcjceokN9nxC5PiirylGHbW1oP0+RYhBj21/U3XSLFoE1z9auFj J5vmc6Qw1g6UaNYAXBd5pkPPR4a8Y59QAs/pH2SPC8PQ+GAk8X+FkQV9kIXv8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZc3yGTzpGj; Thu, 02 Jan 2025 18:28:24 +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 502ISOGU066380; Thu, 2 Jan 2025 18:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISO0t066377; Thu, 2 Jan 2025 18:28:24 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:24 GMT Message-Id: <202501021828.502ISO0t066377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: faf0bf43df0c - main - cgem: Cleanup detaching of child miibus device 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faf0bf43df0c2a16cbffc1e8f88f105a259c7e77 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=faf0bf43df0c2a16cbffc1e8f88f105a259c7e77 commit faf0bf43df0c2a16cbffc1e8f88f105a259c7e77 Author: John Baldwin AuthorDate: 2025-01-02 18:23:16 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:23:16 +0000 cgem: Cleanup detaching of child miibus device Move bus_generic_detach earlier in place of the existing device_delete_child. Differential Revision: https://reviews.freebsd.org/D47964 --- sys/dev/cadence/if_cgem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index 67fbdf4e3fc5..4a7180fd15a4 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -1909,10 +1909,7 @@ cgem_detach(device_t dev) ether_ifdetach(sc->ifp); } - if (sc->miibus != NULL) { - device_delete_child(dev, sc->miibus); - sc->miibus = NULL; - } + bus_generic_detach(dev); /* Release resources. */ if (sc->mem_res != NULL) { @@ -1965,8 +1962,6 @@ cgem_detach(device_t dev) sc->mbuf_dma_tag = NULL; } - bus_generic_detach(dev); - if (sc->clk_tsuclk) clk_release(sc->clk_tsuclk); if (sc->clk_rxclk) From nobody Thu Jan 2 18:28:26 2025 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 4YPFZg1BQfz5jnZ7; Thu, 02 Jan 2025 18:28:27 +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 4YPFZf6qz6z4vCX; Thu, 2 Jan 2025 18:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842507; 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=aoLOD45jXA3sJNKoU/pda01BcbkIF9QyX2b48vLrwJU=; b=l6NVKC7KH4M2ok13PpTGDu0AfMclhg2ku4u/lIhcZAb69/yT2JUzMIYzugWmgzY9UVfYZE 6fs74RPH7xBAsnx0tkrSypkDYvmptjjxM3Wdwo3KqIQ3NEDaEFp2al4HZrzsUG+QkFZdbi BqsljfCv39bkoRFvlmUwZ67Hmv/2eBQfItqldv2VJZhP8H7smUX/hqFLbeAnnCkzHXgODS gmZCzlpA6pi7LZHUWgoFhvyWPw6uKT2eWVkjPovf4l+BGXB9YBl/Qih1svf35HnI0jkkRr +pJL0kZ4twm5QcjgdVB3l6nFkwUxeCifQ+5gmsie1Ju25V3Mn+E9J9CMLyhfLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842507; 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=aoLOD45jXA3sJNKoU/pda01BcbkIF9QyX2b48vLrwJU=; b=cOMclLIyAuy4h2G4hvYOZBxsv6y+rV1f7tgvGBp85/OpkeLgZLtKI9x5PQOEvi38AAqmQ0 xuwBORWrcSbIg+qYjLErRcXH9DY0qbHx1oFpo5ZpK2xUBgRNUL4MWILbPT17lbvG7FZVHc Ila/Y20Nrry3k3IZqaEi8Hyu3Z6oCNiZyoHsVZDWbYzNqgabtGv1//F+DW98M4wMV6Ma3F 0pPb30TZvqPi8s4IZfwVGmfHs+t1hmiLB4yXM3vLenqkFxx8qCR8ZYCS7PvIn6G9HAPbd5 OMh140sJ9xmn1GjYRk/p/eW3d2JI5yiymk2DCzkIJatrsHRrTyRs+xK6QRsZtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842507; a=rsa-sha256; cv=none; b=cD7lOw5ZHGhf0UAZtiueVsrnpqfKPH62FCGiWL9rscoGefwRn5eShjwMKQB8uyEaA2bwit 5qUUrDKoj0xu854xDEHrXmXuNexx1SxyPdZlbhZq7Jlja47d2DQWprljAbOQujNeZfxo8Y hN0p44IavF5f2FVtD2t0pHe7QRA5JYyPvtRQxksRlrMzyOscmgB4vY97oc2RxrVXlvfQb2 eYy+v5ih20UvynU0pNZP+73KWQZzATS+OVheNBpBDRyTy+LP5HlpDqMfmT5e9vsCFJvAI9 fbrMPaRkRyvM9eOQKPSFk6NMsEHYpr7aDr0YH9uFkDeO3/u4Rv7IsEYQtORkbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZf6JHBzp58; Thu, 02 Jan 2025 18:28:26 +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 502ISQks066478; Thu, 2 Jan 2025 18:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISQV9066475; Thu, 2 Jan 2025 18:28:26 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:26 GMT Message-Id: <202501021828.502ISQV9066475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 64d1a02e4e1a - main - Check for errors from bus_generic_detach in various drivers 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64d1a02e4e1a5f561d03b2bbc9c20dad255e79e8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=64d1a02e4e1a5f561d03b2bbc9c20dad255e79e8 commit 64d1a02e4e1a5f561d03b2bbc9c20dad255e79e8 Author: John Baldwin AuthorDate: 2025-01-02 18:23:41 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:23:41 +0000 Check for errors from bus_generic_detach in various drivers In some cases, move the call to bus_generic_detach earlier so that any detach failures from child devices do not leave the parent device partially detached. Differential Revision: https://reviews.freebsd.org/D47966 --- sys/arm/nvidia/tegra_sdhci.c | 6 +++++- sys/arm/ti/cpsw/if_cpsw.c | 7 +++++-- sys/arm/ti/ti_spi.c | 7 +++++-- sys/arm/xilinx/zy7_devcfg.c | 8 +++++--- sys/arm/xilinx/zy7_qspi.c | 6 ++++-- sys/arm/xilinx/zy7_slcr.c | 5 ++++- sys/arm/xilinx/zy7_spi.c | 6 ++++-- sys/dev/etherswitch/felix/felix.c | 5 +++-- 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c index 3bd9a9bb4632..fa6810b655c6 100644 --- a/sys/arm/nvidia/tegra_sdhci.c +++ b/sys/arm/nvidia/tegra_sdhci.c @@ -417,8 +417,12 @@ tegra_sdhci_detach(device_t dev) { struct tegra_sdhci_softc *sc = device_get_softc(dev); struct sdhci_slot *slot = &sc->slot; + int error; + + error = bus_detach_children(dev); + if (error != 0) + return (error); - bus_detach_children(dev); sdhci_fdt_gpio_teardown(sc->gpio); clk_release(sc->clk); bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie); diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 9fc3f414477b..ea8f9c18490e 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -1085,6 +1085,11 @@ static int cpswp_detach(device_t dev) { struct cpswp_softc *sc; + int error; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); CPSW_DEBUGF(sc->swsc, ("")); @@ -1096,8 +1101,6 @@ cpswp_detach(device_t dev) callout_drain(&sc->mii_callout); } - bus_generic_detach(dev); - if_free(sc->ifp); mtx_destroy(&sc->lock); diff --git a/sys/arm/ti/ti_spi.c b/sys/arm/ti/ti_spi.c index 26d6691e5bb5..fd0e0b085363 100644 --- a/sys/arm/ti/ti_spi.c +++ b/sys/arm/ti/ti_spi.c @@ -273,6 +273,11 @@ static int ti_spi_detach(device_t dev) { struct ti_spi_softc *sc; + int error; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); @@ -283,8 +288,6 @@ ti_spi_detach(device_t dev) /* Reset controller. */ TI_SPI_WRITE(sc, MCSPI_SYSCONFIG, MCSPI_SYSCONFIG_SOFTRESET); - bus_generic_detach(dev); - mtx_destroy(&sc->sc_mtx); if (sc->sc_intrhand) bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand); diff --git a/sys/arm/xilinx/zy7_devcfg.c b/sys/arm/xilinx/zy7_devcfg.c index 1cb7ff9168cf..6df0fba1f56a 100644 --- a/sys/arm/xilinx/zy7_devcfg.c +++ b/sys/arm/xilinx/zy7_devcfg.c @@ -791,15 +791,17 @@ static int zy7_devcfg_detach(device_t dev) { struct zy7_devcfg_softc *sc = device_get_softc(dev); + int error; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (sc->sysctl_tree_top != NULL) { sysctl_ctx_free(&sc->sysctl_tree); sc->sysctl_tree_top = NULL; } - if (device_is_attached(dev)) - bus_generic_detach(dev); - /* Get rid of /dev/devcfg0. */ if (sc->sc_ctl_dev != NULL) destroy_dev(sc->sc_ctl_dev); diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c index 53559571f7db..49d4cafd8d61 100644 --- a/sys/arm/xilinx/zy7_qspi.c +++ b/sys/arm/xilinx/zy7_qspi.c @@ -612,9 +612,11 @@ static int zy7_qspi_detach(device_t dev) { struct zy7_qspi_softc *sc = device_get_softc(dev); + int error; - if (device_is_attached(dev)) - bus_generic_detach(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Disable hardware. */ if (sc->mem_res != NULL) { diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c index 755b5d4806ed..a46ccb59a07b 100644 --- a/sys/arm/xilinx/zy7_slcr.c +++ b/sys/arm/xilinx/zy7_slcr.c @@ -673,8 +673,11 @@ static int zy7_slcr_detach(device_t dev) { struct zy7_slcr_softc *sc = device_get_softc(dev); + int error; - bus_generic_detach(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Release memory resource. */ if (sc->mem_res != NULL) diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c index d032deabf8b7..bb5bb7f46767 100644 --- a/sys/arm/xilinx/zy7_spi.c +++ b/sys/arm/xilinx/zy7_spi.c @@ -448,9 +448,11 @@ static int zy7_spi_detach(device_t dev) { struct zy7_spi_softc *sc = device_get_softc(dev); + int error; - if (device_is_attached(dev)) - bus_generic_detach(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Disable hardware. */ if (sc->mem_res != NULL) { diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c index b6fb8cbb67c8..098767ee063e 100644 --- a/sys/dev/etherswitch/felix/felix.c +++ b/sys/dev/etherswitch/felix/felix.c @@ -480,9 +480,10 @@ felix_detach(device_t dev) int error; int i; - error = 0; sc = device_get_softc(dev); - bus_generic_detach(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); mtx_lock(&sc->mtx); callout_stop(&sc->tick_callout); From nobody Thu Jan 2 18:28:25 2025 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 4YPFZf2PXnz5jnMJ; Thu, 02 Jan 2025 18:28:26 +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 4YPFZd5yqzz4v08; Thu, 2 Jan 2025 18:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842505; 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=CEkv6PxqW5c+LeFtUBhNXGW7i3Cy25oqputV1I4qrw8=; b=cTXhGqfRtn7GmHd5YEiTEPd4tDem+Q5esn37KtYzIncCkrrRP3xkQJ8cJPdx+N+v5DooZX k7Y7vEtr3FuIwF2bOay2XhW50GXr9Q2ke/qeieRjKKuF5/HRJ5CjUgjjbTcSrI2CtBDFaL 38p+cDfOpBYjsRNlJYoZNMNkUveCu0T1PHdxGp56mo4qElKdMDLlZ2r49tqKOt2t14yjf8 cnZ889P5aXIP5rWQK8Cu4d5pYhj3I8HKmnYS9DrQ0V5EiAFOybZtRoV3vk0PUh2W3j9vkG MU1oMWUTOBukceWoQAF45f8gMImh/aCI7LIYUSnAY6OQFFoUxIlKOEXoRPaeSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842505; 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=CEkv6PxqW5c+LeFtUBhNXGW7i3Cy25oqputV1I4qrw8=; b=sO4XTCmFym0P32bP+NFV3K2Jix/8M1Mw+7LwTx4+bvZFIWKDtIeY7+y/X5+W+rEKilxf53 vms2JkxuIVFtGmZlYRr7XzROJwSg6vzFOsaFMFDDgu9emgDjwG0qLeyxidxqnQvM/WKdvG Y7nDdgQ8g2VkbC79Vze+rTIxU6fKDrDa7WDxkhRPPpq5HZi/PP3aZLPa1lO643Zl25P8iN nekfx3sBOzBFQlNU3+5XXjtJMjgXu90dA/7ZQc46+RXF5LHE21QjpRxMGEYGXtQYqthQ1A 67792C6KHcuCD5HT1S0w2Wp2ZfmajHEeLLKTylljS8QLg7eAtlFlb2bdU5HvLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842505; a=rsa-sha256; cv=none; b=SKR1bjGvrIO9OEPqGDDCuvvz8uAzi7tL0woHvwelJkSPECS0lkpLD75aIjUEMdoZZ3TN7T XKI0h2smKmj9XfOk7JIdmPdWCdNBvb0iDKtl4SF7TK891RwplQ6TQJti+UWHqdZrhcWw1P /Q8Jx4kRxo6w8tnKQgh+Pl5VrcL2uE8zXag6KEEDIEsNt5kyqE/TA0bkhFvgGGGkabgf0K X42ggP+iJ8xgk4aMDJmylKqoBZvhxoD42uvJMkfUaJhJf9ogAteN4remMxX9cx+d31Dm0Z l5c37gITpT1Oddun9fEPtB6DcSQwcDgtOB7CRT6BgUxOAy/8O/D5hbBg5YV4KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZd5HQQzp57; Thu, 02 Jan 2025 18:28:25 +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 502ISPa2066422; Thu, 2 Jan 2025 18:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISPY0066419; Thu, 2 Jan 2025 18:28:25 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:25 GMT Message-Id: <202501021828.502ISPY0066419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6da28bb2a34a - main - csa/emu10kx: Simplify deleting child devices 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6da28bb2a34ac9e410ba8a49a7d8b8975462e929 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6da28bb2a34ac9e410ba8a49a7d8b8975462e929 commit 6da28bb2a34ac9e410ba8a49a7d8b8975462e929 Author: John Baldwin AuthorDate: 2025-01-02 18:23:28 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:23:28 +0000 csa/emu10kx: Simplify deleting child devices Use bus_generic_detach to detach and delete all child devices instead of several explicit calls to device_delete_child. Differential Revision: https://reviews.freebsd.org/D47965 --- sys/dev/sound/pci/csa.c | 18 ++++-------------- sys/dev/sound/pci/emu10kx.c | 31 ++++--------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 4c43c42b1cc3..4bd8ff029f43 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -317,26 +317,16 @@ csa_detach(device_t dev) scp = device_get_softc(dev); resp = &scp->res; - if (scp->midi != NULL) { - err = device_delete_child(dev, scp->midi); - if (err != 0) - return err; - scp->midi = NULL; - } - - if (scp->pcm != NULL) { - err = device_delete_child(dev, scp->pcm); - if (err != 0) - return err; - scp->pcm = NULL; - } + err = bus_generic_detach(dev); + if (err != 0) + return err; bus_teardown_intr(dev, resp->irq, scp->ih); bus_release_resource(dev, SYS_RES_IRQ, resp->irq_rid, resp->irq); bus_release_resource(dev, SYS_RES_MEMORY, resp->mem_rid, resp->mem); bus_release_resource(dev, SYS_RES_MEMORY, resp->io_rid, resp->io); - return bus_generic_detach(dev); + return (0); } static int diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 0c445482a932..9cd7dbca1cb2 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -3354,36 +3354,13 @@ static int emu_pci_detach(device_t dev) { struct emu_sc_info *sc; - int devcount, i; - device_t *childlist; int r = 0; sc = device_get_softc(dev); - for (i = 0; i < RT_COUNT; i++) { - if (sc->pcm[i] != NULL) { - r = device_delete_child(dev, sc->pcm[i]); - if (r) return (r); - } - } - - if (sc->midi[0] != NULL) { - r = device_delete_child(dev, sc->midi[0]); - if (r) return (r); - } - - if (sc->midi[1] != NULL) { - r = device_delete_child(dev, sc->midi[1]); - if (r) return (r); - } - - if (device_get_children(dev, &childlist, &devcount) == 0) - for (i = 0; i < devcount - 1; i++) { - device_printf(dev, "removing stale child %d (unit %d)\n", i, device_get_unit(childlist[i])); - device_delete_child(dev, childlist[i]); - } - if (childlist != NULL) - free(childlist, M_TEMP); + r = bus_generic_detach(dev); + if (r != 0) + return (r); r = emu10kx_dev_uninit(sc); if (r) @@ -3403,7 +3380,7 @@ emu_pci_detach(device_t dev) mtx_destroy(&sc->rw); mtx_destroy(&sc->lock); - return (bus_generic_detach(dev)); + return (0); } /* add suspend, resume */ static device_method_t emu_methods[] = { From nobody Thu Jan 2 18:28:27 2025 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 4YPFZh333zz5jn6W; Thu, 02 Jan 2025 18:28:28 +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 4YPFZh0bgDz4ttq; Thu, 2 Jan 2025 18:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842508; 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=ijjhz9cMMu9A3L3ztcDqvHH5c8K7lOUYFYCVupogK/0=; b=VD45PwhsYAzH9WZaqDcirEFNCX2iOmDSJysBqCWmhq9dchk+UQPDnE1mgFvLfkub9byqy4 NgYwLTmewahIaqxj9wcevOuIG+5fkIcL6k1tpviBYat2Iv87hxpw9+KHn8yXLk2oBze4VO 5m4k8MN3fTTXNuY1GmJo7a/jD7tkvTNWyLKXR+bwCDPCmgrZwtTyVroh62U8syYALdmE6g QjBTb8/7rSGN/gXz0eeQ5nVB7IN52nFDNkGJoQ5K20RdZtTq4Y3+t7m06m6AQE4VJQKm+V 9DhV6FgUKuqk2ooAJ4RaeNOVSBriR6RLYnPX2QSgVk8c/GRkhPTlSFQp+nL6cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842508; 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=ijjhz9cMMu9A3L3ztcDqvHH5c8K7lOUYFYCVupogK/0=; b=B52ZduiFE8/p/zyVwYjOL3Fnekgg3CkuLYCYW62OCboXAnHl7MsNkjA385vQ4WxmT+SA40 uTTHMYD6y7t088NOLCBfnQ6skTmx5Jc04Wr4gAt5pcRh1chdbPOvd165ghtE67GJBmViKe u1m7Ag9kKV5Gr3Ar4ee92UU4IzrWlrgNx8HjDRmriUeNv02cxOvAlAHHJrtsi/l5v07Ukp MDXfwjaI6giEK/BnVOvtR7ZGOCmL3gmN7zBHvWJqVt3o77/M2eJXq6js830Ma5CodDz//G N2urPAYR5mnY1pn+ObaCb6AANVE0pWeG6pzBy6X4iuL/PKYpSrYczWgLFRLeOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842508; a=rsa-sha256; cv=none; b=ZimQ6/myWV6qodsJATpcD1cLoCFHmJmYFuC05IW3e4/eoOvOvev7nD2WZP43Y9nEBSnLc2 K0Gh814O2wSBXLgFkN/fMbFzAyEjebOPFMEnfgeyPVfOT5rodq5sVId/Pa8O9CNt1mCGrN VOqYJpos944NrAoLex73YqqZMSu0jOWXUh1wbeQjhSupju/meRPWxjh0GY7uyt9/Z2j4ES sARJwvsV2YiGE/7oNmwtANS0FST3Rr8J7eb+JsSLrAhUSt3j46qaMFL3hyq1GOUAuqqwWW +mbpD7I6NMHRHHnp8OxWPIZ7bD+qJ+WbqgTeTFSPpKVpS4v5m4xFP7BBtlUYMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZh07tFzpJl; Thu, 02 Jan 2025 18:28:28 +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 502ISRn1066526; Thu, 2 Jan 2025 18:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISRtq066523; Thu, 2 Jan 2025 18:28:27 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:27 GMT Message-Id: <202501021828.502ISRtq066523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 919f911ea452 - main - siba: Use device_delete_children in siba_add_children 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 919f911ea4523276b7863e32e89943f270d3a76b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=919f911ea4523276b7863e32e89943f270d3a76b commit 919f911ea4523276b7863e32e89943f270d3a76b Author: John Baldwin AuthorDate: 2025-01-02 18:23:54 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:23:54 +0000 siba: Use device_delete_children in siba_add_children Differential Revision: https://reviews.freebsd.org/D47967 --- sys/dev/bhnd/siba/siba.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/bhnd/siba/siba.c b/sys/dev/bhnd/siba/siba.c index e693481f0819..ec9f22ff22af 100644 --- a/sys/dev/bhnd/siba/siba.c +++ b/sys/dev/bhnd/siba/siba.c @@ -1373,12 +1373,7 @@ siba_add_children(device_t dev) return (0); failed: - for (u_int i = 0; i < cid->ncores; i++) { - if (children[i] == NULL) - continue; - - device_delete_child(dev, children[i]); - } + device_delete_children(dev); free(cores, M_BHND); free(children, M_BHND); From nobody Thu Jan 2 18:28:29 2025 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 4YPFZk15f4z5jnTw; Thu, 02 Jan 2025 18:28:30 +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 4YPFZj1dgkz4v4r; Thu, 2 Jan 2025 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842509; 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=WFAACXrx3Q85bowZUAuMz0ByaaGHhcZm4VU0UjA4CAw=; b=N+3m5xCxHHpCDpFffqAuh/JfagnbDmEOs2zl/TerL+9rJXb8WFwKiT1rmaFgoVCs4UhWY0 xy96MF/0LBhWwmqcZl3WEGg5CEItIhYW/X9vmTraq9mD/eWVIzDiWARM8jtyognsxjqH2H fzNQO+H2ZfKmqwScgDt3BlNyhSJtIxuw2ZO8icU7P6BOSGjZX6fBojhST8bTGapSOJXNOk 6bA0p2RTCi3D+p0oBURtDVoMs4mGKU2Sw6+v189OFaThisy5ZS31zXq0AlqcnfGjgNK67J KEq+HQMJlVGp/OcTh7LSEZULnP00we9hqJkiugqXzASCZsd0jMp3lNWyuQeJWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842509; 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=WFAACXrx3Q85bowZUAuMz0ByaaGHhcZm4VU0UjA4CAw=; b=VYgWV/VxfHeMt59eDVVTpF8vT0rWU2hoAMeCi/5bNJk/nQ1bmpgOUdUoDaKQeyT8iJjxI9 FcJ32yd+fEMugB1rbtcNPLAseNsjritrTcXop7iofHAkMBx2r35Hfz4ARUobqThhimAJEz vuTzo7NvzaTVQeAjuLA5/hLKuAg9n7e7ZG7yJcK+YsCjhDcnQwTL/uvMFHo/+RSdpipK7c eTQDboSM5F9ydx4CX2E5cwqXJzpSWHc3EbZj9kAHhnvnb5aa0N0ykj+8SOtwpS5QArLgJV VgBd761GgMakrSzHCHJQ47hEvZqLh/JAyUFIRfPUoQuqFsZm6L1vbNZ3LLNRyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842509; a=rsa-sha256; cv=none; b=R0oN0uIm5gEVeJ1r8CdZGm8ys7z1WDQFo0qn4jK4m4qVtshOKbQc6Fi1Z/6NMfaKsuAKdO XJ7chvcSw36kvyG91SAPieREQ9aqWRWpu44Eee3c2HdiJGICGuab+yp13KUPDNVQ6/EgJ4 uIupjYKcaVY/gThMv0LsJYT1BSgXBJESSts6Z7cuw9d48p/3QGq9HiOmSx9Zbz7Mq3WhA7 t/1J2PN4bsHZ6bMkylizNXyl/Udbuc8Z7VDIWJTCwTXjzS1U9E6h35ZSoQu8m/UI4QW9Z1 Ui8I5Qiywr11thE0BQbo82IsNsZWaLc/tEXONJn0RBwdielShJ7fUFaRFs/vuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZj116MznlC; Thu, 02 Jan 2025 18:28:29 +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 502ISTXB066574; Thu, 2 Jan 2025 18:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISTlQ066571; Thu, 2 Jan 2025 18:28:29 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:29 GMT Message-Id: <202501021828.502ISTlQ066571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 20f932af2973 - main - bhnd bcma/siba: Remove duplicate call to device_delete_children 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20f932af2973afc7624ac40a843b85b48a3947c7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=20f932af2973afc7624ac40a843b85b48a3947c7 commit 20f932af2973afc7624ac40a843b85b48a3947c7 Author: John Baldwin AuthorDate: 2025-01-02 18:24:13 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:24:13 +0000 bhnd bcma/siba: Remove duplicate call to device_delete_children bcma/siba_add_children already call device_delete_children if an error occurs. Differential Revision: https://reviews.freebsd.org/D47968 --- sys/dev/bhnd/bcma/bcma.c | 1 - sys/dev/bhnd/siba/siba.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/dev/bhnd/bcma/bcma.c b/sys/dev/bhnd/bcma/bcma.c index 9ce4bf04a1c5..a83873b321c2 100644 --- a/sys/dev/bhnd/bcma/bcma.c +++ b/sys/dev/bhnd/bcma/bcma.c @@ -81,7 +81,6 @@ bcma_attach(device_t dev) /* Enumerate children */ if ((error = bcma_add_children(dev))) { - device_delete_children(dev); return (error); } diff --git a/sys/dev/bhnd/siba/siba.c b/sys/dev/bhnd/siba/siba.c index ec9f22ff22af..a8e83f843506 100644 --- a/sys/dev/bhnd/siba/siba.c +++ b/sys/dev/bhnd/siba/siba.c @@ -85,7 +85,6 @@ siba_attach(device_t dev) /* Enumerate children */ if ((error = siba_add_children(dev))) { - device_delete_children(dev); SIBA_LOCK_DESTROY(sc); return (error); } From nobody Thu Jan 2 18:28:30 2025 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 4YPFZl599Rz5jnTy; Thu, 02 Jan 2025 18:28:31 +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 4YPFZk2TtKz4vD9; Thu, 2 Jan 2025 18:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842510; 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=38/twcu3dW6/ZAlcpFp2ki3GKXJ56wchH/MCRQSUegc=; b=alWQr28ko9pjTkmytTW2nqssLKkYiDrfwPRiZmwOlh2zeRcf9iMFHBsTsirFPYCrCGotDv YuoZHSB2sZ5FnPlN9lBteSHXGB17wMNZrD9Ll1ennMQNWV7ZCz0ANetr9+xEPMCRSLR9Hv TSxlTA24FGLPzbzWFRbbp4cdI6tbWY4ku/atCKGWIw093OVqtE41yOXOZDCs4bpJcxhcW0 TgHNb8BYuN0FC1FfnitiibpkB0Cdbh1J7YcCrv8Mt7QucEQCQwNNPFxh6sboUSB8qm9iyX O+7xW2vdDolAncuU4wu0t+1MLQjZOwgKinDMN9bJEphxMXfP/4yLzCFAp/vjYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842510; 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=38/twcu3dW6/ZAlcpFp2ki3GKXJ56wchH/MCRQSUegc=; b=H4lxbdT0XihqTOD0QWsikYmILRWc7rLnSkYyQ3upM6xnJAjkdmNb8UhYy6LJZY2n45ITgC wHGx+iUI9hdFzg59PJfKeV6AqmP4TL10EZKelBv+ihZ6Ynit2JANg1c0jfnzgh4DHyt6ua VAg5HBg29f/UC+gwuxyu2olOINWanIyqR+BHm1FYU45sGaM69i+oEDheNLdVKnA5BLebVF A9gldXw2wjzNQiWXTZSeCjItThREBY7izFaBFI/lvhNpQWqPwcfgohtcnXEAvuCYqNQ5n7 naI1qrQLRjEtsbqbmv+tokQ5HveMMLTFR/K3TRwyAKekDMYZSGm82KBC6m2jTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842510; a=rsa-sha256; cv=none; b=yl+2lfpk13g2mW+Gi0uMz9ReyIdz0gHGug0D2TLEGS5BwUn+aVPPO3oXbFtPrVQ+oToNMo 6ouqAHv+yguOCJBcu77jfdiVe7qXyQdidCRzhH/Ri1rFx7aplJksxYj2BuBiF+L2wLZtab J4fjauCEZUjGxJbAD1qqKwo+2SkNXSbOriWmotSniM/Qb4nMgugzFAvkkfuOU4eaxu8Lzd Ze67/6ApxmqlKTX4zd4mj7EpgeqjBSoBa686VFejUGW8ofKRH6ad4ymqqXex1pKgz3AVa/ Qcx6N/cROEd7x4RZq8Q7Z/gAyseZO/+6qWWaDw/A42iS3TXZ4Q3H4Wux31XVpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZk1xpZzpS0; Thu, 02 Jan 2025 18:28:30 +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 502ISUYS066622; Thu, 2 Jan 2025 18:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISU94066619; Thu, 2 Jan 2025 18:28:30 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:30 GMT Message-Id: <202501021828.502ISU94066619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3ddaf8200bc9 - main - Use bus_generic_detach instead of device_delete_children in detach 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ddaf8200bc90b1410755ebac7b5c979ea90a2f6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3ddaf8200bc90b1410755ebac7b5c979ea90a2f6 commit 3ddaf8200bc90b1410755ebac7b5c979ea90a2f6 Author: John Baldwin AuthorDate: 2025-01-02 18:24:28 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:24:28 +0000 Use bus_generic_detach instead of device_delete_children in detach While here, check for errors from bus_generic_detach and move it to the start of detach if necessary. Differential Revision: https://reviews.freebsd.org/D47969 --- sys/arm/freescale/vybrid/vf_ehci.c | 2 +- sys/arm/mv/a37x0_spi.c | 2 +- sys/arm/nvidia/tegra_ehci.c | 10 +++++----- sys/arm/nvidia/tegra_xhci.c | 6 +++++- sys/arm/ti/am335x/am335x_musb.c | 5 ++++- sys/arm/ti/usb/omap_ehci.c | 4 +++- sys/arm/ti/usb/omap_host.c | 5 ++++- sys/arm/xilinx/zy7_ehci.c | 5 ++++- sys/dev/ahci/ahci.c | 6 ++++-- sys/dev/ata/ata-pci.c | 5 ++++- sys/dev/atopcase/atopcase.c | 2 +- sys/dev/etherswitch/e6000sw/e6000sw.c | 8 +++++--- sys/dev/hyperv/input/hv_hid.c | 2 +- sys/dev/iicbus/iicbus.c | 2 +- sys/dev/iicbus/iichid.c | 2 +- sys/dev/intel/spi.c | 7 ++++++- sys/dev/mmc/host/dwmmc.c | 2 +- sys/dev/mvs/mvs_pci.c | 5 ++++- sys/dev/mvs/mvs_soc.c | 5 ++++- sys/dev/neta/if_mvneta.c | 2 +- sys/dev/ow/owc_gpiobus.c | 2 +- sys/dev/p2sb/p2sb.c | 6 +++++- sys/dev/ppc/ppc.c | 5 ++++- sys/dev/rtsx/rtsx.c | 4 ++-- sys/dev/siis/siis.c | 5 ++++- sys/dev/sound/pci/hda/hdaa.c | 2 +- sys/dev/sound/pci/hda/hdacc.c | 2 +- sys/dev/sound/pci/hdsp.c | 2 +- sys/dev/sound/pci/hdspe.c | 2 +- sys/dev/spibus/spibus.c | 2 +- sys/dev/usb/controller/dwc_otg_acpi.c | 5 ++++- sys/dev/usb/controller/dwc_otg_fdt.c | 5 ++++- sys/dev/usb/controller/ehci_fsl.c | 14 +++++--------- sys/dev/usb/controller/ehci_imx.c | 2 +- sys/dev/usb/controller/ehci_msm.c | 10 +++------- sys/dev/usb/controller/ehci_mv.c | 4 +++- sys/dev/usb/controller/ehci_pci.c | 5 ++++- sys/dev/usb/controller/generic_ehci.c | 4 +++- sys/dev/usb/controller/generic_ohci.c | 4 +++- sys/dev/usb/controller/generic_xhci.c | 4 +++- sys/dev/usb/controller/musb_otg_allwinner.c | 13 ++++--------- sys/dev/usb/controller/ohci_pci.c | 5 ++++- sys/dev/usb/controller/uhci_pci.c | 5 ++++- sys/dev/usb/controller/xhci_pci.c | 5 ++++- sys/dev/usb/input/usbhid.c | 6 +++++- sys/dev/usb/video/udl.c | 5 ++++- 46 files changed, 139 insertions(+), 76 deletions(-) diff --git a/sys/arm/freescale/vybrid/vf_ehci.c b/sys/arm/freescale/vybrid/vf_ehci.c index a3477c743997..3a8b48008449 100644 --- a/sys/arm/freescale/vybrid/vf_ehci.c +++ b/sys/arm/freescale/vybrid/vf_ehci.c @@ -386,7 +386,7 @@ vybrid_ehci_detach(device_t dev) sc = &esc->base; /* First detach all children; we can't detach if that fails. */ - if ((err = device_delete_children(dev)) != 0) + if ((err = bus_generic_detach(dev)) != 0) return (err); /* diff --git a/sys/arm/mv/a37x0_spi.c b/sys/arm/mv/a37x0_spi.c index bc47da2f3e6e..027dd57677a3 100644 --- a/sys/arm/mv/a37x0_spi.c +++ b/sys/arm/mv/a37x0_spi.c @@ -227,7 +227,7 @@ a37x0_spi_detach(device_t dev) int err; struct a37x0_spi_softc *sc; - if ((err = device_delete_children(dev)) != 0) + if ((err = bus_generic_detach(dev)) != 0) return (err); sc = device_get_softc(dev); mtx_destroy(&sc->sc_mtx); diff --git a/sys/arm/nvidia/tegra_ehci.c b/sys/arm/nvidia/tegra_ehci.c index 15f086a6c3c0..59bf8646385a 100644 --- a/sys/arm/nvidia/tegra_ehci.c +++ b/sys/arm/nvidia/tegra_ehci.c @@ -113,14 +113,17 @@ tegra_ehci_detach(device_t dev) { struct tegra_ehci_softc *sc; ehci_softc_t *esc; + int error; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); esc = &sc->ehci_softc; if (sc->clk != NULL) clk_release(sc->clk); - if (esc->sc_bus.bdev != NULL) - device_delete_child(dev, esc->sc_bus.bdev); if (esc->sc_flags & EHCI_SCFLG_DONEINIT) ehci_detach(esc); if (esc->sc_intr_hdl != NULL) @@ -135,9 +138,6 @@ tegra_ehci_detach(device_t dev) if (sc->usb_alloc_called) usb_bus_mem_free_all(&esc->sc_bus, &ehci_iterate_hw_softc); - /* During module unload there are lots of children leftover. */ - device_delete_children(dev); - return (0); } diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c index e3b4dd483189..474e31981770 100644 --- a/sys/arm/nvidia/tegra_xhci.c +++ b/sys/arm/nvidia/tegra_xhci.c @@ -916,12 +916,16 @@ tegra_xhci_detach(device_t dev) { struct tegra_xhci_softc *sc; struct xhci_softc *xsc; + int error; sc = device_get_softc(dev); xsc = &sc->xhci_softc; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + if (sc->xhci_inited) { usb_callout_drain(&xsc->sc_callout); xhci_halt_controller(xsc); diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c index 147602c4dbd3..24a204e42c9c 100644 --- a/sys/arm/ti/am335x/am335x_musb.c +++ b/sys/arm/ti/am335x/am335x_musb.c @@ -404,9 +404,12 @@ static int musbotg_detach(device_t dev) { struct musbotg_super_softc *sc = device_get_softc(dev); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { /* diff --git a/sys/arm/ti/usb/omap_ehci.c b/sys/arm/ti/usb/omap_ehci.c index fee5f662963b..224c786bf9fa 100644 --- a/sys/arm/ti/usb/omap_ehci.c +++ b/sys/arm/ti/usb/omap_ehci.c @@ -406,7 +406,9 @@ omap_ehci_detach(device_t dev) int err; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + err = bus_generic_detach(dev); + if (err != 0) + return (err); /* * disable interrupts that might have been switched on in ehci_init diff --git a/sys/arm/ti/usb/omap_host.c b/sys/arm/ti/usb/omap_host.c index b7c387c00601..c336a25eabf3 100644 --- a/sys/arm/ti/usb/omap_host.c +++ b/sys/arm/ti/usb/omap_host.c @@ -432,9 +432,12 @@ static int omap_uhh_detach(device_t dev) { struct omap_uhh_softc *isc = device_get_softc(dev); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (isc->uhh_mem_res) { bus_release_resource(dev, SYS_RES_MEMORY, 0, isc->uhh_mem_res); diff --git a/sys/arm/xilinx/zy7_ehci.c b/sys/arm/xilinx/zy7_ehci.c index f2e1d8a9ec2b..545e2a9bce16 100644 --- a/sys/arm/xilinx/zy7_ehci.c +++ b/sys/arm/xilinx/zy7_ehci.c @@ -315,9 +315,12 @@ static int zy7_ehci_detach(device_t dev) { ehci_softc_t *sc = device_get_softc(dev); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if ((sc->sc_flags & EHCI_SCFLG_DONEINIT) != 0) { ehci_detach(sc); diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index d64ec8caa13f..d5ce503f62ee 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -391,10 +391,12 @@ int ahci_detach(device_t dev) { struct ahci_controller *ctlr = device_get_softc(dev); - int i; + int error, i; /* Detach & delete all children */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Free interrupts. */ for (i = 0; i < ctlr->numirqs; i++) { diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 8c22bb6ff427..6d8b8fb3aad1 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -134,9 +134,12 @@ int ata_pci_detach(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); + int error; /* detach & delete all children */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (ctlr->r_irq) { bus_teardown_intr(dev, ctlr->r_irq, ctlr->handle); diff --git a/sys/dev/atopcase/atopcase.c b/sys/dev/atopcase/atopcase.c index e4e248f7ce0a..9e64b389c9e3 100644 --- a/sys/dev/atopcase/atopcase.c +++ b/sys/dev/atopcase/atopcase.c @@ -545,7 +545,7 @@ atopcase_destroy(struct atopcase_softc *sc) { int err; - err = device_delete_children(sc->sc_dev); + err = bus_generic_detach(sc->sc_dev); if (err) return (err); diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index e79082759593..cb71fa5b0e88 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -845,19 +845,21 @@ e6000sw_writephy_locked(device_t dev, int phy, int reg, int data) static int e6000sw_detach(device_t dev) { - int phy; + int error, phy; e6000sw_softc_t *sc; sc = device_get_softc(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + if (device_is_attached(dev)) taskqueue_drain_timeout(sc->sc_tq, &sc->sc_tt); if (sc->sc_tq != NULL) taskqueue_free(sc->sc_tq); - device_delete_children(dev); - sx_destroy(&sc->sx); for (phy = 0; phy < sc->num_ports; phy++) { if (sc->ifp[phy] != NULL) diff --git a/sys/dev/hyperv/input/hv_hid.c b/sys/dev/hyperv/input/hv_hid.c index c54bc43c0f24..a26c46184442 100644 --- a/sys/dev/hyperv/input/hv_hid.c +++ b/sys/dev/hyperv/input/hv_hid.c @@ -457,7 +457,7 @@ hv_hid_detach(device_t dev) int ret; sc = device_get_softc(dev); - ret = device_delete_children(dev); + ret = bus_generic_detach(dev); if (ret != 0) return (ret); if (sc->hs_xact_ctx != NULL) diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index 97dc9c437866..0894ddddb8e8 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -144,7 +144,7 @@ iicbus_detach(device_t dev) struct iicbus_softc *sc = IICBUS_SOFTC(dev); int err; - if ((err = device_delete_children(dev)) != 0) + if ((err = bus_generic_detach(dev)) != 0) return (err); iicbus_reset(dev, IIC_FASTEST, 0, NULL); mtx_destroy(&sc->lock); diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index ed016fa0e0cc..346d432a74b5 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -1218,7 +1218,7 @@ iichid_detach(device_t dev) int error; sc = device_get_softc(dev); - error = device_delete_children(dev); + error = bus_generic_detach(dev); if (error) return (error); iichid_teardown_interrupt(sc); diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 4c45ef7863a7..9a0d4305227d 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -550,9 +550,14 @@ int intelspi_detach(device_t dev) { struct intelspi_softc *sc; + int error; sc = device_get_softc(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + INTELSPI_LOCK_DESTROY(sc); if (sc->sc_irq_ih) @@ -566,7 +571,7 @@ intelspi_detach(device_t dev) bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid, sc->sc_irq_res); - return (device_delete_children(dev)); + return (0); } int diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index f39a2033f64c..51709bcbb7e9 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -778,7 +778,7 @@ dwmmc_detach(device_t dev) sc = device_get_softc(dev); - ret = device_delete_children(dev); + ret = bus_generic_detach(dev); if (ret != 0) return (ret); diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c index 9743328d9593..9dfb5e3bbedd 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -176,9 +176,12 @@ static int mvs_detach(device_t dev) { struct mvs_controller *ctlr = device_get_softc(dev); + int error; /* Detach & delete all children */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Free interrupt. */ if (ctlr->irq.r_irq) { diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 41f2bf648c9d..8712dc0123e8 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -180,9 +180,12 @@ static int mvs_detach(device_t dev) { struct mvs_controller *ctlr = device_get_softc(dev); + int error; /* Detach & delete all children */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Free interrupt. */ if (ctlr->irq.r_irq) { diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c index 84cbc1e43462..1c6247adb56b 100644 --- a/sys/dev/neta/if_mvneta.c +++ b/sys/dev/neta/if_mvneta.c @@ -843,7 +843,7 @@ mvneta_detach(device_t dev) for (q = 0; q < MVNETA_TX_QNUM_MAX; q++) mvneta_ring_dealloc_tx_queue(sc, q); - device_delete_children(dev); + bus_generic_detach(dev); if (sc->ih_cookie[0] != NULL) bus_teardown_intr(dev, sc->res[1], sc->ih_cookie[0]); diff --git a/sys/dev/ow/owc_gpiobus.c b/sys/dev/ow/owc_gpiobus.c index 231902e02536..f010a4dc75f1 100644 --- a/sys/dev/ow/owc_gpiobus.c +++ b/sys/dev/ow/owc_gpiobus.c @@ -146,7 +146,7 @@ owc_gpiobus_detach(device_t dev) sc = device_get_softc(dev); - if ((err = device_delete_children(dev)) != 0) + if ((err = bus_generic_detach(dev)) != 0) return (err); gpio_pin_release(sc->sc_pin); diff --git a/sys/dev/p2sb/p2sb.c b/sys/dev/p2sb/p2sb.c index 941e35469c69..950ee4e86866 100644 --- a/sys/dev/p2sb/p2sb.c +++ b/sys/dev/p2sb/p2sb.c @@ -159,9 +159,13 @@ static int p2sb_detach(device_t dev) { struct p2sb_softc *sc; + int error; /* Teardown the state in our softc created in our attach routine. */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + sc = device_get_softc(dev); mtx_destroy(&sc->mutex); if (sc->res != NULL) diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index 020043732222..9870379e2eba 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -1815,13 +1815,16 @@ int ppc_detach(device_t dev) { struct ppc_data *ppc = DEVTOSOFTC(dev); + int error; if (ppc->res_irq == 0) { return (ENXIO); } /* detach & delete all children */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (ppc->res_irq != 0) { bus_teardown_intr(dev, ppc->res_irq, ppc->intr_cookie); diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c index a293d5e12e5e..f06b493e0c15 100644 --- a/sys/dev/rtsx/rtsx.c +++ b/sys/dev/rtsx/rtsx.c @@ -3784,10 +3784,10 @@ rtsx_detach(device_t dev) WRITE4(sc, RTSX_BIER, sc->rtsx_intr_enabled); /* Stop device. */ - error = device_delete_children(sc->rtsx_dev); - sc->rtsx_mmc_dev = NULL; + error = bus_generic_detach(sc->rtsx_dev); if (error) return (error); + sc->rtsx_mmc_dev = NULL; taskqueue_drain_timeout(taskqueue_swi_giant, &sc->rtsx_card_insert_task); taskqueue_drain(taskqueue_swi_giant, &sc->rtsx_card_remove_task); diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 4cc78ed57323..df11b36ec844 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -203,9 +203,12 @@ static int siis_detach(device_t dev) { struct siis_controller *ctlr = device_get_softc(dev); + int error; /* Detach & delete all children */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); /* Free interrupts. */ if (ctlr->irq.r_irq) { diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 2fab3ae014d1..51d6e024225f 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -6684,7 +6684,7 @@ hdaa_detach(device_t dev) struct hdaa_devinfo *devinfo = device_get_softc(dev); int error; - if ((error = device_delete_children(dev)) != 0) + if ((error = bus_generic_detach(dev)) != 0) return (error); hdaa_lock(devinfo); diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index c79e9297025c..76aeaec757a5 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -541,7 +541,7 @@ hdacc_detach(device_t dev) struct hdacc_softc *codec = device_get_softc(dev); int error; - if ((error = device_delete_children(dev)) != 0) + if ((error = bus_generic_detach(dev)) != 0) return (error); free(codec->fgs, M_HDACC); return (0); diff --git a/sys/dev/sound/pci/hdsp.c b/sys/dev/sound/pci/hdsp.c index ac343928b26b..4712d78ea88b 100644 --- a/sys/dev/sound/pci/hdsp.c +++ b/sys/dev/sound/pci/hdsp.c @@ -985,7 +985,7 @@ hdsp_detach(device_t dev) return (0); } - err = device_delete_children(dev); + err = bus_generic_detach(dev); if (err) return (err); diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index 4b5c31801d55..c292b2ddef56 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -877,7 +877,7 @@ hdspe_detach(device_t dev) return (0); } - err = device_delete_children(dev); + err = bus_generic_detach(dev); if (err) return (err); diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index 9251bd0c2962..f082b9ec171a 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -68,7 +68,7 @@ spibus_attach(device_t dev) int spibus_detach(device_t dev) { - return (device_delete_children(dev)); + return (bus_generic_detach(dev)); } static int diff --git a/sys/dev/usb/controller/dwc_otg_acpi.c b/sys/dev/usb/controller/dwc_otg_acpi.c index 9b982dfd6e41..5d509911a54a 100644 --- a/sys/dev/usb/controller/dwc_otg_acpi.c +++ b/sys/dev/usb/controller/dwc_otg_acpi.c @@ -127,9 +127,12 @@ static int dwc_otg_detach(device_t dev) { struct dwc_otg_softc *sc = device_get_softc(dev); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (sc->sc_irq_res && sc->sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c index d692638857c5..3d5dcb9e9a7b 100644 --- a/sys/dev/usb/controller/dwc_otg_fdt.c +++ b/sys/dev/usb/controller/dwc_otg_fdt.c @@ -162,9 +162,12 @@ int dwc_otg_detach(device_t dev) { struct dwc_otg_fdt_softc *sc = device_get_softc(dev); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c index 49d23996b696..ed3d4c64f4f8 100644 --- a/sys/dev/usb/controller/ehci_fsl.c +++ b/sys/dev/usb/controller/ehci_fsl.c @@ -372,10 +372,14 @@ fsl_ehci_attach(device_t self) static int fsl_ehci_detach(device_t self) { - int err; ehci_softc_t *sc; + /* During module unload there are lots of children leftover */ + err = bus_generic_detach(self); + if (err != 0) + return (err); + sc = device_get_softc(self); /* * only call ehci_detach() after ehci_init() @@ -399,14 +403,6 @@ fsl_ehci_detach(device_t self) sc->sc_intr_hdl = NULL; } - if (sc->sc_bus.bdev) { - device_delete_child(self, sc->sc_bus.bdev); - sc->sc_bus.bdev = NULL; - } - - /* During module unload there are lots of children leftover */ - device_delete_children(self); - if (sc->sc_irq_res) { bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); sc->sc_irq_res = NULL; diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c index 0ab9bf0ed6f2..caba6b7da85a 100644 --- a/sys/dev/usb/controller/ehci_imx.c +++ b/sys/dev/usb/controller/ehci_imx.c @@ -314,7 +314,7 @@ imx_ehci_detach(device_t dev) esc = &sc->ehci_softc; /* First detach all children; we can't detach if that fails. */ - if ((err = device_delete_children(dev)) != 0) + if ((err = bus_generic_detach(dev)) != 0) return (err); if (esc->sc_flags & EHCI_SCFLG_DONEINIT) diff --git a/sys/dev/usb/controller/ehci_msm.c b/sys/dev/usb/controller/ehci_msm.c index c628d5bf8fde..7f06ad6a1600 100644 --- a/sys/dev/usb/controller/ehci_msm.c +++ b/sys/dev/usb/controller/ehci_msm.c @@ -171,13 +171,9 @@ ehci_msm_detach(device_t dev) sc = device_get_softc(dev); - if (sc->sc_bus.bdev) { - bdev = sc->sc_bus.bdev; - device_detach(bdev); - device_delete_child(dev, bdev); - } - - device_delete_children(dev); + err = bus_generic_detach(dev); + if (err != 0) + return (err); if (sc->sc_irq_res && sc->sc_intr_hdl) { /* only call ehci_detach() after ehci_init() */ diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index 5535cb061949..817cd68257c8 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -283,7 +283,9 @@ mv_ehci_detach(device_t self) int err; /* during module unload there are lots of children leftover */ - device_delete_children(self); + err = bus_generic_detach(self); + if (err != 0) + return (err); /* * disable interrupts that might have been switched on in mv_ehci_attach diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 5141548bf793..bc75669a8d20 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -505,9 +505,12 @@ static int ehci_pci_detach(device_t self) { ehci_softc_t *sc = device_get_softc(self); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(self); + error = bus_generic_detach(self); + if (error != 0) + return (error); pci_disable_busmaster(self); diff --git a/sys/dev/usb/controller/generic_ehci.c b/sys/dev/usb/controller/generic_ehci.c index e660a338df64..35a9564631e0 100644 --- a/sys/dev/usb/controller/generic_ehci.c +++ b/sys/dev/usb/controller/generic_ehci.c @@ -139,7 +139,9 @@ generic_ehci_detach(device_t self) int err; /* during module unload there are lots of children leftover */ - device_delete_children(self); + err = bus_generic_detach(self); + if (err != 0) + return (err); if (sc->sc_irq_res && sc->sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c index fe4493fda977..5c0de59074d2 100644 --- a/sys/dev/usb/controller/generic_ohci.c +++ b/sys/dev/usb/controller/generic_ohci.c @@ -231,7 +231,9 @@ generic_ohci_detach(device_t dev) struct hwrst_list *rst, *rst_tmp; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + err = bus_generic_detach(dev); + if (err != 0) + return (err); /* * Put the controller into reset, then disable clocks and do diff --git a/sys/dev/usb/controller/generic_xhci.c b/sys/dev/usb/controller/generic_xhci.c index 95551aafa519..f64e1fd01ba0 100644 --- a/sys/dev/usb/controller/generic_xhci.c +++ b/sys/dev/usb/controller/generic_xhci.c @@ -152,7 +152,9 @@ generic_xhci_detach(device_t dev) int err; /* during module unload there are lots of children leftover */ - device_delete_children(dev); + err = bus_generic_detach(dev); + if (err != 0) + return (err); if (sc->sc_irq_res != NULL && sc->sc_intr_hdl != NULL) { err = bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intr_hdl); diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c index c52b381fd16a..574e8e712713 100644 --- a/sys/dev/usb/controller/musb_otg_allwinner.c +++ b/sys/dev/usb/controller/musb_otg_allwinner.c @@ -561,16 +561,13 @@ static int awusbdrd_detach(device_t dev) { struct awusbdrd_softc *sc; - device_t bdev; int error; - sc = device_get_softc(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); - if (sc->sc.sc_bus.bdev != NULL) { - bdev = sc->sc.sc_bus.bdev; - device_detach(bdev); - device_delete_child(dev, bdev); - } + sc = device_get_softc(dev); musbotg_uninit(&sc->sc); error = bus_teardown_intr(dev, sc->res[1], sc->sc.sc_intr_hdl); @@ -594,8 +591,6 @@ awusbdrd_detach(device_t dev) bus_release_resources(dev, awusbdrd_spec, sc->res); - device_delete_children(dev); - return (0); } diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index 03291ff34a6f..027be4ce9588 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -320,9 +320,12 @@ static int ohci_pci_detach(device_t self) { ohci_softc_t *sc = device_get_softc(self); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(self); + error = bus_generic_detach(self); + if (error != 0) + return (error); pci_disable_busmaster(self); diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index 90f3dca8f830..0dc2763aed8d 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -414,9 +414,12 @@ int uhci_pci_detach(device_t self) { uhci_softc_t *sc = device_get_softc(self); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(self); + error = bus_generic_detach(self); + if (error != 0) + return (error); /* * disable interrupts that might have been switched on in diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 6f128f1d2fa7..c436f60aefcf 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -465,9 +465,12 @@ static int xhci_pci_detach(device_t self) { struct xhci_softc *sc = device_get_softc(self); + int error; /* during module unload there are lots of children leftover */ - device_delete_children(self); + error = bus_generic_detach(self); + if (error != 0) + return (error); usb_callout_drain(&sc->sc_callout); xhci_halt_controller(sc); diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c index d357a699b527..e88588182ae5 100644 --- a/sys/dev/usb/input/usbhid.c +++ b/sys/dev/usb/input/usbhid.c @@ -851,8 +851,12 @@ static int usbhid_detach(device_t dev) { struct usbhid_softc *sc = device_get_softc(dev); + int error; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); - device_delete_children(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/usb/video/udl.c b/sys/dev/usb/video/udl.c index b5af3be8bc50..213f1f5bb957 100644 --- a/sys/dev/usb/video/udl.c +++ b/sys/dev/usb/video/udl.c @@ -441,9 +441,12 @@ static int udl_detach(device_t dev) { struct udl_softc *sc = device_get_softc(dev); + int error; /* delete all child devices */ - device_delete_children(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); UDL_LOCK(sc); sc->sc_gone = 1; From nobody Thu Jan 2 18:28:31 2025 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 4YPFZm0KDrz5jnSC; Thu, 02 Jan 2025 18:28:32 +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 4YPFZl3LHxz4tvP; Thu, 2 Jan 2025 18:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842511; 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=snel+eqPsIlGbl1t/x6uK+18GKWDPXRn4awkZMKHsn4=; b=eUMc/q+Y4sRib/GOTP2sV/2O2dc9LVl00IzzBX6A/cVc6tdJEJWdl0/5073C7yr1R7LuMn USOPovGxQUSRJHFJgvaWGegjDX5JIGsu9iJSRj5pvOS1HwCtde6bAFJ9rS/fc5jHzhdh1t SofVVwJkY9pvKhztOxDaJ7iUUVuAlo0sh8A2gp5xkfLmRDkWaYBO+YnfkBgfHMoiLiUXGf eJVtBNFyXSIs/p67dqIvywUy5Bi0bbMrFrr8ZHAl067L9RieZvmDz5y5fBBsivGPpt+Pv/ Dpg7KX2xurt3jJiSF9VrsO1CwMzhcLYuNi0jw0v3gngzYov+3hne4D2y8KXgVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842511; 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=snel+eqPsIlGbl1t/x6uK+18GKWDPXRn4awkZMKHsn4=; b=W+pnm6SgLowWsRh31yVf/Ia9azM31kpFctdPkuiugDnZRAO8g+5BCqzF5IQk5nGp3DbkrL zZ1Lu63N/66venjU1HgX4LtZW2uCBpCCM5Xt7B9LKxdpES9QfjbJDUY1jn12Pr9z2U8mAk 19IziUARELPIRDacgovo01faNgYwKVqJzKweIH4sTfTtNzO4K8spbKCG0eHX2zJBC36FLr 9ngV30Gicx65vop9PChtSgfNPY7o3358BuWwvCv4RFjV29JurE4yrHzPcs6fBH6R5fHH77 Gqwe3T6Xp5J0BGv7Ho12MHggYxfXg5/KCA1sCJYzSjvIrYKpQfZ0g4SP2UlvrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842511; a=rsa-sha256; cv=none; b=XbU1T4XNyG6hTGLXFQJ20+uj6Nhvzh1Aihjyn842/U5R7Sg0+LWq3SA0u7jkh7Zn4sWU/w Z7aRZzudQaEi81MbvP8OtyppD4bQ5t3T3bbIhmzRgttRW39dEBAT+9FYRjjYPJ0xW5IU5M +JvguzsN+KX/1T+f5BdEe/fufvPnj4bBw4hPvDap9at1UKCn54VUiAkT0kjY7SIxzd9iZh dCwIQ9wiL01HYpMtE1xCO07F3MGPH+k4OYLDzf5uD/VpzbDEemqJTkVGFFpBaS5o5UQgkX UxtOhAytfpiIUQOCv0xg1jDGpPOfqD+vgXhLWZRauEGrrtMUCDzkK1wsjAf7RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZl2qrlzp59; Thu, 02 Jan 2025 18:28:31 +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 502ISVkH066681; Thu, 2 Jan 2025 18:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISVn5066678; Thu, 2 Jan 2025 18:28:31 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:31 GMT Message-Id: <202501021828.502ISVn5066678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: aa48c1ae0831 - main - etherswitch: Cleanup detach and delete of child devices during detach 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa48c1ae0831789c6aa34bf3a85b9a2289d425e2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa48c1ae0831789c6aa34bf3a85b9a2289d425e2 commit aa48c1ae0831789c6aa34bf3a85b9a2289d425e2 Author: John Baldwin AuthorDate: 2025-01-02 18:24:46 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:24:46 +0000 etherswitch: Cleanup detach and delete of child devices during detach Call bus_generic_detach first and return any error. Remove no longer needed individual device_delete_child calls. Differential Revision: https://reviews.freebsd.org/D47970 --- sys/dev/etherswitch/ar40xx/ar40xx_main.c | 9 +++++---- sys/dev/etherswitch/arswitch/arswitch.c | 9 +++++---- sys/dev/etherswitch/e6000sw/e6060sw.c | 9 +++++---- sys/dev/etherswitch/infineon/adm6996fc.c | 9 +++++---- sys/dev/etherswitch/ip17x/ip17x.c | 9 +++++---- sys/dev/etherswitch/micrel/ksz8995ma.c | 9 +++++---- sys/dev/etherswitch/mtkswitch/mtkswitch.c | 9 +++++---- sys/dev/etherswitch/rtl8366/rtl8366rb.c | 9 +++++---- sys/dev/etherswitch/ukswitch/ukswitch.c | 9 +++++---- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_main.c b/sys/dev/etherswitch/ar40xx/ar40xx_main.c index 41e6813bc840..d5636d26120b 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_main.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_main.c @@ -254,22 +254,23 @@ static int ar40xx_detach(device_t dev) { struct ar40xx_softc *sc = device_get_softc(dev); - int i; + int error, i; device_printf(sc->sc_dev, "%s: called\n", __func__); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + callout_drain(&sc->sc_phy_callout); /* Free PHYs */ for (i = 0; i < AR40XX_NUM_PHYS; i++) { - if (sc->sc_phys.miibus[i] != NULL) - device_delete_child(dev, sc->sc_phys.miibus[i]); if (sc->sc_phys.ifp[i] != NULL) if_free(sc->sc_phys.ifp[i]); free(sc->sc_phys.ifname[i], M_DEVBUF); } - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c index 92c3460e5f78..924793a0488f 100644 --- a/sys/dev/etherswitch/arswitch/arswitch.c +++ b/sys/dev/etherswitch/arswitch/arswitch.c @@ -666,13 +666,15 @@ static int arswitch_detach(device_t dev) { struct arswitch_softc *sc = device_get_softc(dev); - int i; + int error, i; callout_drain(&sc->callout_tick); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + for (i=0; i < sc->numphys; i++) { - if (sc->miibus[i] != NULL) - device_delete_child(dev, sc->miibus[i]); if (sc->ifp[i] != NULL) if_free(sc->ifp[i]); free(sc->ifname[i], M_DEVBUF); @@ -680,7 +682,6 @@ arswitch_detach(device_t dev) free(sc->atu.entries, M_DEVBUF); - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/e6000sw/e6060sw.c b/sys/dev/etherswitch/e6000sw/e6060sw.c index 374eb8c5316b..901f887ffdc6 100644 --- a/sys/dev/etherswitch/e6000sw/e6060sw.c +++ b/sys/dev/etherswitch/e6000sw/e6060sw.c @@ -321,18 +321,20 @@ static int e6060sw_detach(device_t dev) { struct e6060sw_softc *sc; - int i, port; + int error, i, port; sc = device_get_softc(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + callout_drain(&sc->callout_tick); for (i = 0; i < MII_NPHY; i++) { if (((1 << i) & sc->phymask) == 0) continue; port = e6060sw_portforphy(sc, i); - if (sc->miibus[port] != NULL) - device_delete_child(dev, (*sc->miibus[port])); if (sc->ifp[port] != NULL) if_free(sc->ifp[port]); free(sc->ifname[port], M_E6060SW); @@ -344,7 +346,6 @@ e6060sw_detach(device_t dev) free(sc->ifname, M_E6060SW); free(sc->ifp, M_E6060SW); - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c index 2a8ee58107ee..58a3f9625d4a 100644 --- a/sys/dev/etherswitch/infineon/adm6996fc.c +++ b/sys/dev/etherswitch/infineon/adm6996fc.c @@ -281,18 +281,20 @@ static int adm6996fc_detach(device_t dev) { struct adm6996fc_softc *sc; - int i, port; + int error, i, port; sc = device_get_softc(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + callout_drain(&sc->callout_tick); for (i = 0; i < MII_NPHY; i++) { if (((1 << i) & sc->phymask) == 0) continue; port = adm6996fc_portforphy(sc, i); - if (sc->miibus[port] != NULL) - device_delete_child(dev, (*sc->miibus[port])); if (sc->ifp[port] != NULL) if_free(sc->ifp[port]); free(sc->ifname[port], M_ADM6996FC); @@ -304,7 +306,6 @@ adm6996fc_detach(device_t dev) free(sc->ifname, M_ADM6996FC); free(sc->ifp, M_ADM6996FC); - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c index 1eee45148040..c90d46c49857 100644 --- a/sys/dev/etherswitch/ip17x/ip17x.c +++ b/sys/dev/etherswitch/ip17x/ip17x.c @@ -274,7 +274,11 @@ static int ip17x_detach(device_t dev) { struct ip17x_softc *sc; - int i, port; + int error, i, port; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); if (sc->miipoll) @@ -284,8 +288,6 @@ ip17x_detach(device_t dev) if (((1 << i) & sc->phymask) == 0) continue; port = sc->phyport[i]; - if (sc->miibus[port] != NULL) - device_delete_child(dev, (*sc->miibus[port])); if (sc->ifp[port] != NULL) if_free(sc->ifp[port]); free(sc->miibus[port], M_IP17X); @@ -299,7 +301,6 @@ ip17x_detach(device_t dev) /* Reset the switch. */ sc->hal.ip17x_reset(sc); - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c index a51bdb50fdfc..c2ac994fe882 100644 --- a/sys/dev/etherswitch/micrel/ksz8995ma.c +++ b/sys/dev/etherswitch/micrel/ksz8995ma.c @@ -339,7 +339,11 @@ static int ksz8995ma_detach(device_t dev) { struct ksz8995ma_softc *sc; - int i, port; + int error, i, port; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); @@ -349,8 +353,6 @@ ksz8995ma_detach(device_t dev) if (((1 << i) & sc->phymask) == 0) continue; port = ksz8995ma_portforphy(sc, i); - if (sc->miibus[port] != NULL) - device_delete_child(dev, (*sc->miibus[port])); if (sc->ifp[port] != NULL) if_free(sc->ifp[port]); free(sc->ifname[port], M_KSZ8995MA); @@ -362,7 +364,6 @@ ksz8995ma_detach(device_t dev) free(sc->ifname, M_KSZ8995MA); free(sc->ifp, M_KSZ8995MA); - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch.c b/sys/dev/etherswitch/mtkswitch/mtkswitch.c index 7c4e8ae6f934..89e092d02ac4 100644 --- a/sys/dev/etherswitch/mtkswitch/mtkswitch.c +++ b/sys/dev/etherswitch/mtkswitch/mtkswitch.c @@ -248,19 +248,20 @@ static int mtkswitch_detach(device_t dev) { struct mtkswitch_softc *sc = device_get_softc(dev); - int phy; + int error, phy; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); callout_drain(&sc->callout_tick); for (phy = 0; phy < MTKSWITCH_MAX_PHYS; phy++) { - if (sc->miibus[phy] != NULL) - device_delete_child(dev, sc->miibus[phy]); if (sc->ifp[phy] != NULL) if_free(sc->ifp[phy]); free(sc->ifname[phy], M_DEVBUF); } - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c index 304e7f7b8325..079244b2f745 100644 --- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c +++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c @@ -268,18 +268,19 @@ static int rtl8366rb_detach(device_t dev) { struct rtl8366rb_softc *sc; - int i; + int error, i; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); for (i=0; i < sc->numphys; i++) { - if (sc->miibus[i]) - device_delete_child(dev, sc->miibus[i]); if (sc->ifp[i] != NULL) if_free(sc->ifp[i]); free(sc->ifname[i], M_DEVBUF); } - bus_generic_detach(dev); callout_drain(&sc->callout_tick); mtx_destroy(&sc->callout_mtx); mtx_destroy(&sc->sc_mtx); diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c index ed1a27a19494..a2e30c3af8a1 100644 --- a/sys/dev/etherswitch/ukswitch/ukswitch.c +++ b/sys/dev/etherswitch/ukswitch/ukswitch.c @@ -224,7 +224,11 @@ static int ukswitch_detach(device_t dev) { struct ukswitch_softc *sc = device_get_softc(dev); - int i, port; + int error, i, port; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); callout_drain(&sc->callout_tick); @@ -232,8 +236,6 @@ ukswitch_detach(device_t dev) if (((1 << i) & sc->phymask) == 0) continue; port = ukswitch_portforphy(sc, i); - if (sc->miibus[port] != NULL) - device_delete_child(dev, (*sc->miibus[port])); if (sc->ifp[port] != NULL) if_free(sc->ifp[port]); free(sc->ifname[port], M_UKSWITCH); @@ -245,7 +247,6 @@ ukswitch_detach(device_t dev) free(sc->ifname, M_UKSWITCH); free(sc->ifp, M_UKSWITCH); - bus_generic_detach(dev); mtx_destroy(&sc->sc_mtx); return (0); From nobody Thu Jan 2 18:28:33 2025 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 4YPFZp3N8wz5jn6g; Thu, 02 Jan 2025 18:28:34 +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 4YPFZn5XPcz4vJm; Thu, 2 Jan 2025 18:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842513; 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=6k3Pa3M30a8VzLFi6kMkBudnak56vcRGunpU/M1Howw=; b=F5g78ylR6XvAKb0wdoW8fwmQszQJG9tDrK/a+uCQizQHqRDoLe7vTu7E4uw+jNNJUc49ia igw58o748EzQt+oQ1s7IjZQaomL96+fi7BA42O9H2Gxo7hcAqIrrUrDbu1NQmKqA934sa8 nid4G8h52ZUgOI8tJKziH11rYapM9u7bbzpPtM0WD2MhiqONgCSCg+qr3fj3X8ysJMFfwC mOgGh3+BmDtW5cD0OEKqwEQDJk+mRfKNdGtzyrZkgYYoep73fdsL02BK6R5xRV9+YtfSrq Cg/LI2d3Wj3GjPxwY/Wbtb44XMA6CcuAjYnDKzNICuX1ZI6yOkX/SbB5uH66PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842513; 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=6k3Pa3M30a8VzLFi6kMkBudnak56vcRGunpU/M1Howw=; b=WMkU/GQlDw+vYfuaWV0goy6plH06ILKuNccjodIaMYcHcpj1kCfg5TxUb9z8rc+fnUTJoK /9vbbkwAi68QIO+bcabbNc9sLxcKtWJ1dGpMr6lXu2i223mzkGL5pM1Hetwv65xqCNJP5V IOCaE8J2/5ZSh3uJsvu+hANdLGrWmXEuq8LCkueqTpgodSJyfkuTUEDM431g6r4niMxVg3 d9QAeR3zJNnKkpf6S386ebP6mUxKQ1Qj00vQqPcnPkogObJWhthlGthYB5lPR9bkccRVrx 1gZV7KIZvNZC3IB8N0oBrSzIGD/l726faMt3z31CX3fbeMfTbZHyOa5+KZ2qAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842513; a=rsa-sha256; cv=none; b=DBT5zzhtdHBzxCozUf9eoHyx0ofCprulAwGuP+pK/PKnImUBjC0F3xe6eqZFNqr7xbSOgg T79QkMR2ByfK9ee7s0jKXkhzksFiXwDQdRYK8GTmlrEL65dpgXuKZeDNB2S9A9cmTVItoT OutBTBbHcD+ZefhGS55TiySMQ/HgUUc7Mjr1EaS40WqV/P5Yx/G+nm6QSplKfhxlAA+zTC jROJ4n10a/ucQWyj/P5um0BygtCLVO2Sw4Fc1flfVB7uYcH/Lyee18U4fvH1oOvHDbepMQ FFtOZgqqjSrkNuT22iWynx/k7dMg/JP762miyIIPewI+ZAdbpC26ustR80lWEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZn55dnzpM1; Thu, 02 Jan 2025 18:28:33 +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 502ISXTw066798; Thu, 2 Jan 2025 18:28:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISXAl066795; Thu, 2 Jan 2025 18:28:33 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:33 GMT Message-Id: <202501021828.502ISXAl066795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 11a9117871e6 - main - Use bus_generic_detach to detach and delete child devices during detach 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11a9117871e6037ae7b8011b243939322efce569 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=11a9117871e6037ae7b8011b243939322efce569 commit 11a9117871e6037ae7b8011b243939322efce569 Author: John Baldwin AuthorDate: 2025-01-02 18:25:12 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:25:12 +0000 Use bus_generic_detach to detach and delete child devices during detach This is simpler and more robust than individual calls to device_delete_child. Differential Revision: https://reviews.freebsd.org/D47972 --- sys/arm/ti/twl/twl.c | 8 ++++---- sys/dev/aac/aac.c | 10 ++++------ sys/dev/aacraid/aacraid.c | 7 ++++--- sys/dev/alpm/alpm.c | 9 +++++---- sys/dev/amdpm/amdpm.c | 8 ++++---- sys/dev/amdsmb/amdsmb.c | 8 ++++---- sys/dev/cas/if_cas.c | 2 +- sys/dev/enetc/if_enetc.c | 3 +-- sys/dev/gem/if_gem.c | 2 +- sys/dev/mgb/if_mgb.c | 3 +-- sys/dev/mlx/mlx.c | 14 ++++---------- sys/dev/nfsmb/nfsmb.c | 21 ++++++++------------- sys/dev/puc/puc.c | 18 ++++++++---------- sys/dev/sound/pci/hda/hdac.c | 15 +++------------ sys/dev/usb/net/usb_ethernet.c | 8 +++----- sys/dev/virtio/mmio/virtio_mmio.c | 10 +++------- sys/dev/virtio/pci/virtio_pci.c | 12 ++++-------- sys/dev/xilinx/if_xae.c | 3 +-- 18 files changed, 63 insertions(+), 98 deletions(-) diff --git a/sys/arm/ti/twl/twl.c b/sys/arm/ti/twl/twl.c index 3a7a0ddcb0b1..ee54b0ea1f2c 100644 --- a/sys/arm/ti/twl/twl.c +++ b/sys/arm/ti/twl/twl.c @@ -425,13 +425,13 @@ static int twl_detach(device_t dev) { struct twl_softc *sc; + int error; sc = device_get_softc(dev); - if (sc->sc_vreg) - device_delete_child(dev, sc->sc_vreg); - if (sc->sc_clks) - device_delete_child(dev, sc->sc_clks); + error = bus_generic_detach(dev); + if (error != 0) + return (error); TWL_LOCK_DESTROY(sc); diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index 12f5eb50426b..912b3dc903e3 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -669,6 +669,10 @@ aac_detach(device_t dev) sc = device_get_softc(dev); fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + callout_drain(&sc->aac_daemontime); mtx_lock(&sc->aac_io_lock); @@ -683,9 +687,6 @@ aac_detach(device_t dev) /* Remove the child containers */ while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) { - error = device_delete_child(dev, co->co_disk); - if (error) - return (error); TAILQ_REMOVE(&sc->aac_container_tqh, co, co_link); free(co, M_AACBUF); } @@ -693,9 +694,6 @@ aac_detach(device_t dev) /* Remove the CAM SIMs */ while ((sim = TAILQ_FIRST(&sc->aac_sim_tqh)) != NULL) { TAILQ_REMOVE(&sc->aac_sim_tqh, sim, sim_link); - error = device_delete_child(dev, sim->sim_dev); - if (error) - return (error); free(sim, M_AACBUF); } diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c index 9e9b1c602b9d..90a073d10039 100644 --- a/sys/dev/aacraid/aacraid.c +++ b/sys/dev/aacraid/aacraid.c @@ -739,6 +739,10 @@ aacraid_detach(device_t dev) sc = device_get_softc(dev); fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + callout_drain(&sc->aac_daemontime); /* Remove the child containers */ while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) { @@ -749,9 +753,6 @@ aacraid_detach(device_t dev) /* Remove the CAM SIMs */ while ((sim = TAILQ_FIRST(&sc->aac_sim_tqh)) != NULL) { TAILQ_REMOVE(&sc->aac_sim_tqh, sim, sim_link); - error = device_delete_child(dev, sim->sim_dev); - if (error) - return (error); free(sim, M_AACRAIDBUF); } diff --git a/sys/dev/alpm/alpm.c b/sys/dev/alpm/alpm.c index 46dc85ebc485..d7c3d3657d3b 100644 --- a/sys/dev/alpm/alpm.c +++ b/sys/dev/alpm/alpm.c @@ -232,11 +232,12 @@ static int alpm_detach(device_t dev) { struct alpm_softc *alpm = device_get_softc(dev); + int error; + + error = bus_generic_detach(dev); + if (error != 0) + return (error); - if (alpm->smbus) { - device_delete_child(dev, alpm->smbus); - alpm->smbus = NULL; - } mtx_destroy(&alpm->lock); if (alpm->res) diff --git a/sys/dev/amdpm/amdpm.c b/sys/dev/amdpm/amdpm.c index 22b252f572b0..d744c0aa5d4b 100644 --- a/sys/dev/amdpm/amdpm.c +++ b/sys/dev/amdpm/amdpm.c @@ -229,11 +229,11 @@ static int amdpm_detach(device_t dev) { struct amdpm_softc *amdpm_sc = device_get_softc(dev); + int error; - if (amdpm_sc->smbus) { - device_delete_child(dev, amdpm_sc->smbus); - amdpm_sc->smbus = NULL; - } + error = bus_generic_detach(dev); + if (error != 0) + return (error); mtx_destroy(&amdpm_sc->lock); if (amdpm_sc->res) diff --git a/sys/dev/amdsmb/amdsmb.c b/sys/dev/amdsmb/amdsmb.c index 00e2f979b6cc..3d2e7a5e0c19 100644 --- a/sys/dev/amdsmb/amdsmb.c +++ b/sys/dev/amdsmb/amdsmb.c @@ -174,11 +174,11 @@ static int amdsmb_detach(device_t dev) { struct amdsmb_softc *amdsmb_sc = device_get_softc(dev); + int error; - if (amdsmb_sc->smbus) { - device_delete_child(dev, amdsmb_sc->smbus); - amdsmb_sc->smbus = NULL; - } + error = bus_generic_detach(dev); + if (error != 0) + return (error); mtx_destroy(&amdsmb_sc->lock); if (amdsmb_sc->res) diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c index 1f684097bd3a..fed2c3a3a051 100644 --- a/sys/dev/cas/if_cas.c +++ b/sys/dev/cas/if_cas.c @@ -477,7 +477,7 @@ cas_detach(struct cas_softc *sc) taskqueue_drain(sc->sc_tq, &sc->sc_tx_task); if_free(ifp); taskqueue_free(sc->sc_tq); - device_delete_child(sc->sc_dev, sc->sc_miibus); + bus_generic_detach(sc->sc_dev); for (i = 0; i < CAS_NRXDESC; i++) if (sc->sc_rxdsoft[i].rxds_dmamap != NULL) diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c index 3c0bc4723b05..3a5d6ec23282 100644 --- a/sys/dev/enetc/if_enetc.c +++ b/sys/dev/enetc/if_enetc.c @@ -459,8 +459,7 @@ enetc_detach(if_ctx_t ctx) for (i = 0; i < sc->rx_num_queues; i++) iflib_irq_free(ctx, &sc->rx_queues[i].irq); - if (sc->miibus != NULL) - device_delete_child(sc->dev, sc->miibus); + bus_generic_detach(sc->dev); if (sc->regs != NULL) error = bus_release_resource(sc->dev, SYS_RES_MEMORY, diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c index 434c5309d019..74504a950d31 100644 --- a/sys/dev/gem/if_gem.c +++ b/sys/dev/gem/if_gem.c @@ -413,7 +413,7 @@ gem_detach(struct gem_softc *sc) callout_drain(&sc->sc_rx_ch); #endif if_free(ifp); - device_delete_child(sc->sc_dev, sc->sc_miibus); + bus_generic_detach(sc->sc_dev); for (i = 0; i < GEM_NRXDESC; i++) if (sc->sc_rxsoft[i].rxs_dmamap != NULL) diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index 05c4c242f739..1240d0f84415 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -482,8 +482,7 @@ mgb_detach(if_ctx_t ctx) iflib_irq_free(ctx, &sc->rx_irq); iflib_irq_free(ctx, &sc->admin_irq); - if (sc->miibus != NULL) - device_delete_child(sc->dev, sc->miibus); + bus_generic_detach(sc->dev); if (sc->pba != NULL) error = bus_release_resource(sc->dev, SYS_RES_MEMORY, diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index d9a2a1f5442b..f0c7591803e0 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -642,7 +642,7 @@ mlx_shutdown(device_t dev) static int mlx_shutdown_locked(struct mlx_softc *sc) { - int i, error; + int error; debug_called(1); @@ -660,17 +660,11 @@ mlx_shutdown_locked(struct mlx_softc *sc) printf("done\n"); } MLX_IO_UNLOCK(sc); - + /* delete all our child devices */ - for (i = 0; i < MLX_MAXDRIVES; i++) { - if (sc->mlx_sysdrive[i].ms_disk != 0) { - if ((error = device_delete_child(sc->mlx_dev, sc->mlx_sysdrive[i].ms_disk)) != 0) - return (error); - sc->mlx_sysdrive[i].ms_disk = 0; - } - } + error = bus_generic_detach(sc->mlx_dev); - return (0); + return (error); } /******************************************************************************** diff --git a/sys/dev/nfsmb/nfsmb.c b/sys/dev/nfsmb/nfsmb.c index 462f90264885..b88b2ca0001f 100644 --- a/sys/dev/nfsmb/nfsmb.c +++ b/sys/dev/nfsmb/nfsmb.c @@ -275,13 +275,13 @@ nfsmbsub_detach(device_t dev) { device_t parent; struct nfsmb_softc *nfsmbsub_sc = device_get_softc(dev); + int error; parent = device_get_parent(dev); - if (nfsmbsub_sc->smbus) { - device_delete_child(dev, nfsmbsub_sc->smbus); - nfsmbsub_sc->smbus = NULL; - } + error = bus_generic_detach(dev); + if (error != 0) + return (error); mtx_destroy(&nfsmbsub_sc->lock); if (nfsmbsub_sc->res) { bus_release_resource(parent, SYS_RES_IOPORT, nfsmbsub_sc->rid, @@ -295,16 +295,11 @@ static int nfsmb_detach(device_t dev) { struct nfsmb_softc *nfsmb_sc = device_get_softc(dev); + int error; - if (nfsmb_sc->subdev) { - device_delete_child(dev, nfsmb_sc->subdev); - nfsmb_sc->subdev = NULL; - } - - if (nfsmb_sc->smbus) { - device_delete_child(dev, nfsmb_sc->smbus); - nfsmb_sc->smbus = NULL; - } + error = bus_generic_detach(dev); + if (error != 0) + return (error); mtx_destroy(&nfsmb_sc->lock); if (nfsmb_sc->res) { diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index 01193acf85b4..e10d0374c7de 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -409,21 +409,19 @@ puc_bfe_detach(device_t dev) sc = device_get_softc(dev); /* Detach our children. */ - error = 0; + error = bus_generic_detach(dev); + if (error != 0) + return (error); + for (idx = 0; idx < sc->sc_nports; idx++) { port = &sc->sc_port[idx]; if (port->p_dev == NULL) continue; - if (device_delete_child(dev, port->p_dev) == 0) { - if (port->p_rres != NULL) - rman_release_resource(port->p_rres); - if (port->p_ires != NULL) - rman_release_resource(port->p_ires); - } else - error = ENXIO; + if (port->p_rres != NULL) + rman_release_resource(port->p_rres); + if (port->p_ires != NULL) + rman_release_resource(port->p_ires); } - if (error) - return (error); if (sc->sc_serdevs != 0UL) bus_teardown_intr(dev, sc->sc_ires, sc->sc_icookie); diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index c9b11de01d18..4f9f70d98cb6 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -1740,20 +1740,11 @@ static int hdac_detach(device_t dev) { struct hdac_softc *sc = device_get_softc(dev); - device_t *devlist; - int cad, i, devcount, error; + int i, error; - if ((error = device_get_children(dev, &devlist, &devcount)) != 0) + error = bus_generic_detach(dev); + if (error != 0) return (error); - for (i = 0; i < devcount; i++) { - cad = (intptr_t)device_get_ivars(devlist[i]); - if ((error = device_delete_child(dev, devlist[i])) != 0) { - free(devlist, M_TEMP); - return (error); - } - sc->codecs[cad].dev = NULL; - } - free(devlist, M_TEMP); hdac_lock(sc); hdac_reset(sc, false); diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 2f423f557569..977805cefe66 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -315,11 +315,9 @@ uether_ifdetach(struct usb_ether *ue) ether_ifdetach(ifp); /* detach miibus */ - if (ue->ue_miibus != NULL) { - bus_topo_lock(); - device_delete_child(ue->ue_dev, ue->ue_miibus); - bus_topo_unlock(); - } + bus_topo_lock(); + bus_generic_detach(ue->ue_dev); + bus_topo_unlock(); /* free interface instance */ if_free(ifp); diff --git a/sys/dev/virtio/mmio/virtio_mmio.c b/sys/dev/virtio/mmio/virtio_mmio.c index b1a4230f7b46..175b33b42ed8 100644 --- a/sys/dev/virtio/mmio/virtio_mmio.c +++ b/sys/dev/virtio/mmio/virtio_mmio.c @@ -292,17 +292,13 @@ static int vtmmio_detach(device_t dev) { struct vtmmio_softc *sc; - device_t child; int error; sc = device_get_softc(dev); - if ((child = sc->vtmmio_child_dev) != NULL) { - error = device_delete_child(dev, child); - if (error) - return (error); - sc->vtmmio_child_dev = NULL; - } + error = bus_generic_detach(dev); + if (error) + return (error); vtmmio_reset(sc); diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c index fc26d62543c1..b7b34b448f6e 100644 --- a/sys/dev/virtio/pci/virtio_pci.c +++ b/sys/dev/virtio/pci/virtio_pci.c @@ -182,18 +182,14 @@ vtpci_add_child(struct vtpci_common *cn) int vtpci_delete_child(struct vtpci_common *cn) { - device_t dev, child; + device_t dev; int error; dev = cn->vtpci_dev; - child = cn->vtpci_child_dev; - if (child != NULL) { - error = device_delete_child(dev, child); - if (error) - return (error); - cn->vtpci_child_dev = NULL; - } + error = bus_generic_detach(dev); + if (error) + return (error); return (0); } diff --git a/sys/dev/xilinx/if_xae.c b/sys/dev/xilinx/if_xae.c index 26f1bf805ffa..080b13606525 100644 --- a/sys/dev/xilinx/if_xae.c +++ b/sys/dev/xilinx/if_xae.c @@ -1052,8 +1052,7 @@ xae_detach(device_t dev) ether_ifdetach(ifp); } - if (sc->miibus != NULL) - device_delete_child(dev, sc->miibus); + bus_generic_detach(dev); if (ifp != NULL) if_free(ifp); From nobody Thu Jan 2 18:28:32 2025 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 4YPFZn1cjmz5jnV3; Thu, 02 Jan 2025 18:28:33 +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 4YPFZm4NQSz4vJb; Thu, 2 Jan 2025 18:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842512; 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=VJwGfHULeGa/5AIp/oZLEf03aHI+aJnCMsjJ69cZwq8=; b=GUBMhkE7k07tHdfCCUyo3DwilI8D+O/iheDc8eaiT0UNbHpdV2xA7CxIoSElGvkHvgrUpn RCUX95rycW1ZJGtc/Hct+JZJECrNcfqeEKItBItq0ICOmy+IF/H/hx6XXNTNnS15mbovq/ u6C8QCXSgdDEnvO1LsPDFv66tuF5itOhazE4Oj3lksKtJqneioCBH061t2IFLaPqcYMuvv 2mfnpVzwJBTlrkw0r/3I3IymHDZ0VAZgdtef9zGP8C/8MdZc7I+LIRQn54ihndg+KEZ9xN Aly905lTfki1s4cp+7UQvZIQbt1CLb9+nXRKx3GzcH+k6WB+rZQHF1DNyTyghw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842512; 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=VJwGfHULeGa/5AIp/oZLEf03aHI+aJnCMsjJ69cZwq8=; b=OtbTrzra0mUnUvKrbJwuQ5xvbIp5nHOKr08+5g5HRmDLchNPZaklul0cmfyABaBwIv3h3R Rv6Lnaxf/HtmgGxLM47ZimkIFatOJIjzIB/iTl2V9Z28kHS9kWjFi0b6p98UbyGOH4Q/2i AbOpMcSNdiufyOdZxTHh0hu+l2BUC9sXTwh34JSjIzagqYGALnuNCeK84YuZKXQvkg2MAP ZSsFNJ8JEbX+YuJiSHxe47rfKsSiP3QbO9eqTt1LY+yaAbZ5ING80cfMzFwbXUu/PT44xl UxoABhwN0eOK4Hu42ZnInhRyZx1nqw6YdHnjxVAr1UfP+CNVE0ynVAz6scMpnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842512; a=rsa-sha256; cv=none; b=YJ7cDnJ1ubsv2Kr7ONwKqJ/xvxR3ZC6WY4Nb2jWSohfyRHSMNus7Q6KZyKADVbYQTI18W6 ewTdqbkyXizblkojWWAhQXPxlvnPEgnTkuOdyx+nlM0kdHK727fhnd+nshywxUaJwVTpob QZYFMd28iYmu1NdDI05YO6kQRg2WKen2c7s3ip4+jOa0zLvx13WVj/nEfB5dhe3TaI8kzw lH1RR4Cr8lmyllgRuSeXTypUeQXnvI6+f0DAlG3Mtf7sRxK42Zz7aihsaBQtUmi3/zfSic Q4rw7YrH42H4cDAuPOwCXuka0Ny9uZ+0/iwLnNTMdV0ScWstcvnI5lBoRpPoLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZm3dSyzpPT; Thu, 02 Jan 2025 18:28:32 +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 502ISWv0066733; Thu, 2 Jan 2025 18:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISWB3066730; Thu, 2 Jan 2025 18:28:32 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:32 GMT Message-Id: <202501021828.502ISWB3066730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0ac15e476d87 - main - spibus: Use bus_generic_* directly instead of wrappers 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ac15e476d8732bd749768e3fb80e0075f5ad4c0 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ac15e476d8732bd749768e3fb80e0075f5ad4c0 commit 0ac15e476d8732bd749768e3fb80e0075f5ad4c0 Author: John Baldwin AuthorDate: 2025-01-02 18:25:01 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:25:01 +0000 spibus: Use bus_generic_* directly instead of wrappers Differential Revision: https://reviews.freebsd.org/D47971 --- sys/dev/spibus/acpi_spibus.c | 2 +- sys/dev/spibus/spibus.c | 29 +++-------------------------- sys/dev/spibus/spibusvar.h | 1 - 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/sys/dev/spibus/acpi_spibus.c b/sys/dev/spibus/acpi_spibus.c index 9bce45b93dba..749113d81220 100644 --- a/sys/dev/spibus/acpi_spibus.c +++ b/sys/dev/spibus/acpi_spibus.c @@ -394,7 +394,7 @@ acpi_spibus_detach(device_t dev) { acpi_spibus_set_power_children(dev, ACPI_STATE_D3, false); - return (spibus_detach(dev)); + return (bus_generic_detach(dev)); } static int diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index f082b9ec171a..a2e2d884851b 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -61,29 +61,6 @@ spibus_attach(device_t dev) return (0); } -/* - * Since this is not a self-enumerating bus, and since we always add - * children in attach, we have to always delete children here. - */ -int -spibus_detach(device_t dev) -{ - return (bus_generic_detach(dev)); -} - -static int -spibus_suspend(device_t dev) -{ - return (bus_generic_suspend(dev)); -} - -static -int -spibus_resume(device_t dev) -{ - return (bus_generic_resume(dev)); -} - static int spibus_print_child(device_t dev, device_t child) { @@ -257,10 +234,10 @@ static device_method_t spibus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, spibus_probe), DEVMETHOD(device_attach, spibus_attach), - DEVMETHOD(device_detach, spibus_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, spibus_suspend), - DEVMETHOD(device_resume, spibus_resume), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h index 6a74f9b1053d..25cd380173ad 100644 --- a/sys/dev/spibus/spibusvar.h +++ b/sys/dev/spibus/spibusvar.h @@ -77,7 +77,6 @@ extern driver_t spibus_driver; extern driver_t ofw_spibus_driver; int spibus_attach(device_t); -int spibus_detach(device_t); device_t spibus_add_child_common(device_t, u_int, const char *, int, size_t); void spibus_child_deleted(device_t, device_t); void spibus_probe_nomatch(device_t, device_t); From nobody Thu Jan 2 18:28:34 2025 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 4YPFZq3bggz5jn6m; Thu, 02 Jan 2025 18:28:35 +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 4YPFZp6j7Gz4vK2; Thu, 2 Jan 2025 18:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842514; 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=0sGUVMHUdswn03xpMAw0fFFnruwNpE9GzbPfSvrj6xw=; b=E6c0cxx+DybhXwK8D488MDYQ0aaSB8KjUTJcjH2qpUzC2C3hEHKbqBhnmC9G93aptzO4cr 1vJmOFqowfAHaHj1X5CzcDo+ADx3uy/vMnv/bVlivic3IB2xdSbZQCZYzOHlhSVRk1NvRn nHRQ5Mv2w7TW7TjTcC1q/4g0t5WfOQP89kyhULHzkxxPzJ9S71qbI+UsY8kaZ/4jtNf985 k6EKQxDeWCLLb6SsKOECxIQSgzeHhvQCnlDCalHpiwCzrWXFLmsDpcBJlf7+GpN3CCH5rP f2vTG6ZwwddO708kf1VFy2BLe9YEbmIWiK5t7u1f+rtZlVAnabdqFGZ9cBYmmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842514; 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=0sGUVMHUdswn03xpMAw0fFFnruwNpE9GzbPfSvrj6xw=; b=ZFQXYx918IQLQnGTI1jAWfE8mj2hRU9QrmiXnu17ELa6rEyFxPArq9GrfUAGCsR+mkcnHl TsjKIKWUSF3HF9yHwG8qcBEqgulUymRQ90IdX3fHI1mLcHP+Py/DIu6vkNII4pR4iQRKDP Ej3bHILemNzcoSDIk/bpcap2LfxGh8lp7Nb+pC+1p71MydRCOcx8L5TwNZO7wGkAI2aSWx 0B4ZkqeXgEP615njJHovaRubONlAyOLndAiklJOWpy7Xs6zvmOmL9uTF4mrjPUObrk31y6 zbm7+Q9EB2ZHJz0t8mOgjyPEeAABvYIzd7Oi73pSUt7N5zsugWB5wYPVr16BBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842514; a=rsa-sha256; cv=none; b=usvB5rvvzWUog/q9Is4DnN8UWWZXL0x6zIb97tf9pomsR966NDxZpVVxTahfFOs1IPBZIy pdOIqk6aNEZt6+BxgrtjwjhZ3HTb4s5OqLzJ9eif5CjyBq65HdkznVTZclP2G6/3zKAv+4 hS+p3HJXEMxGP08ip23SnG0x8gyggn2+qIQy/8uw3YdDYytC32NzvHToPr5sw492x+b4Uw aMbmcdxPmEYKcP9kCC1V8gygv8dtMZPA/+HBS4AF7dxREvVCfEXPG4QPZw9UbKZxJ8wp9l SdNUYgDlyrhhzRBBAyWE6Jo81njVONIZis1kWWyUkThvXjQYW+2Nd1b4WrNrpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZp5xKvzpS1; Thu, 02 Jan 2025 18:28:34 +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 502ISYwD066854; Thu, 2 Jan 2025 18:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISYt8066851; Thu, 2 Jan 2025 18:28:34 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:34 GMT Message-Id: <202501021828.502ISYt8066851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d174ffca3a79 - main - mfi: Use bus_generic_detach to simplify deleting children during detach 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d174ffca3a79171069cb041f81c2680a6e4809ed Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d174ffca3a79171069cb041f81c2680a6e4809ed commit d174ffca3a79171069cb041f81c2680a6e4809ed Author: John Baldwin AuthorDate: 2025-01-02 18:25:27 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:25:27 +0000 mfi: Use bus_generic_detach to simplify deleting children during detach Differential Revision: https://reviews.freebsd.org/D47973 --- sys/dev/mfi/mfi_pci.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 82082e6b72cf..65e8e30bf994 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -279,8 +279,7 @@ static int mfi_pci_detach(device_t dev) { struct mfi_softc *sc; - int error, devcount, i; - device_t *devlist; + int error; sc = device_get_softc(dev); @@ -294,13 +293,11 @@ mfi_pci_detach(device_t dev) sc->mfi_detaching = 1; mtx_unlock(&sc->mfi_io_lock); - if ((error = device_get_children(sc->mfi_dev, &devlist, &devcount)) != 0) { + error = bus_generic_detach(sc->mfi_dev); + if (error != 0) { sx_xunlock(&sc->mfi_config_lock); return error; } - for (i = 0; i < devcount; i++) - device_delete_child(sc->mfi_dev, devlist[i]); - free(devlist, M_TEMP); sx_xunlock(&sc->mfi_config_lock); EVENTHANDLER_DEREGISTER(shutdown_final, sc->mfi_eh); From nobody Thu Jan 2 18:28:35 2025 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 4YPFZr3Hf2z5jnfw; Thu, 02 Jan 2025 18:28:36 +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 4YPFZr0Fkzz4v5k; Thu, 2 Jan 2025 18:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842516; 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=6sje0G8x4xcn4IcRT+YJtH426m/uquWeB4iHCBq8FAE=; b=JRahxvvjTo1rrcNZkGpr0WXCX8LGRa4B0BKG36QUnLvSvxk4DDgC9MbWGzEaRTFU3k8WAC NX01Kux5UttPXGOWV845WOI/DmHii5ub2r6z12Rm15RVw6roS7LuY1TmuOBXhDnvAbz8ZF +uVwEtrAEXB4aUFmWu4Hx5hPkNw+8gFpbB/rWLBkKyEpl4qUUNJdSZ749a7yEfN/M3zRxB EAZt12C67VKTIkcispLN2HG3NxoqfgnLjnmLQ//vhROhyKItypO3Ny+gOGjMV+6jDb3oFp 89ZoGr2GyjDY7iyvuqm9iDN+2ByXf9W/EIHNkGH2xi6SxRVl6YWYXLKB0Ft83w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842516; 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=6sje0G8x4xcn4IcRT+YJtH426m/uquWeB4iHCBq8FAE=; b=RY7vx3o2b+/ZOrtH+E9y0eK05EKjl+bzNrBeyNqWQhfoJMZ7phJ2wZKdU4xtTsZHpKVJ3a f6TzyBklEiQXYUqMS/3Mj/TIZauHczCD0wmds7nMXlHPenzqwt4v1hZVz8sIf8v6Ssdw2k MxHnwl03zImPMqKCWds45P1NRwoQIMnlyb0KgqvO0VFa+NBKt2pET73fL/NeUfFcbWbyMX tgLttSLplOIG+JvHOUIg4UZE/pIHGDd29Kk3WvDYAFiwcg5xPkGzsynu5hOcKB89nJzjp1 oL0xKKlCcaWWOyv2gQo49b8Pd7ev1PmAyNqTUgbMgtTayJpppSWFLCXfdFNTdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842516; a=rsa-sha256; cv=none; b=xcnpyvD0cymCdftKvwwE/erZWowh2RTKjZCYIh++F2Xh+EnhlEvzgJmzjmuHuorZz4sN+6 RRVU6ym0OnCtWQ/S52Qlll3vpS+EjjbPXPZWV1TIdT5TDokiBojrDRkXlpU4rhG1V2IIkC qZLVqH9pDSfJ99psQ3QgNuQaqPmqb77aRosusxWF6RuQxwpCzzfrGLqGvhL0BTQQtUowry 0lKBAlEmUjjbTotUGn3DVkvaCZUajqD1JRqV2UL+CGLwsKPbShKYtqUNcnU3VMXNObodxb C0yEpu//y0S340QpPfaKm+MQCF52+BquHvT3fpvdKdlgaSK8lAsWb07JeaJhxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZq6yxpzp5B; Thu, 02 Jan 2025 18:28:35 +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 502ISZfD066906; Thu, 2 Jan 2025 18:28:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISZNJ066903; Thu, 2 Jan 2025 18:28:35 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:35 GMT Message-Id: <202501021828.502ISZNJ066903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 925e1016b163 - main - puc: Use device_delete_children if attach fails 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 925e1016b163701268a4298d1eca4b2484a81526 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=925e1016b163701268a4298d1eca4b2484a81526 commit 925e1016b163701268a4298d1eca4b2484a81526 Author: John Baldwin AuthorDate: 2025-01-02 18:25:38 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:25:38 +0000 puc: Use device_delete_children if attach fails This is slightly simpler than deleting individual devices. Differential Revision: https://reviews.freebsd.org/D47974 --- sys/dev/puc/puc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index e10d0374c7de..d55fdf63e70b 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -373,10 +373,9 @@ puc_bfe_attach(device_t dev) return (0); fail: + device_delete_children(dev); for (idx = 0; idx < sc->sc_nports; idx++) { port = &sc->sc_port[idx]; - if (port->p_dev != NULL) - device_delete_child(dev, port->p_dev); if (port->p_rres != NULL) rman_release_resource(port->p_rres); if (port->p_ires != NULL) From nobody Fri Jan 3 01:24:29 2025 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 4YPQpj2q0zz5kDB4; Fri, 03 Jan 2025 01:24:29 +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 4YPQpj23bgz4P7y; Fri, 3 Jan 2025 01:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735867469; 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=0KhZ1ul5qpl+UJ8iljTSKYzGh0NyN+o1HadmKSp7B2I=; b=UIj2bT4TNrpCFl9lKrmsRdb5bWp5UNZP/v5VodORz6bTIHqn5LISb/svSk7TOf8DAaGIKF vIe58fSx1T2AwgzTC4bc5XOf4p7fMSLeui19k84vyhl/f6R4oPX+PXLwlX+SbjIif8auSt jGlvz+4pzfM7LyzOJThDmJQhxJGUp4Q8RaXtH5FpR635wPzU8FWs65VEk/793h1J6mMqPM mC+IVc/k8iJ//F8lsEUNHQG3gea71fNmhUviFOC4fo1WCAicxuduPJ05+l7vTFbpPe6IHt R6t5o9VsmVRrdkNoyJ/U9MX75y8DsXBZJdslN2PpuDz8I8OeBnVNzqbw1XJPfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735867469; 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=0KhZ1ul5qpl+UJ8iljTSKYzGh0NyN+o1HadmKSp7B2I=; b=BTy9llzlHjswOIr6xEet0vrAcbFSqEKBig404xCSW93Z159KAL4TMB3bZheFleVL3+3gDV wo7OOgOBbNNIVeDeFmJmbJJZpE9e+uoRwEH4kVijeRyNisM6CXIVWhovbUoAySA8EB9lNU T+fHIy5PrziGVevGTF37Sh2whbMU0FRUWMPb06Uka3cauA4lzMFIjX2nRUASxY8Je4+B9e 0XnyYeyOBJLmTNmL/zhD1JD2IXsOKJfl/KfUNIHAmt6/rh7n1kuU7L5P+5z3gtr20LNdbt fHV7Epmb1KdavrFL5LpEibqSwUOI3YHTbkIB2cF16NIdN17zOUViuisQRmgkIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735867469; a=rsa-sha256; cv=none; b=JPLnnGFr/vUJ62KwDQ4/RbBryy5CbmuyUDHbUc579VY4n+ssyd05jZFi4E5gNfFOEAHihb W90EgQkdkPE6hyM8+0heNjhGNjJwqH1A6ZxydnyB0HKv7zmcdsizxQg77myv2EE/kRz3KJ oTIYGvRhLT99IB9LBswP36lQgA2JUAALhcApUsDfPSqshSRWlnvWmTE0vbfgA/L1em2MgO Rnd30k7ylyICwSA64XoZQr0vVmGym+BxEecb55KTK575/2CEZZEw3Iak/G4iHlaGGMEy20 4pkT4kZKoKq5tTYTplExBb7uvljHr5XcHPFWe46dQczFyjF1oAX+qOjCQ6Vs+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPQpj1g35z11X6; Fri, 03 Jan 2025 01:24:29 +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 5031OTEb053227; Fri, 3 Jan 2025 01:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031OT9h053224; Fri, 3 Jan 2025 01:24:29 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:24:29 GMT Message-Id: <202501030124.5031OT9h053224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 64ecfc27dbd4 - main - rtwn: add forcerate flag to TX descriptor setup 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64ecfc27dbd486ed764f9696b6e56f88e34ee8a1 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=64ecfc27dbd486ed764f9696b6e56f88e34ee8a1 commit 64ecfc27dbd486ed764f9696b6e56f88e34ee8a1 Author: Adrian Chadd AuthorDate: 2024-12-16 01:28:30 +0000 Commit: Adrian Chadd CommitDate: 2025-01-03 01:24:01 +0000 rtwn: add forcerate flag to TX descriptor setup When doing firmware rate control there will be situations where the rate being passed in needs to actually override the rate control selection. So add a flag to the descriptor setup path to indicate that indeed this particular rate should be forced, rather than rely on the firmware rate control. This is currently a no-op as firmware rate control isn't working in-tree, but it is working for me locally with other changes. Without this, there's no way to force low rates for management, DHCP traffic, and to allow fixed rate via "ifconfig wlanX ucastrate Y" to function. Locally tested: * RTL8192CU, STA mode (firmware and driver/net80211 rate control) Differential Revision: https://reviews.freebsd.org/D48100 Reviewed by: bz, gavin --- sys/dev/rtwn/if_rtwn_tx.c | 14 +++++++++----- sys/dev/rtwn/if_rtwnvar.h | 6 +++--- sys/dev/rtwn/rtl8192c/r92c.h | 2 +- sys/dev/rtwn/rtl8192c/r92c_tx.c | 2 +- sys/dev/rtwn/rtl8812a/r12a.h | 2 +- sys/dev/rtwn/rtl8812a/r12a_tx.c | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn_tx.c b/sys/dev/rtwn/if_rtwn_tx.c index bf45d14f7edc..c59d1de1dea8 100644 --- a/sys/dev/rtwn/if_rtwn_tx.c +++ b/sys/dev/rtwn/if_rtwn_tx.c @@ -117,6 +117,7 @@ rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, struct rtwn_tx_desc_common *txd; struct rtwn_tx_buf buf; uint8_t rate, ridx, type; + bool force_rate = false; u_int cipher; int ismcast; @@ -129,13 +130,16 @@ rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, /* Choose a TX rate index. */ if (type == IEEE80211_FC0_TYPE_MGT || type == IEEE80211_FC0_TYPE_CTL || - (m->m_flags & M_EAPOL) != 0) + (m->m_flags & M_EAPOL) != 0) { rate = tp->mgmtrate; - else if (ismcast) + force_rate = true; + } else if (ismcast) { + force_rate = true; rate = tp->mcastrate; - else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) + } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { + force_rate = true; rate = tp->ucastrate; - else { + } else { if (sc->sc_ratectl == RTWN_RATECTL_NET80211) { /* XXX pass pktlen */ (void) ieee80211_ratectl_rate(ni, NULL, 0); @@ -172,7 +176,7 @@ rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, memset(txd, 0, sc->txdesc_len); txd->txdw1 = htole32(SM(RTWN_TXDW1_CIPHER, rtwn_get_cipher(cipher))); - rtwn_fill_tx_desc(sc, ni, m, txd, ridx, tp->maxretry); + rtwn_fill_tx_desc(sc, ni, m, txd, ridx, force_rate, tp->maxretry); if (ieee80211_radiotap_active_vap(vap)) { struct rtwn_tx_radiotap_header *tap = &sc->sc_txtap; diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h index 3913526f8c3c..fa4b6d0a5df7 100644 --- a/sys/dev/rtwn/if_rtwnvar.h +++ b/sys/dev/rtwn/if_rtwnvar.h @@ -319,7 +319,7 @@ struct rtwn_softc { void (*sc_detach_private)(struct rtwn_softc *); void (*sc_fill_tx_desc)(struct rtwn_softc *, struct ieee80211_node *, struct mbuf *, - void *, uint8_t, int); + void *, uint8_t, bool, int); void (*sc_fill_tx_desc_raw)(struct rtwn_softc *, struct ieee80211_node *, struct mbuf *, void *, const struct ieee80211_bpf_params *); @@ -527,9 +527,9 @@ void rtwn_suspend(struct rtwn_softc *); #define rtwn_detach_private(_sc) \ (((_sc)->sc_detach_private)((_sc))) #define rtwn_fill_tx_desc(_sc, _ni, _m, \ - _buf, _ridx, _maxretry) \ + _buf, _ridx, _force, _maxretry) \ (((_sc)->sc_fill_tx_desc)((_sc), (_ni), \ - (_m), (_buf), (_ridx), (_maxretry))) + (_m), (_buf), (_ridx), (_force), (_maxretry))) #define rtwn_fill_tx_desc_raw(_sc, _ni, _m, \ _buf, _params) \ (((_sc)->sc_fill_tx_desc_raw)((_sc), (_ni), \ diff --git a/sys/dev/rtwn/rtl8192c/r92c.h b/sys/dev/rtwn/rtl8192c/r92c.h index a7091be66f64..cab7393caf39 100644 --- a/sys/dev/rtwn/rtl8192c/r92c.h +++ b/sys/dev/rtwn/rtl8192c/r92c.h @@ -117,7 +117,7 @@ void r92c_tx_enable_ampdu(void *, int); void r92c_tx_setup_hwseq(void *); void r92c_tx_setup_macid(void *, int); void r92c_fill_tx_desc(struct rtwn_softc *, struct ieee80211_node *, - struct mbuf *, void *, uint8_t, int); + struct mbuf *, void *, uint8_t, bool, int); void r92c_fill_tx_desc_raw(struct rtwn_softc *, struct ieee80211_node *, struct mbuf *, void *, const struct ieee80211_bpf_params *); void r92c_fill_tx_desc_null(struct rtwn_softc *, void *, int, int, int); diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c index 07a6a184e924..d5cbc3ad9db9 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_tx.c +++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c @@ -259,7 +259,7 @@ r92c_check_enable_ccx_report(struct rtwn_softc *sc, int macid) void r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, - struct mbuf *m, void *buf, uint8_t ridx, int maxretry) + struct mbuf *m, void *buf, uint8_t ridx, bool force_rate, int maxretry) { #ifndef RTWN_WITHOUT_UCODE struct r92c_softc *rs = sc->sc_priv; diff --git a/sys/dev/rtwn/rtl8812a/r12a.h b/sys/dev/rtwn/rtl8812a/r12a.h index 8bf1464b9525..e5c5c7cd6a80 100644 --- a/sys/dev/rtwn/rtl8812a/r12a.h +++ b/sys/dev/rtwn/rtl8812a/r12a.h @@ -131,7 +131,7 @@ void r12a_get_rx_stats(struct rtwn_softc *, struct ieee80211_rx_stats *, /* r12a_tx.c */ void r12a_fill_tx_desc(struct rtwn_softc *, struct ieee80211_node *, - struct mbuf *, void *, uint8_t, int); + struct mbuf *, void *, uint8_t, bool, int); void r12a_fill_tx_desc_raw(struct rtwn_softc *, struct ieee80211_node *, struct mbuf *, void *, const struct ieee80211_bpf_params *); void r12a_fill_tx_desc_null(struct rtwn_softc *, void *, int, int, int); diff --git a/sys/dev/rtwn/rtl8812a/r12a_tx.c b/sys/dev/rtwn/rtl8812a/r12a_tx.c index 822416a09618..cc686668e4a2 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_tx.c +++ b/sys/dev/rtwn/rtl8812a/r12a_tx.c @@ -261,7 +261,7 @@ r12a_calculate_tx_agg_window(struct rtwn_softc *sc, void r12a_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, - struct mbuf *m, void *buf, uint8_t ridx, int maxretry) + struct mbuf *m, void *buf, uint8_t ridx, bool force_rate, int maxretry) { struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = ni->ni_vap; From nobody Fri Jan 3 01:24:28 2025 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 4YPQph3RcMz5kDB1; Fri, 03 Jan 2025 01:24:28 +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 4YPQph1B85z4NrZ; Fri, 3 Jan 2025 01:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735867468; 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=+ExSc9F53JNnanl3CuQj+te0tv1u9uqUudZFFIJa1bk=; b=hj/w0Lb/1xxTTYK9U8pz55Tc1gB3qANZN9CMWG/YsECe8fzlaxe0o1fDxhhmFQGB34thZA gxL28JY03oB3PjGxQkCmM1UlmKbkbDekJP/tovYN0gXAKfLA0gf/7C6Xw9o5QBoI8aE9dS YKOgXpwOqCOZaA7EDZ2ixae4V7z/YpJT7AXbOjHN22hGdhpnxVaJyUioyyoKhf2Velj18E itSlq1MNk/7GDNNvi250BwSH25WQcblCrSGaMck6Cyul0Bw6WJWImvC2Ohwh40KU+APyRy qrAfBUdlmJzokVKW3hqoGr/BpvD5BrsMlkvHrFbobRFHSsWofrm4z6Wysi+LEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735867468; 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=+ExSc9F53JNnanl3CuQj+te0tv1u9uqUudZFFIJa1bk=; b=M/krZxAiJy6nPC5UPG66JHXy7MqoJDdnMswc4hPMAkFdD2rFvSa6NmSIJX/LJyUCaBTmKg XkdlABnxDNXv9JHiBgWlhoRWq2Sa+9zgRPGGDy60lOe2CrrHiJhgPzg9LWJcJ6wDxcrWru Qkm0mE50gooHGqnG7UGW/vfh+S980IcTul7Q2q+HicnxB39NxR+Bkj9jXChI1J1D9p4W5o KwQVBWyR2r0vs6slGA3CKfjBccl173EP7b4QxxBBtgWwmiMWURz0tRNd4/WsTl3AACp1CE iWwq4criOIMmjH4YwL5j4jnZ5LRlqUCmqwAqN8RDV8mw8cBuLYghz/k/PYK2XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735867468; a=rsa-sha256; cv=none; b=Yt1N4dKNgK0lRznLBAUQ70L6M4QUDxnr8ZbziSQmk7pyZ5qYHENdTSCzDSxpdBgZae7O3I /iG9rghkeNcwLphToB6nmXWnTjdDWq4kq54ZYf+VNqSUUjm8SVmAtA+IcmPEAWM6GIMvOG loAhk38U3Ky6CN1iGIo2oEFmjhtZtmSEDyP5XZrZD/oOW1lJl1oJHKJoilyF1bhebnA2LV /fT8C8LcEA4uzOTmZzw4wnonY+ZvDjsyYE31sGlxbKAMNQ3tl10UsarWu3SBjlx857xkYi 6HjrECgulYuBRtEhuruuJTj3w62Yru3jeKmjlqVbYWfEe2+OQZ4op5R6/g7JXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPQph0bJLz11wv; Fri, 03 Jan 2025 01:24:28 +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 5031OSXv053176; Fri, 3 Jan 2025 01:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031OSiW053173; Fri, 3 Jan 2025 01:24:28 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:24:28 GMT Message-Id: <202501030124.5031OSiW053173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 2be951a526cb - main - rtwn: enable VHT if it's configured in the device 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2be951a526cb2ac20346b96173e553af6031a38c Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=2be951a526cb2ac20346b96173e553af6031a38c commit 2be951a526cb2ac20346b96173e553af6031a38c Author: Adrian Chadd AuthorDate: 2024-12-15 22:43:04 +0000 Commit: Adrian Chadd CommitDate: 2025-01-03 01:18:16 +0000 rtwn: enable VHT if it's configured in the device If the driver attach path adds the VHT flag then add the 20/40/80 MHz VHT channels. This is a no-op right now as nothing is enabling it. Differential Revision: https://reviews.freebsd.org/D48097 Reviewed by: bz --- sys/dev/rtwn/if_rtwn.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c index d7dd97a3fe18..ed84950b1a94 100644 --- a/sys/dev/rtwn/if_rtwn.c +++ b/sys/dev/rtwn/if_rtwn.c @@ -1621,6 +1621,14 @@ rtwn_getradiocaps(struct ieee80211com *ic, /* XXX workaround add_channel_list() limitations */ setbit(bands, IEEE80211_MODE_11A); setbit(bands, IEEE80211_MODE_11NA); + + if (IEEE80211_CONF_VHT(ic)) { + setbit(bands, IEEE80211_MODE_VHT_5GHZ); + /* Only enable VHT80 if HT40/VHT40 is available */ + if (sc->sc_ht40) + cbw_flags |= NET80211_CBW_FLAG_VHT80; + } + for (i = 0; i < nitems(sc->chan_num_5ghz); i++) { if (sc->chan_num_5ghz[i] == 0) continue; From nobody Fri Jan 3 01:53:15 2025 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 4YPRRv3N2yz5kFcf; Fri, 03 Jan 2025 01:53:15 +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 4YPRRv2d8Dz4Qys; Fri, 3 Jan 2025 01:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869195; 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=xmxl9BU63GmpOjVbW+G8eSLbDgT1N5miIX4AuzLhNrg=; b=gJqvRdBzqk7vv4NQ9h7jz6pTO3ELCfJIFl1fEHmqRnamDN7k/sDfR4/Hwr/b6Jb4SmohSl LD9BBfYavbsaPIGl71CXnRiAMFpX547vrv/aBCz0ClCr6wTCM35eMS5FrBtyyN29XUa7fu Dy4hJx9ONbQWTvmwSrCXwJhkT2W2SuXY5+7BC/t3AGTQZyPEpD/UoIC+oRYgMLePOktwBY JiXiFqf0fvOzqIq7gvzryzcLucuMN6t6+SdBu95aRKJ928fO03bfDT2ygYthdyKclFHsPe BwIV4CPM0h0jbsGjsBT8esCxODodT3FB36MrscMzW1ItGHp7G2M1SSZYZvgXOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869195; 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=xmxl9BU63GmpOjVbW+G8eSLbDgT1N5miIX4AuzLhNrg=; b=GS4VM1SYYfvm1xznGCnfmYktVn11QO38nx1qn+p708TidIrRF95pxVL9j+S7leu0unqdyr CclzH38N6YN+MKlrDUrXfnnB/mRz63KRKfRGR68w2OFw4QCvwm9kukwMzS3Mr9d4RjhxYL 7qdycYtA2B4+Webk/vBpOkQWF37tjHMvYZ0AcGGrouZwXm7sgVZnqLUBZCUOl/Tgd3Ts3p ANFWg7ZsVzwe55MmGo3mOyPyWJ4/73CFQ9ub2xAU+x0DG//V7n7C3x01oxMqj3COEJ48Ho iO/zH9H/83X5aJMoSK6LW8oQEQAnjgtTEW1H2NAyJK8TEBJGJcvKUA+/vBXtEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735869195; a=rsa-sha256; cv=none; b=Vhrh8shGwQrAoztxZznYGi7wPichmhkdSSecwIXd1BuFHP5h/8VaEiao7xerZ3xeyUQOFF w99NB1usHSDqtUys+Dx5VNnv4OieJBZLZXhTDwVSa2UbmNu1xAVjBvgORPkdebxH51R7NN LcCg4n1W202Ethltq1jYPzq0zxLFO7bJgWmzq7PbPhWNAkIcSQkkRuVE/lQLGjFlQ6z930 JUNmbQ8dahx27x1UJskXn7zwAoGCyBIEbEK2AtKF4KkPGPFFit9dOvCpk6Y5f1IkWUlM7y nAqu6m+hopDw0fCyFlAhSLt+mno7zsAHwBVhg9vqaQFVLC6FiSq+AZpgnrwdCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPRRv27x6z11w9; Fri, 03 Jan 2025 01:53:15 +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 5031rF5h008622; Fri, 3 Jan 2025 01:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031rFBv008619; Fri, 3 Jan 2025 01:53:15 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:53:15 GMT Message-Id: <202501030153.5031rFBv008619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3fb2371efd13 - main - syslogd tests: Use atf_check when sending SIGHUP to syslogd 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fb2371efd13f1067221c5fc1bae8903f358ae3e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3fb2371efd13f1067221c5fc1bae8903f358ae3e commit 3fb2371efd13f1067221c5fc1bae8903f358ae3e Author: Mark Johnston AuthorDate: 2025-01-03 01:50:39 +0000 Commit: Mark Johnston CommitDate: 2025-01-03 01:50:39 +0000 syslogd tests: Use atf_check when sending SIGHUP to syslogd --- usr.sbin/syslogd/tests/syslogd_test_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index a764ebfb0e24..f37846af0430 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -99,7 +99,7 @@ syslogd_log() # Make syslogd reload its configuration file. syslogd_reload() { - pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" + atf_check pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" } # Stop a private syslogd instance. From nobody Fri Jan 3 01:53:16 2025 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 4YPRRw3tLxz5kFhX; Fri, 03 Jan 2025 01:53:16 +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 4YPRRw3Rb1z4RBv; Fri, 3 Jan 2025 01:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869196; 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=aEFQCWN5xbFArmuJHQis+/8Se8ujrHSvVE6pFEsJGGY=; b=CO19av7Ng8I0PawWNsFJTudX7vB9/AVycS5yinL7VCL7TzEuAKAsGAjrRPka9c7JirZxnu 726CMspvaD0612Bdck5+tn4HLNuwkoKHGtK8Il4Pid9FiWvkUUsAI19b4hHsCkL87lNO6N hz5J+VqlzQWkj/Cygh2pjRswyXTkQjks1t3T+xM9vOPqrdt6xtzZuSkJYVwmTzavSuAMO2 gJmxYih8VspmGM5FumunmOKxADEQ3M6/CjtHIYaCYnNg8t3bkdBvXXDUOpgqdqiFBclOL/ xqznfxyGTBNsGevcpnZ1uNq1FGuI0nd+txsXk4iVMSzxYip+wgpqbnzszvE3TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869196; 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=aEFQCWN5xbFArmuJHQis+/8Se8ujrHSvVE6pFEsJGGY=; b=QO/bHmTe3+jipezRB5VUjIra9BmWz9EUyHMTcEh6QA3OIVCCuoMkQTTdT490sMLIjiuLsE HrUAPwf+WulOW899MVamhmYPskiaL6F0wdbhvuhg3apmb7AlUluN2jeBj0nWONQVkyZAUx JscDsuTaq9tah0qi1YTeiXNuYk9HlsmFpkbe4IZh/OgbL6444wlPYVjVNGoRBawEEVOzsm irUSYHTPq15iMSNkymS0mHlr3SS/g7UiEUVtovi83LwOe3gacrPBCjkZorCra6OGtNPr4q O1fSts26A0xvDehAwWewqscgUT0Hh9RdoyRWUu3CzHx02v1hOsppfSd6ZeIvhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735869196; a=rsa-sha256; cv=none; b=eRXjACFMIc33f9PmiSlDWBgUbsL1JZozEI6hDZ/wnCTVcOAZgN2qfpMQsG3RQbRwjKEzFJ DD64+nlM92hJCZsi7Dxkj/ZzSJ6ZdISiN0WaIS+FKotlwtlq+naxhtUU300Vf9qtE/JG2G Ok+/7W6CYEBiL7p+HkuVFPQojKut9T9+rvecK5TRc0pg92jON2QUV13A5ztMYe5DcgrMbH 2glclGAXW51j28OXbLusJAIE0NPe5RQwwJhi9yQMJIO7+uE/8NT9d0rVmz3TlfwZzDjmaM 6Y88cFRY83ljiWhl6q7wJaRGuKjV2Ju6YrLfWMx2SF2ZN7w5UtgHYS1t0uN+vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPRRw33RHz12SB; Fri, 03 Jan 2025 01:53:16 +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 5031rGW6008691; Fri, 3 Jan 2025 01:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031rGZr008688; Fri, 3 Jan 2025 01:53:16 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:53:16 GMT Message-Id: <202501030153.5031rGZr008688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1da99b479a74 - main - syslogd tests: Permit starting syslogd with multiple -b options 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da99b479a741a49bfa9188925bca52345b67e68 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1da99b479a741a49bfa9188925bca52345b67e68 commit 1da99b479a741a49bfa9188925bca52345b67e68 Author: Mark Johnston AuthorDate: 2025-01-03 01:50:59 +0000 Commit: Mark Johnston CommitDate: 2025-01-03 01:50:59 +0000 syslogd tests: Permit starting syslogd with multiple -b options --- usr.sbin/syslogd/tests/syslogd_test_common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index f37846af0430..34099684a1c2 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -19,7 +19,7 @@ readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" # Start a private syslogd instance. syslogd_start() { - local jail bind_addr conf_file pid_file socket privsocket + local jail bind_arg conf_file pid_file socket privsocket local opt next other_args # Setup loopback so we can deliver messages to ourself. @@ -29,7 +29,7 @@ syslogd_start() while getopts ":b:f:j:P:p:S:" opt; do case "${opt}" in b) - bind_addr="${OPTARG}" + bind_arg="${bind_arg} -b ${OPTARG}" ;; f) conf_file="${OPTARG}" @@ -71,7 +71,7 @@ syslogd_start() done $jail syslogd \ - -b "${bind_addr:-":${SYSLOGD_UDP_PORT}"}" \ + ${bind_arg:--b :${SYSLOGD_UDP_PORT}} \ -C \ -d \ -f "${conf_file:-${SYSLOGD_CONFIG}}" \ From nobody Fri Jan 3 01:53:17 2025 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 4YPRRy07Hnz5kFdy; Fri, 03 Jan 2025 01:53:18 +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 4YPRRx4TLRz4QwW; Fri, 3 Jan 2025 01:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869197; 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=J34NjgtxOEYxfM9jenX8zcSddXstmjdYdKsLDkYmMcQ=; b=JeLzusuQGmhHUw+qEMfzpLL0x1pYz17R8wqe8aN4HQQkfbggOmn3ahcdAHamdWjtl89iJ8 QqcJrByYKZumMoSX6bG0ZovsvpblK5dlAODtzTSHw2IEdrt+REk9vnmh7VbCaWbrH2DIX1 Kk6fPuRmeX8D3m/J656jTzeObkiiqplEbRf6lx4Yx7UBzwwPtdV1oypnxgYotofGnTXkgE H3FaWU5FygaTPLV2vuJORFFAp5uSApWPhOrJ5hR1Pth88OX9gn2nQIl0dQc9x/o20v3bQT twDzSLdkzs8lXfLy7QkCwAntSPMNOi3aVdN6uvr5iQQPssyJMb/n9NMjocElow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869197; 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=J34NjgtxOEYxfM9jenX8zcSddXstmjdYdKsLDkYmMcQ=; b=A8G2lgJBIOu2RWp+Htfdl2gW4H7kvq/xLXCkkRzhnrkeQB6svNGXpVvKHR1YSSI5mx337o sqLBi8B9WamRlOLJgZn49v0bPgUI5HwyrtcDvYhycvQq348P4BZKaRGSfP9KY6NE6J6U0Z ORvkCIwZGaENsl7z15Z63hJwQBfH/ndHyWBAg1/bGuy+5jpGKfzRchbeEi7fzSZGxM0Mpq B8KkklkKZTIx1zSvyeMh4Fx7am4aWeIQNa8+X6uGDpQlR6n6dqXQUK9uMFrinXQg52xLwO w8wkFUuiwI1ZD79RI3JW9gUCLh/zbb2bN0WlkNCAHrbiKOT3mZ9Qi89R/0ICDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735869197; a=rsa-sha256; cv=none; b=Mgf31B3Mm4EN+jbg5LyNfxUGLZzZzZwIqr7ORoAGqh8hvBfkdbAxVRH782jQrItb8IOlqN rv56CxkfwXa6t6alNKRCEtobsvRuNiKLb0XnN8L2G9mz6XB7M59b/ZDBS4p0SLkdidCB6G mJ419guJ9OzN/y6yRYVuNd5eYkrhIfucWayXvIk+Zj9XswAHBtLVLvkb+qEiwu9CEMqYu4 cJgiF2wxsm8MpgA/RE5gKzudDajiuMj1r7ga9aEAK7RWfMnLQ9HjqTGRn9+fgV38dxYJrv 8ZwFCFuvJERMRBbKhfOjB+86/R2RT2lqW8Me84itIwXn2JVpF95hilpUt5MZRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPRRx42s8z12XC; Fri, 03 Jan 2025 01:53:17 +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 5031rH5e008730; Fri, 3 Jan 2025 01:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031rH2m008727; Fri, 3 Jan 2025 01:53:17 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:53:17 GMT Message-Id: <202501030153.5031rH2m008727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 526bd072b33e - main - syslogd: Fix resource leaks 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 526bd072b33e3e255748e547fdc21ab15e77b709 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=526bd072b33e3e255748e547fdc21ab15e77b709 commit 526bd072b33e3e255748e547fdc21ab15e77b709 Author: Mark Johnston AuthorDate: 2025-01-03 01:51:19 +0000 Commit: Mark Johnston CommitDate: 2025-01-03 01:51:19 +0000 syslogd: Fix resource leaks - nvlist_append_nvlist_array() makes a copy of the input nvlist, so the pattern of nvlist_append_nvlist_array(... cfline(...)) would leak memory and descriptors. Pass the entire config nvlist to cfline() instead since this is needed for a future change. - In parse_action(), free the linked list returned by getaddrinfo(). - Remove some checks at the beginning of close_filed(). For some log types we'll always have f->f_file == -1, in which case we wouldn't release other resources, such as forwarding sockets. - After converting a filed to an nvlist, free the filed resources. Fixes: 2567168dc498 ("syslogd: Refresh configuration using libcasper") Reviewed by: jfree Differential Revision: https://reviews.freebsd.org/D48250 --- usr.sbin/syslogd/syslogd.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index be4eaa235d36..e1d3dffe013a 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -334,7 +334,8 @@ struct iovlist; static bool allowaddr(char *); static void addpeer(const char *, const char *, mode_t); static void addsock(const char *, const char *, mode_t); -static nvlist_t *cfline(const char *, const char *, const char *, const char *); +static void cfline(nvlist_t *, const char *, const char *, const char *, + const char *); static const char *cvthname(struct sockaddr *); static struct deadq_entry *deadq_enter(int); static void deadq_remove(struct deadq_entry *); @@ -369,10 +370,6 @@ static void increase_rcvbuf(int); static void close_filed(struct filed *f) { - - if (f == NULL || f->f_file == -1) - return; - switch (f->f_type) { case F_FORW: if (f->f_addr_fds != NULL) { @@ -409,7 +406,8 @@ close_filed(struct filed *f) default: break; } - (void)close(f->f_file); + if (f->f_file != -1) + (void)close(f->f_file); f->f_file = -1; } @@ -2447,8 +2445,7 @@ parseconfigfile(FILE *cf, bool allow_includes, nvlist_t *nvl_conf) } for (i = strlen(cline) - 1; i >= 0 && isspace(cline[i]); i--) cline[i] = '\0'; - nvlist_append_nvlist_array(nvl_conf, "filed_list", - cfline(cline, prog, host, pfilter)); + cfline(nvl_conf, cline, prog, host, pfilter); } return (nvl_conf); @@ -2472,10 +2469,8 @@ readconfigfile(const char *path) (void)fclose(cf); } else { dprintf("cannot open %s\n", path); - nvlist_append_nvlist_array(nvl_conf, "filed_list", - cfline("*.ERR\t/dev/console", "*", "*", "*")); - nvlist_append_nvlist_array(nvl_conf, "filed_list", - cfline("*.PANIC\t*", "*", "*", "*")); + cfline(nvl_conf, "*.ERR\t/dev/console", "*", "*", "*"); + cfline(nvl_conf, "*.PANIC\t*", "*", "*", "*"); } return (nvl_conf); } @@ -3071,7 +3066,7 @@ parse_action(const char *p, struct filed *f) if (shutdown(*sockp, SHUT_RD) < 0) err(1, "shutdown"); } - + freeaddrinfo(res); f->f_type = F_FORW; break; @@ -3125,10 +3120,11 @@ parse_action(const char *p, struct filed *f) } /* - * Crack a configuration file line + * Convert a configuration file line to an nvlist and add to "nvl", which + * contains all of the log configuration processed thus far. */ -static nvlist_t * -cfline(const char *line, const char *prog, const char *host, +static void +cfline(nvlist_t *nvl, const char *line, const char *prog, const char *host, const char *pfilter) { nvlist_t *nvl_filed; @@ -3169,6 +3165,7 @@ cfline(const char *line, const char *prog, const char *host, /* An nvlist is heap allocated heap here. */ nvl_filed = filed_to_nvlist(&f); + close_filed(&f); if (pfilter && *pfilter != '*') { nvlist_t *nvl_pfilter; @@ -3179,7 +3176,8 @@ cfline(const char *line, const char *prog, const char *host, nvlist_add_nvlist(nvl_filed, "f_prop_filter", nvl_pfilter); } - return (nvl_filed); + nvlist_append_nvlist_array(nvl, "filed_list", nvl_filed); + nvlist_destroy(nvl_filed); } /* From nobody Fri Jan 3 13:22:12 2025 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 4YPkkr4jfBz5jysl; Fri, 03 Jan 2025 13:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPkkr4BZxz4Gg5; Fri, 3 Jan 2025 13:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735910532; 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=aTFdpOMf4HNhOtRqkZcyJlZnWd/1DOl9Ao6tUuHgSpU=; b=NhVsLgQ6c2OGuDtimsaYeeu75ZImqcCAfEfhJ5E4yC2p/wyvIB6Hx49nKeUm5NsOf98beN u2TWUIMnF0uns22lYpAFtZchwquhb16KSof2rfpzUEJiQBLBJxk3iTG3wMFgyIr6SANKud VIhJTsB8fLuu+Ot7L7Bz54Hdye7MTGnn/jqDIqLEpsVUlNBMs7+X49WGAKGKbrIg/pmShr dyK2y9q9WnGx7QPystx2y1WSY9KABkU1IPAWUTXqjDtkXcfZMYw7TyFVZ/oaoOClzvx5MT C+DTG8svzzFKGud+2va3o0ub3mo/ZAIBl6gzrKe3Q3dJfb2xOxsSPTqacWmHmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735910532; 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=aTFdpOMf4HNhOtRqkZcyJlZnWd/1DOl9Ao6tUuHgSpU=; b=cR5/Bj57E0ISslYJOOPEnqjLLz0GALuWhRoNdrsUADlgFjvjvB5TN3SpGxNVLMyCT5k1zV tv/TkQa3YhUFQqIPwcOVEusbyybm3H7DC6EF2Bwrc8H1lxUO3+2eE4dbvHpontygezqmD/ QoQysXknCLrZQ4Yw4xvU5uHiRLORr//wHkJMY+fPOC90tSLpVgAlOami8hqk9pvJrvpe5p X8sM6XgA0VjJFPkoIS6qYmJdANVXQ0jrkiQHMo0iPLMKHZU7z073L3+Lqfz1q8ZoSmpGBe OjQKfwaItI2K2IbSMOX9iRYYCEud+Zg0CrTHNpzBtTNkyksQDc05OZHB0ENmkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735910532; a=rsa-sha256; cv=none; b=EurcQYrzMXcU2o9jdfxd/9g6dUJtoSTQ2iZNkIwSsaKm43ZdJdLgMyrCh0QStQ5JoNefEI iC9x89fPNBdFNAu02SROZ488LB8DzU/Mlumj7rXj12gkm9Y8cmFID622qoZKRRX/zigFX7 XZuxlXFscx94W2nBACz1lwiwnx6Q6Y0bMtdhJp/Exx1G1craBhPtQ7cgdUug+0jwRLRGeP pRu186veyVeA2CIQ9X5b8D98w5aisdU0PI6CaT/oCUYXO8o1V/IjFARR4RgEprdLuXaM9w smAJ3GlqdyURcUMU5GIVSXLHqspt5Y3mkA+AqSeaeyr5PYGQE0cLJdTx+nrjTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPkkr3ph3z1NBx; Fri, 03 Jan 2025 13:22:12 +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 503DMCOV095214; Fri, 3 Jan 2025 13:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503DMCiV095211; Fri, 3 Jan 2025 13:22:12 GMT (envelope-from git) Date: Fri, 3 Jan 2025 13:22:12 GMT Message-Id: <202501031322.503DMCiV095211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: deb4252e9e7c - main - TCP RACK: remove un-needed assignment 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: deb4252e9e7c8d2eca9be6333caa434061f3f594 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=deb4252e9e7c8d2eca9be6333caa434061f3f594 commit deb4252e9e7c8d2eca9be6333caa434061f3f594 Author: Michael Tuexen AuthorDate: 2025-01-03 13:20:19 +0000 Commit: Michael Tuexen CommitDate: 2025-01-03 13:20:19 +0000 TCP RACK: remove un-needed assignment No functional change intended. Reviewed by: rrs CID: 1523768 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48292 --- sys/netinet/tcp_stacks/rack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 233513548d72..d7e306186d37 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19497,7 +19497,6 @@ again: } rack_log_output(tp, &to, len, tp->snd_max, flags, error, rack_to_usec_ts(tv), NULL, add_flag, s_mb, s_soff, rack->r_ctl.fsb.hw_tls, segsiz); - m = NULL; if (tp->snd_una == tp->snd_max) { rack->r_ctl.rc_tlp_rxt_last_time = cts; rack_log_progress_event(rack, tp, ticks, PROGRESS_START, __LINE__); From nobody Fri Jan 3 13:24:19 2025 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 4YPknJ037pz5jyqp; Fri, 03 Jan 2025 13:24: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 4YPknH5v1Fz4HHs; Fri, 3 Jan 2025 13:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735910659; 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=FG22AezsIlIpzyrfbcJubM84zJ0j3oayCNCm52g6Ot0=; b=gh6IYVLoGm2KhOoWbUlhtIb0ByJ1ZwRMZJFggki27TdDeDMZRpM94grWH/KDboqcCUkPeH Uz5giJL0psco/MH6PUrHhKN9i5vjwKkCexHw5tG6JEIMnPtV8khtFLfm/zEYQy2jEmeaxM PYj0fO7KJNHwZpeZX80PES0bH1dps8n/Jgc/pk98pTdosKLuzMtHeC1rdOu+KvL9iCoNTD HkE+F4W2r68EU8oCGAARtPGzr1/yyxSUtBJqTL1PI8xqOwMq/wRWUY5gMinSFFKmPARVsR d5wJtRUc1tKwZ+jRrcQx3ztND9OqaO4Ku0W6fH3pc1UyZC6pYYho9sEpUugOyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735910659; 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=FG22AezsIlIpzyrfbcJubM84zJ0j3oayCNCm52g6Ot0=; b=PNk2YNA6XBdLL1jIXpNGbjIguMAoOg/zV5XcFKAD05DEkQ1gCz4luAaOCKz87bdz3d5p9y QFXpY+Vho0CxSe8femFt//jp4bBsx7Ly0QiKCKhGGYEn+c7usYVKy9uXoSGcdO1sZ8q7gf y00HXbLO/nNErHE9T3ggO0H0lZ9NG8RJ8WcSz69V+rW2j3MpTEIrScFU2X75FQ+NndUrJt Pm14m9PPeYJKYbyg8j08tjS1O1NgMhGznlnuEPMurwuk5UhYqp8GoxPDYPdMI35qpvh1Q3 uVbt/IxSDhs53mL0FjFMW2enJejt/Q1/FP+kt71yekv3HbflQDMxZN0Xf10szw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735910659; a=rsa-sha256; cv=none; b=iNihsri2X+XzA/ShD9KvZJ+hwQoT1WL8CU12oV9PjDH+4gyceHMpEx6eazn1A42xVdWgo3 UmmsFX5Ip3uVscPqwH2F9CRg/RJI5aabPFCeb/jSn6qPdtbdYfUaZNH8Xk9cigkutpicfp GBYTejSWV0ITi54sLxPibgSpeLz75nFN3q7Q0klw9Rv8bhAES8/evDbOgLBhhPgyIX7jCN dmGU6sOTpVkU8+cF8N0+AzeMmwUHCF0hY+uN6h8MpoRSNdqYI2mYqRNkphrqHMWh7FsPbx 53oCTYVvR+DdgiZgN0mRlUMEJMqIQ69sZYhcCNWlGD+Yvgrh95AwPKzHbEVvtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPknH5M4Xz1NC6; Fri, 03 Jan 2025 13:24: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 503DOJRm097901; Fri, 3 Jan 2025 13:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503DOJaZ097898; Fri, 3 Jan 2025 13:24:19 GMT (envelope-from git) Date: Fri, 3 Jan 2025 13:24:19 GMT Message-Id: <202501031324.503DOJaZ097898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4173a3a009a4 - main - TCP BBR: simplify expression 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4173a3a009a42c47f1ec2d1cbfb99347aaf195da Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4173a3a009a42c47f1ec2d1cbfb99347aaf195da commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da Author: Michael Tuexen AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen CommitDate: 2025-01-03 13:22:25 +0000 TCP BBR: simplify expression rsm cannot be NULL, when calling bbr_update_bbr_info(). So no need to check partially for it. No functional change intended. Reviewed by: rrs CID: 1523803 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index fa9953fcd0a3..fd5bcd81f25e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6712,7 +6712,7 @@ bbr_update_bbr_info(struct tcp_bbr *bbr, struct bbr_sendmap *rsm, uint32_t rtt, bbr_log_rtt_shrinks(bbr, cts, 0, rtt, __LINE__, BBR_RTTS_NEWRTT, 0); bbr_set_reduced_rtt(bbr, cts, __LINE__); } - bbr_log_type_bbrrttprop(bbr, rtt, (rsm ? rsm->r_end : 0), uts, cts, + bbr_log_type_bbrrttprop(bbr, rtt, rsm->r_end, uts, cts, match, rsm->r_start, rsm->r_flags); apply_filter_min_small(&bbr->r_ctl.rc_rttprop, rtt, cts); if (old_rttprop != bbr_get_rtt(bbr, BBR_RTT_PROP)) { From nobody Fri Jan 3 15:48:59 2025 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 4YPp0C5dRHz5k75V; Fri, 03 Jan 2025 15:48:59 +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 4YPp0C4W5Bz4WbG; Fri, 3 Jan 2025 15:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919339; 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=NccObzWe2SnBR2kB8W1UU/3308/9eZ4HKteabJRrTqQ=; b=pdOHuIaRTSMg5G2cUw7z7TlEO7/c7t1MfrUkzYbmkH2YZZFKpV8jfscqO8sgRVTcP+38Br 95j3Oxy4qu9y7Ua2AUGM4/HjA9sNrpXv+queCKuOAqsHvwcMs45t+8IqbXZ7OaNI+fJaFL EANJHF6kC+wbxVi6YLHw0nfO6sxrecVuxzXVyQleltzsAo8PDsWXDqLGLus5Qte/jhdc8H 0gCMGVL2ASuAeWLekicrHSFXoaC8L4WrMgF/1xGCH0DyLz2IBCOTd03MRjnD9x6FbL0btY zvxBuIaGaFvhTjFj+GgkNBltuMgBF8s2yax48S8g9HuMS/RCDj4bm8cYnfM3Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919339; 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=NccObzWe2SnBR2kB8W1UU/3308/9eZ4HKteabJRrTqQ=; b=FVjDWv9lSiMqokmbPSkr+mF3UpVBJ5Wy/4v+ld3+IN/oREVIROnfVFyO+BJII7DKQmEC/m 60PnSsubVS69UBb+6P2bWQRGARu7EBhmRL5w3OnDu9p7voSQ/lsGc/PNfNCzfIiRTVmTON uymNR7unN/2CVf/SxY6AtRKrb51WaT/1MOq9TDGBcXKm7E+pT+wIbMI26nhNc7jDTl6yE9 jVFcp6B9AfHcq0+lskM00OtlrrxEUOlCFuTkDglnKvIYy+GZrTglprLEQ7/WgmkLoaTdrt RCCFxOOaAbB2asegm0ukZIbB86NC/zThziQt0Qwdk9EEgChuz2vsWsyPjqICFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919339; a=rsa-sha256; cv=none; b=DRcQpSzy9rOtawLfeDSejJKrXo1TK6ApP0LnqgMk5Wf3BIdyGJvr3ecqzBeF4ZiBWt6YqZ GjQowHRlX7/HTOukIStwWEV2I5JThWWxALQKel3jH3s+R/9+5rI3gTZL71ARRnyYCS0LIb iToCUq9nC3i0qH1VrBHX583eiQAo01Cl0WuUtCD58DqjD8XGDSGkXZYlKh09j2E6tnVY2N cSDxOm7eqWGjsHqlkulhALO47qhc3HTEY2UsJAlttimn9dv00U5zZE/I7hfIaU89KdJ47l g6txu22gRaw09e3skIF7v+Lu73QKjJjwR9zT18bLQSlzVDvUSgyGIFYkagL4BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp0C3j8Nz1RXs; Fri, 03 Jan 2025 15:48:59 +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 503FmxbY060531; Fri, 3 Jan 2025 15:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fmxei060528; Fri, 3 Jan 2025 15:48:59 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:48:59 GMT Message-Id: <202501031548.503Fmxei060528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f94513a3a36b - main - pac: Use strdup and asprintf in place of dubious string building 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f94513a3a36b50823c3918c93ee5c6bf5f525e91 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f94513a3a36b50823c3918c93ee5c6bf5f525e91 commit f94513a3a36b50823c3918c93ee5c6bf5f525e91 Author: John Baldwin AuthorDate: 2025-01-03 15:39:44 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:44:22 +0000 pac: Use strdup and asprintf in place of dubious string building GCC 14 warned about transposed arguments to calloc, but these cases are better served by more abstract string functions. --- usr.sbin/lpr/pac/pac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 1cc0e050a99e..22ed8bf7e3bb 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -327,8 +327,7 @@ enter(const char name[]) h = hash(name); hcount++; hp = (struct hent *) calloc(sizeof *hp, (size_t)1); - hp->h_name = (char *) calloc(sizeof(char), strlen(name)+1); - strcpy(hp->h_name, name); + hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; hp->h_link = hashtab[h]; @@ -429,10 +428,8 @@ chkprinter(const char *ptrname) errx(3, "accounting not enabled for printer %s", ptrname); if (!pflag && pp->price100) price = pp->price100/10000.0; - sumfile = (char *) calloc(sizeof(char), strlen(acctfile)+5); + asprintf(&sumfile, "%s_sum", acctfile); if (sumfile == NULL) - errx(1, "calloc failed"); - strcpy(sumfile, acctfile); - strcat(sumfile, "_sum"); + errx(1, "asprintf failed"); return(1); } From nobody Fri Jan 3 15:49:00 2025 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 4YPp0D6B2Dz5k7Kn; Fri, 03 Jan 2025 15:49:00 +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 4YPp0D5BLtz4Wdk; Fri, 3 Jan 2025 15:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919340; 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=OMScghQ38n99JSCAl3mrOsrFcKxlwLqy+vly4d7fzg0=; b=nXVKnDCryJ4x/NXxCHHY0EnVYO/uenlpYl3zcJAAI1/kCVw6E9jLgKavzVI9OpHv+X0ToX uR++zf0w7wHEPLz8VWvBo/C8s4/+zBZf08hjwX9yTzXnReUBJL8LzLYRG7ymBRaj2pZ4xl Dtdv9oHT98kwJp2FEcpMKG5ejoAX5TKKrFNym5UjxUWQRIeDe4NCMtoKwatLU59aToAtgl AxbaHjcSJtvPOsAEv6RKjwYoape7BA0OsWRKFIHyeV/Mx6JOGzC1nVTfuNxszN2VN6WTc9 yyIeXHJ9ohY5lSSbRO67F/XmUruh8ro5Bw06C8CJcyrr0iltlAzDggXf52eoXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919340; 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=OMScghQ38n99JSCAl3mrOsrFcKxlwLqy+vly4d7fzg0=; b=QJ/PdLGeKLF7p6QIdPSgqPMFYhEI7t7eQ4yoOyrXP0KZYBqROUwsDN1tfT3Vo5uTCagzcR Yy56CFoCmiW9jdiq3BQpJdjGeWogCOB6BTeCH0EJXKo56hmaRzcBJ4eaMDA2e1PzZEhqGj sA9/qSCnp7gMZE4t1eEQ2Gy1ER6jIN8FyDQeQOaCTEa7Tv2dvozvzeKgWPfJqjG4VzFrL6 i+jINWTq/qAvZ2BkdjwATH29bK3GCuyDL5pMPdjuKxRAeR8bd0E2XTyFGDMXJm0Qm59Itj MStKu+3KHG5ZiYqUfdc2l+G/pogsH6O1hTnZ6joF2JS2CjIgewhyT857KV94Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919340; a=rsa-sha256; cv=none; b=x+lWc9TUE7OTvQatB/ZzyAd7ne+r2/dRJ8p8wf19MaWIe9MXH+9J7A1tM3P7FlFUbfiHVy 7SbQAELMwvc0Mos+9OK0M3kgZztQSHmJ0rkXo1Zvevedj6kqKHP9H9WRZ2+kmB5R1n7ETd WY701TnQOfQ02das4to1I+Py7Ax+FJLKH6mvK3AlP0dUBr5GjtqOoJmkEiY1Aw/un29fAR FGt9BHkPNOsi89Q5GIvcVC6Ordl6CbXna5wcxMKO2OjX0y2BvZuQ/1oswAcR7Q6I+KiYtI 0Op6ooX2IsOVCcYnw+avNmlK9Hmder4l6Uo9mg/dGnpT1LlttXM9Z7OVRlXKjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp0D4SXRz1RXt; Fri, 03 Jan 2025 15:49:00 +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 503Fn0Ij060597; Fri, 3 Jan 2025 15:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fn00v060594; Fri, 3 Jan 2025 15:49:00 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:49:00 GMT Message-Id: <202501031549.503Fn00v060594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 22956bc9dc90 - main - pac: Consistently use item count as the first argument to calloc 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22956bc9dc907296196a37525a6726f6ba2c06ed Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=22956bc9dc907296196a37525a6726f6ba2c06ed commit 22956bc9dc907296196a37525a6726f6ba2c06ed Author: John Baldwin AuthorDate: 2025-01-03 15:41:36 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:44:27 +0000 pac: Consistently use item count as the first argument to calloc Reported by: GCC 14 -Wcalloc-transposed-args --- usr.sbin/lpr/pac/pac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 22ed8bf7e3bb..260743f5c33a 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -248,7 +248,7 @@ dumpit(void) hp = hashtab[0]; hno = 1; - base = (struct hent **) calloc(sizeof hp, hcount); + base = (struct hent **) calloc(hcount, sizeof(hp)); for (ap = base, c = hcount; c--; ap++) { while (hp == NULL) hp = hashtab[hno++]; @@ -326,7 +326,7 @@ enter(const char name[]) return(hp); h = hash(name); hcount++; - hp = (struct hent *) calloc(sizeof *hp, (size_t)1); + hp = (struct hent *) calloc(1, sizeof(*hp)); hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; From nobody Fri Jan 3 15:49:01 2025 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 4YPp0G0D0vz5k7Kq; Fri, 03 Jan 2025 15:49:02 +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 4YPp0F5kLqz4WPp; Fri, 3 Jan 2025 15:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919341; 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=ElPZ5Bdg0tZnvfdA3laTd7e/Lux1J7VwnjRv5AwnFzo=; b=RJ2Jeq3y9ddRXwb9nkufFqVZFjkwWZTtAR1PDlH3RmH3V9zlfy+EUWZ5xoJcPtAzd8Y9Hq qse9YrCQMmTJ7gcz2/CSOKLW+oxALNHa1r4QS0hHLo9Da221olmwSXxdSeiKCvGxL2qVlj 37AdqToc9lYkI/TL5zQjvqm4/4mBKULunqKyvGuNj68v6nlDh4o2NwHwAj7+rMqRl7Kwl2 0zhjCvxk99gHRFNKjKFYZpmWtl/D/kPBQeiSPAOm2xtDmBOyc4mATpGrQfZgL/HnwWdmnb QZ9R0m+iaVLqCZJfwKWC+b1yEpijh2nQfOPnHrVsSi5cldl+8L8mC13SlvKyeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919341; 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=ElPZ5Bdg0tZnvfdA3laTd7e/Lux1J7VwnjRv5AwnFzo=; b=OMrnbKbqHIQksvtmM7qquyJy0J9DdzTEuKs1uVKUBJ3c8waFcDV9ntSCxmKkno36dpjuCR 16y9kUWLAj+m3RNEmMhVwg7Q6mDzeehdruo337X0+guguWKgSV6Hq+CuF1whlzWr3AcKNY 6UQ1+Wq2+CEckbw2bL4zjZXXyQmhFIqUOLP3EoJWagtyp+jpOUMIcLyAHASoHdGDJXaBts CKV599At/srco2heF6qIqoTEusF96niBB8phx5W2YSml3GeQgFfVsmUg/gV1afWgUZGubo Jn1YCk9Jzn3TA1TFttfNUYnenVNwILU1jBI4v9KuZW/m+KAiMp811yu9Ns1BxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919341; a=rsa-sha256; cv=none; b=OO3NHp3/lTRPUmHY8hQxRrOM5DNi99zleDWs3mapYjoFxlCNCgP8It/cz8GvLeuT42WKy9 U6rY+7P28O0ZXN+vOxLd1Sqph9EdHcRmtdJDxt+34DHQsm1f2zIJ6s5eGO+YAhFcGAx2rO /oo6nUZ9/AIZxDLXJsntB63qUXiw7S0fMZ3Kjf4ZRkVLPdkOnhKX15zRkzC/W7e0Bq4Rag 85GJxNEy4wwsWJk8WVXYIpNB6VV7GHLPjOzXWETrHk8OHrpmt/rF3hdGjNCZvQBCcgz0Ci Q+URi4MKL9QY+9433bxg0lN4Jkj9DmIJ76DiFTj1iLyqn2EoGwzV9vMMoPtLqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp0F5G9Kz1RMg; Fri, 03 Jan 2025 15:49:01 +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 503Fn1wU060680; Fri, 3 Jan 2025 15:49:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fn1UF060677; Fri, 3 Jan 2025 15:49:01 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:49:01 GMT Message-Id: <202501031549.503Fn1UF060677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 40ed89ffc323 - main - .cirrus: Add manual amd64 and aarch64 jobs using GCC 14 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40ed89ffc32353bf50f832635ef767aeb432c0fd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=40ed89ffc32353bf50f832635ef767aeb432c0fd commit 40ed89ffc32353bf50f832635ef767aeb432c0fd Author: John Baldwin AuthorDate: 2025-01-03 15:44:33 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:44:33 +0000 .cirrus: Add manual amd64 and aarch64 jobs using GCC 14 Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D48290 --- .cirrus.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 2a1a8b6cbf3b..ae83c7d4cd9b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -95,6 +95,15 @@ task: TOOLCHAIN: amd64-gcc13 TOOLCHAIN_PKG: ${TOOLCHAIN} EXTRA_MAKE_FLAGS: -s + - name: amd64-gcc14 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: amd64-gcc14 + TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s - name: aarch64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -113,6 +122,15 @@ task: TOOLCHAIN: aarch64-gcc13 TOOLCHAIN_PKG: ${TOOLCHAIN} EXTRA_MAKE_FLAGS: -s + - name: aarch64-gcc14 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: aarch64-gcc14 + TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' && $CIRRUS_BRANCH =~ 'pull/.*' env: From nobody Fri Jan 3 15:49:02 2025 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 4YPp0H1KBBz5k7Sx; Fri, 03 Jan 2025 15:49:03 +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 4YPp0G6pFxz4Wjf; Fri, 3 Jan 2025 15:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919343; 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=llrSuw9e5J8XyHhoqysAPZKN/g9fvYIYd6D5Oa3Byr8=; b=W/8hrPt8Wr42ajxENGAcpSS6qlZCm/kvAbXqkllp1aRfFjZmvI1+iaf0IxOc1bnWFYvwWR Bz++bcgyaItBgwxyvTiDqU21Lz4L73H5xX2L2KsB/AZmyQSJ5VKKTt74uWXNanCImVHADQ B+BXK16aFs0/FvSiwHTAX8kMoJo80h9U0W8l1GN/fPfD+XCLb1KiAqNh2R8XdybwYBIqE1 D+kwcUo9JV0guwCDXDPD5hgTBEtjSCyS5Rhjjhoh7p6Iwg9Vcu9UtE/23ZSSKapg1DzNHN +AGDv6ctcqhR6TO1+MgPf7rC0FHqybaC8ta1rN5fhZ1XiR6ft2hUPzLc7+ZUFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919343; 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=llrSuw9e5J8XyHhoqysAPZKN/g9fvYIYd6D5Oa3Byr8=; b=iN8InkTkJWKpuRwJmlbb/bo4sox/24lF8fF9t1V+NIhkZp2+6Tb+BAaN5GveymlCEOBbb5 krxf8XER75MZEdQExioGYEEYYd5p5ExN2SvmoWXZ61i2bCrwFN2gK6c+6VBlJNyVkgx9L6 pV0lYV8gvDnuA+vsO970mVNwmIg8sOELHXrf+8YCnqqu+131KprLsuIr3alB12OcJI/45x YirX1X2VmEMnEvioTyNyET/fbgHZ6rvq6yqkj79cBZ1PYfQDSLfD3DJD7/RrershP9kgwd 6gG1fz8g0UUUrHyEUJ0r3p/tHKNwwlFuNnU0liahAx8avpaid9xrAh88tj9jAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919343; a=rsa-sha256; cv=none; b=ZkzvSdeEv2pWW8kfklfuEnVxo1gw2EQXE8N0kU03xiweWxPf0KqkNopX+S+Gtr3G37Ql30 J8FiS3Xbv+GAKqj1bOaxbTA5tsKs5dBjPfjeaHsphV5kVUzrX/4Sx83aaLj050aEVHGRpH oXyKb/Kzo9dExsVT5YqfGEHwfjpFQnoYwr4D/1yIoKqe9nwnH1MNO2QtihCMGzlAWGBdzc Gi8JWe57Gx4iS+VukoVZLnXOSoWfbRvFfkvs7Xtt+PqMH56RGeNnh28SBzqE2r9raHYiAW JJTM8rua8YU4iXVg6bzfx0uu5Z/yc4mUibqocJurzVUhfRIiwPDihC6XzGdezQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp0G6GSSz1RMh; Fri, 03 Jan 2025 15:49:02 +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 503Fn2E8060755; Fri, 3 Jan 2025 15:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fn2EW060750; Fri, 3 Jan 2025 15:49:02 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:49:02 GMT Message-Id: <202501031549.503Fn2EW060750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f586d5259949 - main - .cirrus-ci: Update the non-manual GCC build job to GCC 13 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f586d52599499f254f0dd6053c811df4031514ca Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f586d52599499f254f0dd6053c811df4031514ca commit f586d52599499f254f0dd6053c811df4031514ca Author: John Baldwin AuthorDate: 2025-01-03 15:44:44 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:44:44 +0000 .cirrus-ci: Update the non-manual GCC build job to GCC 13 Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D48291 --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ae83c7d4cd9b..8daaef148ca7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -131,12 +131,12 @@ task: TOOLCHAIN: aarch64-gcc14 TOOLCHAIN_PKG: ${TOOLCHAIN} EXTRA_MAKE_FLAGS: -s - - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) + - name: amd64-gcc13 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' && $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: amd64-gcc12 + TOOLCHAIN: amd64-gcc13 TOOLCHAIN_PKG: ${TOOLCHAIN} EXTRA_MAKE_FLAGS: -s timeout_in: 120m From nobody Fri Jan 3 15:49:03 2025 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 4YPp0J2sN4z5k7VK; Fri, 03 Jan 2025 15:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPp0J0Zbxz4WYk; Fri, 3 Jan 2025 15:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919344; 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=XyzJMqZY0q4jZMeRfFM5aCs/8Lykq6EmhbwTt2dpKd8=; b=LLSKMYZba7MdQIx1uH3l8gp2mY250EAehxm2xBjFmbWzR7Xpb1kr3RhONTHPXWvaEU2vzM 96dLODN+kdO61vGiiR7NCoLLNPlKBjA46JYmEheYa/ya7puW9+v94hg3RUOEwcEkTZtS4J 7PE4BuTG7IdZfo0xbUxJ731GEdjpaT0hF+jhpZiuFigSeceJylKcHa5rytx42cfHxvKGfY 3/p19qZRyywsrPq5VARdyHDau8My8Joi1ui+LgoQ21bRRFWY1i2iiJBxXNk3P7dTFbe2Tn eOtQOhiwXpGpfiPk2F6PuLkjwhAj+1BhK607MpqwxKQwxTG0DXhyzHmIJ9PwRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919344; 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=XyzJMqZY0q4jZMeRfFM5aCs/8Lykq6EmhbwTt2dpKd8=; b=m9D/NY+1di8zo3c5c+vjUco3CLcXTkwBmhe4SYDdpU20A2CKzS2VQ4j+ayMgcjcX2q40D6 5K9UnSENA5WdPtiMFctOZ9oPlj4DbideyaZ+z5x4GuHyIU5rfrNwXSfou3x/vNyAFtG7iu spuzcQg3RRUbiB138KjYdUf9wt9bC3Y/DT0PB6ANo1p3d+B8WGcq3bk8TFpqx4TlJTxj1d 9KLZIg6QMT5g0/jHu5WxJlr90gfaGmlLPzfIFR2NWvBOQ6DguwWbzZQlEY6WnMekssG3AA rwkN+X5k0XSOGhDWMB9dVz9MTtQEIEbiLgCsWbv34VR/anKaiXg3PD2VbOVe1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919344; a=rsa-sha256; cv=none; b=K+1P4W4ofRHhV9naqg1ywSf7/wjnZgTvWiweLDt5RD561yuEc7gtIRZC/kuc2HrRDk0GS+ bkVzaJlxyp4Nratog733DTESgsvgnUZRRDPqBLEKb9n5sb7adrctLx28VOBx65Vt7Ix2DJ OIdUC8sBOqOozwdu+udoXh0ZZyo0+FyAFWhapUuBp2A4WIp8X4S5M+zV/5umaTwjY5bh8A Jwt6+qvd+iYOnK+x1K9fRxQL2HOjuLq33BYdA6A5cVOw8odjUWVDHSgS0omX31Qmg2pMyh MSLxCFxASrC4Mrq+GkSEk5cVZUXprTyp8rYYGKY1j3s2GPdJ4mNyifVKyotfCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp0J07jwz1RMj; Fri, 03 Jan 2025 15:49:04 +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 503Fn3jx060808; Fri, 3 Jan 2025 15:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fn3cI060805; Fri, 3 Jan 2025 15:49:03 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:49:03 GMT Message-Id: <202501031549.503Fn3cI060805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 826509a3c364 - main - open.2: Editorial pass 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 826509a3c3642db6a110f8f43ae8860c40c72ad2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=826509a3c3642db6a110f8f43ae8860c40c72ad2 commit 826509a3c3642db6a110f8f43ae8860c40c72ad2 Author: John Baldwin AuthorDate: 2025-01-03 15:48:24 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:48:24 +0000 open.2: Editorial pass - Use a typical tagged list for the open flags instead of a literal block. This permits using markup in the flag descriptions. Also, drop the offset to avoid indenting the entire list. - Note that O_RESOLVE_BENEATH only applies to openat(2) - Use a clearer description of O_CLOEXEC (what it means, not the internal flag it sets) - Note that exactly one permission flag is required. - Split up a paragraph on various flags so that each flag gets its own paragraph. Some flags already had their own paragraph, so this is more consistent. It also makes it clearer which flag a sentence is talking about when a flag has more than one sentence. - Appease some errors from igor and man2ps - In the discussion about a returned directory descriptor opened with O_SEARCH, avoid the use of Fa fd since the descriptor in question is a return value and not an argument to open or openat. - Various and sundry markup and language tweaks Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D48253 --- lib/libsys/open.2 | 184 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 123 insertions(+), 61 deletions(-) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index 8331362640d6..fe1ad757b5b0 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 25, 2024 +.Dd January 3, 2025 .Dt OPEN 2 .Os .Sh NAME @@ -114,7 +114,8 @@ The argument to .Fn openat must be strictly relative to a file descriptor -.Fa fd . +.Fa fd ; +that is, .Fa path must not be an absolute path and must not contain ".." components which cause the path resolution to escape the directory hierarchy @@ -137,46 +138,98 @@ If the .Dv vfs.lookup_cap_dotdot_nonlocal MIB is set to zero, ".." is not allowed if found on non-local filesystem. .Pp -The flags specified are formed by +The +.Fa flags +are formed by .Em or Ns 'ing -the following values -.Pp -.Bd -literal -offset indent -compact -O_RDONLY open for reading only -O_WRONLY open for writing only -O_RDWR open for reading and writing -O_EXEC open for execute only -O_SEARCH open for search only, an alias for O_EXEC -O_NONBLOCK do not block on open -O_APPEND append on each write -O_CREAT create file if it does not exist -O_TRUNC truncate size to 0 -O_EXCL error if create and file exists -O_SHLOCK atomically obtain a shared lock -O_EXLOCK atomically obtain an exclusive lock -O_DIRECT eliminate or reduce cache effects -O_FSYNC synchronous writes (historical synonym for O_SYNC) -O_SYNC synchronous writes -O_DSYNC synchronous data writes -O_NOFOLLOW do not follow symlinks -O_NOCTTY ignored -O_TTY_INIT ignored -O_DIRECTORY error if file is not a directory -O_CLOEXEC set FD_CLOEXEC upon open -O_VERIFY verify the contents of the file -O_RESOLVE_BENEATH path resolution must not cross the fd directory -O_PATH record only the target path in the opened descriptor -O_EMPTY_PATH openat, open file referenced by fd if path is empty -.Ed +the following values: +.Pp +.Bl -tag -width O_RESOLVE_BENEATH +.It Dv O_RDONLY +open for reading only +.It Dv O_WRONLY +open for writing only +.It Dv O_RDWR +open for reading and writing +.It Dv O_EXEC +open for execute only +.It Dv O_SEARCH +open for search only +(an alias for +.Dv O_EXEC +typically used with +.Dv O_DIRECTORY ) +.It Dv O_NONBLOCK +do not block on open +.It Dv O_APPEND +set file pointer to the end of the file before each write +.It Dv O_CREAT +create file if it does not exist +.It Dv O_TRUNC +truncate size to 0 +.It Dv O_EXCL +fail if +.Dv O_CREAT +is set and the file exists +.It Dv O_SHLOCK +atomically obtain a shared lock +.It Dv O_EXLOCK +atomically obtain an exclusive lock +.It Dv O_DIRECT +read and write directly from the backing store +.It Dv O_FSYNC +synchronous data and metadata writes +.Pq historical synonym for Dv O_SYNC +.It Dv O_SYNC +synchronous data and metadata writes +.It Dv O_DSYNC +synchronous data writes +.It Dv O_NOFOLLOW +do not follow symlinks +.It Dv O_NOCTTY +ignored +.It Dv O_TTY_INIT +ignored +.It Dv O_DIRECTORY +error if file is not a directory +.It Dv O_CLOEXEC +automatically close file on +.Xr execve 2 +.It Dv O_VERIFY +verify the contents of the file with +.Xr mac_veriexec 4 +.It Dv O_RESOLVE_BENEATH +.Pq Xr openat 2 only +path resolution must not cross the +.Fa fd +directory +.It Dv O_PATH +record only the target path in the opened descriptor +.It Dv O_EMPTY_PATH +.Pq Xr openat 2 only +open file referenced by +.Fa fd +if path is empty +.El +.Pp +Exactly one of the flags +.Dv O_RDONLY , +.Dv O_WRONLY , +.Dv O_RDWR , +or +.Dv O_EXEC +must be provided. .Pp Opening a file with .Dv O_APPEND -set causes each write on the file -to be appended to the end. +set causes each write on the resulting file descriptor +to be appended to the end of the file. +.Pp If .Dv O_TRUNC is specified and the file exists, the file is truncated to zero length. +.Pp If .Dv O_EXCL is set with @@ -184,7 +237,8 @@ is set with and the file already exists, .Fn open -returns an error. +fails with +.Er EEXIST . This may be used to implement a simple exclusive access locking mechanism. If @@ -194,12 +248,13 @@ a symbolic link, .Fn open will fail even if the symbolic link points to a non-existent name. -If the +.Pp +If .Dv O_NONBLOCK -flag is specified and the +is specified and the .Fn open -system call would result -in the process being blocked for some reason (e.g., waiting for +system call would +block for some reason (for example, waiting for carrier on a dialup line), .Fn open returns immediately. @@ -245,6 +300,8 @@ The system will attempt to avoid caching the data you read or write. If it cannot avoid caching the data, it will minimize the impact the data has on the cache. Use of this flag can drastically reduce performance if not used with care. +The semantics of this flag are filesystem dependent, +and some filesystems may ignore it entirely. .Pp .Dv O_NOCTTY may be used to ensure the OS does not assign this file as the @@ -302,16 +359,14 @@ reside in the directory hierarchy beneath the starting directory. Absolute paths or even the temporal escape from beneath of the starting directory is not allowed. .Pp -When -.Fa fd +When a directory is opened with .Dv O_SEARCH , execute permissions are checked at open time. -The -.Fa fd +The returned file descriptor may not be used for any read operations like .Xr getdirentries 2 . -The primary use for this descriptor will be as the lookup descriptor for the +The primary use of this descriptor is as the lookup descriptor for the .Fn *at family of functions. If @@ -319,7 +374,9 @@ If was not requested at open time, then the .Fn *at functions use the current directory permissions for the directory referenced -by the descriptor at the time of the call. +by the descriptor at the time of the +.Fn *at +call. .Pp .Dv O_PATH returns a file descriptor that can be used as a directory file descriptor for @@ -328,9 +385,9 @@ and other system calls taking a file descriptor argument, like .Xr fstatat 2 and others. The other functionality of the returned file descriptor is limited to -the descriptor-level operations. -It can be used for -.Bl -tag -width readlinkat(2) -offset indent -compact +the following descriptor-level operations: +.Pp +.Bl -tag -width __acl_aclcheck_fd -offset indent -compact .It Xr fcntl 2 but advisory locking is not allowed .It Xr dup 2 @@ -344,12 +401,14 @@ socket using a .Dv SCM_RIGHTS message .It Xr kqueue 2 -using for +only with .Dv EVFILT_VNODE .It Xr readlinkat 2 -.It Xr __acl_get_fd 2 , Xr __acl_aclcheck_fd 2 +.It Xr __acl_get_fd 2 +.It Xr __acl_aclcheck_fd 2 .El -But operations like +.Pp +Other operations like .Xr read 2 , .Xr ftruncate 2 , and any other that operate on file and not on file descriptor (except @@ -358,18 +417,19 @@ are not allowed. .Pp A file descriptor created with the .Dv O_PATH -flag can be opened into normal (operable) file descriptor by +flag can be opened as a normal (operable) file descriptor by specifying it as the .Fa fd argument to .Fn openat -with empty +with an empty .Fa path -and flag -.Dv O_EMPTY_PATH . +and the +.Dv O_EMPTY_PATH +flag. Such an open behaves as if the current path of the file referenced by .Fa fd -is passed, except that the path walk permissions are not checked. +is passed, except that path walk permissions are not checked. See also the description of .Dv AT_EMPTY_PATH flag for @@ -380,6 +440,8 @@ If successful, .Fn open returns a non-negative integer, termed a file descriptor. It returns \-1 on failure. +The file descriptor value returned is the lowest numbered descriptor +currently not in use by the process. The file pointer used to mark the current position within the file is set to the beginning of the file. .Pp @@ -394,7 +456,7 @@ A sleeping open of a fifo (see .Xr mkfifo 2 ) is restarted as normal. .Pp -When a new file is created it is given the group of the directory +When a new file is created, it is assigned the group of the directory which contains it. .Pp Unless @@ -405,9 +467,9 @@ the new descriptor is set to remain open across system calls; see .Xr close 2 , .Xr fcntl 2 -and +and the description of the .Dv O_CLOEXEC -description. +flag. .Pp The system imposes a limit on the number of file descriptors open simultaneously by one process. @@ -511,7 +573,7 @@ or is specified but the underlying file system does not support locking. .It Bq Er EOPNOTSUPP The named file is a special file mounted through a file system that -does not support access to it (e.g.\& NFS). +does not support access to it (for example, NFS). .It Bq Er EWOULDBLOCK .Dv O_NONBLOCK and one of @@ -688,7 +750,7 @@ system call is believed to be compatible with .\" .St -p1003.1-2017 , .\" XXX: This should be replaced in the future when an appropriate argument to .\" the St macro is available: -p1003.1-2017 -.No IEEE Std 1003.1-2008, 2017 Edition (\\(LqPOSIX.1\\(Rq) , +.No IEEE Std 1003.1-2008, 2017 Edition ("POSIX.1") , which specifies that behavior for .Dv O_SEARCH , in the absence of the flag the implementation checks the current From nobody Fri Jan 3 15:52:05 2025 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 4YPp3p1Rhgz5k7cD; Fri, 03 Jan 2025 15:52:06 +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 4YPp3n5f0vz4YWw; Fri, 3 Jan 2025 15:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919525; 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=c7G4R6eqgs/7ojv+UTlY39tzcXiYUKyhxd92mACphA0=; b=RATFdhv1oWwLkNUULs5lnPLCPbrzj10ccXKGHIT1ROn8hUJrZCLc8S5rNZ/ESeUKwyz0Mc LWCu9ypuLQ/k0O+0lYWE0KXOP7SW+pRrcLNKwpwBT6TBVtEt4X7C01iEjXuLPrIHAV6mvS I2ejMHH0em0ORUla5y8JSx5oday/t4fEEsCvJTfQ0Z0MQFuZKI72Dm3uzq5KLeCCYbNR9l /0/rsUVpT6ioWYxkBXsqOCH1wc2APodYIewcKLp6A9ilfWvQUNzJJ6/+Mamm+xA9/UUm0X AELstZqUPopp0KR2AW2tVAsUwB0UK5IAdeJ2SR3HUSXNxALk4+3MBheiSgGBdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919525; 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=c7G4R6eqgs/7ojv+UTlY39tzcXiYUKyhxd92mACphA0=; b=hVfjXCqIIWUsdsZr56KoACRSbfGD6bnxzBEyVp6q8JvfsIVO4niGfc7FQxoL+zEo0LXdlW j08rqDERBvjvkTTANV/PvEpJ3oVEob5QR/etB29SoRCNtoAphLlsB1J36z5l1Z5iTiIvau WgpL78baxvNeOODvqrNwPM8fRwi2yEJTK/VQRd8/9DyK3/midEyJHfEzmQVuhby0T8/0nR OG7LmdRYK62Mktwr1CTaN/uHkqdIAIiqmxG/HbVqk0EBzAVQoNBrGmUdFRQlWVIzaLI+kK 9NCPb9fv3D2iS4fnh4kOkVb+x3YrhTgawVba5yf2H5UGKihfR1gxonkwgzIx4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919525; a=rsa-sha256; cv=none; b=vUmw10vfxDtDuSB86dp+CVk9ZTA/TvhJy5wVMUiuH/ZrtdbM9a5EOU4ymxv0SOcXZHaDtU gjUB1QxFiV6xmtUVyGpERXmRRVibWmazou5DKlkkElm+IPmSbyWFBYpSLyi4td+g16RFUi ogKXoBD4iFJDz1Z2obYUj06uTb45r4KqxXYFa8lEOpTxxJ5CJqjRftPj9jcsROXeZ8nrKL 4nYpSJcFIsc84iOGnIFxpZQCI/43Ks+SlCxfa/GWmghvc8BONaimmxzHyLOGNSpCoxTYNS gnDE81evey6PspneVBTV1e21OTJFauRueJiPlj7i9YNPf6WRxbf5lmui6f8FYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp3n5F4gz1S2V; Fri, 03 Jan 2025 15:52:05 +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 503Fq5Dl076260; Fri, 3 Jan 2025 15:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fq5vp076257; Fri, 3 Jan 2025 15:52:05 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:52:05 GMT Message-Id: <202501031552.503Fq5vp076257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ae1cc4182b3f - main - nv.9: Editorial pass 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae1cc4182b3fa6abe4de85ab201a198917dda73a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ae1cc4182b3fa6abe4de85ab201a198917dda73a commit ae1cc4182b3fa6abe4de85ab201a198917dda73a Author: John Baldwin AuthorDate: 2025-01-03 15:51:28 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:51:28 +0000 nv.9: Editorial pass Various rewording tweaks and clarifications to some behavior (e.g. nvlist_size doesn't require calling nvlist_pack first). Reviewed by: pjd Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48256 --- share/man/man9/cnv.9 | 36 ++-- share/man/man9/dnv.9 | 26 +-- share/man/man9/nv.9 | 482 +++++++++++++++++++++++++++++++-------------------- 3 files changed, 330 insertions(+), 214 deletions(-) diff --git a/share/man/man9/cnv.9 b/share/man/man9/cnv.9 index de37c8271eb9..fa5310e174e1 100644 --- a/share/man/man9/cnv.9 +++ b/share/man/man9/cnv.9 @@ -23,14 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 18, 2018 +.Dd January 3, 2025 .Dt CNV 9 .Os .Sh NAME .Nm cnvlist_get , .Nm cnvlist_take , .Nm cnvlist_free -.Nd "API for managing name/value pairs by cookie." +.Nd "API for managing name/value pairs by cookie" .Sh LIBRARY .Lb libnv .Sh SYNOPSIS @@ -115,7 +115,7 @@ The .Nm libnv library permits easy management of name/value pairs and can send and receive them over sockets. -For more information, also see +For more information, see .Xr nv 9 . .Pp The concept of cookies is explained in @@ -128,25 +128,28 @@ from .Pp The .Fn cnvlist_name -function returns the name of an element associated with the given cookie. +function returns the name of an element associated with +.Fa cookie . .Pp The .Fn cnvlist_type -function returns the type of an element associated with the given cookie. +function returns the type of an element associated with +.Fa cookie . Types which can be returned are described in .Xr nv 9 . .Pp The .Nm cnvlist_get -family of functions obtains the value associated with the given cookie. +functions return the value associated with +.Fa cookie . Returned strings, nvlists, descriptors, binaries, or arrays must not be modified -by the user, since they still belong to the nvlist. +by the user since they still belong to the nvlist. The nvlist must not be in an error state. .Pp The .Nm cnvlist_take -family of functions returns the value associated with the given cookie and -removes the element from the nvlist. +functions return the value associated with the given cookie and +remove the element from the nvlist. When the value is a string, binary, or array value, the caller is responsible for freeing the returned memory with .Fn free 3 . @@ -154,18 +157,21 @@ When the value is an nvlist, the caller is responsible for destroying the returned nvlist with .Fn nvlist_destroy . When the value is a descriptor, the caller is responsible for closing the -returned descriptor with the +returned descriptor with .Fn close 2 . .Pp The .Nm cnvlist_free -family of functions removes an element of the supplied cookie and frees all -resources. -If an element of the given cookie has the wrong type or does not exist, the +functions remove the element identified by +.Fa cookie +and free any associated resources. +If the element identified by +.Fa cookie +has the wrong type or does not exist, the program -is aborted. +aborts. .Sh EXAMPLES -The following example demonstrates how to deal with cnvlist API. +The following example demonstrates how to deal with the cnvlist API. .Bd -literal int type; void *cookie, *scookie, *bcookie; diff --git a/share/man/man9/dnv.9 b/share/man/man9/dnv.9 index 8c89d6599801..16f603df8392 100644 --- a/share/man/man9/dnv.9 +++ b/share/man/man9/dnv.9 @@ -23,13 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 26, 2016 +.Dd January 3, 2025 .Dt DNV 9 .Os .Sh NAME .Nm dnvlist_get , .Nm dnvlist_take -.Nd "API for getting name/value pairs. Nonexistent pairs do not raise an error." +.Nd "API for getting name/value pairs with a default value" .Sh LIBRARY .Lb libnv .Sh SYNOPSIS @@ -63,26 +63,32 @@ The .Nm libnv library permits easy management of name/value pairs and can send and receive them over sockets. -For more information, also see +For more information, see .Xr nv 9 . .Pp The .Nm dnvlist_get -family of functions returns the value associated with the specified name. -If an element of the specified name does not exist, the function returns the +functions return the value associated with +.Fa name . +If an element named +.Fa name +does not exist, the function returns the value provided in .Fa defval . Returned strings, nvlists, descriptors, binaries, or arrays must not be modified -by the user. -They still belong to the nvlist. +by the user since they still belong to the nvlist. If the nvlist is in an error state, attempts to use any of these functions will cause the program to abort. .Pp The .Nm dnvlist_take -family of functions returns the value associated with the specified name and -removes the element from the nvlist. -If an element of the supplied name does not exist, the value provided in +functions return the value associated with +.Fa name +and removes the associated element from +.Fa nvl . +If an element named +.Fa name +does not exist, the value provided in .Nm defval is returned. When the value is a string, binary, or array value, the caller is diff --git a/share/man/man9/nv.9 b/share/man/man9/nv.9 index 67c05247fdfb..4e4542c146ef 100644 --- a/share/man/man9/nv.9 +++ b/share/man/man9/nv.9 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 2, 2023 +.Dd January 3, 2025 .Dt NV 9 .Os .Sh NAME @@ -280,11 +280,12 @@ .Sh DESCRIPTION The .Nm libnv -library allows to easily manage name value pairs as well as send and receive +library permits creating and managing name value pairs as well as +sending and receiving them over sockets. A group (list) of name value pairs is called an .Nm nvlist . -The API supports the following data types: +The API supports the following data types for values: .Bl -ohang -offset indent .It Sy null ( NV_TYPE_NULL ) There is no data associated with the name. @@ -330,7 +331,7 @@ The .Fn nvlist_create function allocates memory and initializes an nvlist. .Pp -The following flag can be provided: +The following flags can be provided: .Pp .Bl -tag -width "NV_FLAG_IGNORE_CASE" -compact -offset indent .It Dv NV_FLAG_IGNORE_CASE @@ -342,28 +343,36 @@ Names in the nvlist do not have to be unique. The .Fn nvlist_destroy function destroys the given nvlist. -Function does nothing if -.Dv NULL -nvlist is provided. -Function never modifies the -.Va errno -global variable. +This function does nothing if +.Fa nvl +is +.Dv NULL . +This function never modifies +.Va errno . .Pp The .Fn nvlist_error -function returns any error value that the nvlist accumulated. -If the given nvlist is -.Dv NULL -the +function returns the first error set on +.Fa nvl . +If +.Fa nvl +is not in the error state, +this function returns zero. +If +.Fa nvl +is +.Dv NULL , .Er ENOMEM -error will be returned. +is returned. .Pp The .Fn nvlist_set_error -function sets an nvlist to be in the error state. +function sets an the error value for +.Fa nvl . Subsequent calls to .Fn nvlist_error -will return the given error value. +will return +.Fa error . This function cannot be used to clear the error state from an nvlist. This function does nothing if the nvlist is already in the error state. .Pp @@ -371,16 +380,24 @@ The .Fn nvlist_empty function returns .Dv true -if the given nvlist is empty and +if +.Fa nvl +is empty and .Dv false otherwise. -The nvlist must not be in error state. +The nvlist must not be in the error state. .Pp The .Fn nvlist_flags -function returns flags used to create the nvlist with the -.Fn nvlist_create -function. +function returns the flags used to create +.Fa nvl +with the +.Fn nvlist_create , +.Fn nvlist_recv , +.Fn nvlist_unpack , +or +.Fn nvlist_xfer +functions. .Pp The .Fn nvlist_in_array @@ -392,7 +409,8 @@ is part of an array that is a member of another nvlist. .Pp The .Fn nvlist_clone -functions clones the given nvlist. +function clones +.Fa nvl . The clone shares no resources with its origin. This also means that all file descriptors that are part of the nvlist will be duplicated with the @@ -401,154 +419,170 @@ system call before placing them in the clone. .Pp The .Fn nvlist_dump -dumps nvlist content for debugging purposes to the given file descriptor +function dumps nvlist content for debugging purposes to the file descriptor .Fa fd . .Pp The .Fn nvlist_fdump -dumps nvlist content for debugging purposes to the given file stream +dumps nvlist content for debugging purposes to the file stream .Fa fp . .Pp The .Fn nvlist_size -function returns the size of the given nvlist after converting it to binary -buffer with the +function returns the size of the binary buffer that would be generated by the .Fn nvlist_pack function. .Pp The .Fn nvlist_pack function converts the given nvlist to a binary buffer. -The function allocates memory for the buffer, which should be freed with the +The function allocates memory for the buffer which should be freed with the .Xr free 3 function. If the .Fa sizep argument is not .Dv NULL , -the size of the buffer will be stored there. -The function returns +the size of the buffer is stored there. +This function returns .Dv NULL in case of an error (allocation failure). If the nvlist contains any file descriptors .Dv NULL will be returned. -The nvlist must not be in error state. +The nvlist must not be in the error state. .Pp The .Fn nvlist_unpack -function converts the given buffer to the nvlist. +function converts a binary buffer to a new nvlist. The .Fa flags -argument defines what type of the top level nvlist is expected to be. -Flags are set up using the -.Fn nvlist_create -function. -If the nvlist flags do not match the flags passed to -.Fn nvlist_unpack , -the nvlist will not be returned. -Every nested nvlist list should be checked using -.Fn nvlist_flags -function. -The function returns +argument has the same meaning as the +.Fa flags +argument passed to +.Fn nvlist_create . +If +.Fa flags +do not match the flags used to create the initial nvlist before it was packed, +this function will fail. +The flags of nested nvlists are not validated by this function. +The caller is responsible for validating the flags on any nested nvlists using +.Fn nvlist_flags . +This function returns the new nvlist on success or .Dv NULL in case of an error. .Pp The .Fn nvlist_send -function sends the given nvlist over the socket given by the -.Fa sock -argument. -Note that nvlist that contains file descriptors can only be send over +function sends +.Fa nvl +over the socket +.Fa sock . +Note that nvlists that contain file descriptors can only be sent over .Xr unix 4 domain sockets. .Pp The .Fn nvlist_recv -function receives nvlist over the socket given by the -.Fa sock -argument. -The +function receives an nvlist over the socket +.Fa sock . +As with +.Fn nvlist_unpack , +the .Fa flags -argument defines what type of the top level nvlist is expected to be. -Flags are set up using the -.Fn nvlist_create -function. -If the nvlist flags do not match the flags passed to -.Fn nvlist_recv , -the nvlist will not be returned. -Every nested nvlist list should be checked using -.Fn nvlist_flags -function. +argument is used to construct the new nvlist and must match the flags used +to construct the original nvlist written to +.Fa sock +by the peer. +The flags of nested nvlists are not validated by this function. +The caller is responsible for validating the flags on any nested nvlists using +.Fn nvlist_flags . +This function returns the new nvlist on success or +.Dv NULL +in case of an error. .Pp The .Fn nvlist_xfer -function sends the given nvlist over the socket given by the +function sends +.Fa nvl +over the socket .Fa sock -argument and receives nvlist over the same socket. +argument and then receives a new nvlist over the same socket. The .Fa flags -argument defines what type of the top level nvlist is expected to be. -Flags are set up using the -.Fn nvlist_create -function. -If the nvlist flags do not match the flags passed to -.Fn nvlist_xfer , -the nvlist will not be returned. -Every nested nvlist list should be checked using -.Fn nvlist_flags -function. -The given nvlist is always destroyed. +argument applies to the new nvlist similar to +.Fn nvlist_recv . +The nvlist +.Fa nvl +is always destroyed. +This function returns the new nvlist on success or +.Dv NULL +in case of an error. .Pp The .Fn nvlist_next -function iterates over the given nvlist returning names and types of subsequent +function iterates over +.Fa nvl +returning the names and types of subsequent elements. The .Fa cookiep -argument allows the function to figure out which element should be returned -next. -The +argument determines which element is returned. +If .Va *cookiep -should be set to -.Dv NULL -for the first call and should not be changed later. -Returning +is +.Dv NULL , +the values for the first element in the list are returned. +Otherwise, +.Va *cookiep +should contain the result of a prior call to +.Fn nvlist_next +in which case values for the next element from +.Fa nvl +are returned. +This function returns .Dv NULL -means there are no more elements on the nvlist. +when there are no more elements on +.Fa nvl . The .Fa typep -argument can be NULL. -Elements may not be removed from the nvlist while traversing it. -The nvlist must not be in error state. -Note that -.Fn nvlist_next -will handle -.Va cookiep -being set to +argument can be .Dv NULL . -In this case first element is returned or -.Dv NULL -if nvlist is empty. -This behavior simplifies removing the first element from the list. +Elements may not be removed from +.Fa nvl +the nvlist while traversing it. +.Fa nvl +must not be in the error state. +Additional actions can be performed on an element identified by a cookie +via the +.Xr cnv 9 +API . .Pp The .Fn nvlist_exists function returns .Dv true -if element of the given name exists (besides of its type) or +if an element named +.Fa name +exists in +.Fa nvl +(regardless of type) or .Dv false otherwise. -The nvlist must not be in error state. +The nvlist must not be in the error state. .Pp The .Fn nvlist_exists_type function returns .Dv true -if element of the given name and the given type exists or +if an element named +.Fa name +of type +.Fa type +exists or .Dv false otherwise. -The nvlist must not be in error state. +The nvlist must not be in the error state. .Pp The .Fn nvlist_exists_null , @@ -565,11 +599,13 @@ The .Fn nvlist_exists_descriptor_array functions return .Dv true -if element of the given name and the given type determined by the function name +if element named +.Fa name +with the type determined by the function name exists or .Dv false otherwise. -The nvlist must not be in error state. +The nvlist must not be in the error state. .Pp The .Fn nvlist_add_null , @@ -586,18 +622,23 @@ The .Fn nvlist_add_string_array , .Fn nvlist_add_nvlist_array , .Fn nvlist_add_descriptor_array -functions add element to the given nvlist. -When adding string or binary buffer the functions will allocate memory -and copy the data over. -When adding nvlist, the nvlist will be cloned and clone will be added. -When adding descriptor, the descriptor will be duplicated using the +functions add an element to +.Fa nvl . +When adding a string or binary buffer, these functions allocate memory +and copy the data. +When adding an nvlist, the +.Fa value +nvlist is cloned and the clone is added to +.Fa nvl . +When adding a file descriptor, the descriptor is duplicated via the .Xr dup 2 -system call and the new descriptor will be added. -The array functions will fail if there are any +system call and the new file descriptor is added. +The array functions fail if there are any .Dv NULL elements in the array, or if the array pointer is .Dv NULL . -If an error occurs while adding new element, internal error is set which can be +If an error occurs while adding a new element, +an internal error is set which can be examined using the .Fn nvlist_error function. @@ -612,17 +653,27 @@ The .Fn nvlist_move_string_array , .Fn nvlist_move_nvlist_array , .Fn nvlist_move_descriptor_array -functions add new element to the given nvlist, but unlike +functions add an element to +.Fa nvl , +but unlike the .Fn nvlist_add_ -functions they will consume the given resource. -In the case of strings, descriptors, or nvlists every elements must be -unique, or it could cause a double free. -The array functions will fail if there are any +functions they consume the given resource. +For string, file descriptor, binary buffer, or nvlist values, +no value should be moved into an nvlist multiple times; +doing so will cause that value to be freed multiple times. +Note that strings or binary buffers must be allocated with +.Xr malloc 3 , +and the pointers will be released via +.Xr free 3 +when +.Fa nvl +is destroyed. +The array functions fail if there are any .Dv NULL elements, or if the array pointer is .Dv NULL . If an error occurs while adding new element, the resource is destroyed and -internal error is set which can be examined using the +an internal error is set which can be examined using the .Fn nvlist_error function. .Pp @@ -638,37 +689,61 @@ The .Fn nvlist_get_string_array , .Fn nvlist_get_nvlist_array , .Fn nvlist_get_descriptor_array -functions return the value that corresponds to the given key name. -In the case of strings, nvlists, descriptors, binary, or arrays, the returned -resource should not be modified - they still belong to the nvlist. -If an element of the given name does not exist, the program will be aborted. -To avoid this, the caller should check for the existence of the name before -trying to obtain the value, or use the -.Xr dnvlist 3 -extension, which can provide a default value in the case of a missing element. -The nvlist must not be in error state. +functions return the value of the first element in +.Fa nvl +named +.Fa name . +For string, nvlist, file descriptor, binary buffer, or array values, +the returned resource must not be modified - it still belongs to +.Fa nvl . +.Pp +If an element named +.Fa name +does not exist, the program aborts. +To avoid this, the caller should check for the existence of the element before +trying to obtain the value or use the +.Xr dnv 9 +extension which provides a default value in the case of a missing element. +.Pp +The nvlist must not be in the error state. .Pp The .Fn nvlist_get_parent -function returns the parent nvlist of the nested nvlist. +function returns the parent nvlist of +.Fa nvl . .Pp The .Fn nvlist_get_array_next -function returns the next element from the array or -.Dv NULL -if the nvlist is not in array or it is the last element. -Note that -.Fn nvlist_get_array_next -only works if you added the nvlist array using the -.Fn nvlist_move_nvlist_array +function returns the next element after +.Fa nvl +from an array of nvlists. +If +.Fa nvl +is not in an array of nvlists or it is the last element, +this function returns +.Dv NULL . +An nvlist is only in an nvlist array if it was added to an nvlist array using +.Fn nvlist_add_nvlist_array , +.Fn nvlist_append_nvlist_array , or -.Fn nvlist_add_nvlist_array -functions. +.Fn nvlist_move_nvlist_array . .Pp The .Fn nvlist_get_pararr -function returns the next element in the array, or if not available -the parent of the nested nvlist. +function returns the next element after +.Fn nvl +from an array of nvlists. +If +.Fn nvl +is the last element in an array of nvlists, +the parent nvlist of +.Fa nvl is +returned. +If +.Fn nvl +is not in an array of nvlists, +.Dv NULL +is returned. .Pp The .Fn nvlist_take_bool , @@ -682,42 +757,38 @@ The .Fn nvlist_take_string_array , .Fn nvlist_take_nvlist_array , .Fn nvlist_take_descriptor_array -functions return value associated with the given name and remove the element -from the nvlist. -In case of string and binary values, the caller is responsible for free returned -memory using the +functions return the value of the element named +.Fa name +and remove the element from +.Fa nvl . +For string and binary buffer values, the caller is responsible for freeing +the returned value using the .Xr free 3 function. -In case of nvlist, the caller is responsible for destroying returned nvlist +For nvlist values, the caller is responsible for destroying the returned nvlist using the .Fn nvlist_destroy function. -In case of descriptor, the caller is responsible for closing returned descriptor +For file descriptor values, the caller is responsible for closing the +returned descriptor using the .Fn close 2 system call. -If an element of the given name does not exist, the program will be aborted. -To avoid that the caller should check for the existence of the given name -before trying to obtain the value, or use the -.Xr dnvlist 3 -extension, which can provide a default value in the case of a missing element. -In the case of an array of strings or binary values, the caller is responsible -for freeing every element of the array using the -.Xr free 3 -function. -In the case of an array of nvlists, the caller is responsible for destroying -every element of array using the -.Fn nvlist_destroy -function. -In the case of descriptors, the caller is responsible for closing every -element of array using the -.Fn close 2 -system call. -In every case involving an array, the caller must also free the pointer to -the array using the +For array values, the caller is responsible for destroying every element of +the array based on the element type. +In addition, the caller must also free the pointer to the array using the .Xr free 3 function. -The nvlist must not be in error state. +.Pp +If an element named +.Fa name +does not exist, the program aborts. +To avoid this, the caller should check for the existence of the element before +trying to obtain the value or use the +.Xr dnv 9 +extension which provides a default value in the case of a missing element. +.Pp +The nvlist must not be in the error state. .Pp The .Fn nvlist_append_bool_array , @@ -725,28 +796,46 @@ The .Fn nvlist_append_string_array , .Fn nvlist_append_nvlist_array , .Fn nvlist_append_descriptor_array -functions append an element to the existing array using the same semantics -as the add functions (i.e. the element will be copied when applicable). -If the array for a given key does not exist, then it will be created +functions append an element to an existing array using the same semantics +as the add functions (that is, the element will be copied when applicable). +If the array named +.Fa name +does not exist, then it will be created as if using the .Fn nvlist_add__array function. -The internal error is set on append failure. +If an error occurs while appending a new element, +an internal error is set on +.Fa nvl . .Pp The .Fn nvlist_free -function removes element of the given name from the nvlist (besides of its type) +function removes the first element named +.Fa name +from +.Fa nvl +(regardless of type) and frees all resources associated with it. -If element of the given name does not exist, the program will be aborted. -The nvlist must not be in error state. +If no element named +.Fa name +exists, the program aborts. +The nvlist must not be in the error state. .Pp The .Fn nvlist_free_type -function removes element of the given name and the given type from the nvlist +function removes the first element named +.Fa name +of type +.Fa type +from +.Fa nvl and frees all resources associated with it. -If element of the given name and the given type does not exist, the program -will be aborted. -The nvlist must not be in error state. +If no element named +.Fa name +of type +.Fa type +exists, the program aborts. +The nvlist must not be in the error state. .Pp The .Fn nvlist_free_null , @@ -761,20 +850,31 @@ The .Fn nvlist_free_string_array , .Fn nvlist_free_nvlist_array , .Fn nvlist_free_descriptor_array -functions remove element of the given name and the given type determined by the -function name from the nvlist and free all resources associated with it. -If element of the given name and the given type does not exist, the program -will be aborted. -The nvlist must not be in error state. +functions remove the first element named +.Fa name +with the type determined by the function name from +.Fa nvl +free all resources associated with it. +If no element named +.Fa name +with the appropriate type exists, the program aborts. +The nvlist must not be in the error state. .Sh NOTES The .Fn nvlist_pack and .Fn nvlist_unpack -functions handle the byte-order conversions, so the binary buffer can be -packed/unpacked by the hosts with the different endianness. +functions handle byte-order conversions, so binary buffers can be +packed and unpacked on hosts with different endianness. +.Pp +The +.Fn nvlist_recv , +.Fn nvlist_send , +and +.Fn nvlist_xfer +functions can transfer nvlists between hosts with different endianness. .Sh EXAMPLES -The following example demonstrates how to prepare an nvlist and send it over +The following example demonstrates how to prepare an nvlist and send it over a .Xr unix 4 domain socket. .Bd -literal @@ -786,16 +886,18 @@ if (fd < 0) err(1, "open(\\"/tmp/foo\\") failed"); nvl = nvlist_create(0); + /* - * There is no need to check if nvlist_create() succeeded, + * There is no need to check if nvlist_create() succeeded * as the nvlist_add_() functions can cope. * If it failed, nvlist_send() will fail. */ nvlist_add_string(nvl, "filename", "/tmp/foo"); nvlist_add_number(nvl, "flags", O_RDONLY); + /* * We just want to send the descriptor, so we can give it - * for the nvlist to consume (that's why we use nvlist_move + * for the nvlist to consume (that is why we use nvlist_move * not nvlist_add). */ nvlist_move_descriptor(nvl, "fd", fd); @@ -806,7 +908,7 @@ if (nvlist_send(sock, nvl) < 0) { nvlist_destroy(nvl); .Ed .Pp -Receiving nvlist and getting data: +Receiving an nvlist and retrieving element values: .Bd -literal nvlist_t *nvl; const char *command; @@ -817,25 +919,27 @@ nvl = nvlist_recv(sock, 0); if (nvl == NULL) err(1, "nvlist_recv() failed"); -/* For command we take pointer to nvlist's buffer. */ +/* For command we accept a pointer to the nvlist's internal buffer. */ command = nvlist_get_string(nvl, "command"); + /* * For filename we remove it from the nvlist and take * ownership of the buffer. */ filename = nvlist_take_string(nvl, "filename"); -/* The same for the descriptor. */ + +/* The same for the file descriptor. */ fd = nvlist_take_descriptor(nvl, "fd"); printf("command=%s filename=%s fd=%d\n", command, filename, fd); +/* command is freed by nvlist_destroy() */ nvlist_destroy(nvl); free(filename); close(fd); -/* command was freed by nvlist_destroy() */ .Ed .Pp -Iterating over nvlist: +Iterating over an nvlist: .Bd -literal nvlist_t *nvl; const char *name; @@ -898,7 +1002,7 @@ nvl = nvlist_recv(sock, 0); if (nvl == null) err(1, "nvlist_recv() failed"); -cookie = null; +cookie = NULL; do { while ((name = nvlist_next(nvl, &type, &cookie)) != NULL) { if (type == NV_TYPE_NVLIST) { From nobody Fri Jan 3 15:52:06 2025 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 4YPp3q05Jlz5k7yd; Fri, 03 Jan 2025 15:52:07 +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 4YPp3p6YFPz4YYJ; Fri, 3 Jan 2025 15:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919526; 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=xG0+HWaw7VX3sUaeWnhWkN5FVGdpPIDSD+GSI7cuxNU=; b=gR3B42AdELmrIQ3MYpQpCHbDkZuyEEx9dxREzOX+f7llE5SB26TPb9sQT7GD/4Wm76SOsj Jf8QlX44+XBzpfxR6jebkp2dN9hnYyasGnSg/Tywa8BE7UP6kk1Hb/YE/1B7RvWEhexrFr cxgSLkUQrAn9Vil/n+o2MTnH8NWxvAB1maCi727A2hCOHEqMmi2r+oLPJoVm0oEbu+cs5O //B+b6yx+Z2XmZm6z9qB5cThB0xYI5mCIA2+JQp/SWIHNvEF0tiM21hzpxDvCQ5Qx3VWgJ eL8NjMeG2udASlewyfTxEMBIe9Py6b/rZiyai9Ia6NwliJp9SyJ4+D+xGsJ/tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735919526; 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=xG0+HWaw7VX3sUaeWnhWkN5FVGdpPIDSD+GSI7cuxNU=; b=a4WCiOF/hIvdEPhpFamWUvdpSLZ5fDtxP2+agxeOCWZ0Gks5KdX7FU2mkw4E199GNa/S7K AbuGpC3RW3Oi4wkpMBWYvodlfxMdH/7Rm/CfL0yrVOfOZo7ZvILvpIlTD8PzJpMuD+h9KN mHh8jc3H3Ls6a3y5cFFheXFtenUoN2f3dKXdZhas7DoNFEDqws1pSL+N1MdNDF1cKDDewi NpHmwW+ZYvHCMpoLVBRKR4v3kwlzHQ17qL81OYnXDpoGq8iioDiOPyoNFzryu4qrrDQxrQ rVbPUssg9H1zPlhvMSLopT/k8f6sGgFgjNHqgkR7cxeGXb/jZsXkgLfwl7vjMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735919526; a=rsa-sha256; cv=none; b=iYwoPJe5radzPhDWlsog8owh9mfpEdOaHxLR+Y9vbU7+LIAgI2Z+cO78iwv7Y4h3vzclXX erqNlNYZ4syz8cBuUjmfiXbJapjQq/xyJtV1qQjio8HYbTcUmGvvRPzrVggLIpsDFhJiNs FJRRFfkycobXOMJXO+a1fPr4gZfMv0IfrTxFjwYXHcS10VJH1dzmjxPLOeKBfRAva7NPWw ydPwOIeNDCYCMZtpTbnGZg62QNB9QL3auLngrZsCgSKCUQGHGAdytUpwk1GgWseme2CfwC xl8FQuL1DxX7QexFhdR32sRM6I68+a936MXjjvTM4ASOxS7gwVRrzzVFenVh7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPp3p64V0z1RlZ; Fri, 03 Jan 2025 15:52:06 +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 503Fq6sM076320; Fri, 3 Jan 2025 15:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Fq6PV076317; Fri, 3 Jan 2025 15:52:06 GMT (envelope-from git) Date: Fri, 3 Jan 2025 15:52:06 GMT Message-Id: <202501031552.503Fq6PV076317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ecb5fe3c5e48 - main - nv.9: Add a new subsection documenting kernel-specific behavior 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecb5fe3c5e483e09544645ba84281b4a8cba4edf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ecb5fe3c5e483e09544645ba84281b4a8cba4edf commit ecb5fe3c5e483e09544645ba84281b4a8cba4edf Author: John Baldwin AuthorDate: 2025-01-03 15:51:51 +0000 Commit: John Baldwin CommitDate: 2025-01-03 15:51:51 +0000 nv.9: Add a new subsection documenting kernel-specific behavior Reviewed by: emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48257 --- share/man/man9/nv.9 | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/share/man/man9/nv.9 b/share/man/man9/nv.9 index 4e4542c146ef..8c99f1d12200 100644 --- a/share/man/man9/nv.9 +++ b/share/man/man9/nv.9 @@ -859,7 +859,7 @@ If no element named .Fa name with the appropriate type exists, the program aborts. The nvlist must not be in the error state. -.Sh NOTES +.Ss Notes The .Fn nvlist_pack and @@ -873,6 +873,36 @@ The and .Fn nvlist_xfer functions can transfer nvlists between hosts with different endianness. +.Ss Kernel Considerations +The +.Nm nv , +.Nm cnv , +and +.Nm dnv +APIs can be used in the kernel with the following differences: +.Bl -bullet +.It +File descriptor and file descriptor array value types are not supported. +.It +.Fn nvlist_recv , +.Fn nvlist_send , +and +.Fn nvlist_xfer +are not supported. +.It +All memory allocations use the +.Dv M_NVLIST +memory type with +.Xr malloc 9 +and +.Xr free 9 . +As a result, any allocated buffers moved into an nvlist must be allocated with +.Dv M_NVLIST , +and buffers returned by functions such as +.Fn nvlist_pack +must be freed with +.Dv M_NVLIST . +.El .Sh EXAMPLES The following example demonstrates how to prepare an nvlist and send it over a .Xr unix 4 From nobody Fri Jan 3 16:03:26 2025 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 4YPpJt5988z5k8VF; Fri, 03 Jan 2025 16:03:26 +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 4YPpJt4gyPz4ZjQ; Fri, 3 Jan 2025 16:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735920206; 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=bau2CbsfELNyOuiEEGLS1gjnlisquK1xXAV4nss4AnM=; b=k/qM9b0EEABItkZ8TpI8z+ozfMV3AJinnI/fCO4aDdWJl6gWaEClg1cMwbqsi1ctasQ2QX 088iisLzQIP+qc1KAZlJ63vGQWVdQ8/uWBGMjZvUKC5eVKGcy9UK/uVsWO7+dJsknuzwcs roiOVUGxe8u9TnKSE1Jyx5wARpN/usVklMm9f4QXqOzcfE3N4zl6trSi1oRsybWGsTIyme IXaXp4eR1i6xkSxVLaPqJ0hbynoH4jy/oMHpoVQ8S/V8fZK/yVYGWrcixpmHVT1z8dddKX 2VhURDV2rdJqe8BGRb5TFZE3Cx5RSzm77uMIIKbZEFJYCdwdsZumgi1xZKhJyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735920206; 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=bau2CbsfELNyOuiEEGLS1gjnlisquK1xXAV4nss4AnM=; b=yFK0s1FBpEhjRhsCwg00HK8PAgcR20c/XdqYa5zYoQcJeukQXIpIVgGmEGq3yYMuxIEsmI v6Mu1dEJRqBBff24rrlwunCI0AmuvXcuBU7yp9WfJvTSSUCKDsOtBVQopgE18qodEjKBUc XLYQ34rmawPtooZY4Hl9LxwNwEtRoABrBSLWvoBRuRLOaUHeEKzpMHKK8xqKHSKo/VvLA+ E99ZdYOZRYLfLTZ3T7718AnKNhmI0hTKtCi6flZi/iKBPwL7/XKUqBQQVMnF11XZPZq8ua PtsHYKck/Vl9hUfizveeBLkKTDNhQvCfopDJnH8/eJalqfRTNnN9w7ypLhEjLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735920206; a=rsa-sha256; cv=none; b=RVZ++EIM9LEF3tVNmeDuGJd+vNPi4GSmljjhXCnefK0aoz8GpXxd7OVxhBgQ/vJFqkyeIG zuavI9yikoxWSqww1wxTcDO68BEtgGR+1KwFlKYANSNcj3bH71VyEq1zFKK1SBbfV8ECJ1 171VMdlupr6VMmjihHk5OjWfn9Rd6FlDYSI5o5HNY9kVKj2lSyU2QrEVRIH6xberRr4N+/ JU43dHci2It9zugycO5y0IrDv+cULs0kmB0kwovbs3wsZyutWZBZMf8cF1jDofaf0+yz03 lH0wjbvcjlC81XRRs3jd5gqSqes8dyuSK6JJ7rd3kURtUaVSSld2vvVOuwo+/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPpJt3zMNz1Rnl; Fri, 03 Jan 2025 16:03:26 +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 503G3QQQ098352; Fri, 3 Jan 2025 16:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503G3QKI098349; Fri, 3 Jan 2025 16:03:26 GMT (envelope-from git) Date: Fri, 3 Jan 2025 16:03:26 GMT Message-Id: <202501031603.503G3QKI098349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9c87cbbcaaed - main - cpu_machdep.9: New manpage describing the semantics of several cpu_* 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c87cbbcaaedbc4e07d5c9d0248bf76f72531f57 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c87cbbcaaedbc4e07d5c9d0248bf76f72531f57 commit 9c87cbbcaaedbc4e07d5c9d0248bf76f72531f57 Author: John Baldwin AuthorDate: 2025-01-03 16:02:43 +0000 Commit: John Baldwin CommitDate: 2025-01-03 16:02:43 +0000 cpu_machdep.9: New manpage describing the semantics of several cpu_* This page is not exhaustive but covers all of the MD interface functions currently declared in . Requested by: kib Reviewed by: kib Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D48022 --- share/man/man9/Makefile | 21 +++ share/man/man9/cpu_machdep.9 | 397 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 418 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 60f994edfd9f..91a7bbe294fa 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -68,6 +68,7 @@ MAN= accept_filter.9 \ contigmalloc.9 \ copy.9 \ counter.9 \ + cpu_machdep.9 \ cpuset.9 \ cr_bsd_visible.9 \ cr_cansee.9 \ @@ -907,6 +908,26 @@ MLINKS+=counter.9 counter_u64_alloc.9 \ counter.9 SYSCTL_ADD_COUNTER_U64.9 \ counter.9 SYSCTL_COUNTER_U64_ARRAY.9 \ counter.9 SYSCTL_ADD_COUNTER_U64_ARRAY.9 +MLINKS+=cpu_machdep.9 cpu_copy_thread.9 \ + cpu_machdep.9 cpu_exec_vmspace_reuse.9 \ + cpu_machdep.9 cpu_exit.9 \ + cpu_machdep.9 cpu_fetch_syscall_args.9 \ + cpu_machdep.9 cpu_fork.9 \ + cpu_machdep.9 cpu_fork_kthread_handler.9 \ + cpu_machdep.9 cpu_idle.9 \ + cpu_machdep.9 cpu_idle_wakeup.9 \ + cpu_machdep.9 cpu_procctl.9 \ + cpu_machdep.9 cpu_ptrace.9 \ + cpu_machdep.9 cpu_set_syscall_retval.9 \ + cpu_machdep.9 cpu_set_upcall.9 \ + cpu_machdep.9 cpu_set_user_tls.9 \ + cpu_machdep.9 cpu_switch.9 \ + cpu_machdep.9 cpu_sync_core.9 \ + cpu_machdep.9 cpu_thread_alloc.9 \ + cpu_machdep.9 cpu_thread_clean.9 \ + cpu_machdep.9 cpu_thread_exit.9 \ + cpu_machdep.9 cpu_thread_free.9 \ + cpu_machdep.9 cpu_throw.9 MLINKS+=cpuset.9 CPUSET_T_INITIALIZER.9 \ cpuset.9 CPUSET_FSET.9 \ cpuset.9 CPU_CLR.9 \ diff --git a/share/man/man9/cpu_machdep.9 b/share/man/man9/cpu_machdep.9 new file mode 100644 index 000000000000..9ab42807eac1 --- /dev/null +++ b/share/man/man9/cpu_machdep.9 @@ -0,0 +1,397 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 (holder) +.\" +.\" This software was developed by SRI International, the University of +.\" Cambridge Computer Laboratory (Department of Computer Science and +.\" Technology), and Capabilities Limited under Defense Advanced Research +.\" Projects Agency (DARPA) Contract No. FA8750-24-C-B047 ("DEC"). +.\" +.Dd January 3, 2025 +.Dt cpu_machdep 9 +.Os +.Sh NAME +.Nm cpu_machdep , +.Nm cpu_copy_thread , +.Nm cpu_exec_vmspace_reuse , +.Nm cpu_exit , +.Nm cpu_fetch_syscall_args , +.Nm cpu_fork , +.Nm cpu_fork_kthread_handler , +.Nm cpu_idle , +.Nm cpu_idle_wakeup , +.Nm cpu_procctl , +.Nm cpu_set_syscall_retval , +.Nm cpu_set_upcall , +.Nm cpu_set_user_tls , +.Nm cpu_switch , +.Nm cpu_sync_core , +.Nm cpu_thread_alloc , +.Nm cpu_thread_clean , +.Nm cpu_thread_exit , +.Nm cpu_thread_free , +.Nm cpu_throw +.Nd machine-dependent interfaces to handle CPU and thread state +.Sh SYNOPSIS +.In sys/proc.h +.In sys/ptrace.h +.Ft void +.Fn cpu_copy_thread "struct thread *td" "struct thread *td0" +.Ft bool +.Fn cpu_exec_vmspace_reuse "struct proc *p" "struct vm_map *map" +.Ft void +.Fn cpu_exit "struct thread *td" +.Ft int +.Fn cpu_fetch_syscall_args "struct thread *td" +.Ft void +.Fo cpu_fork +.Fa "struct thread *td1" "struct proc *p2" "struct thread *td2" "int flags" +.Fc +.Ft void +.Fo cpu_fork_kthread_handler +.Fa "struct thread *td" "void (*func)(void *)" "void *arg" +.Fc +.Ft void +.Fn cpu_idle "int busy" +.Ft int +.Fn cpu_idle_wakeup "int cpu" +.Ft int +.Fo cpu_procctl +.Fa "struct thread *td" "int idtype" "id_t id" "int com" "void *data" +.Fc +.Ft int +.Fn cpu_ptrace "struct thread *_td" "int req" "void *addr" "int data" +.Ft void +.Fn cpu_set_syscall_retval "struct thread *td" "int error" +.Ft int +.Fo cpu_set_upcall +.Fa "struct thread *td" "void (*entry)(void *)" "void *arg" "stack_t *stack" +.Fc +.Ft int +.Fn cpu_set_user_tls "struct thread *td" "void *tls_base" +.Ft void +.Fn cpu_switch "struct thread *old" "struct thread *new" "struct mtx *mtx" +.Ft void +.Fn cpu_sync_core "void" +.Ft void +.Fn cpu_thread_alloc "struct thread *td" +.Ft void +.Fn cpu_thread_clean "struct thread *td" +.Ft void +.Fn cpu_thread_exit "struct thread *td" +.Ft void +.Fn cpu_thread_free "struct thread *td" +.Ft void +.Fn cpu_throw "struct thread *old" "struct thread *new" +.Sh DESCRIPTION +These functions provide architecture-specific implementations of +machine-independent abstractions. +.Pp +.Fn cpu_exec_vmspace_reuse +returns true if +.Fn exec_new_vmspace +can reuse an existing +.Vt struct vmspace +.Pq Fa map +for the process +.Fa p +during +.Xr execve 2 . +This is only invoked if +.Fa map +is not shared with any other consumers. +If this returns false, +.Fn exec_new_vmspace +will create a new +.Vt struct vmspace . +.Pp +.Fn cpu_exit +releases machine-dependent resources other than the address space for the +process containing +.Fa td +during process exit. +.Pp +.Fn cpu_fork +copies and updates machine-dependent state +(for example, the pcb and user registers) from the forking thread +.Fa td1 +in an existing process to the new thread +.Fa td2 +in the new process +.Fa p2 . +This function must set up the new thread's kernel stack and pcb so that +.Fa td2 +calls +.Fn fork_exit +when it begins execution passing a pointer to +.Fn fork_return +as the +.Fa callout +argument and +.Fa td2 +as the +.Fa arg +argument. +.Pp +.Fn cpu_fork_kthread_handler +adjusts a new thread's initial pcb and/or kernel stack to pass +.Fa func +and +.Fa arg +as the +.Fa callout +and +.Fa arg +arguments to +.Fn fork_exit . +This must be called before a new thread is scheduled to run and is +used to set the +.Dq main +function for kernel threads. +.Pp +.Fn cpu_copy_thread +copies machine-dependent state (for example, the pcb and user registers) from +.Fa td +to +.Fa td0 +when creating a new thread in the same process. +This function must set up the new thread's kernel stack and pcb so that +.Fa td0 +calls +.Fn fork_exit +when it begins execution passing a pointer to +.Fn fork_return +as the +.Fa callout +argument and +.Fa td0 +as the +.Fa arg +argument. +.Pp +.Fn cpu_set_upcall +updates a new thread's initial user register state to call +.Fa entry +with +.Fa arg +as the sole argument using the user stack described in +.Fa stack . +.Pp +.Fn cpu_set_user_tls +sets a new thread's initial user thread pointer register to +reference the user TLS base pointer +.Fa tls_base . +.Pp +.Fn cpu_fetch_syscall_args +fetches the current system call arguments for the native FreeBSD ABI from the +current thread's user register state and/or user stack. +The arguments are saved in the +.Fa td_sa +member of +.Fa td . +.Pp +.Fn cpu_set_syscall_retval +updates the user register state for +.Fa td +to store system call error and return values. +If +.Fa error +is 0, +indicate success and return the two values in +.Fa td_retval . +If +.Fa error +is +.Dv ERESTART, +adjust the user PC to re-invoke the current system call after returning +to user mode. +If +.Fa error +is +.Dv EJUSTRETURN , +leave the current user register state unchanged. +For any other value of +.Fa error , +indicate error and return +.Fa error +as the error code. +.Pp +.Fn cpu_idle +waits for the next interrupt to occur on the current CPU. +If an architecture supports low power idling, +this function should place the CPU into a low power state while waiting. +.Fa busy +is a hint from the scheduler. +If +.Fa busy +is non-zero, +the scheduler expects a short sleep, +so the CPU should prefer low-latency over maximum power savings. +If +.Fa busy +is zero, +the CPU should maximumize power savings including deferring unnecessary +clock interrupts via +.Fn cpu_idleclock . +.Pp +.Fn cpu_idle_wakeup +awakens the idle CPU with the ID +.Fa cpu +from a low-power state. +.Pp +.Fn cpu_procctl +handles any machine-dependent +.Xr procctl 2 +requests. +.Pp +.Fn cpu_ptrace +handles any machine-dependent +.Xr ptrace 2 +requests. +.Pp +.Fn cpu_switch +switches the current CPU between threads by swapping register state. +This function saves the current CPU register state in the pcb of +.Fa old +and loads register values from the pcb of +.Fa new +before returning. +While the pcb generally contains caller-save kernel register state, +it can also contain user registers that are not saved in the trapframe. +.Pp +After saving the current CPU register state of +.Fa old , +.Fn cpu_switch +stores +.Fa mtx +in the +.Fa td_lock +member of +.Fa old +transferring ownership of the old thread. +No data belonging to +.Fa old +can be accessed after that store. +Specifically, the old thread's kernel stack must not be accessed after +this point. +.Pp +When +.Dv SCHED_ULE +is being used, +this function must wait (via spinning) for the +.Fa td_lock +member of +.Fa new +to change to a value not equal to +.Va &blocked_lock +before loading register values from +.Fa new +or accessing its kernel stack. +.Pp +From the caller's perspective, +.Fn cpu_switch +returns when +.Fa old +is rescheduled in the future, +possibly on a different CPU. +However, the implementation of +.Fn cpu_switch +returns immediately on the same CPU into the previously-saved context of +.Fa new . +.Pp +.Fn cpu_throw +is similar to +.Fn cpu_switch +but does not save any state for +.Fa old +or write to the old thread's +.Fa td_lock +member. +.Pp +.Fn cpu_sync_core +ensures that all possible speculation and out-of-order execution is +serialized on the current CPU. +Note that this is called from an IPI handler so only has to handle +additional serialization beyond that provided by handling an IPI. +.Ss Thread Object Lifecycle +These functions support the management of machine-dependent thread +state in conjunction with a thread object's lifecycle. +.Pp +The general model is that a thread object is allocated each time a +new kernel thread is created either by system calls like +.Xr fork 2 +or +.Xr thr_new 2 +or when kernel-only threads are created via +.Xr kproc_create 9 , +.Xr kproc_kthread_add 9 , +or +.Xr kthread_add 9 . +When a kernel thread exits, +the thread object is freed. +However, there is one special case to support an optimization where each +free process object caches a thread object. +When a process exits, the last thread object is not freed but remains +attached to the process. +When the process object is later reused for a new process in +.Xr fork 2 , +the kernel recycles that last thread object and uses it as the initial +thread in the new process. +When a thread is recycled, some of the steps in the thread allocation +and free cycle are skipped as an optimization. +.Pp +.Fn cpu_thread_alloc +initializes machine-dependent fields in +.Fa td +after allocating a new kernel stack. +This function typically sets the +.Fa td_pcb +and initial +.Fa td_frame +pointers. +.Fn cpu_thread_alloc +is called both when allocating a new thread object and +when a recycled thread allocates a new kernel stack. +Note that this function is +.Em not +called if a recycled thread reuses its existing kernel stack. +.Pp +.Fn cpu_thread_clean +releases any machine-dependent resources for the last thread in a +process during +.Xr wait 2 . +The thread is a candidate for recycling so should be reset to run as a +new thread in case it is recycled by a future +.Xr fork 2 . +.Pp +.Fn cpu_thread_exit +cleans any machine-dependent state in +.Fa td +while it is exiting. +This is called by the exiting thread so cannot free state needed during +in-kernel execution. +.Pp +.Fn cpu_thread_free +releases any machine-dependent state in +.Fa td +when it is being freed. +This is called for any thread that was not the last thread in a process +once it has finished execution. +.Sh SEE ALSO +.Xr fork 2 , +.Xr procctl 2 , +.Xr ptrace 2 , +.Xr thr_new 2 , +.Xr wait 2 , +.Xr kproc_create 9 , +.Xr kproc_kthread_add 9 , +.Xr kthread_add 9 , +.Xr mi_switch 9 +.Sh AUTHORS +This manual page was +developed by SRI International, the University of Cambridge Computer +Laboratory (Department of Computer Science and Technology), and +Capabilities Limited under contract +.Pq FA8750-24-C-B047 +.Pq Do DEC Dc . From nobody Fri Jan 3 16:03:27 2025 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 4YPpJv6kDFz5k82L; Fri, 03 Jan 2025 16:03:27 +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 4YPpJv5MLyz4Zqq; Fri, 3 Jan 2025 16:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735920207; 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=hZewaFmqd2OAWUFygCrd2K3z3TMc4GBpzHLswwe9cMc=; b=LOwbbfSD12QCE5wgsy1qA/paV0uax1uWW8CUocZyckP3cJiVwF7ygbGYc/ysJ2xLZ21f2g b783CG397Bv1O/SaxeYZ/bd8HUlr8xLKFDdk8y/6+pgXr76QGRHBc1HMlk+8OU7RP9umCY 2iZuFQV5b3aMIrWl+IHk2qpCkB3cO1wG68eCOtnsw15pOROwZ7+yAnI5sjeeucuYl68x9u e1z/a+pomNfVWscEBt60MpexP+Q+SaUEeqCKHiC3gpe9VbNzWJPEKle4qnbnUitS7p0xtB 4yl9trn4xr6bw5T71MwpeXtDfoqPIMZaifwk/WPPMhqsl9Hsysq5Zjyn5wVsaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735920207; 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=hZewaFmqd2OAWUFygCrd2K3z3TMc4GBpzHLswwe9cMc=; b=lmtmEjDa9P1xZWq2YRZtqGFC3EZu5+Yx5JKSrKw1RyzMWGiokAIi0qmdeoJjQkI316EWUQ Z0m1nMyqEvXcTUl9Zjduoz4u23Tr23uRlfArX6ItfD5CWq3BxNmY5y/DDH6ggNk1pFIuFm 9kdKxy5LRxwq48p+vVhihNQx4/J/Fcr47NsjjQ4misYMJfvV5lUaRZzbpGjLVNkf4nDbEc N/GzUWZ9lIObbpLaOfcWUJVHLUvvWGVB63XUAYY3aAK+IqPb6eRvn6fjRBdB47qThov0EC AkkykCmHHpjVUqK5/SAyQSaEHVEgNhEXXAQzxRMOk+XqKR6DUPxBqaWKGdhOqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735920207; a=rsa-sha256; cv=none; b=pi9iul1ZnOt1FBUDEAUn1n2ThBbcvAGCI8uZnG3BIZ7KpBr3tmpljTdMmr5SXQvCUY1mXz qhjuesgPcgOueCEEv2qynEXotva4e8Cm3bZoDwqjZg/kHb4UlQ08CtJn6pY1D9+VmL0Kgw 5nopoWT2J6/dAZBGm0bl8DpqBQP5KGJXclyf9I3sL3nZphHTmTQ47FEgAWj5qqt5N2qtjg gnQffM6G7Hm7nz9SoLoSF2dju7YtjQ7W9zYvEgNU1n0PiJAOXLrYNx2JJNPh8j0bsHkL1M TOE/bJ6mw2XHNotXeiX9tu2sEtCJ7jCwIr/cFTgPpx5mHgo3u8L2evMoWOgRSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPpJv4xfbz1RZ3; Fri, 03 Jan 2025 16:03:27 +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 503G3Rpf098400; Fri, 3 Jan 2025 16:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503G3RxU098397; Fri, 3 Jan 2025 16:03:27 GMT (envelope-from git) Date: Fri, 3 Jan 2025 16:03:27 GMT Message-Id: <202501031603.503G3RxU098397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0e742cc77454 - main - cpu_set_upcall / linux_clone_thread: Remove calls to cpu_thread_clean 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e742cc77454d0872ac2f6e7fd755b6d0322b711 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e742cc77454d0872ac2f6e7fd755b6d0322b711 commit 0e742cc77454d0872ac2f6e7fd755b6d0322b711 Author: John Baldwin AuthorDate: 2025-01-03 16:03:08 +0000 Commit: John Baldwin CommitDate: 2025-01-03 16:03:08 +0000 cpu_set_upcall / linux_clone_thread: Remove calls to cpu_thread_clean This is intended to clean state of a thread at the end of its lifecycle during wait(), not the beginning of its life cycle. Reviewed by: kib Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D48023 --- sys/amd64/amd64/vm_machdep.c | 10 ---------- sys/compat/linux/linux_fork.c | 2 -- sys/i386/i386/vm_machdep.c | 10 ---------- 3 files changed, 22 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index f74091438648..1c6b1549422b 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -605,16 +605,6 @@ int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { - - /* - * Do any extra cleaning that needs to be done. - * The thread may have optional components - * that are not present in a fresh thread. - * This may be a recycled thread so make it look - * as though it's newly allocated. - */ - cpu_thread_clean(td); - #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { /* diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 4ce3bc192b4e..1c9189162a09 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -301,8 +301,6 @@ linux_clone_thread(struct thread *td, struct l_clone_args *args) else em->child_clear_tid = NULL; - cpu_thread_clean(newtd); - linux_set_upcall(newtd, args->stack); PROC_LOCK(p); diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 0e0cebe98e5f..b0dd7534633b 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -480,16 +480,6 @@ int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { - - /* - * Do any extra cleaning that needs to be done. - * The thread may have optional components - * that are not present in a fresh thread. - * This may be a recycled thread so make it look - * as though it's newly allocated. - */ - cpu_thread_clean(td); - /* * Set the trap frame to point at the beginning of the entry * function. From nobody Fri Jan 3 16:27:23 2025 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 4YPprX15dCz5k9CL; Fri, 03 Jan 2025 16:27:24 +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 4YPprX0Qnbz4cxB; Fri, 3 Jan 2025 16:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735921644; 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=FRmoEa1/CKgZa/GyIynE5DuxbAYgFBWOEgtyVAJCFzU=; b=gGrg+Zz5yCUdYITumrwltA2AM8pGlRKPjhMB1C64JJYbZXBJw1L2FaHHDxq9bY+oA7Phvt 25q+7rU/W3G+Mu5mbf3zXPVCHZk3q+DClJNzOYojUtqvxxYQUOjRxBpWtvALMexJlaATG4 I98LxX8UbEBe1QCi7UZNqXn42bKwnyIHKypH6EO3ObxpHcLvyMw2t316YapxO9y7e+XPlC 9WPeviWYRuZXjz9qhAUGEvJob95IUjFvlv7S2+f//dQNIAW+AWm4JWLuT6bzqo8G5tC9jJ 5eZsODdOl2FV1oEcrqOK1bcPE4i3jpZH4qtgp0cyv+iDykmwRAOzE825kWf2xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735921644; 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=FRmoEa1/CKgZa/GyIynE5DuxbAYgFBWOEgtyVAJCFzU=; b=bK/BHPArrGjbW1hgNXrMAXg6YqDUc70Y5SA7kmtzPUyEHIpHakYLmq4vcy0E98SnPbd3+W 1JRDquLK8zqF1emKMFWAQafYIlllhurIQFnX640cgJ5xYjAf16cZx38Wi3dT0wPNJCehC9 crKF+sgstgoYuKYFTgdv7pgLnlZxpkfWtCCWDqAa27YF5FiKOC/fBCugwsYD6b80PU4J93 iblCs/dkbUE5tFiFuq7CVL7U5ohC1VbwYEhuEbO23bFGvZwSCrMvr485iz5sIwcQULQbgi RlPJeNNB+PECjpkco0OXx5KT2s3cf+wGOwYKEHDkUE/CAfaN60zSwzMXim8DYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735921644; a=rsa-sha256; cv=none; b=oSzXzEgqjkyeehTEVGIaKrDW+UYti8UC9/0iPW6QQREnGbva/OdcT9NQZvkSxXczNlpqzh xC6uupB2hsn1iDyVIh91mLnOHkaay1Aw2hgKBjjh5KUHA375M3pvldaXLUZCULQqNgyWBn CA1daTwAUo9j60PrhxDGz1iWm9bx7aF5hnaD0Bw+M/Ct51ZPXZ4Z17qmeIzULaUTn4YZoG X9W6jk6F0Wi1HhzB6aBuvfvShHNQDsae+e1+EesyzHlehZ3kbbNZww4Ikfok3ktSKuee5V S40pofe+AxZ1EsZh5BvDQnCUIkVpMj+T5GEsQ3PBHQd6blt1SiXiOHj8SLqNUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPprW6n1Rz6y; Fri, 03 Jan 2025 16:27:23 +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 503GRNKJ036371; Fri, 3 Jan 2025 16:27:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503GRNJ8036368; Fri, 3 Jan 2025 16:27:23 GMT (envelope-from git) Date: Fri, 3 Jan 2025 16:27:23 GMT Message-Id: <202501031627.503GRNJ8036368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 143dff0f9ce9 - main - pci: Only claim to support PCI ASPM on x86 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 143dff0f9ce9a6f03ae5701368c7144b30e2dc39 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=143dff0f9ce9a6f03ae5701368c7144b30e2dc39 commit 143dff0f9ce9a6f03ae5701368c7144b30e2dc39 Author: Andrew Turner AuthorDate: 2025-01-03 15:50:38 +0000 Commit: Andrew Turner CommitDate: 2025-01-03 16:10:41 +0000 pci: Only claim to support PCI ASPM on x86 We claim to support Active State Power Management, but don't appear to do anything different in the kernel when it's enabled other than tell the firmware we do. This breaks VMware Fusion on Apple Silicon when it's enabled as it expects the kernel to enable the ports. As it is reported to be needed on some x86 servers keep it enabled there, but disable on non-x86 architectures. Reported by: kp, tuexen Reviewed by: tuexen, mav, imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48303 --- sys/dev/pci/pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 251680590747..cf01115581e1 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -407,7 +407,15 @@ static int pci_enable_ari = 1; SYSCTL_INT(_hw_pci, OID_AUTO, enable_ari, CTLFLAG_RDTUN, &pci_enable_ari, 0, "Enable support for PCIe Alternative RID Interpretation"); +/* + * Some x86 firmware only enables PCIe hotplug if we claim to support aspm, + * however enabling it breaks some arm64 firmware as it powers off devices. + */ +#if defined(__i386__) || defined(__amd64__) int pci_enable_aspm = 1; +#else +int pci_enable_aspm = 0; +#endif SYSCTL_INT(_hw_pci, OID_AUTO, enable_aspm, CTLFLAG_RDTUN, &pci_enable_aspm, 0, "Enable support for PCIe Active State Power Management"); From nobody Fri Jan 3 16:27:24 2025 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 4YPprY2mN8z5k96F; Fri, 03 Jan 2025 16:27:25 +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 4YPprY0P49z4d0V; Fri, 3 Jan 2025 16:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735921645; 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=kC3URrAxV1egY+XXOHIxU4SawGjCl4SzD0LQqOlcPAw=; b=L8SuvXyWstBxDDoIo5u8JZhwVItsJTscVKUkuvy1t9Dy3OdUTGI3rWUaKeIbfqK1fgZjUl +K3fJATwoIaR0hVV0SZOa8qZHsmcuGXPzoieu5bobnQaDJY9F3kZsI/UPc4xgICfqRldjV 0MdnVBazQCzt9SKNcKoQlrBYCdoAUniypi69Uvlfcm2I7wdHBj94U+ztgFwT+BmNTe95Ey FuoS5kAOcPxHM//w+1mtEuBHarsQ7NufLK+WFUFyBweB8MTmlGbYPyoDGFwmJNak9Fryph BW6GlUHoS47NAxgt1YM4Rb2gEONkXF2tkpPFJmp2ao5HtgETKZrEFk2qijGt9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735921645; 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=kC3URrAxV1egY+XXOHIxU4SawGjCl4SzD0LQqOlcPAw=; b=XknamX9GJoFzSfhqYx3PDE0SoYlUN8RFk8xD40rCjy8JPMRkLubtEEjLHZXPGUYO/8M1m3 t3An8+CqoBwwYtEP7UitOsz0mb/lH7fikRN6cWW5MXBcx41736CyUstVpbv+oCVfyP22VB W1xuP5qR+ze8iyEYWfm2gMvjfnhplljjX1vSuqbWzVD+Wf8q8PDK2zyL7wtMzmGmxnfirg KFics89HTh3wVbQSYRtZduu/XLeAeOqIrkDNbMwhkjbzzTsLNowRfPxE1EqvgSN7O3vMAP CxSt1H+rsXnbMSZbuuFTfgtClJGMmDEjXuQ/douWoR0PNgA0gwTbcuCyi/e1NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735921645; a=rsa-sha256; cv=none; b=XvKwHZbXXioEUBPshwrLaW+fYYgSwmxN+5IDUVXv+g0t1GWuF/60EZVh/JTQDF6sAcnCtQ QbMNja4sdyG3UC1gIj9wPvEy8Iz1xJnF47pyoOgy3T/TM5ijrODjf8nY20IFLq8+cTu8mw yUGu1UmKzTBL7+gRLsi1I4tXEc1YrkTbUHmR2laBNx61UFaJAYhR9OQ9gNnI78kWKHOy9v 9riLJc1kL4x1npW0c67NYKc1bA8LB9IOxGmDPJWQ15hEa38dah1YTsqZ/Ka2dUQCpQlY1S /HPv/aEJ7GgstTi2wuwm3AaIdEbK5SwFMLoKKky2bVK3B2WNpqbB3QM8Yn05uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPprX6vRfz70; Fri, 03 Jan 2025 16:27:24 +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 503GROv2036422; Fri, 3 Jan 2025 16:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503GROx4036419; Fri, 3 Jan 2025 16:27:24 GMT (envelope-from git) Date: Fri, 3 Jan 2025 16:27:24 GMT Message-Id: <202501031627.503GROx4036419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b714eacb7905 - main - acpi: Pass the correct device to acpi_pcib_osc 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b714eacb790551f35de03831b88ad7b7e1502102 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b714eacb790551f35de03831b88ad7b7e1502102 commit b714eacb790551f35de03831b88ad7b7e1502102 Author: Andrew Turner AuthorDate: 2025-01-03 16:03:31 +0000 Commit: Andrew Turner CommitDate: 2025-01-03 16:10:41 +0000 acpi: Pass the correct device to acpi_pcib_osc Fix a copy-and-paste error in acpi_pcib_request_feature where the child device was passed into acpi_pcib_osc rather than the pcib device. Reviewed by: garga, jhb Fixes: ba1904937d9a ("acpica: Extract _OSC parsing to a common file") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48285 --- sys/dev/acpica/acpi_pcib_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index e4cff4639a93..e8ab481d776f 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -703,7 +703,7 @@ acpi_pcib_request_feature(device_t pcib, device_t dev, enum pci_feature feature) return (EINVAL); } - return (acpi_pcib_osc(dev, &sc->ap_osc_ctl, osc_ctl)); + return (acpi_pcib_osc(pcib, &sc->ap_osc_ctl, osc_ctl)); } static bus_dma_tag_t From nobody Fri Jan 3 17:41:30 2025 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 4YPrV263mfz5kFH2; Fri, 03 Jan 2025 17:41:30 +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 4YPrV25V92z4qfK; Fri, 3 Jan 2025 17:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735926090; 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=gt6Ky/Lmcgb5LETYKrc4JYgIdRFD+fusRHYCdqrIlEE=; b=TtS78kGAs60uablAcyAOhrv+LN/UxlCrw+A/h14xqGGgsu7r1sm8tZ9pR1fb+61PkXYYQa uiV2f3sM3K2Rb/7Wkda5hcAaFsOxti3vZGmS93xrceMhBzgaBe91awuDVzM6dGLKmAHNXc uyBu3HLdSwU0XabW5u4a+/2vYqkRzbllDCqe68H532ySWG0RBsJppOs85g8Fc/MK1Kflcp /I3+dgn3eqoBsf1rrbi+eGfHeDXXJEcLx5KEYRlCR6kvcZq6tTETMjwTrYMIiWLKt/uce1 0xcr8q6r59pnjXfH7apdxUQOWAkee3b5Ms8wUUYWVeQq7nUd+8PX0SjGJMxi2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735926090; 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=gt6Ky/Lmcgb5LETYKrc4JYgIdRFD+fusRHYCdqrIlEE=; b=kq2n9gyV5wcnhQ97CoBHDfd6xrmUy9zk+HU0AX/lmUhMePqW4ccMMm3uHG81/I2C37EmyH g8Jp+GCht3xwJugojY9enjJaERXnpBMTkyD1mLMg2iH7ovF7UeIDH4DvTfmUpdCrU3cZrP TYUBajTsBfTGD7gduahyiyLU3swRHE3/TS+pOagBKMJNPC7AGnaUtFakHdGLVQmdAJS8Zx 42uX0YsikVeORgmM/R2SvADMkX4GDFf9XUjiDO9JqBJiR3AHxK9m0eHOJW1z9ssqt+REZn bhphhBnxw5WVeng7UF5SrwfzF3fEWqffwuXYOXPRn0pCLV7B/RcO+b0IhHRVsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735926090; a=rsa-sha256; cv=none; b=fuY8x83hBamyHsNpFauTI0iAN14aAU6f+EtYsqQzN5mRhcDc+kd23MoCspNvXrhmo59oCm 4erwfI7L9UrHtuV0EAyaMFJG7ghdVGVle9/tkpJwR0X4yucQ8kw5p4ZQRhHLjBGPqGAQmP ehh0w7bfDGyGuAL1L+f71YNx0Y1yZTOXcFZ2zrVzIm/e8zU2tYJx5QqI84Y4n0r7U2DqwM 3mvZ3fODakY10n+tXD049rAWiafAzCTvuVDkopB615+VMJ1xAuVkLz4br4NPOmvErTZJ/N pcG+evqIf9Pk9OA64uPQp6+4j/geql7XF5PaNz6iwW4IybaExdsZAWodr3cA7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPrV2507Cz2DX; Fri, 03 Jan 2025 17:41:30 +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 503HfU9G077900; Fri, 3 Jan 2025 17:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503HfUw4077897; Fri, 3 Jan 2025 17:41:30 GMT (envelope-from git) Date: Fri, 3 Jan 2025 17:41:30 GMT Message-Id: <202501031741.503HfUw4077897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: d72f87c0fd14 - main - tcpdump/print-pflog: Print uid with host endianness 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d72f87c0fd1418bdb814594ea8fc76a202f7d5c6 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=d72f87c0fd1418bdb814594ea8fc76a202f7d5c6 commit d72f87c0fd1418bdb814594ea8fc76a202f7d5c6 Author: Eric A. Borisch AuthorDate: 2025-01-03 00:21:52 +0000 Commit: Joseph Mingrone CommitDate: 2025-01-03 17:37:45 +0000 tcpdump/print-pflog: Print uid with host endianness PR: 283799 Reported by: eborisch@gmail.com Reviewed by: jrm, kp Fixes: 0a7e5f1f02aad2ff5fff1c60f44c6975fd07e1d9 --- contrib/tcpdump/print-pflog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/tcpdump/print-pflog.c b/contrib/tcpdump/print-pflog.c index e54d33ac13bb..71bf01f07555 100644 --- a/contrib/tcpdump/print-pflog.c +++ b/contrib/tcpdump/print-pflog.c @@ -119,8 +119,8 @@ pflog_print(netdissect_options *ndo, const struct pfloghdr *hdr) ND_PRINT("%s", tok2str(pf_reasons, "unkn(%u)", GET_U_1(hdr->reason))); - if (GET_BE_U_4(hdr->uid) != UID_MAX) - ND_PRINT(" [uid %u]", (unsigned)GET_BE_U_4(hdr->uid)); + if (GET_HE_U_4(hdr->uid) != UID_MAX) + ND_PRINT(" [uid %u]", GET_HE_U_4(hdr->uid)); if (ridentifier != 0) ND_PRINT(" [ridentifier %u]", ridentifier); From nobody Fri Jan 3 18:47:20 2025 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 4YPsy117mFz5kJY1; Fri, 03 Jan 2025 18:47:21 +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 4YPsy10RKTz3xr7; Fri, 3 Jan 2025 18:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735930041; 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=LWtWtFnHux4PQ4ZJ9aLHZezwQks2T863zj+IMpduhNc=; b=vfyfeCMpO83uF9XVvxvPES2z3QsEfnncKH95LGXhDIHMlFPij5AU4++8QB8V97KXH0XnEk w1iuSDFo/FX9cxfLbMsccZitWjrtIUFqDivSDgxQKcCaA6e5JPRI9FmfdvX4hp+xdPQmLg rIrqpm8A4Ex9lvdXRtBPa4k7oMBsWly0EXAdGY/ztL8ELJiw5XAm9g2CIq2cEBR5Qx3r7d AvyQmh+hsqSZDi4XeK7EPRfGmZgyX7gHqt4MdE7sw49Q6vfOrkiYsQ8ghd8cepI+JSyqch CGy8zL1ILHl+diMHmKFNVw9bwvriV4XH9cgFcsWiJi/+POTicuBaQi2UuHSE8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735930041; 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=LWtWtFnHux4PQ4ZJ9aLHZezwQks2T863zj+IMpduhNc=; b=h6EyDoUk8bkrJdRSBi0RLgMomVmc+Mq29bN8YriJefPk0u2D0oqjpng1jbvuR1ypAtp4sA gnC5+eKoyruHGblsypFzzndUumrTAckbA4dmK7qLbkfLER60ohaQqikfrWzocWGnyEioI9 f7MCK+fgMwSLqet839HO1AJOHrpNKzyZCdgATk5UKLx+WrtUIwCJ61AbT4cBWdgEXKDwxC 5bfqjf9oWuN9qk3GFr0tkmE95ClkafcebNNZfJQ8kIxC+MMCZUPur/fCrIxF0oPwjRfb8q 23UzLyI1ty6fAq23lVUxJ7d51AJIhdT/NhsisemOOvBAXevLsg2Qd+FU3UCl3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735930041; a=rsa-sha256; cv=none; b=ZIWAXaHrgMip4bsTMnkJ5HFsCep7N9pizU85YeqAGzPMLx+kW/tmXmEfXEvc4dXgVkXics mtjaySR3uvI6eCMOKhkbZpJPelgVIPpyb3IDoujaCORxvO7lx4fDVNLhv2bVKpd1CqnnEQ vdOtslf2Ijr6hKbRFuf3Wf55mA6tsrhLeRQ9dnFFbd7KjeOE7BIMD75ZuID31WxXmRYoC0 qvWMkXz3yfmFZHrFb9uov/5LvhftXSXiscBgcNj2yPjhcdhQkq7vNy6dsVXu4T4ym4b6Fl IYGWwNFoMkt4FyjcJo6oMQABy6ZVKgCoWdrB/wA/agkCcggXaYYNNOK76CM7Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPsy071pqz3Tj; Fri, 03 Jan 2025 18:47:20 +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 503IlK97097241; Fri, 3 Jan 2025 18:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503IlKlR097238; Fri, 3 Jan 2025 18:47:20 GMT (envelope-from git) Date: Fri, 3 Jan 2025 18:47:20 GMT Message-Id: <202501031847.503IlKlR097238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 88766e7af52b - main - TCP BBR: fix integer overflow 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88766e7af52bbde32b14ad48fb76798a3ba4650c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=88766e7af52bbde32b14ad48fb76798a3ba4650c commit 88766e7af52bbde32b14ad48fb76798a3ba4650c Author: Michael Tuexen AuthorDate: 2025-01-03 18:44:43 +0000 Commit: Michael Tuexen CommitDate: 2025-01-03 18:44:43 +0000 TCP BBR: fix integer overflow Use 64-bit arithmetic. Reviewed by: rrs CID: 1523806 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48302 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index fd5bcd81f25e..9e1f83df4298 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3843,7 +3843,7 @@ bbr_post_recovery(struct tcpcb *tp) else if (bbr->r_ctl.rc_delivered == 0) lr2use = 1000; else { - lr2use = bbr->r_ctl.rc_lost * 1000; + lr2use = (uint64_t)bbr->r_ctl.rc_lost * (uint64_t)1000; lr2use /= bbr->r_ctl.rc_delivered; } lr2use += bbr->r_ctl.recovery_lr; From nobody Fri Jan 3 21:54:38 2025 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 4YPy663lCcz5kVJV for ; Fri, 03 Jan 2025 21:54:38 +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 4YPy6639Ylz4GJj; Fri, 3 Jan 2025 21:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=YMiGNNT3uK7euKNBy4/RtsJFIiTeIhxaWpfrKOzNkRw=; b=odZsbZOWsta7jPVv9vakZ3UwCg+Y6wT1TN4e6PHkvQlhlBFUhEdpKQ7Jn6LeP/4c8vZfVG K44ZV9AZgTA4kDvwC9Tcym6a5iDY+M7kFz5Z6UB/nT0/6WBkwEb8kHQE0Z/tagCgwT3hqS 4b8GBrsH5V4n+L9k+ezb5+vaq5Q/CJj7a1iNjzk/Gz/1PU5H6w/Z67RC6WeCos8eGGgfhf E3FZ7iU3018ft1lQ3mS/9je37owrcG1QhTMbBTdGax4O0Hvr1ZLY7cNnSamexnkz0jJMew kAQP1WoheNAUJ75qGXCKMk6FPP1wJWmVENS9fB2oR7WBFYNFc2qy3jLeqg+r0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=YMiGNNT3uK7euKNBy4/RtsJFIiTeIhxaWpfrKOzNkRw=; b=AC2ZrHVoi96h3x4Yc2ZLZ+DndwVY/O7AsMk6i9C+S2JMh6Rg024U2gMZODPdTkGTB+wNjg zbixsWnRIY+Bj2W7JM3TuPo9gc7or5+im9WlPF5VcNoeLausHuJ9wglWXkIbAhLB9uukgx cv3ozqL/dhOM0pnXKNYqZJborh3J3ScpnUzOQ1SJfERZDlwxXAzVJlxM0PVKOoU0u+0Jo8 Oc9fblNFa8EKpbvLArwGL0t8sO4oUifefUkuRO1mIHmfec9EoUaMqE5BAMJdFqUe1hhm+W HqRmvS3oGRVHhLJLr233+zd1pCj60aM/UjKMf8CNyEexTmYWh2012NdZaUIv4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735941278; a=rsa-sha256; cv=none; b=ZlHnHypGP7pgPnn9GsGn7uD+yJzIzokhq+TW45jQFItl19o9mk8mph33mY77X6tHH8B4fB K8fZfL0G9OXy22G6yFhCyG5AjRCPp14rEosCd4jzLZsXeivqTzz8gC1tWcNjVWLnXH6WVX YvMG9lBZM/SiouyZwafWBFJ3H9wtLDJ0NccwkF/ZJWR2Cmcx17V0apZXR/42PsFKNNaJSM yVFbEmPIEamcSBx0uW9wWIV03h31Rq3hS4ikPDg6nGopOwWTdTTxx8tIZV42SMyspGIO/9 6/WkHM3hRq4Sx/NekvHwyomZhJcB/e3Tz9SV/eXf5mykrEjqFihiRtYrgNvZ5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPy662FXyz8jh; Fri, 03 Jan 2025 21:54:38 +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 503Lsc6T051105; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503LscjX051104; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git) Date: Fri, 3 Jan 2025 21:54:38 GMT Message-Id: <202501032154.503LscjX051104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: ef3ba9d62592..98a2c01a8898 - vendor/acpica - vendor branch updated 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/acpica X-Git-Reftype: branch X-Git-Commit: 98a2c01a889887800ea689bbbed0c3c240712fc5 X-Git-Oldrev: ef3ba9d625927fd4592a8c071698a562821485bd X-Git-Newrev: 98a2c01a889887800ea689bbbed0c3c240712fc5 Auto-Submitted: auto-generated The branch vendor/acpica has been updated by jkim: URL: https://cgit.FreeBSD.org/src/log/?id=ef3ba9d62592..98a2c01a8898 b6246dbb668a Import ACPICA 20240321 e690145f81b9 Import ACPICA 20240827 ae8106ed3aec Import ACPICA 20240927 98a2c01a8898 Import ACPICA 20241212 From nobody Fri Jan 3 21:54:38 2025 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 4YPy670LWHz5kVFy for ; Fri, 03 Jan 2025 21:54:39 +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 4YPy664Qy9z4GTb; Fri, 3 Jan 2025 21:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=2BgkVxS5ggc3BDJkh8XJoJi7Jbhk63x6WnicW9uxEkw=; b=Xe/OWWbEDhCgKwo7GJlH6n/zHlTQZlCkar7G106ceJY94glo7ii7WlHpAF7IJdsKBGJNCJ v3aDUA/M8APjOLWwPvZtjkT4XQA2Qh/pp4UilZMHY7enNmuk9bBADBJsrushHXL2BhqUy+ VU/C4FuuErM38PVPDAUAPF8VhFHWtMebuwQBnThzUZU3/NJ53gwXUFRY7a6pahX94KHfAk VgsK2GydItRnLrIFWAzUTnHcX0ijnO7vrSFmshUzcCZw+BAQbu4bYBozhDtlpnY1G+doky lrrmWOi670oYH+s/6LUss7VDDBpV6Bm1NT06AtZsVS6hvZf6588icQCKNPTTEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=2BgkVxS5ggc3BDJkh8XJoJi7Jbhk63x6WnicW9uxEkw=; b=Mslk1/7Ks/uivIjJXzlbx7Y96iwqpauWdQUe97bS/xzpomsITsmuHXJYjqAXLjThyJUtTs wKgPKDu7ucJyWRcQG389yMFaV7iRC9cbjmFmITTHxF0aC6xIkD/fA9XvUm12k8upna41GI qUiOs5lwxDOo/NkRnODQ6B99C65X+l8T+CFypSc6TV5U6ZvV41xsbj406u6UcX1yhKoulO GQuwta7QZDbiRVCr2/791RHchcPpR+zcsO5jd5bzRgZV1Di7ohiPZaqLt4l2VG8FQKdKBD 2QW3IgoJ3QbtvimFJsxDklY4kmHjSUWX/NCeyYLEwhjJ5bdfHD+jRBYQSyXU1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735941278; a=rsa-sha256; cv=none; b=alaujWKNFUZKrKCgHgfOY5PFiFbmQD/Gcy+o6IX13+WW7z25KkMxPclckdFbweYDrXr8rp lDiQaWKJROl15By0yMeX/mxi7NG27dd9hVVLk5nEnyJ00SCw5M39gQ4yT7dpVq3ESsPFH+ JV61opczSiTZ4Gk5mJ+qdABmd4mrG6Y2DcxV17YGpSKzZcJgClbuSFi2bvhoTaZ8UlBTon qdGAFRDCFcHLwhWgeo9VDRgqsTnWVIqYCBF5aivktknfSvX19G5juIuNUhbmaUUoPxpp9E HDUr+pUSfmwMQxtcZCbL5kNUjNPqLQJtyOIuG3aHVznI9K/ylkMIGd70m/GTBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPy663wLKz8tv; Fri, 03 Jan 2025 21:54:38 +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 503LscxE051162; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Lsc3W051161; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git) Date: Fri, 3 Jan 2025 21:54:38 GMT Message-Id: <202501032154.503Lsc3W051161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: f671e8377ba8 - Create tag vendor/acpica/20240927 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/acpica/20240927 X-Git-Reftype: annotated tag X-Git-Commit: f671e8377ba8deaee3f71904a52711defeb9fe07 Auto-Submitted: auto-generated The annotated tag vendor/acpica/20240927 has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/acpica/20240927 tag vendor/acpica/20240927 Tagger: Jung-uk Kim TaggerDate: 2025-01-03 21:51:37 +0000 Tag ACPICA 20240927 commit ae8106ed3aecee3e160f5b0a67b3cf0b500b3723 Author: Jung-uk Kim AuthorDate: 2025-01-03 21:51:31 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 21:51:31 +0000 Import ACPICA 20240927 From nobody Fri Jan 3 21:54:38 2025 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 4YPy670LY5z5kV2j for ; Fri, 03 Jan 2025 21:54:39 +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 4YPy663ddNz4GTZ; Fri, 3 Jan 2025 21:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=2ny+q5qcBXpDpt2HftK5zYKzf6iQdVBiUpN2yEjfZGY=; b=GSdZUR6BTa6XJQ8eZ8BM8CFvk2yQ7ZnYOe/lnvbBtzxZF4OIVhp3/xBXzeDCkvBlqYA/Ks dbVMEdwFmhqPFG+CN0QXbItkAf8JtKNMY6PBRDUqOW6Ly2UZNcrTb9kWaZ8Orh2fd9PrJ+ uoJq2zcPSu7IySlqHVJEwVs5BOI5O1N4cUahReUaPStjsMUBvHD30mN+rnqi8frvcX+8JN wQboeFN8YO4gpqMlSk7N6Ji3d2tWinc0WnQKLCpeP7t7WsiRbBFV+PkyUhOuJjrJ6KhPRU ScLCNdWjWdmzTsEnZtsepnsrCnNpFcEBNA6c80rlRdY8GKEpzxUlW9NqRQmzKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=2ny+q5qcBXpDpt2HftK5zYKzf6iQdVBiUpN2yEjfZGY=; b=tBfKmGqkSsUbMIcQ3sMmFvEnzGSj8T9HejkCi46JHGu8xK62web+zd9ZeHubBgXvQM/E3b ov/EQ1aEuPSimf68SXj7XYDbHO7a4Wrf66eOUx/SquHG3wkZfXk4VU5wbWzevqXxmcjxYj DkyzHcnLSX7FHd0lGDxTNoFSRBxRL0+O9SsWllK9WXYDW+eIZs3N9bzjFa24yNGGReyoNB +LiZhMb+rU4eIdwEkKkI3HMC2oliVgqd9hWVFkPSAbCSIqwwSFpiGAZIQDgynyvP8qwm8u An6ZYjEN7RhAZBQ7imr/IGrqgazk7NUQMUpNXtq3oEnJungWnby2SPTmgRYyPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735941278; a=rsa-sha256; cv=none; b=Rau3QQAcMSJB18gPBfTz+2F4KudG4Mb+2zfOw4VvWjosayOnicPpQ0GbHn99VI7EEaCchw yWR7YpI/auaRwHHjFCKgK5ihjS9NL+8OriI3B07TT75ZWAkeFp/fCgYX7Dp4hM6qn3AKj9 wvmf/xRN1b1im7fm1ZO+f+BUIGHdE9n30N9XuIK+LDo/LZHYH42reQhDruUgOVboh1jy+A B94+oHK3AmzQE1ZLJPfpl+a9GBglNXCrDHlNF4WsV2s/72lNxzodaEGU82juglCRgvJ/7+ MO61qm2Gz1YvLuBZTZlEMiBM6Y7q5f/lKNDnyMEZ0iP3ahGMP6AUByyqPG0rUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPy6630f9z8R2; Fri, 03 Jan 2025 21:54:38 +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 503LscbS051124; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503LscjY051123; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git) Date: Fri, 3 Jan 2025 21:54:38 GMT Message-Id: <202501032154.503LscjY051123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: a40bc4222a18 - Create tag vendor/acpica/20240321 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/acpica/20240321 X-Git-Reftype: annotated tag X-Git-Commit: a40bc4222a18b21d2c7be90b9d2b41cd11821605 Auto-Submitted: auto-generated The annotated tag vendor/acpica/20240321 has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/acpica/20240321 tag vendor/acpica/20240321 Tagger: Jung-uk Kim TaggerDate: 2025-01-03 21:46:39 +0000 Tag ACPICA 20240321 commit b6246dbb668a788f8022fc34f5577de42b386a0f Author: Jung-uk Kim AuthorDate: 2025-01-03 21:45:56 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 21:45:56 +0000 Import ACPICA 20240321 From nobody Fri Jan 3 21:54:38 2025 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 4YPy670MK3z5kVJW for ; Fri, 03 Jan 2025 21:54:39 +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 4YPy663xrvz4GCk; Fri, 3 Jan 2025 21:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=iL5gLzeaveY2XypD0ySNA/KzYkCKFmB5yOwp0oW74Xw=; b=OwkZJOW+0lUkYXbuviWI8xvpAdijEKeLTESlIw+Z3rRi5iMNmjYXoizIWkdv/1p6rPZhGZ mef8h5DhM516Gb/OLRbuyKpnZXA3V8+l1EuYYoUzZUss16+YXXvaZkcddCjm8FMm+mSlmw TBpEk6FSaQ+PK8PEbSfOuerDMnFBRGoKFFYDZD1ybYK9/wFDMPyAdCcGflwDpIBmZGiwC6 opZtOQFO1uxgScz8tDj+qh86QEMlWcu5nAmMQnGfjrAT3XRCf8O1iKxMVcjSKakSuyiH8Z r7LnzuEfb1pJsuT0j2KVVAEGHEXcFGc0lF3LUFsP4098oJt1eByD7/Oez/eupQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=iL5gLzeaveY2XypD0ySNA/KzYkCKFmB5yOwp0oW74Xw=; b=jAO5n3wyo7+YzkNU6efdR/sdYp9rwJ8T3qLglQ+4l1AgsnKyEyh5XZcf25VfEoiTLUDGvb hcWon+d+c3Y6Bt9fjiF9E6OQLONsfw4yW9yXo9DQ7tbDF6ZZVL5qndFkSEZeVUv9Xf1dv7 Bfq3nodo0cknO+dUH4LZ7QKs0SkOPNjfGNbNWFli4WMR2Rf19yOxNDXEE77eScd9ThC50L avqfpluq6VdZ9yLVItr/3XdGSHxDTXVt7ptqCLHNpV+qlO43aM5dpv4dgIhujZwa+nsUSX KSba7wWWoOqu8fK0GsyjcbgBY5FgCYLCxqUr4h5SdnieD8m2YuK4zVc4a0kquQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735941278; a=rsa-sha256; cv=none; b=Np+ntywbMuZeyuP5CN4jw24/O4CzhIRKTFuB9XtQh3GXHfeGqz1x4UvTNA8aqItL1e0bjC Qbdvl/XWw3bVsJS4UtQjunzhZ4HVeiFkVJ2elwSnIc5iY04UavG8OTD7FOYOg0bLIix5G5 xol21cY/xo4yNjmjjCF9GxL+WiBR4v1gUU+el8fsqAbkq/08Z4wsYA6Ve+MPQwGccU5BBw VA8i7lNzhSmw0cPON1heFIcPb5rV5tRelBKOXKZy4jSIkBguAZ+Ql1crZDgl4weg4jeCca feIT6kEwQsYxZ+4kzC5QmHPHlorldwjKwZGAJgUbi8QsBPxqtK6u/sC6aX3/NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPy663T1vz8R3; Fri, 03 Jan 2025 21:54:38 +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 503LsciM051143; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Lsc5g051142; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git) Date: Fri, 3 Jan 2025 21:54:38 GMT Message-Id: <202501032154.503Lsc5g051142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: bcc7802e1753 - Create tag vendor/acpica/20240827 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/acpica/20240827 X-Git-Reftype: annotated tag X-Git-Commit: bcc7802e1753a9ab91444d5c9037a1e0e8dfa45e Auto-Submitted: auto-generated The annotated tag vendor/acpica/20240827 has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/acpica/20240827 tag vendor/acpica/20240827 Tagger: Jung-uk Kim TaggerDate: 2025-01-03 21:49:54 +0000 Tag ACPICA 20240827 commit e690145f81b961a622efa7bc04fd83caba2a769d Author: Jung-uk Kim AuthorDate: 2025-01-03 21:49:36 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 21:49:36 +0000 Import ACPICA 20240827 From nobody Fri Jan 3 21:54:38 2025 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 4YPy670MJCz5kVNh for ; Fri, 03 Jan 2025 21:54:39 +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 4YPy6655fgz4GJk; Fri, 3 Jan 2025 21:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=D+75oCx22RGarY2/GR2mm9YsMvlsjrFucXPJqYWum5E=; b=KzboKeqTvZ3skYOyLGA1FMlPIMGClrSyIopf6QqhG9wwOw8xluMayEx8/zWRY1NI9/Shap 1w1GGHVspmoMRpQLBld9tL+09835VAb95EHlhI0tWrhCxEM+JtjPdkHT5npf5J7TdngFHs 0PoYdnqhI4FiGED2qwEc+kqUtynZVvCRVaWyaI08wUk8yu0vjYiB8OAIBwFxRSSxtuDSoX x+aK9tZvOYs04i+yNcQk+sZr4iAmZFBwO6OiLz5bAfTtBOmj8woEfpYgbG5b5XnM/UdYvq RDJWudeAsj/f7O5ETYmK+EdJunouNWyxviNYYVYtgL/f/8vW05IXVGGrxcs9RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735941278; 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=D+75oCx22RGarY2/GR2mm9YsMvlsjrFucXPJqYWum5E=; b=Z8RqZMg9Wpp5YpkNqdqhcqctgciHJCfh3e9rlUqG/DdagZ5545PXTGe1g8TeHE/9O91+dL j2JBXEWJxSBkW5mLhPoIBFrGbXlGrissoyxJPo7ofbpdmqFAiBBWKctwj6eVbO7HgyUcCO 06TdY+sS2zXzR2Ds3h9owfWbDSmiNt82xxrhdWWepQOL9ZLnatkr6HDrAh68M+2vtUrHPC 1X2L0DxuRZ1jkxaJo/NiUGnrN2IiFuor7sNQHqWAz71y3fNdsjreliNGdXq2wYLRp1qdvB Zzq8/r9ZRYNayA64XEiplR+5/nseRKp0XF95noW1BKZhF0e4SD7GQbaWK1ag1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735941278; a=rsa-sha256; cv=none; b=sYGAELLtCbH4AiDsf2YlENUoyiK8eVKKlJSJfpHPWNxji8UMkqsdkNYTSbwe2eJz5mvrOk TjyWEazMScovikng2qre6yyDET59O+ExzmIooI8d79CFzlyqY1AoG4+sdms7QdfwNcRnIP FJG44pvsO+oZLQxysB7r6wI8BuAw/8T5Y8D1hD7UZb1ZktI+hNVApXJSrsFZJNkJpGTjiT Y1h1Wa6By9vcEoA0uMLzWVzLZJf6suaruxYbfNeshzjdZxhfGutn96Wr3Eu8SL4R0oaZ1p Io9TD4Da2smpgw9+VTPFxHFT9t+ghQyCFHf56fF89jZbIBHVbpdAnuscBn2b2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPy664MrWz8fk; Fri, 03 Jan 2025 21:54:38 +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 503Lsc7I051181; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503LscpN051180; Fri, 3 Jan 2025 21:54:38 GMT (envelope-from git) Date: Fri, 3 Jan 2025 21:54:38 GMT Message-Id: <202501032154.503LscpN051180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: 413ca7a65cb7 - Create tag vendor/acpica/20241212 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/acpica/20241212 X-Git-Reftype: annotated tag X-Git-Commit: 413ca7a65cb7cecd1a21ce6c6f38720dec36cde5 Auto-Submitted: auto-generated The annotated tag vendor/acpica/20241212 has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/acpica/20241212 tag vendor/acpica/20241212 Tagger: Jung-uk Kim TaggerDate: 2025-01-03 21:53:51 +0000 Tag ACPICA 20241212 commit 98a2c01a889887800ea689bbbed0c3c240712fc5 Author: Jung-uk Kim AuthorDate: 2025-01-03 21:53:44 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 21:53:44 +0000 Import ACPICA 20241212 From nobody Fri Jan 3 22:25:23 2025 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 4YPynb54dGz5kWSS; Fri, 03 Jan 2025 22:25:23 +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 4YPynb49Mwz4Jx7; Fri, 3 Jan 2025 22:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735943123; 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=HCVqKvBuEFJDN9PPsHbYky8w8en98RGEVA7MHdCJtK8=; b=u7OgX9GQfj8WTw7/0OnLllkoxgswnrZVdfbBWyQO6heZwV840/0/GfN1mMqLwVZblFZRTG UmrSAGVyyoKJXgI+VCQiBqgJTeJVrpWPlb+eBm4zj8pA3OebZGKm6lp1bWc1E07d/9AQGl P8AJ+FSq7MmllBDECMtWuz3e1lArnnkllsRtpnQiZ7165rr5lsbDp8K27yaObfSFi6ZzIO So5wCgX1iV1+cxUzWqo6jRhaCGdpvGkl3B5h1H7sRZcV44YauIRb7FzaQnMFIwaJELZb7i tK2FP/YuUW7rRpV5hJzqRok050n3NGZzR0c8r0vVJhYEqxos2IUSdjOPt+C6DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735943123; 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=HCVqKvBuEFJDN9PPsHbYky8w8en98RGEVA7MHdCJtK8=; b=T5HA+jVDdY6CqVNjY5oIjcXCQlfqTxHty7pVIn1m2sczO7lUz24cDEuzfNMzlBiLrEawJ2 bjSyVOUwJvlkk+15AGItUG50znZxcL8hYk0VhQy5dCC1c3/eMTZmkAOnPNeYNwikAQQ9BR t0R+GYFn0D102aDZJOSlADOZKkqfMB6PfZOaUMFMQWSF7GYAdUaE+pASrAF/HpxSgKu7WL aIoXV9dh9nlaxbib00Qh3slale7yiludcTN7Zn7TSpp9/SfYTjHHIJ/UXCXVLagar2mOj2 xpf+hJFhPN3gAp63SHgi4jLDTzoYXuMLJ2gBi7JBY2oeeiwU6ho4sNtv8TzNnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735943123; a=rsa-sha256; cv=none; b=qvL5FA4MIaWlCUAn1nPtkGMsCNZK5YbhfewcErVvykKlacOo4XmkaqOCj2bgf7Q88sTzVV VqytE6Jx3cmWKrJ12bD33uZuiEen+tSu2H/wuUNhz7TBVf1KzfGRnqZ1lVsIMd+sCgXzEX a1veZtLdTlgNXZZ1QeuAPupu8ui8ZaTmLV3QQtJJboJjUu1XQy92OsPFKrzix/30iqPHS2 e5R9CS5FGaPZgVtG0401C+yl9UhBfD9UeamHel/4rtb8pPAMFPhkqMFjyIXEdp5Gr9CyoJ W3OBpthHF9Toez/FBaqoRrKUEdCptc/Vyo3VUeEongMtrQvfA2KdY9zORs4FVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPynb3YX5z99R; Fri, 03 Jan 2025 22:25:23 +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 503MPNGp008130; Fri, 3 Jan 2025 22:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503MPNbS008127; Fri, 3 Jan 2025 22:25:23 GMT (envelope-from git) Date: Fri, 3 Jan 2025 22:25:23 GMT Message-Id: <202501032225.503MPNbS008127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e9255dafa1ef - main - pf: netlink KPI use cleanup 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9255dafa1ef0c635385aee78ead3a0050b19cca Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e9255dafa1ef0c635385aee78ead3a0050b19cca commit e9255dafa1ef0c635385aee78ead3a0050b19cca Author: Gleb Smirnoff AuthorDate: 2025-01-03 22:25:10 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-03 22:25:10 +0000 pf: netlink KPI use cleanup - use nlf_p_empty instead of declaring own empty array - don't declare _IN() macro when we don't parse a header Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D48306 --- sys/netinet/ip_carp.c | 7 +------ sys/netpfil/pf/pf_nl.c | 49 +++++++++++-------------------------------------- sys/netpfil/pf/pflow.c | 15 +++------------ 3 files changed, 15 insertions(+), 56 deletions(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 133dba45cf36..871638adb048 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2803,9 +2803,7 @@ struct nl_carp_parsed { uint16_t vrrp_adv_inter; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct nl_carp_parsed, _field) - static const struct nlattr_parser nla_p_set[] = { { .type = CARP_NL_VHID, .off = _OUT(vhid), .cb = nlattr_get_uint32 }, { .type = CARP_NL_STATE, .off = _OUT(state), .cb = nlattr_get_uint32 }, @@ -2820,10 +2818,7 @@ static const struct nlattr_parser nla_p_set[] = { { .type = CARP_NL_VRRP_PRIORITY, .off = _OUT(vrrp_prio), .cb = nlattr_get_uint8 }, { .type = CARP_NL_VRRP_ADV_INTER, .off = _OUT(vrrp_adv_inter), .cb = nlattr_get_uint16 }, }; -static const struct nlfield_parser nlf_p_set[] = { -}; -NL_DECLARE_PARSER(carp_parser, struct genlmsghdr, nlf_p_set, nla_p_set); -#undef _IN +NL_DECLARE_PARSER(carp_parser, struct genlmsghdr, nlf_p_empty, nla_p_set); #undef _OUT diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 79d6c380e31e..e586ad082e4b 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -746,7 +746,6 @@ struct nl_parsed_addrule { char *anchor; char *anchor_call; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct nl_parsed_addrule, _field) static const struct nlattr_parser nla_p_addrule[] = { { .type = PF_ART_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, @@ -755,11 +754,8 @@ static const struct nlattr_parser nla_p_addrule[] = { { .type = PF_ART_ANCHOR_CALL, .off = _OUT(anchor_call), .cb = nlattr_get_string }, { .type = PF_ART_RULE, .off = _OUT(rule), .arg = &rule_parser, .cb = nlattr_get_nested_ptr } }; -static const struct nlfield_parser nlf_p_addrule[] = { -}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(addrule_parser, struct genlmsghdr, nlf_p_addrule, nla_p_addrule); +NL_DECLARE_PARSER(addrule_parser, struct genlmsghdr, nlf_p_empty, nla_p_addrule); static int pf_handle_addrule(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -782,17 +778,13 @@ pf_handle_addrule(struct nlmsghdr *hdr, struct nl_pstate *npt) return (error); } -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pfioc_rule, _field) static const struct nlattr_parser nla_p_getrules[] = { { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, { .type = PF_GR_ACTION, .off = _OUT(rule.action), .cb = nlattr_get_uint8 }, }; -static const struct nlfield_parser nlf_p_getrules[] = { -}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(getrules_parser, struct genlmsghdr, nlf_p_getrules, nla_p_getrules); +NL_DECLARE_PARSER(getrules_parser, struct genlmsghdr, nlf_p_empty, nla_p_getrules); static int pf_handle_getrules(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -840,7 +832,6 @@ struct nl_parsed_get_rule { uint32_t ticket; uint8_t clear; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct nl_parsed_get_rule, _field) static const struct nlattr_parser nla_p_getrule[] = { { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, @@ -849,11 +840,8 @@ static const struct nlattr_parser nla_p_getrule[] = { { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, { .type = PF_GR_CLEAR, .off = _OUT(clear), .cb = nlattr_get_uint8 }, }; -static const struct nlfield_parser nlf_p_getrule[] = { -}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_getrule, nla_p_getrule); +NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_empty, nla_p_getrule); static int pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1016,7 +1004,6 @@ out: return (error); } -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pf_kstate_kill, _field) static const struct nlattr_parser nla_p_clear_states[] = { { .type = PF_CS_CMP_ID, .off = _OUT(psk_pfcmp.id), .cb = nlattr_get_uint64 }, @@ -1032,10 +1019,8 @@ static const struct nlattr_parser nla_p_clear_states[] = { { .type = PF_CS_KILL_MATCH, .off = _OUT(psk_kill_match), .cb = nlattr_get_bool }, { .type = PF_CS_NAT, .off = _OUT(psk_nat), .cb = nlattr_get_bool }, }; -static const struct nlfield_parser nlf_p_clear_states[] = {}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(clear_states_parser, struct genlmsghdr, nlf_p_clear_states, nla_p_clear_states); +NL_DECLARE_PARSER(clear_states_parser, struct genlmsghdr, nlf_p_empty, nla_p_clear_states); static int pf_handle_killclear_states(struct nlmsghdr *hdr, struct nl_pstate *npt, int cmd) @@ -1095,15 +1080,12 @@ pf_handle_kill_states(struct nlmsghdr *hdr, struct nl_pstate *npt) struct nl_parsed_set_statusif { char ifname[IFNAMSIZ]; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct nl_parsed_set_statusif, _field) static const struct nlattr_parser nla_p_set_statusif[] = { { .type = PF_SS_IFNAME, .off = _OUT(ifname), .arg = (const void *)IFNAMSIZ, .cb = nlattr_get_chara }, }; -static const struct nlfield_parser nlf_p_set_statusif[] = {}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(set_statusif_parser, struct genlmsghdr, nlf_p_set_statusif, nla_p_set_statusif); +NL_DECLARE_PARSER(set_statusif_parser, struct genlmsghdr, nlf_p_empty, nla_p_set_statusif); static int pf_handle_set_statusif(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1245,7 +1227,6 @@ struct pf_nl_natlook { uint16_t dport; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pf_nl_natlook, _field) static const struct nlattr_parser nla_p_natlook[] = { { .type = PF_NL_AF, .off = _OUT(af), .cb = nlattr_get_uint8 }, @@ -1256,10 +1237,8 @@ static const struct nlattr_parser nla_p_natlook[] = { { .type = PF_NL_SRC_PORT, .off = _OUT(sport), .cb = nlattr_get_uint16 }, { .type = PF_NL_DST_PORT, .off = _OUT(dport), .cb = nlattr_get_uint16 }, }; -static const struct nlfield_parser nlf_p_natlook[] = {}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(natlook_parser, struct genlmsghdr, nlf_p_natlook, nla_p_natlook); +NL_DECLARE_PARSER(natlook_parser, struct genlmsghdr, nlf_p_empty, nla_p_natlook); static int pf_handle_natlook(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1338,9 +1317,8 @@ struct pf_nl_set_debug static const struct nlattr_parser nla_p_set_debug[] = { { .type = PF_SD_LEVEL, .off = _OUT(level), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_set_debug[] = {}; #undef _OUT -NL_DECLARE_PARSER(set_debug_parser, struct genlmsghdr, nlf_p_set_debug, nla_p_set_debug); +NL_DECLARE_PARSER(set_debug_parser, struct genlmsghdr, nlf_p_empty, nla_p_set_debug); static int pf_handle_set_debug(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1369,9 +1347,8 @@ static const struct nlattr_parser nla_p_set_timeout[] = { { .type = PF_TO_TIMEOUT, .off = _OUT(timeout), .cb = nlattr_get_uint32 }, { .type = PF_TO_SECONDS, .off = _OUT(seconds), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_set_timeout[] = {}; #undef _OUT -NL_DECLARE_PARSER(set_timeout_parser, struct genlmsghdr, nlf_p_set_timeout, nla_p_set_timeout); +NL_DECLARE_PARSER(set_timeout_parser, struct genlmsghdr, nlf_p_empty, nla_p_set_timeout); static int pf_handle_set_timeout(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1430,9 +1407,8 @@ static const struct nlattr_parser nla_p_set_limit[] = { { .type = PF_LI_INDEX, .off = _OUT(index), .cb = nlattr_get_uint32 }, { .type = PF_LI_LIMIT, .off = _OUT(limit), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_set_limit[] = {}; #undef _OUT -NL_DECLARE_PARSER(set_limit_parser, struct genlmsghdr, nlf_p_set_limit, nla_p_set_limit); +NL_DECLARE_PARSER(set_limit_parser, struct genlmsghdr, nlf_p_empty, nla_p_set_limit); static int pf_handle_set_limit(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1547,9 +1523,8 @@ static const struct nlattr_parser nla_p_add_addr[] = { { .type = PF_AA_ADDR, .off = _OUT(addr), .arg = &pool_addr_parser, .cb = nlattr_get_nested }, { .type = PF_AA_WHICH, .off = _OUT(which), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_add_addr[] = {}; #undef _OUT -NL_DECLARE_PARSER(add_addr_parser, struct genlmsghdr, nlf_p_add_addr, nla_p_add_addr); +NL_DECLARE_PARSER(add_addr_parser, struct genlmsghdr, nlf_p_empty, nla_p_add_addr); static int pf_handle_add_addr(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1656,9 +1631,7 @@ static const struct nlattr_parser nla_p_ruleset[] = { { .type = PF_RS_PATH, .off = _OUT(path), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, { .type = PF_RS_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_ruleset[] = { -}; -NL_DECLARE_PARSER(ruleset_parser, struct genlmsghdr, nlf_p_ruleset, nla_p_ruleset); +NL_DECLARE_PARSER(ruleset_parser, struct genlmsghdr, nlf_p_empty, nla_p_ruleset); #undef _OUT static int diff --git a/sys/netpfil/pf/pflow.c b/sys/netpfil/pf/pflow.c index 397d720215b2..8741d55b622c 100644 --- a/sys/netpfil/pf/pflow.c +++ b/sys/netpfil/pf/pflow.c @@ -1389,15 +1389,12 @@ pflow_nl_create(struct nlmsghdr *hdr, struct nl_pstate *npt) struct pflow_parsed_del { int id; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pflow_parsed_del, _field) static const struct nlattr_parser nla_p_del[] = { { .type = PFLOWNL_DEL_ID, .off = _OUT(id), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_del[] = {}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(del_parser, struct genlmsghdr, nlf_p_del, nla_p_del); +NL_DECLARE_PARSER(del_parser, struct genlmsghdr, nlf_p_empty, nla_p_del); static int pflow_nl_del(struct nlmsghdr *hdr, struct nl_pstate *npt) @@ -1417,15 +1414,12 @@ pflow_nl_del(struct nlmsghdr *hdr, struct nl_pstate *npt) struct pflow_parsed_get { int id; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pflow_parsed_get, _field) static const struct nlattr_parser nla_p_get[] = { { .type = PFLOWNL_GET_ID, .off = _OUT(id), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_get[] = {}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(get_parser, struct genlmsghdr, nlf_p_get, nla_p_get); +NL_DECLARE_PARSER(get_parser, struct genlmsghdr, nlf_p_empty, nla_p_get); static bool nlattr_add_sockaddr(struct nl_writer *nw, int attr, const struct sockaddr *s) @@ -1558,7 +1552,6 @@ struct pflow_parsed_set { struct sockaddr_storage dst; uint32_t observation_dom; }; -#define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pflow_parsed_set, _field) static const struct nlattr_parser nla_p_set[] = { { .type = PFLOWNL_SET_ID, .off = _OUT(id), .cb = nlattr_get_uint32 }, @@ -1567,10 +1560,8 @@ static const struct nlattr_parser nla_p_set[] = { { .type = PFLOWNL_SET_DST, .off = _OUT(dst), .arg = &addr_parser, .cb = nlattr_get_nested }, { .type = PFLOWNL_SET_OBSERVATION_DOMAIN, .off = _OUT(observation_dom), .cb = nlattr_get_uint32 }, }; -static const struct nlfield_parser nlf_p_set[] = {}; -#undef _IN #undef _OUT -NL_DECLARE_PARSER(set_parser, struct genlmsghdr, nlf_p_set, nla_p_set); +NL_DECLARE_PARSER(set_parser, struct genlmsghdr, nlf_p_empty, nla_p_set); static int pflow_set(struct pflow_softc *sc, const struct pflow_parsed_set *pflowr, struct ucred *cred) From nobody Fri Jan 3 23:00:49 2025 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 4YPzZV679Mz5kYQS; Fri, 03 Jan 2025 23:00:50 +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 4YPzZV0NQLz4Lrw; Fri, 3 Jan 2025 23:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945250; 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=YeEyu8jgvigjPBV7C4an5xE3gVTqxakNwai7cnD1BJ4=; b=B/nousAUgwf15PkROoIl16Ax6IOvs3bF0j3Ve2pGA8aQkcilnE6qOMNSxIDzsv99y47E1A D3bpn/qqDUyKKT5JfYKmkYUoCd+AzWsI7L78wIiEkpPtQMNWaVk/BmThUIFTLK83kP27OX yQ5YlijkD2pTc0FEZjDLJJGBCXBtzIhBwnlnfMfcX56i0VE28CZpkecgOT4/vCZNcZR7zV rVTRPhIzPCwQxvlPxEe6xVQr88Fqv29t+QFQFmd9TyPyxS7PUWTHFinz4HErDwlWOIKO9k 4DfavUttgQUP0ctuT624RQhLnusz+dDUIsFmFFg4fnAI/TR4VZiff6V0v5046g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945250; 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=YeEyu8jgvigjPBV7C4an5xE3gVTqxakNwai7cnD1BJ4=; b=JfSZZNtUkE43Y8gf3tdvDM9wxrTmmqqT8dflhPeWLCXIq80zjitH/toxUzOHxN/03S6AGI o32wNnpTL9ZaCI/herIeAvBAKvi80lq/ns4uneWVvW1nkdlx5Kxp7n2IBRVfA4ZIwqF/0t 5ZXVAR1qn4M/SpGcLJ4awPPwlGx6OQ2V29cNnhk5N+pCs2Bj0GeUIj0dGknzUb3PvBTpxY gEPlV9UiEJDX7VvXApcgIGBod7tvMDd+n2CUCI5uDtaPx/X0CnUIQUX8oNp8J/RMu5fnkD ER3GChIJQIX53cXhGxSM9ki+/alXai1R90V3pAu2rPEQ36xJxJ0o7uJ/Bh4nTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735945250; a=rsa-sha256; cv=none; b=tKKOonFPbtD0u1oka6D53WQVLC/bgwZbMncnBdxTGInD6CMIlGm4I6fpLGG6OIIUtdDSBd WO1Jdbc9PIt8y1U4P6ZLz9qIH/xtBwnXGASA+XMGw6SwwtdOS3MLQ6wxPeGEn6sJGxBGkf C4BkwiNK8XPKU3wGelG9evr7E/TfW8Yytq6iVntLgpQ9kmWHodzAnxVORYFIPLP9OcijUp rbz5mdYx0QbIJQXC7ueguRjhXpoVM6BWT9a72yIO36z9Ro0jF+hSpGc3ab0ztCSG7YRAD4 yI8Phk0ERKWIVjwE+5jRss5NbpUEBS31qOsw54QtIUSlZmaXXnYsDuu87CzSPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPzZT719MzBCW; Fri, 03 Jan 2025 23:00:49 +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 503N0n7q075335; Fri, 3 Jan 2025 23:00:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503N0nJi075332; Fri, 3 Jan 2025 23:00:49 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:00:49 GMT Message-Id: <202501032300.503N0nJi075332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 804fe2660352 - main - acpica: Import ACPICA 20240321 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 804fe2660352e090f4481f2c1d646b508859e79a Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=804fe2660352e090f4481f2c1d646b508859e79a commit 804fe2660352e090f4481f2c1d646b508859e79a Merge: e9255dafa1ef b6246dbb668a Author: Jung-uk Kim AuthorDate: 2025-01-03 22:35:05 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 22:35:05 +0000 acpica: Import ACPICA 20240321 sys/contrib/dev/acpica/common/acfileio.c | 2 +- sys/contrib/dev/acpica/common/acgetline.c | 2 +- sys/contrib/dev/acpica/common/adfile.c | 2 +- sys/contrib/dev/acpica/common/adisasm.c | 2 +- sys/contrib/dev/acpica/common/adwalk.c | 2 +- sys/contrib/dev/acpica/common/ahids.c | 2 +- sys/contrib/dev/acpica/common/ahpredef.c | 2 +- sys/contrib/dev/acpica/common/ahtable.c | 3 +- sys/contrib/dev/acpica/common/ahuuids.c | 2 +- sys/contrib/dev/acpica/common/cmfsize.c | 2 +- sys/contrib/dev/acpica/common/dmextern.c | 2 +- sys/contrib/dev/acpica/common/dmrestag.c | 2 +- sys/contrib/dev/acpica/common/dmswitch.c | 2 +- sys/contrib/dev/acpica/common/dmtable.c | 194 +------- sys/contrib/dev/acpica/common/dmtables.c | 16 +- sys/contrib/dev/acpica/common/dmtbdump.c | 11 +- sys/contrib/dev/acpica/common/dmtbdump1.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump2.c | 480 +++--------------- sys/contrib/dev/acpica/common/dmtbdump3.c | 7 +- sys/contrib/dev/acpica/common/dmtbinfo.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo1.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo2.c | 308 ++++-------- sys/contrib/dev/acpica/common/dmtbinfo3.c | 15 +- sys/contrib/dev/acpica/common/getopt.c | 2 +- sys/contrib/dev/acpica/compiler/aslallocate.c | 2 +- sys/contrib/dev/acpica/compiler/aslanalyze.c | 2 +- sys/contrib/dev/acpica/compiler/aslascii.c | 2 +- sys/contrib/dev/acpica/compiler/aslbtypes.c | 2 +- sys/contrib/dev/acpica/compiler/aslcache.c | 2 +- sys/contrib/dev/acpica/compiler/aslcodegen.c | 2 +- sys/contrib/dev/acpica/compiler/aslcompile.c | 22 +- sys/contrib/dev/acpica/compiler/aslcompiler.h | 2 +- sys/contrib/dev/acpica/compiler/aslcompiler.l | 2 +- sys/contrib/dev/acpica/compiler/aslcstyle.y | 2 +- sys/contrib/dev/acpica/compiler/asldebug.c | 2 +- sys/contrib/dev/acpica/compiler/asldefine.h | 2 +- sys/contrib/dev/acpica/compiler/aslerror.c | 2 +- sys/contrib/dev/acpica/compiler/aslexternal.c | 2 +- sys/contrib/dev/acpica/compiler/aslfileio.c | 2 +- sys/contrib/dev/acpica/compiler/aslfiles.c | 6 +- sys/contrib/dev/acpica/compiler/aslfold.c | 2 +- sys/contrib/dev/acpica/compiler/aslglobal.h | 3 +- sys/contrib/dev/acpica/compiler/aslhelp.c | 3 +- sys/contrib/dev/acpica/compiler/aslhelpers.y | 2 +- sys/contrib/dev/acpica/compiler/aslhex.c | 2 +- sys/contrib/dev/acpica/compiler/aslkeywords.y | 2 +- sys/contrib/dev/acpica/compiler/asllength.c | 2 +- sys/contrib/dev/acpica/compiler/asllisting.c | 2 +- sys/contrib/dev/acpica/compiler/asllistsup.c | 2 +- sys/contrib/dev/acpica/compiler/aslload.c | 2 +- sys/contrib/dev/acpica/compiler/asllookup.c | 2 +- sys/contrib/dev/acpica/compiler/aslmain.c | 2 +- sys/contrib/dev/acpica/compiler/aslmap.c | 2 +- sys/contrib/dev/acpica/compiler/aslmapenter.c | 2 +- sys/contrib/dev/acpica/compiler/aslmapoutput.c | 2 +- sys/contrib/dev/acpica/compiler/aslmaputils.c | 2 +- sys/contrib/dev/acpica/compiler/aslmessages.c | 2 +- sys/contrib/dev/acpica/compiler/aslmessages.h | 2 +- sys/contrib/dev/acpica/compiler/aslmethod.c | 2 +- sys/contrib/dev/acpica/compiler/aslnamesp.c | 2 +- sys/contrib/dev/acpica/compiler/asloffset.c | 2 +- sys/contrib/dev/acpica/compiler/aslopcodes.c | 2 +- sys/contrib/dev/acpica/compiler/asloperands.c | 2 +- sys/contrib/dev/acpica/compiler/aslopt.c | 2 +- sys/contrib/dev/acpica/compiler/asloptions.c | 9 +- sys/contrib/dev/acpica/compiler/aslparseop.c | 2 +- sys/contrib/dev/acpica/compiler/aslparser.y | 2 +- sys/contrib/dev/acpica/compiler/aslpld.c | 2 +- sys/contrib/dev/acpica/compiler/aslpredef.c | 2 +- sys/contrib/dev/acpica/compiler/aslprepkg.c | 2 +- sys/contrib/dev/acpica/compiler/aslprimaries.y | 2 +- sys/contrib/dev/acpica/compiler/aslprintf.c | 2 +- sys/contrib/dev/acpica/compiler/aslprune.c | 2 +- sys/contrib/dev/acpica/compiler/aslresource.c | 2 +- sys/contrib/dev/acpica/compiler/aslresources.y | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1i.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2d.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2e.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2q.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2s.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2w.c | 2 +- sys/contrib/dev/acpica/compiler/aslrules.y | 2 +- sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +- sys/contrib/dev/acpica/compiler/aslstubs.c | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.l | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.y | 2 +- sys/contrib/dev/acpica/compiler/asltokens.y | 2 +- sys/contrib/dev/acpica/compiler/asltransform.c | 2 +- sys/contrib/dev/acpica/compiler/asltree.c | 2 +- sys/contrib/dev/acpica/compiler/asltypes.h | 2 +- sys/contrib/dev/acpica/compiler/asltypes.y | 2 +- sys/contrib/dev/acpica/compiler/aslutils.c | 2 +- sys/contrib/dev/acpica/compiler/asluuid.c | 2 +- sys/contrib/dev/acpica/compiler/aslwalks.c | 2 +- sys/contrib/dev/acpica/compiler/aslxref.c | 2 +- sys/contrib/dev/acpica/compiler/aslxrefout.c | 2 +- sys/contrib/dev/acpica/compiler/cvcompiler.c | 2 +- sys/contrib/dev/acpica/compiler/cvdisasm.c | 2 +- sys/contrib/dev/acpica/compiler/cvparser.c | 2 +- sys/contrib/dev/acpica/compiler/dtcompile.c | 2 +- sys/contrib/dev/acpica/compiler/dtcompiler.h | 12 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtexpress.c | 2 +- sys/contrib/dev/acpica/compiler/dtfield.c | 2 +- sys/contrib/dev/acpica/compiler/dtio.c | 2 +- sys/contrib/dev/acpica/compiler/dtparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtsubtable.c | 2 +- sys/contrib/dev/acpica/compiler/dttable.c | 2 +- sys/contrib/dev/acpica/compiler/dttable1.c | 2 +- sys/contrib/dev/acpica/compiler/dttable2.c | 478 +++--------------- sys/contrib/dev/acpica/compiler/dttemplate.c | 2 +- sys/contrib/dev/acpica/compiler/dttemplate.h | 179 +++---- sys/contrib/dev/acpica/compiler/dtutils.c | 9 +- sys/contrib/dev/acpica/compiler/preprocess.h | 2 +- sys/contrib/dev/acpica/compiler/prexpress.c | 2 +- sys/contrib/dev/acpica/compiler/prmacros.c | 2 +- sys/contrib/dev/acpica/compiler/prparser.l | 2 +- sys/contrib/dev/acpica/compiler/prparser.y | 2 +- sys/contrib/dev/acpica/compiler/prscan.c | 2 +- sys/contrib/dev/acpica/compiler/prutils.c | 30 +- .../dev/acpica/components/debugger/dbcmds.c | 2 +- .../dev/acpica/components/debugger/dbconvert.c | 2 +- .../dev/acpica/components/debugger/dbdisply.c | 2 +- .../dev/acpica/components/debugger/dbexec.c | 2 +- .../dev/acpica/components/debugger/dbfileio.c | 2 +- .../dev/acpica/components/debugger/dbhistry.c | 2 +- .../dev/acpica/components/debugger/dbinput.c | 2 +- .../dev/acpica/components/debugger/dbmethod.c | 2 +- .../dev/acpica/components/debugger/dbnames.c | 9 +- .../dev/acpica/components/debugger/dbobject.c | 2 +- .../dev/acpica/components/debugger/dbstats.c | 2 +- .../dev/acpica/components/debugger/dbtest.c | 2 +- .../dev/acpica/components/debugger/dbutils.c | 2 +- .../dev/acpica/components/debugger/dbxface.c | 2 +- .../dev/acpica/components/disassembler/dmbuffer.c | 2 +- .../dev/acpica/components/disassembler/dmcstyle.c | 2 +- .../acpica/components/disassembler/dmdeferred.c | 2 +- .../dev/acpica/components/disassembler/dmnames.c | 2 +- .../dev/acpica/components/disassembler/dmopcode.c | 2 +- .../dev/acpica/components/disassembler/dmresrc.c | 2 +- .../dev/acpica/components/disassembler/dmresrcl.c | 2 +- .../dev/acpica/components/disassembler/dmresrcl2.c | 2 +- .../dev/acpica/components/disassembler/dmresrcs.c | 2 +- .../dev/acpica/components/disassembler/dmutils.c | 2 +- .../dev/acpica/components/disassembler/dmwalk.c | 2 +- .../dev/acpica/components/dispatcher/dsargs.c | 2 +- .../dev/acpica/components/dispatcher/dscontrol.c | 2 +- .../dev/acpica/components/dispatcher/dsdebug.c | 2 +- .../dev/acpica/components/dispatcher/dsfield.c | 2 +- .../dev/acpica/components/dispatcher/dsinit.c | 2 +- .../dev/acpica/components/dispatcher/dsmethod.c | 2 +- .../dev/acpica/components/dispatcher/dsmthdat.c | 2 +- .../dev/acpica/components/dispatcher/dsobject.c | 2 +- .../dev/acpica/components/dispatcher/dsopcode.c | 2 +- .../dev/acpica/components/dispatcher/dspkginit.c | 2 +- .../dev/acpica/components/dispatcher/dsutils.c | 2 +- .../dev/acpica/components/dispatcher/dswexec.c | 2 +- .../dev/acpica/components/dispatcher/dswload.c | 2 +- .../dev/acpica/components/dispatcher/dswload2.c | 2 +- .../dev/acpica/components/dispatcher/dswscope.c | 2 +- .../dev/acpica/components/dispatcher/dswstate.c | 2 +- sys/contrib/dev/acpica/components/events/evevent.c | 2 +- sys/contrib/dev/acpica/components/events/evglock.c | 2 +- sys/contrib/dev/acpica/components/events/evgpe.c | 2 +- .../dev/acpica/components/events/evgpeblk.c | 2 +- .../dev/acpica/components/events/evgpeinit.c | 3 +- .../dev/acpica/components/events/evgpeutil.c | 2 +- .../dev/acpica/components/events/evhandler.c | 2 +- sys/contrib/dev/acpica/components/events/evmisc.c | 2 +- .../dev/acpica/components/events/evregion.c | 2 +- .../dev/acpica/components/events/evrgnini.c | 2 +- sys/contrib/dev/acpica/components/events/evsci.c | 2 +- sys/contrib/dev/acpica/components/events/evxface.c | 2 +- .../dev/acpica/components/events/evxfevnt.c | 2 +- sys/contrib/dev/acpica/components/events/evxfgpe.c | 4 +- .../dev/acpica/components/events/evxfregn.c | 2 +- .../dev/acpica/components/executer/exconcat.c | 2 +- .../dev/acpica/components/executer/exconfig.c | 2 +- .../dev/acpica/components/executer/exconvrt.c | 2 +- .../dev/acpica/components/executer/excreate.c | 2 +- .../dev/acpica/components/executer/exdebug.c | 2 +- .../dev/acpica/components/executer/exdump.c | 2 +- .../dev/acpica/components/executer/exfield.c | 2 +- .../dev/acpica/components/executer/exfldio.c | 2 +- .../dev/acpica/components/executer/exmisc.c | 2 +- .../dev/acpica/components/executer/exmutex.c | 2 +- .../dev/acpica/components/executer/exnames.c | 2 +- .../dev/acpica/components/executer/exoparg1.c | 2 +- .../dev/acpica/components/executer/exoparg2.c | 2 +- .../dev/acpica/components/executer/exoparg3.c | 2 +- .../dev/acpica/components/executer/exoparg6.c | 2 +- .../dev/acpica/components/executer/exprep.c | 2 +- .../dev/acpica/components/executer/exregion.c | 2 +- .../dev/acpica/components/executer/exresnte.c | 2 +- .../dev/acpica/components/executer/exresolv.c | 2 +- .../dev/acpica/components/executer/exresop.c | 2 +- .../dev/acpica/components/executer/exserial.c | 2 +- .../dev/acpica/components/executer/exstore.c | 2 +- .../dev/acpica/components/executer/exstoren.c | 2 +- .../dev/acpica/components/executer/exstorob.c | 2 +- .../dev/acpica/components/executer/exsystem.c | 2 +- .../dev/acpica/components/executer/extrace.c | 2 +- .../dev/acpica/components/executer/exutils.c | 2 +- .../dev/acpica/components/hardware/hwacpi.c | 2 +- .../dev/acpica/components/hardware/hwesleep.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwgpe.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwpci.c | 2 +- .../dev/acpica/components/hardware/hwregs.c | 2 +- .../dev/acpica/components/hardware/hwsleep.c | 2 +- .../dev/acpica/components/hardware/hwtimer.c | 2 +- .../dev/acpica/components/hardware/hwvalid.c | 2 +- .../dev/acpica/components/hardware/hwxface.c | 2 +- .../dev/acpica/components/hardware/hwxfsleep.c | 2 +- .../dev/acpica/components/namespace/nsaccess.c | 2 +- .../dev/acpica/components/namespace/nsalloc.c | 2 +- .../dev/acpica/components/namespace/nsarguments.c | 2 +- .../dev/acpica/components/namespace/nsconvert.c | 2 +- .../dev/acpica/components/namespace/nsdump.c | 2 +- .../dev/acpica/components/namespace/nsdumpdv.c | 2 +- .../dev/acpica/components/namespace/nseval.c | 2 +- .../dev/acpica/components/namespace/nsinit.c | 2 +- .../dev/acpica/components/namespace/nsload.c | 2 +- .../dev/acpica/components/namespace/nsnames.c | 2 +- .../dev/acpica/components/namespace/nsobject.c | 2 +- .../dev/acpica/components/namespace/nsparse.c | 2 +- .../dev/acpica/components/namespace/nspredef.c | 2 +- .../dev/acpica/components/namespace/nsprepkg.c | 2 +- .../dev/acpica/components/namespace/nsrepair.c | 2 +- .../dev/acpica/components/namespace/nsrepair2.c | 2 +- .../dev/acpica/components/namespace/nssearch.c | 2 +- .../dev/acpica/components/namespace/nsutils.c | 2 +- .../dev/acpica/components/namespace/nswalk.c | 2 +- .../dev/acpica/components/namespace/nsxfeval.c | 2 +- .../dev/acpica/components/namespace/nsxfname.c | 2 +- .../dev/acpica/components/namespace/nsxfobj.c | 2 +- sys/contrib/dev/acpica/components/parser/psargs.c | 2 +- sys/contrib/dev/acpica/components/parser/psloop.c | 2 +- .../dev/acpica/components/parser/psobject.c | 2 +- .../dev/acpica/components/parser/psopcode.c | 2 +- .../dev/acpica/components/parser/psopinfo.c | 2 +- sys/contrib/dev/acpica/components/parser/psparse.c | 2 +- sys/contrib/dev/acpica/components/parser/psscope.c | 2 +- sys/contrib/dev/acpica/components/parser/pstree.c | 2 +- sys/contrib/dev/acpica/components/parser/psutils.c | 2 +- sys/contrib/dev/acpica/components/parser/pswalk.c | 2 +- sys/contrib/dev/acpica/components/parser/psxface.c | 2 +- .../dev/acpica/components/resources/rsaddr.c | 2 +- .../dev/acpica/components/resources/rscalc.c | 2 +- .../dev/acpica/components/resources/rscreate.c | 2 +- .../dev/acpica/components/resources/rsdump.c | 2 +- .../dev/acpica/components/resources/rsdumpinfo.c | 2 +- .../dev/acpica/components/resources/rsinfo.c | 2 +- sys/contrib/dev/acpica/components/resources/rsio.c | 2 +- .../dev/acpica/components/resources/rsirq.c | 2 +- .../dev/acpica/components/resources/rslist.c | 2 +- .../dev/acpica/components/resources/rsmemory.c | 2 +- .../dev/acpica/components/resources/rsmisc.c | 2 +- .../dev/acpica/components/resources/rsserial.c | 2 +- .../dev/acpica/components/resources/rsutils.c | 2 +- .../dev/acpica/components/resources/rsxface.c | 2 +- sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +- sys/contrib/dev/acpica/components/tables/tbfadt.c | 2 +- sys/contrib/dev/acpica/components/tables/tbfind.c | 2 +- .../dev/acpica/components/tables/tbinstal.c | 2 +- sys/contrib/dev/acpica/components/tables/tbprint.c | 2 +- sys/contrib/dev/acpica/components/tables/tbutils.c | 2 +- sys/contrib/dev/acpica/components/tables/tbxface.c | 2 +- .../dev/acpica/components/tables/tbxfload.c | 2 +- .../dev/acpica/components/tables/tbxfroot.c | 2 +- .../dev/acpica/components/utilities/utaddress.c | 2 +- .../dev/acpica/components/utilities/utalloc.c | 2 +- .../dev/acpica/components/utilities/utascii.c | 2 +- .../dev/acpica/components/utilities/utbuffer.c | 2 +- .../dev/acpica/components/utilities/utcache.c | 2 +- .../dev/acpica/components/utilities/utcksum.c | 2 +- .../dev/acpica/components/utilities/utcopy.c | 2 +- .../dev/acpica/components/utilities/utdebug.c | 7 +- .../dev/acpica/components/utilities/utdecode.c | 2 +- .../dev/acpica/components/utilities/utdelete.c | 2 +- .../dev/acpica/components/utilities/uterror.c | 2 +- .../dev/acpica/components/utilities/uteval.c | 2 +- .../dev/acpica/components/utilities/utexcep.c | 2 +- .../dev/acpica/components/utilities/utglobal.c | 2 +- .../dev/acpica/components/utilities/uthex.c | 2 +- .../dev/acpica/components/utilities/utids.c | 2 +- .../dev/acpica/components/utilities/utinit.c | 2 +- .../dev/acpica/components/utilities/utlock.c | 2 +- .../dev/acpica/components/utilities/utmath.c | 2 +- .../dev/acpica/components/utilities/utmisc.c | 2 +- .../dev/acpica/components/utilities/utmutex.c | 2 +- .../dev/acpica/components/utilities/utnonansi.c | 2 +- .../dev/acpica/components/utilities/utobject.c | 2 +- .../dev/acpica/components/utilities/utosi.c | 2 +- .../dev/acpica/components/utilities/utownerid.c | 2 +- .../dev/acpica/components/utilities/utpredef.c | 2 +- .../dev/acpica/components/utilities/utresdecode.c | 2 +- .../dev/acpica/components/utilities/utresrc.c | 2 +- .../dev/acpica/components/utilities/utstate.c | 2 +- .../dev/acpica/components/utilities/utstring.c | 2 +- .../dev/acpica/components/utilities/utstrsuppt.c | 2 +- .../dev/acpica/components/utilities/utstrtoul64.c | 2 +- .../dev/acpica/components/utilities/uttrack.c | 2 +- .../dev/acpica/components/utilities/utuuid.c | 2 +- .../dev/acpica/components/utilities/utxface.c | 2 +- .../dev/acpica/components/utilities/utxferror.c | 2 +- .../dev/acpica/components/utilities/utxfinit.c | 2 +- .../dev/acpica/components/utilities/utxfmutex.c | 2 +- sys/contrib/dev/acpica/include/acapps.h | 2 +- sys/contrib/dev/acpica/include/acbuffer.h | 2 +- sys/contrib/dev/acpica/include/acclib.h | 2 +- sys/contrib/dev/acpica/include/accommon.h | 2 +- sys/contrib/dev/acpica/include/acconfig.h | 2 +- sys/contrib/dev/acpica/include/acconvert.h | 2 +- sys/contrib/dev/acpica/include/acdebug.h | 2 +- sys/contrib/dev/acpica/include/acdisasm.h | 42 +- sys/contrib/dev/acpica/include/acdispat.h | 2 +- sys/contrib/dev/acpica/include/acevents.h | 2 +- sys/contrib/dev/acpica/include/acexcep.h | 2 +- sys/contrib/dev/acpica/include/acglobal.h | 2 +- sys/contrib/dev/acpica/include/achware.h | 2 +- sys/contrib/dev/acpica/include/acinterp.h | 2 +- sys/contrib/dev/acpica/include/aclocal.h | 4 +- sys/contrib/dev/acpica/include/acmacros.h | 2 +- sys/contrib/dev/acpica/include/acnames.h | 2 +- sys/contrib/dev/acpica/include/acnamesp.h | 2 +- sys/contrib/dev/acpica/include/acobject.h | 84 ++-- sys/contrib/dev/acpica/include/acopcode.h | 2 +- sys/contrib/dev/acpica/include/acoutput.h | 2 +- sys/contrib/dev/acpica/include/acparser.h | 2 +- sys/contrib/dev/acpica/include/acpi.h | 2 +- sys/contrib/dev/acpica/include/acpiosxf.h | 2 +- sys/contrib/dev/acpica/include/acpixf.h | 2 +- sys/contrib/dev/acpica/include/acpredef.h | 2 +- sys/contrib/dev/acpica/include/acresrc.h | 2 +- sys/contrib/dev/acpica/include/acrestyp.h | 2 +- sys/contrib/dev/acpica/include/acstruct.h | 2 +- sys/contrib/dev/acpica/include/actables.h | 2 +- sys/contrib/dev/acpica/include/actbinfo.h | 24 +- sys/contrib/dev/acpica/include/actbl.h | 2 +- sys/contrib/dev/acpica/include/actbl1.h | 12 +- sys/contrib/dev/acpica/include/actbl2.h | 545 +++++++++++---------- sys/contrib/dev/acpica/include/actbl3.h | 22 +- sys/contrib/dev/acpica/include/actypes.h | 2 +- sys/contrib/dev/acpica/include/acutils.h | 2 +- sys/contrib/dev/acpica/include/acuuid.h | 2 +- sys/contrib/dev/acpica/include/amlcode.h | 2 +- sys/contrib/dev/acpica/include/amlresrc.h | 2 +- sys/contrib/dev/acpica/include/platform/acenv.h | 2 +- sys/contrib/dev/acpica/include/platform/acenvex.h | 2 +- .../dev/acpica/include/platform/acfreebsd.h | 2 +- sys/contrib/dev/acpica/include/platform/acgcc.h | 4 +- sys/contrib/dev/acpica/include/platform/acgccex.h | 2 +- .../acpica/os_specific/service_layers/osgendbg.c | 2 +- .../acpica/os_specific/service_layers/osunixxf.c | 2 +- 358 files changed, 1152 insertions(+), 2049 deletions(-) diff --cc sys/contrib/dev/acpica/common/getopt.c index 59e40334dad7,000000000000..9792304df75e mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/common/getopt.c +++ b/sys/contrib/dev/acpica/common/getopt.c @@@ -1,384 -1,0 +1,384 @@@ +/****************************************************************************** + * + * Module Name: getopt + * + *****************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * - * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. ++ * Some or all of this work - Copyright (c) 1999 - 2024, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +/* + * ACPICA getopt() implementation + * + * Option strings: + * "f" - Option has no arguments + * "f:" - Option requires an argument + * "f+" - Option has an optional argument + * "f^" - Option has optional single-char sub-options + * "f|" - Option has required single-char sub-options + */ + +#include +#include +#include + +#define ACPI_OPTION_ERROR(msg, badchar) \ + if (AcpiGbl_Opterr) {fprintf (stderr, "%s%c\n", msg, badchar);} + + +int AcpiGbl_Opterr = 1; +int AcpiGbl_Optind = 1; +int AcpiGbl_SubOptChar = 0; +char *AcpiGbl_Optarg; + +static int CurrentCharPtr = 1; + + +/******************************************************************************* + * + * FUNCTION: AcpiGetoptArgument + * + * PARAMETERS: argc, argv - from main + * + * RETURN: 0 if an argument was found, -1 otherwise. Sets AcpiGbl_Optarg + * to point to the next argument. + * + * DESCRIPTION: Get the next argument. Used to obtain arguments for the + * two-character options after the original call to AcpiGetopt. + * Note: Either the argument starts at the next character after + * the option, or it is pointed to by the next argv entry. + * (After call to AcpiGetopt, we need to backup to the previous + * argv entry). + * + ******************************************************************************/ + +int +AcpiGetoptArgument ( + int argc, + char **argv) +{ + + AcpiGbl_Optind--; + CurrentCharPtr++; + + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + ACPI_OPTION_ERROR ("\nOption requires an argument", 0); + + CurrentCharPtr = 1; + return (-1); + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + return (0); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiGetopt + * + * PARAMETERS: argc, argv - from main + * opts - options info list + * + * RETURN: Option character or ACPI_OPT_END + * + * DESCRIPTION: Get the next option + * + ******************************************************************************/ + +int +AcpiGetopt( + int argc, + char **argv, + char *opts) +{ + int CurrentChar; + char *OptsPtr; + + + if (CurrentCharPtr == 1) + { + if (AcpiGbl_Optind >= argc || + argv[AcpiGbl_Optind][0] != '-' || + argv[AcpiGbl_Optind][1] == '\0') + { + return (ACPI_OPT_END); + } + else if (strcmp (argv[AcpiGbl_Optind], "--") == 0) + { + AcpiGbl_Optind++; + return (ACPI_OPT_END); + } + } + + /* Get the option */ + + CurrentChar = argv[AcpiGbl_Optind][CurrentCharPtr]; + + /* Make sure that the option is legal */ + + if (CurrentChar == ':' || + (OptsPtr = strchr (opts, CurrentChar)) == NULL) + { + ACPI_OPTION_ERROR ("Illegal option: -", CurrentChar); + + if (argv[AcpiGbl_Optind][++CurrentCharPtr] == '\0') + { + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + return ('?'); + } + + /* Option requires an argument? */ + + if (*++OptsPtr == ':') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + ACPI_OPTION_ERROR ( + "Option requires an argument: -", CurrentChar); + + CurrentCharPtr = 1; + return ('?'); + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + } + + /* Option has an optional argument? */ + + else if (*OptsPtr == '+') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + AcpiGbl_Optarg = NULL; + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + } + + /* Option has optional single-char arguments? */ + + else if (*OptsPtr == '^') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)]; + } + else + { + AcpiGbl_Optarg = "^"; + } + + AcpiGbl_SubOptChar = AcpiGbl_Optarg[0]; + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + /* Option has a required single-char argument? */ + + else if (*OptsPtr == '|') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)]; + } + else + { + ACPI_OPTION_ERROR ( + "Option requires a single-character suboption: -", + CurrentChar); + + CurrentCharPtr = 1; + return ('?'); + } + + AcpiGbl_SubOptChar = AcpiGbl_Optarg[0]; + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + /* Option with no arguments */ + + else + { + if (argv[AcpiGbl_Optind][++CurrentCharPtr] == '\0') + { + CurrentCharPtr = 1; + AcpiGbl_Optind++; + } + + AcpiGbl_Optarg = NULL; + } + + return (CurrentChar); +} diff --cc sys/contrib/dev/acpica/compiler/aslhelp.c index 4ad4ad37fb4b,5ef400d1528c..357ae8a23ff5 --- a/sys/contrib/dev/acpica/compiler/aslhelp.c +++ b/sys/contrib/dev/acpica/compiler/aslhelp.c @@@ -182,8 -182,10 +182,9 @@@ Usage ACPI_OPTION ("-I ", "Specify additional include directory"); ACPI_OPTION ("-p ", "Specify path/filename prefix for all output files"); ACPI_OPTION ("-v", "Display compiler version"); - ACPI_OPTION ("-vd", "Display compiler build date and time"); ACPI_OPTION ("-vo", "Enable optimization comments"); ACPI_OPTION ("-vs", "Disable signon"); + ACPI_OPTION ("-ld", "Disable deterministic output"); printf ("\nHelp:\n"); ACPI_OPTION ("-h", "This message"); diff --cc sys/contrib/dev/acpica/components/debugger/dbtest.c index 9fc311c82d6c,000000000000..955b40d0dd89 mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/components/debugger/dbtest.c +++ b/sys/contrib/dev/acpica/components/debugger/dbtest.c @@@ -1,1340 -1,0 +1,1340 @@@ +/******************************************************************************* + * + * Module Name: dbtest - Various debug-related tests + * + ******************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * - * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. ++ * Some or all of this work - Copyright (c) 1999 - 2024, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +#define _COMPONENT ACPI_CA_DEBUGGER + ACPI_MODULE_NAME ("dbtest") + + +/* Local prototypes */ + +static void +AcpiDbTestAllObjects ( + void); + +static ACPI_STATUS +AcpiDbTestOneObject ( + ACPI_HANDLE ObjHandle, + UINT32 NestingLevel, + void *Context, + void **ReturnValue); + +static ACPI_STATUS +AcpiDbTestIntegerType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 BitLength); + +static ACPI_STATUS +AcpiDbTestBufferType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 BitLength); + +static ACPI_STATUS +AcpiDbTestStringType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 ByteLength); + +static ACPI_STATUS +AcpiDbTestPackageType ( + ACPI_NAMESPACE_NODE *Node); + +static ACPI_STATUS +AcpiDbTestFieldUnitType ( + ACPI_OPERAND_OBJECT *ObjDesc); + +static ACPI_STATUS +AcpiDbReadFromObject ( *** 1907 LINES SKIPPED *** From nobody Fri Jan 3 23:00:51 2025 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 4YPzZX2GPXz5kYRp; Fri, 03 Jan 2025 23:00:52 +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 4YPzZX0b6lz4LhT; Fri, 3 Jan 2025 23:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945252; 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=SdqTXfkI+QA1ew3yk7L/X+VMEXmfYuXUGHQ/8Nf9XVo=; b=Dm1eS8dP9YPeM2cpykweSvysRajIvQsCfjCkD6z1+UZal2vzjieM7gZwf51eih0NqDoCgu TgKkvSGPM/PAAmPPQNOP+zoEgCQccnwY58DE/H8pBgat3xfClRGa/5jTdEmqJTCBtT/AYe 6ww9C45MOSE89pmwmzMWdh67JTV0wDiPa8hMBMFl5CCRaBsKIep1lQEEFdCN5glPdE5UNA mqKCqNGqjc4xcbk4JdG38RrM0eeaQHsxiVu+Hd1ue5gyWH3Ac1xYXJaLyV5iD6S24ziriH ifHJ0BzGL1t3Ovwi3XaXynlrX+hADiVSHwFyJmX+kK8Bs1gpg0ChL5tzE2ob+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945252; 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=SdqTXfkI+QA1ew3yk7L/X+VMEXmfYuXUGHQ/8Nf9XVo=; b=RsLW5QXE3Cne2ykTabYgXpjHMYM4N3+w6SlAOZxFjqZPaZAwz0qUkpfI9tqO0MqfDrFL8P aGUw3xsbWM5aaAKjjXJDxL2wPSpLJEwxkWy9AviyIY71z11dqdakC0cH9v7NMBD3JTSCcu tbaO+0WJpTAYdMrwE9zmUPrS+cF8bt8iLWGLJf4i4lRZOe9lxDiDG62+IGOSBHu8bVuAJL epRn+rvIklSX1P9GXmV0BpVo0vXLnaeLRTnpKxEURFS1MFbofDlLdKXUBGPZFrj9mZKcXq Ca//XGCMiyosxYIsMyBLUT9hyk78lAgBHr5gMtoVFALYw455REgNZA+OWAdD7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735945252; a=rsa-sha256; cv=none; b=HZsTijvtwIzYn2LgXqOz+Wcbu9kZ/9IEog0sKxPrzQfxSstvK1gIHtwPn2cYWtcVQMKw8M lmHIYK19CueV7cjZzpvtu83kc4vJ/1PKUuqO+LrfyBgJRljqKLqGo2uHzP/ScC14CtsUlm aMacXdqCNdj/ItM8jK3NHpYGIGtjqShemc47Xncv7puYLglnJBcnLLgD5ZS5yTaW0Iws1i vNGTiCDrPN+5KVul6P+UTdwAqmu0akF6lTHmOQvvNxbmMPOnA3weOPZuHdkVM/gJc6lZHG SXAU8BXYKlguk2QQFhwRvYRy5Xjs/t48+JIXeFklHwSSQDduVfDmjQXl5EJZxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPzZX01YNzBH4; Fri, 03 Jan 2025 23:00:52 +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 503N0piV075385; Fri, 3 Jan 2025 23:00:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503N0pjF075383; Fri, 3 Jan 2025 23:00:51 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:00:51 GMT Message-Id: <202501032300.503N0pjF075383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 92f570c32e9b - main - acpica: Import ACPICA 20240827 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92f570c32e9b9b9b4db9b6921c4ab79be686a498 Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=92f570c32e9b9b9b4db9b6921c4ab79be686a498 commit 92f570c32e9b9b9b4db9b6921c4ab79be686a498 Merge: 804fe2660352 e690145f81b9 Author: Jung-uk Kim AuthorDate: 2025-01-03 22:41:26 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 22:41:26 +0000 acpica: Import ACPICA 20240827 sys/contrib/dev/acpica/changes.txt | 51 ++++++- sys/contrib/dev/acpica/common/dmtable.c | 18 ++- sys/contrib/dev/acpica/common/dmtbdump.c | 7 +- sys/contrib/dev/acpica/common/dmtbdump1.c | 156 +++++++++++++++++-- sys/contrib/dev/acpica/common/dmtbdump2.c | 107 ++++++++----- sys/contrib/dev/acpica/common/dmtbdump3.c | 3 +- sys/contrib/dev/acpica/common/dmtbinfo1.c | 124 ++++++++++++++- sys/contrib/dev/acpica/common/dmtbinfo2.c | 13 +- sys/contrib/dev/acpica/compiler/aslcompiler.h | 13 +- sys/contrib/dev/acpica/compiler/aslcompiler.l | 3 + sys/contrib/dev/acpica/compiler/asldefine.h | 2 +- sys/contrib/dev/acpica/compiler/aslmap.c | 3 + sys/contrib/dev/acpica/compiler/aslparseop.c | 2 +- sys/contrib/dev/acpica/compiler/aslparser.y | 2 +- sys/contrib/dev/acpica/compiler/aslresource.c | 15 ++ sys/contrib/dev/acpica/compiler/aslresources.y | 45 ++++++ sys/contrib/dev/acpica/compiler/aslrestype2d.c | 157 +++++++++++++++++++ sys/contrib/dev/acpica/compiler/aslrestype2q.c | 156 +++++++++++++++++++ sys/contrib/dev/acpica/compiler/aslrestype2w.c | 156 +++++++++++++++++++ sys/contrib/dev/acpica/compiler/asltokens.y | 3 + sys/contrib/dev/acpica/compiler/asltypes.y | 3 + sys/contrib/dev/acpica/compiler/dtfield.c | 4 +- sys/contrib/dev/acpica/compiler/dttable1.c | 149 +++++++++++++++++- sys/contrib/dev/acpica/compiler/dttable2.c | 2 +- sys/contrib/dev/acpica/compiler/dttemplate.h | 168 ++++++++++++--------- sys/contrib/dev/acpica/compiler/dtutils.c | 12 ++ sys/contrib/dev/acpica/compiler/prmacros.c | 10 +- .../dev/acpica/components/debugger/dbconvert.c | 2 + .../dev/acpica/components/disassembler/dmwalk.c | 2 - .../dev/acpica/components/executer/exconvrt.c | 56 ++++++- .../dev/acpica/components/executer/exprep.c | 4 + .../dev/acpica/components/executer/exregion.c | 23 +-- .../dev/acpica/components/executer/exsystem.c | 4 +- .../dev/acpica/components/hardware/hwxfsleep.c | 15 +- sys/contrib/dev/acpica/components/parser/psargs.c | 56 +++++++ .../dev/acpica/components/resources/rsaddr.c | 3 +- .../dev/acpica/components/resources/rsdump.c | 3 +- sys/contrib/dev/acpica/components/tables/tbfadt.c | 29 ++-- sys/contrib/dev/acpica/components/tables/tbutils.c | 12 +- .../dev/acpica/components/utilities/utdelete.c | 4 +- .../dev/acpica/components/utilities/utinit.c | 2 +- .../dev/acpica/components/utilities/utosi.c | 1 + .../dev/acpica/components/utilities/utxfinit.c | 28 ++-- sys/contrib/dev/acpica/include/acconfig.h | 1 - sys/contrib/dev/acpica/include/acdisasm.h | 12 ++ sys/contrib/dev/acpica/include/acglobal.h | 6 +- sys/contrib/dev/acpica/include/aclocal.h | 2 + sys/contrib/dev/acpica/include/acoutput.h | 5 + sys/contrib/dev/acpica/include/acpixf.h | 4 +- sys/contrib/dev/acpica/include/acpredef.h | 2 +- sys/contrib/dev/acpica/include/actbinfo.h | 11 ++ sys/contrib/dev/acpica/include/actbl1.h | 17 ++- sys/contrib/dev/acpica/include/actbl2.h | 109 ++++++++++++- sys/contrib/dev/acpica/include/actypes.h | 1 + sys/contrib/dev/acpica/include/platform/acenv.h | 6 + 55 files changed, 1548 insertions(+), 256 deletions(-) diff --cc sys/contrib/dev/acpica/include/acpixf.h index b954922df88f,53d56a95b65e..bdd5ed473ca7 --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@@ -154,12 -154,12 +154,12 @@@ /* Current ACPICA subsystem version in YYYYMMDD format */ - #define ACPI_CA_VERSION 0x20230628 + #define ACPI_CA_VERSION 0x20240827 -#include "acconfig.h" -#include "actypes.h" -#include "actbl.h" -#include "acbuffer.h" +#include +#include +#include +#include /***************************************************************************** From nobody Fri Jan 3 23:00:53 2025 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 4YPzZb076Yz5kYL1; Fri, 03 Jan 2025 23:00:55 +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 4YPzZZ0Sdpz4Lpk; Fri, 3 Jan 2025 23:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945254; 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=IZcu5b43w2IU547M56Bc8r2ssQ5FTShp8Od3Qh/EPVk=; b=qr6BJPqQN+ToMIXwbyjHZkOLR1f8bdHw9+ZvmXKMYFMMA6HWl9KiJXEsfBfgUYmAUaQXlb STTs5eEcSp+1M51fOajoS/qK5gVRYpMgUhMWMksO9JqQ/VnZYV3oC+3MiGSTsEox7s004e 93NT9llY9L0ix4VDf6/26dKsxLs+xYeER5KMIBtJnDCDx+J1dSlCAjxIwTnbij0bS0BYK+ lh/+gGB6Ke04q012xNySFmorwkS6rMjkFGAYZPrIHLlkEheGlU5rjGFQE1uoUiDzz8W/4g 2E0GD/fj6u4/++4l3KTsB0SmLe9so2r8U7AkVwm43X9o4rvXZoVm+iUOP26Vzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945254; 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=IZcu5b43w2IU547M56Bc8r2ssQ5FTShp8Od3Qh/EPVk=; b=JMinobQA22jSEMDICQg5m4Uzqv2daI7kNED5UcZZ+Gj1muSgI27sHOeMcEznkd7L9pn2xg lMuhn+1I/Rd5BYa3PY0UFyuSh7cyUjdW6mx7wHFRHcnApizH3CPmdzVvzWyxWcUcLQIwDQ M9rN2e6Cea4QjNqIjBiYtllJ9CeyHBxre2L+uO23dODWLEfajIjwViCJsf2JeD/DCcQRC8 YGExbnWZvEwaMY3778GOeBGy1tRg000KWrcY0/U1z+RHcCJ+JNeSE/8lVhoV59VIF0YG/W aBhXRZuDZz4d9aE13gDVPwE+LhrQymY7BGeLJuz5aVoLS9h6UUop2+qjoX3wRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735945254; a=rsa-sha256; cv=none; b=vgxdASklY7hznSn1FzMvxNJC4VLY1be7HD0conJR2CkpXy5uJnrtfYm9vv9n0ueDmrewP+ T0ls9qUVrwX7jAtV4jV6gCd54jKiHMFhml9kM8EgSpr52yVwZnMPqNGVAlzgefbPT0FRrZ HoZYdYKirZJaa4SijkVnv/AKeqmiU2EBoKvq6oiXmKu1zTXG9dPCU2LYbCmz/+gbL1Rhe6 nMo6vBb1+byBCE3bJEgmNJkw+ybFOj0OlSkjE2EYZ5/mOTGkhwuaxeBAsxBkvpIQryIj28 DmiKglOOTdLdATYsJQuuapiFuqWU/UBlgou932Azbe1lCP43SHmvJb9+Xg8x2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPzZZ00H0zBWb; Fri, 03 Jan 2025 23:00:53 +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 503N0rNG075439; Fri, 3 Jan 2025 23:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503N0rTn075435; Fri, 3 Jan 2025 23:00:53 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:00:53 GMT Message-Id: <202501032300.503N0rTn075435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 1a259ad4ab5b - main - acpica: Merge ACPICA 20240927 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a259ad4ab5b3f1e5486b7bde7b404daf7d7cb9e Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=1a259ad4ab5b3f1e5486b7bde7b404daf7d7cb9e commit 1a259ad4ab5b3f1e5486b7bde7b404daf7d7cb9e Merge: 92f570c32e9b ae8106ed3aec Author: Jung-uk Kim AuthorDate: 2025-01-03 22:42:12 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 22:42:12 +0000 acpica: Merge ACPICA 20240927 sys/contrib/dev/acpica/changes.txt | 13 +++++++++++++ sys/contrib/dev/acpica/common/dmtbdump3.c | 2 +- sys/contrib/dev/acpica/include/acpixf.h | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --cc sys/contrib/dev/acpica/include/acpixf.h index bdd5ed473ca7,7590ee6c9fca..ecc3116c2504 --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@@ -154,12 -154,12 +154,12 @@@ /* Current ACPICA subsystem version in YYYYMMDD format */ - #define ACPI_CA_VERSION 0x20240827 + #define ACPI_CA_VERSION 0x20240927 -#include "acconfig.h" -#include "actypes.h" -#include "actbl.h" -#include "acbuffer.h" +#include +#include +#include +#include /***************************************************************************** From nobody Fri Jan 3 23:00:55 2025 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 4YPzZc4YSKz5kYMd; Fri, 03 Jan 2025 23:00:56 +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 4YPzZc0MMxz4Ln6; Fri, 3 Jan 2025 23:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945256; 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=dS/etfqV2D4AYJmqZgbH8R8RuMJodOFfYtNjW0aiVoA=; b=gkpgsa/qE2Gp65GHMmzUe08HUrrigJRt9DexZuxlE0wg1g1xQRI6PQH0BZkhEzSTZ+gDAf kzUUFp9b8XhB4mUhj80gWRdVVr1wxT70ecB4UrywKAAHRsYNqif71vXUE7MZiAALBt1uOS uWlTlbj2Gqycv2+aIsxGOiRcHdCme07KqWPjkcn1rhGMD5jH8Rr12zoD0340in8fcSII+9 RQgHUAVtz29afgUlN8xrL8Zjvp8BRsituSICZS5x3VReOUkaMLC6B+HAruNZTMQIThISVr 8YA/n6LqxEgo1hd5Wt1RhQLboXZJtKz6Gz9zbYk1W4eS1iSjpS80RsIAXBM5qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735945256; 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=dS/etfqV2D4AYJmqZgbH8R8RuMJodOFfYtNjW0aiVoA=; b=MI3Mcbarq3CX4oRhLoOCExS4o50hXXe8k7qDWC2xqyHpeBb1b2dnLuJklZ3iONaM3Rqjdz xDJuCIId/sEXXJ6KJIAoky/vRQOJfbeChwSLLo4nt3KafCCapo/mjg0fK17g2zRdghbsbB HHbYKE2dKjSannYOCZ7Z4akDAuWZVd8Vgs65a7Gii3L/oV8WQvVUYJAX8lDpEM5IiBFVm2 zDRw6DxvM7LLI3Ucliz/JLd/uGIn8LT/kCAuHJkjSZoNWz7A7tWxJkttiHlOoKcCHYGSiL tbZ5rVPgOx15nRKJIXbJskZBg29BVfQwkM+SpcBMnOKC9bOS7fZCsn6a3ay3Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735945256; a=rsa-sha256; cv=none; b=NUOuu+OSckEVHVB+UeQad7O8og/bfM34wLqsOgxerL+FooqMWAIzXtAQMsStagvhk8nsZ7 WEYGmCrbscFBnXlPsENN8yADYERURx3aBKyuM0qMJ4JsObjYg8+AcB4MxpnroL8KEz6z8O eICZYrzstCev57g70ySJbmnSpZUEa+xMSNVtCpTz77Qz0PbgyW4gqG6j1ylO7IM4zqa0Vr 13CVAOncZC3SVpWirJsL7Y/xqOwHKMDOvoxr93rfi6R4CYCBRdpCBTVbj7sxPGXKqaPHhW SvQTgaVida25M8Yj8UA1VJ7vvsjZBxjUwcAHUXIknvw+Ubosd6zMFXEm4q0BDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPzZb72x3z9pm; Fri, 03 Jan 2025 23:00:55 +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 503N0tG9075483; Fri, 3 Jan 2025 23:00:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503N0tAM075480; Fri, 3 Jan 2025 23:00:55 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:00:55 GMT Message-Id: <202501032300.503N0tAM075480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 62e841ccce30 - main - acpica: Import ACPICA 20241212 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62e841ccce30eac30ec6fea767fb3bc151225562 Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=62e841ccce30eac30ec6fea767fb3bc151225562 commit 62e841ccce30eac30ec6fea767fb3bc151225562 Merge: 1a259ad4ab5b 98a2c01a8898 Author: Jung-uk Kim AuthorDate: 2025-01-03 22:44:51 +0000 Commit: Jung-uk Kim CommitDate: 2025-01-03 22:58:38 +0000 acpica: Import ACPICA 20241212 sys/contrib/dev/acpica/changes.txt | 16 ++++++++ sys/contrib/dev/acpica/common/dmtbinfo3.c | 2 +- .../dev/acpica/components/dispatcher/dsutils.c | 9 ++++- .../dev/acpica/components/events/evxfregn.c | 1 - .../dev/acpica/components/namespace/nsaccess.c | 8 ++++ .../dev/acpica/components/parser/psobject.c | 44 ++++++++-------------- sys/contrib/dev/acpica/include/acpixf.h | 2 +- sys/contrib/dev/acpica/include/actbl1.h | 25 ++++++------ sys/contrib/dev/acpica/include/actbl3.h | 2 +- 9 files changed, 65 insertions(+), 44 deletions(-) diff --cc sys/contrib/dev/acpica/components/namespace/nsaccess.c index bc1d670b285a,245ee6e56423..cd2d0e7f38b4 --- a/sys/contrib/dev/acpica/components/namespace/nsaccess.c +++ b/sys/contrib/dev/acpica/components/namespace/nsaccess.c @@@ -449,7 -449,7 +449,9 @@@ AcpiNsLookup ACPI_NAMESPACE_NODE *CurrentNode = NULL; ACPI_NAMESPACE_NODE *ThisNode = NULL; UINT32 NumSegments; ++#ifdef ACPI_DEBUG_OUTPUT UINT32 NumCarats; ++#endif ACPI_NAME SimpleName; ACPI_OBJECT_TYPE TypeToCheckFor; ACPI_OBJECT_TYPE ThisSearchType; @@@ -573,7 -573,7 +575,9 @@@ * the parent node for each prefix instance. */ ThisNode = PrefixNode; ++#ifdef ACPI_DEBUG_OUTPUT NumCarats = 0; ++#endif while (*Path == (UINT8) AML_PARENT_PREFIX) { /* Name is fully qualified, no search rules apply */ @@@ -588,7 -588,7 +592,9 @@@ /* Backup to the parent node */ ++#ifdef ACPI_DEBUG_OUTPUT NumCarats++; ++#endif ThisNode = ThisNode->Parent; if (!ThisNode) { @@@ -611,12 -611,12 +617,14 @@@ } } ++#ifdef ACPI_DEBUG_OUTPUT if (SearchParentFlag == ACPI_NS_NO_UPSEARCH) { ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Search scope is [%4.4s], path has %u carat(s)\n", AcpiUtGetNodeName (ThisNode), NumCarats)); } ++#endif } /* diff --cc sys/contrib/dev/acpica/include/acpixf.h index ecc3116c2504,18f47c9e92d0..bf645648bbc3 --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@@ -154,12 -154,12 +154,12 @@@ /* Current ACPICA subsystem version in YYYYMMDD format */ - #define ACPI_CA_VERSION 0x20240927 + #define ACPI_CA_VERSION 0x20241212 -#include "acconfig.h" -#include "actypes.h" -#include "actbl.h" -#include "acbuffer.h" +#include +#include +#include +#include /***************************************************************************** From nobody Sat Jan 4 01:03:01 2025 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 4YQ2HV0lDQz5kgBH; Sat, 04 Jan 2025 01:03:02 +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 4YQ2HT7585z4Xsh; Sat, 4 Jan 2025 01:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735952582; 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=OsC+/1Q9Skz6phUgAnY950ECzEF+N4VhnGxI0QkSnxA=; b=hCHxQJPK9AUJVrjFu3UBekAgiXEs0ZtlHeeA3Z+keSw38dd68ogqnVs1T+GMildydpgD5q 74BNV3rC6NTDQPHTqymM8gTORAS5wfwT8JxL2Nz2IzeaQE3UAuAFuTQ/V+Jmsn+37HRLct PqD56e2I8dwIzxY7HpgItFSsNwuR8HxDqh14F8KiUqRftHWQ7t6dgxw/kooR3bsL68Jm2J tSdphyBLYMoqgyEQUwqZFVMFmvOlHSjTcGsK9L09HotPYEhdA/4NyhtCXFQgSy/omfvp/h vNF5AQt3sDSWB2Me0kKcaZmj/j5XkJeeLXZH+zoYlHLkrtxiFeFAb6lYyDY+9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735952582; 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=OsC+/1Q9Skz6phUgAnY950ECzEF+N4VhnGxI0QkSnxA=; b=AIv0ok5aq1PJlPo01ukrppHaXzrrJQxZIodvKxvl6SeJ+qslEXXsbtIhnKliYPHA4h1GvG zYnwuUwfNjjFT32hzZVKYWFmlTwSlTTjeViq5Mecs8b6le9QeTtZQ7yed55YbvmNZ0S000 C+G93ZyFwdggNkhY/qBHtuuW+p6dU6EScQ+8SaQMRgPwspbe3NjpP+zonhmGWG5xzH2W5O V9Nm7lidj07u27jf+HcUek345xWw0XrNRlgrid3w3TR2KuhP3P5thf3AWOO3YuMX6nBZ+z pLwMoRx2NhiZjaFDr3UdtYjiZWCYeIb4pt8fmo8Eb8U7rF0e84mJPCGQ//CArA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735952582; a=rsa-sha256; cv=none; b=Ef9U2zSMj9EiMMaXTXr2faxPwu3sK3KO9Bdwx9mofSSoRjo0R+ZQWOREpX9b8V8zANcPkX leUbnQuiqG2+fIiT29wIpwQB+3eEAQcujaYrv1LwYkP48p0y3eRxk/kKukne2ew8Xt6BMe 38Uj/p9i8kRo4H8AQ0r2Y/8ekv9E6c6Lua8kMmiIr0k4KZgPoZDUz1gKd6BkJ5ogeWD6cc myhHsp6Px2PND0oSLNjrJ8xTbQmj0gALF0z1j4deATWVtleJ2wK8KzfiT0JAMqOkDX4HNJ 9JBnPq6wxLZh0Gfp9kQ3M0yVN9uibyzO5zpfaAmTY6YW92pf4M7xsmEeWxwXGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ2HT6cZczWdn; Sat, 04 Jan 2025 01:03:01 +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 5041312B007538; Sat, 4 Jan 2025 01:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5041315s007535; Sat, 4 Jan 2025 01:03:01 GMT (envelope-from git) Date: Sat, 4 Jan 2025 01:03:01 GMT Message-Id: <202501040103.5041315s007535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f27d1ec0f5ad - stable/14 - Export additional __aeabi_ symbols from arm's libgcc_s 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f27d1ec0f5ad4d6c4833606c189c1a863967a293 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f27d1ec0f5ad4d6c4833606c189c1a863967a293 commit f27d1ec0f5ad4d6c4833606c189c1a863967a293 Author: Dimitry Andric AuthorDate: 2024-12-28 21:17:13 +0000 Commit: Dimitry Andric CommitDate: 2025-01-04 01:01:46 +0000 Export additional __aeabi_ symbols from arm's libgcc_s Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: fuz Submitted by: jfc@mit.edu MFC after: 1 week (cherry picked from commit caab831338f4eeaa7455e981478be9fd414b7969) --- lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index 92b54761d810..a426f823de5c 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,8 +4,33 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Set; _Unwind_VRS_Pop; + _Unwind_VRS_Set; + __aeabi_d2h; + __aeabi_d2lz; + __aeabi_d2ulz; + __aeabi_f2h; + __aeabi_f2lz; + __aeabi_f2ulz; + __aeabi_h2f; + __aeabi_idiv; + __aeabi_idiv0; + __aeabi_l2d; + __aeabi_l2f; + __aeabi_lasr; + __aeabi_lcmp; + __aeabi_ldivmod; + __aeabi_llsl; + __aeabi_llsr; + __aeabi_lmul; + __aeabi_ui2d; + __aeabi_ui2f; + __aeabi_uidiv; + __aeabi_uidivmod; + __aeabi_ul2d; + __aeabi_ul2f; + __aeabi_ulcmp; + __aeabi_uldivmod; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Jan 4 01:03:32 2025 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 4YQ2J45gX9z5kgQs; Sat, 04 Jan 2025 01:03:32 +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 4YQ2J4530Pz4Y2P; Sat, 4 Jan 2025 01:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735952612; 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=MQXDYklZ24Ours0Eb3MRio3LNGFaPPI9p00ccD4BtgA=; b=TnUJsxpfI4QPXNym3PlMB3JLdRNBsnjYu6Twzzo9ufUEDPhjFfAzkaNwLBAr2Vjj/wEHBr iVVFg58I8Af0iGtSV1wXS6ckJVVDzORT1UugwXhG4ssaR2/Kv7iTYVE4bCvKSkFFTB5PMN lt4gk2YS8n+8xYngvVgDhvLPtQFcxhdDQwEM7AlINpcenpkT1re5MCvmriZ+v+CtalM579 1m5aNjHrQdJN/nFY/QAdvT5TaqWsBbDZr3xQdazBOgGv+aTCmajWS3ji8t2uPHFJqKjxt5 sak3Ws0PKp5EpLKSOEhzGX9F3H4dd4mNKgD6DT2DaxMHKNKTsB9iRePwFh8K7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735952612; 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=MQXDYklZ24Ours0Eb3MRio3LNGFaPPI9p00ccD4BtgA=; b=a+Fw0ojQDOXkYVcoVidV5dgkn132Eb2Jkd5Ul9Bot0FhbeNH8fpl8kCC7SbhHG7dgbAApY mf8LmvTOBFdkFcO25TWjbo4YKsCr00MrUIzW2ruqOfS/Dt3CJxo01i5FwyKnT9NxFCtR4B sh657xgLn9mVUneimot7r43uTvTMH7IUl/zkpcUAcPYZfUMYVyjRXgVmqfXsii2E8xU0pJ +aILXHyjUQuXeJMUVSVSvRseIAspO4919dxjUcR4WtogXjwuMJaHjpamLQsXwFHzb4Pwtl 4lOA77IBb33xpuLtmpqqKp5LcpKUb2HtDgU1bOS09Smvuwkly0U7k8itnqGZgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735952612; a=rsa-sha256; cv=none; b=k955AjEfB7KUGhkPd3ayW4Lb4aweinmDa6leQS6EPoHvDHZo7caqXR3ZId3X9ye/7VE2sp bHTOB2X7vxS+5YahT28p9kv8YllI71xLjaSBEYSnrb6acxsF96jxaJuUd3eIJKz7bXuPdG bnDlf5mEyQZdzb12RQv8az0OM5V6j9+WULd+J3v0fMmg/IRk9uUcrr8mSB7bWPvKiAnHqP xl9XsOK6sxwessI7t52xp0iSJnP2dgBnAs3vymdQ0C5Vs5Zv5LZs32/MoJ8CNZ2UzNRI4P Unrf0qCyv1BwUzfL3k69USqGUFW7nSKFWZZQmnHpOhhjRxjfWKgCuj7gxtEaXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ2J44bWfzVmS; Sat, 04 Jan 2025 01:03:32 +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 50413Whr007832; Sat, 4 Jan 2025 01:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50413WZx007829; Sat, 4 Jan 2025 01:03:32 GMT (envelope-from git) Date: Sat, 4 Jan 2025 01:03:32 GMT Message-Id: <202501040103.50413WZx007829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a0da8a5fc7c4 - stable/13 - Export additional __aeabi_ symbols from arm's libgcc_s 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a0da8a5fc7c4b3be6aa39f4d321490ccc6b168d4 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a0da8a5fc7c4b3be6aa39f4d321490ccc6b168d4 commit a0da8a5fc7c4b3be6aa39f4d321490ccc6b168d4 Author: Dimitry Andric AuthorDate: 2024-12-28 21:17:13 +0000 Commit: Dimitry Andric CommitDate: 2025-01-04 01:01:53 +0000 Export additional __aeabi_ symbols from arm's libgcc_s Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: fuz Submitted by: jfc@mit.edu MFC after: 1 week (cherry picked from commit caab831338f4eeaa7455e981478be9fd414b7969) --- lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index 92b54761d810..a426f823de5c 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,8 +4,33 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Set; _Unwind_VRS_Pop; + _Unwind_VRS_Set; + __aeabi_d2h; + __aeabi_d2lz; + __aeabi_d2ulz; + __aeabi_f2h; + __aeabi_f2lz; + __aeabi_f2ulz; + __aeabi_h2f; + __aeabi_idiv; + __aeabi_idiv0; + __aeabi_l2d; + __aeabi_l2f; + __aeabi_lasr; + __aeabi_lcmp; + __aeabi_ldivmod; + __aeabi_llsl; + __aeabi_llsr; + __aeabi_lmul; + __aeabi_ui2d; + __aeabi_ui2f; + __aeabi_uidiv; + __aeabi_uidivmod; + __aeabi_ul2d; + __aeabi_ul2f; + __aeabi_ulcmp; + __aeabi_uldivmod; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Jan 4 03:57:43 2025 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 4YQ6940V2pz5j8lc; Sat, 04 Jan 2025 03:57:44 +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 4YQ69371Ngz4qbC; Sat, 4 Jan 2025 03:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963064; 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=PmtD6GWZu7cw7FIG/GjbebHz/GIpaN2wOM5vvrQbtTw=; b=rqL6aDOWHF7f3pnsAc5B1CTCgFO5uSw5hFBD7u+UpSF8nFDbJr041IOlWrivkqVNR8Mdz5 zp3dMh/lr/zaW0tumKnkLfl0fFbguaOHoQHtReEHHFCWwW/N16rVTqphY8eMR/aT0Kjdso Y4MRMuMWW5/ee++9kJfLbbFRqG0yQKFACZ7zp0VXgmOFBBrMl9HwyoTPKo56YmfAGaunFw gQO+ymw7kAb+jOZSofkC1D7J8na/QBiY9PkGoncC0nyL8U8zbWNct7G3a1GuHBbtUY4san VCcGQfHZJXGBcaUv+h8hkJuNptRTXGxmI/PtNFOoFK5gwQNAybyoQLjxBwIzGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963064; 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=PmtD6GWZu7cw7FIG/GjbebHz/GIpaN2wOM5vvrQbtTw=; b=C3Wo2ixyy7hm2ab1/JLS6qN9BoUKQq8ag54q2YMieH4cbz9PyeOiinxJqRbvSiXekM1xxp xR7QUCOpV9iVbx31gZqmYlvxWBtBeXwKGOCvWpPTHr1DyinuaZkONh5BSElltXRcAJ9onA 5KEr06WI/SuvDWYsK2EVPGDYJRvbVXh3m5Xo2uPI//dc9f6h5+0P8ClbSgWr3lBfmxwmf+ EhPp17mOSHkeeOxTDUY+ioBXxvTTcHZ87b4DtE5LwIJIY3RKfgHjeW2eRe3EPuGyLFMoT/ DbShdBfvtbYGpu1uoIJzHRBZ7IICr763oh0MjaMQ7XkBkV+qowwbwpCGG5i5lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963064; a=rsa-sha256; cv=none; b=bhFpmWM5lzavymjJ7q2bI8HxHi62BP3agHvGxeLrM+qCphNPUluhXrGUWCJ47+6rMQHL4Q Orx5FuXNqqEHAc3taq5qupVtrQrsu+9AIlzXjRw/Mq+PqafLSr+AWm6sGLXQHrfst1DgNZ w1bBz4+fULYzby/bEWDTodYT2rujT50FxEDAAhBckPAiJT1ti2HGLUyQmWf0ktd1t1MBzL XExMNKxUZymbcmQBbIHLfUwf7zLjd6SJr0rlZ/drDpTAgKU5NVTzXFAMVgsDfBbyEPXmYn MJdVNm82BUscOVYgFqLp+0ekOGpmhSDUGAXkP54uulnIQ6nNxabsRG2jMQXG9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6936XmxzckC; Sat, 04 Jan 2025 03:57:43 +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 5043vh2G028188; Sat, 4 Jan 2025 03:57:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vht7028185; Sat, 4 Jan 2025 03:57:43 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:43 GMT Message-Id: <202501040357.5043vht7028185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d51ecba718cf - stable/14 - thr_cancel.c: style 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d51ecba718cf6013108454583063a1fa7fae2566 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d51ecba718cf6013108454583063a1fa7fae2566 commit d51ecba718cf6013108454583063a1fa7fae2566 Author: Konstantin Belousov AuthorDate: 2024-12-21 17:55:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 thr_cancel.c: style (cherry picked from commit 3282e368e00460de500e5cfcf1c33b597199aaf8) --- lib/libthr/thread/thr_cancel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index b1b95e54b46f..0e00c2c36086 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -99,9 +99,9 @@ _thr_setcancelstate(int state, int *oldstate) return (EINVAL); } - if (oldstate) { + if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : - PTHREAD_CANCEL_DISABLE; + PTHREAD_CANCEL_DISABLE; } return (0); } @@ -125,9 +125,9 @@ _thr_setcanceltype(int type, int *oldtype) return (EINVAL); } - if (oldtype) { + if (oldtype != NULL) { *oldtype = oldval ? PTHREAD_CANCEL_ASYNCHRONOUS : - PTHREAD_CANCEL_DEFERRED; + PTHREAD_CANCEL_DEFERRED; } return (0); } From nobody Sat Jan 4 03:57:44 2025 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 4YQ6951tFKz5j8mh; Sat, 04 Jan 2025 03:57:45 +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 4YQ6951KJCz4qM3; Sat, 4 Jan 2025 03:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963065; 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=GGQ71WyCywzCcyglgz0yJCOUTw4aZeE5xXs9b7oyT4E=; b=rzJfI6rGhvBipRkcRQtWpRfLbutGzjxiqmRa6O+I1Qx9hF5YJ2brTgNC07VZE9MGzplSRp jNLOXqQXEB8/Mx3MRdnxrW2KbFDM3fbBFwDsvXAltn56uztB7F91ayopMEtZHiRoJTw3CF qtj/72bkZ7LE9AUkU+PMQnTwWIXao9T/etk3SAY5X19jNXZ1d5aeU63oShedx/P5gbXhN5 cEduYI8MJNuiTfQ4qMmhesarvMkWqxCSd31tCwa5No/Qhfhg30CKK7wnBatHaEYX2YwGh6 SuTnhNuBbsKq9aF+4HRdfcPPWMne/9VZTWcUeoUvXH0fPLFFGZng2piRwDQhWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963065; 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=GGQ71WyCywzCcyglgz0yJCOUTw4aZeE5xXs9b7oyT4E=; b=OeZXPGqpz4HEKjcliYR5f+0X+PXogyZKNAWV67fCkjRl8cjb2eh/YHxi19D4i6LtDdenQu R64CEEbpfpkKtYV1DKQGW344YDMY3VqK8g017U3GjZqFHo1THMImM8ozz9F2NW19P8DGzt QgN6G5IGOERHsML1QBnCn/b4CeNX118xQWO0M9Iue5jm54b1c5WWoVdrRSk+9pjbuiuPEI /slc2d1Xvye7VidQ4asD4FlSryvhHaKdBCQmG0zuo2BZB2CbnImucEWGNKNIZ94VFDTR+P x4NHDQpxinUX06K2mmHtaFy+DDaZ/PUdXrgDFXe++KpCL12xSMJVyJARUSHGYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963065; a=rsa-sha256; cv=none; b=X7w8fr0C8jQPQbAb33VjH4DC6sP87Zrs2eH4hxN/WEnYA0MyIyzArwzpHdXV2iMKzI6GPK V62920geza2lf/WEG7SG6gwthUTEX9NL8LBJ8r5py/9dv+JfqKGeyGTbU5j0g7CQFk4zK6 sL7o1YsEIeYmSxaR1LsSGjvT7Zvf7a/ER0qyrlRolQdpmbOKH2kxaX/rTjlR2Wzpg4MPFp zWTZKyW4lpPFhCCBCgbWQ182Rbw1cTWLbbpeanA7XGCOCdPqLpXO3mSN7Y+t398LejwMIp DdGieDQeXDzULGEFvVYN9rhGZRjQV+7Kaf6P9C01ZMz53iMUrlWt1UtKakp4Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6950PF9zcpn; Sat, 04 Jan 2025 03:57:45 +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 5043vib7028225; Sat, 4 Jan 2025 03:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vidY028222; Sat, 4 Jan 2025 03:57:44 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:44 GMT Message-Id: <202501040357.5043vidY028222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 06a8084a147f - stable/14 - thr_sig.c: style 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 06a8084a147f67460b0d1eb32a7d6dc420263ba0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06a8084a147f67460b0d1eb32a7d6dc420263ba0 commit 06a8084a147f67460b0d1eb32a7d6dc420263ba0 Author: Konstantin Belousov AuthorDate: 2024-12-22 20:35:26 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 thr_sig.c: style (cherry picked from commit e32308efa215868d98036c30f73c98ebf67e03d4) --- lib/libthr/thread/thr_sig.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index ad291d106001..a8268f2a770d 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -185,8 +185,7 @@ thr_remove_thr_signals(const sigset_t *set, sigset_t *newset) } static void -sigcancel_handler(int sig __unused, - siginfo_t *info __unused, ucontext_t *ucp) +sigcancel_handler(int sig __unused, siginfo_t *info __unused, ucontext_t *ucp) { struct pthread *curthread = _get_curthread(); int err; @@ -357,7 +356,7 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * on getting a signal before it agrees to return. */ if (curthread->cancel_point) { - if (curthread->in_sigsuspend && ucp) { + if (curthread->in_sigsuspend && ucp != NULL) { SIGADDSET(ucp->uc_sigmask, SIGCANCEL); curthread->unblock_sigcancel = 1; _thr_send_sig(curthread, SIGCANCEL); @@ -368,8 +367,8 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * asynchronous cancellation mode, act upon * immediately. */ - _pthread_exit_mask(PTHREAD_CANCELED, - ucp? &ucp->uc_sigmask : NULL); + _pthread_exit_mask(PTHREAD_CANCELED, ucp != NULL ? + &ucp->uc_sigmask : NULL); } } @@ -407,9 +406,8 @@ check_suspend(struct pthread *curthread) { uint32_t cycle; - if (__predict_true((curthread->flags & - (THR_FLAGS_NEED_SUSPEND | THR_FLAGS_SUSPENDED)) - != THR_FLAGS_NEED_SUSPEND)) + if (__predict_true((curthread->flags & (THR_FLAGS_NEED_SUSPEND | + THR_FLAGS_SUSPENDED)) != THR_FLAGS_NEED_SUSPEND)) return; if (curthread == _single_thread) return; @@ -666,7 +664,7 @@ _thr_sigmask(int how, const sigset_t *set, sigset_t *oset) } int -_sigsuspend(const sigset_t * set) +_sigsuspend(const sigset_t *set) { sigset_t newset; @@ -674,7 +672,7 @@ _sigsuspend(const sigset_t * set) } int -__thr_sigsuspend(const sigset_t * set) +__thr_sigsuspend(const sigset_t *set) { struct pthread *curthread; sigset_t newset; @@ -700,7 +698,7 @@ __thr_sigsuspend(const sigset_t * set) int _sigtimedwait(const sigset_t *set, siginfo_t *info, - const struct timespec * timeout) + const struct timespec *timeout) { sigset_t newset; @@ -715,7 +713,7 @@ _sigtimedwait(const sigset_t *set, siginfo_t *info, */ int __thr_sigtimedwait(const sigset_t *set, siginfo_t *info, - const struct timespec * timeout) + const struct timespec *timeout) { struct pthread *curthread = _get_curthread(); sigset_t newset; From nobody Sat Jan 4 03:57:47 2025 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 4YQ6975C8Sz5j968; Sat, 04 Jan 2025 03:57:47 +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 4YQ6972JzCz4qd5; Sat, 4 Jan 2025 03:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963067; 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=WI7YAW89Yv3T3uPvEI3qMPpuDtq3kT6VDp/vsZsHUEo=; b=KF3edEpMLUL2bNznnuT6dfkvWCZMglsDoXSOhw8636DklB+KaB3HqqKJRMPS5TZfsdHbHr Bg0D4HzsAdA4isMHsaI9u6KtY5kAiZDdCq94tVDVgGvEeIiEmjY/MUr9bk4LzU9gPwQ65P jHUd25yQCS6IsMIQ3/c9V+S2gac0/otY4NL0OC4q6CQiQQ7Ex9MwLbaU7MAKSPP2XPID6O KWlWil8qpNyI3eJAklJzmcQct7lA9471mNxQNGcEW4xFz+MYvGOP4qga6USKUIyoWz4HGj PXi6Wly6dOjxKz3t+6RkGmFnHpC4u97ZMTIwfbiTXXaDWbgm2QSTeKPbuVid9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963067; 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=WI7YAW89Yv3T3uPvEI3qMPpuDtq3kT6VDp/vsZsHUEo=; b=dNup4C/6q7aFnGFwKDLMW5MTS31MDXhmljY60GDWWmhgL6NpSeHvHXaVe50EYToejKFHdf niqNTNNY3ZZzXsP7xIyONPiB5PaBVUpPrbOxzcN8Ou9HocE2TL1CzZs/ShR0PZdiDW60zr SlRexihb8jK8+fkv+nGtxMMqRFCDhLjBMwtdJHEAOEOHfig7v/p80o2Zju4kfOBoHqbm1s 6eSc1OJ16x8ItnhTec7lkd6dWVNczPzsXrCAe/Yp9A8kB2WOwLjZ+nm3RuuMfCKtKdTd4I jpWRPLQlSj3o7SfsPDTUktqAnsbDrt9OSuI3gAQGk0yYXFgyBJvzO6C1r6Le1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963067; a=rsa-sha256; cv=none; b=agP5HfBl/dQ3UAmU1J9vHB3bmgWE8ITEN9Tz3ayzfjVWEBoZ9bM1Lj/tt64iWigpuyUxUB vnLgeHLE3faqoYJAzrgauCZfw5Q/N7xLToTpBNwL/ixV/aZ04nl/f1Qs8alSB1QsXwbalj 6b6CCOer84jSe+J2sVucgiaDePfi/6SFvMJy7OH29LZHFxwb7wcpOtVZbQTu16Zh5V+UE+ ArT3Du4MALifl9mfQ3eum88nrV01Y09WMy4zweXf2FTvzBiIJ5QxJbB3jEuWeOTH3p9MSN 2RI3yQd2fDEThawhmrm+XSG+i3I1aJ9cyB8LUvupQVHZUyMZcCRazXBxHFCzog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6971tB4zcLd; Sat, 04 Jan 2025 03:57:47 +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 5043vlC5028336; Sat, 4 Jan 2025 03:57:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vlIE028333; Sat, 4 Jan 2025 03:57:47 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:47 GMT Message-Id: <202501040357.5043vlIE028333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 20f173fdc7c7 - stable/14 - thr_cancel.c: use testcancel() instead of manually expanding it 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20f173fdc7c70cc2185b8d38cd7ce997e78db795 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=20f173fdc7c70cc2185b8d38cd7ce997e78db795 commit 20f173fdc7c70cc2185b8d38cd7ce997e78db795 Author: Konstantin Belousov AuthorDate: 2024-12-21 17:55:39 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 thr_cancel.c: use testcancel() instead of manually expanding it (cherry picked from commit a944e6d5c0c27c2a533486062497a40d8f0ae543) --- lib/libthr/thread/thr_cancel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 0e00c2c36086..7622e306f937 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -166,9 +166,8 @@ void _thr_cancel_leave(struct pthread *curthread, int maycancel) { curthread->cancel_point = 0; - if (__predict_false(SHOULD_CANCEL(curthread) && - !THR_IN_CRITICAL(curthread) && maycancel)) - _pthread_exit(PTHREAD_CANCELED); + if (maycancel) + testcancel(curthread); } void From nobody Sat Jan 4 03:57:46 2025 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 4YQ6963gVkz5j98T; Sat, 04 Jan 2025 03:57:46 +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 4YQ6961FyRz4qTw; Sat, 4 Jan 2025 03:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963066; 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=JOUACFaxv+HS87IhMLkVgGdmOsRVOOqX9BrvAC6TkN0=; b=gJYzOFIYzph228XjBV7r3c2EsgvcGfFwXw2/Q9vr5TmliCbQ7i3z+8arzWZFmAFYKH2YPp 0eRgfAs+fOwYyb07yxgd9pJHDcH9R8BD7hibGoTatAD2RrjBy5AQMIF4c1pmPwljAhkwI3 wMZLvxucLzgMisxb3cJurKGsRxCjd2xF1G/EHxG2d02qA8VKvFb1tS2l8ir3OfvujoG/zO gdMhBRz/s6dP7ZUq+qJOP3MspnczlYG0BqHYmtE6Hf8ubrUTOX2h9F5VQqt0IoO0lS/x6N aqmmM6ZDv3NgPzmIXqzTxzA9eYg9lb7wiHUecMBanRD41xwEMXBayCllnbIsmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963066; 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=JOUACFaxv+HS87IhMLkVgGdmOsRVOOqX9BrvAC6TkN0=; b=kK+FNTGdCyiBuJzh5YAQU/RFUr+uGz+dy1HMMXKTXHE3g2zvkBWCzAxjMAvTuuCALXL5DD CT3buu5YrTTo82iAHC+hhRRcZxSfhJRQComsb/NOofoRJTrrHRgmcpydRYbtALrEK7u48v oy/bDyR07tD3KnBnjuhSE7L7QZEDmeEBbDKy69cxXkOesr4fIk5W59lKJw82msoDIE5giE LEOHSqWU5Avcf+iPcWJELNLCwBX6j+Ro2/bcrbElgWa/+RJlV2476r359AN1E/qJdZL0+i 2q4Q4A1KhxmlDNEGDNm2E2xdLegqQDdZ7BEPVO1xL1gA5glx3ezuuz8j8K+m1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963066; a=rsa-sha256; cv=none; b=mu0+gpXuauWEqtqw5T4OgEYzYUHyavZm4CqSiA4Axm2bAN1ueqO8KTMHoHEXAJ1ReJYgaY iGV2GwIZoBShik2tH0Ygvw7Y96CiJBd4UdqDiWjAR0gS3eLPCh/piVroQoppEp5bz45u7g lZVtkgMqgjrSfrzj/YHmdxytKhJ2KWbzjeafQ2xIZpgRkUwmo5N/4LB+BNrbCbC485BlG0 0EBzZDPwLtdJYfGtzsrwR7uXEOyXcoCpBNacYamA8aVReiFxMhecvkc7KYOGZ77oihQnNJ 2DGxv/98WM4ky7twmN1sFrNwVLmfyptZ8VVNlkFzPlgFjkt2isyGwKTX20C6yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6960nt7zckD; Sat, 04 Jan 2025 03:57:46 +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 5043vkP0028283; Sat, 4 Jan 2025 03:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vk4H028279; Sat, 4 Jan 2025 03:57:46 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:46 GMT Message-Id: <202501040357.5043vk4H028279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 60b5e18c5362 - stable/14 - libthr: move dlerror_msg into zeroed part of struct thread 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60b5e18c5362541323dd214119a1b0664485ae06 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=60b5e18c5362541323dd214119a1b0664485ae06 commit 60b5e18c5362541323dd214119a1b0664485ae06 Author: Konstantin Belousov AuthorDate: 2024-12-23 23:48:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 libthr: move dlerror_msg into zeroed part of struct thread (cherry picked from commit 86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98) --- lib/libthr/thread/thr_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 7b8a2d6569f9..b34c084ad04d 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -562,8 +562,12 @@ struct pthread { /* Deferred threads from pthread_cond_signal. */ unsigned int *defer_waiters[MAX_DEFER_WAITERS]; -#define _pthread_endzero wake_addr + /* rtld thread-local dlerror message and seen control */ + char dlerror_msg[512]; + int dlerror_seen; + +#define _pthread_endzero wake_addr struct wake_addr *wake_addr; #define WAKE_ADDR(td) ((td)->wake_addr) @@ -572,10 +576,6 @@ struct pthread { /* pthread_set/get_name_np */ char *name; - - /* rtld thread-local dlerror message and seen control */ - char dlerror_msg[512]; - int dlerror_seen; }; #define THR_SHOULD_GC(thrd) \ From nobody Sat Jan 4 03:57:48 2025 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 4YQ6993mSHz5j8lg; Sat, 04 Jan 2025 03:57: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 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 4YQ6990zqkz4qdS; Sat, 4 Jan 2025 03:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963069; 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=sBw/IrN/9zrrexLcSaStc1BORcQk7+YmZ4Pf+vamjkM=; b=UoqAkbm+PUSfS/NVo6S4hS/9NPuXNmWlA1HxKW1Yu3JeR9IlN9QtU1o9ogx6qYqKBrzAca TNxHW8Vh644mmW+BPR+xLqBbRRkKsqeb2pmDMK+F8PJVxAV1w6P9EHqBl2vk9NG0yvPJoI BSpEFkhYGghUZMHsIthsqAteBp5NYzwFp6mtnyPSlG9oPGsx3iAMa3vJCXQHfha1u79XXN dOb6UyQm2D7M7c66npUzQvKI92fG6zyOroJDrCeofOLjGSCiRwaJ2//EQ5Q9xcm+NMZ0An 6wMJtUTHIb5mpHuHZ5LqR/ofK62fbkv1aMhOOELVs0laurvM2UMtwelXOI0yBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963069; 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=sBw/IrN/9zrrexLcSaStc1BORcQk7+YmZ4Pf+vamjkM=; b=iVYla3HHNpfk4uLEuoXqMN+0Xp+5NB3VNHcWfEo4jCSonUBGw59BbGOg0qOYYhSY/FAMsS esYwC9gMEMFGAyVqyv7vyhHkzqse2RMTbS2rfTyvYb5meN4I+6vLzs1UUENfVuY6Ddjgt1 7u4mEXE91173SyLk8SuMNzC3yV65wTeBQ+A/zhf+so6IdCg6E5lzuzzCmvbkX+8v9DuFap vBQZMTW9tHAPlowmgn7gRAWKl7Gw1YNSJ8lWMukuFv5zn4h9vB5Hh2UNR16eJaqZESXQSV UuSmk2zbNq7JxM7blkZvjcg8yqgPQu8r227/kxoHoFCLSu9m+LaHMf2GlnRHWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963069; a=rsa-sha256; cv=none; b=FvSejCYnuaA/1MRbAo/R2koiHji+1AgBCMKkYPuashwjePhcy6I7YhvEHr6190HyvFngvv ShyYWEPZG7/FJUr0vnDU3STj/rVgX18nxc0HgdAzNMv+QVG+uJcWFgdQJ+Scx4zKt+gmmq A8hdMZq65R4dbyfje615CraEBsP/2xKJUt5sacMOt4Nm3Epryk8rARsyB6NGMCToqFjDBG 57wbnAcF7A695Nhxhuh1axzqj0usZub8Q4U0z7Oq/P/KAM1qJztu0XFtggCIPSvr/CP+f8 Th2ReYfPgw0Jm+SnnA27Dk8Qmi70KzysxkFjAa+J3IdGKKUQJ4NXZJs/NZmN4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6982tHTzcmW; Sat, 04 Jan 2025 03:57:48 +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 5043vmJF028375; Sat, 4 Jan 2025 03:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vmh6028372; Sat, 4 Jan 2025 03:57:48 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:48 GMT Message-Id: <202501040357.5043vmh6028372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2f645d539c60 - stable/14 - pthread_setcancelstate(3): make it async-signal-safe 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f645d539c6003601c5a09c156869a6c6334ec4c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2f645d539c6003601c5a09c156869a6c6334ec4c commit 2f645d539c6003601c5a09c156869a6c6334ec4c Author: Konstantin Belousov AuthorDate: 2024-12-23 06:42:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 pthread_setcancelstate(3): make it async-signal-safe (cherry picked from commit 030f48f78f96e0cdb30c960e1a11e5ae01d0eee8) --- lib/libthr/thread/thr_cancel.c | 12 ++++++------ share/man/man3/pthread_testcancel.3 | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 7622e306f937..4189a2640d14 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -83,22 +83,22 @@ int _thr_setcancelstate(int state, int *oldstate) { struct pthread *curthread = _get_curthread(); - int oldval; + int oldval, val; - oldval = curthread->cancel_enable; switch (state) { case PTHREAD_CANCEL_DISABLE: - curthread->cancel_enable = 0; + val = 0; break; case PTHREAD_CANCEL_ENABLE: - curthread->cancel_enable = 1; - if (curthread->cancel_async) - testcancel(curthread); + val = 1; break; default: return (EINVAL); } + oldval = atomic_swap_int(&curthread->cancel_enable, val); + if (state == PTHREAD_CANCEL_ENABLE && curthread->cancel_async) + testcancel(curthread); if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE; diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3 index 2d2bb06c48e2..c74cdcfe943b 100644 --- a/share/man/man3/pthread_testcancel.3 +++ b/share/man/man3/pthread_testcancel.3 @@ -34,6 +34,7 @@ are .Dv PTHREAD_CANCEL_ENABLE and .Dv PTHREAD_CANCEL_DISABLE . +The function is async-signal-safe. .Pp The .Fn pthread_setcanceltype @@ -248,6 +249,11 @@ function conforms to .St -p1003.1-96 . The standard allows implementations to make many more functions cancellation points. +.Pp +The +.Fn pthread_setcancelstate +function is async-signal-safe as required by +.St -p1003.1-2024 . .Sh AUTHORS This manual page was written by .An David Leonard Aq Mt d@openbsd.org From nobody Sat Jan 4 03:57:49 2025 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 4YQ69B03jKz5j96C; Sat, 04 Jan 2025 03:57:50 +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 4YQ69948W2z4qcC; Sat, 4 Jan 2025 03:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963069; 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=AfV1AoLlJS4AE+91biEEFgNN5x3uiBXlH5K8s6gimLA=; b=xtbSyIa6tPEcY1QDiwL9mYpALwVtAusm1ht08guNiXJfB0O0JflTz/csmvQvhcbYNP6FLt w0U3Pctvu7qBV/ee6/AGVUYxkc/WuRSvFK1I629pZ/MxDgjoZnS1a/cQp4f5eFqzA4xq+r wOSleuCt6IW1LuAXJse7F7Zb2jqPnA24/0uZE4aOh41R6wgNgQAqk2l1Tg+wlFXKIXQr44 vBu0BfCChTpqbOlT/MmNyZCSvK48t4CkKfO+x21AZq8fqm5TZZPiVcBqW8UJxetwP6iugt JTYUn9hLrIhdwecHHUB5wa5/ZaKsT7uCaW10blwza1fA23JEGuv793hlaqXqfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963069; 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=AfV1AoLlJS4AE+91biEEFgNN5x3uiBXlH5K8s6gimLA=; b=fFjaO3CScljyBVIHLy+HxSHoG8s+DXFwO0WRvRB0iZqjepFoGk8sHh7mUi1sL/PEtOUnGy WAXy59ElphM829ReVg8Gf+bj9izDcObSM96K+yTu/toe9DlV1viWvD5QKNzawW2dCz2YXW DvFnIOAWHA8dVY8Uq233E4krDWsbOq9XMOUtpaMWZdfEN+7Wecg9Pi93AJvvjQ3Z8hxZpB od8oWQRavSaYAY9bBTPZDwIrOTpB/uBhTjgMnQEOpdOqghVkF1nj3qm2eEX22X3wPBrwWC YV9Gy+02AcBdY6KCvjrgI/ZMklKQzEUDBBuoWAP+NGVbnn36JypXApQu6MqELg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963069; a=rsa-sha256; cv=none; b=DrKNVfF9JLFx1mBrKgt1N+EEKtGKdqHliveOW8GRv1Pz/AzWknkLVQkWPA7z3tgCcSQBOD UIV5xLut/PYm6XeA78nJAWKFexf3sRfLUes17HS1vW8T4RQtv9quPR9HUq7hNJ4JnOMOKK FkAx9AajH+jNcdGSdJb+i6aUcDxi2hHEO/kHUEYVJKhsRwwXptUq8eRq+htQ4mhJ/CSiKA vYLit6Zw/+RJ3hDx4wTdgfyCuBdenzWxo6WhEvURWn+OFwZwCDrXnojK52ICfRmeW/UlC7 nmAJF6rbtnHksmXRxj5bRIh1QexlxDepBI6DmSqLHsdNzVd/UZu636o3BtBu1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6993SKHzd1m; Sat, 04 Jan 2025 03:57:49 +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 5043vnpO028429; Sat, 4 Jan 2025 03:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vnCk028426; Sat, 4 Jan 2025 03:57:49 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:49 GMT Message-Id: <202501040357.5043vnCk028426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 85671cefd93f - stable/14 - check_cancel: when in_sigsuspend, send SIGCANCEL unconditionally 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85671cefd93fff9baf5245b6aae0b44d30621b94 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=85671cefd93fff9baf5245b6aae0b44d30621b94 commit 85671cefd93fff9baf5245b6aae0b44d30621b94 Author: Konstantin Belousov AuthorDate: 2024-12-24 00:08:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 check_cancel: when in_sigsuspend, send SIGCANCEL unconditionally PR: 283101 (cherry picked from commit 9f78c837d94f73f1485e2ce012a8e64197dae9d5) --- lib/libthr/thread/thr_sig.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index a8268f2a770d..1e4a0b9a8f72 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -356,9 +356,11 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * on getting a signal before it agrees to return. */ if (curthread->cancel_point) { - if (curthread->in_sigsuspend && ucp != NULL) { - SIGADDSET(ucp->uc_sigmask, SIGCANCEL); - curthread->unblock_sigcancel = 1; + if (curthread->in_sigsuspend) { + if (ucp != NULL) { + SIGADDSET(ucp->uc_sigmask, SIGCANCEL); + curthread->unblock_sigcancel = 1; + } _thr_send_sig(curthread, SIGCANCEL); } else thr_wake(curthread->tid); From nobody Sat Jan 4 07:10:45 2025 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 4YQBRp43h8z5jrtg; Sat, 04 Jan 2025 07:10:46 +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 4YQBRp0n3Xz53nL; Sat, 4 Jan 2025 07:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735974646; 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=Pjyf213eLN6US2HHl0575fKYOXO6C7HDPLDPnz/3mgc=; b=FKiTWGSD+8C9DiWl57Aq1XxGR9YlI/JyQtE3hxXkBtXYb+LETwmUT1VoJ4X3RAjxqJCQ4/ YpmWH3wJ2ov2JY0wloVEU618VWm/DN6aBcBoaVQKOWBMxT58gOol69+QSQunMA9m0vl50E rh0OqRNsUAyEB1n3I5cuMSVJpWFFXFBE4k2EhxGn+uXlduL6BdnbyxWK3FXSEoj+rLZEEA 2K1uzYdJIpTD1ugZBL13urS3igqWbeIIm3e8UuG1Un+hysHUp4VC1m9ivl0OKtZkmPOTwG l1m03Y+UC0h+ND/HerbjZI0tg4NEZ/PJt31bXBuQEdzO8/fGQfsQeCjoAYAWqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735974646; 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=Pjyf213eLN6US2HHl0575fKYOXO6C7HDPLDPnz/3mgc=; b=pxZf+CzCUtiIizE6ipF9fw5DGFxcfCNxoVlKdrifQ3fabZcYt89M9rDuuss//FmMOfmUCy tt2fYh4WSRFi8O9t7LxX1ltPqmhQKdkN410EBvNwqCmcWDHJmdAGhEg5tnbNkINfyC+PFa aA/v0KfbUEnl+ie/QX84V+DSfzDN0yboTeG6m4CBrSil3Y+C8Jg2Ok3h8nV0rLnyNoz/2U 3deazTBTwfJcuN4lW+D4kaIm/I3ZfC/6t10wC/SRxVfXKtJjh+nd3dNFYtyrJqcaW5bRYy BZqc85c39zb95s+gKOXpY7JQ4SrrXaWFBRzKWlnhbifEJS1TDvxgBbHGfuhMew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735974646; a=rsa-sha256; cv=none; b=oSc5ZDzdF4iHDICCHxYfV5qcr0D9plNF9XJAndPOtaz6Mff9ZbK5A6v29ccuHjjl5OB5u7 LqpRQwaFMOHNcDdkkiGLxKzB3ilDAS6/sAb5rhtOrEutVtbyPvWWW4w4GBgz00bN6xwDLU zuaNnanIuUJfCNLwLc5UP6Z/mAAudp6Nl+/GpuK/7t8XOjvVH/ioSwtHY1qXwq4ewYjmcC m6fPejX/VYO52Cm4foO67b63Nb6EqqutJqHehM5lg/fx5Ojo3bL0+jXGIn/uCBNsrDVP16 RUoZ7iqjgmbqVO1J+bor8IVlK4KLS4302RhPrxSXDcjy53SrA+oa/wHSbMqYIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQBRp0GBbzjjK; Sat, 04 Jan 2025 07:10:46 +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 5047AjjI093678; Sat, 4 Jan 2025 07:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5047AjTP093675; Sat, 4 Jan 2025 07:10:45 GMT (envelope-from git) Date: Sat, 4 Jan 2025 07:10:45 GMT Message-Id: <202501040710.5047AjTP093675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9e4acacf88f8 - stable/14 - timeout(1): Some minor tweaks and improvements 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e4acacf88f8b6f8afe35d661fab9f7e0ebf875c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9e4acacf88f8b6f8afe35d661fab9f7e0ebf875c commit 9e4acacf88f8b6f8afe35d661fab9f7e0ebf875c Author: Gordon Bergling AuthorDate: 2024-12-28 07:13:22 +0000 Commit: Gordon Bergling CommitDate: 2025-01-04 07:10:31 +0000 timeout(1): Some minor tweaks and improvements - Define exit status and macros and use them - Improve the second kill logic by setting 'do_second_kill = false' after configuring the second kill - Minor style tweaks - Reorder options in the man page, as well as the usage help - Reorder the exit status in the man page - Enhance the HISTORY section in the man page (obtained from NetBSD) Reviewed by: bapt, Alexander Ziaee (manpages) Approved by: bapt (src) Obtained from: DragonFlyBSD Differential Revision: https://reviews.freebsd.org/D47866 (cherry picked from commit 06690044dac183ea1d93c2ae227e261da3bdca2a) --- bin/timeout/timeout.1 | 63 +++++++++++++++++++++++++++++++-------------------- bin/timeout/timeout.c | 38 ++++++++++++++++++------------- 2 files changed, 60 insertions(+), 41 deletions(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 10e5fd70c393..b8ec3030b271 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 17, 2024 +.Dd December 28, 2024 .Dt TIMEOUT 1 .Os .Sh NAME @@ -32,10 +32,11 @@ .Nd run a command with a time limit .Sh SYNOPSIS .Nm -.Op Fl -signal Ar sig | Fl s Ar sig -.Op Fl -preserve-status +.Op Fl k Ar time | Fl -kill-after Ar time +.Op Fl s Ar sig | Fl -signal Ar sig .Op Fl -kill-after Ar time | Fl k Ar time .Op Fl -foreground +.Op Fl -preserve-status .Ar duration .Ar command .Op Ar args ... @@ -62,18 +63,6 @@ is 0. .Pp The options are as follows: .Bl -tag -width indent -.It Fl -preserve-status -Exit with the same status as -.Ar command , -even if it times out and is killed. -.It Fl -foreground -Do not propagate timeout to the children of -.Ar command . -.It Fl s Ar sig , Fl -signal Ar sig -Specify the signal to send on timeout. -By default, -.Dv SIGTERM -is sent. .It Fl k Ar time , Fl -kill-after Ar time Send a .Dv SIGKILL @@ -82,8 +71,21 @@ signal if is still running after .Ar time after the first signal was sent. +.It Fl s Ar sig , Fl -signal Ar sig +Specify the signal to send on timeout. +By default, +.Dv SIGTERM +is sent. +.It Fl -foreground +Do not propagate timeout to the children of +.Ar command . +.It Fl -preserve-status +Exit with the same status as +.Ar command , +even if it times out and is killed. .El .Sh DURATION FORMAT +The .Ar duration and .Ar time @@ -92,7 +94,7 @@ unit-specifying suffix. Values without an explicit unit are interpreted as seconds. .Pp Supported unit symbols are: -.Bl -tag -width indent -compact +.Bl -tag -offset indent -width indent -compact .It Cm s seconds .It Cm m @@ -116,10 +118,15 @@ If .Fl -preserve-status is not set, an exit status of 124 is returned. .Pp +If an invalid parameter is passed to +.Fl s +or +.Fl k , +the exit status returned is 125. +.Pp If .Ar command -exits after receiving a signal, the exit status returned is the signal number -plus 128. +is an otherwise invalid program, the exit status returned is 126. .Pp If .Ar command @@ -127,13 +134,8 @@ refers to a non-existing program, the exit status returned is 127. .Pp If .Ar command -is an otherwise invalid program, the exit status returned is 126. -.Pp -If an invalid parameter is passed to -.Fl s -or -.Fl k , -the exit status returned is 125. +exits after receiving a signal, the exit status returned is the signal number +plus 128. .Sh EXAMPLES Run .Xr sleep 1 @@ -206,6 +208,17 @@ The .Nm command first appeared in .Fx 10.3 . +.Pp +The +.Fx +work is compatible with GNU +.Nm +by +.An Padraig Brady , +from GNU Coreutils 8.21. +The +.Nm +utility first appeared in GNU Coreutils 7.0. .Sh AUTHORS .An Baptiste Daroussin Aq Mt bapt@FreeBSD.org and diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 7de255f30150..3803aeeca883 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -41,6 +41,9 @@ #include #define EXIT_TIMEOUT 124 +#define EXIT_INVALID 125 +#define EXIT_CMD_ERROR 126 +#define EXIT_CMD_NOENT 127 static sig_atomic_t sig_chld = 0; static sig_atomic_t sig_term = 0; @@ -51,9 +54,9 @@ static void usage(void) { - fprintf(stderr, "Usage: %s [--signal sig | -s sig] [--preserve-status]" - " [--kill-after time | -k time] [--foreground] " - " \n", getprogname()); + fprintf(stderr, "Usage: %s [-k time | --kill-after time]" + " [-s sig | --signal sig] [--foreground] [--preserve-status]" + " \n", getprogname()); exit(EXIT_FAILURE); } @@ -66,13 +69,13 @@ parse_duration(const char *duration) ret = strtod(duration, &end); if (ret == 0 && end == duration) - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); if (end == NULL || *end == '\0') return (ret); if (end != NULL && *(end + 1) != '\0') - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); switch (*end) { case 's': @@ -87,11 +90,11 @@ parse_duration(const char *duration) ret *= 60 * 60 * 24; break; default: - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); } if (ret < 0 || ret >= 100000000UL) - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); return (ret); } @@ -106,6 +109,7 @@ parse_signal(const char *str) if (errstr == NULL) return (sig); + if (strncasecmp(str, "SIG", 3) == 0) str += 3; @@ -114,7 +118,7 @@ parse_signal(const char *str) return (i); } - errx(125, "invalid signal"); + errx(EXIT_INVALID, "invalid signal"); } static void @@ -149,7 +153,7 @@ set_interval(double iv) memset(&tim, 0, sizeof(tim)); tim.it_value.tv_sec = (time_t)iv; - iv -= (time_t)iv; + iv -= (double)tim.it_value.tv_sec; tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL); if (setitimer(ITIMER_REAL, &tim, NULL) == -1) @@ -160,10 +164,10 @@ int main(int argc, char **argv) { int ch; - unsigned long i; int foreground, preserve; int error, pstat, status; int killsig = SIGTERM; + size_t i; pid_t pid, cpid; double first_kill; double second_kill; @@ -241,11 +245,13 @@ main(int argc, char **argv) signals.sa_handler = sig_handler; signals.sa_flags = SA_RESTART; - for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i++) + for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i++) { if (signums[i] != -1 && signums[i] != 0 && sigaction(signums[i], &signals, NULL) == -1) err(EXIT_FAILURE, "sigaction()"); + } + /* Don't stop if background child needs TTY */ signal(SIGTTIN, SIG_IGN); signal(SIGTTOU, SIG_IGN); @@ -260,9 +266,9 @@ main(int argc, char **argv) error = execvp(argv[0], argv); if (error == -1) { if (errno == ENOENT) - err(127, "exec(%s)", argv[0]); + err(EXIT_CMD_NOENT, "exec(%s)", argv[0]); else - err(126, "exec(%s)", argv[0]); + err(EXIT_CMD_ERROR, "exec(%s)", argv[0]); } } @@ -295,7 +301,7 @@ main(int argc, char **argv) break; } else { procctl(P_PID, getpid(), - PROC_REAP_STATUS, &info); + PROC_REAP_STATUS, &info); if (info.rs_children == 0) break; } @@ -314,7 +320,7 @@ main(int argc, char **argv) if (do_second_kill) { set_interval(second_kill); - second_kill = 0; + do_second_kill = false; sig_ign = killsig; killsig = SIGKILL; } else @@ -331,7 +337,7 @@ main(int argc, char **argv) if (do_second_kill) { set_interval(second_kill); - second_kill = 0; + do_second_kill = false; sig_ign = killsig; killsig = SIGKILL; } else From nobody Sat Jan 4 08:26:40 2025 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 4YQD7P1DgFz5jxFv; Sat, 04 Jan 2025 08:26:41 +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 4YQD7P0l84z57yP; Sat, 4 Jan 2025 08:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735979201; 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=8s6olSkNLIeXerRyjMMFe4cB1JrUXFk2OMf1DiGuVss=; b=RsEWs8t3IGFKT3NGeFvA8iqd9o3YPqGnQN1PszoIr7gEJVdqZIyGpO8E3e/8LJng4GHNDK nGnAAd9VPf1qaJb2wD8Ozp/zoRJ4zNETexeRDRirddks21mltHx2jMgBwKLmsx7KNck5PH VPHJen7qVLNFG5RFvZizgkpL79XS/kegY9r8YeicXx8HBKxF3g+YsELhnypkcwU5KN60Y0 mvgUSyoJANLCWHFFk+p0AK0c+uFP/gBV+pVoAvg82a2k9KcUVLKQCSD4Iq3mToTB4nY4Bj a6PUpSpnhM9uUNecZ4iM5qlPTDB1dwY37IA+pEHa7zcAlWTgV5pFZ1Tq2Nr5cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735979201; 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=8s6olSkNLIeXerRyjMMFe4cB1JrUXFk2OMf1DiGuVss=; b=qHlFCLYkpoGXxxCSE5++7+GAk0xh4MyJEp+wYVjYcON9L5ZLmgPNlZ7AJ/hVF36nR2Oy9k hCxA1p9YSpX2xAWbfk48LaXSKA/QnuTEMUOoRRuSwFqkbs1CfPKmhv52ss70QJ8cgQ1wMe VfXWhPnzSVF2xLIKS1vHuWC2OFbfQbH2O+EHPFt20M0nheuxOBzwvFnKPF0LhsjtZr8DLU vR1h7gDZdEilwZdWtcGfdO1DBc9eqYjqMPlzIaed7Oe/ubIjdbZmJZkBCjwr1B+2xnwZ9w uIOZqdwWRZli9B748Lx5PplHIosjQU07LP5e1ZnEnPp5Z2ALeTByg+Qe1Xs8NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735979201; a=rsa-sha256; cv=none; b=jNgGppLDsKAaHhNyRajjNEHaraxmcnr1d3X6zMr3QK0tdkoWOOJGAPDrWkSsbw4sM7xnzO ryVyrKZg6rb2f46vh9SDaxrofwVnboMOwE1qazU6lShXIGbB+J/l9xXeKxO85J/bnqg3sN A7arC51rUy3HYHubZBUanBxwV5cX0NhbI+4QhC3/oGKAFupjUCvxcv1e/MlA5bDaj426bv UqGJQOJHGqs6ZSRh5pb+6VfYmRjd07lbh8sPxUQABv9bFPTEyqXj0oz7CJ5YxBHRSyWt4S lqwAeGjzxwOl1JDMAoT2lao0MFYNDaj40ePMYjwj2VXkcBBfiwO3twIqNnqgtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQD7P02Mxzlsj; Sat, 04 Jan 2025 08:26:41 +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 5048QeQ4032901; Sat, 4 Jan 2025 08:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5048Qeev032898; Sat, 4 Jan 2025 08:26:40 GMT (envelope-from git) Date: Sat, 4 Jan 2025 08:26:40 GMT Message-Id: <202501040826.5048Qeev032898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6145586a6c74 - main - ascii(7): Correct the history section 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6145586a6c74e99969d74384066ecaf6580a8015 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6145586a6c74e99969d74384066ecaf6580a8015 commit 6145586a6c74e99969d74384066ecaf6580a8015 Author: Gordon Bergling AuthorDate: 2025-01-04 08:25:39 +0000 Commit: Gordon Bergling CommitDate: 2025-01-04 08:25:39 +0000 ascii(7): Correct the history section The man page ascii(7) first appears in the first edition manual. Reviewed by: imp, Alexander Ziaee Obtained from: OpenBSD MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D48224 --- share/man/man7/ascii.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7 index 3e4693153e99..11f4f63ccb47 100644 --- a/share/man/man7/ascii.7 +++ b/share/man/man7/ascii.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 12, 2022 +.Dd January 4, 2025 .Dt ASCII 7 .Os .Sh NAME @@ -192,4 +192,4 @@ ESC ESCape An .Nm manual page appeared in -.At v2 . +.At v1 . From nobody Sat Jan 4 08:36:57 2025 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 4YQDMG2YvCz5jxMy; Sat, 04 Jan 2025 08:36:58 +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 4YQDMG1fdwz58gb; Sat, 4 Jan 2025 08:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735979818; 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=fZICCUayIJHPvqqpBVI7TtYn6KXSAUJfLIX6dmOWuMk=; b=SdemS+ecgraslfpkljjW4TdSdcuru9knjUZP/ufd3G9bIdndoz92qraJrEqQiIR8iFZoWj 0XS3zji5Zq+w+SQib9w/TKxvYAQ2zJor166VMGdk0TG6amItmChIIteFJ/cTR/BkOEM2F1 nPWgI6U5/GQEb6GfI5nSqrVp+eeXJffbmAR1nOQdgUmOBDC8XTekJDE37keNc79Xf0Cwu9 fuq4M/E893z63TskeZO3+WjtlMYaQSv+/ObiY8aWbYs4hl8cydHhd3sDMPFNnx1z/X44Nw nc4Zqlqyz+vzRO9e7kR6cSdqRvQGFcBEVQyQFfKXNYZe/1UkSEMaavxtcnFTRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735979818; 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=fZICCUayIJHPvqqpBVI7TtYn6KXSAUJfLIX6dmOWuMk=; b=Z7siU3c2lPDKwrYk9a/7mEsojS1tBxrW2UtYunX7SP7p2XuMEt1bWYIQGUS4hIO1VZmz4m RTr4GMI2ziTJmdet24bSG6j6Jyj6VyCoZ7RxMTDM3V54x7S4PRbfoHoFCo+gX2fTDcpVgv 9yO5T0pQF3NXzExEWWXX/pZ8npTcIeiG6YksCUxWG2/6LtW2TeGyYUb7KCv36ZmB/d4/dZ GlUKbq1Uu5KywRQF+5DwYHTwyvpUWZBAwNKkwsZMiuI7vlEJEeY/7SHlW2lyWhJne8ebOU ppeJIcsI+DhkaB28GzGQh+I/94tcYjfC8wCJRiOqPs2UGsj9XuIC99yroLacDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735979818; a=rsa-sha256; cv=none; b=r8dE5qTORsdeIFTqaBQlNyFiGR/Z1i8pd2eROgoYCjfo7RiMUj6SKUjsnnqHtnFW9lCvu1 KbT43vw6CeJGfEWKIBx5RNVhiMUNGHAZ2/JbY4FP+uUgRXuUSRiWBEMWyM0VlqYNr+tHTJ pzBqe78wG/uzbuqptvQskQQ1ar2pMvL823dSGAt8pI27bjndjVmz/N54ptGWiY61Xe7gTQ 0WC4sNHbcOwbroy8VQF7YTOGpeYkbLyoSVHoALRZNb5b5yA+45KYpRsUUGKZqFXPz9S9dn tDUFeas54ei2dps7jkBjUvINXsFW/grjlhNnDJMszhyG/EuR9TNlvaRiihvLLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQDMG0q4lzlfS; Sat, 04 Jan 2025 08:36:58 +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 5048avX6052064; Sat, 4 Jan 2025 08:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5048avgf052061; Sat, 4 Jan 2025 08:36:57 GMT (envelope-from git) Date: Sat, 4 Jan 2025 08:36:57 GMT Message-Id: <202501040836.5048avgf052061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f57db7955a6c - main - modules: dtb: allwinner: Remove sun8i-h2-plus-orangepi-r1.dts 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f57db7955a6c69bbfa1dc7b93bea8db58eba87c1 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f57db7955a6c69bbfa1dc7b93bea8db58eba87c1 commit f57db7955a6c69bbfa1dc7b93bea8db58eba87c1 Author: Emmanuel Vadot AuthorDate: 2025-01-04 08:37:53 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-04 08:38:50 +0000 modules: dtb: allwinner: Remove sun8i-h2-plus-orangepi-r1.dts Remove sun8i-h2-plus-orangepi-r1.dts for now, latest update changed some /delete-node/ places and this confuse our dtc. --- sys/modules/dtb/allwinner/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 5320e5a7681f..242ee5d974ad 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -13,7 +13,6 @@ DTS= \ allwinner/sun7i-a20-olimex-som-evb.dts \ allwinner/sun7i-a20-pcduino3.dts \ allwinner/sun8i-a83t-bananapi-m3.dts \ - allwinner/sun8i-h2-plus-orangepi-r1.dts \ allwinner/sun8i-h2-plus-orangepi-zero.dts \ allwinner/sun8i-h3-nanopi-m1.dts \ allwinner/sun8i-h3-nanopi-m1-plus.dts \ From nobody Sat Jan 4 08:39:38 2025 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 4YQDQb1Y6wz5jxnv; Sat, 04 Jan 2025 08:39:51 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4YQDQY4RBWz596Q; Sat, 4 Jan 2025 08:39:49 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=SpjzGucL; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com; dmarc=pass (policy=none) header.from=bidouilliste.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1735979981; 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: in-reply-to:in-reply-to:references:references; bh=K73fx9AGxWIKDq7nYwlLCRtIVjfBx6yKKE0QVF962Dc=; b=SpjzGucLRzYAQyjARzro7DEntRUfqs3uJ2F1Wcm4UOX047bbcg7lf/e/LfDz02DWP8kHFZ /EXJPVF7+XOPhM2BooVITt72FCk6O2batXdXPT/yRbeR84r776VyqFEfOk4b5TNQcaCTUP spti/ac5+K/ex3R5at9MKZSbTUr20bY= Received: from skull.home.blih.net (arennes-299-1-68-49.w92-159.abo.wanadoo.fr [92.159.163.49]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 5005ff46 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 4 Jan 2025 08:39:41 +0000 (UTC) Date: Sat, 4 Jan 2025 09:39:38 +0100 From: Emmanuel Vadot To: John Baldwin Cc: Emmanuel Vadot , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b2d2a78ad80e - main - Import device-tree files from Linux 6.12 Message-Id: <20250104093938.656443d550c7d6d83e8bad4e@bidouilliste.com> In-Reply-To: <82a48a30-9d7f-42fe-83d4-888719c74471@FreeBSD.org> References: <202501020912.5029Cl3V033260@gitrepo.freebsd.org> <82a48a30-9d7f-42fe-83d4-888719c74471@FreeBSD.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4YQDQY4RBWz596Q X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.38 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.982]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; R_SPF_ALLOW(-0.20)[+ip4:212.83.155.74/32]; ONCE_RECEIVED(0.10)[]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; FREEFALL_USER(0.00)[manu]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@FreeBSD.org,dev-commits-src-all@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+] On Thu, 2 Jan 2025 12:04:15 -0500 John Baldwin wrote: > On 1/2/25 04:12, Emmanuel Vadot wrote: > > The branch main has been updated by manu: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b > > > > commit b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b > > Merge: 0e8011faf58b cd989bfc73f7 > > Author: Emmanuel Vadot > > AuthorDate: 2025-01-02 09:12:13 +0000 > > Commit: Emmanuel Vadot > > CommitDate: 2025-01-02 09:12:13 +0000 > > > > Import device-tree files from Linux 6.12 > > Not sure which update triggered this, but I am now getting this failure > building an arm64 GENERIC kernel. The second build "works" but presumably > with a busted fdt (I wonder if we have an error there where we need to > be removing partially built files on error)? > > /freebsd/main/sys/tools/fdt/make_dtb.sh /freebsd/main/sys /freebsd/main/sys/contrib/device-tree/src/arm/allwinner/sun8i-h2-plus-orangepi-r1.dts /usr/obj/freebsd/main/arm.armv7/sys/GENERIC/modules/freebsd/main/sys/modules/dtb/allwinner > Assertion failed: (sorted_phandles.size() == fixups.size()), function resolve_cross_references, file /freebsd/main/usr.bin/dtc/fdt.cc, line 1421. > Abort trap (core dumped) > > -- > John Baldwin > This is caused by some delete-node I think, I've removed the dtb from the build for now. But it's weird that you got it when building a arm64 kernel as we don't build this one for arm64, also the path in your build seems to indicate that this was for an armv7 one. Anyway, I'll investigate later. -- Emmanuel Vadot From nobody Sat Jan 4 08:53:31 2025 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 4YQDkM4J8tz5jyxx; Sat, 04 Jan 2025 08:53:31 +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 4YQDkM3cMsz3xFX; Sat, 4 Jan 2025 08:53:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735980811; 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=4U+c6fj+ErL4TK77hXdrK6L00mfsYtUT+0fl3dh6hIs=; b=d+o2SISXDpLY4EaSMY8mMXW7vJ7tHUwCQxqZrxkOdal01MiiAB4uQO/6hracL0n1Txfwlg RCxOT9Ylbh7XsWYOX38skTr977eZML8h4TFbyVTPIHvKZc6fLgOhEE22Oj+S3X0sPpBh4g dGLNe3a4Vqi/mBQ+tYEszav+DBdGaCInNkQd9ZzgFOxDkMrYCaR4o8G68pQ3Jgb55V1kA0 Z71emsfuBsIbDpdFM8orS0UV+ZRRNz8ffjlqX0F84RaEoeXd9i990huGEYXAfWF2Jd539l h0TZbyoX0Fhkq2CgZwUIAcFnJl/0r8RSzT8V44n2h9dExEajhDH8AW3TYHePwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735980811; 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=4U+c6fj+ErL4TK77hXdrK6L00mfsYtUT+0fl3dh6hIs=; b=DrWt4yfeH4+dA670qAvQN+VRdySQuWY1dAR7ISGba+GGVsrgjgLIiEOEoDFsRXd9VTiBHo 83ztK96ZWUWgdG9f0iC8EN+Bu5ok3l13JZNr8hqhZBNQv0rnBgO1zCic95VGbicrvypln7 RM8LOn2hw89J0Mgpp0RxcP9QmTvsewZHY7Xe1r3ijbLNzTrGIsf7r6hD34U8uRZ7vXFHne +reHJt/dD9YsYNKdPVIa0s21hIEXEj+2pRZPlcMDPWn3Qaw22iTplTQ+I2D053OqCrfXep SDbybTFN7X7Vffkv78j/BA3HB4WEKh0hHUVi7Xl+6oWucONVfp+C5Oyzvi+7kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735980811; a=rsa-sha256; cv=none; b=E2H15O6YJq2lDIU0TZn2iYouJ1ie4TjDY3SehEN2vEXFS0QbG83yGi1SIXL9y5pkVPQQ5R dVQN5klwCubOLR0xgJwkBHZ2LXAt/UaUq7Pbgen+vrbOgj2n7k6qCMU0DmWJc3MMjkSGPW r7ooMsSQUhlEo6KwZ92E40Lm/kLu5WYgVEVyfYkGOG17WV8m3eEnCoxY38ToagWabdZ9d9 YJ/FD/qyiC/DO2Q8PFH4kyDJIcMtT//ukOYTJwtsLzYm9BN26YxhC6bp0KNnfRM5JBZjgn UqoXTN9+5ttTAXf0V50AoMonaWLYLTaV8tvsr2lJtmThS183Ok3ccewWC4qQOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQDkM3BbSzlkf; Sat, 04 Jan 2025 08:53:31 +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 5048rVSA087731; Sat, 4 Jan 2025 08:53:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5048rVCw087728; Sat, 4 Jan 2025 08:53:31 GMT (envelope-from git) Date: Sat, 4 Jan 2025 08:53:31 GMT Message-Id: <202501040853.5048rVCw087728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d633a7d12105 - main - timeout(1): Add -v/--verbose option to show diagnosis info 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d633a7d12105a54551622882f4eee80a13a1445a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d633a7d12105a54551622882f4eee80a13a1445a commit d633a7d12105a54551622882f4eee80a13a1445a Author: Gordon Bergling AuthorDate: 2025-01-04 08:52:56 +0000 Commit: Gordon Bergling CommitDate: 2025-01-04 08:52:56 +0000 timeout(1): Add -v/--verbose option to show diagnosis info The -v/--verbose option enables this utility to show diagnosis info to stderr about any signal sent on timeout. This implementation refers to GNU coreutils's timeout(1). Reviewed by: bapt, Alexander Ziaee (manpages) Approved by: bapt (src) Obtained from: DragonFlyBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48225 --- bin/timeout/timeout.1 | 6 ++++-- bin/timeout/timeout.c | 28 +++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index b8ec3030b271..1a5fd95a6256 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 28, 2024 +.Dd January 4, 2025 .Dt TIMEOUT 1 .Os .Sh NAME @@ -34,7 +34,7 @@ .Nm .Op Fl k Ar time | Fl -kill-after Ar time .Op Fl s Ar sig | Fl -signal Ar sig -.Op Fl -kill-after Ar time | Fl k Ar time +.Op Fl v | Fl -verbose .Op Fl -foreground .Op Fl -preserve-status .Ar duration @@ -76,6 +76,8 @@ Specify the signal to send on timeout. By default, .Dv SIGTERM is sent. +.It Fl v , Fl -verbose +Show information to stderr about any signal sent on timeout. .It Fl -foreground Do not propagate timeout to the children of .Ar command . diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 76e51eaa965e..429ca64349e3 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -49,14 +49,17 @@ static sig_atomic_t sig_chld = 0; static sig_atomic_t sig_term = 0; static sig_atomic_t sig_alrm = 0; static sig_atomic_t sig_ign = 0; +static const char *command = NULL; +static bool verbose = false; static void usage(void) { fprintf(stderr, "Usage: %s [-k time | --kill-after time]" - " [-s sig | --signal sig] [--foreground] [--preserve-status]" - " \n", getprogname()); + " [-s sig | --signal sig] [-v | --verbose] [--foreground]" + " [--preserve-status] \n", + getprogname()); exit(EXIT_FAILURE); } @@ -146,6 +149,16 @@ sig_handler(int signo) } } +static void +send_sig(pid_t pid, int signo) +{ + if (verbose) { + warnx("sending signal %s(%d) to command '%s'", + sys_signame[signo], signo, command); + } + kill(pid, signo); +} + static void set_interval(double iv) { @@ -196,10 +209,11 @@ main(int argc, char **argv) { "kill-after", required_argument, NULL, 'k'}, { "signal", required_argument, NULL, 's'}, { "help", no_argument, NULL, 'h'}, + { "verbose", no_argument, NULL, 'v'}, { NULL, 0, NULL, 0 } }; - while ((ch = getopt_long(argc, argv, "+k:s:h", longopts, NULL)) != -1) { + while ((ch = getopt_long(argc, argv, "+k:s:vh", longopts, NULL)) != -1) { switch (ch) { case 'k': do_second_kill = true; @@ -208,6 +222,9 @@ main(int argc, char **argv) case 's': killsig = parse_signal(optarg); break; + case 'v': + verbose = true; + break; case 0: break; case 'h': @@ -225,6 +242,7 @@ main(int argc, char **argv) first_kill = parse_duration(argv[0]); argc--; argv++; + command = argv[0]; if (!foreground) { /* Acquire a reaper */ @@ -315,7 +333,7 @@ main(int argc, char **argv) procctl(P_PID, getpid(), PROC_REAP_KILL, &killemall); } else - kill(pid, killsig); + send_sig(pid, killsig); if (do_second_kill) { set_interval(second_kill); @@ -332,7 +350,7 @@ main(int argc, char **argv) procctl(P_PID, getpid(), PROC_REAP_KILL, &killemall); } else - kill(pid, sig_term); + send_sig(pid, sig_term); if (do_second_kill) { set_interval(second_kill); From nobody Sat Jan 4 10:21:45 2025 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 4YQGhB0ZSrz5k488; Sat, 04 Jan 2025 10:21:46 +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 4YQGhB01X8z44np; Sat, 4 Jan 2025 10:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735986106; 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=TOFJ4B8ftXAHyS7YGm2q1gICuBz3kC6CVvYEbhG/hpk=; b=uwzUkVA46ZjQ45/ToI5ZhJ/3EJ6Snr1vrQOVznLlYpmZwSrzHEfHCg0e9qhwSaPjMwJ+si nmjkNLPlNEe4EevWA+hLi8UASCTFj6FCz4P9gcHQ8MzU6nn4nkTSlM8Kh4E414keaQvZoi ++dvUV1z+1ADO5r63xB5cmgPs+4CFZGDVQsWsKxsd/525OqCixZt1w6ABL36jLAxhLEX5I uVLEy2vydUiiQnyjUJI+Uo+/h1qD28UDCj198PzEDMU8Eu6zXKfPv+vu3xim8Na83QrXjM IlxT2FXhLrDKLSNsqX7L9OOrvEZ3GKlPMcuz+UOHC4vNCfxMqzguGK7pVHgsRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735986106; 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=TOFJ4B8ftXAHyS7YGm2q1gICuBz3kC6CVvYEbhG/hpk=; b=BgxQVwOaTA/to/Qt0WTakDMZ8Xmo9zwvA2nzfappRioJlbe+PF5WLyKQHcf9Z/KFluJH9C pDDkyJytwtPTmX1/MVDaDhvj5PIti2zA0IMh8K3SpSmBGF9uK8G3wXagKIkbJ/6PE+Z5Yx KsicXOxtyvpHxRYoZ8f+SalnQGQnX7KQbsSfG9EoFU/W4PPy/pGLstvLYJ5Re+n9Co2ZkD avztHc8wS0Ec3HZegWJkRJ74ffbMUdELKlUNdTX5uD/CSZkvdtM01c7kHrfzhQY1E4qWLv Kfy74xQciPjA/s5dmnw2Gm3sSHcszP3FDPv4b37iJiuBhszQcldLUZy6ZSyRSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735986106; a=rsa-sha256; cv=none; b=ukuDbcxtzlNtQqLA8xCTtR+btwHQoWeG0wUUIIkqgxSNLakA8JmkGKcR5taQcGLYghf/L5 UzQDoQNGsjGIvogBMbfg1cw8OpxB2na6gXDNbx3Q4cOedx97hpzTTj60OXwbt0NKDUYSvp +7ihIrQeuwsNGlWqiXAuZL6iiO2BlSd4mA+pxz8fnOFVfBd7v8p/rs5sPbVFf0PUb9YwKm 4DbtIn8d4+tg9pwYDeIaMTQc7MfxtHMK/rhR+AhE+7LQ/F38BvRqUZAr7tRy+h6oL7Rcl6 IF4VjjbYLWStqg1KW5Ef4AWVtaeySID0+M6IDkUiaeAhgMTsMeKtuMx+VIIBHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQGh96X39zp0k; Sat, 04 Jan 2025 10:21:45 +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 504ALjAn054616; Sat, 4 Jan 2025 10:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504ALjCD054613; Sat, 4 Jan 2025 10:21:45 GMT (envelope-from git) Date: Sat, 4 Jan 2025 10:21:45 GMT Message-Id: <202501041021.504ALjCD054613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ba5834b8e11f - main - libusb: fix hotplug sigbus 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba5834b8e11fd002a663d083a464e397e76cb3a9 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ba5834b8e11fd002a663d083a464e397e76cb3a9 commit ba5834b8e11fd002a663d083a464e397e76cb3a9 Author: Baptiste Daroussin AuthorDate: 2025-01-03 09:50:30 +0000 Commit: Baptiste Daroussin CommitDate: 2025-01-04 10:20:49 +0000 libusb: fix hotplug sigbus When a hotplug callback has been registered, and the program using libusb is calling libusb_exit then the thread handler is set to NO_THREAD which result in the variable controlling the loop the be set to 0, it does a last pass through device available without having done a scan, which result in a sigbus after it tried to unregister all the devices. directly break the loop instead and cleanup the list of devices this fixes the tests with LGPLed libusb's hotplugtest program MFC After: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D48298 --- lib/libusb/libusb10_hotplug.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index 9d00b1dbe5a0..98903686f76b 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -112,22 +112,25 @@ libusb_hotplug_scan(void *arg) libusb_device *temp; libusb_device *adev; libusb_device *bdev; - unsigned do_loop = 1; - while (do_loop) { + for (;;) { usleep(4000000); HOTPLUG_LOCK(ctx); + if (ctx->hotplug_handler == NO_THREAD) { + while ((adev = TAILQ_FIRST(&ctx->hotplug_devs)) != NULL) { + TAILQ_REMOVE(&ctx->hotplug_devs, adev, hotplug_entry); + libusb_unref_device(adev); + } + HOTPLUG_UNLOCK(ctx); + break; + } TAILQ_INIT(&hotplug_devs); - if (ctx->hotplug_handler != NO_THREAD) { - if (libusb_hotplug_enumerate(ctx, &hotplug_devs) < 0) { - HOTPLUG_UNLOCK(ctx); - continue; - } - } else { - do_loop = 0; + if (libusb_hotplug_enumerate(ctx, &hotplug_devs) < 0) { + HOTPLUG_UNLOCK(ctx); + continue; } /* figure out which devices are gone */ From nobody Sat Jan 4 13:09:02 2025 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 4YQLPD1tK2z5kFrM; Sat, 04 Jan 2025 13:09:04 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQLPD1BwPz4N3X; Sat, 4 Jan 2025 13:09:04 +0000 (UTC) (envelope-from mmel@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735996144; h=from:from:reply-to: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: in-reply-to:in-reply-to:references:references; bh=jhfi+hU0kuWqH+le8u/mxMierKU/ZqD87efol/fnEWI=; b=uRgWvCnj+NWx0ACCgggExov7TmeuEXA4R8wKir1Q+enrsZevwd+1mhA9hHjBn44W6uk7oz n4/L/N1sHcMpmMp61vtHNbdVIkV3edmnWGzedGRhHMD9xhCIyoAuvoJoKPHBSHbMhu6sBE H82RU52Ql+WUF/+xtkD2fO5WlsJZtqGCcd5SaOmPxiHqH9JIMoz/QbBnQhDlSAfDjJDf6+ HIcQnxi9nz0o2iWxZ3VrqIgMKvaFoDGyNBL17xM5sNHSMaksoMQdJ8OKchMDjdYH0X2JkA J/Tx1R0zt6saM7JwlahLDLrEERdUqFUPTTze8KHmSyiJ5mQZfKrvdDvKQeisrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735996144; h=from:from:reply-to: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: in-reply-to:in-reply-to:references:references; bh=jhfi+hU0kuWqH+le8u/mxMierKU/ZqD87efol/fnEWI=; b=ZfNNP4ioTu5pVtDs8a8AxV6XfIygv5QkHYunPZCtNeO/3DrFcko9iiB7UpWQKeRH0LExod iTgc1tEr772q8ubd67gtphKV6GpeFcx54VGwINRFH8XqJROWTsbjPP72bFdstFnRBUDCcK At8V8uP0uhbzDl1xNFCLV6uvUDlgwW/AVIJVnMhUGC39k61PoN8VLGGNBYAEuwG6I8rT3l ztn/ZyACTxXBP9sJ52QLf+XPFEGMLKdGXW+dRD3/fq/8b4VJvd1fohOL1MNFIH3MubnTPV g3iR+4YyRfGSiQ5mm6kCWypuTf0OCDYP4A8Dj6Z1zLCpknNosNEZ6PJmPist3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735996144; a=rsa-sha256; cv=none; b=LZytapCU8ZeB81nvJxq6iOhSwTWl1nuKkwbRHptMU0DAja5KyIxYXkNsGdZWyBdOvnx+MO eHwGll1hBhB6ebv5RMFJkyBGDoRchu+pIh5iAq1MHJYfLEWdx839oBE98AcK0CkbfQQCgc qX0OmbX29MA3CAdrrzx3mwZaehSGvhJQ+TUyqskuv/jsj0iGezccZXfTNEVSThYsJATkyM e0xKkUVjdna6T5grgCwNF7icjSBIq2VRJJS5WUrKcrgmWLppmQcZwlFqtFUPKHKAhpbGkQ II1n6AqGPd7F3JRJUKrhwKDguV7L3jBhyVn+proA5RvG6jHhLmvoWEXiP//P+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2001:67c:14a0:5fe0:bcb2:4da4:ff9a:30fe] (unknown [IPv6:2001:67c:14a0:5fe0:bcb2:4da4:ff9a:30fe]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mmel/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YQLPC3JCpzKtB; Sat, 04 Jan 2025 13:09:03 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Message-ID: <0ed7a6fa-12a5-4fd9-a77f-a4d49d0b3699@FreeBSD.org> Date: Sat, 4 Jan 2025 14:09:02 +0100 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: mmel@FreeBSD.org Subject: Re: git: caab831338f4 - main - Export additional __aeabi_ symbols from arm's libgcc_s To: Dimitry Andric , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412282118.4BSLIhVr001896@gitrepo.freebsd.org> Content-Language: cs, en-US From: Michal Meloun In-Reply-To: <202412282118.4BSLIhVr001896@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 28.12.2024 22:18, Dimitry Andric wrote: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=caab831338f4eeaa7455e981478be9fd414b7969 > > commit caab831338f4eeaa7455e981478be9fd414b7969 > Author: Dimitry Andric > AuthorDate: 2024-12-28 21:17:13 +0000 > Commit: Dimitry Andric > CommitDate: 2024-12-28 21:18:20 +0000 > > Export additional __aeabi_ symbols from arm's libgcc_s > > Some programs depend on these symbols, when they are compiled for armv6 > or armv7. Closes #1560 (slightly changed due to sorting of the symbols). > > PR: 271087 > Reported by: fuz > Submitted by: jfc@mit.edu > MFC after: 1 week > --- > lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- > 1 file changed, 26 insertions(+), 1 deletion(-) > > diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map > index 92b54761d810..a426f823de5c 100644 > --- a/lib/libgcc_s/arm/Symbol.map > +++ b/lib/libgcc_s/arm/Symbol.map > @@ -4,8 +4,33 @@ > GCC_3.5 { > _Unwind_Complete; > _Unwind_VRS_Get; > - _Unwind_VRS_Set; > _Unwind_VRS_Pop; > + _Unwind_VRS_Set; > + __aeabi_d2h; > + __aeabi_d2lz; > + __aeabi_d2ulz; > + __aeabi_f2h; > + __aeabi_f2lz; > + __aeabi_f2ulz; > + __aeabi_h2f; > + __aeabi_idiv; > + __aeabi_idiv0; > + __aeabi_l2d; > + __aeabi_l2f; > + __aeabi_lasr; > + __aeabi_lcmp; > + __aeabi_ldivmod; > + __aeabi_llsl; > + __aeabi_llsr; > + __aeabi_lmul; > + __aeabi_ui2d; > + __aeabi_ui2f; > + __aeabi_uidiv; > + __aeabi_uidivmod; > + __aeabi_ul2d; > + __aeabi_ul2f; > + __aeabi_ulcmp; > + __aeabi_uldivmod; > __aeabi_unwind_cpp_pr0; > __aeabi_unwind_cpp_pr1; > __aeabi_unwind_cpp_pr2; I think the aeabi_ functions with floating point arguments were not added correctly. By definition, they must be compiled with -mfloat-abi=softfp event if the rest of the library is compiled with hardfp abi. It is also not clear why they are added to lib/libgcc_s/arm/Symbol.map and not to lib/libc/arm/aeabi/Symbol.map, where the other (some now duplicated) aeabi_ symbols are. Also, the list of aeabi_ functions in is not complete, although the compiler_rt library contains them (__aeabi_f2d, __aeabi_f2iz...). When I looked at it, I found another problem - the whole vfp suffix dance in https://cgit.freebsd.org/src/tree/lib/libcompiler_rt/Makefile.inc#n277 is pointless, all these functions have the same extension in their name. They are expected to be compiled (again with -mfloat-abi=softfp) together with the version without the suffix , and the rt linker will select the appropriate version depending on the VFP presence. In addition, the makefile searches for resources in the wrong order, contrib/llvm-project/compiler-rt/lib/builtins is searched before contrib/llvm-project/compiler-rt/lib/builtins/, so for example a non-specific fp_mode is built, not an architecture-specific one. What now? For me the most important question is in which map (and namespace) should the aeabi_ symbols be defined (without breaking the ABI for the user space). Michal From nobody Sat Jan 4 13:18:11 2025 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 4YQLbn1nv1z5kFy7; Sat, 04 Jan 2025 13:18:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQLbn11mWz4P43; Sat, 4 Jan 2025 13:18:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735996693; 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: in-reply-to:in-reply-to:references:references; bh=IjxmuwUIc0wCkAdbux4kWrl4yowXBpEyuIo0w+Ulc20=; b=cFRSxYb2fLqLRwQatZwH5bRHFiFkQNVuJCu5/+rjoFWeanbNR4ijc/AzD9UruLg2cUZ8EN UMr3Uk1HFQ9SyaNKYO401JFH5lkGAF72TgoidmRQElxrF4shxj+HZ9oNyuXyefg/Nn9EUa usqa2D7z0OgQpcKlqG9MbIemKGBq5CwNOxx9oNOFp/cmr0iGz97IalzRgG9ehjsfq9plkW D4d9FZF6n0SBV93qmRaJ7epKrVigSru7ANfBmWsEun6JRzL2mQ4A+qa18Zps5vSg1ANtsb TsAk4DTjVgpFu0LU/eZrNZC0HIQzpjIDqSSoVkacN/FhMLaXiR5U3F+x/6buEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735996693; 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: in-reply-to:in-reply-to:references:references; bh=IjxmuwUIc0wCkAdbux4kWrl4yowXBpEyuIo0w+Ulc20=; b=inAghuf5AmULpH1PjBoJHr0Hhm52B0vDH9RK8nsDHWHsKJUp/Li/8biYql2oa8/t8PWu9R HABtLRd46WGROxnKt+qrTfazTX45sOPgsf8c3AxEIC7ZxXYQX+wh112g3PIJmuIA0ZzTVb ruFFoY6/8lKoOKkgESMUIzBMqBRy0GzCAdjJMwDlbP8bzinygaY5QUEd76cAMU14liUh1d q9DGvaEnLsopVERqBW/r5bocM8ZoTJY9rxiL/K3j1ER9V+LcpcCLrCkNfl4aI3XiGQGrPp Zp0nv94QRDI6VY7MBy7Kkh8AI0FDVw3cAJk2D2MAdc0hl2WwJgD7/QYm9+X5Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735996693; a=rsa-sha256; cv=none; b=mLG0Hlwfk4o8kETtjZDRuUppd+jW3t2Aw6DBxEFsRj7wjqZ1yu6qmjZKGRnfDlr5PuZY40 fpqAexVZJW4ugNCe/89lD1LCJ1MO9BBNxs8rVCXV8AzCCYrJdiFLi6WBmPgLNhDiZBQuA9 111QYlFrE5updCGi1AwvAvY29Zp8xKoBqooLXlIGF5DHhBtoMknMpb8j/RySC9veflQdTj MtcPAFS49eUIZO0GPZFeJEKxgRuXeUcTFEqSUyHH47TY21qXuLO7DkFQgaHdyUjeteQWD6 oycsZPR+99cBAu2Uj4ARQePvE3veJOavhOGVfIVwdQi12D7tUMJ3ZccyK/HejA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R10" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YQLbm6n4xzLSM; Sat, 04 Jan 2025 13:18:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id CC5915FD7F; Sat, 04 Jan 2025 14:18:11 +0100 (CET) Content-Type: text/plain; charset=us-ascii 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.9\)) Subject: Re: git: caab831338f4 - main - Export additional __aeabi_ symbols from arm's libgcc_s From: Dimitry Andric In-Reply-To: <0ed7a6fa-12a5-4fd9-a77f-a4d49d0b3699@FreeBSD.org> Date: Sat, 4 Jan 2025 14:18:11 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8531A9F2-3333-4C74-8DB7-2455C9AE070B@FreeBSD.org> References: <202412282118.4BSLIhVr001896@gitrepo.freebsd.org> <0ed7a6fa-12a5-4fd9-a77f-a4d49d0b3699@FreeBSD.org> To: "mmel@freebsd.org" X-Mailer: Apple Mail (2.3731.700.6.1.9) On 4 Jan 2025, at 14:09, Michal Meloun wrote: >=20 > On 28.12.2024 22:18, Dimitry Andric wrote: >> The branch main has been updated by dim: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcaab831338f4eeaa7455e981478be9fd= 414b7969 >> commit caab831338f4eeaa7455e981478be9fd414b7969 >> Author: Dimitry Andric >> AuthorDate: 2024-12-28 21:17:13 +0000 >> Commit: Dimitry Andric >> CommitDate: 2024-12-28 21:18:20 +0000 >> Export additional __aeabi_ symbols from arm's libgcc_s >> Some programs depend on these symbols, when they are = compiled for armv6 >> or armv7. Closes #1560 (slightly changed due to sorting of the = symbols). >> PR: 271087 >> Reported by: fuz >> Submitted by: jfc@mit.edu >> MFC after: 1 week >> --- >> lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- >> 1 file changed, 26 insertions(+), 1 deletion(-) >> diff --git a/lib/libgcc_s/arm/Symbol.map = b/lib/libgcc_s/arm/Symbol.map >> index 92b54761d810..a426f823de5c 100644 >> --- a/lib/libgcc_s/arm/Symbol.map >> +++ b/lib/libgcc_s/arm/Symbol.map >> @@ -4,8 +4,33 @@ >> GCC_3.5 { >> _Unwind_Complete; >> _Unwind_VRS_Get; >> - _Unwind_VRS_Set; >> _Unwind_VRS_Pop; >> + _Unwind_VRS_Set; >> + __aeabi_d2h; >> + __aeabi_d2lz; >> + __aeabi_d2ulz; >> + __aeabi_f2h; >> + __aeabi_f2lz; >> + __aeabi_f2ulz; >> + __aeabi_h2f; >> + __aeabi_idiv; >> + __aeabi_idiv0; >> + __aeabi_l2d; >> + __aeabi_l2f; >> + __aeabi_lasr; >> + __aeabi_lcmp; >> + __aeabi_ldivmod; >> + __aeabi_llsl; >> + __aeabi_llsr; >> + __aeabi_lmul; >> + __aeabi_ui2d; >> + __aeabi_ui2f; >> + __aeabi_uidiv; >> + __aeabi_uidivmod; >> + __aeabi_ul2d; >> + __aeabi_ul2f; >> + __aeabi_ulcmp; >> + __aeabi_uldivmod; >> __aeabi_unwind_cpp_pr0; >> __aeabi_unwind_cpp_pr1; >> __aeabi_unwind_cpp_pr2; >=20 > I think the aeabi_ functions with floating point arguments were not = added correctly. By definition, they must be compiled with = -mfloat-abi=3Dsoftfp event if the rest of the library is compiled with = hardfp abi. >=20 > It is also not clear why they are added to lib/libgcc_s/arm/Symbol.map = and not to lib/libc/arm/aeabi/Symbol.map, where the other (some now = duplicated) aeabi_ symbols are. >=20 > Also, the list of aeabi_ functions in is not complete, although the = compiler_rt library contains them (__aeabi_f2d, __aeabi_f2iz...). >=20 > When I looked at it, I found another problem - the whole vfp suffix = dance in = https://cgit.freebsd.org/src/tree/lib/libcompiler_rt/Makefile.inc#n277 = is pointless, all these functions have the same extension in their name. = They are expected to be compiled (again with -mfloat-abi=3Dsoftfp) = together with the version without the suffix , and the rt linker will = select the appropriate version depending on the VFP presence. >=20 > In addition, the makefile searches for resources in the wrong order, > contrib/llvm-project/compiler-rt/lib/builtins is searched before > contrib/llvm-project/compiler-rt/lib/builtins/, so for example a = non-specific fp_mode is built, not an architecture-specific one. >=20 > What now? For me the most important question is in which map (and = namespace) should the aeabi_ symbols be defined (without breaking the = ABI for the user space). All good questions, for which I unfortunately do not know the answers. = It is probably best to make a follow-up bug to = https://bugs.freebsd.org/283484 where this patch originated. Or maybe = reopen it? -Dimitry From nobody Sat Jan 4 13:36:47 2025 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 4YQM1D5cGrz5kHKv; Sat, 04 Jan 2025 13:36:48 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQM1D4tvJz4Ryv; Sat, 4 Jan 2025 13:36:48 +0000 (UTC) (envelope-from mmel@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735997808; h=from:from:reply-to: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: in-reply-to:in-reply-to:references:references; bh=JMhwvNz1EraPbdgRvoIuRAYg83BgAIV+4Ak31cqNo9U=; b=BzY4OTg0UqShoIoWrXZ37Y/8Wi9idkWuUdVozRq/8taCzDGFKN+9j8R68HbVRnaQouZFFy LNguxVG1W2HgPq2TsNbs/zLLHGO9ApwlnHLHdCszBWjAE3/ipQPg0O030ZXbWsOG2mmZm8 Wqfn9gDE945BePgy/iU1CluLZUJ58nPF53WOSqE8oSDgJeL8JpqzRNvR1XdZnVCnNx+YED ZKvPwq3avSvnbYl20r3aVgurHSLtNeM7FlQLmfnhGRUlyKsL3BjYQXpVOVFpbQGIZ2/eyl S6ume7dHd5xL/OSppGfL7Lb3qnT0ZNUXwqoN58uWz1jWVMyJ9cMxjRFEpzFPng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735997808; h=from:from:reply-to: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: in-reply-to:in-reply-to:references:references; bh=JMhwvNz1EraPbdgRvoIuRAYg83BgAIV+4Ak31cqNo9U=; b=B8yZxP56JgMHFSGiucfO+LuPHUuJMS6FPuzySzxb6z9CgX05erDNhxHQx6J2YoPrpiL/LY mpza8nRccFLxRkpNWlaRTRQxcM2N/ZEABfjeY7Lwq5JsMBckLZ2qJMb1ZCvJtHIGWsAt2U xGGsxbwi2kzgllLNHYJm0Wc4C9Cl1MFaANKbjxk4SDu9VhGS5cDX0esNPry63/ZqRugXHu /dOcKbo14Ssqcc377d6C2nr3x7yOGnfT2ORkadoQ9KejzxJ9m0clC9DeaKBU7b/C28YUMf 7WwCZ1hJjnp2l05SHr6BIyL0UQ+VGQmn9QiISsG/KZx4y3MH9C6bEo+RQQi9rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735997808; a=rsa-sha256; cv=none; b=eeyV2z8/UARKWeZSCnMLHULnJ5APxCrEBNzPE1GL/9sLbL1YQfIwgJY7l4NNfSNksqJEun oMb/a+DQGSSTNZ+zxoYjvRouk7r3smhaxHeZnrhrOMS9XqaUMKN40v++WYDbDIiZwGbIEJ KBVtBAE7Bqh+J+hHMtcQDUbLZvtAHm8PLpbvEg9VfOG4uqd1EcTm5mZhksC3Mbobb2m7rD uyiQQ0ltYB9/xToRYPZveXk9KMmXOu2v/VssovgYSw06TAzQuuXgp6EJIn8OFZ+65EqR7Q KENGN8/r7zMJCW7Cjg5FTOQB0d2OATGgg+eglj9Lwaq4AnVwZoOqNFnWeRddvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2001:67c:14a0:5fe0:bcb2:4da4:ff9a:30fe] (unknown [IPv6:2001:67c:14a0:5fe0:bcb2:4da4:ff9a:30fe]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mmel/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YQM1C71VlzLSb; Sat, 04 Jan 2025 13:36:47 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Message-ID: <0f8338a6-6a27-47dd-8c5a-8b797f123c27@FreeBSD.org> Date: Sat, 4 Jan 2025 14:36:47 +0100 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: "mmel@freebsd.org" Reply-To: mmel@FreeBSD.org Subject: Re: git: caab831338f4 - main - Export additional __aeabi_ symbols from arm's libgcc_s To: Dimitry Andric Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202412282118.4BSLIhVr001896@gitrepo.freebsd.org> <0ed7a6fa-12a5-4fd9-a77f-a4d49d0b3699@FreeBSD.org> <8531A9F2-3333-4C74-8DB7-2455C9AE070B@FreeBSD.org> Content-Language: cs, en-US In-Reply-To: <8531A9F2-3333-4C74-8DB7-2455C9AE070B@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 04.01.2025 14:18, Dimitry Andric wrote: > On 4 Jan 2025, at 14:09, Michal Meloun wrote: >> >> On 28.12.2024 22:18, Dimitry Andric wrote: >>> The branch main has been updated by dim: >>> URL: https://cgit.FreeBSD.org/src/commit/?id=caab831338f4eeaa7455e981478be9fd414b7969 >>> commit caab831338f4eeaa7455e981478be9fd414b7969 >>> Author: Dimitry Andric >>> AuthorDate: 2024-12-28 21:17:13 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2024-12-28 21:18:20 +0000 >>> Export additional __aeabi_ symbols from arm's libgcc_s >>> Some programs depend on these symbols, when they are compiled for armv6 >>> or armv7. Closes #1560 (slightly changed due to sorting of the symbols). >>> PR: 271087 >>> Reported by: fuz >>> Submitted by: jfc@mit.edu >>> MFC after: 1 week >>> --- >>> lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- >>> 1 file changed, 26 insertions(+), 1 deletion(-) >>> diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map >>> index 92b54761d810..a426f823de5c 100644 >>> --- a/lib/libgcc_s/arm/Symbol.map >>> +++ b/lib/libgcc_s/arm/Symbol.map >>> @@ -4,8 +4,33 @@ >>> GCC_3.5 { >>> _Unwind_Complete; >>> _Unwind_VRS_Get; >>> - _Unwind_VRS_Set; >>> _Unwind_VRS_Pop; >>> + _Unwind_VRS_Set; >>> + __aeabi_d2h; >>> + __aeabi_d2lz; >>> + __aeabi_d2ulz; >>> + __aeabi_f2h; >>> + __aeabi_f2lz; >>> + __aeabi_f2ulz; >>> + __aeabi_h2f; >>> + __aeabi_idiv; >>> + __aeabi_idiv0; >>> + __aeabi_l2d; >>> + __aeabi_l2f; >>> + __aeabi_lasr; >>> + __aeabi_lcmp; >>> + __aeabi_ldivmod; >>> + __aeabi_llsl; >>> + __aeabi_llsr; >>> + __aeabi_lmul; >>> + __aeabi_ui2d; >>> + __aeabi_ui2f; >>> + __aeabi_uidiv; >>> + __aeabi_uidivmod; >>> + __aeabi_ul2d; >>> + __aeabi_ul2f; >>> + __aeabi_ulcmp; >>> + __aeabi_uldivmod; >>> __aeabi_unwind_cpp_pr0; >>> __aeabi_unwind_cpp_pr1; >>> __aeabi_unwind_cpp_pr2; >> >> I think the aeabi_ functions with floating point arguments were not added correctly. By definition, they must be compiled with -mfloat-abi=softfp event if the rest of the library is compiled with hardfp abi. >> >> It is also not clear why they are added to lib/libgcc_s/arm/Symbol.map and not to lib/libc/arm/aeabi/Symbol.map, where the other (some now duplicated) aeabi_ symbols are. >> >> Also, the list of aeabi_ functions in is not complete, although the compiler_rt library contains them (__aeabi_f2d, __aeabi_f2iz...). >> >> When I looked at it, I found another problem - the whole vfp suffix dance in https://cgit.freebsd.org/src/tree/lib/libcompiler_rt/Makefile.inc#n277 is pointless, all these functions have the same extension in their name. They are expected to be compiled (again with -mfloat-abi=softfp) together with the version without the suffix , and the rt linker will select the appropriate version depending on the VFP presence. >> >> In addition, the makefile searches for resources in the wrong order, >> contrib/llvm-project/compiler-rt/lib/builtins is searched before >> contrib/llvm-project/compiler-rt/lib/builtins/, so for example a non-specific fp_mode is built, not an architecture-specific one. >> >> What now? For me the most important question is in which map (and namespace) should the aeabi_ symbols be defined (without breaking the ABI for the user space). > > All good questions, for which I unfortunately do not know the answers. It is probably best to make a follow-up bug to https://bugs.freebsd.org/283484 where this patch originated. Or maybe reopen it? > Reopened. Michal From nobody Sat Jan 4 14:01:22 2025 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 4YQMYZ3dvZz5kJNK; Sat, 04 Jan 2025 14:01:22 +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 4YQMYZ36czz4THr; Sat, 4 Jan 2025 14:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999282; 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=0CyUx5HxzJ1hRqeNUih2RcsqIsPbR8W/diCuVX0TpkE=; b=iZT/Z/UXX+/Q6EaLFt3QX0rhvLYdgEWYYEpgRbgMO5s0cIEArEX5gYvdrCPI9I3NUXmbaQ 9ix73A0JVXBl+FRkGv8VoOmYne5G6zh/uGulzZxc/f+CH/lGnvkHaKxVuxduh8g3OcyuO5 kjr02poVq6g1g7hfGBoyl0l2nXty+gWf2kkMpnLKxr1yG9Reo1e+Niyp/I/quYst2Pidgb /x3a+bnC6of0OZthNvbJ2Iph0YaF/2r09ntL3SuzocPvZfAfvooFEcJiHnRM/EAhhJow+T HYez/LcnMxT+1dMaPVJITJytIiDnutIFXPHtVqoC2LALhJuCvqbPzcq9hA6pZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999282; 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=0CyUx5HxzJ1hRqeNUih2RcsqIsPbR8W/diCuVX0TpkE=; b=h9K759eSqr9joYewYn+fg6kaRrN39a+iPQxW9TByJ84zZ1Ayp00toCumSwJo80Xnw9hJF+ moDIGJJXsVsHyCE9YIAIitkv1pwhcEcwxaC4LXgOtK6OceFWQkaryVQZz+SUkjkqblzpoR 3ZV2cqJRceUgVRHzkfNc99zTaoHOGB4VFwuIFpt6tvwYcraCIhobOZhrceSD5CW6jY4+YV j3V4iQb7LAwYbXs/oe+Z76eSaqHJT/kf/+yUR3z4asBR0G18TLVDkckgb+s+oTbHofebKf T5sRfeFuyMKZIfutyo4iue90h9x0w+tf7Q/70jCbrZsj5x3Fd/FsQFLw4hW4uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735999282; a=rsa-sha256; cv=none; b=XiAoa3KRzRX/Olc7pw5kkzNU5EipJJBhuUauz136RVEUfOb/icEM8hrBX36YftcN3II6nW h+0H+x8koMfr+g41FRSOwm3LPtPOscrbdTdOAtBCNV3s3qE4VuIZP4wN0ksOrxJvAQutZb 2VJNTFL3IngfqHl4dwkPalaTQ2bLeiuDzSBHZd6vNpV2ktKcmdIZxRC3f3Ose+ctdeiXWI z7lP4rDnAAEwlsD1I4hwnhPPjjZzFL6KXxGhxJGyXZMrKaFCOilAy7XXSqDBWInJGNzz2/ IPBm1vwXO8fOOEWFDJwke0DTJOMvXLzdXrK7xn8SW6nbPvQ3UQpTwBfjeOV9EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQMYZ2jmtzw2L; Sat, 04 Jan 2025 14:01:22 +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 504E1MWX063774; Sat, 4 Jan 2025 14:01:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504E1MYo063771; Sat, 4 Jan 2025 14:01:22 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:01:22 GMT Message-Id: <202501041401.504E1MYo063771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 95a7aa800987 - main - LinuxKPI: 802.11: implement wiphy_{,un}lock() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 95a7aa8009877ca95d81967f9af568ef832bb565 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=95a7aa8009877ca95d81967f9af568ef832bb565 commit 95a7aa8009877ca95d81967f9af568ef832bb565 Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 09:43:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-01-04 14:00:13 +0000 LinuxKPI: 802.11: implement wiphy_{,un}lock() This will help us to get minimally better lock coverage in iwlwifi though not yet against the LinuxKPI implementation which will likely switch to this in the future. At least the TODO() logging noise is out of the way. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index f489e7a7da11..7780b265cf6b 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1358,13 +1359,13 @@ wiphy_dev(struct wiphy *wiphy) static __inline void wiphy_lock(struct wiphy *wiphy) { - TODO(); + mutex_lock(&wiphy->mtx); } static __inline void wiphy_unlock(struct wiphy *wiphy) { - TODO(); + mutex_unlock(&wiphy->mtx); } static __inline void From nobody Sat Jan 4 14:08:14 2025 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 4YQMjW36Grz5kK0y; Sat, 04 Jan 2025 14:08:15 +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 4YQMjW09XQz4Txm; Sat, 4 Jan 2025 14:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999695; 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=1C8ziHyCskFNvTMlOqf9vsVhBnLrbtGsQA230O1NuCw=; b=Xu9QUbnqKNLWwiSvtfE8K3wHkBNQjEMZICN/Eu9Jjt7RU+KYyTeh8R+ravH3yi8EbHJBR2 48ypvgA/KXNtUwk684Nya/YYuf86HKcxU+ZRcQOqpRdkQS7qOIKjR211xD+bTW5tNJFAEB FxA14lMZdfsJJlp3JNyl6GWJ+J12p4z0aHyKkz9sMpABqvWKkiqJsnwjKt5O6w1VnNr2rk Dv7hCT4vNWQEOe1csf+TVWUx5XgDg9EWSSbG5VI36xttUUDBqMjosyIqJQrGsJaZ3/Jqhy cX8NFcadfXSBL9W+q8p+NjR4DSrOE0kOSmmJ1VOGFEXyyxIWK3b9AXuTR7Tu3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999695; 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=1C8ziHyCskFNvTMlOqf9vsVhBnLrbtGsQA230O1NuCw=; b=XLBhPeQfIu2UhbCz8ex1tgai1l16HETpm+f3GjfedI5rhFDuKKNkhuqVKMGxaooz4vRNPA aGCPThFpB2dViggOeKQVs4+IHkAUlSuWWA5vTyQucrEg/doZcaSxiWtNJqEkBuUfsLh6Ka XJjheogdKIacxmrSCpHT8XBC3MC6p3ZYMItdykZLnBht4FwZJRp0JyJIrzi0HAI4yL9uC5 mdAKCYoX+Mb3Cdldx/O2OnGfL0cs/jKuwffM3wDHzAI1ruqVvcoYp2gpwdACPYqvmPigkS ueV7ZpK2fW4isNqdmSzGrXgHZRulJcIFLv6nYlXCT8G0AGzzOlkTYTLV8Ra2Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735999695; a=rsa-sha256; cv=none; b=ao6T47mEl/NTIzzPbbH7vJIgBh/uqvu2Z7XNRh7nRlnxwJ9U5+LL1dcRS/84KFkPvwaHzU QjPrqbIrMx8knww7J3aN1z4qZ17PJNZOSZJwz5etHcS7LhbQvxjJpb52kzb8EV0qcSiTJA VzfpL3k2kYFf109QZVcmSj0MjzQG5jF68j2vsg39tRe8hKWC5sE/SyLJvgJ+1DKBPphDo/ 87sdSAXH5QeOSuFYoEIhuCxvooNWGkEKHLA7IBZ3+Mr9SBJmXeKIt+RjIXDs4opKOG+dxK +xsV64q/2YhJyQIPFsREqHOuBrBYlaULak+ALSu1KPBm4BtZz0iwA7d1DXaLgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQMjV6tJGzwVg; Sat, 04 Jan 2025 14:08:14 +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 504E8EaJ070434; Sat, 4 Jan 2025 14:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504E8ENS070431; Sat, 4 Jan 2025 14:08:14 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:08:14 GMT Message-Id: <202501041408.504E8ENS070431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f9275f94f33b - stable/14 - riscv: Permit spurious faults in kernel mode 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9275f94f33bd017a05ed791b1ee56a68ab42be7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f9275f94f33bd017a05ed791b1ee56a68ab42be7 commit f9275f94f33bd017a05ed791b1ee56a68ab42be7 Author: Mark Johnston AuthorDate: 2024-12-10 15:07:28 +0000 Commit: Mark Johnston CommitDate: 2025-01-04 13:56:34 +0000 riscv: Permit spurious faults in kernel mode Right now, pmap_enter() does not issue an sfence.vma after overwriting an invalid PTE, so the kernel can trigger a page fault when accessing a freshly created mapping. In this case, pmap_fault() can handle the exception, but we may panic before that. Move the check; this is consistent with arm64 and serves to ensure that we don't call vm_fault() etc. from a context where that's not permitted. Also fix a related bug: don't enable interrupts if they were disabled in the context where the exception occurred. Reviewed by: br Tested by: br MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47688 (cherry picked from commit c226f193515c8c0665610cb519fe381987f8ee24) --- sys/riscv/riscv/trap.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 3a7b3fba26b9..0b6db7982847 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -229,11 +229,6 @@ page_fault_handler(struct trapframe *frame, int usermode) pcb = td->td_pcb; stval = frame->tf_stval; - if (td->td_critnest != 0 || td->td_intr_nesting_level != 0 || - WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, - "Kernel page fault") != 0) - goto fatal; - if (usermode) { if (!VIRT_IS_VALID(stval)) { call_trapsignal(td, SIGSEGV, SEGV_MAPERR, (void *)stval, @@ -246,7 +241,8 @@ page_fault_handler(struct trapframe *frame, int usermode) * Enable interrupts for the duration of the page fault. For * user faults this was done already in do_trap_user(). */ - intr_enable(); + if ((frame->tf_sstatus & SSTATUS_SIE) != 0) + intr_enable(); if (stval >= VM_MIN_KERNEL_ADDRESS) { map = kernel_map; @@ -270,6 +266,11 @@ page_fault_handler(struct trapframe *frame, int usermode) if (VIRT_IS_VALID(va) && pmap_fault(map->pmap, va, ftype)) goto done; + if (td->td_critnest != 0 || td->td_intr_nesting_level != 0 || + WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, + "Kernel page fault") != 0) + goto fatal; + error = vm_fault_trap(map, va, ftype, VM_FAULT_NORMAL, &sig, &ucode); if (error != KERN_SUCCESS) { if (usermode) { From nobody Sat Jan 4 14:08:16 2025 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 4YQMjX4TGdz5kJkb; Sat, 04 Jan 2025 14:08:16 +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 4YQMjX1j82z4Thk; Sat, 4 Jan 2025 14:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999696; 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=fIqmzup+N23EReSyhufHh0hPwaySLt9kux2VBSSLNx4=; b=CVtEGvQgFP0mX3wul1pTvv9RKgwsrbtG+K6j/QKgfV3R2kc5jfh/F+rUaZ3SonmVWqhf+A LOvZyPt2O0riCwUmUU2x0OEiC0m0c9U7LLFEv+dvIxPSFwBmCn8K2wnY/PC9B603Ca18Tn v8khkzAoz5u8UTkd5aN6KjLReGsDk2TmBWDxHYKKjExFidUZpOUNk/VY0NsOxULtr+QOcb IPWrzNP+PNPfbFF35N32yDnUOzgScg0A6K79xV9QPkVZEae7IxN+S07Hqoi2rCvtoWaQaA wufo9NQnEWsffnIsenIZ9powUK6Ofht4aeVNH+OfiW50fd6tvFSQpF89sMZa9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999696; 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=fIqmzup+N23EReSyhufHh0hPwaySLt9kux2VBSSLNx4=; b=Z12JFFvPuoib61DlCH5+OG+kJU1HuMcEn1uIjeFab3ExmTWBRWuRtTvizjOhFma9Q11joH mXoJ1mtRO8Z60QebAdPSDYqpvfZayf57pbbwH7ckuZf+1p02GT1N4RgEk/gF2GqxBnptoN HsW5YuNNdaJhYOjinRlv5Z6k3OhO8k1kLKWEh4cPELzetNtwylffrU/A8L8ilOG1V4u91h JHZ6pYOkpUrWlLvaZrWoJZ6VfaCwv+pkBxSGo6k5fCwB6AjrjFMqeMkCvbGdjUJBF/BWg/ p7vliniSU7CzU37rW30H8y9NiwngWJ6Q5fKhC+feTsOcg6PLRjv0YRC3GdnDwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735999696; a=rsa-sha256; cv=none; b=hUwuRGQ0JK+KquSLv1n7T5qcpfRrfgxSG+ArKr6b7Y3O5tS9xOfdAtvfYoILF7serLt9My RD2iWCKV4SvnvurVkoVFqnrVe2MqK8vTXOB7Wzh/qV9L1c3CSes7qIVRn51/UQpujh5bf+ t2fh4b7H5x7Vlbfq9PNDn7sO/dFphDy1bRQIBXPI4BdtQvl6dwzD5Q9qH/kbPsT5+rNCOK 7bDpKI8N3xaW9Aspo2xdlv37H0hm7x8jOJGet9+bQDJGdigY5Gs5HEvjaALV/dc/IEkdyZ kNgFdJCeTGmzQJdM+fyiWeQNPHJYEcUqm/YgT2pa+TFB6sAH85wfTbVYpJ4+GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQMjX13rCzwSJ; Sat, 04 Jan 2025 14:08:16 +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 504E8Gjx070485; Sat, 4 Jan 2025 14:08:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504E8GWj070482; Sat, 4 Jan 2025 14:08:16 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:08:16 GMT Message-Id: <202501041408.504E8GWj070482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f1933eda43e6 - stable/14 - jail: Handle jail removal in a dedicated thread 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1933eda43e6d15bc237a63741bda56bfed953e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f1933eda43e6d15bc237a63741bda56bfed953e0 commit f1933eda43e6d15bc237a63741bda56bfed953e0 Author: Mark Johnston AuthorDate: 2024-12-21 19:23:51 +0000 Commit: Mark Johnston CommitDate: 2025-01-04 13:56:37 +0000 jail: Handle jail removal in a dedicated thread Otherwise a deadlock is possible: the system taskqueue thread removes a prison and calls vnet_destroy(), vnet_vlan_uninit() destroys the if_vlan cloner, the vlan_clone_destroy() callback calls taskqueue_drain() on the thread taskqueue. Fix the problem by introducing a new thread for jail removals. Ideally, the taskqueue interface would let consumers define queues without having to map them to threads, as that'd make it possible to avoid such deadlocks without extra threads; for now, this is the only solution. Reviewed by: jamie MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47991 (cherry picked from commit 8cf955f3f48a45db22a3cc3ad89a22b543fa38ce) --- sys/kern/kern_jail.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index c4e89774f18b..6f2b4f7fc336 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -130,6 +130,12 @@ struct jailsys_flags { unsigned new; }; +/* + * Handle jail teardown in a dedicated thread to avoid deadlocks from + * vnet_destroy(). + */ +TASKQUEUE_DEFINE_THREAD(jail_remove); + /* allprison, allprison_racct and lastprid are protected by allprison_lock. */ struct sx allprison_lock; SX_SYSINIT(allprison_lock, &allprison_lock, "allprison"); @@ -2868,7 +2874,7 @@ prison_free(struct prison *pr) * Don't remove the last reference in this context, * in case there are locks held. */ - taskqueue_enqueue(taskqueue_thread, &pr->pr_task); + taskqueue_enqueue(taskqueue_jail_remove, &pr->pr_task); } } @@ -2942,7 +2948,7 @@ prison_proc_free(struct prison *pr) pr->pr_id)); pr->pr_flags |= PR_COMPLETE_PROC; mtx_unlock(&pr->pr_mtx); - taskqueue_enqueue(taskqueue_thread, &pr->pr_task); + taskqueue_enqueue(taskqueue_jail_remove, &pr->pr_task); } } From nobody Sat Jan 4 14:08:17 2025 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 4YQMjY341Jz5kJg6; Sat, 04 Jan 2025 14:08:17 +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 4YQMjY2R27z4Tsd; Sat, 4 Jan 2025 14:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999697; 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=nahuYwyEFXB4itsdpcM0hoDpRwSsbbphfW3nYJm+gjo=; b=eSkLGmECT+2YguCNWj/0WQ91+MjR5pZfzcomvJmJ/PqUt+Z5wK/Hf/uGY0T5GmDO6EUz/7 bcGa9HEXWRzaBfGzhuswgEyzYAXH5ntmcX6mEYYG/SPHqVx+FN+ZAvk+RG17wT1W/osWaY wzR7HNjkc53Pl8u28vKgHft3dKoM7sSkntgkouT2SUMRVFd9G1z5V+Vay0TEr592SV0nP0 xJlVNa0ITDkfnz/fbWOiJruPJpSfXrKkeWx3OvdFXuPEVgBGD2ePM5tPk5Dwws3neK5f3C Z2pwB9H912jKBjT6Ph98SYyQy7rpFNosS0XRGXrtVlLtsLM+NM1GMNRjMFDMIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999697; 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=nahuYwyEFXB4itsdpcM0hoDpRwSsbbphfW3nYJm+gjo=; b=uFL//A64diCgFVIh3zjSzePTt/ZdvYa87GT1ri/SK4cl93onycZNQpTMlZJoVq3hAAUv6d 7QnjgGqWt8lz5xjYF76hxMs8AjU90IM35jIAaCpNEPQVBZsLP//pCqgN87YABI1afHb5z4 aPxesbtSUVp4oohvZ0UZ9+y/HtNlzm/1aW3H82ivO0jzx1RJoQfeFjPyf2yjWBQyKW/9u+ zPr6n8MY9Lxs6pq8dKWjdHu4kn1o9aJuGd9UPvs7mLiykF2DG2La821bzJcxKDYCmyoNdw azy92JVCohDO43WLPlzgdqAQJiLMgMzqH1DGM5rXfeUhhDq96CBBCFpWPVXEOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735999697; a=rsa-sha256; cv=none; b=NKGj2xYljWgUNoYhRANBSsR77n1qxzy2nojz/PKimnR5/89vL+IBfGJwcFgMHeEYjt3PxQ PbwRAd3gI0FO1w1jLi+wIceDFlSwTt19niR9YYWcSR8y9eJJj+KFkB9/F+3H15KglG7LbI BCOS0PoBAbUTHjQgC3UuTDPgc7qwOlBEObS0YadWeXAdRzI8QHXjmDkqxOLVjKNJ2UJEZB nScB/hh3T9/sf2pDJDUx9zk0DifpvQ9ENymchRfGnygY1MZdVShVr5JoPEjMpP18qcU0Nv T7uNPH6d3/5ctucvg+hNIaffmUFzmj1u1weVz9f+0a6nhSK/yO8rrCwGShy2lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQMjY1qLmzvpG; Sat, 04 Jan 2025 14:08:17 +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 504E8HGd070544; Sat, 4 Jan 2025 14:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504E8Hh4070541; Sat, 4 Jan 2025 14:08:17 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:08:17 GMT Message-Id: <202501041408.504E8Hh4070541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4e793a6be4f9 - stable/14 - inpcb: Factor out parts of in6_pcbbind() and in_pcbbind_setup() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4e793a6be4f908376ba9d2770f220c7a952f19e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e793a6be4f908376ba9d2770f220c7a952f19e7 commit 4e793a6be4f908376ba9d2770f220c7a952f19e7 Author: Mark Johnston AuthorDate: 2024-12-05 15:00:13 +0000 Commit: Mark Johnston CommitDate: 2025-01-04 13:56:51 +0000 inpcb: Factor out parts of in6_pcbbind() and in_pcbbind_setup() A large portion of these functions just determines whether the inpcb can bind to the address/port. This portion has no side effects, so is a good candidate to move into its own helper function. This patch does so, making the callers less complicated and reducing indentation. While moving this code, also make some changes: - Load socket options (SO_REUSEADDR etc.) only once. There is nothing preventing another thread from toggling the socket options, so make this function easier to reason about by avoiding races. - When checking whether the bind address is an interface address, make a separate sockaddr rather than temporarily modifying the one passed to in_pcbbind(). Reviewed by: ae, glebius MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47590 (cherry picked from commit 01f8ce83242d7a8e599cf6a78b6277161d79edd4) --- sys/netinet/in_pcb.c | 172 ++++++++++++++++++-------------- sys/netinet6/in6_pcb.c | 262 +++++++++++++++++++++++++++---------------------- 2 files changed, 242 insertions(+), 192 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index ccd76d1c449e..88826a866bdc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -863,6 +863,93 @@ in_pcb_lport(struct inpcb *inp, struct in_addr *laddrp, u_short *lportp, #endif /* INET || INET6 */ #ifdef INET +/* + * Determine whether the inpcb can be bound to the specified address/port tuple. + */ +static int +in_pcbbind_avail(struct inpcb *inp, const struct in_addr laddr, + const u_short lport, int sooptions, int lookupflags, struct ucred *cred) +{ + int reuseport, reuseport_lb; + + INP_LOCK_ASSERT(inp); + INP_HASH_LOCK_ASSERT(inp->inp_pcbinfo); + + reuseport = (sooptions & SO_REUSEPORT); + reuseport_lb = (sooptions & SO_REUSEPORT_LB); + + if (IN_MULTICAST(ntohl(laddr.s_addr))) { + /* + * Treat SO_REUSEADDR as SO_REUSEPORT for multicast; + * allow complete duplication of binding if + * SO_REUSEPORT is set, or if SO_REUSEADDR is set + * and a multicast address is bound on both + * new and duplicated sockets. + */ + if ((sooptions & (SO_REUSEADDR | SO_REUSEPORT)) != 0) + reuseport = SO_REUSEADDR | SO_REUSEPORT; + /* + * XXX: How to deal with SO_REUSEPORT_LB here? + * Treat same as SO_REUSEPORT for now. + */ + if ((sooptions & (SO_REUSEADDR | SO_REUSEPORT_LB)) != 0) + reuseport_lb = SO_REUSEADDR | SO_REUSEPORT_LB; + } else if (!in_nullhost(laddr)) { + struct sockaddr_in sin; + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_addr = laddr; + + /* + * Is the address a local IP address? + * If INP_BINDANY is set, then the socket may be bound + * to any endpoint address, local or not. + */ + if ((inp->inp_flags & INP_BINDANY) == 0 && + ifa_ifwithaddr_check((const struct sockaddr *)&sin) == 0) + return (EADDRNOTAVAIL); + } + + if (lport != 0) { + struct inpcb *t; + + if (ntohs(lport) <= V_ipport_reservedhigh && + ntohs(lport) >= V_ipport_reservedlow && + priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT)) + return (EACCES); + + if (!IN_MULTICAST(ntohl(laddr.s_addr)) && + priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { + t = in_pcblookup_local(inp->inp_pcbinfo, laddr, lport, + INPLOOKUP_WILDCARD, cred); + if (t != NULL && + (inp->inp_socket->so_type != SOCK_STREAM || + in_nullhost(t->inp_faddr)) && + (!in_nullhost(laddr) || + !in_nullhost(t->inp_laddr) || + (t->inp_socket->so_options & SO_REUSEPORT) || + (t->inp_socket->so_options & SO_REUSEPORT_LB) == 0) && + (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) + return (EADDRINUSE); + } + t = in_pcblookup_local(inp->inp_pcbinfo, laddr, lport, + lookupflags, cred); + if (t != NULL && ((reuseport | reuseport_lb) & + t->inp_socket->so_options) == 0) { +#ifdef INET6 + if (!in_nullhost(laddr) || + !in_nullhost(t->inp_laddr) || + (inp->inp_vflag & INP_IPV6PROTO) == 0 || + (t->inp_vflag & INP_IPV6PROTO) == 0) +#endif + return (EADDRINUSE); + } + } + return (0); +} + /* * Set up a bind operation on a PCB, performing port allocation * as required, but do not actually modify the PCB. Callers can @@ -880,15 +967,9 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct in_addr laddr; u_short lport = 0; - int lookupflags = 0, reuseport = (so->so_options & SO_REUSEPORT); + int lookupflags, sooptions; int error; - /* - * XXX: Maybe we could let SO_REUSEPORT_LB set SO_REUSEPORT bit here - * so that we don't have to add to the (already messy) code below. - */ - int reuseport_lb = (so->so_options & SO_REUSEPORT_LB); - /* * No state changes, so read locks are sufficient here. */ @@ -898,7 +979,10 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, laddr.s_addr = *laddrp; if (sin != NULL && laddr.s_addr != INADDR_ANY) return (EINVAL); - if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT|SO_REUSEPORT_LB)) == 0) + + lookupflags = 0; + sooptions = atomic_load_int(&so->so_options); + if ((sooptions & (SO_REUSEADDR | SO_REUSEPORT | SO_REUSEPORT_LB)) == 0) lookupflags = INPLOOKUP_WILDCARD; if (sin == NULL) { if ((error = prison_local_ip4(cred, &laddr)) != 0) @@ -920,73 +1004,11 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, } laddr = sin->sin_addr; - /* NB: lport is left as 0 if the port isn't being changed. */ - if (IN_MULTICAST(ntohl(laddr.s_addr))) { - /* - * Treat SO_REUSEADDR as SO_REUSEPORT for multicast; - * allow complete duplication of binding if - * SO_REUSEPORT is set, or if SO_REUSEADDR is set - * and a multicast address is bound on both - * new and duplicated sockets. - */ - if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) != 0) - reuseport = SO_REUSEADDR|SO_REUSEPORT; - /* - * XXX: How to deal with SO_REUSEPORT_LB here? - * Treat same as SO_REUSEPORT for now. - */ - if ((so->so_options & - (SO_REUSEADDR|SO_REUSEPORT_LB)) != 0) - reuseport_lb = SO_REUSEADDR|SO_REUSEPORT_LB; - } else if (!in_nullhost(laddr)) { - sin->sin_port = 0; /* yech... */ - bzero(&sin->sin_zero, sizeof(sin->sin_zero)); - /* - * Is the address a local IP address? - * If INP_BINDANY is set, then the socket may be bound - * to any endpoint address, local or not. - */ - if ((inp->inp_flags & INP_BINDANY) == 0 && - ifa_ifwithaddr_check( - (const struct sockaddr *)sin) == 0) - return (EADDRNOTAVAIL); - } - if (lport) { - struct inpcb *t; - - if (ntohs(lport) <= V_ipport_reservedhigh && - ntohs(lport) >= V_ipport_reservedlow && - priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT)) - return (EACCES); - - if (!IN_MULTICAST(ntohl(laddr.s_addr)) && - priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { - t = in_pcblookup_local(pcbinfo, laddr, lport, - INPLOOKUP_WILDCARD, cred); - if (t != NULL && - (so->so_type != SOCK_STREAM || - in_nullhost(t->inp_faddr)) && - (!in_nullhost(laddr) || - !in_nullhost(t->inp_laddr) || - (t->inp_socket->so_options & SO_REUSEPORT) || - (t->inp_socket->so_options & SO_REUSEPORT_LB) == 0) && - (inp->inp_cred->cr_uid != - t->inp_cred->cr_uid)) - return (EADDRINUSE); - } - t = in_pcblookup_local(pcbinfo, laddr, lport, - lookupflags, cred); - if (t != NULL && ((reuseport | reuseport_lb) & - t->inp_socket->so_options) == 0) { -#ifdef INET6 - if (!in_nullhost(laddr) || - !in_nullhost(t->inp_laddr) || - (inp->inp_vflag & INP_IPV6PROTO) == 0 || - (t->inp_vflag & INP_IPV6PROTO) == 0) -#endif - return (EADDRINUSE); - } - } + /* See if this address/port combo is available. */ + error = in_pcbbind_avail(inp, laddr, lport, sooptions, + lookupflags, cred); + if (error != 0) + return (error); } if (*lportp != 0) lport = *lportp; diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 5741d88d8e76..7a0eb68c233e 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -162,27 +162,157 @@ in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) return (0); } +/* + * Determine whether the inpcb can be bound to the specified address/port tuple. + */ +static int +in6_pcbbind_avail(struct inpcb *inp, const struct sockaddr_in6 *sin6, + int sooptions, int lookupflags, struct ucred *cred) +{ + const struct in6_addr *laddr; + int reuseport, reuseport_lb; + u_short lport; + + INP_LOCK_ASSERT(inp); + INP_HASH_LOCK_ASSERT(inp->inp_pcbinfo); + + laddr = &sin6->sin6_addr; + lport = sin6->sin6_port; + + reuseport = (sooptions & SO_REUSEPORT); + reuseport_lb = (sooptions & SO_REUSEPORT_LB); + + if (IN6_IS_ADDR_MULTICAST(laddr)) { + /* + * Treat SO_REUSEADDR as SO_REUSEPORT for multicast; + * allow compepte duplication of binding if + * SO_REUSEPORT is set, or if SO_REUSEADDR is set + * and a multicast address is bound on both + * new and duplicated sockets. + */ + if ((sooptions & (SO_REUSEADDR | SO_REUSEPORT)) != 0) + reuseport = SO_REUSEADDR | SO_REUSEPORT; + /* + * XXX: How to deal with SO_REUSEPORT_LB here? + * Treat same as SO_REUSEPORT for now. + */ + if ((sooptions & (SO_REUSEADDR | SO_REUSEPORT_LB)) != 0) + reuseport_lb = SO_REUSEADDR | SO_REUSEPORT_LB; + } else if (!IN6_IS_ADDR_UNSPECIFIED(laddr)) { + struct sockaddr_in6 sin6; + struct epoch_tracker et; + struct ifaddr *ifa; + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_addr = *laddr; + + NET_EPOCH_ENTER(et); + if ((ifa = ifa_ifwithaddr((const struct sockaddr *)&sin6)) == + NULL && (inp->inp_flags & INP_BINDANY) == 0) { + NET_EPOCH_EXIT(et); + return (EADDRNOTAVAIL); + } + + /* + * XXX: bind to an anycast address might accidentally + * cause sending a packet with anycast source address. + * We should allow to bind to a deprecated address, since + * the application dares to use it. + */ + if (ifa != NULL && + ((struct in6_ifaddr *)ifa)->ia6_flags & + (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY | IN6_IFF_DETACHED)) { + NET_EPOCH_EXIT(et); + return (EADDRNOTAVAIL); + } + NET_EPOCH_EXIT(et); + } + + if (lport != 0) { + struct inpcb *t; + + if (ntohs(lport) <= V_ipport_reservedhigh && + ntohs(lport) >= V_ipport_reservedlow && + priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT)) + return (EACCES); + + if (!IN6_IS_ADDR_MULTICAST(laddr) && + priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != + 0) { + t = in6_pcblookup_local(inp->inp_pcbinfo, laddr, lport, + INPLOOKUP_WILDCARD, cred); + if (t != NULL && + (inp->inp_socket->so_type != SOCK_STREAM || + IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) && + (!IN6_IS_ADDR_UNSPECIFIED(laddr) || + !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr) || + (t->inp_socket->so_options & SO_REUSEPORT) || + (t->inp_socket->so_options & SO_REUSEPORT_LB) == 0) && + (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) + return (EADDRINUSE); + +#ifdef INET + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 && + IN6_IS_ADDR_UNSPECIFIED(laddr)) { + struct sockaddr_in sin; + + in6_sin6_2_sin(&sin, sin6); + t = in_pcblookup_local(inp->inp_pcbinfo, + sin.sin_addr, lport, INPLOOKUP_WILDCARD, + cred); + if (t != NULL && + (inp->inp_socket->so_type != SOCK_STREAM || + in_nullhost(t->inp_faddr)) && + (inp->inp_cred->cr_uid != + t->inp_cred->cr_uid)) + return (EADDRINUSE); + } +#endif + } + t = in6_pcblookup_local(inp->inp_pcbinfo, laddr, lport, + lookupflags, cred); + if (t != NULL && ((reuseport | reuseport_lb) & + t->inp_socket->so_options) == 0) + return (EADDRINUSE); +#ifdef INET + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 && + IN6_IS_ADDR_UNSPECIFIED(laddr)) { + struct sockaddr_in sin; + + in6_sin6_2_sin(&sin, sin6); + t = in_pcblookup_local(inp->inp_pcbinfo, sin.sin_addr, + lport, lookupflags, cred); + if (t != NULL && ((reuseport | reuseport_lb) & + t->inp_socket->so_options) == 0 && + (!in_nullhost(t->inp_laddr) || + (t->inp_vflag & INP_IPV6PROTO) != 0)) { + return (EADDRINUSE); + } + } +#endif + } + return (0); +} + int in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) { struct socket *so = inp->inp_socket; struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; u_short lport = 0; - int error, lookupflags = 0; - int reuseport = (so->so_options & SO_REUSEPORT); - - /* - * XXX: Maybe we could let SO_REUSEPORT_LB set SO_REUSEPORT bit here - * so that we don't have to add to the (already messy) code below. - */ - int reuseport_lb = (so->so_options & SO_REUSEPORT_LB); + int error, lookupflags, sooptions; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); if (inp->inp_lport || !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) return (EINVAL); - if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT|SO_REUSEPORT_LB)) == 0) + + lookupflags = 0; + sooptions = atomic_load_int(&so->so_options); + if ((sooptions & (SO_REUSEADDR | SO_REUSEPORT | SO_REUSEPORT_LB)) == 0) lookupflags = INPLOOKUP_WILDCARD; if (sin6 == NULL) { if ((error = prison_local_ip6(cred, &inp->in6p_laddr, @@ -201,115 +331,13 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) ((inp->inp_flags & IN6P_IPV6_V6ONLY) != 0))) != 0) return (error); - lport = sin6->sin6_port; - if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) { - /* - * Treat SO_REUSEADDR as SO_REUSEPORT for multicast; - * allow compepte duplication of binding if - * SO_REUSEPORT is set, or if SO_REUSEADDR is set - * and a multicast address is bound on both - * new and duplicated sockets. - */ - if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) != 0) - reuseport = SO_REUSEADDR|SO_REUSEPORT; - /* - * XXX: How to deal with SO_REUSEPORT_LB here? - * Treat same as SO_REUSEPORT for now. - */ - if ((so->so_options & - (SO_REUSEADDR|SO_REUSEPORT_LB)) != 0) - reuseport_lb = SO_REUSEADDR|SO_REUSEPORT_LB; - } else if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - struct epoch_tracker et; - struct ifaddr *ifa; - - sin6->sin6_port = 0; /* yech... */ - NET_EPOCH_ENTER(et); - if ((ifa = ifa_ifwithaddr((struct sockaddr *)sin6)) == - NULL && - (inp->inp_flags & INP_BINDANY) == 0) { - NET_EPOCH_EXIT(et); - return (EADDRNOTAVAIL); - } - - /* - * XXX: bind to an anycast address might accidentally - * cause sending a packet with anycast source address. - * We should allow to bind to a deprecated address, since - * the application dares to use it. - */ - if (ifa != NULL && - ((struct in6_ifaddr *)ifa)->ia6_flags & - (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED)) { - NET_EPOCH_EXIT(et); - return (EADDRNOTAVAIL); - } - NET_EPOCH_EXIT(et); - } - if (lport) { - struct inpcb *t; - - if (ntohs(lport) <= V_ipport_reservedhigh && - ntohs(lport) >= V_ipport_reservedlow && - priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT)) - return (EACCES); - - if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr) && - priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { - t = in6_pcblookup_local(pcbinfo, - &sin6->sin6_addr, lport, - INPLOOKUP_WILDCARD, cred); - if (t != NULL && - (so->so_type != SOCK_STREAM || - IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) && - (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) || - !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr) || - (t->inp_socket->so_options & SO_REUSEPORT) || - (t->inp_socket->so_options & SO_REUSEPORT_LB) == 0) && - (inp->inp_cred->cr_uid != - t->inp_cred->cr_uid)) - return (EADDRINUSE); - -#ifdef INET - if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 && - IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - struct sockaddr_in sin; - - in6_sin6_2_sin(&sin, sin6); - t = in_pcblookup_local(pcbinfo, - sin.sin_addr, lport, - INPLOOKUP_WILDCARD, cred); - if (t != NULL && - (so->so_type != SOCK_STREAM || - in_nullhost(t->inp_faddr)) && - (inp->inp_cred->cr_uid != - t->inp_cred->cr_uid)) - return (EADDRINUSE); - } -#endif - } - t = in6_pcblookup_local(pcbinfo, &sin6->sin6_addr, - lport, lookupflags, cred); - if (t != NULL && ((reuseport | reuseport_lb) & - t->inp_socket->so_options) == 0) - return (EADDRINUSE); -#ifdef INET - if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 && - IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - struct sockaddr_in sin; + /* See if this address/port combo is available. */ + error = in6_pcbbind_avail(inp, sin6, sooptions, lookupflags, + cred); + if (error != 0) + return (error); - in6_sin6_2_sin(&sin, sin6); - t = in_pcblookup_local(pcbinfo, sin.sin_addr, - lport, lookupflags, cred); - if (t != NULL && ((reuseport | reuseport_lb) & - t->inp_socket->so_options) == 0 && - (!in_nullhost(t->inp_laddr) || - (t->inp_vflag & INP_IPV6PROTO) != 0)) { - return (EADDRINUSE); - } - } -#endif - } + lport = sin6->sin6_port; inp->in6p_laddr = sin6->sin6_addr; } if (lport == 0) { From nobody Sat Jan 4 14:08:18 2025 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 4YQMjb0DxNz5kK10; Sat, 04 Jan 2025 14:08:19 +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 4YQMjZ3Rt6z4V5r; Sat, 4 Jan 2025 14:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999698; 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=vYnuw+Udv277fhuQU5hVC5Lx8rsqjdIsxstORut4F/0=; b=O4WtKnDK5b1e9NAix+waKjHL5VP3Aooa7cWLwnLsXUXYFWU8SrcKSqKEFQcE8P+4WJbonu lcr8C26kzKmmer9wyXp3k5lHBRbMvf3fatE25HnwsqnkGUDHGTkoFbcBBodQ3R/iAv4nXL KuRS8kw2Cb56KwJiAzyQeETUTY7U48SzJqhwR5w4DC9jaUomCq6S6g5d12DPPslg+OkkO7 9Cs+bo1zvObiKEVIAfnFsS98ik/eFR5N+Q/JbGWq0pgX0N4qSjC+zk8IsFL5DEMYPQI08W nCb+maU0Xg0A2BxtPVf7CbkwGMTQnptpUAI2vBtSHnXr3Pu+w5MBBIWyQ+hd3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999698; 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=vYnuw+Udv277fhuQU5hVC5Lx8rsqjdIsxstORut4F/0=; b=usye2tm3Y8Ghz79oXTUxoS6ogQmffMt3OiRauSRnNbdsGDVegOQko+Zqi9sKHcf5K4bRSF EiAGRZX6or82j/pG4TuA68bY9VMsWWGc/BSSvmASfmdyY9h1i5mD2iZHrk/QhiSlt6gDOX VUaxt9dB4POex4+bm1JT0zXtDBBv4982qBfpIkVZ3OiSnkanPnkxCDIimhmP5dn+NudgAO WXxOnh9+enNvz6OCARvMH56O/RXD+DT+vUZc/3Okicj7SR2wI5e/h2BHxn/AJ0C2VZ6sFM OFgvAIy9xvjoqN8Jb8MUg+lJL+JBzpjGYpQrIUIXLKT/oxsKbbkaZk2P1+pYCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735999698; a=rsa-sha256; cv=none; b=WDa4O5s2r/57acp/wr/T5wkY5TbbGpUuR167OIOpzXnbsN/RXC6N9XcEhGqBMsBWiapEmz by0qo+FcFRCR0nTjf1ly5Mw5QvLxw+7fXZmucvcB8Tx7b0xA8j7nEtj4/oN1oOkkbbK5AD FJ4Fhh8qOvRo1oAGeFHwKg22OUL5WCuoROXRPCf4FrTRLIW0X3EL/+8U0WWaYSixlF3tfh VTEZPzaqnZnQAXR2Jy8SnASVh+l1NkzK3fPbsV0rr/63C7qFApSHjpMY7LZlKJIqWseY2o dRE+gKJwSRrLcAPn/f4l8vyUPwS1WDtrfxCHOdiVWqXMxtsouAn+/p8Duh3BGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQMjZ2rwLzwVh; Sat, 04 Jan 2025 14:08:18 +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 504E8IWB070613; Sat, 4 Jan 2025 14:08:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504E8IqB070610; Sat, 4 Jan 2025 14:08:18 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:08:18 GMT Message-Id: <202501041408.504E8IqB070610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eecdd412ff5b - stable/14 - sysctl: Do not serialize requests when running as root 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eecdd412ff5b9f2462b9fbad700e301fa420002e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eecdd412ff5b9f2462b9fbad700e301fa420002e commit eecdd412ff5b9f2462b9fbad700e301fa420002e Author: Mark Johnston AuthorDate: 2024-12-21 19:25:32 +0000 Commit: Mark Johnston CommitDate: 2025-01-04 13:56:59 +0000 sysctl: Do not serialize requests when running as root Bugs or unexpected behaviour can cause a user thread to block in a sysctl handler for a long time. "procstat -kka" is the most useful tool to see why this might happen, but it can block on sysctlmemlock too. Since the purpose of this lock is merely to ensure userspace can't wire too much memory, don't require it for requests from privileged threads. PR: 282994 Reviewed by: kib, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47842 (cherry picked from commit 7d1d9cc440f800858b6ec8dfb5a41c853fc8c36d) --- sys/kern/kern_sysctl.c | 10 ++++++---- sys/sys/priv.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 53b61c08713f..2e983e2ff803 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2398,8 +2398,9 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, const void *new, size_t newlen, size_t *retval, int flags) { - int error = 0, memlocked; struct sysctl_req req; + int error = 0; + bool memlocked; bzero(&req, sizeof req); @@ -2431,9 +2432,10 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, if (KTRPOINT(curthread, KTR_SYSCTL)) ktrsysctl(name, namelen); #endif - memlocked = 0; - if (req.oldptr && req.oldlen > 4 * PAGE_SIZE) { - memlocked = 1; + memlocked = false; + if (priv_check(td, PRIV_SYSCTL_MEMLOCK) != 0 && + req.oldptr != NULL && req.oldlen > 4 * PAGE_SIZE) { + memlocked = true; sx_xlock(&sysctlmemlock); } CURVNET_SET(TD_TO_VNET(td)); diff --git a/sys/sys/priv.h b/sys/sys/priv.h index fd0f7dd213ff..cfec8345a4b4 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -210,6 +210,7 @@ #define PRIV_SYSCTL_DEBUG 240 /* Can invoke sysctl.debug. */ #define PRIV_SYSCTL_WRITE 241 /* Can write sysctls. */ #define PRIV_SYSCTL_WRITEJAIL 242 /* Can write sysctls, jail permitted. */ +#define PRIV_SYSCTL_MEMLOCK 243 /* Large requests are not serialized. */ /* * TTY privileges. From nobody Sat Jan 4 14:08:19 2025 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 4YQMjc0lh7z5kJxX; Sat, 04 Jan 2025 14:08: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 4YQMjb4JQ7z4V6C; Sat, 4 Jan 2025 14:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999699; 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=JZhR33RCKXVqfMTC1iyuATvmS84olYyw6oY3BMae4j8=; b=sgQfQ2yNNPpgFvWRX+Ve0dq215lxpXMsfFvGyZ4gmalOYBvUppE2PDaGcm5E70M++V449O 7IcW9Lqviu/sOBacDb8JCuJzS2yvXoZu7mPU1F2GWxRsizzml8T9UidEpTa8XRQzlUDE5l nEV4cGdJa3wB9671CA2mR2EZp+Qo1SS1W/3bVxtQSBxm8QvFZiE28ffx5hGM9SxuyEoytN seCF774dr+wT95QDdd2GsT/jrZiLBCU4dcX/0vdWW+gbR1/YGYRmARogue1jq+Y1j5qoSK n01iNMYN3Us9K3y1vSpYxKFzs/rRys3dCa/h/y0QXbj1Pm+/RMKwkzU+clo4gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735999699; 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=JZhR33RCKXVqfMTC1iyuATvmS84olYyw6oY3BMae4j8=; b=uCtLahqXc6f5Cg8qKoLNHobl2TMtrhAl/y5B4gXsI3qa0nq4OniWS0idHMpd/X8R7AaKZR EPWjToOl7QSqDSwd8hEt/L5LEyAl1Y/v+CUOtN/EcDsEPTDo0eOi1GyVeL/NkAdUga6Yw8 oWJIly2toj1MuZ9NNaa6rZ6cSr2kpNTl5iQnEP9/99B7vxviyuLVHp1IKfiespa6aWcEdY UVfSk8U8SnZoGu0jJYLEyF8dOdoBu+AoQMiV9+Hep8/QA8NNFrs5FW5DwZUe4s1lVGjyKd SUh/S1pTXbwTu9ymlw5kCGpFSg4HZ6YViv9xcIC8xQVkeZJrcQbN2w1jzDfbZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735999699; a=rsa-sha256; cv=none; b=O3ORzz/+7aDBQlofKQulA1TXyu9oonadW1cZ1/EXHrm0qL6y+FzjmFi94RI0wjQhFlZz+m xQoC2kr/163iAUyNLELz+y/4t2N/cVLMIC8zyfgHHNdGq/bwpSjtAmK3rr9QZada483cp8 u81a2W12e+wTpSzC11M8F8ydKNSob5Bg1N4oAIoTpQ3sJcFC0M9PP3SKF3VaO05575fvA9 PWMrIKgWfLwZdqVxrdJD8anvU+2Lyxtt+PApwlL2aSgz2M/hRIxLtQyPfZfjX+77K08kv0 RdFlUFGFtR5tFtxbjA8LPHVifoxcqg/DHErVqUQ7T6mQ+4v8a2F1nMkZrKkosw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQMjb3dbczw34; Sat, 04 Jan 2025 14:08: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 504E8JY6070659; Sat, 4 Jan 2025 14:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504E8JcF070656; Sat, 4 Jan 2025 14:08:19 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:08:19 GMT Message-Id: <202501041408.504E8JcF070656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5ada29ab253d - stable/14 - inpcb: Fix the GENERIC-NODEBUG build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5ada29ab253dcaf09bbae62e4b21e9205bd8b157 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ada29ab253dcaf09bbae62e4b21e9205bd8b157 commit 5ada29ab253dcaf09bbae62e4b21e9205bd8b157 Author: Mark Johnston AuthorDate: 2024-12-05 16:38:22 +0000 Commit: Mark Johnston CommitDate: 2025-01-04 14:03:12 +0000 inpcb: Fix the GENERIC-NODEBUG build Fixes: 01f8ce83242d ("inpcb: Factor out parts of in6_pcbbind() and in_pcbbind_setup()") (cherry picked from commit ffb3d384fc1d550a764def2c0cd034ac3a4f0b86) --- sys/netinet/in_pcb.c | 3 +-- sys/netinet6/in6_pcb.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 88826a866bdc..0add5a7c340b 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -964,7 +964,6 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, u_short *lportp, struct ucred *cred) { struct socket *so = inp->inp_socket; - struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct in_addr laddr; u_short lport = 0; int lookupflags, sooptions; @@ -974,7 +973,7 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, * No state changes, so read locks are sufficient here. */ INP_LOCK_ASSERT(inp); - INP_HASH_LOCK_ASSERT(pcbinfo); + INP_HASH_LOCK_ASSERT(inp->inp_pcbinfo); laddr.s_addr = *laddrp; if (sin != NULL && laddr.s_addr != INADDR_ANY) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 7a0eb68c233e..de864305b434 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -300,12 +300,11 @@ int in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) { struct socket *so = inp->inp_socket; - struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; u_short lport = 0; int error, lookupflags, sooptions; INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(pcbinfo); + INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo); if (inp->inp_lport || !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) return (EINVAL); From nobody Sat Jan 4 14:24:41 2025 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 4YQN4V3Zg3z5kKdV; Sat, 04 Jan 2025 14:24:42 +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 4YQN4V2Vtdz4XYr; Sat, 4 Jan 2025 14:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000682; 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=3+IuMarKyLTiTHi2QT5wNbw+NfU4FQ0uPGp1qHPPpQY=; b=nLS5K8MFsSRZAoB4j8LSZ7Er0jYgMT2JM8LqCvyuGD664Lct9XnkWoqCKVx5BZFGIDrWiT OIu8vFwlFz647r5qp998KfCbfDDjllevjfYkyanoi4tmhNQB+DAbzdRbZhWwa2hCGqP88+ sjKZqRZRSjsnUArdHfQAkB2D7byHPk5r/1aGKMyq1fhCoWPKYO571M+GSWCixTNwoXJI/T PoxKVBOeJYq+m9SbueqI6+2T/v+z6dlRXY5BbtjrDapOYgFgLNYRhEAoGZKGewQKd9mHq5 nA966WutuPzDmcikxV2nst40P/d3DSif2IszEaKcnyhHKuUxvxqOkzLBPsN3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000682; 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=3+IuMarKyLTiTHi2QT5wNbw+NfU4FQ0uPGp1qHPPpQY=; b=UOv9ZSu2D74Db4IMXcg6fM2TRC16hSt9qqZ5MA7GQDIXQonWdq4adm8pCMegd2ftTZxXgy kBAEi81NQgVVn/hFcxTBYfuFgGVpeH10VgLtzUiNf3YERim1bfvY74D119flHE1MKYBLhC 8JcYuhfFam5mJALwCViyNSNbcxl/s4B3T+0xoIbzaBrgPDCkKQqIQt5a5QSvXYdZ/U3Mb+ r2q39E7bUI7Zaq8Nt3NHokDtx24tdRP05AKkZh7cp2OK5iV9HCQ5+lW42nUnkjwSQG/bGK 1/cPkldf3r05mCBm9PL5CAHGZm66Ywx3VIKOcD5Zl2nW2BVjgHzYgyo113P0Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736000682; a=rsa-sha256; cv=none; b=cqK+qtnXvZDTWPdRxBMpPY0anzCCBhh6OlAX/YVS81/JE3F21XpMYKJxzOidQnnsz6U2N3 Kv8xiBx+pXPbYL00jma11sDlOH0RPT5FEO6vfkJ+Eq0f1izmT7ucUvzyCKmJfrcxeN6ZbC 4g2LZ7kAKqK5OU2ZAbLHACsm/bufPraLyxGti0wJY+jtGFEfNVfivv4QrPenubP2agBQEI KlNF232mHrijAyIu7Rnii0n9kFHLf8ZqxFt/+cmFw2ArbLW5aqhYQsoVqZ8MAY2Ekf1Gk1 9GQx1DfcvkvOTYKYKdBX9HLutpfukddo5KsvyXFqhN3AzpqwTKZK/uVolqXFOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQN4V1Zq4zx3R; Sat, 04 Jan 2025 14:24:42 +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 504EOg4i006791; Sat, 4 Jan 2025 14:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504EOf6H006788; Sat, 4 Jan 2025 14:24:41 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:24:41 GMT Message-Id: <202501041424.504EOf6H006788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 41af5eeefc2c - main - TCP RACK: remove code that cannot be reached 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41af5eeefc2c11d0e301f9f4476ba50214a8a584 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=41af5eeefc2c11d0e301f9f4476ba50214a8a584 commit 41af5eeefc2c11d0e301f9f4476ba50214a8a584 Author: Michael Tuexen AuthorDate: 2025-01-04 14:22:40 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 14:22:40 +0000 TCP RACK: remove code that cannot be reached No functional change intended. Reviewed by: rrs CID: 1523797 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48301 --- sys/netinet/tcp_stacks/rack.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index d7e306186d37..6774acb9d5e6 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15260,12 +15260,6 @@ rack_timer_audit(struct tcpcb *tp, struct tcp_rack *rack, struct sockbuf *sb) if (tmr_up == PACE_TMR_DELACK) /* We are supposed to have delayed ack up and we do */ return; - } else if (sbavail(&tptosocket(tp)->so_snd) && (tmr_up == PACE_TMR_RXT)) { - /* - * if we hit enobufs then we would expect the possibility - * of nothing outstanding and the RXT up (and the hptsi timer). - */ - return; } else if (((V_tcp_always_keepalive || rack->rc_inp->inp_socket->so_options & SO_KEEPALIVE) && (tp->t_state <= TCPS_CLOSING)) && From nobody Sat Jan 4 14:27:22 2025 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 4YQN7Z4hJjz5kKtB; Sat, 04 Jan 2025 14:27:22 +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 4YQN7Z3m9Zz4Xpg; Sat, 4 Jan 2025 14:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000842; 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=0vcJ2jGwE3aC3xaLuPoHVaFlgQaKE+1N8Tmp36287iA=; b=YkFXes/qFaab4Mgf/47i11lKxuVSDyGKuRi05YbBwKyXefSizH1T0Nhv5m/61kU0uldJml ipFofMN/9Z4tav7yohSvvqHC1/InObEc8IRoeURj7L6dNHSP9JQ5UQqDKVI5pETN8PYL/n lkyoOYBTiyqtCZBtoLerd5UteERhpJ1BxJk64C8Hcrfq/GfaiIo6nEutoDUK/+Nhi0JjTy HcaGfW6dBpiPuqIuQgfpWlNYOKRQuvvF0lgx5To2aG1ye+32kvN6aZSgVFcSF0F60Xrnql D7rCfyVF59nRcQsi96a6/2DpMHuOjZUwSHw0n60j4VnlC1zRHm5ASPAaAQ2g6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000842; 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=0vcJ2jGwE3aC3xaLuPoHVaFlgQaKE+1N8Tmp36287iA=; b=W1a3CGfa9O+gKyBoYi/PZRBccofNj1SIH+w8PtEESlDnJGRgHMUcA/ZHL+s/p9aBobFLEp SKPRAEBqYv8pKwrJ899LFH9chVRMpNSs2AsAt/dS4LigMM5uOfrsvKTrfg3xxBe/1QomgR HUNXFbtc2dPESv+NeLVbKefMl0FzDEyopmexgdC2w3t9vN+iH+l0Nzo59937l6yXtDllSb YU0bePKnc0sgkTPFAy35To1TJvnomShI1TtB7qIDF+C3P9VZ1ZF/XbO7Hfqa6nwGsAClW7 CerkLGg1S5azTxJTkrOrx3Rb4Dt3hmfJTXh8qeeFIKJfpUAfZzboc021V15wGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736000842; a=rsa-sha256; cv=none; b=rwhmm1/pQp8/wKiffyG7d+Stv9kJrwKJ0negqBR5bi/IFH8P0tK/am4+eGx0ajyaMlCfXk aoWNNP9/DbPnY3aR1PLgU1VcNVGwJVw23y/a5ZdUTnorTLsJmaBzPCXlH9x0hZHNkvAP+n SbNYKvowk/T+3JzgiZAdDZGKSMhKiYvDNee5H9wDJWi+bJsjAJAOAaEfiz80/A3YpZkJ6B dqYUzNVCXCkwE/UkDQ3JZX/pQLRrPk26uQ/ZG1g4qQoIid1hy6Xcu1i5Y/CfBm1FdwMfHN 9/dsJs9OU6dhlEgCdoAQVz0ANhaL8xQRiHgMYTUmyPh7DI+xaOsqQBQQk2I55w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQN7Z2tqzzwpd; Sat, 04 Jan 2025 14:27:22 +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 504ERMsL007708; Sat, 4 Jan 2025 14:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504ERMWF007705; Sat, 4 Jan 2025 14:27:22 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:27:22 GMT Message-Id: <202501041427.504ERMWF007705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 305c40dc552f - main - TCP BBR: simplify expression 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 305c40dc552f9c150eacce95c181798031368cd9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=305c40dc552f9c150eacce95c181798031368cd9 commit 305c40dc552f9c150eacce95c181798031368cd9 Author: Michael Tuexen AuthorDate: 2025-01-04 14:25:01 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 14:25:01 +0000 TCP BBR: simplify expression There is no need to check partially for bbr->r_ctl.crte being NULL, since this can't be true in this path. No functional change intended. Reviewed by: rrs CID: 1523810 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48312 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 9e1f83df4298..ed7e07861ebd 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5553,7 +5553,7 @@ lost_rate: bbr_type_log_hdwr_pacing(bbr, bbr->r_ctl.crte->ptbl->rs_ifp, rate, - ((bbr->r_ctl.crte == NULL) ? 0 : bbr->r_ctl.crte->rate), + bbr->r_ctl.crte->rate, __LINE__, cts, error); From nobody Sat Jan 4 14:49:54 2025 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 4YQNdb10c0z5kM46; Sat, 04 Jan 2025 14:49:55 +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 4YQNdb03rmz4ZFY; Sat, 4 Jan 2025 14:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736002195; 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=7Su7gk13NSKhx0Flxx4U1YRmK5Nct542NjUk04EaJAA=; b=jojwWFNYjvsDNQJADs1F4rgpF6XQWr3aG1Xf8C2/MnSWzGSdWZn4DKwDaiMc6Q17C5fitZ i3fSg9JEoyecMEeLJ1cCwd2ZBQvfPJfl6/9pvwUGxwnQUCKgMAqJ8+Ac7V384db79amOEa EL7oQVURAV+JvwZKRnCRpZSAHIP8nrNQcmilu+P1W0LHEOEu2YfM53xgdmeNAgfKUx6LmM xW2R0gbOKYIT2tjviG3Jsl1HS6qZOSjtcFkDJsUq9hkEUAbB56hVSCxfFQI1yWyn+CpCkB UgS64KOjKyq7ifEL4giDSOuac1eOTZb4VsHLpgXCtvxxAP5r5yM1Tq5J9SD1BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736002195; 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=7Su7gk13NSKhx0Flxx4U1YRmK5Nct542NjUk04EaJAA=; b=ZiL7NqplOvU1tPeacjH3WPbk/tpxq5aoJNW0Qdvk6CdogjfIQ/FrbOPM1EfQnAu1PkLwFw vlLAKD6zLmsOvEpKECEjUexaqR0+6bjAj9SN03Cg2v6o4+lZX2nOSOFlU/xZaRGfXE3J8b i5TqQZRHHHTRVGmc1Z908IUTuyB6y9bh+efxFnBAECoRX7Zae0syJkOKuJzi8i/tV/IL5c hEuZ6uPMyTTUqYNejBqZdh8PqjXO9mxCvh275TWp/rTvduCy1cl5NN+arAouBXm3V4Ni6w og/YJewzLxtEGI34awQNqCAhFUgPX5myvWYHZM/Jrb75gZSF6GJMtKXgWtZIJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736002195; a=rsa-sha256; cv=none; b=cIdRX0bof+Esa27Hb7dvpY/KuXLuoztM+UVpKuGj8eiDtRm0lv8ZQsLBv34OPiYBh94jmE jbcvF4nstGrzYdwFLhoVEmlzq0oPr+8fyG5zyl6a8+dTAKLKD5Mx39/YcTGApJDj5+OuFg II+Hu62KPsDoYz8FZl+fllNCOblFakrz9vIWvSgL2Q4H3CcizgJkisp5y5DIhgSLVCTQ34 7u1iQar1IfNufHd5AN/vY3vW4zu9JgkU70A10IIxkr4ImWrCzKSAyXX5nF9H5hFK1GVBZ1 UD1bQSjiX8PsMu+DfnguURgJOzQ+HqNHEcbYXpFw4v5k4hT6iekRX/qbwLxf/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQNdZ6mfXzw8p; Sat, 04 Jan 2025 14:49:54 +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 504EnsqB045429; Sat, 4 Jan 2025 14:49:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504EnsCN045426; Sat, 4 Jan 2025 14:49:54 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:49:54 GMT Message-Id: <202501041449.504EnsCN045426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7d5e02b01577 - main - pf: allow ICMP messages related to an SCTP state to pass 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d5e02b01577047290e937399accc02e6b184ce9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d5e02b01577047290e937399accc02e6b184ce9 commit 7d5e02b01577047290e937399accc02e6b184ce9 Author: Kristof Provost AuthorDate: 2024-12-20 13:38:41 +0000 Commit: Kristof Provost CommitDate: 2025-01-04 14:37:41 +0000 pf: allow ICMP messages related to an SCTP state to pass Much like we already do for TCP and UDP we should also parse SCTP-in-ICMP messages to see if they apply to an SCTP connection we've already allowed. If so we should allow the ICMP packet to pass, even if we'd otherwise block it. Add a test case where we generate an 'ICMP unreachable - need to frag' packet and check that it passes through pf. MFC after: 2 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D48170 --- sys/netpfil/pf/pf.c | 137 ++++++++++++++++++++++++++++++++++++++++++- tests/sys/netpfil/pf/sctp.sh | 86 +++++++++++++++++++++++++++ 2 files changed, 221 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2a0dd2c3933a..335b192d454d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7736,8 +7736,8 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, if (pf_icmp_mapping(pd, icmptype, &icmp_dir, &multi, &virtual_id, &virtual_type) == 0) { /* - * ICMP query/reply message not related to a TCP/UDP packet. - * Search for an ICMP state. + * ICMP query/reply message not related to a TCP/UDP/SCTP + * packet. Search for an ICMP state. */ ret = pf_icmp_state_lookup(&key, pd, state, pd->dir, virtual_id, virtual_type, icmp_dir, &iidx, @@ -8242,6 +8242,139 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, break; } #ifdef INET + case IPPROTO_SCTP: { + struct sctphdr sh; + struct pf_state_peer *src; + int copyback = 0; + + if (! pf_pull_hdr(pd->m, pd2.off, &sh, sizeof(sh), NULL, reason, + pd2.af)) { + DPFPRINTF(PF_DEBUG_MISC, + ("pf: ICMP error message too short " + "(sctp)\n")); + return (PF_DROP); + } + + key.af = pd2.af; + key.proto = IPPROTO_SCTP; + PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af); + PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af); + key.port[pd2.sidx] = sh.src_port; + key.port[pd2.didx] = sh.dest_port; + + STATE_LOOKUP(&key, *state, pd); + + if (pd->dir == (*state)->direction) { + if (PF_REVERSED_KEY((*state)->key, pd->af)) + src = &(*state)->src; + else + src = &(*state)->dst; + } else { + if (PF_REVERSED_KEY((*state)->key, pd->af)) + src = &(*state)->dst; + else + src = &(*state)->src; + } + + if (src->scrub->pfss_v_tag != sh.v_tag) { + DPFPRINTF(PF_DEBUG_MISC, + ("pf: ICMP error message has incorrect " + "SCTP v_tag\n")); + return (PF_DROP); + } + + /* translate source/destination address, if necessary */ + if ((*state)->key[PF_SK_WIRE] != + (*state)->key[PF_SK_STACK]) { + + struct pf_state_key *nk; + + if (PF_REVERSED_KEY((*state)->key, pd->af)) + nk = (*state)->key[pd->sidx]; + else + nk = (*state)->key[pd->didx]; + +#if defined(INET) && defined(INET6) + int afto, sidx, didx; + + afto = pd->af != nk->af; + sidx = afto ? pd2.didx : pd2.sidx; + didx = afto ? pd2.sidx : pd2.didx; + + if (afto) { + if (pf_translate_icmp_af(nk->af, + &pd->hdr.icmp)) + return (PF_DROP); + m_copyback(pd->m, pd->off, + sizeof(struct icmp6_hdr), + (c_caddr_t)&pd->hdr.icmp6); + if (pf_change_icmp_af(pd->m, ipoff2, pd, + &pd2, &nk->addr[sidx], + &nk->addr[didx], pd->af, + nk->af)) + return (PF_DROP); + if (nk->af == AF_INET) + pd->proto = IPPROTO_ICMP; + else + pd->proto = IPPROTO_ICMPV6; + sh.src_port = nk->port[sidx]; + sh.dest_port = nk->port[didx]; + m_copyback(pd2.m, pd2.off, sizeof(sh), (c_caddr_t)&sh); + PF_ACPY(pd->src, + &nk->addr[pd2.sidx], nk->af); + PF_ACPY(pd->dst, + &nk->addr[pd2.didx], nk->af); + pd->naf = nk->af; + return (PF_AFRT); + } +#endif + + if (PF_ANEQ(pd2.src, + &nk->addr[pd2.sidx], pd2.af) || + nk->port[pd2.sidx] != sh.src_port) + pf_change_icmp(pd2.src, &sh.src_port, + daddr, &nk->addr[pd2.sidx], + nk->port[pd2.sidx], NULL, + pd2.ip_sum, icmpsum, + pd->ip_sum, 0, pd2.af); + + if (PF_ANEQ(pd2.dst, + &nk->addr[pd2.didx], pd2.af) || + nk->port[pd2.didx] != sh.dest_port) + pf_change_icmp(pd2.dst, &sh.dest_port, + saddr, &nk->addr[pd2.didx], + nk->port[pd2.didx], NULL, + pd2.ip_sum, icmpsum, + pd->ip_sum, 0, pd2.af); + copyback = 1; + } + + if (copyback) { + switch (pd2.af) { +#ifdef INET + case AF_INET: + m_copyback(pd->m, pd->off, ICMP_MINLEN, + (caddr_t )&pd->hdr.icmp); + m_copyback(pd->m, ipoff2, sizeof(h2), + (caddr_t )&h2); + break; +#endif /* INET */ +#ifdef INET6 + case AF_INET6: + m_copyback(pd->m, pd->off, + sizeof(struct icmp6_hdr), + (caddr_t )&pd->hdr.icmp6); + m_copyback(pd->m, ipoff2, sizeof(h2_6), + (caddr_t )&h2_6); + break; +#endif /* INET6 */ + } + m_copyback(pd->m, pd2.off, sizeof(sh), (caddr_t)&sh); + } + + return (PF_PASS); + break; + } case IPPROTO_ICMP: { struct icmp *iih = &pd2.hdr.icmp; diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 95a780747d82..563103827fac 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -745,6 +745,91 @@ timeout_cleanup() pft_cleanup } +atf_test_case "related_icmp" "cleanup" +related_icmp_head() +{ + atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' + atf_set require.user root +} + +related_icmp_body() +{ + sctp_init + + epair_cl=$(vnet_mkepair) + epair_rtr=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + ifconfig ${epair_cl}a 192.0.2.1/24 up + route add default 192.0.2.2 + + vnet_mkjail rtr ${epair_cl}b ${epair_rtr}a + jexec rtr ifconfig ${epair_cl}b 192.0.2.2/24 up + jexec rtr ifconfig ${epair_rtr}a 198.51.100.1/24 up + jexec rtr sysctl net.inet.ip.forwarding=1 + jexec rtr route add default 198.51.100.2 + + vnet_mkjail rtr2 ${epair_rtr}b ${epair_srv}a + jexec rtr2 ifconfig ${epair_rtr}b 198.51.100.2/24 up + jexec rtr2 ifconfig ${epair_srv}a 203.0.113.1/24 up + jexec rtr2 ifconfig ${epair_srv}a mtu 1300 + jexec rtr2 sysctl net.inet.ip.forwarding=1 + jexec rtr2 route add default 198.51.100.1 + + vnet_mkjail srv ${epair_srv}b + jexec srv ifconfig ${epair_srv}b 203.0.113.2/24 up + jexec srv ifconfig ${epair_srv}b mtu 1300 + jexec srv route add default 203.0.113.1 + + # Sanity checks + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.2 + atf_check -s exit:0 -o ignore \ + ping -c 1 198.51.100.1 + atf_check -s exit:0 -o ignore \ + ping -c 1 198.51.100.2 + atf_check -s exit:0 -o ignore \ + ping -c 1 203.0.113.1 + atf_check -s exit:0 -o ignore \ + ping -c 1 203.0.113.2 + + jexec rtr pfctl -e + pft_set_rules rtr \ + "block proto icmp" \ + "pass proto sctp" + + # Make sure SCTP traffic passes + echo "foo" | jexec srv nc --sctp -N -l 1234 & + sleep 1 + + out=$(nc --sctp -N -w 3 203.0.113.2 1234) + if [ "$out" != "foo" ]; then + jexec rtr pfctl -ss -vv + jexec rtr pfctl -sr -vv + atf_fail "SCTP connection failed" + fi + + # Do we see ICMP traffic if we send overly large traffic? + echo "foo" | jexec srv nc --sctp -N -l 1234 >/dev/null & + sleep 1 + + atf_check -s exit:0 -o not-match:".*destination unreachable:.*" \ + netstat -s -p icmp + + # Generate traffic that will be fragmented by rtr2, and will provoke an + # ICMP unreachable - need to frag (mtu 1300) message + dd if=/dev/random bs=1600 count=1 | nc --sctp -N -w 3 203.0.113.2 1234 + + # We'd expect to see an ICMP message + atf_check -s exit:0 -o match:".*destination unreachable: 1" \ + netstat -s -p icmp +} + +related_icmp_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic_v4" @@ -757,4 +842,5 @@ atf_init_test_cases() atf_add_test_case "rdr_v4" atf_add_test_case "pfsync" atf_add_test_case "timeout" + atf_add_test_case "related_icmp" } From nobody Sat Jan 4 17:54:44 2025 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 4YQSks67d7z5j5Md; Sat, 04 Jan 2025 17:54:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQSks51MSz4tW3; Sat, 4 Jan 2025 17:54:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736013285; 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: in-reply-to:in-reply-to:references:references; bh=997h6bA0Fhjhn1Eej/Y6RNsTAjJKLbNPknm2Ov+Xpyw=; b=oouJHExpfqudmio+c5JLTO0RTEZBhKcLj6JF6B9WfA4UOwEiUCEOrD1C8Tc8JyjexfeiPC M/GUV/694p1qnfUc+CakEOiP6jFY1aQ/Lbx9ketufoNjxKJ0w6glJBRmATZcWxO1uFr/VX mzlPjNeXaa7zhTHXBl3XWR9HGI7D1+EqVQ+EPTlsuzQ8sqrzzoqVjN1Qlm4ucqwG4ka9/H INfe3Oi7JrJyWxzPtU3LzfNlbivUnAAgPlrYSyL0bmg3jGO0DRYaOsrsqMMWb3oTZy06BJ uqDJfPVmQkE5gWYDUAkCoC6O+HOWE/rM5uEEVcO8atc186TpyWHDuRLzNBGmVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736013285; 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: in-reply-to:in-reply-to:references:references; bh=997h6bA0Fhjhn1Eej/Y6RNsTAjJKLbNPknm2Ov+Xpyw=; b=Anq0ztHwAnLEliyWzTmNytnxFvWPulcJETtjMoC7b1B5yXmoNbzZsqjDbBFApI/JygV8bQ o8Z3BGzFre0PEyqInWqo1uei9KQfQbcU/Hr7XUOnrCGt/1HNkkAu1pJILs2rC8rL15T/xU jTghxRQIUXv5X2NVOWWtVluqfN7hyIc6jnwcA+T+EsiwEu5qtlefZ9vEC9USxL9Pc/t+7A 493UTqeS7zRq/0IBYDmsSMaLotQY81ncZaZWrIFTAR/r2BKroqK+aUg0k5EmP9Rf3DzraJ /cu8M8uSO5Ly1m9ufv9oo/QGMlO45SvpaRrztoecLXDDWzimBteAcIdt92y8hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736013285; a=rsa-sha256; cv=none; b=elYCb5xUMGbuq3DnxVLKt6yF4QdHWIo1NDoyhVjzXGhhxTKD5wr/W5aHgeyZgvJRCripIk zUspXiWBk2VVhhglkOoDJ4TBxTYqyy6D0FjiLha+jUc5tJ9bNFwRwzeZ55cnfbZ11YbbAx IkkiMbcQ+tFmvXgWdgrUg8sHYK7+WZpUwMvbG9PZ+VMKoI1VWDkhLm68jnKDceJdQhOlkx 0ZLiZPRfg2F6b1a8COO5oUhqZN3nG1v2eimrrH0tfZs7MOBkxKRivziTGgfDZfpw5Fhk2m uRvFYPxZ1RbWJdsbsPSVdDOL3tB6texri0AtL9KqQTmC/cX+jaRl+UpFRmkvhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4200:b830:cb5:856a:2321:731d] (unknown [IPv6:2601:5c0:4200:b830:cb5:856a:2321:731d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YQSks2lfHzRZg; Sat, 04 Jan 2025 17:54:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Sat, 4 Jan 2025 12:54:44 -0500 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: b2d2a78ad80e - main - Import device-tree files from Linux 6.12 Content-Language: en-US To: Emmanuel Vadot Cc: Emmanuel Vadot , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202501020912.5029Cl3V033260@gitrepo.freebsd.org> <82a48a30-9d7f-42fe-83d4-888719c74471@FreeBSD.org> <20250104093938.656443d550c7d6d83e8bad4e@bidouilliste.com> From: John Baldwin In-Reply-To: <20250104093938.656443d550c7d6d83e8bad4e@bidouilliste.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/4/25 03:39, Emmanuel Vadot wrote: > On Thu, 2 Jan 2025 12:04:15 -0500 > John Baldwin wrote: > >> On 1/2/25 04:12, Emmanuel Vadot wrote: >>> The branch main has been updated by manu: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b >>> >>> commit b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b >>> Merge: 0e8011faf58b cd989bfc73f7 >>> Author: Emmanuel Vadot >>> AuthorDate: 2025-01-02 09:12:13 +0000 >>> Commit: Emmanuel Vadot >>> CommitDate: 2025-01-02 09:12:13 +0000 >>> >>> Import device-tree files from Linux 6.12 >> >> Not sure which update triggered this, but I am now getting this failure >> building an arm64 GENERIC kernel. The second build "works" but presumably >> with a busted fdt (I wonder if we have an error there where we need to >> be removing partially built files on error)? >> >> /freebsd/main/sys/tools/fdt/make_dtb.sh /freebsd/main/sys /freebsd/main/sys/contrib/device-tree/src/arm/allwinner/sun8i-h2-plus-orangepi-r1.dts /usr/obj/freebsd/main/arm.armv7/sys/GENERIC/modules/freebsd/main/sys/modules/dtb/allwinner >> Assertion failed: (sorted_phandles.size() == fixups.size()), function resolve_cross_references, file /freebsd/main/usr.bin/dtc/fdt.cc, line 1421. >> Abort trap (core dumped) >> >> -- >> John Baldwin >> > > This is caused by some delete-node I think, I've removed the dtb from > the build for now. > But it's weird that you got it when building a arm64 kernel as we > don't build this one for arm64, also the path in your build seems to > indicate that this was for an armv7 one. > Anyway, I'll investigate later. That was a typo in my e-mail, sorry, it was for armv7 (I had separate breakage for arm64 for the GENERIC-UP kernel I had sent a mail on at the same time which is probably why I mistyped). -- John Baldwin From nobody Sat Jan 4 18:12:42 2025 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 4YQT7b1gjkz5j6c4; Sat, 04 Jan 2025 18:12:43 +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 4YQT7b0LQxz40RJ; Sat, 4 Jan 2025 18:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736014363; 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=53e6yjHIkt/4p3JHCeywb0zNEkZ4cMwpqGflYFsoqg0=; b=rd9PgIY1yyQtuNB0KqH6PG89DoYh4PWJs8kzU7Fot/Cj7HSAdyBUeYxX6dUaViO2KbWyFO OIO8URb6DLf1lU6yvkRvBUSRq++Z2CkJ4BNVI9EvNS1oljt+hzxq6ibjJEhzT7AYVtVdsb De5hZzqqHxeeviSrkfvd8jbD5VWepuoPCDgTI5QxMwDQt/CyvN0c0eByWuELppHGSfuOsa L17BBFRpclYITRHL65HiKbuEBut/HGS2xSFO+8wF7TKBrY5onZt+L5PMUlGRZqrLfwnVpF MwnPlne3IlBLIwT6hwRNYBFImqOXPtjQfygCZtdwADTM5tbIzRdtqpj5xUTXnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736014363; 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=53e6yjHIkt/4p3JHCeywb0zNEkZ4cMwpqGflYFsoqg0=; b=Ui0lFpr6ZtM5qvIyHvpZdive5qgPpBu7FP56iNuwJZ24DN1/Kxax95iHc3i35q/PUgbe5X uoGGZ7aIiZyqc/ukumgH986ETYzvqLH3MT6nx615h7gkaBOgN8/k3xL1vGaGvhQAXLFy84 +eAJ+C7ySo2a0ed/XVnd0+CEWxk7yhDwH/whLik4sgtCQ04CDMXtL3S7qTz2bjm44Wa844 cpsCY8xXT/AGG3mWUApJst7Fd2O/cy2xrKmC/RFAiGOixWYyFe8sX1ShzaeDvdxO4PLXE5 +tLGzvD/ut6v9kTSMZP6h3cSkkWRNWlOIUGr98v2WVVf2zmrtJTZTbJ8P3XA8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736014363; a=rsa-sha256; cv=none; b=JWzgWfukCHZOWyYpgWJfAcnGXMoQeNu3lHg5oVMQr1gCMWTvQH2B94mwBiUOE3nU8J0nDi Yfi7oH4ZO2HECe9un2kUTF9Jqzj5lYa/c9sAC+FZ5LSxrw4jRpyLgowVUYD2KlFdlFML8S mBGQo7ZvqcCK2U6xrf0ub6nCPpdh8nN2gn3PePHhKz1QGqOtKjCRpZWi3ypER+gECtqIDH j8iwM4o98Mot+N1AMY2onYeDM3fc7FU5dN/i0peD/7xSXA3JGvKZyA5zluaw9g2TPw+th8 CkOjAQAi9Egc35A3kSr5ZDp1kCQ8B/nhUbcVwgFcsjAypiWuu8rjz0IobgSWRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQT7Z708Mz13rl; Sat, 04 Jan 2025 18:12:42 +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 504ICg7D036260; Sat, 4 Jan 2025 18:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504ICgPP036257; Sat, 4 Jan 2025 18:12:42 GMT (envelope-from git) Date: Sat, 4 Jan 2025 18:12:42 GMT Message-Id: <202501041812.504ICgPP036257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b662ca1d6cd8 - main - Revert "Export additional __aeabi_ symbols from arm's libgcc_s" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b662ca1d6cd82044c6cb79075e1830b97594bef3 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b662ca1d6cd82044c6cb79075e1830b97594bef3 commit b662ca1d6cd82044c6cb79075e1830b97594bef3 Author: Dimitry Andric AuthorDate: 2025-01-04 18:09:37 +0000 Commit: Dimitry Andric CommitDate: 2025-01-04 18:12:16 +0000 Revert "Export additional __aeabi_ symbols from arm's libgcc_s" This reverts commit caab831338f4eeaa7455e981478be9fd414b7969, because some new unresolved issues came up in bug 271087: Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: mmel MFC after: immediately --- lib/libgcc_s/arm/Symbol.map | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index a426f823de5c..92b54761d810 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,33 +4,8 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Pop; _Unwind_VRS_Set; - __aeabi_d2h; - __aeabi_d2lz; - __aeabi_d2ulz; - __aeabi_f2h; - __aeabi_f2lz; - __aeabi_f2ulz; - __aeabi_h2f; - __aeabi_idiv; - __aeabi_idiv0; - __aeabi_l2d; - __aeabi_l2f; - __aeabi_lasr; - __aeabi_lcmp; - __aeabi_ldivmod; - __aeabi_llsl; - __aeabi_llsr; - __aeabi_lmul; - __aeabi_ui2d; - __aeabi_ui2f; - __aeabi_uidiv; - __aeabi_uidivmod; - __aeabi_ul2d; - __aeabi_ul2f; - __aeabi_ulcmp; - __aeabi_uldivmod; + _Unwind_VRS_Pop; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Jan 4 18:13:53 2025 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 4YQT8x4zBwz5j6tH; Sat, 04 Jan 2025 18:13:53 +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 4YQT8x4FtPz40qy; Sat, 4 Jan 2025 18:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736014433; 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=zlB77uO3u9/KfS6OOBU/eWPLKHTdcnLPeDJSKM6XVUM=; b=TS0ThQlXKvP5djDMcdvFdoemac2N9lVKKBPAl6f50L5UMIRMiOnvbKP7Hxg0Cx/0sa4GMc AVf5sV9/8iRP+1VXKvVInA/hyHvv9n3NtpBH+HrFZTofLPKK1va7JvHAcbeAPcWeucs4Ky n8doPc8aPDnPrflSvbvR0qxGOzgB70qxwD8yR6DJTUT2yjAe8vTj3TRvoCO1K3gB953zpy SfiFYkiOP2zzK7UNvAF65G+3MiA06S/w/g9sp0lxy8ACRRxP3dgTK3wqLu2DEFYo3gDMcP e8ndbBGoU6cujLmj4o28FahJZHaDmqJQzvug8AhbBt4ounKyCI82ZJoIrU0lKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736014433; 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=zlB77uO3u9/KfS6OOBU/eWPLKHTdcnLPeDJSKM6XVUM=; b=KzsvZCXc0M3GFZ0RXc+SN8zbvllp2yzF6BgZB/UA148iQwbNsxhPPy2UkkAOt7xf+w3eaG CYbubWKRT9xni9Y8+FJszG0NV7HuzOpqhzm5jtuCQfc2peA20mgpN+o02W0ukTMkgpogKl Zy4u6MigaD8s+aEsFv6y7M4JkV66hkg0/ARW1jBvJR6cfkIG7vccPyavhbhDhwbJJvoXIH XZ5Qb9tMLLolqmPhPMmnPNOkGATvrHc84HQ1Kn6gmvbBjZ5elUfHZWPGbwouSqJDO8eWGS WeKvT1A6rVni8xIoVNKspVIhZ+NsHfxbJoW9B8cczJehaPET1LFrhmkkfvO/KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736014433; a=rsa-sha256; cv=none; b=OuhKWEJXclXCkW9bnRwuzPd217x/tVxbMjQNVc2nb1/oOh/ZvQ6w0QNut16EFaTOUIgLd8 2DDHWtrhhRitXu0yQRFPWxxJYLhLX18MrbIYCVZF3wG5iDiIH+g3mgXMg1wZaFxBYFQ3rh j1LpwH6KWbFGCdenIekbQh7QNHI1hSAYG5VnCzJZJjZHYmf4qrOhescirk3M5ygWX19e00 bAqypuKVabY6pCb8vOJ6WU0SFmdZBFpvrkSXJjsY+PsPk1D8OgQDLEpqZ5aoWpTJF9ZOq3 zoDDR/b8Qy64Hd1Hxp1oNYQ/oE6XcG12tpvQ4ec99rBqXngC/I4n0gIIq2D1BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQT8x3qd7z13Z9; Sat, 04 Jan 2025 18:13:53 +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 504IDrtO036767; Sat, 4 Jan 2025 18:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504IDrPQ036764; Sat, 4 Jan 2025 18:13:53 GMT (envelope-from git) Date: Sat, 4 Jan 2025 18:13:53 GMT Message-Id: <202501041813.504IDrPQ036764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 589cf0f3e26f - stable/14 - Revert "Export additional __aeabi_ symbols from arm's libgcc_s" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 589cf0f3e26f8c4cb9c825be54cae246e2151484 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=589cf0f3e26f8c4cb9c825be54cae246e2151484 commit 589cf0f3e26f8c4cb9c825be54cae246e2151484 Author: Dimitry Andric AuthorDate: 2025-01-04 18:09:37 +0000 Commit: Dimitry Andric CommitDate: 2025-01-04 18:13:25 +0000 Revert "Export additional __aeabi_ symbols from arm's libgcc_s" This reverts commit caab831338f4eeaa7455e981478be9fd414b7969, because some new unresolved issues came up in bug 271087: Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: mmel MFC after: immediately (cherry picked from commit b662ca1d6cd82044c6cb79075e1830b97594bef3) --- lib/libgcc_s/arm/Symbol.map | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index a426f823de5c..92b54761d810 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,33 +4,8 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Pop; _Unwind_VRS_Set; - __aeabi_d2h; - __aeabi_d2lz; - __aeabi_d2ulz; - __aeabi_f2h; - __aeabi_f2lz; - __aeabi_f2ulz; - __aeabi_h2f; - __aeabi_idiv; - __aeabi_idiv0; - __aeabi_l2d; - __aeabi_l2f; - __aeabi_lasr; - __aeabi_lcmp; - __aeabi_ldivmod; - __aeabi_llsl; - __aeabi_llsr; - __aeabi_lmul; - __aeabi_ui2d; - __aeabi_ui2f; - __aeabi_uidiv; - __aeabi_uidivmod; - __aeabi_ul2d; - __aeabi_ul2f; - __aeabi_ulcmp; - __aeabi_uldivmod; + _Unwind_VRS_Pop; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Jan 4 18:14:12 2025 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 4YQT9J41npz5j6tL; Sat, 04 Jan 2025 18:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQT9J3Dx7z41DN; Sat, 4 Jan 2025 18:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736014452; 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=chvn5Lp4H0E2sajVAu9ftv9dS1dDiTqXF9Ml47S0HH0=; b=BuSegBUO95vkjZteay1t2dkPVnDS8zFXbwfYrDV8fGkM/wvXu4fWuH8Jqgi+yASshC9C/R nlZWio8BdyIV33AEI/3uK+1mev639I8Tx0K4lsu6ZZrfF+T81eLdOf03varTCtgL2d6rSv W6G6JwmNcXSX3R7gdeq+kphYdn/Jl42gN7p/aqp8mZlHlAWKCQgMekeH/SqKKLcxRXYD4b R/Lw+nmVnY1X1sRQE7D/2UISMWNAT446C1JrOJxgGtuBE+Iz9sPyFSvqMukkKSn4kIlfXJ Q2V98qr5Gnrikht/wvCkraiqE31+eBf3fwZcpkWd95W4X5XXvgsxx0sVVrivlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736014452; 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=chvn5Lp4H0E2sajVAu9ftv9dS1dDiTqXF9Ml47S0HH0=; b=isAkr7vYbsQuh0YThFNp2z2Rmph/GL3KwRJ5xX0FVxx+rC5yqmF5gJ1CetGlnXzjPasz5U VTQQSkzIrGraI4M9MCftTgzYTMnLYW2ndGvpXrkIefr+sXgkqKgJHkbVKZZU2o5+CW+YoR cAsJ0Q0NYzUER17cvINvKGSEPsuvnjphA0qWSpX2O6URrv2ddOFu1B9LHxTCSDP+7togJM cu80lGU0bc3U886kO1sAlMBatQFIoC904DuLnuKGnBSdRcYyQXAzAfddxBWfnChcfG7nIt 9eific9TX/ni3OYxkpjBv6A69YC44cMIBMWuncBC5QbiYibocev7mPwBmJZbZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736014452; a=rsa-sha256; cv=none; b=kzK7jhFnBaye3priviTZmZEj3dtbvfOvEsPWvPwgcX30sULPNk/6a4zvwx/qySdF6/e7Rj B4z5AF2GmuqOTJEuBtionDgHV/+E5yOCDZweO8lOV1NPix9yrSCLV0gafIuVNq71yL31j+ llVxZ5HIgfpoSp60EN6N1Ns8hlpudG4mPXwnS/lHmOGHk55bz1HJpO+5q5uQMV4mN+ja67 U/ld6khaHFnRt3paP/nwHaIn/r5JL1jrLxVsfkwB/Sw1OXvvJ+NXiUeie1eW+L3GZkTnXG unJq0TdWt3ZBwPyC7b0IORw9ZXCCrcsL3leb8Va/dId0CqUhNHKiy/qETL/asA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQT9J2dy7z13ZG; Sat, 04 Jan 2025 18:14:12 +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 504IECBv037036; Sat, 4 Jan 2025 18:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504IECNE037033; Sat, 4 Jan 2025 18:14:12 GMT (envelope-from git) Date: Sat, 4 Jan 2025 18:14:12 GMT Message-Id: <202501041814.504IECNE037033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 014064b33f72 - stable/13 - Revert "Export additional __aeabi_ symbols from arm's libgcc_s" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 014064b33f72c4405117eb71e6a06c8b51cc224e Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=014064b33f72c4405117eb71e6a06c8b51cc224e commit 014064b33f72c4405117eb71e6a06c8b51cc224e Author: Dimitry Andric AuthorDate: 2025-01-04 18:09:37 +0000 Commit: Dimitry Andric CommitDate: 2025-01-04 18:13:30 +0000 Revert "Export additional __aeabi_ symbols from arm's libgcc_s" This reverts commit caab831338f4eeaa7455e981478be9fd414b7969, because some new unresolved issues came up in bug 271087: Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: mmel MFC after: immediately (cherry picked from commit b662ca1d6cd82044c6cb79075e1830b97594bef3) --- lib/libgcc_s/arm/Symbol.map | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index a426f823de5c..92b54761d810 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,33 +4,8 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Pop; _Unwind_VRS_Set; - __aeabi_d2h; - __aeabi_d2lz; - __aeabi_d2ulz; - __aeabi_f2h; - __aeabi_f2lz; - __aeabi_f2ulz; - __aeabi_h2f; - __aeabi_idiv; - __aeabi_idiv0; - __aeabi_l2d; - __aeabi_l2f; - __aeabi_lasr; - __aeabi_lcmp; - __aeabi_ldivmod; - __aeabi_llsl; - __aeabi_llsr; - __aeabi_lmul; - __aeabi_ui2d; - __aeabi_ui2f; - __aeabi_uidiv; - __aeabi_uidivmod; - __aeabi_ul2d; - __aeabi_ul2f; - __aeabi_ulcmp; - __aeabi_uldivmod; + _Unwind_VRS_Pop; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Jan 4 20:11:11 2025 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 4YQWmH72Pyz5jkhM; Sat, 04 Jan 2025 20:11:11 +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 4YQWmH6D4tz4GLp; Sat, 4 Jan 2025 20:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736021471; 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=XE391UuN8FRFSQLa30BQ2jDTNyg09dlgOAUbt8yNVBo=; b=SJ0JrJ2JpJPGICTinrG9OObcS+RtJLh6KvVWH5LJ6lLsxDTmsBKjj48d+OyL/clBEpIaNq YEAMgO5FJwXEJ5NJnNKNgvq5H3W0ZmzlCkgQmN9mmcG1MI/CJe3LspATgXgPqTew6NXiod huuzwnzTaqmsrlKIqpiaWdQXi27BZm66o2YphRwUZnmUyhR2MC9clD2Lo1NbSHPBFsfD84 UAn+xmIJuxr4DRqHbkCjEk5cFkdKLHIo8Z1BXrQo265IRf5onmneALn4iCsGYRmaJGY+Tl IVklx67MEhCQRhb26n2M9Fk4DB7VEfS3r8nIfbzDDgrVnXdII3qJT3Oohrfl2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736021471; 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=XE391UuN8FRFSQLa30BQ2jDTNyg09dlgOAUbt8yNVBo=; b=YdFcxDt1CQAdZL9MmNNAmCjjuUvyw9/0rR+I1yZhqKhrYLXsMNlWa8LO6goKITubT0hhqT r4A/R3tu9rIFNDxnY07I9T7gsctE01Jorn1SckkraBLEhfe3hDT/LUBlUz4BZ/jDwSGpmA THlfPPYdtKDGMOGKjF7lQhbJX8NSfXZe5nUKbE2MmFGcy8HgCp7DDS4F7ua7i1xNKl+UWL w1CL/2j/FG/ouWhhKTVtB4+lRSNz3hDJa6dLHhAE89DEhIST2zkFOFTikm/tFo/VQKUZSq v8RL/7sqRfTJs6awZmeaeBiKJvStF+Fz+F6VWS7hFQdrsNcIZFxYwrkpf6yg8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736021471; a=rsa-sha256; cv=none; b=Au/lyRvjjyDkzv289G7+e8OG4J5/RQS0kiVuCe7clNnmoSrPHDeB4mJtV8/fr77PelaDMo bzgVYKWX3cvteZ1KCvg+kmfFOCUQ0vXD2/Sgg8yOuaK0inASY/WzmI/nFotc4QmU22cb+r dxksK4OPkbcPl6qQO037cSQbNDVRVsN4wnWjUH6j9W0buCKjS2lW69wHQsmKZ4DFqd+Lwv Ih0I/aut5YqTX53w8mQvlT/TLCSG/k1g4ShZgwmgalFpHUOQ7NHKUtQn3UWG4xh4p8koo4 WaEYX0C47GIiyjT+8LRZ+MS6859Zghlg30eapZkJq09SVhBZkHL/mrpa1G/xoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQWmH5pTlz16fn; Sat, 04 Jan 2025 20:11:11 +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 504KBBYU056251; Sat, 4 Jan 2025 20:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504KBBNd056248; Sat, 4 Jan 2025 20:11:11 GMT (envelope-from git) Date: Sat, 4 Jan 2025 20:11:11 GMT Message-Id: <202501042011.504KBBNd056248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4bce1a19fcfa - main - TCP BBR: remove code which is not needed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bce1a19fcfac0c9f22c11278daa510546ccd3f2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4bce1a19fcfac0c9f22c11278daa510546ccd3f2 commit 4bce1a19fcfac0c9f22c11278daa510546ccd3f2 Author: Michael Tuexen AuthorDate: 2025-01-04 20:08:43 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 20:08:43 +0000 TCP BBR: remove code which is not needed rc_bbr_substate is a 3-bit unsigned int, so it can't be larger than or equal to 8. The wrap around already happens. No functional change intended. Reviewed by: rrs CID: 1523795 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48320 --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index ed7e07861ebd..535766a0a1b0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10313,10 +10313,6 @@ bbr_substate_change(struct tcp_bbr *bbr, uint32_t cts, int32_t line, int dolog) bbr->r_ctl.bbr_smallest_srtt_state2 = bbr->r_ctl.bbr_smallest_srtt_this_state; } bbr->rc_bbr_substate++; - if (bbr->rc_bbr_substate >= BBR_SUBSTATE_COUNT) { - /* Cycle back to first state-> gain */ - bbr->rc_bbr_substate = 0; - } if (bbr_state_val(bbr) == BBR_SUB_GAIN) { /* * We enter the gain(5/4) cycle (possibly less if From nobody Sat Jan 4 20:14:02 2025 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 4YQWqb0sTTz5jlMJ; Sat, 04 Jan 2025 20:14:03 +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 4YQWqb0MlFz4HQv; Sat, 4 Jan 2025 20:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736021643; 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=jJUz8ilVGppy7IiMn9JH2Er46o3ALk9r4kSJhpn5OGI=; b=um/ygEcOxLL+ly0LJh9VWArCck2jSJV+ZR/HhcbIIFmC4n+vmJ5md1D5YdNEenfqejJvU6 5oCkcSSVEZPowT5YnNd0CB45+eM1rMRBLUPtOLS3zghdEYsCUNt6kSs5ixHPnQL5vf9GnB BwLnVwlkyuaxjxBd3w23B3rLlJ7k48KHgFG7gCxSBqo8GlGRMA2+kgFH76JfvdvVe8dQy6 EtHihWl9PmHDz2DA4iHTKwcjCkyb43NrF1VioILaSL/QIgDoLhG2e0LnSQ1bwm4+RPfDXB EK2wi0Ulbssh2So2I18l3WL5u4883aFuKW3iMpNM+AVNVbAN/gh/7/cUbUQ3ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736021643; 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=jJUz8ilVGppy7IiMn9JH2Er46o3ALk9r4kSJhpn5OGI=; b=jSpTVf9BZ/RP6aQsegK0W/5nbG2qRdn8Kbn1FKKuaVAgeiM65SqOKG0WzPib48p+Ez7qYK f3yOrsNlUWKwardqDIieA4y+uiyX4NOo9+TXLAtAJHly3quMvY1fYgHz27Y7KS3jvlnYjE s0R8UKxOSSnZRt7m6vZVfdk2cACNy9wkiDLnkWRFP0FAVhlInHnEwaK0Y47r9JECial2ta eS2qIvqGw235rGuGPrb8OMIraGiS6JNZAS6S+cX9dB0d3z06knkPlb16ek6QXeg3RMxlxu y65NgJC1dc3801sPpDEywW5hnqACmuNJ00cD2Y7KKpeTgDJZPpmyQ4SmUmCqUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736021643; a=rsa-sha256; cv=none; b=Hr9mxC6CmCcrIoULaB7qXuA/XwFOZkoaE1fuGVMhXhGZaXZrueUqHr/9P6Vtx8K5+h9Rr9 bV0j5zIEPSZWNk+pLTpoTSbHcz1xlKdaeAt1+4oz86oq6+AVJKfFOv6mwOUnFPFRedMZ6M +u0bKF3AuStuzR13mougWGSBRzfu1f8i4dWmMgGrX+togl8t94ye0wNjzwX2Vb3RC1J+vf VX+IX7I+UoAzgg9mw/QsTCXSCZwA9SQlECJjrh4v9C9uKDSAM+sBr2OmjyiPtfLMn5Hsig 65J4+QzGL1zBWvm32PsQVqAI9Ig+J1swHGl7dE2tevQNr1AwvyEV4CaidUh/MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQWqZ734pz168y; Sat, 04 Jan 2025 20:14:02 +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 504KE2ND062585; Sat, 4 Jan 2025 20:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504KE21Z062582; Sat, 4 Jan 2025 20:14:02 GMT (envelope-from git) Date: Sat, 4 Jan 2025 20:14:02 GMT Message-Id: <202501042014.504KE21Z062582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 84e894ce1309 - main - TCP RACK: remove variable with is only initialized and not changed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84e894ce1309b426aa5d1a20ec194401f35dc478 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=84e894ce1309b426aa5d1a20ec194401f35dc478 commit 84e894ce1309b426aa5d1a20ec194401f35dc478 Author: Michael Tuexen AuthorDate: 2025-01-04 20:11:26 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 20:11:26 +0000 TCP RACK: remove variable with is only initialized and not changed minslot is initialized to 0 and never changed. It is not clear to me under which condition minslot should be set to which value. Therefore, remove it and the code checking that it is not zero. No functional change intended. Reviewed by: rrs CID: 1523812 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48321 --- sys/netinet/tcp_stacks/rack.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 6774acb9d5e6..cc0725324760 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -17456,7 +17456,6 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str { uint64_t srtt; int32_t slot = 0; - int32_t minslot = 0; int can_start_hw_pacing = 1; int err; int pace_one; @@ -17788,11 +17787,6 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str } } } - if (minslot && (minslot > slot)) { - rack_log_pacing_delay_calc(rack, minslot, slot, rack->r_ctl.crte->rate, bw_est, lentim, - 98, __LINE__, NULL, 0); - slot = minslot; - } done_w_hdwr: if (rack_limit_time_with_srtt && (rack->use_fixed_rate == 0) && From nobody Sun Jan 5 00:16:50 2025 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 4YQdCk6yV7z5k2ZC; Sun, 05 Jan 2025 00:16:50 +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 4YQdCk4Znjz4fqT; Sun, 5 Jan 2025 00:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736036210; 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=nct/MpZaXxXbdLNjqEEz4Wy1e2dsrtQ0m5bhwzkDx4E=; b=PM5zRUgUCjQa2n1sK0TGq4zUHMUgxlEKAaM+nZ9l+oDGKcnhzquoXgL46+aZxq40FO8s89 bvoyg/MLaf+MgSzM9STfO9F6HihbRwb38cTIRfhhLnam2decWux+Pc9NESlBoHLt5Gyh4I UH5dUkeyDVfc/hCnuV/qObq8B5OUNfjwYwV2nOFbid1PzaNqQU3o8CpCh6eAPYuSGBDPj8 x2vlbEaV4IG26fQ/Yzr9wimyDy91UPViQWtjhoIMD/yRhEUDe7VceaxYO9StDFREM8/nYg sWuIdbKS2MvIxs3o9XkTx7ISef+M0ZnznW8D5dWiiY10156iqrzqYeixurhEqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736036210; 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=nct/MpZaXxXbdLNjqEEz4Wy1e2dsrtQ0m5bhwzkDx4E=; b=xQo1dPkFOiI+m9mRVtaxCLIjPPn762MWN9oPfNO7a0VHKZFJGmZIl4hnk3vWzAYpgnoapr HSmB3NZe1XKCZsplav+CRkf0SUV+rrB9+i+SEyiqC3mOLoIWBmuGdWv5OlIceyJ/GUw6/Q N7pmXz88Z2BGxKBXZHn0NeBBzh/IsazMqtKigW3+7LmGIESUrR8IgzSbz5hsJOyP5v2sQZ b8j6UvAW8lPvgfirLNRjmGnqg+NEMckO7/tNhHIBjfph7qs65A5GHI5EiVUsLl+fAmd0tB c8TM3FM+5kbmQCMoEOthWJE9Sj4vKkt2lFp0wHYmgezNTB7qf30uAFaSkgiEvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736036210; a=rsa-sha256; cv=none; b=h13kV4zL3ucm9zQPbZ3cehVNviotHdyl+eMftGH/SoeeBa42qRIItueZPn4lP27So2wAhF 0vM4EOg6zt0jIVITAOuiPs8LtTMiOADcz6rLF/pT8OQRW38gbEaFVp7oNiRIgjaqwqe/J3 xR8ftQgXElJ9sy/BN8BTqHov8DfZhLNizn7IEeP+iwzaRF/JXc2+7a/COgQP778FqTwsJs 7aszMk39eMqOVWADPX3NoC5qn4aVAOLmw03ERZ09DCdbbIeEcGx4F7ULVxmJ6AuJRIfSY5 ydaJ6h5Eq2P8Y8NBocmHnNsBHTIpLc0cgYWxa7wd9Vl1X6JgfWcmvIhWlWT3OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQdCk49szzk5; Sun, 05 Jan 2025 00:16:50 +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 5050GoaU012076; Sun, 5 Jan 2025 00:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5050Gost012073; Sun, 5 Jan 2025 00:16:50 GMT (envelope-from git) Date: Sun, 5 Jan 2025 00:16:50 GMT Message-Id: <202501050016.5050Gost012073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0f7d8b71b45b - main - Makefile.inc1: Set DISTDIR in stagekernel target 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f7d8b71b45b0a86b25e1005e83140ee6cbdff45 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0f7d8b71b45b0a86b25e1005e83140ee6cbdff45 commit 0f7d8b71b45b0a86b25e1005e83140ee6cbdff45 Author: Ed Maste AuthorDate: 2025-01-02 02:26:00 +0000 Commit: Ed Maste CommitDate: 2025-01-05 00:16:38 +0000 Makefile.inc1: Set DISTDIR in stagekernel target The distributekernel target expects DESTDIR and DISTDIR to be set. The stagekernel target invokes `make distributekernel`, and previously left DISTDIR unset, resulting in a path with a "//" component. Instead, set DISTDIR to . to make the way we're (ab)using the distributekernel target more explicit. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48288 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5c3d190e4c3e..bad747a0e551 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1991,7 +1991,7 @@ packagekernel: .PHONY .endif stagekernel: .PHONY - ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel + ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} DISTDIR=. distributekernel PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage From nobody Sun Jan 5 13:48:00 2025 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 4YQzCh4tK0z5jj8k; Sun, 05 Jan 2025 13:48:00 +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 4YQzCh2mdtz4njf; Sun, 5 Jan 2025 13:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736084880; 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=K7OJNpoIz11uDN2csr65lI+WkHCprEuf89BrGiUdqEs=; b=Y7/h6mlWvBAQ0684zEzw0y+zU7mbch78tEKeoYJU1Lgl/UTUf0YN0aNFZoNwpjy+bI/Bq9 MQ5UArkDKOvO0EMnnzPOM9tceVxpYBlInPLQCAF/azkpg9cRNh3AOFt5dOmlCgLXF4dKb3 6ukYkP4IPqg6AznFnEG4sNY4Eo8gr/+3LBZVRTNxd9MzR2NxYTJvZu3FRGNl55gSnj35nG B3frdjk5F1TplyB9YRFYAjl8reKvhLrAjgxd94L8aakqk1N7FaVFZMgG3WMJvQDOQWeIpP tU0qz0OOjsN3cYg97jnTfp9CE5mqKz8UpWrDR8UsYnKv3UoKodtHVk96Ipp5Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736084880; 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=K7OJNpoIz11uDN2csr65lI+WkHCprEuf89BrGiUdqEs=; b=OU0KeuGja2905+qfEKF9qnIF6zzKRYA0RhxotglQy/vThSX9Bx+2gJH7kgpMjePX93A8Du nB+o+ClizyXNKm91L90z9C86kxDWPCIpD+tu165lRBHGX07QTevfrTBp/CTxt0UTD57GRP 8VoQvqrDIDFxiXksgLP3JM9MXIwL9qD2ORyvTRD3RduZZhmm7xj+xUXMwBnoWe3jyWeSRN k0vU+gWU6WedCUR3WkP5yFk7vfD19upijFw1WhY1xquLh7wQjtQikUUppztVkdOYcEo9ZO 4RAn6YVuvAi4ZVumwIbTAH4i32n6iD3AsTsL5UfYfR60aLYQY0k7/CV81IcGbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736084880; a=rsa-sha256; cv=none; b=ZLubRelb4i2OCtQhTj9wgHHL1JLa3dhhhC0Nk78tPlzoW9Anhp5vmS7xIev4s3AhlkjSMK gzGlNAfoKqERzM38SAIjNuHOJGb9k732339rspSGQ0CfHFR/u+1fTK+AQsnXfiou0IBxup mBvzr11suyyopEY6t2eMA9PjIn48FmmD6zgWVtjVNgty9ydx0/Y8sP/9ff4dKhQw5rBFH7 x7aNhX4GIy+bKvO0AfQB8pRHiWuJKaYTVAoLKnGcF5Kzz55kptOcEBSfxzvYWG0vkL8LeW 3kPgRRyJRCW6u6kwpQ9X62NkbHSdvKvvpyFfXmH1yA7UIyqBlzibX4zp2bo+dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQzCh2N7RzhPv; Sun, 05 Jan 2025 13:48:00 +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 505Dm0Jf026669; Sun, 5 Jan 2025 13:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 505Dm0I8026666; Sun, 5 Jan 2025 13:48:00 GMT (envelope-from git) Date: Sun, 5 Jan 2025 13:48:00 GMT Message-Id: <202501051348.505Dm0I8026666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 48b9d78a0a9d - main - hda: Add patch for Framework Laptop Intel 13th gen 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48b9d78a0a9d795cfdeb56895a27309aadd50c77 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=48b9d78a0a9d795cfdeb56895a27309aadd50c77 commit 48b9d78a0a9d795cfdeb56895a27309aadd50c77 Author: Daniel Schaefer AuthorDate: 2025-01-04 15:53:37 +0000 Commit: Ed Maste CommitDate: 2025-01-05 13:23:04 +0000 hda: Add patch for Framework Laptop Intel 13th gen It uses the same audio codec as 12th gen (PCI ID 0x0002). Actually everything is the same, except the CPU. Signed-off-by: Daniel Schaefer --- sys/dev/sound/pci/hda/hdaa_patches.c | 3 ++- sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index d425e3c0080b..3c063deb0822 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -330,7 +330,8 @@ hdac_pin_patch(struct hdaa_widget *w) } } else if (id == HDA_CODEC_IDT92HD95B && (subid == FRAMEWORK_LAPTOP_0001_SUBVENDOR || - subid == FRAMEWORK_LAPTOP_0002_SUBVENDOR)) { + subid == FRAMEWORK_LAPTOP_0002_SUBVENDOR || + subid == FRAMEWORK_LAPTOP_0003_SUBVENDOR)) { switch (nid) { case 10: patch_str = "as=1 seq=15 color=Black loc=Left"; diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index d00ad4e4705c..f0e72f091a85 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -528,6 +528,7 @@ #define FRAMEWORK_VENDORID 0xf111 #define FRAMEWORK_LAPTOP_0001_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0001) #define FRAMEWORK_LAPTOP_0002_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0002) +#define FRAMEWORK_LAPTOP_0003_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0003) /* All codecs you can eat... */ #define HDA_CODEC_CONSTRUCT(vendor, id) \ From nobody Sun Jan 5 17:22:14 2025 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 4YR3yt4cwkz5k0SJ; Sun, 05 Jan 2025 17:22:14 +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 4YR3yt2TFGz4CbY; Sun, 5 Jan 2025 17:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736097734; 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=2X2FZsZ2S2NCzq6yuvzM4bCiPMeb64vbhXxO1LiwBlU=; b=NuqbJjH4VBMIG6D71MQdnfpJkHfxYNQuUCPwOFzxnJYFcgBOA9U9/aFzwRRgHub7qideyQ vwyTZu8NvGmTkkqh7izCVDrcryRCmeyVJj1rgdjcWEm7MpA7pLE+X6B0zEaJxyc1nzKMSI EzQjWkYIo9bBabEPb4WlUFCLEkghUEHwCnfjvX29JrgB47QloeyxCNsSPPKzurqzyem5FU ZZJVMCav7GI7gStUAN/gZzfuuPNA4pcnPpsH8vcZ3s1CVsqN1jWk0M0mCQW7TTxF8VcVyL Sme+fth+UxpMoYEgXbLyQ44gpd8X43J9Cgx1gqpEr+taMfsQ2HHPOycIBAOzJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736097734; 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=2X2FZsZ2S2NCzq6yuvzM4bCiPMeb64vbhXxO1LiwBlU=; b=QDUdQd7R9GlwPBqNrb0d6ZTPeSZ0k0CCFVEgv7x8184Kg35JjpzVUCrEgDelROJ9MsoT/O kTSLLudeiLvgxXTr8GimoVG3OOYCxXlvLIASodiSS1sPywkGmlJiVfDPvDEyJ5NMlV6jCF VNnCnUdGKop9XrB4tjvgV5MbSoKjKClnb4TjyimlI/qCthpLfpTYuvKJKieKlnHv62UO5x uPcncZVa3BTR2872hA36upDh8YkG4l/YO0VxP/Apvmu4Ljc4MLT3egya+TIvr+CkpCqHgd aVPRa7dg4RqoTGgVPME8hBGZXfsr6Q0LM89iVzQhwebBDnqlDmlk83OA3rOaZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736097734; a=rsa-sha256; cv=none; b=NT1DbWrCrBRsl4S+6k9yllED7S18JzcDbtdfNhUrf017WbZ6UGEiXbRZtQSUm4s1EJ5OkV zJ1qt+G+5v1osY5Ot6PPvb7vxFoTHyXGrbPF2/QTHVpaThqwB9XSTU0jXRwZv2DsmDMmiz 14wOfUUHQmrI6ghJWZh4YJ9YHh9oFSyLKUmUWp4HYNNosv9rOuO8HhuzzNMhBZVV7QYDsJ f2tr5cPwOvIUJLPu7Og+FocJONKw8nHQkeMy8zIkQCepVnWAtKOgp9DYHEddPpQ/mDlabL mGqmx9dQaQ97vlQtnWM/CZjzswCy4qsJo2RYbYDNS0zWyt9KBMVoeXeco2wUrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YR3yt1x4PznY8; Sun, 05 Jan 2025 17:22:14 +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 505HME5v034242; Sun, 5 Jan 2025 17:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 505HME2j034239; Sun, 5 Jan 2025 17:22:14 GMT (envelope-from git) Date: Sun, 5 Jan 2025 17:22:14 GMT Message-Id: <202501051722.505HME2j034239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 93411b39fff2 - main - rtwn: calculate control rate for VHT rate frames 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93411b39fff24ab4c9bf2b0395c7789b1a1c7a42 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=93411b39fff24ab4c9bf2b0395c7789b1a1c7a42 commit 93411b39fff24ab4c9bf2b0395c7789b1a1c7a42 Author: Adrian Chadd AuthorDate: 2024-12-16 02:05:13 +0000 Commit: Adrian Chadd CommitDate: 2025-01-05 17:21:53 +0000 rtwn: calculate control rate for VHT rate frames If the passed in rate is a VHT rate, use rtwn_ctl_vhtrate() to find a suitable rate for RTS/CTS. Differential Revision: https://reviews.freebsd.org/D48295 Reviewed by: bz, cy, emaste --- sys/dev/rtwn/rtl8812a/r12a_tx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/rtwn/rtl8812a/r12a_tx.c b/sys/dev/rtwn/rtl8812a/r12a_tx.c index cc686668e4a2..582e6e0ddaf4 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_tx.c +++ b/sys/dev/rtwn/rtl8812a/r12a_tx.c @@ -103,11 +103,17 @@ r12a_tx_protection(struct rtwn_softc *sc, struct r12a_tx_desc *txd, if (mode == IEEE80211_PROT_CTSONLY || mode == IEEE80211_PROT_RTSCTS) { - /* TODO: VHT */ - if (RTWN_RATE_IS_HT(ridx)) + /* + * Note: this code assumes basic rates for protection for + * both 802.11abg and 802.11n rates. + */ + if (RTWN_RATE_IS_VHT(ridx)) + rate = rtwn_ctl_vhtrate(ic->ic_rt, ridx); + else if (RTWN_RATE_IS_HT(ridx)) rate = rtwn_ctl_mcsrate(ic->ic_rt, ridx); else rate = ieee80211_ctl_rate(ic->ic_rt, ridx2rate[ridx]); + /* Map basic rate back to ridx */ ridx = rate2ridx(IEEE80211_RV(rate)); txd->txdw4 |= htole32(SM(R12A_TXDW4_RTSRATE, ridx)); From nobody Sun Jan 5 18:21:02 2025 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 4YR5Gk5hKFz5k419; Sun, 05 Jan 2025 18:21:02 +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 4YR5Gk4Ktcz4J7L; Sun, 5 Jan 2025 18:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736101262; 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=JTx5YzkXGf6OcOuXQeBeBLXP+nrmSG5DF4R8Oo/S7nk=; b=qrFQ35PuyIVX9KgQyYbhheDUCop7SjIo2EuePTynDY/eHfTnLVKXcQrQH8ayjfjhhYSVta dyha3+IQeCtc+/jrnhBYLmwhwn6VnouWwHmyRko8E+K1xfPiLM0AKFuuZZyVuazciN6sXJ cFybaIsCV6yIfxURTMyZYxg/5LANA4nVLzHOiLxsgc0ez1XyN1qwL+CkpWvk6aj1NnjdMx DGiDttbfak/pv3vzlw+AcxYBWRG2+t602UfZIsvFxgmtVt4oOsIpFMFruQPSrNnBiCXyvh LI6PXOb2l7rXsESmZhnmcwyptIUy2734FiBa+I2W72obDsiDuLz5+V8M/eWVVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736101262; 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=JTx5YzkXGf6OcOuXQeBeBLXP+nrmSG5DF4R8Oo/S7nk=; b=DrWTE1b6bF9UMeX2KARM5krJOtBs2BaWwPq65fas+XsDZ6H3js8oVv0j65yQra/dR9W4D4 A5ILi7CxuFcyNVqCKSYDs03ciDJBZ5o+Ij5C6yi/f9ZP/4a06gTNrKqK7eQF0uWWUpwRzk icIApI1UTQuFKOMuzMi+DPhxQ1BnbQf4t6zm7aXDYPKi51PvdrndI+up9S4ciw1exrJ+tA NBYkcv3XTrWgFqe8C9GHQ69RU+ZRPLedCXfiFKdllbftZKu0nZ5XN2FGXwux9AnuPIC/jZ PSW/P2DVxjt7Z6LWC86Q7TDSmBtt0/jc/lg1uEZyR+dxOecckH6pxoW2gSKDEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736101262; a=rsa-sha256; cv=none; b=sZqiwnIwfmC3zrcSSMeJGHyEQuA9pmtsLV2FkQuCg87iM0R9rwZAmhkXKG2pMGnRoBQ6XB SkLG2MOJn1Anne17M8GPIvgqXMkfHlM/mLZ8ozHPH0GUQy7Iejq7VvhmiGsSLbHIWubSgX kDZGaeH9froUe7S18XlypDjUQyjh3tFcm+k/uGy3hmnRwZalJUP7KMjsg5s0UMF8WVmD1C bTxZ7a1RjPRiDvSSUcrB7GFXmyNUn9j6nGYtyisk1GIuAjHmmmv7nit+jUNphKUkSmlmZH hlZZ2sGP4jVcifX+GuU7DDHhRYlemMM/ok5Yrel1WoLhtukCMxCHNEOgTwz06g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YR5Gk3xv0zpqc; Sun, 05 Jan 2025 18:21:02 +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 505IL2KE044056; Sun, 5 Jan 2025 18:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 505IL2EN044053; Sun, 5 Jan 2025 18:21:02 GMT (envelope-from git) Date: Sun, 5 Jan 2025 18:21:02 GMT Message-Id: <202501051821.505IL2EN044053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 50c1e179b584 - main - umtx: handle allocation failire in umtx_pi_alloc() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50c1e179b584f43ba82e9afc91b25ec4831b58ef Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=50c1e179b584f43ba82e9afc91b25ec4831b58ef commit 50c1e179b584f43ba82e9afc91b25ec4831b58ef Author: Kristof Provost AuthorDate: 2025-01-05 16:09:08 +0000 Commit: Kristof Provost CommitDate: 2025-01-05 17:19:56 +0000 umtx: handle allocation failire in umtx_pi_alloc() Don't assume that this allocation will succeed. We may have been passed M_NOWAIT. The calling code already handles allocation failures, but the function itself did not. PR: 283807 MFC after: 1 week --- sys/kern/kern_umtx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index c4a820f41bc3..a9294c324cb4 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -1740,6 +1740,9 @@ umtx_pi_alloc(int flags) struct umtx_pi *pi; pi = uma_zalloc(umtx_pi_zone, M_ZERO | flags); + if (pi == NULL) + return (NULL); + TAILQ_INIT(&pi->pi_blocked); atomic_add_int(&umtx_pi_allocated, 1); return (pi); From nobody Sun Jan 5 20:16:37 2025 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 4YR7r613w5z5kBvd; Sun, 05 Jan 2025 20:16:38 +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 4YR7r60R7Rz4QHV; Sun, 5 Jan 2025 20:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736108198; 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=hY5rJVs8qBIL8xciYN6jQz39CC5O+zEa0WXWCUe3S5w=; b=I6oZd+DkHW22zFNbJ/L2PaFMW2TvfcuTKsJVVBg0WR7//M8GUZ1+tffk3a4COkRGZu8Y9K PkR7jDM62tj+PaXc9+uWRFZg6euDug7HgsZpfQEOiJbbMvv/MiFSOvj9uQC4nVX8gTP6B/ ycATu98uOyBeTvyH3pLHXJYV42jK3nGiWqz+6G9efrknwYWmyWZmKK40aS5qu7PwdapECw iVx086NGY0gvpFUk+/idKwR+gxa+i8xB7ZomFd2bubBcGXdTwfCouZGylidloCcTIqWT8w t1wssp6+XQnsHjtBOK/JGHdDKEunSGZSzN+mKaTYGLyc4t6TirSZa8RuAuFuCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736108198; 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=hY5rJVs8qBIL8xciYN6jQz39CC5O+zEa0WXWCUe3S5w=; b=XPEfxkuU30k6GiPpbU2+8mf5N6RcAqLcNh9XOBBlQgx6wjvEeSXsnmsXZ3gFBZ/Yz0jFPA Vw9wy1lMaCZfV8zv8jrQCO7BEXQowMEzD334nTvVO2kUopVAVIHGCJet8Fh/QdyegovAXE +ukZfinXyuYFiSlmmy65MA8NuG6UC/K5o5mauo/MqSfOkLCqAHd68qN8/UNp0dzij6gYjg mJMgb5dud26gKbrKN9QXsaQqOy/lbCPOqk2m4YQKCwiCyi2rOSCIwjFHq3CJ53dd36nc0N rtzXNRax4ScWNhk67JmiTYmoNt+BJiYsmv7IcGXhzXhj2Pyc9hLKmMLw3HKTnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736108198; a=rsa-sha256; cv=none; b=lNAqm51EkEXgJT/PsE7aliQFI798PSHqpQ5ZfeEZztEiBYauelQ+871G+kw0b1nHrOpraw 38jsCVTkXnz7ynUmTyBEk7g1wGVg8tLC1qjcmRyNrXNSWsye4IOu4135QMil9cjdhq7VVl 4VeHqkQ8vHxJJRuUV93GuR8HYs28KS3pJ8Rf3Tn9LA9zOp3PMazSCaU/eoZhYedG70GoKk DaJwOMXi+DwOS6M9LD++9pjokR4du+RxtG+Y7s+qjuKwWBzfkUTprjMj9eT/A24XGBwmx6 +orGJJ3unA0x0U4gjwFuEu63XEA3tTY9G9JRuJhwgZDh8yDICvvmNrDFojuJJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YR7r56xkKzt6N; Sun, 05 Jan 2025 20:16:37 +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 505KGbdd056651; Sun, 5 Jan 2025 20:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 505KGbXu056648; Sun, 5 Jan 2025 20:16:37 GMT (envelope-from git) Date: Sun, 5 Jan 2025 20:16:37 GMT Message-Id: <202501052016.505KGbXu056648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: d830cac9fed1 - main - recoverdisk: Fix comparison between stripesize and sectorsize 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d830cac9fed1882a192b0ec5c96fb3ac9bfbc2ee Auto-Submitted: auto-generated The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=d830cac9fed1882a192b0ec5c96fb3ac9bfbc2ee commit d830cac9fed1882a192b0ec5c96fb3ac9bfbc2ee Author: Poul-Henning Kamp AuthorDate: 2025-01-05 20:14:37 +0000 Commit: Poul-Henning Kamp CommitDate: 2025-01-05 20:16:22 +0000 recoverdisk: Fix comparison between stripesize and sectorsize Discovered trying to read a 360KB floppy disk :-) --- sbin/recoverdisk/recoverdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c index 91f42c904c52..446266c36d50 100644 --- a/sbin/recoverdisk/recoverdisk.c +++ b/sbin/recoverdisk/recoverdisk.c @@ -482,7 +482,7 @@ main(int argc, char * const argv[]) err(1, "DIOCGSECTORSIZE failed"); error = ioctl(fdr, DIOCGSTRIPESIZE, &stripesize); - if (error == 0 && stripesize > sectorsize) + if (error == 0 && stripesize < sectorsize) sectorsize = stripesize; minsize = sectorsize; From nobody Sun Jan 5 21:13:08 2025 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 4YR95W4b23z5kGX8; Sun, 05 Jan 2025 21:13:19 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from wzl.woozle.net (wzl.woozle.net [195.54.192.66]) by mx1.freebsd.org (Postfix) with ESMTP id 4YR95V4gshz4VNd; Sun, 5 Jan 2025 21:13:18 +0000 (UTC) (envelope-from marck@rinet.ru) Authentication-Results: mx1.freebsd.org; none Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by wzl.woozle.net (Postfix) with ESMTP id 1F203B54; Mon, 06 Jan 2025 00:13:11 +0300 (MSK) Received: from localhost (woozle.rinet.ru [195.54.192.68]) by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id 505LD89q083496; Mon, 6 Jan 2025 00:13:10 +0300 (MSK) (envelope-from marck@rinet.ru) Date: Mon, 6 Jan 2025 00:13:08 +0300 (MSK) From: Dmitry Morozovsky To: Poul-Henning Kamp cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d830cac9fed1 - main - recoverdisk: Fix comparison between stripesize and sectorsize In-Reply-To: <202501052016.505KGbXu056648@gitrepo.freebsd.org> Message-ID: References: <202501052016.505KGbXu056648@gitrepo.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-OpenPGP-Key-ID: 6B691B03 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (woozle.rinet.ru [195.54.192.68]); Mon, 06 Jan 2025 00:13:10 +0300 (MSK) X-Rspamd-Queue-Id: 4YR95V4gshz4VNd X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8331, ipnet:195.54.192.0/19, country:RU] Poul, On Sun, 5 Jan 2025, Poul-Henning Kamp wrote: > The branch main has been updated by phk: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d830cac9fed1882a192b0ec5c96fb3ac9bfbc2ee > > commit d830cac9fed1882a192b0ec5c96fb3ac9bfbc2ee > Author: Poul-Henning Kamp > AuthorDate: 2025-01-05 20:14:37 +0000 > Commit: Poul-Henning Kamp > CommitDate: 2025-01-05 20:16:22 +0000 > > recoverdisk: Fix comparison between stripesize and sectorsize > > Discovered trying to read a 360KB floppy disk :-) brilliant! amazing! where did you dig it from, and what (if it's an allowed question!) could be stored at?! [snip] -- Sincerely, D.Marck [MCK-RIPE] [ FreeBSD committer: marck@FreeBSD.org ] --------------------------------------------------------------------------- *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- woozle@woozle.net *** --------------------------------------------------------------------------- From nobody Sun Jan 5 21:19:11 2025 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 4YR9DS2Q2pz5kGwG; Sun, 05 Jan 2025 21:19:20 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4YR9DS09Ywz4VnV; Sun, 5 Jan 2025 21:19:19 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 79139892D1; Sun, 05 Jan 2025 21:19:12 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 505LJBZ0029249; Sun, 5 Jan 2025 21:19:11 GMT (envelope-from phk) Message-Id: <202501052119.505LJBZ0029249@critter.freebsd.dk> To: Dmitry Morozovsky cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d830cac9fed1 - main - recoverdisk: Fix comparison between stripesize and sectorsize In-reply-to: From: "Poul-Henning Kamp" References: <202501052016.505KGbXu056648@gitrepo.freebsd.org> 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <29247.1736111951.1@critter.freebsd.dk> Content-Transfer-Encoding: quoted-printable Date: Sun, 05 Jan 2025 21:19:11 +0000 X-Rspamd-Queue-Id: 4YR9DS09Ywz4VnV X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] -------- Dmitry Morozovsky writes: > > recoverdisk: Fix comparison between stripesize and sectorsize > > = > > Discovered trying to read a 360KB floppy disk :-) > > brilliant! amazing! where did you dig it from, and what (if it's an allo= wed = > question!) could be stored at?! I'm a volunteer at datamuseum.dk, in that context 360KB floppies is "the n= ew stuff" :-) (See also: https://github.com/Datamuseum-DK/FloppyTools) Not sure what's on these floppies yet, or if even anything. -- = Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe = Never attribute to malice what can adequately be explained by incompetence= .