From nobody Mon May 13 04:50:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vd6WQ0j1Xz5KChN; Mon, 13 May 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vd6WP5B18z4H4m; Mon, 13 May 2024 04:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715575857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C9a7fkDK/jdd6PR2vGUGPW+vo8n4zEJiMt0B2JUuUo=; b=OiqEMgSnnU4+SmRTQvzHLcOMnaI86tLq+2Cn3niuBAZQpP1xtM5PSznYxkPit0v405fkQO j7nQ1nCXngF3zeg8OdWjjt1cQiJJi1AZDwxax8fi9b9Fb14lYbSrwrN90rv7oEbtGYiSkx rd9bjuxdnOQrYfsSthdIt1p8rbmdjXWYF/oV3fPc/K0d4mo3HmgzHFAuBWnZ9pN93MtBmj torguJNLRNxhPUR1J96YdG6J16gcjJc3gFX01rJEsxma37Cbw6BUZTFBG5T9GoGRkAgL+N TE2K/BgE7zO2RUcRLUiihUP5kg/yUFYRqjE5N3Y582IVBbgswLatlg29VV1cHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715575857; a=rsa-sha256; cv=none; b=Gt9XCo+7fDUXwZnCkGBafwpuw9L0iPQZzSvCbHroVEpK3fTZf8Mp5zG25eIXSSX+CTO63V qOON3z5f0NlSIQqeoUU3FDiKYwYjM/nncmb3tjn0eEitOkXy0DWmVauAWeFjddqO41mL1t dPAqHYlbCD+VW4TL4ABpH1YRe7/EYUq7C34QL4HvjsFO9eaTn8oHhkGMRez2AtvTFYxiPf vesMw3pyHRvcMtfsco3d4RFNN7aeihw8ADN/vHaLBYyJTLY7pSrkjMSfdiSNnIC2tK1JUz 29Vc3UCijfleOHddpK3X314g3h3rEc1zFwWj2TjiOqqnGYWZ5koui1EoMz9WIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715575857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C9a7fkDK/jdd6PR2vGUGPW+vo8n4zEJiMt0B2JUuUo=; b=r8Am1NozyA5FMXkVRM+7BCHnT0EgghWM+NCVtJErsMc6+YoLIMtuMXXlVqZ1Us4qiy6yoq Qk1LwTplEO19aVJ/fcAnA/MhjApIfQ4kVFWFczD6BvZNI7Vc/myH+8ZvGEL2e3LBSR8YeK hkW3BJz4o5qGaXqU73FKHU7n5dvL+QEmmclcd4XlIWi6Se3fSsWEoa9Uh2wHtRjGXBVBjc 2KtZxaGvcItMkmQe4CaodsLCLEqQPnDnPbXHeQR4/CkOJZNj7RyrppO2gF5mQEsWd7Qrme YYyq4yePe7b4oWkHrnRHQPFLnXQFDYYFbrhwueUYn4xcOpP7HKPezE6NoU7mGQ== 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 4Vd6WP4pCWzZTR; Mon, 13 May 2024 04:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44D4ovlI026274; Mon, 13 May 2024 04:50:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44D4ov5g026271; Mon, 13 May 2024 04:50:57 GMT (envelope-from git) Date: Mon, 13 May 2024 04:50:57 GMT Message-Id: <202405130450.44D4ov5g026271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2c65656b29fb - releng/14.1 - nfsd: Fix Link conformance with RFC8881 for delegations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 2c65656b29fb803edeeda931c6771c7c22c9efac Auto-Submitted: auto-generated The branch releng/14.1 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2c65656b29fb803edeeda931c6771c7c22c9efac commit 2c65656b29fb803edeeda931c6771c7c22c9efac Author: Rick Macklem AuthorDate: 2024-05-04 21:30:07 +0000 Commit: Rick Macklem CommitDate: 2024-05-13 04:49:04 +0000 nfsd: Fix Link conformance with RFC8881 for delegations RFC8881 specifies that, when a Link operation occurs on an NFSv4, that file delegations issued to other clients must be recalled. Discovered during a recent discussion on nfsv4@ietf.org. Although I have not observed a problem caused by not doing the required delegation recall, it is definitely required by the RFC, so this patch makes the server do the recall. Tested during a recent NFSv4 IETF Bakeathon event. Approved by: re (cperciva) (cherry picked from commit 3f65000b6b1460a7a23cd83014bb41a68d1a8a19) (cherry picked from commit 3c414a8c2fb37ca37de454aaa145e7bcaefcaa05) --- sys/fs/nfs/nfs_var.h | 2 +- sys/fs/nfsserver/nfs_nfsdport.c | 12 +++++++----- sys/fs/nfsserver/nfs_nfsdserv.c | 11 +++++++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 578fb3ce1340..950e0c097457 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -713,7 +713,7 @@ int nfsvno_rmdirsub(struct nameidata *, int, struct ucred *, NFSPROC_T *, struct nfsexstuff *); int nfsvno_rename(struct nameidata *, struct nameidata *, u_int32_t, u_int32_t, struct ucred *, NFSPROC_T *); -int nfsvno_link(struct nameidata *, vnode_t, struct ucred *, +int nfsvno_link(struct nameidata *, vnode_t, nfsquad_t, struct ucred *, NFSPROC_T *, struct nfsexstuff *); int nfsvno_fsync(vnode_t, u_int64_t, int, struct ucred *, NFSPROC_T *); int nfsvno_statfs(vnode_t, struct statfs *); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index f8c2ddfd2a59..f4679309657b 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1656,8 +1656,8 @@ out1: * Link vnode op. */ int -nfsvno_link(struct nameidata *ndp, struct vnode *vp, struct ucred *cred, - struct thread *p, struct nfsexstuff *exp) +nfsvno_link(struct nameidata *ndp, struct vnode *vp, nfsquad_t clientid, + struct ucred *cred, struct thread *p, struct nfsexstuff *exp) { struct vnode *xp; int error = 0; @@ -1672,9 +1672,11 @@ nfsvno_link(struct nameidata *ndp, struct vnode *vp, struct ucred *cred, } if (!error) { NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY); - if (!VN_IS_DOOMED(vp)) - error = VOP_LINK(ndp->ni_dvp, vp, &ndp->ni_cnd); - else + if (!VN_IS_DOOMED(vp)) { + error = nfsrv_checkremove(vp, 0, NULL, clientid, p); + if (error == 0) + error = VOP_LINK(ndp->ni_dvp, vp, &ndp->ni_cnd); + } else error = EPERM; if (ndp->ni_dvp == vp) { vrele(ndp->ni_dvp); diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 8141ee6cbdb6..0c8bda6dc6a6 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -1797,6 +1797,7 @@ nfsrvd_link(struct nfsrv_descript *nd, int isdgram, char *bufp; u_long *hashp; struct thread *p = curthread; + nfsquad_t clientid; if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); @@ -1858,8 +1859,14 @@ nfsrvd_link(struct nfsrv_descript *nd, int isdgram, NULL); } } - if (!nd->nd_repstat) - nd->nd_repstat = nfsvno_link(&named, vp, nd->nd_cred, p, exp); + if (!nd->nd_repstat) { + clientid.qval = 0; + if ((nd->nd_flag & (ND_IMPLIEDCLID | ND_NFSV41)) == + (ND_IMPLIEDCLID | ND_NFSV41)) + clientid.qval = nd->nd_clientid.qval; + nd->nd_repstat = nfsvno_link(&named, vp, clientid, nd->nd_cred, + p, exp); + } if (nd->nd_flag & ND_NFSV3) getret = nfsvno_getattr(vp, &at, nd, p, 0, NULL); if (dirp) { From nobody Mon May 13 09:51:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdFB36q5Mz5KdV4; Mon, 13 May 2024 09:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdFB36MvNz4gBJ; Mon, 13 May 2024 09:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715593883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ilo4ELZYwIIKNbU3YcObwBl0hh5rtu/zuuY4qBkmZ8=; b=eKaAR7xnNNmZ9FG3KtaTIED8F2lATmPApsamO7cEVbwGHGiYnsPp6CfAHDmlVq2vT4uvpS q9HBoEJGP/rWRNH3GGKONMjxKPpUhxPVWWhB+DJzcvqPyGk+WF4hfYUsJTGieOajlbfIPf 8uhMcnliNl2jV/J+1G0K/AVZfrMhql6qjF8Av6KHXKNshHL1HO/kQyOCRSfFw3pfu4oAtZ nWfRxA/VFL4BdieYRiV9gvCx9NnyAxss3JQaLzDMdfXu5Q2nvR62n4kBYFh9FbSSDUSGiP xnmSOC6HCUJ/itkdA9wEJGO9dmxVYWt9uWZ1r0HS4PZxL07ubQlW28yfBhng1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715593883; a=rsa-sha256; cv=none; b=GosUA41VJxKsflyva2jfJDUpleenvs/5K3iUie3c+pisrcUrtyT+GXXixkvVhWMcYn9/Pc jVWwoYg8RVZDvdVrcj2nHnuqekzUna3hy7PpFPApDKnj/hmUjq1ZzHuzLJo8tNhHLmc7R7 i7B0Dkyt4OCFaXk+sBL9waE+0WMOVR5hoEGtNXRJvju7xcsokMwU/bCn8CKYL4GRH1u0xC OmoUMNCWKg+Ib42Gc5LhINdwhTcxEfWwupYc4V4wLaBoQzdb59IBpePWbJNYsj+B5yBAqw U3UWXQpR6vfx08vxthUlWmitXxhE6wIAgmlRbue5CgHrVZYsn1CyIuepLdEMxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715593883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ilo4ELZYwIIKNbU3YcObwBl0hh5rtu/zuuY4qBkmZ8=; b=hQr80hpuK6rRgBPkTYS+sn5jaHjaznSNMDScQUupSjeyivGVeuqkNxVvVAOvMc8vonHlK9 fuDWaNw2QgpxUhcsqeHbjb9KZicmmiH6gSIs03fsYA30skYNk4T2dOST8E7QFzaSNIIMPZ PBZBiYMYb3pxjQb1piew07Tjen/dVZ41NSYwCa48na6vqeKdwA0K885PXQcvMScBAFKSxk go8B9Wq7caIQXFO3ZnamLNGPXR6C2hF/OD39mM+ItlZIxak4qRLsXIXowZqQBjMOL0BRKS +uFpF8ydTDCLi3Xs0wqflQu35x9I/7mwGxMbadEgKa2m4ZLyNdn6qhbXJRRXSg== 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 4VdFB35ztjzjp7; Mon, 13 May 2024 09:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44D9pNUP036624; Mon, 13 May 2024 09:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44D9pND3036622; Mon, 13 May 2024 09:51:23 GMT (envelope-from git) Date: Mon, 13 May 2024 09:51:23 GMT Message-Id: <202405130951.44D9pND3036622@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: 9877b9bea5b0 - stable/13 - mlx5en: add diagnostic in one more case of failed eeprom read preparation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9877b9bea5b0857bfdf0b7eeadbd53d227b651bf Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9877b9bea5b0857bfdf0b7eeadbd53d227b651bf commit 9877b9bea5b0857bfdf0b7eeadbd53d227b651bf Author: Konstantin Belousov AuthorDate: 2024-05-05 07:09:07 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-12 01:18:13 +0000 mlx5en: add diagnostic in one more case of failed eeprom read preparation (cherry picked from commit c097967b9af946cf46246cce5adde53f7e955ecc) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 75786d313fc9..fb1c8ede424f 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3642,6 +3642,9 @@ out: /* Check if module is present before doing an access */ module_status = mlx5_query_module_status(priv->mdev, module_num); if (module_status != MLX5_MODULE_STATUS_PLUGGED_ENABLED) { + mlx5_en_err(ifp, + "Query module %d status: not plugged (%d), eeprom reading is not supported\n", + module_num, module_status); error = EINVAL; goto err_i2c; } From nobody Mon May 13 09:51:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdFBW5rH4z5KdK8; Mon, 13 May 2024 09:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdFBW5KXwz4gc5; Mon, 13 May 2024 09:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715593907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OMr2f8GgMP56izcSCsJAQSbkhGE1rap10COo4LsqN1g=; b=j5MqHfrDds5A2VcVLk8LBT7lR9hug6wLLLABlOKDXWfYI06dthKy0/BgNK5WIq627D/i1A KKj5QzS5HcHf0HX52zJK78y8J9x3CCmr7rcRTQNjKr0d+nlOOLsnEZpwKbIzuriqnb+8Q1 BEaIRF3pbRtPDzQDTgKpIsorqEWsjbpyDWDzFG+Zxgz3jrAikea6s/rWEKF0Abdiudnxvi WkoZRn0x0H0JjWiqMjOAx4BGbUUxtnf9RM1ilg7BYmXMhmy6efVgHeoKf1G1TaC4gPYpPP ge4Q7BXAxWRNFdv0XFxXzyGUJvoEvN7rdGKi+TwhikRaJiR311PS7EVMewgQkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715593907; a=rsa-sha256; cv=none; b=MsL7jDLCmFaJitxhjIMio+m6ohLEuvOJLAvPZqIhEfjPKwhnYykhEWiNII7TrMHOGE+ylY qJO/KHpD85hzpIhf0H426Y5chGYw7orF5HWb5tgpdQfTt4OKTbCQEm4FSq/JmUr6Qv7Knk 5K+qr+3Sm8a4xBvV4kmcnTziptDP+vKx7nOnpvQ+mLu/m+DKZ/odFd5rCqtycM4yV+CX1q uKJQ7kWsjbcmQS3oID6ZmQl+2JAaEcvV8xgoP2hqBSEUaX9cDfrt4nI4E0163xvt3+tjbC fQZSX0VCidxw6bJX3jFeSHZlgsAzxGyGxbXgbgt+fhiwczHp6//ihh7nV7np8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715593907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OMr2f8GgMP56izcSCsJAQSbkhGE1rap10COo4LsqN1g=; b=nSzOXK0hFMIy3825Uz5Eoz8VLm1zlfcVwXsqMWgRfgO00uTzOKE5Ak+vBEqiApsHkNQB59 HOZdlouOgezjY12oW/HWA8naYjTPvHJCsuOIU5p9/Cinv8hCnl8gNsER4XhuAfu0mMmvM8 4c811ymxxu/Zi9K9iJEinTo9kjmNBvvovVRCOd1PUNBmRCwkOJ5bwbsspRwTD030/MvaeW 4GwtGQj5iI7qeAXzafeBo0fW2GdSRkzzn65OPxzxCSxaqssAhqXvLrVXTGp54mfEUr+uzA WacR3jsfHUzUxPYVnQjN5d4YZcE8oKPhMdEEaDXIS7M+/Jpmg7X1fNtdz2tDfg== 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 4VdFBW4tsFzjy7; Mon, 13 May 2024 09:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44D9plXf036814; Mon, 13 May 2024 09:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44D9plKq036811; Mon, 13 May 2024 09:51:47 GMT (envelope-from git) Date: Mon, 13 May 2024 09:51:47 GMT Message-Id: <202405130951.44D9plKq036811@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: ddabe1d3c515 - stable/14 - mlx5en: add diagnostic in one more case of failed eeprom read preparation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ddabe1d3c51556c84f830b0203204c55b495e57b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ddabe1d3c51556c84f830b0203204c55b495e57b commit ddabe1d3c51556c84f830b0203204c55b495e57b Author: Konstantin Belousov AuthorDate: 2024-05-05 07:09:07 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-13 09:51:29 +0000 mlx5en: add diagnostic in one more case of failed eeprom read preparation (cherry picked from commit c097967b9af946cf46246cce5adde53f7e955ecc) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index e1dbd02fcf3a..962705e6d258 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3674,6 +3674,9 @@ out: /* Check if module is present before doing an access */ module_status = mlx5_query_module_status(priv->mdev, module_num); if (module_status != MLX5_MODULE_STATUS_PLUGGED_ENABLED) { + mlx5_en_err(ifp, + "Query module %d status: not plugged (%d), eeprom reading is not supported\n", + module_num, module_status); error = EINVAL; goto err_i2c; } From nobody Mon May 13 14:24:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdMFC3T2Fz5KMgw; Mon, 13 May 2024 14:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdMFB0Jq9z4X23; Mon, 13 May 2024 14:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUwESccMgeG1XXIHYPVUioP3vmeowWTDbZkcvHovosU=; b=virnLnnPL07qxMY5vvdQsZ6uEBbjJlFyxtGaEBO47pQplkPPwMc+kEJkQ+sN2l6Uw1e4Mw ZdoFTUbg/RxeHBvznNtI5NwfkCqaoP/VzE6Q+Cp7Riba1yBr0H1s1sAwfZcjxGCS8vDaFQ JLtPMwsBe43o97Alu50aYs2gniVSwY2NCr2i7EFGkRPbVoZ5W/Oio0vUuWd51dJibkTL8e cXBXf2EbzVBjRizU25VjM2bqprTt4tiQqd2uyWDlFR0YRfs15MXyX7i+aqb1awXNsjoL5o U2Az7VizsiQkfoLLSJKxNIocmjbBCrGV6UDCANP5ySz2nJ5vQlaN3H7Pmpul0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715610270; a=rsa-sha256; cv=none; b=yvenMmoTHGot0d+qCmbWyNcM2JlXu6J/aWocCu9pyh81m2Yf1sz6TgS4Cfp03OwXEtc/e7 a0sEW+6yXfQWgHJnubbLv+fTF/QdQ3pObGSYhvYVyGNeKHuZkKjljTh0aUy+Rn3Z1o2p2F 5U1rEwz5LopAT/DiLnrXBcy55LeMVf9xxj8Vfm9OLny+woZN8eYAgds+q0iNZ0FRWHR4gD f77z6C4vC88dqnGilTI6SpMZtel/GJc1dksHXsBT+DDJY7At9THHcYXu+v7C9l4Zb+FWN0 FmxhRXhA9IfLy9h6M3pyk1D+19BWba4Yrtla082uDjwiEjhKlJqU+Fvk97Dnqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUwESccMgeG1XXIHYPVUioP3vmeowWTDbZkcvHovosU=; b=x4lLxwNpVSth9ABQ0p9k+S+6OG4BkG1BtiXLUNxRl4EKT/+U7rUg0ZbbplF9URcgLxRYDz KCGc6c+BZfvG7+d+Tbo4juqmdmkNehvAWyQKicmYwT96zDazd9z/+Wc9TOzYkjj9rb1lhd K2LEtpTNDcdFouIytzykyVDKwkaOxX3XUImhiZBrE3R0HWnFwMRtet9nqKBWX4ac3ZUL+G M9uMbYoNCdbH6dEWq9DPcZdjxFaareGvdZO1CSYVcTE3eCzkZVA5Fxmk1m8oYOWDjXPl65 tD1Cx/56A0z86IPVTCDpNk+sm8wj5zx4DOHMfGsbkp8bXk4rAWaqQUEm8y1o8Q== 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 4VdMF96NbGzrsg; Mon, 13 May 2024 14:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DEOTkQ016626; Mon, 13 May 2024 14:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DEOTGf016623; Mon, 13 May 2024 14:24:29 GMT (envelope-from git) Date: Mon, 13 May 2024 14:24:29 GMT Message-Id: <202405131424.44DEOTGf016623@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: f2109683ce37 - stable/14 - dlopen(3): mention fdlopen for capsicum(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f2109683ce37927d02965fc97e5757761caf89ed Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f2109683ce37927d02965fc97e5757761caf89ed commit f2109683ce37927d02965fc97e5757761caf89ed Author: Ed Maste AuthorDate: 2024-05-07 01:45:50 +0000 Commit: Ed Maste CommitDate: 2024-05-13 14:22:34 +0000 dlopen(3): mention fdlopen for capsicum(4) Capsicum-sandboxed applications generally cannot use dlopen, as absolute and cwd-relative paths cannot be accessed. Mention that fdlopen is useful for sandboxed applications. PR: 277169 Reviewed by: markj, oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45108 (cherry picked from commit d84fd89ecd404ffbf629381d2dde14fd79b39402) --- lib/libc/gen/dlopen.3 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3 index 09f37ff2fa93..340545114114 100644 --- a/lib/libc/gen/dlopen.3 +++ b/lib/libc/gen/dlopen.3 @@ -29,9 +29,7 @@ .\" .\" Copyright (c) 1991 Sun Microsystems, Inc. .\" -.\" @(#) dlopen.3 1.6 90/01/31 SMI -.\" -.Dd May 14, 2020 +.Dd May 7, 2024 .Dt DLOPEN 3 .Os .Sh NAME @@ -201,6 +199,10 @@ The function can be used by the code that needs to perform additional checks on the loaded objects, to prevent races with symlinking or renames. +Applications sandboxed using +.Xr capsicum 4 +can also make beneficial use of +.Fn fdlopen . .Pp The .Fn dlsym From nobody Mon May 13 14:25:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdMGT2mN2z5KN0F; Mon, 13 May 2024 14:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdMGS6f5qz4YBV; Mon, 13 May 2024 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBifF/8JVYxbIi3b0CHrELUVMk+9CvB00Ms284jTzn8=; b=dVxr/KYWZzhKwW2fonEOcImI/fMWAqJvo0fTfrPXfllvMpbBaSmYRFbkzEZr7vtaSLfJ3x hta8eS8RkADewb5UpGm2k1XapZU+k1hS8WbRt93vwZyvSYewykfQpGNCNA2F6TUbBY+0K+ lgbbVCiLes5yWP36stJuFxXlKf+Umt5DxB9hBwZxko8lyfsqEqymqRdecZO1bDpUovgDur dkf58rfmW2m1+5rjl/PZLnb3MJBjBkbwOHihp/d1zTFCk9589S6r6rUbSOo4QRjoiLyZhT TFUOMor3/GcjwxdL6LDW1Rv3TCFf0x1Xa1zwu2ah4GcaevEuPNbBL43T9mltHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715610336; a=rsa-sha256; cv=none; b=HyTwepOUHQXcy1cLnTTFpY79uvxF7y5X3rK/BGF18+0GyySKbd1g0joKxS52xdC6a4kxFb p/qzkUrFwZXTP8hqIWFwJ6iFjgX6zxNcbTITuNo3HihSdkdmWOO76o9HyxC/zH4NB1Qc81 oZC7GucEn+DWYbi4tHlqpWFw67+RzMe+ep7+4ogzOlabWaLdy4c+FCDZp3F7W6/8d/GuQF km3ml28g+Jb69ibD2ZR7pAfhOz54zm0tRHA/HtptfaCgCpNmFj2W3gljUMqWn0jYO8Wma9 ETPChgyRtLhIMylY8AJWYgFc0GWT8uyk9Nj7YK6n4SOI8Qsr008hqfIjFi2uSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBifF/8JVYxbIi3b0CHrELUVMk+9CvB00Ms284jTzn8=; b=Q9unID85UwIAGemWKmBaZMg/0d3K2QRIitdIWmTcfrGG0MxAw+kIP2xGbkOx4RdMf0rA4l X7eRn6Rg98eMyP2jrW3XSvdAZppZfEvu77XlGkn4iUyLZhFjTXTUETm6HqTib/Q/uS3Mnv e8SR/btwrLzeti6FfSNgoFu9Or4SAkWJR+tpkVrswufgoi4YTAWsjs2GWKD72Bas9dduHC FYljPmuXt1jsqM2nmaSh11WgpGXEa8HuNC95mSayhNf+HZLc5BYsAmG1eYRwTDb6PFpI9s 2H7qEHh+n4AaNRYtFlokTTpBCBE/GZgbLkva0zuKutCGuiPvgyc6B9LR1apJVQ== 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 4VdMGS643mzs46; Mon, 13 May 2024 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DEPacg019193; Mon, 13 May 2024 14:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DEPax8019190; Mon, 13 May 2024 14:25:36 GMT (envelope-from git) Date: Mon, 13 May 2024 14:25:36 GMT Message-Id: <202405131425.44DEPax8019190@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: 3c05a91910d7 - stable/13 - dlopen(3): mention fdlopen for capsicum(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c05a91910d7ee809f884ca6ed46944bfda260e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3c05a91910d7ee809f884ca6ed46944bfda260e4 commit 3c05a91910d7ee809f884ca6ed46944bfda260e4 Author: Ed Maste AuthorDate: 2024-05-07 01:45:50 +0000 Commit: Ed Maste CommitDate: 2024-05-13 14:24:57 +0000 dlopen(3): mention fdlopen for capsicum(4) Capsicum-sandboxed applications generally cannot use dlopen, as absolute and cwd-relative paths cannot be accessed. Mention that fdlopen is useful for sandboxed applications. PR: 277169 Reviewed by: markj, oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45108 (cherry picked from commit d84fd89ecd404ffbf629381d2dde14fd79b39402) (cherry picked from commit f2109683ce37927d02965fc97e5757761caf89ed) --- lib/libc/gen/dlopen.3 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3 index 94dd1864c126..4719d2733fe5 100644 --- a/lib/libc/gen/dlopen.3 +++ b/lib/libc/gen/dlopen.3 @@ -29,9 +29,7 @@ .\" .\" Copyright (c) 1991 Sun Microsystems, Inc. .\" -.\" @(#) dlopen.3 1.6 90/01/31 SMI -.\" -.Dd May 14, 2020 +.Dd May 7, 2024 .Dt DLOPEN 3 .Os .Sh NAME @@ -201,6 +199,10 @@ The function can be used by the code that needs to perform additional checks on the loaded objects, to prevent races with symlinking or renames. +Applications sandboxed using +.Xr capsicum 4 +can also make beneficial use of +.Fn fdlopen . .Pp The .Fn dlsym From nobody Mon May 13 14:26:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdMHN2H6cz5KNKb; Mon, 13 May 2024 14:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdMHM3zCmz4ZDN; Mon, 13 May 2024 14:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liymykgxb/luAvyYvnPNjX2G//QXUnBFOZNEvG+uBjE=; b=Qg6HPmtNjDkM1ApDk99rXzC1MrifwPsy3VB3k41r3d3mNaHZVl7ECTShVBN4Svs+S7w+o2 qMrnFLKJMnWZZ8yFy+yBfxwIstCk+6AoyyW62hpnnUeFlyutB6xuzyywDHVxc+wZIvTbmO CzyOC/Rb2GhYov9HNNk/z1Q/vyIXHhDAmjRpaIpO0A7f6BCEy9RIcIWrFdLIbWY/HaWB8E kqZp0J8B1Gw1bwd8VIidbq25AEhS2iUni32AtmcL+x7Q71H7BDFNGqg6+cVQpAUC8AuvAf mbRCCTKD80ntNb98S3DTDzY1+15NRk5r3Sv1CE+TPrQ9pYsXphacbjmwRJsyLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715610383; a=rsa-sha256; cv=none; b=hX2wUFKOz+LWl0rRvWH1daPCDwcEZYYcZSdWtlNwijBpB//TLiR5PalH1LNeHO57jeCnRk j35hCOQ9AeEgxFUn0CNTyHQob/NCCzPmwesFy2jBzLrMjWGtWu3CqwPvTusfRUEHLV/aWz J/El3iTSD2+qtV0iLVfiR2goXe00xEgcNIWFFlijeoD158i6/MzP6S2lmDlCum6ztXchpl e4yCOnT81RLQMqWPDdG+QiZ9pxQlDDAOB4v16jDoKSde93vfwxuSGoUfjdXis/fwGp0C0M EK2ymKBd1YNeaej3SluZIpKIp+Y0QDaOg77dAUs1U1hTDvza6GyMYeo9Kl4Hlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liymykgxb/luAvyYvnPNjX2G//QXUnBFOZNEvG+uBjE=; b=Kc6u9HkhvzWRNYW90ncT8ZNhgSuLy3psdtQkezj+WPwE9ZYfLSiCVOx+M7oSNBsh0SFxS0 ushGPiXf/L92OGgrYkh1cdu8NvB2Ffs+dWBr0zGTUyTQjSSXHZF3TPTRq+DTeO69bjmSP5 svOM3iVO4VT5G1TkDju8rO6LdIbXIc1lInIP40RUq6xrcrQr82CqTz5I3CpE+bAVNKa9WK Uz592O1Q7kluJJnM/qpXBv2AmcyEBIClppznd3GkApJX2WXJOGpEyzGXnfBUBFs3QqdIi/ dIfOvDup22B8FaKtJzLGaBIvSZsTjJYgAirkePKQjb8qYW81cZq/fSgzcv1oaw== 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 4VdMHM3Y63zrjJ; Mon, 13 May 2024 14:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DEQN2W021770; Mon, 13 May 2024 14:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DEQNuS021767; Mon, 13 May 2024 14:26:23 GMT (envelope-from git) Date: Mon, 13 May 2024 14:26:23 GMT Message-Id: <202405131426.44DEQNuS021767@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: c595a834ebbd - stable/13 - clock_gettime.2: Clarify CLOCK_* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c595a834ebbd4b6fa49b40c8f9cb4e3dda082c4b Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c595a834ebbd4b6fa49b40c8f9cb4e3dda082c4b commit c595a834ebbd4b6fa49b40c8f9cb4e3dda082c4b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-08 19:54:10 +0000 Commit: Ed Maste CommitDate: 2024-05-13 14:26:10 +0000 clock_gettime.2: Clarify CLOCK_* Clarify that CLOCK_* (e.g., CLOCK_REALTIME) do not necessarily default to CLOCK_*_FAST. PR: 259642 (cherry picked from commit 16e4487e5f82e1ff501fe5af6afbfbd0435a1cbf) --- lib/libc/sys/clock_gettime.2 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2 index 7b325a2bb394..ed469153a40e 100644 --- a/lib/libc/sys/clock_gettime.2 +++ b/lib/libc/sys/clock_gettime.2 @@ -94,19 +94,28 @@ Returns the execution time of the calling thread. .El .Pp The clock IDs +.Fa CLOCK_REALTIME , +.Fa CLOCK_MONOTONIC , +and +.Fa CLOCK_UPTIME +perform a full time counter query. +The clock IDs with the _FAST suffix, i.e., .Fa CLOCK_REALTIME_FAST , .Fa CLOCK_MONOTONIC_FAST , -.Fa CLOCK_UPTIME_FAST -are analogs of corresponding IDs without _FAST suffix but do not perform +and +.Fa CLOCK_UPTIME_FAST , +do not perform a full time counter query, so their accuracy is one timer tick. Similarly, .Fa CLOCK_REALTIME_PRECISE , .Fa CLOCK_MONOTONIC_PRECISE , +and .Fa CLOCK_UPTIME_PRECISE are used to get the most exact value as possible, at the expense of execution time. The clock IDs -.Fa CLOCK_REALTIME_COARSE , +.Fa CLOCK_REALTIME_COARSE +and .Fa CLOCK_MONOTONIC_COARSE are aliases of corresponding IDs with _FAST suffix for compatibility with other systems. From nobody Mon May 13 14:27:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdMK60LhHz5KN4Y; Mon, 13 May 2024 14:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdMK55Phhz4dwn; Mon, 13 May 2024 14:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NR6CTOhQoOvicVWi7WaLCgpHhgzWb41p2CujCRO9WxI=; b=qUIPA0GZDiRO99G9aGiG9BIBBiSMeRqjU5Rn+hyMzCdEXNTWuz9WGxr2P6Y2zSVbMGrwya JOUOz7nXjn8UEIYZEI8Xmhg+zTKe0dUOVKrfKipbRTzmNA9uHQvz4hlQ6rXdtocJo7+K+b AofaVFIyr1UN936qyfy/wUDdu8Jhmbq7euIG8dVypXCx2GQ4EMuQZ6w3FqzTNE9lODDFkD PqD7S/8oSdmep48FIdfseN2rLq6VoMIfzSrN13yiyH5TFL0EC8OdNOun+MLaeSwrzauBWT qLFuJ0FdY9Q5WTsx3nNRukQ9Ml15eEL4bh1JvwT6rlylDbzpVc0gow7mk4b+wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715610473; a=rsa-sha256; cv=none; b=TOcW0RCj8GOvGueMXwyiNml6NdK+nG9fliXhUGNmwOnxllQVZ9FJTj/gza+RZdq7CtSnvL w4t5GoB9pWgGedzEyuztxvzdhtxLca/5P8n4VH6fUmHVOGEAqWJytKIWHGbY4QM9YvG/3o VldCyYIpRQtduJWnMq/SJWaqCVOi/0vInlsvsbqaoWiIeiiugl4w3RN3o4/XIgTzY0PEH8 T8FGgNCf0wAGjRFnerI8Bf+ya5NQLcWzitelcbOi6+BdXpGUrWcVDQQKDwiKvv1x5P9PLg +Sa7oZDHtII2D2ZsaSmr5xokzgl8EzqrVgAdcqvQHYTlFP+17qNIllLs6ZPaZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715610473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NR6CTOhQoOvicVWi7WaLCgpHhgzWb41p2CujCRO9WxI=; b=kBXb8CzOI1lFeJoNchJ4qeMS0K+QC0NX725j9MCKW9uUKOPgcXZkTAI2PrHIMUGCJuGOil 4IKfvajUBUy/T9+yxWKnuCmHKSiRTdVgGhWhEV90EzemDQ/DpHtSUltCWHTK18G4F6XQPX a0QPUcmleXyJtmHiwNjNf6MUiFHTuwV0BfZmH325fPenM28CjJDgiAztljyJDODZB+q9SM EoX3dczpub3f1+gstJ90C+cWq4Q1ZaHqWaj9y/YK4+nC9FFfGdetHc1xNkl5xx1A+gkDVq PIcRGojArIvyeV2audf6pFqfGcBoT7arhExoLCMYn5xwFfSDxSrPCQFjdeEU8Q== 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 4VdMK54RPPzs49; Mon, 13 May 2024 14:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DERr46022092; Mon, 13 May 2024 14:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DERrHc022089; Mon, 13 May 2024 14:27:53 GMT (envelope-from git) Date: Mon, 13 May 2024 14:27:53 GMT Message-Id: <202405131427.44DERrHc022089@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: eca3db908c60 - stable/13 - clock_gettime.2: fix markup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eca3db908c602405b18196aa53832602c93933a6 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eca3db908c602405b18196aa53832602c93933a6 commit eca3db908c602405b18196aa53832602c93933a6 Author: Ed Maste AuthorDate: 2024-05-06 19:59:42 +0000 Commit: Ed Maste CommitDate: 2024-05-13 14:27:19 +0000 clock_gettime.2: fix markup The CLOCK_* constants are "defined variable or preprocessor constants" and so use .Dv. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45106 (cherry picked from commit 2d29d2ecebf8ea19221995b3ea2e3a7ac700bf81) (cherry picked from commit 0e0220d11addc60fe7ed6fca79aefac2a3a9af27) --- lib/libc/sys/clock_gettime.2 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2 index ed469153a40e..c8bef4c5424f 100644 --- a/lib/libc/sys/clock_gettime.2 +++ b/lib/libc/sys/clock_gettime.2 @@ -94,29 +94,29 @@ Returns the execution time of the calling thread. .El .Pp The clock IDs -.Fa CLOCK_REALTIME , -.Fa CLOCK_MONOTONIC , +.Dv CLOCK_REALTIME , +.Dv CLOCK_MONOTONIC , and -.Fa CLOCK_UPTIME +.Dv CLOCK_UPTIME perform a full time counter query. The clock IDs with the _FAST suffix, i.e., -.Fa CLOCK_REALTIME_FAST , -.Fa CLOCK_MONOTONIC_FAST , +.Dv CLOCK_REALTIME_FAST , +.Dv CLOCK_MONOTONIC_FAST , and -.Fa CLOCK_UPTIME_FAST , +.Dv CLOCK_UPTIME_FAST , do not perform a full time counter query, so their accuracy is one timer tick. Similarly, -.Fa CLOCK_REALTIME_PRECISE , -.Fa CLOCK_MONOTONIC_PRECISE , +.Dv CLOCK_REALTIME_PRECISE , +.Dv CLOCK_MONOTONIC_PRECISE , and -.Fa CLOCK_UPTIME_PRECISE +.Dv CLOCK_UPTIME_PRECISE are used to get the most exact value as possible, at the expense of execution time. The clock IDs -.Fa CLOCK_REALTIME_COARSE +.Dv CLOCK_REALTIME_COARSE and -.Fa CLOCK_MONOTONIC_COARSE +.Dv CLOCK_MONOTONIC_COARSE are aliases of corresponding IDs with _FAST suffix for compatibility with other systems. Finally, @@ -138,7 +138,7 @@ struct timespec { .Ed .Pp Only the super-user may set the time of day, using only -.Fa CLOCK_REALTIME . +.Dv CLOCK_REALTIME . If the system .Xr securelevel 7 is greater than 1 (see @@ -186,14 +186,14 @@ and system calls conform to .St -p1003.1b-93 . The clock IDs -.Fa CLOCK_REALTIME_FAST , -.Fa CLOCK_REALTIME_PRECISE , -.Fa CLOCK_MONOTONIC_FAST , -.Fa CLOCK_MONOTONIC_PRECISE , -.Fa CLOCK_UPTIME , -.Fa CLOCK_UPTIME_FAST , -.Fa CLOCK_UPTIME_PRECISE , -.Fa CLOCK_SECOND +.Dv CLOCK_REALTIME_FAST , +.Dv CLOCK_REALTIME_PRECISE , +.Dv CLOCK_MONOTONIC_FAST , +.Dv CLOCK_MONOTONIC_PRECISE , +.Dv CLOCK_UPTIME , +.Dv CLOCK_UPTIME_FAST , +.Dv CLOCK_UPTIME_PRECISE , +.Dv CLOCK_SECOND are .Fx extensions to the POSIX interface. From nobody Mon May 13 15:43:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdP0N5tBZz5KVCJ; Mon, 13 May 2024 15:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdP0N31fkz47Cy; Mon, 13 May 2024 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715615012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZbvRz9GWmYd6+jmkj9R8C0JQosnCbOOsuM5UdOBlJew=; b=NOrzyGgJfH3u+oVmGRTfBcMAUKztnAa++LP6B0c3OUFJZS8HrTN+v1fI6rh1bu/QZxtQgC b70zMOAsD3fMDKhRn/02kzwNUVXhhtYAs3ty4Mg9vMvWGf54d0CyjCVyrsLV3mx1aHD1Me qExLyf4LgoWaEZHC/vv8c6oJaIatXeIiq2DlQse+yeXBiUu91SHLki+mbEMDHidEilqgba xeF35ym+rf8mmi1796NGQ/6qi3E2KGjUFZ1YieDR04o0iwsK7MswLC7V1Pzn7NW25X2kMM gqChNMqw1rep/7eajKUku2IZyKB8wRWg7s6bceyRQQ6AkPK1/WG7CwwUx4Skng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715615012; a=rsa-sha256; cv=none; b=waFuU8+AILsDhDKnlh2q79zBBshm4ZYuhfWS2IcS1gyVIbrCR8NKzl6f/9+YrJeee9pXGa OsqXGifZHFOPBs/zS5AZXi+H3NQy5njcsOdGTajs6XDt1edg1GCZBEyIo58c+wXrEDV/ay 12lGOCmH7O2prEEapP2osVUYLV/4NTbDe1XEkX7yK621gSmupJVTd4xdm6/FgO0F5zG5PZ R975KEFR6ng0UgbX9CwDz+tHl7e4OPM+EV1gQDPmAz+sMmQl1CqEfOJsZng4sRelynrMVU P4L0eICGBvhLU1e0ozVzc/ZSxfHHnL4m2dklXl8y5DEiamZxQC7wYLoPiahfHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715615012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZbvRz9GWmYd6+jmkj9R8C0JQosnCbOOsuM5UdOBlJew=; b=cOfaQpx6zP7TolY7ygzJoxxZbkWimoNEL/qJCw5GJLJxsxS3Kpgnnww4ImM7n3k3+4sWTh tM/muX5KMZiWEMIOB1SV1RKlkNfXQrbtN7ggSJ0p7bhyVQdkf4TDNsX36fLxjLOVTH++eb ZdUOuV1eEdv6jj07znGQ5LhiEgXxjzlEHxTnhFEgXZD1fI54BIDwgAeIWMwJIB4zLPrire SKDLnQutIF3zV74VvCKtk5+sSE2xCxJ2fEVRbaDhPfhZMyIg9SYiE5Jawudu12ujO0NuqE u2b7pgM52oCJm69vDrvETI3Tu0Dg33RfjHa5bpwDmN1FL7k2GEbW4/+tjVRtOA== 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 4VdP0N2Q6czt2X; Mon, 13 May 2024 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DFhW6m057225; Mon, 13 May 2024 15:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DFhWKc057222; Mon, 13 May 2024 15:43:32 GMT (envelope-from git) Date: Mon, 13 May 2024 15:43:32 GMT Message-Id: <202405131543.44DFhWKc057222@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: 14c2c7913c90 - stable/14 - libpfctl: fix incorrect pcounters array size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14c2c7913c908e4c446cb809e1d7a620cedc16b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=14c2c7913c908e4c446cb809e1d7a620cedc16b6 commit 14c2c7913c908e4c446cb809e1d7a620cedc16b6 Author: Kristof Provost AuthorDate: 2024-04-26 14:07:38 +0000 Commit: Kristof Provost CommitDate: 2024-05-13 15:28:02 +0000 libpfctl: fix incorrect pcounters array size The array is 2 x 2 x 2, not 2 x 2 x 3. Sponsored by: Rubicon Communications, LLC ("Netgate") MFC after: 2 weeks (cherry picked from commit a3f7176523e8611b259cefd7431c01e24f446db7) --- lib/libpfctl/libpfctl.c | 2 +- lib/libpfctl/libpfctl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index f43fb78d9a0f..7dc375717acc 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -250,7 +250,7 @@ pfctl_get_status(int dev) _pfctl_get_status_counters(nvlist_get_nvlist(nvl, "scounters"), &status->scounters); - pf_nvuint_64_array(nvl, "pcounters", 2 * 2 * 3, + pf_nvuint_64_array(nvl, "pcounters", 2 * 2 * 2, (uint64_t *)status->pcounters, NULL); pf_nvuint_64_array(nvl, "bcounters", 2 * 2, (uint64_t *)status->bcounters, NULL); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index edaffdd12118..a2991cc05b04 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -62,7 +62,7 @@ struct pfctl_status { struct pfctl_status_counters lcounters; struct pfctl_status_counters fcounters; struct pfctl_status_counters scounters; - uint64_t pcounters[2][2][3]; + uint64_t pcounters[2][2][2]; uint64_t bcounters[2][2]; }; From nobody Mon May 13 15:43:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdP0N2Tfdz5KV98; Mon, 13 May 2024 15:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdP0N1dDmz46r5; Mon, 13 May 2024 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715615012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PrMry7XcyxH+NRcceOX3ckDdPcEQF7ET9fbJO7+ow/A=; b=R3nrRJ+FEOTb5cAF1lg7b5WVAT4BvtLHWyVqy4skz9x0fBCy8ouBhMUiQf+LRDbY/WlYCP DTNg3ZmqyyLln29agbwe7Yb8KVNs9lN+ggbdCs76ArqOH3gc3bEGHG4P6CWLlViPsrhmGk f6Lo/NVy1P/Og8ToEng04OlQBiAiV4nTxWejHUEMjNDnE75fRIOjrdhdubCe25YdEP03Ae FxNY9icYxmzhfoE4VENUhfeZ7OtKWPlAw+xHgHpYrkL/FON4nMjc/Y+7rPojaKWytEQ6LZ rt6ExYpKXuJmgq0Wk2eDSPGZebSnqHihuQ9S4rmGspbWkQxtPDtT1Iiz7ooffA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715615012; a=rsa-sha256; cv=none; b=Vt4rccuXoSjAdkGZQaBXhhrUAZn5ZiBS+C8HHOtEbCwK7P32sC55rzJyQbinju2Fis8O2I h1t5x8fy6EjNWhsHIFxVPUVnYGvY7hXrpf7CFYZXEHRfNkG2wp6SX60GBOmVCqdUvsg2Xc ngGHZOe55yviaDPY2jcxSS1bWGW8Br2hyRPa6qtnJklkYswMd5nopsV9mIAQXSxEITdouq Rm+l8kmks+7Eb6YDlKAueUZrylHBC38+/6z7MXkf+sqTyNykQhsLCWGyOITTryU5J10PMA g76In8ohO0Rmjw2+3EQ8sCaUS11hn5Clxrd2r2RhqgUOrNskQbaQpEnNwgUxkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715615012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PrMry7XcyxH+NRcceOX3ckDdPcEQF7ET9fbJO7+ow/A=; b=mZrRxlkeojD/YdGpAm6sGXXQKV7wUU9yHGSeJ/E5ONuI3MjmC6muqqy5jdSV1vIu6GjxS7 3DSmraAYl2Sv3pz1fjtLT1DC8JeAwtskTKPsmzKRZwXVvObFw3xt6bHxLRp1kdl95/c6cT l8K0PAaB19Lu5rYG3LbbRK6Wpc0rFfhAbxwwY8HP4Zy0P9VSGNilimFcSMfkUjy54FYzGu C7T7fK+//hBN6rI+ElO9oPXMckv371mh2YKtsZECPHN79fIFJQXhkuHQ9olxqOripLcVM0 oyrxDNy1xTFWAYu9PQ6QDv/ZEMns1LvoBbA25KBou6sAMqGB7SBo7sqNGsr0qQ== 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 4VdP0N0nXfztyw; Mon, 13 May 2024 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DFhWiJ057140; Mon, 13 May 2024 15:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DFhWY0057137; Mon, 13 May 2024 15:43:32 GMT (envelope-from git) Date: Mon, 13 May 2024 15:43:32 GMT Message-Id: <202405131543.44DFhWY0057137@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: 75a94658d372 - stable/13 - libpfctl: fix incorrect pcounters array size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 75a94658d3724e61f25ec3692d2665fce9ead195 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=75a94658d3724e61f25ec3692d2665fce9ead195 commit 75a94658d3724e61f25ec3692d2665fce9ead195 Author: Kristof Provost AuthorDate: 2024-04-26 14:07:38 +0000 Commit: Kristof Provost CommitDate: 2024-05-13 15:41:05 +0000 libpfctl: fix incorrect pcounters array size The array is 2 x 2 x 2, not 2 x 2 x 3. Sponsored by: Rubicon Communications, LLC ("Netgate") MFC after: 2 weeks (cherry picked from commit a3f7176523e8611b259cefd7431c01e24f446db7) --- lib/libpfctl/libpfctl.c | 2 +- lib/libpfctl/libpfctl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index be45746368de..f5ddbba79bfd 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -249,7 +249,7 @@ pfctl_get_status(int dev) _pfctl_get_status_counters(nvlist_get_nvlist(nvl, "scounters"), &status->scounters); - pf_nvuint_64_array(nvl, "pcounters", 2 * 2 * 3, + pf_nvuint_64_array(nvl, "pcounters", 2 * 2 * 2, (uint64_t *)status->pcounters, NULL); pf_nvuint_64_array(nvl, "bcounters", 2 * 2, (uint64_t *)status->bcounters, NULL); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 78d981c2d769..308be03fbd1a 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -60,7 +60,7 @@ struct pfctl_status { struct pfctl_status_counters lcounters; struct pfctl_status_counters fcounters; struct pfctl_status_counters scounters; - uint64_t pcounters[2][2][3]; + uint64_t pcounters[2][2][2]; uint64_t bcounters[2][2]; }; From nobody Mon May 13 20:17:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdW4N6zXcz5KtMM; Mon, 13 May 2024 20:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdW4N5nNwz4kYy; Mon, 13 May 2024 20:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715631444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+y+SIjAU8JaD+63UFRJ82MNuaZL1VYZCjb/YDKTAwTQ=; b=o5QDp1CEoaBZ5g4FvMmMtqNktSwTm8YBBQQz7bNWanh+IaRgsI7HDSYrYWzPiPnsB6KSKC dBfRlAwmYPfjFWoS5lhgKwRkMhhSNgXAq/cvzgtkpj++RSdVMHuISqt9pbzXif1gvXYXHS xzJU3TVNliEE+vpseVA3J1LR8BqnKWnmFBpTqo0GBZ0bHZAlomfqlGeDc6dclJaFQm/4XI Nw0NvbD8lnUIWDEcEteFoqimd60fapX9AxM4W0w+Q6s1doxXRi4XJwQrmaHEvlTkDBSOOX WSMxc8P3jRpxqyHScEka2YQpsN1kTbydkv8nSFcqPb1uuvGONo4KdvmCBmYKoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715631444; a=rsa-sha256; cv=none; b=cx5LzF725XnIgjpxqo0wrDg6N3uZ2rbSc1kmVcVII+PvaJq/ydSN8smec36NNQhUwwuJpj wqMOj1c4rNT149ukeFn1UegIu751hd/rUfIbIeZ0+xHFUtDlKerc7ooBvcK+4TJrPvHkHM xSuwAmQ7X5zuVcudsKxwn96etlVdTdhmwGa1NIr8OVGRgk6v9aCDua0x3SSYRM/pIYxqDF 2YZ2enm97xqNNRg4tLOB+4409N9Hh526QokAeZgYZH5BvdRYeoYQ31hIIrLAadLeIa+hvQ m/drB4wMMDNd4rC/HYcS+9+EPa+Oe2rWt+icIc0DR5Gicv5LQFqrSL3kIdeAtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715631444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+y+SIjAU8JaD+63UFRJ82MNuaZL1VYZCjb/YDKTAwTQ=; b=JjBN9szuCgbc2uxN7qj/qncU7OA/CEpn2r4ksqZRMr2UQIFscqyTyIM3ucwPey6oFHn8Iw k4t8hpmzA2ZlmMakLjJAAxLsCDUJyZdavxMNr2qp7tmjp/RBmqSsYURjRPk+OtljfJRBiI TaR82FbKXhZZ5xni6TfS2inY7jplDpGBAd6r8bjpMl83aKYERgL7YSc7KNMbfuNsQIpYmt nS9Hr2c1MTSYXOYD2ha9vBy7VX2JqRoM9VS7hMAjVG6gK1ZDE2vMmP/sD6GdV/8ooTY2hF IURdqv23HiMaLmFb4vn4T/8qF6sGyYJhE00/0VZhWkjUuKBdU/K8CitjnEwGaA== 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 4VdW4N5GZrz12bG; Mon, 13 May 2024 20:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DKHOJj019804; Mon, 13 May 2024 20:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DKHOk8019801; Mon, 13 May 2024 20:17:24 GMT (envelope-from git) Date: Mon, 13 May 2024 20:17:24 GMT Message-Id: <202405132017.44DKHOk8019801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 8f0bd08e9869 - stable/14 - lld: work around elftoolchain bug which causes bloated RISCV binaries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f0bd08e9869ac1e6ad1f0f9c3964a76457cbce1 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0bd08e9869ac1e6ad1f0f9c3964a76457cbce1 commit 8f0bd08e9869ac1e6ad1f0f9c3964a76457cbce1 Author: Dimitry Andric AuthorDate: 2024-02-14 19:41:09 +0000 Commit: Mike Karels CommitDate: 2024-05-13 20:09:29 +0000 lld: work around elftoolchain bug which causes bloated RISCV binaries The elftoolchain strip(1) command appears to have trouble with the new .riscv.attributes sections being added by lld 17 to RISCV binaries. This causes huge 'holes' in the files, making them larger than necessary. Since nothing in the base system uses the new section yet, patch lld to leave it out for now. Direct commit to stable/13, since this intended to go into the 13.3 release, while the elftoolchain bug is being investigated. Cherry-pick to stable/14 from stable/13 for the 14.1 release; the bug has not been fixed yet. Hopefully it will be fixed (or the code replaced) in time for 14.2. When that happens, this can be reverted. Reported by: karels Submitted by: jrtc27 (cherry picked from commit 42ceb92e6a544fa0956eb660b3c16e38189acf20) --- contrib/llvm-project/lld/ELF/Writer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/lld/ELF/Writer.cpp b/contrib/llvm-project/lld/ELF/Writer.cpp index 8a08b0fcc90d..0c1bd27bb1fe 100644 --- a/contrib/llvm-project/lld/ELF/Writer.cpp +++ b/contrib/llvm-project/lld/ELF/Writer.cpp @@ -2148,9 +2148,13 @@ template void Writer::finalizeSections() { addPhdrForSection(part, SHT_MIPS_OPTIONS, PT_MIPS_OPTIONS, PF_R); addPhdrForSection(part, SHT_MIPS_ABIFLAGS, PT_MIPS_ABIFLAGS, PF_R); } +#if 0 + // XXX: This stops elftoolchain strip adjusting .riscv.attributes, + // leaving large holes in binaries. if (config->emachine == EM_RISCV) addPhdrForSection(part, SHT_RISCV_ATTRIBUTES, PT_RISCV_ATTRIBUTES, PF_R); +#endif } Out::programHeaders->size = sizeof(Elf_Phdr) * mainPart->phdrs.size(); From nobody Mon May 13 20:58:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdWzq2PtJz5KxT5; Mon, 13 May 2024 20:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdWzq1sxYz4nRP; Mon, 13 May 2024 20:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715633911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liPmscFLYDM2pVj8//UwM4+OYuKVVEqWinHj6/FPfFc=; b=SAWuf34qPT++A1CUEV7S+WLm6V74VnAToCL9R5CdMEzoYairNMHt+2tYRHgd6hCZh/FuUU emzm+06bnHEJ6I4aK13HrryogGleS7IsAcWc6CoTmmMTEivPTAJcK2zhQTRrFSsQX8OXig qQnhkg+nAmEZXxs4MrIlIsX1ysQQh53Gyv+QwNx4u//7vd10BpXH/0K1sv/GzPQC/gf+78 dTcWEbnz758XNG0DqfcE9ZQDXH25t7bh+VDcRFdZXK7AQNpe5bmna3L3uSG38/iziYRfC3 Ls8S+swlOy2yDOOBZPH+Pz+UGN7NqBZn4ztezsLbhUSSWvw5PPNLzOEX1Oo5ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715633911; a=rsa-sha256; cv=none; b=QPqT0BAs4P9R3+KmZp+NMvR8CcmcBn7D72gTu7wv0hYmvlxUYFv0Qrw8iLXTnh1VQywjGG TlVIHaMpTXYw9ofF0sptkdQjgu3UJkhQKk442QqlK2lSFW2f2ut//mXCzIjYPHngQku771 KB08J6CSjB49CmXqGNa67e/4LJDVkp+5CAxFRR5QCCmVyA0Yp61QMQcm7yEIUOzH33qgaB sLYyy7VYh23wQujNJ6glSol2VOpVSrQp6gYeff4b+zqYkxILgTQz7Ts8dwmrXmJNnxoi2G LGr1W5Zp7Mb0jNK0QRECL1ONaeT3U+ivW0LRrltl+rd/7UxY6ftgtJgDoKTt4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715633911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liPmscFLYDM2pVj8//UwM4+OYuKVVEqWinHj6/FPfFc=; b=I0kGMD0dBDcLzWZsrK3RyeDf0z3adVQvxpoATymBJGPGj6E9LU/T6oCYEnUW0Mskz3nHWz 7kNSSFD5fy5VWskA/fmzXnlmq+l0CdX0xHkcBzRolkLpUQ+nXzeZuwipTQlvAAsjtPlS7p INOCV64okLl7RnNODwIII22wuSrNu4HG5oI2MdPPhJxwT4wySDgPcWf7Cr/5CjbkIgMlfo Ga7/SetBjuZmpVhqNrzAS8X7XvM1oOlMCYQkPfB+MV51JCpR9gBuJiqI9TrMHRad+BFbKl 95+NDObl8tSNCfLJaysdVenDaS8HzPTbEJyWQBoCO3sNVv11A9huW4C9JACGdg== 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 4VdWzq1BPKz13NL; Mon, 13 May 2024 20:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DKwVoO087109; Mon, 13 May 2024 20:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DKwVZg087106; Mon, 13 May 2024 20:58:31 GMT (envelope-from git) Date: Mon, 13 May 2024 20:58:31 GMT Message-Id: <202405132058.44DKwVZg087106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 975e833ff730 - releng/14.1 - lld: work around elftoolchain bug which causes bloated RISCV binaries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 975e833ff73005bd3b786de57e037b3bbd15fbab Auto-Submitted: auto-generated The branch releng/14.1 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=975e833ff73005bd3b786de57e037b3bbd15fbab commit 975e833ff73005bd3b786de57e037b3bbd15fbab Author: Dimitry Andric AuthorDate: 2024-02-14 19:41:09 +0000 Commit: Mike Karels CommitDate: 2024-05-13 20:58:20 +0000 lld: work around elftoolchain bug which causes bloated RISCV binaries The elftoolchain strip(1) command appears to have trouble with the new .riscv.attributes sections being added by lld 17 to RISCV binaries. This causes huge 'holes' in the files, making them larger than necessary. Since nothing in the base system uses the new section yet, patch lld to leave it out for now. Direct commit to stable/13, since this intended to go into the 13.3 release, while the elftoolchain bug is being investigated. Cherry-pick to stable/14 from stable/13 for the 14.1 release; the bug has not been fixed yet. Hopefully it will be fixed (or the code replaced) in time for 14.2. When that happens, this can be reverted. Reported by: karels Submitted by: jrtc27 Approved by: re (cperciva) (cherry picked from commit 42ceb92e6a544fa0956eb660b3c16e38189acf20) (cherry picked from commit 8f0bd08e9869ac1e6ad1f0f9c3964a76457cbce1) --- contrib/llvm-project/lld/ELF/Writer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/lld/ELF/Writer.cpp b/contrib/llvm-project/lld/ELF/Writer.cpp index 8a08b0fcc90d..0c1bd27bb1fe 100644 --- a/contrib/llvm-project/lld/ELF/Writer.cpp +++ b/contrib/llvm-project/lld/ELF/Writer.cpp @@ -2148,9 +2148,13 @@ template void Writer::finalizeSections() { addPhdrForSection(part, SHT_MIPS_OPTIONS, PT_MIPS_OPTIONS, PF_R); addPhdrForSection(part, SHT_MIPS_ABIFLAGS, PT_MIPS_ABIFLAGS, PF_R); } +#if 0 + // XXX: This stops elftoolchain strip adjusting .riscv.attributes, + // leaving large holes in binaries. if (config->emachine == EM_RISCV) addPhdrForSection(part, SHT_RISCV_ATTRIBUTES, PT_RISCV_ATTRIBUTES, PF_R); +#endif } Out::programHeaders->size = sizeof(Elf_Phdr) * mainPart->phdrs.size(); From nobody Mon May 13 22:24:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdYvL12m6z5L41Q; Mon, 13 May 2024 22:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdYvK75kMz3yHN; Mon, 13 May 2024 22:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkGWpBp9Oj4bLqstnEdLf12hJ2wXO1eUanMkfQIMWG0=; b=i1VVDDICHwgF/8UQYb9EvBhX4GJ2T2TcsqgmHkISyEG9uylYD5ZNuMQf0/KYZiH+/wxgyY Awby7+BxHL7rk8Hi7gOQx/CbXSj1We5Hu3/8NZ09kO+m+ju/U7W5VeLNV9n4EV7bIAZPl/ Mc8g6cALDnuqAeJNh04BVn3a2Mevy2aUAfMI+29HNy/umtO+dIT+hPcSLttrPpHN3Qjeyq hfIJ0GQsVgu1/JLmmBrfDfTWG2jJ/0BFbuee8AunPuVSugz35WynLvbl02aOCbSX7yp+Lz IZH97HT3Rgv3MWbq2z9dDbRK/oem3GT43lHzYO2PUpp9JsOxJyn7m6fWg5BV9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715639086; a=rsa-sha256; cv=none; b=ektqXHXbfHkB52hrSvOYG7jhAz3Tae7wSklpNcwJT88MLJ2EA99fLPnaIoDarttsR16Dxu jcVf3ogplC15/ttHsnIPO/eY691TSeGNP6ldxIh09FrylW7jsMx+IXjQvcb9hIo3Ack1mh hT4sm0rA6K09fG/+amAFXkVBQzXV12fqQdhde/QbzyMRxrrBaCfqSEBEqd2OddlC38dqdR MTdKLmKe4j5HnlfXg52p0lYZLVIBRqjAB/64FQpqk74GKfsOlBzgbkTqtacPAIT3JxLoZa WU1jXE1S7P6BsWlGgwQC0zar0+MoZZbjjbQK+7IF300/whhx4L5ONXMldDGr9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkGWpBp9Oj4bLqstnEdLf12hJ2wXO1eUanMkfQIMWG0=; b=Bfd5x1RSCixDn2KCrtFZ3DqKL/1GZg32gAro8TggikR8uiZE4RfvTov3p/h3ngGyahk5nN dGWHX73OdXZs8CLJX7mMlLDgW5ysu025ItQOovWvSWJZv0TP8mrcEG3hAgUC1w36ObjQ3N tuKTTfr6sWAdRwLc8JTPjGT8uoLvCV0ugx2mSky/706y+uq0NouVw0Nz4rdswfurQJaub8 /v4mq6ldhZkJOkPDkZoS0vsBXY369F7b2r7nYx/+gNe14ycibWEUxYlZobO8TvGx4OiNXZ WHH49u8H9SyExnn2VlIfqbR5XLsFpaMlRGASwKZrw0Hx0/EtBK16d3/hjCfrKQ== 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 4VdYvK6ZgVz15bQ; Mon, 13 May 2024 22:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DMOj3Y041090; Mon, 13 May 2024 22:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DMOjo1041087; Mon, 13 May 2024 22:24:45 GMT (envelope-from git) Date: Mon, 13 May 2024 22:24:45 GMT Message-Id: <202405132224.44DMOjo1041087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 166432191c5a - stable/14 - release: Use qemu when cross-building vm images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 166432191c5a46f60155a6cb14ce4c918c82be4d Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=166432191c5a46f60155a6cb14ce4c918c82be4d commit 166432191c5a46f60155a6cb14ce4c918c82be4d Author: Colin Percival AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival CommitDate: 2024-05-13 22:24:28 +0000 release: Use qemu when cross-building vm images For a bit over 5 years, we have used qemu when cross-building cloudware images; in particular, it's necessary when installing packages which might include post-install scripts. Use qemu in the vm-images target too; while "generic" vm images don't install packages, they still run newaliases and /etc/rc.d/ldconfig, both of which fail without appropriate emulation. MFC after: 1 week (cherry picked from commit 9287d1853c00267a0118401530debf9c0554ff28) --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 0eb549ec7bc2..6fd165528854 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -157,12 +157,13 @@ CLEANFILES+= ${VMBASE}.${FS}.${FORMAT} vm-base: vm-image -vm-image: +vm-image: ${QEMUTGT} .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ + QEMUSTATIC=${QEMUSTATIC} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ From nobody Mon May 13 22:24:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdYvM2VsQz5L431; Mon, 13 May 2024 22:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdYvM0gG4z3y5g; Mon, 13 May 2024 22:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JA1JAzbZhSDfQueLBkzazw3DxoDEZ3sb7QiOmavSguU=; b=INPIVjC4ijabYJoob9Vl45IAfRJZy7bK/Wj6XNk5eqsexkCczT5xrdhjkYHeKiuLHlk/2z DWYz4i6GepbB+d4XqvSAOZ3vJJhKavRbWrRraGdSiM4ZxTDlzb/zSiZw50Wwug26GQqP6g hAe8FPFrO+5ORz8qMvIAHofY/CbBbb97CxelX87PPTv/kLOXeukeg5KtvlPdEokZLNAN3C MMzDqlT8mkyHAD2PTOo8fXPuN28EOU62KFgiJ1n4//5JELFgyjA4ulf4NzHjhMughDPyAz GwdGLuMaaPIXZ/XUxorcmFUPKxoIHoaq5OU8WdV123kIGsLHyMoCJCoHWk6nZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715639087; a=rsa-sha256; cv=none; b=h2z9erOJVu9M/XqtOEC6LXT+t4Tj7mWdUi7OietIYqx7zfHrd7Dyuwtn+c839efdjr3UHU DLq+axx9UcOH9Bf1Z556Y8Aj4IiOlaRcpR/7JIsopOEiJPNN37sasYOyAhpzD7lsreiXbT GU+rJi7YISepO20FXArt3CYcfA1OQrmqS9dB9YoRgnhuF68GjxIh3IkmJr4GTXHn5tvao/ /JokFULGQ6d0B6zGiLG/LxA3MEHFkHtOuAJ9W2ivNqd5V0P8fU3Sos677PPVQHMmoblHk+ ZvsMZsjwePa7zKA0F8DzFq5mPRwVp8K+wMW9wRVM40J62yPNQzGrd4mMnF9xrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JA1JAzbZhSDfQueLBkzazw3DxoDEZ3sb7QiOmavSguU=; b=pWZtPanPdxMd3IZknFdsubjM8IwSJhM6YE0MG/v6LOxw1+LEWu8fRE5RQx0K6JP2jD96Dd v29D2yZHz8ZB3iCjgrtqH2oLUKdRnQKMa+BQb4LHoibPnmHgSsKU3wQWhwabsyKKe3HamX MchOXzXrVIW/JJ9NkI4OJcz0sHQ5tnGdSFlJ0Ix3R8Uy8AKbB1AcMgai3NbEpvCh/IrbAO wIRa+w5A5rke5qNcFJ+b/Ss0HV2q6LpRBujP/uMQbuc6qPaTq+GQHoUgDCfEHmaxSEAfW/ t+aF2pQIraNBB68OO2e1SE5csY9J9YxgZH6gvrTScb9g3B31epxZ2GNb8Aoi4w== 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 4VdYvM0Fh8z15hK; Mon, 13 May 2024 22:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DMOkY8041132; Mon, 13 May 2024 22:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DMOkhE041129; Mon, 13 May 2024 22:24:46 GMT (envelope-from git) Date: Mon, 13 May 2024 22:24:46 GMT Message-Id: <202405132224.44DMOkhE041129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c5342be39c1a - stable/14 - release: Rework vm_extra_pre_umount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c5342be39c1ab37ca41e74aabdd7f507a6c6e036 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c5342be39c1ab37ca41e74aabdd7f507a6c6e036 commit c5342be39c1ab37ca41e74aabdd7f507a6c6e036 Author: Colin Percival AuthorDate: 2024-05-06 20:26:52 +0000 Commit: Colin Percival CommitDate: 2024-05-13 22:24:28 +0000 release: Rework vm_extra_pre_umount The vm_extra_pre_umount function in vmimage.subr served two purposes: It removed /etc/resolv.conf and /qemu (if cross-building), and it provided a function for cloudware to override in order to make cloud specific changes to the filesystem before constructing a disk image. This resulted in a number of bugs: 1. When cross-building, the emulator binary was left as /qemu in the Azure, GCE, Openstack and Vagrant images. 2. The build host's resolv.conf was left as /etc/resolv.conf in the basic-ci and basic-cloudinit images. 3. When building GCE images, a Google-specific resolv.conf file was constructed, and then deleted before the disk image was created. Move the bits needed for running code inside a VM staging directory from vm_install_base into a new vm_emulation_setup routine, and move the corresponding cleanup bits from vm_extra_pre_umount to a new vm_emulation_cleanup routine. Remove the /qemu and /etc/resolv.conf cleanups from the cloudware configuration files (where they exist) since we will now be running vm_emulation_cleanup to remove those even when vm_extra_pre_umount has been overridden. Override vm_emulation_cleanup in gce.conf since in that one case (and *only* that one case) we don't want to clean up resolv.conf (since it was constructed for the VM image rather than copied from the host). releng/14.1 candidate. MFC after: 1 week Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 0b1c5628c74a37e2aa2aa3769c606d3e826302f8) --- release/scripts/mk-vmimage.sh | 3 ++- release/tools/azure.conf | 2 -- release/tools/ec2.conf | 5 ----- release/tools/gce.conf | 10 +++++++++- release/tools/oci.conf | 5 ----- release/tools/openstack.conf | 2 -- release/tools/vagrant-virtualbox.conf | 1 - release/tools/vagrant-vmware.conf | 1 - release/tools/vmimage.subr | 23 +++++++++++------------ 9 files changed, 22 insertions(+), 30 deletions(-) diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index ca6a359affbd..dfd91f43140d 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -97,13 +97,14 @@ main() { vm_create_base vm_install_base + vm_emulation_setup vm_extra_install_base vm_extra_install_packages vm_extra_install_ports vm_extra_enable_services vm_extra_pre_umount vm_extra_pkg_rmcache - cleanup + vm_emulation_cleanup vm_copy_base vm_create_disk || return 0 vm_extra_create_disk diff --git a/release/tools/azure.conf b/release/tools/azure.conf index b6526f21e474..9da2b19de694 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -53,7 +53,5 @@ EOF touch ${DESTDIR}/firstboot - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index a233bf5981c1..ce09ab0d2367 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -102,10 +102,5 @@ EOF # The first time the AMI boots, run "first boot" scripts. touch ${DESTDIR}/firstboot - if ! [ -z "${QEMUSTATIC}" ]; then - rm -f ${DESTDIR}/${EMULATOR} - fi - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } diff --git a/release/tools/gce.conf b/release/tools/gce.conf index aad4a74d2e39..5ad83bcded53 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -118,7 +118,15 @@ EOF touch ${DESTDIR}/firstboot - rm -f ${DESTDIR}/etc/resolv.conf + return 0 +} +# Do everything except deleting resolv.conf since we construct our own +# Googlized resolv.conf file in vm_extra_install_base. +vm_emulation_cleanup() { + if ! [ -z "${QEMUSTATIC}" ]; then + rm -f ${DESTDIR}/${EMULATOR} + fi + umount_loop ${DESTDIR}/dev return 0 } diff --git a/release/tools/oci.conf b/release/tools/oci.conf index c57a7683a500..a4fe54ad3031 100644 --- a/release/tools/oci.conf +++ b/release/tools/oci.conf @@ -90,10 +90,5 @@ EOF touch ${DESTDIR}/firstboot - if ! [ -z "${QEMUSTATIC}" ]; then - rm -f ${DESTDIR}/${EMULATOR} - fi - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf index 4c905fbae4ba..05d2d13bbb39 100644 --- a/release/tools/openstack.conf +++ b/release/tools/openstack.conf @@ -35,8 +35,6 @@ vm_extra_pre_umount() { echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> \ ${DESTDIR}/usr/local/etc/sudoers.d/cloud-init - rm -f ${DESTDIR}/etc/resolv.conf - # The console is not interactive, so we might as well boot quickly. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/vagrant-virtualbox.conf b/release/tools/vagrant-virtualbox.conf index 4dd7ca8953ad..9e0e430bbc88 100644 --- a/release/tools/vagrant-virtualbox.conf +++ b/release/tools/vagrant-virtualbox.conf @@ -14,5 +14,4 @@ vm_extra_pre_umount () { # Setup the Vagrant common items vagrant_common - rm -f ${DESTDIR}/etc/resolv.conf } diff --git a/release/tools/vagrant-vmware.conf b/release/tools/vagrant-vmware.conf index 52ff7f1aac1a..fff929829222 100644 --- a/release/tools/vagrant-vmware.conf +++ b/release/tools/vagrant-vmware.conf @@ -18,5 +18,4 @@ vm_extra_pre_umount () { # Setup the Vagrant common items vagrant_common - rm -f ${DESTDIR}/etc/resolv.conf } diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index eda22e061c6d..72540dad14a8 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -83,8 +83,14 @@ vm_install_base() { echo "zfs_enable=\"YES\"" >> ${DESTDIR}/etc/rc.conf echo "zpool_reguid=\"zroot\"" >> ${DESTDIR}/etc/rc.conf echo "zpool_upgrade=\"zroot\"" >> ${DESTDIR}/etc/rc.conf + echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf + echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf fi + return 0 +} + +vm_emulation_setup() { if ! [ -z "${QEMUSTATIC}" ]; then export EMULATOR=/qemu cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR} @@ -94,15 +100,8 @@ vm_install_base() { mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} ${EMULATOR} /usr/bin/newaliases chroot ${DESTDIR} ${EMULATOR} /bin/sh /etc/rc.d/ldconfig forcestart - umount_loop ${DESTDIR}/dev - cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf - if [ "${VMFS}" = zfs ]; then - echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf - echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf - fi - return 0 } @@ -136,15 +135,12 @@ vm_extra_install_packages() { if [ -z "${VM_EXTRA_PACKAGES}" ]; then return 0 fi - mkdir -p ${DESTDIR}/dev - mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg bootstrap -y for p in ${VM_EXTRA_PACKAGES}; do chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${p} done - umount_loop ${DESTDIR}/dev return 0 } @@ -159,13 +155,16 @@ vm_extra_install_ports() { vm_extra_pre_umount() { # Prototype. When overridden, performs additional tasks within the # virtual machine environment prior to unmounting the filesystem. - # Note: When overriding this function, removing resolv.conf in the - # disk image must be included. + return 0 +} + +vm_emulation_cleanup() { if ! [ -z "${QEMUSTATIC}" ]; then rm -f ${DESTDIR}/${EMULATOR} fi rm -f ${DESTDIR}/etc/resolv.conf + umount_loop ${DESTDIR}/dev return 0 } From nobody Mon May 13 22:24:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdYvN2Ycyz5L4HC; Mon, 13 May 2024 22:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdYvN1FYPz3xy5; Mon, 13 May 2024 22:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MafzNct8wA/w+NxqjHAn5Sf1FP9S7R+f6LPjGmPUqf8=; b=qO7pdI+BJBSZ59sBY75mcj8KstjgYA+1bY9m8v9/XTXwR3UH+7qG9ZD6UPj3WrbcF7s93F FcrRT1lSKS4RmekAXYRDrJghfo1r5o8qqnE5PpFsBvyEX1Y1wbhFWY4neg0jzuA0ru40jj VSB0LIZhvHRchoiKUeey4r9n+1e2fo/lEgNGPtEaNSsEZ7AQnahK2BUY/AOXxb3bCKJfsI YubujsPp4iUIkK651uTiFOIOODFckCot94HaUJNdOYF7IxSR4l4GrYiZrvSoOgNScf06Ev IDgcd+7FIQbk/eFq/Q9RRR7ONoUL5g8es+u15Be5Fg2x4GL+Om4fnnmdxpFx0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715639088; a=rsa-sha256; cv=none; b=HvXekaggTK47C6fVSPqKyPt8mZVBX8BVeEq2h8pujlvZImVzUaHbM+FRJR/gF1fLGLAgqt XL4CGJ9iLCeJ0jXI8XW4FIrOUlEANRYNMjVNfd2jB6+Gy6rEs6syibzX0u+0Cc4XxsQbIz mQAvhfjyNNrM8JxrpF4w7MODxWNdjrTS6L8Z/QTwMJsTJpBscZUiMNVbnKXnL8G+Rsh5vX oAlLTDxlTT0Dz/rzootC4/CIa32Yg8qAd03y+Xoo2G0MHAhpvaOP/TUSp++yZZ2zCXrIAS ct7tC5vKM1FBo4835c4rVkvzWs34VTCPATR8TSFjet650cvAh2rIRcRYYNiauw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MafzNct8wA/w+NxqjHAn5Sf1FP9S7R+f6LPjGmPUqf8=; b=JTLiFEJWe+I9G5zNaOfXE5PlSCE4MOcyjnPqEH2dcXaHf28yvit75QVFaO8ClDuDhZ1jw3 5ch+93zmxNwax8BKwjd3R5JhoEOuAw7VEprtnbcWj7bmpX44NYjsdFZwqoj3IKxOUppKYY 6cpDx42CKSHfaG674rNENqxxDdZ6IN+KBQtN/LH/YqycEaRL5NcKPjFhnu/z1VLa/ffUiD I6RLXrU9NXNLV/YPeSHhE45wD4DRZ7Ra7VDxyqCXkgENFzILS/fl1sajnSpJlErrQ8CLaS zaqJv1uYgdrtPZA7LrX4uX80Mwkr3zTEKQBWVtkQUkxl7JUuIUYorHgB3jbuHg== 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 4VdYvN0pJlz15sg; Mon, 13 May 2024 22:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DMOmL8041178; Mon, 13 May 2024 22:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DMOmp8041175; Mon, 13 May 2024 22:24:48 GMT (envelope-from git) Date: Mon, 13 May 2024 22:24:48 GMT Message-Id: <202405132224.44DMOmp8041175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: e306ad1c194d - stable/14 - release: make dependencies, not recursive make List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e306ad1c194d464708b4b12277d577d931e6eae9 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e306ad1c194d464708b4b12277d577d931e6eae9 commit e306ad1c194d464708b4b12277d577d931e6eae9 Author: Colin Percival AuthorDate: 2024-05-09 07:52:25 +0000 Commit: Colin Percival CommitDate: 2024-05-13 22:24:28 +0000 release: make dependencies, not recursive make For historical reasons, the vm-release and cloudware-release targets were written as recursive makes of ${VMTARGETS} and ${CLOUDTARGETS}; this worked fine until we started running `make release -jN` and had both VM and cloud targets depending on ${QEMUTGT}, at which point things exploded when we tried to build the port twice at the same time. Switch vm-release and cloudware-release to have make dependencies on their individual components; this way a single make process runs and is aware of the duplicate dependency (and only runs it once). MFC after: 5 days (cherry picked from commit ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb) --- release/Makefile.vm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 6fd165528854..95d48490c353 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -223,14 +223,16 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif -vm-release: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS} +vm-release: ${VMTARGETS} +.else +vm-release: .endif -cloudware-release: .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} +cloudware-release: ${CLOUDTARGETS} +.else +cloudware-release: .endif .include "${.CURDIR}/Makefile.azure" From nobody Mon May 13 22:24:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdYvP54h7z5L4Kv; Mon, 13 May 2024 22:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdYvP2kRfz3yfd; Mon, 13 May 2024 22:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FoUPuQQ0OdhqLJpjSIHnUwZmz78TUmrw/0+nHHqTkMg=; b=ps4svP84NW4zgRVmCaX3qZIt9TC7+qZH1OPbzMWG92V2EdvT+81wZJkKR+ZK7NB7iYmEIN 3TcJt6qQAfjJqLu0K4IptbgOwhd14nd3qXzgKc0SWGmwc6r+V737RoP59RgKq0BB6iRtVX VdODuBASQNtiHfjbn5Dha17tb3EFN3u8Zv0IbTntMtKv+zC85+NXjD5qzK4OonszNlN4yu +RukAaWPyNf++XRNzjnw1AkpbkXpV+RR1p82bFtBM45ahiMKXNxF99URzl8B4QI6hZ2dto twJCHnWn3AbdUT4Juh2L7U4ZSH4kgWws3tT5dq86ezvFKhiw3MwOjWwCBsFAyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715639089; a=rsa-sha256; cv=none; b=HUujLSVRAX73AVAW/13YEharXaxWxAMAW5doop+9k+15bEqCyfg+UJgpE4YpZdKMGRSEVi xK0aF8NPP4dJ7zyB7b47b89aIFvrXS8WO6EN5AfKxYcLJAQvxRs3tkNjDv70kpec8m6Zf5 4IqNBEnpWUOR74nbjR57nKxfOyxmeZKJnHgNBz7y76EYM9JGmzj/Hj2OodHiAodH2fG9Zw H5urayhXfbVHRhn1bwOIubbkadZ0GWpKvcYnQUfKrFaoe1TWnyTHaHwzNvWqWvny64WOG3 2KmpQK0XsCGi2X8KCn4Z0gLlWBxoBU0GZlbS2ibC8cGTf/+DyW1nQpiPED+zzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FoUPuQQ0OdhqLJpjSIHnUwZmz78TUmrw/0+nHHqTkMg=; b=uXhjLh3cAIBEdfLV3dHbzOzSazmjgBOMPhcorzCNqdJ11I0BuNwWL6udRl6MPsqn4gUgFt ODPWZxhme+iEagaN/s7v8F2rpZ0BKNPkkCz8iBDUiKacyMdp0z+I8Mbzolgr2ViuoRL1Ab D4lVioKpuLo7LcIXhkWunXaAMnG6Ocm9DhmWFacAtYRFllBNDR+eSnriAPF1AoLniLiM70 AMHlxTZNLubxec+rFDEJxtvJX7vHsLzPhttn8pU9uDl2OLPOsA4bWg/4f9n68MQ+orgiqS oRqv24YWTWhwz95Zyb+hH7DsGgR4W0IYt70Bcx/JPw5ek1sQlvpdKZuRmHeyHA== 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 4VdYvP287mz15bR; Mon, 13 May 2024 22:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DMOnbR041229; Mon, 13 May 2024 22:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DMOnVt041226; Mon, 13 May 2024 22:24:49 GMT (envelope-from git) Date: Mon, 13 May 2024 22:24:49 GMT Message-Id: <202405132224.44DMOnVt041226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c58d78f4fa99 - stable/14 - New sysctl to disable NOMATCH until devmatch runs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c58d78f4fa9919d63a2d7dfd29772152727bfa43 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c58d78f4fa9919d63a2d7dfd29772152727bfa43 commit c58d78f4fa9919d63a2d7dfd29772152727bfa43 Author: Isaac Cilia Attard AuthorDate: 2024-04-29 20:44:27 +0000 Commit: Colin Percival CommitDate: 2024-05-13 22:24:29 +0000 New sysctl to disable NOMATCH until devmatch runs Introduce hw.bus.devctl_nomatch_enabled and use it to suppress NOMATCH until devmatch runs There's a lot of NOMATCH events generated at boot. We also run devmatch once during early boot to load unmatched devices. To avoid redundant work, don't start generating NOMATCH events until after devmatch runs. Set hw.bus.devctl_nomatch_enabled=1 just before we run devmatch. The kernel will suppress NOMATCH events until this is set to true. This saves about 170ms from the boot on aarch64 running atop Apple M-series processors and the VMWare Fusion hypervisor. Reviewed by: imp, cperciva MFC after: 3 days Sponsored by: Google Summer of Code Pull Request: https://github.com/freebsd/freebsd-src/pull/1213 (cherry picked from commit 6437872c1d665c2605f54e8ff040b0ba41edad07) --- libexec/rc/rc.d/devmatch | 1 + sys/kern/kern_devctl.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index 78050cfa4541..67bb14761614 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -46,6 +46,7 @@ devmatch_start() if [ -n "$one_nomatch" ]; then list=$(devmatch -p "${one_nomatch}" | sort -u) else + sysctl hw.bus.devctl_nomatch_enabled=1 list=$(devmatch | sort -u) fi diff --git a/sys/kern/kern_devctl.c b/sys/kern/kern_devctl.c index 12d4f9ebfc4d..0dd05a49c9ad 100644 --- a/sys/kern/kern_devctl.c +++ b/sys/kern/kern_devctl.c @@ -89,6 +89,9 @@ static int sysctl_devctl_queue(SYSCTL_HANDLER_ARGS); static int devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN; SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, 0, sysctl_devctl_queue, "I", "devctl queue length"); +static bool nomatch_enabled = false; +SYSCTL_BOOL(_hw_bus, OID_AUTO, devctl_nomatch_enabled, CTLFLAG_RWTUN, + &nomatch_enabled, 0, "enable nomatch events"); static void devctl_attach_handler(void *arg __unused, device_t dev); static void devctl_detach_handler(void *arg __unused, device_t dev, @@ -208,7 +211,8 @@ devctl_detach_handler(void *arg __unused, device_t dev, enum evhdev_detach state static void devctl_nomatch_handler(void *arg __unused, device_t dev) { - devaddq("?", "", dev); + if (nomatch_enabled) + devaddq("?", "", dev); } static int From nobody Tue May 14 06:59:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdnJr4WFdz5KYfL; Tue, 14 May 2024 06:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdnJr3K87z4pkd; Tue, 14 May 2024 06:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=414uAsts6YODio8nexsL31XnNHX3vM6iIeL3EfvaOkE=; b=U+7+5JSc4HexT1IR1Douj7JMjsXT8KNJd6UvRt5iExcO0SkqZcpKElHr9qb+EmRaEDGZGX sDy83RT6WJ5nJ1MsUplJhiowtGbGFfcfW2HB2sRxWsbHIM19ia8dNoYGu5+1zA93nlOnNI gsltX7vetdDO6yG5MxJQNfebAhxB+JgrMD5a95hgyGj2J6sUYV1oItFC+GEcxWZ9/Yhxz/ vJviHzeaspLYsTAkViw3lboTkxRj3AXBkwyntTcTvHlZ+qLb1NxAXgtpPjtUob2WtTQEGy iNbRdBLq6lv31ND0/zKxmhdMfWv0pCJlqkkxShv93jH+PPl9vmA5kT44KRSX6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715669948; a=rsa-sha256; cv=none; b=IFgEKor82SYJfTkP0e+TwcIQFm6xGNrgW/85o5N+6i5LUQDEWvfmXcXiclqlPyNXanTK6Q 7ylJS4OozfO/oxssODs/SbTcfo3Noa73iAeAxSL9zfWL/LhC5JhWMOTzlDy+68GP1pSfex i8BDkjrKihHfdrr2MOlLrl8zTcMImf5UF6QCLRsFG+oivAxjk31d17VnU4uY1eLE/FAVb3 kVWjdZYJ6uCu1RWOU775c6fNlYZfYaKl1ylFMFvMrZ1MYOYYWrfq/3uTk66wP1PW3aHFEW dFC4aJGu7jf5lhjN0OzI9SPjREryoC0qQ1Zz1b4y2zMMjLL5PGwU6sPwr9GFWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=414uAsts6YODio8nexsL31XnNHX3vM6iIeL3EfvaOkE=; b=S8/vq1kXQ+8zFr5NXoJBYEQ09j49wp1aMYcdqBiR/TIMQ2JW4MLLb8gdO7j8WrCDVxxabR qgqUUxqncc/vZt6+jMKbnroFcE4alhrfSSvCbTYXxOIFIGQIuZUbmAZQVKnKdC9CfElsZq OREmbLhIOwUnydBz7ORpzhEt//O5ARVjYW4SRa/dTVLuBjt+eJ4ii4dicYgoq6Nwm9l46c Fmt8RwJf9Vrk+0xYkPghtxCe5tpQ8g/IQKJEQvI4+wrsuRQ9qNOew2uPgwiOfVSqtqihGs vQ30MWnustFDYXDFZ/X3cszjyYDYcPF/kzNzEOH5EY3gRSSnob3a1LLD5Uctkw== 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 4VdnJr2xNhzMGx; Tue, 14 May 2024 06:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E6x8lu004816; Tue, 14 May 2024 06:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E6x8P5004812; Tue, 14 May 2024 06:59:08 GMT (envelope-from git) Date: Tue, 14 May 2024 06:59:08 GMT Message-Id: <202405140659.44E6x8P5004812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 626ee3cac845 - stable/14 - tftpd: Add missing `-S` option to synopsis. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 626ee3cac8458b355d4330c2099240d3ca881589 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=626ee3cac8458b355d4330c2099240d3ca881589 commit 626ee3cac8458b355d4330c2099240d3ca881589 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-10 21:15:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-14 06:58:40 +0000 tftpd: Add missing `-S` option to synopsis. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D45129 (cherry picked from commit 816c4d3dcf99adcd40a03d93431237ddbd23bbdf) tftpd: Drop unneeded includes. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D45130 (cherry picked from commit 1111da6b7c612c571453a23a8dd02fd5e7e40b18) tftpd: Add missing include. This went unnoticed due to namespace pollution in our headers. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D45131 (cherry picked from commit ae285a8cbf1212bdc1b3f81219635bc1395fadee) tftpd: Satisfy clang-analyzer. * Replace `random()` with `arc4random()`. * Change some variable types. * Drop some unused assignments. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D45132 (cherry picked from commit 4d09eb87c5d5bec2e2832f50537e2ce6f75f4117) tftpd: silence gcc overflow warnings GCC 13 complains that we might be writing too much to an on-stack buffer when createing a filename. In practice there is a check that filename isn't too long given the time format and other static characters so GCC is incorrect, but GCC isn't wrong that we're potentially trying to put a MAXPATHLEN length string + some other characters into a MAXPATHLEN buffer (if you ignore the check GCC can't realistically evaluate at compile time). Switch to snprintf to populate filename to ensure that future logic errors don't result in a stack overflow. Shorten the questionably named yyyymmdd buffer enough to slience the warning (checking the snprintf return value isn't sufficent) while preserving maximum flexibility for admins who use the -F option. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D45086 (cherry picked from commit 25945af47e7a1d06c44c8c160045a866e90569ab) --- libexec/tftpd/tests/functional.c | 1 + libexec/tftpd/tftp-file.h | 1 - libexec/tftpd/tftp-io.c | 11 +++----- libexec/tftpd/tftp-io.h | 1 - libexec/tftpd/tftp-options.h | 1 - libexec/tftpd/tftp-transfer.h | 1 - libexec/tftpd/tftp-utils.c | 2 +- libexec/tftpd/tftp-utils.h | 3 +-- libexec/tftpd/tftpd.8 | 6 ++--- libexec/tftpd/tftpd.c | 56 +++++++++++++++++++++++++--------------- 10 files changed, 45 insertions(+), 38 deletions(-) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index f31d2a893da1..32e5f85cf421 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/libexec/tftpd/tftp-file.h b/libexec/tftpd/tftp-file.h index 0fb7f6c1decc..c424e5cbc75b 100644 --- a/libexec/tftpd/tftp-file.h +++ b/libexec/tftpd/tftp-file.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include int write_init(int fd, FILE *f, const char *mode); size_t write_file(char *buffer, int count); int write_close(void); diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c index b5f39423fd60..aaacc9dd7f45 100644 --- a/libexec/tftpd/tftp-io.c +++ b/libexec/tftpd/tftp-io.c @@ -72,13 +72,13 @@ static struct errmsg { #define DROPPACKET(s) \ if (packetdroppercentage != 0 && \ - random()%100 < packetdroppercentage) { \ + arc4random()%100 < packetdroppercentage) { \ tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \ return; \ } #define DROPPACKETn(s,n) \ if (packetdroppercentage != 0 && \ - random()%100 < packetdroppercentage) { \ + arc4random()%100 < packetdroppercentage) { \ tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \ return (n); \ } @@ -157,10 +157,8 @@ send_error(int peer, int error) pe->e_msg = strerror(error - 100); tp->th_code = EUNDEF; /* set 'undef' errorcode */ } - strcpy(tp->th_msg, pe->e_msg); - length = strlen(pe->e_msg); - tp->th_msg[length] = '\0'; - length += 5; + snprintf(tp->th_msg, MAXPKTSIZE - 4, "%s%n", pe->e_msg, &length); + length += 5; /* header and terminator */ if (debug & DEBUG_PACKETS) tftp_log(LOG_DEBUG, "Sending ERROR %d: %s", error, tp->th_msg); @@ -331,7 +329,6 @@ send_ack(int fp, uint16_t block) DROPPACKETn("send_ack", 0); tp = (struct tftphdr *)buf; - size = sizeof(buf) - 2; tp->th_opcode = htons((u_short)ACK); tp->th_block = htons((u_short)block); size = 4; diff --git a/libexec/tftpd/tftp-io.h b/libexec/tftpd/tftp-io.h index 85934e824a1a..1d6bc2bd8b5e 100644 --- a/libexec/tftpd/tftp-io.h +++ b/libexec/tftpd/tftp-io.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #define RP_NONE 0 #define RP_RECVFROM -1 #define RP_TOOSMALL -2 diff --git a/libexec/tftpd/tftp-options.h b/libexec/tftpd/tftp-options.h index c68db53de4e2..f1b0a5cfaf32 100644 --- a/libexec/tftpd/tftp-options.h +++ b/libexec/tftpd/tftp-options.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include /* * Options */ diff --git a/libexec/tftpd/tftp-transfer.h b/libexec/tftpd/tftp-transfer.h index 48431ebbc863..449f29c246e0 100644 --- a/libexec/tftpd/tftp-transfer.h +++ b/libexec/tftpd/tftp-transfer.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include int tftp_send(int peer, uint16_t *block, struct tftp_stats *tp); int tftp_receive(int peer, uint16_t *block, struct tftp_stats *tp, struct tftphdr *firstblock, size_t fb_size); diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c index b309a94f7653..8ce7c09c9992 100644 --- a/libexec/tftpd/tftp-utils.c +++ b/libexec/tftpd/tftp-utils.c @@ -204,7 +204,7 @@ struct debugs debugs[] = { { DEBUG_ACCESS, "access", "TCPd access debugging" }, { DEBUG_NONE, NULL, "No debugging" }, }; -int packetdroppercentage = 0; +unsigned int packetdroppercentage = 0; int debug_find(char *s) diff --git a/libexec/tftpd/tftp-utils.h b/libexec/tftpd/tftp-utils.h index 763b3b493c7e..276dedcf74cd 100644 --- a/libexec/tftpd/tftp-utils.h +++ b/libexec/tftpd/tftp-utils.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include /* */ #define TIMEOUT 5 @@ -100,7 +99,7 @@ struct debugs { }; extern int debug; extern struct debugs debugs[]; -extern int packetdroppercentage; +extern unsigned int packetdroppercentage; int debug_find(char *s); int debug_finds(char *s); const char *debug_show(int d); diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index 3de042197618..24a743a92e14 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" -.Dd July 20, 2023 +.Dd May 8, 2024 .Dt TFTPD 8 .Os .Sh NAME @@ -35,11 +35,11 @@ .Nd Internet Trivial File Transfer Protocol server .Sh SYNOPSIS .Nm tftpd -.Op Fl cdClnow +.Op Fl CcdlnoSw .Op Fl F Ar strftime-format .Op Fl s Ar directory -.Op Fl u Ar user .Op Fl U Ar umask +.Op Fl u Ar user .Op Ar directory ... .Sh DESCRIPTION The diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 78348a8c6aaf..00c1257ce548 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -172,7 +172,7 @@ main(int argc, char *argv[]) options_extra_enabled = 0; break; case 'p': - packetdroppercentage = atoi(optarg); + packetdroppercentage = (unsigned int)atoi(optarg); tftp_log(LOG_INFO, "Randomly dropping %d out of 100 packets", packetdroppercentage); @@ -463,9 +463,9 @@ static char * parse_header(int peer, char *recvbuffer, size_t size, char **filename, char **mode) { - char *cp; - int i; struct formats *pf; + char *cp; + size_t i; *mode = NULL; cp = recvbuffer; @@ -482,12 +482,11 @@ parse_header(int peer, char *recvbuffer, size_t size, i = get_field(peer, cp, size); *mode = cp; - cp += i; /* Find the file transfer mode */ - for (cp = *mode; *cp; cp++) - if (isupper(*cp)) - *cp = tolower(*cp); + for (; *cp; cp++) + if (isupper((unsigned char)*cp)) + *cp = tolower((unsigned char)*cp); for (pf = formats; pf->f_mode; pf++) if (strcmp(pf->f_mode, *mode) == 0) break; @@ -624,12 +623,20 @@ tftp_rrq(int peer, char *recvbuffer, size_t size) static int find_next_name(char *filename, int *fd) { - int i; + /* + * GCC "knows" that we might write all of yyyymmdd plus the static + * elemenents in the format into into newname and thus complains + * unless we reduce the size. This array is still too big, but since + * the format is user supplied, it's not clear what a better limit + * value would be and this is sufficent to silence the warnings. + */ + static const int suffix_len = strlen("..00"); + char yyyymmdd[MAXPATHLEN - suffix_len]; + char newname[MAXPATHLEN]; + int i, ret; time_t tval; - size_t len; + size_t len, namelen; struct tm lt; - char yyyymmdd[MAXPATHLEN]; - char newname[MAXPATHLEN]; /* Create the YYYYMMDD part of the filename */ time(&tval); @@ -637,26 +644,33 @@ find_next_name(char *filename, int *fd) len = strftime(yyyymmdd, sizeof(yyyymmdd), newfile_format, <); if (len == 0) { syslog(LOG_WARNING, - "Filename suffix too long (%d characters maximum)", - MAXPATHLEN); + "Filename suffix too long (%zu characters maximum)", + sizeof(yyyymmdd) - 1); return (EACCESS); } /* Make sure the new filename is not too long */ - if (strlen(filename) > MAXPATHLEN - len - 5) { + namelen = strlen(filename); + if (namelen >= sizeof(newname) - len - suffix_len) { syslog(LOG_WARNING, - "Filename too long (%zd characters, %zd maximum)", - strlen(filename), MAXPATHLEN - len - 5); + "Filename too long (%zu characters, %zu maximum)", + namelen, + sizeof(newname) - len - suffix_len - 1); return (EACCESS); } /* Find the first file which doesn't exist */ for (i = 0; i < 100; i++) { - sprintf(newname, "%s.%s.%02d", filename, yyyymmdd, i); - *fd = open(newname, - O_WRONLY | O_CREAT | O_EXCL, - S_IRUSR | S_IWUSR | S_IRGRP | - S_IWGRP | S_IROTH | S_IWOTH); + ret = snprintf(newname, sizeof(newname), "%s.%s.%02d", + filename, yyyymmdd, i); + /* + * Size checked above so this can't happen, we'd use a + * (void) cast, but gcc intentionally ignores that if + * snprintf has __attribute__((warn_unused_result)). + */ + if (ret < 0 || (size_t)ret >= sizeof(newname)) + __unreachable(); + *fd = open(newname, O_WRONLY | O_CREAT | O_EXCL, 0666); if (*fd > 0) return 0; } From nobody Tue May 14 06:59:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdnK8535Dz5KYWP; Tue, 14 May 2024 06:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdnK84927z4pnQ; Tue, 14 May 2024 06:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IlT8csYNzra8WFOGztHMw0PoIMVZU2g7TdRJSuQmtnc=; b=jN1XdM7OkxxxDk96Snj9MNRWBMcXkEyVjfdCLKhp1qVvd/FedA9qBUaZ4zTNzNVjVwaqjf LuRnQTXGZMojpTIDrX/KqLbGscSYhFBYo3TwAbRfwtARrJoyMKewQlw0uJAHoONByfZd/i DlcqweNBXQ2R49OtY744caPip3uNb3Uzk+ofOOJ7eS9WJBAVOozKMZ78+2YrUrOfNSk0EA SOL/tBzfuQDXaZOhUw61a0JHa8ZaJPmsBPwTq3SoPr8UGSmEpFM79LhMU0sTG4VpXS4kAc be3omKKodhFmpnY4/jR+8nDOOB4oz1aDzjc+4ngSax07aGxWXzxmojBAmUAnEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715669964; a=rsa-sha256; cv=none; b=gE0J85fKUL7OJJ40wy7pTorUJjjKli/P5GlK18aGL/L9xiguIMGmSwy8whQ5EJruoU0Olb sXYTqe+zer2FSuo6aZXT+bmqbEHFowWGpnoTqWy2RPDl+WafsWapIblr5VpZb21Lm0bwFm uKlYsoXhwfIe7v6XsObLHxGsVluY8pL2yNGmSku/mCzGPJyjxYYzXcfAWIuJpgkDaKoLIP +5gWx9rGgmmaqWwEhd2XlP+w38sZVE6PK6GGI+wLynLmc0nSBNB5Kyp/wrT8fkdj6ooWT2 CiT98EmjH6yyvU1ADQc0QuifmnfIzpOvwhEnxHc/4ezCX2gaE6npDSLoppWoKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IlT8csYNzra8WFOGztHMw0PoIMVZU2g7TdRJSuQmtnc=; b=FMJGuJNzmDaLn3zFBXPF5ME8zxIPNxbCnIfg02d8ljgXFTa/e1HGGfJn411PI+MJRFNdQq GDqCUJM5bEw6p4KStB7MUdiotoRApsdb0T+FHqja81Q0u6RrmlFNcuU7Ddoiw6ksQ8Ddaf cLO8UeAfxVKy0VkqttqL7hXI1ZrNTmEqFWxD0K1PlpWzehsf8uN24c1USUTZXRGd9Q20us Q3nPECQJqh+Gh0UD/AZ63+2RzuU/Vm9YHo9jZAZm/bXES+6siKq/tNUhev2wDQOdPgwgu7 +m/Es1FJAfyXWIc3jcZtnFOa7HPe7ItP2kyMVtvFBr6w4sUGZMLzuBw/jcHSKA== 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 4VdnK83lpMzM5K; Tue, 14 May 2024 06:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E6xOvk005033; Tue, 14 May 2024 06:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E6xOx2005030; Tue, 14 May 2024 06:59:24 GMT (envelope-from git) Date: Tue, 14 May 2024 06:59:24 GMT Message-Id: <202405140659.44E6xOx2005030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7f97e3f47149 - stable/13 - Add man page for nfslockd. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f97e3f47149ee44b06e3877f1bab1834c6a9307 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7f97e3f47149ee44b06e3877f1bab1834c6a9307 commit 7f97e3f47149ee44b06e3877f1bab1834c6a9307 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-10 09:23:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-14 06:59:12 +0000 Add man page for nfslockd. PR: 130238 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45139 (cherry picked from commit 44e72c6e2e6bcfa2cba89afb92fa05f6ac4d5660) --- share/man/man4/Makefile | 1 + share/man/man4/nfslockd.4 | 45 ++++++++++++++++++++++++++++++++++++++++++ usr.sbin/rpc.lockd/lockd.c | 3 ++- usr.sbin/rpc.lockd/rpc.lockd.8 | 5 +++-- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 83bec8e9f66a..1ea3431c859a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -343,6 +343,7 @@ MAN= aac.4 \ netlink.4 \ netmap.4 \ ${_nfe.4} \ + nfslockd.4 \ ${_nfsmb.4} \ ng_async.4 \ ngatmbase.4 \ diff --git a/share/man/man4/nfslockd.4 b/share/man/man4/nfslockd.4 new file mode 100644 index 000000000000..770d9b8736b0 --- /dev/null +++ b/share/man/man4/nfslockd.4 @@ -0,0 +1,45 @@ +.\"- +.\" Copyright (c) 2024 Dag-Erling Smørgrav +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 8, 2024 +.Dt NFSLOCKD 4 +.Os +.Sh NAME +.Nm nfslockd +.Nd NFS advisory locking +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines in +your kernel configuration file: +.Bd -ragged -offset indent +.Cd "options NFSLOCKD" +.Ed +.Pp +Alternatively, to load the driver as a module at boot time, place the +following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +nfslockd_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides kernel support for NFSv3 advisory locking. +It works in tandem with +.Xr rpc.lockd 8 , +which will normally load it on startup if it is not already loaded or +compiled-in. +.Sh SEE ALSO +.Xr rpc.lockd 8 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 6.4 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Doug Rabson Aq Mt dfr@FreeBSD.org . diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c index 35953f32692e..15448b651749 100644 --- a/usr.sbin/rpc.lockd/lockd.c +++ b/usr.sbin/rpc.lockd/lockd.c @@ -188,7 +188,8 @@ main(int argc, char **argv) kernel_lockd_client = FALSE; if (modfind("nfslockd") < 0) { if (kldload("nfslockd") < 0) { - fprintf(stderr, "Can't find or load kernel support for rpc.lockd - using non-kernel implementation\n"); + fprintf(stderr, "Unable to load nfslockd(4), " + "using userland implementation\n"); } else { kernel_lockd = TRUE; } diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8 index 89f55087901d..89592a1cceaf 100644 --- a/usr.sbin/rpc.lockd/rpc.lockd.8 +++ b/usr.sbin/rpc.lockd/rpc.lockd.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 21, 2019 +.Dd May 8, 2024 .Dt RPC.LOCKD 8 .Os .Sh NAME @@ -44,7 +44,7 @@ The .Nm utility provides monitored and unmonitored file and record locking services -in an NFS environment. +in an NFSv3 environment. To monitor the status of hosts requesting locks, the locking daemon typically operates in conjunction with @@ -137,6 +137,7 @@ RPC protocol specification for the network lock manager protocol. .El .Sh SEE ALSO .Xr syslog 3 , +.Xr nfslockd 4 , .Xr rc.conf 5 , .Xr rpc.statd 8 .Sh STANDARDS From nobody Tue May 14 06:59:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdnKC0d4Yz5KYnK; Tue, 14 May 2024 06:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdnKB6SZmz4pst; Tue, 14 May 2024 06:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXP8oGLVOZWbA/ZfV8MpCI8q2DCCagX0XOER6J8iciA=; b=NrWu0D5k7GgBPoDm3U5I0eqzUcnjHsKgwGDgcYGmL9ijMry2S8QNqJBp23tAQMpUKM7g34 duxAz4Sm8u/3JCPcrhm9+rQ9ClOqmd4vQQhzS5ux+75eDh8KTJWVYop15ZSk3abhfhjbhy rRoJz5gEqqz5We+eDmP1Iewo6f5Mc4aiIjo7ZCe/JZJH1HT1zoDQtUhYrPfpsY+BFhrIdT hRmI8B+4gwTxetyLZT/sJfWOjh+3oMZf8HtGHdLXevRAdP8FIpRXILD1eRg40xxP/hPaiT CSbQgf0BY1W3L0huDMWihrdUl/1ZTKu6ZIF9jb5B718/QbsPl2cu/kg7szElLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715669967; a=rsa-sha256; cv=none; b=UuPTyye3WZbuw0f09FEJSyt7KYRENGoWGgI5F4paeYgonVxzHaRQv9k9CyfhVZxVhiQRil 5SubHdQzghDffasj18lcpkJIxKVkfRGOWH+qdqVGui1JMy9cOE9UzEhGr02XoCxkAKIgsK IWHPLQAsw+8qDHtbL02r3x3ZdjEzFRC1v5gnIMLlhzPkF6C5zvz7NqslPZGsTT5Nt6PeF9 U2MMojh/3zKYssugSteAsKRQxyTG7gEu404q7UfUsmY9aVxKKxWDzRI+0apjoXACuSP4Xd b5tKBP3Uot4sypdZs5Y/AaQQSd5E0tfUh705JFXtSO+k5MnzOYcaltv9a10l9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXP8oGLVOZWbA/ZfV8MpCI8q2DCCagX0XOER6J8iciA=; b=O2TcjLoABkd5SpgEOScRmiogD8ICLajVAt2sbl63kOfyf8pAWTw8DnUldLfPv+2akVSBoh OQJn82A44o091qBo72+DJFZKCzlkkIw6oxxJwzT/epIQeGY7s2yZZw4gV1BcH+04rC2Gdj EWEyNRSPtz1ea+8gwlfvnxAZ1vOwd8QAwRkq3vLOcl2JXy86uhHqz5p02WR5hhVcIPRAff cu4shUz3Ikb2c/z5AbbI4XYZZggoh6S/m5jd63kCicQJ6knDFtikUrCTXsEdtGatUoct04 iKhqI3KRZp0o0bZPhzEHGeI/mNSbBXK3dlcidUHXMNFF9c6gOiTD72zcfH+3Aw== 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 4VdnKB5ngHzLxZ; Tue, 14 May 2024 06:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E6xQiU005167; Tue, 14 May 2024 06:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E6xQcS005164; Tue, 14 May 2024 06:59:26 GMT (envelope-from git) Date: Tue, 14 May 2024 06:59:26 GMT Message-Id: <202405140659.44E6xQcS005164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b52cbae3b7f4 - stable/13 - tftpd: Add missing `-S` option to synopsis. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b52cbae3b7f4e00e4bf0600f0189009b8edd9fe4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b52cbae3b7f4e00e4bf0600f0189009b8edd9fe4 commit b52cbae3b7f4e00e4bf0600f0189009b8edd9fe4 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-10 21:15:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-14 06:59:12 +0000 tftpd: Add missing `-S` option to synopsis. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D45129 (cherry picked from commit 816c4d3dcf99adcd40a03d93431237ddbd23bbdf) --- libexec/tftpd/tftpd.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index 3de042197618..24a743a92e14 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" -.Dd July 20, 2023 +.Dd May 8, 2024 .Dt TFTPD 8 .Os .Sh NAME @@ -35,11 +35,11 @@ .Nd Internet Trivial File Transfer Protocol server .Sh SYNOPSIS .Nm tftpd -.Op Fl cdClnow +.Op Fl CcdlnoSw .Op Fl F Ar strftime-format .Op Fl s Ar directory -.Op Fl u Ar user .Op Fl U Ar umask +.Op Fl u Ar user .Op Ar directory ... .Sh DESCRIPTION The From nobody Tue May 14 06:59:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdnK96wTQz5KYWS; Tue, 14 May 2024 06:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdnK95DH6z4pWx; Tue, 14 May 2024 06:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VZ/BF6uqE6yBDw4yC0kYmOdN9zxgsJ1uNRSW/rWYvoc=; b=m6Xga9Si6AbnGWGOacf3eipKfZG+2LF2PJVyd/8pShtNCua+7RA/w6vwB9U7Z5cEbYO226 cWkUyZpiqOymGApC0R1NKmLm8B7wi087MgH+Q+uEgFenZjHKG9y+BObkCCpwMQnN2tVrcK JI9+K31qKbPmBtRMB2XxE56dld7j+jZ+Jpzlj9S73QBjZEYkh6MHVUuCKMtPniaFqLF17y z+61Mj3qk35tjk/vK4t7q2YHylUo22JbWhKdNO9b0Y+VHtj2/PKUj8Dbs5fm8/wbVT1C43 LjU1kwmP8ndBr497C94lETOFt/knt9pE5TYWPw1ClQOsrbvd4dtdcwit22vuZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715669965; a=rsa-sha256; cv=none; b=Sl56M9S0Zq9Jva3CHOo9+FOWKD7IyWMtbbQJ/nCIZCLscECoxb/UKPdCq+Q4RNA169eXXg DJdj/T2TKFs2PSJ8mvEwQZ4PmQ+dUhNwWfIBUSe6A5BmaowAxZcB5uGXyXF2UXSSpSaPcV RdiRWGZwOnDILr4cYfc5FoQFg/JY3D/tUXy003qtqeIHINcgzKreCc+5u9+meFqJqRpoEY FyvA/w3mba7hOnnnLW8HCmTfXOdys8isJtxgiwUw16G7tqnXhpf4imfHSsdLyaA09PCNJn juXh3p1FPK0bdr33A0HI7mEoHiib2GkhVibTYHkUy4v46X/rSMKy7GsDBei/GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VZ/BF6uqE6yBDw4yC0kYmOdN9zxgsJ1uNRSW/rWYvoc=; b=qJO0+B1lxNw+DXqrlBAwc766ByzF9o802JP0/ars8kBt6zhqoNcI9h23NBawODRzFL1ELB trLKDCXSr2kcMV/lf36mmvxX9LZVhYG6Ql6r/Xz8L60HZQvOgB2R1KmAMIMzDIyYN9DvcW /O0Pv1lTh9KNr6cgAwRfz6wh5V0MNC1Km8fnO0IoiY5W1A5N6aMsNc7nCrx4OwdvvtrYvv 5cguZuXUIzaSbcGRBNYb7leFQ/Q+KkQHdFHR61SKAAooTLnUyZ5+wyAuykkMWOH+/4t/qq 0x1fLZXdP4clE6T3Ymjt/pQMZFNmeemQLlTkIyoeGt9iHbuXkS+XFAibEQSwWQ== 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 4VdnK94nXGzLxY; Tue, 14 May 2024 06:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E6xPIZ005112; Tue, 14 May 2024 06:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E6xPN5005108; Tue, 14 May 2024 06:59:25 GMT (envelope-from git) Date: Tue, 14 May 2024 06:59:25 GMT Message-Id: <202405140659.44E6xPN5005108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b6fb1131e64f - stable/13 - cat: Check for lack of success rather than a specific failure. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6fb1131e64f47854c08ab8ee733aed1f6f81180 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b6fb1131e64f47854c08ab8ee733aed1f6f81180 commit b6fb1131e64f47854c08ab8ee733aed1f6f81180 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-10 10:59:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-14 06:59:12 +0000 cat: Check for lack of success rather than a specific failure. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: oshogbo Differential Revision: https://reviews.freebsd.org/D45149 (cherry picked from commit c6f9df7064106a3b016c13ea3b9a930362b53089) cat: Missed a couple. MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit ad4f3bdf733c1a670021f4db378338f5aaedbfd8) --- bin/cat/cat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index dc6e6417dc49..48294be5c5b5 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -138,7 +138,7 @@ init_casper_net(cap_channel_t *casper) familylimit = AF_LOCAL; cap_net_limit_name2addr_family(limit, &familylimit, 1); - if (cap_net_limit(limit) < 0) + if (cap_net_limit(limit) != 0) err(EXIT_FAILURE, "unable to apply limits"); } #endif @@ -211,7 +211,7 @@ main(int argc, char *argv[]) stdout_lock.l_start = 0; stdout_lock.l_type = F_WRLCK; stdout_lock.l_whence = SEEK_SET; - if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1) + if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) != 0) err(EXIT_FAILURE, "stdout"); } @@ -219,7 +219,7 @@ main(int argc, char *argv[]) caph_cache_catpages(); - if (caph_enter_casper() < 0) + if (caph_enter_casper() != 0) err(EXIT_FAILURE, "capsicum"); if (bflag || eflag || nflag || sflag || tflag || vflag) @@ -456,7 +456,7 @@ udom_open(const char *path, int flags) errno = serrno; return (-1); } - if (caph_rights_limit(fd, &rights) < 0) { + if (caph_rights_limit(fd, &rights) != 0) { serrno = errno; close(fd); freeaddrinfo(res0); @@ -494,7 +494,7 @@ udom_open(const char *path, int flags) } cap_rights_clear(&rights, CAP_CONNECT, CAP_SHUTDOWN); - if (caph_rights_limit(fd, &rights) < 0) { + if (caph_rights_limit(fd, &rights) != 0) { serrno = errno; close(fd); errno = serrno; From nobody Tue May 14 13:39:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdyBg5m75z5K7BD; Tue, 14 May 2024 13:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdyBg593tz4PGl; Tue, 14 May 2024 13:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gavHeeCl9lR1Fgn5S6CHp1biaAdm1ZhuYfI5HogsSIE=; b=SIDbzCjTbq70xemDYEsi2RnsOGAQSrBzNkGfcwbFhONpUpL5truE7+bm697aoKl1vLO0eE cywuj8zVv8MM1kxHxaU099h1qHlT8Ium+ZsEhIZND9pig8ACssmyx0sTtLqhdeu65NRCMw yCQufZBu89vwgkLjSWV94EVAEmOJW5pSDab+0+FfImhE1QvmOzoaXeTr2p8RymGceuSL+I p7/5B9MJX0nFFcQ9kFF3lmPHYOjndk5xtpPRacmBzlnFNOGRA6wjO58smAWCpC/4QVZuoZ 9ahsaqopEcvdsai0QphiA33kwu/XSUcdlrbIy4D+GXom6Sn0NPkuwb2y05TwBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715693963; a=rsa-sha256; cv=none; b=JOYmbkHEmOEfiFgUA56nq7RrePu/v4sHCot0XtIsETDy8qBWKpBSN0mpwBtxQa0MBmLH1E pzoOqujkGfzswyeRLWJ9vxiID0M1xrXen7jzXof4MqH35uSGCb1hm3D3m1JJoLHGogCPTv hBHBkaQs3Ihq5lMAuWiUWBCmfVd66PbLIBDGmXafUY7VraZBTGbwPKdg08DjxTkBh/R0MX Gz0yOBd1W4E4m1xEZSr8EDWwt/4RLwNolcYI6o2ErL/pfeTBS8CQuY3Q8I6Mhx0/haumjo ud5S09Y33pb2KQ8GSt5kY17ikhy9pzvmRefruPeQZgtGihIeOI5qdB0NPEAUjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gavHeeCl9lR1Fgn5S6CHp1biaAdm1ZhuYfI5HogsSIE=; b=F6y9EOEibbnz3R8UyLcAXC9vCutkIeGxh5+JmlY57xkha0RJvT+nOumOpOhjYvdn8KJm5q kMdgx56geXke5aVsJGPLSisC1hOkDcKkbCQbUvVaeOA+QWUttEVLHNz84VRoSRVEWgbc6/ olh9TV/cETk5VVyPrUk0W4kQev3rznhjCrw+FoOYx9K/q2hkFHeVMFnyvkBwHiwmIOfV8h 4rej3lwSU/esUHdBPyxM9YfYOIsI91LOiqgd3acExPFNVIhZYs+//N9WZwHk7CYS0ASnJn l8RLHunkOj3B7dqyq19ksRVdj5k/A/kpVz901tyYWZa+dEbIc5K5U5BUpLcOCQ== 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 4VdyBg4jYyzZ99; Tue, 14 May 2024 13:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EDdN3P080386; Tue, 14 May 2024 13:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EDdN9P080383; Tue, 14 May 2024 13:39:23 GMT (envelope-from git) Date: Tue, 14 May 2024 13:39:23 GMT Message-Id: <202405141339.44EDdN9P080383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 21284ecd1e65 - releng/14.1 - PP mutexes: unlock: Reset inherited prio regardless of privileges List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 21284ecd1e65fcc6c2e418b45d68f2e23e1e67f5 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=21284ecd1e65fcc6c2e418b45d68f2e23e1e67f5 commit 21284ecd1e65fcc6c2e418b45d68f2e23e1e67f5 Author: Olivier Certner AuthorDate: 2024-02-20 13:52:40 +0000 Commit: Olivier Certner CommitDate: 2024-05-14 13:36:38 +0000 PP mutexes: unlock: Reset inherited prio regardless of privileges 'uq_inherited_pri' contains the current priority inherited from Priority Protection mutexes. If -1 is passed through 'm_ceilings[1]', meaning that there are no such mutexes held anymore, this must be reflected into it by setting it to PRI_MAX, regardless of whether the thread has privilege to set realtime priorities (PRI_MAX is also obviously not a realtime priority level). By contrast, it shall not be updated and the computed 'new_inherited_pri' shall stay unused if the thread doesn't have the ability to set a realtime priority, possibly keeping an older such priority acquired previously. Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43984 (cherry picked from commit 1df8700aa6cff7c759e90f7e507de4b8714435a4) Approved by: emaste (mentor) (cherry picked from commit eded8fea5c3a7ef7aafb5755c523a40dd7fce20e) Approved by: emaste (mentor) Approved by: re (cperciva) --- sys/kern/kern_umtx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 57ff74f5421e..9c7225863bb1 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -2684,7 +2684,8 @@ do_unlock_pp(struct thread *td, struct umutex *m, uint32_t flags, bool rb) struct umtx_q *uq, *uq2; struct umtx_pi *pi; uint32_t id, owner, rceiling; - int error, pri, new_inherited_pri, su; + int error, pri, new_inherited_pri; + bool su; id = td->td_tid; uq = td->td_umtxq; @@ -2739,7 +2740,7 @@ do_unlock_pp(struct thread *td, struct umutex *m, uint32_t flags, bool rb) error = EFAULT; else { mtx_lock(&umtx_lock); - if (su != 0) + if (su || new_inherited_pri == PRI_MAX) uq->uq_inherited_pri = new_inherited_pri; pri = PRI_MAX; TAILQ_FOREACH(pi, &uq->uq_pi_contested, pi_link) { From nobody Tue May 14 13:39:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdyBh6h9jz5K780; Tue, 14 May 2024 13:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdyBh64fqz4Pbs; Tue, 14 May 2024 13:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nHJ6TvibdUoBsFQZ7x3la0iCF8NToTz/W/b8/vezRcE=; b=qBtkp1J2CFcfLcaJ8ytJnVO2ON6RLsy9fCtCaeE78NePMCNhLIlWFeF+gce1LaTuqqAiol Fq3+itEC5czFjznFa1D52MCaefIPHM/FsQeh05SqTJ2+ofhcbPre44KemNxn68I4tCt8yh URQcnLNXGOjaIjr9QHvEWqTbQP2ILg45SLUhYMYMLxHxvWNnuKpujyaBL5G/8SiL2GroHJ AqmVZ34laeQNE30kOgHsNWypiZLXfO72WQs4+GE/5P0VQxsZH1gMJ5t3EwEo8CjIfcEBLF sNqThevH2DpxzpcRTvO4tone75ncuAt3Jtoihq1kSAPFT5yXv0oBpPdPbqvr0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715693964; a=rsa-sha256; cv=none; b=VdN+K2Az8dGkkkKuZJekcnM6Wjp8UTT7rF5vcLMYe+iYtYTluCEgBPTA1p/Kd4OI4/BITw mb1KDEwbovVmIU0ThUCwoWxSxyl4wcdsQifANmRBshmDmxrrTRblguIIQllqgd405cHT0P Sb+K8vjfnVMXdOr22YOPx7z4r4ZjCLL5gFxXwO1RDlIxZQgs2hMC2NFB0ttx3tIgKjVlTH nfDynQDsanVpdptILKKYSu3yalDt1OWhZc5TQ19poydQdDy+SzARYxg7dpOBTV0R7293Qg RhT0q1Mh6z9LyZycZtcSp8Z35RJutF0ZEe5ROZJ0AnQ7Ad7lBD4UpJJAG5f9JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nHJ6TvibdUoBsFQZ7x3la0iCF8NToTz/W/b8/vezRcE=; b=QeCjL2yhX2JJ6V3w9OE/AILp7sapjYQSY+wJl5QtjBlSIJ7dq8Vmg7IH+YSJhAShd/k8S/ 9h6eHBhe12h1v0Thd2W+cLkRtITjSMByJliTgRXIgqI2lXNAm1G7m+QXAQxnVmBf4/Qz5V mPF4ixc7AWMBknzEbr1d22cxsNVoIyf2ygROcdEuQ4HxNM4pmExBWJcgrdKJtVp33dUn6m NJ0Kg1fFOxzFyuIcuS6oK/IapOVENY3I4x+zuDeDlevl++lLbLnQm8T7f8d4LItB/4U1u7 dF0ZCXr8FzpyLn1GHcdcXHQWywB/BjwTX3taCEdrRbHTt8ofmwfLpvwzzQFUSQ== 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 4VdyBh5hzkzZ9B; Tue, 14 May 2024 13:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EDdOtl080449; Tue, 14 May 2024 13:39:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EDdO7c080446; Tue, 14 May 2024 13:39:24 GMT (envelope-from git) Date: Tue, 14 May 2024 13:39:24 GMT Message-Id: <202405141339.44EDdO7c080446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 8bd89740cb2b - releng/14.1 - PP mutexes: lock: Check if priority is too high against base one List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 8bd89740cb2bb52ebe4155ed380c623e703c392f Auto-Submitted: auto-generated The branch releng/14.1 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd89740cb2bb52ebe4155ed380c623e703c392f commit 8bd89740cb2bb52ebe4155ed380c623e703c392f Author: Olivier Certner AuthorDate: 2024-02-22 08:53:51 +0000 Commit: Olivier Certner CommitDate: 2024-05-14 13:37:26 +0000 PP mutexes: lock: Check if priority is too high against base one Doing this instead of using the current (user) priority, which includes current lendings, prevents gratuitous failures for threads involved in multiple locking groups, where each group is defined as the threads that can lock a particular PP or PI mutex. No deadlock can occur in this case. Indeed, if a thread holds such a lock A giving it a higher priority than the ceiling of some other lock B that is PP, and B is acquired by another thread, effectively the latter may not be able to run but this situation can only last until the first thread releases A, which it will do eventually. Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44044 (cherry picked from commit 9ac3ac9ece6269365ac314fa5fdb484e96d4a32e) Approved by: emaste (mentor) (cherry picked from commit f9e9c02241dc887244cf62136dfcea04718290a0) Approved by: emaste (mentor) Approved by: re (cperciva) --- sys/kern/kern_umtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 9c7225863bb1..5abc1e71d763 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -2551,7 +2551,7 @@ do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags, } mtx_lock(&umtx_lock); - if (UPRI(td) < PRI_MIN_REALTIME + ceiling) { + if (td->td_base_user_pri < PRI_MIN_REALTIME + ceiling) { mtx_unlock(&umtx_lock); error = EINVAL; goto out; From nobody Tue May 14 13:39:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdyBk2RkHz5K7Dm; Tue, 14 May 2024 13:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdyBk0LdCz4Pm7; Tue, 14 May 2024 13:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjJZWiiH6ONfubtGZHHFmICOTWKGrGgtZt4inC/sScs=; b=tKKxCyzPCVzMkYEJWy0FiAVRJV3AZS6hcaF3BxaAQWQDmQk/Tn5mz9eAbQPaPtDPuuWg3U hKjqPT0cCxCBUhXzwfoLofwUEYWb7/lzI/Yd7tpAyXalJ0dbGrVwNGpMUhqQnekaZ70/3W kk4b2lyxhOOgKjnV9revkKo/5oEAKqUBAZtLSqPY2qR+BHI5+LcVOStEMccW45ZzHe+4ct GGaP4t4bpY35hboVb8mkx3y3VNTUcZyw23bN0CUBYTs4Wjayte8Xx+sL8MBZlRaQQUPNF0 QtbK6n13ouA0nh0tTcpHYn823BSgO3fR2qws0Qr5qMDDF8Wfy+kwY7VsOZiWyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715693966; a=rsa-sha256; cv=none; b=wLEfMjFHTGjFDbMc7qCq05enBiBEptYZfyvRcdlDlSU06WoEErZdfXZHUBW2oVEDCLOwPa nedFyrK/SvgQ9WBbfYAdK1eKrAOxOSAzgUuX99lmuqhXSiMoIc3wgMz9GXh0pW3XzwGmJn y8xyMEWRSUiivH3cfn73RNq/YnIFEBsMPj11zQfKVvJyYiPS/rmRgpVXbezKtFC2WBv7ih bDHXNHoKE4RfRO2uTDJ4JZfT1SRVibWcXyJDJKI1ozDyE9wRKIuXd4m2gh4HmLpWIGjJpM QF+sdyF04n763IYgXvfcosfQm840QXFgt4qZP9suFvII78fzFkSjzVYyIrA9wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjJZWiiH6ONfubtGZHHFmICOTWKGrGgtZt4inC/sScs=; b=sBmQ07hjSalrf+AVZQE/ILSfz5PL0yl332H3LsyV14NX3OU7NmasUiMNjgmhGso+Hujn6B qozWn/kIQ2nOOc6A1jKtIVoDqD0TDGJkeLKt6cqRpgJEREyGofebpypxoLTgebVYT/XXgr P9DhE2LfbR6JnMBc4n34V7nU4Ja9X2P672hPKYlvdhlRk9UZ/BzOtdtpNBOlscgjsFeUKS 3S/vIVJ0q2uP4jZ6wCDQ+5DEARyYt1R2aajeuBojgPlbEYhUrYejTLcYrye+FZWzNHyEl7 Ll0Y87/bk5mzYKND2pE47j/tKonRq7Amn50j6opk9eJde2vF+KXnOYzpFdM3jA== 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 4VdyBj6kRlzZ6g; Tue, 14 May 2024 13:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EDdPNb080509; Tue, 14 May 2024 13:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EDdPH6080506; Tue, 14 May 2024 13:39:25 GMT (envelope-from git) Date: Tue, 14 May 2024 13:39:25 GMT Message-Id: <202405141339.44EDdPH6080506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9dad96bc6344 - releng/14.1 - PP mutexes: lock: Reduce 'umtx_lock' holding before taking the user lock List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 9dad96bc634429711f3a1f74a8f988d963e99d96 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9dad96bc634429711f3a1f74a8f988d963e99d96 commit 9dad96bc634429711f3a1f74a8f988d963e99d96 Author: Olivier Certner AuthorDate: 2024-02-22 09:13:38 +0000 Commit: Olivier Certner CommitDate: 2024-05-14 13:37:35 +0000 PP mutexes: lock: Reduce 'umtx_lock' holding before taking the user lock There is no need to have it for the priority check (that the thread doesn't have a higher priority than the mutex's ceiling), and there's also no need to take it if the thread doesn't have privileges to set its priority to the mutex's ceiling. While here, turn 'su' into a 'bool' and compute the internal priority corresponding to the mutex's ceiling once and for all, putting it in new 'new_pri'. Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44045 (cherry picked from commit 39e4665c9694b9f9b07d1cfa85befc288cabe906) Approved by: emaste (mentor) (cherry picked from commit ce7dc52f07d05d00054d48faf00fcac4036d56df) Approved by: emaste (mentor) Approved by: re (cperciva) --- sys/kern/kern_umtx.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 5abc1e71d763..092fcade9d19 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -2520,7 +2520,8 @@ do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags, struct umtx_pi *pi; uint32_t ceiling; uint32_t owner, id; - int error, pri, old_inherited_pri, su, rv; + int error, pri, old_inherited_pri, new_pri, rv; + bool su; id = td->td_tid; uq = td->td_umtxq; @@ -2549,21 +2550,23 @@ do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags, error = EINVAL; goto out; } + new_pri = PRI_MIN_REALTIME + ceiling; - mtx_lock(&umtx_lock); - if (td->td_base_user_pri < PRI_MIN_REALTIME + ceiling) { - mtx_unlock(&umtx_lock); + if (td->td_base_user_pri < new_pri) { error = EINVAL; goto out; } - if (su && PRI_MIN_REALTIME + ceiling < uq->uq_inherited_pri) { - uq->uq_inherited_pri = PRI_MIN_REALTIME + ceiling; - thread_lock(td); - if (uq->uq_inherited_pri < UPRI(td)) - sched_lend_user_prio(td, uq->uq_inherited_pri); - thread_unlock(td); + if (su) { + mtx_lock(&umtx_lock); + if (new_pri < uq->uq_inherited_pri) { + uq->uq_inherited_pri = new_pri; + thread_lock(td); + if (new_pri < UPRI(td)) + sched_lend_user_prio(td, new_pri); + thread_unlock(td); + } + mtx_unlock(&umtx_lock); } - mtx_unlock(&umtx_lock); rv = casueword32(&m->m_owner, UMUTEX_CONTESTED, &owner, id | UMUTEX_CONTESTED); From nobody Tue May 14 13:39:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdyBl1ntFz5K7BG; Tue, 14 May 2024 13:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdyBl1BW2z4PQ5; Tue, 14 May 2024 13:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8Zzv4BE5RnR3jXUIo7DwZic/SIt8T4SUQcCPrfqx8I=; b=IA1qZPqVuItbJ+RodWKj3rMkiIKf+tzCOoPQ+ClNS3yEHJvpActPPOnepAwlWHHdKrmCyY ZQFEnfSTTp2+EDCnL6m53EjXE8mlpXv8+6IxQXANRorg6VI0eLXuqK6T3mu4fmQoFoZdq5 9vFoKN3vvIqBMH8Ooy70Un5cH9V1KXw/6qf6D6Vg4ojTUIcLB1M4Vrn5WRCb02EllrD1lK PrGY7JBfguI0g04ixdQx89G2ZRhe19tDIw3d0dsqGdC71/VE9IwHAKNSIpUEcoSYypMpIR tkypp4MG+qTRwCSWEdkgxO3deAB8t9sMs22GencHnzZP6J01MnRlcVLRBQgfmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715693967; a=rsa-sha256; cv=none; b=oh3nfB6cVaPwW5NHLxcD1O7ZspN78Mr9XREVp+JZe92iCRyJ/Rl2Dx5piAobaZh9qKd85B 1+GrzwGU8Psogmh+/b3NSr86fHHDWnJEnV80rNCZlSiJsptCTDbY+9ZAEVpAMhLpmhwUVJ iuhHFK5+D9tXfa6iNK2PCTE3cG8JwbcMKMHcleDmoQc0/HkFYCQB1vX+GnJ3Y/8VpcYr42 aVY3rM75sixpVPBUnHVrbDVGjxAMzZ3JQxqWgUp4XOQ1NxuvoQBkhdkXpFAgqltuKqN5Tk XzOkwUqdPDMabzqcz+BVBVQs8hRxwdmEuUZploK59/5jAbTOu4x2A2HciY2eEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715693967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8Zzv4BE5RnR3jXUIo7DwZic/SIt8T4SUQcCPrfqx8I=; b=XY6OEF4F1Ct65PJsRd1DLiDOecZyaHFbUcZ4pHw3TDUdos6d5TtYrWmYkfiPaI7voZnrFe FtPVD5OiZqzAGK0FpkqiV6XaTy1cCn1OQV3DplIWAgPw/0ls52UC6H5TMEy+rh8oqPRAaX B9GQBgY8mZkOyN1yb49EJUHiQA9cAeeZgTB35YK4NbJbGHhTNlW730Ljmq4Sku1AnbUXs5 n7p57V6/vhEKHGQ4U2b7vDEuzSS/6hbEqSyajkES95akUAz+ovGRX6pfaI3wV7GgNukyBr wCNWq3VItp310g+RzCOPzOTktD6aZdQXeOFkxG0lNCzOpVMn1yrCBWEyzi+STg== 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 4VdyBl0X3YzYZt; Tue, 14 May 2024 13:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EDdQLf080545; Tue, 14 May 2024 13:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EDdQKj080542; Tue, 14 May 2024 13:39:26 GMT (envelope-from git) Date: Tue, 14 May 2024 13:39:26 GMT Message-Id: <202405141339.44EDdQKj080542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 81ddf56306ca - releng/14.1 - sched: Simplify sched_lend_user_prio_cond() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 81ddf56306ca46894baa376c4f58c4a52ce5809d Auto-Submitted: auto-generated The branch releng/14.1 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=81ddf56306ca46894baa376c4f58c4a52ce5809d commit 81ddf56306ca46894baa376c4f58c4a52ce5809d Author: Olivier Certner AuthorDate: 2024-02-09 18:03:22 +0000 Commit: Olivier Certner CommitDate: 2024-05-14 13:37:42 +0000 sched: Simplify sched_lend_user_prio_cond() If 'td_lend_user_pri' has the expected value, there is no need to check the fields that sched_lend_user_prio() modifies, they either are already good or soon will be ('td->td_lend_user_pri' has just been changed by a concurrent update). Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44050 (cherry picked from commit aeff15b392e68f5f193fff3bb01728b965cacc3a) Approved by: emaste (mentor) (cherry picked from commit b8b729e23cb91a77f3ca51df5100e2c85dfa7447) Approved by: emaste (mentor) Approved by: re (cperciva) --- sys/kern/sched_4bsd.c | 12 +++--------- sys/kern/sched_ule.c | 10 ++-------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index f0fffeb08e2d..ff1e57746404 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -981,15 +981,9 @@ void sched_lend_user_prio_cond(struct thread *td, u_char prio) { - if (td->td_lend_user_pri != prio) - goto lend; - if (td->td_user_pri != min(prio, td->td_base_user_pri)) - goto lend; - if (td->td_priority != td->td_user_pri) - goto lend; - return; - -lend: + if (td->td_lend_user_pri == prio) + return; + thread_lock(td); sched_lend_user_prio(td, prio); thread_unlock(td); diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index ee1e0ab0b955..4b99f1c486bf 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2007,15 +2007,9 @@ void sched_lend_user_prio_cond(struct thread *td, u_char prio) { - if (td->td_lend_user_pri != prio) - goto lend; - if (td->td_user_pri != min(prio, td->td_base_user_pri)) - goto lend; - if (td->td_priority != td->td_user_pri) - goto lend; - return; + if (td->td_lend_user_pri == prio) + return; -lend: thread_lock(td); sched_lend_user_prio(td, prio); thread_unlock(td); From nobody Tue May 14 14:47:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdzjL5sRmz5KTDl; Tue, 14 May 2024 14:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdzjL4gFMz4d7s; Tue, 14 May 2024 14:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715698054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cUiC91cBhw/ZHD7WhniAtchbQpCIhldtzbX0w717nwk=; b=qTgd3Rv/MvLsNKg7lIoEQ/9ui90Z16Vjz50N1fLxoDtWgpQPUr0BPQND3zZG69lKBxOgG/ +NlK539Ng2QD9Yd63s7m8HfoGp1ya6LIjrtSxCVf+4KeVwKStMuV4hXzFbOL9pYO6Jkwsb X9sQfmnK1Roj9l64W22vk7Pq+zOaYrAFf1LMtpuYmPI/n86rjx3qC8eB1hPjYVI0uU5imG JSdmwhM6lUBhgot3D6ApHvQBq2N5yUEFVlqW5OXBnmiEjjUPb6JAf9E0fiWq3bVVQg8JNc oOfd8cFHxXXXF85MR7Nirz2L1wKcn0FTPuXuQraMWumb9T/QmaZIREfpeOk9uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715698054; a=rsa-sha256; cv=none; b=WuENk6Xd8ItJXm1bVN+64JKufb1pwgcBENixwzyNVI7bLwJjR86rzOIVcyd3gEPAFH2VVf zHNADiJr9I2H+6zyJTx9tD9YGcUsD4T1QDAqtaxND8jjBq9Oa8WWmrrlW0MxQOu0nAVtpa 0MVy/CJo0PtSGFVMNzMnqVYMndAcwlgT8MUamZeILDrJv/0Q1ymAH1+EDP2p+c1OMELNa5 UC9kh/9ZK6M5FP95+Vi98vQsati40IoD1cA+SOa2saw2AnCze0TtBaHfYBYmuxjzsm5gJw iECLonOkt5BwGIEnyDk8T1x0k3TxnDzVa5xOB/VugN6tDfL2Nc7t2ty5Aoz/3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715698054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cUiC91cBhw/ZHD7WhniAtchbQpCIhldtzbX0w717nwk=; b=BLW2hHqulpEnbGb3sPeqIJJTrJKUVUYfLJIYc8gjlbIQ/TZxgK2P6ONPQNZ25HlIqQtYME ENV93jKRENHtjibxv+ySwvO5Owtu194Fa+mW9QaeLF/mZPXpaj52B6K4aMpv/oVRnZCizH WYe/3CnuXEu/tPaxPB1KM7VUXxOKVfNQbWv6QV7+L8svJizh/ZML1UtPJ9COaigc6YG/G5 YlHkpWhclDqZYcXxCtP77qz1BPlyXjJGbjyfh+b7Woyu6bmRUtMbZfSbFfHBWu82PV5Wf4 wwVTZrKTpFJ4xWl18HGtPbxgAKKgazFsjbz9pf/I54IYt9iB+gVydjfgPeVbhw== 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 4VdzjL2VvVzbqf; Tue, 14 May 2024 14:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EElYNV098340; Tue, 14 May 2024 14:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EElYSE098337; Tue, 14 May 2024 14:47:34 GMT (envelope-from git) Date: Tue, 14 May 2024 14:47:34 GMT Message-Id: <202405141447.44EElYSE098337@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: e9a7be7def4c - stable/14 - ip17x: fix non-debug build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e9a7be7def4c55fb5476c5d9540137f0ae6f9206 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a7be7def4c55fb5476c5d9540137f0ae6f9206 commit e9a7be7def4c55fb5476c5d9540137f0ae6f9206 Author: Ed Maste AuthorDate: 2024-05-08 13:20:44 +0000 Commit: Ed Maste CommitDate: 2024-05-14 14:47:00 +0000 ip17x: fix non-debug build PR: 278847 Reviewed by: jhibbits Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45133 (cherry picked from commit 82f43db382cc4aea2a3f34f08da9a97ab023d5fb) --- sys/dev/etherswitch/ip17x/ip17x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c index 218c0c293662..65e548ba293b 100644 --- a/sys/dev/etherswitch/ip17x/ip17x.c +++ b/sys/dev/etherswitch/ip17x/ip17x.c @@ -556,7 +556,7 @@ ip17x_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) static int ip17x_readreg(device_t dev, int addr) { - struct ip17x_softc *sc; + struct ip17x_softc *sc __diagused; sc = device_get_softc(dev); IP17X_LOCK_ASSERT(sc, MA_OWNED); @@ -568,7 +568,7 @@ ip17x_readreg(device_t dev, int addr) static int ip17x_writereg(device_t dev, int addr, int value) { - struct ip17x_softc *sc; + struct ip17x_softc *sc __diagused; sc = device_get_softc(dev); IP17X_LOCK_ASSERT(sc, MA_OWNED); From nobody Tue May 14 14:47:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdzjM6wL5z5KTPx; Tue, 14 May 2024 14:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdzjM43trz4dDw; Tue, 14 May 2024 14:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715698055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYrCOoEtZFtST6sDW8cCieaBQUs8g5nhW1S5Zufzi/M=; b=BkMQYlsi3VAx/v4LzxZopKMgdSLedm4lwxfEgNsuRTSTO4VkrcMCkI/mjVl/0wR+P/hw5p 8XLvyuVHclr5B35+vxQI4S4ypgj8BusDEL3KIH2EYFzEm6Ho8pfh1c5dbr+vzhqcDYbL5Z f+ICo6i07u9toaeHcM4KNUghDaeBuWaGT/PMtKCEwt4VmrE8eh0cWVp6Lw7ZhZqlF8QHN/ ddRBKwhE3p6UmRnMj5q+Y1Oh/mouisuL6Fx0DgTTP83XClb0RDUUTLp+frdtV4gGyEc0Cb lLI8SDSXW7VobcMhdTasUM1X4Ij5nxUIPPB7ZcB9HGaZoDRTcbDDP17zHoo1sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715698055; a=rsa-sha256; cv=none; b=pBhgpJBU1j3o6Qv+ngARp6Z/YxpZ0apkP7Gi+9eiU477SVm3VIW+caJbwNEcjnWJPMwy0d KG9h4/MSE+PuLRIjJITNi6wCW8+eufuPbN5jAc9zP3JI4bJNStXCdLwVbxRM/c527MCh6V DueKmkz+SQ1sgXDs52cmu2AwyMX5lveRbV51pkSo3k/8be+tnmK7e9L8ExazN6niQTER+/ A2P8/wwaE11FTi5yKUpoCr2A+vWNWSf6aksIFD7DUaWrA319E4wE+0RAZYwvjX3WUYl7ln BqdP35uInE+zAzwRfDh0uXJWd/KKRWHhuvfaBLd6DIoBZMeKxJhNIawP4IZZoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715698055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYrCOoEtZFtST6sDW8cCieaBQUs8g5nhW1S5Zufzi/M=; b=YUfQ3/+Er4knpen4CsD/t01kOKIx9AbVvnCBFnDB+g1ctJ1OM92VXrHuFxYMziQNb7Y5y4 ZiunCs2B3BrKPNEfocLi32+cBXz3JcQz+zVa/KVmWH7siHXyyEMLA5D/lF0H6WC9nrbFsc bC2GGcrrvKUlulPPzw8n8TE/ctELKqyCtf8BrfggPB1dq7k9IKJ4OBuNeP6l7bohzIbMp4 P1JwuGjxYDrQI6eLDqRX6x4Zk1G7wZsueE3ucN9X44sWJ2sT2nT8sEGz7VKvEPPDxHTnsO uAYOJ+jp+Ga7c7/9stfBXYs/hriHvHnQrn/tJg/FpizWRxLUgvNqUm3jFffSyA== 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 4VdzjM3dKWzbf1; Tue, 14 May 2024 14:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EElZKl098381; Tue, 14 May 2024 14:47:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EElZVo098378; Tue, 14 May 2024 14:47:35 GMT (envelope-from git) Date: Tue, 14 May 2024 14:47:35 GMT Message-Id: <202405141447.44EElZVo098378@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: 7309d72e140b - stable/14 - ukswitch: fix non-debug build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7309d72e140b8d13698c0e88168228f8877aaaad Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7309d72e140b8d13698c0e88168228f8877aaaad commit 7309d72e140b8d13698c0e88168228f8877aaaad Author: Ed Maste AuthorDate: 2024-05-10 12:52:06 +0000 Commit: Ed Maste CommitDate: 2024-05-14 14:47:00 +0000 ukswitch: fix non-debug build PR: 278847 Sponsored by: The FreeBSD Foundation (cherry picked from commit 2e0c027e69de66afc1157c76bd42ecd3737d54e1) --- sys/dev/etherswitch/ukswitch/ukswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c index 6eff37bb118e..88726422bd01 100644 --- a/sys/dev/etherswitch/ukswitch/ukswitch.c +++ b/sys/dev/etherswitch/ukswitch/ukswitch.c @@ -514,7 +514,7 @@ ukswitch_writephy(device_t dev, int phy, int reg, int data) static int ukswitch_readreg(device_t dev, int addr) { - struct ukswitch_softc *sc; + struct ukswitch_softc *sc __diagused; sc = device_get_softc(dev); UKSWITCH_LOCK_ASSERT(sc, MA_OWNED); @@ -526,7 +526,7 @@ ukswitch_readreg(device_t dev, int addr) static int ukswitch_writereg(device_t dev, int addr, int value) { - struct ukswitch_softc *sc; + struct ukswitch_softc *sc __diagused; sc = device_get_softc(dev); UKSWITCH_LOCK_ASSERT(sc, MA_OWNED); From nobody Tue May 14 14:48:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vdzk31Dygz5KT8R; Tue, 14 May 2024 14:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vdzk30Ft0z4dp8; Tue, 14 May 2024 14:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715698091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mh2p0uZaqudVe7uiQj3SlJ/Miwx9w/i6Znb46oyjuuA=; b=C3U8huudNPO9r20FhKkR8spiHAT5EbybhCqFaf3uAiuRga6KKkbt3xG1noCoqzjL07fJft Oepea7EDMbd4PBlNOhTD8iznEvJjQe65ilLgkEIpVwPRz+QgM5K05DJczy1oHi4t6Ic8Nj 1UH3sFYenh8UfzukXbfqM9j2b8keVe2NSwQM4w115YQNoae9f65JJrN9DJ+y7pxpcKzHfS x5nYfX+/2iXMmfOPzb7BJi2fR2V73TBChr2hvrrjVxS6vsbEIrSDTz4tWSP9XHgHYmSSio ZBMfAmewWHyaUoHFmEeEzG5dDZipYW8ZD4Vpt4ZrfJp/PQrhytxHhaD0HZt/Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715698091; a=rsa-sha256; cv=none; b=p0zlvIOnW/JoH8We+k3dkO4ePUJtSz6rzIaP7IPMEI8KBq5z9ZPgXxTrx4k3Q2uJEOCjpb IPYYQyEhuXeNSi/3P8usOUqax2EauIBJ5pQ/2NEp8Jm334o2rhNVZLLo7E8OpwQZxLEVY/ cKdO5+TH2xyhwBuyBMEPnw6olYrD/GuvGn8tM9qtBuK4F0rS8nS1wpQbRuKAu0MN77geuz I0DBxsCfQh89zCeOj+joB/bfNC8tkkty4KfboeTtulY+INFBPO8yLX3dYW/6XlIWlOwp0w X6u6NZv2sKIcW0+Hh0L7JpihpmUFxz8N3R++OKhrseDo6VBiMUUFZrtO3//3ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715698091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mh2p0uZaqudVe7uiQj3SlJ/Miwx9w/i6Znb46oyjuuA=; b=DgCBuMjm1ynkM0zFNtFQKVV1boFZoseqgTjxJM3XvfSN7dWc2VLdRE76pDWSnXiEON6Cpm kpXBGRVQCDy5zm+xUXGf81iEx/XASsDsRiITA1jPEZrJ2QDteCvi1RGz/9yMW8QwYP3ahb laMl8KDxiLvDS48q5YS69f0eBWlhNFFzxEgIXIe2GcwnNkcnUQGACqMCL7VCB+4A/KZp61 0EI9sxyoH9H7JeB4+5L0ZlUKAaRbaBXw4PEFxNvA3wonNLaNs2qvEIWUaOgrVy1Q+TVfko xvktlWdbT8WVoGlqjo5m17fgTwRtNvQo5i5Eyqes1RoVbU9h+uDjIED7bGltLA== 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 4Vdzk26w4Hzb2b; Tue, 14 May 2024 14:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EEmAtf098606; Tue, 14 May 2024 14:48:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EEmAGx098603; Tue, 14 May 2024 14:48:10 GMT (envelope-from git) Date: Tue, 14 May 2024 14:48:10 GMT Message-Id: <202405141448.44EEmAGx098603@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: 412b433cc75b - stable/13 - smsc(4): update to mention Microchip List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 412b433cc75b99b581d2a1aab46890f15ae72914 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=412b433cc75b99b581d2a1aab46890f15ae72914 commit 412b433cc75b99b581d2a1aab46890f15ae72914 Author: Ed Maste AuthorDate: 2024-05-07 15:33:45 +0000 Commit: Ed Maste CommitDate: 2024-05-14 14:47:45 +0000 smsc(4): update to mention Microchip Microchip Technology acquired SMSC in 2012, and all current products and datasheets refer to the devices supported by this driver as Microchip parts. Mention SMSC in a parenthetical comment to explain the driver's name. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45115 (cherry picked from commit 7ef6ce51742d44a7375ccbaeda4cc64e034c4816) (cherry picked from commit 5e7de5daa95dd901fc4f051120461805aaff29e3) --- share/man/man4/smsc.4 | 12 ++++++------ sys/dev/usb/net/if_smsc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/man/man4/smsc.4 b/share/man/man4/smsc.4 index 56c1556e5f83..61b12c7d230c 100644 --- a/share/man/man4/smsc.4 +++ b/share/man/man4/smsc.4 @@ -25,12 +25,12 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 24, 2015 +.Dd May 7, 2024 .Dt SMSC 4 .Os .Sh NAME .Nm smsc -.Nd "USB SMSC LAN9xxx Fast Ethernet driver" +.Nd "USB Microchip LAN9xxx Fast Ethernet driver" .Sh SYNOPSIS To load the driver as a module at boot time, place the following line in @@ -53,7 +53,7 @@ following lines in your kernel configuration file: The .Nm device driver provides support for USB Fast Ethernet adapters based -on the SMSC LAN9xxx chipsets. +on the Microchip (formerly SMSC) LAN9xxx chipsets. .Pp For more information on configuring this device, see .Xr ifconfig 8 . @@ -64,11 +64,11 @@ driver: .Pp .Bl -bullet -compact .It -SMSC LAN9500, LAN9500A, LAN9505 and LAN9505A based Ethernet adapters +LAN9500, LAN9500A, LAN9505 and LAN9505A based Ethernet adapters .It -SMSC LAN89530, LAN9530 and LAN9730 based Ethernet adapters +LAN89530, LAN9530 and LAN9730 based Ethernet adapters .It -SMSC LAN951x Ethernet adapters with integrated USB hub +LAN951x Ethernet adapters with integrated USB hub .El .Sh SEE ALSO .Xr arp 4 , diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index e6f811754555..e57e5e044a18 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -28,7 +28,7 @@ #include /* - * SMSC LAN9xxx devices (http://www.smsc.com/) + * Microchip LAN9xxx devices (https://www.microchip.com/en-us/product/lan9500a) * * The LAN9500 & LAN9500A devices are stand-alone USB to Ethernet chips that * support USB 2.0 and 10/100 Mbps Ethernet. @@ -38,7 +38,7 @@ * supports the hub part. * * This driver is closely modelled on the Linux driver written and copyrighted - * by SMSC. + * by SMSC (later acquired by Microchip). * * * From nobody Tue May 14 16:54:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf2WR57glz5KfpW; Tue, 14 May 2024 16:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf2WR4YPfz4t3J; Tue, 14 May 2024 16:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715705651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIM24nKVwJ5R1m+YP1p1E7lf0D/ofWMQva8NfogMaZA=; b=wyJTLc8eHgNvp3xEmVEx+ktYPR3ALTlVYwT1uJlRDz2UmmosGIx/WuF/va63suTxS6Hjc4 1cCuJ2ZOPBBUptFWVy+ueFQvw+flgLCGBsS94mntlvRzpnuRbrz7J3fkOVxkTKZxizyKtE 3HpE+m65SIF34l1hVWNhcBu6HTo71mbS5i4oDnJkLQIVw75Kft9EpSEaLxqUqcFYpNEAI3 Jt11LSSo/FKzT4N0g3B5z6lSPw2oUi1J4LQQdb8g3IOxUx0KhGZlEsPdNkWxwkSIJgjQVC b91ksWxl/dIU4L3cN0z019leIPqXKb9pnOgui4jOtlIC0qzexONCKwKNQSDx5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715705651; a=rsa-sha256; cv=none; b=yBTSz/RY40z0VbJvCCUaJS0EXPDfqK+FUdryS5jM6IPFBmZLIbVXREmwVd7dLxwtO3k6h6 916hXLL8Nw4xKRYBVT4/5aePf7ML/vBlq660tW4hAdn7g0KV5pWVYKLE8E4hItm5cXYAlZ kmVFejF4+ZbRU14DaxJFbLdZa/zJ8SZngcc1iLWGNjv7QRNZSjTno/5/80fKI5euAdzUUw 93EI+lTF3nj+WGQfki3itc1N1ZbUxzSSCAHFC713xIBvuRyGXKOkNepeDGVyr4ZGHLdqGK p2tQWr8oObAkKgcWj4PLsK+3T6Bw7/0171M8yB6im5ByiUQooqUaxxTcUDHRxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715705651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIM24nKVwJ5R1m+YP1p1E7lf0D/ofWMQva8NfogMaZA=; b=K/eLZ8vDPvGqRw0/89wQVDzyO6UcC5wUv5tn/0rHShM7K+TZVkfFTS+344YJN7viWiGjra iWlHBnec7wQve5Wx7Q0iDmshtJ8XgMVCZeaVdPAQH+d02LMRFN0CTq0EOKXr/K1Ka7kwst anczUncmlHdhVR2IfQ+tu4JukhIn3xTSqP768S5MQTXMxCuGCaNhUeZP/JSML45qKmTwzU X/VTweJW7ygI7Z2XmheeW19fLwLHetu1vCA9hD1V1mJj5CF0DV+bFfXRiFll436gZFzOYK 3CrX3PzeqjLtHmSGiS9HaO7K3FN/7WOdOO0XBReo/cq5BItHON7v9Rvpfaai0g== 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 4Vf2WR46FJzflt; Tue, 14 May 2024 16:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EGsBVw018038; Tue, 14 May 2024 16:54:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EGsBAF018035; Tue, 14 May 2024 16:54:11 GMT (envelope-from git) Date: Tue, 14 May 2024 16:54:11 GMT Message-Id: <202405141654.44EGsBAF018035@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: f4b6272a26da - stable/14 - .github: Update the path used for the homebrew LLVM install on macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4b6272a26da7b1cf577d13c74c9f146412bad56 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f4b6272a26da7b1cf577d13c74c9f146412bad56 commit f4b6272a26da7b1cf577d13c74c9f146412bad56 Author: John Baldwin AuthorDate: 2024-05-02 21:11:48 +0000 Commit: Ed Maste CommitDate: 2024-05-14 16:53:59 +0000 .github: Update the path used for the homebrew LLVM install on macOS Pull Request: https://github.com/freebsd/freebsd-src/pull/1212 (cherry picked from commit 1091f525df9d74f07d707d8a79a91fe26a6c50e3) --- .github/workflows/cross-bootstrap-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index 0aa1d9a35c1e..8a714788cce7 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -30,7 +30,7 @@ jobs: pkgs: bmake libarchive-dev clang-14 lld-14 - os: macos-latest compiler: clang-13 - cross-bindir: /usr/local/opt/llvm@13/bin + cross-bindir: /opt/homebrew/opt/llvm@13/bin pkgs: bmake libarchive llvm@13 - target_arch: amd64 target: amd64 From nobody Tue May 14 16:56:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf2ZX3Mzhz5Kfrn; Tue, 14 May 2024 16:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf2ZX1Tcgz4tM6; Tue, 14 May 2024 16:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715705812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrsfH/8nx2d+Cac1ELlPM4boj2lEJCVKbFvPRO+CXks=; b=nui8p+6le7aVSgQ75p+paWYtZPbDxa44WE+XL2Q9461D1ly+hxa/3pBH0sS9UIqoInBOq6 J7+hAkKiTYchfiHg6kS4/gQ0XifXzDt1KReKcKp3UbhRwF/MmzurPPTwkKUuVlRvtjp1+l 1NV0uiC/TooWKp4NxXB9TSm+qoHqqrnoKyU8+vLntTidvAdTEmpsstoF0CGclUnB+X9Wn2 /8CikI2zDn10tpXOWhHKwuy7MPt81SCNOTNVl0De84FSs9fANqciHgXwWseGPYgW2n4r4G HbgPECo9JmZHeGs0690HvBpn4oAY00frnXiAO+ZcM+yq9XBX7OJMGNFTEPKicg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715705812; a=rsa-sha256; cv=none; b=LKkc73rQkfwnh7SCAKpUyWXSISovLP43/HSOieIXzvVj5qpVCY64mZL5h/4o9mNBH++5u2 8TSWia46C/fkqWf9kE3iYmVWms98KNT+/dmlfmVAe2KVJVnilMhdRwoa56PoDOOMevu+dd n61sLp6zaJMeKYmglaVhXeh5lJC0EPjIzblaT0yzYNWiOZRjyla89mGRIVEuvwGi8CHdgc DBpQ8Z8tRELXLQfem4p1geFoLewBCthwXpY968EzGReLxhNQDTg5BC7XZasYjsvgpa9W+t bLcRJH+H+EW4N22pfZibW+luqpJo95aOuD8JK28hKiEsBgwmYx4eq8R2/e6Jhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715705812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrsfH/8nx2d+Cac1ELlPM4boj2lEJCVKbFvPRO+CXks=; b=Tt2CV7a/qTLhIa5Y5AdKxDHIHpoq7DzSYlDQYBXD3eFcW6dYIRMs/CVA2XZdtTgLxJAUpC CCVoup2AMkyQK+RzCPEMWPw4jNg/zDQa8z4oQG8DP0hMhW6xoRlRgEBrgyn0R9aJhIS746 zbHXxIpawG0TQuvewTxevWv1zYNmmzMOb5GKG9YRcwG9s8t5vvaexSU3SO5ZBpr43oLQ7L QS8MeWnX+LN3v95X1LKdY+KQwnBstpbl6DA6JbAF7Qd9ycC6jNKQLjGYhsMjiF87BP9SJI 1ahg4oulj/6MwGG1QvIQI0JyRbx1hZ4rOqe8vOuVSiGWl/TPIrGXnRHenuCJ9w== 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 4Vf2ZX14zszgH5; Tue, 14 May 2024 16:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EGuqie018544; Tue, 14 May 2024 16:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EGuqa5018541; Tue, 14 May 2024 16:56:52 GMT (envelope-from git) Date: Tue, 14 May 2024 16:56:52 GMT Message-Id: <202405141656.44EGuqa5018541@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: dfac340633bc - stable/13 - ip17x: fix non-debug build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dfac340633bcc64ce005009483ec353c6201b210 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dfac340633bcc64ce005009483ec353c6201b210 commit dfac340633bcc64ce005009483ec353c6201b210 Author: Ed Maste AuthorDate: 2024-05-08 13:20:44 +0000 Commit: Ed Maste CommitDate: 2024-05-14 16:56:33 +0000 ip17x: fix non-debug build PR: 278847 Reviewed by: jhibbits Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45133 (cherry picked from commit 82f43db382cc4aea2a3f34f08da9a97ab023d5fb) (cherry picked from commit e9a7be7def4c55fb5476c5d9540137f0ae6f9206) --- sys/dev/etherswitch/ip17x/ip17x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c index 66e74b098e7b..cf118b0bc2cf 100644 --- a/sys/dev/etherswitch/ip17x/ip17x.c +++ b/sys/dev/etherswitch/ip17x/ip17x.c @@ -556,7 +556,7 @@ ip17x_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) static int ip17x_readreg(device_t dev, int addr) { - struct ip17x_softc *sc; + struct ip17x_softc *sc __diagused; sc = device_get_softc(dev); IP17X_LOCK_ASSERT(sc, MA_OWNED); @@ -568,7 +568,7 @@ ip17x_readreg(device_t dev, int addr) static int ip17x_writereg(device_t dev, int addr, int value) { - struct ip17x_softc *sc; + struct ip17x_softc *sc __diagused; sc = device_get_softc(dev); IP17X_LOCK_ASSERT(sc, MA_OWNED); From nobody Tue May 14 16:56:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf2ZY3dFGz5Kfh7; Tue, 14 May 2024 16:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf2ZY2FQ1z4tZ9; Tue, 14 May 2024 16:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715705813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neyuCObRSILJzFV4wZYJWfLH2e7N+VXOuSXwqe7+Foc=; b=DwErs9kA8qaFSAcQaQJ7368/4NBgZoz84GOyvwnXjSDkVu3z53uZQLkC1oTvf5Z323j9nH 8p8CFHPtDh5LEZveZOzft37Bn+SxzSnDAn4uVVEbt86/eUZ+7WSq0xMfKvfK5Cb2htpIwy zV63lLSEq5h+UtgLXKJozRxyHC2MOy2LubbkySIXtfcv4JDiZf8w8UDwbTksKrRGO2fMAL QK1l7zdYve8p0cLW3JH0xqSOXDzQZ3b6+zp/eixe5fe+T2Y27g8/24uF+L+NtLR9Zwssd1 B+G7s4CrIEKObYxgoNqz6jtmuTMjMkNnZQiZgTtJicBhtRNKRelU2OE1zuV+sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715705813; a=rsa-sha256; cv=none; b=sqpJkGhKWRqM4/gAB0BqOOAnM3tNeHGwrUl9ZoPne4vtoHKjFpqv/9CD6ccamQh2mAVFtW gfk+WUmhLuTG1Z/Dj+Lkn8nUrXYgtlm+eusdY74W35eK23dy3cZ0knJuV9ZQYk542pG/GE 266wT9/JJX4l2+vjo07rgOf1ZpPPfyXQq7bVV/zDZpV1i5uxSb2DW9BMJc/H2Au6E5aVof BwL6VKqG0ukbC5eXdBMCYJA8HbmEiI8GVqfvez2x2Z5sEjycDmlIwHeoYNuVaNW9lCweyF MHeYE8NjCVpMX97RuOTH+zX8PwmsImaywKxvGWKc+/ig4DooUVxIq7z25QuzFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715705813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neyuCObRSILJzFV4wZYJWfLH2e7N+VXOuSXwqe7+Foc=; b=XOzYcN6EBPr02II/xBv3k/T0NFlgKBPqrZ9whzbMoqK9CcMtYATFiMt9lmuhlPRNlI6lX8 kEB8CtnQuF75EFTaghcMBcX0kIELenHtwy6RqfzLLrzp1z7vv4bI7p5XChOItYR/TZ2IXL 2gm+De/siw7jk23rYxmucmtdqWsrDmJPDYIEH7sMc61UHrDZymEt9cdy3tLuOURHLGBo/g sIJKXdBCWZDA339uHLYsTl3vYL6n5WQhTX5NqRJrl9GXl1DnihjJW8XnutjTWekkd93vKI VuwHpR2aL7YHK5syj+G8w0A8a/o8Op2b1eA5vFRheGAaB4lvgk028Q3/QAH0jA== 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 4Vf2ZY1rYdzfxD; Tue, 14 May 2024 16:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EGurFf018589; Tue, 14 May 2024 16:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EGurLD018586; Tue, 14 May 2024 16:56:53 GMT (envelope-from git) Date: Tue, 14 May 2024 16:56:53 GMT Message-Id: <202405141656.44EGurLD018586@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: 1346b9ca7167 - stable/13 - ukswitch: fix non-debug build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1346b9ca7167789061edec6547f1f8c5b839c71a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1346b9ca7167789061edec6547f1f8c5b839c71a commit 1346b9ca7167789061edec6547f1f8c5b839c71a Author: Ed Maste AuthorDate: 2024-05-10 12:52:06 +0000 Commit: Ed Maste CommitDate: 2024-05-14 16:56:33 +0000 ukswitch: fix non-debug build PR: 278847 Sponsored by: The FreeBSD Foundation (cherry picked from commit 2e0c027e69de66afc1157c76bd42ecd3737d54e1) (cherry picked from commit 7309d72e140b8d13698c0e88168228f8877aaaad) --- sys/dev/etherswitch/ukswitch/ukswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c index a5d2de94a13e..ab22ac5f97e9 100644 --- a/sys/dev/etherswitch/ukswitch/ukswitch.c +++ b/sys/dev/etherswitch/ukswitch/ukswitch.c @@ -514,7 +514,7 @@ ukswitch_writephy(device_t dev, int phy, int reg, int data) static int ukswitch_readreg(device_t dev, int addr) { - struct ukswitch_softc *sc; + struct ukswitch_softc *sc __diagused; sc = device_get_softc(dev); UKSWITCH_LOCK_ASSERT(sc, MA_OWNED); @@ -526,7 +526,7 @@ ukswitch_readreg(device_t dev, int addr) static int ukswitch_writereg(device_t dev, int addr, int value) { - struct ukswitch_softc *sc; + struct ukswitch_softc *sc __diagused; sc = device_get_softc(dev); UKSWITCH_LOCK_ASSERT(sc, MA_OWNED); From nobody Tue May 14 17:08:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf2rD4vJXz5Kgjk; Tue, 14 May 2024 17:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf2rD4Mxbz4vwL; Tue, 14 May 2024 17:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715706524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zdZ5XSU062lhuuRULGXske3tRC0qQExTmBK6albsN40=; b=Mw173HrEcaaY7lTxyI151HY7D2huQycsoKQ1ERKRQJQfGiiXvQTaopGvsEMHnhArsTXZhD qUACwuAfQynmiu5MeQkDfSSwDXZURzYKY1kyCQSLUrIIR3lDjmnWVv8GTxKHrfX3RK+iOl KJFXpdndjdfqFGJLGF2DkZ9qsKDd391WIMKO9Du2FIuNxsuHN3/TcFn4NfazNUyuCv1gaF KXZ1wC7t1lnFdPlMU0HzSBgGlAp/4QLP5CiYxsXsBTR56rLQF/EfKVPxl5pRNrUUQEMTQb KvorzrmRWe0ZvwnJSF/3gDxNj6pLK6pNL2IeRqAGFMkQ/7b5yN51wlvqXteKrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715706524; a=rsa-sha256; cv=none; b=c/wKCbC227666zEs0qfYsmt0jq3xL+Pckxez/YISZFFk2K6x7hoShAgPmSBdss08q6q432 hMZZPVnnGnsO0SfKZnFopxAebdraRP11oOnDXKo+E0eXo1f3av+r5mVpAppUdt9RpstOA3 /qJoxCLUjYVPh812iXVlELAUrnzoNHjrrDhqHYl9at1AyraFLs90gm0g4+DSVpKW4UnVLw JFB4sMPSAzfIIBQnruWTmGgWetJt62cQ5vYXeWiOx7RL9QE5qBnqqS6ROdsk//Y6i8VNAa OsVK0H4HWrdA/K7FF9n73r6pDwaJIO9rst2TgagEBjTGm9z16+My+p2ijr64Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715706524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zdZ5XSU062lhuuRULGXske3tRC0qQExTmBK6albsN40=; b=QN/xejsLfVCwXRbVFrKovBCb6aorMXU3PqgQY9faeA0MevMP6kVFIPiYHDJWimxLGpEBw5 CiAmlaelPs682Je2/cMIj0lf1bxyS7am+nYvU72Op8gn8utemzws5Aut7mQGWQxQUTOgox dgQYa/XrGszbp+x9f6yZme5wgAVVPrarfaIr2tPAA+oNICDVzcWXYfNQxyOQal7ZjJ7sMP XGa6vbyosVy+SQvjScp6nRISvQ65DJalsudlWj7g+7Xq+e7aWlg+TnqyG/Q+dxT6DVUd2b jZjW7Itj0640vAf3kd2OxL9aH4fRr+VFvetOz/odD4BdQBQU6o6VKJSMgl5NAg== 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 4Vf2rD3zQ6zfy8; Tue, 14 May 2024 17:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EH8iH5037184; Tue, 14 May 2024 17:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EH8iWS037181; Tue, 14 May 2024 17:08:44 GMT (envelope-from git) Date: Tue, 14 May 2024 17:08:44 GMT Message-Id: <202405141708.44EH8iWS037181@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: ea6caf8bc223 - stable/13 - .github: Update the path used for the homebrew LLVM install on macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ea6caf8bc223783f6c6b898285ef96c1ffa7cdcb Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6caf8bc223783f6c6b898285ef96c1ffa7cdcb commit ea6caf8bc223783f6c6b898285ef96c1ffa7cdcb Author: John Baldwin AuthorDate: 2024-05-02 21:11:48 +0000 Commit: Ed Maste CommitDate: 2024-05-14 16:56:33 +0000 .github: Update the path used for the homebrew LLVM install on macOS Pull Request: https://github.com/freebsd/freebsd-src/pull/1212 (cherry picked from commit 1091f525df9d74f07d707d8a79a91fe26a6c50e3) (cherry picked from commit f4b6272a26da7b1cf577d13c74c9f146412bad56) --- .github/workflows/cross-bootstrap-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index 47349a517a1f..78ba1560e5de 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -30,7 +30,7 @@ jobs: pkgs: bmake libarchive-dev clang-14 lld-14 - os: macos-latest compiler: clang-13 - cross-bindir: /usr/local/opt/llvm@13/bin + cross-bindir: /opt/homebrew/opt/llvm@13/bin pkgs: bmake libarchive llvm@13 - target_arch: amd64 target: amd64 From nobody Tue May 14 20:01:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf6h805Ybz5KwJw; Tue, 14 May 2024 20:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf6h71dX0z4FNC; Tue, 14 May 2024 20:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715716919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Fq9uKOTJeJC4/XeP/gbW4vhprG2TAcD+59cT8QgV3A=; b=fVDYshLaxyeVKyx3HoLBR4Gzdxq2RcEc/SLPe3WMdhKFG02jSO23fvrpB9wOZjWSOBBOrk ePWfeLxAhd0lqJgi5NihPd8TnKiwU5yTh0GjrV/Oeawb9qnp9XGYxIoodyJbHUt28UdPrB fqcGDSUgmyMn5slkqDR7FZZZNTuA0Vm8Ryokc5ZDHcQMkzt/iAtl4s6XZySfyX8jYlCkZg 9XkgdOgan9lKlvmZ/3JYsiK6XdfoQ3UcFF88uDPVaHKVDIEx+6pkCp2D9b3tkpdzxWjhvd eWFrIuE3C2bjWzLDp/H3T60on1S/lJdwuOW661CNhh1Df+M4KsBMYbqpKK0M3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715716919; a=rsa-sha256; cv=none; b=gp0uhaQ7/rtqWw0Tmor6wMqBxlZgJgcAYTm5q07813JvvGQTsyCiTc/6kv1kNMpbuvbHGl vzmIC1DGzwvRimDAqD0yphf0cHnjl0HgNPUTf0LF7ZMNsE5FHknw3fQv+FQRedWAZf+/R8 Xds1qLFb81a0s68StGuiz/WBHDmu1kF/yLba0UTPKHNggU7PjjzBe44Y3/hun0wi3EE7b/ ghnYD3F/uodrjhKEcMfvaKtif9b1XW51jE9czNMyuF5GTYQxVr5LB6wuSQiCYyGubnbz0A 4+DrAlYVqnXe2/IhpQaU0fcs0G7B9WNDzeZGSAWLEY37ZbaYmtnldRJ1D9p5LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715716919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Fq9uKOTJeJC4/XeP/gbW4vhprG2TAcD+59cT8QgV3A=; b=Z3juYPLuVpjr9SFU6WWtSOREzrwiJvbSz0ciqlNltANwH+6Y1d53JxIJFarYpwfVdtcneb aimRJif6uDeT0Aqfsz4YZyJ3SQ3rHihPg5kq67hH/UlDdJGKkKoT3842Ihlq23+HDQZHas 9TVX40DxETCHpH0ui/FFP6qkHQjF4x4TgcLfq2h98515dV7Kpt+qohs9YsyQQYVXUyglRT WBoizzwvqvMu0iI331MLGbnSGUHeQDAoXR5ZajcAFuZU7+tSV4nRt3vQS49A7YBQ3ltRzf IYTzlv003P30AnHC3cCz6srpWQ7yUWrrXNG9tE9lqTNOHf28OeCeW55e+miwiw== 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 4Vf6h71Dxczlhv; Tue, 14 May 2024 20:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EK1xO4038765; Tue, 14 May 2024 20:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EK1xPh038762; Tue, 14 May 2024 20:01:59 GMT (envelope-from git) Date: Tue, 14 May 2024 20:01:59 GMT Message-Id: <202405142001.44EK1xPh038762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 096a438138b5 - releng/14.1 - in6.h: expose s6_addr* definitions to user level List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 096a438138b54d6e0bd657c626921b7c4eeea668 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=096a438138b54d6e0bd657c626921b7c4eeea668 commit 096a438138b54d6e0bd657c626921b7c4eeea668 Author: Mike Karels AuthorDate: 2024-05-02 15:24:37 +0000 Commit: Mike Karels CommitDate: 2024-05-14 20:01:43 +0000 in6.h: expose s6_addr* definitions to user level The only element of of in6_addr that is specified in RFC 3493 or in POSIX.1-2017 is s6_addr, implemented via a #define to a union member. However, FreeBSD and other BSD systems have additional definitions for the other union members, s6_addr{8,16,32} which are defined for the kernel and loader. Some Linux applications also use them, and they seem to be allowed by the RFC and POSIX. Remove the current ifdefs, exposing the additional fields to user level, and replace with #if __BSD_VISIBLE. Add an explanatory comment expanding on the previous "nonstandard" comment. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D44979 Approved by: re (cperciva) (cherry picked from commit eb3dbf2dbe22ed6d4df54aebbf23f5b555a21cf1) (cherry picked from commit a5a2e963f9a0a4bc65aa1c70a361243328e23961) --- sys/netinet6/in6.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 78c9cd56ed60..ce3bbea6b8e6 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -102,7 +102,13 @@ struct in6_addr { }; #define s6_addr __u6_addr.__u6_addr8 -#if defined(_KERNEL) || defined(_STANDALONE) /* XXX nonstandard */ +#if __BSD_VISIBLE +/* + * s6_addr is the only in6_addr element specified in RFCs 2553 and 3493, + * also in POSIX 1003.1-2017. The following three definitions were not + * exposed to user programs in FreeBSD before 14.1, or in other BSDs, + * and are thus less portable than s6_addr. + */ #define s6_addr8 __u6_addr.__u6_addr8 #define s6_addr16 __u6_addr.__u6_addr16 #define s6_addr32 __u6_addr.__u6_addr32 From nobody Tue May 14 20:38:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vg5CGcz5L03G; Tue, 14 May 2024 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vg48t3z4JYf; Tue, 14 May 2024 20:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1tl89Zho1ir7ViggzV5HyZTIAjGxho7JQmMy6AK9ug=; b=K1i0Y6wkuY4EmPIbNzfuDr/9vlkh5N0RdYBdgfmfyaagov92iWKabpBWUrh/G0xAAAXnmp pLGCwWnSn91SXIMFzYmSXfKuBlfpgtK9S5j46buVkU9A0joqiUjOGCEsKOQllQ7nADedXv r48b33tEjhE35JIr2Fhyjto27p20AtCyEcCss82KkL7Iykwgic5wbvxWKtENXo1RC6S9H5 0FoI5GY2JQBKADb/oaYcMrfL6lqXqP0IAxkoDEVUuYo7CsLgnZBl714J/YIdIksx6UQVv0 a4XltwLQ6gofkefg6f+KEOnWCpu4x/hefvlo33ZA2xcC1CtFFFAGGryGCGjZSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719131; a=rsa-sha256; cv=none; b=cDTIIKoV9ZOERA2Hdm0XJ1Er8fXBM/Zycl8wa1UPUnQy2UxeS8BWUb4YZP+W226hs8LtSj LZupqjvb0SlofEZNumccrakzPwrEfvQx9tn4pKXJzJg1kMBbS2v023oi9VOs+k5GC7+JfK sg9nZO0w7CaT6fF9fHRMGP1aUeRXZ6sz/dWjwYCsSYwV99uQwW8KCZeeG+FhdtXpoZT+vd Fkw4ZovTPchha3G5TeFxLbqSQx0tKHE7u2xwdnk//tu502cVcBcrau59zNZ2eAZszdYCHe V01J2lmiP3lcZClzTkHsVrDwU0zoP1wvDTt4LI7w2OD08mF7vhLiXHjE8ansTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1tl89Zho1ir7ViggzV5HyZTIAjGxho7JQmMy6AK9ug=; b=JkpqN0RgptZ5JSBu2z9nhGfR1i9W9dazv+d/TlIiuRqC/MJImPoPotDq1APZRZ+U05raCH D0ew2N4Hr/5nBlnMgGQZFViO12dh0ehfOYlaNR56VaLKtZjjNRPo43UpE6ojnVdLtxArh9 DeZp58xW35KYMBq0nKiX2nVRWx7H/2XBroNb3P10fDBST/Q7d8T0S+TAo4JpTn4xwccKsP z5IaqiwuFiCLKn8MoIVG6tHt5y1sTBD1vh0hgBrDBqq4J6fvQYHXiOVfzreamHBBGjnSKD dBdrQdzTcfxJAGETEcf+cCkCfrOG+e1cYyiWCmAJP9bEe522RP6dXzpnxLZgXQ== 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 4Vf7Vg3JNczmZQ; Tue, 14 May 2024 20:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKcpLA092213; Tue, 14 May 2024 20:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcph7092210; Tue, 14 May 2024 20:38:51 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:51 GMT Message-Id: <202405142038.44EKcph7092210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: e9927f4e6129 - stable/14 - fib_dxr: log malloc() failures. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e9927f4e6129271843985d994aab9edf7299aaa0 Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=e9927f4e6129271843985d994aab9edf7299aaa0 commit e9927f4e6129271843985d994aab9edf7299aaa0 Author: Marko Zec AuthorDate: 2024-05-06 18:21:55 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:31:10 +0000 fib_dxr: log malloc() failures. MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index e7eede53ea51..db4f4a537e22 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1118,8 +1118,10 @@ dxr_init(uint32_t fibnum, struct fib_data *fd, void *old_data, void **data) struct dxr *dxr; dxr = malloc(sizeof(*dxr), M_DXRAUX, M_NOWAIT); - if (dxr == NULL) + if (dxr == NULL) { + FIB_PRINTF(LOG_NOTICE, fd, "Unable to allocate DXR struct"); return (FLM_REBUILD); + } /* Check whether we may reuse the old auxiliary structures */ if (old_dxr != NULL && old_dxr->aux != NULL) { @@ -1213,16 +1215,41 @@ dxr_dump_end(void *data, struct fib_dp *dp) dxr_build(dxr); da = dxr->aux; - if (da == NULL) + if (da == NULL) { + /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR aux struct"); return (FLM_REBUILD); + } - /* Structural limit exceeded, hard error */ - if (da->rtbl_top >= BASE_MAX) + if (da->range_tbl == NULL) { + /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR range table"); + return (FLM_REBUILD); + } + +#ifdef DXR2 + if (da->x_tbl == NULL) { + /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR extension table"); + return (FLM_REBUILD); + } +#endif + + if (da->rtbl_top >= BASE_MAX) { + /* Structural limit exceeded, hard error */ + FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); return (FLM_ERROR); + } - /* A malloc(,, M_NOWAIT) failed somewhere, retry later */ - if (dxr->d == NULL) + if (dxr->d == NULL) { + /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR lookup table"); return (FLM_REBUILD); + } dp->f = choose_lookup_fn(da); dp->arg = dxr; @@ -1311,13 +1338,17 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, /* Structural limit exceeded, hard error */ if (da->rtbl_top >= BASE_MAX) { + /* Structural limit exceeded, hard error */ dxr_destroy(new_dxr); + FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); return (FLM_ERROR); } - /* A malloc(,, M_NOWAIT) failed somewhere, retry later */ if (new_dxr->d == NULL) { + /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ dxr_destroy(new_dxr); + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR lookup table"); return (FLM_REBUILD); } From nobody Tue May 14 20:38:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vh5m0Gz5Kyvv; Tue, 14 May 2024 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vh4ltnz4JfN; Tue, 14 May 2024 20:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9O/+LWKwITGIKwC8fFLekHX72JFxA87Cgxuy+C99qM=; b=E7IR+eWmF2G1uKzIneVX3R5eN34gSXCPua/oAfQYF/LY5/CIE0bkv4noVaXafgqnIsTAlh JV+0LSszRY/elgrd3O8ttXyBLOLDEbbzchflkMWOz1wKwZNX4hwJfofsfjtT3ntU2GJDMX xxz9sM9wRtqvjgZamBtRKHWEoOA+eTTpq5sD5jiDkmeyuBkhT3uFqMzQW/FIEzpjJVSU6/ /m6cJzPTmslcaRQ80SiUT6IEM+9ZTjQXAVd9UTTV8Z9V3OQRrRww9GUp9HzUduqc17OvYA DzbfKGNBf3YSvBFVzuRd7i5mUlKS5hcIJV4PZOpOXmeW+5l3R+ZjiFC9ugymLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719132; a=rsa-sha256; cv=none; b=jLIP7SU8ohaqHNcm5TWP56NYLWpvepoqpArSs1v4EXZeGIRSsVJNHV5l2h40D9uCJEsLJw TwEQyy3/6Rqn7MdWjG2Pph4HNHj2NAU8V8OKdn8MMqcJM6/Pa8Jqrynh/YmdkuymQ5mhD+ tHqu1UAVrrZRs9MmOspsNDRtL0ZbC4Llep4WaaCgzaxO7+U4h+wdiwiceZoCOCCxg6BzMi af0UL/gKNCxUdo7yOHg9fUbuV+q4XlDDeDqZCNqhw9o6EpQtlWhfpkMO1IVQye+HapsNsZ eEtZ+FRBAPYedT9N2Q7LuclFuwPWIDy2zWfX+injLISJWp1Cwue6YDktV7ycbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9O/+LWKwITGIKwC8fFLekHX72JFxA87Cgxuy+C99qM=; b=qoitDhH9XglA6jY7d0ls/NKmbMT+Q8gFhxAejijn0u9uTwtRXFNdWacBfem6X7znbkDwt8 8F/8QL2/Gc6gV53VP8OCOpLIkI8fht+XYm9tnUPr2CwiyNx7C6/ZD/SmypzF7I/7umyhZI XgeoCJAUmuVcEjdYwW2RLUjsO/RMsT1Snsgf/L9/cYPSloz6jygegimdZGT/AzNDAYlB8i tvyD6Bb+cafshWWjz83xtKbcgyuXm9fodYoY79vARCDVuT2i5/mX4pD68a74AsrrXZBvwx enK5fIrUTabIJiIK5mVZ6hl1ZSmEL1Aafifceq8u41Z/dO4mjSQ8fdOFcmr8MQ== 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 4Vf7Vh4MLZzmCl; Tue, 14 May 2024 20:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKcqxV092279; Tue, 14 May 2024 20:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcqrL092276; Tue, 14 May 2024 20:38:52 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:52 GMT Message-Id: <202405142038.44EKcqrL092276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 64136682ba16 - stable/14 - fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64136682ba1681e56093f77b4cec8bdfa6375a72 Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=64136682ba1681e56093f77b4cec8bdfa6375a72 commit 64136682ba1681e56093f77b4cec8bdfa6375a72 Author: Marko Zec AuthorDate: 2024-05-06 18:34:11 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:31:24 +0000 fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index db4f4a537e22..55f79994f552 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1142,14 +1142,11 @@ static void dxr_destroy(void *data) { struct dxr *dxr = data; - struct dxr_aux *da; + struct dxr_aux *da = dxr->aux; struct chunk_desc *cdp; struct trie_desc *tp; - if (dxr->d != NULL) - free(dxr->d, M_DXRLPM); - - da = dxr->aux; + free(dxr->d, M_DXRLPM); free(dxr, M_DXRAUX); if (da == NULL || atomic_fetchadd_int(&da->refcnt, -1) > 1) From nobody Tue May 14 20:38:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vk0Hw0z5Kyxl; Tue, 14 May 2024 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vj5m4Lz4Jbv; Tue, 14 May 2024 20:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyHvfaF31XYQ9VJJjqz+jjLrC9IhcmTEsblJGKK4TH8=; b=F3FOhxxOPPDZeWKY2Nz7VHVUEu8Jkkml2NRswqLvJQE05DPJPmY1wI3VwIxEiUffIw3Nen eV1qm1wzrv6X69RNybRSjs24AFQEsEAT7vTbjPGlyAONn9LYPNs19uz18e7f5CSCkbNw2G pAUAhpGPJMzvc07gyWfV3F/+fXZe2M2mtoNksGJE8ZtcWtSHX+CS7qRd/Z3buuPeqv3t4c 3tyivRHcG6Y5LqorA2IROJidnHGu+7o66madg6+21DqeNxKRU7QEfgvllBuoJbeDrZTEAp siElzac3cnU0QaipFVdykDxLnl3SAeHVUYXZe67YqVPsC2L9q3BAOp00UmIAyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719133; a=rsa-sha256; cv=none; b=L9SAgLkJHw+ZXrh2SLK2+BIjZpnw6Asm8owODMqX1jsqjOTksjFLcHSruLTC5ZdeWupfIL 6IkH7oFdsabQOH6M7ztgNQAc6LFR4kZFwXB5RzPoOKZnKlvBcl9CC83AuehFIMMbieSIZS 8qxwaIfQnjFQowz/wM8B26Oa52ODQoN9TdsOhwbOtPsHr84Gadev2luB5LCOlIEqXLxR2a zfZFOpcszdlwGNBo+YS8ZtT80RJM2Vo7UYJcZHfE+Xx9D6WO6hAin6jmGkE4zuSO2np8Ai GTzSauiedA8zKAYfOWexq6FtaUvlHbNdheh/0FnEO25n1StcuERRfSx7eARchQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyHvfaF31XYQ9VJJjqz+jjLrC9IhcmTEsblJGKK4TH8=; b=kuV+0V+YOaDEJHsLb6yJrvvNvPIkOIL0+fF5rlEE/yPRozJU7t3Uiys/f9WaGWCfYK3C9c 0IQJPWQ3zRnPPBgFUCj+8yA3npj6BQxvJv0Pa2t20A7SitD1W1AzMrMWX5yLuUdIYKqJjJ WAm6Eh4cVKCWHgSlSnBAOz3FSZKI4Udq9ZsWDsJB3T3noTmLbOdRGFE0i8O67ILV/fWAwf 90ioBaE03n+wpzgKyr5htdJdnjYE33sWNesk2ywdcKHAs+pe0HsjsUAyBSKjTZvU+G1wbn UI3EBCIYvIM4WA/93VVyOjLHerXkne0GTq4Cfvr+y4hqWtgBmzlS9p23RBS1og== 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 4Vf7Vj5LnRzmZx; Tue, 14 May 2024 20:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKcrrn092318; Tue, 14 May 2024 20:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcrGf092315; Tue, 14 May 2024 20:38:53 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:53 GMT Message-Id: <202405142038.44EKcrGf092315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: df376a714af6 - stable/14 - fib_dxr: update comment. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df376a714af6b9aaec5a0366e27ef42985b4220b Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=df376a714af6b9aaec5a0366e27ef42985b4220b commit df376a714af6b9aaec5a0366e27ef42985b4220b Author: Marko Zec AuthorDate: 2024-05-06 18:42:31 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:31:43 +0000 fib_dxr: update comment. MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 55f79994f552..3015564953c6 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1098,7 +1098,7 @@ dxr2_try_squeeze: } /* - * Glue functions for attaching to FreeBSD 13 fib_algo infrastructure. + * Glue functions for attaching to the FIB_ALGO infrastructure. */ static struct nhop_object * From nobody Tue May 14 20:38:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vl2c4rz5Kysh; Tue, 14 May 2024 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vk6vMjz4Jfg; Tue, 14 May 2024 20:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e0wzStyXwbjBq28h9tn1XiaahEBnGHOoLGGfmoRgII0=; b=ltGT06TKmmR6nj3vhyP2oJDVV3Nxu80aZwibHDWxpsSDPNcpj1EtuqwGKTunpbh9A9kSbE bqpuNmZLfz2iMznhT8/7U7uBpaKD+5rw5wtRjEvXEmr8cHRTqfvGDL3NuvQKogqEJCwEC0 AsASXInGjRgO71CGFXj9+vLmAxH8nkgszOkCk5GRWbqvlJcLN3Ou0bPAvfvrYXu4rPinwf fSo6FXcRFboKeBF32T2B7wZvH0inePvvkh3KXHeBgJPVO/OX4dihqP7BgxSulPqBt4NqNy Go4GFeJewTKF/7Sje2ai+jwyCgwFRN/n0NJvuOJHZlx1AsXM75y9ll2UqGK9XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719135; a=rsa-sha256; cv=none; b=sOZIazLF2ssyznsK5JwknKZ+oUiNCYdPUS9Gz7lSo4wn0rHihcG3inCCXXX8vfiSUodsk7 J7SZKyw9oH1003MQNhdBq7qCw482PUycuJ25OtjIf2+0L0sxo1691k5xOBVTu+9ImQFme+ 3/ACCg0LQIHWUkdZV6m8ADvxfhsw4ww+BJ/EhE8ZH5NA1cpV1XbtkvGAXnO3R9NH7htK+c sNEaKBeUZAnL2rusaIsvxw9cO5SXoB4YymHb2el3Sywcpra9Ag3XTDRKsMzZOmkvGK8xOU 4d/NODVGe3ZeJ3aTxxDZZXBF8aG/HVleJwn4b9nZIxKO/xuNlg2OL3218KQXeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e0wzStyXwbjBq28h9tn1XiaahEBnGHOoLGGfmoRgII0=; b=r0DIyyodZ+gUnXDezTdED6UoPN/5Y5/p6FD8ZkR8TPCZWYgdnnt4J0BGAjmYSYsx1i4YWL vsZyCHKMBTSg1K0cfZEK+p5wHOkWUPJu28id+gqkBSrrcDVEC9gBlyv8rcSV/j2jVInWcm PRlORLgwIzc8QTgc0KM2tLwa20foNxz1MoYzu6Pg9waTV2dHnLj6yJ3e9JXJT4Z6mKpZzA 11lBLNVUm5np9/CdmY1RUjAUzIpLxJWT+zoE6nKwbg1xpfccLNZPgFcV2E2hX09ujYZOoN Gc+m5nwiX7oLuOwhnwWlMk7nE2wsgYNlrIn2uOtrNCPIn+SREboTA7V5hHxbtQ== 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 4Vf7Vk66G5zmCm; Tue, 14 May 2024 20:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKcs7C092382; Tue, 14 May 2024 20:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcsYS092379; Tue, 14 May 2024 20:38:54 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:54 GMT Message-Id: <202405142038.44EKcsYS092379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: e474704b9c49 - stable/14 - fib_dxr: move the bulko of malloc() failure logging into dxr_build() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e474704b9c49dda12e2afff2ae05f972207e21d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=e474704b9c49dda12e2afff2ae05f972207e21d7 commit e474704b9c49dda12e2afff2ae05f972207e21d7 Author: Marko Zec AuthorDate: 2024-05-07 15:11:30 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:32:05 +0000 fib_dxr: move the bulko of malloc() failure logging into dxr_build() --- sys/netinet/in_fib_dxr.c | 77 +++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 3015564953c6..3b2dc837d50b 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -497,8 +497,11 @@ chunk_ref(struct dxr_aux *da, uint32_t chunk) da->range_tbl = realloc(da->range_tbl, sizeof(*da->range_tbl) * da->rtbl_size + FRAGS_PREF_SHORT, M_DXRAUX, M_NOWAIT); - if (da->range_tbl == NULL) + if (da->range_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR range table"); return (1); + } } return (0); @@ -632,8 +635,11 @@ trie_ref(struct dxr_aux *da, uint32_t index) da->xtbl_size += XTBL_SIZE_INCR; da->x_tbl = realloc(da->x_tbl, sizeof(*da->x_tbl) * da->xtbl_size, M_DXRAUX, M_NOWAIT); - if (da->x_tbl == NULL) + if (da->x_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR extension table"); return (-1); + } } return(tp->td_index); } @@ -873,8 +879,11 @@ dxr_build(struct dxr *dxr) if (da == NULL) { da = malloc(sizeof(*dxr->aux), M_DXRAUX, M_NOWAIT); - if (da == NULL) + if (da == NULL) { + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR aux struct"); return; + } dxr->aux = da; da->fibnum = dxr->fibnum; da->refcnt = 1; @@ -894,16 +903,22 @@ dxr_build(struct dxr *dxr) if (da->range_tbl == NULL) { da->range_tbl = malloc(sizeof(*da->range_tbl) * da->rtbl_size + FRAGS_PREF_SHORT, M_DXRAUX, M_NOWAIT); - if (da->range_tbl == NULL) + if (da->range_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR range table"); return; + } range_rebuild = 1; } #ifdef DXR2 if (da->x_tbl == NULL) { da->x_tbl = malloc(sizeof(*da->x_tbl) * da->xtbl_size, M_DXRAUX, M_NOWAIT); - if (da->x_tbl == NULL) + if (da->x_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR extension table"); return; + } trie_rebuild = 1; } #endif @@ -1039,8 +1054,11 @@ dxr2_try_squeeze: #endif dxr->d = malloc(dxr_tot_size, M_DXRLPM, M_NOWAIT); - if (dxr->d == NULL) + if (dxr->d == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR lookup table"); return; + } #ifdef DXR2 memcpy(dxr->d, da->d_tbl, d_size); dxr->x = ((char *) dxr->d) + d_size; @@ -1119,7 +1137,8 @@ dxr_init(uint32_t fibnum, struct fib_data *fd, void *old_data, void **data) dxr = malloc(sizeof(*dxr), M_DXRAUX, M_NOWAIT); if (dxr == NULL) { - FIB_PRINTF(LOG_NOTICE, fd, "Unable to allocate DXR struct"); + FIB_PRINTF(LOG_NOTICE, fd, + "Unable to allocate DXR container struct"); return (FLM_REBUILD); } @@ -1212,41 +1231,11 @@ dxr_dump_end(void *data, struct fib_dp *dp) dxr_build(dxr); da = dxr->aux; - if (da == NULL) { - /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR aux struct"); + if (da == NULL || dxr->d == NULL) return (FLM_REBUILD); - } - if (da->range_tbl == NULL) { - /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR range table"); - return (FLM_REBUILD); - } - -#ifdef DXR2 - if (da->x_tbl == NULL) { - /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR extension table"); - return (FLM_REBUILD); - } -#endif - - if (da->rtbl_top >= BASE_MAX) { - /* Structural limit exceeded, hard error */ - FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); + if (da->rtbl_top >= BASE_MAX) return (FLM_ERROR); - } - - if (dxr->d == NULL) { - /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR lookup table"); - return (FLM_REBUILD); - } dp->f = choose_lookup_fn(da); dp->arg = dxr; @@ -1334,18 +1323,11 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, dxr_build(new_dxr); /* Structural limit exceeded, hard error */ - if (da->rtbl_top >= BASE_MAX) { - /* Structural limit exceeded, hard error */ - dxr_destroy(new_dxr); - FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); + if (da->rtbl_top >= BASE_MAX) return (FLM_ERROR); - } if (new_dxr->d == NULL) { - /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ dxr_destroy(new_dxr); - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR lookup table"); return (FLM_REBUILD); } @@ -1357,6 +1339,7 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, return (FLM_SUCCESS); } + FIB_PRINTF(LOG_NOTICE, dxr->fd, "fib_set_datapath_ptr() failed"); dxr_destroy(new_dxr); return (FLM_REBUILD); } From nobody Tue May 14 20:38:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vn3rpJz5L03f; Tue, 14 May 2024 20:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vn1PsLz4JVJ; Tue, 14 May 2024 20:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQxBWmDRRGSG92ND5PHR5e96k/nXorgQkO8AvcclAkw=; b=ikzG+VYOLh5FTE48B4SipYGlHR9BhConUURsRl2YN7X/6NTcViyUKfHeL4X2vGF4Hrqouw +mGvFD0Mk3ZPaoJR/dJqgsjh3UFvtn1iiTxBS2QFN5qG1G13pQyvKIYQi4qB04ixsl4VDs MQ81aYYsvmuQDwccgYD5JTwV5ZoWHaVhmcNwp3W9PUz2mOCA+aLPTr5RM/sSFiyCW6PZoF jm1BqK3OGNkfyxdehW9gEArJCg/oGPULjBiP0MwtCaqwaRehE6Lcq+JTaTKmjVtihsqgmt aCfh8dx/i7g2KobwP36iDJpOB/x7NJ/BsZSgWUkYFt2LUlzocLGpkGdX4zbkiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719137; a=rsa-sha256; cv=none; b=esWDUcVqFh6t9+Ba3ZJ+tNbvkskQuGEgWlDfNl3OWH3Dta/8aakmih8an8HTcx65GuF6Zu nZMIniDR3kVos6Smx92HenTgyJ1AkeThVjKeuSBvqpGzqNBbwTx1sDjE/NeZochrt+OAFr z3j50I5MOhQKayYLvwWk0+zJduNp0PHXMX+bdV7dlAL5qD2kXTvjQFzebATzYowC3kUBZj WJQaNASgIWIgRAD+f2UYMcX92c6dzXQUgNyuJ9d5R2fsblKo0DphNIpXUgNvtEgqu3mr1v iSjY0phnhVa+076kd3Ff5NzwwNLa0zR+dirfaGbuCq/GnNOgrZAEKkFtXJqtEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQxBWmDRRGSG92ND5PHR5e96k/nXorgQkO8AvcclAkw=; b=A3beIFIbn8f5SYA/7Wbd7BospTcCHpky5rwHhsHVZ1k9se30nU1Bbay/+YZzp5uNPMXfFo ZVwZFnluW2xQ8FOehp+DDmNfpfGiqFryYmokMuQUyoDzOJFVXXRg1TEc0LQIzuV5Ly+Uo4 Tp6B2xDaHYfCsrk0lhT2Ls91upwMo6YbOc3gBDnf9m9c7THDj1GySAaOEJm0b3JDcvQMlK PYe4ua5SgNUIiRWqgQo1LcWMWgKVIUOTe0NjHUezMMqKlkIN95YqTA1vXSArfAY0ysp7fG y+db/05HyhaUIXjbzkMFVNVFMHnKSUOWx72v7jqkPQ/4hMYcXPig89QoYzzWug== 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 4Vf7Vn10rpzmQ6; Tue, 14 May 2024 20:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKcvPl092472; Tue, 14 May 2024 20:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcvQG092469; Tue, 14 May 2024 20:38:57 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:57 GMT Message-Id: <202405142038.44EKcvQG092469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 1261fc325c3c - stable/14 - fib_dxr: s/KASSERT/MPASS/ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1261fc325c3cb96eeaddf3ed5a6b1c7c6a08d064 Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=1261fc325c3cb96eeaddf3ed5a6b1c7c6a08d064 commit 1261fc325c3cb96eeaddf3ed5a6b1c7c6a08d064 Author: Marko Zec AuthorDate: 2024-05-07 15:33:23 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:32:29 +0000 fib_dxr: s/KASSERT/MPASS/ MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 5c5311068169..91f3bafdb47d 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -474,8 +474,7 @@ chunk_ref(struct dxr_aux *da, uint32_t chunk) cdp->cd_max_size = size; cdp->cd_base = fdesc->base; LIST_INSERT_HEAD(&da->all_chunks, cdp, cd_all_le); - KASSERT(cdp->cd_base + cdp->cd_max_size == da->rtbl_top, - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp->cd_base + cdp->cd_max_size == da->rtbl_top); } cdp->cd_hash = hash; @@ -525,7 +524,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) sizeof(struct range_entry_long) * size) == 0) break; - KASSERT(cdp != NULL, ("dxr: dangling chunk")); + MPASS(cdp != NULL); if (--cdp->cd_refcnt > 0) return; @@ -536,8 +535,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) /* Attempt to merge with the preceding chunk, if empty */ cdp2 = LIST_NEXT(cdp, cd_all_le); if (cdp2 != NULL && cdp2->cd_cur_size == 0) { - KASSERT(cdp2->cd_base + cdp2->cd_max_size == cdp->cd_base, - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp2->cd_base + cdp2->cd_max_size == cdp->cd_base); LIST_REMOVE(cdp, cd_all_le); LIST_REMOVE(cdp2, cd_hash_le); cdp2->cd_max_size += cdp->cd_max_size; @@ -548,8 +546,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) /* Attempt to merge with the subsequent chunk, if empty */ cdp2 = LIST_PREV(cdp, &da->all_chunks, chunk_desc, cd_all_le); if (cdp2 != NULL && cdp2->cd_cur_size == 0) { - KASSERT(cdp->cd_base + cdp->cd_max_size == cdp2->cd_base, - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp->cd_base + cdp->cd_max_size == cdp2->cd_base); LIST_REMOVE(cdp, cd_all_le); LIST_REMOVE(cdp2, cd_hash_le); cdp2->cd_max_size += cdp->cd_max_size; @@ -560,8 +557,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) if (cdp->cd_base + cdp->cd_max_size == da->rtbl_top) { /* Free the chunk on the top of the range heap, trim the heap */ - KASSERT(cdp == LIST_FIRST(&da->all_chunks), - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp == LIST_FIRST(&da->all_chunks)); da->rtbl_top -= cdp->cd_max_size; da->unused_chunks_size -= cdp->cd_max_size; LIST_REMOVE(cdp, cd_all_le); @@ -875,7 +871,7 @@ dxr_build(struct dxr *dxr) uint32_t trie_frag; #endif - KASSERT(dxr->d == NULL, ("dxr: d not free")); + MPASS(dxr->d == NULL); if (da == NULL) { da = malloc(sizeof(*dxr->aux), M_DXRAUX, M_NOWAIT); @@ -1273,16 +1269,14 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, int update_delta = 0; #endif - KASSERT(data != NULL, ("%s: NULL data", __FUNCTION__)); - KASSERT(q != NULL, ("%s: NULL q", __FUNCTION__)); - KASSERT(q->count < q->size, ("%s: q->count %d q->size %d", - __FUNCTION__, q->count, q->size)); + MPASS(data != NULL); + MPASS(q != NULL); + MPASS(q->count < q->size); da = dxr->aux; - KASSERT(da != NULL, ("%s: NULL dxr->aux", __FUNCTION__)); - KASSERT(da->fd != NULL, ("%s: da->fd %p", __FUNCTION__, da->fd)); - KASSERT(da->refcnt > 0, ("%s: da->refcnt %d", __FUNCTION__, - da->refcnt)); + MPASS(da != NULL); + MPASS(da->fd != NULL); + MPASS(da->refcnt > 0); FIB_PRINTF(LOG_INFO, da->fd, "processing %d update(s)", q->count); for (ui = 0; ui < q->count; ui++) { @@ -1315,8 +1309,7 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, #ifdef INVARIANTS fib_get_rtable_info(fib_get_rh(da->fd), &rinfo); - KASSERT(da->prefixes + update_delta == rinfo.num_prefixes, - ("%s: update count mismatch", __FUNCTION__)); + MPASS(da->prefixes + update_delta == rinfo.num_prefixes); #endif res = dxr_init(0, dxr->fd, data, (void **) &new_dxr); From nobody Tue May 14 20:38:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vn03Cfz5L03Y; Tue, 14 May 2024 20:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vm0SDmz4Jnn; Tue, 14 May 2024 20:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Qg0Z9lheMK9xmmSZBIc6rdQUDMkjL+qErjGzuaW1s8=; b=iterge3XLQrxyuceJa3vC4lbrU8yR3rG+pVyosCah45n7YhATsCQdLMfZIezFgzbzetnkG WWmMhH32IY3uTQjK43QjinDjHLWteUH7XkXRfHxg2htZ136yJ0qTvSfNR7mDWO7vRjhstU IzcsI1Ahv3XtEJD6k3PI8Lsf2SEkdnO5nQowzxSbyUhd9Jaopdyoikrf5uZ9iWIRj8dSjN GSGfX94M0KLGaZQRCo04Cy2I1AR9i1XUWVcrK1F7VossCuJqVqmHVwUTS6vuC7q1+RAk0w mCKckrqRX/lmdCWZ7Fgt+VSDSkoBW2jooez3dlksPluQnYxNXg0SJpHIXQKv1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719136; a=rsa-sha256; cv=none; b=ZSkig2t8WBekNOBiSgU8lC52Tu4mqGgLBczXVFYBVqpZbysEymBIZcODD5v2zTiQ3tBZNO pwG5wiGdXftF0s43zQnHLyJ5dDbKPXs85tPck4FctfITkAYnNY7gj8RDEVdcXRfDLXSwnu 2sQXeBiBEs8sFdwlpU1m5zg+vuhQkHU6Yd6jcd0+u/3CtDjW3ALB6wmPMOwpriIRr+FtME 4zEaItJr8mFthDWIgymL3M4Kl+nFVLX8AfRvKN3uJ7eVwhgUFstPATf66iScCL6PypLYSC gIAukA1MRKOjLID8EiY2GLmPBlBRq6NLWQWnS7BmK/DJDuCATg3yGjQsnJkX7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Qg0Z9lheMK9xmmSZBIc6rdQUDMkjL+qErjGzuaW1s8=; b=YJcQ29wO4cRfh8tP9WrROLpArsD/xV+E+x/NNveNwaNZN9fs5ihglO7sRbdNNnlIlY2F/H TsBQDo/P0a0dWtn3Ccbgr5I6Jtr+xcqsa9SrfT8GoC53PpkE4LiJcnt3misOL/tfiyZ2Zn DmVKB3NZCmK53fX0Hag/6MAk4nTPYbatGFXDi+fi7s3fYx5BBDmc170GEjYmZ4d0ROPSjI FcxnGei5m6uVbSz+0uQ77dSEahpoRIP+sO20ecN6P0XghH/X1rnTFdMdRuyuzCRwLf8huL x/rxduLgK9eAugGHr4GFr6M5FsgnbeLnqu4oZy8NXg3HFI+gDRbAxRpyF4YPeg== 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 4Vf7Vm01qZzmZy; Tue, 14 May 2024 20:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKctdM092439; Tue, 14 May 2024 20:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKctua092436; Tue, 14 May 2024 20:38:55 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:55 GMT Message-Id: <202405142038.44EKctua092436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 52075e4cfabc - stable/14 - fib_dxr: KASSERTs for chasing NULL ptr and runaway refcount suspects List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52075e4cfabc30d08605ec296b2b374d61e2e2bb Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=52075e4cfabc30d08605ec296b2b374d61e2e2bb commit 52075e4cfabc30d08605ec296b2b374d61e2e2bb Author: Marko Zec AuthorDate: 2024-05-07 15:22:00 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:32:17 +0000 fib_dxr: KASSERTs for chasing NULL ptr and runaway refcount suspects MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 3b2dc837d50b..5c5311068169 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1280,6 +1280,9 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, da = dxr->aux; KASSERT(da != NULL, ("%s: NULL dxr->aux", __FUNCTION__)); + KASSERT(da->fd != NULL, ("%s: da->fd %p", __FUNCTION__, da->fd)); + KASSERT(da->refcnt > 0, ("%s: da->refcnt %d", __FUNCTION__, + da->refcnt)); FIB_PRINTF(LOG_INFO, da->fd, "processing %d update(s)", q->count); for (ui = 0; ui < q->count; ui++) { From nobody Tue May 14 20:38:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7Vp5GCDz5Kyw3; Tue, 14 May 2024 20:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7Vp2V2Fz4JrR; Tue, 14 May 2024 20:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srNxVVUtikiiVBJrneDOPu/cgIMrFk0AZnFaKds+qcc=; b=tPkSI0sLedwSRV6FmCe5dcQctRZ2i3MPoX/Eh3liNLoLLhOREscGI1VWGeNs/zH7uSyayL Hj3OLL8aED3mD2vq/PW4tM8ePOOIX7lsv8YIFeT+E54ZgnrE9xeA9CCaM6b6mtV8ATPKLK hWY+BUneHUYfh7jCL8a44XVfptNqUW82lZdLJbAs4teVSx4rR+0qnoNpNX3qL3nVj4BSV+ LxT5zVw5zY3QEPsYpel365tVlPk8yKdnnZW2BqSc877v8XXJ7qNGG7eJZWHRg1lXJ0J3Eh NPUJ6WYhOsG3+krcAFqB4v3tgdCCWgP7joR3d1z1/vETJPX5p1jY/E8xE+Gepg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719138; a=rsa-sha256; cv=none; b=qiyxNUS8fuVsiYdKjSMJWq5x6xD1YAMwk6iZGDD8qRTksGdEg7UNvzN7WYMFmVNvIbpyhT OyXHltWza4JwVVj5XJ8PzfAoxQzFSM621G8pjTTkAzO93irtUGucm4w5ZyqtAUBkW8Dd0n tD1sinjgOuq5vxOLMy8nPrlmjtNIpsKTYe+HcYIIf/G4FudqrELdOHnvgEoCG7pvZFF169 FzJdhNmJbivrJpkilxRXSwo/CTbhPq9xuiizBA+KSDd9PFCpP+1WRYtFp5uW3vmxX6DHvU /mpca7TRza9GoM+Z1Sg9IsRznobHGIJqMGtStX5WbwHHEfoMsEdRMEnmm7WKvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srNxVVUtikiiVBJrneDOPu/cgIMrFk0AZnFaKds+qcc=; b=tmLLdHkueuihNj+4LAuGdbH7FPJYggplIV9Nd6VfSLDUYlpq0I9dRAT8uGhaisYZfq0Tc3 knKvQ1qbqwgd0Ya4hMEwVIy4tmWrlNz8ykhlg9HXRdFtE/zWtMDsp8nwUOjR9EoTjM1QuQ GVaMvACEAlxzZXLH54lXKKft2uFzmELoTkTOdFDqtySQutL+ortps5f1s4KNbg70ZmRElc WT+aPenRoPJHkOrroVcofnGuyhBdiZ4RwxzqeZ6QlrJ55H/ZKCtbR0gBbQ+ET4SSJZoYVs QcQ6nNPJpvmOX4WBD0ivadyr+0VSuT+GRBdR+5Iviz+WAgClQvVDx4KQZGwDUw== 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 4Vf7Vp26G7zmZS; Tue, 14 May 2024 20:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKcwb6092526; Tue, 14 May 2024 20:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcwkQ092523; Tue, 14 May 2024 20:38:58 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:58 GMT Message-Id: <202405142038.44EKcwkQ092523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 0418d7a09037 - stable/14 - fib_dxr: set fib_data field in struct dxr_aux early enough List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0418d7a0903725ade71ae77c4ff900010a93a185 Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=0418d7a0903725ade71ae77c4ff900010a93a185 commit 0418d7a0903725ade71ae77c4ff900010a93a185 Author: Marko Zec AuthorDate: 2024-05-07 15:44:09 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:32:41 +0000 fib_dxr: set fib_data field in struct dxr_aux early enough Previously it was possible for dxr_build() to return with da->fd unset in case of range_tbl or x_tbl malloc() failures. This may have led to NULL ptr dereferencing in dxr_change_rib_batch(). MFC after: 1 week PR: 278422 --- sys/netinet/in_fib_dxr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 91f3bafdb47d..82245ecf6e66 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -882,6 +882,7 @@ dxr_build(struct dxr *dxr) } dxr->aux = da; da->fibnum = dxr->fibnum; + da->fd = dxr->fd; da->refcnt = 1; LIST_INIT(&da->all_chunks); LIST_INIT(&da->all_trie); @@ -918,7 +919,6 @@ dxr_build(struct dxr *dxr) trie_rebuild = 1; } #endif - da->fd = dxr->fd; microuptime(&t0); From nobody Tue May 14 20:39:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WM1rfSz5L05K; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WL6rBSz4Ksm; Tue, 14 May 2024 20:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4xc841hT3BVjKGDra33JVVm287NwbnaQPWxFEXPE6w=; b=nggHT5Rhn5UIbnAmOdkkwZD7L9pFlvSxsgHS4jS2FfiLduWWKHInr7Y7oQvpkjf3w8n9sM H1w/vaNgrQmqaVJaxfYoNbR1AkS5P51cA/mCUbGaFbRMU7AcgRxZZxQHEYfMhoukKiSBtI tf5EhPNGiOG/jVC8OWBv993g9M8jO2cFwr8J6Aazo9IbXmefh9YNq5wUc9NYdZ43Ilodog 7i4l4nIWAtVFhf/6SjiyGixxfx49+hWfOAjuRSxtNInzCZHA+9TKkRI07F/GVVnjTLVxlY F7kyGJMsY5VbpE7wtQ46Qai+AHOynIBref794Rf9IAZlVWbXQ9X9+k84rP79PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719167; a=rsa-sha256; cv=none; b=vhTQcqLmEmjizdsDPBoH8ksRR1/WKuivkSPPDMh0enWrT0yUPEhwXA4GqLbuv52nPDq5fR GA5PEt3mCAjpQInImRsTD+4x2DOVxkHKJ1TKppjGfKsadgqwXEPOLfYJuBFgfINNDKvmF2 3dx6ctSN2zLgZR2zpTCT90gAzgYeENZ4DEyUl9XXWJb2K9vQOJwtLMT7TviALPa6YMYyca pdmMqnzaLkr3rqEH9L2ML/uM+RDKSaG713pY7byxTlTkeoxCQk0LhIzfw77syIWnt3GnNX PvFjIXYCNkzaryL+Uf5++meJYio4X6PrvK+wK2ksnA/cfiTCSboPJ5JlRn6+hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4xc841hT3BVjKGDra33JVVm287NwbnaQPWxFEXPE6w=; b=UeYB1JBRXgvYAuVMYqorj9zDnz6iwDnPFes/Ota5EaWiLbkMiP1XsVeRR9Fz6F3GAeiT2X W8HZxvNtN4BDaDYpe2Bwp+AOTOmZPdYXwCbph9nGPlEZ4ep3zYboHcQYdSg7v80Vy6XXfU qmIrpw/4VDDDRe/YreR8K+gBaiAFkTIuTqEWoYDQ7XuAaTCSP7oBhQ/OuopccxQLwmRVAr XSUU6go/r+BQH6Zgp8QGXi/BRmgmjYkzzjuqAI9JehAeXihOQTEATnD0n0idcL6u3x4lFg AtNcXSZ51FLKzwAnVkWi1achDxFg2YZj6lDjNQZv7HQxdW+jK1GqYVAZ5TYP/g== 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 4Vf7WL6QkrzmCp; Tue, 14 May 2024 20:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdQoT092785; Tue, 14 May 2024 20:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdQgX092782; Tue, 14 May 2024 20:39:26 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:26 GMT Message-Id: <202405142039.44EKdQgX092782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 416679ecabd6 - stable/13 - fib_dxr: log malloc() failures. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 416679ecabd6c73ee5cd700367347133ae15f37c Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=416679ecabd6c73ee5cd700367347133ae15f37c commit 416679ecabd6c73ee5cd700367347133ae15f37c Author: Marko Zec AuthorDate: 2024-05-06 18:21:55 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:35:09 +0000 fib_dxr: log malloc() failures. MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index e7eede53ea51..db4f4a537e22 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1118,8 +1118,10 @@ dxr_init(uint32_t fibnum, struct fib_data *fd, void *old_data, void **data) struct dxr *dxr; dxr = malloc(sizeof(*dxr), M_DXRAUX, M_NOWAIT); - if (dxr == NULL) + if (dxr == NULL) { + FIB_PRINTF(LOG_NOTICE, fd, "Unable to allocate DXR struct"); return (FLM_REBUILD); + } /* Check whether we may reuse the old auxiliary structures */ if (old_dxr != NULL && old_dxr->aux != NULL) { @@ -1213,16 +1215,41 @@ dxr_dump_end(void *data, struct fib_dp *dp) dxr_build(dxr); da = dxr->aux; - if (da == NULL) + if (da == NULL) { + /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR aux struct"); return (FLM_REBUILD); + } - /* Structural limit exceeded, hard error */ - if (da->rtbl_top >= BASE_MAX) + if (da->range_tbl == NULL) { + /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR range table"); + return (FLM_REBUILD); + } + +#ifdef DXR2 + if (da->x_tbl == NULL) { + /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR extension table"); + return (FLM_REBUILD); + } +#endif + + if (da->rtbl_top >= BASE_MAX) { + /* Structural limit exceeded, hard error */ + FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); return (FLM_ERROR); + } - /* A malloc(,, M_NOWAIT) failed somewhere, retry later */ - if (dxr->d == NULL) + if (dxr->d == NULL) { + /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR lookup table"); return (FLM_REBUILD); + } dp->f = choose_lookup_fn(da); dp->arg = dxr; @@ -1311,13 +1338,17 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, /* Structural limit exceeded, hard error */ if (da->rtbl_top >= BASE_MAX) { + /* Structural limit exceeded, hard error */ dxr_destroy(new_dxr); + FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); return (FLM_ERROR); } - /* A malloc(,, M_NOWAIT) failed somewhere, retry later */ if (new_dxr->d == NULL) { + /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ dxr_destroy(new_dxr); + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR lookup table"); return (FLM_REBUILD); } From nobody Tue May 14 20:39:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WN2BlPz5L092; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WN0Hn7z4KwN; Tue, 14 May 2024 20:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uhv+rgRjY6QkAfqeLnd/6hixpswIU0z6W9DaEfKOZ0E=; b=bjLNMfk3ecs4CH+Oh2h+xQJZQ7YNA/I9LuAmO5X6tlx9Oisb7+IwhH2km1NTwo5ckooUWb vLHEqjS5xNh1zECQfPkYEpvklTXv+oV51gj+Zjww1m7yEFHtKJQaZ0dvKGP30b3PZCwRD0 aEjl07A3yRRq0ba/BzJJ6m4IN07CjSzHcm0DV1VJsptjgR2khtD1pjBLw9LkuwnAbesszA 2QQWsvoOgh13nIHb9ypbXDmESUPBNAUA24p8ZeB7xJ7/iS17/+ifQ7x6YJNIIW/n56R04c kotYujDy2RatISyxC0DlF6z9wp4X21TjdRQyDuYNZ5CMWhJOe8opN9EtbXQg4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719168; a=rsa-sha256; cv=none; b=e5tTMV0TsxkPrtFKrM/fuWUuymH2TPQry9wWUeLtU9EbW7kp7Hv0S4rRAQ23dxD8LGzRb3 r5WrpIy1mheCze2Juod47QURf30gjPU4LzFIxs6wTIi7a0sK0LkrCXazgfasYLo3wgQjCr TcULIK0phr4MaSI4WCK+tYYSkVjVMFshx1Kk5uXQ5iLNmnRLbg07uZkOgguIi8up9M1Ly5 dtZp/0dY77Cqzt7xMGi+79cfw8D5KnzhkN6x6zDr21G3xba/+hkAAvPf/+AmXCbKKjU70g 5KFbKLk+DX9PUhq65OVfyWELaz9nch/J50DMNxLBHpGsestJ0VrrmfCVpcs9GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uhv+rgRjY6QkAfqeLnd/6hixpswIU0z6W9DaEfKOZ0E=; b=SZwAeXtkgLa7yLV9g1wlIavHi9k7fJRaMIA2KF3Dw1cd/v+ykl1IldWcA0KbyHyxTieXza wlWfGsohJgYHf5U64Ho17jDn9+50TE/nnNmgexnn5YRuXIqCHviBe2MS5rnS+rnnasvGd2 cm/CpVEWCNvglnxCjoD3wd9U7esUB2MNVx9BeOUaf1S7hmEcNKaFKaMFoNxGg6Ffso8603 UvqKq9FPT8oTkRgVjfcbUB6tXQnrXFQgh7yEHZ5nJdLcKCwmfRzDielo2SgflYIXaV46LG z0ovaklOVkigOfDdqaSCJm2EeFzXkiHEflSLVjXmkcauqU5SE53PRFa//1kXhw== 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 4Vf7WM6zHCzmZT; Tue, 14 May 2024 20:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdRV9092851; Tue, 14 May 2024 20:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdRSn092848; Tue, 14 May 2024 20:39:27 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:27 GMT Message-Id: <202405142039.44EKdRSn092848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: f68ecf5d4fbd - stable/13 - fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f68ecf5d4fbd69dae868e474ff1f37d38e37c461 Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=f68ecf5d4fbd69dae868e474ff1f37d38e37c461 commit f68ecf5d4fbd69dae868e474ff1f37d38e37c461 Author: Marko Zec AuthorDate: 2024-05-06 18:34:11 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:35:28 +0000 fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index db4f4a537e22..55f79994f552 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1142,14 +1142,11 @@ static void dxr_destroy(void *data) { struct dxr *dxr = data; - struct dxr_aux *da; + struct dxr_aux *da = dxr->aux; struct chunk_desc *cdp; struct trie_desc *tp; - if (dxr->d != NULL) - free(dxr->d, M_DXRLPM); - - da = dxr->aux; + free(dxr->d, M_DXRLPM); free(dxr, M_DXRAUX); if (da == NULL || atomic_fetchadd_int(&da->refcnt, -1) > 1) From nobody Tue May 14 20:39:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WP3Hjgz5L093; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WP1HXDz4Knm; Tue, 14 May 2024 20:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fGm9gmeut9DEvBVQWZKpbtbQK1HeZx7pdAPoLN7Lfug=; b=nUGPGJVDgQGxZ1WejcjdzrKKYqCieUobaSyWsGEFt/2Inacd1aYIxRY7cnQE8QoidQqHWn im3PUVpCRv8ueTkpuedQsEmx04oAXQvX1gvLpVjgcj1BQzCGVq4iIZByc3ONjcmvfQwdVW X9qpal0zDt1KjNhnAU3C9POOfgYOXcjTmbrf9PkngHSjs/++5L+BWt8reJ0gQ40U1TGPK+ k2IW+QtYD6IPE+oNPhulUfkzIxaHh/g1DmUnAB1wgbYSFBr2plu4Fiust4AkRKHUgglWFm G5EI7fvTL0hhewkWQUk62vG35uOy0XQkvthJ10xD1t98x5dI/FFgsh9eysuYjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719169; a=rsa-sha256; cv=none; b=sCvumjeOv8NlDt/oe4hrNY8IZvKLykfGGZiOmvhu7CkDoPSA7ZLCQiTR+FxlWfiiJe7gYI cfMKxIW61D9hQntCWbxxVTBzDrU8U+PaTaYiI/Z1I3obeMaF5gV9bsCbK/gFUFgOwc/OlF ysuia86DF2FpIkiM8SpCU62OfTK5E0Ef2kF0sZEKTPtfFS7YDlzrwKCLRfSeMpA86Cndf+ GIxThJ7dYS+3lf65uIEwapuMNLVQTyVRfpsU/FxJJVtP5fOYUh5X/SHDuhjnVDGEqZevnE ZMMIYhKSZtaKsWSy7vo7EcYu+iMGUla/UveF59wQY4495dJUFNsOlaL4VPZtfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fGm9gmeut9DEvBVQWZKpbtbQK1HeZx7pdAPoLN7Lfug=; b=NayxFg6jqOiFyFcQxBTQ9q6u2j1wz7eQ9TSvx483EszrdMQSrSF0ukfC2zpcOOQyEqmBRm 40gTULjIOZKRQMJ0voj69U5QeGJ3b9tTqf9r7lPidDCvVQhO8UZ4K8newjl/W5d6YhMm4e oDTd4O12d6zkTzDlx/XPEUc00epfgJEHgumxaLOITY6kHGQ1sKMhBDe2m121BGjUJdrQYR aQ9exSAGS6qj8IxpyQvq4Io75jSTJR500+ETpF7tu4DVCerpihGdspN53oFscCQFASm5cp bgD8z5OKEbljTNaLhdGdfdbY2tSryYdGA8q6NHhOMEvlEhKXUrnjirtbKoC4DA== 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 4Vf7WP0sqFzmZV; Tue, 14 May 2024 20:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdTVP092894; Tue, 14 May 2024 20:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdTsU092891; Tue, 14 May 2024 20:39:29 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:29 GMT Message-Id: <202405142039.44EKdTsU092891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 2b9843e268fa - stable/13 - fib_dxr: update comment. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b9843e268fa2dfcd5a02ff96e504a6a254a5b60 Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=2b9843e268fa2dfcd5a02ff96e504a6a254a5b60 commit 2b9843e268fa2dfcd5a02ff96e504a6a254a5b60 Author: Marko Zec AuthorDate: 2024-05-06 18:42:31 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:35:38 +0000 fib_dxr: update comment. MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 55f79994f552..3015564953c6 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1098,7 +1098,7 @@ dxr2_try_squeeze: } /* - * Glue functions for attaching to FreeBSD 13 fib_algo infrastructure. + * Glue functions for attaching to the FIB_ALGO infrastructure. */ static struct nhop_object * From nobody Tue May 14 20:39:30 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WQ5bS3z5L00G; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WQ2977z4Kp5; Tue, 14 May 2024 20:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVKVarsgLXx8U65ygv5RTp/+3+lm2q/G4gYAgSG/Ppw=; b=wo3HZehToOzhqtb39YRLdnE4arHlngaBPUmMdh6fN6m9qVpKoRn20LgapDRq3uskh3UD7n +hGaNeU50BLh+5bGfLUUX0NJHaVplir/BJwpI6nbtWKyQUoC5+WaA0CiINMqM72LlY6Rs9 6AW3vxp4AOa/Dc6l3LKXkH4xvBZAaWC3CZ6wqaHO1DCjULkueRcRDy2f0Y8IFwR3L3CCZc La2CUa61+i8mpFD8k8M1pmhwyx+cWyYvTo1OXY3r3WzFczgWRYGBna27Zbm0buqGidO1k/ YxwyYMNY4DzopKeCNmg71wm4HcYOged4zIN15cfN/aYlkuXpHjd3je5CBaBVPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719170; a=rsa-sha256; cv=none; b=yhvkDSdEMYLAbpwFgEnJcMrG8PGPxR8Li+GdH0d4MCHBjWteoG5oUunQ4ypNdsdUJO8Z1q O4jcLOzYe/bK2gFdAIR47/wjdwDtLmwdkI31HXIHw4vIWybAOGZr3HhDcoi5CdLPuertKl RSNKaTN6wC/8vwsofhyn5bem4bUwmuCi6Y17nF68j6qzIc4BnvpTVBpzkHlQKfJD7PYCWc OO+34VPEO3WYqQPg4SDoIHd2o356hmk2GaLKtmB6aMiLMqQUOaoQS4JWWYghKu8mHEZb5I nJB1lxIALw/IJ16vvvhdBZppcwi8HRrmBwyUQR+i6qmFuM3xM9GGPymi7hvQmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVKVarsgLXx8U65ygv5RTp/+3+lm2q/G4gYAgSG/Ppw=; b=bZVRrLBzCNlbVw8Qi/dW+wkINlQU1r98Gl0nGeGYrTrKmeQTts+smETq41H1HWScR8DtwB 9y1ojBukMzhWzFyzSCv7TQbRC8/NelmNIYVwLqHMecPhsk5nKOp3dHPcOg2USYmQ39cqgV vMM1ACX9RVJf8Hyj1ilKWmwo4gJpV5lIKtUrIrKksHF+4qdQGOXhX/qgeVUsSkv3Ax1FpR v1iqVAP4w+qdtAo0oFMsor9nfcHratstWQdN3TuRfmgK0kPKj3axu+pSOC3e8FHMTwWbO1 fHCM2VZ9Bq7syGPJ/7ibGmL6AlKBWyFm9Bb7V8jG69hsX7QxkM6cu1Zl56nbjg== 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 4Vf7WQ1mwJzmb1; Tue, 14 May 2024 20:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdUwa092955; Tue, 14 May 2024 20:39:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdULQ092952; Tue, 14 May 2024 20:39:30 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:30 GMT Message-Id: <202405142039.44EKdULQ092952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 40a1183ac774 - stable/13 - fib_dxr: move the bulko of malloc() failure logging into dxr_build() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 40a1183ac774b3f36a7c5b663dfa5fb835a66fd4 Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=40a1183ac774b3f36a7c5b663dfa5fb835a66fd4 commit 40a1183ac774b3f36a7c5b663dfa5fb835a66fd4 Author: Marko Zec AuthorDate: 2024-05-07 15:11:30 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:35:48 +0000 fib_dxr: move the bulko of malloc() failure logging into dxr_build() --- sys/netinet/in_fib_dxr.c | 77 +++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 3015564953c6..3b2dc837d50b 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -497,8 +497,11 @@ chunk_ref(struct dxr_aux *da, uint32_t chunk) da->range_tbl = realloc(da->range_tbl, sizeof(*da->range_tbl) * da->rtbl_size + FRAGS_PREF_SHORT, M_DXRAUX, M_NOWAIT); - if (da->range_tbl == NULL) + if (da->range_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR range table"); return (1); + } } return (0); @@ -632,8 +635,11 @@ trie_ref(struct dxr_aux *da, uint32_t index) da->xtbl_size += XTBL_SIZE_INCR; da->x_tbl = realloc(da->x_tbl, sizeof(*da->x_tbl) * da->xtbl_size, M_DXRAUX, M_NOWAIT); - if (da->x_tbl == NULL) + if (da->x_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR extension table"); return (-1); + } } return(tp->td_index); } @@ -873,8 +879,11 @@ dxr_build(struct dxr *dxr) if (da == NULL) { da = malloc(sizeof(*dxr->aux), M_DXRAUX, M_NOWAIT); - if (da == NULL) + if (da == NULL) { + FIB_PRINTF(LOG_NOTICE, dxr->fd, + "Unable to allocate DXR aux struct"); return; + } dxr->aux = da; da->fibnum = dxr->fibnum; da->refcnt = 1; @@ -894,16 +903,22 @@ dxr_build(struct dxr *dxr) if (da->range_tbl == NULL) { da->range_tbl = malloc(sizeof(*da->range_tbl) * da->rtbl_size + FRAGS_PREF_SHORT, M_DXRAUX, M_NOWAIT); - if (da->range_tbl == NULL) + if (da->range_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR range table"); return; + } range_rebuild = 1; } #ifdef DXR2 if (da->x_tbl == NULL) { da->x_tbl = malloc(sizeof(*da->x_tbl) * da->xtbl_size, M_DXRAUX, M_NOWAIT); - if (da->x_tbl == NULL) + if (da->x_tbl == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR extension table"); return; + } trie_rebuild = 1; } #endif @@ -1039,8 +1054,11 @@ dxr2_try_squeeze: #endif dxr->d = malloc(dxr_tot_size, M_DXRLPM, M_NOWAIT); - if (dxr->d == NULL) + if (dxr->d == NULL) { + FIB_PRINTF(LOG_NOTICE, da->fd, + "Unable to allocate DXR lookup table"); return; + } #ifdef DXR2 memcpy(dxr->d, da->d_tbl, d_size); dxr->x = ((char *) dxr->d) + d_size; @@ -1119,7 +1137,8 @@ dxr_init(uint32_t fibnum, struct fib_data *fd, void *old_data, void **data) dxr = malloc(sizeof(*dxr), M_DXRAUX, M_NOWAIT); if (dxr == NULL) { - FIB_PRINTF(LOG_NOTICE, fd, "Unable to allocate DXR struct"); + FIB_PRINTF(LOG_NOTICE, fd, + "Unable to allocate DXR container struct"); return (FLM_REBUILD); } @@ -1212,41 +1231,11 @@ dxr_dump_end(void *data, struct fib_dp *dp) dxr_build(dxr); da = dxr->aux; - if (da == NULL) { - /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR aux struct"); + if (da == NULL || dxr->d == NULL) return (FLM_REBUILD); - } - if (da->range_tbl == NULL) { - /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR range table"); - return (FLM_REBUILD); - } - -#ifdef DXR2 - if (da->x_tbl == NULL) { - /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR extension table"); - return (FLM_REBUILD); - } -#endif - - if (da->rtbl_top >= BASE_MAX) { - /* Structural limit exceeded, hard error */ - FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); + if (da->rtbl_top >= BASE_MAX) return (FLM_ERROR); - } - - if (dxr->d == NULL) { - /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR lookup table"); - return (FLM_REBUILD); - } dp->f = choose_lookup_fn(da); dp->arg = dxr; @@ -1334,18 +1323,11 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, dxr_build(new_dxr); /* Structural limit exceeded, hard error */ - if (da->rtbl_top >= BASE_MAX) { - /* Structural limit exceeded, hard error */ - dxr_destroy(new_dxr); - FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded"); + if (da->rtbl_top >= BASE_MAX) return (FLM_ERROR); - } if (new_dxr->d == NULL) { - /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */ dxr_destroy(new_dxr); - FIB_PRINTF(LOG_NOTICE, dxr->fd, - "Unable to allocate DXR lookup table"); return (FLM_REBUILD); } @@ -1357,6 +1339,7 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, return (FLM_SUCCESS); } + FIB_PRINTF(LOG_NOTICE, dxr->fd, "fib_set_datapath_ptr() failed"); dxr_destroy(new_dxr); return (FLM_REBUILD); } From nobody Tue May 14 20:39:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WR5CVHz5L05Q; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WR3LLxz4KpN; Tue, 14 May 2024 20:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3wjFgFmanDIJyTQA64rajcmEOfd1XU1lwE7HYUX377g=; b=SYOVvTa5fXJ1ELwgRdjgw2f67gupoz00QLlS/BtWat8XR2gVXZa773wyq9Z7NeTIJZzH4T HLAJ6i/Q/FWSEpc9Uw4LXMDt8PkYZKwgqDGCKM9ixVJHRRKVeXKwTc+RDsvDTRfqr/hW/i FI9esuromT4YuNvcXgtdrqf/4ZvL62dVjCVkVNEh0r2uYwRV83udclV5GQje/wl2sLxMdr mfDyp5alPMuNfoXqvbWB9T4cOQQbW0atZ8oON1TcVdb8fxipaFnhNSpIdhbc+Ti4ivsHm+ wapP6TQwu2ZFIqHGZJLjUlkUM+ihLoesWeV62eJtsxZlyuMgLewbU8uOADxM3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719171; a=rsa-sha256; cv=none; b=YyKCOINjannWmlLbg2l5gatmLK0O5I+k7ivpbzLABxp5srHxF8sextQHGk4CaKNfG72jg4 8efIuSJgszuQLD1K1mLLYYiZELBAtZ8Lktm9xla18t/qSlvfeRZ6dNOW/ZLFhyeKL10LiI tKtlkWyX+rtNFsDg9jJSAhnIYvC7FeAzJVkHIQSgPmzctYiV2GMJeU5t6GfSMLdqzZWjGv keAhSjrLQKeuOjMX4FSKKIlyDkUnpFqnFiFlGkgO4Vg52Jjp+wfVWZAriGpDQ6YdnhuReN VjfmJJ1QZBsgb6bMamVaZ6lc4+EjRJuOLaQpEja1KVEPqxFIrPgPSoMCsVqSLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3wjFgFmanDIJyTQA64rajcmEOfd1XU1lwE7HYUX377g=; b=vh6ZhawJc7sCZvv9/yZVkUbS9SrBGcIDhUHknaEj+WR9vmdK/Eo5jq4RHEEphEEbCZoH7/ aYtryhRu4IrgrD3mA7za8iahi+Kp6hg8aWDD7QT0ZQfBDLgCpzxjW763Z9Dyw7pZ0nh5W0 yeS4JgheKvm/sbewOSKcMBuBcZzEGyr6lDpgqqle9j6lOSh3yJOF/N929ZEfcCx3oyXucZ h/cZizm7YKuxeiwlCRKStzNIGt6VdGBGlfHa1178Du70PcTCod/MkTkUBhNLEjf1XpGnTX m89ns9XDq6x4vWgZWBaA6Cqe75cSBdiGMPOifJkZZ1ZluWrfICku9/U+Qcrdkg== 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 4Vf7WR2rptzm7b; Tue, 14 May 2024 20:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdVcc093012; Tue, 14 May 2024 20:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdVUt093009; Tue, 14 May 2024 20:39:31 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:31 GMT Message-Id: <202405142039.44EKdVUt093009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 354fa04f5ea1 - stable/13 - fib_dxr: KASSERTs for chasing NULL ptr and runaway refcount suspects List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 354fa04f5ea1dcea904637dd8fb40d7cb8b04525 Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=354fa04f5ea1dcea904637dd8fb40d7cb8b04525 commit 354fa04f5ea1dcea904637dd8fb40d7cb8b04525 Author: Marko Zec AuthorDate: 2024-05-07 15:22:00 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:35:58 +0000 fib_dxr: KASSERTs for chasing NULL ptr and runaway refcount suspects MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 3b2dc837d50b..5c5311068169 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1280,6 +1280,9 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, da = dxr->aux; KASSERT(da != NULL, ("%s: NULL dxr->aux", __FUNCTION__)); + KASSERT(da->fd != NULL, ("%s: da->fd %p", __FUNCTION__, da->fd)); + KASSERT(da->refcnt > 0, ("%s: da->refcnt %d", __FUNCTION__, + da->refcnt)); FIB_PRINTF(LOG_INFO, da->fd, "processing %d update(s)", q->count); for (ui = 0; ui < q->count; ui++) { From nobody Tue May 14 20:39:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WT0DWgz5L0G8; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WS41Ygz4Kty; Tue, 14 May 2024 20:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2oIJHusS14Gt4pZcRUYPPcZvY5oNqQaa5SKqgsK3Tg=; b=MNQDu9Bhvt/Y0HhcJ1vN/yLM2yXIV1V2xtagmB7Am68QnmJCzYUMv7Xiw2vMFzys0dTs6L kC1DJHmqcuswou9l8MhAdhPwjfWu3Hm14aL5GfHC9PNQTo9ln1qdx/zAndKCUlebzGb6/3 WBijQiNMTu2Tbpxj2kwXonYvQ9nXdLyKAYfT8xrLqT5jFoIIzx/K3FydV+Pj8cAFy/cxEh 3o6Ne1H9lNaVBAKx9x6eVp6EGeweY6czdIDk7pm0f6xBCVgdEFMoPHKNMyMsJu+iWUytgg indri3EZU9BCJysxVRwu+oTJkKFIjRPf5NQhNXiRizWhrOspkag0hPEyqu3v/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719172; a=rsa-sha256; cv=none; b=XTn1c/HmpL01A5+22V5p7DujvRVAszuCdaogzJUXkBgwnezBXpo9BT3vAR0GqM2q7kavFU ScPrxqz93Wibz8x/dkVsThv5n6ud0tkfRaALO0r8HotSMKafT/EOPefGKmUmb4ZGab4QOK OiZvGQXzurbJ9J7ekInBLLsRoUqcbOH93Y6D8dWkcTibFH7HUXEkr/jDH0MGjKxUvFjP8c rZuYNWU15Bagdp/leQLYCdfo34ku8KAsjs5CQE3DuQYj0Xy7GU/Z43B1/0DYYBD6qNLHSR gUt/hQJB2S07Dgr0XNXvVUfO+B7xfFbewqwdWJtiPS6pep00KyH5jYyVNMGOAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2oIJHusS14Gt4pZcRUYPPcZvY5oNqQaa5SKqgsK3Tg=; b=ls93XJID2HKHCZO2Et0I1bU72322XHzLcA44cw/WtMy3MiIojcd7DwF2yfIv0XVZq70Gsy 0qXvM0mo63OOVnlU+VcuCHYiGGSF0owMDxEMkdjLIPvX02CLVwASQKrbD/EvUHmgxsRqgq wvJah9rP44SKjKHE1hFuSH0yVXdzR2/632Nb+znKDvIUZTs6//kaz2qoz+iJFEIjGiXrOP 4RP2FB5hYPagGnp3X0cvjl46+oi97fEruqxcioqFx0lREwRtdvgblDPav7Ox8Jp4iYHvtB 1MnWSkThj8OEF6YWUIpYb9AglSbqM6VluVMXx7vHtl05pir3cZa0K0uIZKmFZQ== 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 4Vf7WS3WNTzmd5; Tue, 14 May 2024 20:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdWct093045; Tue, 14 May 2024 20:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdWXE093042; Tue, 14 May 2024 20:39:32 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:32 GMT Message-Id: <202405142039.44EKdWXE093042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 43571fe7c8dc - stable/13 - fib_dxr: s/KASSERT/MPASS/ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 43571fe7c8dc433266aedb31001659d461d93bbe Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=43571fe7c8dc433266aedb31001659d461d93bbe commit 43571fe7c8dc433266aedb31001659d461d93bbe Author: Marko Zec AuthorDate: 2024-05-07 15:33:23 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:36:09 +0000 fib_dxr: s/KASSERT/MPASS/ MFC after: 1 week --- sys/netinet/in_fib_dxr.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 5c5311068169..91f3bafdb47d 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -474,8 +474,7 @@ chunk_ref(struct dxr_aux *da, uint32_t chunk) cdp->cd_max_size = size; cdp->cd_base = fdesc->base; LIST_INSERT_HEAD(&da->all_chunks, cdp, cd_all_le); - KASSERT(cdp->cd_base + cdp->cd_max_size == da->rtbl_top, - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp->cd_base + cdp->cd_max_size == da->rtbl_top); } cdp->cd_hash = hash; @@ -525,7 +524,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) sizeof(struct range_entry_long) * size) == 0) break; - KASSERT(cdp != NULL, ("dxr: dangling chunk")); + MPASS(cdp != NULL); if (--cdp->cd_refcnt > 0) return; @@ -536,8 +535,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) /* Attempt to merge with the preceding chunk, if empty */ cdp2 = LIST_NEXT(cdp, cd_all_le); if (cdp2 != NULL && cdp2->cd_cur_size == 0) { - KASSERT(cdp2->cd_base + cdp2->cd_max_size == cdp->cd_base, - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp2->cd_base + cdp2->cd_max_size == cdp->cd_base); LIST_REMOVE(cdp, cd_all_le); LIST_REMOVE(cdp2, cd_hash_le); cdp2->cd_max_size += cdp->cd_max_size; @@ -548,8 +546,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) /* Attempt to merge with the subsequent chunk, if empty */ cdp2 = LIST_PREV(cdp, &da->all_chunks, chunk_desc, cd_all_le); if (cdp2 != NULL && cdp2->cd_cur_size == 0) { - KASSERT(cdp->cd_base + cdp->cd_max_size == cdp2->cd_base, - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp->cd_base + cdp->cd_max_size == cdp2->cd_base); LIST_REMOVE(cdp, cd_all_le); LIST_REMOVE(cdp2, cd_hash_le); cdp2->cd_max_size += cdp->cd_max_size; @@ -560,8 +557,7 @@ chunk_unref(struct dxr_aux *da, uint32_t chunk) if (cdp->cd_base + cdp->cd_max_size == da->rtbl_top) { /* Free the chunk on the top of the range heap, trim the heap */ - KASSERT(cdp == LIST_FIRST(&da->all_chunks), - ("dxr: %s %d", __FUNCTION__, __LINE__)); + MPASS(cdp == LIST_FIRST(&da->all_chunks)); da->rtbl_top -= cdp->cd_max_size; da->unused_chunks_size -= cdp->cd_max_size; LIST_REMOVE(cdp, cd_all_le); @@ -875,7 +871,7 @@ dxr_build(struct dxr *dxr) uint32_t trie_frag; #endif - KASSERT(dxr->d == NULL, ("dxr: d not free")); + MPASS(dxr->d == NULL); if (da == NULL) { da = malloc(sizeof(*dxr->aux), M_DXRAUX, M_NOWAIT); @@ -1273,16 +1269,14 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, int update_delta = 0; #endif - KASSERT(data != NULL, ("%s: NULL data", __FUNCTION__)); - KASSERT(q != NULL, ("%s: NULL q", __FUNCTION__)); - KASSERT(q->count < q->size, ("%s: q->count %d q->size %d", - __FUNCTION__, q->count, q->size)); + MPASS(data != NULL); + MPASS(q != NULL); + MPASS(q->count < q->size); da = dxr->aux; - KASSERT(da != NULL, ("%s: NULL dxr->aux", __FUNCTION__)); - KASSERT(da->fd != NULL, ("%s: da->fd %p", __FUNCTION__, da->fd)); - KASSERT(da->refcnt > 0, ("%s: da->refcnt %d", __FUNCTION__, - da->refcnt)); + MPASS(da != NULL); + MPASS(da->fd != NULL); + MPASS(da->refcnt > 0); FIB_PRINTF(LOG_INFO, da->fd, "processing %d update(s)", q->count); for (ui = 0; ui < q->count; ui++) { @@ -1315,8 +1309,7 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q, #ifdef INVARIANTS fib_get_rtable_info(fib_get_rh(da->fd), &rinfo); - KASSERT(da->prefixes + update_delta == rinfo.num_prefixes, - ("%s: update count mismatch", __FUNCTION__)); + MPASS(da->prefixes + update_delta == rinfo.num_prefixes); #endif res = dxr_init(0, dxr->fd, data, (void **) &new_dxr); From nobody Tue May 14 20:39:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf7WT6VhCz5L0J9; Tue, 14 May 2024 20:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf7WT55YDz4Kxb; Tue, 14 May 2024 20:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YI7V/Gwb/zJ8RbkWkMNyKavJk4Y/gQjeYbiIGit/MiQ=; b=sfNCio1AnCjkWH39i8l+eifE2ZE3Qh7UxD6l1tKzfquBzhITx38+LFJh+9XVP2VCn3+QgO hym9b662Ou/BgGq/jAJ5QCHEusBRpTchaftN9HWui2HrXN2zKpghsIm4578Z3sNxCLyt/F 8FMRhULlh67sjX6UOEC3pjx4NK6ip7NFO9dXRJZhm6zE3KY8xNwYA+c0A9u9nYKntcuGia 7burHV6st+HI9ntMnvuCW7R2LobBbQEk8V7W544yJ7TFAFR/OW2RcY8l/HDsnBEry2ZfGv /PSeFqQuW6zK+pQl7MgyaQLyfMyLXe03KkRhBb9vAjcrW1NKuXx13BlqBoH8+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719173; a=rsa-sha256; cv=none; b=glrJ0PL4sZ9QoRj4tLE766hwBFPjSfjsrXbqFWFqCQqHE6YShh89UMm5WVxrO0bm4jtEiM kw2I9YwpD+XM44QXLpAN3RiKsg0VSIyGBeMaXKpsJVhAiyFQImyZxN7d4zV290X1+NmN0a YegrvnEleoTFkg6thSmXvn1KiukjqbtLf9kGoNAN9IlqDziciNdXvgI6nuUXn4vwmFXux+ BsGhcitZ62lkAN6cHsrAQMtkzfy1XOpbTSezGeDZvpXYLMNQ+kMDXZwCwgF60VT/WipVFp IUkJm5XzHMCSzGFO3B+dM36PnmirhBtI7XwzPtCVU8j7tGdf1u4vcFKalR1PqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YI7V/Gwb/zJ8RbkWkMNyKavJk4Y/gQjeYbiIGit/MiQ=; b=hSm6UTC+TQPerQqTlEzcsrV4k9l6/NNLsnUC6iQYcotif+Q2Elf2DcCE1uk5fO2HwNSJcD N0muSWbnXLeP5zaQmtIXjYEOZIAr6QKfL3F8HO+OORPnYza7d/Nk/9idcF/V934z+fAn1k Q49tuD/zbVCsy2Wqbazbf1r7IknI6/TCaxuRn1zlS1iid4LhRbQl9jMK/4aoncYKK2PAwM wchBMugJh41D/oa9QKM9HOUyufvPXA1tbjbgbKSZwxSe+qBhtp1H3DC2jy9sBSWEI4E4iy lLT7U8lpcx/xvWsXtDWPoBQidQ3t1jRE0EIstz+LJ0gq4AEDIibk6zs3j08udQ== 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 4Vf7WT4fRmzmQ7; Tue, 14 May 2024 20:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44EKdXjS093099; Tue, 14 May 2024 20:39:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKdXsY093096; Tue, 14 May 2024 20:39:33 GMT (envelope-from git) Date: Tue, 14 May 2024 20:39:33 GMT Message-Id: <202405142039.44EKdXsY093096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 9ae078121d3f - stable/13 - fib_dxr: set fib_data field in struct dxr_aux early enough List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ae078121d3f70d8cd8c537fa16daf302ff5ee21 Auto-Submitted: auto-generated The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=9ae078121d3f70d8cd8c537fa16daf302ff5ee21 commit 9ae078121d3f70d8cd8c537fa16daf302ff5ee21 Author: Marko Zec AuthorDate: 2024-05-07 15:44:09 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:36:20 +0000 fib_dxr: set fib_data field in struct dxr_aux early enough Previously it was possible for dxr_build() to return with da->fd unset in case of range_tbl or x_tbl malloc() failures. This may have led to NULL ptr dereferencing in dxr_change_rib_batch(). MFC after: 1 week PR: 278422 --- sys/netinet/in_fib_dxr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 91f3bafdb47d..82245ecf6e66 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -882,6 +882,7 @@ dxr_build(struct dxr *dxr) } dxr->aux = da; da->fibnum = dxr->fibnum; + da->fd = dxr->fd; da->refcnt = 1; LIST_INIT(&da->all_chunks); LIST_INIT(&da->all_trie); @@ -918,7 +919,6 @@ dxr_build(struct dxr *dxr) trie_rebuild = 1; } #endif - da->fd = dxr->fd; microuptime(&t0); From nobody Tue May 14 21:38:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf8qZ3cGZz5L3x9; Tue, 14 May 2024 21:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf8qZ2Vdzz4RnW; Tue, 14 May 2024 21:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BFZ7AN90RCvb1tK0gW9f7LpNWfGz013VAPI7IAXFhYc=; b=iKb8zyh2Pk8hgRYwswI1D0p/iwd2jTuuzfygQFYt5l5YCsEmXp7pc278QUWzRjs8TPkiSp KSrwlutlFwJPupMdn5EE79gOZ6XFod4lxmmLGhjeyJB3hGta1rGkYVieOGj+/FhhY1K2KR Fu14tCcAXvva6Q5yTgA7K6EB5aED6wLFMIVfRWt+T1EPnuzM3+Dj63MiF3qh+K3igNbakK LFiYChl0b89H+r1SAu3KOEg2ZqOkd5C8HbodbIPzd4IR35gI3n81ZkXzsImOmkDOpDQ9kK NCrodoxHXcYdMEyL3wPVQDg/llUFzJVtZgnfCdew8a1l72naCySzANE0rP38ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722714; a=rsa-sha256; cv=none; b=yVHI+Uf0XgXj9DKbVT78LzVg21stD2/muz9gjYypkDP+wRbomxbVpsRn4i6qLeBKFYrPRe VUJw+SMnU7Ls8+HQaQYeex/IquOiim0vsT+Xtdf/iwd+ydacQF/6m5tTCLD/ZX+8MKw/Q4 ZScDsTjlXg3r1GXF8tQ6d+3yOe5RSCzQJdVk9s8U19x2V5kHiAbHCfEMC1tmIXxkbu/qOb qElXqq9sEIrEU6WD+h3cH6DDZMw+U04Ap/C9d95dU6pqJWuRyzfzCOqFw9BKF/XJv2tUnI 7zDkw3tyGP08iixpg7JTEFR2SR3c8qsqrlu/KzglHN4imO4bXjKHQzpsysbhrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BFZ7AN90RCvb1tK0gW9f7LpNWfGz013VAPI7IAXFhYc=; b=VYfYuF4bkh+WFqEEZcPciL0ZXlHGssaBrQdMZXTfLkjnhI9ohztFXO3C2DYTgHV8Tcbn9h F8BiS1PwO61v553qdsSEKEgeKmXFa/uMnlWAqOE5tjcVDQ5wzjHHIZEQ2KxECZPhaGB4GG hugvtTsCY6scTkQBHjJzhaeMHg3vLCJLso7IOBvZwAJp/A2VcgAPuCrXQBuNt9jmxKsV0x Ye5fJgnqp0Oga9ZlGx+oDqoJIsX9NdIkXXqACJW0l/NpMI9Cy6TmmPcqT5DYl+umKe2PI+ DxIhqc6FvKCjcqficQs4oqFK234k1rc2RlXW1m51tewXaEn0nC1LupspBrUxzQ== 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 4Vf8qZ206zzp6T; Tue, 14 May 2024 21:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44ELcYLF093895; Tue, 14 May 2024 21:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELcYrg093892; Tue, 14 May 2024 21:38:34 GMT (envelope-from git) Date: Tue, 14 May 2024 21:38:34 GMT Message-Id: <202405142138.44ELcYrg093892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1653215de8f4 - releng/14.1 - release: Use qemu when cross-building vm images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 1653215de8f4e70372b77f08150e4faef8230504 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1653215de8f4e70372b77f08150e4faef8230504 commit 1653215de8f4e70372b77f08150e4faef8230504 Author: Colin Percival AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival CommitDate: 2024-05-14 21:37:47 +0000 release: Use qemu when cross-building vm images For a bit over 5 years, we have used qemu when cross-building cloudware images; in particular, it's necessary when installing packages which might include post-install scripts. Use qemu in the vm-images target too; while "generic" vm images don't install packages, they still run newaliases and /etc/rc.d/ldconfig, both of which fail without appropriate emulation. MFC after: 1 week Approved by: re (delphij) (cherry picked from commit 9287d1853c00267a0118401530debf9c0554ff28) (cherry picked from commit 166432191c5a46f60155a6cb14ce4c918c82be4d) --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 0eb549ec7bc2..6fd165528854 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -157,12 +157,13 @@ CLEANFILES+= ${VMBASE}.${FS}.${FORMAT} vm-base: vm-image -vm-image: +vm-image: ${QEMUTGT} .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ + QEMUSTATIC=${QEMUSTATIC} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ From nobody Tue May 14 21:38:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf8qb3ZpYz5L3xB; Tue, 14 May 2024 21:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf8qb35GZz4RYB; Tue, 14 May 2024 21:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pG8m1NooDZTn3H9G2LoKlgXyxWk1XthEX2B6/x/H7mI=; b=EmBM7OoHREXlzmDF/J74aol9/8k1BfM2qd2qyQ4cIg9yEQYO+FVEHsyvSRxaQmc6rPRrlf ZH202NAdnRATNx7pMdpgln8A0um23TFXf8vt5dIEZNjcykfo0aG4uphs8kYzImWhNBd13Q kwJn9AIzHKj95Mf282TpyuMizROxoHHPbjM0oldVkhjoYBQgbf/63//pYZZUhJibwy9YD7 ks3sr57u1/w1Zv/7HRFrh9G0gpu0bhd9gRs2xeg2WDRQzLAGH47ViZm4XYQsGdEVkEKwsw 0DnMD57UM7ClqxGkGAhCwGt6hQeeDbcCr3F3RQoQ0E8kiE0PGXpKQ2PE8l5UFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722715; a=rsa-sha256; cv=none; b=FepBiHpjISFo0fyUiIap8jt2TVX6MhjOWmu4qxA2yGVROBiZ2DaX/mUZIp9C3GALOhvJkp tsVNq7UcfUbuhNBouulswVQv+Dfuz8etYpTzrZwt95M1/NemGHDrncRPBx026LgrVk2u3I +1iOlI1b4vLczqjCQlqrmYRwWMHwy3KstzXC1m3U0JwXYDV3VDEmWHuvikObREa5aBkcP8 OL7OOaJUyJEWual8l+kEyXihKaKddbiLYE/4d1aFnTHEtizznu3u0Nzc+jqKvFyI6tXal4 l0DRDcz7t7Hsr7Fkf/DfwpEMni5MBHRFJV76Wrqnz/9pKvv2VV7vbI7IR5xNIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pG8m1NooDZTn3H9G2LoKlgXyxWk1XthEX2B6/x/H7mI=; b=fkY+IupblwWWcr2O+GWMMnE6VU+9b4aBio47FZa2dUtw8LYLEjP87cc/vgSxTezPIoA5hG 84jx4RGtma501lEPlCwdSLcOEz3SGA+dLuPuN+mZJmvTF0VjNPO3Dd4B77bxw3LPF1j1YG KGGxX0KzpGU45xTqJFrWQECw7XtJNc2K2nXn7bXU6hzvu7lXM13V4X92l9z0Jk3M22KYhU dEbp1eeC7GqHz0V4or/0ZtMSeTvxGxpTpiEJmAGLlwo1BxsPfs9tvSTNRURssixnc6wAW0 7wEz8Fb49FYJPk+heqBjhU6hvyoxcqmEobVjuiJomdNHMN2myoPK8GM9scpxMA== 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 4Vf8qb2gfqzp6V; Tue, 14 May 2024 21:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44ELcZsm093932; Tue, 14 May 2024 21:38:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELcZ8S093929; Tue, 14 May 2024 21:38:35 GMT (envelope-from git) Date: Tue, 14 May 2024 21:38:35 GMT Message-Id: <202405142138.44ELcZ8S093929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0db0821fb8d7 - releng/14.1 - release: Rework vm_extra_pre_umount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 0db0821fb8d7d0eb3f2ae7d219ceca1545f85bd0 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0db0821fb8d7d0eb3f2ae7d219ceca1545f85bd0 commit 0db0821fb8d7d0eb3f2ae7d219ceca1545f85bd0 Author: Colin Percival AuthorDate: 2024-05-06 20:26:52 +0000 Commit: Colin Percival CommitDate: 2024-05-14 21:38:09 +0000 release: Rework vm_extra_pre_umount The vm_extra_pre_umount function in vmimage.subr served two purposes: It removed /etc/resolv.conf and /qemu (if cross-building), and it provided a function for cloudware to override in order to make cloud specific changes to the filesystem before constructing a disk image. This resulted in a number of bugs: 1. When cross-building, the emulator binary was left as /qemu in the Azure, GCE, Openstack and Vagrant images. 2. The build host's resolv.conf was left as /etc/resolv.conf in the basic-ci and basic-cloudinit images. 3. When building GCE images, a Google-specific resolv.conf file was constructed, and then deleted before the disk image was created. Move the bits needed for running code inside a VM staging directory from vm_install_base into a new vm_emulation_setup routine, and move the corresponding cleanup bits from vm_extra_pre_umount to a new vm_emulation_cleanup routine. Remove the /qemu and /etc/resolv.conf cleanups from the cloudware configuration files (where they exist) since we will now be running vm_emulation_cleanup to remove those even when vm_extra_pre_umount has been overridden. Override vm_emulation_cleanup in gce.conf since in that one case (and *only* that one case) we don't want to clean up resolv.conf (since it was constructed for the VM image rather than copied from the host). releng/14.1 candidate. MFC after: 1 week Approved by: re (delphij) Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 0b1c5628c74a37e2aa2aa3769c606d3e826302f8) (cherry picked from commit c5342be39c1ab37ca41e74aabdd7f507a6c6e036) --- release/scripts/mk-vmimage.sh | 3 ++- release/tools/azure.conf | 2 -- release/tools/ec2.conf | 5 ----- release/tools/gce.conf | 10 +++++++++- release/tools/oci.conf | 5 ----- release/tools/openstack.conf | 2 -- release/tools/vagrant-virtualbox.conf | 1 - release/tools/vagrant-vmware.conf | 1 - release/tools/vmimage.subr | 23 +++++++++++------------ 9 files changed, 22 insertions(+), 30 deletions(-) diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index ca6a359affbd..dfd91f43140d 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -97,13 +97,14 @@ main() { vm_create_base vm_install_base + vm_emulation_setup vm_extra_install_base vm_extra_install_packages vm_extra_install_ports vm_extra_enable_services vm_extra_pre_umount vm_extra_pkg_rmcache - cleanup + vm_emulation_cleanup vm_copy_base vm_create_disk || return 0 vm_extra_create_disk diff --git a/release/tools/azure.conf b/release/tools/azure.conf index b6526f21e474..9da2b19de694 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -53,7 +53,5 @@ EOF touch ${DESTDIR}/firstboot - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index a233bf5981c1..ce09ab0d2367 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -102,10 +102,5 @@ EOF # The first time the AMI boots, run "first boot" scripts. touch ${DESTDIR}/firstboot - if ! [ -z "${QEMUSTATIC}" ]; then - rm -f ${DESTDIR}/${EMULATOR} - fi - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } diff --git a/release/tools/gce.conf b/release/tools/gce.conf index aad4a74d2e39..5ad83bcded53 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -118,7 +118,15 @@ EOF touch ${DESTDIR}/firstboot - rm -f ${DESTDIR}/etc/resolv.conf + return 0 +} +# Do everything except deleting resolv.conf since we construct our own +# Googlized resolv.conf file in vm_extra_install_base. +vm_emulation_cleanup() { + if ! [ -z "${QEMUSTATIC}" ]; then + rm -f ${DESTDIR}/${EMULATOR} + fi + umount_loop ${DESTDIR}/dev return 0 } diff --git a/release/tools/oci.conf b/release/tools/oci.conf index c57a7683a500..a4fe54ad3031 100644 --- a/release/tools/oci.conf +++ b/release/tools/oci.conf @@ -90,10 +90,5 @@ EOF touch ${DESTDIR}/firstboot - if ! [ -z "${QEMUSTATIC}" ]; then - rm -f ${DESTDIR}/${EMULATOR} - fi - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf index 4c905fbae4ba..05d2d13bbb39 100644 --- a/release/tools/openstack.conf +++ b/release/tools/openstack.conf @@ -35,8 +35,6 @@ vm_extra_pre_umount() { echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> \ ${DESTDIR}/usr/local/etc/sudoers.d/cloud-init - rm -f ${DESTDIR}/etc/resolv.conf - # The console is not interactive, so we might as well boot quickly. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/vagrant-virtualbox.conf b/release/tools/vagrant-virtualbox.conf index 4dd7ca8953ad..9e0e430bbc88 100644 --- a/release/tools/vagrant-virtualbox.conf +++ b/release/tools/vagrant-virtualbox.conf @@ -14,5 +14,4 @@ vm_extra_pre_umount () { # Setup the Vagrant common items vagrant_common - rm -f ${DESTDIR}/etc/resolv.conf } diff --git a/release/tools/vagrant-vmware.conf b/release/tools/vagrant-vmware.conf index 52ff7f1aac1a..fff929829222 100644 --- a/release/tools/vagrant-vmware.conf +++ b/release/tools/vagrant-vmware.conf @@ -18,5 +18,4 @@ vm_extra_pre_umount () { # Setup the Vagrant common items vagrant_common - rm -f ${DESTDIR}/etc/resolv.conf } diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index eda22e061c6d..72540dad14a8 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -83,8 +83,14 @@ vm_install_base() { echo "zfs_enable=\"YES\"" >> ${DESTDIR}/etc/rc.conf echo "zpool_reguid=\"zroot\"" >> ${DESTDIR}/etc/rc.conf echo "zpool_upgrade=\"zroot\"" >> ${DESTDIR}/etc/rc.conf + echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf + echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf fi + return 0 +} + +vm_emulation_setup() { if ! [ -z "${QEMUSTATIC}" ]; then export EMULATOR=/qemu cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR} @@ -94,15 +100,8 @@ vm_install_base() { mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} ${EMULATOR} /usr/bin/newaliases chroot ${DESTDIR} ${EMULATOR} /bin/sh /etc/rc.d/ldconfig forcestart - umount_loop ${DESTDIR}/dev - cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf - if [ "${VMFS}" = zfs ]; then - echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf - echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf - fi - return 0 } @@ -136,15 +135,12 @@ vm_extra_install_packages() { if [ -z "${VM_EXTRA_PACKAGES}" ]; then return 0 fi - mkdir -p ${DESTDIR}/dev - mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg bootstrap -y for p in ${VM_EXTRA_PACKAGES}; do chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${p} done - umount_loop ${DESTDIR}/dev return 0 } @@ -159,13 +155,16 @@ vm_extra_install_ports() { vm_extra_pre_umount() { # Prototype. When overridden, performs additional tasks within the # virtual machine environment prior to unmounting the filesystem. - # Note: When overriding this function, removing resolv.conf in the - # disk image must be included. + return 0 +} + +vm_emulation_cleanup() { if ! [ -z "${QEMUSTATIC}" ]; then rm -f ${DESTDIR}/${EMULATOR} fi rm -f ${DESTDIR}/etc/resolv.conf + umount_loop ${DESTDIR}/dev return 0 } From nobody Tue May 14 21:38:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vf8qc6D2pz5L409; Tue, 14 May 2024 21:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf8qc3lQKz4Rt7; Tue, 14 May 2024 21:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+eJpAl4tbZsVK67zGm9g2BgOy1MlSvF2/5a3k2sOcFU=; b=YXAj8YsdVLLgx6ap3+SUmNzZuSbPnliB8WBXI8m1TRZqKRZQS4VWLwlawIDk7/KI/pb1f+ q4TxEl+fjZru7caIVj+dTMmXMQg/4dV1U8KCKrw+m9ybW4IxmfhFslgnnUnQRDzIk9rBYL hDmA9+7MsAO0preFW51bA5aFxxNsf0PefDXmSTqgHaRYUrJ1Evx3uu9mzwR5CpS0KwN3Wl ++48yOp+ab6n2wfvMQWASvbPE9hyIjHlNwN/8h1LjnBfvznt1ATCzSIIeUCNjIAG9JfSQZ usDzzQeZXGmvLC8DNhQWX0Fkh9IO+rYaJVzXdvdA+MFRzoneO1QYdmta5LtyCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722716; a=rsa-sha256; cv=none; b=ogd9J1BJ6xcuFO1/JlpkdtZaiSrA3uRxUvLjC7aab7AFJv7xVh/P5KYBSr7h5AFmjgI1JZ sLOQ95HZRe2MlRz4WkX8u6v7teivGA6dAScsTCOFr8lLJWOCs+cKpKQiZiQSjPZdKVc5HP EZ11+MW2wXvDI/kfBiw63qaqjB4jIg8jqRP8jsd++Ql2u7cnOMpMtsX7TZbtk6RVZF/UvZ MHo3BsQt3L8sPraWUIpgIZUpwg5f2ax3BrgI2UdOL48Zy94Ozs8iJd8IDTQmI5SyPv/0CQ Gr6hf/RNb5/Tv5GzhdXUdx50RAEG4XtRtDeUm3fjebCKTYzRSGvktXTdy/KQgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+eJpAl4tbZsVK67zGm9g2BgOy1MlSvF2/5a3k2sOcFU=; b=QrpN50ui4c264J8pTLS5j2ooTth74Pmq0mMNymfCmatc8vJWgmEB8nbcs8JOsMa9ABtm0/ P1ZsUnkJMK3oaxNAug4smwyK9HozGeUvlaGN/uleEzbou5Nug3nS2vV911yxlGrB1dcZBL GP65ddIUarCkCLseA1/w3I+MCBpy1tCfKBQRnhE60VegnXZqUzSwRKIcGOREryxMpdBWkh QUrPkbhtaxohcWEG7K0lO26bBqb9f+HGfI4LvixIXZdpif513ltSiC4dRqejxuNBsslAgI Dl3+CXeLTf9REXUrzIdrS3RiGnTzuI01iB4HN1vMcXwLvp08BA3DrMFAXVSWkA== 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 4Vf8qc3Jg9zp6W; Tue, 14 May 2024 21:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44ELcaVW093980; Tue, 14 May 2024 21:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELcaDh093977; Tue, 14 May 2024 21:38:36 GMT (envelope-from git) Date: Tue, 14 May 2024 21:38:36 GMT Message-Id: <202405142138.44ELcaDh093977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 67f4116a102f - releng/14.1 - release: make dependencies, not recursive make List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 67f4116a102f6a6917f4b329412b0dfa30016e1a Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=67f4116a102f6a6917f4b329412b0dfa30016e1a commit 67f4116a102f6a6917f4b329412b0dfa30016e1a Author: Colin Percival AuthorDate: 2024-05-09 07:52:25 +0000 Commit: Colin Percival CommitDate: 2024-05-14 21:38:17 +0000 release: make dependencies, not recursive make For historical reasons, the vm-release and cloudware-release targets were written as recursive makes of ${VMTARGETS} and ${CLOUDTARGETS}; this worked fine until we started running `make release -jN` and had both VM and cloud targets depending on ${QEMUTGT}, at which point things exploded when we tried to build the port twice at the same time. Switch vm-release and cloudware-release to have make dependencies on their individual components; this way a single make process runs and is aware of the duplicate dependency (and only runs it once). MFC after: 5 days Approved by: re (delphij) (cherry picked from commit ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb) (cherry picked from commit e306ad1c194d464708b4b12277d577d931e6eae9) --- release/Makefile.vm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 6fd165528854..95d48490c353 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -223,14 +223,16 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif -vm-release: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS} +vm-release: ${VMTARGETS} +.else +vm-release: .endif -cloudware-release: .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} +cloudware-release: ${CLOUDTARGETS} +.else +cloudware-release: .endif .include "${.CURDIR}/Makefile.azure" From nobody Wed May 15 13:22:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfYm83pV3z5Kskd; Wed, 15 May 2024 13:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfYm82tD4z428y; Wed, 15 May 2024 13:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715779320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D52X0j7R6SiSd/qbHqd6+k8rVt1WUhS7eVVGQRE7zcM=; b=jZXHxVDbvLk8Rb7I+8qHH12Uost/foNTdkAtdTzeGkt5Nl34AHh9CIUzz56obFHhabh0Ad YxTy5QNoN1hnnFPwqi0FcCP/0vROyGzppTg9giVYdKVEtAM+IEaOec9O/Dk/xnkFTpzjfN 5Hua4PkefTVfUDOaEDUi5HZGAmEw6BF6RwTtYj3gD6UVUbHgRHLTbAl00B/OopFgDRtl6E fDeHfm9p+9ifL3N+anOLG4JWG9kZVFgwrb6EHJbCeQz9LZxql1YATvwdXPhdXcYHAFS4cW 0lZCrSmRXIvkHUwr8lxmgqK7VbUVF0FquvneMN/7QemhjsS99SZnONjqQ0ihpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715779320; a=rsa-sha256; cv=none; b=iMprMIRR5HrhRr5xf+UICHbJmzyTKRiLAEuexGIiznC+qkkBcujmJBsvUhMsok66c/6qpw /Cb/0BvD9HKiWFiPlQk5+kl1BbUDCxYyCRvoxe1cmVdJhqhqrLrVi175D9KLENYPYFLhl9 hwr3tXgPO3fTZooQ1QRuD8R1cHJA5cPey4HrbwaDVrV3pum//WLbPmEgRpgZF98am1hFbv 6GcZ3ns6KyZ5zkI2mip5DXs7nfBuq3kyyIcYIiPFoaSJSHNMJPSnC6XMQ3rrqPwyYYD40Y GERog/ibwaqbiKOCl0lDJMKnTKhVGaggCnp2VOSIS+WTo26ONR8jyRO+JoQjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715779320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D52X0j7R6SiSd/qbHqd6+k8rVt1WUhS7eVVGQRE7zcM=; b=Q1Vm6O/BWKir7YlznqpOZyZeAmmUV/XP0FGLlL11CMMmBauoaiZ2A2CKsMGuhoWZfLtNSz 3zzFpTVJyCfcc0wTJdQhqhKqy4HOTBEmbJ8VGXLvPzy6s/jvusXDeywFiB7a/8jGfh7Btr ZhmAO0/VWcks/Gayo05hH1sWDwhCDWBuZKPIbpIB0ScKvzth9KIgAl5dtMaztrS07Zq3eE j7O4/SWVtXN1eMqxjDGGZBWBkrHucZCEe/TpCd5ZgLiZBgHNNf7TimedKDw72mlDavaVry YySSocnkiy19KHESe54eSTqQ3EL984dMe03ynQfAD3gfTnjoFwZqKWzgEQR1Ug== 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 4VfYm82TgvzGdC; Wed, 15 May 2024 13:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FDM0Rv093799; Wed, 15 May 2024 13:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FDM0hf093797; Wed, 15 May 2024 13:22:00 GMT (envelope-from git) Date: Wed, 15 May 2024 13:22:00 GMT Message-Id: <202405151322.44FDM0hf093797@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: 6adfee18effb - stable/14 - sys/namei.h: move NI_CAP_VIOLATION() macro from namei.h to vfs_lookup.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6adfee18effba91ff56341549a4e28473738316a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6adfee18effba91ff56341549a4e28473738316a commit 6adfee18effba91ff56341549a4e28473738316a Author: Konstantin Belousov AuthorDate: 2024-04-24 18:55:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-15 13:21:34 +0000 sys/namei.h: move NI_CAP_VIOLATION() macro from namei.h to vfs_lookup.c (cherry picked from commit 66df81021e5437e86ff5e0886c35170feb1cd3a0) --- sys/kern/vfs_lookup.c | 5 +++++ sys/sys/namei.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 600af6d486eb..f7fb986d4472 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -88,6 +88,11 @@ static void NDVALIDATE_impl(struct nameidata *, int); ndp->ni_cnd.cn_flags |= ISRESTARTED; \ } while (0) +#define NI_CAP_VIOLATION(ndp, path) do { \ + ktrcapfail(CAPFAIL_NAMEI, (path)); \ + (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ +} while (0) + SDT_PROVIDER_DEFINE(vfs); SDT_PROBE_DEFINE4(vfs, namei, lookup, entry, "struct vnode *", "char *", "unsigned long", "bool"); diff --git a/sys/sys/namei.h b/sys/sys/namei.h index d464423c025c..f6279700e735 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -205,11 +205,6 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define NI_LCF_CAP_DOTDOT_KTR 0x0008 /* ".." in strictrelative case */ #define NI_LCF_KTR_FLAGS (NI_LCF_STRICTREL_KTR | NI_LCF_CAP_DOTDOT_KTR) -#define NI_CAP_VIOLATION(ndp, path) do { \ - ktrcapfail(CAPFAIL_NAMEI, (path)); \ - (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ -} while (0) - /* * Initialization of a nameidata structure. */ From nobody Wed May 15 13:22:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfYm94wkvz5KsdV; Wed, 15 May 2024 13:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfYm93v0Bz42TH; Wed, 15 May 2024 13:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715779321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1cMg/LToz2I5vn+UbnkDm31t8L9coau5wofO8ovLU4=; b=OSs+Y2SDeVJvUYHSiLlIEGChl1efnY6zDgP3vohb9pHgdXczZu0MekXvWnuWdv/XCBGTNw peqK7Hywp+6+MoM078yZ3ppSM8+G1NCNDAbIJc3HUyMliCgUJq/gyWaJgBIAquI682TV+3 1BtKOiB+mnmUI3RtHQ9aHkloJhhLbD88FEQ9AQs2xl0Vc93tKSZzi9vI9RcA1jdw0nb/4W 0o5FHTklVL9lsYl1KiR22cOH+jgUgyn1pm5bPcpinwOkmsRo4lJ1mYKkG9V8GZT9zBqBHw Xd7CK9bdLR9GeMm7/cDwfb2X/fe/fnfJUICpSFUMDRCEbJk/ucLjQvfaLlenLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715779321; a=rsa-sha256; cv=none; b=VQyR8PmWDte9w4noGxqeYtJM4wZWxPAnsZOSn+blct9I6WekE8Ies3xge971Hb5QjSkyJg FvtXHRkVOlAZeGeShFAO1WowSLPOOh7kcnsjmGofUmvDUozrt/FptVR4T6gtOkSA6cg2jY ExvYrHgXA5wqFhgKwG7w5SwAbQlwrHB0KhmSldncle9L2L8opPqAzz3q1lTt20hiCKexLM v0UrTgRVREzdyH0siy9bxfJM6k6mxNnSWdyMCTVzwop96SdXfUydj5/W9eFdM97UluY0TH IRns7hLSdA/9JHHrTnB2TmwfbquPiJ84VSinEMjy2/sIjntbfMvWSpHNyZnKlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715779321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1cMg/LToz2I5vn+UbnkDm31t8L9coau5wofO8ovLU4=; b=qNnr+Z8nJbj4FWVTHXdFwbCSeXylNxUym8FJfRmkLgaaUu55TlDL5mBWcB8tmNT3rNBv8U 0MhIOyuBv+EtDPxTQfz1+Ni8uaXaKeFXz7PacHQKGH11NECF13W1+mZSbGmk5++6+dXy1u fauU5uttlRQQdzdH+f+HiI1FO5+SgAekVjI0ZjV7zdoO6EbogUTA/UF5rMIv3mgyyJRtla bdVz7HW2VE7iWh83nAkzN+CYkelSjIqlqJasxQinU3fMsBh3zDcgM/UNRbYANdfpT+nxtN TuHTzTNVnm0dKlRedMtdjYuDuOHcMGEpiT68EUX5TYOaLb6S9YlLyWX0hqNYew== 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 4VfYm93VK7zH4s; Wed, 15 May 2024 13:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FDM1Gt093856; Wed, 15 May 2024 13:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FDM1xg093853; Wed, 15 May 2024 13:22:01 GMT (envelope-from git) Date: Wed, 15 May 2024 13:22:01 GMT Message-Id: <202405151322.44FDM1xg093853@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: 00cf2f3092e4 - stable/14 - vfs_lookup.c: only call ktrcapfail() if KTRACE is enabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00cf2f3092e462b8840b8cb9c3d86c471da065e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=00cf2f3092e462b8840b8cb9c3d86c471da065e5 commit 00cf2f3092e462b8840b8cb9c3d86c471da065e5 Author: Konstantin Belousov AuthorDate: 2024-04-24 19:06:14 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-15 13:21:35 +0000 vfs_lookup.c: only call ktrcapfail() if KTRACE is enabled (cherry picked from commit 6b0cf2a2379b86b67269ed4549057cd6d69490e5) --- sys/kern/vfs_lookup.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index f7fb986d4472..b7f751a364ce 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -88,8 +88,14 @@ static void NDVALIDATE_impl(struct nameidata *, int); ndp->ni_cnd.cn_flags |= ISRESTARTED; \ } while (0) +#ifdef KTRACE +#define NIKTRCAPFAIL(path) ktrcapfail(CAPFAIL_NAMEI, (path)) +#else +#define NIKTRCAPFAIL(path) +#endif + #define NI_CAP_VIOLATION(ndp, path) do { \ - ktrcapfail(CAPFAIL_NAMEI, (path)); \ + NIKTRCAPFAIL(path); \ (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ } while (0) From nobody Wed May 15 15:34:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vfcj93m0Kz5L3rc; Wed, 15 May 2024 15:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vfcj91RxQz4Q4Q; Wed, 15 May 2024 15:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715787277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPhGT4F3HxFOUQSPJ5+LAmXzSQbxythbD3aSlUJo2aE=; b=eQK6g5pZl6kIy2IxCMzrcSLpZKjraa/wxojjox9cxDizxtZqCmlpmkwcSmcXmBftG7b1c2 LaIOn3RaULPGZ99pzjuWhEag8BFYn3H67ILSGJ9dnP+ZX2DzxI+oQ6nqbApiiVkG3bbMud QZhpLHV9odZtlhJnz0wqckiHtivLePPYpru/4ZriV9FROGCxioq6i3zF8ygRANF8ehAGVQ rqbbFzjhL9YxsSt65/wcKB7NZmuC/d9U2yEECWzl6FB7z42mJ0+HaZkYbUpaQ3sS2Xu2iR ZbvgHyF11p4dTwb8g4vy3ExcMr5TbUrfsYm4YDlbc132CTJ+qfieSU6vsZuWAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715787277; a=rsa-sha256; cv=none; b=Gp9Nz01IpZ9lftK7UqtNU0A+U9RND8UrSYajF8plj4ZeAXXTw8dmBRk7YCpLP8OXULmY6u 4TuqUSXfeouqmTed19Q+QZOpJC8ukxAtFW2Gli6WVAUt5q8CE4tyuoSwRpyFE9j5v9+boY 4+GP9AQmju3r79XeBgc1LZ1XMVuhLRrS8zU/XPe6lS92X1an4Udxiemtd9FlEe3y3Z51Vl gFNajum4yLQwCJT41ygx5iCEwC3Tz0u7tj03vlQVN1DZDCoTMNd0p1AS0qcXYtc70zye6T zvv0jDiHs9W2iS95JugTQ+/tYfORYJMA7XlBINNFqQt3+CWQe/FV898fN69sgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715787277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPhGT4F3HxFOUQSPJ5+LAmXzSQbxythbD3aSlUJo2aE=; b=mOQCfY/mRipSvLoBSzD47+GQJR+NCBefpMSqXXSbG5rQeq6vtLoEiLN+TzgSWHRUGXw4HA tJG/FiswxHMOwuNNPeBeu2BL9bE7FS4LXSxCIhva/EsYN+LtavPNP71Ktyr5fLH1WOXdvG O61w4GUJdgv9WqWfOv4L4TP9ob9rgFp70nxbI7W+3JCi6jThQQp6s3+LwBYpZhN1EU16Of 5vxWkbmsCuP1BWka2NT9RiX8P2ZDc8r43SI+f/EpJGKbXbJ2e5IRB4ocKFQ/7LTUrY0ZVM F/0ua80aZBEKEmbfOlpAa7YYg9pV9zwvc1ZgaDjfBSx/e+WOt1nIFK0UXRiADQ== 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 4Vfcj912cBzLLk; Wed, 15 May 2024 15:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FFYb1s018816; Wed, 15 May 2024 15:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FFYbFb018813; Wed, 15 May 2024 15:34:37 GMT (envelope-from git) Date: Wed, 15 May 2024 15:34:37 GMT Message-Id: <202405151534.44FFYbFb018813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 3e627553bbd7 - stable/14 - Revert "intrng: switch from MAXCPU to mp_ncpus" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=3e627553bbd791a4f73eaeea2c2d795fd4e0ee70 commit 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70 Author: Mike Karels AuthorDate: 2024-05-14 22:44:58 +0000 Commit: Mike Karels CommitDate: 2024-05-15 15:34:26 +0000 Revert "intrng: switch from MAXCPU to mp_ncpus" This reverts commit b4d11915c73f199501672b278be86e1f63790036. This is a direct commit to stable/14. The change breaks booting on older Raspberry Pi 4's, although that works on main. The cause is unknown. The original commit should be redone on stable/14 if/when it catches up with main. --- sys/kern/subr_intr.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 49fe20cdc890..6535c42f2404 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -175,11 +175,11 @@ intr_irq_init(void *dummy __unused) /* * - 2 counters for each I/O interrupt. - * - mp_maxid + 1 counters for each IPI counters for SMP. + * - MAXCPU counters for each IPI counters for SMP. */ nintrcnt = intr_nirq * 2; #ifdef SMP - nintrcnt += INTR_IPI_COUNT * (mp_maxid + 1); + nintrcnt += INTR_IPI_COUNT * MAXCPU; #endif intrcnt = mallocarray(nintrcnt, sizeof(u_long), M_INTRNG, @@ -312,18 +312,18 @@ intr_ipi_setup_counters(const char *name) mtx_lock(&isrc_table_lock); /* - * We should never have a problem finding mp_maxid + 1 contiguous - * counters, in practice. Interrupts will be allocated sequentially - * during boot, so the array should fill from low to high index. Once - * reserved, the IPI counters will never be released. Similarly, we - * will not need to allocate more IPIs once the system is running. + * We should never have a problem finding MAXCPU contiguous counters, + * in practice. Interrupts will be allocated sequentially during boot, + * so the array should fill from low to high index. Once reserved, the + * IPI counters will never be released. Similarly, we will not need to + * allocate more IPIs once the system is running. */ - bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); + bit_ffc_area(intrcnt_bitmap, nintrcnt, MAXCPU, &index); if (index == -1) panic("Failed to allocate %d counters. Array exhausted?", - mp_maxid + 1); - bit_nset(intrcnt_bitmap, index, index + mp_maxid); - for (i = 0; i < mp_maxid + 1; i++) { + MAXCPU); + bit_nset(intrcnt_bitmap, index, index + MAXCPU - 1); + for (i = 0; i < MAXCPU; i++) { snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); intrcnt_setname(str, index + i); } From nobody Wed May 15 16:00:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfdGV4PsSz5L5J5; Wed, 15 May 2024 16:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfdGV3vJCz4SLf; Wed, 15 May 2024 16:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KCfmNUTSpTDJzu+AaYYmcGBSJpttGL4PKMM05lkCZAE=; b=j6lZFJWXMSuwdQOzEwspUPOmoxxXwrHLhQJ+hXc3cD9hDTkBXpkdkpduM959DgFMazWj+u HKXkmTYN4sCsF6WiTXe8Ve7StN4tuNb6NPhz6JcyNRHQQke7OEgwMykpmfkess8ixe/wVs 4uiDHXHBwGflhYe0rEhhxGKngYssMmiyRJEsTkngEXyt71l9z+P4Hex5GLJiokLgN6Y8r7 VX9u8nJtLzBIHCW1U3+oBTkzlkzeJNP/VurFhCezXJb9aX3NdZq1t1+m30vI7kgff5tGgc 3QMzYCBsBRuvGpsk8iAe8yppXziuPr1jdyyfgqZzWnL1YyMkXFuYBfSzJkk5dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715788802; a=rsa-sha256; cv=none; b=abusjL59tF/pTNJvfZvUnEB6ChJrXd4tGrP6BGEcbO4r2EKMJD7AIeCp0aHWFCI7oaOzHz /GYsJePhPPj4AoYTAzevTwM8KkESdnu+C8uvUoegQsOGY/p0fundK03Fq6evVNxTB8ppGT 0ZQ/ZQm5m+t0MTW8ujMLJrX9bhMnkB8b+U3HrIwr2unF6iD6bUdfn5uZrMOMbOzk/gvUpP 8QWAUDtC70cFX17C1yOk5NVarj7E6EZkS0oVCSNDZZkUkDjd0x10rfUTiPJazfSt3plkbO 3Fyp5mzg0l2HaH7oFVckrf6ROi3f9mbdW6qJEkchVCNPvHovYkwHsJjx99NE6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KCfmNUTSpTDJzu+AaYYmcGBSJpttGL4PKMM05lkCZAE=; b=iBdRHRKQlXyqYJdhprB0lihLlHnyqgA6wsMBJw1hPTV/5YqK/xnSC263Tf3JUFIhVM8c+/ yKfT0GyWFpq/x85qBJR4kkyGcags6mKV5rpTlpv/sBJDYK//+OeSma8MVw8TUBlRoO3hwI khSx5jFwQCwPjkvzC4e2EA2Tp00j5a5a5Qn4m1Q4nP8ObS+bWOTM+R1kd9ZHuQzXf2cQXa DUguWnmDe2dQarfvqLudhzGTk5tzH15wluxDezMZdWeHTnySGbNQHLKK7sZCWixHxO6i0x UhU+xZ+MAWWmd4U/94HO6O6RBTldd96ExXWRlLI+yke3PrAoM5+U8/ofFg054Q== 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 4VfdGV3VN2zLtV; Wed, 15 May 2024 16:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FG02RB055753; Wed, 15 May 2024 16:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FG02Ll055746; Wed, 15 May 2024 16:00:02 GMT (envelope-from git) Date: Wed, 15 May 2024 16:00:02 GMT Message-Id: <202405151600.44FG02Ll055746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0d230c89f5b3 - stable/14 - expand: Fix markup for the `-t` option. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0d230c89f5b39b06730bb43aa6e0cd0482dbd64a Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0d230c89f5b39b06730bb43aa6e0cd0482dbd64a commit 0d230c89f5b39b06730bb43aa6e0cd0482dbd64a Author: Dag-Erling Smørgrav AuthorDate: 2024-05-13 10:41:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-15 15:59:30 +0000 expand: Fix markup for the `-t` option. PR: 274897 Fixes: 8993d785a261 MFC after: 3 days Reviewed by: gbe Differential Revision: https://reviews.freebsd.org/D45167 (cherry picked from commit f3eeeb959c9b00c89a2e1ff009c78162eb398656) --- usr.bin/expand/expand.1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1 index 9a49deb1a948..c1e19891b1ab 100644 --- a/usr.bin/expand/expand.1 +++ b/usr.bin/expand/expand.1 @@ -80,9 +80,15 @@ If the .Fl a option is given, then tabs are inserted whenever they would compress the resultant file by replacing two or more characters. -.It Fl t \&Sm Ar tab1 , tab2 , ... , tabn \&Sm +.It Fl t Xo +.Sm off +.Ar tab1 , tab2 , ... , tabn +.Sm on +.Xc Set tab stops at column positions +.Sm off .Ar tab1 , tab2 , ... , tabn . +.Sm on If only a single number is given, tab stops are set that number of column positions apart instead of the default number of 8. .El From nobody Wed May 15 16:00:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfdGX4X4rz5L5Mt; Wed, 15 May 2024 16:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfdGX2dqRz4STN; Wed, 15 May 2024 16:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BcWXwB1QSSuGyH7InDlBhKiAdGshDlhGhQDrzLFTSTA=; b=YMFCjfwgxaCHlg/XRxDujBo6FDDvAamwZtNosYQtPas0WWI069KbImn3g30+4SKhy/20qi /LnxO9F22Sri0HzJCE5amq7L214Si0DA3G8TKROCLcwIeejWN5iLY9nXsxlKXTCY/+76x5 aeIJqIsBmCn6vlO96WeWB5CFueqz352nGWGcleRIR8ySK/uqNnAAiD65RfaEVLRtNjZ2/t Pw5QLDxRTVh+jO8arYStCZ5UAfdD73ANxic3lCFax7+7pTs7Wnji4xUYBjBja+wLJU8HLV uefp3XbQva1uZmLB75xQz7gV+d6UeTB3p39LzPr37HjsGpXKBGKe090bSrFbcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715788804; a=rsa-sha256; cv=none; b=cUsIb+lBBxpZ6s+RsV5YxGCTmkx7rIcMzzesaeDdHOvkmTAaIYy/0F3LQS4Qg/v9u3x7vr n0LpzrZTsAaW6BsnKw4CHmVQeJi8r3Es+emAfbwGAsMSlKV277CkX4gkEH7bMHWXiHFlEQ jBZR+XaMCLqjNarA7woEPTvZ5qbYO7bUZ0Z82sWD3XDnH8aZnelLXKrQBF3zuG8/95j7+j e4/bDR90/QNgyBynZBUhTIGijtO7eqrXS4BSzZ6ZGRmYooEgYKiopFfD74nztFsLV9g0Xn DpIpqZ7MwJlfLRRQN3Tp20rG+CO7E5FiXMaGhEbFyNeDG+45jBnStePqcyMoIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BcWXwB1QSSuGyH7InDlBhKiAdGshDlhGhQDrzLFTSTA=; b=D3LYw7LTT02eia68NjSJ3+hdP+WzCo1n4BnFjFiS+CRwQ+HpByjTL0uIocTXU7ic4jVP2q Yx0YmQh1uqCeNA11BXachsm4QkydSM5KRnH1feSduOkwqlTQjW0SC3n96JiTOwkLco/3um EBpXASZanEBOzlRob8FlYiztwzVEkil9LzYktUI0pvvh2UsDydA4yseAfIn6tgB5xU5H30 QLm+XIs3tRcz3DhEoMk+H/SBdlmEOSQ17uhdLPUGFpfwMmVZjJ7S6cGuc9SEC86FEdX3HX 9968KWgrGTlNyEXnECEGa7/22ZEBCKjvYyTLUuVs3LugFgWsIgKMLbrFsaj4kw== 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 4VfdGX2FW4zLZd; Wed, 15 May 2024 16:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FG04oR056658; Wed, 15 May 2024 16:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FG0434056653; Wed, 15 May 2024 16:00:04 GMT (envelope-from git) Date: Wed, 15 May 2024 16:00:04 GMT Message-Id: <202405151600.44FG0434056653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a4d054aa5cab - stable/13 - expand: Fix markup for the `-t` option. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4d054aa5cabcf3ad7991d186dc0c98e0152d2b4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a4d054aa5cabcf3ad7991d186dc0c98e0152d2b4 commit a4d054aa5cabcf3ad7991d186dc0c98e0152d2b4 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-13 10:41:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-15 13:51:10 +0000 expand: Fix markup for the `-t` option. PR: 274897 Fixes: 8993d785a261 MFC after: 3 days Reviewed by: gbe Differential Revision: https://reviews.freebsd.org/D45167 (cherry picked from commit f3eeeb959c9b00c89a2e1ff009c78162eb398656) --- usr.bin/expand/expand.1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1 index 9a49deb1a948..c1e19891b1ab 100644 --- a/usr.bin/expand/expand.1 +++ b/usr.bin/expand/expand.1 @@ -80,9 +80,15 @@ If the .Fl a option is given, then tabs are inserted whenever they would compress the resultant file by replacing two or more characters. -.It Fl t \&Sm Ar tab1 , tab2 , ... , tabn \&Sm +.It Fl t Xo +.Sm off +.Ar tab1 , tab2 , ... , tabn +.Sm on +.Xc Set tab stops at column positions +.Sm off .Ar tab1 , tab2 , ... , tabn . +.Sm on If only a single number is given, tab stops are set that number of column positions apart instead of the default number of 8. .El From nobody Wed May 15 16:00:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfdGZ0BZlz5L5J8; Wed, 15 May 2024 16:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfdGY3Cz6z4SJt; Wed, 15 May 2024 16:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCJpGrlDo+Ot8COpXPEmlo/6OhebOtxjm6a/Yh3Z4ew=; b=h+28WVtFcekga87wKNNz3RCMySlfaeAFwB8aocMFQ+oeEIrFOscF1mfdkNEZo34M2vWZDn Ow6Tr5G5KbIBkEmYusWKBFD9kKrgkJ1GXvQMm4G8RuVlvl6iHekL794JiviuFdqTdkIDt6 XoZTJpsWePFkk3/qchRK3bhuct422w6uWPhO8z3RuilafVs1z0XdJS5K/Tb2qkAJdDEAj7 E2YSYG5/qGNuh/bMUDsc6WdbarfvnJpJolhu0qDCKSUUd7Euu8V9jRCj3+t3IVJa8X0JhA yGaMgexZhyER9CYlCPnRX37n4g+3d0brZr4m8BAO+6yBaz2mSOEtP2eXduISEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715788805; a=rsa-sha256; cv=none; b=FkJSvacSiUWuc02Y6FxjLN+GEOnSHqLFWndSjKWzwTywXgdrbOKJg4qQTg43Jpp3Nz1BfR B5bi3JbAAhDTGiKxLJk8frDbZvz7DuINt93DbEzjmH1q6AV042PLPbkK54i71iBB80YBFU ffE50t79IlafrZn4xYlrXFdtWYBB8t8rqz+/jkPRy6HN/juQv0x3v+YhL0mgA9GjslcTBr AHTchjzNaDFHIWpEaiDQwAxet2ed6C15v4DxuwNO2hknPzfSG+ZNSH4bxfoyRg6WPq6zWn OWawACBA6uM4U6g6ILDETogRWFlBDQd+FQ6R6JtEpbTAkzX03xKnKNXpT1hg8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCJpGrlDo+Ot8COpXPEmlo/6OhebOtxjm6a/Yh3Z4ew=; b=Ea5moOH2rSOyxDjLLyxpwlsRBl64dlvYbLRg54a1m8Xt16lq9N5B0FVvkeQ6HGlOUgz1ey qFtV32XZO410NkbvyGmLS3eE2x4J7jtLEaJY8rbAiH1cc0HB2zsIL+3wPLTKkHiVfQzJZS FAf5MmCBrHYOI9FWNXoGpZi+OGnvFaPnCJsBsU1LiRATg1ppio7x5PhYwjge38cQnNtrPD G1tsNuH1s4qTqKPfos/DZzcmonJaqUlggt+yZd7FbI0KMkBRIuRxdGzPapFj96UxBTN4ZI aRuXfNYzRygc4fGh6PN3qEd5Y0c6m9pHgkpdZwmwALQX0cBznjL6eoIjTWoNfQ== 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 4VfdGY2qC4zM7b; Wed, 15 May 2024 16:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FG05To056967; Wed, 15 May 2024 16:00:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FG05e9056962; Wed, 15 May 2024 16:00:05 GMT (envelope-from git) Date: Wed, 15 May 2024 16:00:05 GMT Message-Id: <202405151600.44FG05e9056962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 14a33d7a0016 - stable/13 - adduser: Additional variable fixes. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14a33d7a00166caa79f5d1b89eaf5ed1a0bebbbf Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=14a33d7a00166caa79f5d1b89eaf5ed1a0bebbbf commit 14a33d7a00166caa79f5d1b89eaf5ed1a0bebbbf Author: Dag-Erling Smørgrav AuthorDate: 2024-05-15 12:13:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-15 15:59:16 +0000 adduser: Additional variable fixes. One function used `_input` without making it local, causing its value to leak into other functions. This broke the `-f` case. Fix that instance and initialize all local variables that weren't already initialized. Fixes: 170d0882903e MFC after: 3 days Reviewed by: karels Differential Revision: https://reviews.freebsd.org/D45204 (cherry picked from commit 46a619c6d4cfc662069950baca16ec2a3b18b8a5) --- usr.sbin/adduser/adduser.sh | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 61a4b3b5058f..7c3fdb418179 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -53,7 +53,7 @@ info() { # by pw(8). # get_nextuid () { - local _uid=$1 _nextuid + local _uid=$1 _nextuid= if [ -z "$_uid" ]; then _nextuid="$(${PWCMD} usernext | cut -f1 -d:)" @@ -101,7 +101,7 @@ show_usage() { # basename of the shell is output. # valid_shells() { - local _prefix + local _prefix= ${GREPCMD} '^[^#]' ${ETCSHELLS} | while read _path _junk ; do @@ -119,7 +119,7 @@ valid_shells() { # full path to the shell from the /etc/shells file. # fullpath_from_shell() { - local _shell=$1 _fullpath + local _shell=$1 _fullpath= if [ -z "$_shell" ]; then return @@ -154,7 +154,7 @@ fullpath_from_shell() { # will emit an informational message saying so. # shell_exists() { - local _sh="$1" + local _sh=$1 if [ -z "$(fullpath_from_shell "$_sh")" ] ; then err "Invalid shell ($_sh) for user $username." @@ -193,8 +193,9 @@ save_config() { # message or lock the account, do so. # add_user() { - local _uid _name _comment _gecos _home _group _grouplist _shell _class - local _dotdir _expire _pwexpire _passwd _upasswd _passwdmethod _pwcmd + local _uid= _name= _comment= _gecos= _home= _group= _grouplist= + local _shell= _class= _dotdir= _expire= _pwexpire= _passwd= _upasswd= + local _passwdmethod= _pwcmd= # Is this a configuration run? If so, don't modify user database. # @@ -299,7 +300,7 @@ add_user() { fi fi - local _line _owner _perms _file _dir + local _line= _owner= _perms= _file= _dir= if [ -n "$msgflag" ]; then if [ -r "$msgfile" ]; then # We're evaluating the contents of an external file. @@ -331,7 +332,7 @@ add_user() { # a file it will output an error message and return to the caller. # get_user() { - local _input + local _input= # No need to take down user names if this is a configuration saving run. [ -n "$configflag" ] && return @@ -366,7 +367,7 @@ get_user() { # and batch (from file) mode. # get_gecos() { - local _input + local _input= # No need to take down additional user information for a configuration run. [ -n "$configflag" ] && return @@ -386,7 +387,7 @@ get_gecos() { # If an invalid shell is entered it will simply use the default shell. # get_shell() { - local _input _fullpath + local _input= _fullpath= ushell="$defaultshell" # Make sure the current value of the shell is a valid one @@ -424,7 +425,7 @@ get_shell() { # and batch input. # get_homedir() { - _input= + local _input= if [ -z "$fflag" ]; then echo -n "Home directory [${homeprefix}/${username}]: " read _input @@ -450,7 +451,7 @@ get_homedir() { # Reads the account's home directory permissions. # get_homeperm() { - local _input _prompt + local _input= _prompt= uhomeperm=$defaultHomePerm if [ -n "$uhomeperm" ]; then @@ -473,7 +474,7 @@ get_homeperm() { # so, enable ZFS home dataset creation. # get_zfs_home() { - local _prefix + local _prefix= # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS @@ -494,7 +495,7 @@ get_zfs_home() { # allocates one if it is not specified. # get_uid() { - local _input _prompt + local _input= _prompt= uuid=${uidstart} if [ -n "$uuid" ]; then @@ -519,7 +520,7 @@ get_uid() { # Reads login class of account. Can be used in interactive or batch mode. # get_class() { - local _input _class + local _input= _class= uclass="$defaultclass" _class=${uclass:-"default"} @@ -541,7 +542,7 @@ get_class() { # will then provide a login group with the same name as the username. # get_logingroup() { - local _input + local _input= ulogingroup="$defaultLgroup" if [ -z "$fflag" ]; then @@ -560,7 +561,7 @@ get_logingroup() { # and batch modes. # get_groups() { - local _input _group + local _input= _group= ugroups="$defaultgroups" _group=${ulogingroup:-"${username}"} @@ -626,7 +627,7 @@ get_password() { # Ask user if they want to enable encryption on their ZFS home dataset. # get_zfs_encryption() { - local _input _prompt + local _input= _prompt= _prompt="Enable ZFS encryption? (yes/no) [${Zencrypt}]: " while : ; do echo -n "$_prompt" @@ -702,7 +703,7 @@ set_zfs_perms() { # adds it to the user database. # input_from_file() { - local _field + local _field= while read -r fileline ; do case "$fileline" in @@ -733,7 +734,7 @@ input_from_file() { # the user database. # input_interactive() { - local _disable _pass _passconfirm _input + local _disable= _pass= _passconfirm= _input= local _random="no" local _emptypass="no" local _usepass="yes" From nobody Wed May 15 16:00:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfdGW6Z84z5L5W1; Wed, 15 May 2024 16:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfdGW4P10z4SQv; Wed, 15 May 2024 16:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62Zhn8bZHdo1TU9K0Cjmn7wEI9eyFP5EmkW1sa1VnAs=; b=M28BpiuNPym0o7CFBqQ3IVDCZtnGW6/HUS/OVkhWihevOeyx8Q0GFRfRNIgGNLPr7D84tw MqFjTFNwha9fLMigtere6korOUJhLirt1/U0b8W/YGgRPlwCFFfXlYc8tN0hW6NRr1iVdI uU/fhZhgTWb+5n8KrbkGG1Z8kaR1WHFChpXSIkoHsrYDH6cT7u8bar1IkImduNmVIlUtSM BAYcz4q5jAtf6hEYnpp9WzF4NOIdbsRXn5FCFGvv4rLDGkrAH2ADYKoaQd7v1NztV2YD6u titDNX3PL2RAbHJGSkiSKoHWV/ehEcSqdJIJCXDkfqibgpAK6almLagDity7wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715788803; a=rsa-sha256; cv=none; b=nYZW7OnhBqHDIlE1dWkM6k9yfWGXtzNpi4lBI0+qWMSIC+RBX5Vd7NlD7ABK/lQtZFApIU FkQhXfq866E2da8Wxv3zXevVLWX/iaUfPUf18CMRy4rHwWo8Z9NIPna5Wye2qE7wYHRAni gcTLjbDlY62+voikdhuyIE1vf3b+WklF7Cmw9gehqjDRPKlF5A4hPyIcugs6lQe6j6OKM7 Yd3aUOwyhWYuem39usKID1e6QLFLsMUwcZ0m2xIkUaRL4tZ9hzjpVJvWdgavShlMsVRmGU C8MF73SrVpcCUrwpnsbrRx1e0KDBdX6m7Wo82U+YgrwScd0OHd4OCicmWuOLCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715788803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62Zhn8bZHdo1TU9K0Cjmn7wEI9eyFP5EmkW1sa1VnAs=; b=rSri6cZL/fJQIhBjo2GzHFanrD0GpH1tkt/DdisXzobU1o0VhUC/7rA0XHUK81nagEUb+m l2g4vxB46bAbblYAkMb8V6mYDpf/0YYGsEtsJaLx9gHTMQ3WxCm1tihAuvPXcNe4fwYL54 cQal1Nxt0zCJku7UNvWlA3lesPRVnz9sRqXnFq5dgTRuhP7iWRlcRN7pyX8AU2SMgspX60 HBcSUaVMx8o6d6vA1MvqGCC7JoyXd2m+bhz9nR1RxvXLndAsy/zeIG8XIYTv6bopPS//fS P3V5OPYOBvGuh4BGoiAUFTB7NQZ9NAGJOnxW/xXhi+83Xr9mtxgFTrcpfX2h0g== 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 4VfdGW419kzLZc; Wed, 15 May 2024 16:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FG03hV056337; Wed, 15 May 2024 16:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FG03AF056330; Wed, 15 May 2024 16:00:03 GMT (envelope-from git) Date: Wed, 15 May 2024 16:00:03 GMT Message-Id: <202405151600.44FG03AF056330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: db5aefb1cae1 - stable/14 - adduser: Additional variable fixes. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: db5aefb1cae14e31263ddb146f5952ca64bf6865 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=db5aefb1cae14e31263ddb146f5952ca64bf6865 commit db5aefb1cae14e31263ddb146f5952ca64bf6865 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-15 12:13:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-15 15:59:30 +0000 adduser: Additional variable fixes. One function used `_input` without making it local, causing its value to leak into other functions. This broke the `-f` case. Fix that instance and initialize all local variables that weren't already initialized. Fixes: 170d0882903e MFC after: 3 days Reviewed by: karels Differential Revision: https://reviews.freebsd.org/D45204 (cherry picked from commit 46a619c6d4cfc662069950baca16ec2a3b18b8a5) --- usr.sbin/adduser/adduser.sh | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 61a4b3b5058f..7c3fdb418179 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -53,7 +53,7 @@ info() { # by pw(8). # get_nextuid () { - local _uid=$1 _nextuid + local _uid=$1 _nextuid= if [ -z "$_uid" ]; then _nextuid="$(${PWCMD} usernext | cut -f1 -d:)" @@ -101,7 +101,7 @@ show_usage() { # basename of the shell is output. # valid_shells() { - local _prefix + local _prefix= ${GREPCMD} '^[^#]' ${ETCSHELLS} | while read _path _junk ; do @@ -119,7 +119,7 @@ valid_shells() { # full path to the shell from the /etc/shells file. # fullpath_from_shell() { - local _shell=$1 _fullpath + local _shell=$1 _fullpath= if [ -z "$_shell" ]; then return @@ -154,7 +154,7 @@ fullpath_from_shell() { # will emit an informational message saying so. # shell_exists() { - local _sh="$1" + local _sh=$1 if [ -z "$(fullpath_from_shell "$_sh")" ] ; then err "Invalid shell ($_sh) for user $username." @@ -193,8 +193,9 @@ save_config() { # message or lock the account, do so. # add_user() { - local _uid _name _comment _gecos _home _group _grouplist _shell _class - local _dotdir _expire _pwexpire _passwd _upasswd _passwdmethod _pwcmd + local _uid= _name= _comment= _gecos= _home= _group= _grouplist= + local _shell= _class= _dotdir= _expire= _pwexpire= _passwd= _upasswd= + local _passwdmethod= _pwcmd= # Is this a configuration run? If so, don't modify user database. # @@ -299,7 +300,7 @@ add_user() { fi fi - local _line _owner _perms _file _dir + local _line= _owner= _perms= _file= _dir= if [ -n "$msgflag" ]; then if [ -r "$msgfile" ]; then # We're evaluating the contents of an external file. @@ -331,7 +332,7 @@ add_user() { # a file it will output an error message and return to the caller. # get_user() { - local _input + local _input= # No need to take down user names if this is a configuration saving run. [ -n "$configflag" ] && return @@ -366,7 +367,7 @@ get_user() { # and batch (from file) mode. # get_gecos() { - local _input + local _input= # No need to take down additional user information for a configuration run. [ -n "$configflag" ] && return @@ -386,7 +387,7 @@ get_gecos() { # If an invalid shell is entered it will simply use the default shell. # get_shell() { - local _input _fullpath + local _input= _fullpath= ushell="$defaultshell" # Make sure the current value of the shell is a valid one @@ -424,7 +425,7 @@ get_shell() { # and batch input. # get_homedir() { - _input= + local _input= if [ -z "$fflag" ]; then echo -n "Home directory [${homeprefix}/${username}]: " read _input @@ -450,7 +451,7 @@ get_homedir() { # Reads the account's home directory permissions. # get_homeperm() { - local _input _prompt + local _input= _prompt= uhomeperm=$defaultHomePerm if [ -n "$uhomeperm" ]; then @@ -473,7 +474,7 @@ get_homeperm() { # so, enable ZFS home dataset creation. # get_zfs_home() { - local _prefix + local _prefix= # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS @@ -494,7 +495,7 @@ get_zfs_home() { # allocates one if it is not specified. # get_uid() { - local _input _prompt + local _input= _prompt= uuid=${uidstart} if [ -n "$uuid" ]; then @@ -519,7 +520,7 @@ get_uid() { # Reads login class of account. Can be used in interactive or batch mode. # get_class() { - local _input _class + local _input= _class= uclass="$defaultclass" _class=${uclass:-"default"} @@ -541,7 +542,7 @@ get_class() { # will then provide a login group with the same name as the username. # get_logingroup() { - local _input + local _input= ulogingroup="$defaultLgroup" if [ -z "$fflag" ]; then @@ -560,7 +561,7 @@ get_logingroup() { # and batch modes. # get_groups() { - local _input _group + local _input= _group= ugroups="$defaultgroups" _group=${ulogingroup:-"${username}"} @@ -626,7 +627,7 @@ get_password() { # Ask user if they want to enable encryption on their ZFS home dataset. # get_zfs_encryption() { - local _input _prompt + local _input= _prompt= _prompt="Enable ZFS encryption? (yes/no) [${Zencrypt}]: " while : ; do echo -n "$_prompt" @@ -702,7 +703,7 @@ set_zfs_perms() { # adds it to the user database. # input_from_file() { - local _field + local _field= while read -r fileline ; do case "$fileline" in @@ -733,7 +734,7 @@ input_from_file() { # the user database. # input_interactive() { - local _disable _pass _passconfirm _input + local _disable= _pass= _passconfirm= _input= local _random="no" local _emptypass="no" local _usepass="yes" From nobody Wed May 15 16:35:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vff3z3p8Mz5L7sD; Wed, 15 May 2024 16:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vff3z3HMtz4YWN; Wed, 15 May 2024 16:35:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715790959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rcUenXNWJ9YH82stG4AKZ89KbRI9fLhbb7TufBf+f3w=; b=ekHwHRKV6CA+FNDLpX7VZZH6cV63+vNN1c4YttO04ygvymR0Y4fzchdeVVQAJp5f8asu/0 OUimTEFQgjPy3moood+9jWtHS90cecD17APJkraRsYRVBmgrcZfzOmUTKR8s7wAGJnPO/s rno6wvl67USBAk3BEHFD8PAUY9p2nd+zdf/EIL83Ne44joKmJ9BydzXVWwjZIfPw+uDH7C rjq4hPepR60WFboIV5C/UqPSVdWjt/rxVrMVXZBXV4B7G14C1392pk/Fq7O/G2q5O0Wv5X 2yCduMqFGQKb4QolMrdsv8UhvxLAI8P3b0IAu/0hhDoGwzR0ea3aN9BCV2yWaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715790959; a=rsa-sha256; cv=none; b=ZYR7vXtywNgn1GkpmZGQRCm2t7c3WxGO0QRv4njo9wIPx/P3hCtCEcnWZXK7jWQGRm6mVj 3pnhsvziwf8l6YRLgMvmbxibIr1DinUGrixsAKvuR7mhU5BuMis0ohFkRN92tcXlM8m5X7 MY8BHtU27GkYmnnDMeGo9ZPbyIQQvyGZIYUHw8m53N8L9rf39ke8nmRsaoVSuIFGdrHxve N544DCNpzGPTyPlFXTqB/a5ODMkRUxyZIcYBmXqst12FJRJmzYbw/fu2WfDEKSTOC0hKl5 fM2rUJf/tWQYRKaZAB6CE9Y87M8tv0uwM4MH0D7ZxV6bxj2YvY1Z3Bq1ydhBcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715790959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rcUenXNWJ9YH82stG4AKZ89KbRI9fLhbb7TufBf+f3w=; b=CI2BCdxyZRvFgG4xOROA8Jw24ZJ8vHhSj3o0rgdUbnWHJKKMisWphoS+CVtWNMDfypIheL o1VWMAr9TQVMU7VdOro20/oSQSvjkSrLi5eXLhEcrXcN054N02nAYnXixflc0GMRQM9bKK m/yeG8WnmylSrBsy8EFbcP+a7i++p82uUDeccXtW2kBkhJJF742MLROT0j1Z34Xmh9ye7o pObcXh6H0sXodEAoJo+ZV0d0ReeE2h1hanpz0zbT/+Qi4jyg23p7VfyR18LmRUj2DCyWH+ lCgct/Ns6kQS1nO0BL/bd39XiW7y6UsQfr/obLnqI78IYu/himRsLmbO17IjeA== 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 4Vff3z2p5PzMyQ; Wed, 15 May 2024 16:35:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FGZxak021249; Wed, 15 May 2024 16:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FGZxAS021246; Wed, 15 May 2024 16:35:59 GMT (envelope-from git) Date: Wed, 15 May 2024 16:35:59 GMT Message-Id: <202405151635.44FGZxAS021246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: b827afb9e3a7 - releng/14.1 - Revert "intrng: switch from MAXCPU to mp_ncpus" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: b827afb9e3a7aaaa2da7d101c46881c646d4df2f Auto-Submitted: auto-generated The branch releng/14.1 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=b827afb9e3a7aaaa2da7d101c46881c646d4df2f commit b827afb9e3a7aaaa2da7d101c46881c646d4df2f Author: Mike Karels AuthorDate: 2024-05-14 22:44:58 +0000 Commit: Mike Karels CommitDate: 2024-05-15 16:35:38 +0000 Revert "intrng: switch from MAXCPU to mp_ncpus" This reverts commit b4d11915c73f199501672b278be86e1f63790036. This is a direct commit to stable/14. The change breaks booting on older Raspberry Pi 4's, although that works on main. The cause is unknown. The original commit should be redone on stable/14 if/when it catches up with main. (cherry picked from commit 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70) Approved-by: re (cperciva) --- sys/kern/subr_intr.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 49fe20cdc890..6535c42f2404 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -175,11 +175,11 @@ intr_irq_init(void *dummy __unused) /* * - 2 counters for each I/O interrupt. - * - mp_maxid + 1 counters for each IPI counters for SMP. + * - MAXCPU counters for each IPI counters for SMP. */ nintrcnt = intr_nirq * 2; #ifdef SMP - nintrcnt += INTR_IPI_COUNT * (mp_maxid + 1); + nintrcnt += INTR_IPI_COUNT * MAXCPU; #endif intrcnt = mallocarray(nintrcnt, sizeof(u_long), M_INTRNG, @@ -312,18 +312,18 @@ intr_ipi_setup_counters(const char *name) mtx_lock(&isrc_table_lock); /* - * We should never have a problem finding mp_maxid + 1 contiguous - * counters, in practice. Interrupts will be allocated sequentially - * during boot, so the array should fill from low to high index. Once - * reserved, the IPI counters will never be released. Similarly, we - * will not need to allocate more IPIs once the system is running. + * We should never have a problem finding MAXCPU contiguous counters, + * in practice. Interrupts will be allocated sequentially during boot, + * so the array should fill from low to high index. Once reserved, the + * IPI counters will never be released. Similarly, we will not need to + * allocate more IPIs once the system is running. */ - bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); + bit_ffc_area(intrcnt_bitmap, nintrcnt, MAXCPU, &index); if (index == -1) panic("Failed to allocate %d counters. Array exhausted?", - mp_maxid + 1); - bit_nset(intrcnt_bitmap, index, index + mp_maxid); - for (i = 0; i < mp_maxid + 1; i++) { + MAXCPU); + bit_nset(intrcnt_bitmap, index, index + MAXCPU - 1); + for (i = 0; i < MAXCPU; i++) { snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); intrcnt_setname(str, index + i); } From nobody Wed May 15 17:21:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vfg4Q6PdCz49wMN; Wed, 15 May 2024 17:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vfg4Q5ymgz4fWy; Wed, 15 May 2024 17:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715793686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8bBnbuh+RJm5PdjgcJgwxFV+CMYjI8/k14j78aXLLOQ=; b=ULSCwjZCkuIRwL9nk+aVBlUqGjHBfxylhXX8HOQwH3G1g3/7m1b1Onnp2Q4Y/aoexAXJ5r ViBFs6o0Wb/ZGcHMsYq+vQRkDuG8LCpPM3fWqVfqZKPkFHVdBxL50vMGu24BY92jEE7/Lt pAwllhZsn68B8iLS1ni73kKcq47PZxXdLagTxvgAlnJgXkq0igt5A2AtmDWK9OEBS1itW9 qUIbrvHJjRV4K4K2mn3ludk5xekIOwUl9wPNnsYeU/4lOPGl5jAe3ojCbRPfxASM6nGDDu TrQKgtBNlFgIbN8GeOR92aKpHT6ti5//2UXKs+QIbS7wuki+qe9oiXny1KQShA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715793686; a=rsa-sha256; cv=none; b=iNA+YcjPRnLjI5O6tqOKUh7NJ6J10Z2S4gcay/BXA17LYJB6wF7WUP83w6IRIK7T1+oW9a P6iewzrfui70SMOihc7mb8Ls/0AlqKvG0JHfEB7T3E3ZwMT7xFBKed+/Wq9/uw7aPKaERx o8ne1xW7F77P/f9g6sWoh1V5cD40fWg+XIaZ5Z9Jx8aLrAQ8HVEVLJmJjkNPc+8CL6bgzw Zr2WLuV6OqPJfCwB1TJR7bDTiYr3nPgclfcjKTbBg19kqCc+87Ty5aNMJJercU11laCGvC zv8ElHRjZzJaynFyDeqtX1rWN3Xn/ycu+SDImFR4OiZX/xq4mekdMbpJeVzNTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715793686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8bBnbuh+RJm5PdjgcJgwxFV+CMYjI8/k14j78aXLLOQ=; b=wM42kwmHuUGiypSgIqciP6l9iUNGvAkPuk5hezO2nmIE+P/XLiiQv1VeNh3hCKDNDZD5XA VNwAnm005n7SrO9x1KrW5O3FeslLnTCH9WJgQ4EkWfPcrCliqs37uLVq/ELlcUjLdPxsYz DSxhnMdfgKspUVxtXhidVq/GblLyQtaMPE1iKfM3BkX/IK1KqNeimyCF+F9AmBGp5PPRO/ 4SKo6rzSVooPbmjKGolP22s03hlZuJVFA3Rm7ksU1bs3hzI3kuV8/NXBaYBlve9HUPPiAL EmBCth9BalgCREQs5Yalb3imxXUzUAXoGxctgPpunRvQaocxUdwHV6IdpQoXjQ== 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 4Vfg4Q5ZJ8zP1N; Wed, 15 May 2024 17:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FHLQMm003815; Wed, 15 May 2024 17:21:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FHLQcc003812; Wed, 15 May 2024 17:21:26 GMT (envelope-from git) Date: Wed, 15 May 2024 17:21:26 GMT Message-Id: <202405151721.44FHLQcc003812@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: 18119e711f1c - stable/14 - Increase IOAPIC_MAX_ID to 255 (from 254) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18119e711f1c844bd6eacf5afc8d4cdec3ac8085 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=18119e711f1c844bd6eacf5afc8d4cdec3ac8085 commit 18119e711f1c844bd6eacf5afc8d4cdec3ac8085 Author: Ed Maste AuthorDate: 2024-05-10 17:40:59 +0000 Commit: Ed Maste CommitDate: 2024-05-15 17:21:14 +0000 Increase IOAPIC_MAX_ID to 255 (from 254) A test system provided by AMD panicked with "madt_parse_apics: I/O APIC ID 255 too high". I/O APIC ID 255 is acceptable, so increase the limit. Reviewed by: jhb, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45157 (cherry picked from commit 4e3286818327453efd8e4c133928ba26a169567a) --- sys/x86/include/apicvar.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 10016e291b9b..ac6a82659e34 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -78,7 +78,12 @@ #define MAX_APIC_ID 0x800 #define APIC_ID_ALL 0xffffffff -#define IOAPIC_MAX_ID xAPIC_MAX_APIC_ID +/* + * The 0xff ID is used for broadcast IPIs for local APICs when not using + * x2APIC. IPIs are not sent to I/O APICs so it's acceptable for an I/O APIC + * to use that ID. + */ +#define IOAPIC_MAX_ID 0xff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) From nobody Wed May 15 18:47:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vfj070HJKz4B3WP; Wed, 15 May 2024 18:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vfj066y2Vz4sBg; Wed, 15 May 2024 18:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715798871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4261E4b4TXVBtkMQDsRUnf/cwKMaCFlF9s0ifuJUeBU=; b=Hro9jjv9v/kHqwBrULO8sfXJiOHCKMbBgPdXLWWDh9jU6BFqhW1CGyLm10Cx1uyl9+3wte n2c+taCu/zbx0gkqI1iUM19qzTzc99vsbLy0rtenvG7kM4EKK7Rfsh95klLejJOj7hGbXr iA/a7ZliVi9Z28yBx6ObvlM1FsDl9QHnHoa+/YXRQAtWVLzLHhfECdHgVNJ1bWyBHWWQQl 3gv0Rs2sOytjjL6zSkbn8VW59CNYVw953L6Te7ZkJBsSGPdVugEK9X+9hmrvwFVW8aWwts UmF9/tZrkqgwjPeaFQDdvGnET7+pZYDXadHmogOTbxXmoxG7cCKp05+PIVb/wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715798871; a=rsa-sha256; cv=none; b=f6GCuW+PjBzaec56h2jFxLiduTrPve7u3EyZngpV2VsApuXhbXkalozmPoGTUDwa0TUdYz lcVEEwrFn78IFUt8Mt4vtDOJBmuCrmFo6cnlkOH/WOdp0eyaRA06hF9z/hNBh7MT4V1hsn IZiLYit2XKOboy9yRjdYX9iUoYGCzaQtSVE0VtA4oi3YlA3bdyOu1S2Wt1+FAxqozj4jjl 95gkSdfFpOrMQpk8RRbjl5++4WnuvM85/9brpaamN07L/zQB8DTxz6QaoNggtAm0DWedPN 7zWkOWn7B84THMwcpRzeJYG7L5YbqyHSqhqv/ItjYuc3mYDH/Sm1CxYvqc3yJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715798871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4261E4b4TXVBtkMQDsRUnf/cwKMaCFlF9s0ifuJUeBU=; b=xKgTBcsRnj7JSQJh508RwARSulk/iTTqfsvZkQC2BJ+s1JFfJx4SVuWHM6Go9o8mQz7yRv iwf9ShZNuVgk69snC2NmVEB1an8wgpfyBEmEAinvOdID9aMiOmXHeAgNdmGIskg3JWwDrA 00vIljW6EroDmceyDPUhyt2jPEMhH69SdDkNqYKUDW2r/YVnzJPX8W7O2l/rWmUNaDgpoq /AwhAuiNYf/PuqAUgwYivX6zPaX5uRMbx31mtEQn3JaMIZ5MBwsHVPqyZw4Bo7Qo0E0CS3 SqBpa/YyuyraRXXZr7XDdtqItfYBOms0Avfah2ZGfr3Hy8KeTzkoC1ICJSMtuQ== 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 4Vfj066YXzzQvP; Wed, 15 May 2024 18:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FIloSZ043399; Wed, 15 May 2024 18:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FIlom2043397; Wed, 15 May 2024 18:47:50 GMT (envelope-from git) Date: Wed, 15 May 2024 18:47:50 GMT Message-Id: <202405151847.44FIlom2043397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0a09b741a794 - releng/14.1 - adduser: Additional variable fixes. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 0a09b741a7946c347310980d3f980044feda792b Auto-Submitted: auto-generated The branch releng/14.1 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0a09b741a7946c347310980d3f980044feda792b commit 0a09b741a7946c347310980d3f980044feda792b Author: Dag-Erling Smørgrav AuthorDate: 2024-05-15 12:13:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-15 18:47:24 +0000 adduser: Additional variable fixes. One function used `_input` without making it local, causing its value to leak into other functions. This broke the `-f` case. Fix that instance and initialize all local variables that weren't already initialized. Fixes: 170d0882903e MFC after: 3 days Reviewed by: karels Differential Revision: https://reviews.freebsd.org/D45204 (cherry picked from commit 46a619c6d4cfc662069950baca16ec2a3b18b8a5) (cherry picked from commit db5aefb1cae14e31263ddb146f5952ca64bf6865) Approved by: re (cperciva) --- usr.sbin/adduser/adduser.sh | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 61a4b3b5058f..7c3fdb418179 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -53,7 +53,7 @@ info() { # by pw(8). # get_nextuid () { - local _uid=$1 _nextuid + local _uid=$1 _nextuid= if [ -z "$_uid" ]; then _nextuid="$(${PWCMD} usernext | cut -f1 -d:)" @@ -101,7 +101,7 @@ show_usage() { # basename of the shell is output. # valid_shells() { - local _prefix + local _prefix= ${GREPCMD} '^[^#]' ${ETCSHELLS} | while read _path _junk ; do @@ -119,7 +119,7 @@ valid_shells() { # full path to the shell from the /etc/shells file. # fullpath_from_shell() { - local _shell=$1 _fullpath + local _shell=$1 _fullpath= if [ -z "$_shell" ]; then return @@ -154,7 +154,7 @@ fullpath_from_shell() { # will emit an informational message saying so. # shell_exists() { - local _sh="$1" + local _sh=$1 if [ -z "$(fullpath_from_shell "$_sh")" ] ; then err "Invalid shell ($_sh) for user $username." @@ -193,8 +193,9 @@ save_config() { # message or lock the account, do so. # add_user() { - local _uid _name _comment _gecos _home _group _grouplist _shell _class - local _dotdir _expire _pwexpire _passwd _upasswd _passwdmethod _pwcmd + local _uid= _name= _comment= _gecos= _home= _group= _grouplist= + local _shell= _class= _dotdir= _expire= _pwexpire= _passwd= _upasswd= + local _passwdmethod= _pwcmd= # Is this a configuration run? If so, don't modify user database. # @@ -299,7 +300,7 @@ add_user() { fi fi - local _line _owner _perms _file _dir + local _line= _owner= _perms= _file= _dir= if [ -n "$msgflag" ]; then if [ -r "$msgfile" ]; then # We're evaluating the contents of an external file. @@ -331,7 +332,7 @@ add_user() { # a file it will output an error message and return to the caller. # get_user() { - local _input + local _input= # No need to take down user names if this is a configuration saving run. [ -n "$configflag" ] && return @@ -366,7 +367,7 @@ get_user() { # and batch (from file) mode. # get_gecos() { - local _input + local _input= # No need to take down additional user information for a configuration run. [ -n "$configflag" ] && return @@ -386,7 +387,7 @@ get_gecos() { # If an invalid shell is entered it will simply use the default shell. # get_shell() { - local _input _fullpath + local _input= _fullpath= ushell="$defaultshell" # Make sure the current value of the shell is a valid one @@ -424,7 +425,7 @@ get_shell() { # and batch input. # get_homedir() { - _input= + local _input= if [ -z "$fflag" ]; then echo -n "Home directory [${homeprefix}/${username}]: " read _input @@ -450,7 +451,7 @@ get_homedir() { # Reads the account's home directory permissions. # get_homeperm() { - local _input _prompt + local _input= _prompt= uhomeperm=$defaultHomePerm if [ -n "$uhomeperm" ]; then @@ -473,7 +474,7 @@ get_homeperm() { # so, enable ZFS home dataset creation. # get_zfs_home() { - local _prefix + local _prefix= # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS @@ -494,7 +495,7 @@ get_zfs_home() { # allocates one if it is not specified. # get_uid() { - local _input _prompt + local _input= _prompt= uuid=${uidstart} if [ -n "$uuid" ]; then @@ -519,7 +520,7 @@ get_uid() { # Reads login class of account. Can be used in interactive or batch mode. # get_class() { - local _input _class + local _input= _class= uclass="$defaultclass" _class=${uclass:-"default"} @@ -541,7 +542,7 @@ get_class() { # will then provide a login group with the same name as the username. # get_logingroup() { - local _input + local _input= ulogingroup="$defaultLgroup" if [ -z "$fflag" ]; then @@ -560,7 +561,7 @@ get_logingroup() { # and batch modes. # get_groups() { - local _input _group + local _input= _group= ugroups="$defaultgroups" _group=${ulogingroup:-"${username}"} @@ -626,7 +627,7 @@ get_password() { # Ask user if they want to enable encryption on their ZFS home dataset. # get_zfs_encryption() { - local _input _prompt + local _input= _prompt= _prompt="Enable ZFS encryption? (yes/no) [${Zencrypt}]: " while : ; do echo -n "$_prompt" @@ -702,7 +703,7 @@ set_zfs_perms() { # adds it to the user database. # input_from_file() { - local _field + local _field= while read -r fileline ; do case "$fileline" in @@ -733,7 +734,7 @@ input_from_file() { # the user database. # input_interactive() { - local _disable _pass _passconfirm _input + local _disable= _pass= _passconfirm= _input= local _random="no" local _emptypass="no" local _usepass="yes" From nobody Thu May 16 00:58:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfsDS0kdLz5KB5F; Thu, 16 May 2024 00:59:04 +0000 (UTC) (envelope-from zlei@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfsDR5rTJz4SgB; Thu, 16 May 2024 00:59:03 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715821143; 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=TVD0Bu1cwnlj/Jc3E62kT9jP9QDJQYZoihJkLvI1Gck=; b=DVjIL0zuT6oXK0ktRGt4d8Bzk0rdhfYJ+2avXR5wHfQXhgkkXEd8AsjndfXbAACtA3/0/d xGjfzES0rxMo31E7g3XyO5wxzSUHU7KuCbVEtDG6+60civIhL6OkRVNvOKZSFefnYoXVrE yS0k58NykBibn3HYBQhpBxARDmy2ly8CQN5Hc3tqgwWdtcKvgiLzU/x5oCQdvFNlyABZ8X LW7sCAfbRS8eiN0lfCWkebKQb8K+eqPKdwoGfa1nrRVXHqW0iVmH6UsZ6KdoyV7h15q+gr lgs8T7HRUa3WUl5PqNKRy8ShVqb0quJClNQvST6dnxcsQrnbWcSNtl8+XVu+XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715821143; a=rsa-sha256; cv=none; b=Mli9u8wbXzFlLxBmHElll5wFAxV1B9ju0UIYx/SBWX5bgwAHnuI6Ry0vCwJKeJFrLLPCWQ /ezrGAM4ROgCNhOE5NZZkH0ENSpP+hhznURlLCc4n2AcYcvC/8aCczb7aZT2CPfpuswCsO Z6M7PFy22RGs6IFBbs0fqjyDlqy0SrnHspTt6eIk7ALGgVvQ6ZzSJfh28kBGKBaUD1zjsl /WCGOCYXgjdIriMg25TkxMHGm9EASSCWtLRG5jYuSkppNp6JTQfnGPs1PweTVQybhTtI/p SuH7h1gu1O0TTYc6UduqzjWqNtG1MiC3dLAGrwPT9I1RjnFnWyOPBt6yzILpGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715821143; 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=TVD0Bu1cwnlj/Jc3E62kT9jP9QDJQYZoihJkLvI1Gck=; b=nV3TnQ9sbn+KXUy9QxewD8+B3JBOQxt5pbhmp70HXcx1v7w1Urd5EFVx6iEPDVAEX7VoA3 DLfskE7W59OnM/Pl9ITT8bYZdEPBQxm13QbV/lW6Gb6gDN8U8Ci9j4chIPswzWlaSsk4ae T0Ri4xv+5nWEeC9b4M+ylI17v89X5pNiJMoquTwXiNjyuNVj9L80HVDejSCeqDsu9ShHRF fGtU6uTeqRlYEUmgWVJky9zFeb8GMxnfqzz96JvZK82TD8Bb289QfsjVo4Lg6CjwDPQ85+ Qb8cQi+FplHCPD2pYP37+cwARJ+fAVFeo/NtUQhutmFYBapQry1bvaE+4gH+QQ== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VfsDQ3X3MzT4h; Thu, 16 May 2024 00:59:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.8\)) Subject: Re: git: b827afb9e3a7 - releng/14.1 - Revert "intrng: switch from MAXCPU to mp_ncpus" From: Zhenlei Huang In-Reply-To: <202405151635.44FGZxAS021246@gitrepo.freebsd.org> Date: Thu, 16 May 2024 08:58:54 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <88AD738C-4E2C-430D-8AE1-D1C7A633B977@FreeBSD.org> References: <202405151635.44FGZxAS021246@gitrepo.freebsd.org> To: Mike Karels X-Mailer: Apple Mail (2.3696.120.41.1.8) > On May 16, 2024, at 12:35 AM, Mike Karels wrote: >=20 > The branch releng/14.1 has been updated by karels: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db827afb9e3a7aaaa2da7d101c46881c6= 46d4df2f >=20 > commit b827afb9e3a7aaaa2da7d101c46881c646d4df2f > Author: Mike Karels > AuthorDate: 2024-05-14 22:44:58 +0000 > Commit: Mike Karels > CommitDate: 2024-05-15 16:35:38 +0000 >=20 > Revert "intrng: switch from MAXCPU to mp_ncpus" >=20 > This reverts commit b4d11915c73f199501672b278be86e1f63790036. > This is a direct commit to stable/14. The change breaks booting > on older Raspberry Pi 4's, although that works on main. The cause Emm, I think this revert affects other arch also. Does this have large = impact ? If yes, and only older Paspberry Pi 4 is to be fixed, why not add conditional compile #if = directive for Paspberry Pi 4 instead ? For amd64 the MAXCPU has been bumped from 256 to 1024 [1]. That is large = IMO. 1. 9051987e40c5 amd64: Bump MAXCPU to 1024 (from 256) > is unknown. The original commit should be redone on stable/14 > if/when it catches up with main. >=20 > (cherry picked from commit = 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70) >=20 > Approved-by: re (cperciva) > --- > sys/kern/subr_intr.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) >=20 > diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c > index 49fe20cdc890..6535c42f2404 100644 > --- a/sys/kern/subr_intr.c > +++ b/sys/kern/subr_intr.c > @@ -175,11 +175,11 @@ intr_irq_init(void *dummy __unused) >=20 > /* > * - 2 counters for each I/O interrupt. > - * - mp_maxid + 1 counters for each IPI counters for SMP. > + * - MAXCPU counters for each IPI counters for SMP. > */ > nintrcnt =3D intr_nirq * 2; > #ifdef SMP > - nintrcnt +=3D INTR_IPI_COUNT * (mp_maxid + 1); > + nintrcnt +=3D INTR_IPI_COUNT * MAXCPU; > #endif >=20 > intrcnt =3D mallocarray(nintrcnt, sizeof(u_long), M_INTRNG, > @@ -312,18 +312,18 @@ intr_ipi_setup_counters(const char *name) > mtx_lock(&isrc_table_lock); >=20 > /* > - * We should never have a problem finding mp_maxid + 1 = contiguous > - * counters, in practice. Interrupts will be allocated = sequentially > - * during boot, so the array should fill from low to high index. = Once > - * reserved, the IPI counters will never be released. Similarly, = we > - * will not need to allocate more IPIs once the system is = running. > + * We should never have a problem finding MAXCPU contiguous = counters, > + * in practice. Interrupts will be allocated sequentially during = boot, > + * so the array should fill from low to high index. Once = reserved, the > + * IPI counters will never be released. Similarly, we will not = need to > + * allocate more IPIs once the system is running. > */ > - bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); > + bit_ffc_area(intrcnt_bitmap, nintrcnt, MAXCPU, &index); > if (index =3D=3D -1) > panic("Failed to allocate %d counters. Array = exhausted?", > - mp_maxid + 1); > - bit_nset(intrcnt_bitmap, index, index + mp_maxid); > - for (i =3D 0; i < mp_maxid + 1; i++) { > + MAXCPU); > + bit_nset(intrcnt_bitmap, index, index + MAXCPU - 1); > + for (i =3D 0; i < MAXCPU; i++) { > snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); > intrcnt_setname(str, index + i); > } Best regards, Zhenlei From nobody Thu May 16 01:23:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfsmH1R7tz5KDLd; Thu, 16 May 2024 01:23:11 +0000 (UTC) (envelope-from karels@freebsd.org) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.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 "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfsmG3Lwlz4WVM; Thu, 16 May 2024 01:23:10 +0000 (UTC) (envelope-from karels@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.18.1/8.18.1) with ESMTP id 44G1N8aG008209; Wed, 15 May 2024 20:23:08 -0500 (CDT) (envelope-from karels@freebsd.org) Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id 37eUNvxfRWYPIAAAs/W3XQ (envelope-from ); Wed, 15 May 2024 20:23:08 -0500 From: Mike Karels To: Zhenlei Huang Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: b827afb9e3a7 - releng/14.1 - Revert "intrng: switch from MAXCPU to mp_ncpus" Date: Wed, 15 May 2024 20:23:08 -0500 X-Mailer: MailMate (1.14r6028) Message-ID: <68191B25-A5CB-48CE-BD17-F5E7F95CF052@freebsd.org> In-Reply-To: <88AD738C-4E2C-430D-8AE1-D1C7A633B977@FreeBSD.org> References: <202405151635.44FGZxAS021246@gitrepo.freebsd.org> <88AD738C-4E2C-430D-8AE1-D1C7A633B977@FreeBSD.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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.16.0.0/14, country:US] X-Rspamd-Queue-Id: 4VfsmG3Lwlz4WVM On 15 May 2024, at 19:58, Zhenlei Huang wrote: >> On May 16, 2024, at 12:35 AM, Mike Karels wrote: >> >> The branch releng/14.1 has been updated by karels: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Db827afb9e3a7aaaa2da7d10= 1c46881c646d4df2f >> >> commit b827afb9e3a7aaaa2da7d101c46881c646d4df2f >> Author: Mike Karels >> AuthorDate: 2024-05-14 22:44:58 +0000 >> Commit: Mike Karels >> CommitDate: 2024-05-15 16:35:38 +0000 >> >> Revert "intrng: switch from MAXCPU to mp_ncpus" >> >> This reverts commit b4d11915c73f199501672b278be86e1f63790036. >> This is a direct commit to stable/14. The change breaks booting >> on older Raspberry Pi 4's, although that works on main. The cause > > Emm, I think this revert affects other arch also. Does this have large = impact ? If yes, and only > older Paspberry Pi 4 is to be fixed, why not add conditional compile #i= f directive for Paspberry Pi 4 > instead ? That won't help with installations. We use one GENERIC config for arm64.= On the other hand, arm64 has 32K counters for interrupts and only 1K for IPI= s (with this reverted and MAXCPU at 1024), so this isn't that big an increm= ent. arm has MAXCPU of 4; riscv has 16. This reversion makes the outcome the = same as on 14.0. > For amd64 the MAXCPU has been bumped from 256 to 1024 [1]. That is larg= e IMO. This change does not affect amd64 or i386, just systems with INTRNG (arm,= arm64, and riscv). So the change is only significant on arm64. Mike > 1. 9051987e40c5 amd64: Bump MAXCPU to 1024 (from 256) > >> is unknown. The original commit should be redone on stable/14 >> if/when it catches up with main. >> >> (cherry picked from commit 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70= ) >> >> Approved-by: re (cperciva) >> --- >> sys/kern/subr_intr.c | 22 +++++++++++----------- >> 1 file changed, 11 insertions(+), 11 deletions(-) >> >> diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c >> index 49fe20cdc890..6535c42f2404 100644 >> --- a/sys/kern/subr_intr.c >> +++ b/sys/kern/subr_intr.c >> @@ -175,11 +175,11 @@ intr_irq_init(void *dummy __unused) >> >> /* >> * - 2 counters for each I/O interrupt. >> - * - mp_maxid + 1 counters for each IPI counters for SMP. >> + * - MAXCPU counters for each IPI counters for SMP. >> */ >> nintrcnt =3D intr_nirq * 2; >> #ifdef SMP >> - nintrcnt +=3D INTR_IPI_COUNT * (mp_maxid + 1); >> + nintrcnt +=3D INTR_IPI_COUNT * MAXCPU; >> #endif >> >> intrcnt =3D mallocarray(nintrcnt, sizeof(u_long), M_INTRNG, >> @@ -312,18 +312,18 @@ intr_ipi_setup_counters(const char *name) >> mtx_lock(&isrc_table_lock); >> >> /* >> - * We should never have a problem finding mp_maxid + 1 contiguous >> - * counters, in practice. Interrupts will be allocated sequentially >> - * during boot, so the array should fill from low to high index. Onc= e >> - * reserved, the IPI counters will never be released. Similarly, we >> - * will not need to allocate more IPIs once the system is running. >> + * We should never have a problem finding MAXCPU contiguous counters= , >> + * in practice. Interrupts will be allocated sequentially during boo= t, >> + * so the array should fill from low to high index. Once reserved, t= he >> + * IPI counters will never be released. Similarly, we will not need = to >> + * allocate more IPIs once the system is running. >> */ >> - bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); >> + bit_ffc_area(intrcnt_bitmap, nintrcnt, MAXCPU, &index); >> if (index =3D=3D -1) >> panic("Failed to allocate %d counters. Array exhausted?", >> - mp_maxid + 1); >> - bit_nset(intrcnt_bitmap, index, index + mp_maxid); >> - for (i =3D 0; i < mp_maxid + 1; i++) { >> + MAXCPU); >> + bit_nset(intrcnt_bitmap, index, index + MAXCPU - 1); >> + for (i =3D 0; i < MAXCPU; i++) { >> snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); >> intrcnt_setname(str, index + i); >> } > > Best regards, > Zhenlei From nobody Thu May 16 01:56:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VftW45sFtz5KGMp; Thu, 16 May 2024 01:56:48 +0000 (UTC) (envelope-from zlei@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VftW45JgLz4ZXk; Thu, 16 May 2024 01:56:48 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715824608; 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: in-reply-to:in-reply-to:references:references; bh=dXmqhrT2DFKIOMAA3s9jmoVdE3tlFlfZhLw/OOF/FNc=; b=UdAo5xcyA2ZU73vRLtyfI+Lu7lB4tEPz1IlX9/zbM43tfd6mgZHRyWa6Vru2T8C7cmEnuh oJcaCKkpRXqBJlVxASwkoMmR9rvp8x4SoZshdizD7eteU5Nv5YQB9oh4hH8rCiLJhnWRPQ nMmF4HqXXuxEqWEwzPjrfnfCkSH2C4dQaygBj1HZIJe00DkfBGcbpBtk/ETletJ5eCA8Qy Me0t6c3GVo0cRNl3076efxTpyolNVZEoVnZIOcHVhpdDK2/B/+naVwu4nUP6V2dxqPZABe mNEgkxzIuoLlnyqj7cxF/YncdXTESPxod3xcHhkOxKJcsrmN1/KJ/OcOvP7dcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715824608; a=rsa-sha256; cv=none; b=DrZSfIzxFOFj/4TSjr2WVFLTTMaImrXhRaXZ4cAS1AIdhnO40FlWluQm+kHqz9PwxK1UEY AHCCfWDCGmMPXPCmdXk2s1YEnFlCMsNu7DAtkfDQxmcTlZWl4QLUTfMQ2KQPSR54oGYJO1 OQAOvv1a8OfbykbuK6PmcaATu+y8LU0dIgOdEcRemagKY8vWFIV8jOkkrjpMsxBHGLk9J+ viAW81rNSYwCFxq73blKC4wjgXqoEiavik/tuhJzimsfYYKvRAeb9uIC/03qHYSGZsbzfj Pf0bIMfXfAakTHMO1L+c8hDorM/d47dEbtdMogm6DlBc6tBhqYhtQK8WHe2+CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715824608; 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: in-reply-to:in-reply-to:references:references; bh=dXmqhrT2DFKIOMAA3s9jmoVdE3tlFlfZhLw/OOF/FNc=; b=EcmZK5vE+LWv3zjtn871r3oEG+Y/LLNilNl1NMYyLEF+xvgemT6aVNIgLiss+rGbHtQDdX AGmvre324mJIbK8dj1yhompVD99DN6H+GkfGaTF+T9vpBdKF6KakVwsmX4VHEdG8jTF8UL +A+jJyO5D0hnwnUotAqNa2bgT+aEiXUmHEoKor6R9+/FlI2jvaHoBpPDcC3x6tYQv/8Ip0 8QhOQ6HsLvuPY4tfc230WlwBlANZ8islvEs3PA3RloyaAFsezFEiyI69Umpc2d51+ikV4p ADOTOWn9SxF65eRv3P8lbh64wP957+5+0gBUBeujVxWRThJQVEJ5XrmyECPbyg== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VftW3103nzV8k; Thu, 16 May 2024 01:56:46 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <93753D00-CA46-4777-AB98-6C2A30906DB7@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_50E54440-1DA0-4055-88E2-92A7499DE7EE" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.8\)) Subject: Re: git: b827afb9e3a7 - releng/14.1 - Revert "intrng: switch from MAXCPU to mp_ncpus" Date: Thu, 16 May 2024 09:56:41 +0800 In-Reply-To: <68191B25-A5CB-48CE-BD17-F5E7F95CF052@freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" To: Mike Karels References: <202405151635.44FGZxAS021246@gitrepo.freebsd.org> <88AD738C-4E2C-430D-8AE1-D1C7A633B977@FreeBSD.org> <68191B25-A5CB-48CE-BD17-F5E7F95CF052@freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.8) --Apple-Mail=_50E54440-1DA0-4055-88E2-92A7499DE7EE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On May 16, 2024, at 9:23 AM, Mike Karels wrote: >=20 > On 15 May 2024, at 19:58, Zhenlei Huang wrote: >=20 >>> On May 16, 2024, at 12:35 AM, Mike Karels = wrote: >>>=20 >>> The branch releng/14.1 has been updated by karels: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db827afb9e3a7aaaa2da7d101c46881c6= 46d4df2f >>>=20 >>> commit b827afb9e3a7aaaa2da7d101c46881c646d4df2f >>> Author: Mike Karels >>> AuthorDate: 2024-05-14 22:44:58 +0000 >>> Commit: Mike Karels >>> CommitDate: 2024-05-15 16:35:38 +0000 >>>=20 >>> Revert "intrng: switch from MAXCPU to mp_ncpus" >>>=20 >>> This reverts commit b4d11915c73f199501672b278be86e1f63790036. >>> This is a direct commit to stable/14. The change breaks booting >>> on older Raspberry Pi 4's, although that works on main. The cause >>=20 >> Emm, I think this revert affects other arch also. Does this have = large impact ? If yes, and only >> older Paspberry Pi 4 is to be fixed, why not add conditional compile = #if directive for Paspberry Pi 4 >> instead ? >=20 > That won't help with installations. We use one GENERIC config for = arm64. On > the other hand, arm64 has 32K counters for interrupts and only 1K for = IPIs > (with this reverted and MAXCPU at 1024), so this isn't that big an = increment. > arm has MAXCPU of 4; riscv has 16. This reversion makes the outcome = the same > as on 14.0. Thanks for the explanation. >=20 >> For amd64 the MAXCPU has been bumped from 256 to 1024 [1]. That is = large IMO. >=20 > This change does not affect amd64 or i386, just systems with INTRNG = (arm, > arm64, and riscv). So the change is only significant on arm64. Sorry I was not aware that INTRNG is arm, arm64 and riscv only. >=20 > Mike >=20 >> 1. 9051987e40c5 amd64: Bump MAXCPU to 1024 (from 256) >>=20 >>> is unknown. The original commit should be redone on stable/14 >>> if/when it catches up with main. >>>=20 >>> (cherry picked from commit = 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70) >>>=20 >>> Approved-by: re (cperciva) >>> --- >>> sys/kern/subr_intr.c | 22 +++++++++++----------- >>> 1 file changed, 11 insertions(+), 11 deletions(-) >>>=20 >>> diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c >>> index 49fe20cdc890..6535c42f2404 100644 >>> --- a/sys/kern/subr_intr.c >>> +++ b/sys/kern/subr_intr.c >>> @@ -175,11 +175,11 @@ intr_irq_init(void *dummy __unused) >>>=20 >>> /* >>> * - 2 counters for each I/O interrupt. >>> - * - mp_maxid + 1 counters for each IPI counters for SMP. >>> + * - MAXCPU counters for each IPI counters for SMP. >>> */ >>> nintrcnt =3D intr_nirq * 2; >>> #ifdef SMP >>> - nintrcnt +=3D INTR_IPI_COUNT * (mp_maxid + 1); >>> + nintrcnt +=3D INTR_IPI_COUNT * MAXCPU; >>> #endif >>>=20 >>> intrcnt =3D mallocarray(nintrcnt, sizeof(u_long), M_INTRNG, >>> @@ -312,18 +312,18 @@ intr_ipi_setup_counters(const char *name) >>> mtx_lock(&isrc_table_lock); >>>=20 >>> /* >>> - * We should never have a problem finding mp_maxid + 1 = contiguous >>> - * counters, in practice. Interrupts will be allocated = sequentially >>> - * during boot, so the array should fill from low to high index. = Once >>> - * reserved, the IPI counters will never be released. Similarly, = we >>> - * will not need to allocate more IPIs once the system is = running. >>> + * We should never have a problem finding MAXCPU contiguous = counters, >>> + * in practice. Interrupts will be allocated sequentially during = boot, >>> + * so the array should fill from low to high index. Once = reserved, the >>> + * IPI counters will never be released. Similarly, we will not = need to >>> + * allocate more IPIs once the system is running. >>> */ >>> - bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); >>> + bit_ffc_area(intrcnt_bitmap, nintrcnt, MAXCPU, &index); >>> if (index =3D=3D -1) >>> panic("Failed to allocate %d counters. Array = exhausted?", >>> - mp_maxid + 1); >>> - bit_nset(intrcnt_bitmap, index, index + mp_maxid); >>> - for (i =3D 0; i < mp_maxid + 1; i++) { >>> + MAXCPU); >>> + bit_nset(intrcnt_bitmap, index, index + MAXCPU - 1); >>> + for (i =3D 0; i < MAXCPU; i++) { >>> snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); >>> intrcnt_setname(str, index + i); >>> } >>=20 >> Best regards, >> Zhenlei --Apple-Mail=_50E54440-1DA0-4055-88E2-92A7499DE7EE Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On May 16, 2024, at 9:23 AM, Mike Karels <karels@freebsd.org> = wrote:

On 15 May 2024, at 19:58, Zhenlei Huang wrote:

On May 16, 2024, at = 12:35 AM, Mike Karels <karels@FreeBSD.org> wrote:

The branch releng/14.1 has been updated by karels:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db827afb9e3a7aaaa2da7d= 101c46881c646d4df2f

commit = b827afb9e3a7aaaa2da7d101c46881c646d4df2f
Author: =     Mike Karels <karels@FreeBSD.org>
AuthorDate: = 2024-05-14 22:44:58 +0000
Commit: =     Mike Karels <karels@FreeBSD.org>
CommitDate: = 2024-05-15 16:35:38 +0000

  Revert = "intrng: switch from MAXCPU to mp_ncpus"

  This reverts commit = b4d11915c73f199501672b278be86e1f63790036.
  This = is a direct commit to stable/14.  The change breaks booting
  on older Raspberry Pi 4's, although that works on = main.  The cause

Emm, I = think this revert affects other arch also. Does this have large impact ? = If yes, and only
older Paspberry Pi 4 is to be fixed, why = not add conditional compile #if directive for Paspberry Pi 4
instead ?

That won't help with installations.  We use one GENERIC = config for arm64.  On
the other hand, arm64 has 32K counters for interrupts and = only 1K for IPIs
(with this reverted and MAXCPU at 1024), so this isn't that = big an increment.
arm has MAXCPU of 4; riscv has 16.  This reversion makes = the outcome the same
as on 14.0.

Thanks for the explanation.


For = amd64 the MAXCPU has been bumped from 256 to 1024 [1]. That is large = IMO.

This change does not affect amd64 or i386, just systems with = INTRNG (arm,
arm64, and = riscv).  So the change is only significant on arm64.

Sorry = I was not aware that INTRNG is arm, arm64 and riscv only.


= Mike

1. = 9051987e40c5 amd64: Bump MAXCPU to 1024 (from 256)

  is unknown. =  The original commit should be redone on stable/14
  if/when it catches up with main.

  (cherry picked from commit = 3e627553bbd791a4f73eaeea2c2d795fd4e0ee70)

  Approved-by:    re (cperciva)
---
sys/kern/subr_intr.c | 22 = +++++++++++-----------
1 file changed, 11 insertions(+), = 11 deletions(-)

diff --git = a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
index = 49fe20cdc890..6535c42f2404 100644
--- = a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -175,11 +175,11 @@ intr_irq_init(void *dummy __unused)

/*
 * - 2 counters for each I/O = interrupt.
-  * - mp_maxid + 1 counters = for each IPI counters for SMP.
+  * - MAXCPU counters for = each IPI counters for SMP.
 */
nintrcnt = =3D intr_nirq * 2;
#ifdef SMP
- nintrcnt = +=3D INTR_IPI_COUNT * (mp_maxid + 1);
+ nintrcnt = +=3D INTR_IPI_COUNT * MAXCPU;
#endif

= intrcnt =3D mallocarray(nintrcnt, sizeof(u_long), M_INTRNG,
@@ -312,18 +312,18 @@ intr_ipi_setup_counters(const char = *name)
mtx_lock(&isrc_table_lock);

= /*
-  * We should never have a = problem finding mp_maxid + 1 contiguous
-  * counters, in practice. = Interrupts will be allocated sequentially
-  * during boot, so the array = should fill from low to high index. Once
-  * reserved, the IPI = counters will never be released. Similarly, we
-  * will not need to allocate = more IPIs once the system is running.
+  * We should never have a = problem finding MAXCPU contiguous counters,
+  * in practice. Interrupts = will be allocated sequentially during boot,
+  * so the array should fill = from low to high index. Once reserved, the
+  * IPI counters will never = be released. Similarly, we will not need to
+  * allocate more IPIs once = the system is running.
 */
- = bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, = &index);
+ bit_ffc_area(intrcnt_bitmap, = nintrcnt, MAXCPU, &index);
if (index = =3D=3D -1)
panic("Failed to allocate %d = counters. Array exhausted?",
-     mp_maxid = + 1);
- bit_nset(intrcnt_bitmap, index, index + mp_maxid);
- = for (i =3D 0; i < mp_maxid + 1; i++) {
+     MAXCPU);+ = bit_nset(intrcnt_bitmap, index, index + MAXCPU - 1);
+ = for (i =3D 0; i < MAXCPU; i++) {
= snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name);
= = intrcnt_setname(str, index + i);
}

Best regards,
Zhenlei


= --Apple-Mail=_50E54440-1DA0-4055-88E2-92A7499DE7EE-- From nobody Thu May 16 05:59:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vfzty3TLRz5Kcjf; Thu, 16 May 2024 05:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vfzty2zq8z3xs2; Thu, 16 May 2024 05:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715839162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3U+ffBgdhtzS0Z/tenrQdxU/bTgr7tGyyyfOrUndZMc=; b=ucPP+M7aJrxCnkDFjeFaVBRpg2F+SMR6T6ai0Sxc9RF8NZUuETQl0NZ7C+nhCj1M10ki13 mZ/7hL9sOIpyCAbZD9+HhQfyVhLtZNpWFPiYVZT4HmCLa/t2AXnS0wvHJy+f3U+/VohWmL yuh99DhxnOO5mQDvX5M0prcApkzjbLCVstSXp9jlM98jh0tIkPqSBByXfa+q1gXRTj8KCF 3um+85gv7xP7BG9CZPgfhmB5Hd2Ev34kQKDhXejuwnWH/M1clq3vvntiFU2xmt4PAjiiNe q27EecxMUHkhXAKZcPlUjsWQZmHNRAKUGMoovd0UpCJxANzrRmJrqcD5TP5cZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715839162; a=rsa-sha256; cv=none; b=RaX5oavBW6+BQWb+P5KA73z1vbC2X46z11+5IxGX5pu7mDO2mmGjBLGT5mmHtpbldD11Zq 5EAhmaEZ3R7cfTcHm8XjXT0X+aDqyqPQMPglxLXjbBC1GWlcyZWI0uacmNSM/uUQYV2wR/ OtkUimlhXqTqYet1tnGudijKiU72Fqt3rCBaRWJfr6dfLjZEwM7a/RSbXggcll5G7Wn3IM JWo4s4FW3ZiiEXM+/mv/BUjvTPu1NJ6M/jaPjHcjeEf7PfeD0Vu4VmsCguT/p/c98+RMCT zSHRkB326tEcfCocaD+M5s17BZu8ERvWhfke8vbfaSUsF8ky/sBXKULD7SC7Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715839162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3U+ffBgdhtzS0Z/tenrQdxU/bTgr7tGyyyfOrUndZMc=; b=L4jsOO7Ywr6wfKhX0WGhMEK1FCdml5hfmr2roTkAzKOUkm/i83j3k1oHp0YCSwhmsxS6kz 4gzK9yV9Lf0rVVLsbDQLlmtG6n1l40Io48njNq45z67AytmYJg45VuZhfSnBc13KTw8pGQ VEzlLFTl+O/E4FlbGBhD46x5PD0jG/M5av5aqLX4jeD5TUKCbtJX5U1T5uIpsBN9METthm bDTSgglbssuzyCWI7K9TbOpkw+Oc36qCBG2dCchE2/EARyGt4Kt+Mf8F4lht3f3eSSAV3S Vvv8bjnqUaABmrZ1rbRu/S87xvmsQqXlsymyxrY3G2uZyF1A3DOUOdpjWVuizQ== 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 4Vfzty2b1Pzmjw; Thu, 16 May 2024 05:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44G5xMT9078799; Thu, 16 May 2024 05:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44G5xMpc078796; Thu, 16 May 2024 05:59:22 GMT (envelope-from git) Date: Thu, 16 May 2024 05:59:22 GMT Message-Id: <202405160559.44G5xMpc078796@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: 3e5219458fed - stable/14 - ipfw: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e5219458fed7c559ba157cca65a99e41e14aadc Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5219458fed7c559ba157cca65a99e41e14aadc commit 3e5219458fed7c559ba157cca65a99e41e14aadc Author: Gordon Bergling AuthorDate: 2024-05-12 08:53:40 +0000 Commit: Gordon Bergling CommitDate: 2024-05-16 05:59:09 +0000 ipfw: Fix a typo in a source code comment - s/defaul/default/ (cherry picked from commit 78e4dbc34559f7b18ea85cafd6663db4e6d54af9) --- sys/netinet/ip_fw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 2b59e46b5bcc..937dc8fbbbc2 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -979,7 +979,7 @@ typedef struct _ipfw_range_tlv { #define IPFW_RCFLAG_USER (IPFW_RCFLAG_RANGE | IPFW_RCFLAG_ALL | \ IPFW_RCFLAG_SET | IPFW_RCFLAG_DYNAMIC) /* Internally used flags */ -#define IPFW_RCFLAG_DEFAULT 0x0100 /* Do not skip defaul rule */ +#define IPFW_RCFLAG_DEFAULT 0x0100 /* Do not skip default rule */ typedef struct _ipfw_ta_tinfo { uint32_t flags; /* Format flags */ From nobody Thu May 16 05:59:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfzvH5Ytrz5Kcjl; Thu, 16 May 2024 05:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfzvH4z68z3yjS; Thu, 16 May 2024 05:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715839179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yWTkPxT/E0/92TAjsx0IbMM5LI4Q/BFq8V8BnCorF1g=; b=CfryqdHT43p+0C/oFWqzJMJo1+Ls08kTpClyYuzZinfNokb/mL4BEP1tmsfq2HkK+Vh4fp B/MNx8ROvvBS0gBSnsh9zuEk3X72hMI9tUD1KFmNXtVIOM5gG3hXBEAGmAyfKk7Sx2w6mw CWmnET5hozKg1/pqlHxG3kcELeQkudjCJDtYBEaOsj3zZ8U+bEYDhBzzAWyAz9c4F1GJ6p tOqXAHQ+BxFsyr6wwDv5Ys9vbdDC6iD2dNVbgjdOr4fG954LzFIrE9JbzU2t6wevQHGEU6 htwdjLlXfD/YYE3JPeDU+01dxSqcrKU5SFKycy84vq4xozJfwgVZgkQkbt+M+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715839179; a=rsa-sha256; cv=none; b=UQiSLsiOJrP/jcYWpk/Z/gZhyVGkhDbOzS9mBTZxRnuZtTS/TLLRzMAS2RtGnWT1uYUqTG Q65u+J+1QjYLecfbN3cTd9faidjW4CCwS3wJyGe1q5xu6V+Ec5sklUk4QKBrPX6M0bDkez X2RR8SvqljmgCGIsCDXvmMn5JSAXqqbJr4fxNQ8nyhrMrDMF1ewCIORW4Mp193czKyS54+ QhvgcPsGeAduS0kvXx37KrDo4zzayGB7nprJeycJCycz4cZIlyoMdCnsC/Yj65AshOIupD Powlh4u3n+JBF2UakmljsuJJFgzE21Zi8hr6osN4Ue92NWu42X6PzODyO7GaLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715839179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yWTkPxT/E0/92TAjsx0IbMM5LI4Q/BFq8V8BnCorF1g=; b=LOxDfz89ikYxRIO0x+guRmHIII8I9vyq8og8eFU1lLj9qvEX2T/Z5bzu41Uq1RElcOUsne I8xQNRcS8dQF5Il1nsNkuQBtZQQX48hnGXfz8ryuC/XDbH5DbbBn/ml03o/RL1L10PXX6U 9mbRPQv+SwftIytTuALVdI43YD24A0+p7wrBWjXUXbcCav6v+9NDyUrwV6BMDvldjA5XQ4 t4yXx0fzcy9Kh/mA1nTpHQ42Fdz43MWUFeDmragdSszks6HrVho4SLvBkrbKzlHzGx4KfS bLu4t80GR7JhGnGtxadZHWalYarwN7WeBiKskuIXfz+1X418tXmu1FApX43vcA== 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 4VfzvH4ZVvzmgQ; Thu, 16 May 2024 05:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44G5xdkc078971; Thu, 16 May 2024 05:59:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44G5xdSK078968; Thu, 16 May 2024 05:59:39 GMT (envelope-from git) Date: Thu, 16 May 2024 05:59:39 GMT Message-Id: <202405160559.44G5xdSK078968@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: 0e2681e4d79f - stable/13 - ipfw: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e2681e4d79fcdb93f899de82a5610f562fe9a09 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0e2681e4d79fcdb93f899de82a5610f562fe9a09 commit 0e2681e4d79fcdb93f899de82a5610f562fe9a09 Author: Gordon Bergling AuthorDate: 2024-05-12 08:53:40 +0000 Commit: Gordon Bergling CommitDate: 2024-05-16 05:59:28 +0000 ipfw: Fix a typo in a source code comment - s/defaul/default/ (cherry picked from commit 78e4dbc34559f7b18ea85cafd6663db4e6d54af9) --- sys/netinet/ip_fw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 332d6e2db0b8..ba2bb06b2416 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -972,7 +972,7 @@ typedef struct _ipfw_range_tlv { #define IPFW_RCFLAG_USER (IPFW_RCFLAG_RANGE | IPFW_RCFLAG_ALL | \ IPFW_RCFLAG_SET | IPFW_RCFLAG_DYNAMIC) /* Internally used flags */ -#define IPFW_RCFLAG_DEFAULT 0x0100 /* Do not skip defaul rule */ +#define IPFW_RCFLAG_DEFAULT 0x0100 /* Do not skip default rule */ typedef struct _ipfw_ta_tinfo { uint32_t flags; /* Format flags */ From nobody Thu May 16 05:59:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vfzvf4NJ8z5KcrC; Thu, 16 May 2024 05:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vfzvf3sG3z40DN; Thu, 16 May 2024 05:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715839198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbkMBbOwntnhKU48bHJvDYXvhNfAPkw0ie6K3oq2OZE=; b=TozvbYOJa0rKROLkslQE0iCN/dsY3Mfh/MIXzQ1BDeiHRq5TYAVIoU5oYSBkEghFBT7qEk jguftPzrbXqY3cWyuWAQMZGrYoMvkBoS2wTXJFFvAnDfh76Zl/+bisdzluegDXMvc/qH76 /kW8bqBF1iwEX8ijRPuMoBK1KlRBE+o6qsAET0qQvHvsnyCHvaBHZhgsuiEVunLgHJi9M4 f9iLQZQt1n3OQfV/7jRxtuabng8Asl0x2LDoHJB5MaG56+y+hTZSatCgi3dTGkMq95+mSO lnA9WNPLhKfyVi26NsvXC4TcXpls+1ML4Yi6SlLaCtKAD7NpDL6AfJPgECDx/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715839198; a=rsa-sha256; cv=none; b=XfB0cA8m6o64Rr4Mz9ILkFWWxBJXvWNe0eyTyoFHwop9nWscDbhbd5oBKvpe0ZcPTmiI67 7IcqefMXnEcb6KIatbX3iu5dvp9mXPvfE3hmvDEJoagBq4qAjKaAHX9Q2Ckx017tCA3Zos jzlCTVsITsEwZDzzccNwySJhMDibOZEbaL3otnw5yBFmxg4Q4pCZrZ14znGg1f2ptqp8U1 XybAP823IqvXHObKo7THKj3KU11O0PfP3sUlNq0k0prdHCH2IN70ROh2ZeSGF+WXWuSF2V HuV8luGsZlvQHATv/hutamt3bGiFvEnRjE/+NY7CPF0XYQ0cKXsnd+aehpZGRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715839198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbkMBbOwntnhKU48bHJvDYXvhNfAPkw0ie6K3oq2OZE=; b=wast22Ze3t+RuVaMMZ6wiaFnm4gKww3rTCYWY4Xpy0t01jmc+NimVR7G3hOjWYXsvfCcYs H6l+Qk1APpvE/kk0QhOR2Fg1qH0XVtx7oXo0Q7vFLpF1BwX1SNzCAv85hd7JxuEacsaqJH rCKf2vzNrCe2efOkN/b+hSQxSvbpCEp6rTEJwUPbK7QYHp3/Dis5mhoaTQbL5wCfEf6RLc +BaVA8gumRAX39ENEBKYg1mMmXL8fP8NsrE7WrQZRKX343W+jNHpOm7emwx5GIcrogllLD RjIIBg+snOIe9yQzJdwSP+4vlSU6qaMDgz7WCfa8Rh6Fnh2SZ8G6dlPp4DcQBA== 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 4Vfzvf3SkKzn7K; Thu, 16 May 2024 05:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44G5xwQs079162; Thu, 16 May 2024 05:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44G5xwJA079159; Thu, 16 May 2024 05:59:58 GMT (envelope-from git) Date: Thu, 16 May 2024 05:59:58 GMT Message-Id: <202405160559.44G5xwJA079159@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: 4b62662bcd67 - stable/12 - ipfw: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4b62662bcd672b97676da5812c1b6436805fcb69 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4b62662bcd672b97676da5812c1b6436805fcb69 commit 4b62662bcd672b97676da5812c1b6436805fcb69 Author: Gordon Bergling AuthorDate: 2024-05-12 08:53:40 +0000 Commit: Gordon Bergling CommitDate: 2024-05-16 05:59:48 +0000 ipfw: Fix a typo in a source code comment - s/defaul/default/ (cherry picked from commit 78e4dbc34559f7b18ea85cafd6663db4e6d54af9) --- sys/netinet/ip_fw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 8b6055e64a6d..151251032e3b 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -954,7 +954,7 @@ typedef struct _ipfw_range_tlv { #define IPFW_RCFLAG_USER (IPFW_RCFLAG_RANGE | IPFW_RCFLAG_ALL | \ IPFW_RCFLAG_SET | IPFW_RCFLAG_DYNAMIC) /* Internally used flags */ -#define IPFW_RCFLAG_DEFAULT 0x0100 /* Do not skip defaul rule */ +#define IPFW_RCFLAG_DEFAULT 0x0100 /* Do not skip default rule */ typedef struct _ipfw_ta_tinfo { uint32_t flags; /* Format flags */ From nobody Thu May 16 06:56:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vg18K1nsYz5KjVQ; Thu, 16 May 2024 06:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vg18K103tz4HS5; Thu, 16 May 2024 06:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715842561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fv2aU/BbmI+K3K9cOwOjSo1DPibzdHZt+fMQgQ7RGA4=; b=rh708xk6MADXbsUkoZDw07yyOG0VFUNNK2et5ZXFVbSQs5HLCYjXr8dHtDRC0IUL8A5mRH UxQACeiPJq1sVxuKARdEgpxcOYEvEXd4zKYilo/0NkeFUTx435SMl1f2VMBb9gzXMNmQ15 HBjpPxcggcY4uckCdMf6y9gw7eB1T8jv6AeWb9fmOeonS+PQdwB7QqA7knUqXzAyXm/QU7 pqDlLP6lZoIwebgxHKpto3NNCEuoCRGcIqO26dNOu7/nM1chJBteYg06Zpu0bMKAT6Izsi OpgaO60XZY66E1UJ0RH/u3DMyhkMjGMHJy03NzuDfXViRFmFbYaXeOoaFHpn7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715842561; a=rsa-sha256; cv=none; b=yXCbxyGdr6XRthfdNhPUOyjWTSIf9wrhxwwsyND5TcCOx89YmFbhYkWrVllYNg7JWnVhkZ XoPlEgwvlKoIHOVnClvAPiPn6FamB5+1X75mFPsxYMu2TwTtJEcIWG7Z4AJ1RZGrDaCIfQ aDqv0DszWFMjMoxRi/TQYdtPmTw6/u7q5zVbfqmRb2sTk0uAgRGSpuyjymAIx8FouVkCco FBNC4p5Jd6wwIWwtDpzOGzY94dYYCvEQvK7AC7tp5kobNAROPtAZtBIg3BBLxbVAl9qCbl GdzvJ/XW8JUrCOJepeOIELCLzpoMseFAy6K9Uh5GYzLLDNqxuDmsmiUwuL0AkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715842561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fv2aU/BbmI+K3K9cOwOjSo1DPibzdHZt+fMQgQ7RGA4=; b=VGR1s1UXcaFLUOt0W5QKZqBT2ZRn70XQ/v4jGc4FRBYScB/q4aymHOozzu00RgqhCGUqIH BP6NW/54vMWqGdvAzFq7eE6QZgoD9bUHxCtEL76iBZxP3dTOISNFiacB/q5XVoOdFp859l u1AeN6ann3UI9mQx+z9nHQLdEa2msGw8KXOktUEOV466nhS3NvFdgDM2k1hclVtDAzBx8j SApAKIdLC8AIgHqRqIWj75LwOsXuozbZ5/HRSGm5WS7kRSTRQ/PWHyhh0agYEvQbhDQ5zE e9YUMY4ysiDOWVkNNoTz88pRVkawT+gQ4YO0kVFCx19Zcl6k8X2cF6CRu/MJ2Q== 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 4Vg18K0SpXzpSY; Thu, 16 May 2024 06:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44G6u04k087135; Thu, 16 May 2024 06:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44G6u03n087132; Thu, 16 May 2024 06:56:00 GMT (envelope-from git) Date: Thu, 16 May 2024 06:56:00 GMT Message-Id: <202405160656.44G6u03n087132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 7465f9fc0646 - stable/14 - Enable soft updates by default for UFS2 filesystems. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7465f9fc06467e57d3bbf2430031fe51d8182c30 Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=7465f9fc06467e57d3bbf2430031fe51d8182c30 commit 7465f9fc06467e57d3bbf2430031fe51d8182c30 Author: Kirk McKusick AuthorDate: 2024-05-15 05:38:35 +0000 Commit: Kirk McKusick CommitDate: 2024-05-16 06:55:44 +0000 Enable soft updates by default for UFS2 filesystems. Differential Revision: https://reviews.freebsd.org/D45201 (cherry picked from commit 61dece6d27fb2436928ca93d65667b358e05aa7b) --- sbin/newfs/newfs.8 | 6 +++++- sbin/newfs/newfs.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index e1496af814ca..0dc93cb8b78d 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -27,7 +27,7 @@ .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\" -.Dd October 21, 2022 +.Dd May 18, 2024 .Dt NEWFS 8 .Os .Sh NAME @@ -100,6 +100,10 @@ The default format is UFS2. For backward compatibility. .It Fl U Enable soft updates on the new file system. +Soft updates are enabled by default for UFS2 format file systems. +Use +.Xr tunefs 8 +to disable soft updates if they are not wanted. .It Fl a Ar maxcontig Specify the maximum number of contiguous blocks that will be laid out before forcing a rotational delay. diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index afb71f9f25b4..c96e414b85dd 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -395,6 +395,9 @@ main(int argc, char *argv[]) fprintf(stderr, "because minfree is less than %d%%\n", MINFREE); opt = FS_OPTSPACE; } + /* Use soft updates by default for UFS2 and above */ + if (Oflag > 1) + Uflag = 1; realsectorsize = sectorsize; if (sectorsize != DEV_BSIZE) { /* XXX */ int secperblk = sectorsize / DEV_BSIZE; From nobody Thu May 16 10:05:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vg5LP1HbNz5L04F; Thu, 16 May 2024 10:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vg5LP0X6dz4ZVt; Thu, 16 May 2024 10:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715853901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKJPzTuKgLLkN/mwwbGj5M3MsmagG2jAVEfBHm5saeI=; b=JowxY4RaHlqo0qQh01/5lJej5KTGJ08LxBGhZgHRp7HgrUCLrVkdnZItcsl6ZCYPF12aOc uBfQBdHY0nkfrwKiEOqrpL6KJ5L7hZjacl+ppQe3uvbDkyH6LViRYN0Nfx4taOHzHsxnh9 KKnTPTqAIzwPQZMIpP/lLEo9npulNJUC293zH5QpDeLfO0UmSMJHtNsLbNH0GrkE+3MNYP LVEBcygOcGvVywLSHMAtgntS8E0AKqLXT8xce5cge/5YHEmsv7aR9/i1HanKPlOxFY2fEe iZeUF2CK+m5kyeIOgZigbIrjbawe0pFZNxhpd+u5HD/vrWbOmqoUNXSXZN/ifQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715853901; a=rsa-sha256; cv=none; b=UQ58h18ySYg6XzKnq7noYcgz8w3mt4EmdYecooaaPuylHj3/QOKSlMpvC1AUF34v9QlgCp 7cwpB3M/2LMUVOGQlmX8spGFwGDXynzKHy7j++VYzvC71cYLEcMZ6oEaKTHZPdrQ4vh2Ik WWH/MqxgBU0xUenF2tnysY3Hnu8RY2u9GBEUGyguYt3hJhGDAsRTnY5muwxws1yY5teTCm j8PCQfAtpjI2prZJhcrptYLe66196oATI0Yeumw6ZlQTKBRHrtztwMp/Xr62g1ooft4T4a DjNEmr16Ew8L1AkuRgmsMXgZIAceogTjI5ECwwrWLlRfys3w+o+266wVcj6Wsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715853901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKJPzTuKgLLkN/mwwbGj5M3MsmagG2jAVEfBHm5saeI=; b=i2Sh7ACzroseoNhtmvRAQ1GKYTjpt86Wh6gXYaLa1jvON1FzgXWw4LKtKalb/XBDsBGN6S 9vC8j4ttySzYlqPAl8nN4ZQEFMyDRYugJAtvh6AM69YfsM2OWB3ba3N/so9MI/NmNdLrHr icwzWqEdJUe2gniMCIxGz8PAv0mdyE8ogF7QW6tqLpM5b27FhMulMMDlZcVkRes5w7h/VF aZKLFK4TqQOCDvmDwjbZMopmIFmOtlTjbJuEHmS4J3xqznmGLoisc1IYILMH9bB+GxnXbd dY9zcdiq7Y9fi9hiuvECZ4FPClUM/rdQpEi+H+QyRHSMxpnQv2X7Ybn4OrViUg== 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 4Vg5LP07MCztjB; Thu, 16 May 2024 10:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GA50Zx009433; Thu, 16 May 2024 10:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GA50vE009430; Thu, 16 May 2024 10:05:00 GMT (envelope-from git) Date: Thu, 16 May 2024 10:05:00 GMT Message-Id: <202405161005.44GA50vE009430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b45d038b5f7c - releng/14.1 - expand: Fix markup for the `-t` option. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: b45d038b5f7c3d4c972d656e08fea91e9059687b Auto-Submitted: auto-generated The branch releng/14.1 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b45d038b5f7c3d4c972d656e08fea91e9059687b commit b45d038b5f7c3d4c972d656e08fea91e9059687b Author: Dag-Erling Smørgrav AuthorDate: 2024-05-13 10:41:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-16 10:04:05 +0000 expand: Fix markup for the `-t` option. PR: 274897 Fixes: 8993d785a261 MFC after: 3 days Reviewed by: gbe Differential Revision: https://reviews.freebsd.org/D45167 (cherry picked from commit f3eeeb959c9b00c89a2e1ff009c78162eb398656) (cherry picked from commit 0d230c89f5b39b06730bb43aa6e0cd0482dbd64a) Approved by: re (cperciva) --- usr.bin/expand/expand.1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1 index 9a49deb1a948..c1e19891b1ab 100644 --- a/usr.bin/expand/expand.1 +++ b/usr.bin/expand/expand.1 @@ -80,9 +80,15 @@ If the .Fl a option is given, then tabs are inserted whenever they would compress the resultant file by replacing two or more characters. -.It Fl t \&Sm Ar tab1 , tab2 , ... , tabn \&Sm +.It Fl t Xo +.Sm off +.Ar tab1 , tab2 , ... , tabn +.Sm on +.Xc Set tab stops at column positions +.Sm off .Ar tab1 , tab2 , ... , tabn . +.Sm on If only a single number is given, tab stops are set that number of column positions apart instead of the default number of 8. .El From nobody Thu May 16 12:02:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vg7xP41N4z5L83s; Thu, 16 May 2024 12:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vg7xP3WYDz4jwf; Thu, 16 May 2024 12:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715860921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwKLXk4Qh7j/K1Ipg5YZSy2FEiqvt6c58x8yWLbJFfY=; b=p7ldlJukMaLR1NGfEj4bB6fF1NTPsHmoAto89NxXk6UWQ/NzVF0NTEArKuFiLMCJC4l+61 AhO5pf006L2leK2/DPmQFFJLmFOpwJQPXGZh9r1B6cqP6ngaPDIXwwGCTnafgSIBvzlACk 8p4sGo3OxMXC1q6DTfpnnMzF2396929NFqtrYo1m5zBHpzzeW+Lv4dD7AZeVL7uP5Xs9X9 DDhxo7XkIRPSV1IZogpkMxnchNfkRm/H6T2Bcw5scCuR7SB35qTEObx2kVqHFFoiMKKi/M LiQu4jZI0cocfTzbNxzxg3B75tWb4G9IDL1FTq+7/NYkvXiyDsHySASIYcxQUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715860921; a=rsa-sha256; cv=none; b=dYl04LO++E/ARLTAKOkb1z1v01+k2UJt2Q6G3wlcD3lZkZa+IRzH3gspXNvAok1LQ2OxaY SAVh6CKEZ6fjODWQJkkRbs4RqFjQHS6XBuWvPJS9YGj4X6GxRRebLUXaPVFF/kukSkISXP K4iYXUSQhZnjhuZj91x1XFLCOa36pMLeklBUTJ7p+ZyOUwXdw45+2eizRUJTe/y+HnA57k i7GBmuzTI4h5xN2dzDHpohbq5MJCSWNtu8Wf1AD9CTAPE6KrCXfhxi+heHHYBYH940AW68 dTDJFHzDyePKtNOhS2OdGUgoykp3oc/8CfNg9e2Rpi19OjmvEpfeEUUd9FQRzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715860921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwKLXk4Qh7j/K1Ipg5YZSy2FEiqvt6c58x8yWLbJFfY=; b=m7NaCy/mB+O4ZxOuYpF59YaWITYnlohRNX2ISgeUiQpjqocgkNhRtkfUytVfTVBTFnBJW5 f4OrE+5te1z9PFAurcNyq9nTwuZ46xbsn3fA7beipVbEbrl2Q5U5D3yOL/iWHMLcZPLaXQ bYq5KKd7DTeDHomaPxksQLRFH3WpVlGiSll2yeZmmp/B5oyG/XuCJjzigEQkTBUhSo+6M0 GwynlqCiDquDDjYXci6T55XBMQEdT+Rpn7tjmXrOxQ+qp8QIDRZddLL0RdPy9fnHVaRPIx sUwUlnFjoHiw/F3dzuDlaFWLEye1bhWup/MPa7NWZQfS5oWC8XJ48p6jAxVJDw== 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 4Vg7xP36m3zxfp; Thu, 16 May 2024 12:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GC21Bp008553; Thu, 16 May 2024 12:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GC21Mn008550; Thu, 16 May 2024 12:02:01 GMT (envelope-from git) Date: Thu, 16 May 2024 12:02:01 GMT Message-Id: <202405161202.44GC21Mn008550@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: e73147fc7ca6 - stable/14 - pf: always mark states as unlinked before detaching them List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e73147fc7ca6632c7b2499c52f134c93fe664cc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e73147fc7ca6632c7b2499c52f134c93fe664cc6 commit e73147fc7ca6632c7b2499c52f134c93fe664cc6 Author: Kristof Provost AuthorDate: 2024-05-06 07:43:49 +0000 Commit: Kristof Provost CommitDate: 2024-05-16 07:41:02 +0000 pf: always mark states as unlinked before detaching them Users have reported crashes in pf_test_state_udp() where at least one state key is NULL. That suggests that pf_detach_state() ran concurrently with pf_test_state_udp(). pf_test_state_udp() holds the state lock (aka the id lock), but pf_detach_state() does not. The intent is that detached states are not returned by STATE_LOOKUP/ pf_find_state(), as the state's timeout is set to PFTM_UNLINKED and thus pf_find_state() does not find the state. There are other paths to pf_detach_state() (outside of pf_unlink_state()) though, where we did not set the timeout to PFTM_UNLINKED. Fix those, and assert that the timeout is set correctly when we enter pf_detach_state(). MFC after: 1 week See also: https://redmine.pfsense.org/issues/15413 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D45101 (cherry picked from commit 301ec2cebb6a3e472af39eb7b98c3b7ff88e04b0) --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5fc234c5aca9..6874dd59c1f7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1325,6 +1325,7 @@ keyattach: sk : NULL); printf("\n"); } + s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); KEYS_UNLOCK(); uma_zfree(V_pf_state_key_z, sk); @@ -1392,6 +1393,8 @@ pf_detach_state(struct pf_kstate *s) struct pf_state_key *sks = s->key[PF_SK_STACK]; struct pf_keyhash *kh; + MPASS(s->timeout >= PFTM_MAX); + pf_sctp_multihome_detach_addr(s); if (sks != NULL) { @@ -1517,6 +1520,7 @@ pf_state_insert(struct pfi_kkif *kif, struct pfi_kkif *orig_kif, break; if (cur != NULL) { + s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: state ID collision: " From nobody Thu May 16 12:02:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vg7yB2XLVz5L8Jb; Thu, 16 May 2024 12:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vg7yB1ltTz4kQm; Thu, 16 May 2024 12:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715860962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=keywcwpjL4kZjUsDQFYE9SACiPcEne8PvGlM4skA6w4=; b=E5cJQfwvrTBV2MmRwZzT3SeBPy6imMxVGHpOZI6JIAspCpiClVMBZb/yVCFkBHzh7AhU+p lb4QVwLXwV6EGaTnO5/mvtaLEsjy5Ifpn/yEXCAj3sZys5NCXsCfyt3jeqYa33gx5pZsOH ha0e4ijmUNEKTY58V+98IKyqOwRHmzGMk17b+H5uKoAEkn5URW7HtBOzO60nmA0ATF1Xhd Qfj3Ljb7sgAwmMLo4diD/T90At7rFRcNtC9S26gm/RgnGSD3FaC1Rk155gjR66Zu6AMz87 cQsBCtQsWSlNgpRlTkmpFPOSoOxyptB3IBGSGaR7XuBFvSM1uzdJggUPjXF2vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715860962; a=rsa-sha256; cv=none; b=K2JBzB+NFH64umi800Ku2eVJ1vSAEbtAoeliop0seBiAk0TLiEnoQ3x5u+YVODoSWepgeB A7eXXUeMoaqTIxJiskU0P1AVcOra789BBiG6R31ioBDucQdmMyLbqtu/hKKckIdm+0BLKA Kuc8CJusDDop51W6ve2DvDRcBeWrr0uA/n5ZwaNCXTM8sbIjshL9uDrZl9Hyvrnab2/sOg 31odiRGLLcron5GRoFQ2o/mnXOHiR/o2cm0LGsLNc1cBL2uh52D9DFvHKqBuVz6jETQjpe BtkzBAgmTDwGl2JSQIer8Py+O7c0tSa/qNdwaiMClMHCz59FwGzd9VV+jhvjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715860962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=keywcwpjL4kZjUsDQFYE9SACiPcEne8PvGlM4skA6w4=; b=fvTC25FkwsrK/W8O0VffrLTPslqlEE4Pi896oy5BCyq2L7L0W9x5uwswB4iyXuR/o9s7DW jWcg5Uh13vD+CMScWrR3x/I9zm5eg+q+Uw7p0KhULNEILRS5Gd8IcCfny+GREkLjgP4QP0 2oiQXermnxiDt9sUus5AX0hAy0seNj5YZwYajZuUeOnhi9n1CFqvtBGFSeeNdHMFZcUqWz PWW+W3vr49+GgIeTCcqKOkWJU+jxmbFBzYsBdsYE18qFElA9tnxoQd+jsZAiIvlhQyZOLj lVGemw2dVbLKf8Tc/DUHSNBoykg9fqQTgZE/dwXu2puMtsbjPK1lvd2yZybxEQ== 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 4Vg7yB1LM0zyKN; Thu, 16 May 2024 12:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GC2gQ8011971; Thu, 16 May 2024 12:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GC2gxw011968; Thu, 16 May 2024 12:02:42 GMT (envelope-from git) Date: Thu, 16 May 2024 12:02:42 GMT Message-Id: <202405161202.44GC2gxw011968@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: b9f6b6685558 - stable/13 - pf: always mark states as unlinked before detaching them List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9f6b668555849a8d6d322b803264404d65615cd Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f6b668555849a8d6d322b803264404d65615cd commit b9f6b668555849a8d6d322b803264404d65615cd Author: Kristof Provost AuthorDate: 2024-05-06 07:43:49 +0000 Commit: Kristof Provost CommitDate: 2024-05-16 07:40:35 +0000 pf: always mark states as unlinked before detaching them Users have reported crashes in pf_test_state_udp() where at least one state key is NULL. That suggests that pf_detach_state() ran concurrently with pf_test_state_udp(). pf_test_state_udp() holds the state lock (aka the id lock), but pf_detach_state() does not. The intent is that detached states are not returned by STATE_LOOKUP/ pf_find_state(), as the state's timeout is set to PFTM_UNLINKED and thus pf_find_state() does not find the state. There are other paths to pf_detach_state() (outside of pf_unlink_state()) though, where we did not set the timeout to PFTM_UNLINKED. Fix those, and assert that the timeout is set correctly when we enter pf_detach_state(). MFC after: 1 week See also: https://redmine.pfsense.org/issues/15413 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D45101 (cherry picked from commit 301ec2cebb6a3e472af39eb7b98c3b7ff88e04b0) --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1fd5803117bd..2c171514e946 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1283,6 +1283,7 @@ keyattach: sk : NULL); printf("\n"); } + s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); KEYS_UNLOCK(); uma_zfree(V_pf_state_key_z, sk); @@ -1350,6 +1351,8 @@ pf_detach_state(struct pf_kstate *s) struct pf_state_key *sks = s->key[PF_SK_STACK]; struct pf_keyhash *kh; + MPASS(s->timeout >= PFTM_MAX); + pf_sctp_multihome_detach_addr(s); if (sks != NULL) { @@ -1478,6 +1481,7 @@ pf_state_insert(struct pfi_kkif *kif, struct pfi_kkif *orig_kif, break; if (cur != NULL) { + s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: state ID collision: " From nobody Thu May 16 12:23:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vg8Q16Hy5z5LBDr; Thu, 16 May 2024 12:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vg8Q13cVXz4nhs; Thu, 16 May 2024 12:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715862201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ra2rEUx5MJaSjehOu/i3MoenriLvqBP2EmLnZ0oI230=; b=SMkZxzjFUyw8999RxEtGsu2IaR2J/Ng323sV3i8a97Y3N3IkHZP7xYBdfVmmcvp1wQbMFP F+To2oqw713Tzcwh0Zto1Crh7jPwn9CCltOaovphOTKxeWIfscBoKaI2NR8i6LGmwxWqTo VYI5O/DW74WmMyS3UgFNP4ERcrqqCdMxFwFILeR3dOn+wD0EHP1+Pg0X9t2pR3ThDdb835 wyupBfBRd0AtfWwxSqGkNd7bihaDhVVqfLv7EEW+6+9vmYI/Hzjtk9Kkozsu06UMLjYcCe KxnZ/zSknvyVQU626IhlqE5+oBE5ZeCs5RbbapBmIdREYwaugSP0zfx7UGEZOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715862201; a=rsa-sha256; cv=none; b=G4HUJkbdtD7mvVYAm/X2apTrbcQ/u6T0tdMMasUIlPxK86f9BAkuRASuLbyTPVDPuZ/a/8 ZshbV0yGelGG+dRoY58BJDddHddq1fpuq5NEd+jsCyzD1tjLguRIFQ8Ux41hAmovEeQWe/ LxPNvWWee+G9s/Opkv4xTCfvloQLnqmYE1mwIW8013AMHL+Mvn88P0PM2TYsZ91Zp6waK1 HR8ARp0peFZFCJeHOwluMVbetgRruTIru/NSkv9BK6hWwWXzXmlwpzLnl4u8NNa7t/ESdw 288LciCUwUTPh8iM04xOQ8OnJv3yLZ/3X54OSEXRXgLec2yhsT+Ds5iStsc9ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715862201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ra2rEUx5MJaSjehOu/i3MoenriLvqBP2EmLnZ0oI230=; b=yjxGlvE0WKf2sVtsOpBMye6KprM6tqkOlI6icca+zV68Nk28PKeSHyTz7bF9dBPYZ1QVyS O3crVWYLEb14uGwLXoh7CuZhtKDflc1qQzI+qB1EbGJSC3DDL48f2rWW8J9ldDWJ3N671g dtgUTEX8qFujHkYdYiFFYjjbZzofpdLfjqwB8OWGU+6yJmjvxDmWz4ZG+5LPHRwabfHR08 oiA09ugHKjD9herXtslr2e7RML2x9GkKmH+KqugxR2l7wJttMmmmYHYjBVZunrK+CwNVVI bQLPtmUEYmb2Y/Zm0/P93fFGB4W/baLuHbseuhPA9swmQOJoHySIfRUhaA2l2A== 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 4Vg8Q13CgVzyMD; Thu, 16 May 2024 12:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GCNLNs045159; Thu, 16 May 2024 12:23:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GCNL05045156; Thu, 16 May 2024 12:23:21 GMT (envelope-from git) Date: Thu, 16 May 2024 12:23:21 GMT Message-Id: <202405161223.44GCNL05045156@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: 147c7e4dde23 - releng/14.1 - Increase IOAPIC_MAX_ID to 255 (from 254) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 147c7e4dde23b3b787b4fb8b754f043f64ab7adb Auto-Submitted: auto-generated The branch releng/14.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=147c7e4dde23b3b787b4fb8b754f043f64ab7adb commit 147c7e4dde23b3b787b4fb8b754f043f64ab7adb Author: Ed Maste AuthorDate: 2024-05-10 17:40:59 +0000 Commit: Ed Maste CommitDate: 2024-05-16 12:23:05 +0000 Increase IOAPIC_MAX_ID to 255 (from 254) A test system provided by AMD panicked with "madt_parse_apics: I/O APIC ID 255 too high". I/O APIC ID 255 is acceptable, so increase the limit. Reviewed by: jhb, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45157 (cherry picked from commit 4e3286818327453efd8e4c133928ba26a169567a) (cherry picked from commit 18119e711f1c844bd6eacf5afc8d4cdec3ac8085) Approved by: re (cperciva) --- sys/x86/include/apicvar.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 10016e291b9b..ac6a82659e34 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -78,7 +78,12 @@ #define MAX_APIC_ID 0x800 #define APIC_ID_ALL 0xffffffff -#define IOAPIC_MAX_ID xAPIC_MAX_APIC_ID +/* + * The 0xff ID is used for broadcast IPIs for local APICs when not using + * x2APIC. IPIs are not sent to I/O APICs so it's acceptable for an I/O APIC + * to use that ID. + */ +#define IOAPIC_MAX_ID 0xff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) From nobody Thu May 16 17:25:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgH6S0ns9z5LZts; Thu, 16 May 2024 17:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgH6S0D64z4QFf; Thu, 16 May 2024 17:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715880320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWbV0UcM6mBBrMqJs4uEviuQoOkC0WvurOvoDz+gpK8=; b=R7h4OM16Yjg5T6EpBWwf4NTSV4QIPGmafkS6jRbIlrwZYYIaFS+N3o6A0qE6gDXOOYlUSQ TYe7sKMT3E0m1xzkOpE0kvqjeUveLxvIE9My4bArdjpJ3USOsEFHUi3DfYcl3DFZGBUP6Z kTpEN2WyWJ3nYOrKxIB0xJXV7AdhgHlw3HicPZLYWYIqI6bkP+A7+JHf0WelOo5qw7VJbF +gnmJcSXBpl7350c8Afid7B/72BS3h5L9xINDf4GY+Sj17J16/LopHpjVSsIurKXuiKvj8 AEhGCq/d0JxMHCdBzzYxph6OnVAcC8OXgfAeBjnP9VduAGoE6xpDUWCuj2Ix3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715880320; a=rsa-sha256; cv=none; b=Oie03dEcgNpn2XkLMBM5oYisKUrzGLMShrKSoAaMx0zie48KvciFZQ3Fb/dCFBH+Qxbnb9 tumdpyjw9FDEavhJ0AJHCaUJtWn0nfx/bIMHbS188MCqxURUdaRg//pLelAiPkhLEXQxvu KGO/0kw0N+63WS7xIh6qy7Cc2XDqw69CcU1lw1hvzHo4rr48q+7n7zpxAUJ/ujDakG331X Dlw3RnJM8vZGtVzv5KAYtJ3qZdaxjw/vH26iNd6IuxD3wF+S17BRETYgDAQWNXVHhLL9lr 7yN2W2nEJEanSk/9Y79882RLkqa/L4ApN+3V9Vh6/33Jm+5k1XqEohxBZYCmYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715880320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWbV0UcM6mBBrMqJs4uEviuQoOkC0WvurOvoDz+gpK8=; b=Mp8NAOm0WGSSmh0rDCeAcC0ZWEDkcqicV3sgR9bXj83yFkB7mMSMil2EeUib0/dBJ7lyeE uKymwh1M2OjNDuMJKQw4I9/rrnm8gagSfWjcVgCYzwAwMrcOCy5QIKTJUjNwWeuGVPRp1E /pLqeK1D67Bv3CTRaeVY+iDmpymQ5MOVwKf43XywIUL3HvLN2YK19pvNYB/5G/Ee9HG5rw /jMl8is5fwolcbSPR0i+fKbACuL/hN0trngJrTuUr7ksYewaQPHYn0enT0BL6MHV3gNTz4 u7kU+EQ/Ermlj5lrrCb4cgsWb/Vrjo3TAnoPB2e1EClI34kreROyEleSBlQdUw== 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 4VgH6R6xGVz17Jt; Thu, 16 May 2024 17:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GHPJIs053329; Thu, 16 May 2024 17:25:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GHPJQP053326; Thu, 16 May 2024 17:25:19 GMT (envelope-from git) Date: Thu, 16 May 2024 17:25:19 GMT Message-Id: <202405161725.44GHPJQP053326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 8930e7d8ea4d - releng/14.1 - save-entropy: Add manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 8930e7d8ea4dc0ec34c6d2f7db5a7c7746997b8f Auto-Submitted: auto-generated The branch releng/14.1 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8930e7d8ea4dc0ec34c6d2f7db5a7c7746997b8f commit 8930e7d8ea4dc0ec34c6d2f7db5a7c7746997b8f Author: Fernando Apesteguía AuthorDate: 2023-09-07 08:28:43 +0000 Commit: Mitchell Horne CommitDate: 2024-05-16 17:24:30 +0000 save-entropy: Add manual page Succinct manual page for save-entropy(8). PR: 223998 Reported by: AJ Jordan Reviewed by: carlavilla@, delphij@, lwhsu@, pauamma_gundo.com Approved by: delphi, lwhsu (src) Differential Revision: https://reviews.freebsd.org/D41768 (cherry picked from commit 8dc9b10e388da19d63b3dd718a8243e8e969091d) (cherry picked from commit 227f81c8bd0f60176519276839b24b468afce0bc) Approved by: re (cperciva) --- libexec/save-entropy/Makefile | 1 + libexec/save-entropy/save-entropy.8 | 97 +++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile index 1c7eabf36c7f..0c541606411f 100644 --- a/libexec/save-entropy/Makefile +++ b/libexec/save-entropy/Makefile @@ -1,4 +1,5 @@ SCRIPTS= save-entropy.sh +MAN= save-entropy.8 .include diff --git a/libexec/save-entropy/save-entropy.8 b/libexec/save-entropy/save-entropy.8 new file mode 100644 index 000000000000..f7a93c8866fc --- /dev/null +++ b/libexec/save-entropy/save-entropy.8 @@ -0,0 +1,97 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Fernando Apesteguia +.\" +.\" 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. +.\" +.Dd September 18, 2023 +.Dt SAVE-ENTROPY 8 +.Os +.Sh NAME +.Nm save-entropy +.Nd Save bits of entropy to feed /dev/random at startup +.Sh SYNOPSIS +.Nm save-entropy +.Sh DESCRIPTION +The +.Nm +command is used to save entropy data from +.Pa /dev/random +to files in a specified output location. +The files saved are used at startup to provide additional entropy for +.Pa /dev/random . +The output file will be different in every invocation until the maximum number +of different files is reached. +(See +.Em entropy_save_num +for details). +By default this script is invoked via +.Xr cron 8 +every eleven minutes approximately. +.Pp +This command does nothing if executed inside a +.Xr jail 8 . +.Pp +Three variables in +.Pa /etc/rc.conf +regulate the behavior of the script: +.Bl -tag -width Ds +.It Va entropy_dir +Specify the directory for saved entropy files. +Defaults to +.Pa /var/db/entropy . +If set to "NO" it disables caching entropy via +.Xr cron 8 . +This setting is shared with +.Pa /etc/rc.d/random . +.It Va entropy_save_sz +Size of the entropy cache files. +Defaults to 4096. +.It Va entropy_save_num +Number of entropy cache files to save. +Defaults to 8. +.El +.Sh FILES +.Bl -tag -width Ds +.It Pa /etc/rc.conf +.El +.Sh EXIT STATUS +.Ex -std +Errors will be recorded in the system log. +.Sh SEE ALSO +.Xr syslog 3 , +.Xr random 4 , +.Xr rc.conf 5 , +.Xr cron 8 +.Sh HISTORY +The +.Nm +command first appeared in +.Fx 5.0 . +.Sh AUTHORS +The +.Nm +command was originally written by +.An Doug Barton . +This manual page was written by +.An Fernando Apesteguia . From nobody Thu May 16 23:44:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgRX669Ttz5KRp6; Thu, 16 May 2024 23:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgRX65ch7z4CMb; Thu, 16 May 2024 23:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715903078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K5cd+hjWwOM4lIsRCJn9ZqDB9rvFM/37tQp8+b4fK34=; b=hkeGAH/XiDMkJRgsFH2+Dz9GhDO4cU/cW4l4I0dmcHfC4CROyWOagXVAcD6P8xkIZ99Kmd mQzT/O4P1RSGa9PzgA27D3sPlCuVnrBEScuqXlmspJ1rzr8m2Q9uFzgLp4bDNdQ5xP8rKZ 7I3T13rIZC9YhJLXLkPdtMcN6DvlwXF9iYiaG5Z2FL8oxOIPy8Rk44JfNqzxnW0FtRSz7V /JS3vDBON1SONVezoOe4yRwXAVkxLYRU2wbrVrmA5mhUT0EgEEs3oBK3b7RmagkOinyxQq NJk1ZGEUvxRPT3NOcIM5esmtWGpK+8/k3IS/aW0pthyHfE/Y+vdbWjZBgs7wbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715903078; a=rsa-sha256; cv=none; b=Rs3ETyUT1b+LOrlgXTzVAh9/2hDcFgD8wY4PuIdOFbHSn0+zNtQIW3qeaB4WT+IutX9Gzr 8QHQlMyGkWMMQDCJrMgDButsvKM+NxBnANQ9ZKjYNdoMWNwOlvEbIfjQrX+k//C/2RW/qQ kO2fy+Mc/gs5q8G0YDQdL4Nm9k7hL3MACHZszhvGWS8sqj8HP0o5/u74iMwtCByGQgoye9 44gHfpiELWSXBS6vrx5APzLv0tbVSe3JfwJnQg5hGsKajwRLPuOc/DQAnqenpT6C8o1PNa Bq01UWA7f6Ek90oI3ijJZzYZGuWoCKkInrf5X1s1e9s1QJE7l8Tw12JPpT99XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715903078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K5cd+hjWwOM4lIsRCJn9ZqDB9rvFM/37tQp8+b4fK34=; b=xm9G8wl+idi2hnabGlH5mdOBj2BCbWyqk+aWYXjaOhMCnRZ82D2dDwfGJ17iuuxemP/j/K 3+NpaIbFdjH3Fghm6L6N+wjrfGlwgGaK5+N4WG1bObtugtNj3/u30QPY3ENm0CS0dxe2v3 MlaYH4r+JM12ZH6JS3/tPhc371TRCdb/aiK32Sgk16QEOxC5ksFQijmd6tyQtjqIkhtvEe 3bm1R/AKUsl7nYEI0jmI1MrybgHNzV/FROG493rEwIEElKAPmC+izNOd8Ufejy7ZsOwp+s /JiLctCrIUuI0UphDHYYHD07xBqBEhElEesDxIdcff0OisFTi4GTHhx6w/I+/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 4VgRX65CQSzJrF; Thu, 16 May 2024 23:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GNicq0094379; Thu, 16 May 2024 23:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GNic9B094376; Thu, 16 May 2024 23:44:38 GMT (envelope-from git) Date: Thu, 16 May 2024 23:44:38 GMT Message-Id: <202405162344.44GNic9B094376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 6b2af2d88ffd - releng/14.1 - Enable soft updates by default for UFS2 filesystems. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 6b2af2d88ffdcae1f50c6e821ce83eb5f5f97fef Auto-Submitted: auto-generated The branch releng/14.1 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2af2d88ffdcae1f50c6e821ce83eb5f5f97fef commit 6b2af2d88ffdcae1f50c6e821ce83eb5f5f97fef Author: Kirk McKusick AuthorDate: 2024-05-15 05:38:35 +0000 Commit: Kirk McKusick CommitDate: 2024-05-16 23:43:01 +0000 Enable soft updates by default for UFS2 filesystems. Differential Revision: https://reviews.freebsd.org/D45201 (cherry picked from commit 61dece6d27fb2436928ca93d65667b358e05aa7b) (cherry picked from commit 7465f9fc06467e57d3bbf2430031fe51d8182c30) Approved by: re (Colin Percival) --- sbin/newfs/newfs.8 | 6 +++++- sbin/newfs/newfs.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index e1496af814ca..0dc93cb8b78d 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -27,7 +27,7 @@ .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\" -.Dd October 21, 2022 +.Dd May 18, 2024 .Dt NEWFS 8 .Os .Sh NAME @@ -100,6 +100,10 @@ The default format is UFS2. For backward compatibility. .It Fl U Enable soft updates on the new file system. +Soft updates are enabled by default for UFS2 format file systems. +Use +.Xr tunefs 8 +to disable soft updates if they are not wanted. .It Fl a Ar maxcontig Specify the maximum number of contiguous blocks that will be laid out before forcing a rotational delay. diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index afb71f9f25b4..c96e414b85dd 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -395,6 +395,9 @@ main(int argc, char *argv[]) fprintf(stderr, "because minfree is less than %d%%\n", MINFREE); opt = FS_OPTSPACE; } + /* Use soft updates by default for UFS2 and above */ + if (Oflag > 1) + Uflag = 1; realsectorsize = sectorsize; if (sectorsize != DEV_BSIZE) { /* XXX */ int secperblk = sectorsize / DEV_BSIZE; From nobody Fri May 17 04:07:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgYMW4Hwcz5KqYc; Fri, 17 May 2024 04:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgYMW3kNJz4WCh; Fri, 17 May 2024 04:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715918855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNLBu2/rmK2cUP3PVhXM/3U+3lnDIvE7G3oJ9eNi2qU=; b=E+unBzIi1MyKUtnx5MbT//kFQqQQ2ldOVjKL9IknLJ6M+rEq4i3CLV/HDn+KbIWwiAmyHW OdPV3DATbU+h6rHMOnYxo3FrOSWeBgBFSdrrwWjYyHK467y4nwsyvo+m0gw3gWaCdAgTXu vLl6xfS/WreG7Meb7F/hA9RfidEtWa2TPvY+rRDWUlOSi9UOl4pRRB5uCyDaYmUWw/KkbT KtajoybqZX56bs06sZ2sfAE3oPK0vNQkR994HTmWn3O9qtCpiqGWt1Dm+80ft/8KgKPQbi Govnx59CixM0a0b9Xf5lBv/00FtMsZJQOFUQkWj2dndzWhd5CzNCDK5xZFgbTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715918855; a=rsa-sha256; cv=none; b=PjgbDjmVSD9lf5UeIe/VqvIbJXVV/H22mSAReoahHvjs6CT///kGYJpDlgiXOzZKJkfj3z 4jLfgyFKIX09jRz42msr1RuphDfv4NYtqwyFO7ldoexJlVv5L2xNVFO/v04reE1BqWR2eZ ukik9vDPPNM1BL1Q5yOZ/RKGLpG53RJ4Yn5HcXrGUbsPFJHSbC7UR++Hh7A1OK65g+hJCV 7c537xxOa3K/nBZ0a6MP5hS66xyROMTdLII5NFzGFDdMjmMW4f1nNr3SvszmlBsi+QIG0R Z0L2u/3a6XkQtRI7UiiUb8ShgnjD8To/kYryGz+on5Qp8hUrIxOoOwXGi8h5VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715918855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNLBu2/rmK2cUP3PVhXM/3U+3lnDIvE7G3oJ9eNi2qU=; b=hi002t8+SpAuZgpj7G3lTtt9Qfza2MAZmDb8RZ5q5sScxwVhddQg5whtJo/mqUKwO6bmZ9 rheVSW49M1ysDtyoiZt8+TzaaaZIRgulZJ0+bbJhE3fAAGgVuqPLOIUogC9NResMY82Nmj ZXH2eBeg9E66yiKp/jAMLUPGR9/lKIZaV81wP798KMqdS9Opm5pjIgn4chvT0aK1vD+ehd xAcQbGMETMdA4eLPfiK/Z0pH/cthuoRdC7d3AqoNMIcNk/8HjxIBtxMMl/KL8zBzwUEfoi lMiNib/W1Ltc+9zy7aSyQorPkJeZqrN/iVKGplUw7jDR4mvS8V9Ph5x9xsm/EQ== 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 4VgYMW3DkKzRNx; Fri, 17 May 2024 04:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44H47ZBg035011; Fri, 17 May 2024 04:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44H47Z6m035008; Fri, 17 May 2024 04:07:35 GMT (envelope-from git) Date: Fri, 17 May 2024 04:07:35 GMT Message-Id: <202405170407.44H47Z6m035008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1652c9e29f5b - stable/14 - boottrace: Use NULL for SYSINIT's last arg, which is a pointer type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1652c9e29f5b12688c49f02b6ecef550e5650bfe Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1652c9e29f5b12688c49f02b6ecef550e5650bfe commit 1652c9e29f5b12688c49f02b6ecef550e5650bfe Author: Zhenlei Huang AuthorDate: 2024-05-14 04:03:50 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-17 04:06:50 +0000 boottrace: Use NULL for SYSINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit d9f1f0a901831ff960380fe82a2abe99a3721f87) --- sys/kern/kern_boottrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c index 86fee4f47fbe..1b097e7378ad 100644 --- a/sys/kern/kern_boottrace.c +++ b/sys/kern/kern_boottrace.c @@ -613,4 +613,4 @@ boottrace_init(void) st.table = malloc(st.size * sizeof(struct bt_event), M_BOOTTRACE, M_WAITOK | M_ZERO); } -SYSINIT(boottrace, SI_SUB_CPU, SI_ORDER_ANY, boottrace_init, 0); +SYSINIT(boottrace, SI_SUB_CPU, SI_ORDER_ANY, boottrace_init, NULL); From nobody Fri May 17 18:46:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgwsw205Jz5LcJK; Fri, 17 May 2024 18:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgwsw16s8z4p97; Fri, 17 May 2024 18:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715971604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF32+mnx1lb28jOnAiwcE18b7uoRoqskwytWsMMUTEo=; b=Sbi614RY5II3ak3y65/sq2/0wqQ4e5dc+NAjAg1yyDb6Uog0WoQqV0kmAoneE/UZLR2PIY zzC5yh055s/ERgc9+KrJ8Moa5ZsHegVfSyEnrImWrig9WBQjwEgeIUyFc2T71e2a8T8Olw R2dW66OBayZyPne/rR4T8v8f+zbxk4B8U+YvBvm9Xti3pwIeZZan5xi4Ef8AvxrO2F6S0h qhnGC/Hu+pynKZnOHFSbRa8Oc5TdC9Su1wRWDVZpm5VwEXp7P3rK+vEiVo93euxx2g2aZi IR5w6YfjWZSA0l4a5abSEsE7ZE8fmyD6nv1wcfMDyHspYB+gBM67lKZi+x8R+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715971604; a=rsa-sha256; cv=none; b=mph3W+i0VZUYhqv2WoCs7cHEQgzHHGJ8K/gx0EsCLiBlRC9HIEGaBFHry7mhTA0HnEtuIS 801hxoA9ghLK85Gv2LqeW7ruwOTSYZru/cKmo0Y+10v5Ky/p6oDDqJ0MWsAm6HMeozWaiK aOGrXUb5Vp8HfHzxBRkyNLftzRWR+eo4f1fwbtge3n470CT7aVQCvlA4qenZuSz84KnL7E /54yG/dXMiECDQZ7YWfJy6huVM0sbCs5cKbMGpuvHeiGjyuzvqg3lRoZxz2O12HoMXkt0B LFYClKkbvtOdgVjyQLJLpEOIuCNnhVv31RBgoiX4BeodaM80qz/2uSdJ92EbvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715971604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF32+mnx1lb28jOnAiwcE18b7uoRoqskwytWsMMUTEo=; b=b3TDPD1D0XB0egpU7a6bMvwxpTANMxvcDcEISilPts3cit0Kvk5TozwoGgKQNLY1IPJ3Jx BJZkfrFvNjL6UsrfJkRprWqXWbyoEPv8uv0q6guQKxd43fAI8ssLsyU3GFYbtCR1XhiYS0 zCflkIiavX4fNlGJ2YqclujcVDN7ZRshd+nIeIOohSHI5a4g7FzPlt/TNPGidHqngSmFbC L/ehKZLc97hqy/S/KLHtk1W7gR5YrkYhlRshPcnCz4ENT8dljmV3kIZGreuVxCuUryaa8+ cQtdQ/vJHQZ2RUHB9hrCI4j+AnHJv1Gsm/aWwz3GBA+ECa8F8ZefsTNp6Q/Acw== 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 4Vgwsw0k0Fztbw; Fri, 17 May 2024 18:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HIkhII019023; Fri, 17 May 2024 18:46:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HIkhwE019021; Fri, 17 May 2024 18:46:43 GMT (envelope-from git) Date: Fri, 17 May 2024 18:46:43 GMT Message-Id: <202405171846.44HIkhwE019021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1f2c98c92c65 - releng/14.1 - Revert "Reapply "release.sh: Add -jN to `make release`"" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 1f2c98c92c655c28d2343e049ce33f6b8ca28aec Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2c98c92c655c28d2343e049ce33f6b8ca28aec commit 1f2c98c92c655c28d2343e049ce33f6b8ca28aec Author: Colin Percival AuthorDate: 2024-05-17 15:22:30 +0000 Commit: Colin Percival CommitDate: 2024-05-17 16:15:33 +0000 Revert "Reapply "release.sh: Add -jN to `make release`"" Release builds on 14.x have been failing for unclear reasons; the most likely culprit is the recently-enabled parallel release building. Turn it off on the 14.1 release branch to make sure we don't run into any problems with building the release. This is a direct commit to releng/14.1 -- I'm leaving parallel release building turned on in stable/14 so I can try to track down the problems there (and it's also enabled in HEAD, where I haven't seen any failures). This reverts commit db34bbcedbf5b9fe7c015856cd04136923e1ce06. Discussed with: karels Approved by: re (cperciva) --- release/release.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/release/release.sh b/release/release.sh index 3c68f89c2cc3..c9d0203debd4 100755 --- a/release/release.sh +++ b/release/release.sh @@ -89,11 +89,9 @@ env_setup() { SRC_CONF="/dev/null" # The number of make(1) jobs, defaults to the number of CPUs available - # for buildworld, and half of number of CPUs available for buildkernel - # and 'make release'. + # for buildworld, and half of number of CPUs available for buildkernel. WORLD_FLAGS="-j$(sysctl -n hw.ncpu)" KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" - RELEASE_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" MAKE_FLAGS="-s" @@ -192,7 +190,7 @@ env_check() { ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \ KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" - RELEASE_RMAKEFLAGS="${ARCH_FLAGS} ${RELEASE_FLAGS} \ + RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}" From nobody Fri May 17 18:46:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgwsx2K1yz5LcCY; Fri, 17 May 2024 18:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgwsx1t0Jz4pJW; Fri, 17 May 2024 18:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715971605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sx1e97tRaHmRpn7hq8s2P/W9j9YWaJd2gYUwrjOOX2k=; b=BP1y4AeVAO+4TgnZy9j2vKXya0pfZFcR0VFSPFmrNuT/jAf9rz5Iq4JUYT7+RrzHJBofxD ao+ElU+vgPruZ6oQ8G0kor4FXlCy9k9VwUkvUI4bUmTk1uo0sXCtsUKAzJnj4Ft078qeEm MMqcIM14Y9k9x5VCbo7UOPY8Kfs0bI25NAK130W6V+5qA33CZ47MsYdE22TwnsZbw0opsl FdowIU9Nk3zi0qbw5Ql0cEDmofAi7eKM4WGy2kLjpL24/4Zjs1B/CrgmqNCH97bR3OjSAy 0IC5AU9f5NnDj6fFQiICZ5mwHqIomCadH7XVWqo7M+R5XjhVg68FAgK4sj1Gkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715971605; a=rsa-sha256; cv=none; b=wGG2rgmLasMy/SV6YOdq+wL1+krtGjfUYGW6qe9Wm4iaROCdYmujibHBLsWIP7NYE5gLVR 7kT60V46IQQiQIWyLR/rnVI6Ze416YJd9W2UZtCCiihp1DuMJiO+Oa0hivGPX7l5PHLRzg A51HXYMFTlKNXFX/amLJXvAUd8VidwJllylpWsYMGlXSZGUMY8NSKI1ujUuX16+wAJD0ce 7vLH+srLWCiatFlmpiJWv9t7AI0uHJsKZ6dJzyHwXAiqhyfQCrUm57pN2i2EhuPuUHyvbo Aa1eZdtlPgXr8fHwyicB6aVmU3RtB/jLhCTcXX36u5OTxL3+getOwf9tF7Enww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715971605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sx1e97tRaHmRpn7hq8s2P/W9j9YWaJd2gYUwrjOOX2k=; b=Xf5r+CuzhftioNnMLl+Xu9rJNDqU/fudlU3PTgJ/D1QcVMr2GI1IbXJOd2ucHNWsNS9z4Q Feaeu1evK44d4ePACelW0j2dCkkkZX1HXxI2cTCBisUcS3icR/ygzY1+dA93xO3Z7RFZtd Du5Hi5V62I8tufvVjQEXzEmcko18bs0vyv774t4wpQW1Of5QDbA9RksMFx0HzuK6cbsygv 2dNTiQxXx7LCaEFzgL40dLU3ni2KujaH+6CY4EixCE70fKb4gVBYf0zx6Kkt7Qp6XvMhTf VP6+FGCM674QGVzXUCPe4iQor7rbydLh4d+wH68ilKgOjxkqxsVClrcH1hwM7Q== 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 4Vgwsx1VDxztYm; Fri, 17 May 2024 18:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HIkjIl019068; Fri, 17 May 2024 18:46:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HIkjHB019065; Fri, 17 May 2024 18:46:45 GMT (envelope-from git) Date: Fri, 17 May 2024 18:46:45 GMT Message-Id: <202405171846.44HIkjHB019065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2a964a7fc34e - releng/14.1 - 14.1: update to BETA3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 2a964a7fc34e43fe29265a5f53c618fb1f4ac4c7 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2a964a7fc34e43fe29265a5f53c618fb1f4ac4c7 commit 2a964a7fc34e43fe29265a5f53c618fb1f4ac4c7 Author: Colin Percival AuthorDate: 2024-05-17 15:27:12 +0000 Commit: Colin Percival CommitDate: 2024-05-17 16:15:43 +0000 14.1: update to BETA3 Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8816eb174865..76028e28d286 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.1" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 17 19:30:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrm5bstz5LgBP; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrm58KQz4tVd; Fri, 17 May 2024 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NzdisA4dtTGSR0GgWfRMaADF2kBcgPicxvuxPZcxKM=; b=CvXqpgxTsGA6w2WaD5zSnnbmsRyBXl64eUF9s4nTrEw1+s4LaO3vMI2axuPZ4syiHCVqYn UP1e5MiWQ6U6cDhHl+T/qpaeTB3WNAFlhcISQ+bbkKppPT5n6tagsCe0tgezlv80k0yBXu ZdxlAsNLzw0SjmCluVuPCDovlZ8O7H1NM75abmlJsABb7BNmFOouVu6DxU4yMVvIf7HtWP Rt+cx3/H0768oR45V6VNr4v33kzc+/guS1g+6COjl3DJCWLRHhm6X2hqMR4cn/LLHJq0Bs R1KrPRvJdBvevRC2rm6laKjphgrALD6+lezasUp3MavCZ58NT49+A6b2OdG7kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974248; a=rsa-sha256; cv=none; b=dG1HlbsQHdxDBH+N1Q+oTWaBNdSRLcCd59A4Jg3DlPLtOMFOR7P6/nMGjVCujF2PZ3k0WO 1F8OWxz1NN/T8b2VeIvJ0SZbUOmgVLkw9GdGNId51MEB9fqEt/RnSwn3vIlNwTZ1RnlIDk 8QGIveVqTwYcNmOUoSfkvAJXQiotuO2UL5FZgbsFJEzGErCzFfCBl6jhkFZPhbHa/90zHZ 6Kkjcy/EjHLAoR/giwzETwDUycCZH9wyAN1AZ7iB28NIqaAmQRBm24bDwkvtTl7jwfiwxX VpG6RrVnZaFjjkpfHt28S5UIGXq9MmbcVWUVh9s0poVTWTE2S+6JA+o8vR63tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NzdisA4dtTGSR0GgWfRMaADF2kBcgPicxvuxPZcxKM=; b=cDBpLEHt5kD0Bv9Wb/bXW8dL1OcpUGU8tvNFMCSc3TJ4vOz4oPZglvkXQqeymYzRcTJ1AT BQP6uCPDyCDoQlbot69RwzGcfdhlKErhnwaq0G/l1arK2hmx36kyBDEjBEexEob9YaKz95 9U2OR/0FdwbS709Zu7FSMGDcOwzfId3LSFhf67k0iYsAvS7Q7lXDwnU20XVEM1vGrTDz+q yFIPUukdXglfhOPIZ6NZcjcvgXx+6Q+hCcpikaPffNnDOBcclNHri0j57vYddBpep8gH8S kylONEQFgm1XIR3jEzcHwrQxNdITsO3tVPMLZEmEm0PW4YVeI77rE5ZAzsEz6g== 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 4Vgxrm4lbBzvqx; Fri, 17 May 2024 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUmnI099114; Fri, 17 May 2024 19:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUm28099111; Fri, 17 May 2024 19:30:48 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:48 GMT Message-Id: <202405171930.44HJUm28099111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8771127d75a1 - stable/14 - sound: Be more verbose with virtual channel descriptions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8771127d75a1295dd32abd0022ff3750bc564706 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8771127d75a1295dd32abd0022ff3750bc564706 commit 8771127d75a1295dd32abd0022ff3750bc564706 Author: Christos Margiolis AuthorDate: 2024-04-18 20:34:45 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +0000 sound: Be more verbose with virtual channel descriptions Non-virtual channel description denote "play" or "record", so do the same for virtual ones as well. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44839 (cherry picked from commit d0032e6a9e6596302bf129d7f68a627a02c6cd0a) --- sys/dev/sound/pcm/sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 2057c7572ad6..83248efd3f37 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -461,7 +461,7 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c max = SND_MAXHWCHAN; break; case PCMDIR_PLAY_VIRTUAL: - dirs = "virtual"; + dirs = "virtual_play"; direction = PCMDIR_PLAY; pnum = &d->pvchancount; device = SND_DEV_DSPHW_VPLAY; @@ -475,7 +475,7 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c max = SND_MAXHWCHAN; break; case PCMDIR_REC_VIRTUAL: - dirs = "virtual"; + dirs = "virtual_record"; direction = PCMDIR_REC; pnum = &d->rvchancount; device = SND_DEV_DSPHW_VREC; From nobody Fri May 17 19:30:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrn6tYgz5Lg8P; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrn6Hj2z4v1d; Fri, 17 May 2024 19:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IPVu2ipqLE1sI4FMGH2cULNSKgAT76ljSn2TErzyFMA=; b=QVbjmrQpFxa0cetkDN1P9lp/NGCOedRmrlGggEq9kArjP14MGww/ZiwICRI8DZg3pp13iw bfI7V+QAe5bxzz5kzSO61UZGmU7l037oawmGsOFObFe4QkTyEGg1Ysw+I7JSr/1jDaIHhV kS+4PQBbmVX5u5sI2lJyGpsH8BAAmzzssd3AdEVB+s6jXDQV3XxI1VjXTmhNUO3/2PKGZG u+YSFkAVRUjKEyosiwUQ9WiaRN4aPZHqvweHkMK//FnTALaZeXcZQGTb5pCBTMNYPTDLHY +zhB88MGtvgTWEwC6CmLo2Hu5JAdOLERoN3UD4kMUM31ye3HLRUXhgC9lX7dSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974249; a=rsa-sha256; cv=none; b=t2hl4qfVijRwfr8TxLV/iDGwWIZrvNrt6yL0vW2C7NKgCUry1Zq8VT0hYbDPW+nHHenJzD tzSbQluDeRasMs6y9hfcTdh5smBdX0JroAOaB/MJn3cCtnas0buYguRWf3cDIDo0qKion1 vjYg6tYWdvVmu2ehYEVhasNHZWzWwZ9b5acRaHtCo5d1ol99fRAEi88lfN2X9D7zIukY2y zU3v7vir7FQP4U1y2GroO5/qBgYAUTyqTFt7pbVRemDrDhZN64Et3iS6sopIRUJyohIL/2 Xnyg8rJoaJMpijgGuz+MalmFMRO1niu2ZjItIgJhx0apWGNqGnGjg0fSMlSCXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IPVu2ipqLE1sI4FMGH2cULNSKgAT76ljSn2TErzyFMA=; b=OQ9n15hxRmuz2Mxg9XUdpId2XvVYzFlpfhk4Q1slOMC+iUwH1xjdz4bLDkgjdoFh/tDorr w4l6UoytyrKlxioL1rcBIpoFcBgFFwpT8fVhRfwG7v1ei00PedTXwLodTv+7eZ4Sp9HbDC nwKtlENqjqqcLoz3MAR5mJNmFOekCPJ66S7MWOK2HqQT8gkUBcK07hrWuoIOpd/d1lU1qs DbfqdCfPHb7SXztmLJMtGKTmRMPTT3leVoPRZNuEQCoxdAXoNmx+I+OeWFY3I34pgTQwTx HSSJQKNr7waR1jjN2lZ8x2my3E+jSfHzXCnF+uOJUBDg9bvEv6+EWNI9RwMeeA== 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 4Vgxrn5tz7zvqy; Fri, 17 May 2024 19:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUnZs099170; Fri, 17 May 2024 19:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUn0U099167; Fri, 17 May 2024 19:30:49 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:49 GMT Message-Id: <202405171930.44HJUn0U099167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 69707d9f5091 - stable/14 - sound: Call device_get_name() and device_get_unit() only once in mixer_init() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 69707d9f509175e4b79ef046798226f79c3787f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=69707d9f509175e4b79ef046798226f79c3787f4 commit 69707d9f509175e4b79ef046798226f79c3787f4 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:01 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +0000 sound: Call device_get_name() and device_get_unit() only once in mixer_init() No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44840 (cherry picked from commit 41ab202ff74ea6af7e9125c9dfb430c729380f41) --- sys/dev/sound/pcm/mixer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 0645089ac503..24fc5678af71 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -726,14 +726,17 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) struct snd_mixer *m; u_int16_t v; struct cdev *pdev; + const char *name; int i, unit, devunit, val; snddev = device_get_softc(dev); if (snddev == NULL) return (-1); - if (resource_int_value(device_get_name(dev), - device_get_unit(dev), "eq", &val) == 0 && val != 0) { + name = device_get_name(dev); + unit = device_get_unit(dev); + if (resource_int_value(name, unit, "eq", &val) == 0 && + val != 0) { snddev->flags |= SD_F_EQ; if ((val & SD_F_EQ_MASK) == val) snddev->flags |= val; @@ -749,8 +752,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { v = snd_mixerdefaults[i]; - if (resource_int_value(device_get_name(dev), - device_get_unit(dev), snd_mixernames[i], &val) == 0) { + if (resource_int_value(name, unit, snd_mixernames[i], + &val) == 0) { if (val >= 0 && val <= 100) { v = (u_int16_t) val; } @@ -761,7 +764,6 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ - unit = device_get_unit(dev); devunit = snd_mkunit(unit, SND_DEV_CTL, 0); pdev = make_dev(&mixer_cdevsw, PCMMINOR(devunit), UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); From nobody Fri May 17 19:30:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrq1D5vz5LgBS; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrq089Bz4tnC; Fri, 17 May 2024 19:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uCLZ8sJ7kYlg9Y20+L3DOuIqDsxnaNeaX9SkzJFDLEo=; b=HBO+J1/A+ZPg6tMIoaPBR7iMIqhY3QZ0PJFkOQAbxY6vBLXd/0Nyy6d7KHkcPL8KVSSXuz DGEKbU9xPJdJyyJ8mhR3WYE5q46dCoBfovhHvRJLU8CYJuJAYgiQpIcGynl+fNy7dA5PiS yWlfgXPoUb6KTsePqvMBidKiDFt2va84zUZJ10gYrX+v18EPpF+qtF0BVAn/TriyNr3yUo nPXTG5r0IBK8pc5zQ/VL9GJtq54s6gTi9igELd425J1s4UwqNqMspRO3sOMnORBCoUWUgD BEQJSdMWL2dATD1ckjqW4hQIK9NRNlUii9YJ/cq56SCtgpaSZ7sx3A6+b3YWWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974251; a=rsa-sha256; cv=none; b=yyBwkzLvT7EIsC0w/uQs4psLytkhxuNienKhG4S81zMAc9buYvSPTp9brbwHQWtmdlEAft GrwYYv22hvwHxu46TGnxq4n4Cqp35Td766qku1idEtKYfOIRb3GX9vuOFfuHlBKV/xu5bG ZvwER3bILe6o4PGkR4lL8UBsR8941zBxicUEKs+MSbes+2B92oSzttznGvtV1upeVX3xIk +grlKBmIezTXJ4XQbj8Oq3dtahslX38upHYzGBQUvcDRNQBHS4otB3Cn3gPNP3rrUHtTij GOwRoBNyeWrNbDEXLJGjIWyy6OdHdlzX8Izsdj2Dx3R29wjmLSpBg1TfTMgV0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uCLZ8sJ7kYlg9Y20+L3DOuIqDsxnaNeaX9SkzJFDLEo=; b=YUu1TDnJlZ+25PTl/6XXRmS7J84A29a6Okcq47xY3pHxpzKufqse26P1P4ZvUQeNqqnrZf gYFOyyzeiNhxyCZlKn7w1xR1iXNsp/Si9i3nyOIPwVZ8jmQITUw0IGA5xftDQbD3nZeT/6 c5M9yhR9NcEfIROgWO0sMvjuIt3F9yb7oV7m8jljZ+PLLTNhFLLZZEHH1Q5wRp5cr6lpsB FbgZM4Pa0MDvt9jyQSJqgqA1RQdb10qaV5Qupd37us2xZnX9zX8HWP+h4bAoep3y7r6rs1 qUY2ewf4Na3drjxc4Zs2ebMzlkUpvcKeo8nvBq6VBc4XY/eHUaGQ8d3kfO9Z0w== 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 4Vgxrp6tFWzvgb; Fri, 17 May 2024 19:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUoNB099212; Fri, 17 May 2024 19:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUoEs099209; Fri, 17 May 2024 19:30:50 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:50 GMT Message-Id: <202405171930.44HJUoEs099209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d27972ec911d - stable/14 - sound: Get rid of snddev_info->devcount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d27972ec911d09379bfbd400a7e7e7ebd4a595ec Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d27972ec911d09379bfbd400a7e7e7ebd4a595ec commit d27972ec911d09379bfbd400a7e7e7ebd4a595ec Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:06 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +0000 sound: Get rid of snddev_info->devcount snddev_info->devcount keeps track of the total number of channels for a given device. However, it is redundant to have it, since it is only used in sound_oss_sysinfo() to populate the "numaudios" field, and we also keep track of the channel counts in the playcount, pvchancount, reccount and rvchancount fields anyway. We can simply sum those fields together instead of updating a separate variable upon every channel addition/deletion. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44852 (cherry picked from commit 4d2be7be3837d66ba242a0a7fd51632c3f89285d) --- sys/dev/sound/pcm/sound.c | 7 +------ sys/dev/sound/pcm/sound.h | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 83248efd3f37..92ff041d0fb9 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -602,8 +602,6 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) break; } - d->devcount++; - return (0); } @@ -644,8 +642,6 @@ pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch) break; } - d->devcount--; - return (0); } @@ -974,7 +970,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) d->flags |= SD_F_BITPERFECT; d->devinfo = devinfo; - d->devcount = 0; d->reccount = 0; d->playcount = 0; d->pvchancount = 0; @@ -1137,7 +1132,7 @@ sound_oss_sysinfo(oss_sysinfo *si) PCM_UNLOCKASSERT(d); PCM_LOCK(d); - si->numaudios += d->devcount; + si->numaudios += PCM_CHANCOUNT(d); ++ncards; CHN_FOREACH(c, d, channels.pcm) { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index b48aed7c2d6e..3b725603ee2b 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -175,6 +175,9 @@ struct snd_mixer; #define PCM_DETACHING(x) ((x)->flags & SD_F_DETACHING) +#define PCM_CHANCOUNT(d) \ + (d->playcount + d->pvchancount + d->reccount + d->rvchancount) + /* many variables should be reduced to a range. Here define a macro */ #define RANGE(var, low, high) (var) = \ (((var)<(low))? (low) : ((var)>(high))? (high) : (var)) @@ -367,7 +370,7 @@ struct snddev_info { } opened; } pcm; } channels; - unsigned devcount, playcount, reccount, pvchancount, rvchancount ; + unsigned playcount, reccount, pvchancount, rvchancount; unsigned flags; unsigned int bufsz; void *devinfo; From nobody Fri May 17 19:30:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrr4B6Wz5LfyT; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrr15rJz4tyc; Fri, 17 May 2024 19:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MRPVHO4RddqituVD2jQrGtTnql5yEgKOtckRSAjPyc=; b=ak2RTNlkhQ09qpTP5UVV3bUEd0ZiEmxicFdu5ixO0orO8KmELMWO5O9FhCFAlOTerqL83p 6h1V2E/o7kXpSu4tCm1w2kl+oO2nWwJsHCNxsgWY9+UYmNF6IlYWqz5mmfF2nfa0N3jGOB N4PNSzT6KhoZSvjliy9OdFFSZuM3VdMUdnqKhHzVGoMObYel6U2bmC797bo+b6XUX8RGDH kWBKNmMyfgLmSgevO+0kNTbPyOahzRADQxhugxgKjcPpxU0qOo1Ss3uqgbNKLOuunOZCXO LblMZgVT+jahQ/GfKUngNZszKa8vVf3xQEWlekCv8MvYAN2JCZDDm6K/NZfXEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974252; a=rsa-sha256; cv=none; b=TNcX4iC/5d2PnuChbdOAnhzmuO7sI6uVJQd4QqxociMz4ztgKaNGog3NkJb53b2+FDi3ki AjiEj5w2wDd0ECKPiPdfn3aBvn9CAhPw29WyZipfCDrCxiT1Sbb6swI0hapgDyJ6wgrEFE UO/ydyrypVtbr9pLtXY/olvMaZQEyDkuzvMsUq3WW4Hcte959u5PDCAI6R4cqJVjjhmypK qG2J70tqmxLzu+IJMgphzz1TXZ5v0NwDMNhtqGd3aUiXuAeheRb0Km1maHV4VIiptIVmpq dnIrS1RYfW8j4ARyNSjMXFqXiCYNEaPecENz43wX0sbzlSeAaCv5VePMh46oJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MRPVHO4RddqituVD2jQrGtTnql5yEgKOtckRSAjPyc=; b=k4bTbUjJcxwOxB8z8hon8+rIx8vxNmRMYUd9Hn0rsMY0DN8BmxQmTPUcXlAlJgaCo8R2W9 G5ORUD0uwtTR4AFTqmzXIHmY36FncRxSmf1aWE+OxhnHV02TPB569e/JnfcmlVC7248bA/ AQvt57ny0nmUN67OSATlPffAzlQO+N/Y8iFXc0uuVt75dBV9rvBHI52X7zjCc/JGN2+j4P /4Nuh9NR/JVvEBEcHWpFHzvgdiSQv8CnmTvOMTaqq4zDnZxyJe30O/uUjhJWr8MYXsRpxT wgVuYAqzERnbwPqxvv7uXJLdgvRkRLy4eW+3FcQGQeA9J1EUDQBcP4yOmyVB+g== 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 4Vgxrr0XckzvsK; Fri, 17 May 2024 19:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUpqW099248; Fri, 17 May 2024 19:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUp0S099245; Fri, 17 May 2024 19:30:51 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:51 GMT Message-Id: <202405171930.44HJUp0S099245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: decc224ab899 - stable/14 - sound: Remove PCMMINOR() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: decc224ab8993797473a5d37d60588a021965d2f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=decc224ab8993797473a5d37d60588a021965d2f commit decc224ab8993797473a5d37d60588a021965d2f Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:15 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +0000 sound: Remove PCMMINOR() It's a NO-OP. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44854 (cherry picked from commit 8b97dce6973ca1b6c3407c34c76d459f43ca1061) --- sys/dev/sound/pci/emu10kx.c | 2 +- sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/pcm/sound.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 6bbbfcc1df0e..d17f5fb16d34 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -2313,7 +2313,7 @@ emu10kx_dev_init(struct emu_sc_info *sc) mtx_init(&sc->emu10kx_lock, device_get_nameunit(sc->dev), "kxdevlock", 0); unit = device_get_unit(sc->dev); - sc->cdev = make_dev(&emu10kx_cdevsw, PCMMINOR(unit), UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit); + sc->cdev = make_dev(&emu10kx_cdevsw, unit, UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit); if (sc->cdev != NULL) { sc->cdev->si_drv1 = sc; return (0); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 24fc5678af71..2f4a6f4d6395 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -765,8 +765,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ devunit = snd_mkunit(unit, SND_DEV_CTL, 0); - pdev = make_dev(&mixer_cdevsw, PCMMINOR(devunit), - UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); + pdev = make_dev(&mixer_cdevsw, devunit, UID_ROOT, GID_WHEEL, 0666, + "mixer%d", unit); pdev->si_drv1 = m; snddev->mixer_dev = pdev; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 3b725603ee2b..b72348ccf486 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -115,9 +115,6 @@ struct snd_mixer; #define PCMDEV(x) (snd_unit2d(dev2unit(x))) #define PCMCHAN(x) (snd_unit2c(dev2unit(x))) -/* XXX unit2minor compat */ -#define PCMMINOR(x) (x) - /* * By design, limit possible channels for each direction. */ From nobody Fri May 17 19:30:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrt2g9sz5LgBT; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrt0FWBz4v45; Fri, 17 May 2024 19:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tanRaRI0FkXJd5M+tFqRJryC9SRGAiLHjtkZsGlVYeU=; b=SooYoFCjiu9uh2UEstjQGrF4UnZ91z1K9e7e+FHOIHiK5vd34p1paV8+yoB7c+aRn4p5dY DtxuEXq5sATGV8PW2JCkkwEcHKvzs83lH+5stwbtafS/YUEopzWjQ2nHFFYYAxPBm+ZgwG vFaTBGRgZ9nEwH2Ssz3LxWYVfjVl6NDgWPvNAOXld3PSs6Yc6kt1Qc6l7fIEpRJOwlaWWy WEjMNR2Rus/lYCcpcH+A080Bk3KodybVP+l38DNRApoAPOk13LI4a9c59GOGcOt4IQpoP7 Bp/OK5jLqfNcNBlhT5Tg1dQOuzlGVs+fHJFJ81irs9QWHkIs5Y2paawrjx6aJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974254; a=rsa-sha256; cv=none; b=R18QlYcl6KrxSUAnXn5Qv5/QLAGT1A3rT4Mv5rGD5JtB1SK1lcPR9vos7eEwksE7AbHZ19 Oim/RmNFwSNtMNKkX0bb8nOTJ3XsvLWVpeJRjNWZfSKHXORdE3pbuNEqPXcCw4X4GK5HvH Y12gew+q5/snvbLIfUwobnGvuPUCu600JO1j5b9apa1D3ooDMThQNslzub+tehtFPnkoc7 nAK3yg62Hsr8dbslY9qC6qhqhpwfmxliS00/hnrALFvNfjDPK0StMZmrRENJmtkjaKNVye hQmn4t1cZEcpOgNXl3eP1Kh5z7Hb4KnmQhObw6hVdv1k48xd/JnQhhqZVwek3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tanRaRI0FkXJd5M+tFqRJryC9SRGAiLHjtkZsGlVYeU=; b=wMlSN3AHFk1yp6GnXsvL1JSxY0Xr4M+dq6zvE5smKWf/vwj6dGnPWoeY9rGVtjsg01v5k6 eMaOJhlQx2NdRes177kp2elq/4iKdO0C9qZLqBLhZLNeDlZmrPY9mfpL0DQJlVvtoeOQl4 W0rSjdSDADLoawnZpzPtOQVKMX8g4BDFr4jKX8RM2josOPan8/w4GvtSGipdpbUDApOioO 4Yl3QJy63ZvV56MqMNDP7/NahxDYMxMtIYmw3wyrGbdHx4xmQapx3bXFhPQCni2K9pTVSE d00tVPcJOOZBJIYN4inZD4g6cAJM3uLJJb9s/oQSFGM+QWTjOCkWElPzWGHcPQ== 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 4Vgxrs1Xqszvy8; Fri, 17 May 2024 19:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUrNx099300; Fri, 17 May 2024 19:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUrgb099297; Fri, 17 May 2024 19:30:53 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:53 GMT Message-Id: <202405171930.44HJUrgb099297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 98157281725b - stable/14 - sound: Simplify unit fetching in dsp_oss_audioinfo() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 98157281725b3eed5612753d8150b3edfd01c1b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=98157281725b3eed5612753d8150b3edfd01c1b5 commit 98157281725b3eed5612753d8150b3edfd01c1b5 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:20 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +0000 sound: Simplify unit fetching in dsp_oss_audioinfo() "i" keeps the value of the current unit, so we do not have to call PCMUNIT() and device_get_unit() to fetch it. In the mixer case, I think it is more correct to do it like this, since mixer and DSP device units have a 1-1 relationship (i.e the mixer unit is always the same as the corresponding DSP device one) and that way we can make it more clear. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44855 (cherry picked from commit a44c45c7f597d67d37e09396b0778a2847a30981) --- sys/dev/sound/pcm/dsp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index aa6c21f36601..df1482d6a97a 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2185,7 +2185,7 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) struct pcm_channel *ch; struct snddev_info *d; uint32_t fmts; - int i, nchan, *rates, minch, maxch; + int i, nchan, *rates, minch, maxch, unit; char *devname, buf[CHN_NAMELEN]; /* @@ -2205,9 +2205,9 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) * Search for the requested audio device (channel). Start by * iterating over pcm devices. */ - for (i = 0; pcm_devclass != NULL && - i < devclass_get_maxunit(pcm_devclass); i++) { - d = devclass_get_softc(pcm_devclass, i); + for (unit = 0; pcm_devclass != NULL && + unit < devclass_get_maxunit(pcm_devclass); unit++) { + d = devclass_get_softc(pcm_devclass, unit); if (!PCM_REGISTERED(d)) continue; @@ -2332,14 +2332,13 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) * @todo @c port_number - routing information? */ ai->port_number = -1; - ai->mixer_dev = (d->mixer_dev != NULL) ? PCMUNIT(d->mixer_dev) : -1; + ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note * @c real_device - OSSv4 docs: "Obsolete." */ ai->real_device = -1; - snprintf(ai->devnode, sizeof(ai->devnode), - "/dev/dsp%d", device_get_unit(d->dev)); + snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** * @note From nobody Fri May 17 19:30:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrt4mZHz5LgBX; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrt2nbgz4tp3; Fri, 17 May 2024 19:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ofk2AUjxbH8V7vKLjEUqvwpmlug8AJDvv7idfcTQdU=; b=iddt9AgTnlodxRwCN2wgkYuWat8+SHybGdhphcKSMtk24RQChl7yKl8IqAXjIQTpztxKWz TUJ2OLZnyVoT0vL2XHGYsWc1HtZsuGqXXY9EGhwgZ1aPGjewKt+U3gOz9l+xN1KpS6Ci2v Zxksu1O5L+F3Tx3kAWiT4uobbvx+OCzoOweduzknz2Pz0CVVpKElTxTAHhgpyapzqsEjjM EL5fF1aXZmeCaEIwlCqX3iN31Wxgy7rn2orgmSgrXXkRLGSHE7QuzkOn2cXv0nmG/LM0lb O8bNCgpo7Jb5jTDExB2x5u7BIwvPNGuzW8AFN2ltyn3w4+WiGtvu8PKZbzFTcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974254; a=rsa-sha256; cv=none; b=NL8oGS0Zk6k8/DlGmQ01x84BL1Huw3mwm/u9/3McbqzTfdeXk4EIrobKRwp2KwXoFjS2GH yIqxZUTel24m0P+zI3FBzyAcJ9TMVofCNVE4h0LF7BxHzD82yGEOc+n501TOXXlv78RQUP QGkd4mBriE4FBDSh3ivV81os59EcYcwD3wBP64BnjZxPIGmqRRoO1s6epaSNfm//pssuCx OUndvdA8R+FkFNSrFqnTXgkxQUOx09c+X70P5HPj7r4HROARk3EroZUxjUDuU4nbgPgKC1 wK575+4ZxRP7S9dKjM2j1qOK3FjLLghCq2bJA1JF2tqBEPWdUYypkoFejiWa0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ofk2AUjxbH8V7vKLjEUqvwpmlug8AJDvv7idfcTQdU=; b=bBhVrdIk5gpqRzF/0/m+BNP5oMV/Cfh9KRReYEMqTLgeTqyQoJI5yBUzqWSJCY69AFvz1R QRfv3caz6jAjcPBOcWnBeMJyfi0/6YNq8shdXcPwwjJK8gfCTw1beGj8WELZAzyHhF/M/u paudGGuTdxBkBV7tqE5dY1GtkQLY0O9w79oSHYAcLIjtA9EZLUO1MIbLlBuOWjnDwfCrEj NZmb4NirVfGGXeDuePwhpYt1WOQI3Ui2ETeybZwYpW6H7E44TDNorP87foX86irPA+jIma YlcGLn1efyKThX0L8w26GjmBhf0o/b/bvr4qLbcQLh8v4V3SqOhExtKj2PBthw== 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 4Vgxrt26XYzvgc; Fri, 17 May 2024 19:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUsNr099342; Fri, 17 May 2024 19:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUsfj099339; Fri, 17 May 2024 19:30:54 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:54 GMT Message-Id: <202405171930.44HJUsfj099339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 41dee6355556 - stable/14 - sound: Remove obsolete DV_F_* flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 41dee63555560f06175dfd80ef25c8ef7cc5199c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=41dee63555560f06175dfd80ef25c8ef7cc5199c commit 41dee63555560f06175dfd80ef25c8ef7cc5199c Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:26 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +0000 sound: Remove obsolete DV_F_* flags The ISA sound drivers that used them are retired. Last reference of DV_F_DRQ_MASK and DV_F_DUAL_DMA: 716924cb4832ea0a440daf09913a06f3166f243e ("Retire snd_sbc ISA sound card driver") Last reference of DV_F_DEV_MASK and DV_F_DEV_SHIFT: 5126e5eeeb5e07ceef3c809452a8c9f508b2d4d1 ("Retire snd_mss ISA sound card driver") Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44858 (cherry picked from commit 1b82d425ec0ac155765bcdf706040534309e9c94) --- sys/dev/sound/pcm/sound.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index b72348ccf486..fe310a3be3d6 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -341,14 +341,6 @@ void snd_mtxassert(void *m); int sndstat_register(device_t dev, char *str); int sndstat_unregister(device_t dev); -/* usage of flags in device config entry (config file) */ -#define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ -#define DV_F_DUAL_DMA 0x00000010 /* set to use secondary dma channel */ - -/* ought to be made obsolete but still used by mss */ -#define DV_F_DEV_MASK 0x0000ff00 /* force device type/class */ -#define DV_F_DEV_SHIFT 8 /* force device type/class */ - /* * this is rather kludgey- we need to duplicate these struct def'ns from sound.c * so that the macro versions of pcm_{,un}lock can dereference them. From nobody Fri May 17 19:30:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrw01Zvz5LgBy; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrv3dqGz4tt9; Fri, 17 May 2024 19:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKrPHBfQF/MujOobbr/JGdfe4TMuyY92QS4BoWDS3Xs=; b=tB+TQgaS+n2xOe/oW2+OGyXCp6THpkrKXo/hO4XuEFarR+08CS78wgR4Kp+IcBQ6gh8hPk HiPVzYWdYp3G7PDZV7+NOtvUH2rmXOaT0uBN45G1rm8C/U15wSwZbukAKTEiktzDBmMu+J weu18vNRa5Ff003E+igK9beyVD2piTtGqaaxTjJ4zmSZ/ntCt+Un3jVB6riDWWs2DQj3jl 9g5RUHPvuKcFJYKo7+sz7sX3j5A2XXv2MRwUBv51HziFc8sNlWGOFY8euvcpvc8vkxeZym 5QR9FwTJkrvwJKK4khDsSSMuxVcROaBFYmZB/fyB+UGesL0HcWB1NzReHBKvAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974255; a=rsa-sha256; cv=none; b=TFwZucZrEe79e5+x7QqIj9fJ8Ym7vCtxpo+5KfIWSj0W37NIX3zHS9g346WQHMjVRxjYlz ZEnBTWgb2s1ubuUckBSIVBY4Gq9z/Vzvp8cMYU/eqkCE4QGW47EV8Ds0S7ygpm6FcyowRW AFNbK91DW2hU3AF8AKSLIu9QQwL3UQyMwwzjr6zIFPby5sPdejxKlOlynjgIbWWjQAi0wZ S950Q4/EeSwIkpuGFqw8u59YdeT4IGVnYhSpUoLlCg5VO+PrqlUfG5+W6bZ8+4hr9PbvIe Vo3OYTISgXk0SXX8ZHqNvO68g+sMMVsU55mRGlx2GWZZX18Mpp6NPSJ9U8VLcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKrPHBfQF/MujOobbr/JGdfe4TMuyY92QS4BoWDS3Xs=; b=d4wl1V1xSdvsg+DXjtoOYnI2UzUJVy1xvkJfK8/hRAzNzS7oLa34hzSAyOalfHIWMPtKqh JZBhyAss4WmL/8Uv+dmkunXxI1OuCR11ccHDbTkV+f/t2PhYZigNKmb2YK3I6ITt0kUfav F8z1pgkA8Gtfe8YFdWhLHUmj/AAiB6CqPfZwZq2E8/SVQugI01ewcJK0nON6qGDrFGY73S Uvopt69FAMD7rvcrfzqC5YzFVLlBadHbCNQChITf2OsTXnMBRebsnaz1sPWVxpRNCMtjfC TI1bzZNtq/nwpHx+z6TMi/9YEvatK59riumicVkOELvQJu0CLCpFk8uDvrg4/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 4Vgxrv2qJ9zvgf; Fri, 17 May 2024 19:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUtUX099378; Fri, 17 May 2024 19:30:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUtCo099375; Fri, 17 May 2024 19:30:55 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:55 GMT Message-Id: <202405171930.44HJUtCo099375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ad677fb457bb - stable/14 - sound: Retire unit.* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad677fb457bbd8556c3efe1f7f682e61e2d54431 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ad677fb457bbd8556c3efe1f7f682e61e2d54431 commit ad677fb457bbd8556c3efe1f7f682e61e2d54431 Author: Christos Margiolis AuthorDate: 2024-04-28 19:44:35 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:25 +0000 sound: Retire unit.* The unit.* code is largely obsolete and imposes limits that are no longer needed nowadays. - Capping the maximum allowed soundcards in a given machine. By default, the limit is 512 (snd_max_u() in unit.c), and the maximum possible is 2048 (SND_UNIT_UMAX in unit.h). It can also be tuned through the hw.snd.maxunit loader(8) tunable. Even though these limits are large enough that they should never cause problems, there is no need for this limit to exist in the first place. - Capping the available device/channel types. By default, this is 32 (snd_max_d() in unit.c). However, these types are pre-defined in pcm/sound.h (see SND_DEV_*), so the cap is unnecessary when we know that their number is constant. - Capping the number of channels per-device. By default, the limit 1024 (snd_max_c() in unit.c). This is probably the most problematic of the limits mentioned, because this limit can never be reached, as the maximum is hard-capped at either hw.snd.maxautovchans (16 by default), or SND_MAXHWCHAN and SND_MAXVCHANS. These limtits are encoded in masks (see SND_U_MASK, SND_D_MASK, SND_C_MASK in unit.h) and are used to construct a bitfield of the form [dsp_unit, type, channel_unit] in snd_mkunit() which is assigned to pcm_channel->unit. This patch gets rid of everything unit.*-related and makes a slightly different use of the "unit" field to only contain the channel unit number. The channel type is stored in a new pcm_channel->type field, and the DSP unit number need not be stored at all, since we can fetch it from device_get_unit(pcm_channel->dev). This change has the effect that we no longer need to impose caps on the number of soundcards, device/channel types and per-device channels. As a result the code is noticeably simplified and more readable. Apart from the fact that the hw.snd.maxunit loader(8) tunable is also retired as a side-effect of this patch, sound(4)'s behavior remains the same. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D44912 (cherry picked from commit 25723d66369fe6786e9e4f5f77381b944755f267) --- sys/conf/files | 1 - sys/dev/sound/pcm/channel.h | 9 +- sys/dev/sound/pcm/dsp.c | 98 +++----------------- sys/dev/sound/pcm/dsp.h | 2 +- sys/dev/sound/pcm/feeder.c | 4 +- sys/dev/sound/pcm/mixer.c | 5 +- sys/dev/sound/pcm/sound.c | 144 ++++++++++-------------------- sys/dev/sound/pcm/sound.h | 18 +--- sys/dev/sound/pcm/vchan.c | 2 +- sys/dev/sound/unit.c | 188 --------------------------------------- sys/dev/sound/unit.h | 52 ----------- sys/modules/sound/sound/Makefile | 2 +- 12 files changed, 71 insertions(+), 454 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index c4e9f0698c4f..7d3c44893e09 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3060,7 +3060,6 @@ dev/smc/if_smc.c optional smc dev/smc/if_smc_acpi.c optional smc acpi dev/smc/if_smc_fdt.c optional smc fdt dev/snp/snp.c optional snp -dev/sound/unit.c optional sound dev/sound/pci/als4000.c optional snd_als4000 pci dev/sound/pci/atiixp.c optional snd_atiixp pci dev/sound/pci/cmi.c optional snd_cmi pci diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index c8d33c583188..d4f73275ed39 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -104,6 +104,7 @@ struct pcm_channel { void *devinfo; device_t dev; int unit; + int type; char name[CHN_NAMELEN]; char comm[MAXCOMLEN + 1]; struct mtx *lock; @@ -224,7 +225,7 @@ struct pcm_channel { #define CHN_INSERT_SORT(w, x, y, z) do { \ struct pcm_channel *t, *a = NULL; \ CHN_FOREACH(t, x, z) { \ - if ((y)->unit w t->unit) \ + if ((y)->type w t->type) \ a = t; \ else \ break; \ @@ -235,13 +236,9 @@ struct pcm_channel { CHN_INSERT_HEAD(x, y, z); \ } while (0) -#define CHN_INSERT_SORT_ASCEND(x, y, z) CHN_INSERT_SORT(>, x, y, z) +#define CHN_INSERT_SORT_ASCEND(x, y, z) CHN_INSERT_SORT(>=, x, y, z) #define CHN_INSERT_SORT_DESCEND(x, y, z) CHN_INSERT_SORT(<, x, y, z) -#define CHN_UNIT(x) (snd_unit2u((x)->unit)) -#define CHN_DEV(x) (snd_unit2d((x)->unit)) -#define CHN_CHAN(x) (snd_unit2c((x)->unit)) - #define CHN_BUF_PARENT(x, y) \ (((x) != NULL && (x)->parentchannel != NULL && \ (x)->parentchannel->bufhard != NULL) ? \ diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index df1482d6a97a..448ecb183298 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -444,7 +444,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (DSP_F_READ(flags)) { /* open for read */ rderror = pcm_chnalloc(d, &rdch, PCMDIR_REC, - td->td_proc->p_pid, td->td_proc->p_comm, -1); + td->td_proc->p_pid, td->td_proc->p_comm); if (rderror == 0 && chn_reset(rdch, fmt, spd) != 0) rderror = ENXIO; @@ -472,7 +472,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (DSP_F_WRITE(flags)) { /* open for write */ wrerror = pcm_chnalloc(d, &wrch, PCMDIR_PLAY, - td->td_proc->p_pid, td->td_proc->p_comm, -1); + td->td_proc->p_pid, td->td_proc->p_comm); if (wrerror == 0 && chn_reset(wrch, fmt, spd) != 0) wrerror = ENXIO; @@ -629,69 +629,13 @@ dsp_write(struct cdev *i_dev, struct uio *buf, int flag) return (dsp_io_ops(priv, buf)); } -static int -dsp_get_volume_channel(struct dsp_cdevpriv *priv, struct pcm_channel **volch) -{ - struct snddev_info *d; - struct pcm_channel *c; - int unit; - - KASSERT(volch != NULL, - ("%s(): NULL query priv=%p volch=%p", __func__, priv, volch)); - - d = priv->sc; - if (!PCM_REGISTERED(d)) { - *volch = NULL; - return (EINVAL); - } - - PCM_UNLOCKASSERT(d); - - *volch = NULL; - - c = priv->volch; - if (c != NULL) { - if (!(c->feederflags & (1 << FEEDER_VOLUME))) - return (-1); - *volch = c; - return (0); - } - - PCM_LOCK(d); - PCM_WAIT(d); - PCM_ACQUIRE(d); - - unit = dev2unit(d->dsp_dev); - - CHN_FOREACH(c, d, channels.pcm) { - CHN_LOCK(c); - if (c->unit != unit) { - CHN_UNLOCK(c); - continue; - } - *volch = c; - pcm_chnref(c, 1); - priv->volch = c; - CHN_UNLOCK(c); - PCM_RELEASE(d); - PCM_UNLOCK(d); - return ((c->feederflags & (1 << FEEDER_VOLUME)) ? 0 : -1); - } - - PCM_RELEASE(d); - PCM_UNLOCK(d); - - return (EINVAL); -} - static int dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *volch, u_long cmd, caddr_t arg) { struct snddev_info *d; struct pcm_channel *rdch, *wrch; - int j, devtype, ret; - int left, right, center, mute; + int j, left, right, center, mute; d = priv->sc; if (!PCM_REGISTERED(d) || !(pcm_getflags(d->dev) & SD_F_VPC)) @@ -716,19 +660,6 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *volch, volch = wrch; } - devtype = PCMDEV(d->dsp_dev); - - /* Look super harder */ - if (volch == NULL && - (devtype == SND_DEV_DSPHW_PLAY || devtype == SND_DEV_DSPHW_VPLAY || - devtype == SND_DEV_DSPHW_REC || devtype == SND_DEV_DSPHW_VREC)) { - ret = dsp_get_volume_channel(priv, &volch); - if (ret != 0) - return (ret); - if (volch == NULL) - return (EINVAL); - } - /* Final validation */ if (volch == NULL) return (EINVAL); @@ -2105,8 +2036,6 @@ dsp_sysinit(void *p) { if (dsp_ehtag != NULL) return; - /* initialize unit numbering */ - snd_unit_init(); dsp_ehtag = EVENTHANDLER_REGISTER(dev_clone, dsp_clone, 0, 1000); } @@ -2123,20 +2052,19 @@ SYSINIT(dsp_sysinit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysinit, NULL); SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); char * -dsp_unit2name(char *buf, size_t len, int unit) +dsp_unit2name(char *buf, size_t len, struct pcm_channel *ch) { - int i, dtype; + int i; KASSERT(buf != NULL && len != 0, ("bogus buf=%p len=%ju", buf, (uintmax_t)len)); - dtype = snd_unit2d(unit); - for (i = 0; i < nitems(dsp_cdevs); i++) { - if (dtype != dsp_cdevs[i].type || dsp_cdevs[i].alias != NULL) + if (ch->type != dsp_cdevs[i].type || dsp_cdevs[i].alias != NULL) continue; - snprintf(buf, len, "%s%d%s%d", dsp_cdevs[i].name, - snd_unit2u(unit), dsp_cdevs[i].sep, snd_unit2c(unit)); + snprintf(buf, len, "%s%d%s%d", + dsp_cdevs[i].name, device_get_unit(ch->dev), + dsp_cdevs[i].sep, ch->unit); return (buf); } @@ -2224,12 +2152,10 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) if (devfs_foreach_cdevpriv(i_dev, dsp_oss_audioinfo_cb, ch) != 0) { devname = dsp_unit2name(buf, - sizeof(buf), ch->unit); + sizeof(buf), ch); } - } else if (ai->dev == nchan) { - devname = dsp_unit2name(buf, sizeof(buf), - ch->unit); - } + } else if (ai->dev == nchan) + devname = dsp_unit2name(buf, sizeof(buf), ch); if (devname != NULL) break; CHN_UNLOCK(ch); diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h index 6098c0641eb5..b81e60dc19b5 100644 --- a/sys/dev/sound/pcm/dsp.h +++ b/sys/dev/sound/pcm/dsp.h @@ -35,7 +35,7 @@ extern struct cdevsw dsp_cdevsw; int dsp_make_dev(device_t); void dsp_destroy_dev(device_t); -char *dsp_unit2name(char *, size_t, int); +char *dsp_unit2name(char *, size_t, struct pcm_channel *); int dsp_oss_audioinfo(struct cdev *, oss_audioinfo *); #endif /* !_PCMDSP_H_ */ diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 8278a85948a8..78443ad76140 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -82,9 +82,7 @@ feeder_register(void *p) if (snd_verbose < 0 || snd_verbose > 4) snd_verbose = 1; - /* initialize unit numbering */ - snd_unit_init(); - if (snd_unit < 0 || snd_unit > PCMMAXUNIT) + if (snd_unit < 0) snd_unit = -1; if (snd_maxautovchans < 0 || diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 2f4a6f4d6395..3e197b120c9d 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -727,7 +727,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) u_int16_t v; struct cdev *pdev; const char *name; - int i, unit, devunit, val; + int i, unit, val; snddev = device_get_softc(dev); if (snddev == NULL) @@ -764,8 +764,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ - devunit = snd_mkunit(unit, SND_DEV_CTL, 0); - pdev = make_dev(&mixer_cdevsw, devunit, UID_ROOT, GID_WHEEL, 0666, + pdev = make_dev(&mixer_cdevsw, SND_DEV_CTL, UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); pdev->si_drv1 = m; snddev->mixer_dev = pdev; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 92ff041d0fb9..652f59494697 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -244,98 +244,63 @@ pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num) /* return error status and a locked channel */ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, - pid_t pid, char *comm, int devunit) + pid_t pid, char *comm) { struct pcm_channel *c; int err, vchancount, vchan_num; + bool retry; - KASSERT(d != NULL && ch != NULL && (devunit == -1 || - !(devunit & ~(SND_U_MASK | SND_D_MASK | SND_C_MASK))) && + KASSERT(d != NULL && ch != NULL && (direction == PCMDIR_PLAY || direction == PCMDIR_REC), - ("%s(): invalid d=%p ch=%p direction=%d pid=%d devunit=%d", - __func__, d, ch, direction, pid, devunit)); + ("%s(): invalid d=%p ch=%p direction=%d pid=%d", + __func__, d, ch, direction, pid)); PCM_BUSYASSERT(d); - /* Double check again. */ - if (devunit != -1) { - switch (snd_unit2d(devunit)) { - case SND_DEV_DSPHW_PLAY: - case SND_DEV_DSPHW_VPLAY: - if (direction != PCMDIR_PLAY) - return (ENOTSUP); - break; - case SND_DEV_DSPHW_REC: - case SND_DEV_DSPHW_VREC: - if (direction != PCMDIR_REC) - return (ENOTSUP); - break; - default: - if (!(direction == PCMDIR_PLAY || - direction == PCMDIR_REC)) - return (ENOTSUP); - break; - } - } - *ch = NULL; vchan_num = 0; vchancount = (direction == PCMDIR_PLAY) ? d->pvchancount : d->rvchancount; + retry = false; retry_chnalloc: err = ENOTSUP; /* scan for a free channel */ CHN_FOREACH(c, d, channels.pcm) { CHN_LOCK(c); - if (devunit == -1 && c->direction == direction && - (c->flags & CHN_F_VIRTUAL)) { + if (c->direction == direction && (c->flags & CHN_F_VIRTUAL)) { if (vchancount < snd_maxautovchans && - vchan_num < CHN_CHAN(c)) { + vchan_num < c->unit) { CHN_UNLOCK(c); goto vchan_alloc; } vchan_num++; } - if (c->direction == direction && !(c->flags & CHN_F_BUSY) && - (devunit == -1 || devunit == -2 || c->unit == devunit)) { + if (c->direction == direction && !(c->flags & CHN_F_BUSY)) { c->flags |= CHN_F_BUSY; c->pid = pid; strlcpy(c->comm, (comm != NULL) ? comm : CHN_COMM_UNKNOWN, sizeof(c->comm)); *ch = c; return (0); - } else if (c->unit == devunit) { - if (c->direction != direction) - err = ENOTSUP; - else if (c->flags & CHN_F_BUSY) - err = EBUSY; - else - err = EINVAL; - CHN_UNLOCK(c); - return (err); - } else if ((devunit == -1 || devunit == -2) && - c->direction == direction && (c->flags & CHN_F_BUSY)) + } else if (c->direction == direction && (c->flags & CHN_F_BUSY)) err = EBUSY; CHN_UNLOCK(c); } - if (devunit == -2) + /* + * We came from retry_chnalloc and still didn't find a free channel. + */ + if (retry) return (err); vchan_alloc: /* no channel available */ - if (devunit == -1 || snd_unit2d(devunit) == SND_DEV_DSPHW_VPLAY || - snd_unit2d(devunit) == SND_DEV_DSPHW_VREC) { - if (!(vchancount > 0 && vchancount < snd_maxautovchans) && - (devunit == -1 || snd_unit2c(devunit) < snd_maxautovchans)) - return (err); - err = pcm_setvchans(d, direction, vchancount + 1, - (devunit == -1) ? -1 : snd_unit2c(devunit)); - if (err == 0) { - if (devunit == -1) - devunit = -2; - goto retry_chnalloc; - } + if (!(vchancount > 0 && vchancount < snd_maxautovchans)) + return (err); + err = pcm_setvchans(d, direction, vchancount + 1, -1); + if (err == 0) { + retry = true; + goto retry_chnalloc; } return (err); @@ -445,7 +410,7 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c { struct pcm_channel *ch; int direction, err, rpnum, *pnum, max; - int udc, device, chan; + int type, unit; char *dirs, *devname, buf[CHN_NAMELEN]; PCM_BUSYASSERT(d); @@ -457,56 +422,54 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c dirs = "play"; direction = PCMDIR_PLAY; pnum = &d->playcount; - device = SND_DEV_DSPHW_PLAY; + type = SND_DEV_DSPHW_PLAY; max = SND_MAXHWCHAN; break; case PCMDIR_PLAY_VIRTUAL: dirs = "virtual_play"; direction = PCMDIR_PLAY; pnum = &d->pvchancount; - device = SND_DEV_DSPHW_VPLAY; + type = SND_DEV_DSPHW_VPLAY; max = SND_MAXVCHANS; break; case PCMDIR_REC: dirs = "record"; direction = PCMDIR_REC; pnum = &d->reccount; - device = SND_DEV_DSPHW_REC; + type = SND_DEV_DSPHW_REC; max = SND_MAXHWCHAN; break; case PCMDIR_REC_VIRTUAL: dirs = "virtual_record"; direction = PCMDIR_REC; pnum = &d->rvchancount; - device = SND_DEV_DSPHW_VREC; + type = SND_DEV_DSPHW_VREC; max = SND_MAXVCHANS; break; default: return (NULL); } - chan = (num == -1) ? 0 : num; + unit = (num == -1) ? 0 : num; - if (*pnum >= max || chan >= max) + if (*pnum >= max || unit >= max) return (NULL); rpnum = 0; CHN_FOREACH(ch, d, channels.pcm) { - if (CHN_DEV(ch) != device) + if (ch->type != type) continue; - if (chan == CHN_CHAN(ch)) { - if (num != -1) { - device_printf(d->dev, - "channel num=%d allocated!\n", chan); - return (NULL); - } - chan++; - if (chan >= max) { - device_printf(d->dev, - "chan=%d > %d\n", chan, max); - return (NULL); - } + if (unit == ch->unit && num != -1) { + device_printf(d->dev, + "channel num=%d allocated!\n", unit); + return (NULL); + } + unit++; + if (unit >= max) { + device_printf(d->dev, + "chan=%d > %d\n", unit, max); + return (NULL); } rpnum++; } @@ -518,25 +481,24 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c return (NULL); } - udc = snd_mkunit(device_get_unit(d->dev), device, chan); - devname = dsp_unit2name(buf, sizeof(buf), udc); - - if (devname == NULL) { - device_printf(d->dev, - "Failed to query device name udc=0x%08x\n", udc); - return (NULL); - } - PCM_UNLOCK(d); ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO); ch->methods = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); - ch->unit = udc; + ch->type = type; + ch->unit = unit; ch->pid = -1; strlcpy(ch->comm, CHN_COMM_UNUSED, sizeof(ch->comm)); ch->parentsnddev = d; ch->parentchannel = parent; ch->dev = d->dev; ch->trigger = PCMTRIG_STOP; + devname = dsp_unit2name(buf, sizeof(buf), ch); + if (devname == NULL) { + device_printf(d->dev, "Failed to query device name"); + kobj_delete(ch->methods, M_DEVBUF); + free(ch, M_DEVBUF); + return (NULL); + } snprintf(ch->name, sizeof(ch->name), "%s:%s:%s", device_get_nameunit(ch->dev), dirs, devname); @@ -585,7 +547,7 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) CHN_INSERT_SORT_ASCEND(d, ch, channels.pcm); - switch (CHN_DEV(ch)) { + switch (ch->type) { case SND_DEV_DSPHW_PLAY: d->playcount++; break; @@ -625,7 +587,7 @@ pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch) CHN_REMOVE(d, ch, channels.pcm); - switch (CHN_DEV(ch)) { + switch (ch->type) { case SND_DEV_DSPHW_PLAY: d->playcount--; break; @@ -939,14 +901,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) return EINVAL; } - if (device_get_unit(dev) > PCMMAXUNIT) { - device_printf(dev, "PCMMAXUNIT reached : unit=%d > %d\n", - device_get_unit(dev), PCMMAXUNIT); - device_printf(dev, - "Use 'hw.snd.maxunit' tunable to raise the limit.\n"); - return ENODEV; - } - d = device_get_softc(dev); d->dev = dev; d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev"); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index fe310a3be3d6..1f2dda880742 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -88,7 +88,6 @@ struct snd_mixer; #include #include #include -#include #define PCM_SOFTC_SIZE (sizeof(struct snddev_info)) @@ -100,21 +99,6 @@ struct snd_mixer; #define SOUND_PREFVER SOUND_MODVER #define SOUND_MAXVER SOUND_MODVER -/* - * We're abusing the fact that MAXMINOR still have enough room - * for our bit twiddling and nobody ever need 512 unique soundcards, - * 32 unique device types and 1024 unique cloneable devices for the - * next 100 years... - */ - -#define PCMMAXUNIT (snd_max_u()) -#define PCMMAXDEV (snd_max_d()) -#define PCMMAXCHAN (snd_max_c()) - -#define PCMUNIT(x) (snd_unit2u(dev2unit(x))) -#define PCMDEV(x) (snd_unit2d(dev2unit(x))) -#define PCMCHAN(x) (snd_unit2c(dev2unit(x))) - /* * By design, limit possible channels for each direction. */ @@ -311,7 +295,7 @@ SYSCTL_DECL(_hw_snd); int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, - pid_t pid, char *comm, int devunit); + pid_t pid, char *comm); int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index d10c3ff4aabb..ac5a0535ddce 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -923,7 +923,7 @@ vchan_sync(struct pcm_channel *c) if (snd_passthrough_verbose != 0) { char *devname, buf[CHN_NAMELEN]; - devname = dsp_unit2name(buf, sizeof(buf), c->unit); + devname = dsp_unit2name(buf, sizeof(buf), c); device_printf(c->dev, "%s(%s/%s) %s() -> re-sync err=%d\n", __func__, (devname != NULL) ? devname : "dspX", c->comm, diff --git a/sys/dev/sound/unit.c b/sys/dev/sound/unit.c deleted file mode 100644 index 28ffbde1f7ec..000000000000 --- a/sys/dev/sound/unit.c +++ /dev/null @@ -1,188 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2007 Ariff Abdullah - * 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 - -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_snd.h" -#endif - -#include - -/* - * Unit magic allocator for sound driver. - * - * 'u' = Unit of attached soundcards - * 'd' = Device type - * 'c' = Channel number - * - * eg: dsp0.p1 - u=0, d=p, c=1 - * dsp1.vp0 - u=1, d=vp, c=0 - * - * Maximum unit of soundcards can be tuned through "hw.snd.maxunit", which is - * between SND_UNIT_UMIN (16) and SND_UNIT_UMAX (2048). By design, the maximum - * allowable allocated channel is 256. - */ - -/* Default width */ -static int snd_u_shift = 9; /* 0 - 0x1ff : 512 distinct soundcards */ -static int snd_d_shift = 5; /* 0 - 0x1f : 32 distinct device types */ -static int snd_c_shift = 10; /* 0 - 0x3ff : 1024 distinct channels - (256 limit "by design") */ - -static int snd_unit_initialized = 0; - -#ifdef SND_DIAGNOSTIC -#define SND_UNIT_ASSERT() do { \ - if (snd_unit_initialized == 0) \ - panic("%s(): Uninitialized sound unit!", __func__); \ -} while (0) -#else -#define SND_UNIT_ASSERT() KASSERT(snd_unit_initialized != 0, \ - ("%s(): Uninitialized sound unit!", \ - __func__)) -#endif - -#define MKMASK(x) ((1 << snd_##x##_shift) - 1) - -int -snd_max_u(void) -{ - SND_UNIT_ASSERT(); - - return (MKMASK(u)); -} - -int -snd_max_d(void) -{ - SND_UNIT_ASSERT(); - - return (MKMASK(d)); -} - -int -snd_max_c(void) -{ - SND_UNIT_ASSERT(); - - return (MKMASK(c)); -} - -int -snd_unit2u(int unit) -{ - SND_UNIT_ASSERT(); - - return ((unit >> (snd_c_shift + snd_d_shift)) & MKMASK(u)); -} - -int -snd_unit2d(int unit) -{ - SND_UNIT_ASSERT(); - - return ((unit >> snd_c_shift) & MKMASK(d)); -} - -int -snd_unit2c(int unit) -{ - SND_UNIT_ASSERT(); - - return (unit & MKMASK(c)); -} - -int -snd_u2unit(int u) -{ - SND_UNIT_ASSERT(); - - return ((u & MKMASK(u)) << (snd_c_shift + snd_d_shift)); -} - -int -snd_d2unit(int d) -{ - SND_UNIT_ASSERT(); - - return ((d & MKMASK(d)) << snd_c_shift); -} - -int -snd_c2unit(int c) -{ - SND_UNIT_ASSERT(); - - return (c & MKMASK(c)); -} - -int -snd_mkunit(int u, int d, int c) -{ - SND_UNIT_ASSERT(); - - return ((c & MKMASK(c)) | ((d & MKMASK(d)) << snd_c_shift) | - ((u & MKMASK(u)) << (snd_c_shift + snd_d_shift))); -} - -/* - * This *must* be called first before any of the functions above!!! - */ -void -snd_unit_init(void) -{ - int i; - - if (snd_unit_initialized != 0) - return; - - snd_unit_initialized = 1; - - if (getenv_int("hw.snd.maxunit", &i) != 0) { - if (i < SND_UNIT_UMIN) - i = SND_UNIT_UMIN; - else if (i > SND_UNIT_UMAX) - i = SND_UNIT_UMAX; - else - i = roundup2(i, 2); - - for (snd_u_shift = 0; (i >> (snd_u_shift + 1)) != 0; - snd_u_shift++) - ; - - /* Make room for channels to fit within 24bit MAXMINOR limit. */ - snd_c_shift = 24 - snd_u_shift - snd_d_shift; - } - - if (bootverbose != 0) - printf("%s() u=0x%08x [%d] d=0x%08x [%d] c=0x%08x [%d]\n", - __func__, SND_U_MASK, snd_max_u() + 1, - SND_D_MASK, snd_max_d() + 1, SND_C_MASK, snd_max_c() + 1); -} diff --git a/sys/dev/sound/unit.h b/sys/dev/sound/unit.h deleted file mode 100644 index 9ddd68a2fe04..000000000000 --- a/sys/dev/sound/unit.h +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2007 Ariff Abdullah - * 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 _SND_UNIT_H_ -#define _SND_UNIT_H_ - -#define SND_UNIT_UMIN 16 -#define SND_UNIT_UMAX 2048 - -int snd_max_u(void); -int snd_max_d(void); -int snd_max_c(void); -int snd_unit2u(int); -int snd_unit2d(int); -int snd_unit2c(int); -int snd_u2unit(int); -int snd_d2unit(int); -int snd_c2unit(int); -int snd_mkunit(int, int, int); - -void snd_unit_init(void); - -#define SND_U_MASK (snd_u2unit(snd_max_u())) -#define SND_D_MASK (snd_d2unit(snd_max_d())) -#define SND_C_MASK (snd_c2unit(snd_max_c())) - -#endif /* !_SND_UNIT_H_ */ diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 833330ef9b26..1c3685715503 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -17,7 +17,7 @@ SRCS+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h SRCS+= mpu_if.h mpufoi_if.h synth_if.h SRCS+= mpu_if.c mpufoi_if.c synth_if.c SRCS+= ac97.c ac97_patch.c buffer.c channel.c dsp.c -SRCS+= mixer.c sndstat.c sound.c unit.c vchan.c +SRCS+= mixer.c sndstat.c sound.c vchan.c SRCS+= midi.c mpu401.c sequencer.c feeder_eq_gen.h: ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk From nobody Fri May 17 19:30:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrx29HPz5Lfn7; Fri, 17 May 2024 19:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrw4w7cz4trT; Fri, 17 May 2024 19:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLdRCd7pLN6JWK2PeDqKhnHxQdO6ReLpeQ24Xf/Xn9w=; b=MqFdIjB6dMK4CRHy1Hsj6isL56pSpHH/ghVheS53Dr5puTrAG1bmkvxD4hzNnfeM4YzSmk 0gRBUt3QZ1L/7ZBgHlWyV1VAR9qk8+cyiRwLemZVb+cB/2uuCyVUCNi7iuF0qGUSs+ltEM 2XHIw45hITKcWaZoZY6qRlNFCqAcAE/263PhRxb2hIOC9LlGA5uPJQNlV24zKR4I3Q5qh9 YrOFw/nbH41MIK74RUlLWXsMAE2YLhkQn5S8qAcYXq7SyuEBqmTlgW1kRsnzIO9E6dtea1 cATEkFnHtwkjquhpfeLdZAiFbOsh2U9tARtE1BzondS0l5Vh9+smlvXOQLwKjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974256; a=rsa-sha256; cv=none; b=BluCo6KpB49v9AsJZFNefq1pfRmNIQi8ouDFiFFTuPoNHGH4pBniMnV2GKMkY2EWUifDFg 3NqudcKYBv4WUTjhv+/GoPQcen5Vd6t6yT+G3oVv5JOS1O5HuL8//tsIpw9IX+tZSlcU3/ d/Xak6EEwpWXpnt97GvB3QYRrj1ZENFf5p9dIpZGfMpWUMEB9FNsk+Ntpe/XjudQ4WQe6e FDFN/lhEcIJMvLPsOHvD/sPeB5TdQj4m/dFGG7dY+P8eGX+0hW+7ll5cF3YJZb6HUgf3N0 kYspd4yxeErkVqSezhM9lJF+QLHrMw7yqH/W8gdJfY2lSSz1fshdHsLSAg2N9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLdRCd7pLN6JWK2PeDqKhnHxQdO6ReLpeQ24Xf/Xn9w=; b=fWleP90tJGJLUoZmOtbX1fO2/eiFr1o+F1mKALaUZhAPeig13UZX5bEehXWPWuvmLYE3QF Ondw1hYFJlegxuaxZba74zBVZJ7dM0xncicXVVKF49qP18FqozJRpM+0viDAD9Par49SPW QsbvqkocVM4VJcPwdgbfieYh7MgJZLlelxLfuGka3H8KUkjPM+fwFZK7fg2b7+mTdpjesg dBHyFG16k6czcVDT67ou/3I9qLgAOJBdkId5bmnLLL3on8snedBS+QO0cWMLs4susBho9u sTDB/rV0DUU0Bg1Bwce43iG8DFK0CxQFdycVweIuDnSWtTjBAIi0KrbmGKgzMg== 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 4Vgxrw4FB7zvr1; Fri, 17 May 2024 19:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUuFS099420; Fri, 17 May 2024 19:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUusi099417; Fri, 17 May 2024 19:30:56 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:56 GMT Message-Id: <202405171930.44HJUusi099417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 532b1efd2d2e - stable/14 - sound: Merge pcm_chn_destroy() and chn_kill() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 532b1efd2d2e659a488bf147ca817ceabb5d8997 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=532b1efd2d2e659a488bf147ca817ceabb5d8997 commit 532b1efd2d2e659a488bf147ca817ceabb5d8997 Author: Christos Margiolis AuthorDate: 2024-04-28 19:46:08 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:34 +0000 sound: Merge pcm_chn_destroy() and chn_kill() pcm_chn_destroy() acts like a wrapper around chn_kill(), and additionally calls a few more functions that should in fact be part of chn_kill()'s logic. Merge pcm_chn_destroy()'s functionality in chn_kill() to improve readability, as well as code layering. While here, convert chn_kill() to void as it currently always returns 0. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44984 (cherry picked from commit b3ea087c05d8c75978a302cbb3fa92ce1afa3e49) --- sys/dev/sound/pcm/channel.c | 12 +++++++----- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/sound.c | 26 ++------------------------ sys/dev/sound/pcm/sound.h | 1 - sys/dev/sound/pcm/vchan.c | 6 +++--- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 1527d5ea3d2c..21a91ff13186 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1279,11 +1279,13 @@ out: return 0; } -int +void chn_kill(struct pcm_channel *c) { - struct snd_dbuf *b = c->bufhard; - struct snd_dbuf *bs = c->bufsoft; + struct snd_dbuf *b = c->bufhard; + struct snd_dbuf *bs = c->bufsoft; + + PCM_BUSYASSERT(c->parentsnddev); if (CHN_STARTED(c)) { CHN_LOCK(c); @@ -1299,8 +1301,8 @@ chn_kill(struct pcm_channel *c) CHN_LOCK(c); c->flags |= CHN_F_DEAD; chn_lockdestroy(c); - - return (0); + kobj_delete(c->methods, M_DEVBUF); + free(c, M_DEVBUF); } void diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index d4f73275ed39..45381b907fa2 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -260,7 +260,7 @@ int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); -int chn_kill(struct pcm_channel *c); +void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 652f59494697..b3ae93b77a5d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -515,28 +515,6 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c return (ch); } -int -pcm_chn_destroy(struct pcm_channel *ch) -{ - struct snddev_info *d __diagused; - int err; - - d = ch->parentsnddev; - PCM_BUSYASSERT(d); - - err = chn_kill(ch); - if (err) { - device_printf(ch->dev, "chn_kill(%s) failed, err = %d\n", - ch->name, err); - return (err); - } - - kobj_delete(ch->methods, M_DEVBUF); - free(ch, M_DEVBUF); - - return (0); -} - int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) { @@ -630,7 +608,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) if (err) { device_printf(d->dev, "pcm_chn_add(%s) failed, err=%d\n", ch->name, err); - pcm_chn_destroy(ch); + chn_kill(ch); } return (err); @@ -678,7 +656,7 @@ pcm_killchans(struct snddev_info *d) error = pcm_chn_remove(d, ch); PCM_UNLOCK(d); if (error == 0) - pcm_chn_destroy(ch); + chn_kill(ch); } while (!CHN_EMPTY(d, channels.pcm)); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 1f2dda880742..70addf32bddd 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -300,7 +300,6 @@ int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); -int pcm_chn_destroy(struct pcm_channel *ch); int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index ac5a0535ddce..c3bc36d924bd 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -709,7 +709,7 @@ vchan_create(struct pcm_channel *parent, int num) ret = pcm_chn_add(d, ch); PCM_UNLOCK(d); if (ret != 0) { - pcm_chn_destroy(ch); + chn_kill(ch); CHN_LOCK(parent); return (ret); } @@ -837,7 +837,7 @@ vchan_create(struct pcm_channel *parent, int num) PCM_LOCK(d); if (pcm_chn_remove(d, ch) == 0) { PCM_UNLOCK(d); - pcm_chn_destroy(ch); + chn_kill(ch); } else PCM_UNLOCK(d); CHN_LOCK(parent); @@ -890,7 +890,7 @@ vchan_destroy(struct pcm_channel *c) /* destroy ourselves */ if (ret == 0) - ret = pcm_chn_destroy(c); + chn_kill(c); CHN_LOCK(parent); From nobody Fri May 17 19:30:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrx6s5Dz5LgNG; Fri, 17 May 2024 19:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrx5VMDz4txD; Fri, 17 May 2024 19:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHkaQ+ApWiFrY2/JYHvdKuAChprh/uKlub2QEjupx2A=; b=qp/yIDpeX/X3ZWy2J1GQmL/rakLXa3i4GII4553yYxzmjO/BTrro1Exvk52+QebyEv3ATf Yv4AOblmiQv9xXACyad451odU6YxFmw6dDPbZZhF32ViMxvqXIN/KuxeTbacGs29ubZtG5 KezGsmGMkKqsXoldvm/CKmQ/QrNZk62dXEXAXXDqxo5N2/jRr6jOLvsvoC4bwzTa/o3WGl XuwSSJMqIYHKinxHrNuhiwnv8dQO2uDFLWkdW5YysvvOtAVxwqeu60f75Bn0ph6U+Q9NK/ gHukvBq2kVBmhyNjUASQkTns8R1SXS7XaVPRMsyz+VsPNbld/ZQlSQEwid05wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974257; a=rsa-sha256; cv=none; b=EFLUltkbQ7cQR0MNOmkfyRCIR9RRKKIxto4pCeDXyra2EEwC7aYzzw058zUCljHW3He2PG ePc5DlZJLpnKRN/lu0WSviz5at5j65byjm2ESaOOQ07fePKkDazIlcBdHnYLLi2tZmIvHo Dht2EWZH5c9okTr9KVvJXlCVR1tBa5DfK7ZlWfABYvkYemBLLrDiWPC/uwVR2Hk6Ak+wud dWnNrX285pMvcaxSG+bh0z8RAm3ZUaPIWPbwFu9DHkEkWP1BxnJjXQa1+YG/tmBelIBIHd uvdL3q04tVtyA29rosPfYLV4VIFfWwJVpOunCRPpWwTFOpgO4y3O2L1fYveBHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHkaQ+ApWiFrY2/JYHvdKuAChprh/uKlub2QEjupx2A=; b=a6/OdOhc9g96ODWRXCMOOoRdOyHWAfbXJlMTGOiswxgmqh+8ODPRoY/4Urhh1O2jIbBAy9 JIKjapJss5pEa0TaTaTefrkFE+gRrgbid+LSxucSJ7zUp+60T0TGMFq3PVDIN5ilzm6l7x Td9kUdmCUgPP2Ybe2+2mBe9VpMcXKl+m1nQ6bx1ZcxrSCZP4rp4VMuKIdcqnF/ao6Z3Q7I 1JCwOzvZsV4xC9cektyGouD6pdSwDqEJnXHMuGu0Fk6ID5bi1MmYX1X4sCSaCeOvG8IjzL v1ATmULWMVfKfkTs/0CYgEpiatvKzjHBfYMGFZzWavZoiw9UiZSbpTE3YYO58A== 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 4Vgxrx54mxzvsN; Fri, 17 May 2024 19:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUvS3099469; Fri, 17 May 2024 19:30:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUvvY099466; Fri, 17 May 2024 19:30:57 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:57 GMT Message-Id: <202405171930.44HJUvvY099466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 930b5a3c07f2 - stable/14 - sound: Move pcm_chnref() and pcm_chnrelease() to pcm/channel.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 930b5a3c07f23c8eafbd9ad73d45cc216841e7d3 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=930b5a3c07f23c8eafbd9ad73d45cc216841e7d3 commit 930b5a3c07f23c8eafbd9ad73d45cc216841e7d3 Author: Christos Margiolis AuthorDate: 2024-04-28 19:46:55 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:34 +0000 sound: Move pcm_chnref() and pcm_chnrelease() to pcm/channel.c Improve code layering. These are channel functions, and so they do not belong in pcm/sound.c. While here, assert in chn_ref() that new refcount won't be negative. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44985 (cherry picked from commit a24050e2b784e13561da3ab731a1db92f2e3366c) --- sys/dev/sound/pcm/channel.c | 28 ++++++++++++++++++++++++++++ sys/dev/sound/pcm/channel.h | 2 ++ sys/dev/sound/pcm/dsp.c | 26 +++++++++++++------------- sys/dev/sound/pcm/sound.c | 26 -------------------------- sys/dev/sound/pcm/sound.h | 2 -- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 21a91ff13186..0fea169e3eb7 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1314,6 +1314,34 @@ chn_shutdown(struct pcm_channel *c) c->flags |= CHN_F_DEAD; } +/* release a locked channel and unlock it */ +int +chn_release(struct pcm_channel *c) +{ + PCM_BUSYASSERT(c->parentsnddev); + CHN_LOCKASSERT(c); + + c->flags &= ~CHN_F_BUSY; + c->pid = -1; + strlcpy(c->comm, CHN_COMM_UNUSED, sizeof(c->comm)); + CHN_UNLOCK(c); + + return (0); +} + +int +chn_ref(struct pcm_channel *c, int ref) +{ + PCM_BUSYASSERT(c->parentsnddev); + CHN_LOCKASSERT(c); + KASSERT((c->refcount + ref) >= 0, + ("%s(): new refcount will be negative", __func__)); + + c->refcount += ref; + + return (c->refcount); +} + int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 45381b907fa2..698a1186924f 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -262,6 +262,8 @@ int chn_poll(struct pcm_channel *c, int ev, struct thread *td); int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); +int chn_release(struct pcm_channel *c); +int chn_ref(struct pcm_channel *c, int ref); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 448ecb183298..9c31fff7e8cd 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -181,8 +181,8 @@ getchns(struct dsp_cdevpriv *priv, uint32_t prio) pcm_setflags(d->dev, flags); if (ch != NULL) { CHN_LOCK(ch); - pcm_chnref(ch, -1); - pcm_chnrelease(ch); + chn_ref(ch, -1); + chn_release(ch); } PCM_RELEASE(d); PCM_UNLOCK(d); @@ -301,7 +301,7 @@ dsp_close(void *data) wdref--; else { CHN_LOCK(volch); - pcm_chnref(volch, -1); + chn_ref(volch, -1); CHN_UNLOCK(volch); } } @@ -332,12 +332,12 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(rdch); - pcm_chnref(rdch, rdref); + chn_ref(rdch, rdref); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); chn_reset(rdch, 0, 0); - pcm_chnrelease(rdch); + chn_release(rdch); } if (wrch != NULL) { /* @@ -350,12 +350,12 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(wrch); - pcm_chnref(wrch, wdref); + chn_ref(wrch, wdref); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); chn_reset(wrch, 0, 0); - pcm_chnrelease(wrch); + chn_release(wrch); } PCM_LOCK(d); } @@ -451,7 +451,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (rderror != 0) { if (rdch != NULL) - pcm_chnrelease(rdch); + chn_release(rdch); if (!DSP_F_DUPLEX(flags)) { PCM_RELEASE_QUICK(d); PCM_GIANT_EXIT(d); @@ -463,7 +463,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) rdch->flags |= CHN_F_NBIO; if (flags & O_EXCL) rdch->flags |= CHN_F_EXCLUSIVE; - pcm_chnref(rdch, 1); + chn_ref(rdch, 1); chn_vpc_reset(rdch, SND_VOL_C_PCM, 0); CHN_UNLOCK(rdch); } @@ -479,7 +479,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (wrerror != 0) { if (wrch != NULL) - pcm_chnrelease(wrch); + chn_release(wrch); if (!DSP_F_DUPLEX(flags)) { if (rdch != NULL) { /* @@ -487,8 +487,8 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) * created record channel */ CHN_LOCK(rdch); - pcm_chnref(rdch, -1); - pcm_chnrelease(rdch); + chn_ref(rdch, -1); + chn_release(rdch); } PCM_RELEASE_QUICK(d); PCM_GIANT_EXIT(d); @@ -500,7 +500,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) wrch->flags |= CHN_F_NBIO; if (flags & O_EXCL) wrch->flags |= CHN_F_EXCLUSIVE; - pcm_chnref(wrch, 1); + chn_ref(wrch, 1); chn_vpc_reset(wrch, SND_VOL_C_PCM, 0); CHN_UNLOCK(wrch); } diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index b3ae93b77a5d..9d5eaf3f5ad7 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -306,32 +306,6 @@ vchan_alloc: return (err); } -/* release a locked channel and unlock it */ -int -pcm_chnrelease(struct pcm_channel *c) -{ - PCM_BUSYASSERT(c->parentsnddev); - CHN_LOCKASSERT(c); - - c->flags &= ~CHN_F_BUSY; - c->pid = -1; - strlcpy(c->comm, CHN_COMM_UNUSED, sizeof(c->comm)); - CHN_UNLOCK(c); - - return (0); -} - -int -pcm_chnref(struct pcm_channel *c, int ref) -{ - PCM_BUSYASSERT(c->parentsnddev); - CHN_LOCKASSERT(c); - - c->refcount += ref; - - return (c->refcount); -} - static void pcm_setmaxautovchans(struct snddev_info *d, int num) { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 70addf32bddd..08aa56cc96f7 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -296,8 +296,6 @@ SYSCTL_DECL(_hw_snd); int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm); -int pcm_chnrelease(struct pcm_channel *c); -int pcm_chnref(struct pcm_channel *c, int ref); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); From nobody Fri May 17 19:30:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxrz28gwz5Lg98; Fri, 17 May 2024 19:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxrz03z8z4v7w; Fri, 17 May 2024 19:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyqR2JL1GU14PrauoL6zpsL+vCAstm0P19krs86vkeA=; b=TCSfQRNf64sAuiCJLGRm94BYkhLTWBJLRKCXddbspXoRQPq/VuiotNYdQj9i+hqsNdzWgQ 8GGkFk5oH0Cfp51rjupLUdZElFeH+f8jWpkxKy6qs5Dd8hEt2IUEEnBfDOMj7197L3JArp LCemkDN0FJE3t+0saUgRc/QAxIzR7Gg2GstJ60tqg8E3Wvg6APEArDRBl93ZsMizreXDwe 0qJofpk6OImBAT0h31EKttvO6XVvmc+3nL+lDzMz2BKqezwCZGP/bhrDd2FBMDs3Q+x8H4 xCOGc2vbhq+Tn8/JSMEZ5WKD/MUBrOuF+XpB79zFtLP1qihlqxl5UmNj83sROg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974259; a=rsa-sha256; cv=none; b=G1r3TeqA90KKet1ybcxYZhFx8LlJXGcs6gnn0JxwJXUgPxHmYxkVwreDd8lS/zPqu2AKWJ bx4NKjOjqPaIkAcqJHtuFlSIMjycrXkkeitZXEJ8/FVy+zVUtmKDlZnHwVUQyOjtDCcBUN OfIyzMKFqNzCNAExFfTDjIGRK5TaDVcnUhvVfH2B6H2ul0BDlpXDxV5iMfnqd0hZZISRRz a3AC4VzYqDoC6+EM7Ekyh3W2FmYQ1n0aa6yTQNeeHgCtZP0ecxTuchJBnTjALZ/ojESoCw S0dkE9eKYaHAzt4w/dFvOkeXyBccrYGoVBmWxWPFoYj+QQ4UzmLUjjYC4vbaIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyqR2JL1GU14PrauoL6zpsL+vCAstm0P19krs86vkeA=; b=IJxN5twP/dL6YPSkguThEen3LaKIDuVn64N86lx40NaM4QlO5ZjaFaLxlVME4oIyLxISI7 lsRX812isDf9CZV5uqFw763ido5QwcTuOlYbSFDI8U+jO5KZgjKMJBmorriHVlIq/eiCzA JTXUcZMCrqY0O6LHW/xF7BpPssCeQNJ3R4EAhp9o8udI981k1TXRGu5W2Ev11QudGrOglD 3gp2AKExPTMgLReNA0hrcWGl1kfJ69JztSPKaD4UPZjSz0m2QDARjz3stMCMXxF6BWLVrD Bcu7cNQZg3e81m0LC/+OtQ5c4cpj2Skbm8cabgGxBjE+j9QO+tVmzQ8vXhxhNw== 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 4Vgxry6YPtzvsP; Fri, 17 May 2024 19:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUwnL099520; Fri, 17 May 2024 19:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUwRa099517; Fri, 17 May 2024 19:30:58 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:58 GMT Message-Id: <202405171930.44HJUwRa099517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0baaaf8543d5 - stable/14 - sound: Remove chn_timeout check from chn_init() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0baaaf8543d5d88bbfe1a537e6fb7d0773fa9261 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0baaaf8543d5d88bbfe1a537e6fb7d0773fa9261 commit 0baaaf8543d5d88bbfe1a537e6fb7d0773fa9261 Author: Christos Margiolis AuthorDate: 2024-04-28 19:47:33 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:34 +0000 sound: Remove chn_timeout check from chn_init() This check is not related to channel initializion, but is also unnecessary, since sysctl_hw_snd_timeout() takes care of checking if chn_timeout is within bounds. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44992 (cherry picked from commit 7cc1afc5589000ac6ad7a908b07fad3401367bd1) --- sys/dev/sound/pcm/channel.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 0fea169e3eb7..859476f212ae 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1164,9 +1164,6 @@ chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) struct snd_dbuf *b, *bs; int i, ret; - if (chn_timeout < CHN_TIMEOUT_MIN || chn_timeout > CHN_TIMEOUT_MAX) - chn_timeout = CHN_TIMEOUT; - chn_lockinit(c, dir); b = NULL; From nobody Fri May 17 19:30:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs04c9bz5LgC8; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs014sGz4v9p; Fri, 17 May 2024 19:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=abn1n7vv0UheWtj/vZp6BXpx4YiQij9Yhf9MR59Krm0=; b=j1Kp2lTFmClLtsyJNnFmvKwSuskaKmp32E2elpeDiTvdwTqH1KVuqlQMnyxRnRGTzXIZpH i/qUV5HR6/BopuJTxlRfXGZ279hhSGE4GKdE9DeUEQPiMOQS6eD674rvJGj9/Bd8qH3xJt c5xgo0He7GdvpbLgF1zpuY0b3YEwPn3E/1n/VYq3sF3sISHJ/PApu15lZQmy0ve4TGaDSw epN07TEY696HAaXkP6ONSFHG1yUutZNdFKtOM2C/s25gxQ2SYMEDJQ5nsSmaXXy+EiR5Ns 2YZfQwYlOkrkIqVWtkcco5h3o8MhZJKbinjpn2sUxFPQUjKVE3I1OgUPiSSsFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974260; a=rsa-sha256; cv=none; b=DSn1TCu8Gt+VP8K782qo0wgk8sHZM4N0jGKlVfSvtkBiaE9ch1/eberSGGBUEX+Zc1BGnd VcPMSoG8yvCYUYd8QrDSwwInuNpbShTQYP5sHTLCKXT+kr8FaWlLfoXZRsZK15YOkLBk9N sCKpQAy/B62MacK1ZGohUdV0CsTrs3s4Ttuki0f2fML+zHCK3aLYua/Zt/y90rJ3zn9ZNS AlwFvm1ovdHeo800UKPLCD74ecENbpulrRyVi2MI7puUeEVLvaHznjwILWxs3/8eD3Oq6e wFJpT3WBqAMXDWSZVjOfzFnrtJe15XINvjWT0/9XZ3KIScVRdFOsMShH0yqeyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=abn1n7vv0UheWtj/vZp6BXpx4YiQij9Yhf9MR59Krm0=; b=wY3ZhjXwGdSeGh67aZArcyGqDJ8BMEnVyJPUUGa+QMvx6M3yJwH7Ou792MzzLEJliJb1CW nTYy3GLEf2wn/Bb/8YuNDVy+9fjgohJJNLpJbTt2E1ZN+lJnJlxQ5F0qgDgSQ56jQTFEYU 5ohMocRDVebcifHAbhyXCuu7fT+qjPm2mAi/G5EOB2TcjVBQ3rEM1vUYYZnWcwAR/rIOUZ PLOZhDFyH+sDfvqs4xQbHMGJ8xtr6rFaXhf/fdZJ/ocIA1fO+RSeXqk45UxjkZyyaLUOPH pcnZa07ef/PpqrKbzaLBg4RDR5m8SFEjp7cbhkytHkYQ4et2BVtMxpLhU1ibtw== 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 4Vgxs00hMPzvfB; Fri, 17 May 2024 19:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJUxtp099565; Fri, 17 May 2024 19:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUxh7099562; Fri, 17 May 2024 19:30:59 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:59 GMT Message-Id: <202405171930.44HJUxh7099562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 13ee4d7f332e - stable/14 - sound: Merge pcm_chn_create() and chn_init() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 13ee4d7f332ee1948f2886aeec70e97a4cf5457e Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=13ee4d7f332ee1948f2886aeec70e97a4cf5457e commit 13ee4d7f332ee1948f2886aeec70e97a4cf5457e Author: Christos Margiolis AuthorDate: 2024-05-06 18:26:37 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:34 +0000 sound: Merge pcm_chn_create() and chn_init() Follow-up of b3ea087c05d8c75978a302cbb3fa92ce1afa3e49 ("sound: Merge pcm_chn_destroy() and chn_kill()") While here, add device_printf()'s to all failure points. Also fix an existing bug where we'd unlock an already unlocked channel, in case we went to "out" (now "out2") before locking the channel. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D44993 (cherry picked from commit 2e9962ef57044b191431fe9228841e1415574d82) --- sys/dev/sound/pcm/channel.c | 167 ++++++++++++++++++++++++++++++++++++++------ sys/dev/sound/pcm/channel.h | 3 +- sys/dev/sound/pcm/sound.c | 114 +----------------------------- sys/dev/sound/pcm/sound.h | 1 - sys/dev/sound/pcm/vchan.c | 2 +- 5 files changed, 151 insertions(+), 136 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 859476f212ae..996cb0cb04f7 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1157,14 +1157,112 @@ chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd) return r; } -int -chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) +struct pcm_channel * +chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, + int dir, int num, void *devinfo) { + struct pcm_channel *c; struct feeder_class *fc; struct snd_dbuf *b, *bs; - int i, ret; + char *dirs, *devname, buf[CHN_NAMELEN]; + int i, ret, direction, rpnum, *pnum, max, type, unit; + PCM_BUSYASSERT(d); + PCM_LOCKASSERT(d); + KASSERT(num >= -1, ("invalid num=%d", num)); + + switch (dir) { + case PCMDIR_PLAY: + dirs = "play"; + direction = PCMDIR_PLAY; + pnum = &d->playcount; + type = SND_DEV_DSPHW_PLAY; + max = SND_MAXHWCHAN; + break; + case PCMDIR_PLAY_VIRTUAL: + dirs = "virtual_play"; + direction = PCMDIR_PLAY; + pnum = &d->pvchancount; + type = SND_DEV_DSPHW_VPLAY; + max = SND_MAXVCHANS; + break; + case PCMDIR_REC: + dirs = "record"; + direction = PCMDIR_REC; + pnum = &d->reccount; + type = SND_DEV_DSPHW_REC; + max = SND_MAXHWCHAN; + break; + case PCMDIR_REC_VIRTUAL: + dirs = "virtual_record"; + direction = PCMDIR_REC; + pnum = &d->rvchancount; + type = SND_DEV_DSPHW_VREC; + max = SND_MAXVCHANS; + break; + default: + device_printf(d->dev, + "%s(): invalid channel direction: %d\n", + __func__, dir); + goto out1; + } + + unit = (num == -1) ? 0 : num; + + if (*pnum >= max || unit >= max) { + device_printf(d->dev, "%s(): unit=%d or pnum=%d >= than " + "max=%d\n", __func__, unit, *pnum, max); + goto out1; + } + + rpnum = 0; + + CHN_FOREACH(c, d, channels.pcm) { + if (c->type != type) + continue; + if (unit == c->unit && num != -1) { + device_printf(d->dev, + "%s(): channel num=%d already allocated\n", + __func__, unit); + goto out1; + } + unit++; + if (unit >= max) { + device_printf(d->dev, + "%s(): chan=%d >= max=%d\n", __func__, unit, max); + goto out1; + } + rpnum++; + } + + if (*pnum != rpnum) { + device_printf(d->dev, + "%s(): pnum screwed: dirs=%s pnum=%d rpnum=%d\n", + __func__, dirs, *pnum, rpnum); + goto out1; + } + + PCM_UNLOCK(d); + c = malloc(sizeof(*c), M_DEVBUF, M_WAITOK | M_ZERO); + c->methods = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); + c->type = type; + c->unit = unit; + c->pid = -1; + strlcpy(c->comm, CHN_COMM_UNUSED, sizeof(c->comm)); + c->parentsnddev = d; + c->parentchannel = parent; + c->dev = d->dev; + c->trigger = PCMTRIG_STOP; chn_lockinit(c, dir); + devname = dsp_unit2name(buf, sizeof(buf), c); + if (devname == NULL) { + ret = EINVAL; + device_printf(d->dev, "%s(): failed to create channel name", + __func__); + goto out2; + } + snprintf(c->name, sizeof(c->name), "%s:%s:%s", + device_get_nameunit(c->dev), dirs, devname); b = NULL; bs = NULL; @@ -1177,20 +1275,31 @@ chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) ret = ENOMEM; b = sndbuf_create(c->dev, c->name, "primary", c); - if (b == NULL) - goto out; + if (b == NULL) { + device_printf(d->dev, "%s(): failed to create hardware buffer\n", + __func__); + goto out2; + } bs = sndbuf_create(c->dev, c->name, "secondary", c); - if (bs == NULL) - goto out; + if (bs == NULL) { + device_printf(d->dev, "%s(): failed to create software buffer\n", + __func__); + goto out2; + } CHN_LOCK(c); ret = EINVAL; fc = feeder_getclass(NULL); - if (fc == NULL) - goto out; - if (chn_addfeeder(c, fc, NULL)) - goto out; + if (fc == NULL) { + device_printf(d->dev, "%s(): failed to get feeder class\n", + __func__); + goto out2; + } + if (chn_addfeeder(c, fc, NULL)) { + device_printf(d->dev, "%s(): failed to add feeder\n", __func__); + goto out2; + } /* * XXX - sndbuf_setup() & sndbuf_resize() expect to be called @@ -1226,12 +1335,17 @@ chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) CHN_UNLOCK(c); /* XXX - Unlock for CHANNEL_INIT() malloc() call */ c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, direction); CHN_LOCK(c); - if (c->devinfo == NULL) - goto out; + if (c->devinfo == NULL) { + device_printf(d->dev, "%s(): NULL devinfo\n", __func__); + goto out2; + } ret = ENOMEM; - if ((sndbuf_getsize(b) == 0) && ((c->flags & CHN_F_VIRTUAL) == 0)) - goto out; + if ((sndbuf_getsize(b) == 0) && ((c->flags & CHN_F_VIRTUAL) == 0)) { + device_printf(d->dev, "%s(): hardware buffer's size is 0\n", + __func__); + goto out2; + } ret = 0; c->direction = direction; @@ -1251,12 +1365,14 @@ chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) bs->shadbuf = malloc(bs->sl, M_DEVBUF, M_NOWAIT); if (bs->shadbuf == NULL) { ret = ENOMEM; - goto out; + device_printf(d->dev, "%s(): failed to create shadow " + "buffer\n", __func__); + goto out2; } } - -out: - CHN_UNLOCK(c); +out2: + if (CHN_LOCKOWNED(c)) + CHN_UNLOCK(c); if (ret) { if (c->devinfo) { if (CHANNEL_FREE(c->methods, c->devinfo)) @@ -1270,10 +1386,19 @@ out: c->flags |= CHN_F_DEAD; chn_lockdestroy(c); - return ret; + PCM_LOCK(d); + + kobj_delete(c->methods, M_DEVBUF); + free(c, M_DEVBUF); + + return (NULL); } - return 0; + PCM_LOCK(d); + + return (c); +out1: + return (NULL); } void diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 698a1186924f..6aca089a7c4d 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -259,7 +259,8 @@ int chn_sync(struct pcm_channel *c, int threshold); int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); -int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); +struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, + kobj_class_t cls, int dir, int num, void *devinfo); void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); int chn_release(struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 9d5eaf3f5ad7..cc19d119ac36 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -379,116 +379,6 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, maxautovchans, sysctl_hw_snd_maxautovchans, "I", "maximum virtual channel"); -struct pcm_channel * -pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo) -{ - struct pcm_channel *ch; - int direction, err, rpnum, *pnum, max; - int type, unit; - char *dirs, *devname, buf[CHN_NAMELEN]; - - PCM_BUSYASSERT(d); - PCM_LOCKASSERT(d); - KASSERT(num >= -1, ("invalid num=%d", num)); - - switch (dir) { - case PCMDIR_PLAY: - dirs = "play"; - direction = PCMDIR_PLAY; - pnum = &d->playcount; - type = SND_DEV_DSPHW_PLAY; - max = SND_MAXHWCHAN; - break; - case PCMDIR_PLAY_VIRTUAL: - dirs = "virtual_play"; - direction = PCMDIR_PLAY; - pnum = &d->pvchancount; - type = SND_DEV_DSPHW_VPLAY; - max = SND_MAXVCHANS; - break; - case PCMDIR_REC: - dirs = "record"; - direction = PCMDIR_REC; - pnum = &d->reccount; - type = SND_DEV_DSPHW_REC; - max = SND_MAXHWCHAN; - break; - case PCMDIR_REC_VIRTUAL: - dirs = "virtual_record"; - direction = PCMDIR_REC; - pnum = &d->rvchancount; - type = SND_DEV_DSPHW_VREC; - max = SND_MAXVCHANS; - break; - default: - return (NULL); - } - - unit = (num == -1) ? 0 : num; - - if (*pnum >= max || unit >= max) - return (NULL); - - rpnum = 0; - - CHN_FOREACH(ch, d, channels.pcm) { - if (ch->type != type) - continue; - if (unit == ch->unit && num != -1) { - device_printf(d->dev, - "channel num=%d allocated!\n", unit); - return (NULL); - } - unit++; - if (unit >= max) { - device_printf(d->dev, - "chan=%d > %d\n", unit, max); - return (NULL); - } - rpnum++; - } - - if (*pnum != rpnum) { - device_printf(d->dev, - "%s(): WARNING: pnum screwed : dirs=%s pnum=%d rpnum=%d\n", - __func__, dirs, *pnum, rpnum); - return (NULL); - } - - PCM_UNLOCK(d); - ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO); - ch->methods = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); - ch->type = type; - ch->unit = unit; - ch->pid = -1; - strlcpy(ch->comm, CHN_COMM_UNUSED, sizeof(ch->comm)); - ch->parentsnddev = d; - ch->parentchannel = parent; - ch->dev = d->dev; - ch->trigger = PCMTRIG_STOP; - devname = dsp_unit2name(buf, sizeof(buf), ch); - if (devname == NULL) { - device_printf(d->dev, "Failed to query device name"); - kobj_delete(ch->methods, M_DEVBUF); - free(ch, M_DEVBUF); - return (NULL); - } - snprintf(ch->name, sizeof(ch->name), "%s:%s:%s", - device_get_nameunit(ch->dev), dirs, devname); - - err = chn_init(ch, devinfo, dir, direction); - PCM_LOCK(d); - if (err) { - device_printf(d->dev, "chn_init(%s) failed: err = %d\n", - ch->name, err); - kobj_delete(ch->methods, M_DEVBUF); - free(ch, M_DEVBUF); - return (NULL); - } - - return (ch); -} - int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) { @@ -569,9 +459,9 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) PCM_BUSYASSERT(d); PCM_LOCK(d); - ch = pcm_chn_create(d, NULL, cls, dir, -1, devinfo); + ch = chn_init(d, NULL, cls, dir, -1, devinfo); if (!ch) { - device_printf(d->dev, "pcm_chn_create(%s, %d, %p) failed\n", + device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", cls->name, dir, devinfo); PCM_UNLOCK(d); return (ENODEV); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 08aa56cc96f7..09e739ea5c20 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -297,7 +297,6 @@ int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm); -struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index c3bc36d924bd..ccac08891220 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -698,7 +698,7 @@ vchan_create(struct pcm_channel *parent, int num) } /* create a new playback channel */ - ch = pcm_chn_create(d, parent, &vchan_class, direction, num, parent); + ch = chn_init(d, parent, &vchan_class, direction, num, parent); if (ch == NULL) { PCM_UNLOCK(d); CHN_LOCK(parent); From nobody Fri May 17 19:31:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs205d2z5LgCC; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs11nhcz4vGG; Fri, 17 May 2024 19:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ozvb+JrrJ1QE6b3CxDLJ7T3y+3qabLSS/qvr9yyGmS4=; b=LivMF4o+T48nUhj6KFmmAgVTMfQk6Si9yohCIylFN53o4MMXMl+xTpOpmBC8Uhw2tOz0Ri HuYt8dIYTQNYl3RLGHyx+mqZU+XVAK1PWkr8vuO2BY9YEqYVjwe1tUJfqFBBxqvKLSjXvf OjcLWj6ySdpkH1cOurPtBGJjPyDubIrSNHPCNaVPZ30aaGG7xdKUKCpb1e1O/g1qWN0tWD Quj8Kj84FWn9XkkZkchJJTofQ4VWYgeG52RYza/jhIT2qU6FfBxk7QEQBapSceEf9Z0Z3A oQpVsCwFOFhu+5T0nS7lxLLw222g3OXh9SHUfT4KixYLKlf3yLoghd9bGxanPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974261; a=rsa-sha256; cv=none; b=sVmP9aUfvwYH7CMevx9vRsKbfMmL+2kwQ5gBk1v6dAZ9yZzu7IJqhaFkbHX8co4TsJgENg ky7MLLo06jD0I7rOYIjcRqlle6W5mKwUpJcmJNyxyMmkGqM4jwbmLVPb8zIgAEVsET/lcq fapQkmlmV2cx8U/yOTNr3qw7qMhTCTHPlBBBZanL1nw/bjR2Ld+iJew5sZIn8fJbGxaVKo GvOCnD4hlSxrIaqjkV8x0Ii0iww8jjEWAwEavrhS1Q3x1aDfxxuhJvA28H9rLkxfw88I0N 9kpo6XsWpnzkkW5hGU7aTEQFQYUj+T8DCEZaXH8e4/PoPnoFZBwXgglTogr5rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ozvb+JrrJ1QE6b3CxDLJ7T3y+3qabLSS/qvr9yyGmS4=; b=i3pWO78r6q0EaWzNVszgiOHIcRYrkbSvILzv/B6Po3p/2hp3nCMwhLBcDlKZeipaQfHdgC P7FyYyjQuKrGwsvJISe4IRFDi3gqPrASRS5SqzrthxGHrf7F42yTlD/ViIlPHGVcNzKb4/ mY0ZSIuB6HbqKm1mSuFvmdLs3AvzerYQa8EMe1g9HoTnVOi+CqFswxcmpWvV4OGKxa6YDT txMy1YCelNT/qq74daiMEvVMKR12AqK3WybC5kQyypYkrm10qOBT1uwbrEfbS7jW8iGArf cU9Ml2lrrLLMGCRdKHeaYkSqH/438hPALyy2aaYLscJXzoQcRix1fPlvqywvAg== 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 4Vgxs11Q2VzvyC; Fri, 17 May 2024 19:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV1kb099631; Fri, 17 May 2024 19:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV1jj099628; Fri, 17 May 2024 19:31:01 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:01 GMT Message-Id: <202405171931.44HJV1jj099628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e6e7bf7087fb - stable/14 - sound: Add __assert_unreachable() to default cases in pcm_chn_add() and pcm_chn_remove() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6e7bf7087fb50a404f684092bd522ece2533d34 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e7bf7087fb50a404f684092bd522ece2533d34 commit e6e7bf7087fb50a404f684092bd522ece2533d34 Author: Christos Margiolis AuthorDate: 2024-05-06 18:26:56 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:34 +0000 sound: Add __assert_unreachable() to default cases in pcm_chn_add() and pcm_chn_remove() We should normally never enter these cases. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44994 (cherry picked from commit 76f95bae092b7353ff82b7a0056ca5801bb98f76) --- sys/dev/sound/pcm/sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index cc19d119ac36..2787c0ee126d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -403,7 +403,7 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) d->rvchancount++; break; default: - break; + __assert_unreachable(); } return (0); @@ -443,7 +443,7 @@ pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch) d->rvchancount--; break; default: - break; + __assert_unreachable(); } return (0); From nobody Fri May 17 19:31:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs243fbz5LgLB; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs237Jdz4vBV; Fri, 17 May 2024 19:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uel1HSjoHWmciXPqGzkygcrt/gPgeV4OGWQ/FOsKCpw=; b=w6L54Zw4kUvSQoG29ovUjAY3SXGAUURw5Ru5+aYselOresrT86M9AlFY+QBHiqN3gprv6O OxruY3tL9mfsroamz9rgNwyjKov4W8XIAw2V1G2qh3aOuADxKH/irh/SE4K6WGUpygPdzc Xqx1Q0wiRiHW6x1SIzM7Rs4yF9O39VK+t3pxW5Q7wE56ZmAOMOv/k+Rti/1YHe425zwwNS y9xbsgp3g1+9dkhIFx0jUiAP7tKznYWoUir0W8IPuvdSeVgfEu516Xrnh4gbLuGjZ7/PxS BdemEETq3gmCrECQDFOWTGpFwFDwZ1a3bxxldH2+EEMUHb21cXx/AbbAPTYjFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974262; a=rsa-sha256; cv=none; b=ljwqFhgEq7q+9z6OemZInKcjCyWSS8zy/j656WDEuvFk7xDHlGBzIBG/Q2GYSY+4XgzddQ Uks80H/JGMDlXvpzyvSse48RLDdnuletrM1YmeYCT0dlR8Sqx3qSc71+EtvRHxYoMfM7NV E3HyG3iTHiWk5+GGGamRTiE8pd9SMbKk5YbGvvjc//BYZpBJqQzZFdM9yYFh88Xhurh12G PtPe2a7pfmDc7uPZX+7+koI5aO791hffgATd+gOy9dMp32osZVFe6877FfhaVSkxx4pYJz AmTZI2GkrhFXdqd+4bcryDgPknFcNJ6MhvtziLfJtEOvhgnBzZU6hrsIuZ0KhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uel1HSjoHWmciXPqGzkygcrt/gPgeV4OGWQ/FOsKCpw=; b=q/aluX8af365YxvWmZ7dPdhT/XATWhMo1etfbVQfpyGL+kdMtB9SKwTtx0xXdG5jigl2+B v0FK2ytrHH/IbPgrtNPHB2xHQj1DSzpyaWPKe5hnDBbh+kJ9KaAogC9589wk8/lx3FKcjS JzrMp8GgMGG7Jpq/JTttavFv/UB24Q88gMClo7ZNjOCUIc8tfAIpgh9IiS+skUobffnqaU FWhrMKr4iQBOIirvYaeN5hJCI7O5VB42+kZOnByPxJkTZyl9nXX4Y/hxvfsgB+iWRXWPJJ qLRNXWfgsLMFLe07H+ryL1anbkdn80qAPaHeXwAjYC2A6eXk1sHAw+mRwjFSZw== 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 4Vgxs22l6vzvr4; Fri, 17 May 2024 19:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV29C099673; Fri, 17 May 2024 19:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV2Ri099670; Fri, 17 May 2024 19:31:02 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:02 GMT Message-Id: <202405171931.44HJV2Ri099670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2c53a4bbcb17 - stable/14 - sound: Convert pcm_chn_add() to void List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c53a4bbcb17bbe3beddb2b56cd18d1fd3045df0 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2c53a4bbcb17bbe3beddb2b56cd18d1fd3045df0 commit 2c53a4bbcb17bbe3beddb2b56cd18d1fd3045df0 Author: Christos Margiolis AuthorDate: 2024-05-06 18:27:18 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:34 +0000 sound: Convert pcm_chn_add() to void It always returns 0. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44998 (cherry picked from commit 139bcec852cf2786ca839ca0bddbb2b78a23d6fa) --- sys/dev/sound/pcm/sound.c | 14 +++----------- sys/dev/sound/pcm/sound.h | 2 +- sys/dev/sound/pcm/vchan.c | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 2787c0ee126d..9b4de948eac4 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -379,7 +379,7 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, maxautovchans, sysctl_hw_snd_maxautovchans, "I", "maximum virtual channel"); -int +void pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) { PCM_BUSYASSERT(d); @@ -405,8 +405,6 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) default: __assert_unreachable(); } - - return (0); } int @@ -454,7 +452,6 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) { struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; - int err; PCM_BUSYASSERT(d); @@ -467,15 +464,10 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) return (ENODEV); } - err = pcm_chn_add(d, ch); + pcm_chn_add(d, ch); PCM_UNLOCK(d); - if (err) { - device_printf(d->dev, "pcm_chn_add(%s) failed, err=%d\n", - ch->name, err); - chn_kill(ch); - } - return (err); + return (0); } static void diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 09e739ea5c20..6c9f4c8f18b2 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -297,7 +297,7 @@ int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm); -int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); +void pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch); int pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index ccac08891220..1a21b7049b77 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -706,13 +706,8 @@ vchan_create(struct pcm_channel *parent, int num) } /* add us to our grandparent's channel list */ - ret = pcm_chn_add(d, ch); + pcm_chn_add(d, ch); PCM_UNLOCK(d); - if (ret != 0) { - chn_kill(ch); - CHN_LOCK(parent); - return (ret); - } CHN_LOCK(parent); /* @@ -727,6 +722,7 @@ vchan_create(struct pcm_channel *parent, int num) parent->flags |= CHN_F_HAS_VCHAN; + ret = 0; parent_caps = chn_getcaps(parent); if (parent_caps == NULL) ret = EINVAL; From nobody Fri May 17 19:31:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs35bxBz5Lg9d; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs345SCz4vKG; Fri, 17 May 2024 19:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQ7B6F4Wjrq8PipnfFyoeMp4VihySAKhlaFbEsbNCXg=; b=bbmb/kpfXhs1TRpKJH6YonVgYPbfpoL6vVE8XwFB1lcqNnP+85tu91iye4jkvBTp75vnPs FMU6PXUDPIh9cEW75SRPcmHPMMLO/CwbNyHQafCcubJ6HaYBeUwxdK3gLtiqmRe+XaIGQ7 tahMQIufr6uM2Y8alW7b0Qq7IW6Fnjp47gH1ctZXjnw3iuHipLMO5PU134E2A5Xi0npHZE JqhuZY2taDFu0A++u/nGmi7AST+oLBEIbLNSR4WhN07DXRPDfI4fxbGwxwBIzvr0p4YOxH tSgmKLPwNbT4nJzPjCSFPVXmjE/xwKwGC9jqmLuGEvSwf+/RfX//ZRngJzYB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974263; a=rsa-sha256; cv=none; b=bc9CQQ7XCaqemIVffE+tdS1AfLRP0SXE8C6wzmJ2QYRF9Idg7DEWp/3olVoLEauEHqg9MD nRPrBP82AHhp6FZI1NRikprpVj/3CZTMMBiMBthx1eRrTr0U3VMc7NcQ3ucgvbMl7nWEw9 pP47fgmQ6uI13WCGID03lReO3dlJUuB9+wdM4ENTlWVOYCJU6Mz2xt0dHnQF+feyRY5hpT bKa2V0qze4LHSfW+GX8HJzrBy+JZF5vHg0E77QSwRIVyKTjHCpe2W6dqBYsMH1QVrc+amc Ef9pmephGUYKEfwbTB4nd22TVt8plExemRH3wCjBcjzUzLzN3XI6+yWaTl6jww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQ7B6F4Wjrq8PipnfFyoeMp4VihySAKhlaFbEsbNCXg=; b=gl1Um4YSX1pmMSX3DhegTUf9Y+rAi1u17hsmjMDSdkkc00z34xJk/hJ+VwLsrh1ieSIswO T/jqDBbK/SdJylRodware+Ta6YYA6etzXrWr2v+vNlo0e7gVzFZnQBfyq09q0geZEpY/Jq X3alML0iKV/6DgOu94eSEMBYgCgKE3zZI3Xz8BdZ9sLzlOU2ZDsshYkzGh1CcqijMLalOe /riWNYJNffglSp4+TOoOxIB1+IqtcB/jco3l26luB8lkNq8zW9anLwZaK3pPD6VPPNvx1y ScoHHkhRqtMTfdmXGcPPTcHeBR6O4uQl4pF+JJ3wlhT6SEyMNtYl/pyVk4dOMQ== 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 4Vgxs33PkgzvfC; Fri, 17 May 2024 19:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV31N099715; Fri, 17 May 2024 19:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV3PP099712; Fri, 17 May 2024 19:31:03 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:03 GMT Message-Id: <202405171931.44HJV3PP099712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d1eaefde3bca - stable/14 - sound: Remove hw.snd.version and SND_DRV_VERSION List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1eaefde3bca383abd419fd30796bffde242d385 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d1eaefde3bca383abd419fd30796bffde242d385 commit d1eaefde3bca383abd419fd30796bffde242d385 Author: Christos Margiolis AuthorDate: 2024-05-06 18:30:58 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Remove hw.snd.version and SND_DRV_VERSION hw.snd.version and SND_DRV_VERSION define the sound driver version and are meant to be used in bug reports, but because these values are constant, there is not much useful information we can extract from them. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, emaste Differential Revision: https://reviews.freebsd.org/D44996 (cherry picked from commit 7398d1ece5cfa2e6ce4997234a95115b49c9e818) --- sys/dev/sound/pcm/sndstat.c | 8 ++------ sys/dev/sound/pcm/sound.c | 10 ---------- sys/dev/sound/version.h | 42 ------------------------------------------ 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index ef006a580d40..edb33e92ade9 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -51,7 +51,6 @@ #include #include -#include #include "feeder_if.h" @@ -1271,11 +1270,8 @@ sndstat_prepare(struct sndstat_file *pf_self) /* make sure buffer is reset */ sbuf_clear(s); - if (snd_verbose > 0) { - sbuf_printf(s, "FreeBSD Audio Driver (%ubit %d/%s)\n", - (u_int)sizeof(intpcm32_t) << 3, SND_DRV_VERSION, - MACHINE_ARCH); - } + if (snd_verbose > 0) + sbuf_printf(s, "FreeBSD Audio Driver\n"); /* generate list of installed devices */ k = 0; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 9b4de948eac4..d2acfc403e8c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -64,15 +63,6 @@ SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, static void pcm_sysinit(device_t); -/* - * XXX I've had enough with people not telling proper version/arch - * while reporting problems, not after 387397913213th questions/requests. - */ -static char snd_driver_version[] = - __XSTRING(SND_DRV_VERSION)"/"MACHINE_ARCH; -SYSCTL_STRING(_hw_snd, OID_AUTO, version, CTLFLAG_RD, &snd_driver_version, - 0, "driver version/arch"); - /** * @brief Unit number allocator for syncgroup IDs */ diff --git a/sys/dev/sound/version.h b/sys/dev/sound/version.h deleted file mode 100644 index b816bbf964e8..000000000000 --- a/sys/dev/sound/version.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2007 Ariff Abdullah - * 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 _SND_VERSION_H_ -#define _SND_VERSION_H_ - -/* - * FreeBSD sound driver internal versioning, nothing to do - * with OSS whatsoever. Dear future maintainer, please revisit - * this _before_ Jan 1 2148 - * - * Last 2 decimal places reserved for daily versioning, starting - * with 0. - */ -#define SND_DRV_VERSION 2009061500 - -#endif /* !_SND_VERSION_H_ */ From nobody Fri May 17 19:31:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs51lSZz5Lfyt; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs44nSTz4vSB; Fri, 17 May 2024 19:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q2+5eoMIi82sH3rV8MyIAppvznkvF8+8pyDDGHjU3cY=; b=gGB+MtvVSHs1AJmzuWKWG8Y0MY52FqDdi44Yx5MUW3Of+2mC2AmBalT3Tbw+cyUyRl8ROs HPU88SvcsfulGOc+m/IJi0Y5qEduMNIHxYz0iEDjna7MJeDO32/Tc+7PHBoJOeO6VrAjtq RuCpUQ2jFEGw8x2OQXMi1ZD7qX/b0aAq8ilkXlp8oWvyxzKMa79B/u68+4dima72+c2bF2 eJlUZbtzFzTgwrcblt0T1PvSBCZD5Xdc+TP2Iy+eQi5bJqLdNYVJG6ZMYdZDdo7GOmMkl/ muwXYvGyt9PYhDK6ZbloRyvYJCKPk3FQBmWPNnMOx2Lpzb0SnmymsPoEyqAYTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974264; a=rsa-sha256; cv=none; b=crNBf25LTMtMtmRtrof+vPbssMHaw7n/21eibaKMEEnokFwZlY32VZgNX1DLgo7dhfoyVo +YGNf7rQX0UTZmv+f/Y8g3pqV1k3B2oaBbk0UqztTbCmPjRLwkEdXFzpgjCZrkJd/JeGph vIZNr0kA8O13Y9ZAkhX9Vjtw8bGIdaHfJjQnHNKVJgBjmC8feq1xHjBTz9f0buK6SOSDAR pX1aV3zhzdrnTWj9G8NkyINvMA1YsY/qSp5Rxrl+x9/YHJoiycHIcV9BWKsT9amVyTfYw/ d45vwRKjqX0jBnvdx0vpNVBVpiMnkHhJZgLjKGrzEU5nv8fWBjdS1g+FgfI1tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q2+5eoMIi82sH3rV8MyIAppvznkvF8+8pyDDGHjU3cY=; b=Ql+o+cqlc2HZQcAuBPLNbGfp7WjkiJlXYN0D5QX5aHf7/IQu0WjFC047OEsiswbadAY41E 6vwK9d3msERkyjtp6XWlUexHrJG848gQkY6s+Fl6lQLag2imFDrlQu18vL/6/nkbhCPzxR x2NLcvI5ZoBRTLkHnXnCY7fWDOeFxnps0x+jogIn1hsN2qwNIesbpg/qU0eZjoDldxoOGJ PTDluiNRNmbepAvtaOka0yMTYoMLmGxwak7ipxv86zCa4fbmWO6TWuswIHLvZ2CJfGf5PK 8LTDdVSFD2FhVdlwczTvvwFeVt9ncm15ImbhWaYswgxkoqIsP4Sl2BLSOcigdQ== 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 4Vgxs44MlWztyV; Fri, 17 May 2024 19:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV45t099766; Fri, 17 May 2024 19:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV47F099763; Fri, 17 May 2024 19:31:04 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:04 GMT Message-Id: <202405171931.44HJV47F099763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e14f7d11cb2f - stable/14 - sound: Move chip.h contents to pcm/sound.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e14f7d11cb2f30324b8af06ffdbd7af03c27f473 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e14f7d11cb2f30324b8af06ffdbd7af03c27f473 commit e14f7d11cb2f30324b8af06ffdbd7af03c27f473 Author: Christos Margiolis AuthorDate: 2024-05-06 18:32:12 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Move chip.h contents to pcm/sound.h Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44997 (cherry picked from commit 923e0040a59af8ac2271d3e673fef1c641d0cce7) --- sys/dev/sound/chip.h | 47 ---------------------------------------- sys/dev/sound/pci/csa.c | 1 - sys/dev/sound/pci/csamidi.c | 1 - sys/dev/sound/pci/csapcm.c | 1 - sys/dev/sound/pci/emu10kx-midi.c | 1 - sys/dev/sound/pci/emu10kx-pcm.c | 1 - sys/dev/sound/pci/emu10kx.c | 1 - sys/dev/sound/pci/hdspe-pcm.c | 1 - sys/dev/sound/pci/hdspe.c | 1 - sys/dev/sound/pci/solo.c | 1 - sys/dev/sound/pcm/sound.h | 16 ++++++++++++++ sys/dev/sound/usb/uaudio.c | 1 - sys/dev/sound/usb/uaudio_pcm.c | 1 - 13 files changed, 16 insertions(+), 58 deletions(-) diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h deleted file mode 100644 index bb40d2809a00..000000000000 --- a/sys/dev/sound/chip.h +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 1999 Seigo Tanimura - * 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. - */ - -/* - * These are the function codes assigned to the children of - * sound cards. - */ -enum { - SCF_PCM, - SCF_MIDI, - SCF_SYNTH, -}; - -/* - * This is the device information struct, used by - * a bridge device to pass the device function code - * to the children. - */ -struct sndcard_func { - int func; /* The function code. */ - void *varinfo; /* Bridge-specific information. */ -}; diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 7bb7967b74e7..662f0de80188 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -45,7 +45,6 @@ #endif #include -#include #include #include diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index df1699092990..29d5548b0954 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -43,7 +43,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 71b9a0253cdb..c8424dd3e433 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -36,7 +36,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c index 4ed8e6c1dd9c..2a98562f8f39 100644 --- a/sys/dev/sound/pci/emu10kx-midi.c +++ b/sys/dev/sound/pci/emu10kx-midi.c @@ -43,7 +43,6 @@ #include "opt_snd.h" #endif -#include #include #include diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index 825a39fc4e63..bef6b596646e 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -43,7 +43,6 @@ #include "opt_snd.h" #endif -#include #include #include diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index d17f5fb16d34..0f938597e06c 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -49,7 +49,6 @@ #include "opt_snd.h" #endif -#include #include #include diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index db39b867879f..4bea6c65e087 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index e0197d1e981a..91d1f3ee1bf6 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -37,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index bee79e723696..82eabf3a4884 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -35,7 +35,6 @@ #include #include -#include #include "mixer_if.h" diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 6c9f4c8f18b2..d2ec480b45b0 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -321,6 +321,22 @@ void snd_mtxassert(void *m); int sndstat_register(device_t dev, char *str); int sndstat_unregister(device_t dev); +/* These are the function codes assigned to the children of sound cards. */ +enum { + SCF_PCM, + SCF_MIDI, + SCF_SYNTH, +}; + +/* + * This is the device information struct, used by a bridge device to pass the + * device function code to the children. + */ +struct sndcard_func { + int func; /* The function code. */ + void *varinfo; /* Bridge-specific information. */ +}; + /* * this is rather kludgey- we need to duplicate these struct def'ns from sound.c * so that the macro versions of pcm_{,un}lock can dereference them. diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 2351c2522021..d47eb86ed271 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -90,7 +90,6 @@ #include #include #include -#include #include "feeder_if.h" static int uaudio_default_rate = 0; /* use rate list */ diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 9b17cb232907..0b3da9b20440 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -32,7 +32,6 @@ #endif #include -#include #include #include "mixer_if.h" From nobody Fri May 17 19:31:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs56zZfz5Lfyv; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs55TSHz4vQD; Fri, 17 May 2024 19:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uiJcYE5KtTuZp21pe7mxSqhRHxVkXitSrE+7Mfv94xQ=; b=CgYycF2tA+S1evyJSHj6JOyV+5BrC8NBsqDfGt0KWSdqKEpgi93btacw8j1gVge/eaOKCy dG3o6Bv5nveAtfonpk1W6zYfXOHRWpuy7JNSqmhfQwTa2iGl9zddZA4HzsHZjJNrzoWPxe itMYn6dDNytoAU8OZ1cVzQ0RdeDJ1FQMoHjPEsi2Z5CiyD5coN9w7edAfJEZeiwfCvA4ml jM5CNROZwxj43uuwBQXneIZFwhTbBOSJVHdNIAp5ebRaJOfiGwR10dJtF/k19DeoHvDRHy CJ2LbRIa0ZCzjC0m1Ud+1ePxyVQkgZ2CvCg3CgfuXYUf01t5Wsu9Qo3jLMnMbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974265; a=rsa-sha256; cv=none; b=ZXllqlv7HReeEP/nfARQ0NuNXbOaUQHVMskhxfvGDKe08vcd4vvPVvq4++1vVidcyB9Ty+ aN67bo9SniVSr7UKCbux9pMetmDM3x0cKZRewA4DFKGbKzyNWDhohIit9FV75h6GcOyshz Q8mECbJ83tIZ+clghcqpKYYX3nfinlXiuy0NiEHfeAn9Je1n2ymdyl64/mgFPT3UccaI6G nvk5nBxahCfXDGDxuO7VwuK3kIehhNGI/MMJPMGgZVQBHqlJZsjGr2Iv9xKbqJiJfFOXcn LPhIQe22IlsvIxje1jVQCldfUp8+rcPFuNCRSs80/UplB9qPbD4+qKfuq0sUjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uiJcYE5KtTuZp21pe7mxSqhRHxVkXitSrE+7Mfv94xQ=; b=UmNe8taB9soozfddAhEshGvfY71Jwcm6nhTXHzl9DxbxO2rb+5c+f5/Y21y+Tuf5r2OMT6 908B8lLsoP4kmli6qBQufB17HyLX2rS8rNc9SHCVxg9Wt2b7kNzJOMHliaj3Ux2lPIcvBr vkdYL6tAu6mkwtUG8VquU9KYExqhb/U2T/oWxiegp4UEeXQDRR1dEmYtwgcTesMzxEQf7R THxXNAQxKoCi75L7Im0KtbA4HC3n1FmkUo9a7rGj5iqcztI6evd/UuAvR9Fk/UNz+20EcA 3x4eS6z8BgKjfa7rDKZWMRGPyKglYO8ndftpTWUbVGp1dGNysrc+wT8C7OTanQ== 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 4Vgxs554LMzvfD; Fri, 17 May 2024 19:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV5rX099814; Fri, 17 May 2024 19:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV5CK099811; Fri, 17 May 2024 19:31:05 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:05 GMT Message-Id: <202405171931.44HJV5CK099811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6f6cc9324131 - stable/14 - sound: Remove unused dsp_cdevs[] fields and devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f6cc9324131a1db629336d93d0ccf6e68609b48 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6cc9324131a1db629336d93d0ccf6e68609b48 commit 6f6cc9324131a1db629336d93d0ccf6e68609b48 Author: Christos Margiolis AuthorDate: 2024-05-06 18:32:25 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Remove unused dsp_cdevs[] fields and devices These fields and devices are unused as of e8c0d15a64fa ("sound: Get rid of snd_clone and use DEVFS_CDEVPRIV(9)"). While here, remove unused SND_DEV_* defines from pcm/sound.h and convert the list to an enum. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45013 (cherry picked from commit 72cbd381075a2eb22a070505334d1ce92ec2d7ad) --- sys/dev/sound/pcm/dsp.c | 57 +++++++++-------------------------------------- sys/dev/sound/pcm/sound.h | 50 +++++++++-------------------------------- 2 files changed, 21 insertions(+), 86 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 9c31fff7e8cd..6c3d76e27b6b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -203,13 +203,6 @@ relchns(struct dsp_cdevpriv *priv, uint32_t prio) CHN_UNLOCK(priv->wrch); } -/* duplex / simplex cdev type */ -enum { - DSP_CDEV_TYPE_RDONLY, /* simplex read-only (record) */ - DSP_CDEV_TYPE_WRONLY, /* simplex write-only (play) */ - DSP_CDEV_TYPE_RDWR /* duplex read, write, or both */ -}; - #define DSP_F_VALID(x) ((x) & (FREAD | FWRITE)) #define DSP_F_DUPLEX(x) (((x) & (FREAD | FWRITE)) == (FREAD | FWRITE)) #define DSP_F_SIMPLEX(x) (!DSP_F_DUPLEX(x)) @@ -221,48 +214,18 @@ static const struct { char *name; char *sep; char *alias; - int use_sep; - int hw; - int max; - int volctl; - uint32_t fmt, spd; - int query; } dsp_cdevs[] = { - { SND_DEV_DSP, "dsp", ".", NULL, 0, 0, 0, 0, - SND_FORMAT(AFMT_U8, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_AUDIO, "audio", ".", NULL, 0, 0, 0, 0, - SND_FORMAT(AFMT_MU_LAW, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_DSP16, "dspW", ".", NULL, 0, 0, 0, 0, - SND_FORMAT(AFMT_S16_LE, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_DSPHW_PLAY, "dsp", ".p", NULL, 1, 1, SND_MAXHWCHAN, 1, - SND_FORMAT(AFMT_S16_LE, 2, 0), 48000, DSP_CDEV_TYPE_WRONLY }, - { SND_DEV_DSPHW_VPLAY, "dsp", ".vp", NULL, 1, 1, SND_MAXVCHANS, 1, - SND_FORMAT(AFMT_S16_LE, 2, 0), 48000, DSP_CDEV_TYPE_WRONLY }, - { SND_DEV_DSPHW_REC, "dsp", ".r", NULL, 1, 1, SND_MAXHWCHAN, 1, - SND_FORMAT(AFMT_S16_LE, 2, 0), 48000, DSP_CDEV_TYPE_RDONLY }, - { SND_DEV_DSPHW_VREC, "dsp", ".vr", NULL, 1, 1, SND_MAXVCHANS, 1, - SND_FORMAT(AFMT_S16_LE, 2, 0), 48000, DSP_CDEV_TYPE_RDONLY }, - { SND_DEV_DSPHW_CD, "dspcd", ".", NULL, 0, 0, 0, 0, - SND_FORMAT(AFMT_S16_LE, 2, 0), 44100, DSP_CDEV_TYPE_RDWR }, + { SND_DEV_DSP, "dsp", ".", NULL }, + { SND_DEV_DSPHW_PLAY, "dsp", ".p", NULL }, + { SND_DEV_DSPHW_VPLAY, "dsp", ".vp", NULL }, + { SND_DEV_DSPHW_REC, "dsp", ".r", NULL }, + { SND_DEV_DSPHW_VREC, "dsp", ".vr", NULL }, /* Low priority, OSSv4 aliases. */ - { SND_DEV_DSP, "dsp_ac3", ".", "dsp", 0, 0, 0, 0, - SND_FORMAT(AFMT_U8, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_DSP, "dsp_mmap", ".", "dsp", 0, 0, 0, 0, - SND_FORMAT(AFMT_U8, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_DSP, "dsp_multich", ".", "dsp", 0, 0, 0, 0, - SND_FORMAT(AFMT_U8, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_DSP, "dsp_spdifout", ".", "dsp", 0, 0, 0, 0, - SND_FORMAT(AFMT_U8, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, - { SND_DEV_DSP, "dsp_spdifin", ".", "dsp", 0, 0, 0, 0, - SND_FORMAT(AFMT_U8, 1, 0), DSP_DEFAULT_SPEED, - DSP_CDEV_TYPE_RDWR }, + { SND_DEV_DSP, "dsp_ac3", ".", "dsp" }, + { SND_DEV_DSP, "dsp_mmap", ".", "dsp" }, + { SND_DEV_DSP, "dsp_multich", ".", "dsp" }, + { SND_DEV_DSP, "dsp_spdifout", ".", "dsp" }, + { SND_DEV_DSP, "dsp_spdifin", ".", "dsp" }, }; static void diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index d2ec480b45b0..5a750440cbea 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -228,45 +228,17 @@ struct snd_mixer; #define AFMT_NE (AFMT_SIGNED_NE | AFMT_U8_NE | AFMT_U16_NE | \ AFMT_U24_NE | AFMT_U32_NE) -/* - * Minor numbers for the sound driver. - * - * Unfortunately Creative called the codec chip of SB as a DSP. For this - * reason the /dev/dsp is reserved for digitized audio use. There is a - * device for true DSP processors but it will be called something else. - * In v3.0 it's /dev/sndproc but this could be a temporary solution. - */ - -#define SND_DEV_CTL 0 /* Control port /dev/mixer */ -#define SND_DEV_SEQ 1 /* Sequencer /dev/sequencer */ -#define SND_DEV_MIDIN 2 /* Raw midi access */ -#define SND_DEV_DSP 3 /* Digitized voice /dev/dsp */ -#define SND_DEV_AUDIO 4 /* Sparc compatible /dev/audio */ -#define SND_DEV_DSP16 5 /* Like /dev/dsp but 16 bits/sample */ -#define SND_DEV_STATUS 6 /* /dev/sndstat */ - /* #7 not in use now. */ -#define SND_DEV_SEQ2 8 /* /dev/sequencer, level 2 interface */ -#define SND_DEV_SNDPROC 9 /* /dev/sndproc for programmable devices */ -#define SND_DEV_PSS SND_DEV_SNDPROC /* ? */ -#define SND_DEV_NORESET 10 - -#define SND_DEV_DSPHW_PLAY 11 /* specific playback channel */ -#define SND_DEV_DSPHW_VPLAY 12 /* specific virtual playback channel */ -#define SND_DEV_DSPHW_REC 13 /* specific record channel */ -#define SND_DEV_DSPHW_VREC 14 /* specific virtual record channel */ - -#define SND_DEV_DSPHW_CD 15 /* s16le/stereo 44100Hz CD */ - -/* - * OSSv4 compatible device. For now, it serve no purpose and - * the cloning itself will forward the request to ordinary /dev/dsp - * instead. - */ -#define SND_DEV_DSP_MMAP 16 /* /dev/dsp_mmap */ -#define SND_DEV_DSP_AC3 17 /* /dev/dsp_ac3 */ -#define SND_DEV_DSP_MULTICH 18 /* /dev/dsp_multich */ -#define SND_DEV_DSP_SPDIFOUT 19 /* /dev/dsp_spdifout */ -#define SND_DEV_DSP_SPDIFIN 20 /* /dev/dsp_spdifin */ +enum { + SND_DEV_CTL = 0, /* Control port /dev/mixer */ + SND_DEV_SEQ, /* Sequencer /dev/sequencer */ + SND_DEV_MIDIN, /* Raw midi access */ + SND_DEV_DSP, /* Digitized voice /dev/dsp */ + SND_DEV_STATUS, /* /dev/sndstat */ + SND_DEV_DSPHW_PLAY, /* specific playback channel */ + SND_DEV_DSPHW_VPLAY, /* specific virtual playback channel */ + SND_DEV_DSPHW_REC, /* specific record channel */ + SND_DEV_DSPHW_VREC, /* specific virtual record channel */ +}; #define DSP_DEFAULT_SPEED 8000 From nobody Fri May 17 19:31:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs72rT6z5Lg00; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs66pYGz4vNT; Fri, 17 May 2024 19:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+87ht6JG6/m5HegufX0Xx/dte2Eq0sqTzPMS8CyjT8=; b=biiEd2McebxQ+NXEhWr0vecZdGSLp93q+jXZRLwaPfr1dwtUSupiC8brwF6t8pmF2InlXX mGd1XwONGplETtI2TCirqrQNHh6XRfxq/SBeyp3tJr0+H+8mbHzzemmctK7wZ/UZLSh39Z RfRVUa21WE/zbhYyQG4ce8l4ajr+JG76UE1mu0wTqtoooRgmzwXltId7AtR8vFQUxDdei+ h9sh9thXGWBmjOi26h4/wbD46s0mtrfbWtay8rV37bqlHN8aObLCMXclx5ulhbgXU+JR+h sW++irRcNegbmuIff+qjRc43j4ETFeLehbHFCf6nQh+QiRIREq7cy8tLWJQIeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974267; a=rsa-sha256; cv=none; b=MKChAtmNrO97VWDIKzP3ErWHbczsjI2lJk6Sj2Ca/OU++HB1RqaelC9VK6316eBZ1/XEm6 XNkxOIkr+BwoILlrBsJbY9cL7n46NlAu8PYVmG7ORdMrUNtEB6AURCJZ6vojlhho+oBNP2 wcYSQbCMpuv2pC2wOnHwbTzFi9VFDRGrwgDJ8tVvpa6nJapxEtmpdPyPvMpfBa1m+Y9Ok6 afe7b/qopWjTcHJH4kL6YXA+biOsre57ed7u3oPygRS91z8/cy8gg95SRSGNna/hnyZsPU 7L/Pu5e5Vt2DHXjROglzdKlCTknn3wW36diggzabtlMpnBeNLtXxFu99KtEm0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+87ht6JG6/m5HegufX0Xx/dte2Eq0sqTzPMS8CyjT8=; b=cBCY1Agk9Q+BFO6/sY0jaSMz+7pIKmFSLVtTFaDT7BfSi631jyjTWOcaXHr+Yb5y2cu5R9 lFZTe7na2AnWF0UiFyggrFrig849QfwgGLT2JqkP0JQR6t0A60CPY9xTHelPzr143DlrGv GX9qQsh2vsSESuB51eOUNQWPEwcY+GeEZyF3i4neQMyOucHwd7fD1KJR7hSt3ZP+PcuwVT qGk33lRoXQORnQzyJAik4ntA9bmJK+BcFdUYqTV2c0aePJxWQj3jvaI/7HMJ4S3+wCnzGY UlKTahHgVq/TlQP1r1AwCTPknuRdA9SPL1TAYa1OSZoOJ3T3Mpg8IHUpr1xLxQ== 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 4Vgxs66QwrzvfF; Fri, 17 May 2024 19:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV6IN099856; Fri, 17 May 2024 19:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV6rT099853; Fri, 17 May 2024 19:31:06 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:06 GMT Message-Id: <202405171931.44HJV6rT099853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 00b0cbf98bb7 - stable/14 - sound: Use nitems() where possible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00b0cbf98bb79298446f469d81b4d2eefe06be46 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=00b0cbf98bb79298446f469d81b4d2eefe06be46 commit 00b0cbf98bb79298446f469d81b4d2eefe06be46 Author: Christos Margiolis AuthorDate: 2024-05-06 18:32:35 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Use nitems() where possible No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D45014 (cherry picked from commit c597c557923288eff527594619a692a44ade909a) --- sys/dev/sound/pci/atiixp.c | 4 ++-- sys/dev/sound/pci/hda/hdaa.c | 11 +++++++---- sys/dev/sound/pci/ich.c | 4 ++-- sys/dev/sound/pci/maestro3.c | 4 ++-- sys/dev/sound/pcm/dsp.c | 4 ++-- sys/dev/sound/pcm/feeder_format.c | 15 ++++++--------- sys/dev/sound/pcm/feeder_matrix.c | 4 ++-- sys/dev/sound/pcm/feeder_volume.c | 2 +- sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/pcm/sound.c | 5 +++-- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index dcbf041f9605..eeb28bb08276 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -1168,12 +1168,12 @@ atiixp_release_resource(struct atiixp_info *sc) static int atiixp_pci_probe(device_t dev) { - int i; + size_t i; uint16_t devid, vendor; vendor = pci_get_vendor(dev); devid = pci_get_device(dev); - for (i = 0; i < sizeof(atiixp_hw) / sizeof(atiixp_hw[0]); i++) { + for (i = 0; i < nitems(atiixp_hw); i++) { if (vendor == atiixp_hw[i].vendor && devid == atiixp_hw[i].devid) { device_set_desc(dev, atiixp_hw[i].desc); diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index dcd10cb36510..e8d9ee12fffc 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -267,7 +267,8 @@ hdaa_channels_handler(struct hdaa_audio_as *as) struct hdaa_chan *ch = &devinfo->chans[as->chans[0]]; struct hdaa_widget *w; uint8_t *eld; - int i, total, sub, assume, channels; + int total, sub, assume, channels; + size_t i; uint16_t cpins, upins, tpins; cpins = upins = 0; @@ -347,7 +348,7 @@ hdaa_channels_handler(struct hdaa_audio_as *as) printf("\n"); ); /* Look for maximal fitting matrix. */ - for (i = 0; i < sizeof(matrixes) / sizeof(struct matrix); i++) { + for (i = 0; i < nitems(matrixes); i++) { if (as->pinset != 0 && matrixes[i].analog == 0) continue; if ((matrixes[i].m.mask & ~channels) == 0) { @@ -1252,7 +1253,8 @@ hdaa_sysctl_config(SYSCTL_HANDLER_ARGS) static void hdaa_config_fetch(const char *str, uint32_t *on, uint32_t *off) { - int i = 0, j, k, len, inv; + size_t k; + int i = 0, j, len, inv; for (;;) { while (str[i] != '\0' && @@ -1292,7 +1294,8 @@ static int hdaa_sysctl_quirks(SYSCTL_HANDLER_ARGS) { char buf[256]; - int error, n = 0, i; + int error, n = 0; + size_t i; uint32_t quirks, quirks_off; quirks = *(uint32_t *)oidp->oid_arg1; diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index fbde0accfd28..910a371c6653 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -860,12 +860,12 @@ ich_init(struct sc_info *sc) static int ich_pci_probe(device_t dev) { - int i; + size_t i; uint16_t devid, vendor; vendor = pci_get_vendor(dev); devid = pci_get_device(dev); - for (i = 0; i < sizeof(ich_devs)/sizeof(ich_devs[0]); i++) { + for (i = 0; i < nitems(ich_devs); i++) { if (vendor == ich_devs[i].vendor && devid == ich_devs[i].devid) { device_set_desc(dev, ich_devs[i].name); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 6dd54a66f683..4d6dca310eea 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -488,7 +488,7 @@ m3_pchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel DMAC_BLOCKF_SELECTOR); /* set an armload of static initializers */ - for(i = 0 ; i < (sizeof(pv) / sizeof(pv[0])) ; i++) { + for(i = 0 ; i < nitems(pv); i++) { m3_wr_assp_data(sc, ch->dac_data + pv[i].addr, pv[i].val); } @@ -862,7 +862,7 @@ m3_rchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel DMAC_PAGE3_SELECTOR + DMAC_BLOCKF_SELECTOR); /* set an armload of static initializers */ - for(i = 0 ; i < (sizeof(rv) / sizeof(rv[0])) ; i++) { + for(i = 0 ; i < nitems(rv); i++) { m3_wr_assp_data(sc, ch->adc_data + rv[i].addr, rv[i].val); } diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 6c3d76e27b6b..fe816db54697 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1966,7 +1966,7 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev) { struct snddev_info *d; - int i; + size_t i; if (*dev != NULL) return; @@ -2017,7 +2017,7 @@ SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); char * dsp_unit2name(char *buf, size_t len, struct pcm_channel *ch) { - int i; + size_t i; KASSERT(buf != NULL && len != 0, ("bogus buf=%p len=%ju", buf, (uintmax_t)len)); diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 1e18e3e07450..3bdd808df0ee 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -115,16 +115,13 @@ static const struct { } }; -#define FEEDFORMAT_TAB_SIZE \ - ((int32_t)(sizeof(feed_format_ops) / sizeof(feed_format_ops[0]))) - static int feed_format_init(struct pcm_feeder *f) { struct feed_format_info *info; intpcm_read_t *rd_op; intpcm_write_t *wr_op; - int i; + size_t i; if (f->desc->in == f->desc->out || AFMT_CHANNEL(f->desc->in) != AFMT_CHANNEL(f->desc->out)) @@ -133,7 +130,7 @@ feed_format_init(struct pcm_feeder *f) rd_op = NULL; wr_op = NULL; - for (i = 0; i < FEEDFORMAT_TAB_SIZE && + for (i = 0; i < nitems(feed_format_ops) && (rd_op == NULL || wr_op == NULL); i++) { if (rd_op == NULL && AFMT_ENCODING(f->desc->in) == feed_format_ops[i].format) @@ -276,9 +273,9 @@ FEEDER_DECLARE(feeder_format, NULL); intpcm_read_t * feeder_format_read_op(uint32_t format) { - int i; + size_t i; - for (i = 0; i < FEEDFORMAT_TAB_SIZE; i++) { + for (i = 0; i < nitems(feed_format_ops); i++) { if (AFMT_ENCODING(format) == feed_format_ops[i].format) return (feed_format_ops[i].read); } @@ -289,9 +286,9 @@ feeder_format_read_op(uint32_t format) intpcm_write_t * feeder_format_write_op(uint32_t format) { - int i; + size_t i; - for (i = 0; i < FEEDFORMAT_TAB_SIZE; i++) { + for (i = 0; i < nitems(feed_format_ops); i++) { if (AFMT_ENCODING(format) == feed_format_ops[i].format) return (feed_format_ops[i].write); } diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index f5f02e2bf4f5..97cf86585636 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -230,7 +230,7 @@ feed_matrix_reset(struct feed_matrix_info *info) { uint32_t i, j; - for (i = 0; i < (sizeof(info->matrix) / sizeof(info->matrix[0])); i++) { + for (i = 0; i < nitems(info->matrix); i++) { for (j = 0; j < (sizeof(info->matrix[i].chn) / sizeof(info->matrix[i].chn[0])); j++) { @@ -679,7 +679,7 @@ feeder_matrix_compare(struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out) m_in->mask != m_out->mask) return (1); - for (i = 0; i < (sizeof(m_in->map) / sizeof(m_in->map[0])); i++) { + for (i = 0; i < nitems(m_in->map); i++) { if (m_in->map[i].type != m_out->map[i].type) return (1); if (m_in->map[i].type == SND_CHN_T_MAX) diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 452d8788a5a5..7e600c131afe 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -337,7 +337,7 @@ feeder_volume_apply_matrix(struct pcm_feeder *f, struct pcmchan_matrix *m) info = f->data; - for (i = 0; i < (sizeof(info->matrix) / sizeof(info->matrix[0])); i++) { + for (i = 0; i < nitems(info->matrix); i++) { if (i < m->channels) info->matrix[i] = m->map[i].type; else diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 3e197b120c9d..4e67a0227506 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -650,7 +650,7 @@ mixer_obj_create(device_t dev, kobj_class_t cls, void *devinfo, int type, const char *desc) { struct snd_mixer *m; - int i; + size_t i; KASSERT(dev != NULL && cls != NULL && devinfo != NULL, ("%s(): NULL data dev=%p cls=%p devinfo=%p", @@ -671,7 +671,7 @@ mixer_obj_create(device_t dev, kobj_class_t cls, void *devinfo, m->devinfo = devinfo; m->busy = 0; m->dev = dev; - for (i = 0; i < (sizeof(m->parent) / sizeof(m->parent[0])); i++) { + for (i = 0; i < nitems(m->parent); i++) { m->parent[i] = SOUND_MIXER_NONE; m->child[i] = 0; m->realdev[i] = i; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index d2acfc403e8c..afa19f9f0624 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -880,7 +880,8 @@ sound_oss_sysinfo(oss_sysinfo *si) struct snddev_info *d; struct pcm_channel *c; - int i, j, ncards; + int j, ncards; + size_t i; ncards = 0; @@ -958,7 +959,7 @@ sound_oss_sysinfo(oss_sysinfo *si) * Si->filler is a reserved array, but according to docs each * element should be set to -1. */ - for (i = 0; i < sizeof(si->filler)/sizeof(si->filler[0]); i++) + for (i = 0; i < nitems(si->filler); i++) si->filler[i] = -1; } From nobody Fri May 17 19:31:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs81ZNJz5LgCX; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs80Xqtz4vL6; Fri, 17 May 2024 19:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ur0pnZnstyFqpgOmu+FMwGHpoxVKWD1dI9MtsKaj6JU=; b=kaviHFYBGDJs3wxvaCySldaG7FIMJhqsid0jnK6/J4CfH+cOOPiejU7OFNI1SUz3rRJHp6 lWmbV3HMOt9OXCJWWu5MzoybTr22kAi4sSNBirHLdL2Z4Dj94pk5UpEPfH70TfJtucPw8a R7GGNrY9HJ6S9kzR9T0CtInbWE9gWlMDEi3R5+W1o9Vn9tQhPfjNz+n7zvmIJo/uAz2228 ZVmXyhfRVSyVOvQeZAvimOfRKOEj+6mRuKL9BNhs7cP8lR2L0uaiQW9p/+f6CI98o0r7Rd u4EDFr7bm6JTd8zLo57PRefArH9FZk/LnRrDXbxr3mJ8y5kOrs6l36rg2OXouQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974268; a=rsa-sha256; cv=none; b=uIGeidbsmbH8Wv7NLmOK8jeECrC7NGZ1vLUmqrXXBiPh9CcfEGQcpJGgMsgiwDOATO0a4/ ogND9thLP/5IVsY8y+8mOSkSREGmeaVm2S2QzEsUlouR/sWJgFtgAJ3UQr0fhB6PEsetLi igJDtMynCvIAqNGngbYCb1oKF7MT+qB4R1ezEbbDKWiiasYP7CkaqWBLAUdHNMcwWDgBQf C661XiYj5HpeyZtABDjspS6quczRkZV4Jkaiwm7PJqge/48j50mjjZGzfMjMgNjS5hzqja t28ehegwAPsvHR8RTVABDod9DIq8yQ9RiDBwvnQZYxHd4z2zyrH82UhflLVUhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ur0pnZnstyFqpgOmu+FMwGHpoxVKWD1dI9MtsKaj6JU=; b=cPkb1marPdxgTxE5TjRV74HDPRpDy4ART4rvx1U7xcChw21i6ozF7tGafhskVd83LJjgK9 L+USxxwg+PY04myKEwxgHNRz1WSiZqD8yE5ZoRfsZmZqf84CjnUfMVZ7R0AJJDjdboO+k+ cq4EHhOVvHutqt12PndUyfKutA3K5eUPgrHdyynxYLVk5cxIgYaxPFLgS351WjoiCW/Ezv UbEpn9snvS7XbOP44Qyci2wEU+ozz0vbmQJXQCZCKCHTVU4497Z5flfpfgiB3+C+7bkoAU Y7eb/31J2U8iSolC0T7SIlhfXHqfpsgFITBXcnCqhbP9KvZ5wNK0ec31CxVp+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 4Vgxs808m5zvvq; Fri, 17 May 2024 19:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV7jp099901; Fri, 17 May 2024 19:31:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV7lj099898; Fri, 17 May 2024 19:31:07 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:07 GMT Message-Id: <202405171931.44HJV7lj099898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ab7c01f9e82c - stable/14 - sound: Move vchan-related code to pcm/vchan.* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab7c01f9e82cbf63d3b51d392ebfa1112bea14ef Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ab7c01f9e82cbf63d3b51d392ebfa1112bea14ef commit ab7c01f9e82cbf63d3b51d392ebfa1112bea14ef Author: Christos Margiolis AuthorDate: 2024-05-06 18:32:46 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Move vchan-related code to pcm/vchan.* pcm/sound.* contains code that should be part of pcm/vchan.*. Changes: - pcm_setvchans() -> vchan_setnew() - pcm_setmaxautovchans() -> vchan_setmaxauto() - hw.snd.maxautovchans moved to pcm/vchan.c - snd_maxautovchans declaration moved to pcm/vchan.h and definition to pcm/vchan.c Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45015 (cherry picked from commit 7ad5f383fcb507482d5606c8eb7a324b3621a9db) --- sys/dev/sound/pcm/feeder.c | 1 + sys/dev/sound/pcm/sound.c | 176 +-------------------------------------------- sys/dev/sound/pcm/sound.h | 2 - sys/dev/sound/pcm/vchan.c | 173 +++++++++++++++++++++++++++++++++++++++++++- sys/dev/sound/pcm/vchan.h | 5 ++ 5 files changed, 180 insertions(+), 177 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 78443ad76140..0113299bd0d4 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -32,6 +32,7 @@ #endif #include +#include #include "feeder_if.h" diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index afa19f9f0624..971054261030 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -56,8 +56,6 @@ static int snd_unit_auto = -1; SYSCTL_INT(_hw_snd, OID_AUTO, default_auto, CTLFLAG_RWTUN, &snd_unit_auto, 0, "assign default unit to a newly attached device"); -int snd_maxautovchans = 16; - SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Sound driver"); @@ -111,126 +109,6 @@ snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand return bus_setup_intr(dev, res, flags, NULL, hand, param, cookiep); } -int -pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num) -{ - struct pcm_channel *c, *ch, *nch; - struct pcmchan_caps *caps; - int i, err, vcnt; - - PCM_BUSYASSERT(d); - - if ((direction == PCMDIR_PLAY && d->playcount < 1) || - (direction == PCMDIR_REC && d->reccount < 1)) - return (ENODEV); - - if (!(d->flags & SD_F_AUTOVCHAN)) - return (EINVAL); - - if (newcnt < 0 || newcnt > SND_MAXVCHANS) - return (E2BIG); - - if (direction == PCMDIR_PLAY) - vcnt = d->pvchancount; - else if (direction == PCMDIR_REC) - vcnt = d->rvchancount; - else - return (EINVAL); - - if (newcnt > vcnt) { - KASSERT(num == -1 || - (num >= 0 && num < SND_MAXVCHANS && (newcnt - 1) == vcnt), - ("bogus vchan_create() request num=%d newcnt=%d vcnt=%d", - num, newcnt, vcnt)); - /* add new vchans - find a parent channel first */ - ch = NULL; - CHN_FOREACH(c, d, channels.pcm) { - CHN_LOCK(c); - if (c->direction == direction && - ((c->flags & CHN_F_HAS_VCHAN) || (vcnt == 0 && - c->refcount < 1 && - !(c->flags & (CHN_F_BUSY | CHN_F_VIRTUAL))))) { - /* - * Reuse hw channel with vchans already - * created. - */ - if (c->flags & CHN_F_HAS_VCHAN) { - ch = c; - break; - } - /* - * No vchans ever created, look for - * channels with supported formats. - */ - caps = chn_getcaps(c); - if (caps == NULL) { - CHN_UNLOCK(c); - continue; - } - for (i = 0; caps->fmtlist[i] != 0; i++) { - if (caps->fmtlist[i] & AFMT_CONVERTIBLE) - break; - } - if (caps->fmtlist[i] != 0) { - ch = c; - break; - } - } - CHN_UNLOCK(c); - } - if (ch == NULL) - return (EBUSY); - ch->flags |= CHN_F_BUSY; - err = 0; - while (err == 0 && newcnt > vcnt) { - err = vchan_create(ch, num); - if (err == 0) - vcnt++; - else if (err == E2BIG && newcnt > vcnt) - device_printf(d->dev, - "%s: err=%d Maximum channel reached.\n", - __func__, err); - } - if (vcnt == 0) - ch->flags &= ~CHN_F_BUSY; - CHN_UNLOCK(ch); - if (err != 0) - return (err); - } else if (newcnt < vcnt) { - KASSERT(num == -1, - ("bogus vchan_destroy() request num=%d", num)); - CHN_FOREACH(c, d, channels.pcm) { - CHN_LOCK(c); - if (c->direction != direction || - CHN_EMPTY(c, children) || - !(c->flags & CHN_F_HAS_VCHAN)) { - CHN_UNLOCK(c); - continue; - } - CHN_FOREACH_SAFE(ch, c, nch, children) { - CHN_LOCK(ch); - if (vcnt == 1 && c->refcount > 0) { - CHN_UNLOCK(ch); - break; - } - if (!(ch->flags & CHN_F_BUSY) && - ch->refcount < 1) { - err = vchan_destroy(ch); - if (err == 0) - vcnt--; - } else - CHN_UNLOCK(ch); - if (vcnt == newcnt) - break; - } - CHN_UNLOCK(c); - break; - } - } - - return (0); -} - /* return error status and a locked channel */ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, @@ -287,7 +165,7 @@ vchan_alloc: /* no channel available */ if (!(vchancount > 0 && vchancount < snd_maxautovchans)) return (err); - err = pcm_setvchans(d, direction, vchancount + 1, -1); + err = vchan_setnew(d, direction, vchancount + 1, -1); if (err == 0) { retry = true; goto retry_chnalloc; @@ -296,25 +174,6 @@ vchan_alloc: return (err); } -static void -pcm_setmaxautovchans(struct snddev_info *d, int num) -{ - PCM_BUSYASSERT(d); - - if (num < 0) - return; - - if (num >= 0 && d->pvchancount > num) - (void)pcm_setvchans(d, PCMDIR_PLAY, num, -1); - else if (num > 0 && d->pvchancount == 0) - (void)pcm_setvchans(d, PCMDIR_PLAY, 1, -1); - - if (num >= 0 && d->rvchancount > num) - (void)pcm_setvchans(d, PCMDIR_REC, num, -1); - else if (num > 0 && d->rvchancount == 0) - (void)pcm_setvchans(d, PCMDIR_REC, 1, -1); -} - static int sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) { @@ -338,37 +197,6 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, default_unit, sizeof(int), sysctl_hw_snd_default_unit, "I", "default sound device"); -static int -sysctl_hw_snd_maxautovchans(SYSCTL_HANDLER_ARGS) -{ - struct snddev_info *d; - int i, v, error; - - v = snd_maxautovchans; - error = sysctl_handle_int(oidp, &v, 0, req); - if (error == 0 && req->newptr != NULL) { - if (v < 0) - v = 0; - if (v > SND_MAXVCHANS) - v = SND_MAXVCHANS; - snd_maxautovchans = v; - for (i = 0; pcm_devclass != NULL && - i < devclass_get_maxunit(pcm_devclass); i++) { - d = devclass_get_softc(pcm_devclass, i); - if (!PCM_REGISTERED(d)) - continue; - PCM_ACQUIRE_QUICK(d); - pcm_setmaxautovchans(d, v); - PCM_RELEASE_QUICK(d); - } - } - return (error); -} -SYSCTL_PROC(_hw_snd, OID_AUTO, maxautovchans, - CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, 0, sizeof(int), - sysctl_hw_snd_maxautovchans, "I", - "maximum virtual channel"); - void pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) { @@ -549,7 +377,7 @@ pcm_setstatus(device_t dev, char *str) if (d->playcount > 0 || d->reccount > 0) d->flags |= SD_F_AUTOVCHAN; - pcm_setmaxautovchans(d, snd_maxautovchans); + vchan_setmaxauto(d, snd_maxautovchans); strlcpy(d->status, str, SND_STATUSLEN); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 5a750440cbea..e4a3ba41ee7f 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -247,7 +247,6 @@ enum { extern int pcm_veto_load; extern int snd_unit; -extern int snd_maxautovchans; extern int snd_verbose; extern devclass_t pcm_devclass; extern struct unrhdr *pcmsg_unrhdr; @@ -265,7 +264,6 @@ extern struct unrhdr *pcmsg_unrhdr; SYSCTL_DECL(_hw_snd); -int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 1a21b7049b77..9df23298b742 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -57,6 +57,8 @@ struct vchan_info { int trigger; }; +int snd_maxautovchans = 16; + static void * vchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c, int dir) @@ -337,7 +339,7 @@ sysctl_dev_pcm_vchans(SYSCTL_HANDLER_ARGS) cnt = 0; if (cnt > SND_MAXVCHANS) cnt = SND_MAXVCHANS; - err = pcm_setvchans(d, direction, cnt, -1); + err = vchan_setnew(d, direction, cnt, -1); } PCM_RELEASE_QUICK(d); @@ -930,6 +932,175 @@ vchan_sync(struct pcm_channel *c) return (ret); } +int +vchan_setnew(struct snddev_info *d, int direction, int newcnt, int num) +{ + struct pcm_channel *c, *ch, *nch; + struct pcmchan_caps *caps; + int i, err, vcnt; + + PCM_BUSYASSERT(d); + + if ((direction == PCMDIR_PLAY && d->playcount < 1) || + (direction == PCMDIR_REC && d->reccount < 1)) + return (ENODEV); + + if (!(d->flags & SD_F_AUTOVCHAN)) + return (EINVAL); + + if (newcnt < 0 || newcnt > SND_MAXVCHANS) + return (E2BIG); + + if (direction == PCMDIR_PLAY) + vcnt = d->pvchancount; + else if (direction == PCMDIR_REC) + vcnt = d->rvchancount; + else + return (EINVAL); + + if (newcnt > vcnt) { + KASSERT(num == -1 || + (num >= 0 && num < SND_MAXVCHANS && (newcnt - 1) == vcnt), + ("bogus vchan_create() request num=%d newcnt=%d vcnt=%d", + num, newcnt, vcnt)); + /* add new vchans - find a parent channel first */ + ch = NULL; + CHN_FOREACH(c, d, channels.pcm) { + CHN_LOCK(c); + if (c->direction == direction && + ((c->flags & CHN_F_HAS_VCHAN) || (vcnt == 0 && + c->refcount < 1 && + !(c->flags & (CHN_F_BUSY | CHN_F_VIRTUAL))))) { + /* + * Reuse hw channel with vchans already + * created. + */ + if (c->flags & CHN_F_HAS_VCHAN) { + ch = c; + break; + } + /* + * No vchans ever created, look for + * channels with supported formats. + */ + caps = chn_getcaps(c); + if (caps == NULL) { + CHN_UNLOCK(c); + continue; + } + for (i = 0; caps->fmtlist[i] != 0; i++) { + if (caps->fmtlist[i] & AFMT_CONVERTIBLE) + break; + } + if (caps->fmtlist[i] != 0) { + ch = c; + break; + } + } + CHN_UNLOCK(c); + } + if (ch == NULL) + return (EBUSY); + ch->flags |= CHN_F_BUSY; + err = 0; + while (err == 0 && newcnt > vcnt) { + err = vchan_create(ch, num); + if (err == 0) + vcnt++; + else if (err == E2BIG && newcnt > vcnt) + device_printf(d->dev, + "%s: err=%d Maximum channel reached.\n", + __func__, err); + } + if (vcnt == 0) + ch->flags &= ~CHN_F_BUSY; + CHN_UNLOCK(ch); + if (err != 0) + return (err); + } else if (newcnt < vcnt) { + KASSERT(num == -1, + ("bogus vchan_destroy() request num=%d", num)); + CHN_FOREACH(c, d, channels.pcm) { + CHN_LOCK(c); + if (c->direction != direction || + CHN_EMPTY(c, children) || + !(c->flags & CHN_F_HAS_VCHAN)) { + CHN_UNLOCK(c); + continue; + } + CHN_FOREACH_SAFE(ch, c, nch, children) { + CHN_LOCK(ch); + if (vcnt == 1 && c->refcount > 0) { + CHN_UNLOCK(ch); + break; + } + if (!(ch->flags & CHN_F_BUSY) && + ch->refcount < 1) { + err = vchan_destroy(ch); + if (err == 0) + vcnt--; + } else + CHN_UNLOCK(ch); + if (vcnt == newcnt) + break; + } + CHN_UNLOCK(c); + break; + } + } + + return (0); +} + +void +vchan_setmaxauto(struct snddev_info *d, int num) +{ + PCM_BUSYASSERT(d); + + if (num < 0) + return; + + if (num >= 0 && d->pvchancount > num) + (void)vchan_setnew(d, PCMDIR_PLAY, num, -1); + else if (num > 0 && d->pvchancount == 0) + (void)vchan_setnew(d, PCMDIR_PLAY, 1, -1); + + if (num >= 0 && d->rvchancount > num) + (void)vchan_setnew(d, PCMDIR_REC, num, -1); + else if (num > 0 && d->rvchancount == 0) + (void)vchan_setnew(d, PCMDIR_REC, 1, -1); +} + +static int +sysctl_hw_snd_maxautovchans(SYSCTL_HANDLER_ARGS) +{ + struct snddev_info *d; + int i, v, error; + + v = snd_maxautovchans; + error = sysctl_handle_int(oidp, &v, 0, req); + if (error == 0 && req->newptr != NULL) { + if (v < 0) + v = 0; + if (v > SND_MAXVCHANS) + v = SND_MAXVCHANS; + snd_maxautovchans = v; + for (i = 0; pcm_devclass != NULL && + i < devclass_get_maxunit(pcm_devclass); i++) { + d = devclass_get_softc(pcm_devclass, i); + if (!PCM_REGISTERED(d)) + continue; + PCM_ACQUIRE_QUICK(d); + vchan_setmaxauto(d, v); + PCM_RELEASE_QUICK(d); + } + } + return (error); +} +SYSCTL_PROC(_hw_snd, OID_AUTO, maxautovchans, + CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, 0, sizeof(int), + sysctl_hw_snd_maxautovchans, "I", "maximum virtual channel"); + void vchan_initsys(device_t dev) { diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h index e2dcc9761261..dcc1d6e9ff32 100644 --- a/sys/dev/sound/pcm/vchan.h +++ b/sys/dev/sound/pcm/vchan.h @@ -30,6 +30,8 @@ #ifndef _SND_VCHAN_H_ #define _SND_VCHAN_H_ +extern int snd_maxautovchans; + int vchan_create(struct pcm_channel *, int); int vchan_destroy(struct pcm_channel *); @@ -45,6 +47,9 @@ int vchan_sync(struct pcm_channel *); sndbuf_getfmt((c)->bufhard) != (c)->parentchannel->format || \ sndbuf_getspd((c)->bufhard) != (c)->parentchannel->speed)) +int vchan_setnew(struct snddev_info *, int, int, int); +void vchan_setmaxauto(struct snddev_info *, int); + void vchan_initsys(device_t); /* From nobody Fri May 17 19:31:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgxs94Nbhz5LgNd; Fri, 17 May 2024 19:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgxs91y2Dz4vgl; Fri, 17 May 2024 19:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjNQWQ0VDddtgeJ94qv34NqQSWKIE7YgoxRjqoSmNj0=; b=wm9amEbh7VFgPUK7IhZpaiNq2J0fkxPDLjvOYzfVqtgjVXwOLslzz1v31ToiVHThwx/e+n J7JbJKxWAIT4SI4XdPYx/FWnoRA2jjoCFy2W+kxtDoNGa2K6lUxPOG2uAx6iBiwNqT8jZe cIvSzoSuNw0cvvHUw6Ivq/kt7lqWRc0Cn0iEtHMGfk2WsqqRvtEeH0GJmrtmPftUkGgCyt D+5bGhJhPtiT3AksMaDnQtqqhrzxUKHvEgqrZTJ5mPcIwuaSkrLn0qG9NM37AmswmMeKtK ouS0xO1YZCsIw56ZGG/cK8eS3Mcd804k7sxOwAvEPJ3LFG90MjGCYWDWmXUFAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974269; a=rsa-sha256; cv=none; b=QTEVNi+dfvh6uA3cPrU2gLaMOBS4whcWFn9IvKUZGgU4PfdRzYk94g07TEsZb69wbkin86 RQlL9QSkM4YaZEYlr8BJr/HvZYnagkE2pxDqMZ/O8PuD9D4DFD+xRHlWghp4beXPtO5fEt 3Pvqe/qWKloiYh4IYWXIDk2FdzAoSsUWydyX2VL9eHTcH1smLxnDNmmwfhHpE+/Pk17BIg iWP5ZJ33aLvUTrc0IuhDyglQL6ewJV5cCouXrWo+JsAp8hB8INyXVJRg7qTYwqPhG46J2N WgD//yEvdcC0RmpM7FlqsDwiCmCWi04KG3F3Cnxq+wmgMScTv3zIP5uxoFUKFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjNQWQ0VDddtgeJ94qv34NqQSWKIE7YgoxRjqoSmNj0=; b=GgqoEtDiNFwmK/njLqKSEujhjGwJgZGrvXLHc6DkK6gbmDbW9HQtcKFgHKDFKM3CS3gsUg G+rdFXFQ9dpPb6lywfVKscqdGqpn6oNTAyI3ME/XO+yaP34y7yLkAcKy1KnF+bhXw1spnC ighPPsVC7WJ/H7LZjYM+AAmEnckmkjsrhLwI66XHyf+H6tK3gbzu2sOLtapNlC3ruhz8d6 1Yj1WpBaXSTU/QxsGHf1Nny2ZTNeIuWYEuCa5J0ADxD8rZeusD2DUmI+BIfiYhtQQVEoVO 8HbDUuljrFZQhQze7YzqAQdDEYv2B7hvjvR5IML9PYTq6+FCB13reALCu4y9zw== 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 4Vgxs91YWVzvvr; Fri, 17 May 2024 19:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJV9Rq099946; Fri, 17 May 2024 19:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV9Kh099943; Fri, 17 May 2024 19:31:09 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:09 GMT Message-Id: <202405171931.44HJV9Kh099943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 99e372420df4 - stable/14 - sound: Rename pcm_getparentchannel() to vchan_getparentchannel() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99e372420df4a8f1905b43c0f905de4a56795037 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=99e372420df4a8f1905b43c0f905de4a56795037 commit 99e372420df4a8f1905b43c0f905de4a56795037 Author: Christos Margiolis AuthorDate: 2024-05-06 18:32:57 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Rename pcm_getparentchannel() to vchan_getparentchannel() Follow the rest of the vchan.c naming convention. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D45016 (cherry picked from commit 77ab4263bc42a5dcc102bbea39ce4f7f46b8d4f8) --- sys/dev/sound/pcm/vchan.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 9df23298b742..904ce6661675 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -251,7 +251,7 @@ static kobj_method_t vchan_methods[] = { CHANNEL_DECLARE(vchan); static void -pcm_getparentchannel(struct snddev_info *d, +vchan_getparentchannel(struct snddev_info *d, struct pcm_channel **wrch, struct pcm_channel **rdch) { struct pcm_channel **ch, *wch, *rch, *c; @@ -380,9 +380,9 @@ sysctl_dev_pcm_vchanmode(SYSCTL_HANDLER_ARGS) PCM_UNLOCK(d); if (direction == PCMDIR_PLAY) - pcm_getparentchannel(d, &c, NULL); + vchan_getparentchannel(d, &c, NULL); else - pcm_getparentchannel(d, NULL, &c); + vchan_getparentchannel(d, NULL, &c); if (c == NULL) { PCM_RELEASE_QUICK(d); @@ -482,9 +482,9 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) PCM_UNLOCK(d); if (direction == PCMDIR_PLAY) - pcm_getparentchannel(d, &c, NULL); + vchan_getparentchannel(d, &c, NULL); else - pcm_getparentchannel(d, NULL, &c); + vchan_getparentchannel(d, NULL, &c); if (c == NULL) { PCM_RELEASE_QUICK(d); @@ -591,9 +591,9 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS) PCM_UNLOCK(d); if (direction == PCMDIR_PLAY) - pcm_getparentchannel(d, &c, NULL); + vchan_getparentchannel(d, &c, NULL); else - pcm_getparentchannel(d, NULL, &c); + vchan_getparentchannel(d, NULL, &c); if (c == NULL) { PCM_RELEASE_QUICK(d); From nobody Fri May 17 19:31:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsB3tyfz5LgR7; Fri, 17 May 2024 19:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsB2rTnz4vZ5; Fri, 17 May 2024 19:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EshoxT94u4VppSdJj7+4lzIL+TEI/Vf4QU89UHkflU=; b=l615tQ6ee0eXstynnkvMbhDE74SIB51P7r4Iy6HW1NhK8FaFUuTC+fT0B0FHEWrYf9+wv+ N3XEVZBodIkVEnKOD/wWq6iBafl0Z0/nms+BTzbpU/LqBGMlDKbjgWQP3u7FNFS4Hjveb8 84J/Lf38qA3Wpvvupf+7wwfzamhA6EPVwCM4g4Yi2syp6tYj0uVabEHf18BSBdTyN8EgW1 A03xSPqa8u21FKfEM1Y7GAwm3eDLAeNGTjxvAH4iGHsU6dwu8fA1IQzThO+NgjkmnXvpy2 +Su1zJyt4x9Vr+W1m+d7UIstFLfGVve2UWCX3DEg8jKF4t/o7s+j/rfu+sZyzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974270; a=rsa-sha256; cv=none; b=O+fdHKxCOrGYFNg7UDcWCABXUu+79KxoouuxS31U3HhbuGAgvnjotzQg2vDU3r2uwVwDNG +xbMWSYW/bV/67YbZdV/N2Ca/YyijwY0rK3OEgOgkW6U06sxe2vwhtV+epUd8rHyQkxNJ/ 3/vYuGqCyVE72/EXTHDY8VgXDRdVoWQesUbtxIvgIJZ09hng2EMVWKFETzqIhy5gh9U1vQ BJk7df3fUXlsYJ3J2vkScuQa3SSkm2d/M7nnIhSU6Lb+PlTdtZaUB7Uc1338XSnKjCUtGS oBvW9FcVd6NUpJo3j5u+Dcdjm+42hZDWv0/WsSmAX8GAj3WL+myi93NABpsN8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EshoxT94u4VppSdJj7+4lzIL+TEI/Vf4QU89UHkflU=; b=dVHvXNkH7e5UOJlFoaBpuvuSyk9bMrdhtVMMRMRdbBMF3Vb4xDnfQ0ySRUW8yN/m5rwUKf lfRlZ89bnJ49F1kqcx68U7YUkORazRGWCbgYLrroZD46YrqKB70Mx9HN17yrAPNyL2v6xc FK1HwrRV49gFiEIv7J57+HoXcv7LxI2CPoiqkCfKqhCE3/FR7STi6+I6PychldKGQUIkNr QZ8t9/lylenA2AtQ3iByw235esMN0+WmZ1fAUUgLCfCHnvRebmyCSVHx64GvDrTtFZH4CO fpQea5SodFSxoUJcnE81EOn0zgezQYLc2hrw4BYZSOGWriSpvlFraqD1DvO9nA== 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 4VgxsB2SRJzvTq; Fri, 17 May 2024 19:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVAp0000035; Fri, 17 May 2024 19:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVAaP000032; Fri, 17 May 2024 19:31:10 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:10 GMT Message-Id: <202405171931.44HJVAaP000032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 17a50abe0e19 - stable/14 - sound: Remove unused "num" argument from chn_init() and related callers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17a50abe0e195671bd5079537fcc22c0231572f0 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=17a50abe0e195671bd5079537fcc22c0231572f0 commit 17a50abe0e195671bd5079537fcc22c0231572f0 Author: Christos Margiolis AuthorDate: 2024-05-06 18:33:11 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Remove unused "num" argument from chn_init() and related callers It is always -1 (i.e unused). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45095 (cherry picked from commit 3af2beb8b24ba21fb7e7fbd165a79b8eeff37712) --- sys/dev/sound/pcm/channel.c | 11 ++--------- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/sound.c | 4 ++-- sys/dev/sound/pcm/vchan.c | 27 ++++++++++++--------------- sys/dev/sound/pcm/vchan.h | 4 ++-- 5 files changed, 19 insertions(+), 29 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 996cb0cb04f7..846885b9d729 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1159,7 +1159,7 @@ chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd) struct pcm_channel * chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, - int dir, int num, void *devinfo) + int dir, void *devinfo) { struct pcm_channel *c; struct feeder_class *fc; @@ -1169,7 +1169,6 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, PCM_BUSYASSERT(d); PCM_LOCKASSERT(d); - KASSERT(num >= -1, ("invalid num=%d", num)); switch (dir) { case PCMDIR_PLAY: @@ -1207,7 +1206,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto out1; } - unit = (num == -1) ? 0 : num; + unit = 0; if (*pnum >= max || unit >= max) { device_printf(d->dev, "%s(): unit=%d or pnum=%d >= than " @@ -1220,12 +1219,6 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, CHN_FOREACH(c, d, channels.pcm) { if (c->type != type) continue; - if (unit == c->unit && num != -1) { - device_printf(d->dev, - "%s(): channel num=%d already allocated\n", - __func__, unit); - goto out1; - } unit++; if (unit >= max) { device_printf(d->dev, diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6aca089a7c4d..445882a62f0a 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -260,7 +260,7 @@ int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, - kobj_class_t cls, int dir, int num, void *devinfo); + kobj_class_t cls, int dir, void *devinfo); void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); int chn_release(struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 971054261030..17a7138519ac 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -165,7 +165,7 @@ vchan_alloc: /* no channel available */ if (!(vchancount > 0 && vchancount < snd_maxautovchans)) return (err); - err = vchan_setnew(d, direction, vchancount + 1, -1); + err = vchan_setnew(d, direction, vchancount + 1); if (err == 0) { retry = true; goto retry_chnalloc; @@ -274,7 +274,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) PCM_BUSYASSERT(d); PCM_LOCK(d); - ch = chn_init(d, NULL, cls, dir, -1, devinfo); + ch = chn_init(d, NULL, cls, dir, devinfo); if (!ch) { device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", cls->name, dir, devinfo); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 904ce6661675..8ba8138e55f1 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -339,7 +339,7 @@ sysctl_dev_pcm_vchans(SYSCTL_HANDLER_ARGS) cnt = 0; if (cnt > SND_MAXVCHANS) cnt = SND_MAXVCHANS; - err = vchan_setnew(d, direction, cnt, -1); + err = vchan_setnew(d, direction, cnt); } PCM_RELEASE_QUICK(d); @@ -664,7 +664,7 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS) "play.vchanrate" : "rec.vchanrate" int -vchan_create(struct pcm_channel *parent, int num) +vchan_create(struct pcm_channel *parent) { struct snddev_info *d; struct pcm_channel *ch; @@ -700,7 +700,7 @@ vchan_create(struct pcm_channel *parent, int num) } /* create a new playback channel */ - ch = chn_init(d, parent, &vchan_class, direction, num, parent); + ch = chn_init(d, parent, &vchan_class, direction, parent); if (ch == NULL) { PCM_UNLOCK(d); CHN_LOCK(parent); @@ -933,7 +933,7 @@ vchan_sync(struct pcm_channel *c) } int -vchan_setnew(struct snddev_info *d, int direction, int newcnt, int num) +vchan_setnew(struct snddev_info *d, int direction, int newcnt) { struct pcm_channel *c, *ch, *nch; struct pcmchan_caps *caps; @@ -959,10 +959,9 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt, int num) return (EINVAL); if (newcnt > vcnt) { - KASSERT(num == -1 || - (num >= 0 && num < SND_MAXVCHANS && (newcnt - 1) == vcnt), - ("bogus vchan_create() request num=%d newcnt=%d vcnt=%d", - num, newcnt, vcnt)); + KASSERT((newcnt - 1) == vcnt, + ("bogus vchan_create() request newcnt=%d vcnt=%d", + newcnt, vcnt)); /* add new vchans - find a parent channel first */ ch = NULL; CHN_FOREACH(c, d, channels.pcm) { @@ -1004,7 +1003,7 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt, int num) ch->flags |= CHN_F_BUSY; err = 0; while (err == 0 && newcnt > vcnt) { - err = vchan_create(ch, num); + err = vchan_create(ch); if (err == 0) vcnt++; else if (err == E2BIG && newcnt > vcnt) @@ -1018,8 +1017,6 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt, int num) if (err != 0) return (err); } else if (newcnt < vcnt) { - KASSERT(num == -1, - ("bogus vchan_destroy() request num=%d", num)); CHN_FOREACH(c, d, channels.pcm) { CHN_LOCK(c); if (c->direction != direction || @@ -1061,14 +1058,14 @@ vchan_setmaxauto(struct snddev_info *d, int num) return; if (num >= 0 && d->pvchancount > num) - (void)vchan_setnew(d, PCMDIR_PLAY, num, -1); + (void)vchan_setnew(d, PCMDIR_PLAY, num); else if (num > 0 && d->pvchancount == 0) - (void)vchan_setnew(d, PCMDIR_PLAY, 1, -1); + (void)vchan_setnew(d, PCMDIR_PLAY, 1); if (num >= 0 && d->rvchancount > num) - (void)vchan_setnew(d, PCMDIR_REC, num, -1); + (void)vchan_setnew(d, PCMDIR_REC, num); else if (num > 0 && d->rvchancount == 0) - (void)vchan_setnew(d, PCMDIR_REC, 1, -1); + (void)vchan_setnew(d, PCMDIR_REC, 1); } static int diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h index dcc1d6e9ff32..1f0fa058cf71 100644 --- a/sys/dev/sound/pcm/vchan.h +++ b/sys/dev/sound/pcm/vchan.h @@ -32,7 +32,7 @@ extern int snd_maxautovchans; -int vchan_create(struct pcm_channel *, int); +int vchan_create(struct pcm_channel *); int vchan_destroy(struct pcm_channel *); #ifdef SND_DEBUG @@ -47,7 +47,7 @@ int vchan_sync(struct pcm_channel *); sndbuf_getfmt((c)->bufhard) != (c)->parentchannel->format || \ sndbuf_getspd((c)->bufhard) != (c)->parentchannel->speed)) -int vchan_setnew(struct snddev_info *, int, int, int); +int vchan_setnew(struct snddev_info *, int, int); void vchan_setmaxauto(struct snddev_info *, int); void vchan_initsys(device_t); From nobody Fri May 17 19:31:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsC70wLz5Lg49; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsC4J1vz4vZQ; Fri, 17 May 2024 19:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pjule/1pAKYgsU+ss3LcqrK91taudkXLCYCXmW6mHEo=; b=ZRbOjfJ9Iz+vxEs/lM/+Z6oxsY1zLUt/P5DdFRI6VsIFHs2eJxIIzQ75i/YPPMkRXPfOqS 4DB4H0IMjaOaTNCoKtuZ2ozAZ2VcisDt2ifjAs5RyljSW2RRthkySqhMxWAcf9/nBpls+i ZnVUAvxn08naZtpDk3ctgAOnYM2VTxbjzfbK0rndLNn8qZtANKM46EdvoopHgcKjl8QEDc EYHUoa2rwpZXGqa81w/WfTu5aD1ruvgOvcIR7byJlfC11pu/fU7/XB5BAeE8CzG0BW7qdi 12v7G6KY+or3wE/ZWemFqLI8tuIblaA6uhAaeTakm79VwwW5j4J06ELwSa2eug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974271; a=rsa-sha256; cv=none; b=vyoIHzDedX+yzENMkdhVCpdRd1eX0CCvjM9XOWXLrhyCahsHo6WCbr9CnuWrZukpqYeQbK apI6JIV00SyaVk7nUH4Q3G6aEGqejmxGAzsS6WzZsRcGm+R8ZmTsJw75FO84ATdlCdFI4D EYTmgoSzIL7Pz69Mkfoc95XGfqJAqt6wAswH1hJEgfpRxri07ba0ymBCxlpPgb3RBr+tp4 TKMMzOKYS7JRlD4HFKgpnCUyqEdJkOEYC/JW67eM1DC3dwHWbT8nB1uM5Px90bVqwOWKet byL1RDT80F9BRf6SqwSCU7gnZ/jjaQf1WN/kye5kVB61kXzL7fZ32tMDadc0vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pjule/1pAKYgsU+ss3LcqrK91taudkXLCYCXmW6mHEo=; b=tYJqY67R54E3wpl09wbqMvALBebuPEqiAGkTjRmGbMoObMqwY2DH4kjZ/6g1Q21n3tnhNa txbMBySWyUJVNzgmdHUSRdH/SfRxcCA8jJ1/atwwPcuzwBZ0Bx7uFq9BvCkWeb+H6N5EcA hQHSmzwtfYu/GMRNA0rb0YHjgOMMKscfx1hTlV9nKx7T+VBU93qyJ9DLkwCqrlIml4u0sF QphLDLgkZOdxGc9rGQgvHWI9DvqBFw5uZJoF2yaA/qoS4ku5MOFyC0Qez+wG2D9ghYtE06 +5OKZrjVlH3nezAxZNhKpOx65Jy7YvfNeLey1/PrGH/zTjGfFwvfbnXaWJM0pg== 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 4VgxsC3vKJztyZ; Fri, 17 May 2024 19:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVBmJ000077; Fri, 17 May 2024 19:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVBXE000074; Fri, 17 May 2024 19:31:11 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:11 GMT Message-Id: <202405171931.44HJVBXE000074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 00f9d84ee207 - stable/14 - sound: Update pcm/vchan.c LICENSE header List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00f9d84ee2077b53325ed52bdaa11f21eab7abf9 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=00f9d84ee2077b53325ed52bdaa11f21eab7abf9 commit 00f9d84ee2077b53325ed52bdaa11f21eab7abf9 Author: Christos Margiolis AuthorDate: 2024-05-06 18:47:33 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Update pcm/vchan.c LICENSE header Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 2b14465faa8dd9d228b764359672b38b4c8ca8c1) --- sys/dev/sound/pcm/vchan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 8ba8138e55f1..528c6fa62621 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -4,6 +4,10 @@ * Copyright (c) 2006-2009 Ariff Abdullah * Copyright (c) 2001 Cameron Grant * All rights reserved. + * Copyright (c) 2024 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * 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 From nobody Fri May 17 19:31:12 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsF1Rrxz5Lg4C; Fri, 17 May 2024 19:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsD5WNnz4vJS; Fri, 17 May 2024 19:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tIBfSVQCG/27v1kHX4qqTouqUg4H+zmSyIrJq8Izds4=; b=M1fyl8B8bgkzy5uWu/B0DuxKdMO45+O3G5n6LHVhFHTpEzKPwr+EprCXBXhfbvdq+t7UEu OFcsrtkaiGGjjifQ5yttaH91X7yKSEHMyAu8o89AsIx2hEvWwnA3ftqR0h7SR6UgYXIM+L l6YBY7NyviJrgqK27utmfLE1yP4EN79u9oG/YCiXLV4HV05DwgGuHkUFtbaihM9sgygCMf ier6N3XEwqhbt489sdYBRd5XBuN4f//TlOKzcZ+gS9j7F1iH8iGkWylllPga/FrGzC+i/K OZ3E4eVoFEBRbx+3doMbQStUa4XlOSenzN9op0LlvRqE/B1grc5+DBvBdCskXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974272; a=rsa-sha256; cv=none; b=ALRNuHT/lN7TFh5K9PrWNf4SvwbmX577G8VoLndUc+6uLmgVsSl50JxucGDge9dtpTUmPm oWiv25xS4MiBQXZ1TApJQVJqSFuNPiPv2yxfLJfC3sN4iBCA+7q67Q3cPB4vNLBGuXStG0 m3QHnDsnMJWKRSYwP4jkTlEh3kghuVBmELpjAyGZre217ROPmRTpNllchQEbISnPcD8UA+ AcbkBGblpA4wPs/6Ef9p3Oz82CVLWVi6HCfMoYiBxrOLQyfQc+/Ty4DfxVYPNrcNT91QGi FJ/DVtwujFlmmtM53f4kRB5KLgqoESVg1h/ReyD6ha+9SIMsIrGs98UfOxGtqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tIBfSVQCG/27v1kHX4qqTouqUg4H+zmSyIrJq8Izds4=; b=rpEtObJTLzkbT5P4MlwOTzL1opWkS7FbaQGPNG6RSktDj3CailwNPjIKpH3jB9cQvL+UDe ypxMtP15D1pQSSAAUueRE6jh1wUwlQy14J/aWOe+w9gTqF86wkZ4z6jrMiQdHhrEnGADpY 1/Ffy7o1Wlx1gkO0N1CUQPgCQ8iOSQ7vOYBjJqqz6ssL8BE9vNlgiKpC1tFrAIgD1EhXTE OclkamVxsVZii4tq65+Z4/N1WZ9qo+V4wSGtM32U0aabfQAA15vGYJ1b6QbP8IR2AXlyTU WNDEZ13ZO44AJRNRnsk71SminOC/aqoc94/JJdTkNeK8HP/BN9d1SRWOtjcErQ== 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 4VgxsD54SJzvfJ; Fri, 17 May 2024 19:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVCC1000122; Fri, 17 May 2024 19:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVC5F000119; Fri, 17 May 2024 19:31:12 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:12 GMT Message-Id: <202405171931.44HJVC5F000119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 71b9b8d34bb7 - stable/14 - arm: Remove stray references to dev/sound/chip.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 71b9b8d34bb7c50179035be0297725210862e43c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=71b9b8d34bb7c50179035be0297725210862e43c commit 71b9b8d34bb7c50179035be0297725210862e43c Author: Christos Margiolis AuthorDate: 2024-05-06 19:35:30 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 arm: Remove stray references to dev/sound/chip.h Fixes: 923e0040a59a ("sound: Move chip.h contents to pcm/sound.h") Reported by: Jenkins CI Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit a3513995f549e2e649b89a1fecbfb351d9825bac) --- sys/arm/allwinner/a10_codec.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_audio.c | 1 - sys/arm/freescale/imx/imx6_ssi.c | 1 - sys/arm/freescale/vybrid/vf_sai.c | 1 - 4 files changed, 4 deletions(-) diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index 05fb25d9b02d..036de684b788 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -41,7 +41,6 @@ #include #include -#include #include #include diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index e0f525fa9520..75a0c81f29a1 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -28,7 +28,6 @@ #endif #include -#include #include "mixer_if.h" diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index 931a2b677eae..6b23334a4e97 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -43,7 +43,6 @@ #include #include -#include #include #include diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 5336dfc6dd57..3b3a120df4e1 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -44,7 +44,6 @@ #include #include -#include #include #include From nobody Fri May 17 19:31:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsG13Qhz5Lg07; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsF6Z3yz4vjn; Fri, 17 May 2024 19:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EfUPUNeH6AM500P13bCCayMMOjPVBj90YvTD0EmGgE=; b=BGPMUq0ZvjiLB4ftgMXDAh8myhfitCNg9RdNgO0u5K6Ce27yT/3zcNK8ZOjRf1uXEBZZgX 8eyX6FwzUOK+DwlXh00znrrPXFowRlwzMBwxQYCJdJQIcUKN0b6GD8H3TgIVyz2dxzHkhw YhtQQRXVQ0NqFysZczpSwMWpz/T/inM6ReGy6GjdADleWatzXtocFU7BqcLTfR24cP9pxn 6qHU+NWHXwE3ko//NXopzgJF6czt/68aO97shCIZDVq23Q2nFR5UTajL6rdouvRI4Hk4p2 rZGscXohibfGZc8K17eWZR9oOU/vH/0VRLPn14G/gxHYeeJF7AMAnyLNzuwPwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974273; a=rsa-sha256; cv=none; b=kPqmtEm7D08QIQ7uBr4IWXbGqqsnObz0iiDLVyfstjEwtZCaipm1lAxH8qGEWAKH3Wx9e6 zo9J00tc/aM2Vg0lB62/3/qPwQFOiSl5XnT7astyn875rcQ3rAP/1RPQBbos/usZCRCQlA STY3fjJ4Q4+YUPH8AEkrHNjbnOFNrX5xK4BGjuwrO4oWWmyJqrpHAlLFnX/u2d/foVoT3F oOvp4aMJpyM3ONJc64QSXjeV+QUBqJsq5nDRxHo1j0fFuGR8PRRldLY7DGH4Ybz6YLXWO4 PzK5NpuRetiXitv1gZr+nPncFe09CuQczVho8b5DZiWvoy+3cxgktbOM9WwThA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EfUPUNeH6AM500P13bCCayMMOjPVBj90YvTD0EmGgE=; b=olKGf/lW5l0Fw7CwB6wngYoFQQm71qVaOVrGuiXUh389y20FuS4QSNLR/UC1mted+X0+J9 7Ree6Om+5vfm+i+aaSHAGecmdRLfOIZ4hAnpg0w+854G1FrgAPgtHm6dZda62w4FIoh6Yw mffmpOtExfyrFd7cNvWPp4A4q9RKts+4Gbk9fCA9Gs2PXPnQ+bjHsw2PUfl1Q+EnGunp9L KHAomHZ+PFkwcttlAvy1PyGB3ztbwKTfnNJ0hUP5sMQR9zTFrbqMwdB9rrwPw1Bqmzw4he IqvYpgC7309sFUwHQoeaszJyIf6BGbnHGVvj8LTaeRkuG/wfvf1KbrH7zzNnRw== 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 4VgxsF6BQ5zvTr; Fri, 17 May 2024 19:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVDfA000167; Fri, 17 May 2024 19:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVD4V000164; Fri, 17 May 2024 19:31:13 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:13 GMT Message-Id: <202405171931.44HJVD4V000164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8b4e2ba31d1b - stable/14 - sound: Remove nmix variable from mixer_oss_mixerinfo() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b4e2ba31d1b171f688cb630f1827ec397ecaacb Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4e2ba31d1b171f688cb630f1827ec397ecaacb commit 8b4e2ba31d1b171f688cb630f1827ec397ecaacb Author: Christos Margiolis AuthorDate: 2024-05-09 19:07:48 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 sound: Remove nmix variable from mixer_oss_mixerinfo() nmix is used to compare against oss_mixerinfo->dev, which is a user-supplied value to select the mixer device (if not -1, in which case we'll select the default one) we want to fetch the information of. It is also used to set oss_mixerinfo->dev in case it is -1. However, nmix is at best redundant, since we have the loop counter already (i), and confusing at worst. For example, suppose a system with 3 mixer devices. We call SNDCTL_MIXERINFO with oss_mixerinfo->dev=1, meaning we want to get information for /dev/mixer1. Suppose /dev/mixer0 detaches while inside the loop, so we'll hit the loop's "continue" case, and nmix won't get incremented (i.e will stay 0 for now). At this point nmix counts 1 device less, so when it reaches 1, we'll be fetching /dev/mixer2's information instead of /dev/mixer1's. This is also true in case the mixer device disappears prior to the call to mixer_oss_mixerinfo(). Simply remove nmix and use the loop counter to both set oss_mixerinfo->dev and check against it in case a non -1 value is supplied. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45135 (cherry picked from commit 2f31a5eb75f1e47b5c49f574e8ce48d2c863e9d3) --- sys/dev/sound/pcm/mixer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 4e67a0227506..a37b94dce43a 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1431,7 +1431,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) { struct snddev_info *d; struct snd_mixer *m; - int nmix, i; + int i; /* * If probing the device handling the ioctl, make sure it's a mixer @@ -1442,7 +1442,6 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) d = NULL; m = NULL; - nmix = 0; /* * There's a 1:1 relationship between mixers and PCM devices, so @@ -1462,7 +1461,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) if (d->mixer_dev != NULL && d->mixer_dev->si_drv1 != NULL && ((mi->dev == -1 && d->mixer_dev == i_dev) || - mi->dev == nmix)) { + mi->dev == i)) { m = d->mixer_dev->si_drv1; mtx_lock(m->lock); @@ -1474,7 +1473,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) * sure to unlock when existing. */ bzero((void *)mi, sizeof(*mi)); - mi->dev = nmix; + mi->dev = i; snprintf(mi->id, sizeof(mi->id), "mixer%d", i); strlcpy(mi->name, m->name, sizeof(mi->name)); mi->modify_counter = m->modify_counter; @@ -1538,8 +1537,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) mi->legacy_device = i; */ mtx_unlock(m->lock); - } else - ++nmix; + } PCM_UNLOCK(d); From nobody Fri May 17 19:31:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsH3gpYz5LgB4; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsH0HVRz4vjx; Fri, 17 May 2024 19:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLtgzeo2z7hCJVeUzcSE6D/3qC65vOwl/hgJ6XieufA=; b=hfxTVKXdyt7CDJQjcw9aD7t8+8mu0v02pTcN71ILsAlKxUd0ylvOqCD0m73fw/GJ/J01ud zEC3RHYJ2lb0cObWaXBYW3tY5evkG6kc01hgn6Lm3GnxUwrp/8IFeQ3//U/7pem4FIClJP D63Id5XeZa+Cjg6m3G2695SXC36m01BzPkAtm72C8PPieKzasQsgZf9DsBT3azvf0dKyIu XKzLZYatEY3pm/fjLwng4outRywnnagfXPA50TL2M0bhj24as908fH4SXkjSwbYQdShKcG QMqSx8pRmlwBpzZj78Sx+RpLdNVieuZrcNsfoso9wGWwxf7DvlbMMqnebWOlng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974275; a=rsa-sha256; cv=none; b=P9IyDqygj1AiZWLmt5p3pZ+BEpmFzknpz02xfxe1MIC/370N8s7E1mEy8dILw4QT9hgJJo 5RGJg4txS35Ja+GV1vbdGdui+lE/ASPFJXm+quXLfxSLC+okx+9S1ufXGjY0tcL0KhUybq fRPXD8Ng/e+j18iceaDcy/GiGnkNMXOmnqQN31PtDu1C0N//vwdz7gabYnGZm9kRnrw3to Iy42LSGz2TYkJg45cRCi0dWSImCcRLgDFbHv9m7pQozBulEA4YrPFV5fdPCsKRYkfkoe4J kocJMRjcypZpssVpBOY0D+HykWBgdFUUDQ4vlBx6NocHdL2aZ7kxhIVcORwVng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLtgzeo2z7hCJVeUzcSE6D/3qC65vOwl/hgJ6XieufA=; b=Yk5dDbUxctdpzg0q9aqwJMPxd+9YYzOoLl/8kv2zYQPqBeeiYsQJeL29rd0aV2X0OBfnE5 C+IPA88Knk7VlsYecVcuSG8BgnanPxnVLKBLZG98OPQ9RClIfBvqEtKAQnaThBFY6rt2zS WoFQgb9mB+5rkr18zAlF3l9MxbT5nPDfaUboAzsEshjTP3OrfCA2DVv+7yTRVIjWvDfz7y 00z1iZHG8dmSrVtawvXJQcMb6yjNOg/fhS62adKRKz686hdGSTEznjfoIhX097XJ41aw9X vW6pIB10AsBeGmp6tGittozEgl29N6Xubkh+sccNATUJ+jG2EqEg7HYpHEUhow== 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 4VgxsG71jPzvvs; Fri, 17 May 2024 19:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVEv9000203; Fri, 17 May 2024 19:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVEB8000200; Fri, 17 May 2024 19:31:14 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:14 GMT Message-Id: <202405171931.44HJVEB8000200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2b3698288771 - stable/14 - sound: Fix oss_sysinfo->numcards List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2b3698288771f6d236212f80b1a259aa86e09fa8 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2b3698288771f6d236212f80b1a259aa86e09fa8 commit 2b3698288771f6d236212f80b1a259aa86e09fa8 Author: Christos Margiolis AuthorDate: 2024-05-09 19:08:01 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 sound: Fix oss_sysinfo->numcards According to the OSS manual, oss_sysinfo->numcards holds the number of detected audio devices in the system, while the current ncards variable, whose value is assigned to oss_sysinfo->numcards, holds the number of currently registered devices only. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch, emaste Differential Revision: https://reviews.freebsd.org/D45136 (cherry picked from commit 59d98edae3e1a6fffd292e4393c49862d624f25f) --- sys/dev/sound/pcm/sound.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 17a7138519ac..3e95fd0e0ea4 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -708,11 +708,9 @@ sound_oss_sysinfo(oss_sysinfo *si) struct snddev_info *d; struct pcm_channel *c; - int j, ncards; + int j; size_t i; - ncards = 0; - strlcpy(si->product, si_product, sizeof(si->product)); strlcpy(si->version, si_version, sizeof(si->version)); si->versionnum = SOUND_VERSION; @@ -720,7 +718,7 @@ sound_oss_sysinfo(oss_sysinfo *si) /* * Iterate over PCM devices and their channels, gathering up data - * for the numaudios, ncards, and openedaudio fields. + * for the numaudios and openedaudio fields. */ si->numaudios = 0; bzero((void *)&si->openedaudio, sizeof(si->openedaudio)); @@ -740,7 +738,6 @@ sound_oss_sysinfo(oss_sysinfo *si) PCM_LOCK(d); si->numaudios += PCM_CHANCOUNT(d); - ++ncards; CHN_FOREACH(c, d, channels.pcm) { CHN_UNLOCKASSERT(c); @@ -771,7 +768,7 @@ sound_oss_sysinfo(oss_sysinfo *si) si->nummidis = 0; si->numtimers = 0; si->nummixers = mixer_count; - si->numcards = ncards; + si->numcards = devclass_get_maxunit(pcm_devclass); /* OSSv4 docs: Intended only for test apps; API doesn't really have much of a concept of cards. Shouldn't be used by applications. */ From nobody Fri May 17 19:31:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsJ3JKfz5LgB6; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsJ1mXZz4vsH; Fri, 17 May 2024 19:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQTNP5lHXqg+Fk6ui45lbveM7+CebE4TmCi/6jJh7/o=; b=uXuWSUC0UQJ/z352OeBgK2kz5OdoLnIMsihplHsW1cw0X8OskBBb7JKIh7D1wZIaP9vFja i1KkjMZC15wqa+RqNiekkprCBBdR4RRmF2N/WKHu3HrYVb7VYrgVu06p2nqQ43If1CKZ60 MJyP/yG/3SohyGByK8XKVb1PcsYouMcTiJq7ujChqbg8I2zkGBU/VqtsJWwOCtMdjUjrzp UphqXMN84eKoHk6tF2xgw0Ls1EGDeGMRzQuD0OYNXHCfWCGQIca1D2qXnY/JmKugP2I9Kh pi5yJLESMeDVL7TrjF+6ZM+wIcifJfVTgN6Jyhx/10yBeo44vBKvYJTHRHDnsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974276; a=rsa-sha256; cv=none; b=BD1xAEZyVfRz8ByhnxHHnu+aWLc8/AlKFPXGJEd+T1L0praDQHx5vlNG/u5M+97iKHLiCg IZxZQ+InNtGjAVVMiiTgwrC2mfx/BoxQWKwEFFbF5rifR2mHtaIRDCTjYnSQ5IqzoDawKs 0VDurlltmF74kHmI2zW21oA43AlmKYZaB6fTudKlNHqof5Sfvfeojbt1qzNSBIDoLQNIvO hPD/fIBrqOp1xGn1T1Lg8/2Xnt9p8dZtkHwTRjUn823zBxAx2DqRjoiCER+YS6JDtlSFZN gSGg0K3K+rgj4r2lmX5WH0r843FEW6Ie2LMZTpleGFlW+9jGXYRXj0TEU9/ANA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQTNP5lHXqg+Fk6ui45lbveM7+CebE4TmCi/6jJh7/o=; b=GGpAi7d15NV54Bnz5M19V004g+xSHdjYvlxZi1uSj9vNAtGqXe9G2meN1kAdjYQpOPIhVd WdC1rtbkpV26wezi6uOmATPUzsdg5zpOS/a353KGGEO9Aqpsq8UZdD2plMIBA0/fRTdeMQ lYoR2fdnG9gqEmacIrECgxbqJLENtsfHpMekGnmofTPnnpPcLbEV2rzUTkdrFDoJryQurX d1yHrn25I9Ly1lD2qtOo+dhq+GhyPC79GkX7KI977zLpQpjyB0G0TURiNZRFFDY8sz0HWZ Es2LUJVOiApP9T4iY+grwxVvB7cRSOg77aw661APV2zNhCoYX0nqTrajW6j+Kw== 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 4VgxsJ1NYYzvgl; Fri, 17 May 2024 19:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVGbZ000260; Fri, 17 May 2024 19:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVGhF000257; Fri, 17 May 2024 19:31:16 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:16 GMT Message-Id: <202405171931.44HJVGhF000257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8bd14f511efa - stable/14 - sound: Add missing oss_mixerinfo devnode and legacy_device fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8bd14f511efa8c2d40c538cff915bb3a822d724f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd14f511efa8c2d40c538cff915bb3a822d724f commit 8bd14f511efa8c2d40c538cff915bb3a822d724f Author: Christos Margiolis AuthorDate: 2024-05-09 19:08:11 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 sound: Add missing oss_mixerinfo devnode and legacy_device fields They are missing from soundcard.h and are in fact used by some applications, such as OSS' ossinfo(1): http://manuals.opensound.com/developer/ossinfo.c.html The new size for filler is chosen according to the most recent official version of soundcard.h, which includes those 2 fields. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45137 (cherry picked from commit e6df8c379b0cf2f6d715d4903fcb1f279e38173e) --- sys/dev/sound/pcm/mixer.c | 11 +++++------ sys/sys/soundcard.h | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index a37b94dce43a..9811496853c8 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1516,6 +1516,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) * Mixer extensions currently aren't supported, so * leave @sa oss_mixerinfo::nrext blank for now. */ + /** * @todo Fill in @sa oss_mixerinfo::priority (requires * touching drivers?) @@ -1529,13 +1530,11 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) * default mixer. Other devices use values 1 to 9 * depending on the estimated probability of being the * default device. - * - * XXX Described by Hannu@4Front, but not found in - * soundcard.h. - strlcpy(mi->devnode, devtoname(d->mixer_dev), - sizeof(mi->devnode)); - mi->legacy_device = i; */ + + snprintf(mi->devnode, sizeof(mi->devnode), "/dev/mixer%d", i); + mi->legacy_device = i; + mtx_unlock(m->lock); } diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h index ddd8a51d29a5..64f57742a52b 100644 --- a/sys/sys/soundcard.h +++ b/sys/sys/soundcard.h @@ -1925,7 +1925,9 @@ typedef struct oss_mixerinfo * as the default mixer. */ int priority; - int filler[254]; /* Reserved */ + oss_devnode_t devnode; + int legacy_device; + int filler[245]; /* Reserved */ } oss_mixerinfo; typedef struct oss_midi_info From nobody Fri May 17 19:31:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsK6ZRvz5LgBB; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsK2n5Nz4vkY; Fri, 17 May 2024 19:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=21eAqP3uXgAFS2gDYd3n2KbSoFt03huGvDM6dQqfFJQ=; b=xdrq5SFAD20CMZ/t6DLwyPvHPDxWKXVPVvgT5SfNrJ6jWUDz1nLYwRibphWbTv70A+Y8Az sMIFTbsqbn9cfhtvQIJ5wLt0hYfG3mkpbNAONhimppQqCUfX2itu2cmiAsTjRRIvLVp97I yFE+7aLLAsA+risEDADxKoDg055JYlYiT1MZM1MjZkL43Th5eGVHoxakrL9YfyWW3VX+AA j6uUWw4WeqwkoPMLecicK/WkU4eBkV77l80krkiOeWpZ9MPPfyWLxS7Un67A9QqI2atC0i HPqyNaAnPDyv+zcrIBbsaT4mNhLdKICEscATkrQlomuUouMWK4U9OqEc+IZGsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974277; a=rsa-sha256; cv=none; b=ts56gdpe0XMBMzf1ZYbGO45UmvZnfl/w7CZp8zc6W/FCVgtqqBsUVAcj/L3H2xYSbqHo+H lva9DWTR+oz6SHaC4zkN7pF28FmZIM6T8lH6dXjZwz63t5IuyZIrw4b9UPdscZLHRj2Dyu xpTLlhO8UX8KLwNIvpDRK3cEWo0TRd2l18eoNkFr8trbLx9BVNNk+b/xiCk4MDUU06Qr7k vDKBiGC3LVzgjqIOcYR8iGedIUd0ovuIUM+X1TcHptjq5VNlUlKOpHa7+YHq1pxKoS4neD Z+1LHh+cfF+ALtEtJPg2kt89BvHZdFwua4sPiG1pISe8Y2Nxa0i5xbMXMBwcAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=21eAqP3uXgAFS2gDYd3n2KbSoFt03huGvDM6dQqfFJQ=; b=f7Ei0avWOo1adIKvznjJJ5joQlWQj7e6er6ODoT3m4ksXx0GOpAvXzTwSlMboNj2Qe2pJ3 wvRrcQVzPRTZ3x8sDw0LUL9JiEcMwqBYBr2Uho63AEAmKOINdelG+albpbT3xuDEOp5/vZ Gs8ASDEKsxr+KDCKmy4gKHDAmDgKWqLbnJFoS7fW5fo1VXucVySTd+B52koTEzzFvW7nqa hQac1HW+DKT7/vxsQXsfqX2Qek+1Lc6t2IcP86OaRmXU7cQtfVPKiaaHW1LNtOtxBRbMRz BvCI+n1I0AyewxnNHyefKFxdUzTB0VKYArCrCi8VPvfmnLk4B5mo0olqLgxXsg== 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 4VgxsK2NkkzvfN; Fri, 17 May 2024 19:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVHhZ000306; Fri, 17 May 2024 19:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVHvP000303; Fri, 17 May 2024 19:31:17 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:17 GMT Message-Id: <202405171931.44HJVHvP000303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 15aa8688d036 - stable/14 - sound: Rename oss_audioinfo->real_device to oss_audioinfo->legacy_device List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15aa8688d036a3ad769cd818ea5c93455c76fafa Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=15aa8688d036a3ad769cd818ea5c93455c76fafa commit 15aa8688d036a3ad769cd818ea5c93455c76fafa Author: Christos Margiolis AuthorDate: 2024-05-09 19:08:17 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 sound: Rename oss_audioinfo->real_device to oss_audioinfo->legacy_device The OSS manual now documents this field as "legacy_device". Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45138 (cherry picked from commit 24d5cc14dd60b49553ff3ee7830305621f782ff1) --- sys/dev/sound/pcm/dsp.c | 4 ++-- sys/sys/soundcard.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index fe816db54697..6e5fad048d40 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2224,9 +2224,9 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note - * @c real_device - OSSv4 docs: "Obsolete." + * @c legacy_device - OSSv4 docs: "Obsolete." */ - ai->real_device = -1; + ai->legacy_device = -1; snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h index 64f57742a52b..b5434b930215 100644 --- a/sys/sys/soundcard.h +++ b/sys/sys/soundcard.h @@ -1878,7 +1878,7 @@ typedef struct oss_audioinfo int card_number; int port_number; int mixer_dev; - int real_device; /* Obsolete field. Replaced by devnode */ + int legacy_device; /* Obsolete field. Replaced by devnode */ int enabled; /* 1=enabled, 0=device not ready at this moment */ int flags; /* For internal use only - no practical From nobody Fri May 17 19:31:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsL5N89z5Lg4L; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsL3z2pz3wfT; Fri, 17 May 2024 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhspkcxETU1gJBQaeDOo1xvIJ1Q1jsF/r5yyo+a16Os=; b=TSqz77NuB8u2yOkh5Hk072R8p5ME8RMjNlcJk36xkQnQe/r1xRs9ZhgqLH3LHrI97rIIC4 p5L0F2RBxIgD8WjnB/5QS9GgXrftYm+ryUHy+SOWhPmMzWbXmkodjDXLd6aA8tzeljYu5U eN7NX20kewSkA62EhWaAZvCHpIbG0nRv6bA6TTTR3kv4lMUlV15hVO258mTD5Vg2OMgEHv R74DT1Uvxg9vq1LBuWDjNDYcC9GRQW4JvUd4Mf/Wt6zNxoLiqrmOn79P6OWOE5OqGSbDLD OdO3u2g4bzdKg7FD/dnxdkwOO4qAtJiIrVcOfvkBLcuGj4rKS2pgH5OV4qKOuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974278; a=rsa-sha256; cv=none; b=F9Sr8BV8Dq8kqjHWNzTNGVK6wiyIFlijkFudZpSSGb4QQpQvwW1+VcqbMK60V69hjldkXk arIBTKk2quHDfDAxUZ7RGZMPjNEWsE4tShyUQ8QR5zsDXlutwmkJmKYScAd6UvnPyzkXUg uf3fPQYRvto/bsP14PkEHFfEFURn3d2FHndlsUJUo9960BDxzSF9JKMGz7ahScqAppihK7 US2aDLZSyb8JJEx+yhTPyAzahHwA2T1sAD5ya/2MAarjiGa7W6ROuOYBDbWQMtfo8XWyUA TxuV/Y45nWlwt5GKIq62MDdMMPsF5dOK4sFv2092G2+kSrmU43TT518BtoSQOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhspkcxETU1gJBQaeDOo1xvIJ1Q1jsF/r5yyo+a16Os=; b=aom+0FnPCQpnysgVsodjO606YipX2YbXzusAOaw73HQxZjP6uN0lmboFNGCgc9fkZB7DvM Y+FihUDwF9YnLF7V+f5SyTNbHGAHrxdzQ/CJUJYCIRmFsFMl+YbFJicOCo++gNRGYBuAaL abZf+I8EbLl4IuY9R72u5VvIfgPx2PboK4iIACBCRweqRIyGfhpX7BTDTfQKzbxGVj87zS bsE0qERCnRItTNvcugT0KZQ5nvGmVn254cToY+59PTRWx5DU6IAtZ0l6OfR4qqBYpX4GIg OGULYG/UOCutJtjsheZOfDqO8BRbEndUiN/DJeNRBcMfAT1amSexWU8VebZHDA== 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 4VgxsL3YW0zvvt; Fri, 17 May 2024 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVI6U000356; Fri, 17 May 2024 19:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVIZ7000353; Fri, 17 May 2024 19:31:18 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:18 GMT Message-Id: <202405171931.44HJVIZ7000353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9a620018afb2 - stable/14 - snd_hda: Add patch for Lenovo Ideapad 3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a620018afb2da062fce11e866a2154765886983 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9a620018afb2da062fce11e866a2154765886983 commit 9a620018afb2da062fce11e866a2154765886983 Author: Christos Margiolis AuthorDate: 2024-05-14 13:42:04 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 snd_hda: Add patch for Lenovo Ideapad 3 Reported by: bsd-lists@bsdforge.com Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D45100 (cherry picked from commit 54cc353f505dbc5f19168b6b1417b6736433d9ae) --- 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 3a7dfc63637a..76f677d69614 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -318,7 +318,8 @@ hdac_pin_patch(struct hdaa_widget *w) } } else if (id == HDA_CODEC_ALC257 && (subid == LENOVO_L5AMD_SUBVENDOR || - subid == LENOVO_L5INTEL_SUBVENDOR)) { + subid == LENOVO_L5INTEL_SUBVENDOR || + subid == LENOVO_I3_SUBVENDOR)) { switch (nid) { case 20: patch_str = "as=1 seq=0"; diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 4dd589ed2a09..12552286bd8c 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -383,6 +383,7 @@ #define LENOVO_L5INTEL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x380f) #define LENOVO_3000_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x384e) #define LENOVO_I330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) +#define LENOVO_I3_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3881) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) /* Samsung */ From nobody Fri May 17 19:31:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsN0Dqjz5Lg4P; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsM53tgz3wlJ; Fri, 17 May 2024 19:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqRgEauBd7pA/pe3m5KnHESVIyKY1KG85HQRzPPaEIE=; b=adO7aQhN9KT29NP109z+Tp8LEBIoewDwbrFiMn5R+PDB9Q6QNEbyExWX5wqaGa+H0XxTRq qKEYwLBJhicVW3ggCd167AYtt0iRZS0ZuKg68f+2GD77N8F3rHZj26gdFA/o05HU6Ml3uo umwUX7OeskSIfDc8aOguM3pRWdKostTi4Nh9jtfIQfa27pTXjJXnHY/42W0n8YE4NExR+c AB+DEgGElM3kdPrW++40Fbg2pqfDR2nig/QTLywFRQ2KiXyYUM6hyRbDBS3TchPTtaT1Qy Z2sGV8HLta3dzWKQ6g10uUyvxvz+1l9J33B5EFCFtC+u/9tW0RtOpnMcjztc/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974279; a=rsa-sha256; cv=none; b=mdIH808ib6lredt4LKD4TgQ2BZnbgzKNZneHCJ9BxyT5IwuNP19xI0L6gSqJyYKA9kMk2v 2wFjVL/lVDhlSqPxBDw0PZZG0hCs4tAzS7Ajxjyza4oHdTm0vjsWP9B3tL7M50gnxbd0j8 5MMa79vNihB6fQpsDC0nrTW8yPWld+KXMFmM5ocYBnunuhSuwtH4EhPtRPh45NyUakFxll UGHKFMN/qIOUztxRRNfrSDUZinHqHKM0HrkpIXRyNYiniMQHAf/Ab+ql7og34kqF6dnZlQ C7nq0SHRySDOlnPELDkyv+iw3aByUlGFfvEIfuqZvORl3UPZWO44oQ7cTxaSWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqRgEauBd7pA/pe3m5KnHESVIyKY1KG85HQRzPPaEIE=; b=VHpJaqxpqSIzQhit+6tjl+/ucuZSdUl5GNQat8GyGScKFKXtvI9av6bZwEaTl+pElXN3kN g2dqQSprvneZuYhX7VtiAQKtoaK2oTYc3tjls7ApRupp2QwhWTdiOFgXJByQW/KjXK/tuz 1mg+zmZwmjtuJnbbX50XLJv0NvS80VLqUUeqA5mPelspNkgIo0J98R+1XvlDKEt+ffl2oo 5fzwFRnKYUbfqb4LHtBpqjNn7uCdUVYfTNoitnXRDZ52oBDCy/tf1MEjjwj9S8e+rOhdl4 gzfHCFSdWs2P4R4qY59d+/lHEGYQItTZGKZF2cLBfGXaOecf/r7tRWM8qc6Uwg== 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 4VgxsM4dDlzvr9; Fri, 17 May 2024 19:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVJcM000398; Fri, 17 May 2024 19:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVJmO000395; Fri, 17 May 2024 19:31:19 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:19 GMT Message-Id: <202405171931.44HJVJmO000395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7814ed2bd321 - stable/14 - snd_hda: Rename LENOVO_I* to LENOVO_IDEAPAD* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7814ed2bd321dff2bbec8408c5b64cb7f4f2dfc5 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7814ed2bd321dff2bbec8408c5b64cb7f4f2dfc5 commit 7814ed2bd321dff2bbec8408c5b64cb7f4f2dfc5 Author: Christos Margiolis AuthorDate: 2024-05-14 13:42:15 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 snd_hda: Rename LENOVO_I* to LENOVO_IDEAPAD* Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D45105 (cherry picked from commit 278953360e0e6187c3f7c688cb49254df1567f0b) --- sys/dev/sound/pci/hda/hdaa_patches.c | 4 ++-- sys/dev/sound/pci/hda/hdac.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 76f677d69614..9f3532562252 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -319,7 +319,7 @@ hdac_pin_patch(struct hdaa_widget *w) } else if (id == HDA_CODEC_ALC257 && (subid == LENOVO_L5AMD_SUBVENDOR || subid == LENOVO_L5INTEL_SUBVENDOR || - subid == LENOVO_I3_SUBVENDOR)) { + subid == LENOVO_IDEAPAD3_SUBVENDOR)) { switch (nid) { case 20: patch_str = "as=1 seq=0"; @@ -340,7 +340,7 @@ hdac_pin_patch(struct hdaa_widget *w) break; } } else if (id == HDA_CODEC_ALC230 && - subid == LENOVO_I330_SUBVENDOR) { + subid == LENOVO_IDEAPAD330_SUBVENDOR) { switch (nid) { case 20: patch_str = "as=1 seq=0 device=Speaker"; diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 12552286bd8c..6a3314280a22 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -382,8 +382,8 @@ #define LENOVO_L5AMD_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x381b) #define LENOVO_L5INTEL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x380f) #define LENOVO_3000_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x384e) -#define LENOVO_I330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) -#define LENOVO_I3_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3881) +#define LENOVO_IDEAPAD330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) +#define LENOVO_IDEAPAD3_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3881) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) /* Samsung */ From nobody Fri May 17 19:31:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxsP1Ybcz5LgTt; Fri, 17 May 2024 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxsN5xD5z3wlR; Fri, 17 May 2024 19:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEO64mDGBB4UtUz6E0bTfK+ss/nj8rcVHI6x0AtUt7c=; b=Mf1ZsSiol9HuSanmmitB2RuGbVJSWsXmTilOPqiITURSbN8Dta8VapxFlRClAl/j7S7JZ4 tmLiG/OyH79ZjjHPhPIPzcSbgXVZgVmfznv1RmPqXUsqY1nxnFMbKpHbO5VGvnnTGREVLG uJHBVVufu0dFl3DXyOSjD7ZNqQR5H5Ld/A+Tn6D5Nrs4LwIGxCdS8FGShO6cNdNqWrpBrc D/rzoBVy6N68r9sUQVWtzVgIkSMc6RZ4F/AzSxn6doXSm86KJVBCHyyV66BDw/vjhWmPti YdQTlp5PREl7Ad2xAtHm8HR/caOrNGtj6504Dh5gA425N1/wiPKdyWwOv9iNTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974280; a=rsa-sha256; cv=none; b=d+OFxXTu86Lhjf/Y8ili4cG7fa4x+6s8K1x+IialxAjoAPGh8paxn7w2Bm8be9fdLahj9L jgM/l+ttxciqUDHySi1FPCkjKchkXx6yxUrRQuxDflAHOXq9tg25v41CfXStgbboNSp7Gs JSpTy6cmf8rMQb2MpONwVZc8NMrBmwXssBJRAM5Fz06Y1B48KV/OY7RL3Hv0acT1XpUHL2 3lvZnyOIpyjcBGgqg8+3ky+vb1DZjzXa4SkT+KWugLfc37q9d886LXPtRNcGjzdJsjpfZg gROwBM8IOAExcZgltXg5rJa1SeYUke05u4rkFzNtKTkKuP3d0pyU/y/sRCA9ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEO64mDGBB4UtUz6E0bTfK+ss/nj8rcVHI6x0AtUt7c=; b=y309nNH+pyP5TeoD4Cd2mbczjaftBVTw8XTJL/d3NqZ5Npj4rzX0XnSjS5ThJQG4w3/LgE 3KWHEn+cp3ILDYBhDOsavUO+4Xxoc7EiEhVIom60m7oXNaQLCPofIG5KBRH8bjhhO+I+Sr zGLUUjVMCdMpyH/VgsCQdIYiWkNZqQLVofRDtI3rq6kmfuom6QfUDuLBUWO1QmMj0tVs6r sYiTpbs8QIHxdtJKmCS5n+mouUvL2l9fOwvk4Vr/Hv9pfyXhGUDdLckqXyg5LpyRgOsxww +t0DOruRWo1FoS64aK6/nltMaM4QHiA61PxQV5CkBQjXUiwh0dQ3H46mG5yg1w== 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 4VgxsN5Y9BzvfP; Fri, 17 May 2024 19:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVK6H000449; Fri, 17 May 2024 19:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVKhL000445; Fri, 17 May 2024 19:31:20 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:20 GMT Message-Id: <202405171931.44HJVKhL000445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a19d42b08a40 - stable/14 - sound: Remove ncards variable from sound_oss_card_info() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a19d42b08a40cda6af119f14236e166e178bd2cd Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a19d42b08a40cda6af119f14236e166e178bd2cd commit a19d42b08a40cda6af119f14236e166e178bd2cd Author: Christos Margiolis AuthorDate: 2024-05-14 13:42:20 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 sound: Remove ncards variable from sound_oss_card_info() The loop counter is also the card's index, so ncards is redundant. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45144 (cherry picked from commit 305db91d4b92a5d53826dcb6df39fc8a1f3b427e) --- sys/dev/sound/pcm/sound.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 3e95fd0e0ea4..e66462af2a71 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -792,9 +792,7 @@ int sound_oss_card_info(oss_card_info *si) { struct snddev_info *d; - int i, ncards; - - ncards = 0; + int i; for (i = 0; pcm_devclass != NULL && i < devclass_get_maxunit(pcm_devclass); i++) { @@ -802,7 +800,7 @@ sound_oss_card_info(oss_card_info *si) if (!PCM_REGISTERED(d)) continue; - if (ncards++ != si->card) + if (i != si->card) continue; PCM_UNLOCKASSERT(d); From nobody Sun May 19 00:58:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vhj4K65vbz5KMkx; Sun, 19 May 2024 00:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vhj4K5Vtpz49Xk; Sun, 19 May 2024 00:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TohgD0pIxxTihrb2AUCtCYxGjtIdIWHkLeTOE23Bqvg=; b=G+sVQ9L8gMfXOaBJ3cjAQIh/Y3LPE3v482byGvLxVs/77+Ip1Ve+mWpDjnjkNQT109mV0f D3LnKtfFShaZh2UJbeakUL5qZKFTNk9rjek97p3Fkj22StPXu+Qc+L/jsisNBPFSugWyRO G/nie3uA19AditOMJWZSOj7pc3u+vRNkGzEYXx0cQf9dYZhPPu6D+Z/LX7Yu/Fso6Jo388 wooFJLyZiTAlbersanoxoDouOqkie6XCFIkKveGnB+0OQiex3e//5Lnx+3Nk3J6vUeF8Jz BYv4NHpx7owpVYdgIJMSNh8VcUCLfRZs4GDSoz4mPum1OSUcjAE6omlf0tAcgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716080305; a=rsa-sha256; cv=none; b=vHaitg2ZC/wF+7MSuF1sUueOgA0NTDDuU0Jp2jMOB0cnJ1Fb84eOAlw7ipKyx7VOa1gWPJ MBHAHHr9eov+kc3n71nrnM+AVN0inzD9yPA+zRlGOsvBVSPtAytAA6IylkywDnAR+xs4Do AmV1qKh7+xyM2Nd7F9VJjxvkhSeLCIl6ex7d2CF7UVhMelVuXF52MdtWxYe1DOv0v7NpGL 9SDzO82jDkQw5eee1duc2VFA8+Iste/kTMGYlStBpqhAw99NN6eVRt46U2skU51eBvh7XR RipeDQLJfWI1BtnHdKv7jpNDcwHJud4pP68qsEAk6/7USndT/e078fqy+KLywA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TohgD0pIxxTihrb2AUCtCYxGjtIdIWHkLeTOE23Bqvg=; b=GObXTBRZo6QB+wsvx3n+dQzj772Ak45ExUVC5axi/oUMTfyGsN2Q5FWtisUSxahJVIo6BN OPrhGO9GLz2viZggm2RRTzLSqzZDhy2+sV1xOkK3SFUfc1EdnzCKn0kjAf12wpSW9XmYwv 3/kfP/yb7/5wRnSUUNjjyFx00MO3/bQO3XWmtnAKcOsik3tpfC53hO0v4Mhjuec6NhvNKo /KamFQevSwjX3FUdl20vLGvUqxI0l+ZDkTyntDt9RzOSt/cDQYsHeS4HxdrOlt00H02ss8 9xaBYEWPw7po8zqoCpTdSzHjxlFX3garWEvgt1RO1aR/+eRJcZb4WSucNP0+LA== 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 4Vhj4K55hhzpGP; Sun, 19 May 2024 00:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44J0wPZS079728; Sun, 19 May 2024 00:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44J0wPb9079725; Sun, 19 May 2024 00:58:25 GMT (envelope-from git) Date: Sun, 19 May 2024 00:58:25 GMT Message-Id: <202405190058.44J0wPb9079725@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: 4018bcdea8e1 - stable/14 - cdev_pager_allocate(): ensure that the cdev_pager_ops ctr is called only once List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4018bcdea8e1934eedba4b800e6feb2099b1091d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4018bcdea8e1934eedba4b800e6feb2099b1091d commit 4018bcdea8e1934eedba4b800e6feb2099b1091d Author: Konstantin Belousov AuthorDate: 2024-05-07 13:23:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:57:54 +0000 cdev_pager_allocate(): ensure that the cdev_pager_ops ctr is called only once PR: 278826 (cherry picked from commit e93404065177d6c909cd64bf7d74fe0d8df35edf) --- sys/vm/device_pager.c | 70 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 2d8f003c6f92..cb3b0e522d9a 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -118,8 +118,15 @@ cdev_pager_lookup(void *handle) { vm_object_t object; +again: mtx_lock(&dev_pager_mtx); object = vm_pager_object_lookup(&dev_pager_object_list, handle); + if (object != NULL && object->un_pager.devp.dev == NULL) { + msleep(&object->un_pager.devp.dev, &dev_pager_mtx, + PVM | PDROP, "cdplkp", 0); + vm_object_deallocate(object); + goto again; + } mtx_unlock(&dev_pager_mtx); return (object); } @@ -129,9 +136,8 @@ cdev_pager_allocate(void *handle, enum obj_type tp, const struct cdev_pager_ops *ops, vm_ooffset_t size, vm_prot_t prot, vm_ooffset_t foff, struct ucred *cred) { - vm_object_t object, object1; + vm_object_t object; vm_pindex_t pindex; - u_short color; if (tp != OBJT_DEVICE && tp != OBJT_MGTDEVICE) return (NULL); @@ -157,16 +163,16 @@ cdev_pager_allocate(void *handle, enum obj_type tp, pindex < OFF_TO_IDX(size)) return (NULL); - if (ops->cdev_pg_ctor(handle, size, prot, foff, cred, &color) != 0) - return (NULL); +again: mtx_lock(&dev_pager_mtx); /* * Look up pager, creating as necessary. */ - object1 = NULL; object = vm_pager_object_lookup(&dev_pager_object_list, handle); if (object == NULL) { + vm_object_t object1; + /* * Allocate object and associate it with the pager. Initialize * the object's pg_color based upon the physical address of the @@ -174,15 +180,19 @@ cdev_pager_allocate(void *handle, enum obj_type tp, */ mtx_unlock(&dev_pager_mtx); object1 = vm_object_allocate(tp, pindex); - object1->flags |= OBJ_COLORED; - object1->pg_color = color; - object1->handle = handle; - object1->un_pager.devp.ops = ops; - object1->un_pager.devp.dev = handle; - TAILQ_INIT(&object1->un_pager.devp.devp_pglist); mtx_lock(&dev_pager_mtx); object = vm_pager_object_lookup(&dev_pager_object_list, handle); if (object != NULL) { + object1->type = OBJT_DEAD; + vm_object_deallocate(object1); + object1 = NULL; + if (object->un_pager.devp.dev == NULL) { + msleep(&object->un_pager.devp.dev, + &dev_pager_mtx, PVM | PDROP, "cdplkp", 0); + vm_object_deallocate(object); + goto again; + } + /* * We raced with other thread while allocating object. */ @@ -194,29 +204,51 @@ cdev_pager_allocate(void *handle, enum obj_type tp, KASSERT(object->un_pager.devp.ops == ops, ("Inconsistent devops %p %p", object, ops)); } else { + u_short color; + object = object1; object1 = NULL; object->handle = handle; + object->un_pager.devp.ops = ops; + TAILQ_INIT(&object->un_pager.devp.devp_pglist); TAILQ_INSERT_TAIL(&dev_pager_object_list, object, pager_object_list); + mtx_unlock(&dev_pager_mtx); if (ops->cdev_pg_populate != NULL) vm_object_set_flag(object, OBJ_POPULATE); + if (ops->cdev_pg_ctor(handle, size, prot, foff, + cred, &color) != 0) { + mtx_lock(&dev_pager_mtx); + TAILQ_REMOVE(&dev_pager_object_list, object, + pager_object_list); + wakeup(&object->un_pager.devp.dev); + mtx_unlock(&dev_pager_mtx); + object->type = OBJT_DEAD; + vm_object_deallocate(object); + object = NULL; + mtx_lock(&dev_pager_mtx); + } else { + mtx_lock(&dev_pager_mtx); + object->flags |= OBJ_COLORED; + object->pg_color = color; + object->un_pager.devp.dev = handle; + wakeup(&object->un_pager.devp.dev); + } } + MPASS(object1 == NULL); } else { + if (object->un_pager.devp.dev == NULL) { + msleep(&object->un_pager.devp.dev, + &dev_pager_mtx, PVM | PDROP, "cdplkp", 0); + vm_object_deallocate(object); + goto again; + } if (pindex > object->size) object->size = pindex; KASSERT(object->type == tp, ("Inconsistent device pager type %p %d", object, tp)); } mtx_unlock(&dev_pager_mtx); - if (object1 != NULL) { - object1->handle = object1; - mtx_lock(&dev_pager_mtx); - TAILQ_INSERT_TAIL(&dev_pager_object_list, object1, - pager_object_list); - mtx_unlock(&dev_pager_mtx); - vm_object_deallocate(object1); - } return (object); } From nobody Sun May 19 00:58:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vhj4M0NYFz5KMky; Sun, 19 May 2024 00:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vhj4L6DyZz49mt; Sun, 19 May 2024 00:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kw/1VV3FHUleFj5DgnnWlGQULnTF+TYkVBP2bUYFPHA=; b=KEMV+4HiUZ0M5q/UNNmtn6LLj1vGB8GpFstK7DRudxeuKKNQNHy0X486rk8sauYlCgiAEu AP9wJME/xLxdqeFwyPyYxx/kcqubwSvJnNvUtrumnXetL7EkvgilGgENBDRb6A5xF7b20g 6YOwezo42/+eoaTHS00T2mHAiqmd16rn+F/4xzQE/aAoTQZ79zHeWKWg8wcCZZOTjS8F4S IBmpQhUEOul0vSfNzt7b1ce8UL2VLXUROsFf9zvQgbo9Gc3LsxVI1r4rdMCR6qvmjsyVWe r/BEITpaz8FagV+kP5efAGkK6gPVe+x786324j9aWC5/Qxi4yby1wr/4aOJHyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716080306; a=rsa-sha256; cv=none; b=Z9n92icfiKtkuE3QOBgGD36Ji+VsPnE9zDgh2u75tirtYWMMVkZcHJhDrmVffq3cS0m+OP X/0F59KVrwQ5kswNXMcxlY8WI3HJ97uMPViWyHns7op+riY74hcMxnKPpz2zYTDo8TJcHF vTDrnCQfHq4G2NbUqsV0gZTew5PR32Ut5RrkQMAHQMVtrmbt0nk73tG6UF84ZpcQwnHRBh YfUlN9Dw3W+OjGpG9Bwx0lLKDbJhFFBFJGo6+1ByaQmZhE4QbSdaUweWgdMnkqx0xqjN3L PSnghEXlEYGaJKTHno0a7hPNlCc8kXrjrmwuO7RJ2IEHJMFA36DuQs6SIfgtgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kw/1VV3FHUleFj5DgnnWlGQULnTF+TYkVBP2bUYFPHA=; b=TSFQ7/DgTzIxaOCZVWOjz1AKk1Cj+/g2K6GotwGtYxT2fUI1ITBuRaRDvm8m8s+0f8fb9I 11L3Ar1fFfXY8GzgvaFb2LXbDncpq8Q7oeIsawkxEUxWEFTm6Ma3FpL2eKW/k9ZPo0jI6w SECdFsnWfYn57IXLUtk9rnB2iMtVxtaVya7uPW5VsjSolGTsG3nzcghhD7ziXevqo3PUUT I5SkN7x3bp2+Eesgo5V4Z3rJjB2ptl9dDyBmxLmjPezrpcd2JaOim5K7AFNLKm1VotShWu PKj7O/5Lk+huhSbGsgJnYrOOUcImy0+HwZs7ao33brCWlFKgJGLesRm06lC4Tw== 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 4Vhj4L5rJNzpFs; Sun, 19 May 2024 00:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44J0wQXl079783; Sun, 19 May 2024 00:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44J0wQ3t079780; Sun, 19 May 2024 00:58:26 GMT (envelope-from git) Date: Sun, 19 May 2024 00:58:26 GMT Message-Id: <202405190058.44J0wQ3t079780@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: 9ccd5394123b - stable/14 - devfs_allocv(): style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ccd5394123bf429b09b4404fa6cb8543b617331 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ccd5394123bf429b09b4404fa6cb8543b617331 commit 9ccd5394123bf429b09b4404fa6cb8543b617331 Author: Konstantin Belousov AuthorDate: 2024-05-07 12:33:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:57:54 +0000 devfs_allocv(): style (cherry picked from commit 6d79564fe341c8dbf09405cae1a0a76460aaf8aa) --- sys/fs/devfs/devfs_vnops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index cda4afc8c241..9dcf3b235feb 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -557,8 +557,7 @@ loop: if (devfs_allocv_drop_refs(0, dmp, de)) { vput(vp); return (ENOENT); - } - else if (VN_IS_DOOMED(vp)) { + } else if (VN_IS_DOOMED(vp)) { mtx_lock(&devfs_de_interlock); if (de->de_vnode == vp) { de->de_vnode = NULL; From nobody Sun May 19 00:58:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vhj4N0Ygjz5KMx5; Sun, 19 May 2024 00:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vhj4M72nbz49l0; Sun, 19 May 2024 00:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vd4pWnEtE+otasuBHg/xwjS31P6ggrxT/01b/BLRLzY=; b=uM6URHqnZTju6GaYlmhZL67QY91UbQchgVHAMkE6d0i5+Cx/M9y0Q8/mfB0hdF6RvLSgll aBVV4p5ByJJaw8Df166qlomWR8bSqADFmT6VEoklNBCAqSQ5HQ9G8DkJ6LfkweG7Y+5S+M ncoqP4ISc866v/pqAp86KfHweqfNQoGV8zNCWMqKhVxSZ3jEQ6H1NfsHP+yEO7mixn85aR pBpyLK6YD/lhdlySd6ZamDvNL2TNLaWWLV+FDRM+1vYgelsysJSIsST5j6AGTNCc7FKu3B p2mPWl3ApRcYCNAiajSxNZRPHi+YZXugdqI3LMJwZQVGcLTc4isXWsNdecQQIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716080308; a=rsa-sha256; cv=none; b=k78296PGyUHbPxUy8IT2mhdnHnDJq+EoCDSUpr7lNSW34Shh/iPkohmKxhTZLB14tnNw2q 0f49zTzOtODWQXRvSwlOQ/57kjSIoh+Gimy9nVRWJncn3ZGH2wbv/eUs2KqWg9DBLjuayh OvxfVY4Z/tonk5b+aJjHGo9j8v68G8DQVS6XobtJZpyRl/1kJsS5F3sJ7G1/YtY/z6YAu3 hCDsocplOQBji/2HOJ+AOSCYjZqDNQKad6VAD/mni7f102JILZZWskL6WJBtfCoK6bV/ES IOMAP7Z0j+IYiixiVGogjb01AgQUrTaGo2anM/72Nr9FVSUgyaft46TT4zjo6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vd4pWnEtE+otasuBHg/xwjS31P6ggrxT/01b/BLRLzY=; b=SSXqekeMozu4CJ2gKcOi8DE7i3ZlackzdM20siiSnBJI9dKdzZ1aSB2WgSup/uOYkESLa6 lYFgntEzV5l3nY0TcU5QlY6hjsy2sdsuTlZmLQSwyMvbumLE3DoLNj3XCgHxabD2/CH6H6 5qlTjAvQ08b8TywZ1zvU3kIKUz3H0wDmzvYVS/jWHqcpkLvzRx0dXuaDk/+zkulPwZRhOc sfarZVtbtJ/A2iMOYTQSi629/1/RJWZgfjfIscbDqv67/AWlnQXyVnwZLDgZuIohB/G7Zv T6qEZxURmNpVKo7b2H7Cy9ogPUzYKiSkL5Vg9muBQ5gCzdNnjyPjS/tfy7K84g== 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 4Vhj4M6P76zpK3; Sun, 19 May 2024 00:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44J0wRfb079942; Sun, 19 May 2024 00:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44J0wRSO079939; Sun, 19 May 2024 00:58:27 GMT (envelope-from git) Date: Sun, 19 May 2024 00:58:27 GMT Message-Id: <202405190058.44J0wRSO079939@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: 936aa8ec7cb5 - stable/14 - vfs_domount_update(): style, use space instead of tab List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 936aa8ec7cb57a32387e1f6e636d055d3397edcf Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=936aa8ec7cb57a32387e1f6e636d055d3397edcf commit 936aa8ec7cb57a32387e1f6e636d055d3397edcf Author: Konstantin Belousov AuthorDate: 2024-05-16 00:59:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:57:54 +0000 vfs_domount_update(): style, use space instead of tab (cherry picked from commit 5a061a38cdfa151315051a1ca1400bb32e39cde2) --- sys/kern/vfs_mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 49d1d21d2d6d..9289c35e4f86 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1518,7 +1518,7 @@ vfs_domount_update( MNT_ILOCK(mp); if (error == 0) { - mp->mnt_flag &= ~(MNT_UPDATE | MNT_RELOAD | MNT_FORCE | + mp->mnt_flag &= ~(MNT_UPDATE | MNT_RELOAD | MNT_FORCE | MNT_SNAPSHOT); } else { /* From nobody Sun May 19 00:59:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vhj5p0CJHz5KMxj; Sun, 19 May 2024 00:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vhj5n6WRZz4Ccg; Sun, 19 May 2024 00:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=azIyx/ndEm9iHtwBQH+IQooeVSFPn9up6VByzyrheLc=; b=nCVxOqIH1eIkBNDbq8dmRRV7QvXkbJ/lnjxz+lhaHvkzulGcrbPhp6D+hHZGH1YN7lyS0d rtXrGj1kr6IFEQ7Zp/B0DMNAyaze5jE/hKLBN+r/kWzD9Zo5vC3Dr+1KrrQx0eYYwIT4I0 C/uCHut0Gx/Pe0+k1M9jfTOjJ5UswLloRtuRwE++2+zD6JZSl1qIVqwFTMjTY/TS9e2X6k MFcwFd0AQ5qamESwCMIuyoRiZh687qpk/mIbi2v2VWYdXN6Mg4VJOqicgAdT36a1ak+8tX +FPueSmKGN7sfimBIW+/aK9Yk9+CCkBnh1uUSl9MF8gBF5KAIWo/tNW2dTdlJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716080381; a=rsa-sha256; cv=none; b=Ui6ab4+HGmBaF6ZKkp/vhrq17YqrZEXUHbfAgAAHiEwE8Sa5TCKXLkzQGvJGAKqoRkbhPT gfILkWdJJPVfKT9gR8bj2vlftvqHDrWbLAYW+7OZpEWdyMgZcRUeJgcpc4lh96bx1mNaih OQNww8Tf9AIRnBjj5eJn1xuCZmytK3qj+MuQ3p+NRxHLbRZI7oPosRNrvFHSmriaq+Uhps sb+1da7hsOt5Ga4LU/h5qjbxB5QOla9iJKvrhw5jSuSS19NKuOjfeGQ3jrVMRHAGvi/v8c Q/5HU7lV4YM/h+GTvn0pSg+ilYpJmAqjOFpoB6S+1C+9koLIvfQoXgUrUYV2GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=azIyx/ndEm9iHtwBQH+IQooeVSFPn9up6VByzyrheLc=; b=gtLG8PeMsM83K/2RUr/feyy3eVbbcoocoI1diISuxu1tF5GOQtShQlYv18x/GcN7oSL5JJ s2oZoeg4MkKfeZzP+pnBXmr90q/1n5/pLX/EiKRb3mhNzn9mfdT0rFvCNXtlfg7/S3i4dg TSAcmTwHm145H282+5Fl7RvTlQIRvILfBmjNA8Dzha7rvhGET77m5k6nNkUx/V3CMCaSNb TrCEhTfqQ0zeXqvWJ1h8AhZXhrbToznotlNNX1CAZy+HAjCWIknLfi0Kj+JknYuILjATej cdRIzcb4zXlIfnPhUEvWrpRUPNVXpE8BzrdydtBL1pMLjd0mAM5qDu1h5s7qxQ== 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 4Vhj5n66RxzpML; Sun, 19 May 2024 00:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44J0xfFU080305; Sun, 19 May 2024 00:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44J0xfx3080301; Sun, 19 May 2024 00:59:41 GMT (envelope-from git) Date: Sun, 19 May 2024 00:59:41 GMT Message-Id: <202405190059.44J0xfx3080301@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: 2eeb0e9fc130 - stable/13 - cdev_pager_allocate(): ensure that the cdev_pager_ops ctr is called only once List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2eeb0e9fc1306f40ec684af1ea56a8871a9a3684 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2eeb0e9fc1306f40ec684af1ea56a8871a9a3684 commit 2eeb0e9fc1306f40ec684af1ea56a8871a9a3684 Author: Konstantin Belousov AuthorDate: 2024-05-07 13:23:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:59:13 +0000 cdev_pager_allocate(): ensure that the cdev_pager_ops ctr is called only once PR: 278826 (cherry picked from commit e93404065177d6c909cd64bf7d74fe0d8df35edf) --- sys/vm/device_pager.c | 70 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 2d8f003c6f92..cb3b0e522d9a 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -118,8 +118,15 @@ cdev_pager_lookup(void *handle) { vm_object_t object; +again: mtx_lock(&dev_pager_mtx); object = vm_pager_object_lookup(&dev_pager_object_list, handle); + if (object != NULL && object->un_pager.devp.dev == NULL) { + msleep(&object->un_pager.devp.dev, &dev_pager_mtx, + PVM | PDROP, "cdplkp", 0); + vm_object_deallocate(object); + goto again; + } mtx_unlock(&dev_pager_mtx); return (object); } @@ -129,9 +136,8 @@ cdev_pager_allocate(void *handle, enum obj_type tp, const struct cdev_pager_ops *ops, vm_ooffset_t size, vm_prot_t prot, vm_ooffset_t foff, struct ucred *cred) { - vm_object_t object, object1; + vm_object_t object; vm_pindex_t pindex; - u_short color; if (tp != OBJT_DEVICE && tp != OBJT_MGTDEVICE) return (NULL); @@ -157,16 +163,16 @@ cdev_pager_allocate(void *handle, enum obj_type tp, pindex < OFF_TO_IDX(size)) return (NULL); - if (ops->cdev_pg_ctor(handle, size, prot, foff, cred, &color) != 0) - return (NULL); +again: mtx_lock(&dev_pager_mtx); /* * Look up pager, creating as necessary. */ - object1 = NULL; object = vm_pager_object_lookup(&dev_pager_object_list, handle); if (object == NULL) { + vm_object_t object1; + /* * Allocate object and associate it with the pager. Initialize * the object's pg_color based upon the physical address of the @@ -174,15 +180,19 @@ cdev_pager_allocate(void *handle, enum obj_type tp, */ mtx_unlock(&dev_pager_mtx); object1 = vm_object_allocate(tp, pindex); - object1->flags |= OBJ_COLORED; - object1->pg_color = color; - object1->handle = handle; - object1->un_pager.devp.ops = ops; - object1->un_pager.devp.dev = handle; - TAILQ_INIT(&object1->un_pager.devp.devp_pglist); mtx_lock(&dev_pager_mtx); object = vm_pager_object_lookup(&dev_pager_object_list, handle); if (object != NULL) { + object1->type = OBJT_DEAD; + vm_object_deallocate(object1); + object1 = NULL; + if (object->un_pager.devp.dev == NULL) { + msleep(&object->un_pager.devp.dev, + &dev_pager_mtx, PVM | PDROP, "cdplkp", 0); + vm_object_deallocate(object); + goto again; + } + /* * We raced with other thread while allocating object. */ @@ -194,29 +204,51 @@ cdev_pager_allocate(void *handle, enum obj_type tp, KASSERT(object->un_pager.devp.ops == ops, ("Inconsistent devops %p %p", object, ops)); } else { + u_short color; + object = object1; object1 = NULL; object->handle = handle; + object->un_pager.devp.ops = ops; + TAILQ_INIT(&object->un_pager.devp.devp_pglist); TAILQ_INSERT_TAIL(&dev_pager_object_list, object, pager_object_list); + mtx_unlock(&dev_pager_mtx); if (ops->cdev_pg_populate != NULL) vm_object_set_flag(object, OBJ_POPULATE); + if (ops->cdev_pg_ctor(handle, size, prot, foff, + cred, &color) != 0) { + mtx_lock(&dev_pager_mtx); + TAILQ_REMOVE(&dev_pager_object_list, object, + pager_object_list); + wakeup(&object->un_pager.devp.dev); + mtx_unlock(&dev_pager_mtx); + object->type = OBJT_DEAD; + vm_object_deallocate(object); + object = NULL; + mtx_lock(&dev_pager_mtx); + } else { + mtx_lock(&dev_pager_mtx); + object->flags |= OBJ_COLORED; + object->pg_color = color; + object->un_pager.devp.dev = handle; + wakeup(&object->un_pager.devp.dev); + } } + MPASS(object1 == NULL); } else { + if (object->un_pager.devp.dev == NULL) { + msleep(&object->un_pager.devp.dev, + &dev_pager_mtx, PVM | PDROP, "cdplkp", 0); + vm_object_deallocate(object); + goto again; + } if (pindex > object->size) object->size = pindex; KASSERT(object->type == tp, ("Inconsistent device pager type %p %d", object, tp)); } mtx_unlock(&dev_pager_mtx); - if (object1 != NULL) { - object1->handle = object1; - mtx_lock(&dev_pager_mtx); - TAILQ_INSERT_TAIL(&dev_pager_object_list, object1, - pager_object_list); - mtx_unlock(&dev_pager_mtx); - vm_object_deallocate(object1); - } return (object); } From nobody Sun May 19 00:59:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vhj5q1yPgz5KNFK; Sun, 19 May 2024 00:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vhj5q0dK5z4CWs; Sun, 19 May 2024 00:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IX8rhTCKcTrLAltrvJxjD5dovwVSiVIPiGrU4GkRuEk=; b=NtHMiQhrXIxVihXkxQjMaoER+17ZX+OqmaVNo8wCUl3HGD6XoADrjhuuNV81PO44WUDrHt tgtfNO1ourcZQa5x0XncAgI3cdfVW/FuEKsleXkIuQ/c4z2189pq/5bLnpSPfzBJZQqvXa zt1mNPkNwhEo0ghU7ew1jvokbhka1ANnsbDqCdGETC2wCzQOdeUZ2nJjRvny/wvJHiPM6O nPTZELbHX+0+Pq2W8stqKS2tqJ7UgUr1c7jsmvQ/x8WbbCyUay2ov4CY8mRplKGQmu2/2e HZYmrP2fYzTZhYFQXTeT7mlB3LE7VjxD/x+kEfhv0QyugSvoAt50uIjkDPfboQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716080383; a=rsa-sha256; cv=none; b=Mq9KVgXz08yeEKL3aWEH41/mGjb/lN84zTj7wFKzUig3//IO29TaFhYSpNzzTRA+gGrR1j 8Ce70yirH+qnaxjt7fX8ea4A7q17k94bv6wQXkVx4wmaqxXeEran66ZY9e/QKcDDNeESSP S5+J+pwDi0qfwRDd1T2Cko1mXRQgy9Si8/MEyqjHtUgNg8PjKN6D4bQ7Yn5Xs1cGI33vb9 bY3Qn530gs2Qx8tf8vZKzGSu8o0SioqLzKPxAOC7XogxgG7uWib7EQh2bwXWqWiPqfo7wC UsGknhGeYrFowzR8uQErb5T/cKS9tzdmdqlvpOe/0NPURQCpdCqo2GaWT2HXig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IX8rhTCKcTrLAltrvJxjD5dovwVSiVIPiGrU4GkRuEk=; b=FYoIjrqe9gHnHL4jq6DldUIPpzm6g/j8OszuAgh9vx5bcRh6SpS1eR/LHp15m6Rn7AlD0Z 4bS/9wl9p1d7rpyyT3VmoLTPzAomN8r+0gS+fv3Li4Nu/zNQruAXmFY/306ihENKCBV1wd ibn8s7GWZEPpn66EO6pkknrJuv5ukGfLHbCgfmR2vGMt5//Xbj8PQrWV2QsTwzT7u/sOpf CwjM5//bceVxK9H0mO3yhvaJ3oJ8eOD3Gyq4+JlAosI/l7JPStBW4FliaiTQZ0TyKXaF46 L2NtVpS1XNXHep+ZOUOiI/iR71T79iLjd9pOEH7crbZ8saKEp++Jrbqo1wx6pA== 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 4Vhj5q0FXdzpZJ; Sun, 19 May 2024 00:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44J0xgdj080345; Sun, 19 May 2024 00:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44J0xgVr080342; Sun, 19 May 2024 00:59:42 GMT (envelope-from git) Date: Sun, 19 May 2024 00:59:42 GMT Message-Id: <202405190059.44J0xgVr080342@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: 7c23465541f3 - stable/13 - devfs_allocv(): style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7c23465541f328acab2192c870be31324ce436d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c23465541f328acab2192c870be31324ce436d9 commit 7c23465541f328acab2192c870be31324ce436d9 Author: Konstantin Belousov AuthorDate: 2024-05-07 12:33:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:59:13 +0000 devfs_allocv(): style (cherry picked from commit 6d79564fe341c8dbf09405cae1a0a76460aaf8aa) --- sys/fs/devfs/devfs_vnops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 919ab2ff4381..535b2c198e64 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -574,8 +574,7 @@ loop: if (devfs_allocv_drop_refs(0, dmp, de)) { vput(vp); return (ENOENT); - } - else if (VN_IS_DOOMED(vp)) { + } else if (VN_IS_DOOMED(vp)) { mtx_lock(&devfs_de_interlock); if (de->de_vnode == vp) { de->de_vnode = NULL; From nobody Sun May 19 00:59:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vhj5r2K2Sz5KNL6; Sun, 19 May 2024 00:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vhj5r1MKqz4Cw6; Sun, 19 May 2024 00:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sk7RO+aqrfw2jh5GPf0I3Yt5RffoIRspXEi1d4QWO/I=; b=wr2brVXe1YO/bNmxTlCx3adVBXMieuqFklooQY8E+TyW0fSAznR64Gj47D+NEtTbywzP/y FZ3B1IkkW2477N+Br+EzKYZV/iyMyOqkGfC2lxh/Kavt4om+ZKTET2bJ+SO+bkKGoeWckU MtC9/cL8GK3oN7Drwj5jm6VpYf0YJoKYRNjGygn73Y6Uv0QtLO5oK4eFKyQ11ETyaOwPU2 CPckxWBq7g8wrvSAVvCGO3oPyMj9SL5b5pSj8sZFFHC90w0/S8JqA+fEueDjwKP0QpSwJ0 rPt2dUi9l7qc2Qx81z2trGo4K+rx0zsMQ763iZ9InFsrz0EPtCOnCOLk2mvf5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716080384; a=rsa-sha256; cv=none; b=L0MlgAT5nKLu3oSEKG+4FPMVUm6vmMzZrE53JCYjgV55PIs27+GOWdZ/qwPpoxePYgvL+m 0W3xul8qgr+CbBlVexe+k97u0Q/agzAn0OLqpodlUT9J+tFlGrbcX9pvifvzCqzJ+ZmMtx UcAaJwMZ4XUl/ChUWEjLYa4AB41SqQYK71GNizQDJyoNnfNi3mPGuZo+AtWyNgG8hUc2sY QwQ8DnS0oeDc9Qk3lXadnvxBXV43DdVa7Ic7Xr+QXNYoPxAV5w4LJ8OUdGSOQSPElDzTA7 cTphL5p2ozh4BGc7lEMP0wliLxrb5zuyiyVbLXfPf9JgrXEOVuMK6eHOL2j/4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716080384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sk7RO+aqrfw2jh5GPf0I3Yt5RffoIRspXEi1d4QWO/I=; b=am5Zx/vZ5WMs5V893GtwRddz5mJhJx4aQnEAZtreN2JZUqOQFmLSXOJ+fa7LnKbtk35V6V 2dCrgqXHDj5O0RAOTao7Ws0nF3AEiOizu/qNqUjS85+8qx9lDaBx4uPeUNvvXNe26UDkrn MmqcfwVsEDDxdnAeXOMyFDbgFpdo+G5/fT1m9HIqRIKQHTbeHeCCdgpZPaUD6TvjePhm2K RO++t3VOVP8KrjwfV0dA3PVB5B51tOw9S2MmBJou+0F1eAezxGQPKBXHQvrkMWsp1MV2yL nrA49LLyDDrTaUmCcOTWdYbuEE7ncIzJZjAoQS9IPCilHBZVmbkJgiC1HVOKHw== 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 4Vhj5r0zgjzpZK; Sun, 19 May 2024 00:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44J0xigW080394; Sun, 19 May 2024 00:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44J0xiGv080391; Sun, 19 May 2024 00:59:44 GMT (envelope-from git) Date: Sun, 19 May 2024 00:59:44 GMT Message-Id: <202405190059.44J0xiGv080391@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: e4df9d84b19f - stable/13 - vfs_domount_update(): style, use space instead of tab List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e4df9d84b19f2e6d1930abf65ef0679196600114 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e4df9d84b19f2e6d1930abf65ef0679196600114 commit e4df9d84b19f2e6d1930abf65ef0679196600114 Author: Konstantin Belousov AuthorDate: 2024-05-16 00:59:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:59:13 +0000 vfs_domount_update(): style, use space instead of tab (cherry picked from commit 5a061a38cdfa151315051a1ca1400bb32e39cde2) --- sys/kern/vfs_mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 756ac4789c8c..68b22d1a77a8 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1359,7 +1359,7 @@ vfs_domount_update( MNT_ILOCK(mp); if (error == 0) { - mp->mnt_flag &= ~(MNT_UPDATE | MNT_RELOAD | MNT_FORCE | + mp->mnt_flag &= ~(MNT_UPDATE | MNT_RELOAD | MNT_FORCE | MNT_SNAPSHOT); } else { /*