From nobody Mon Sep 30 00:47:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH2Tp6j20z5XSbj; Mon, 30 Sep 2024 00:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH2Tp6B8tz4qM8; Mon, 30 Sep 2024 00:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727657246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fov1L5z6uSBgCbLey0O/XFrPnXqmvWqi/J/J8KKTe3w=; b=qCGWxC6+6rfAwUkYbKO/er6QzcpFNiBwLb3Yw54NOhF2jbuPoI5+EjFi9dICAsIn4Ruh4F NY2kCtIXFgaPRQdQn93TjFW37ldb4/GFeH/oLUVsviEV6a6r8ZOn4daKzU1+VqgizpZ1IO 0d8IeRjeJrk4nA57qPXD50OedYq4sARofoNgikYBS8HrOP4BECRWZ3INY7jXR8+LD5/7EX qe76X2/im2wPDMyhxOofHmjXCJbdUMhbdBUyvAlPamRzUxqYcldmnYqoOuCAdO7kh9Uif0 6eG1PKGZxJ+gkqWEHw7GDuPh6/eBiM2GD2klsZTMLKHWlGyUo+OfpQTg5cCerg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727657246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fov1L5z6uSBgCbLey0O/XFrPnXqmvWqi/J/J8KKTe3w=; b=KfafqvftF9MG5xuFPHwKMIuHuF39NTEESaRSt8Kr9PyTLLbwlUIlDIbNkT4qLB1OCHQXT+ 0V5uu81a/S3azaWS3AyzAjKYDh2c50H6OXfeD1GS9JyNNg7GOCokwBDtY+/f0M5XYA1Jar N7MYWmM9J9tDJ+1FefR2m7ncUSmcEMSxSaW21Oa2mRIjqYUQs4MgVgyUDEqdn6+iVaASBm oxrcE9QdBQqAWmmP9BL7kBy5VluaU03ZNfCjR1jo1DCM/C5iEIUYTf4iCsoMJomwf52ECn LOMkrO3sHz+9T35BjruJ5hNE1SRa/+S4m0tgsU20I57k8Szhd0xucvcrimGMJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727657246; a=rsa-sha256; cv=none; b=FQxyJLKFfcDKzTkOpu8KLp0jt73XqLUB9BHlTRjNGuutAIEoZs6DhQCgqf3uVmDWJTPaip pdxwL2PSbmRz4X/ubaxyl5WCtRvTxLGrIUPc5k39/bdUxpqO7u1fH8mAIjVaD5Qbew1M6a 6LM9ospn7RaKgAMATPlsP75Eeyn1BED+BjQf+RpThmFB2c5w2Ku/48BB2QxtaSDRBigtZj hkf/G5oM+9xc8nbV9fpD6N8SRPQ/LS1ZXcC8dj92p/b21ifmlrqdSfw30CaoGDaDs4EHrX MJKQyPtlHN6x5dTsz4QxJHRTVJawp4JvE3dbXVrkwv3CogJzlJLIPIOHw2gEcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH2Tp5j26zXYD; Mon, 30 Sep 2024 00:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U0lQTD078830; Mon, 30 Sep 2024 00:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U0lQh3078827; Mon, 30 Sep 2024 00:47:26 GMT (envelope-from git) Date: Mon, 30 Sep 2024 00:47:26 GMT Message-Id: <202409300047.48U0lQh3078827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: cc110bbec6d2 - main - cxgbe/t4_tom: Remove duplicate unlock in t4_tom_deactivate. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc110bbec6d23d8cff47733704c71de641d0c8e8 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=cc110bbec6d23d8cff47733704c71de641d0c8e8 commit cc110bbec6d23d8cff47733704c71de641d0c8e8 Author: Navdeep Parhar AuthorDate: 2024-09-29 20:04:30 +0000 Commit: Navdeep Parhar CommitDate: 2024-09-30 00:38:11 +0000 cxgbe/t4_tom: Remove duplicate unlock in t4_tom_deactivate. Fixes: c1c524852f62 cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/tom/t4_tom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 356ac7edc134..d5b6b6ee2ce0 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1966,7 +1966,6 @@ t4_tom_deactivate(struct adapter *sc) MPASS(TAILQ_EMPTY(&td->synqe_list)); MPASS(TAILQ_EMPTY(&td->stranded_tids)); mtx_unlock(&td->toep_list_lock); - mtx_unlock(&td->toep_list_lock); mtx_lock(&td->lctx_hash_lock); if (td->lctx_count > 0) From nobody Mon Sep 30 00:47:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH2Tr1qB8z5XSR9; Mon, 30 Sep 2024 00:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH2Tr0zGdz4qjk; Mon, 30 Sep 2024 00:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727657248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbsUeyZPne6s6BqYYUHe+RYwms3tFEBn8DWb6qwwXyg=; b=uQ7HhhfQuzboVCsjDaFBieDL022iMcaPKWCybOKnVALm4ILYTCeySrSG5ud/yj9TOjZ/M8 KaT9qu5YjznjmCg7O837xFbKQ5buYXLTZY+Q3qGX4kuwLWMHSnFXz6Xc5G13jANO6Q6Ent Cg0gvTvpNeb1ZGnyBDNYTfS/FOxYKfGFJmcc5HUzy/br+NZPF1zSi/4PoLf+torEJs/Z08 eXyCSGdJwhW0fzQelvrdUYibpqpxwCOT4XA+FCH9VIzxNyIdOKLXiM5sZ+yZHAIKkX4U1D 0JsFVC3SQ9mJA5gRXfukSD9oyremA6hQefrzDC2Z3NIPpqFAX4UTf3Yn2XsblQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727657248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbsUeyZPne6s6BqYYUHe+RYwms3tFEBn8DWb6qwwXyg=; b=R4+Rjsz4PlpolGQWqi+YbPoPMrb+76TWbO7hEvY/4EJoI6h9k4E+CU9a22Sb6x+P1C6XMI 49SMhydJFU6MO67LcVhCegHfVaxQm3WoNCUmlMDenfBwaew9bCvLz5Cs77biDkKNP8TMP4 qANt2rujQfrLLxf1V43Z86pv2b11N/YdFNenTWwItMndby6hKOE9zcg8+pl50hDX5kv4R2 eH9wybURQMl+kaZlqr3EicTYM2HpNT/uS4oJ3KVSx9bcTT7T/WWgf6PC0yrhwPWZCkg76Y lemr71PpKlouHcObtZn4HcHsKbYW/qqCe+hDW/VU8Gn+zvCoS2GXp+3RVrZrpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727657248; a=rsa-sha256; cv=none; b=ef+TLiQS0xIpmUMaAV9yajBxm1rXzThJTaxi0bQabZMkxNR/K//EufbKoK96ajUPbaXzL5 oMbLbFcJHwZJTQ1uYQF45YSUPekvBCn0FGD4dXk4pNA5zo+cLDzpng3qjOGq69RAp7veaH TlijwnWG1XWpv2/miL5VjhW034hVBfK5Jvdj6IIwK5BzW/yN5eS1gR4XTI/YQpxPDJGQnV P3xzuEHCyEC2YmnL7PuHYjKM6OuzHHzy8lXCtb3kcBaxbubKDLxuawxTz6yQtvT6C5x+fo T7ac6D846jzIzb8fo21zrozDlFGD6ZCcWYXjdVUxKDPgVLT7CcKJp0FJzKd+EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH2Tq721jzXLr; Mon, 30 Sep 2024 00:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U0lRNE078878; Mon, 30 Sep 2024 00:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U0lRD1078875; Mon, 30 Sep 2024 00:47:27 GMT (envelope-from git) Date: Mon, 30 Sep 2024 00:47:27 GMT Message-Id: <202409300047.48U0lRD1078875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 9ba8670a8b17 - main - cxgbe(4): Allow t4_tom to be unloaded safely. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ba8670a8b175de79ea087688f51595b4f2db862 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=9ba8670a8b175de79ea087688f51595b4f2db862 commit 9ba8670a8b175de79ea087688f51595b4f2db862 Author: Navdeep Parhar AuthorDate: 2024-09-29 23:29:41 +0000 Commit: Navdeep Parhar CommitDate: 2024-09-30 00:38:11 +0000 cxgbe(4): Allow t4_tom to be unloaded safely. * Disable IFCAP_TOE automatically on all ifnets on all adapters during unload. This is user-friendly and avoids panics due to stale ifnet state after t4_tom is unloaded. * Do not allow unload if tids are in use by the TOE on any adapter. Reported by: Bimal Abraham @ Chelsio MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/adapter.h | 1 + sys/dev/cxgbe/t4_main.c | 22 +++++++++++----------- sys/dev/cxgbe/tom/t4_tom.c | 31 +++++++++++++++++++++++-------- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 2769277e8411..862a90e8a441 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1394,6 +1394,7 @@ void cxgbe_media_status(if_t, struct ifmediareq *); void t4_os_cim_err(struct adapter *); int suspend_adapter(struct adapter *); int resume_adapter(struct adapter *); +int toe_capability(struct vi_info *, bool); #ifdef KERN_TLS /* t6_kern_tls.c */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 307b9c27111a..508f3f08f22a 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -869,7 +869,6 @@ static int stop_lld(struct adapter *); static inline int restart_adapter(struct adapter *); static int restart_lld(struct adapter *); #ifdef TCP_OFFLOAD -static int toe_capability(struct vi_info *, bool); static int deactivate_all_uld(struct adapter *); static void stop_all_uld(struct adapter *); static void restart_all_uld(struct adapter *); @@ -12386,7 +12385,7 @@ t4_ioctl(struct cdev *dev, unsigned long cmd, caddr_t data, int fflag, } #ifdef TCP_OFFLOAD -static int +int toe_capability(struct vi_info *vi, bool enable) { int rc; @@ -12452,6 +12451,7 @@ toe_capability(struct vi_info *vi, bool enable) if (isset(&sc->offload_map, pi->port_id)) { /* TOE is enabled on another VI of this port. */ + MPASS(pi->uld_vis > 0); pi->uld_vis++; return (0); } @@ -12477,17 +12477,17 @@ toe_capability(struct vi_info *vi, bool enable) if (!uld_active(sc, ULD_ISCSI)) (void) t4_activate_uld(sc, ULD_ISCSI); - pi->uld_vis++; - setbit(&sc->offload_map, pi->port_id); + if (pi->uld_vis++ == 0) + setbit(&sc->offload_map, pi->port_id); } else { - pi->uld_vis--; - - if (!isset(&sc->offload_map, pi->port_id) || pi->uld_vis > 0) + if ((if_getcapenable(vi->ifp) & IFCAP_TOE) == 0) { + /* TOE is already disabled. */ return (0); - - KASSERT(uld_active(sc, ULD_TOM), - ("%s: TOM never initialized?", __func__)); - clrbit(&sc->offload_map, pi->port_id); + } + MPASS(isset(&sc->offload_map, pi->port_id)); + MPASS(pi->uld_vis > 0); + if (--pi->uld_vis == 0) + clrbit(&sc->offload_map, pi->port_id); } return (0); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index d5b6b6ee2ce0..97cb380d0e71 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1946,20 +1946,29 @@ done: static int t4_tom_deactivate(struct adapter *sc) { - int rc = 0; + int rc = 0, i, v; struct tom_data *td = sc->tom_softc; + struct vi_info *vi; ASSERT_SYNCHRONIZED_OP(sc); if (td == NULL) return (0); /* XXX. KASSERT? */ - if (sc->offload_map != 0) - return (EBUSY); /* at least one port has IFCAP_TOE enabled */ - if (uld_active(sc, ULD_IWARP) || uld_active(sc, ULD_ISCSI)) return (EBUSY); /* both iWARP and iSCSI rely on the TOE. */ + if (sc->offload_map != 0) { + for_each_port(sc, i) { + for_each_vi(sc->port[i], v, vi) { + toe_capability(vi, false); + if_setcapenablebit(vi->ifp, 0, IFCAP_TOE); + SETTOEDEV(vi->ifp, NULL); + } + } + MPASS(sc->offload_map == 0); + } + mtx_lock(&td->toep_list_lock); if (!TAILQ_EMPTY(&td->toep_list)) rc = EBUSY; @@ -2243,14 +2252,16 @@ t4_tom_mod_load(void) } static void -tom_uninit(struct adapter *sc, void *arg __unused) +tom_uninit(struct adapter *sc, void *arg) { + bool *ok_to_unload = arg; + if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4tomun")) return; /* Try to free resources (works only if no port has IFCAP_TOE) */ - if (uld_active(sc, ULD_TOM)) - t4_deactivate_uld(sc, ULD_TOM); + if (uld_active(sc, ULD_TOM) && t4_deactivate_uld(sc, ULD_TOM) != 0) + *ok_to_unload = false; end_synchronized_op(sc, 0); } @@ -2258,7 +2269,11 @@ tom_uninit(struct adapter *sc, void *arg __unused) static int t4_tom_mod_unload(void) { - t4_iterate(tom_uninit, NULL); + bool ok_to_unload = true; + + t4_iterate(tom_uninit, &ok_to_unload); + if (!ok_to_unload) + return (EBUSY); if (t4_unregister_uld(&tom_uld_info, ULD_TOM) == EBUSY) return (EBUSY); From nobody Mon Sep 30 03:36:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DN6h1Qz5Xf2V; Mon, 30 Sep 2024 03:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DN6PFpz4387; Mon, 30 Sep 2024 03:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpW9M+yb4Pp4+bQDD2+xpWsCkkyrGTLMxKrJ3RgKouo=; b=iXWwY9DGXdiR20ptPKj8mNwtIgKXY48RX8M6nKu2qJhNA/eT/BP0VQNLo0UwZkxOY90h/e knr8wJNYu5ZxqPFSLbCgbgr01moTxnm67g/BYU41P4jgiB+gb8NnIuAb5HoWc7BG+GgrXz jM2oAa0A/CPT3OXdSEjksqgy+D2nIG4PQPy/XGzyr64oWGUInnSFvQW2s3GUM8p/h1Lnen gk2uBdeaA7RF3rR32EKS+Yjhluy5B/j1Im/0mC8jgXxfyISVuowHRh5nShnyCdfPf8iOG6 7D/6dmi+8AGpKgs8ENTXD184VZmNslPZkvWfqKBoz1zO6buCC1nKhZIDHDnVSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpW9M+yb4Pp4+bQDD2+xpWsCkkyrGTLMxKrJ3RgKouo=; b=B0kKCIUBwLFCB+GYgqr0wtZOimFGf2R0sJp7LBlBZOOwcE5d/f+tifABrtwZIgfbvSSZQb AkQe93iDgf/Jf9OhoDr+1MPeYFmyLvT25/WRR+cbDDIy59e1BxF+1RKMfBIdUDHfAmkss1 YIlBofDYTuahIPtDgR3Kll5ILJTgi5n7DLNjLcg2qEx2N8r/mx9X53XV3jWbZuFHH5/ahw +W4nvacbO8M+yWTixVHRuno+9zFcP8uR9s94oRScT3OiEdT5aqJzzw58E4bieiHTXefGOR ozKzAVV3bYqzqMOLG24FDRlTIZAVoYZhSC1vY3atci7N0LfSypRzNkkBFXUcCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667364; a=rsa-sha256; cv=none; b=bZB+sA/AjCzVDlT+9g88+o2fhpv+KZ3VUmyRjcqWuGagGA+KbGsd+XjasqvSBOx3t03+l5 EGK9vojJ5QQiU6bumSQM+3YFAK323qb0pw7pHqh8MMIjocKyeyu5UdJ4PRd2RbAAjJzuyR CfdGEkze4ruOCVDhNlp4u3n6o9Wp25RIJyAtJGAT7vYBsOswHeItvLyrvtSW4/ww3t1jc2 YV2EBOpONUYVTvtUwdq+p/fNJHQv4hVWTBeavOqA8KF328u/RKyIKAlCAMqWMPGHldOVoa xlXfPRhgdMiOyN7LldbKqGsf9wFYWHBQrbr0s8u9L2prGxHuXfWmR1Je0xdP7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DN5w3HzcPY; Mon, 30 Sep 2024 03:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3a4it066965; Mon, 30 Sep 2024 03:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3a4jV066962; Mon, 30 Sep 2024 03:36:04 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:04 GMT Message-Id: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7a629c851d747772cc138efcb0418809ecdea55 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e7a629c851d747772cc138efcb0418809ecdea55 commit e7a629c851d747772cc138efcb0418809ecdea55 Author: Kyle Evans AuthorDate: 2022-03-08 15:39:52 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:18 +0000 libmd, kern, stand: consolidate md5 implementations (NFC) Reduce the number of md5c.c between the three of these from two to one by just reaching into the kernel build for both userland builds. The precedent for this already exists for sha2 in both cases. _libmd_ symbol privatization bits have been moved to sys/md5.h and md5.h remains to #include for compatibility. This stops exporting MD5Pad() in the process because the kernel stopped exporting it in 502a35d60f4c. soversion is bumped accordingly. This also renames the libc version of stack_protector.c; it previously only worked by coincidence because .PATH ordering worked out such that we got the right one, but this is not the case anymore. Remove the landmine. PR: 280784 (exp-run) Reviewed by: allanjude, delphij Differential Revision: https://reviews.freebsd.org/D34497 --- ObsoleteFiles.inc | 3 + lib/libc/Makefile | 2 +- lib/libc/md/Makefile.inc | 2 +- lib/libc/secure/Makefile.inc | 2 +- .../{stack_protector.c => libc_stack_protector.c} | 0 lib/libcrypt/Makefile | 2 +- lib/libmd/Makefile | 3 +- lib/libmd/md5.h | 40 --- lib/libmd/md5c.c | 344 --------------------- lib/libssp/Makefile | 2 +- stand/libsa/Makefile | 4 +- sys/kern/md5c.c | 23 +- sys/sys/md5.h | 42 +++ 13 files changed, 72 insertions(+), 397 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 2686086970ce..9ecf5a8c3ecf 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -3230,6 +3230,9 @@ OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.in OLD_DIRS+=usr/tests/usr.bin/uuencode OLD_DIRS+=usr/tests/usr.bin/uudecode +# 20220308: libmd bumped to version 7 +OLD_LIBS+=lib/libmd.so.6 + # 20220318: snd_ds1 and snd_maestro drivers removed OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz diff --git a/lib/libc/Makefile b/lib/libc/Makefile index ae059e53144c..d0c254e33396 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -220,6 +220,6 @@ GENDIRDEPS_FILTER+= N${RELDIR:H}/msun # Disable warnings in contributed sources. CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/} # Disable stack protection for SSP symbols. -SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/} +SSP_CFLAGS:= ${.IMPSRC:N*/libc_stack_protector.c:C/^.+$/${SSP_CFLAGS}/} # Generate stack unwinding tables for cancellation points CANCELPOINTS_CFLAGS:= ${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//} diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc index 346fb93017a6..82c5f0670485 100644 --- a/lib/libc/md/Makefile.inc +++ b/lib/libc/md/Makefile.inc @@ -1,3 +1,3 @@ -.PATH: ${SRCTOP}/lib/libmd +.PATH: ${SRCTOP}/sys/kern SRCS+= md5c.c diff --git a/lib/libc/secure/Makefile.inc b/lib/libc/secure/Makefile.inc index e5286a5a380f..5ee6f38d8b98 100644 --- a/lib/libc/secure/Makefile.inc +++ b/lib/libc/secure/Makefile.inc @@ -15,7 +15,7 @@ CFLAGS.vsnprintf_chk.c+= -Wno-unused-parameter CFLAGS.vsprintf_chk.c+= -Wno-unused-parameter # Sources common to both syscall interfaces: -SRCS+= stack_protector.c \ +SRCS+= libc_stack_protector.c \ stack_protector_compat.c SYM_MAPS+= ${LIBC_SRCTOP}/secure/Symbol.map diff --git a/lib/libc/secure/stack_protector.c b/lib/libc/secure/libc_stack_protector.c similarity index 100% rename from lib/libc/secure/stack_protector.c rename to lib/libc/secure/libc_stack_protector.c diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 9511bba81e26..d9bd85f7e699 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -10,7 +10,7 @@ PACKAGE= runtime SHLIB_MAJOR= 5 LIB= crypt -.PATH: ${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2 +.PATH: ${SRCTOP}/sys/kern ${SRCTOP}/sys/crypto/sha2 SRCS= crypt.c misc.c \ crypt-md5.c md5c.c \ crypt-nthash.c md4c.c \ diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 4c2ed2f7f9c7..0a0890e06550 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -5,7 +5,7 @@ SHLIBDIR?= /lib PACKAGE= runtime LIB= md -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 SRCS= md4c.c md5c.c md4hl.c md5hl.c \ rmd160c.c rmd160hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ @@ -105,6 +105,7 @@ CFLAGS+= -DWEAK_REFS CFLAGS.skein_block.c+= -DSKEIN_LOOP=995 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 .PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} +.PATH: ${SRCTOP}/sys/kern USE_ASM_SOURCES?=1 .if defined(BOOTSTRAPPING) || ${MK_MACHDEP_OPTIMIZATIONS} == no diff --git a/lib/libmd/md5.h b/lib/libmd/md5.h index a4a9f47d4d90..fca9d5f6ee6e 100644 --- a/lib/libmd/md5.h +++ b/lib/libmd/md5.h @@ -2,45 +2,5 @@ #ifndef _MD5_H_ #define _MD5_H_ -#ifndef _KERNEL - -/* Ensure libmd symbols do not clash with libcrypto */ - -#ifndef MD5Init -#define MD5Init _libmd_MD5Init -#endif -#ifndef MD5Update -#define MD5Update _libmd_MD5Update -#endif -#ifndef MD5Pad -#define MD5Pad _libmd_MD5Pad -#endif -#ifndef MD5Final -#define MD5Final _libmd_MD5Final -#endif -#ifndef MD5Transform -#define MD5Transform _libmd_MD5Transform -#endif -#ifndef MD5End -#define MD5End _libmd_MD5End -#endif -#ifndef MD5Fd -#define MD5Fd _libmd_MD5Fd -#endif -#ifndef MD5FdChunk -#define MD5FdChunk _libmd_MD5FdChunk -#endif -#ifndef MD5File -#define MD5File _libmd_MD5File -#endif -#ifndef MD5FileChunk -#define MD5FileChunk _libmd_MD5FileChunk -#endif -#ifndef MD5Data -#define MD5Data _libmd_MD5Data -#endif - -#endif - #include #endif /* _MD5_H_ */ diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c deleted file mode 100644 index 56f21f441e2c..000000000000 --- a/lib/libmd/md5c.c +++ /dev/null @@ -1,344 +0,0 @@ -/*- - * SPDX-License-Identifier: RSA-MD - * - * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD5 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD5 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - * - * This code is the same as the code published by RSA Inc. It has been - * edited for clarity and style only. - */ - -#include - -#ifdef _KERNEL -#include -#else -#include -#endif - -#include -#include -#include "md5.h" - -static void MD5Transform(u_int32_t [4], const unsigned char [64]); - -#ifdef _KERNEL -#define memset(x,y,z) bzero(x,z); -#define memcpy(x,y,z) bcopy(y, x, z) -#endif - -#if (BYTE_ORDER == LITTLE_ENDIAN) -#define Encode memcpy -#define Decode memcpy -#else - -/* - * Encodes input (u_int32_t) into output (unsigned char). Assumes len is - * a multiple of 4. - */ - -static void -Encode (unsigned char *output, u_int32_t *input, unsigned int len) -{ - unsigned int i; - u_int32_t *op = (u_int32_t *)output; - - for (i = 0; i < len / 4; i++) - op[i] = htole32(input[i]); -} - -/* - * Decodes input (unsigned char) into output (u_int32_t). Assumes len is - * a multiple of 4. - */ - -static void -Decode (u_int32_t *output, const unsigned char *input, unsigned int len) -{ - unsigned int i; - const u_int32_t *ip = (const u_int32_t *)input; - - for (i = 0; i < len / 4; i++) - output[i] = le32toh(ip[i]); -} -#endif - -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* F, G, H and I are basic MD5 functions. */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits. */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* - * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. - * Rotation is separate from addition to prevent recomputation. - */ -#define FF(a, b, c, d, x, s, ac) { \ - (a) += F ((b), (c), (d)) + (x) + (u_int32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) { \ - (a) += G ((b), (c), (d)) + (x) + (u_int32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) { \ - (a) += H ((b), (c), (d)) + (x) + (u_int32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) { \ - (a) += I ((b), (c), (d)) + (x) + (u_int32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } - -/* MD5 initialization. Begins an MD5 operation, writing a new context. */ - -void -MD5Init (MD5_CTX *context) -{ - - context->count[0] = context->count[1] = 0; - - /* Load magic initialization constants. */ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; -} - -/* - * MD5 block update operation. Continues an MD5 message-digest - * operation, processing another message block, and updating the - * context. - */ - -void -MD5Update (MD5_CTX *context, const void *in, unsigned int inputLen) -{ - unsigned int i, idx, partLen; - const unsigned char *input = in; - - /* Compute number of bytes mod 64 */ - idx = (unsigned int)((context->count[0] >> 3) & 0x3F); - - /* Update number of bits */ - if ((context->count[0] += ((u_int32_t)inputLen << 3)) - < ((u_int32_t)inputLen << 3)) - context->count[1]++; - context->count[1] += ((u_int32_t)inputLen >> 29); - - partLen = 64 - idx; - - /* Transform as many times as possible. */ - if (inputLen >= partLen) { - memcpy((void *)&context->buffer[idx], (const void *)input, - partLen); - MD5Transform (context->state, context->buffer); - - for (i = partLen; i + 63 < inputLen; i += 64) - MD5Transform (context->state, &input[i]); - - idx = 0; - } - else - i = 0; - - /* Buffer remaining input */ - memcpy ((void *)&context->buffer[idx], (const void *)&input[i], - inputLen-i); -} - -/* - * MD5 padding. Adds padding followed by original length. - */ - -void -MD5Pad (MD5_CTX *context) -{ - unsigned char bits[8]; - unsigned int idx, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. */ - idx = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (idx < 56) ? (56 - idx) : (120 - idx); - MD5Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD5Update (context, bits, 8); -} - -/* - * MD5 finalization. Ends an MD5 message-digest operation, writing the - * the message digest and zeroizing the context. - */ - -void -MD5Final (unsigned char digest[16], MD5_CTX *context) -{ - /* Do padding. */ - MD5Pad (context); - - /* Store state in digest */ - Encode (digest, context->state, 16); - - /* Zeroize sensitive information. */ - explicit_bzero(context, sizeof(*context)); -} - -/* MD5 basic transformation. Transforms state based on block. */ - -static void -MD5Transform (u_int32_t state[4], const unsigned char block[64]) -{ - u_int32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. */ - memset ((void *)x, 0, sizeof (x)); -} - -#ifdef WEAK_REFS -/* When building libmd, provide weak references. Note: this is not - activated in the context of compiling these sources for internal - use in libcrypt. - */ -#undef MD5Init -__weak_reference(_libmd_MD5Init, MD5Init); -#undef MD5Update -__weak_reference(_libmd_MD5Update, MD5Update); -#undef MD5Pad -__weak_reference(_libmd_MD5Pad, MD5Pad); -#undef MD5Final -__weak_reference(_libmd_MD5Final, MD5Final); -#undef MD5Transform -__weak_reference(_libmd_MD5Transform, MD5Transform); -#endif diff --git a/lib/libssp/Makefile b/lib/libssp/Makefile index c481839ee324..d4038b705acb 100644 --- a/lib/libssp/Makefile +++ b/lib/libssp/Makefile @@ -27,7 +27,7 @@ CFLAGS+= -I${SRCTOP}/lib/libc/include # _elf_aux_info is exported from libc as elf_aux_info(3), so just that for the # libssp build instead. CFLAGS+= -D_elf_aux_info=elf_aux_info -SRCS+= stack_protector.c +SRCS+= libc_stack_protector.c # Stack protection on libssp symbols should be considered harmful, as we may # be talking about, for example, the guard setup constructor. diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 6064a6780921..3d46b9c7ffa1 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -189,8 +189,8 @@ SRCS+= g_eli_hmac.c pkcs5v2.c .PATH: ${SYSDIR}/crypto/sha2 SRCS+= sha256c.c sha512c.c -# md5 from libmd -.PATH: ${SRCTOP}/lib/libmd +# md5 from the kernel +.PATH: ${SYSDIR}/kern SRCS+= md5c.c .if ${DO32:U0} == 0 diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c index cc28ba484e95..b1ceac656cdd 100644 --- a/sys/kern/md5c.c +++ b/sys/kern/md5c.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: RSA-MD + * * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm * * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All @@ -26,10 +28,6 @@ * edited for clarity and style only. */ -/* - * This file should be kept in sync with src/lib/libmd/md5c.c - */ - #include #ifdef _KERNEL @@ -220,7 +218,7 @@ MD5Final(unsigned char digest[static MD5_DIGEST_LENGTH], MD5_CTX *context) Encode (digest, context->state, MD5_DIGEST_LENGTH); /* Zeroize sensitive information. */ - memset (context, 0, sizeof (*context)); + explicit_bzero (context, sizeof (*context)); } /* MD5 basic transformation. Transforms state based on block. */ @@ -328,3 +326,18 @@ MD5Transform(uint32_t state[4], const unsigned char block[64]) /* Zeroize sensitive information. */ memset ((void *)x, 0, sizeof (x)); } + +#ifdef WEAK_REFS +/* When building libmd, provide weak references. Note: this is not + activated in the context of compiling these sources for internal + use in libcrypt. + */ +#undef MD5Init +__weak_reference(_libmd_MD5Init, MD5Init); +#undef MD5Update +__weak_reference(_libmd_MD5Update, MD5Update); +#undef MD5Final +__weak_reference(_libmd_MD5Final, MD5Final); +#undef MD5Transform +__weak_reference(_libmd_MD5Transform, MD5Transform); +#endif diff --git a/sys/sys/md5.h b/sys/sys/md5.h index ac9a1dbfe4ae..2320a1a860bb 100644 --- a/sys/sys/md5.h +++ b/sys/sys/md5.h @@ -29,6 +29,8 @@ documentation and/or software. #ifndef _SYS_MD5_H_ #define _SYS_MD5_H_ +#include + #define MD5_BLOCK_LENGTH 64 #define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) @@ -40,6 +42,46 @@ typedef struct MD5Context { unsigned char buffer[64]; /* input buffer */ } MD5_CTX; +#ifndef _KERNEL + +/* Ensure libmd symbols do not clash with libcrypto */ + +#ifndef MD5Init +#define MD5Init _libmd_MD5Init +#endif +#ifndef MD5Update +#define MD5Update _libmd_MD5Update +#endif +#ifndef MD5Pad +#define MD5Pad _libmd_MD5Pad +#endif +#ifndef MD5Final +#define MD5Final _libmd_MD5Final +#endif +#ifndef MD5Transform +#define MD5Transform _libmd_MD5Transform +#endif +#ifndef MD5End +#define MD5End _libmd_MD5End +#endif +#ifndef MD5Fd +#define MD5Fd _libmd_MD5Fd +#endif +#ifndef MD5FdChunk +#define MD5FdChunk _libmd_MD5FdChunk +#endif +#ifndef MD5File +#define MD5File _libmd_MD5File +#endif +#ifndef MD5FileChunk +#define MD5FileChunk _libmd_MD5FileChunk +#endif +#ifndef MD5Data +#define MD5Data _libmd_MD5Data +#endif + +#endif + #include __BEGIN_DECLS From nobody Mon Sep 30 03:36:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DQ2PZDz5XfNr; Mon, 30 Sep 2024 03:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DQ15gTz43cN; Mon, 30 Sep 2024 03:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZKgSWGEuF4OSP+n5fWZp8YvgwmCoQI+fz1zmddlc0A=; b=RtAPUiyq9QxRqGm5J9H+9pE6P03Es2QEUBtpE6z9Whw57lvIkXDFRhqkPRj3tUeTkaJQFG 6gp+zRcFOyGzsYx8V2LVaMLY0ps213vx1D9Ow8aNOmzTJvFSVRu9BV8sMBZNnvk1DgjJzA DIqshZxwG16Zxo8lOu8+tjbcSgfit5KkmEZDoZ0mv2aUuknfDOOgV+iHz32l4L4iqsrtx4 AONY8sOUVJpVfnBZ096JTiMMeNHJ8g3BMtqU6xoixE1MdoQKazHdE9jUttjJ3g3Z24fkuE hv1z/cBTkMW+HU3wpbx7OZKkbfYPn/AfemfaKUDQGEi6ImTAWTE4/6hfvnas2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZKgSWGEuF4OSP+n5fWZp8YvgwmCoQI+fz1zmddlc0A=; b=PiymNjZLJlgPm9xTlJBJM0IYpZ795bx+ya7LPRl7NiNfSjeSmuq1P6EIYeeySqMNEP9cE+ ZET2YTqFMmA2TLCs5w31l1XsvoVMdwstuO0QSqURKoUFQ34LpKSjZsxRRrReLLpOv2ttFy llFoPO8XVHPhYRsEz+5fSfXkqGsJ5qlmqPz5WOWjIECKiFWUulIIYEAl7Y/O/fYBQ95YOv WzWVEkQRPRehsz69Dk8tv/mjsEzxgOpPPIgYYmnfaqVUQ/0SYirp4WWwwR8PeM9ZNZaetJ 5sTv1IqvjTiCXfZshQuF30NviMIlCDONDfR4j2agArHn0795stGtsAuAuQxnlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667366; a=rsa-sha256; cv=none; b=SIZLGcYObJcE4I7MDLrSFgm4xY6Rz3jzYJyLLOgxQCUGYBrG2Hls9AOwr4HlxlNiiffTvu JzUhoa3bXq5QNngogyKMFp1g8FgIGqcz+d2L52PUucPd5gAHSVo6H40a0BwSltpEczO6so iYlthjZKt1OTXzsVQRr9oGqvC8Zj/R9qcN29cZD7nmK9ZjXNg0EtqRpRBTomVOA2KryYVN WYXCzGWJjO00qIupoeALN+sRq412mXoEmSIMbn7t2uTfKh6oPwuBSqYpy9pz/Y3EG8iMqj hmJhGVnjoLbfJyuZRfVxS5ELeQbl/jJ6uWkFcES084U/I6AAB7XgNk5IW+GphQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DP6bLCzcjL; Mon, 30 Sep 2024 03:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3a5kP067008; Mon, 30 Sep 2024 03:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3a5Ct067005; Mon, 30 Sep 2024 03:36:05 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:05 GMT Message-Id: <202409300336.48U3a5Ct067005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d61f4b481f48 - main - libmd: stop exporting _block symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d61f4b481f4876a8640830f9b06c8ffa2bdcae7d Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d61f4b481f4876a8640830f9b06c8ffa2bdcae7d commit d61f4b481f4876a8640830f9b06c8ffa2bdcae7d Author: Kyle Evans AuthorDate: 2022-03-08 15:52:01 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:18 +0000 libmd: stop exporting _block symbols These are needed across compilation units so we can keep the _libmd_ prefixing bits (though I suspect we're not likely to collide), but we don't need to be exporting the unprefixed versions of these; it's an implementation detail. PR: 280784 (exp-run) Reviewed by: delphij, fuz Differential Revision: https://reviews.freebsd.org/D34498 --- lib/libmd/rmd160c.c | 2 -- lib/libmd/sha1c.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c index 66ba0a5e5c72..afc20545dd3d 100644 --- a/lib/libmd/rmd160c.c +++ b/lib/libmd/rmd160c.c @@ -544,6 +544,4 @@ __weak_reference(_libmd_RIPEMD160_Final, RIPEMD160_Final); __weak_reference(_libmd_RIPEMD160_Transform, RIPEMD160_Transform); #undef RMD160_version __weak_reference(_libmd_RMD160_version, RMD160_version); -#undef ripemd160_block -__weak_reference(_libmd_ripemd160_block, ripemd160_block); #endif diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index 299a9149be4a..42b554c83ed1 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -487,8 +487,6 @@ __weak_reference(_libmd_SHA_Final, SHA_Final); __weak_reference(_libmd_SHA_Transform, SHA_Transform); #undef SHA_version __weak_reference(_libmd_SHA_version, SHA_version); -#undef sha_block -__weak_reference(_libmd_sha_block, sha_block); #undef SHA1_Init __weak_reference(_libmd_SHA1_Init, SHA1_Init); #undef SHA1_Update @@ -499,6 +497,4 @@ __weak_reference(_libmd_SHA1_Final, SHA1_Final); __weak_reference(_libmd_SHA1_Transform, SHA1_Transform); #undef SHA1_version __weak_reference(_libmd_SHA1_version, SHA1_version); -#undef sha1_block -__weak_reference(_libmd_sha1_block, sha1_block); #endif From nobody Mon Sep 30 03:36:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DR4pxFz5Xf6b; Mon, 30 Sep 2024 03:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DR2g5rz43Fc; Mon, 30 Sep 2024 03:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H71xsEUwgvcMNpbLLD0PTqO2PZXLmvQkq11BkpNaTOU=; b=yMfUUSuRJUH4DlOSzcdUMIzNtkhILpe5Zh+WMU1V7taqvxTfVLh6/P8OiOeox87aCDsht9 rBRh0CpN3YBTsZ9SHA5ikvXHf8qAzytgB3SVJ70MhoEyurMQbB1TwEceLz0bl2N4lkczag +QpUmpsyKk94KjjPM0NOGB2l0AJWJLYzDkUvmafHayyJNhWrXhAmEGidj9gwsmAnA0G+MF YlJh8BI8pWZ1K6eHxYqPclcnfxexkfCEr3YM1+pjffBjYfYHJIfVoZmiPegpqfZ7EwSpiw yZqCtFTRNdS50EzrB188R1mhQQAjnSm/RJVyY3TMS4RmDLV18ziKvfh3M4n/sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H71xsEUwgvcMNpbLLD0PTqO2PZXLmvQkq11BkpNaTOU=; b=GuFqfwTU/Z8gLVCVQ0vN+4xlqyOZQH2davq8eN8nKGN9rtoN+2ppguuJ4vaWY4cVA27ExH XCTIHLLYPQ5dcJpp2CnsvAVmOIn9Ao4o3pUQ6hqwBVMS91RfGYpOd1URt9xhXz0bATLiAu 27aWi6GjuMS4wWHKk7wLkJY8FQYr37nLPkKN4Pq7LXqHNif78hnRObn7P4TR9ckYEiEArz JixFYYhz9r28Q5ZZSGS3wkKBzMdDmZRgAbEKaAR8g/qgfaUS4n4gX4e61PAFhCeU9yFoR8 j9/uHgiWDZSqzKtGycNVoP/rOpC6RqCTBHU8CYbjcqWsgfjDspB0BNMJwX0qMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667367; a=rsa-sha256; cv=none; b=yOZAOyrhhmsqbYw3gok5qSdIAWA/Ix/LNGEpqZrycr9DBhpnq2CED1QWfWprv70tP4ciko 0oc51zCm77GjD6TRr6PFUOf52IJkCRSb3nkV3OiWS8Ow1s8dl7g2JnYyoMSQx3xXyH0D4b 49AL2IeneQMqPQM1ZHwlKogHR5WePsz3JNJlpYc1Qy4GP/3LvEiPe5BNiUL/4aQTV2NolL WGxwBfcFSm/PIP5oa3MyCdEnta2sFtWUJsABCbiSsh9yu0A2R/iDj33hhcjq8GNcF1gyY7 SWlYUHeUChFyALdzZNIX6HkWmni+fBMqL/+mq5XkFNqr2VhpZMOsjJZ7mdu9/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DR1DRZzcd8; Mon, 30 Sep 2024 03:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3a730067046; Mon, 30 Sep 2024 03:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3a6ng067043; Mon, 30 Sep 2024 03:36:06 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:06 GMT Message-Id: <202409300336.48U3a6ng067043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e25527f75f73 - main - libmd: symbol versioning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e25527f75f73665517c7a449cdc6a29fa4c90c1c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e25527f75f73665517c7a449cdc6a29fa4c90c1c commit e25527f75f73665517c7a449cdc6a29fa4c90c1c Author: Kyle Evans AuthorDate: 2022-03-08 16:12:19 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:19 +0000 libmd: symbol versioning The primary benefit sought is exporting _libmd_* symbols in a private namespace, and avoiding export of some other implementation details that are shared amongst TUs. PR: 280784 (exp-run) Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D34499 --- lib/libmd/Makefile | 3 + lib/libmd/Symbol.map | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 275 insertions(+) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 0a0890e06550..9412adaf5a56 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -19,6 +19,9 @@ INCS= md4.h md5.h ripemd.h sha.h sha224.h sha256.h sha384.h sha512.h \ WARNS?= 0 +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def +SYMBOL_MAPS= ${.CURDIR}/Symbol.map + MAN+= md4.3 md5.3 ripemd.3 sha.3 sha256.3 sha512.3 skein.3 MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3 MLINKS+=md4.3 MD4End.3 md4.3 MD4File.3 md4.3 MD4FileChunk.3 diff --git a/lib/libmd/Symbol.map b/lib/libmd/Symbol.map new file mode 100644 index 000000000000..9ac73e5bb5fd --- /dev/null +++ b/lib/libmd/Symbol.map @@ -0,0 +1,272 @@ +FBSD_1.7 { + MD4Data; + MD4End; + MD4Fd; + MD4FdChunk; + MD4File; + MD4FileChunk; + MD4Final; + MD4Init; + MD4Pad; + MD4Update; + MD5Data; + MD5End; + MD5Fd; + MD5FdChunk; + MD5File; + MD5FileChunk; + MD5Final; + MD5Init; + MD5Transform; + MD5Update; + RIPEMD160_Data; + RIPEMD160_End; + RIPEMD160_Fd; + RIPEMD160_FdChunk; + RIPEMD160_File; + RIPEMD160_FileChunk; + RIPEMD160_Final; + RIPEMD160_Init; + RIPEMD160_Transform; + RIPEMD160_Update; + RMD160_version; + SHA1_Data; + SHA1_End; + SHA1_Fd; + SHA1_FdChunk; + SHA1_File; + SHA1_FileChunk; + SHA1_Final; + SHA1_Init; + SHA1_Transform; + SHA1_Update; + SHA1_version; + SHA224_Data; + SHA224_End; + SHA224_Fd; + SHA224_FdChunk; + SHA224_File; + SHA224_FileChunk; + SHA224_Final; + SHA224_Init; + SHA224_Update; + SHA256_Data; + SHA256_End; + SHA256_Fd; + SHA256_FdChunk; + SHA256_File; + SHA256_FileChunk; + SHA256_Final; + SHA256_Init; + SHA256_Transform; + SHA256_Update; + SHA384_Data; + SHA384_End; + SHA384_Fd; + SHA384_FdChunk; + SHA384_File; + SHA384_FileChunk; + SHA384_Final; + SHA384_Init; + SHA384_Update; + SHA512_224_Data; + SHA512_224_End; + SHA512_224_Fd; + SHA512_224_FdChunk; + SHA512_224_File; + SHA512_224_FileChunk; + SHA512_224_Final; + SHA512_224_Init; + SHA512_224_Update; + SHA512_256_Data; + SHA512_256_End; + SHA512_256_Fd; + SHA512_256_FdChunk; + SHA512_256_File; + SHA512_256_FileChunk; + SHA512_256_Final; + SHA512_256_Init; + SHA512_256_Update; + SHA512_Data; + SHA512_End; + SHA512_Fd; + SHA512_FdChunk; + SHA512_File; + SHA512_FileChunk; + SHA512_Final; + SHA512_Init; + SHA512_Transform; + SHA512_Update; + SHA_Data; + SHA_End; + SHA_Fd; + SHA_FdChunk; + SHA_File; + SHA_FileChunk; + SKEIN1024_Data; + SKEIN1024_End; + SKEIN1024_Fd; + SKEIN1024_FdChunk; + SKEIN1024_File; + SKEIN1024_FileChunk; + SKEIN1024_Final; + SKEIN1024_Init; + SKEIN1024_Update; + SKEIN256_Data; + SKEIN256_End; + SKEIN256_Fd; + SKEIN256_FdChunk; + SKEIN256_File; + SKEIN256_FileChunk; + SKEIN256_Final; + SKEIN256_Init; + SKEIN256_Update; + SKEIN512_Data; + SKEIN512_End; + SKEIN512_Fd; + SKEIN512_FdChunk; + SKEIN512_File; + SKEIN512_FileChunk; + SKEIN512_Final; + SKEIN512_Init; + SKEIN512_Update; +}; + +FBSDprivate_1.0 { + _libmd_MD4Data; + _libmd_MD4End; + _libmd_MD4Fd; + _libmd_MD4FdChunk; + _libmd_MD4File; + _libmd_MD4FileChunk; + _libmd_MD4Final; + _libmd_MD4Init; + _libmd_MD4Pad; + _libmd_MD4Update; + _libmd_MD5Data; + _libmd_MD5End; + _libmd_MD5Fd; + _libmd_MD5FdChunk; + _libmd_MD5File; + _libmd_MD5FileChunk; + _libmd_MD5Final; + _libmd_MD5Init; + _libmd_MD5Transform; + _libmd_MD5Update; + _libmd_RIPEMD160_Data; + _libmd_RIPEMD160_End; + _libmd_RIPEMD160_Fd; + _libmd_RIPEMD160_FdChunk; + _libmd_RIPEMD160_File; + _libmd_RIPEMD160_FileChunk; + _libmd_RIPEMD160_Final; + _libmd_RIPEMD160_Init; + _libmd_RIPEMD160_Transform; + _libmd_RIPEMD160_Update; + _libmd_RMD160_version; + _libmd_SHA1_Data; + _libmd_SHA1_End; + _libmd_SHA1_Fd; + _libmd_SHA1_FdChunk; + _libmd_SHA1_File; + _libmd_SHA1_FileChunk; + _libmd_SHA1_Final; + _libmd_SHA1_Init; + _libmd_SHA1_Transform; + _libmd_SHA1_Update; + _libmd_SHA1_version; + _libmd_SHA224_Data; + _libmd_SHA224_End; + _libmd_SHA224_Fd; + _libmd_SHA224_FdChunk; + _libmd_SHA224_File; + _libmd_SHA224_FileChunk; + _libmd_SHA224_Final; + _libmd_SHA224_Init; + _libmd_SHA224_Update; + _libmd_SHA256_Data; + _libmd_SHA256_End; + _libmd_SHA256_Fd; + _libmd_SHA256_FdChunk; + _libmd_SHA256_File; + _libmd_SHA256_FileChunk; + _libmd_SHA256_Final; + _libmd_SHA256_Init; + _libmd_SHA256_Transform; + _libmd_SHA256_Update; + _libmd_SHA384_Data; + _libmd_SHA384_End; + _libmd_SHA384_Fd; + _libmd_SHA384_FdChunk; + _libmd_SHA384_File; + _libmd_SHA384_FileChunk; + _libmd_SHA384_Final; + _libmd_SHA384_Init; + _libmd_SHA384_Update; + _libmd_SHA512_224_Data; + _libmd_SHA512_224_End; + _libmd_SHA512_224_Fd; + _libmd_SHA512_224_FdChunk; + _libmd_SHA512_224_File; + _libmd_SHA512_224_FileChunk; + _libmd_SHA512_224_Final; + _libmd_SHA512_224_Init; + _libmd_SHA512_224_Update; + _libmd_SHA512_256_Data; + _libmd_SHA512_256_End; + _libmd_SHA512_256_Fd; + _libmd_SHA512_256_FdChunk; + _libmd_SHA512_256_File; + _libmd_SHA512_256_FileChunk; + _libmd_SHA512_256_Final; + _libmd_SHA512_256_Init; + _libmd_SHA512_256_Update; + _libmd_SHA512_Data; + _libmd_SHA512_End; + _libmd_SHA512_Fd; + _libmd_SHA512_FdChunk; + _libmd_SHA512_File; + _libmd_SHA512_FileChunk; + _libmd_SHA512_Final; + _libmd_SHA512_Init; + _libmd_SHA512_Transform; + _libmd_SHA512_Update; + _libmd_SHA_Data; + _libmd_SHA_End; + _libmd_SHA_Fd; + _libmd_SHA_FdChunk; + _libmd_SHA_File; + _libmd_SHA_FileChunk; + _libmd_SHA_Final; + _libmd_SHA_Init; + _libmd_SHA_Transform; + _libmd_SHA_Update; + _libmd_SHA_version; + _libmd_SKEIN1024_Data; + _libmd_SKEIN1024_End; + _libmd_SKEIN1024_Fd; + _libmd_SKEIN1024_FdChunk; + _libmd_SKEIN1024_File; + _libmd_SKEIN1024_FileChunk; + _libmd_SKEIN1024_Final; + _libmd_SKEIN1024_Init; + _libmd_SKEIN1024_Update; + _libmd_SKEIN256_Data; + _libmd_SKEIN256_End; + _libmd_SKEIN256_Fd; + _libmd_SKEIN256_FdChunk; + _libmd_SKEIN256_File; + _libmd_SKEIN256_FileChunk; + _libmd_SKEIN256_Final; + _libmd_SKEIN256_Init; + _libmd_SKEIN256_Update; + _libmd_SKEIN512_Data; + _libmd_SKEIN512_End; + _libmd_SKEIN512_Fd; + _libmd_SKEIN512_FdChunk; + _libmd_SKEIN512_File; + _libmd_SKEIN512_FileChunk; + _libmd_SKEIN512_Final; + _libmd_SKEIN512_Init; + _libmd_SKEIN512_Update; +}; From nobody Mon Sep 30 03:36:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DS4fdXz5XfQt; Mon, 30 Sep 2024 03:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DS34qJz43Wk; Mon, 30 Sep 2024 03:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aQKxLXK0/4lMhaJHuxabLOhkv9Hf17Nb+d01A1xh3BE=; b=pMSv/JtgtZl+PuzDKK+7vTeOUM9MaA8dIdnYJb0E38+hO+SBoFBAKR8BKsYItbPz3YIL80 iLrZOBPZ9yLEpSidMIV2ci255CTHzggPwTj/28vsvBKamnJZsmM0foUF7yKLMIMl4Gy8mP I4YZ6fW3GIN8JD+HzYrGGD68thMPpvTcTHKxxuowtVD9dE+2M6v2exi0jLMJtOED24J62s CaphgAIN/nKUwrQdGp1pQ2MlA/hzrJpVpEdXPT4kJGkLgjXa7LUiuzJ69r6EIEG5tX+sJ+ aheUWU78aNp7QRqDpp7456b6xC/jGtyHYoGo1YWMhnMbnqxRL7aR3RDh1Ev9Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aQKxLXK0/4lMhaJHuxabLOhkv9Hf17Nb+d01A1xh3BE=; b=xObtHMBVt8fke51oOwOhK516KpebpQq9XS1IOiZKSz/C/D52u3RI7Del3tMhN7OhDiDQAR FP8E5fem2DL/H2CXvm26uSwkaUuPPHTwxBehGmm2lkWbAcff98sPYlcP1mZw0gXr3Mmq2s 2aGkUoOJkbemInn++ewNJRn8MfIc3hoy3SqcAjmLpYRynmZAigubHNGNDN/jrSlRVPWIKQ 5N8E0WXsw2uEybl7+KIhH6xSFpUVoj7BlBaftpjqM/ceAMC6hnOdRT6Lwtqpi7UwBhYs53 njZMmCpEley+s50R7+EzpOO4aabNXs1qUIx5p5ZPAd8YDU/wrsp4tt/VP17CaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667368; a=rsa-sha256; cv=none; b=NU3hrJliFyMDinYxBY08ecVIX+68+ZN3Lh4TU0/jZ3B2JaUcwylQ9ZpMZygydgvC6BeB6A siqleTA4uYOGB3s0pkW3xicY7MDuuXzDCyStg4BSSJFG6iVs+YKmL0dehoRnY0MCThHqGH nekkch+G6cqhQdJhUwto8pJ2ywnGLovEsBShPYSNL5WBRwodZpr7X8CZ0+tFs8JOQFDKpU YCgUfKbDBNYGYmUd2T6upCRi30v7ky36/NXhCTuXXZaTpUB8QW1HejFrNuFJSr+WQEDfbE 0FkjT2kBro3JkZBYm9AVP5RyB/5iG8zINZ4zMACriY3NSxw0FtJ4V13qm28gyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DS1YPHzcvP; Mon, 30 Sep 2024 03:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3a86G067099; Mon, 30 Sep 2024 03:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3a89P067096; Mon, 30 Sep 2024 03:36:08 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:08 GMT Message-Id: <202409300336.48U3a89P067096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e0c51286dd6d - main - libmd: split tests out into the test infrastructure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c51286dd6d1c1ce6d3761933a028cc3dcdd6ca Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c51286dd6d1c1ce6d3761933a028cc3dcdd6ca commit e0c51286dd6d1c1ce6d3761933a028cc3dcdd6ca Author: Kyle Evans AuthorDate: 2022-03-08 17:16:13 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:19 +0000 libmd: split tests out into the test infrastructure Make us a little less reliant on individuals running the tests, we'll start running them as part of CI. PR: 280784 (exp-run) Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D34500 --- etc/mtree/BSD.tests.dist | 2 + lib/libmd/Makefile | 245 +--------------------------------- lib/libmd/tests/Makefile | 258 ++++++++++++++++++++++++++++++++++++ lib/libmd/{ => tests}/mddriver.c | 0 lib/libmd/{ => tests}/rmddriver.c | 0 lib/libmd/{ => tests}/shadriver.c | 0 lib/libmd/{ => tests}/skeindriver.c | 0 7 files changed, 262 insertions(+), 243 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index ac53de071c11..67dc71fbfda4 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -427,6 +427,8 @@ .. libkvm .. + libmd + .. libmp .. libnv diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 9412adaf5a56..d8c32063d6ce 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -237,248 +237,7 @@ md${i}.3: ${.CURDIR}/mdX.3 cat ${.CURDIR}/md${i}.copyright >> ${.TARGET} .endfor -md4.ref: - echo 'MD4 test suite:' > ${.TARGET} - @echo 'MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0' >> ${.TARGET} - @echo 'MD4 ("a") = bde52cb31de33e46245e05fbdbd6fb24' >> ${.TARGET} - @echo 'MD4 ("abc") = a448017aaf21d8525fc10ae87aa6729d' >> ${.TARGET} - @echo 'MD4 ("message digest") = d9130a8164549fe818874806e1c7014b' >> ${.TARGET} - @echo 'MD4 ("abcdefghijklmnopqrstuvwxyz") = d79e1c308aa5bbcdeea8ed63df412da9' >> ${.TARGET} - @echo 'MD4 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '043f8582f241db351ce627e153e7f0e4' >> ${.TARGET} - @echo 'MD4 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - 'e33b4ddc9c38f2199c3e7b164fcc0536' >> ${.TARGET} - -md5.ref: - echo 'MD5 test suite:' > ${.TARGET} - @echo 'MD5 ("") = d41d8cd98f00b204e9800998ecf8427e' >> ${.TARGET} - @echo 'MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661' >> ${.TARGET} - @echo 'MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72' >> ${.TARGET} - @echo 'MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0' >> ${.TARGET} - @echo 'MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b' >> ${.TARGET} - @echo 'MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = d174ab98d277d9f5a5611c2c9f419d9f' >> ${.TARGET} - @echo 'MD5 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = 57edf4a22be3c955ac49da2e2107b67a' >> ${.TARGET} - -sha0.ref: - echo 'SHA-0 test suite:' > ${.TARGET} - @echo 'SHA-0 ("") = f96cea198ad1dd5617ac084a3d92c6107708c0ef' >> ${.TARGET} - @echo 'SHA-0 ("abc") = 0164b8a914cd2a5e74c4f7ff082c4d97f1edf880' >> ${.TARGET} - @echo 'SHA-0 ("message digest") =' \ - 'c1b0f222d150ebb9aa36a40cafdc8bcbed830b14' >> ${.TARGET} - @echo 'SHA-0 ("abcdefghijklmnopqrstuvwxyz") =' \ - 'b40ce07a430cfd3c033039b9fe9afec95dc1bdcd' >> ${.TARGET} - @echo 'SHA-0 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '79e966f7a3a990df33e40e3d7f8f18d2caebadfa' >> ${.TARGET} - @echo 'SHA-0 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '4aa29d14d171522ece47bee8957e35a41f3e9cff' >> ${.TARGET} - -sha1.ref: - echo 'SHA-1 test suite:' > ${.TARGET} - @echo 'SHA-1 ("") = da39a3ee5e6b4b0d3255bfef95601890afd80709' >> ${.TARGET} - @echo 'SHA-1 ("abc") = a9993e364706816aba3e25717850c26c9cd0d89d' >> ${.TARGET} - @echo 'SHA-1 ("message digest") =' \ - 'c12252ceda8be8994d5fa0290a47231c1d16aae3' >> ${.TARGET} - @echo 'SHA-1 ("abcdefghijklmnopqrstuvwxyz") =' \ - '32d10c7b8cf96570ca04ce37f2a19d84240d3a89' >> ${.TARGET} - @echo 'SHA-1 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '761c457bf73b14d27e9e9265c46f4b4dda11f940' >> ${.TARGET} - @echo 'SHA-1 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '50abf5706a150990a08b2c5ea40fa0e585554732' >> ${.TARGET} - -sha224.ref: - echo 'SHA-224 test suite:' > ${.TARGET} - @echo 'SHA-224 ("") = d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f' >> ${.TARGET} - @echo 'SHA-224 ("abc") =' \ - '23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7' >> ${.TARGET} - @echo 'SHA-224 ("message digest") =' \ - '2cb21c83ae2f004de7e81c3c7019cbcb65b71ab656b22d6d0c39b8eb' >> ${.TARGET} - @echo 'SHA-224 ("abcdefghijklmnopqrstuvwxyz") =' \ - '45a5f72c39c5cff2522eb3429799e49e5f44b356ef926bcf390dccc2' >> ${.TARGET} - @echo 'SHA-224 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - 'bff72b4fcb7d75e5632900ac5f90d219e05e97a7bde72e740db393d9' >> ${.TARGET} - @echo 'SHA-224 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - 'b50aecbe4e9bb0b57bc5f3ae760a8e01db24f203fb3cdcd13148046e' >> ${.TARGET} - -sha256.ref: - echo 'SHA-256 test suite:' > ${.TARGET} - @echo 'SHA-256 ("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' >> ${.TARGET} - @echo 'SHA-256 ("abc") =' \ - 'ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad' >> ${.TARGET} - @echo 'SHA-256 ("message digest") =' \ - 'f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650' >> ${.TARGET} - @echo 'SHA-256 ("abcdefghijklmnopqrstuvwxyz") =' \ - '71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73' >> ${.TARGET} - @echo 'SHA-256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - 'db4bfcbd4da0cd85a60c3c37d3fbd8805c77f15fc6b1fdfe614ee0a7c8fdb4c0' >> ${.TARGET} - @echo 'SHA-256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - 'f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e' >> ${.TARGET} - -sha384.ref: - echo 'SHA-384 test suite:' > ${.TARGET} - @echo 'SHA-384 ("") =' \ - '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b' >> ${.TARGET} - @echo 'SHA-384 ("abc") =' \ - 'cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7' >> ${.TARGET} - @echo 'SHA-384 ("message digest") =' \ - '473ed35167ec1f5d8e550368a3db39be54639f828868e9454c239fc8b52e3c61dbd0d8b4de1390c256dcbb5d5fd99cd5' >> ${.TARGET} - @echo 'SHA-384 ("abcdefghijklmnopqrstuvwxyz") =' \ - 'feb67349df3db6f5924815d6c3dc133f091809213731fe5c7b5f4999e463479ff2877f5f2936fa63bb43784b12f3ebb4' >> ${.TARGET} - @echo 'SHA-384 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '1761336e3f7cbfe51deb137f026f89e01a448e3b1fafa64039c1464ee8732f11a5341a6f41e0c202294736ed64db1a84' >> ${.TARGET} - @echo 'SHA-384 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - 'b12932b0627d1c060942f5447764155655bd4da0c9afa6dd9b9ef53129af1b8fb0195996d2de9ca0df9d821ffee67026' >> ${.TARGET} - -sha512.ref: - echo 'SHA-512 test suite:' > ${.TARGET} - @echo 'SHA-512 ("") =' \ - 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' >> ${.TARGET} - @echo 'SHA-512 ("abc") =' \ - 'ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f' >> ${.TARGET} - @echo 'SHA-512 ("message digest") =' \ - '107dbf389d9e9f71a3a95f6c055b9251bc5268c2be16d6c13492ea45b0199f3309e16455ab1e96118e8a905d5597b72038ddb372a89826046de66687bb420e7c' >> ${.TARGET} - @echo 'SHA-512 ("abcdefghijklmnopqrstuvwxyz") =' \ - '4dbff86cc2ca1bae1e16468a05cb9881c97f1753bce3619034898faa1aabe429955a1bf8ec483d7421fe3c1646613a59ed5441fb0f321389f77f48a879c7b1f1' >> ${.TARGET} - @echo 'SHA-512 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '1e07be23c26a86ea37ea810c8ec7809352515a970e9253c26f536cfc7a9996c45c8370583e0a78fa4a90041d71a4ceab7423f19c71b9d5a3e01249f0bebd5894' >> ${.TARGET} - @echo 'SHA-512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '72ec1ef1124a45b047e8b7c75a932195135bb61de24ec0d1914042246e0aec3a2354e093d76f3048b456764346900cb130d2a4fd5dd16abb5e30bcb850dee843' >> ${.TARGET} - -sha512t224.ref: - echo 'SHA-512224 test suite:' > ${.TARGET} - @echo 'SHA-512224 ("") =' \ - '6ed0dd02806fa89e25de060c19d3ac86cabb87d6a0ddd05c333b84f4' >> ${.TARGET} - @echo 'SHA-512224 ("abc") =' \ - '4634270f707b6a54daae7530460842e20e37ed265ceee9a43e8924aa' >> ${.TARGET} - @echo 'SHA-512224 ("message digest") =' \ - 'ad1a4db188fe57064f4f24609d2a83cd0afb9b398eb2fcaeaae2c564' >> ${.TARGET} - @echo 'SHA-512224 ("abcdefghijklmnopqrstuvwxyz") =' \ - 'ff83148aa07ec30655c1b40aff86141c0215fe2a54f767d3f38743d8' >> ${.TARGET} - @echo 'SHA-512224 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - 'a8b4b9174b99ffc67d6f49be9981587b96441051e16e6dd036b140d3' >> ${.TARGET} - @echo 'SHA-512224 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - 'ae988faaa47e401a45f704d1272d99702458fea2ddc6582827556dd2' >> ${.TARGET} - -sha512t256.ref: - echo 'SHA-512256 test suite:' > ${.TARGET} - @echo 'SHA-512256 ("") =' \ - 'c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a' >> ${.TARGET} - @echo 'SHA-512256 ("abc") =' \ - '53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23' >> ${.TARGET} - @echo 'SHA-512256 ("message digest") =' \ - '0cf471fd17ed69d990daf3433c89b16d63dec1bb9cb42a6094604ee5d7b4e9fb' >> ${.TARGET} - @echo 'SHA-512256 ("abcdefghijklmnopqrstuvwxyz") =' \ - 'fc3189443f9c268f626aea08a756abe7b726b05f701cb08222312ccfd6710a26' >> ${.TARGET} - @echo 'SHA-512256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - 'cdf1cc0effe26ecc0c13758f7b4a48e000615df241284185c39eb05d355bb9c8' >> ${.TARGET} - @echo 'SHA-512256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '2c9fdbc0c90bdd87612ee8455474f9044850241dc105b1e8b94b8ddf5fac9148' >> ${.TARGET} - -rmd160.ref: - echo 'RIPEMD160 test suite:' > ${.TARGET} - @echo 'RIPEMD160 ("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31' >> ${.TARGET} - @echo 'RIPEMD160 ("abc") = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc' >> ${.TARGET} - @echo 'RIPEMD160 ("message digest") =' \ - '5d0689ef49d2fae572b881b123a85ffa21595f36' >> ${.TARGET} - @echo 'RIPEMD160 ("abcdefghijklmnopqrstuvwxyz") =' \ - 'f71c27109c692c1b56bbdceb5b9d2865b3708dbc' >> ${.TARGET} - @echo 'RIPEMD160 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - 'b0e20b6e3116640286ed3a87a5713079b21f5189' >> ${.TARGET} - @echo 'RIPEMD160 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '9b752e45573d4b39f4dbd3323cab82bf63326bfb' >> ${.TARGET} - -skein256.ref: - echo 'SKEIN256 test suite:' > ${.TARGET} - @echo 'SKEIN256 ("") = c8877087da56e072870daa843f176e9453115929094c3a40c463a196c29bf7ba' >> ${.TARGET} - @echo 'SKEIN256 ("abc") = 258bdec343b9fde1639221a5ae0144a96e552e5288753c5fec76c05fc2fc1870' >> ${.TARGET} - @echo 'SKEIN256 ("message digest") =' \ - '4d2ce0062b5eb3a4db95bc1117dd8aa014f6cd50fdc8e64f31f7d41f9231e488' >> ${.TARGET} - @echo 'SKEIN256 ("abcdefghijklmnopqrstuvwxyz") =' \ - '46d8440685461b00e3ddb891b2ecc6855287d2bd8834a95fb1c1708b00ea5e82' >> ${.TARGET} - @echo 'SKEIN256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '7c5eb606389556b33d34eb2536459528dc0af97adbcd0ce273aeb650f598d4b2' >> ${.TARGET} - @echo 'SKEIN256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '4def7a7e5464a140ae9c3a80279fbebce4bd00f9faad819ab7e001512f67a10d' >> ${.TARGET} - -skein512.ref: - echo 'SKEIN512 test suite:' > ${.TARGET} - @echo 'SKEIN512 ("") =' \ - 'bc5b4c50925519c290cc634277ae3d6257212395cba733bbad37a4af0fa06af41fca7903d06564fea7a2d3730dbdb80c1f85562dfcc070334ea4d1d9e72cba7a' >> ${.TARGET} - @echo 'SKEIN512 ("abc") =' \ - '8f5dd9ec798152668e35129496b029a960c9a9b88662f7f9482f110b31f9f93893ecfb25c009baad9e46737197d5630379816a886aa05526d3a70df272d96e75' >> ${.TARGET} - @echo 'SKEIN512 ("message digest") =' \ - '15b73c158ffb875fed4d72801ded0794c720b121c0c78edf45f900937e6933d9e21a3a984206933d504b5dbb2368000411477ee1b204c986068df77886542fcc' >> ${.TARGET} - @echo 'SKEIN512 ("abcdefghijklmnopqrstuvwxyz") =' \ - '23793ad900ef12f9165c8080da6fdfd2c8354a2929b8aadf83aa82a3c6470342f57cf8c035ec0d97429b626c4d94f28632c8f5134fd367dca5cf293d2ec13f8c' >> ${.TARGET} - @echo 'SKEIN512 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - '0c6bed927e022f5ddcf81877d42e5f75798a9f8fd3ede3d83baac0a2f364b082e036c11af35fe478745459dd8f5c0b73efe3c56ba5bb2009208d5a29cc6e469c' >> ${.TARGET} - @echo 'SKEIN512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - '2ca9fcffb3456f297d1b5f407014ecb856f0baac8eb540f534b1f187196f21e88f31103128c2f03fcc9857d7a58eb66f9525e2302d88833ee069295537a434ce' >> ${.TARGET} - -skein1024.ref: - echo 'SKEIN1024 test suite:' > ${.TARGET} - @echo 'SKEIN1024 ("") =' \ - '0fff9563bb3279289227ac77d319b6fff8d7e9f09da1247b72a0a265cd6d2a62645ad547ed8193db48cff847c06494a03f55666d3b47eb4c20456c9373c86297d630d5578ebd34cb40991578f9f52b18003efa35d3da6553ff35db91b81ab890bec1b189b7f52cb2a783ebb7d823d725b0b4a71f6824e88f68f982eefc6d19c6' >> ${.TARGET} - @echo 'SKEIN1024 ("abc") =' \ - '35a599a0f91abcdb4cb73c19b8cb8d947742d82c309137a7caed29e8e0a2ca7a9ff9a90c34c1908cc7e7fd99bb15032fb86e76df21b72628399b5f7c3cc209d7bb31c99cd4e19465622a049afbb87c03b5ce3888d17e6e667279ec0aa9b3e2712624c01b5f5bbe1a564220bdcf6990af0c2539019f313fdd7406cca3892a1f1f' >> ${.TARGET} - @echo 'SKEIN1024 ("message digest") =' \ - 'ea891f5268acd0fac97467fc1aa89d1ce8681a9992a42540e53babee861483110c2d16f49e73bac27653ff173003e40cfb08516cd34262e6af95a5d8645c9c1abb3e813604d508b8511b30f9a5c1b352aa0791c7d2f27b2706dccea54bc7de6555b5202351751c3299f97c09cf89c40f67187e2521c0fad82b30edbb224f0458' >> ${.TARGET} - @echo 'SKEIN1024 ("abcdefghijklmnopqrstuvwxyz") =' \ - 'f23d95c2a25fbcd0e797cd058fec39d3c52d2b5afd7a9af1df934e63257d1d3dcf3246e7329c0f1104c1e51e3d22e300507b0c3b9f985bb1f645ef49835080536becf83788e17fed09c9982ba65c3cb7ffe6a5f745b911c506962adf226e435c42f6f6bc08d288f9c810e807e3216ef444f3db22744441deefa4900982a1371f' >> ${.TARGET} - @echo 'SKEIN1024 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ - 'cf3889e8a8d11bfd3938055d7d061437962bc5eac8ae83b1b71c94be201b8cf657fdbfc38674997a008c0c903f56a23feb3ae30e012377f1cfa080a9ca7fe8b96138662653fb3335c7d06595bf8baf65e215307532094cfdfa056bd8052ab792a3944a2adaa47b30335b8badb8fe9eb94fe329cdca04e58bbc530f0af709f469' >> ${.TARGET} - @echo 'SKEIN1024 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ - 'cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048f9fe1e897893ea18b64e0e37cb07d5ac947f27ba544caf7cbc1ad094e675aed77a366270f7eb7f46543bccfa61c526fd628408058ed00ed566ac35a9761d002e629c4fb0d430b2f4ad016fcc49c44d2981c4002da0eecc42144160e2eaea4855a' >> ${.TARGET} - -test: md4.ref md5.ref sha0.ref rmd160.ref sha1.ref sha224.ref sha256.ref sha384.ref \ - sha512.ref sha512t224.ref sha512t256.ref skein256.ref skein512.ref skein1024.ref - @${ECHO} if any of these test fail, the code produces wrong results - @${ECHO} and should NOT be used. - ${CC} ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c libmd.a - ./mddriver | cmp md4.ref - - @${ECHO} MD4 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DMD=5 -o mddriver ${.CURDIR}/mddriver.c libmd.a - ./mddriver | cmp md5.ref - - @${ECHO} MD5 passed test - -rm -f mddriver - ${CC} ${CFLAGS} ${LDFLAGS} -o rmddriver ${.CURDIR}/rmddriver.c libmd.a - ./rmddriver | cmp rmd160.ref - - @${ECHO} RIPEMD160 passed test - -rm -f rmddriver - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=0 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha0.ref - - @${ECHO} SHA-0 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=1 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha1.ref - - @${ECHO} SHA-1 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=224 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha224.ref - - @${ECHO} SHA-224 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=256 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha256.ref - - @${ECHO} SHA-256 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=384 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha384.ref - - @${ECHO} SHA-384 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha512.ref - - @${ECHO} SHA-512 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512224 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha512t224.ref - - @${ECHO} SHA-512t224 passed test - -rm -f shadriver - ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512256 -o shadriver ${.CURDIR}/shadriver.c libmd.a - ./shadriver | cmp sha512t256.ref - - @${ECHO} SHA-512t256 passed test - -rm -f shadriver - ${CC} ${CFLAGS} ${LDFLAGS} -DSKEIN=256 -o skeindriver ${.CURDIR}/skeindriver.c libmd.a - ./skeindriver | cmp skein256.ref - - @${ECHO} SKEIN256 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSKEIN=512 -o skeindriver ${.CURDIR}/skeindriver.c libmd.a - ./skeindriver | cmp skein512.ref - - @${ECHO} SKEIN512 passed test - ${CC} ${CFLAGS} ${LDFLAGS} -DSKEIN=1024 -o skeindriver ${.CURDIR}/skeindriver.c libmd.a - ./skeindriver | cmp skein1024.ref - - @${ECHO} SKEIN1024 passed test - -rm -f skeindriver +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include diff --git a/lib/libmd/tests/Makefile b/lib/libmd/tests/Makefile new file mode 100644 index 000000000000..fa8f2fc4f7f6 --- /dev/null +++ b/lib/libmd/tests/Makefile @@ -0,0 +1,258 @@ +# $FreeBSD$ + +PACKAGE= tests + +# XXX +WARNS= 0 + +ATF_TESTS_SH= libmd_test + +MDTESTS= md rmd sha skein + +MDTESTS_md= md4 md5 +MDTESTS_rmd= rmd160 +MDTESTS_sha= sha0 sha1 sha224 sha256 sha384 sha512 sha512t224 sha512t256 +MDTESTS_skein= skein256 skein512 skein1024 + +LIBADD= md + +.for mdt in ${MDTESTS} +REFS_${mdt}= ${MDTESTS_${mdt}:C/$/.ref/} +${PACKAGE}FILES+= ${REFS_${mdt}} +CLEANFILES+= ${REFS_${mdt}} + +# This target is simply convenient for auditing, letting you build all of one +# digest suite with `make driver`. +.PHONY: ${mdt}driver + +. for mdtc in ${MDTESTS_${mdt}} +PROGS+= ${mdtc}driver +DIGESTS+= ${mdtc} + +# Avoid obj collision, we'll build the same driver.c multiple times. +${mdtc}driver.c: ${mdt}driver.c + ${CP} ${.CURDIR}/${mdt}driver.c ${.TARGET} + +SRCS_${mdtc}driver= ${mdtc}driver.c +BINDIR_${mdtc}driver= ${TESTSDIR} +.if ${mdt} == "sha" +CFLAGS_${mdtc}driver= -DSHA=${mdtc:C/sha//:C/t//} +.else +CFLAGS_${mdtc}driver= -D${mdt:tu}=${mdtc:C/${mdt}//} +.endif + +${mdt}driver: ${mdtc}driver + +. endfor +.endfor + +CLEANFILES+= libmd_test.sh +libmd_test.sh: Makefile + :> ${.TARGET} +.for _digest in ${DIGESTS} + @echo "atf_test_case ${_digest}" >> ${.TARGET} + @echo "${_digest}_body() {" >> ${.TARGET} + @echo " atf_check -o file:\$$(atf_get_srcdir)/${_digest}.ref \\" >> \ + ${.TARGET} + @echo " \$$(atf_get_srcdir)/${_digest}driver" >> ${.TARGET} + @echo "}" >> ${.TARGET} +.endfor + @echo "atf_init_test_cases() {" >> ${.TARGET} +.for _digest in ${DIGESTS} + @echo " atf_add_test_case ${_digest}" >> ${.TARGET} +.endfor + @echo "}" >> ${.TARGET} + +md4.ref: + echo 'MD4 test suite:' > ${.TARGET} + @echo 'MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0' >> ${.TARGET} + @echo 'MD4 ("a") = bde52cb31de33e46245e05fbdbd6fb24' >> ${.TARGET} + @echo 'MD4 ("abc") = a448017aaf21d8525fc10ae87aa6729d' >> ${.TARGET} + @echo 'MD4 ("message digest") = d9130a8164549fe818874806e1c7014b' >> ${.TARGET} + @echo 'MD4 ("abcdefghijklmnopqrstuvwxyz") = d79e1c308aa5bbcdeea8ed63df412da9' >> ${.TARGET} + @echo 'MD4 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '043f8582f241db351ce627e153e7f0e4' >> ${.TARGET} + @echo 'MD4 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'e33b4ddc9c38f2199c3e7b164fcc0536' >> ${.TARGET} + +md5.ref: + echo 'MD5 test suite:' > ${.TARGET} + @echo 'MD5 ("") = d41d8cd98f00b204e9800998ecf8427e' >> ${.TARGET} + @echo 'MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661' >> ${.TARGET} + @echo 'MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72' >> ${.TARGET} + @echo 'MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0' >> ${.TARGET} + @echo 'MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b' >> ${.TARGET} + @echo 'MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = d174ab98d277d9f5a5611c2c9f419d9f' >> ${.TARGET} + @echo 'MD5 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = 57edf4a22be3c955ac49da2e2107b67a' >> ${.TARGET} + +sha0.ref: + echo 'SHA-0 test suite:' > ${.TARGET} + @echo 'SHA-0 ("") = f96cea198ad1dd5617ac084a3d92c6107708c0ef' >> ${.TARGET} + @echo 'SHA-0 ("abc") = 0164b8a914cd2a5e74c4f7ff082c4d97f1edf880' >> ${.TARGET} + @echo 'SHA-0 ("message digest") =' \ + 'c1b0f222d150ebb9aa36a40cafdc8bcbed830b14' >> ${.TARGET} + @echo 'SHA-0 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'b40ce07a430cfd3c033039b9fe9afec95dc1bdcd' >> ${.TARGET} + @echo 'SHA-0 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '79e966f7a3a990df33e40e3d7f8f18d2caebadfa' >> ${.TARGET} + @echo 'SHA-0 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '4aa29d14d171522ece47bee8957e35a41f3e9cff' >> ${.TARGET} + +sha1.ref: + echo 'SHA-1 test suite:' > ${.TARGET} + @echo 'SHA-1 ("") = da39a3ee5e6b4b0d3255bfef95601890afd80709' >> ${.TARGET} + @echo 'SHA-1 ("abc") = a9993e364706816aba3e25717850c26c9cd0d89d' >> ${.TARGET} + @echo 'SHA-1 ("message digest") =' \ + 'c12252ceda8be8994d5fa0290a47231c1d16aae3' >> ${.TARGET} + @echo 'SHA-1 ("abcdefghijklmnopqrstuvwxyz") =' \ + '32d10c7b8cf96570ca04ce37f2a19d84240d3a89' >> ${.TARGET} + @echo 'SHA-1 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '761c457bf73b14d27e9e9265c46f4b4dda11f940' >> ${.TARGET} + @echo 'SHA-1 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '50abf5706a150990a08b2c5ea40fa0e585554732' >> ${.TARGET} + +sha224.ref: + echo 'SHA-224 test suite:' > ${.TARGET} + @echo 'SHA-224 ("") = d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f' >> ${.TARGET} + @echo 'SHA-224 ("abc") =' \ + '23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7' >> ${.TARGET} + @echo 'SHA-224 ("message digest") =' \ + '2cb21c83ae2f004de7e81c3c7019cbcb65b71ab656b22d6d0c39b8eb' >> ${.TARGET} + @echo 'SHA-224 ("abcdefghijklmnopqrstuvwxyz") =' \ + '45a5f72c39c5cff2522eb3429799e49e5f44b356ef926bcf390dccc2' >> ${.TARGET} + @echo 'SHA-224 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'bff72b4fcb7d75e5632900ac5f90d219e05e97a7bde72e740db393d9' >> ${.TARGET} + @echo 'SHA-224 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'b50aecbe4e9bb0b57bc5f3ae760a8e01db24f203fb3cdcd13148046e' >> ${.TARGET} + +sha256.ref: + echo 'SHA-256 test suite:' > ${.TARGET} + @echo 'SHA-256 ("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' >> ${.TARGET} + @echo 'SHA-256 ("abc") =' \ + 'ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad' >> ${.TARGET} + @echo 'SHA-256 ("message digest") =' \ + 'f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650' >> ${.TARGET} + @echo 'SHA-256 ("abcdefghijklmnopqrstuvwxyz") =' \ + '71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73' >> ${.TARGET} + @echo 'SHA-256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'db4bfcbd4da0cd85a60c3c37d3fbd8805c77f15fc6b1fdfe614ee0a7c8fdb4c0' >> ${.TARGET} + @echo 'SHA-256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e' >> ${.TARGET} + +sha384.ref: + echo 'SHA-384 test suite:' > ${.TARGET} + @echo 'SHA-384 ("") =' \ + '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b' >> ${.TARGET} + @echo 'SHA-384 ("abc") =' \ + 'cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7' >> ${.TARGET} + @echo 'SHA-384 ("message digest") =' \ + '473ed35167ec1f5d8e550368a3db39be54639f828868e9454c239fc8b52e3c61dbd0d8b4de1390c256dcbb5d5fd99cd5' >> ${.TARGET} + @echo 'SHA-384 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'feb67349df3db6f5924815d6c3dc133f091809213731fe5c7b5f4999e463479ff2877f5f2936fa63bb43784b12f3ebb4' >> ${.TARGET} + @echo 'SHA-384 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '1761336e3f7cbfe51deb137f026f89e01a448e3b1fafa64039c1464ee8732f11a5341a6f41e0c202294736ed64db1a84' >> ${.TARGET} + @echo 'SHA-384 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'b12932b0627d1c060942f5447764155655bd4da0c9afa6dd9b9ef53129af1b8fb0195996d2de9ca0df9d821ffee67026' >> ${.TARGET} + +sha512.ref: + echo 'SHA-512 test suite:' > ${.TARGET} + @echo 'SHA-512 ("") =' \ + 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' >> ${.TARGET} + @echo 'SHA-512 ("abc") =' \ + 'ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f' >> ${.TARGET} + @echo 'SHA-512 ("message digest") =' \ + '107dbf389d9e9f71a3a95f6c055b9251bc5268c2be16d6c13492ea45b0199f3309e16455ab1e96118e8a905d5597b72038ddb372a89826046de66687bb420e7c' >> ${.TARGET} + @echo 'SHA-512 ("abcdefghijklmnopqrstuvwxyz") =' \ + '4dbff86cc2ca1bae1e16468a05cb9881c97f1753bce3619034898faa1aabe429955a1bf8ec483d7421fe3c1646613a59ed5441fb0f321389f77f48a879c7b1f1' >> ${.TARGET} + @echo 'SHA-512 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '1e07be23c26a86ea37ea810c8ec7809352515a970e9253c26f536cfc7a9996c45c8370583e0a78fa4a90041d71a4ceab7423f19c71b9d5a3e01249f0bebd5894' >> ${.TARGET} + @echo 'SHA-512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '72ec1ef1124a45b047e8b7c75a932195135bb61de24ec0d1914042246e0aec3a2354e093d76f3048b456764346900cb130d2a4fd5dd16abb5e30bcb850dee843' >> ${.TARGET} + +sha512t224.ref: + echo 'SHA-512224 test suite:' > ${.TARGET} + @echo 'SHA-512224 ("") =' \ + '6ed0dd02806fa89e25de060c19d3ac86cabb87d6a0ddd05c333b84f4' >> ${.TARGET} + @echo 'SHA-512224 ("abc") =' \ + '4634270f707b6a54daae7530460842e20e37ed265ceee9a43e8924aa' >> ${.TARGET} + @echo 'SHA-512224 ("message digest") =' \ + 'ad1a4db188fe57064f4f24609d2a83cd0afb9b398eb2fcaeaae2c564' >> ${.TARGET} + @echo 'SHA-512224 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'ff83148aa07ec30655c1b40aff86141c0215fe2a54f767d3f38743d8' >> ${.TARGET} + @echo 'SHA-512224 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'a8b4b9174b99ffc67d6f49be9981587b96441051e16e6dd036b140d3' >> ${.TARGET} + @echo 'SHA-512224 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'ae988faaa47e401a45f704d1272d99702458fea2ddc6582827556dd2' >> ${.TARGET} + +sha512t256.ref: + echo 'SHA-512256 test suite:' > ${.TARGET} + @echo 'SHA-512256 ("") =' \ + 'c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a' >> ${.TARGET} + @echo 'SHA-512256 ("abc") =' \ + '53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23' >> ${.TARGET} + @echo 'SHA-512256 ("message digest") =' \ + '0cf471fd17ed69d990daf3433c89b16d63dec1bb9cb42a6094604ee5d7b4e9fb' >> ${.TARGET} + @echo 'SHA-512256 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'fc3189443f9c268f626aea08a756abe7b726b05f701cb08222312ccfd6710a26' >> ${.TARGET} + @echo 'SHA-512256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'cdf1cc0effe26ecc0c13758f7b4a48e000615df241284185c39eb05d355bb9c8' >> ${.TARGET} + @echo 'SHA-512256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '2c9fdbc0c90bdd87612ee8455474f9044850241dc105b1e8b94b8ddf5fac9148' >> ${.TARGET} + +rmd160.ref: + echo 'RIPEMD160 test suite:' > ${.TARGET} + @echo 'RIPEMD160 ("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31' >> ${.TARGET} + @echo 'RIPEMD160 ("abc") = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc' >> ${.TARGET} + @echo 'RIPEMD160 ("message digest") =' \ + '5d0689ef49d2fae572b881b123a85ffa21595f36' >> ${.TARGET} + @echo 'RIPEMD160 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'f71c27109c692c1b56bbdceb5b9d2865b3708dbc' >> ${.TARGET} + @echo 'RIPEMD160 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'b0e20b6e3116640286ed3a87a5713079b21f5189' >> ${.TARGET} + @echo 'RIPEMD160 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '9b752e45573d4b39f4dbd3323cab82bf63326bfb' >> ${.TARGET} + +skein256.ref: + echo 'SKEIN256 test suite:' > ${.TARGET} + @echo 'SKEIN256 ("") = c8877087da56e072870daa843f176e9453115929094c3a40c463a196c29bf7ba' >> ${.TARGET} + @echo 'SKEIN256 ("abc") = 258bdec343b9fde1639221a5ae0144a96e552e5288753c5fec76c05fc2fc1870' >> ${.TARGET} + @echo 'SKEIN256 ("message digest") =' \ + '4d2ce0062b5eb3a4db95bc1117dd8aa014f6cd50fdc8e64f31f7d41f9231e488' >> ${.TARGET} + @echo 'SKEIN256 ("abcdefghijklmnopqrstuvwxyz") =' \ + '46d8440685461b00e3ddb891b2ecc6855287d2bd8834a95fb1c1708b00ea5e82' >> ${.TARGET} + @echo 'SKEIN256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '7c5eb606389556b33d34eb2536459528dc0af97adbcd0ce273aeb650f598d4b2' >> ${.TARGET} + @echo 'SKEIN256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '4def7a7e5464a140ae9c3a80279fbebce4bd00f9faad819ab7e001512f67a10d' >> ${.TARGET} + +skein512.ref: + echo 'SKEIN512 test suite:' > ${.TARGET} + @echo 'SKEIN512 ("") =' \ + 'bc5b4c50925519c290cc634277ae3d6257212395cba733bbad37a4af0fa06af41fca7903d06564fea7a2d3730dbdb80c1f85562dfcc070334ea4d1d9e72cba7a' >> ${.TARGET} + @echo 'SKEIN512 ("abc") =' \ + '8f5dd9ec798152668e35129496b029a960c9a9b88662f7f9482f110b31f9f93893ecfb25c009baad9e46737197d5630379816a886aa05526d3a70df272d96e75' >> ${.TARGET} + @echo 'SKEIN512 ("message digest") =' \ + '15b73c158ffb875fed4d72801ded0794c720b121c0c78edf45f900937e6933d9e21a3a984206933d504b5dbb2368000411477ee1b204c986068df77886542fcc' >> ${.TARGET} + @echo 'SKEIN512 ("abcdefghijklmnopqrstuvwxyz") =' \ + '23793ad900ef12f9165c8080da6fdfd2c8354a2929b8aadf83aa82a3c6470342f57cf8c035ec0d97429b626c4d94f28632c8f5134fd367dca5cf293d2ec13f8c' >> ${.TARGET} + @echo 'SKEIN512 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + '0c6bed927e022f5ddcf81877d42e5f75798a9f8fd3ede3d83baac0a2f364b082e036c11af35fe478745459dd8f5c0b73efe3c56ba5bb2009208d5a29cc6e469c' >> ${.TARGET} + @echo 'SKEIN512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + '2ca9fcffb3456f297d1b5f407014ecb856f0baac8eb540f534b1f187196f21e88f31103128c2f03fcc9857d7a58eb66f9525e2302d88833ee069295537a434ce' >> ${.TARGET} + +skein1024.ref: + echo 'SKEIN1024 test suite:' > ${.TARGET} + @echo 'SKEIN1024 ("") =' \ + '0fff9563bb3279289227ac77d319b6fff8d7e9f09da1247b72a0a265cd6d2a62645ad547ed8193db48cff847c06494a03f55666d3b47eb4c20456c9373c86297d630d5578ebd34cb40991578f9f52b18003efa35d3da6553ff35db91b81ab890bec1b189b7f52cb2a783ebb7d823d725b0b4a71f6824e88f68f982eefc6d19c6' >> ${.TARGET} + @echo 'SKEIN1024 ("abc") =' \ + '35a599a0f91abcdb4cb73c19b8cb8d947742d82c309137a7caed29e8e0a2ca7a9ff9a90c34c1908cc7e7fd99bb15032fb86e76df21b72628399b5f7c3cc209d7bb31c99cd4e19465622a049afbb87c03b5ce3888d17e6e667279ec0aa9b3e2712624c01b5f5bbe1a564220bdcf6990af0c2539019f313fdd7406cca3892a1f1f' >> ${.TARGET} + @echo 'SKEIN1024 ("message digest") =' \ + 'ea891f5268acd0fac97467fc1aa89d1ce8681a9992a42540e53babee861483110c2d16f49e73bac27653ff173003e40cfb08516cd34262e6af95a5d8645c9c1abb3e813604d508b8511b30f9a5c1b352aa0791c7d2f27b2706dccea54bc7de6555b5202351751c3299f97c09cf89c40f67187e2521c0fad82b30edbb224f0458' >> ${.TARGET} + @echo 'SKEIN1024 ("abcdefghijklmnopqrstuvwxyz") =' \ + 'f23d95c2a25fbcd0e797cd058fec39d3c52d2b5afd7a9af1df934e63257d1d3dcf3246e7329c0f1104c1e51e3d22e300507b0c3b9f985bb1f645ef49835080536becf83788e17fed09c9982ba65c3cb7ffe6a5f745b911c506962adf226e435c42f6f6bc08d288f9c810e807e3216ef444f3db22744441deefa4900982a1371f' >> ${.TARGET} + @echo 'SKEIN1024 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ + 'cf3889e8a8d11bfd3938055d7d061437962bc5eac8ae83b1b71c94be201b8cf657fdbfc38674997a008c0c903f56a23feb3ae30e012377f1cfa080a9ca7fe8b96138662653fb3335c7d06595bf8baf65e215307532094cfdfa056bd8052ab792a3944a2adaa47b30335b8badb8fe9eb94fe329cdca04e58bbc530f0af709f469' >> ${.TARGET} + @echo 'SKEIN1024 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ + 'cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048f9fe1e897893ea18b64e0e37cb07d5ac947f27ba544caf7cbc1ad094e675aed77a366270f7eb7f46543bccfa61c526fd628408058ed00ed566ac35a9761d002e629c4fb0d430b2f4ad016fcc49c44d2981c4002da0eecc42144160e2eaea4855a' >> ${.TARGET} + +.include diff --git a/lib/libmd/mddriver.c b/lib/libmd/tests/mddriver.c similarity index 100% rename from lib/libmd/mddriver.c rename to lib/libmd/tests/mddriver.c diff --git a/lib/libmd/rmddriver.c b/lib/libmd/tests/rmddriver.c similarity index 100% rename from lib/libmd/rmddriver.c rename to lib/libmd/tests/rmddriver.c diff --git a/lib/libmd/shadriver.c b/lib/libmd/tests/shadriver.c similarity index 100% rename from lib/libmd/shadriver.c rename to lib/libmd/tests/shadriver.c diff --git a/lib/libmd/skeindriver.c b/lib/libmd/tests/skeindriver.c similarity index 100% rename from lib/libmd/skeindriver.c rename to lib/libmd/tests/skeindriver.c From nobody Mon Sep 30 03:36:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DT6CvNz5XfTC; Mon, 30 Sep 2024 03:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DT3Mt3z43cx; Mon, 30 Sep 2024 03:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tX3SgfAMnNHXwUFCbNJzAtCmG/+yv2d/IPWCbW6T08=; b=DBJB8RgVEUoE3sXDJbobBuDGsVzKrcbnILD/7aMLJ8DGAmp1lXORLoJvAzeU3+PXHyTNd0 BcjJOSUgJXO2C1CE9ORsh6Y082g8NeEtszT55LBOIt1zqGZ2UT6pJXyhIVjBtWsFS1BlWH dalXTlJIgwcFVRGzUcaIdd3RQ1K0eCK5ZG0gYjkAoKGcAh0lAQObeYxXk/z/VcMi9gzd4B UPVt0U3hZLCUM9Gd4ht2rFbq05aQTAvFJHytbQHt77Nagtofwz+u0Z+FdapTQxDU5UgHWX yU+8gVYP9LOq2GxSbKmXfrJPXpGqFyJKyScsWlEhE9UFRoB1En92/D+mQ9SdCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tX3SgfAMnNHXwUFCbNJzAtCmG/+yv2d/IPWCbW6T08=; b=ec4CvrCTU3cHAHB7f0mDpJo8jRnJH0hGi8eIOZTB5NFjOXOhSePnjyoKujuguzTmSkQXNV PsyeSeKUq0EaZOxFOrW2yHbSdIeLYrnl45GqwxP3AtCz0f5wo9ECSrWt8feSqRgOssXOQT +UHK5tS4gwbYbT5J8BjRSwR867ElELguABLuZtYgSQqFNIQPMMLU3qbfx0yS28syAslZjh lG5xn4TOuB2dtKuj2a6OxX9hS3ZYDSB/mvdRw7feCKl7GTqCjpLTPnEvRkCdlN/XMz2ZsX Lgh28ciFDMxU3rt0xogXDMg/L+QZy77BeBs0IFJuoZvHIHECZXjJtqUNOjqx4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667369; a=rsa-sha256; cv=none; b=jSBu5miYBcO+X7MZX6TfvsN04FQXeoF3VBuhg7CdOpBRj2qz3ghjIg//5US6lP6tZT1lmc 8hj0J1jOqevcJQsK67bDWd1S9JGOc0k3g/udGL7oLpiuH9cT8/G6F20Y6zyfGU+7JnVM4i jnh/LyhzkL8K3V7PK+Re4UrYI8EvlfZc958vRdfZxhm5zHGOKy4zf4wlFnrgErY5CXHyN9 vOfTVwyioyJqHLWvBDYBaXjMqiVhKALbtm20Ld7ocYfi9Rb1GVQ4W9qB0nu5EQ1VR3VvZ1 scFykWxy8zv3/qNxvTFnCdSJ+iiDEdoI+4S5vDLZ7tIJ6pOBzN1ZkKX7SCv0Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DT2YhWzcjM; Mon, 30 Sep 2024 03:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3a9se067156; Mon, 30 Sep 2024 03:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3a9rR067153; Mon, 30 Sep 2024 03:36:09 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:09 GMT Message-Id: <202409300336.48U3a9rR067153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 01112a1711f3 - main - libmd: tests: raise WARNS to the default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01112a1711f3b7f329d84f7946ee0b8cdd1872c9 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=01112a1711f3b7f329d84f7946ee0b8cdd1872c9 commit 01112a1711f3b7f329d84f7946ee0b8cdd1872c9 Author: Kyle Evans AuthorDate: 2022-03-08 17:20:09 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:20 +0000 libmd: tests: raise WARNS to the default The drivers just had a small issue, passing a literal string as non-const. Fix it and lift WARNS. PR: 280784 (exp-run) Reviewed by: delphij, emaste Differential Revision: https://reviews.freebsd.org/D34501 --- lib/libmd/tests/Makefile | 3 --- lib/libmd/tests/mddriver.c | 4 ++-- lib/libmd/tests/rmddriver.c | 4 ++-- lib/libmd/tests/shadriver.c | 2 +- lib/libmd/tests/skeindriver.c | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/libmd/tests/Makefile b/lib/libmd/tests/Makefile index fa8f2fc4f7f6..e11e8e1bf154 100644 --- a/lib/libmd/tests/Makefile +++ b/lib/libmd/tests/Makefile @@ -2,9 +2,6 @@ PACKAGE= tests -# XXX -WARNS= 0 - ATF_TESTS_SH= libmd_test MDTESTS= md rmd sha skein diff --git a/lib/libmd/tests/mddriver.c b/lib/libmd/tests/mddriver.c index 47ff87663bff..1229a4e2929f 100644 --- a/lib/libmd/tests/mddriver.c +++ b/lib/libmd/tests/mddriver.c @@ -37,8 +37,8 @@ #endif /* Digests a string and prints the result. */ -static void -MDString(char *string) +static void +MDString(const char *string) { char buf[33]; diff --git a/lib/libmd/tests/rmddriver.c b/lib/libmd/tests/rmddriver.c index 3c37c2866bfd..50227dcffb5d 100644 --- a/lib/libmd/tests/rmddriver.c +++ b/lib/libmd/tests/rmddriver.c @@ -20,8 +20,8 @@ #include "ripemd.h" /* Digests a string and prints the result. */ -static void -RIPEMD160String(char *string) +static void +RIPEMD160String(const char *string) { char buf[2*20 + 1]; diff --git a/lib/libmd/tests/shadriver.c b/lib/libmd/tests/shadriver.c index 42d57ed2016f..85cb21185bc8 100644 --- a/lib/libmd/tests/shadriver.c +++ b/lib/libmd/tests/shadriver.c @@ -58,7 +58,7 @@ /* Digests a string and prints the result. */ static void -SHAString(char *string) +SHAString(const char *string) { char buf[2*64 + 1]; diff --git a/lib/libmd/tests/skeindriver.c b/lib/libmd/tests/skeindriver.c index 874f0c17e500..a28ac8fc2c2a 100644 --- a/lib/libmd/tests/skeindriver.c +++ b/lib/libmd/tests/skeindriver.c @@ -41,7 +41,7 @@ /* Digests a string and prints the result. */ static void -SKEINString(char *string) +SKEINString(const char *string) { char buf[2*128 + 1]; From nobody Mon Sep 30 03:36:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DV5bK7z5XfP0; Mon, 30 Sep 2024 03:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DV3lmJz43d7; Mon, 30 Sep 2024 03:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z09bHofWG8J57/JbIBcKVwxiQqr18NaFD9wx4SqDENI=; b=l90Rp0sVD33MM9uJryIZHmuGsJUh7s7DaGSTNUIc0Zz9RGUEyPz1EjBO0jrnjP3eqP4bjJ nwVMhcImVQ/JC2VptQiFiw2nj64T7LKJRX8CtPnrIMQi3wuk0hFAHiyf5vNBFcPf60gyO2 UG17PNt+ouBxwuiYCd0+OUg7SVkvZY8iGAFskhnNSIPaHBYqY6NPFDjo1tSMtKavbZ7cMk 3ox3LBjv08N2Mhzava2pbb0PUwzPBcPrqgBu3iOuKnC0BtvuzJk1DzG89JqPK7gHwYWYhL oklV/3e6slwCnYGjJj8Fiqy7weHfSq+thK/5Qe9MulWeSAKRYSM9+uIukjXFQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z09bHofWG8J57/JbIBcKVwxiQqr18NaFD9wx4SqDENI=; b=XUbiuDJ0Ic9rTkr+CGffCnSajAsFdcwm7zJQRva9Ai3adOqcNCvOl9LHCSHfJ1D+Wqu00V MBOQYSaKKQZDnqCrUk0tJ3SHx5ppDrV56PqXor0R3fEii4zr9jKgEouZCSCHF7FVRkGtnX Ny8AhCEv3x4ail1JWlveTOaRmMMj9Hx0LqvCr4yE1XOH5qPo/aEnb/G4LkS8is9tlR7Kpq RouzSUERb0YSzIB6FK6mGADGrNQnYtEDgSz29DRB8dO0byak2IwVs76A7qMICnml2blW0N 76hjmckMydWtRtAGevxhVDt85bBxTFEkz56qKhs2767Vpcah0X+ojLOQ6+n/Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667370; a=rsa-sha256; cv=none; b=fcNsrzo/TGhjqBD4FmN4PvaEMWGDWXRw4PVBpbmigiLTs2cwrYnTTUCQAvZK22e2CZfpBn osn3NWoJhaOEVlewrrjisJHFp92eqOoOVE0Hj+lBmkTdvNEDcKmaaJ1tDi0iKbI7whQ8wq 8dGq7wIuev7DcH6gIt0wCepZQ/iR8pa0RQ3g/fr2ODw+0PMJN8azv7k8loo77aV4sx8dUj 7Bej7lZoHmoUPv20SMNaISD/0AE4nIjBn08E4DW0MTNZrOM3rff7zkfGaEJ7XIVlI6TWi6 AckRpj1uvw+1OaY4GP1EvgtB9Z9BUPtuUfWMRtcLySDtYcsGIuRJQnUU7O08wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DV3HtMzcjN; Mon, 30 Sep 2024 03:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3aAhe067206; Mon, 30 Sep 2024 03:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3aAg1067203; Mon, 30 Sep 2024 03:36:10 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:10 GMT Message-Id: <202409300336.48U3aAg1067203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: fd3ced150708 - main - libmd: export and document *Fd/*FdChunk interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd3ced15070885c818b74a44a0fbe45ed8687f44 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fd3ced15070885c818b74a44a0fbe45ed8687f44 commit fd3ced15070885c818b74a44a0fbe45ed8687f44 Author: Kyle Evans AuthorDate: 2022-03-08 17:42:52 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:20 +0000 libmd: export and document *Fd/*FdChunk interfaces PR: 280784 (exp-run) Fixes: de13c2427d6c ("libmd: introduce functions that operate on an fd") Reviewed by: manpages (bcr), fuz Differential Revision: https://reviews.freebsd.org/D34502 --- lib/libmd/mdX.3 | 21 ++++++++++++++++++++- lib/libmd/mdXhl.c | 4 ++++ lib/libmd/ripemd.3 | 21 ++++++++++++++++++++- lib/libmd/sha.3 | 27 ++++++++++++++++++++++++++- lib/libmd/sha256.3 | 27 ++++++++++++++++++++++++++- lib/libmd/sha512.3 | 33 ++++++++++++++++++++++++++++++++- lib/libmd/skein.3 | 33 ++++++++++++++++++++++++++++++++- 7 files changed, 160 insertions(+), 6 deletions(-) diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3 index 26c8b2b43c81..7c86f28ad628 100644 --- a/lib/libmd/mdX.3 +++ b/lib/libmd/mdX.3 @@ -6,7 +6,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.Dd May 21, 2019 +.Dd March 8, 2022 .Dt MDX 3 .Os .Sh NAME @@ -15,6 +15,8 @@ .Nm MDXPad , .Nm MDXFinal , .Nm MDXEnd , +.Nm MDXFd , +.Nm MDXFdChunk , .Nm MDXFile , .Nm MDXFileChunk , .Nm MDXData @@ -35,6 +37,10 @@ .Ft "char *" .Fn MDXEnd "MDX_CTX *context" "char *buf" .Ft "char *" +.Fn MDXFd "int fd" "char *buf" +.Ft "char *" +.Fn MDXFdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn MDXFile "const char *filename" "char *buf" .Ft "char *" .Fn MDXFileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -125,6 +131,19 @@ function calculates the digest of a chunk of data in memory, and uses .Fn MDXEnd to return the result. .Pp +The +.Fn MDXFd +and +.Fn MDXFdChunk +functions are identical to their +.Fn MDXFile +and +.Fn MDXFileChunk +counterparts, with the exception that the first argument is an +.Fa fd +instead of a +.Fa filename . +.Pp When using .Fn MDXEnd , .Fn MDXFile , diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c index 171b97b38794..68598f192056 100644 --- a/lib/libmd/mdXhl.c +++ b/lib/libmd/mdXhl.c @@ -130,6 +130,10 @@ __weak_reference(_libmd_MDXEnd, MDXEnd); __weak_reference(_libmd_MDXFile, MDXFile); #undef MDXFileChunk __weak_reference(_libmd_MDXFileChunk, MDXFileChunk); +#undef MDXFd +__weak_reference(_libmd_MDXFd, MDXFd); +#undef MDXFdChunk +__weak_reference(_libmd_MDXFdChunk, MDXFdChunk); #undef MDXData __weak_reference(_libmd_MDXData, MDXData); #endif diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3 index fcd2ea308791..cad07aac8007 100644 --- a/lib/libmd/ripemd.3 +++ b/lib/libmd/ripemd.3 @@ -8,7 +8,7 @@ .\" .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" -.Dd July 20, 2018 +.Dd March 8, 2022 .Dt RIPEMD 3 .Os .Sh NAME @@ -16,6 +16,8 @@ .Nm RIPEMD160_Update , .Nm RIPEMD160_Final , .Nm RIPEMD160_End , +.Nm RIPEMD160_Fd , +.Nm RIPEMD160_FdChunk , .Nm RIPEMD160_File , .Nm RIPEMD160_FileChunk , .Nm RIPEMD160_Data @@ -34,6 +36,10 @@ .Ft "char *" .Fn RIPEMD160_End "RIPEMD160_CTX *context" "char *buf" .Ft "char *" +.Fn RIPEMD160_Fd "int fd" "char *buf" +.Ft "char *" +.Fn RIPEMD160_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn RIPEMD160_File "const char *filename" "char *buf" .Ft "char *" .Fn RIPEMD160_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -106,6 +112,19 @@ function calculates the digest of a chunk of data in memory, and uses .Fn RIPEMD160_End to return the result. .Pp +The +.Fn RIPEMD160_Fd +and +.Fn RIPEMD160_FdChunk +functions are identical to their +.Fn RIPEMD160_File +and +.Fn RIPEMD160_FileChunk +counterparts, with the exception that the first argument is an +.Fa fd +instead of a +.Fa filename . +.Pp When using .Fn RIPEMD160_End , .Fn RIPEMD160_File , diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3 index 49ee322eacab..e2475f981738 100644 --- a/lib/libmd/sha.3 +++ b/lib/libmd/sha.3 @@ -8,7 +8,7 @@ .\" .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" -.Dd February 6, 2023 +.Dd February 12, 2023 .Dt SHA 3 .Os .Sh NAME @@ -16,6 +16,8 @@ .Nm SHA_Update , .Nm SHA_Final , .Nm SHA_End , +.Nm SHA_Fd , +.Nm SHA_FdChunk , .Nm SHA_File , .Nm SHA_FileChunk , .Nm SHA_Data , @@ -23,6 +25,8 @@ .Nm SHA1_Update , .Nm SHA1_Final , .Nm SHA1_End , +.Nm SHA1_Fd , +.Nm SHA1_FdChunk , .Nm SHA1_File , .Nm SHA1_FileChunk , .Nm SHA1_Data @@ -41,6 +45,10 @@ .Ft "char *" .Fn SHA_End "SHA_CTX *context" "char *buf" .Ft "char *" +.Fn SHA_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -55,6 +63,10 @@ .Ft "char *" .Fn SHA1_End "SHA_CTX *context" "char *buf" .Ft "char *" +.Fn SHA1_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA1_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA1_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA1_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -130,6 +142,19 @@ calculates the digest of a chunk of data in memory, and uses .Fn SHA1_End to return the result. .Pp +The +.Fn SHA1_Fd +and +.Fn SHA1_FdChunk +functions are identical to their +.Fn SHA1_File +and +.Fn SHA1_FileChunk +counterparts, with the exception that the first argument is an +.Fa fd +instead of a +.Fa filename . +.Pp When using .Fn SHA1_End , .Fn SHA1_File , diff --git a/lib/libmd/sha256.3 b/lib/libmd/sha256.3 index e22258f40140..406dfd1b357d 100644 --- a/lib/libmd/sha256.3 +++ b/lib/libmd/sha256.3 @@ -8,7 +8,7 @@ .\" .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" -.Dd July 20, 2018 +.Dd March 8, 2022 .Dt SHA256 3 .Os .Sh NAME @@ -16,6 +16,8 @@ .Nm SHA224_Update , .Nm SHA224_Final , .Nm SHA224_End , +.Nm SHA224_Fd , +.Nm SHA224_FdChunk , .Nm SHA224_File , .Nm SHA224_FileChunk , .Nm SHA224_Data , @@ -23,6 +25,8 @@ .Nm SHA256_Update , .Nm SHA256_Final , .Nm SHA256_End , +.Nm SHA256_Fd , +.Nm SHA256_FdChunk , .Nm SHA256_File , .Nm SHA256_FileChunk , .Nm SHA256_Data @@ -41,6 +45,10 @@ .Ft "char *" .Fn SHA224_End "SHA224_CTX *context" "char *buf" .Ft "char *" +.Fn SHA224_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA224_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA224_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA224_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -56,6 +64,10 @@ .Ft "char *" .Fn SHA256_End "SHA256_CTX *context" "char *buf" .Ft "char *" +.Fn SHA256_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA256_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA256_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA256_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -125,6 +137,19 @@ calculates the digest of a chunk of data in memory, and uses .Fn SHA256_End to return the result. .Pp +The +.Fn SHA256_Fd +and +.Fn SHA256_FdChunk +functions are identical to their +.Fn SHA256_File +and +.Fn SHA256_FileChunk +counterparts, with the exception that the first argument is an +.Fa fd +instead of a +.Fa filename . +.Pp When using .Fn SHA256_End , .Fn SHA256_File , diff --git a/lib/libmd/sha512.3 b/lib/libmd/sha512.3 index a5c478efa9ae..17d0d0988350 100644 --- a/lib/libmd/sha512.3 +++ b/lib/libmd/sha512.3 @@ -8,7 +8,7 @@ .\" .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" -.Dd February 3, 2023 +.Dd February 12, 2023 .Dt SHA512 3 .Os .Sh NAME @@ -16,6 +16,8 @@ .Nm SHA512_Update , .Nm SHA512_Final , .Nm SHA512_End , +.Nm SHA512_Fd , +.Nm SHA512_FdChunk , .Nm SHA512_File , .Nm SHA512_FileChunk , .Nm SHA512_Data , @@ -23,6 +25,8 @@ .Nm SHA384_Update , .Nm SHA384_Final , .Nm SHA384_End , +.Nm SHA384_Fd , +.Nm SHA384_FdChunk , .Nm SHA384_File , .Nm SHA384_FileChunk , .Nm SHA384_Data , @@ -37,6 +41,8 @@ .Nm SHA512_256_Update , .Nm SHA512_256_Final , .Nm SHA512_256_End , +.Nm SHA512_256_Fd , +.Nm SHA512_256_FdChunk , .Nm SHA512_256_File , .Nm SHA512_256_FileChunk , .Nm SHA512_256_Data @@ -55,6 +61,10 @@ .Ft "char *" .Fn SHA512_End "SHA512_CTX *context" "char *buf" .Ft "char *" +.Fn SHA512_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA512_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA512_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA512_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -70,6 +80,10 @@ .Ft "char *" .Fn SHA384_End "SHA384_CTX *context" "char *buf" .Ft "char *" +.Fn SHA384_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA384_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA384_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA384_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -99,6 +113,10 @@ .Ft "char *" .Fn SHA512_256_End "SHA512_CTX *context" "char *buf" .Ft "char *" +.Fn SHA512_256_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SHA512_256_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SHA512_256_File "const char *filename" "char *buf" .Ft "char *" .Fn SHA512_256_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -168,6 +186,19 @@ calculates the digest of a chunk of data in memory, and uses .Fn SHA512_End to return the result. .Pp +The +.Fn SHA512_Fd +and +.Fn SHA512_FdChunk +functions are identical to their +.Fn SHA512_File +and +.Fn SHA512_FileChunk +counterparts, with the exception that the first argument is an +.Fa fd +instead of a +.Fa filename . +.Pp When using .Fn SHA512_End , .Fn SHA512_File , diff --git a/lib/libmd/skein.3 b/lib/libmd/skein.3 index 1dff9e2c92dc..8fe79a4ad0bf 100644 --- a/lib/libmd/skein.3 +++ b/lib/libmd/skein.3 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 21, 2019 +.Dd March 8, 2022 .Dt SKEIN 3 .Os .Sh NAME @@ -31,6 +31,8 @@ .Nm SKEIN256_Update , .Nm SKEIN256_Final , .Nm SKEIN256_End , +.Nm SKEIN256_Fd , +.Nm SKEIN256_FdChunk , .Nm SKEIN256_File , .Nm SKEIN256_FileChunk , .Nm SKEIN256_Data , @@ -38,6 +40,8 @@ .Nm SKEIN512_Update , .Nm SKEIN512_Final , .Nm SKEIN512_End , +.Nm SKEIN512_Fd , +.Nm SKEIN512_FdChunk , .Nm SKEIN512_File , .Nm SKEIN512_FileChunk , .Nm SKEIN512_Data , @@ -45,6 +49,8 @@ .Nm SKEIN1024_Update , .Nm SKEIN1024_Final , .Nm SKEIN1024_End , +.Nm SKEIN1024_Fd , +.Nm SKEIN1024_FdChunk , .Nm SKEIN1024_File , .Nm SKEIN1024_FileChunk , .Nm SKEIN1024_Data @@ -63,6 +69,10 @@ .Ft "char *" .Fn SKEIN256_End "SKEIN256_CTX *context" "char *buf" .Ft "char *" +.Fn SKEIN256_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SKEIN256_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SKEIN256_File "const char *filename" "char *buf" .Ft "char *" .Fn SKEIN256_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -77,6 +87,10 @@ .Ft "char *" .Fn SKEIN512_End "SKEIN512_CTX *context" "char *buf" .Ft "char *" +.Fn SKEIN512_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SKEIN512_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SKEIN512_File "const char *filename" "char *buf" .Ft "char *" .Fn SKEIN512_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -91,6 +105,10 @@ .Ft "char *" .Fn SKEIN1024_End "SKEIN1024_CTX *context" "char *buf" .Ft "char *" +.Fn SKEIN1024_Fd "int fd" "char *buf" +.Ft "char *" +.Fn SKEIN1024_FdChunk "int fd" "char *buf" "off_t offset" "off_t length" +.Ft "char *" .Fn SKEIN1024_File "const char *filename" "char *buf" .Ft "char *" .Fn SKEIN1024_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" @@ -160,6 +178,19 @@ calculates the digest of a chunk of data in memory, and uses .Fn SKEIN256_End to return the result. .Pp +The +.Fn SKEIN256_Fd +and +.Fn SKEIN256_FdChunk +functions are identical to their +.Fn SKEIN256_File +and +.Fn SKEIN256_FileChunk +counterparts, with the exception that the first argument is an +.Fa fd +instead of a +.Fa filename . +.Pp When using .Fn SKEIN256_End , .Fn SKEIN256_File , From nobody Mon Sep 30 03:36:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DW60BSz5XfP4; Mon, 30 Sep 2024 03:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DW4w9Mz43XD; Mon, 30 Sep 2024 03:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dK9lYIR+R8x4/gCHHV6TkIizt8j+FYGbovzNgcUioqA=; b=FAYmFy6F+cgxRLOd+baryxXc+rc6HhAwjRVxEJuv8nGJiikT63nE8wSzHpIH4Sb8wePwRp 5BgUhHUk3Vc/72nlModVJ0fG876nPd5YatMl6UYRv1cXIzmyFh8IezVzzR+BI62OdsfEpX dmC7pNVhcS8B1cW90rniuosHJbFLXS+W4YZqLZRT5JyQePLbdK+oGhBqTPKHQJziuYblws LWDfmoYYrCG5tshToVCRuQGgmrLeLzKO1VlYbCmT/NQIYokO5qEXSwSrpYAAEjW+319HUt dho/xn8Rd7YA1L0W+ljxFXYoG3TANNXkNc3ZpygyeIRdgdGGJSnIFk3UTkg08g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dK9lYIR+R8x4/gCHHV6TkIizt8j+FYGbovzNgcUioqA=; b=DA3x4qW5eqGKq6htLpN6dKx57Ea07OV4eN+X3qfSAGHeQiVC9aCb4801oWyy7YySWxlY+i 6pnl66oEHokPb+f5+64ow9U+doc4Ky6ZrazbkAjF+ZgMvl5qHWw7QIIMY8VbpYqFH5GEFc gV2i7iNA1i5dPhKgNRh9BIWwG7JbBILiy2ADF7FuFh9ti8SWkHCO6AMQQt7Uo61WdoDVYv YsIkztCl2CyXPdMk5nnqmpo5wJSRNja4ZykifdgItMp+yl5EYFPQzjV/nKOsrEKI/xYSY0 +65Vo/ebcHboNKqNpC/itwvTelS2Gc9ETmn5+qd7jrA9wp4tfe5RcHW0GFq6nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667371; a=rsa-sha256; cv=none; b=mbdu3xdn4jjZbryPLZD5wOT3VCSRbT+3yaWrTKHPu0M+NHn0h8ISI42PnFMd14jeIrtzBY bqNBHLuA0N/bgTQXkIBCLGOixo3uMDEsBbYQe2nBETCcHFmnH/3gcW60lXaZKDPS9/bFhR 9xR2owXUfkQpiV+Xzal8Vh50XUSYOGpYvXk63Miz1JAeIunyCuKOOXVj9ujtoa8nf6jNLz rvEaJjz2M1YnXAcslqxdBU2XMvM8IT3zXm76vc7iUjr6627m+uvzfDlPOT09+M9pglMwaz rYANdkPAhyy2FGfyeJCaftzKlrNH/TlIt39ss5GBazwxxbT17YF1VREDwrD5ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DW40BqzctL; Mon, 30 Sep 2024 03:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3aBft067248; Mon, 30 Sep 2024 03:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3aBBJ067245; Mon, 30 Sep 2024 03:36:11 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:11 GMT Message-Id: <202409300336.48U3aBBJ067245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 81de655acd2e - main - libmd: stop exporting Transform() symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81de655acd2ebdf104dc4a332eaee5e62b8440a2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=81de655acd2ebdf104dc4a332eaee5e62b8440a2 commit 81de655acd2ebdf104dc4a332eaee5e62b8440a2 Author: Kyle Evans AuthorDate: 2022-03-08 18:05:24 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:20 +0000 libmd: stop exporting Transform() symbols They're not documented in libmd and we don't have any consumers. It's problematic to keep them exported, as we don't currently export their implementations. Make them all private. PR: 280784 (exp-run) Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D34503 --- lib/libmd/Symbol.map | 11 ----------- lib/libmd/ripemd.h | 3 --- lib/libmd/rmd160c.c | 4 +--- lib/libmd/sha.h | 6 ------ lib/libmd/sha0c.c | 2 +- lib/libmd/sha1c.c | 6 +----- sys/crypto/sha2/sha256.h | 3 --- sys/crypto/sha2/sha256c.c | 2 -- sys/crypto/sha2/sha512.h | 3 --- sys/crypto/sha2/sha512c.c | 2 -- sys/crypto/sha2/sha512t.h | 6 ------ sys/kern/md5c.c | 2 -- 12 files changed, 3 insertions(+), 47 deletions(-) diff --git a/lib/libmd/Symbol.map b/lib/libmd/Symbol.map index 9ac73e5bb5fd..86523a5933a1 100644 --- a/lib/libmd/Symbol.map +++ b/lib/libmd/Symbol.map @@ -17,7 +17,6 @@ FBSD_1.7 { MD5FileChunk; MD5Final; MD5Init; - MD5Transform; MD5Update; RIPEMD160_Data; RIPEMD160_End; @@ -27,7 +26,6 @@ FBSD_1.7 { RIPEMD160_FileChunk; RIPEMD160_Final; RIPEMD160_Init; - RIPEMD160_Transform; RIPEMD160_Update; RMD160_version; SHA1_Data; @@ -38,7 +36,6 @@ FBSD_1.7 { SHA1_FileChunk; SHA1_Final; SHA1_Init; - SHA1_Transform; SHA1_Update; SHA1_version; SHA224_Data; @@ -58,7 +55,6 @@ FBSD_1.7 { SHA256_FileChunk; SHA256_Final; SHA256_Init; - SHA256_Transform; SHA256_Update; SHA384_Data; SHA384_End; @@ -95,7 +91,6 @@ FBSD_1.7 { SHA512_FileChunk; SHA512_Final; SHA512_Init; - SHA512_Transform; SHA512_Update; SHA_Data; SHA_End; @@ -151,7 +146,6 @@ FBSDprivate_1.0 { _libmd_MD5FileChunk; _libmd_MD5Final; _libmd_MD5Init; - _libmd_MD5Transform; _libmd_MD5Update; _libmd_RIPEMD160_Data; _libmd_RIPEMD160_End; @@ -161,7 +155,6 @@ FBSDprivate_1.0 { _libmd_RIPEMD160_FileChunk; _libmd_RIPEMD160_Final; _libmd_RIPEMD160_Init; - _libmd_RIPEMD160_Transform; _libmd_RIPEMD160_Update; _libmd_RMD160_version; _libmd_SHA1_Data; @@ -172,7 +165,6 @@ FBSDprivate_1.0 { _libmd_SHA1_FileChunk; _libmd_SHA1_Final; _libmd_SHA1_Init; - _libmd_SHA1_Transform; _libmd_SHA1_Update; _libmd_SHA1_version; _libmd_SHA224_Data; @@ -192,7 +184,6 @@ FBSDprivate_1.0 { _libmd_SHA256_FileChunk; _libmd_SHA256_Final; _libmd_SHA256_Init; - _libmd_SHA256_Transform; _libmd_SHA256_Update; _libmd_SHA384_Data; _libmd_SHA384_End; @@ -229,7 +220,6 @@ FBSDprivate_1.0 { _libmd_SHA512_FileChunk; _libmd_SHA512_Final; _libmd_SHA512_Init; - _libmd_SHA512_Transform; _libmd_SHA512_Update; _libmd_SHA_Data; _libmd_SHA_End; @@ -239,7 +229,6 @@ FBSDprivate_1.0 { _libmd_SHA_FileChunk; _libmd_SHA_Final; _libmd_SHA_Init; - _libmd_SHA_Transform; _libmd_SHA_Update; _libmd_SHA_version; _libmd_SKEIN1024_Data; diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h index fa9f513ebfd8..7f82a54a5176 100644 --- a/lib/libmd/ripemd.h +++ b/lib/libmd/ripemd.h @@ -110,9 +110,6 @@ __BEGIN_DECLS #define RIPEMD160_Data _libmd_RIPEMD160_Data #endif -#ifndef RIPEMD160_Transform -#define RIPEMD160_Transform _libmd_RIPEMD160_Transform -#endif #ifndef RMD160_version #define RMD160_version _libmd_RMD160_version #endif diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c index afc20545dd3d..5642a9a29a1c 100644 --- a/lib/libmd/rmd160c.c +++ b/lib/libmd/rmd160c.c @@ -226,7 +226,7 @@ void RIPEMD160_Update(RIPEMD160_CTX *c, const void *in, size_t len) } } -void RIPEMD160_Transform(RIPEMD160_CTX *c, unsigned char *b) +static void RIPEMD160_Transform(RIPEMD160_CTX *c, unsigned char *b) { u_int32_t p[16]; #if BYTE_ORDER != LITTLE_ENDIAN @@ -540,8 +540,6 @@ __weak_reference(_libmd_RIPEMD160_Init, RIPEMD160_Init); __weak_reference(_libmd_RIPEMD160_Update, RIPEMD160_Update); #undef RIPEMD160_Final __weak_reference(_libmd_RIPEMD160_Final, RIPEMD160_Final); -#undef RIPEMD160_Transform -__weak_reference(_libmd_RIPEMD160_Transform, RIPEMD160_Transform); #undef RMD160_version __weak_reference(_libmd_RMD160_version, RMD160_version); #endif diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h index 6c7b0c0c30b3..49f65d91bfda 100644 --- a/lib/libmd/sha.h +++ b/lib/libmd/sha.h @@ -107,9 +107,6 @@ __BEGIN_DECLS #define SHA_Data _libmd_SHA_Data #endif -#ifndef SHA_Transform -#define SHA_Transform _libmd_SHA_Transform -#endif #ifndef SHA_version #define SHA_version _libmd_SHA_version #endif @@ -145,9 +142,6 @@ __BEGIN_DECLS #define SHA1_Data _libmd_SHA1_Data #endif -#ifndef SHA1_Transform -#define SHA1_Transform _libmd_SHA1_Transform -#endif #ifndef SHA1_version #define SHA1_version _libmd_SHA1_version #endif diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c index 4c39ed842ea9..a36617b6ca60 100644 --- a/lib/libmd/sha0c.c +++ b/lib/libmd/sha0c.c @@ -242,7 +242,7 @@ void SHA_Update(SHA_CTX *c, const void *in, size_t len) p[sw]=l; } -void SHA_Transform(SHA_CTX *c, unsigned char *b) +static void SHA_Transform(SHA_CTX *c, unsigned char *b) { u_int32_t p[16]; #if BYTE_ORDER == LITTLE_ENDIAN diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index 42b554c83ed1..6e80407e4ec0 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -270,7 +270,7 @@ SHA1_Update(SHA_CTX *c, const void *in, size_t len) p[sw]=l; } -void SHA1_Transform(SHA_CTX *c, unsigned char *b) +static void SHA1_Transform(SHA_CTX *c, unsigned char *b) { u_int32_t p[16]; #if BYTE_ORDER != BIG_ENDIAN @@ -483,8 +483,6 @@ __weak_reference(_libmd_SHA_Init, SHA_Init); __weak_reference(_libmd_SHA_Update, SHA_Update); #undef SHA_Final __weak_reference(_libmd_SHA_Final, SHA_Final); -#undef SHA_Transform -__weak_reference(_libmd_SHA_Transform, SHA_Transform); #undef SHA_version __weak_reference(_libmd_SHA_version, SHA_version); #undef SHA1_Init @@ -493,8 +491,6 @@ __weak_reference(_libmd_SHA1_Init, SHA1_Init); __weak_reference(_libmd_SHA1_Update, SHA1_Update); #undef SHA1_Final __weak_reference(_libmd_SHA1_Final, SHA1_Final); -#undef SHA1_Transform -__weak_reference(_libmd_SHA1_Transform, SHA1_Transform); #undef SHA1_version __weak_reference(_libmd_SHA1_version, SHA1_version); #endif diff --git a/sys/crypto/sha2/sha256.h b/sys/crypto/sha2/sha256.h index 60c417e0fb8d..7bee1002c25c 100644 --- a/sys/crypto/sha2/sha256.h +++ b/sys/crypto/sha2/sha256.h @@ -73,9 +73,6 @@ __BEGIN_DECLS #define SHA256_Data _libmd_SHA256_Data #endif -#ifndef SHA256_Transform -#define SHA256_Transform _libmd_SHA256_Transform -#endif #ifndef SHA256_version #define SHA256_version _libmd_SHA256_version #endif diff --git a/sys/crypto/sha2/sha256c.c b/sys/crypto/sha2/sha256c.c index a3bebc4bee55..b7f7295c5c85 100644 --- a/sys/crypto/sha2/sha256c.c +++ b/sys/crypto/sha2/sha256c.c @@ -391,8 +391,6 @@ __weak_reference(_libmd_SHA256_Init, SHA256_Init); __weak_reference(_libmd_SHA256_Update, SHA256_Update); #undef SHA256_Final __weak_reference(_libmd_SHA256_Final, SHA256_Final); -#undef SHA256_Transform -__weak_reference(_libmd_SHA256_Transform, SHA256_Transform); #undef SHA224_Init __weak_reference(_libmd_SHA224_Init, SHA224_Init); diff --git a/sys/crypto/sha2/sha512.h b/sys/crypto/sha2/sha512.h index a119af36276a..4a3e2cadf022 100644 --- a/sys/crypto/sha2/sha512.h +++ b/sys/crypto/sha2/sha512.h @@ -72,9 +72,6 @@ __BEGIN_DECLS #define SHA512_Data _libmd_SHA512_Data #endif -#ifndef SHA512_Transform -#define SHA512_Transform _libmd_SHA512_Transform -#endif #ifndef SHA512_version #define SHA512_version _libmd_SHA512_version #endif diff --git a/sys/crypto/sha2/sha512c.c b/sys/crypto/sha2/sha512c.c index 8eda238870e8..076cb30a1dfa 100644 --- a/sys/crypto/sha2/sha512c.c +++ b/sys/crypto/sha2/sha512c.c @@ -511,8 +511,6 @@ __weak_reference(_libmd_SHA512_Init, SHA512_Init); __weak_reference(_libmd_SHA512_Update, SHA512_Update); #undef SHA512_Final __weak_reference(_libmd_SHA512_Final, SHA512_Final); -#undef SHA512_Transform -__weak_reference(_libmd_SHA512_Transform, SHA512_Transform); #undef SHA512_224_Init __weak_reference(_libmd_SHA512_224_Init, SHA512_224_Init); diff --git a/sys/crypto/sha2/sha512t.h b/sys/crypto/sha2/sha512t.h index 51df4e4dfb2e..2274fa2704b9 100644 --- a/sys/crypto/sha2/sha512t.h +++ b/sys/crypto/sha2/sha512t.h @@ -69,9 +69,6 @@ __BEGIN_DECLS #define SHA512_224_Data _libmd_SHA512_224_Data #endif -#ifndef SHA512_224_Transform -#define SHA512_224_Transform _libmd_SHA512_224_Transform -#endif #ifndef SHA512_224_version #define SHA512_224_version _libmd_SHA512_224_version #endif @@ -104,9 +101,6 @@ __BEGIN_DECLS #define SHA512_256_Data _libmd_SHA512_256_Data #endif -#ifndef SHA512_256_Transform -#define SHA512_256_Transform _libmd_SHA512_256_Transform -#endif #ifndef SHA512_256_version #define SHA512_256_version _libmd_SHA512_256_version #endif diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c index b1ceac656cdd..0922d0f8cc61 100644 --- a/sys/kern/md5c.c +++ b/sys/kern/md5c.c @@ -338,6 +338,4 @@ __weak_reference(_libmd_MD5Init, MD5Init); __weak_reference(_libmd_MD5Update, MD5Update); #undef MD5Final __weak_reference(_libmd_MD5Final, MD5Final); -#undef MD5Transform -__weak_reference(_libmd_MD5Transform, MD5Transform); #endif From nobody Mon Sep 30 03:36:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DY1RSxz5XfC7; Mon, 30 Sep 2024 03:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DX6BScz43XK; Mon, 30 Sep 2024 03:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0itikgqNr2pnyHb8QTxKd7LI1wTQgIFNYQ+25rDo5Tk=; b=UdwKdV0P1jCnh6Pg3Ihl5GUR4FM/dTBMRznKqMIZNumeLFkwDNQ+SfZVXzgQ65X4WhdJUn QT/pn+VFGFn6O7OW/tN+Q48ldR5j8QiMnazG7iXdhUs8LInxcelS6GTgfEQR2JYQdcLdaQ 9JIwBXzcBHRmJvGBPE9uZHUTwMJWj7ZqL0RQsx8Dlailn/gmmIWeroOObcEAPaPxeAuNjz x7Chmxcxal8z51UCn/DtPqHSvA+c2VLzA0kkB1xNeJPNd01h6jm62Yhg/K2wu+8EsBWW3n Wr4ZE+C1gTJchjHKF/j58HH83wUE+0/dvAMrxXJepNKrHhXDG324XxGoqYoNNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0itikgqNr2pnyHb8QTxKd7LI1wTQgIFNYQ+25rDo5Tk=; b=jxMPdhuJBsFWAIl6kwnQyUVfbbzhoBVuAK8q8YyuAGXDrAwlVbUKH4zIQPVEjjt/uVGTsh acl845PXbWcnUfvj5fbiYQuhtA8UT2QPyEAMd2Yve8lGXbBZ/2Irl++4k+KKsw9DSV9HGA aco8iiPsPd//f3GLrU1b0hw133MPeEH0eQaS2EEm4+d9A8GM4r6WoFVdqAmZK7Ijy5J+ck tI4K5cVCXLIGBxcoa7E9hxbWd9YELVi8CtqNwUrHsVM9nvvKsiVdeV7AqzFmqJ1TfzvgG9 FcryCCg6FLDf1v2emyU6Tk8sXGKNSe7fW4YkIwq+Oh/6HFMNE3ijVAavQV/++g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667372; a=rsa-sha256; cv=none; b=MJLjUAxVfS41tHJKR+mTbJQgkHhydC/WzO3GWjFpoD/M3goqdESCa2j0CcMPTU9ewrJAne 47YjeoroHpkxn5nOpzpxaM0+IwOpzJPlnYi8GAg0DhUygEYm6vYKqRgTSL8nJpqsb7pDnZ 43DHynT2THjU2+waKvolQwq+DjMiUSMcNs7JEC8DwrqLF1OW4BhUnrr8X+uxdZHFS/m7X6 fpC30OyQ/d7HBJ2c36jkASYtlKq/ScfgZ4aB2S3u04PEldOE8qBZdbp9Tgokgir9PIFFv8 RDLSMlokDgyHLUf/HtQjx9Pje1CX2+9uvQv2qqastILUhMkyQNUq2mcSWezuzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DX5HBZzcZr; Mon, 30 Sep 2024 03:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3aCCW067296; Mon, 30 Sep 2024 03:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3aCrZ067293; Mon, 30 Sep 2024 03:36:12 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:12 GMT Message-Id: <202409300336.48U3aCrZ067293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 442e0975ee4b - main - Consolidate md4 implementations written in C List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 442e0975ee4b3d6ea809359b7da670b7bd548435 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=442e0975ee4b3d6ea809359b7da670b7bd548435 commit 442e0975ee4b3d6ea809359b7da670b7bd548435 Author: Kyle Evans AuthorDate: 2022-03-23 02:39:02 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:34:21 +0000 Consolidate md4 implementations written in C We currently have one in libmd and another in the kernel that's almost completely identical. Standardize on the kernel version. PR: 280784 (exp-run) --- lib/libmd/md4.h | 55 +--------- lib/libmd/md4c.c | 299 ------------------------------------------------------- sys/kern/md4c.c | 19 ++++ sys/sys/md4.h | 48 ++++++++- 4 files changed, 64 insertions(+), 357 deletions(-) diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h index f8d762dbec27..f251fa4821cf 100644 --- a/lib/libmd/md4.h +++ b/lib/libmd/md4.h @@ -27,60 +27,7 @@ #ifndef _MD4_H_ #define _MD4_H_ -/* MD4 context. */ -typedef struct MD4Context { - u_int32_t state[4]; /* state (ABCD) */ - u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ - unsigned char buffer[64]; /* input buffer */ -} MD4_CTX; -#include - -__BEGIN_DECLS - -/* Ensure libmd symbols do not clash with libcrypto */ - -#ifndef MD4Init -#define MD4Init _libmd_MD4Init -#endif -#ifndef MD4Update -#define MD4Update _libmd_MD4Update -#endif -#ifndef MD4Pad -#define MD4Pad _libmd_MD4Pad -#endif -#ifndef MD4Final -#define MD4Final _libmd_MD4Final -#endif -#ifndef MD4End -#define MD4End _libmd_MD4End -#endif -#ifndef MD4Fd -#define MD4Fd _libmd_MD4Fd -#endif -#ifndef MD4FdChunk -#define MD4FdChunk _libmd_MD4FdChunk -#endif -#ifndef MD4File -#define MD4File _libmd_MD4File -#endif -#ifndef MD4FileChunk -#define MD4FileChunk _libmd_MD4FileChunk -#endif -#ifndef MD4Data -#define MD4Data _libmd_MD4Data -#endif - -void MD4Init(MD4_CTX *); -void MD4Update(MD4_CTX *, const void *, unsigned int); -void MD4Pad(MD4_CTX *); -void MD4Final(unsigned char [16], MD4_CTX *); -char * MD4End(MD4_CTX *, char *); -char * MD4Fd(int, char *); -char * MD4FdChunk(int, char *, off_t, off_t); -char * MD4File(const char *, char *); -char * MD4FileChunk(const char *, char *, off_t, off_t); -char * MD4Data(const void *, unsigned int, char *); -__END_DECLS +#include #endif /* _MD4_H_ */ diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c deleted file mode 100644 index d98221d264fc..000000000000 --- a/lib/libmd/md4c.c +++ /dev/null @@ -1,299 +0,0 @@ -/* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm - */ - -#include -/*- - SPDX-License-Identifier: RSA-MD - - Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD4 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD4 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - */ - -#include -#include -#include "md4.h" - -typedef unsigned char *POINTER; -typedef const unsigned char *CONST_POINTER; -typedef u_int16_t UINT2; -typedef u_int32_t UINT4; - -#define PROTO_LIST(list) list - -/* Constants for MD4Transform routine. - */ -#define S11 3 -#define S12 7 -#define S13 11 -#define S14 19 -#define S21 3 -#define S22 5 -#define S23 9 -#define S24 13 -#define S31 3 -#define S32 9 -#define S33 11 -#define S34 15 - -static void MD4Transform PROTO_LIST ((UINT4 [4], const unsigned char [64])); -static void Encode PROTO_LIST - ((unsigned char *, UINT4 *, unsigned int)); -static void Decode PROTO_LIST - ((UINT4 *, const unsigned char *, unsigned int)); - -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* F, G and H are basic MD4 functions. - */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) - -/* ROTATE_LEFT rotates x left n bits. - */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* FF, GG and HH are transformations for rounds 1, 2 and 3 */ -/* Rotation is separate from addition to prevent recomputation */ -#define FF(a, b, c, d, x, s) { \ - (a) += F ((b), (c), (d)) + (x); \ - (a) = ROTATE_LEFT ((a), (s)); \ - } -#define GG(a, b, c, d, x, s) { \ - (a) += G ((b), (c), (d)) + (x) + (UINT4)0x5a827999; \ - (a) = ROTATE_LEFT ((a), (s)); \ - } -#define HH(a, b, c, d, x, s) { \ - (a) += H ((b), (c), (d)) + (x) + (UINT4)0x6ed9eba1; \ - (a) = ROTATE_LEFT ((a), (s)); \ - } - -/* MD4 initialization. Begins an MD4 operation, writing a new context. - */ -void -MD4Init(MD4_CTX *context) -{ - context->count[0] = context->count[1] = 0; - - /* Load magic initialization constants. - */ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; -} - -/* MD4 block update operation. Continues an MD4 message-digest - operation, processing another message block, and updating the - context. - */ -void -MD4Update(MD4_CTX *context, const void *in, unsigned int inputLen) -{ - unsigned int i, idx, partLen; - const unsigned char *input = in; - - /* Compute number of bytes mod 64 */ - idx = (unsigned int)((context->count[0] >> 3) & 0x3F); - /* Update number of bits */ - if ((context->count[0] += ((UINT4)inputLen << 3)) - < ((UINT4)inputLen << 3)) - context->count[1]++; - context->count[1] += ((UINT4)inputLen >> 29); - - partLen = 64 - idx; - /* Transform as many times as possible. - */ - if (inputLen >= partLen) { - memcpy - ((POINTER)&context->buffer[idx], (CONST_POINTER)input, partLen); - MD4Transform (context->state, context->buffer); - - for (i = partLen; i + 63 < inputLen; i += 64) - MD4Transform (context->state, &input[i]); - - idx = 0; - } - else - i = 0; - - /* Buffer remaining input */ - memcpy - ((POINTER)&context->buffer[idx], (CONST_POINTER)&input[i], - inputLen-i); -} - -/* MD4 padding. */ -void -MD4Pad(MD4_CTX *context) -{ - unsigned char bits[8]; - unsigned int idx, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. - */ - idx = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (idx < 56) ? (56 - idx) : (120 - idx); - MD4Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD4Update (context, bits, 8); -} - -/* MD4 finalization. Ends an MD4 message-digest operation, writing the - the message digest and zeroizing the context. - */ -void -MD4Final(unsigned char digest[16], MD4_CTX *context) -{ - /* Do padding */ - MD4Pad (context); - - /* Store state in digest */ - Encode (digest, context->state, 16); - - /* Zeroize sensitive information. - */ - explicit_bzero(context, sizeof(*context)); -} - -/* MD4 basic transformation. Transforms state based on block. - */ -static void -MD4Transform(UINT4 state[4], const unsigned char block[64]) -{ - UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ - FF (a, b, c, d, x[ 0], S11); /* 1 */ - FF (d, a, b, c, x[ 1], S12); /* 2 */ - FF (c, d, a, b, x[ 2], S13); /* 3 */ - FF (b, c, d, a, x[ 3], S14); /* 4 */ - FF (a, b, c, d, x[ 4], S11); /* 5 */ - FF (d, a, b, c, x[ 5], S12); /* 6 */ - FF (c, d, a, b, x[ 6], S13); /* 7 */ - FF (b, c, d, a, x[ 7], S14); /* 8 */ - FF (a, b, c, d, x[ 8], S11); /* 9 */ - FF (d, a, b, c, x[ 9], S12); /* 10 */ - FF (c, d, a, b, x[10], S13); /* 11 */ - FF (b, c, d, a, x[11], S14); /* 12 */ - FF (a, b, c, d, x[12], S11); /* 13 */ - FF (d, a, b, c, x[13], S12); /* 14 */ - FF (c, d, a, b, x[14], S13); /* 15 */ - FF (b, c, d, a, x[15], S14); /* 16 */ - - /* Round 2 */ - GG (a, b, c, d, x[ 0], S21); /* 17 */ - GG (d, a, b, c, x[ 4], S22); /* 18 */ - GG (c, d, a, b, x[ 8], S23); /* 19 */ - GG (b, c, d, a, x[12], S24); /* 20 */ - GG (a, b, c, d, x[ 1], S21); /* 21 */ - GG (d, a, b, c, x[ 5], S22); /* 22 */ - GG (c, d, a, b, x[ 9], S23); /* 23 */ - GG (b, c, d, a, x[13], S24); /* 24 */ - GG (a, b, c, d, x[ 2], S21); /* 25 */ - GG (d, a, b, c, x[ 6], S22); /* 26 */ - GG (c, d, a, b, x[10], S23); /* 27 */ - GG (b, c, d, a, x[14], S24); /* 28 */ - GG (a, b, c, d, x[ 3], S21); /* 29 */ - GG (d, a, b, c, x[ 7], S22); /* 30 */ - GG (c, d, a, b, x[11], S23); /* 31 */ - GG (b, c, d, a, x[15], S24); /* 32 */ - - /* Round 3 */ - HH (a, b, c, d, x[ 0], S31); /* 33 */ - HH (d, a, b, c, x[ 8], S32); /* 34 */ - HH (c, d, a, b, x[ 4], S33); /* 35 */ - HH (b, c, d, a, x[12], S34); /* 36 */ - HH (a, b, c, d, x[ 2], S31); /* 37 */ - HH (d, a, b, c, x[10], S32); /* 38 */ - HH (c, d, a, b, x[ 6], S33); /* 39 */ - HH (b, c, d, a, x[14], S34); /* 40 */ - HH (a, b, c, d, x[ 1], S31); /* 41 */ - HH (d, a, b, c, x[ 9], S32); /* 42 */ - HH (c, d, a, b, x[ 5], S33); /* 43 */ - HH (b, c, d, a, x[13], S34); /* 44 */ - HH (a, b, c, d, x[ 3], S31); /* 45 */ - HH (d, a, b, c, x[11], S32); /* 46 */ - HH (c, d, a, b, x[ 7], S33); /* 47 */ - HH (b, c, d, a, x[15], S34); /* 48 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. - */ - memset ((POINTER)x, 0, sizeof (x)); -} - -/* Encodes input (UINT4) into output (unsigned char). Assumes len is - a multiple of 4. - */ -static void -Encode(unsigned char *output, UINT4 *input, unsigned int len) -{ - unsigned int i, j; - - for (i = 0, j = 0; j < len; i++, j += 4) { - output[j] = (unsigned char)(input[i] & 0xff); - output[j+1] = (unsigned char)((input[i] >> 8) & 0xff); - output[j+2] = (unsigned char)((input[i] >> 16) & 0xff); - output[j+3] = (unsigned char)((input[i] >> 24) & 0xff); - } -} - -/* Decodes input (unsigned char) into output (UINT4). Assumes len is - a multiple of 4. - */ -static void -Decode(UINT4 *output, const unsigned char *input, unsigned int len) -{ - unsigned int i, j; - - for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | - (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); -} - -#ifdef WEAK_REFS -/* When building libmd, provide weak references. Note: this is not - activated in the context of compiling these sources for internal - use in libcrypt. - */ -#undef MD4Init -__weak_reference(_libmd_MD4Init, MD4Init); -#undef MD4Update -__weak_reference(_libmd_MD4Update, MD4Update); -#undef MD4Pad -__weak_reference(_libmd_MD4Pad, MD4Pad); -#undef MD4Final -__weak_reference(_libmd_MD4Final, MD4Final); -#endif diff --git a/sys/kern/md4c.c b/sys/kern/md4c.c index d706f22db744..e173e17e3387 100644 --- a/sys/kern/md4c.c +++ b/sys/kern/md4c.c @@ -26,7 +26,11 @@ */ #include +#ifdef _KERNEL #include +#else +#include +#endif #include typedef unsigned char *POINTER; @@ -277,3 +281,18 @@ Decode(UINT4 *output, const unsigned char *input, unsigned int len) output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); } + +#ifdef WEAK_REFS +/* When building libmd, provide weak references. Note: this is not + activated in the context of compiling these sources for internal + use in libcrypt. + */ +#undef MD4Init +__weak_reference(_libmd_MD4Init, MD4Init); +#undef MD4Update +__weak_reference(_libmd_MD4Update, MD4Update); +#undef MD4Pad +__weak_reference(_libmd_MD4Pad, MD4Pad); +#undef MD4Final +__weak_reference(_libmd_MD4Final, MD4Final); +#endif diff --git a/sys/sys/md4.h b/sys/sys/md4.h index 0918d533659b..e00675e9f462 100644 --- a/sys/sys/md4.h +++ b/sys/sys/md4.h @@ -25,8 +25,8 @@ documentation and/or software. */ -#ifndef _MD4_H_ -#define _MD4_H_ +#ifndef _SYS_MD4_H_ +#define _SYS_MD4_H_ /* MD4 context. */ typedef struct MD4Context { u_int32_t state[4]; /* state (ABCD) */ @@ -36,6 +36,43 @@ typedef struct MD4Context { #include +#ifndef _KERNEL + +/* Ensure libmd symbols do not clash with libcrypto */ + +#ifndef MD4Init +#define MD4Init _libmd_MD4Init +#endif +#ifndef MD4Update +#define MD4Update _libmd_MD4Update +#endif +#ifndef MD4Pad +#define MD4Pad _libmd_MD4Pad +#endif +#ifndef MD4Final +#define MD4Final _libmd_MD4Final +#endif +#ifndef MD4End +#define MD4End _libmd_MD4End +#endif +#ifndef MD4Fd +#define MD4Fd _libmd_MD4Fd +#endif +#ifndef MD4FdChunk +#define MD4FdChunk _libmd_MD4FdChunk +#endif +#ifndef MD4File +#define MD4File _libmd_MD4File +#endif +#ifndef MD4FileChunk +#define MD4FileChunk _libmd_MD4FileChunk +#endif +#ifndef MD4Data +#define MD4Data _libmd_MD4Data +#endif + +#endif + __BEGIN_DECLS void MD4Init(MD4_CTX *); void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); @@ -43,9 +80,12 @@ void MD4Pad(MD4_CTX *); void MD4Final(unsigned char [__min_size(16)], MD4_CTX *); #ifndef _KERNEL char * MD4End(MD4_CTX *, char *); +char * MD4Fd(int, char *); +char * MD4FdChunk(int, char *, off_t, off_t); char * MD4File(const char *, char *); -char * MD4Data(const unsigned char *, unsigned int, char *); +char * MD4FileChunk(const char *, char *, off_t, off_t); +char * MD4Data(const void *, unsigned int, char *); #endif __END_DECLS -#endif /* _MD4_H_ */ +#endif /* _SYS_MD4_H_ */ From nobody Mon Sep 30 03:36:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6DZ0CM0z5Xf2r; Mon, 30 Sep 2024 03:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6DY6Xfzz43fl; Mon, 30 Sep 2024 03:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRNerBwfuQellBjYE4nxQ1QGv/e0MMggE50mQ+WamHY=; b=e6U3sJQJX2R6lqW4Z2Xm4ShntGFDHtxxxgCI54t3lUENCzVUDnROUt7QDHI/OcFmtrkCbs wlVOWqI4Gw/qJ34g0MFAYXuXbJk10OJpHtnZIa6MOkBUTDqmXgPhb2P0Y8XLusdlTHtzq5 0JMdrVsoOReAfYAAUN+Y5mNQClYU83GyBV0AAHK3c3EiSIJ6sl0/pgLvRU43y9C2fkotdo S7hgzaWL6PFTDR5J+FaXVoDLHqBRVGJrMv4noPjzogR7i51to0ATwQqNbr6v4/MG+2COei l2lnoI/alKpw0V1Vfv2th4Aw4We1RQLuwB3qcMflJa9GBRgIzpjzuah1/LgNOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727667373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRNerBwfuQellBjYE4nxQ1QGv/e0MMggE50mQ+WamHY=; b=Pm24oJb3MFjGV2+697akkWTtlR3T7+qACK1pJTiVeQPgUYr8v8lmO6PfFl3+5rTQCkkv+3 P+yjwfZXp0TF9Zjqv/n+vK6TeUTwxO1rdh8+GR2c6IS0haoVK80DfMILMwt2SYV6M8xf+K bwpeNW9Ed8g61xLBd7GZeoV76MzkF/TXowWKnvZUXIW+yASxSJNBjtf8OOdqVsm/YrPmAW HKsk8p2E/aJ39eqGB3o2eIx1rpHx5Tq2HPgkPnojxbEh+B77Kiu9ww9Uc5BkE5l+6N1Ua+ TZeRsSy7WIyuspBaIFEfDsxpYuLNkXxBu39aJNcmcOhTf7Zg6MeOqmxxQu34QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727667373; a=rsa-sha256; cv=none; b=rQ9MYDs2BiYx1X2r7I7Ie9hohqf6siVFD0m/Q30ZvPU9qcjEXbPuBUx97LNgCEQIhWYpLv WRABsm3mI71wMC0etXR1vbm6ofEPoNWGORYP2AKgMdfKkcEP6Mdmzaa0hFbj4GjnotbYp1 g6ktzgjfxjstyt+WyzrhMw8+MAWkQc2JM9zkXo6s2vmofsbskAPM2N5E0VHVhgLygx7KZY KZV/BOElMlMm01sLEbBINsFIslMr5lfqnBFsH+O8CY3FWEAjrWwyC20BZQKpxbc1wW1z1C PhdTkqkqx9vOETgBS/Q5EeIQkT6ppZ7rHNbqgIbsF/sHzinUadb8MM45h3KB7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6DY5s3wzcZs; Mon, 30 Sep 2024 03:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3aDRt067339; Mon, 30 Sep 2024 03:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3aDbV067336; Mon, 30 Sep 2024 03:36:13 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:36:13 GMT Message-Id: <202409300336.48U3aDbV067336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 5190e6341ce5 - main - libmd: stop exporting _version symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5190e6341ce5121cb17df109f9dc56ab8674aa5c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5190e6341ce5121cb17df109f9dc56ab8674aa5c commit 5190e6341ce5121cb17df109f9dc56ab8674aa5c Author: Kyle Evans AuthorDate: 2024-09-30 03:32:42 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:35:23 +0000 libmd: stop exporting _version symbols These are reportedly likely to be specific to SSLeay's implementation and likely not needed here. At the very least they shouldn't be used by consumers, so let's kick them out now while we're already prepared for a libmd soversion bump. Requested by: delphij, fuz --- lib/libmd/Symbol.map | 5 ----- lib/libmd/ripemd.h | 3 --- lib/libmd/rmd160c.c | 4 +--- lib/libmd/sha.h | 6 ------ lib/libmd/sha1c.c | 6 +----- sys/crypto/sha2/sha224.h | 4 ---- sys/crypto/sha2/sha256.h | 4 ---- sys/crypto/sha2/sha384.h | 4 ---- sys/crypto/sha2/sha512.h | 4 ---- sys/crypto/sha2/sha512t.h | 8 -------- 10 files changed, 2 insertions(+), 46 deletions(-) diff --git a/lib/libmd/Symbol.map b/lib/libmd/Symbol.map index 86523a5933a1..f0a1192af352 100644 --- a/lib/libmd/Symbol.map +++ b/lib/libmd/Symbol.map @@ -27,7 +27,6 @@ FBSD_1.7 { RIPEMD160_Final; RIPEMD160_Init; RIPEMD160_Update; - RMD160_version; SHA1_Data; SHA1_End; SHA1_Fd; @@ -37,7 +36,6 @@ FBSD_1.7 { SHA1_Final; SHA1_Init; SHA1_Update; - SHA1_version; SHA224_Data; SHA224_End; SHA224_Fd; @@ -156,7 +154,6 @@ FBSDprivate_1.0 { _libmd_RIPEMD160_Final; _libmd_RIPEMD160_Init; _libmd_RIPEMD160_Update; - _libmd_RMD160_version; _libmd_SHA1_Data; _libmd_SHA1_End; _libmd_SHA1_Fd; @@ -166,7 +163,6 @@ FBSDprivate_1.0 { _libmd_SHA1_Final; _libmd_SHA1_Init; _libmd_SHA1_Update; - _libmd_SHA1_version; _libmd_SHA224_Data; _libmd_SHA224_End; _libmd_SHA224_Fd; @@ -230,7 +226,6 @@ FBSDprivate_1.0 { _libmd_SHA_Final; _libmd_SHA_Init; _libmd_SHA_Update; - _libmd_SHA_version; _libmd_SKEIN1024_Data; _libmd_SKEIN1024_End; _libmd_SKEIN1024_Fd; diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h index 7f82a54a5176..07293dad0e5f 100644 --- a/lib/libmd/ripemd.h +++ b/lib/libmd/ripemd.h @@ -110,9 +110,6 @@ __BEGIN_DECLS #define RIPEMD160_Data _libmd_RIPEMD160_Data #endif -#ifndef RMD160_version -#define RMD160_version _libmd_RMD160_version -#endif #ifndef ripemd160_block #define ripemd160_block _libmd_ripemd160_block #endif diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c index 5642a9a29a1c..92d6524b25b4 100644 --- a/lib/libmd/rmd160c.c +++ b/lib/libmd/rmd160c.c @@ -76,7 +76,7 @@ #undef RMD160_ASM #endif -char *RMD160_version="RIPEMD160 part of SSLeay 0.9.0b 11-Oct-1998"; +static char *RMD160_version="RIPEMD160 part of SSLeay 0.9.0b 11-Oct-1998"; #ifdef RMD160_ASM void ripemd160_block_x86(RIPEMD160_CTX *c, const u_int32_t *p,int num); @@ -540,6 +540,4 @@ __weak_reference(_libmd_RIPEMD160_Init, RIPEMD160_Init); __weak_reference(_libmd_RIPEMD160_Update, RIPEMD160_Update); #undef RIPEMD160_Final __weak_reference(_libmd_RIPEMD160_Final, RIPEMD160_Final); -#undef RMD160_version -__weak_reference(_libmd_RMD160_version, RMD160_version); #endif diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h index 49f65d91bfda..cd4a899bee49 100644 --- a/lib/libmd/sha.h +++ b/lib/libmd/sha.h @@ -107,9 +107,6 @@ __BEGIN_DECLS #define SHA_Data _libmd_SHA_Data #endif -#ifndef SHA_version -#define SHA_version _libmd_SHA_version -#endif #ifndef sha_block #define sha_block _libmd_sha_block #endif @@ -142,9 +139,6 @@ __BEGIN_DECLS #define SHA1_Data _libmd_SHA1_Data #endif -#ifndef SHA1_version -#define SHA1_version _libmd_SHA1_version -#endif #ifndef sha1_block #define sha1_block _libmd_sha1_block #endif diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index 6e80407e4ec0..83e402e132e7 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -79,7 +79,7 @@ #undef SHA1_ASM #endif -char *SHA1_version="SHA1 part of SSLeay 0.9.0b 11-Oct-1998"; +static char *SHA1_version="SHA1 part of SSLeay 0.9.0b 11-Oct-1998"; /* Implemented from SHA-1 document - The Secure Hash Algorithm */ @@ -483,14 +483,10 @@ __weak_reference(_libmd_SHA_Init, SHA_Init); __weak_reference(_libmd_SHA_Update, SHA_Update); #undef SHA_Final __weak_reference(_libmd_SHA_Final, SHA_Final); -#undef SHA_version -__weak_reference(_libmd_SHA_version, SHA_version); #undef SHA1_Init __weak_reference(_libmd_SHA1_Init, SHA1_Init); #undef SHA1_Update __weak_reference(_libmd_SHA1_Update, SHA1_Update); #undef SHA1_Final __weak_reference(_libmd_SHA1_Final, SHA1_Final); -#undef SHA1_version -__weak_reference(_libmd_SHA1_version, SHA1_version); #endif diff --git a/sys/crypto/sha2/sha224.h b/sys/crypto/sha2/sha224.h index 8286a31fdec2..b54f418ae594 100644 --- a/sys/crypto/sha2/sha224.h +++ b/sys/crypto/sha2/sha224.h @@ -73,10 +73,6 @@ __BEGIN_DECLS #define SHA224_Data _libmd_SHA224_Data #endif -#ifndef SHA224_version -#define SHA224_version _libmd_SHA224_version -#endif - void SHA224_Init(SHA224_CTX *); void SHA224_Update(SHA224_CTX *, const void *, size_t); void SHA224_Final(unsigned char [__min_size(SHA224_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha256.h b/sys/crypto/sha2/sha256.h index 7bee1002c25c..77237c466bd9 100644 --- a/sys/crypto/sha2/sha256.h +++ b/sys/crypto/sha2/sha256.h @@ -73,10 +73,6 @@ __BEGIN_DECLS #define SHA256_Data _libmd_SHA256_Data #endif -#ifndef SHA256_version -#define SHA256_version _libmd_SHA256_version -#endif - void SHA256_Init(SHA256_CTX *); void SHA256_Update(SHA256_CTX *, const void *, size_t); void SHA256_Final(unsigned char [__min_size(SHA256_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha384.h b/sys/crypto/sha2/sha384.h index 17d99f6901b7..83ffb8b1ebf1 100644 --- a/sys/crypto/sha2/sha384.h +++ b/sys/crypto/sha2/sha384.h @@ -72,10 +72,6 @@ __BEGIN_DECLS #define SHA384_Data _libmd_SHA384_Data #endif -#ifndef SHA384_version -#define SHA384_version _libmd_SHA384_version -#endif - void SHA384_Init(SHA384_CTX *); void SHA384_Update(SHA384_CTX *, const void *, size_t); void SHA384_Final(unsigned char [__min_size(SHA384_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha512.h b/sys/crypto/sha2/sha512.h index 4a3e2cadf022..b78fde7dc22f 100644 --- a/sys/crypto/sha2/sha512.h +++ b/sys/crypto/sha2/sha512.h @@ -72,10 +72,6 @@ __BEGIN_DECLS #define SHA512_Data _libmd_SHA512_Data #endif -#ifndef SHA512_version -#define SHA512_version _libmd_SHA512_version -#endif - void SHA512_Init(SHA512_CTX *); void SHA512_Update(SHA512_CTX *, const void *, size_t); void SHA512_Final(unsigned char [__min_size(SHA512_DIGEST_LENGTH)], diff --git a/sys/crypto/sha2/sha512t.h b/sys/crypto/sha2/sha512t.h index 2274fa2704b9..dc8025e4a74f 100644 --- a/sys/crypto/sha2/sha512t.h +++ b/sys/crypto/sha2/sha512t.h @@ -69,10 +69,6 @@ __BEGIN_DECLS #define SHA512_224_Data _libmd_SHA512_224_Data #endif -#ifndef SHA512_224_version -#define SHA512_224_version _libmd_SHA512_224_version -#endif - #ifndef SHA512_256_Init #define SHA512_256_Init _libmd_SHA512_256_Init #endif @@ -101,10 +97,6 @@ __BEGIN_DECLS #define SHA512_256_Data _libmd_SHA512_256_Data #endif -#ifndef SHA512_256_version -#define SHA512_256_version _libmd_SHA512_256_version -#endif - void SHA512_224_Init(SHA512_CTX *); void SHA512_224_Update(SHA512_CTX *, const void *, size_t); void SHA512_224_Final(unsigned char [__min_size(SHA512_224_DIGEST_LENGTH)], From nobody Mon Sep 30 03:53:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH6cb5cz9z5XgQ1; Mon, 30 Sep 2024 03:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH6cb4t5Wz46tq; Mon, 30 Sep 2024 03:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727668415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N1wt1SwZoRkund8y94gnTBXKdhFcCnIY6lX8zV8u8j4=; b=SHtV+jhwy5SnZ/7LwGUCkVq1CbkeI90rddg5idWSoj2VvvHLCsu4Tp/eRqrViuqI9dRbaK Chzk7JB2kkvcu6Cj4lqt+2XkpnGkI09gAmV/dPNA4WVKlHY3tGretDJ1aCTFiOczMnOd21 4j34A0tZHfByWl+k2VQwJIdl1N3qRd8mqdJ+0ixjX8SPGnIXiLTnePW7VnP665wWG+yKED pHrVE0ZEgK8bRrYKIMgqeoFLucpepLxFFu3b/IfnioLOG3NDwbVDssIqG1EQbswy7isp/+ VtsAQgOZ80xYFwqhOcfm/dajY2XhaSWBBX7yTuQwLGTMT413HPx+sN7kchriuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727668415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N1wt1SwZoRkund8y94gnTBXKdhFcCnIY6lX8zV8u8j4=; b=ci+BFCDf1dqkdeJuDnLTSNZWR2NamVqlBPWJ54vFHKBkGr+GC0Da7Pgv+g+PRNdr67kyEB uxFBVRgspbUspajuoA6Dang58IKS1JxQW07DiPx8Gsj5m2Xy6HnAXH+XQ57SJgsGFCOHzV MMqG6ZXyCxqmMV5HgW13aHNsL5b+nVpxVXTdd5j6H/hScYtCxpqQUIa8vP2C7GuiD6O+A5 r1xma6VdLMc0ADqo/+NTT0hNamy7+JX9wxFYD7VJHxE4sUImTWGcIOdAHe1ZMv3yuldczt yrB43qUrjlSzJcaZMDvOPo9HsJBna41CctXsV8zVdu6d+H3jw/45Fg/vCbfitg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727668415; a=rsa-sha256; cv=none; b=TLpYt3HEkO0WR+gJJ59DWH9oGEuGaGRRMb2Af+xhdTpo/7UkUnfECoa5gY05E2TNMYFW9x q2kbfcB7t14C5AYBNDUZJqZ9rf/GMxT4niYKM1odn+a15ZFetXN0umv6S8S9rVPHhKT7aS 1YQXoly3VZlHalDnPbi6V52YGWmV1l4y0aDdkGIX8tMpWnx5UqKbqPdxB/r9VcWVecpCjO zU2YAOqfZ6GaKQVG5Wr1JuowXUCTiD+xo1qoVs/V55CTh75ojUyytGJhllHDNpN+H44eTh iWcyzysSYIq9Msw9QqkGekWCPMsuVIRikd6diGlazXGR0mHNlgAkSgrDURV/dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH6cb4F71zdPd; Mon, 30 Sep 2024 03:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U3rZaO000713; Mon, 30 Sep 2024 03:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U3rZM7000710; Mon, 30 Sep 2024 03:53:35 GMT (envelope-from git) Date: Mon, 30 Sep 2024 03:53:35 GMT Message-Id: <202409300353.48U3rZM7000710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c2caf3b3313f - main - flua: lposix: add more useful functions for general purpose scripts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2caf3b3313fe73bfc9b4b984c21da8d571f8798 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c2caf3b3313fe73bfc9b4b984c21da8d571f8798 commit c2caf3b3313fe73bfc9b4b984c21da8d571f8798 Author: Kyle Evans AuthorDate: 2023-03-11 06:03:02 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 03:52:20 +0000 flua: lposix: add more useful functions for general purpose scripts unistd: - _exit - close - fork - getpid - pipe - read - write libgen: - basename, dirname stdlib: - realpath These are sufficient for a number of real world scenarios. In our first application of them, we use the libgen+stdlib additions to grab the script dir based on argv[0]. The unistd assortment is then used to outsource a bunch of work to forks and report back to the main process. Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D39083 --- libexec/flua/linit_flua.c | 3 + libexec/flua/modules/lposix.c | 415 ++++++++++++++++++++++++++++++++++++++---- libexec/flua/modules/lposix.h | 3 + 3 files changed, 388 insertions(+), 33 deletions(-) diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index 4635970d1fd7..5cae7531b7da 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -57,8 +57,11 @@ static const luaL_Reg loadedlibs[] = { #endif /* FreeBSD Extensions */ {"lfs", luaopen_lfs}, + {"posix.libgen", luaopen_posix_libgen}, + {"posix.stdlib", luaopen_posix_stdlib}, {"posix.sys.stat", luaopen_posix_sys_stat}, {"posix.sys.utsname", luaopen_posix_sys_utsname}, + {"posix.sys.wait", luaopen_posix_sys_wait}, {"posix.unistd", luaopen_posix_unistd}, {"fbsd", luaopen_fbsd}, {NULL, NULL} diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index fa3fd5f8e589..9ca57d409d10 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -1,35 +1,18 @@ /*- - * Copyright (c) 2019 Kyle Evans - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. + * Copyright (c) 2019, 2023 Kyle Evans * + * SPDX-License-Identifier: BSD-2-Clause */ #include #include +#include #include #include +#include #include +#include #include #include @@ -40,6 +23,39 @@ /* * Minimal implementation of luaposix needed for internal FreeBSD bits. */ +static int +lua__exit(lua_State *L) +{ + int code, narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 1, 1, "_exit takes exactly one argument"); + + code = luaL_checkinteger(L, 1); + _exit(code); +} + +static int +lua_basename(lua_State *L) +{ + char *inpath, *outpath; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg > 0, 1, "at least one argument required"); + inpath = strdup(luaL_checkstring(L, 1)); + if (inpath == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(ENOMEM)); + lua_pushinteger(L, ENOMEM); + return (3); + } + + outpath = basename(inpath); + lua_pushstring(L, outpath); + free(inpath); + return (1); +} static int lua_chmod(lua_State *L) @@ -57,10 +73,10 @@ lua_chmod(lua_State *L) lua_pushnil(L); lua_pushstring(L, strerror(errno)); lua_pushinteger(L, errno); - return 3; + return (3); } lua_pushinteger(L, 0); - return 1; + return (1); } static int @@ -120,14 +136,32 @@ lua_chown(lua_State *L) } static int -lua_getpid(lua_State *L) +lua_pclose(lua_State *L) { - int n; + int error, fd, n; n = lua_gettop(L); - luaL_argcheck(L, n == 0, 1, "too many arguments"); - lua_pushinteger(L, getpid()); - return 1; + luaL_argcheck(L, n == 1, 1, + "close takes exactly one argument (fd)"); + + fd = luaL_checkinteger(L, 1); + if (fd < 0) { + error = EBADF; + goto err; + } + + if (close(fd) == 0) { + lua_pushinteger(L, 0); + return (1); + } + + error = errno; +err: + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); + } static int @@ -163,7 +197,271 @@ lua_uname(lua_State *L) return (1); } -#define REG_SIMPLE(n) { #n, lua_ ## n } +static int +lua_dirname(lua_State *L) +{ + char *inpath, *outpath; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg > 0, 1, + "dirname takes at least one argument (path)"); + inpath = strdup(luaL_checkstring(L, 1)); + if (inpath == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(ENOMEM)); + lua_pushinteger(L, ENOMEM); + return (3); + } + + outpath = dirname(inpath); + lua_pushstring(L, outpath); + free(inpath); + return (1); +} + +static int +lua_fork(lua_State *L) +{ + pid_t pid; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 0, 1, "too many arguments"); + + pid = fork(); + if (pid < 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_pushinteger(L, pid); + return (1); +} + +static int +lua_getpid(lua_State *L) +{ + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 0, 1, "too many arguments"); + lua_pushinteger(L, getpid()); + return (1); +} + +static int +lua_pipe(lua_State *L) +{ + int error, fd[2], narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 0, 1, "too many arguments"); + + error = pipe(fd); + if (error != 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (1); + } + + lua_pushinteger(L, fd[0]); + lua_pushinteger(L, fd[1]); + return (2); +} + +static int +lua_read(lua_State *L) +{ + char *buf; + ssize_t ret; + size_t sz; + int error, fd, narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 2, 1, + "read takes exactly two arguments (fd, size)"); + + fd = luaL_checkinteger(L, 1); + sz = luaL_checkinteger(L, 2); + + if (fd < 0) { + error = EBADF; + goto err; + } + + buf = malloc(sz); + if (buf == NULL) + goto err; + + /* + * For 0-byte reads, we'll still push the empty string and let the + * caller deal with EOF to match lposix semantics. + */ + ret = read(fd, buf, sz); + if (ret >= 0) + lua_pushlstring(L, buf, ret); + else if (ret < 0) + error = errno; /* Save to avoid clobber by free() */ + + free(buf); + if (error != 0) + goto err; + + /* Just the string pushed. */ + return (1); +err: + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); +} + +static int +lua_realpath(lua_State *L) +{ + const char *inpath; + char *outpath; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg > 0, 1, "at least one argument required"); + inpath = luaL_checkstring(L, 1); + + outpath = realpath(inpath, NULL); + if (outpath == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_pushstring(L, outpath); + free(outpath); + return (1); +} + +static int +lua_wait(lua_State *L) +{ + pid_t pid; + int options, status; + int narg; + + narg = lua_gettop(L); + + pid = -1; + status = options = 0; + if (narg >= 1 && !lua_isnil(L, 1)) + pid = luaL_checkinteger(L, 1); + if (narg >= 2 && !lua_isnil(L, 2)) + options = luaL_checkinteger(L, 2); + + pid = waitpid(pid, &status, options); + if (pid < 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_pushinteger(L, pid); + if (pid == 0) { + lua_pushliteral(L, "running"); + return (2); + } + + if (WIFCONTINUED(status)) { + lua_pushliteral(L, "continued"); + return (2); + } else if(WIFSTOPPED(status)) { + lua_pushliteral(L, "stopped"); + lua_pushinteger(L, WSTOPSIG(status)); + return (3); + } else if (WIFEXITED(status)) { + lua_pushliteral(L, "exited"); + lua_pushinteger(L, WEXITSTATUS(status)); + return (3); + } else if (WIFSIGNALED(status)) { + lua_pushliteral(L, "killed"); + lua_pushinteger(L, WTERMSIG(status)); + return (3); + } + + return (1); +} + +static int +lua_write(lua_State *L) +{ + const char *buf; + size_t bufsz, sz; + ssize_t ret; + off_t offset; + int error, fd, narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg >= 2, 1, + "write takes at least two arguments (fd, buf, sz, off)"); + luaL_argcheck(L, narg <= 4, 5, + "write takes no more than four arguments (fd, buf, sz, off)"); + + fd = luaL_checkinteger(L, 1); + if (fd < 0) { + error = EBADF; + goto err; + } + + buf = luaL_checkstring(L, 2); + + bufsz = sz = lua_rawlen(L, 2); + if (narg >= 3 && !lua_isnil(L, 3)) + sz = luaL_checkinteger(L, 3); + + offset = 0; + if (narg >= 4 && !lua_isnil(L, 4)) + offset = luaL_checkinteger(L, 4); + + if ((size_t)offset > bufsz || offset + sz > bufsz) { + lua_pushnil(L); + lua_pushfstring(L, + "write: invalid access offset %zu, size %zu in a buffer size %zu", + offset, sz, bufsz); + lua_pushinteger(L, EINVAL); + return (3); + } + + ret = write(fd, buf + offset, sz); + if (ret < 0) { + error = errno; + goto err; + } + + lua_pushinteger(L, ret); + return (1); +err: + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); +} + +#define REG_DEF(n, func) { #n, func } +#define REG_SIMPLE(n) REG_DEF(n, lua_ ## n) +static const struct luaL_Reg libgenlib[] = { + REG_SIMPLE(basename), + REG_SIMPLE(dirname), + { NULL, NULL }, +}; + +static const struct luaL_Reg stdliblib[] = { + REG_SIMPLE(realpath), + { NULL, NULL }, +}; + static const struct luaL_Reg sys_statlib[] = { REG_SIMPLE(chmod), { NULL, NULL }, @@ -174,18 +472,69 @@ static const struct luaL_Reg sys_utsnamelib[] = { { NULL, NULL }, }; +static const struct luaL_Reg sys_waitlib[] = { + REG_SIMPLE(wait), + {NULL, NULL}, +}; + static const struct luaL_Reg unistdlib[] = { - REG_SIMPLE(getpid), + REG_SIMPLE(_exit), REG_SIMPLE(chown), + REG_DEF(close, lua_pclose), + REG_SIMPLE(fork), + REG_SIMPLE(getpid), + REG_SIMPLE(pipe), + REG_SIMPLE(read), + REG_SIMPLE(write), { NULL, NULL }, }; + #undef REG_SIMPLE +#undef REG_DEF + +int +luaopen_posix_libgen(lua_State *L) +{ + luaL_newlib(L, libgenlib); + return (1); +} + +int +luaopen_posix_stdlib(lua_State *L) +{ + luaL_newlib(L, stdliblib); + return (1); +} int luaopen_posix_sys_stat(lua_State *L) { luaL_newlib(L, sys_statlib); - return 1; + return (1); +} + +int +luaopen_posix_sys_wait(lua_State *L) +{ + luaL_newlib(L, sys_waitlib); + +#define lua_pushflag(L, flag) do { \ + lua_pushinteger(L, flag); \ + lua_setfield(L, -2, #flag); \ +} while(0) + + /* Only these two exported by lposix */ + lua_pushflag(L, WNOHANG); + lua_pushflag(L, WUNTRACED); + + lua_pushflag(L, WCONTINUED); + lua_pushflag(L, WSTOPPED); + lua_pushflag(L, WTRAPPED); + lua_pushflag(L, WEXITED); + lua_pushflag(L, WNOWAIT); +#undef lua_pushflag + + return (1); } int @@ -199,5 +548,5 @@ int luaopen_posix_unistd(lua_State *L) { luaL_newlib(L, unistdlib); - return 1; + return (1); } diff --git a/libexec/flua/modules/lposix.h b/libexec/flua/modules/lposix.h index e37caaae9d04..9d2c97b0d2dc 100644 --- a/libexec/flua/modules/lposix.h +++ b/libexec/flua/modules/lposix.h @@ -7,6 +7,9 @@ #include +int luaopen_posix_libgen(lua_State *L); +int luaopen_posix_stdlib(lua_State *L); int luaopen_posix_sys_stat(lua_State *L); int luaopen_posix_sys_utsname(lua_State *L); +int luaopen_posix_sys_wait(lua_State *L); int luaopen_posix_unistd(lua_State *L); From nobody Mon Sep 30 04:43:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7kY2Bpmz5Xk25; Mon, 30 Sep 2024 04:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7kY1SNmz4Crq; Mon, 30 Sep 2024 04:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=npcC6jZBfT4QbOWw+QKEFVwwiq3kmQwyXZ/sbcc9OjQ=; b=swlRM6419rsvGbY51fWFpihjzZpazcCMygaTP1O/q6UgVeB2Xrzl7wRapoaIEuKcRwdj1X //jqUW6Pq/xxDzH9Jy+3/9OM9WcaUV4PnFKXE8r9Ag63ueDwa+VeywA4+4Kc5yiNzip6nH 7fVeqjJy4SZcEPqlW/PQaZCLvTof3xAKATJ9VpZMVr6b1XoBcAuQTTdyPfPAhbPZALE8a3 uExO6j38O5HcwwhKZfRJpd/AmARnSR1jHw/RJ0OTKwJICbtSWpH8qXnXnroI7JrpB9h97m LJw0XwpjCeXnz+iSOJrl5AU4H8rWFVJdYkbd2cjaFmAvjOcfBcwzXxd4UcNB0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=npcC6jZBfT4QbOWw+QKEFVwwiq3kmQwyXZ/sbcc9OjQ=; b=AgObH2paMs90EOZyulXrWJQQREen4cop2Hw78ShVPJwhVF1QymqIYlxDxowd+MW+JvS2Lm t7eiThuRc+Wng5yJvThupnlwZePOhTpL4iffWeTabQVY5sxduGWFXEL5dcIRxo4cR4rGV7 /aGFxKRii5bxFs3sCd8HJK6jZE5ItQbkFSG173dBCYMkf+ANsk0JVsJXBrdMlPxiP8/qKz YpHa8qosFjUkm0ZyLblboNJM+JBZlL8+xB0foaxXCdv3ic5vXhPq6CkjjsCsoHc8sRucXt 42gaPQapUzy7TJu71sfn/ePyvfTO47gdNIzwDEIxAzJ0k95RmQs9Z9YN4snvWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671429; a=rsa-sha256; cv=none; b=mVgrEn0TSSy3A8ZtKj2Cx/YygEX7yvwSL54i5W9Kqb5kqpjyrfOgHyG7hJkY4Wn3I1tYkL x6blVkphR5UuMO/JD8y2ln9cHDLS3BwhcTWWAZUkz25w/i2cRSO1wJesowefSexfx6azN0 EVWrYdK5QanrKie205LttOZB/c7GDNb4ZkDbknNwMFG0pntbm3KOFtC1DUeriu4cwOnu3V 5EZrgBCRC5pT2694+wynX+6ghnYqygkIkqCj00hsVmyuVPvbej+ObI8C6D+oV9P/tBGWzx yb90PXwfEawRmcuaM5VOJ3YCEHdjMKOSyrhVVv6h2kRa/UkjjVQjfOZkJhXYPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7kY0wJXzf9N; Mon, 30 Sep 2024 04:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4hnQU085452; Mon, 30 Sep 2024 04:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4hnTm085449; Mon, 30 Sep 2024 04:43:49 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:43:49 GMT Message-Id: <202409300443.48U4hnTm085449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0ffebeb08ae5 - main - libmd: quickly switch exported symbols to FBSD_1.8 before anyone notices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ffebeb08ae5d77f0159550761878d6a090770f2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0ffebeb08ae5d77f0159550761878d6a090770f2 commit 0ffebeb08ae5d77f0159550761878d6a090770f2 Author: Kyle Evans AuthorDate: 2024-09-30 04:42:53 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 04:42:53 +0000 libmd: quickly switch exported symbols to FBSD_1.8 before anyone notices This sat in my tree for years, and we've since cut another release branch. Oops. =\ --- lib/libmd/Symbol.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libmd/Symbol.map b/lib/libmd/Symbol.map index f0a1192af352..c3ea3a43968f 100644 --- a/lib/libmd/Symbol.map +++ b/lib/libmd/Symbol.map @@ -1,4 +1,4 @@ -FBSD_1.7 { +FBSD_1.8 { MD4Data; MD4End; MD4Fd; From nobody Mon Sep 30 04:45:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m03pzfz5Xk0V; Mon, 30 Sep 2024 04:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m03HQcz4DRq; Mon, 30 Sep 2024 04:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8AMOee11tFqrnYmQZV8PQ+Gj4PQILUVeqid+1XAwG+E=; b=IcCSwWM3pyitazZdAjQAhnYNT6/48jk4m80Ucqd0QaEoHoU5tYzBpD9VutpT75UwAKYkOP XwqmqB3QXhOMXH+9Aw7JYuV5uaDAoynp5F9KJ/960yARHY4+M1iM6jkciAGse0iLI2eVfb nRuOACExYO3tQYs8LXOHk2D8Wk5THCsZRdTYOBcCPV6sQlwNY5N6fjvOLghG3Ux8H73tzE 4ePJkNrmEv8NS/IPayi9Y34OaC/8VP/qqPKu1/ynFVd6E4yv/8l+rmfBhZ29+hkZHFpOn0 dERQ3O9XOkFr1D7ffgL0q+3bVZrhzKu0C53vsr/bSbBcbmTRTNnD5fyB5Y1b1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8AMOee11tFqrnYmQZV8PQ+Gj4PQILUVeqid+1XAwG+E=; b=GnteQmDCKcwHkuQXgJo980EdmC3bw1m3nxAnmWFMSHE3Kfs47TmtB+r67b7Y5geKfAo5XO 0DINmnpuWSRa2R0D0P8JdZ6/SBaFdXdyhP+in+YpkcdYIlytAg0sJYT8LEVfnCexSJXM0B gKEzMitpY+qkoxqPeaFJeIoVSvW8TAvtXieWV+iypl8fb/IMPCuw9SPgBBkUJ2fleKUM8J WXYh7UQAgNRDabhubFBZa7x8p9y+OYJCo9yyMsiE9iYsw5WK14YtnBdcNHZ2Hv/siq5M4d 7hnlWtTpGyTZTcv9z+6oQWdl9aguQwDp6ai8tgbhS68pzigCgvMQJmKE5udQXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671504; a=rsa-sha256; cv=none; b=DPZLsI4WhjoVluE4pXAUQ8YPGkNU16BVyj7/YBe5slc3Sa/UdIsSmzMSTODR4AMozrUulw id4FqrAZFuSi+Gs+aCHQvuzPe722C798zKVrfXWldoVH41FmwQF7heSKvRqsWfQzXo5MbX XczELcpL3XYfUKkf0aXoPfAGONeLKAd+f5qpnii0lsjtPqmLsYkoJKLICR3O8Kf0zNL0cb 34MnKVhQfeibFZSqKepMTdUFN/8kKoQetp0iM5Nk3FOAn547ykasBbiPnqrtzQKk9DZXtc 12A8QJD+TdIJtmIsfRfTBLW8LqQXByrCy0/GADmA8yaYCMub2XSIGdNyS6U6AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m02qqdzfbg; Mon, 30 Sep 2024 04:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j4Oe086004; Mon, 30 Sep 2024 04:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j48i086001; Mon, 30 Sep 2024 04:45:04 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:04 GMT Message-Id: <202409300445.48U4j48i086001@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: fbaf48065115 - stable/14 - kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c commit fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:13 +0000 kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) `fp_malloc` is defined as a macro that redirects to `malloc`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6a2a385507c79abaa9db9eabfdd827362f3dc7ed) --- sys/kern/kern_fail.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index f60500b22ef4..2c362b68f24b 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -479,11 +479,10 @@ fail_point_init(struct fail_point *fp, const char *fmt, ...) /* Allocate the name and fill it in. */ name = fp_malloc(n + 1, M_WAITOK); - if (name != NULL) { - va_start(ap, fmt); - vsnprintf(name, n + 1, fmt, ap); - va_end(ap); - } + va_start(ap, fmt); + vsnprintf(name, n + 1, fmt, ap); + va_end(ap); + fp->fp_name = name; fp->fp_location = ""; fp->fp_flags |= FAIL_POINT_DYNAMIC_NAME; From nobody Mon Sep 30 04:45:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m15H9yz5Xjp5; Mon, 30 Sep 2024 04:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m14cf6z4Dg4; Mon, 30 Sep 2024 04:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PyHJS/wkYeAwXSUNSVteFx0+AtjSxGA6vC6mHsFrZOE=; b=JSyZNXXn51X5VA3w4EON7hov9fuwfF4iuXNDmzL/OxXas8TpkbYKjAhEu4xbSBpE31Gu7J XoSX4YpQFpUaVCg76qQsd7feDAMJlE0k97YrMLgZF6nICbgfMupzja3NrlpUJ9GnJhTkEX c3Yj22HfKvLgRpbSrDpjiqhqViQnL9MGSCeo40bMS0wDe71ysYoXnJHDIO69DHAxTu9br7 /OxeeNiY3C6Rl4ZbW6KwEfYDNgWRcnA+3+aIok1MQIAHJzxzHQ14vaHNCtYGxPnHidJtpG 0xPRwNu8rl63kMHNZVEMEPC0tGzkzx4HO0te/eJiO+IZsM7MbMZFlYmWbyugog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PyHJS/wkYeAwXSUNSVteFx0+AtjSxGA6vC6mHsFrZOE=; b=Of/B9+s2+xjPMDvjWZleL8ZIDmIvgK2Q2vnyO/0dyOLJtGO2b8TSaB7P3PaOjl30IBUiXD XZycJhrXToCx30+h5MhxkJhVisFCAXthneuzNAefAAy34mPLx32epfMWxWn/CcTZss3heQ yILG54RYAy4ApSy0cjr+1nVQw4RRwws/gXi8m83sEH2yml57jpcVruUB0/afrM/6UmY62x B+OQG1LXHOY5RZEVcUanFsGIwEKJIRXjYyQs786XvnG8HS1ZHA41+jsnGzJcDsSKtOhfZh 0rp53BgV6jG8tTSP97wzR9oTUUPpa22et312cqTOrjMHANcnztup8AfLZ6AZow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671505; a=rsa-sha256; cv=none; b=Qb9Ugab6j9cJB/jPBjNl9chJ0q8GYZRH05lzwzy1jgjTf7J425qEWB++mD8+dpv4TTRnbR GqcAgKWdGK7Das6XCBOdciUBKAbFfrnK7TZ2s7lC7HTA6nk4ly1mf1tQiJe77ST7dXSet7 lTDLiMJjuA/QpxPvH1xf8jdM8Q5lQWXUeE5fdWa6M9ptkCmS3YFt+zPxzxw+3gZKZNP17F fK+WJeLLKBdQcwSPVPvMfb/7UePlZ+JsTlfcrja/icxBfueM4HH2m9YJcJL8UU+iYDej3M zhmTbUjlrhF2OBXnnwtlyPCsxjYXzZiPIxg1zjCPzXHKrGCvtc/FUoTtPSKHrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m147VHzf28; Mon, 30 Sep 2024 04:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j55i086052; Mon, 30 Sep 2024 04:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j56W086049; Mon, 30 Sep 2024 04:45:05 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:05 GMT Message-Id: <202409300445.48U4j56W086049@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: ab314540193e - stable/14 - boottrace: Stop checking for failures from realloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab314540193e75983ceb363b18433ce405d943e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ab314540193e75983ceb363b18433ce405d943e6 commit ab314540193e75983ceb363b18433ce405d943e6 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:17 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:13 +0000 boottrace: Stop checking for failures from realloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit f444db950e877596805aed897c3fbb975be28711) --- sys/kern/kern_boottrace.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c index 1b097e7378ad..5516f3160587 100644 --- a/sys/kern/kern_boottrace.c +++ b/sys/kern/kern_boottrace.c @@ -561,9 +561,6 @@ boottrace_resize(u_int newsize) } rt.table = realloc(rt.table, newsize * sizeof(struct bt_event), M_BOOTTRACE, M_WAITOK | M_ZERO); - if (rt.table == NULL) - return (ENOMEM); - rt.size = newsize; boottrace_reset("boottrace_resize"); return (0); From nobody Mon Sep 30 04:45:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m2707wz5Xk2D; Mon, 30 Sep 2024 04:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m25X8Kz4DdG; Mon, 30 Sep 2024 04:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QxlFx+x+siIWvd27eRI0N4qhy83fW8DnRtgs05So3o=; b=AcKrVs9bT+CGRWCkWCX3Wsl3h2jV+spsN7brrf4UcgCPc1DXpwuKUOgePXzHDraD4ukdzQ o/yaIkdjSh94g19SGmHsZtbWv/werJGfyXgn6iZ0+zli3Nka4NscsHeCE8rAEMx+jZiAw1 uTYLeM2uBgdz1aBceWquvMIY1ES6FzByJibfRMsZ0OXFBErA3HJWhyWJAYp5G7AgoA8+rz kGpeDbUIq2X206VVa0m4Ystdanl5iWfgGXJe7d+OBsXdn/G9/8Mx7M/qZuhsViHqB5/BWP MCA/DCekqfnRtl6cjzOfrooV1HQSyd2KAohHyN6+tsx182qtlMq6u0sOQ4wIyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QxlFx+x+siIWvd27eRI0N4qhy83fW8DnRtgs05So3o=; b=RyzLki9JmrfWHVsvzl+JhKHedKRPsMcp5WnCUZ8lz3FhEALN58yNkzLBY2iNDfDYRXRhRI Owak/gzrmsKLAYhmZWFyBggwG98kFRMGVn/ZpESI72qWRnrImFERQ0cpPRLoksHUGfnewe mYnf6gkS4Ulxmv5yEZYOGLxbwRNXAMvVlvha0RXzYoVEXiEiXiC0+oQex4hAYKZdED07Jm uzL5XQ+xDqr6f30CS4Xqksd+L+uv1jzRO66ZyGPNcyWGF/NUVf2zjWMZ9kjsyna7BoSuOS ybRBw3FBujl3ZTMOrSH1LZCN9EoeUb3LwyENJFGq2VAsxaLybJo8vNgYciugcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671506; a=rsa-sha256; cv=none; b=BHnPbYSqB+EiEDBVcxMgyM+nk5QnspmphJ+JhQYb67syNinZd1NliQXij+FUbL9pJ7Hn5O 8Kf6sRg9xnhOOHGU+2sy/Jq6toMitRHV+zXjYN7KDez61XRZizCYHVynQhsJ6HJl2hq+DF qxhKOsHVOxFqhK+0v3lOo2u0YPQRfnEjNqWf0eO+yletvrb6jFTto7EZVjzkMXPhSxCUg/ QwKDHfcm1kCuNPRciDZUo8QwQo6S55UbNlRJRPOWX2lEzyQ8UH0EoDFFUFOhvW9EiI7UKV 2cgiu0NYUf6WMyibnGeF0tIIokgSthUhPTHRBxc1dxAea4yITPdaRyX6m1zQBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m258P8zf9P; Mon, 30 Sep 2024 04:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j6Jo086111; Mon, 30 Sep 2024 04:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j6ae086108; Mon, 30 Sep 2024 04:45:06 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:06 GMT Message-Id: <202409300445.48U4j6ae086108@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: 44a6f9c9a0b5 - stable/14 - subr_bus: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44a6f9c9a0b503f70fb7f1d44bd75a8f68c4833f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=44a6f9c9a0b503f70fb7f1d44bd75a8f68c4833f commit 44a6f9c9a0b503f70fb7f1d44bd75a8f68c4833f Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:17 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:14 +0000 subr_bus: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 99e3bb555cb1ef5572de54be0ffed2aa6fc080cd) --- sys/kern/subr_bus.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 38c646593a85..5965b8941b54 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -5395,8 +5395,6 @@ sysctl_devices(SYSCTL_HANDLER_ARGS) * Populate the return item, careful not to overflow the buffer. */ udev = malloc(sizeof(*udev), M_BUS, M_WAITOK | M_ZERO); - if (udev == NULL) - return (ENOMEM); udev->dv_handle = (uintptr_t)dev; udev->dv_parent = (uintptr_t)dev->parent; udev->dv_devflags = dev->devflags; From nobody Mon Sep 30 04:45:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m40WQfz5XkK9; Mon, 30 Sep 2024 04:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m36ZNCz4DXp; Mon, 30 Sep 2024 04:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHJp2Mi+0Lymgi3kOczBoKj+PtooZ2HRo8FSk7VNZ2w=; b=xVjdMCoJtSwiYjm9/PiBNfMiYO/0cE9tY+aAJuZNFyJpPK3ZuNUsE3/rEgltuSOQdQCpu0 j22QMMpiIFOyW8jiNaWkF1N9heZqL4prEHRl5t34jYFS1b86oX//XadU3/Ixt+Dosg2zwT 2bo9x+kE6ggyDWzVFXBiJGDu3LPvgfGC5/hZ7t2IBahVfMLwmZkFaUjndJvK9qOV0vmcFs xgX4XMfnR2eLanYAzjdp2tbPgO6Xx8J515wyki23rdZn3UgYw5+/0GIlceLXdoAhYPGXHO doirLyrWPnQKV+ZNkoh9xMRqW1RZCYwKcS+T8wMb3iHk0p7D1dio0Xz9dsbQ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHJp2Mi+0Lymgi3kOczBoKj+PtooZ2HRo8FSk7VNZ2w=; b=IIfoeALtY6m8tzKrweDCG0kU33VeoaoExchVJixkyFdKHQteHsA6yNmbd9g+xkvila9ErV o28qQAI2Yo3JDOXL9OopzaL5hDQL5E9R2rovQuLjPjLqX9F3/XHYeBIkbZiuoJDwaCCp6o hqZrMyw/gH0hNNEKkX/DlIF1rC5w2Ccr30PIIhBet4DUMJr9KGQ6/U+0P4XyrWOJxnQYTT JG0t2PscQb7pog9ELvVKoZh7OGjZOvcABps6iYm3PieNbj+RrepO0uoJtI3VsOe7X9bgPv Y5HugHmd5kO+c7Dqj2cptz1yTSFxzAJKyIgESFHQZB8+JvMwQ52m4Li6kjVnvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671507; a=rsa-sha256; cv=none; b=W2OXin20qkK+8QZyzyuOjxm75KniSZeCcxkJEtmMoFVkAf2yVglzJNK3a0fby81qfP/6ru ckDAvyj+MwA2FTZgf5Oqp+oPA1RhibeegZZtb0X8fILZiOZ5DFDbdJa5khbsjB6/kUoN7u OtBRvtcDUPE7eHo+JYMngSDT3JVvy5YvzBqqpyk9PLJoGWJmpQlXyDa85RKUdOTEwyg5KR 42+N7qdqwyHotASokasdnFg/8ph3Hh/gE3rYFr291nI23P7D3D/iaWHKXTd/vORK+S26YB zyttvo/jIIBqAL5j+unuqmUQ/ArhWzCHYNmA1SsPq+DMrP3713DOD7uNcH+7Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m35pJDzfFp; Mon, 30 Sep 2024 04:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j79a086164; Mon, 30 Sep 2024 04:45:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j7Uj086161; Mon, 30 Sep 2024 04:45:07 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:07 GMT Message-Id: <202409300445.48U4j7Uj086161@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: d2d4758456aa - stable/14 - ctl: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d2d4758456aa89863ee615dbe1516a01c1fa83b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d2d4758456aa89863ee615dbe1516a01c1fa83b9 commit d2d4758456aa89863ee615dbe1516a01c1fa83b9 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:18 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:14 +0000 ctl: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 8e6dd4185871cd9b785869178ab2191a0d6c0b53) --- sys/cam/ctl/ctl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 9a99823a5c1c..de759f81bc86 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2711,12 +2711,6 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, } entries = malloc(ooa_hdr->alloc_len, M_CTL, M_WAITOK | M_ZERO); - if (entries == NULL) { - printf("%s: could not allocate %d bytes for OOA " - "dump\n", __func__, ooa_hdr->alloc_len); - retval = ENOMEM; - break; - } mtx_lock(&softc->ctl_lock); if ((ooa_hdr->flags & CTL_OOA_FLAG_ALL_LUNS) == 0 && From nobody Mon Sep 30 04:45:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m51rbhz5Xk0Y; Mon, 30 Sep 2024 04:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m509xXz4DSJ; Mon, 30 Sep 2024 04:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N18vKApKXkQZOlOtAy9ndyRBZPNqCsxjSP+GuTQerCo=; b=oaJh/0Hj80BTmCtTgVoOF4o6c6I7jThrRWyqTWoyQ7+aXvf45VBZNq2kiNgx9jGvJjihE8 ICfwVP5COdIvkIoWQLTsTCu49JY9EYOAVU93KzOxHJzCBeMmYeRHWMMxM7ZfaWUb0qNBfO Hx2qSn/xlkI708oIFzLraJkR3FayyxFb0744He8tIHNSQRp0DjptG0j7PouWS1/37GE/Vg 06xLBc8iVycl21qFu4XVjAwd55PYqZdwFviaddpLp2EHG5nDp0bn9d3vBZvx2b0TuZuRxi q24kiUhaPOijqER9jrL3Pq3wF8RQFh5/cu/SDgUqyxLwBuYUTzcezCSg6FRq2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N18vKApKXkQZOlOtAy9ndyRBZPNqCsxjSP+GuTQerCo=; b=LbCRD+t1Z2EABDgjTo9EJlM+1yz0yvyWo+JpF13wZPwyAk6T4h61PldtgYUYKdG9ENjBN6 sWP7MyNyYCaPX7L82VDQS81oCeHHYEI6ge7TYJ5R1iQCRqzVdMWvwxWacd3PrE39pXLiSa uSofthUQNgahSnxK1unNaig+EtKY0yIp7NJibNrSct4sDfZYn+W6Bdt/IXHTmQI4AcIqb/ N1h1N36fululuMQdvftAhXmg8f9UYEVkpDqJS816Yu/+VRidDLjrHbKXF5OBYxzsuVNAxK 567ndc2pUejxhpAr1NDMrMGZUqIyMODz6rYhi4/LWs9ya+teyTs9xj6RSOfqog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671509; a=rsa-sha256; cv=none; b=nw9sBuFKDCiyjwkQ/KWwTjDMImqTEXv3KT6RvD6SWdvt69oxQSLECKq778mbZQ7c1sphrJ kDNN3KR9Q16/k0vjLd4Hctn0D68eSNRWoONSp0fdX/YOK5doJhPIQi0oIvFZNsmddL+8Zo /elyvpAxba8w14rpC9Vsu0SVVtUwH5CZTdYANJIiHDOoXHQ1a2G3HrzyVDzu1DvcGrWhD0 udKhd4vHWpp1TOlvvcGMjbeA1qXYEGzv0TQN5j2j/Lhs/CBQhIxBDbrR/TsUW5QiGaYtln Qluk4rKB3O3pCgx3d12ojDOw9c72LnLtbLd6mAARTUYqdArZGOSqJEt2NeAKtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m46ngGzdwJ; Mon, 30 Sep 2024 04:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j8c1086212; Mon, 30 Sep 2024 04:45:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j8GS086209; Mon, 30 Sep 2024 04:45:08 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:08 GMT Message-Id: <202409300445.48U4j8GS086209@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: a77e68b0148d - stable/14 - udf: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a77e68b0148d5224a64740c2cb7b25b1efc55335 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a77e68b0148d5224a64740c2cb7b25b1efc55335 commit a77e68b0148d5224a64740c2cb7b25b1efc55335 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:18 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:15 +0000 udf: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 3feb35dc465a8247d70e50792680c230954ef1c1) --- sys/fs/udf/udf_vnops.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index f230ca0c72fa..98a779280690 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -800,8 +800,6 @@ udf_readdir(struct vop_readdir_args *a) */ ncookies = uio->uio_resid / 8; cookies = malloc(sizeof(*cookies) * ncookies, M_TEMP, M_WAITOK); - if (cookies == NULL) - return (ENOMEM); uiodir.ncookies = ncookies; uiodir.cookies = cookies; uiodir.acookies = 0; From nobody Mon Sep 30 04:45:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m74S3cz5XkKH; Mon, 30 Sep 2024 04:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m72Fkyz4DkQ; Mon, 30 Sep 2024 04:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMQxlmdjk8A8Z6Ds4gvEu5q0jMENClFZ2kzKaQOuv+k=; b=Nlo9TI4e64WFh47WGnDZCjubxDhsZfHDzLwWF60hc1VVZPw8tVC47TPChcxRql6G5koM7N 4xzlWfu0n87UiEknwoYdX00J+6yjbgb0b1AqJotfd1gyRRFP8eETM/e4s2htCzGhJE1eYq ZAbCyw8mWuKYSx2WKdqvZvj9+U5kb3u7wM6GZLp+ap+HR73wJornrocgaTleoxNAA+xO4n Pq6hW7BWRuSziq0HwpxQLtIXrzU6mecq2IshpVp1qjiXW6ZGvS82obzfIa7tN8czu8Sn9Y NZRAMwTbsHzr7DA8xNNS5eOCLXy1kWCHxYBOojGfMLV7nM7v+fRTiKS8+TE8xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMQxlmdjk8A8Z6Ds4gvEu5q0jMENClFZ2kzKaQOuv+k=; b=dj1wzpy4JOuoZ2umnqvrIZwtU08YzdTQSoko56H6c0B3Evi5nWeh7dWf+OHtBkBIQSd1Na nZ9e6et68rLywmMR2ShLP09Ohz2TnGE1/6kTT5XNAF0QgWxsPGtgaTMfAKdxa1E8qRRF8Z CCM4SWrgG3gtv1g8R+zLfHYcEROTGvnUydfF2BmpVVafIuEc9tbuPbd+LsG3K1vhX7ivEz ZtsYMb4YuZA/D1Wz5l6YJpwHiVJRJaeMPT4RlcMoXHfGnHdVwR0Mi2II1nFsaXv2x6rjor SOoS/a741FeLtJWdqGriBkiYnJjY4U+FVkTqyXvsd5OxY+sR8R3rzbhzYZyf2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671511; a=rsa-sha256; cv=none; b=qzSuNYeFOSWOFf0KVvyrhSzY2jCUbe6QPlRKkI6FkkvxjUbww0d260L26K0UvSFO7LQk7u 25VLlNfvJmdvu4QkOa4+qscVMPtaqd2+vmbtU4s8q7WFiuFHMWis1s+RDhPmWGUfjpsxnc By8YlpF1DkSdQCqn6ngzJQDc1iIy2zd01TchtqXNMk26CUgIVygan0FzbSrsKHixbDZUln WWTMCeu9HQqDUXMn4eCx1jluwWwwEg++phhUJUtzow6c+Y8VdilmtUxcjPEyCtJTt+y95o IRKQ0xcRwhh7iGYHezjpJpJ1KmDRwQm4mL/C3haE15wnr+IEblV4fEpXS57FpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m71kTBzf2B; Mon, 30 Sep 2024 04:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jB1i086309; Mon, 30 Sep 2024 04:45:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jB64086306; Mon, 30 Sep 2024 04:45:11 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:11 GMT Message-Id: <202409300445.48U4jB64086306@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: 67971181687f - stable/14 - if_vlan: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67971181687f0475dcf72b42d065364efea96251 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=67971181687f0475dcf72b42d065364efea96251 commit 67971181687f0475dcf72b42d065364efea96251 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:15 +0000 if_vlan: Stop checking for failures from malloc(M_WAITOK) Fixes: b08d611de835 fix vlan locking to permit sx acquisition in ioctl calls MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 07b16b1e2aeab0b30f68a013de31a4c322a61246) --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 59eb41956ad4..206d46e7f9be 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -508,11 +508,6 @@ vlan_growhash(struct ifvlantrunk *trunk, int howmuch) return; hash2 = malloc(sizeof(struct ifvlanhead) * n2, M_VLAN, M_WAITOK); - if (hash2 == NULL) { - printf("%s: out of memory -- hash size not changed\n", - __func__); - return; /* We can live with the old hash table */ - } for (j = 0; j < n2; j++) CK_SLIST_INIT(&hash2[j]); for (i = 0; i < n; i++) From nobody Mon Sep 30 04:45:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m642f7z5Xjwt; Mon, 30 Sep 2024 04:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m619PJz4Df5; Mon, 30 Sep 2024 04:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=boZvgMY/J+hXFIbp4H5pdYbqjri9Ip4anhZn/Bkdxz8=; b=LyBhuFgzx2HssoTLk9xrsX4fQg3GlgG+E/RqQcLdC4xjAJNgvN6VhvCynfHGSdSK6WIOG6 vax1JelrhXna03LfCi3jssMk0KOMfoXdeR4sdEGhIhFVpRDv/bEPwfsUJqUvF7/cv0PIA4 EvtrVXMxaWkqm167Ri62TCOSA93aNbio0Xr34fVM9HxPVtb+c5N3Cad5pOacY5/UqmJk/k EVnkt2uximi1z1KAfKQsf/Moad8w8sE1U9VqhRYTsCCY2uNpCZ7woZBxIKfslo2l4X2GYv YiMansxefV70MdnLvQVS8NzYpQiu5IDKPb94UKcKxtjsadygnsvb6o1sbSO3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=boZvgMY/J+hXFIbp4H5pdYbqjri9Ip4anhZn/Bkdxz8=; b=hAgiaPTelN5t3OGzHR4MJ6cw7B1AQyEfINiI9oYk0pSYRwjQ7rvWBMYLCyWN0GNSbAMbL+ 22O8dlTF64n41R+PkmXVsFXegiwwUlEQJCIK+h1Xj1bKC5Vl7V8Ih9BbABPQOPxzx6GPLu NrV15JU5C3hyMWy3bMYIy/jt9LmoetttK1j2BnmxLUACHddOZ1Na62rX4MSTgpND4Klsc4 0EiAsS67NBMh3epAqLlTTY8YhGRZwBvN2xlFtvBuPhPuPbax4WmP8xMg3WIWTT5+Edypbm pPspb0yWN8OH3+wmyZRDiTZ6tt80coN1VVef4UKsg/P8TUTxvQfN8oIIxdQsZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671510; a=rsa-sha256; cv=none; b=OagG4DhYMn/0WSgrMpOLPVITyQZN5PHCkZkg049IonjJLLOgYZX0P86Z36wNXmWXhN1oqw kNajYzsUsjGdmUlvbJX1W6dy/o29xRXcxGBvoYZWHILexk/z3ULBEj+v7b0suBbI03q+iF kuOSjw9RqlVlRDpBDFGrfSuVmYnQoywflMQJeJPtshk5T7ZxDdoPDERjCS/YgWKWNsWznZ cU8nUXYDXvvlzcmAVtYE0AoDoJNay6UB4uiF2FqHQg9LTRDFaG7CTEpsWZNxFJ40AInySw RXc85VsKYQ9WyZrkatJ0WKabbpwUpm8IbwC41p5oAsJxhEMl3cNhVvHN1VnejA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m60fDRzf29; Mon, 30 Sep 2024 04:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4j9Mo086260; Mon, 30 Sep 2024 04:45:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4j9kU086257; Mon, 30 Sep 2024 04:45:09 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:09 GMT Message-Id: <202409300445.48U4j9kU086257@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: 891fdd020a68 - stable/14 - altq: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 891fdd020a6826eb98d30284f78000e666f9a263 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=891fdd020a6826eb98d30284f78000e666f9a263 commit 891fdd020a6826eb98d30284f78000e666f9a263 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:15 +0000 altq: Stop checking for failures from malloc(M_WAITOK) While here, prefer malloc(M_ZERO) over bzero(). MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 2a119886630bb5fe8283e20db5acb7c0cdba31c3) --- sys/net/altq/altq_subr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index 3ade724818dd..534841289611 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -1327,12 +1327,7 @@ acc_add_filter(classifier, filter, class, phandle) return (EINVAL); #endif - afp = malloc(sizeof(struct acc_filter), - M_DEVBUF, M_WAITOK); - if (afp == NULL) - return (ENOMEM); - bzero(afp, sizeof(struct acc_filter)); - + afp = malloc(sizeof(*afp), M_DEVBUF, M_WAITOK | M_ZERO); afp->f_filter = *filter; afp->f_class = class; From nobody Mon Sep 30 04:45:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7m90rbjz5XkGl; Mon, 30 Sep 2024 04:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m84BTsz4Ds7; Mon, 30 Sep 2024 04:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQ080WfzmxQupCyrr6aR10smpDN5SrBZeVp5T3MFD0E=; b=Lr9MBfBGbosaEuF6HvQNUH6w+80e+yCXiOMx7GH2k7Iw27hK0sNbjTs0TZ/V2GS6yoXt0T Ytm92EO/nBe3uJ1Y/8fQrVw+k2LERi8feTIGNySLyGFvEjzj7uKTUC+yp0w6if7Odp414P zjT/1VFq9MzVcLHLBA7HWpggyaxsiBg8yxXm+IEQSnUA8pTa00UyfCAKcJ8KHDOmUfcoaE bejnHkIRoJJhx8hESD3xbtxkas10bOtAAGHrqzwVt9pSqGFzK2jXx3dfaaylEd3lt+SZ8y 2Z9nQuv+1RuTzVGCPGSb/HSwXuWYKNT6dL9BDbuNU2BKavORBG6iEwcJ7+P+4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQ080WfzmxQupCyrr6aR10smpDN5SrBZeVp5T3MFD0E=; b=ErZH5lNF5jA10KA5ops50g++elggK2Iv1BQHrON22WCOnokcHTVrRQPFoTKp1nInfGiYgu raJo91DHaQ4cT04sNe1pZF4B9Zjw2w1kFjsZ17D0T1v3jwSgta9CY+VDxOpmw+0M9Nmk3U ZHC+3Sfnm5dbBDI+gp/tAK/F0UxXHgIgfQ83VLKQWBQmQLe7jOQoIxhm6h6GRX3Wf9rt0X Xo6s7Tw0Py8vNrwZcq41SDmKM2B3EdNxBvm2/2wYY3vTj5fIGmP5Wl3qGYEhLpq3CYt4dJ gh34XnELJM7CXWr+IASZQm00VZPvGWmqMjZ+7KNux3ZC/7nJpCASY/8XT8bT7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671512; a=rsa-sha256; cv=none; b=WQ5KEWoI2JKLnVjX/YsJIDt/WfSEy2Do9FrDcPRFhERqUViv9afwX6B4ui/zhfGSTY/S+3 R/PGLV//LflmfYEWyGcTvbEjQvC+H7cOmywfNBC2ZE9iLcScvsyGPlBktiL8s08Zwli1CL 53gqUH0WL2S+bkzo08wuNHRjLfGkmSApOb7Q7LcaOtKqUiu27cGP8N2J2qyJnconwlc1yC 4oeYecUoAO09Cgd8DW1q4JDKci50IY2Wvv63eDzI6bCIBcKlKfMXDLyDcAizIsuX3xTrd7 /wiHbnYDDrby6L2SUzPnQykKxQo3cq/PX76HH08G3Xty0rtIyUnw9w+zQJmAVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m82tRZzf9Q; Mon, 30 Sep 2024 04:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jCWf086359; Mon, 30 Sep 2024 04:45:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jCfF086356; Mon, 30 Sep 2024 04:45:12 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:12 GMT Message-Id: <202409300445.48U4jCfF086356@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: a0c4498478f9 - stable/14 - pf: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a0c4498478f92f76e2d06a1d2ba49806156264e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a0c4498478f92f76e2d06a1d2ba49806156264e3 commit a0c4498478f92f76e2d06a1d2ba49806156264e3 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:16 +0000 pf: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 5b00557330b3b69db84969e33f2e201288208dd9) --- sys/netpfil/pf/pf_ioctl.c | 32 -------------------------------- sys/netpfil/pf/pf_syncookies.c | 3 --- 2 files changed, 35 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 04369a1aa9bb..6cb7bc95df2b 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2670,9 +2670,6 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td /* Copy the request in */ packed = malloc(nv->len, M_NVLIST, M_WAITOK); - if (packed == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, packed, nv->len); if (error) ERROUT(error); @@ -2750,9 +2747,6 @@ DIOCGETETHRULES_error: ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -2850,9 +2844,6 @@ DIOCGETETHRULE_error: ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -2883,8 +2874,6 @@ DIOCGETETHRULE_error: } rule = malloc(sizeof(*rule), M_PFRULE, M_WAITOK); - if (rule == NULL) - ERROUT(ENOMEM); rule->timestamp = NULL; error = pf_nveth_rule_to_keth_rule(nvl, rule); @@ -2983,9 +2972,6 @@ DIOCADDETHRULE_error: ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -3061,9 +3047,6 @@ DIOCGETETHRULESETS_error: ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -3333,9 +3316,6 @@ DIOCADDRULENV_error: /* Copy the request in */ nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -6132,9 +6112,6 @@ pf_keepcounters(struct pfioc_nv *nv) ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -6258,9 +6235,6 @@ pf_killstates_nv(struct pfioc_nv *nv) ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -6316,9 +6290,6 @@ pf_clearstates_nv(struct pfioc_nv *nv) ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); @@ -6375,9 +6346,6 @@ pf_getstate(struct pfioc_nv *nv) ERROUT(ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - ERROUT(ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index c5ee64c6aed0..538ab1dfd94c 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -201,9 +201,6 @@ pf_set_syncookies(struct pfioc_nv *nv) return (ENOMEM); nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); - if (nvlpacked == NULL) - return (ENOMEM); - error = copyin(nv->data, nvlpacked, nv->len); if (error) ERROUT(error); From nobody Mon Sep 30 04:45:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mB4TCMz5Xjv0; Mon, 30 Sep 2024 04:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m94bjNz4Dxr; Mon, 30 Sep 2024 04:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AuKNa0AGM5MlWxL1xCA2Gq4+WbhkNYbcFhyTmAz7HNg=; b=YBT0Nrwj5LZpca+6mhP8FhpP5jNcbCd767U14k3y1IMTZLcOika8gi6NELku2+3SGClHEn hRUInJVLdLL6b0ydbW682i8uE+4MshCxUHzArYQFkBVHHVczJawd0TVsYFafLSVWF/U+DN esa7Wx8yMhlkZNrtduncBtD3crOXOCHAcggpEBkwff9C8akz6i9GXtG56J0N/mRIkzxIJ2 W+5vaj9M3NcXFlsng3+xjPWgSYhScSP5SmOpjLEa38zvg+nn8SgVZTy1FSLKpv28MPfiGU 16IBr2k1v9rKXRSu+TE9Y4WOjre/hVuvs1QImEQfu79lAjGoP+1lx42rc8+VVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AuKNa0AGM5MlWxL1xCA2Gq4+WbhkNYbcFhyTmAz7HNg=; b=m7hwHyTQ60EKBj2EylDXwFFzleWGQuBacLHNF49yXBeiB/jm/53XTN8DeQ2HIdwpI89eis u1d14Vldc+qnvPEbqHHnJ2rJepvaeFECOdzLyed3/uyYVmTbpDfZrIrH4yG9j8ZuDxItrh M26N1LRke5PYolvVCgP/3YUbjlmE68UOsPLre0eI/e5cZoMKVTyoHiBDf7muz8biwNFIsQ GlUftjjgPsdyiGa5nIg7IC1xDdnNr2h4S20lQRjbdUiP401sDp+4GKAjT7Qb0s0vad4SqM WrBOE6bhhrZ0ozDX3HLrP9WKSAwSRMhW2NPZbDwxTchXB+UT+NZRAL5dD1BR4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671513; a=rsa-sha256; cv=none; b=JMjBsMs7C+9ZrmA+xyYs51VPm4mpeZHKdbCEiUeqBtNoLFwQ+7omR7saiKetoSq4SnRi0U aOjusUuw0efgnlvrIFFNfEzKr8NLtCS0JUO4Bv79yJZzm6NPnnZHQCoUpk/Sc7oABeWI/v A9COFbM4FJEs/VnoyebQ87cr7aGLsZskvV5kVkgXZhwSqjHstcPlJRs0H9K9cXMzITZNVt Oa0xZAqNTVU8f6ec0LnVMfcgUx5Eij9ozTWmu3dCBashAPy6nLy9lpiOh+KG1Eh9mCHiqI EkLeKiNWUEXTTSm2dJqPYq3sNx6hK6I6b/p+x87NPtbF/rzfeVBabDBUtCLKfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7m942JBzfFq; Mon, 30 Sep 2024 04:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jDqN086414; Mon, 30 Sep 2024 04:45:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jDgI086411; Mon, 30 Sep 2024 04:45:13 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:13 GMT Message-Id: <202409300445.48U4jDgI086411@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: ce708880847c - stable/14 - netsmb: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce708880847cb8d87ac0d7499fdb6f08cc33a7f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ce708880847cb8d87ac0d7499fdb6f08cc33a7f8 commit ce708880847cb8d87ac0d7499fdb6f08cc33a7f8 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:16 +0000 netsmb: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6e50988cf822f87a524b8da2fdc35b234078cc2f) --- sys/netsmb/smb_rq.c | 4 ---- sys/netsmb/smb_subr.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c index 71f6e221ace9..0170514f52ce 100644 --- a/sys/netsmb/smb_rq.c +++ b/sys/netsmb/smb_rq.c @@ -65,8 +65,6 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred, int error; rqp = malloc(sizeof(*rqp), M_SMBRQ, M_WAITOK); - if (rqp == NULL) - return ENOMEM; error = smb_rq_init(rqp, layer, cmd, scred); rqp->sr_flags |= SMBR_ALLOCED; if (error) { @@ -377,8 +375,6 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred, int error; t2p = malloc(sizeof(*t2p), M_SMBRQ, M_WAITOK); - if (t2p == NULL) - return ENOMEM; error = smb_t2_init(t2p, layer, setup, scred); t2p->t2_flags |= SMBT2_ALLOCED; if (error) { diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c index 8094f9593957..73961f7a8c81 100644 --- a/sys/netsmb/smb_subr.c +++ b/sys/netsmb/smb_subr.c @@ -150,8 +150,6 @@ smb_memdup(const void *umem, int len) if (len > 8 * 1024) return NULL; p = malloc(len, M_SMBSTR, M_WAITOK); - if (p == NULL) - return NULL; bcopy(umem, p, len); return p; } From nobody Mon Sep 30 04:45:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mC1Cd6z5XjpL; Mon, 30 Sep 2024 04:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mB5dxTz4Dw7; Mon, 30 Sep 2024 04:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTAdvOqcQEjZFF1eahVyNuAheQvXWC+DH9WPauDc45E=; b=nPeJom4VAfD4hirO5QJOnsRvR5MAY9s/Gxh+v59gSJYpO+X/2KmqRN3fahzL4fITzlywIM nUZMbUVWPyjGIvZ1lVzpjj2g7OJeOnP+/wiYIbiYrvUElLoGnDLE5gynVkNOODaiyi8qWp 54KtumEelzluRn/rQoDMbLpWa+Uv1tzN6S6D0GaBFdQ4HA7fgQ9z66XJi86PdHugc1c0Zf vBOA6k83ESGg8PPQGHFj1WaZAS662oZqre0j+aDLTcZyknh/XgaTXBiN4z2Wv82sYCWg2G D7gsrV7NisgPYBw7RwcjJZM4taXc/sYyl0q9CyIcj/apXPq1Mt14cDhELAputw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTAdvOqcQEjZFF1eahVyNuAheQvXWC+DH9WPauDc45E=; b=Ky/ylhvxyGbMXcglYEq9zP7LBfqr1DW1Y2b1qx2G/IuvJxmioVIWw+HKj9p6W6Qpa4IgbP vKW76HLM3j0IYlYffuPVYLeI/kT8svLqem6yiYU8xv8fMr5c52tJtBooDcuy3xaW7n8oY3 wFRhrd7/D+DXjsceyUgMJB9siyFF5xeMB5whN3yumqUdW6abjYBiJdym1xzUiSEys+DSbd z9Xes4wHPLS5wXMyplnRBXnpqqD4FqmkUst673SAWsSTO45JtJ90zrF/BF1hWIg4ALAJa1 8Y6a1ILYoZyodTWUPTCiIlaNxp4Pd4+Q3X/MNyA47DLpPOOcfc+ZiAKXkxzK6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671514; a=rsa-sha256; cv=none; b=yJRSc5KzvQ1EvHse1WtD5og6KS7ue7y2OhmSCXtViZlS9I3RIZI7NlBWyunAa2Qt0S4vK2 jtPvbHw7TgL6YT7SD8Q9l6VCKPXR6qyewoOPhwXG2QjrTDnMd6xDyfquz/OKtSFgCbPb03 J6jMnka/ehiXbnodqyUulybFcEtCw7cylq9M0IuK1Pf6TqNGpFl5F1fLO3COAfuTMXOwnm d1RWyFa8pYk8PVVfwg4cQpY9MTV78j5Rz9yq6yh3uturHH9FBHO860xT4ekG62t24r5YCb sReVdluAR8dwR29n043fkMDmnohhwCiPfxcizZIlss3W7gsNnlh4DbxkhjrlFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mB53rPzf9R; Mon, 30 Sep 2024 04:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jEhd086468; Mon, 30 Sep 2024 04:45:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jEKk086465; Mon, 30 Sep 2024 04:45:14 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:14 GMT Message-Id: <202409300445.48U4jEKk086465@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: 3d5e539b1f43 - stable/14 - xdr: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3d5e539b1f43dec0abd2df61cb958550ef9606a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3d5e539b1f43dec0abd2df61cb958550ef9606a0 commit 3d5e539b1f43dec0abd2df61cb958550ef9606a0 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:16 +0000 xdr: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 7a720bf67d73ba565a0a1130065f798870eb5faa) --- sys/xdr/xdr_sizeof.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/xdr/xdr_sizeof.c b/sys/xdr/xdr_sizeof.c index 6491fa80dce1..fc341dcaa9df 100644 --- a/sys/xdr/xdr_sizeof.c +++ b/sys/xdr/xdr_sizeof.c @@ -95,10 +95,7 @@ x_inline(XDR *xdrs, u_int len) /* Free the earlier space and allocate new area */ if (xdrs->x_private) free(xdrs->x_private, M_RPC); - if ((xdrs->x_private = (caddr_t) malloc(len, M_RPC, M_WAITOK)) == NULL) { - xdrs->x_base = 0; - return (NULL); - } + xdrs->x_private = malloc(len, M_RPC, M_WAITOK); xdrs->x_base = (caddr_t)(uintptr_t) len; xdrs->x_handy += len; return ((int32_t *) xdrs->x_private); From nobody Mon Sep 30 04:45:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mD1LtHz5Xk0h; Mon, 30 Sep 2024 04:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mC6PNHz4DnR; Mon, 30 Sep 2024 04:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaGOyWuC+VvPfxJ8z/rSshaS5Qo5084pIuzbJE1ZWUw=; b=G3q+iJ7BKnWd4MGANGnbeebcns0HeJRNnggv5TRLHj1zIUfdNyoOWYOGCQBUTfW2hfnQB/ fevMD2zTbzM1wDptd9fJ9qiAvzH0mZVe83rkyINi4ZJFZw28vQbMRDfIOaYFmkVU7oH4yg +lt5Qla9I6MMVdvbCLTm/C/Dy4B/zEeK84JXV2nvL0oqffBEhKy1hrv5gXJcCibf5ijEdC XZzTWF+MzkBxydI0zIBwqO/tUpKcZ6kBqUWRzYbVhHUDsq1EhmJrGpMgrvOyPIefAHSoNk sa4QOeZGN/pjC39g/QsveK/6gCxjinWZ4KyxoQfHgll8e0hmSuRA5EDrRFc+Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaGOyWuC+VvPfxJ8z/rSshaS5Qo5084pIuzbJE1ZWUw=; b=kLaRao2E++1J0ROdmaFueXl4FggLziH/vteSFwMDvv92nKNSieaSrg1Swn2HGEL2Puksm8 LU2n7L/psSzKl7XlTUCvcomgp/l2ArGhWGj4zlaU/1OT8Z/agXI+h1j9E44OLzA+DWpFQW 4t44AuIB5qnzSwEbIk3L+YA4HARSO6ZwxfCkv7fa/w0+Bv3xtjRcjrehZBuFLoQm9Xpa+Z jHmahAUj32zCbnvYfDMc1Rk8llnzlT2VdlXLc/uSfSSWkNtR01PbWtz2ANmNL3KiXNh56b ZeFxPGeJu5OlbU4vubw7jRkbT2OYyKDeRiK1x5y0bWY31UownSH1SFE/l46Dzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671515; a=rsa-sha256; cv=none; b=RY7SO6vir9DMbjFooYxhBj/XHw+BMWwPiKa21Q72FmWL0ZZ5rlxbZnXQ1F6qVWGal1Dooy lwzUO5/16tm+ra5lf/NkWLszGki+MaqkGuVstGR5u4XOSypAtdQgT1LstjB2AkCsmHipJv ZFDJqwTJH2q+hsjHOTyP6U3OY+iiVJuvhjKOKkruZPsYEwqYkA2Dm0lVbdp8GHod6FPd3m rfgTiKXc7s5sBp1YD3vEoSWbOaIULlbQNlT+ja4ndfa3vTuKkFE5DrtP55yTUEF1XdEURs KBcFzmC3MWrz4T/4JT6F3Ek3S7igaR//KZXJjM5vjnMcFiwPEzZx3ibVApmtBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mC5n6zzfFr; Mon, 30 Sep 2024 04:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jFjD086520; Mon, 30 Sep 2024 04:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jFNc086517; Mon, 30 Sep 2024 04:45:15 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:15 GMT Message-Id: <202409300445.48U4jFNc086517@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: 7bea79c1ab40 - stable/14 - LinuxKPI: 802.11: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7bea79c1ab400fc223d730a89af97dcf4ba09911 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7bea79c1ab400fc223d730a89af97dcf4ba09911 commit 7bea79c1ab400fc223d730a89af97dcf4ba09911 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:17 +0000 LinuxKPI: 802.11: Stop checking for failures from malloc(M_WAITOK) As a consequence lkpi_ieee80211_ifalloc() now does not fail. Remove unneeded NULL check. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 7bcb1228558b4325fab39616e2e3b2573a9e7da6) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a4b5545e0c3c..34e40b961bed 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4402,8 +4402,6 @@ lkpi_ieee80211_ifalloc(void) struct ieee80211com *ic; ic = malloc(sizeof(*ic), M_LKPI80211, M_WAITOK | M_ZERO); - if (ic == NULL) - return (NULL); /* Setting these happens later when we have device information. */ ic->ic_softc = NULL; @@ -4455,10 +4453,6 @@ linuxkpi_ieee80211_alloc_hw(size_t priv_len, const struct ieee80211_ops *ops) /* BSD Specific. */ lhw->ic = lkpi_ieee80211_ifalloc(); - if (lhw->ic == NULL) { - ieee80211_free_hw(hw); - return (NULL); - } IMPROVE(); From nobody Mon Sep 30 04:45:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mF0tyFz5XkKS; Mon, 30 Sep 2024 04:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mF07Jsz4DqF; Mon, 30 Sep 2024 04:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tnNLtjoYcteizefa7Pz3Fg338x97AClLe09A7N+g740=; b=GpsO3lAaUXmZEUTe1/DeDraYWiYgtdhhW01Xy5O984CvYWt5fPpGN95XU90oqfenucqV+4 XfuIp3UiRHdJ7Bb8VT8+ek5nnppZgVJ/EkWtA91t+2o5c65AhWGXO5uBlZ6QX+pZ1ccrzs Wd3Sj3dnJr+HyOG3khXxuknSchPgJB+VT2+l+VonI9eT9mhpA0DXLkCUKp/hdWHyshfOwV xbkSneMWUbY4pq+6omvaQi8xv/Aa7CAnNJqG0s2n+AEUoZJrBxUQM4vqmANyHvZzZ5zT20 ioLIbDPFq0t1le4MnpXSetkbNIuW/LIQXYPBmKUMtCzHTnO9ZPIlBZK6xjCyug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tnNLtjoYcteizefa7Pz3Fg338x97AClLe09A7N+g740=; b=Y9mVbeGXzxxzpThyLYBxFRN/cmvm6YgSncN8tKc/2JZGfLui3ukWF/jemAvLhu5QbFCWJ+ AJ4UUDKH3QQuRERbIS/3zbo0ws/hnQ5zc3R0hmoBj57sU8kR5yaBcUM4sCBTMdDhpqWyen 4/iZ+Iv3aClkqlhKp8YhALXPAyYKkojZsBiuQU1GYT6bQ+JW9+LlM1Zh2bXXESkNAr3dY8 kPsVVvGXdh0ojwVXhjySafoTSZGHp/9otoLodp8bdZ6Eg+mn6cRMROORpynfgRBSRX9tBP kZzZelirn0hWU8xE7YYyioosAlv/jr/JXRYVWQMmnmi2PCP7rck/iDUc6bxcdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671517; a=rsa-sha256; cv=none; b=Z2+kAKZskad+HjXSVB6AC1u9g/ZGxB9p81fSttRrJAWuPckEjKV1LNDa/ZWgT+w9j5O35c CeGRoheTpS+hoAeRo+eqTt7ntlUsEgQpceGdPHeVVAlXg6TVRnpI363a3Yx1Y6FHB44smL pEMls5HWlmnVa12TgyxI8SAHcvWg7+I0jhhyNu1KQpLYDum7zr9XvbcJBI65PpEgp6kojB UvpjrfwqIuiDyKbggSQfWZ+wGs/vRJUn0Mg5AOGIE+d8OlBx/pEwjbcF68/m+jdRTWiY3g v8CLr90FxCuZI+0Rv0MW5cxBN1L83NKhWyKDY44+BVZ3mIxb6bCA22x6+2+MWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mD6lPLzfcy; Mon, 30 Sep 2024 04:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jGKI086568; Mon, 30 Sep 2024 04:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jGmX086565; Mon, 30 Sep 2024 04:45:16 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:16 GMT Message-Id: <202409300445.48U4jGmX086565@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: 905d5420ee1e - stable/14 - krping: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 905d5420ee1eced55f99ab3ba5c340b685f2f896 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=905d5420ee1eced55f99ab3ba5c340b685f2f896 commit 905d5420ee1eced55f99ab3ba5c340b685f2f896 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:17 +0000 krping: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 66c35a6675ff987b52a2018871231658b1980a6c) --- sys/contrib/rdma/krping/krping_dev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/contrib/rdma/krping/krping_dev.c b/sys/contrib/rdma/krping/krping_dev.c index eea3c772ea4f..59aa19672443 100644 --- a/sys/contrib/rdma/krping/krping_dev.c +++ b/sys/contrib/rdma/krping/krping_dev.c @@ -174,12 +174,7 @@ krping_write(struct cdev *dev, struct uio *uio, int ioflag) char *cp; krping_t *krpingmsg; - krpingmsg = malloc(sizeof *krpingmsg, M_DEVBUF, M_WAITOK|M_ZERO); - if (!krpingmsg) { - uprintf("Could not malloc mem!\n"); - return ENOMEM; - } - + krpingmsg = malloc(sizeof *krpingmsg, M_DEVBUF, M_WAITOK | M_ZERO); cp = krpingmsg->msg; while (uio->uio_resid) { amt = MIN(uio->uio_resid, remain); From nobody Mon Sep 30 04:45:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mG2dYJz5XkGw; Mon, 30 Sep 2024 04:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mG1H8Gz4F2C; Mon, 30 Sep 2024 04:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/NmM3ibfGmUWdwQn2vDt/S85DLdoksQCO8kZ3DEho4=; b=NFo3Le9EsRIGo8CHdfAUzK9T6ensh28Ha+Pqj7y8rLc+hvl/11gQ9Te3c2VLjXSvRaLFdx OyOS6KpJAc5a/HpQetqvP0ubI5hElyhHQmuftl7Hy6ReOf47XJ9H6F6jeJa58bxK5bjIQa 4audE8zpip6ldo4+Cp7ElU6bD8+fGVeJfo5ed5eCHL4iOJk4+ZJLcxh6hZgQOHPyBC4eC+ aoNywD/dHqOuA3Oo+4tFAynbLLY8UqeVDeeqv83u9Px+sQsQ1kAm9pV2NXTKQJd3bpI0hc vuoVHVok6bpgiz79NJTIOK4Y+APU3Axu9whs3WTMBEhEIsh1rMPMEj/l8xyXAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/NmM3ibfGmUWdwQn2vDt/S85DLdoksQCO8kZ3DEho4=; b=gS6IQ968SIzlXfeccLrSBNBXvZxPZ4uLTA7xnX/BtSwPrauGypkaaIvmxA6cYah1SnP85x futjld593hdqMyANCC4UfYIUm7AIiaPRWG4ARPGWEVg/RdSpUipVn8FT6iudVlxsCfrFbN eg2cu06Bxe9i3lqFMUgswmBP2Z81P979Pz0u325JfXdz22N2kY/EOOn4ygQ8nfD0uuAJpV PJqhn1Uejhf+ThTDV40Cg+pX1IQbwMjb+fF7tES4YZsD1XJJCuPG+bUULtsA4/fj5nG0hY VlDzJkBeH5cib72YtrXDsQJiF+7CjUBKBSvkeblqQFMDK8gt4ql+baHqrnVx9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671518; a=rsa-sha256; cv=none; b=xLp6+VfmPWKkBIVUXr8KkjoT6CwM4QlQt4IfTp3XBkv4mUgDohJCKG9gXhhaNeK3H623tH FZb71meVI8XlKcXq8tFCYVzEf0MshsCrhv0dHJsk4HP+2fQolneyTJXzFzsTwPSrPmujjf ERoX2I3eRZBhp7mlc//lkitlw9e2PCo8E6UudtFfAwmhpae0+awg4kiV8QJWmYSP2gccqi IOMs31ySc0bvk4pGeQQBwD69o5bihn9poRzx/PsIu9vW1JC3pFSnS3JuDzj99OfzB/fmQS T90KdUs02evc1uwQ8hLew9OSNzT/Z7IBnpQF79+x+K8+9JIuSVbJbSlUjB1r+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mG0SdKzf2C; Mon, 30 Sep 2024 04:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jHFM086622; Mon, 30 Sep 2024 04:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jHK1086619; Mon, 30 Sep 2024 04:45:17 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:17 GMT Message-Id: <202409300445.48U4jHK1086619@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: 6a0ed6fe27ec - stable/14 - tests: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a0ed6fe27ecd9f9b51a6c29bc15f5dbf2ab6c4a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0ed6fe27ecd9f9b51a6c29bc15f5dbf2ab6c4a commit 6a0ed6fe27ecd9f9b51a6c29bc15f5dbf2ab6c4a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:18 +0000 tests: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit aac6c41d4ba9b0a1aef561f6c4bfd284ab369ebf) --- sys/tests/framework/kern_testfrwk.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/tests/framework/kern_testfrwk.c b/sys/tests/framework/kern_testfrwk.c index 19714fa76f52..c6b46542a205 100644 --- a/sys/tests/framework/kern_testfrwk.c +++ b/sys/tests/framework/kern_testfrwk.c @@ -192,10 +192,6 @@ kerntest_execute(SYSCTL_HANDLER_ARGS) } /* Grab some memory */ kte = malloc(sizeof(struct kern_test_entry), M_KTFRWK, M_WAITOK); - if (kte == NULL) { - error = ENOMEM; - goto out; - } KTFRWK_LOCK(); TAILQ_FOREACH(li, &kfrwk.kfrwk_testlist, next) { if (strcmp(li->name, kt.name) == 0) { @@ -244,10 +240,6 @@ kern_testframework_register(const char *name, kerntfunc func) return (E2BIG); } te = malloc(sizeof(struct kern_test_list), M_KTFRWK, M_WAITOK); - if (te == NULL) { - error = ENOMEM; - goto out; - } KTFRWK_LOCK(); /* First does it already exist? */ TAILQ_FOREACH(li, &kfrwk.kfrwk_testlist, next) { From nobody Mon Sep 30 04:45:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mJ5j0Mz5XkH0; Mon, 30 Sep 2024 04:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mJ36Svz4F8n; Mon, 30 Sep 2024 04:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdTlxEcuMQT6anedAKrWIyqgKYKOJgRJ9neXnV9P1kE=; b=wwDnSFFnIe7TM5tzTnDTJcTDAJoqeVLmOP/fReVuKQwLd1njYpErq5rwcVE2tMryeea6/e ckyFuzDJJQowfS08NpWu9ZCQ9msoz13b+RayDks+XZZIv9V3kiJfEGsBORnNmpNuf0BVzw N42uP6zQ1sq/SpYBgphN668Iec2/Z4cV/1aDIAr50KfxCB+P3gG9KulGYIteQbE5R0JST0 wKkzS2HI87ASvd5Zn3eh0BG5jwTkAYeiPBwepkRQb1jeM97KVYdfeHumxvipCycoMFeJDL 9/IIWG7fu0Zx78Z30raPJ+m41b57ySJn2nCF9gOYosvnngnmuJIB4PfDloAzVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdTlxEcuMQT6anedAKrWIyqgKYKOJgRJ9neXnV9P1kE=; b=rnLbR6QPpgBMdIo1zjLzIdMDyE25inWO0n2xiFJQqLtcHz2vjU3IA5svfc3jpONnF0BQA6 ZqKdluXQb46n6q4vM2JE/6GWvtugc/MHdSlvI2rkCa1/XFK/MgONrLVehKyTDkrtOy2198 JPEOx7ONH1dv5GagGh95q/5FIOyM2GXhD27OpPbboKiLKWdJWNqaRPHXLjbKnSeklJt6xl 1SRurMNzD5h7KFSW5z6nK9ZTCit84QUidbzGnxz73lnzEhQhFtx3llekydTfxbbaObnQeu 5mMAPyreLoBWtLjL5AeEjdNRtY5zqdGOGP6BDyDCw0VxsiC0jG5dpctPm3LOEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671520; a=rsa-sha256; cv=none; b=soIvRFKcSUtJ++sBgolzO723JWwMcp2avlYx2obndUkfWfE0Z2GivfzB9xF8ApAxqW4yKd MImhoFXcqADKfqHu0Fy4IVXvUByGYWVAdLWOZibGu3tALez/4nAAht98sZrNshfDNGhkWP 1JrSCyRBPhzgO0FlqJkN20C/QfFDKeFnUjTQsFHMNu31CGs5TVZpRPJz98rLkJFJeO7HDZ iIBQi1bxUUzmpJiGGYb3cShuDrRWY24a/jk6aJV3Dwu6Idh3Y50iKNt24dU+rEVpsGu7xv /Aaw7BSfm9bH90yDBzHPsFfdd7KRn9N0S7FsET1cY+sfFc35vNFRkP0Q4yBnRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mJ2LZMzfFs; Mon, 30 Sep 2024 04:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jK6H086725; Mon, 30 Sep 2024 04:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jKtC086722; Mon, 30 Sep 2024 04:45:20 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:20 GMT Message-Id: <202409300445.48U4jKtC086722@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: 53b79271160c - stable/14 - cmn600: Stop checking for failures from malloc/mallocarray(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53b79271160c36fc060c819a8e34dab86dd00df3 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=53b79271160c36fc060c819a8e34dab86dd00df3 commit 53b79271160c36fc060c819a8e34dab86dd00df3 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:18 +0000 cmn600: Stop checking for failures from malloc/mallocarray(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 1d321c1907c210a33192ff5293f5c23554c96867) --- sys/arm64/arm64/cmn600.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c index 7079907e63ce..976c272cc869 100644 --- a/sys/arm64/arm64/cmn600.c +++ b/sys/arm64/arm64/cmn600.c @@ -332,9 +332,6 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset, int i; node = malloc(sizeof(struct cmn600_node), M_DEVBUF, M_WAITOK); - if (node == NULL) - return (NULL); - node->sc = sc; node->nd_offset = node_offset; node->nd_parent = parent; @@ -399,8 +396,6 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset, node->nd_children = (struct cmn600_node **)mallocarray( node->nd_child_count, sizeof(struct cmn600_node *), M_DEVBUF, M_WAITOK); - if (node->nd_children == NULL) - goto FAIL; for (i = 0; i < node->nd_child_count; i++) { val = node->nd_read8(node, child_offset + (i * 8)); node->nd_children[i] = cmn600_create_node(sc, val & @@ -420,9 +415,6 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset, break; } return (node); -FAIL: - free(node, M_DEVBUF); - return (NULL); } static void From nobody Mon Sep 30 04:45:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mH48Fjz5XjxG; Mon, 30 Sep 2024 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mH1qGhz4DtV; Mon, 30 Sep 2024 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQtfHmwQjGXmbcnjINCzFaVXy1L2jjSFqVGExZcjQas=; b=OTnWf8tLfrui59a/zaiaECGzZLn/0mHTvCSH76MzFMyGRBjsUcWUGHFO/bx57bRf3XlM+g IJvqtzxrqwhjIeZ3AZZaS/wtL+EBh0oPPhF/DxuI+OywAzPGxKWn6SXL8aolvyIHCOLAoT aTMObKkV5o6liwvA/TZCNIsFhKj0MwpPPJhFxb9qP022pDnhBZpIpibcv7Kq2+8Hy74xRx CUFclFyRF39k9vX0Rxx6U7Q++IJwmD/V87hbmWHDVRFh3GYAclEqIy8lz9SaGIVCqy0Gso +mT9S2vcxFOZZLsLH//0C1A0PtXEHPp7ptfZsW9N2seC8sBuTxth3Be7Bd+4jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQtfHmwQjGXmbcnjINCzFaVXy1L2jjSFqVGExZcjQas=; b=VV62QCTbdnTHDRQivBCd2j/bxcxnjWv4C/ovmBi78zhosDU9LI4AwmG97lRsaxDRWRjDLM f9y+5vRfP8zlZUpZflU79soa4mUsbNgklJdC/NjRsTc+4h9S0YckofFQXpIfTjlK1n7MHI FlBj/RGqJpsE4UOkUlRrtNhnu22iFinLwBbaFIZ91NX4In/q3w3ukue1NJHuTz/NcVY/ye hlbG+nWJkwiUOYnkZfmZ1ouD9+Ai9T/kakoGPFd3lirln4a5Tv0c2bxv2oWW4yDVu4tDqO hmDPAL0NCl04CYHLdfNso2Uzg2eUw2WSYtrLPeNB1woiNI3EjMFGFEd+BYIWng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671519; a=rsa-sha256; cv=none; b=fenQajGB9eedycAjiodAb7gP00xlE1PX+RWhSpZlL4BYxVodX1Zy+r7RKxVnTlqQzp8pt6 cJjC4zmtb+w/tI71I4WtlgiefxQ+cCwvPIs4JguOnUrq/sIOkkHafrOu3/DlJIGHyL5jg2 r10TGwVfoHSzPpgarN0V/k7vOnM6FOJT5i/CRlA9gOcjoBYVWkM8SynbusVSjW7rfH4gVK TWE5J+z3E70swoj98WyGS5z4r57tprCYvoZ+ek6Vg3lL1vqliyQxR8CX/wR5TuVx+inzld Jc39zl0kxUkNwFbAFoJeTZknmRfnbjDyjI1/iE9qnTsaMQ5GPcCkgCLxdxbVrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mH1HsNzf2D; Mon, 30 Sep 2024 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jJTv086677; Mon, 30 Sep 2024 04:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jJ4U086674; Mon, 30 Sep 2024 04:45:19 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:19 GMT Message-Id: <202409300445.48U4jJ4U086674@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: 920288c32900 - stable/14 - arm ti: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 920288c32900da48136eafc41aa6d020552e36e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=920288c32900da48136eafc41aa6d020552e36e5 commit 920288c32900da48136eafc41aa6d020552e36e5 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:18 +0000 arm ti: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit fe6985ef87e1aedf8e5c9b3b959c7dd54a03e2fe) --- sys/arm/ti/ti_pruss.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c index 378c892c95ec..b6895a8a9cef 100644 --- a/sys/arm/ti/ti_pruss.c +++ b/sys/arm/ti/ti_pruss.c @@ -184,9 +184,6 @@ ti_pruss_irq_open(struct cdev *dev, int oflags, int devtype, struct thread *td) sc = dev->si_drv1; irqs = malloc(sizeof(struct ctl), M_DEVBUF, M_WAITOK); - if (!irqs) - return (ENOMEM); - irqs->cnt = sc->tstamps.ctl.cnt; irqs->idx = sc->tstamps.ctl.idx; From nobody Mon Sep 30 04:45:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mM0zlXz5Xk2d; Mon, 30 Sep 2024 04:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mL560Hz4F0d; Mon, 30 Sep 2024 04:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMMStybdZi6WPZctxlo20/zwWy8eKcJGSjWmE4PlsNw=; b=vnbULDfcfLDlg6pW2HAzHl9OW5Fc487ojHZTOk/9dhNQGViMFpR0MpeHiypM3glCKOrFwq m/kbIzkufdFbe227vy64RXTZx4ZR/Oo5T8vhGTAw3Z6X9rv47WAN+NkAv2C6XmSj0qIDfz UDxapDtlh7c4rEVM2vqGtCP0hS3ImXfoDK4BQiLItySSyJe0kbDq/cta0nQl9jdIE7qv/o II4O20P8LV8L2lBm4pQhFnwUy7y98MkitwL1r6MEwXMyproapkry9OqougjLdt4ywuuO+z 7IIzvzAH5MXWArzretFrAJ0Mi3MF7YSetTi20+b18ZTa0+0YykgAmtMom8gH+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMMStybdZi6WPZctxlo20/zwWy8eKcJGSjWmE4PlsNw=; b=XkEEiOda7BIR2mVnK092S2bODXWG7EsY4Zkxfxw0sMhUIreVD8LDVqQuMDPWkP3hZsrY1a Iz3fMF6ThY+lqxn+6sMFeGCf/7o2919lhidOB+Jxc/KxHv51xOcDBeh8nKMxyn7lcN2fHJ CgRstqSeRWGhKE+smkZa+RarMZ+qZjzLa3DJYkyNkat0WQsvFRzsMmb8tQdpWM54VNkgom DlYu2p1+7kNxd1oiTb72HSNUQFoaP3Sc9fd8C8HBD6yM9DfHmPXa5Tfwn/I+uKciDWfmI5 IFjRBpOkxZodj3AheoJcBc8qBFe+nZAkC4HPcGWv35Xvh7t+ewitXJAkYIK2eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671522; a=rsa-sha256; cv=none; b=jUh3AslLFUuCpW1biCkV4seujmudad4xyt+8tkTTZPHVeB0Qmm9RqAgZ5p9gHyJhUqS1fc YgIB952fUH747wj6/vOH/A5TQKdjOnv2TR0gqZN8w6vg6imaJ2ah9+CjoWeKGK2lksa73X pXDFUoKKsvGYiqDE4u6iD0ntI2r8DJHRzhNqucCh3BhzzZMnsAFVVzsxvfkgzGLgGeXPgB KAH7iQ8T6/EW0C2CnAj10GtumDlK35kkIXvKCDCUbvTFkYKJZuIn8dAGWHDGAa9fb43sBT ikkXuOdDd71QdD8HvtnWpVvkXpD7gCbMYEhMn8uS9tThUnJ3PmOxiHMpNnUygA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mL4gC8zf2F; Mon, 30 Sep 2024 04:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jMQS086821; Mon, 30 Sep 2024 04:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jMSO086818; Mon, 30 Sep 2024 04:45:22 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:22 GMT Message-Id: <202409300445.48U4jMSO086818@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: 74887e322101 - stable/14 - al_eth: Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 74887e322101cbc9e531e3acd08a6eb10dd2169e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=74887e322101cbc9e531e3acd08a6eb10dd2169e commit 74887e322101cbc9e531e3acd08a6eb10dd2169e Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:19 +0000 al_eth: Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 00ae9c1be02e2db6ede1abd5b787bb9a3fbd76b0) --- sys/dev/al_eth/al_eth.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/dev/al_eth/al_eth.c b/sys/dev/al_eth/al_eth.c index baf47ac1d378..b4fbf041660b 100644 --- a/sys/dev/al_eth/al_eth.c +++ b/sys/dev/al_eth/al_eth.c @@ -2005,14 +2005,6 @@ al_eth_enable_msix(struct al_eth_adapter *adapter) adapter->msix_entries = malloc(msix_vecs*sizeof(*adapter->msix_entries), M_IFAL, M_ZERO | M_WAITOK); - - if (adapter->msix_entries == NULL) { - device_printf_dbg(adapter->dev, "failed to allocate" - " msix_entries %d\n", msix_vecs); - rc = ENOMEM; - goto exit; - } - /* management vector (GROUP_A) @2*/ adapter->msix_entries[AL_ETH_MGMT_IRQ_IDX].entry = 2; adapter->msix_entries[AL_ETH_MGMT_IRQ_IDX].vector = 0; @@ -2300,9 +2292,6 @@ al_eth_setup_tx_resources(struct al_eth_adapter *adapter, int qid) size = sizeof(struct al_eth_tx_buffer) * tx_ring->sw_count; tx_ring->tx_buffer_info = malloc(size, M_IFAL, M_ZERO | M_WAITOK); - if (tx_ring->tx_buffer_info == NULL) - return (ENOMEM); - tx_ring->descs_size = tx_ring->hw_count * sizeof(union al_udma_desc); q_params->size = tx_ring->hw_count; @@ -2325,10 +2314,6 @@ al_eth_setup_tx_resources(struct al_eth_adapter *adapter, int qid) mtx_init(&tx_ring->br_mtx, "AlRingMtx", NULL, MTX_DEF); tx_ring->br = buf_ring_alloc(AL_BR_SIZE, M_DEVBUF, M_WAITOK, &tx_ring->br_mtx); - if (tx_ring->br == NULL) { - device_printf(dev, "Critical Failure setting up buf ring\n"); - return (ENOMEM); - } /* Allocate taskqueues */ TASK_INIT(&tx_ring->enqueue_task, 0, al_eth_start_xmit, tx_ring); @@ -2477,9 +2462,6 @@ al_eth_setup_rx_resources(struct al_eth_adapter *adapter, unsigned int qid) size += 1; rx_ring->rx_buffer_info = malloc(size, M_IFAL, M_ZERO | M_WAITOK); - if (rx_ring->rx_buffer_info == NULL) - return (ENOMEM); - rx_ring->descs_size = rx_ring->hw_count * sizeof(union al_udma_desc); q_params->size = rx_ring->hw_count; From nobody Mon Sep 30 04:45:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mL4Jrkz5XkH1; Mon, 30 Sep 2024 04:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mL2Plfz4F73; Mon, 30 Sep 2024 04:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qOV3n55uSL1cUNuOU7bcbH7hufJIx3djyZfGHNVE5Cc=; b=iorsgez9JNYJta+6GpN1R+4u/BDodyd1cNi2lJbo7tqLCmMTtf2ISjbNf1XK2pAkqpyCM/ tDZFsqAuAxTnL1tlwmCqsCzJxYjO7d1De/XnD3qRMCwH2jw8pg038uiZ44gBbQoRDD8MsQ qwcNjpCuI+GCcnVstrI+bjj9KhkHpKKKgfdfsrZfMXbhe2RLZ1AgGeH95+O6bup5hzSHMB 7RFsq/Zxqs6GwMum0Pdj/HKt/NnYhxbd0+c7O3V/YkRL6dctR8AGxoUN0NP3xdvhHCV1nb FgN/9mSyb2eXFd1XCJ/9oSeipNFgNE2TDzNara2xPdbqxT/5+LG6C1SZE66flg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qOV3n55uSL1cUNuOU7bcbH7hufJIx3djyZfGHNVE5Cc=; b=jhhT4XFtMjy/qFnCEZ6pRrEwu6RROYqmEuAZG+pJXAKOGWg5q7RYY95jQWGlMkJiXB0juy L2LW0QLFD0ZVdr/ZPGmkSwuAxe5rY81ShPlduxAg+4nuZy/MQ6ZHjE2owSmFO2Wf8y+KWg eUqDonb/40iAw82D8vskRvwhJ5/oAfxnrDtqXEgNHjKSsB/7L3NlE9ymHhLhS0oU01Wqdl w5Iojv4kxif/hlQshBij/tgiPIQGDlZEiyF+zLYyRa0xSarh2R2f7At0e3LeZ4j90pnZ36 h1BZop+zpQs8MCu0HTRejIip/+lO9ek5jNjBqhJ5DiW/xUutG+QEjSmSYU9XOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671522; a=rsa-sha256; cv=none; b=h1NkGXHa1dF2DL55eBxebt+KupRg+Owag4Yj6zYNOsOR9JVYSkeCZk1st2cNxkR26NNlqg kUbpjD8V9wHy0aEpqjg1PF4QfPFisJJNQ/8Dk1gNRmBsWWhDKl+EhckOZfBgx6UNzjlKo2 IpoQz0qhX3YNhZ1kfxwPefMAenBLJeyN57oQhup4/DV+L7jpDIh7Tn+rHANUYJS9CJMznZ APjLxvh1aYNmTQlpXk96EemwoLD54V7Iga9z4dSz8PZXBNdvprx+yFtu8LVfvIk3NJk+k1 AFVKs3Zll7v2wla3uNzW4N4caQUcLJWR/tttRLx0M7utzs5Pv5NsZfO7exOp6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mK4TrNzdkT; Mon, 30 Sep 2024 04:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jLD4086773; Mon, 30 Sep 2024 04:45:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jL6a086770; Mon, 30 Sep 2024 04:45:21 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:21 GMT Message-Id: <202409300445.48U4jL6a086770@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: 49995f771b53 - stable/14 - smmu: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 49995f771b537064daeb2931ce86a13e78f9d977 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=49995f771b537064daeb2931ce86a13e78f9d977 commit 49995f771b537064daeb2931ce86a13e78f9d977 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:18 +0000 smmu: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit f75ceecad2157a0d3aca61a4893ab78f2dec21ee) --- sys/arm64/iommu/smmu.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 4e724f2fd53a..d09f33a9a49f 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -971,10 +971,6 @@ smmu_init_strtab_2lvl(struct smmu_softc *sc) sz = strtab->num_l1_entries * sizeof(struct l1_desc); strtab->l1 = malloc(sz, M_SMMU, M_WAITOK | M_ZERO); - if (strtab->l1 == NULL) { - contigfree(strtab->vaddr, l1size, M_SMMU); - return (ENOMEM); - } reg = STRTAB_BASE_CFG_FMT_2LVL; reg |= size << STRTAB_BASE_CFG_LOG2SIZE_S; From nobody Mon Sep 30 04:45:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mN41RPz5Xjv4; Mon, 30 Sep 2024 04:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mM6MlXz4F7g; Mon, 30 Sep 2024 04:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ln+Cyz3X/AptOaqzoWggl4SgekldK80KD0sjy77isk=; b=o4Sw4uxiAw8OmXV4yXem1SdQeZ3n+ac0iohPZZh9c22UVl68K6ZBkHLTL/cqUJDeWivhbT xiEXVqYhmhj+ZVoWHJLH+sAqt3UzMOYkGuA3Zr4ZqCSCZihkVsV4X/wNa1le1tm11xDB59 ltWroMWzE1fk5bkUQksgfGB6z9WHaGUebOYIRKLeY0XM+w/E1r31lDjn60ASoHnR6zha2V 0uUj978HldtUfTpnCr0PhjTQimkMlwdQ1r/raifd3vC41S5AoyZfIgwq2XEp+sakXxP/Ih svgWrU02RLh+mphAHOy40VnXZQMnNalYHNjsuXygZclODSeKEVxBFOWZ2Ke8Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ln+Cyz3X/AptOaqzoWggl4SgekldK80KD0sjy77isk=; b=QlWwzIhurTdKdpmSU8sguIFVJpFyOLHl66jBzNShWt9erWkKUI63Q6isVmkyru2WFUuG59 YKzmbpgLHXd8Y39u21DRYTBt4Y+YUuWRa6uOXMJVerd17U8E/bKjxz5YHiKURtzAmEI2wr MLBS9+DIxbnaHQ+odG6kfxs+d9ygAV1RPsl0Q/3kUzrXTsTE0nrbYXDEbVdOu59iRWmkt9 bo86KZfpwlwQGYgVmeB3rLHHumvSLTo8fOMV8zwAGSxUXldSAcegzwlg4FTTTXiOb6Nc9K kyqco24V4RbaoijHbqUc7E+d3/hfyqG+bUJrw+fstgarxddc6Xz3H/fwdfmmwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671523; a=rsa-sha256; cv=none; b=rqmY+yxkWiQuI2ZYP8QCCevANa1hQz0+5EhDC1ZUMm/eG5+ecMPMveh2FxqLm/69S1kB4m vuGNXGrXTtnu7eSAC8nUpLb2VQhuouSu+uJj93awV5GZTbb+qItXAoz2NCEPBZDusTZB1o YFNeMeI76tHq+ErDwk9wPPVeY6q9sg6McBocMCiOR8VpPxcODp9ODRIgIODpgPgKB9FB+E xwat61IklnQfurWJtOa423kD6Deqx4YWS6HPhqbSLZhdCzM1u+81cvMPoWWn7a5LNCQ077 Y5anxJdJV6yq2UrBhgx2YwLht0eJVo5/T+EjGFkH3ufZaEkadGhHLgEeFSxvJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mM5qkbzfFt; Mon, 30 Sep 2024 04:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jNVr086875; Mon, 30 Sep 2024 04:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jNBo086871; Mon, 30 Sep 2024 04:45:23 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:23 GMT Message-Id: <202409300445.48U4jNBo086871@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: 66bb507ccb1c - stable/14 - altera: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66bb507ccb1c9860662a921d231f591ec814d83f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=66bb507ccb1c9860662a921d231f591ec814d83f commit 66bb507ccb1c9860662a921d231f591ec814d83f Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:19 +0000 altera: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit e06e2c84074740a0087193d5929d09f1bc7e1c4b) --- sys/dev/altera/msgdma/msgdma.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/altera/msgdma/msgdma.c b/sys/dev/altera/msgdma/msgdma.c index bb35d7315b6c..c5c75a5fb5e1 100644 --- a/sys/dev/altera/msgdma/msgdma.c +++ b/sys/dev/altera/msgdma/msgdma.c @@ -356,11 +356,6 @@ msgdma_desc_alloc(struct msgdma_softc *sc, struct msgdma_channel *chan, /* Descriptors. */ chan->descs = malloc(nsegments * sizeof(struct msgdma_desc *), M_DEVBUF, (M_WAITOK | M_ZERO)); - if (chan->descs == NULL) { - device_printf(sc->dev, - "%s: Can't allocate memory.\n", __func__); - return (-1); - } chan->dma_map = malloc(nsegments * sizeof(bus_dmamap_t), M_DEVBUF, (M_WAITOK | M_ZERO)); chan->descs_phys = malloc(nsegments * sizeof(bus_dma_segment_t), From nobody Mon Sep 30 04:45:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mP4ZpMz5XkHB; Mon, 30 Sep 2024 04:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mP1Rdbz4FDS; Mon, 30 Sep 2024 04:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKy+IhVp4d0y/e53XdmuKoeMN3eiE8B6e7F8WmscERk=; b=IWxq4jvorRtF2mufVEE76DdmekwwJKNESXkJWqwc6nKkgHkGAXTS4XqAJ3ZUHbzxGcNurm 3hhgbYHmGnArp20zNSVbGddiyb6mlGiHdk3AkkfgvaSSNlhevFPzKLBfF4yOVclG0U+1I1 BEWM4jNkLHWyLh+XgmZFYAG8uxvNAbjnnZ+HD8SMaVvR7+kJns3UPgc+CxKh8IJsg6jN1+ kNjKYRsw2O5mIKrR2Ok4/mmUN9NJdPNLmLRHii1SYFE9ZabWYqnQ6clLFV9D3DrhHeI2B8 WVEAh0kAZAuyufgml9K4wLbB9+I8rOGSUXDv2sVnq+ASWkbwPK3fXCFUnClE/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKy+IhVp4d0y/e53XdmuKoeMN3eiE8B6e7F8WmscERk=; b=HnN2SA2HKfz3DZFakBf2IkZgzUvHca4hGotwQXs74LVUJCPo+GjxSFwjIMvV/z8+X4p/5N S3YT4QuXS8YBSxP4WQa2dJBo7uA8/4N7dS0Qx7PqNMAETfyH1Gr0LNazGIJR3MNiyiDoyI ZZDnOj6KNE+m8qpVYS56HZgHqo3MilZd5o5AokwyaJz6YX6ub1w/HanNEBSrfbNR64icdt 2gKlzcRyYmxu/Niyztk9XqhIhsn+xIXE675oX4lSHZ1ze29WG/FoS9suQrLZxIvReXnu9E qbiNaQRCNz2KMIrtfL0MyO7+/AWC+x6g2wSyE8EZFUYG/T+/856KDKyf4a7Q+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671525; a=rsa-sha256; cv=none; b=sKZyp3go+rlGVK7+mx0rAveiF/DJMChMS614YwcAT300CtbQD8d0/J9FI+/uoJsPRT65/p /K5qABneSStWVwUiAIU5HtLqyqUGpYhJUVcfDSQMYr9g6UXUOOkI2C8j44kt3y1vDxrw7/ Xpw5ozSSbRoINyD2RWGe+loGzcygb6RhySDHDqbP+Tr0rPS2w90GHBEL/rfkszjgyDcUb0 Kc7AsNkcANL83AazwMM3Tnq+6koTt2mo31nKmGNouxu+bNZcdMpdiUbjmaWqOq3inQ5pxi Qjda5WLmHjoBVqDeTTHYKPsti16SZ1ykRMszTJt4gzc7sRCLiTY3cah5XAoN0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mP00Vzzf2G; Mon, 30 Sep 2024 04:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jOEh086926; Mon, 30 Sep 2024 04:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jOBU086923; Mon, 30 Sep 2024 04:45:24 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:24 GMT Message-Id: <202409300445.48U4jOBU086923@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: 8c2748b922f5 - stable/14 - ath(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c2748b922f579080d4d8ca88a8ada5512a69035 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8c2748b922f579080d4d8ca88a8ada5512a69035 commit 8c2748b922f579080d4d8ca88a8ada5512a69035 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:19 +0000 ath(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 3fdf587ab02f33018bd042094e3d0bd4169352ed) --- sys/dev/ath/if_ath_lna_div.c | 6 ------ sys/dev/ath/if_ath_pci.c | 5 ----- sys/dev/ath/if_ath_spectral.c | 7 ------- 3 files changed, 18 deletions(-) diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c index 1b20591fc64e..0755bb667716 100644 --- a/sys/dev/ath/if_ath_lna_div.c +++ b/sys/dev/ath/if_ath_lna_div.c @@ -96,12 +96,6 @@ ath_lna_div_attach(struct ath_softc *sc) ss = malloc(sizeof(struct if_ath_ant_comb_state), M_TEMP, M_WAITOK | M_ZERO); - if (ss == NULL) { - device_printf(sc->sc_dev, "%s: failed to allocate\n", - __func__); - /* Don't fail at this point */ - return (0); - } /* Fetch the hardware configuration */ OS_MEMZERO(&div_ant_conf, sizeof(div_ant_conf)); diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c index 72f0a802aa5f..a242eab7a694 100644 --- a/sys/dev/ath/if_ath_pci.c +++ b/sys/dev/ath/if_ath_pci.c @@ -269,11 +269,6 @@ ath_pci_attach(device_t dev) __func__, fw->data); sc->sc_eepromdata = malloc(fw->datasize, M_TEMP, M_WAITOK | M_ZERO); - if (! sc->sc_eepromdata) { - device_printf(dev, "%s: can't malloc eepromdata\n", - __func__); - goto bad4; - } memcpy(sc->sc_eepromdata, fw->data, fw->datasize); firmware_put(fw, 0); } diff --git a/sys/dev/ath/if_ath_spectral.c b/sys/dev/ath/if_ath_spectral.c index 58f21b526e93..951d66605981 100644 --- a/sys/dev/ath/if_ath_spectral.c +++ b/sys/dev/ath/if_ath_spectral.c @@ -112,13 +112,6 @@ ath_spectral_attach(struct ath_softc *sc) ss = malloc(sizeof(struct ath_spectral_state), M_TEMP, M_WAITOK | M_ZERO); - - if (ss == NULL) { - device_printf(sc->sc_dev, "%s: failed to alloc memory\n", - __func__); - return (-ENOMEM); - } - sc->sc_spectral = ss; (void) ath_hal_spectral_get_config(sc->sc_ah, &ss->spectral_state); From nobody Mon Sep 30 04:45:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mQ4rpmz5Xk2g; Mon, 30 Sep 2024 04:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mQ2Jbfz4F89; Mon, 30 Sep 2024 04:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FYKKd5tQYZPHJCOT7XwV086IPG3LYXeyRwipKtwApEk=; b=rG3M5ICFmlLNcF0S6Dtv+N4J2tlaBzzpArpW3KygGs2vLHcslz4HCj50YOMPyzJKKOfC6K M52mDTlksWNgN/exzxxdXdWwHgpDInrwOnoisFwupPdnqlMnGrBwH46rf1iTldGOqT2kx5 +lMK4MYIWgtePhnF3MlmaxDXpOFNJdqC37afUYOojOZu0283O+6Va2xMa/pHWwBn5YZPTi tOs2lGXXAZPHygRFotDlmzzPBXBKW86RdckKlOGJ8esQLOUoLMHx2D7mvcPPrNEMQM6TPN 42RjFLoD6mHdT4DVeQZ0AzwrSkM8JHNrI9F23Hbi2Vd+N/klRkoK6A+mnVRTxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FYKKd5tQYZPHJCOT7XwV086IPG3LYXeyRwipKtwApEk=; b=icrQlm4uawMt8JoaWTEffzHvjmf7211352YPwRv4dGmGNKVfaEbTFzt51NQ+soZoUYuu+g CkvA+GU/mC1GdHS6sMFhP/JWAHDSF8qlnO7jECPoa0Xb3yR7ou2vsaLcEhQxJWIfu0BpIw zcljiToJfzcptn6BDoMhJjDv3cJnea8a3Oa9b8Ns7DBCeast38F/6nxVsVzSsSdKqj6PIi 6B8bi4j++/O1tLTDXpz9AvnWRLtpfMTyMueYS0qJdVZ9om3sqaDRx8ExPOC/4iPSwtNxDp TJKcIWIjPVTV3LoIh6FK68z3u2WWEdfdiz4Hl5xA+9b1pC36wfZufsyBt36aCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671526; a=rsa-sha256; cv=none; b=reUaiLVBFkaS6p200Y4YRMQWjYAn0jCqKt6tOA6OZwgQa0mJhIkBKKn8/NKEnq+5+zotrg cfU5SwaDoX8GBVTtbQqzkR/1ixqqYXhthRoz0J0tbr2mxIUqAZ1Yq+2M2usSzpNn9Id7Gm aUs4wJ2nRuN7aI8WkvdJhw0OHRlvMvGfb4j1yAIc0MC2reDc3cEIcPAw3m6WTUu+8O4hqd aUYCowM7yCijnIwtKXZeOZZixMRma+NdgTEbM0lIgUM72Db14gWZuwhCNzhKmd/3Iim9x9 f1Mf/eATnzO8QuIVUbxAdmVlV9vz+bVMSRem7aompSb23RxJMU6JlX3wOxzHaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mQ19LszdwK; Mon, 30 Sep 2024 04:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jQIh086974; Mon, 30 Sep 2024 04:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jQW4086971; Mon, 30 Sep 2024 04:45:26 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:26 GMT Message-Id: <202409300445.48U4jQW4086971@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: 3db5be682169 - stable/14 - axgbe: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3db5be68216957067ebaa9c57a70f3dde45887eb Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3db5be68216957067ebaa9c57a70f3dde45887eb commit 3db5be68216957067ebaa9c57a70f3dde45887eb Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:20 +0000 axgbe: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit ab0b996bddd96300d56b7d2aa830e2479cdfa92b) --- sys/dev/axgbe/xgbe-phy-v2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c index b7d27f633265..46e4bf8c9ee6 100644 --- a/sys/dev/axgbe/xgbe-phy-v2.c +++ b/sys/dev/axgbe/xgbe-phy-v2.c @@ -3482,8 +3482,6 @@ xgbe_phy_init(struct xgbe_prv_data *pdata) return (ret); phy_data = malloc(sizeof(*phy_data), M_AXGBE, M_WAITOK | M_ZERO); - if (!phy_data) - return (-ENOMEM); pdata->phy_data = phy_data; phy_data->port_mode = XP_GET_BITS(pdata->pp0, XP_PROP_0, PORT_MODE); From nobody Mon Sep 30 04:45:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mS09Chz5XjvF; Mon, 30 Sep 2024 04:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mR2MqGz4FF7; Mon, 30 Sep 2024 04:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/OtnNRpB2UM+DD8jthVxslNhmAb7MK+TYSxaT3+W5w=; b=vLOVB90iSyM5Px65rGdDF348eQb/xHUtZ3XH7NFjDMCp7ytye0JvZIKyJR0g6KEFAcvpI1 zWsohY9FexevhchEYaMxrA4zO+K4XUwyQIEOwi5zStfh0cme6ns5mQF7KguC7KU0WmZ0vl /tu6TzhgnavGuHDpo4mRTpBbcJrwUxSApebI5+VJbuJu3WyvkcLVgXXBhgb329bgmlvpAl djRAIPh/Y/eRc5EBl7jQv2/3lvhPNnaJyur8rDECMAS5gr7wUC56k9aKIYolmXHvug82mz 3eUlAa2ihxAEJTIMmDMwepwjXIvmQ+Sq8/0Xe+C28KeWdu8Wjzb+Zs51+AqmpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/OtnNRpB2UM+DD8jthVxslNhmAb7MK+TYSxaT3+W5w=; b=GksTMnZFikw32af4grEcTT1y3ClTlE5Rz+l0s10W/UJA962z61BG2Jk9ZFrAwu5I8Mj8zb 18xt5+6piU6T0mzYYHoMfxeWLsDgB6gB3EsfMqVsSzGq70Xty9R610tsqUTyYHfyrDOVyy tm7nrt0yGZfzfnR3dzaordSQOlVcadAPgefMuiUQTxKWbrspMP1uPUgaFAw//eRu/xnLyZ H7pYA1Rae/nLS3i4TR5QZ7P6MvWCBXimVf+AG32AmG1kymsPFtLE+YVVTqGwLsz3yBVGA5 BN13jCRwv6IN8xb5JY7PvbV9jCadA1zxWKheMz0MUH2u4tZ7hfxtNYYiMEF+qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671527; a=rsa-sha256; cv=none; b=U/NldJzK7T1QkFkjiIpGtPWzHECtvwszxpdG1+f8v0GN1b27N9Zym9oorDzYc4Xc7yBfe+ 5//jBJY08D08j2g6G359rmPAGI2rzYCrsn+amgkP5TKn/haQpVBO3RLlzFYIgwxtCZGhK7 F4iP9khm7s3YN+slGV7CMnEjkiRGR43XRUWW5qVpNr/4zROmaOYhxF93A/yp3OQJtSX34b bL2g0Ri8QLFmTakcO58msVyfISemTMkLrDXePh1IaYwcqVsnxLRzsY+db70wC5hQ1oXGxR Ar4XYQdixFLzKZ33Ji6ukDspKj0Pc7GCvbxMhnnFulOrOCuvLD5/d0f5tHiy4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mR1qY0zf9S; Mon, 30 Sep 2024 04:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jR24087025; Mon, 30 Sep 2024 04:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jRve087022; Mon, 30 Sep 2024 04:45:27 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:27 GMT Message-Id: <202409300445.48U4jRve087022@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: e763c326fc85 - stable/14 - bnxt(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e763c326fc85c0d8b3e86d954339aa847f13a934 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e763c326fc85c0d8b3e86d954339aa847f13a934 commit e763c326fc85c0d8b3e86d954339aa847f13a934 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:20 +0000 bnxt(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit dcd387aaa5d4409a7e99376e0254029fce1a48a8) --- sys/dev/bnxt/bnxt_en/bnxt_mgmt.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c index 2f82580352cb..72704c3db452 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c @@ -205,19 +205,7 @@ bnxt_mgmt_process_hwrm(struct cdev *dev, u_long cmd, caddr_t data, } req = malloc(msg_temp.len_req, M_BNXT, M_WAITOK | M_ZERO); - if(!req) { - device_printf(softc->dev, "%s:%d Memory allocation failed", - __FUNCTION__, __LINE__); - return -ENOMEM; - } - resp = malloc(msg_temp.len_resp, M_BNXT, M_WAITOK | M_ZERO); - if(!resp) { - device_printf(softc->dev, "%s:%d Memory allocation failed", - __FUNCTION__, __LINE__); - ret = -ENOMEM; - goto end; - } if (copyin((void *)msg_temp.usr_req, req, msg_temp.len_req)) { device_printf(softc->dev, "%s:%d Failed to copy data from user\n", @@ -237,12 +225,6 @@ bnxt_mgmt_process_hwrm(struct cdev *dev, u_long cmd, caddr_t data, (num_ind * sizeof(struct dma_info)); msg2 = malloc(size, M_BNXT, M_WAITOK | M_ZERO); - if(!msg2) { - device_printf(softc->dev, "%s:%d Memory allocation failed", - __FUNCTION__, __LINE__); - ret = -ENOMEM; - goto end; - } if (copyin((void *)mgmt_req.req.hreq, msg2, size)) { device_printf(softc->dev, "%s:%d Failed to copy" From nobody Mon Sep 30 04:45:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mS52LSz5Xk0v; Mon, 30 Sep 2024 04:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mS3bzQz4FMF; Mon, 30 Sep 2024 04:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YOciIc/YY3aiP6QYsRdz7QxEs3ma5bWA60YooK/aMIo=; b=vACptZrM6tV5cu8fswEH5JOb6QbVSPmsnZc+1usEl2MXvzjPCDSedCYtLSMsMfYlH9sMSW xR689JrnuM8zRywTyKmviyFpzQS9iRM3IHWlfuG33UMALGoLn2ZTYYErEoqPvy3Ctl4te2 AHAaZCj84ErStv1jFhhX+C4YUk/eWa56uKCorTXa+N6EaFx4FfkADrwWVPVxsM4SrzH3RV a5H8WjoIah5pr8hCBMwpDH14bwxGd9/B3EUL8ZqXagQsiJSwVWkEFYxHewWCeSZxvNDa55 U5OqTdMdBxdZdfFcvFPvj1POv0LJ7f07acTmnx1uWNHIPP+xjRKopAO7tN9WzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YOciIc/YY3aiP6QYsRdz7QxEs3ma5bWA60YooK/aMIo=; b=qnldUcIHSXM6EqiFT5gcDDG+aLy2ONziU/D/BvBv2Ojt7Oh5rW1Vz3irlYDKZ/wwyk7tnK s8NsrE4//T6icTozUk1uaXuflWNU2uxgTJmEi+nXgqtfTD+fRDj14jartAtB44D6372PWW bNYUbl8xeQCroVivWi66n2NRoJrw7nlBhWnE1EkFQ3m6VF65G7sZ4MV6RqOA+O1ik9PzNy bkCVS5vfs66QMx9lJAGU02Q7oOfizkXTm0ICw0vt5HgAUf/ta/UWx1YHnKFryRF7ZKFpY8 z9ivo3/tWLvu4fC9r5K8Zg6uHBdANHlglpqp7qIaIJSg60wTEl3Dd6w2NCHwAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671528; a=rsa-sha256; cv=none; b=uzGrnvus6pE7jnMnv+Ub1L8u1w8XTYFLwM6AN8ll7s7Jpsqk2iccrnGVEswzy4f4/1k/V2 zjVLUyQW5V3LpX4mv0X9pd447iApTGCgWmrfyEj2gaZh32PMbpjeZczSVuMTtpMXLW8tp6 2ssv+vHM/a7d59AQC0Gdj+qTWPNFlZDVcdeXwLOE+0HRfPKBOSDY0hGGDSy0svhu5hYsyN +LVKxy4+ApQ3Z89MKLZ7GF1tGOlsdDFD8DnrijO5XDOhb2M9DCslczfyOAwiklhtpZxKB2 hVeVE9JPbiS0p8MT8RqO36Cihyv0juV/s2srGlJlmBiIK2cqSxFn3x+qSHrCHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mS38sPzdwL; Mon, 30 Sep 2024 04:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jSus087075; Mon, 30 Sep 2024 04:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jStr087072; Mon, 30 Sep 2024 04:45:28 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:28 GMT Message-Id: <202409300445.48U4jStr087072@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: 9216ba1853b7 - stable/14 - cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9216ba1853b76185c85abccbf338f2e4ea71a238 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9216ba1853b76185c85abccbf338f2e4ea71a238 commit 9216ba1853b76185c85abccbf338f2e4ea71a238 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:20 +0000 cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b) --- sys/dev/cxgb/cxgb_main.c | 4 +--- sys/dev/cxgb/cxgb_sge.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 9bcdb86312c4..4d754aa8b1b7 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -2472,9 +2472,7 @@ set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset) aligned_len = (len + (offset & 3) + 3) & ~3; if (aligned_offset != offset || aligned_len != len) { - buf = malloc(aligned_len, M_DEVBUF, M_WAITOK|M_ZERO); - if (!buf) - return (ENOMEM); + buf = malloc(aligned_len, M_DEVBUF, M_WAITOK | M_ZERO); err = t3_seeprom_read(adapter, aligned_offset, (u32 *)buf); if (!err && aligned_len > 4) err = t3_seeprom_read(adapter, diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index f57494065aec..8469997b00a8 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -2422,11 +2422,8 @@ t3_sge_alloc_qset(adapter_t *sc, u_int id, int nports, int irq_vec_idx, q->port = pi; q->adap = sc; - if ((q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size, - M_DEVBUF, M_WAITOK, &q->lock)) == NULL) { - device_printf(sc->dev, "failed to allocate mbuf ring\n"); - goto err; - } + q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size, + M_DEVBUF, M_WAITOK, &q->lock); if ((q->txq[TXQ_ETH].txq_ifq = malloc(sizeof(struct ifaltq), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { device_printf(sc->dev, "failed to allocate ifq\n"); From nobody Mon Sep 30 04:45:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mT6Dndz5XjvK; Mon, 30 Sep 2024 04:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mT4JSqz4FPT; Mon, 30 Sep 2024 04:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmBTBPCInDREYQVcIjraSjcJkRcFfD5RerQuwRF9PEo=; b=V21XxbDeU5p+0b8eiVV2yC1HagbZwbqz3lf4FyGtRQDfjsGU5QNj6rB7Wow4UNy/2jbOFt MqDaFZbOjLLW/PHWywe6I+Fr8fts7SQKlv3jIKCr7umLqIm7BQWx39eLbAakOtwMyBe1o6 X3ZCEbkDbLB/tnF2OgOFs3vZ3lX/nIEP1HZvXEsBRnMmA7QJbFdlArFeDAiR4BfoRvUXkk g6NRYiJX0d0Fn/aJPkREP5lsSM7SlKwcmowtDMSeIidmBg1d+to+LjFJ/2YUTfDZPE1+oz xrWUApKWunleFIkxi6BHulpLwNT2Q+YihbhNGYL5eynoBEObompNeE6vu80TsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmBTBPCInDREYQVcIjraSjcJkRcFfD5RerQuwRF9PEo=; b=W9pDmE4Cawu7PELfqOstD7i8bTyY+m47Bj2H4+by/z3Q+QOwHzwWbfHSY3nKlEpfomKW+8 4D1xQy/d6w2EhYXWtOYK/H83aEr3a0gfm/cAJnyF90/R6m9vI05p2crm8exbDu61UVmHg5 lYQIYTRC5lFs3Mv2vFxuKzlzEN317kSLli4jO2jfCmRa3lEMFV+QVRKuNhfecpBV8IA14X QIsEXEsYtMVH2gFf+UXvyru6X6XUm+P5/yzujItCJt2MRkQLvFuFC6o+JpQSSnxS48KuFm /YFh58a8vliuO5/EgHjuRwO0m5a5oWtj6d47eYSS2d1Vl28VQlGpsiY3jvjvbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671529; a=rsa-sha256; cv=none; b=tb7HEuFSkD6gJdzn9qqEyidD4D43oZT9dDN3Qj2WCGX8eORZuJgNffdMZNyjXJbNSFJDBk z4e9tMq66RPdm/p9MLrQ3RSJ/Ia3Ia1dG3nux99pFj4hSMb6E6RWPU4FqpERHkVex/wbp8 O093zfv8hK7WhT7f29tzptMxkXvSvUfIlrscegzBrCGF16N0Kf9ZsYhRDV81W1fVmpOZgA V6ttW6Ev1EB2YYWneW3ZYPhgi+7qg/N9PnZcBVRgWgD5YiGpbrEIggS+TRLsT/gsXmUIhv 3Oygi78RKW6cGpCbTKow9clehbUqsGo67QUb5Xb+nln/2pFLq8TgaHcl6IjwQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mT3tv2zf9T; Mon, 30 Sep 2024 04:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jTic087129; Mon, 30 Sep 2024 04:45:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jTSB087126; Mon, 30 Sep 2024 04:45:29 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:29 GMT Message-Id: <202409300445.48U4jTSB087126@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: 09ed34449c79 - stable/14 - cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09ed34449c795c137d0dd55890486165e2bb0c15 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=09ed34449c795c137d0dd55890486165e2bb0c15 commit 09ed34449c795c137d0dd55890486165e2bb0c15 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:21 +0000 cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 955b380365af174b3d35905b7b8afae97506a0bd) --- sys/dev/cxgbe/cxgbei/cxgbei.c | 3 --- sys/dev/cxgbe/tom/t4_cpl_io.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c index 193d58f9eda4..4ae0e4da717b 100644 --- a/sys/dev/cxgbe/cxgbei/cxgbei.c +++ b/sys/dev/cxgbe/cxgbei/cxgbei.c @@ -842,9 +842,6 @@ cxgbei_activate(struct adapter *sc) /* per-adapter softc for iSCSI */ ci = malloc(sizeof(*ci), M_CXGBE, M_ZERO | M_WAITOK); - if (ci == NULL) - return (ENOMEM); - rc = cxgbei_init(sc, ci); if (rc != 0) { free(ci, M_CXGBE); diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 842e72bf8b2b..0d42c89dcf93 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -2125,11 +2125,6 @@ alloc_aiotx_mbuf(struct kaiocb *job, int len) break; m = mb_alloc_ext_pgs(M_WAITOK, aiotx_free_pgs); - if (m == NULL) { - vm_page_unhold_pages(pgs, npages); - break; - } - m->m_epg_1st_off = pgoff; m->m_epg_npgs = npages; if (npages == 1) { From nobody Mon Sep 30 04:45:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mW1gxhz5Xk0y; Mon, 30 Sep 2024 04:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mV63q7z4FCD; Mon, 30 Sep 2024 04:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Ult7ENbyOHgfgA5tLzsaVF8LES7CKlmYO0Fd3oOyLw=; b=o38G6gff+ArLDb3+hZCtZbowph+gaNqTUM5fzEkmZLCeTOK8UFDH6dGEr3OWxCkQxRur+r LZwl2/6mKdYrjG8BVQdcK4MmD0xJJ1fcBmX8Ae+sQ+gfK9LnQLbbdJrw0Du4KpTKGDas/h LKp7F6LCrUWGvWVb88t+Fk6m0NFthhkligf6MC8DJU8NHKBv6W8ey369vpBJQnGV30l2ON 23h1MsEKbebdXedqVCow91TwpLc3ZMNXvRpwfoN4R0npuiwXX1sv9ZGCh2TT8vVhYacV81 XqC7blwDpX3W64HJmCT9cdk7tSq8lJTzAqLmE0aCJuXLKDtNQqQ4C9bBZxllSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Ult7ENbyOHgfgA5tLzsaVF8LES7CKlmYO0Fd3oOyLw=; b=IZzV2GZC3WTc8/zn3hJffUNXMAKsLjJx02lwnE7yBJ7OY9pGcQAWCxIo5cKL1gbeka0Iep OOYa4uQceeMmYvPjdTwpHXLkzcHDYD+Hu+9ODE0J1bwD49PR8RXjp+45ZRyOXJxZMvEKNX PIME7fXdHrl2VslR2Hm6nN78CLmIuUbq0INNKWRBtywtfyz8EGTs8IBnlI/c7OzTJj0Gpe FNKJRPYtb3aJMn7142Av1lU8GfKmnbr4UMBfXO2ERA5T78Be78buzIET3pfHpmQ03fxDl7 he519IzLHE/BP/zT7ihfSt1Jdf8aiObOf5SKgk0BbibzAXS/BCbRVu5kwb1Tzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671530; a=rsa-sha256; cv=none; b=qpRoQICTcwk8ayI3ZzSiSkERTzDvdBg5hbo7RPUBttTHxXhUqt5STxykcKUDwOsbHAvwXH I/sMaMDSeLmFse/4ec1FiP697Osb+NHqXpYwJvF66wOFRYbafssk3p3vKC8qR/u4YnCRIJ Ovbr4lkqVgK6kDoDUlWotZhwNwMXAWtsmEMDi8Sw9QJmutR6gz37Skpx9BdGomwf77JilS dy6Q7S0RhcUpWUPkCagnP8FSgBTBnvra9M8h1azTWYZppElqPNk3+kXLAI2P0tSAXKxcZr qBL64+Vyx6fjT8+hXCc5tosiBZ6pudjhjSdz4TSDXlI0qvgsZAw6bIhZJyxLkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mV4yPSzf2H; Mon, 30 Sep 2024 04:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jUOK087179; Mon, 30 Sep 2024 04:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jUod087176; Mon, 30 Sep 2024 04:45:30 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:30 GMT Message-Id: <202409300445.48U4jUod087176@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: 95532d15a12c - stable/14 - drm2: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 95532d15a12c9cbf7c5e62e912de90919af7db24 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=95532d15a12c9cbf7c5e62e912de90919af7db24 commit 95532d15a12c9cbf7c5e62e912de90919af7db24 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:21 +0000 drm2: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6dbf3aca4f5c4f7287f186360c2391f2adfea8d6) --- sys/dev/drm2/drm_buffer.c | 30 ----------------------------- sys/dev/drm2/drm_crtc.c | 45 +------------------------------------------ sys/dev/drm2/ttm/ttm_object.c | 5 ----- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/sys/dev/drm2/drm_buffer.c b/sys/dev/drm2/drm_buffer.c index 8a674397262e..8069f2c8c4c6 100644 --- a/sys/dev/drm2/drm_buffer.c +++ b/sys/dev/drm2/drm_buffer.c @@ -50,45 +50,15 @@ int drm_buffer_alloc(struct drm_buffer **buf, int size) * variable sized */ *buf = malloc(sizeof(struct drm_buffer) + nr_pages*sizeof(char *), DRM_MEM_DRIVER, M_ZERO | M_WAITOK); - - if (*buf == NULL) { - DRM_ERROR("Failed to allocate drm buffer object to hold" - " %d bytes in %d pages.\n", - size, nr_pages); - return -ENOMEM; - } - (*buf)->size = size; for (idx = 0; idx < nr_pages; ++idx) { - (*buf)->data[idx] = malloc(min(PAGE_SIZE, size - idx * PAGE_SIZE), DRM_MEM_DRIVER, M_WAITOK); - - - if ((*buf)->data[idx] == NULL) { - DRM_ERROR("Failed to allocate %dth page for drm" - " buffer with %d bytes and %d pages.\n", - idx + 1, size, nr_pages); - goto error_out; - } - } return 0; - -error_out: - - /* Only last element can be null pointer so check for it first. */ - if ((*buf)->data[idx]) - free((*buf)->data[idx], DRM_MEM_DRIVER); - - for (--idx; idx >= 0; --idx) - free((*buf)->data[idx], DRM_MEM_DRIVER); - - free(*buf, DRM_MEM_DRIVER); - return -ENOMEM; } EXPORT_SYMBOL(drm_buffer_alloc); diff --git a/sys/dev/drm2/drm_crtc.c b/sys/dev/drm2/drm_crtc.c index b9415082e7a1..a163c7455773 100644 --- a/sys/dev/drm2/drm_crtc.c +++ b/sys/dev/drm2/drm_crtc.c @@ -662,13 +662,6 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, plane->funcs = funcs; plane->format_types = malloc(sizeof(uint32_t) * format_count, DRM_MEM_KMS, M_WAITOK); - if (!plane->format_types) { - DRM_DEBUG_KMS("out of memory when allocating plane\n"); - drm_mode_object_put(dev, &plane->base); - ret = -ENOMEM; - goto out; - } - memcpy(plane->format_types, formats, format_count * sizeof(uint32_t)); plane->format_count = format_count; plane->possible_crtcs = possible_crtcs; @@ -725,8 +718,6 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev) nmode = malloc(sizeof(struct drm_display_mode), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!nmode) - return NULL; if (drm_mode_object_get(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) { free(nmode, DRM_MEM_KMS); @@ -1009,9 +1000,6 @@ int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group) group->id_list = malloc(total_objects * sizeof(uint32_t), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!group->id_list) - return -ENOMEM; - group->num_crtcs = 0; group->num_connectors = 0; group->num_encoders = 0; @@ -1997,10 +1985,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, connector_set = malloc(crtc_req->count_connectors * sizeof(struct drm_connector *), DRM_MEM_KMS, M_WAITOK); - if (!connector_set) { - ret = -ENOMEM; - goto out; - } for (i = 0; i < crtc_req->count_connectors; i++) { set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr; @@ -2522,11 +2506,6 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, } clips = malloc(num_clips * sizeof(*clips), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!clips) { - ret = -ENOMEM; - goto out_err1; - } - ret = copy_from_user(clips, clips_ptr, num_clips * sizeof(*clips)); if (ret) { @@ -2773,15 +2752,10 @@ struct drm_property *drm_property_create(struct drm_device *dev, int flags, property = malloc(sizeof(struct drm_property), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!property) - return NULL; - if (num_values) { + if (num_values) property->values = malloc(sizeof(uint64_t)*num_values, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!property->values) - goto fail; - } ret = drm_mode_object_get(dev, &property->base, DRM_MODE_OBJECT_PROPERTY); if (ret) @@ -2907,9 +2881,6 @@ int drm_property_add_enum(struct drm_property *property, int index, prop_enum = malloc(sizeof(struct drm_property_enum), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!prop_enum) - return -ENOMEM; - strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN); prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0'; prop_enum->value = value; @@ -3103,9 +3074,6 @@ static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev blob = malloc(sizeof(struct drm_property_blob)+length, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!blob) - return NULL; - ret = drm_mode_object_get(dev, &blob->base, DRM_MODE_OBJECT_BLOB); if (ret) { free(blob, DRM_MEM_KMS); @@ -3433,10 +3401,6 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, crtc->gamma_store = malloc(gamma_size * sizeof(uint16_t) * 3, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!crtc->gamma_store) { - crtc->gamma_size = 0; - return -ENOMEM; - } return 0; } @@ -3631,13 +3595,6 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, mtx_unlock(&dev->event_lock); e = malloc(sizeof *e, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (e == NULL) { - mtx_lock(&dev->event_lock); - file_priv->event_space += sizeof e->event; - mtx_unlock(&dev->event_lock); - goto out; - } - e->event.base.type = DRM_EVENT_FLIP_COMPLETE; e->event.base.length = sizeof e->event; e->event.user_data = page_flip->user_data; diff --git a/sys/dev/drm2/ttm/ttm_object.c b/sys/dev/drm2/ttm/ttm_object.c index 8c373618d7ac..31af15cf4c56 100644 --- a/sys/dev/drm2/ttm/ttm_object.c +++ b/sys/dev/drm2/ttm/ttm_object.c @@ -282,11 +282,6 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, if (unlikely(ret != 0)) return ret; ref = malloc(sizeof(*ref), M_TTM_OBJ_REF, M_WAITOK); - if (unlikely(ref == NULL)) { - ttm_mem_global_free(mem_glob, sizeof(*ref)); - return -ENOMEM; - } - ref->hash.key = base->hash.key; ref->obj = base; ref->tfile = tfile; From nobody Mon Sep 30 04:45:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mX3gWqz5XkKs; Mon, 30 Sep 2024 04:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mX0MTzz4FKW; Mon, 30 Sep 2024 04:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMepewXWptHS/0jEL9lhByCPEjwWPTlDLKpixj+ZpfI=; b=pSj9DmYh6H6vivYW+hgNai5k+lR9LghIbome2Y36fLHZiwYly3bSTgVnm+zUpG7IDAv8BH 15piDZ1nvMpziCphSh2T2VpLHLIRIOSDldybe1X7+lFLJWfzi863XbpjYbTmIZmXY/B7yh 8bP+m60krLuXZKnuOAhjgBbug9cs84isfZQ4XVE+7P023qy/eLPfG7ev9QfQn2hlTgVpFV PL6kMhs33tj/zXeCRCho5TrZg3B0bygYTTt8N2kTBV8AWM1dVu+57+QKHF+SWL8wXrwXmA z04wN2O3xUw1SejaCZegacdweYJe4QBYDttKfX2XyiRnk82erytGYPXnYFgbcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMepewXWptHS/0jEL9lhByCPEjwWPTlDLKpixj+ZpfI=; b=Vg0ZtOu9G/sfn4SbAcppjvbgAQH9sYdwa/91Tc57RXN8tBcyR313xLFwqjwVRkovFphTVz vimOMcbFuXcawlmPIcrb82AeXgSQCEgVX+R9J5unUpA0/rBtxZg6LK5EvIB4fC7Xq6/MZr 2h1JSHZJvTLbsgcle2TpwFloVHDsvjfFLU9O26KjRJD3yCx+tBv5VRaiMQN8HDadaUI3Nm q3pC7K3OmI59BqXgjMzZQqahJRp6+XPqxBbnHoqiiqr8+iIaOumK+BA4RnZDVFYh7GSjWw KvOcUZPxAEi7+tKeEiZTGsFQ1Ao9t3BkqY14Mz+XYQzYzZVOf8HeEEa+hLULyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671532; a=rsa-sha256; cv=none; b=SNacDiCagbmySlIGWgsR2sXBmiHpg3p5pAYgZ2OC9Jtf+hCjF/FrTz3x/ufGCpLHMhcvLP H5GEUXwPyHcg4/xbALXpTWMD+QvFtdBGN5l5txGk0GwFWi8HGavY89zTy5KbHgFfK9C7Yw DRn9G8MMIrlA/9k4KaWwWj1MyOjRD4GRvFQytT6oKSOGMBCvUjLTbECkb6DpHjVWXRSG2J xAmWhfX7FojSnScLLZzcw4DQplbtW6g8MWCC0GXXB7XG+07r8BoxWCdVHPbJAY4kKbD0XK 1lSbi+K9990VSS8FgtNdpEbzReTWL0uYPkwWYb4zfXvyhyKGJDaMrhRQZMWmcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mW6Dr5zfbh; Mon, 30 Sep 2024 04:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jV2r087229; Mon, 30 Sep 2024 04:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jVH8087226; Mon, 30 Sep 2024 04:45:31 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:31 GMT Message-Id: <202409300445.48U4jVH8087226@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: 8c2d777a223d - stable/14 - ena(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c2d777a223d56d63c55552e8ca1d689f7c58b06 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8c2d777a223d56d63c55552e8ca1d689f7c58b06 commit 8c2d777a223d56d63c55552e8ca1d689f7c58b06 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:21 +0000 ena(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 51971340bd3ff41591adbbfca68e9e753f6eb135) --- sys/dev/ena/ena_rss.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c index d90a7fbb253a..41fa9c62f94a 100644 --- a/sys/dev/ena/ena_rss.c +++ b/sys/dev/ena/ena_rss.c @@ -279,12 +279,9 @@ ena_rss_indir_init(struct ena_adapter *adapter) struct ena_indir *indir = adapter->rss_indir; int rc; - if (indir == NULL) { + if (indir == NULL) adapter->rss_indir = indir = malloc(sizeof(struct ena_indir), M_DEVBUF, M_WAITOK | M_ZERO); - if (indir == NULL) - return (ENOMEM); - } rc = ena_rss_indir_get(adapter, indir->table); if (rc != 0) { From nobody Mon Sep 30 04:45:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mY5XCvz5XjvQ; Mon, 30 Sep 2024 04:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mY16sHz4FYd; Mon, 30 Sep 2024 04:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7EpfiiO4tGXH9i1uhFHvSceHFQ3Aq/FPcirdPoFlL4I=; b=ZeW5afUuaZAhJvinA03V62Lk2KdY2najtWgSDP+vhg2+29w70K1ue157fay+AAIfJD8B7+ Lm3cJ9heEjA0SfTbgqB+NEDv70Jrtc+iRglli8vz+8z+I67KaaMlTkCLlrqbCqcXJiRqnz U75JtR3sPHeHJNKD/VGkaLCthQ6HexMt9MWf3PRtohVOOcsWiI+wxee/yfLi1BJ1w6SRoU mxKBqaOg6ur1vpa4b6Zk1PNx6FYTv3PceCbBjCA5QlzwB10gUh1+u4Kbp5S+KcjHt9cpqE +vdOM8LbBphoBY3aznPskfjclnt/NsBEn9czSnbhnw9NR7g0V1UCFVShaS+i1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7EpfiiO4tGXH9i1uhFHvSceHFQ3Aq/FPcirdPoFlL4I=; b=idZZTQbNBKBZVzffuoAt63LlJSZ/ujDKHLw8Dk3Thx+x7BLlSTqP42b5KSZ56F7zUwYMv+ zT5sI5iDsdT1YTiKodkAnJwjZp/z1nMZ3tRAo49JknreF2/s+WtP1wNjkhVgbKDdSINNcB AmgzyWxjuwNuiLPtu20Q9p01+mGmKJQi5CFBPQVUwTrTSBeCiAmC/v7wT/U4El5l71jqRo CkoH++JBQ/t/SoxmnG2NRhGl5gAPmGgp9RG2DooG+y9HN5TZdwzQOSgU9Nc5dg4IOzmlqD 692/scsree/5Ea56XxYnbW8JuXPWyw27NZ7uL2nF7QT8MrBCxhE9zf/ivRao6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671533; a=rsa-sha256; cv=none; b=sU/v26Th65IZfx5JTjX6FdC/4u8lC5mcllNpwLf+pSMMAwH/ClJTDPMxW/5kSByd2GqFNr x8ooINxKL83JjsYAO0YHMzg2l70tl0Xt28nN+/1CcPLKS2BSI1jNG/8LCjJh1k17Qpe1IP MIqvE6xWr2PQGEXgz6b55BU9NcYf0jKL9Jx4WEzdymQBxxSHpqcl5YpeZfswkB/SMG4R/e d8xnHfrWcmbGGuWeu1xuV3z5VAozkpIqHgcWjX3XQG0YIwCU4pV3twSV51YVuG6SUoc1dc Sr1XXO0E0HxeYZv2Ao2l+2X5Em9OeYRiDAiDbA3pAxxzkovZ/5O9hC7XWOntMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mX6wFkzdwM; Mon, 30 Sep 2024 04:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jWiD087279; Mon, 30 Sep 2024 04:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jWiB087276; Mon, 30 Sep 2024 04:45:32 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:32 GMT Message-Id: <202409300445.48U4jWiB087276@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: e78c315e8941 - stable/14 - etherswitch: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e78c315e8941ff39d89c45ffa5841b8028a3bbce Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e78c315e8941ff39d89c45ffa5841b8028a3bbce commit e78c315e8941ff39d89c45ffa5841b8028a3bbce Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:27 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:21 +0000 etherswitch: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 48741f4ceca71523aa1fa8da3bb78b184fad4aca) --- sys/dev/etherswitch/infineon/adm6996fc.c | 22 ++++------------------ sys/dev/etherswitch/micrel/ksz8995ma.c | 22 ++++------------------ 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c index 2c6c83a4388d..64f61df93db1 100644 --- a/sys/dev/etherswitch/infineon/adm6996fc.c +++ b/sys/dev/etherswitch/infineon/adm6996fc.c @@ -179,10 +179,6 @@ adm6996fc_attach_phys(struct adm6996fc_softc *sc) if_initname(sc->ifp[port], name, port); sc->miibus[port] = malloc(sizeof(device_t), M_ADM6996FC, M_WAITOK | M_ZERO); - if (sc->miibus[port] == NULL) { - err = ENOMEM; - goto failed; - } err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port], adm6996fc_ifmedia_upd, adm6996fc_ifmedia_sts, \ BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0); @@ -255,12 +251,6 @@ adm6996fc_attach(device_t dev) sc->portphy = malloc(sizeof(int) * sc->numports, M_ADM6996FC, M_WAITOK | M_ZERO); - if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL || - sc->portphy == NULL) { - err = ENOMEM; - goto failed; - } - /* * Attach the PHYs and complete the bus enumeration. */ @@ -281,14 +271,10 @@ adm6996fc_attach(device_t dev) return (0); failed: - if (sc->portphy != NULL) - free(sc->portphy, M_ADM6996FC); - if (sc->miibus != NULL) - free(sc->miibus, M_ADM6996FC); - if (sc->ifname != NULL) - free(sc->ifname, M_ADM6996FC); - if (sc->ifp != NULL) - free(sc->ifp, M_ADM6996FC); + free(sc->portphy, M_ADM6996FC); + free(sc->miibus, M_ADM6996FC); + free(sc->ifname, M_ADM6996FC); + free(sc->ifp, M_ADM6996FC); return (err); } diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c index e512a86202c6..ccd7dbffa9e9 100644 --- a/sys/dev/etherswitch/micrel/ksz8995ma.c +++ b/sys/dev/etherswitch/micrel/ksz8995ma.c @@ -225,10 +225,6 @@ ksz8995ma_attach_phys(struct ksz8995ma_softc *sc) if_initname(sc->ifp[port], name, port); sc->miibus[port] = malloc(sizeof(device_t), M_KSZ8995MA, M_WAITOK | M_ZERO); - if (sc->miibus[port] == NULL) { - err = ENOMEM; - goto failed; - } err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port], ksz8995ma_ifmedia_upd, ksz8995ma_ifmedia_sts, \ BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0); @@ -305,12 +301,6 @@ ksz8995ma_attach(device_t dev) sc->portphy = malloc(sizeof(int) * sc->numports, M_KSZ8995MA, M_WAITOK | M_ZERO); - if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL || - sc->portphy == NULL) { - err = ENOMEM; - goto failed; - } - /* * Attach the PHYs and complete the bus enumeration. */ @@ -339,14 +329,10 @@ ksz8995ma_attach(device_t dev) return (0); failed: - if (sc->portphy != NULL) - free(sc->portphy, M_KSZ8995MA); - if (sc->miibus != NULL) - free(sc->miibus, M_KSZ8995MA); - if (sc->ifname != NULL) - free(sc->ifname, M_KSZ8995MA); - if (sc->ifp != NULL) - free(sc->ifp, M_KSZ8995MA); + free(sc->portphy, M_KSZ8995MA); + free(sc->miibus, M_KSZ8995MA); + free(sc->ifname, M_KSZ8995MA); + free(sc->ifp, M_KSZ8995MA); return (err); } From nobody Mon Sep 30 04:45:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mb5CxSz5Xk12; Mon, 30 Sep 2024 04:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mb344Fz4FNW; Mon, 30 Sep 2024 04:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBDwHy60z43ST/Yx9UYpQ73C95WPG59o/U0WTaAYDQA=; b=a7ttbB7YIdyBE9t7p+G8MGqiLBqA36MdLVeEbTmA24FFbiv4O4Wz5nB0fiUuCNcUOYP31Q drzO8oC2NzEJ7rjP5odWeC037NDSAqZWHg3JOjlJ5f67qXWE+ym3D+LpVg3+LbaeNWTt0p YcFp4f4xndC9EkZAPLM/3sZ2WSq04HfSdcLTm46T/MYzrcG573kR+zNcTiK9cGfy7Bd3QJ PGWc2ESfyEpfMOD1VREXzKmfYBjCy6EFrOQ2cfLmNB4b4yh9qQXlvs68qByxgZIem5CEsp TBBWftBzEsmEwzzNCSx16EPjxK1yKvTrGeuii3tUe7jB5fmUKggqHrcTXoe0Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBDwHy60z43ST/Yx9UYpQ73C95WPG59o/U0WTaAYDQA=; b=cfdS9+aWoNGNtVlkW4adjeBdCABTpPQkXA67G6BgoJOjjvk7TYyTIv3MavPSnh7gqFUC+n tkBcaUkpH9qzYwm5USyokOvk0IVuUCAQkFppWsuxzXM46nbN+SH4qXHnRfu+XeIRzeEMKE yOvsW4pUE7Sd2xwwh46jaXzGpxPljetYkpCzA8g3rMzKnqbdhLyJ5TsDzQ3m1uCnd5zsFa 56n3n6A4ChZp9YqB7G3n6t59Rcq4I0io/PSFjsgY+ZyIilJPUE0B6ZYxAF63xCjByRST9S tTN7bU/5p6BXeb+HJvnBk90HI3KpqHcwLFhWRt68fZ2+wHraGFI+X409TLsmXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671535; a=rsa-sha256; cv=none; b=QUO0Aqpdz2eYZjq+a/vhAKsi/1i33Va1fjQLN8XrPwrUnrlfG4tx/q24GcU/WyzFMu9RtR sD1trIXIQvgyOKPv7YFu6ygTzcpEs+YTJqatNbHqs9dyMlTxBMnjl2yprG6Ys4vJN6DGtF udxGcYJBldRucDiWJdajNHyEGr1UfUFl2Ro3cataY35gi2/dpjXEp+H47KYCd8oamWictD SHik9PJi/UGidcSNX7TN0rQeQUttgpqJDiJHkP2LvxsePhzGJvYNyASHHENjUGeywQ+3LN Jgb+FEs7eMH5z061ZEMF1ipJsYBA/azwHh4YtJkt8f+l59nE8yuTrsC1uPDkeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mb21gJzf2K; Mon, 30 Sep 2024 04:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jZe9087381; Mon, 30 Sep 2024 04:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jZSC087378; Mon, 30 Sep 2024 04:45:35 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:35 GMT Message-Id: <202409300445.48U4jZSC087378@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: f3af52726024 - stable/14 - fwip(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f3af527260242c570b3e2bea56287f1ad5abb7b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f3af527260242c570b3e2bea56287f1ad5abb7b7 commit f3af527260242c570b3e2bea56287f1ad5abb7b7 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:28 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:22 +0000 fwip(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 4d47c7ca7baa1ae76cc1fc72ec85b475f1efd41d) --- sys/dev/firewire/if_fwip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c index 6350ec9cb56e..41143e2e59d4 100644 --- a/sys/dev/firewire/if_fwip.c +++ b/sys/dev/firewire/if_fwip.c @@ -304,13 +304,9 @@ fwip_init(void *arg) xferq->psize = MCLBYTES; xferq->queued = 0; xferq->buf = NULL; - xferq->bulkxfer = (struct fw_bulkxfer *) malloc( + xferq->bulkxfer = malloc( sizeof(struct fw_bulkxfer) * xferq->bnchunk, M_FWIP, M_WAITOK); - if (xferq->bulkxfer == NULL) { - printf("if_fwip: malloc failed\n"); - return; - } STAILQ_INIT(&xferq->stvalid); STAILQ_INIT(&xferq->stfree); STAILQ_INIT(&xferq->stdma); From nobody Mon Sep 30 04:45:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mZ2rFpz5XkHX; Mon, 30 Sep 2024 04:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mZ1rq6z4FbY; Mon, 30 Sep 2024 04:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/pG++KP5Vt0Jijn6GjFgcZQHXhiZ2aUelcgg47hwp8=; b=cbUgz9AMwZOT7UMVpqp8/ak9g3zieqecfaSUxUheN+dYtdyhvhv2y8JTngzBxmRs4JUZ9w V/VOiPRIIucTt/mBgQI4sjJW2NerISua7uNLDz7JF3aWkU2cRbhZUoiaRHuZzvibUQpRnA /3VLaMnay18x7jyFzmMLHVwXgUkfMIskca672AyvuuCEOXVi7/Bo+TQkQkZa++LTJ6ZHcm TxB+Hc72hWJ6jSz8Z6vFy5on/3jcuPsGuwyYLp+X3/USci0jRqm7rcAGnzHsPE6JiqNXwp W0/EPJ/AvaDMAC68gRmD7YM8SJFbhDS1O4Qo7DsNk7jQOz11px77r8c9QdJQjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/pG++KP5Vt0Jijn6GjFgcZQHXhiZ2aUelcgg47hwp8=; b=dCtdiyyZsIUa19u9szNPVTgdCWA96PDL2pGukxw+6h3vHwfFLMpwHESUM6yhk9lgx3n6Gw MMLpaOXFPbtG+JzMSEsxMYtIzV1ApJ9vpK1xPyTD/WUI7x4IdeYYJ/U6uAzRC4UJF2VV9p YKifSVawGZbCZHYfimhadWj8CArxDg9VTj+dSkZTvyUB/HYimOB4lMJWJFM54esrN3lr5K j2THxp1JfDQfFkkPJZ2D4yQ2SYA+11Ccr8Q3dRNFkP1t1QTxmiAHBK7aHydw+gynKBTomP O75R9TBRz2D2qr0WTuGFafvBLdnA+lFS37fPJWfGsU5P47jZn3LsI7XuuQafxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671534; a=rsa-sha256; cv=none; b=Ju4f2JW5Gt+BEYpje3qDi7VZdXGHXOBreyyLgDT5YLOrx6Z6EVmZGHV/+jdQAlx/i8Vykl Un1nEfKVO3HmyJin2soXrOZL2UFcRv7ycpRegw2fZrlOyI2EXSQejoa5GJdX0amYEkouOc xS3pPa8Mc6od8L+BA5vBCuVTRz2qVYbgjQV9WT2HSNXWpCwsGkqFxC17+ncT4SnrEU8OTb +3ry1q9+Y3vkj0+cQqG+5gZpvVunpCTjEciVQ2nSBsnY1LNeekOM33PmS+K3bITHFwup4r bRp9xSStIbOnCt4ANqrkzeAx8JYhaoO8LGW0br7O30lfnnGzybDL3WDPXbOo7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mZ16xszf2J; Mon, 30 Sep 2024 04:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jYRC087327; Mon, 30 Sep 2024 04:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jYRb087324; Mon, 30 Sep 2024 04:45:34 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:34 GMT Message-Id: <202409300445.48U4jYRb087324@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: 6515ef4d2b42 - stable/14 - flexspi: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6515ef4d2b4251ff4c628577e93b3bd5c1ed480e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6515ef4d2b4251ff4c628577e93b3bd5c1ed480e commit 6515ef4d2b4251ff4c628577e93b3bd5c1ed480e Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:27 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:22 +0000 flexspi: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit d1a89bd9b6eb1524902b619fa092c7d6de63e623) --- sys/dev/flash/flexspi/flex_spi.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c index 106a7845b2ad..b4c2ce985e08 100644 --- a/sys/dev/flash/flexspi/flex_spi.c +++ b/sys/dev/flash/flexspi/flex_spi.c @@ -781,12 +781,6 @@ flex_spi_attach(device_t dev) } sc->buf = malloc(sc->erasesize, SECTOR_BUFFER, M_WAITOK); - if (sc->buf == NULL) { - device_printf(sc->dev, "Unable to set up allocate internal buffer\n"); - flex_spi_detach(dev); - return (ENOMEM); - } - /* Move it to per-flash */ sc->disk = disk_alloc(); sc->disk->d_open = flex_spi_open; From nobody Mon Sep 30 04:45:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7md0SMrz5XkMY; Mon, 30 Sep 2024 04:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mc3LJ7z4Ffb; Mon, 30 Sep 2024 04:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3pR/KU21c61vsx3FUQCt6s5GoJ4PIdesJOO5n9KMO4=; b=TMfcKGLEcGVgJV5QHGmG93zs+hETT9WeDavCuJfiEJyjn3QU5lJ1+8DRXj0Yr9Uh9zT8OK OepdwHvfWL+xeydB5a7QT6naQ5G2GJLn0UBxaoQeexbH6vRnfbJYIrJZo41zNpNp6Cr5hC wMX+/QOdzcJhl71gKQWj7hqhuUIaW9v0u7QhBb3UrO5AnP90KGefCOEmVB+FH76ZyTZFir HG+homGnRmBueT7bu7YVW4EdCN5NxQribyKPI/sqsB5vFat4BYEClj1Iy9ESQJqb/4KmkR HCAlsKgNN8Fjc0TSIejOF2HdAct05qAi+AvNV2uArPPxd5O3KLRaxn7uXTY5Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3pR/KU21c61vsx3FUQCt6s5GoJ4PIdesJOO5n9KMO4=; b=uZthpnNm6CfaOaeFpuctobi5HyYG77sNMz4BmW12uqL21mCI12qdWZpQm8X7p1bxgEV7kq B20qjHmzX7tcrd+QqRBTFkfT/70o/tI86DE0+uv29IG99aFieGdd0Hzwrv40zm8fO+TaXs MggIPXJbjwn+BlADmcu/n+VWOnVhUhsFToLuOmepnV4iKIGWp5wncVWI9iFi1evWMJsU/G Qo5c5vbnJWfZSQv85eqFIQHcxbVuZvaIl//8Qvw0ncF6yFCbRQhI0WA9j1tf+l2/ybJN4x hvEp65TpCMnbWxQvcL5uVfalprYwsh7FriyFQHMkIg/KNh3RetsHC0LBOOxMzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671536; a=rsa-sha256; cv=none; b=MNS187Q30PLKLqctmyPDAEvuRBsduk4XZGh3OKqXvQ4hOkvFZwD2J9hJBac+xI3j6v61Up +HCrc0xdCISrd1LskgjfvkjnD/UmYpuFEuNdyFsXkp8yaCBQGSfbPBLNe6rV7D/mNkqFNX 5Zhskya8GyAOcvu+A0NC+9i4H2b+2U+0tKOns4tY6vytmOshhJnz0ktP0dM/sSfNrr6aYX 6zPJW6RuyLDC7PT2Vh0Hgnr3+RLKDjMMVNgv0GoN77soeBQ7HxiMCky/MUYpYCw0BoNb8v 9+h47kfktuMwg/dMLEfNFbFimfAfKGHscP1ChSMWnhx0wH4hSYFCMs42dghNLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mc2tZ5zdwN; Mon, 30 Sep 2024 04:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jamm087435; Mon, 30 Sep 2024 04:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4ja99087432; Mon, 30 Sep 2024 04:45:36 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:36 GMT Message-Id: <202409300445.48U4ja99087432@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: 0341c77f203e - stable/14 - hpt27xx(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0341c77f203e5200470657a428f8ce63f2dc9988 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0341c77f203e5200470657a428f8ce63f2dc9988 commit 0341c77f203e5200470657a428f8ce63f2dc9988 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:28 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:22 +0000 hpt27xx(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 28e413a699838df6fa5b0504c9ceb92a515037d9) --- sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c index 32d3e465c569..a40cb69e47f0 100644 --- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c @@ -94,9 +94,6 @@ static int hpt_attach(device_t dev) size = him->get_adapter_size(&pci_id); hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK); - if (!hba->ldm_adapter.him_handle) - return ENXIO; - hba->pcidev = dev; hba->pciaddr.tree = 0; hba->pciaddr.bus = pci_get_bus(dev); @@ -114,10 +111,6 @@ static int hpt_attach(device_t dev) if (!ldm_register_adapter(&hba->ldm_adapter)) { size = ldm_get_vbus_size(); vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK); - if (!vbus_ext) { - free(hba->ldm_adapter.him_handle, M_DEVBUF); - return ENXIO; - } memset(vbus_ext, 0, sizeof(VBUS_EXT)); vbus_ext->ext_type = EXT_TYPE_VBUS; ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext); @@ -168,7 +161,6 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext) f->tag, f->count, f->size, f->count*f->size)); for (i=0; icount; i++) { p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK); - if (!p) return (ENXIO); *p = f->head; f->head = p; } @@ -1109,10 +1101,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1327,18 +1315,13 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } hpt_do_ioctl(&ioctl_args); From nobody Mon Sep 30 04:45:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7md6dV2z5Xk2w; Mon, 30 Sep 2024 04:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7md5NVSz4FNt; Mon, 30 Sep 2024 04:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MH+NDtS1SGDZOMPa6efGiXXI8+qFSuKsxSgSOLKPxwM=; b=kHbEWvrH8FZ0iyHEvjrbUzgjHGPiWyq4ohxhlKq+1i69KB/vNTf0AIJwYfPK/T1syQKGDO UH4RMNPLKHct0ffIDJ2gVqyHU7HunjupTpCYnF9D9ZoCWuEAywxaNGD8/eOIc7kfedaWWH dG8DkBScepXSeBVQQnzn0S47wARYdfesZNcf+subQgElVI2Pp4CXE9X2E/dWiQeFeP9nfV dIio+h8RdIgQDmGBuObrg4CiVvU9orcK0U2rlkE+P0UF1t6+9vz5NFesad8wrqWeZ5/QkO AuKpKLrtO/16G1hNHbktTyZC0K14TLPNhco8vDAHR6zmm83e/MV8pch1ElQysw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MH+NDtS1SGDZOMPa6efGiXXI8+qFSuKsxSgSOLKPxwM=; b=UanlTVRVvX6yqf7fRrmLV2yvB50W/JJHXLF+BB26fR5CTAOy0SLbL5whYAkgxWTExAc1Hs xdUW6hW+Yf6FjMIseObbMf5lrPbNev9kjb/DiROUR1YOEcAex/BcmEqkoOPAOan82vjSPB prTSRFt+Jt/4f2USJ2pUOCgiMyHJ3duJh4XKlJLqpxR8RS5/oTK+X328YesedU+cC+eNfN AQ705woTor3q4+/60iKp+DgP4vkGubHhDEck+SYZ+EkBDUvZ+7DhhWO70/OkQk/5j2RE2M OzfwE8htQnnvAui1SihAqS2M9nG7U3ewAgLVFL6h0Cv2JQbd9E9XadnLjxoEgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671537; a=rsa-sha256; cv=none; b=cvA0b13yVrsnWTCitMuN1W+0y7pcBe1F8CdaG7gZDN25Vh2JalUhTLl3cJHo2CyNxjXrBf 0wN002mCo6A1pol10ez0sCXKVJykK3/PagUS82agyRl40M1N516DnvJxJLDNArmG4FjaQS uGjha+/it7AxeL6vX2Tf5Aj2ASw8xnGl5ToNnlmzSt866K1DvmLnVf54Aa3fw/Koj2Sy+5 i04eLpj2eeCc+mPlv38dh+cVEr/lK2Ja++Xvt0dOlwVXZBDkqrQK3wodpDsmEdj66ftj5U ZRSBPX+tKWNZY38V20CSES7yHtH2lCUekKOPRIA1dTOWwUGxhvf4zOmHqFiU2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7md4B9GzdwP; Mon, 30 Sep 2024 04:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jbgm087487; Mon, 30 Sep 2024 04:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jbku087484; Mon, 30 Sep 2024 04:45:37 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:37 GMT Message-Id: <202409300445.48U4jbku087484@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: c860df902b6d - stable/14 - hptnr(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c860df902b6d010cb18490580c776c4b0a6a9123 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c860df902b6d010cb18490580c776c4b0a6a9123 commit c860df902b6d010cb18490580c776c4b0a6a9123 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:23 +0000 hptnr(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit a3ec5d3ee7579a26790a86ca4c074512946ab964) --- sys/dev/hptnr/hptnr_osm_bsd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index 00774bf9be4a..b1fcaae2fd7a 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -165,7 +165,6 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext) f->tag, f->count, f->size, f->count*f->size)); for (i=0; icount; i++) { p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK); - if (!p) return (ENXIO); *p = f->head; f->head = p; } @@ -1389,10 +1388,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1610,19 +1605,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } - + hpt_do_ioctl(&ioctl_args); if (ioctl_args.result==HPT_IOCTL_RESULT_OK) { From nobody Mon Sep 30 04:45:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mg1l4Jz5XkMb; Mon, 30 Sep 2024 04:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mf65Lvz4FZh; Mon, 30 Sep 2024 04:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=02eJ/Alv4sKOwzwQspzc8uIAb4wtBzFJ0uy7QT/20mM=; b=q1yLo344Kz6YzaL9sJtkRvs2t3Aeryg1yNxBRAKW4IHDI47tokCFbdyn+5jfVYOowdeEeb oDu/8MKJGCT74fBkeqkA6wnbeWabiBj+VOMNEd9zPdK0XwxrDm1AWp2jmraLgCbYtDYleD y0GM3ILtwwza/QBYUmlq7LfJCryEY7Dw8SvKSOepnWUyVi2IV1/1OrbYEZY2ThcrBuj6FQ chCoA0n4IlmHvXCvbTp6h5zD8oP65ur7eMM20fGBx3bMqk0lSFZsXMEjFEH+RkaouPAwWN qUKasrVbWnJ1SWpTsPO7gMSBCuGehXzLuwP1DVHhAVAIRHc/KbFj3OWoOjcFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=02eJ/Alv4sKOwzwQspzc8uIAb4wtBzFJ0uy7QT/20mM=; b=MvgdmOiYpT1au+RXl9q755QESDlZCl3v3p5ef3ytN+GJuFNrmO8UYfVPbpAkPT4tBdHSyd gBFzYLW0qbuP0vz+Ec3+ZCmt0HrX1+Vquw2YzTQqjO+iv4ezryNVddp0Z4hXDHq0otfL7H XhwnobiP1wJQJUKu2fvrrK2LBTIjTkgH5wY4a5/nHlhTOLfG8xwz9HiNOc5qkZMU1wgQNo Jod/pNnrfh6mcZ3LL5NBOxkIp6qVnAreE3bASoPPWO5ElwnO0XusJ8USZ6i4KFqASE0Dtj L6VT/XaYBkz3u6QQ4dF2ANxum6Xyw/ivwHlrGbJ+aZ6MNigXVbXQVvsRGx7K5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671538; a=rsa-sha256; cv=none; b=E3lNCC3f1ryiMYnOD945gmZQaLCsgzJpj2ZIrHPAd0GgLGr2fPwpwOvaKveVmP74fJO108 ow2eWKi1ha5wQNbbploPXscB3DfGzHGPQKvyAGjoLcj191vxhDvvB98fSHe6/hC3Pa12tg HWwQDx8dOs93zP/3AtbJKillTtXawOKl8vIPTnvq6gJEjnaSO0zIJACXCorpn3ZEMBrX8Y 9hTK0mNXPylv9+qOgwbUzhLUxk71Q6LSUHwP0WZwBDADkH2j8Oz0WhgyyzukfcImNZQj4g hEG4EbQqk7zN3m2QVfGE1U85IQ8zC7MohHZr4LGFyp6uMSHF/STSIQUvwlaITg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mf5G8nzfFv; Mon, 30 Sep 2024 04:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jc6e087535; Mon, 30 Sep 2024 04:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jccH087532; Mon, 30 Sep 2024 04:45:38 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:38 GMT Message-Id: <202409300445.48U4jccH087532@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: e4de0a965faa - stable/14 - hptrr(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4de0a965faaff171e6061714478c8f4eaec8cb1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e4de0a965faaff171e6061714478c8f4eaec8cb1 commit e4de0a965faaff171e6061714478c8f4eaec8cb1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:23 +0000 hptrr(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 92b0370ec65d5287a1deec84fd513e320a8da736) --- sys/dev/hptrr/hptrr_osm_bsd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index 4208dd620e37..055ad13b14cb 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -1032,10 +1032,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1252,19 +1248,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } - + hpt_do_ioctl(&ioctl_args); if (ioctl_args.result==HPT_IOCTL_RESULT_OK) { From nobody Mon Sep 30 04:45:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mh51Syz5XkSW; Mon, 30 Sep 2024 04:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mh0LKkz4Fb2; Mon, 30 Sep 2024 04:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tB/1cMRaSjjZ0QT7ooNRA9pxfomrBfZL5pAZC+GtLUE=; b=Lm5uwkoedgCDISyMuPawLiyv6db+X5mGx0BrrYqlZPRML9w2ZQD3pNuYNRHoJujX6U34I9 mE3jKFXydsH2AJSJbxTmch7copLT5H54GIu6vbM9PY6T5A3Lrnep4er/9zaIBU5Y3Dhkhj aHoxjqD3uug60uui22js7SP/eDwz1pGjEd+ewbV1IUm6l79phXvSOL5JHvNjeRJQXyG848 AvtkdjSABcqsxIahXGOwNbss5AZS22GJuirbFeNliMze8sB9UVfgJcxdxMKV44svHHL0H1 NutmQCWj48MCLcBe65p1uK1nMURncpCRtTPvtHQqn8UjFPlmkj8LnEzw5/CXJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tB/1cMRaSjjZ0QT7ooNRA9pxfomrBfZL5pAZC+GtLUE=; b=Dd+V+WvWwA7q07A2mWXQA9A/ua27JswZi7dIpT3rvEI+IG9mx4Ga0Pum48Y86G4eXzMLWx DST7zbAReJlwQu3h5YWgWBmj0cnlGDB67oXNQkrwUmo8DcfQQCjnsPQsAvR5UA4Sq4KUrq tA6/sLMdOYPGAyZO+GoHbQxhEWTgJsSCe0sBZUYX1Ck1EWyFVdB6NrELw7idX6OrvSQmzu g46VChJmaBW8lVInbh7QuIcSI1Ir/iieJqtBV/8s9EdGonG6Y8k+BvTdBCn2iDPf1/d/rs tFO5Zi808aH56TjF7UeDl+cYBpeezY9oA8lOMqvxOY4NoBulBfMi0MlKGU6fUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671540; a=rsa-sha256; cv=none; b=fe4h3VEYIWboov6auxOaf/qogmeOUwdzwSP1v6QtXuOiZaTpYRbWKprxp7yaB05pQeiGBX k0N7q9b6JIe2dapftDS3H/SJchG/SeeLOa+M/2+VE9tBoxDgxlWfzWJcGZ15Kxbv8NzGPf ppJW6/dtwIfzpEM7/KtmIkk4zW32s6RBdkw7HIqyd5vEc7nldXBbs5TJpkSNKcNuVvyI5j UBtL9sUnuFgYGoPM1qvwlOLEGloZ0Zv2OwQYEbOU1CuOse4pvYxBPfRiBY7sYUX5WyGgPR Wx0nNUhSdvxsN3EEH3kebCcrpHljLqS6r8d2lOoyY8USK2nEwILzjikYUXjmuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mg6Nj1zf9V; Mon, 30 Sep 2024 04:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jdDT087585; Mon, 30 Sep 2024 04:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jdgx087582; Mon, 30 Sep 2024 04:45:39 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:39 GMT Message-Id: <202409300445.48U4jdgx087582@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: bb8c6f43256d - stable/14 - ice(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb8c6f43256d234d492c267d74526fc62102b23d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8c6f43256d234d492c267d74526fc62102b23d commit bb8c6f43256d234d492c267d74526fc62102b23d Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:23 +0000 ice(4): Stop checking for failures from malloc(M_WAITOK) As a consequence now ice_alloc_vsi_qmap() does not fail. Remove unneeded error checks. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 5f97656fa334b494d70866cb1bfff406d3efd92d) --- sys/dev/ice/ice_lib.c | 24 +++--------------------- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/if_ice_iflib.c | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 659412450fce..7077859cc877 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -426,31 +426,21 @@ ice_setup_pf_vsi(struct ice_softc *sc) * all queues for this VSI are not yet assigned an index and thus, * not ready for use. * - * Returns an error code on failure. */ -int +void ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, const int max_rx_queues) { - struct ice_softc *sc = vsi->sc; int i; MPASS(max_tx_queues > 0); MPASS(max_rx_queues > 0); /* Allocate Tx queue mapping memory */ - if (!(vsi->tx_qmap = - (u16 *) malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK))) { - device_printf(sc->dev, "Unable to allocate Tx qmap memory\n"); - return (ENOMEM); - } + vsi->tx_qmap = malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK); /* Allocate Rx queue mapping memory */ - if (!(vsi->rx_qmap = - (u16 *) malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK))) { - device_printf(sc->dev, "Unable to allocate Rx qmap memory\n"); - goto free_tx_qmap; - } + vsi->rx_qmap = malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK); /* Mark every queue map as invalid to start with */ for (i = 0; i < max_tx_queues; i++) { @@ -459,14 +449,6 @@ ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, for (i = 0; i < max_rx_queues; i++) { vsi->rx_qmap[i] = ICE_INVALID_RES_IDX; } - - return 0; - -free_tx_qmap: - free(vsi->tx_qmap, M_ICE); - vsi->tx_qmap = NULL; - - return (ENOMEM); } /** diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index cfd848d370bb..6c010cffc0fd 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -830,7 +830,7 @@ void ice_free_bar(device_t dev, struct ice_bar_info *bar); void ice_set_ctrlq_len(struct ice_hw *hw); void ice_release_vsi(struct ice_vsi *vsi); struct ice_vsi *ice_alloc_vsi(struct ice_softc *sc, enum ice_vsi_type type); -int ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, +void ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, const int max_rx_queues); void ice_free_vsi_qmaps(struct ice_vsi *vsi); int ice_initialize_vsi(struct ice_vsi *vsi); diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index 4e451bf3fb55..3de79787f6e8 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -631,12 +631,8 @@ reinit_hw: */ ice_setup_pf_vsi(sc); - err = ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max, + ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max, scctx->isc_nrxqsets_max); - if (err) { - device_printf(dev, "Unable to allocate VSI Queue maps\n"); - goto free_main_vsi; - } /* Allocate MSI-X vectors (due to isc_flags IFLIB_SKIP_MSIX) */ err = ice_allocate_msix(sc); @@ -3518,12 +3514,7 @@ ice_setup_mirror_vsi(struct ice_mirr_if *mif) mif->vsi = vsi; /* Reserve VSI queue allocation from PF queues */ - ret = ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES); - if (ret) { - device_printf(dev, "%s: Unable to allocate mirror VSI queue maps (%d queues): %s\n", - __func__, ICE_DEFAULT_VF_QUEUES, ice_err_str(ret)); - goto release_vsi; - } + ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES); vsi->num_tx_queues = vsi->num_rx_queues = ICE_DEFAULT_VF_QUEUES; /* Assign Tx queues from PF space */ From nobody Mon Sep 30 04:45:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mj3bmXz5XkLc; Mon, 30 Sep 2024 04:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mj1NF0z4Fnl; Mon, 30 Sep 2024 04:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qw2VGB7ZG+WK4byvf5gqomghVH97Ksm9T78Mb1WbE+4=; b=YNbBG3bWdIj8RjZn92XPRgkgx1GSmeZMenKRwDm9Vsy5WAtIyukDWCr0Msk35zEDaS4xV/ M5GZ/IYHKwYvvawGrSI9GXkjmDLTqqSxWvhyMEOYdnEXifuuCnAlE4n+SB3iFsU8b2S1XK WIqOuqron4fbdd4CX94qnOe40fU3twMUyVQcLSvH2m7v2VaSdSX4NSPmxOkklz7heLwMD9 GJZ6cpn0PNr/UxFVSPBWOUBU1UJCEbWvY/I8dsJBhCGqEjj03sL8JUYqvn4M+LBLHV8znY cnD2m5KF5p2tVA2cfU3EsS5vUrw3mHud3ZFTNOiqPTZU/QbYTJOTzSknX/AQXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qw2VGB7ZG+WK4byvf5gqomghVH97Ksm9T78Mb1WbE+4=; b=j67x7I6MioIbxM9l/eD0iUblI8f6LiWJ5uR68n5929pGM34B6VvzGpV3RJk/eKqm7rdw+0 Y2ModmM6yErbPHrqYHtivcw5hZwhNpe2NiK54w2sQ0FJvSBsfrF9sWYErW0ls4ji1TJxiy x8wRUrAujH3izmlWQ7COtlNh6nrQitPwwk9py7PqUrFnDETnz2TBhyf/s482/Pq1n1ivQb xtMqD4dFZsfR7Lr3DfYXU892djlYny59kOtNyb4z55YnTraqR2Ors+oK/DaPa2R/tL4ZM9 Lxh0NIA/bD1mmaj3SG3ASKxdz47GQ/1fX4a6JBBrjsbCa7OpNeHjVHOI2Qcl2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671541; a=rsa-sha256; cv=none; b=wzDUCpR+hG8/sDIGZwJY8lFeX7EiBZo7VV4exHd6z2LnmtDCljzPZ0GXCFn9rAoK8SE1BK B1c6kGyIHOVxqluE7enjrLp/0hFFFau22X60O1WVOxtu+MlA49RUeZm9VudtAcGK7lawPn ebV1oakZXq7LYTu05eSwPb1Vb+IZoZKBGY9gTM+9ZjT5YHgI5X4pGYBpstamu4bPUeO/H0 nMiQp8TYf8vUwZloXggQ+RsItyPw4Qs1Nq6vosL526WpKTRDrNWi08ybfg2LG3kQaM22Be 5Qed1hJzeR6blTMmlpcHnpknt0bl6V6usVNqfgxxadpu3MNgWkPwQeug6g3F1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mj02ZfzfFw; Mon, 30 Sep 2024 04:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jeYO087641; Mon, 30 Sep 2024 04:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jeYd087638; Mon, 30 Sep 2024 04:45:40 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:40 GMT Message-Id: <202409300445.48U4jeYd087638@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: ec68da0a7e6e - stable/14 - iser(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec68da0a7e6e8041672f515a6d09fe43ce8838a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ec68da0a7e6e8041672f515a6d09fe43ce8838a1 commit ec68da0a7e6e8041672f515a6d09fe43ce8838a1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:30 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:23 +0000 iser(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 40a6bbc4284111790d9240f8a24ef11a9a9ecb07) --- sys/dev/iser/iser_verbs.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/dev/iser/iser_verbs.c b/sys/dev/iser/iser_verbs.c index f5f057b961ef..f0c7e524ccf0 100644 --- a/sys/dev/iser/iser_verbs.c +++ b/sys/dev/iser/iser_verbs.c @@ -212,8 +212,6 @@ iser_create_device_ib_res(struct iser_device *device) device->comps = malloc(device->comps_used * sizeof(*device->comps), M_ISER_VERBS, M_WAITOK | M_ZERO); - if (!device->comps) - goto comps_err; max_cqe = min(ISER_MAX_CQ_LEN, ib_dev->attrs.max_cqe); @@ -280,7 +278,6 @@ cq_err: ib_dealloc_pd(device->pd); pd_err: free(device->comps, M_ISER_VERBS); -comps_err: ISER_ERR("failed to allocate an IB resource"); return (1); } @@ -343,11 +340,6 @@ iser_create_fastreg_desc(struct ib_device *ib_device, struct ib_pd *pd) int ret; desc = malloc(sizeof(*desc), M_ISER_VERBS, M_WAITOK | M_ZERO); - if (!desc) { - ISER_ERR("Failed to allocate a new fastreg descriptor"); - return (NULL); - } - ret = iser_alloc_reg_res(ib_device, pd, &desc->rsc); if (ret) { ISER_ERR("failed to allocate reg_resources"); @@ -509,9 +501,6 @@ iser_device_find_by_ib_device(struct rdma_cm_id *cma_id) goto inc_refcnt; device = malloc(sizeof *device, M_ISER_VERBS, M_WAITOK | M_ZERO); - if (device == NULL) - goto out; - /* assign this device to the device */ device->ib_device = cma_id->device; /* init the device and link it into ig device list */ From nobody Mon Sep 30 04:45:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7ml6nMfz5Xjvq; Mon, 30 Sep 2024 04:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7ml2Sngz4Flx; Mon, 30 Sep 2024 04:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZbakR542Y5Cy/9+paqeGhk4mxJKrgWlefC5ioSdoU3E=; b=UZFhjAGO19UYdBr+zzqJsP91cCkNZn0ATkxWDZInCKsBitNm3oUpBwxtZwHK7fEQiRpDZm ypdz98mgXQNOQ4HKVEURAQIht0RsH88mEbg/VvDSHd7bAx1hy6V2T0q3wCNp4016SbYZVL +IIz9d//vCxwxcczNMXFbgsUej7JDNpcXfm8689QhzMJHMsFenTf2iKnb5qgwt65X/X004 e663MXkZLLWSHbAAsvYzb+9bnu6irEf7+cyt5t/k+ie6ehkuYu2t5Fbp7OYGoX7CPEUn/J oVXcWicCJn8KcLAW/CKmD4IMoIk8JD4Tjc/pFw0mvRBli/gTnzRiiQ9jgNJGoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZbakR542Y5Cy/9+paqeGhk4mxJKrgWlefC5ioSdoU3E=; b=lZfB6xC04+m4dnpgiQDffAyndu4DLYY7j9jSCKTu1kDTmRFXnyO0TiGdZuf9aRYmBC5hLE zh/qEdhL5dLvum8zttVNFMbEU1lQxACvr4+gIWbl9pn2bsceXpkLNJxubdOtg/Z9vIAEdL L+L/zFozRif/y4kuOaagD6YWon33tcaF0tRB9jxy+j6j3RmnS2DrddpCw79+rl/jYmQZ9/ 9/rIMOJ8tsh1WSNOAye4R3HcZBOzv0fiGq+AGJm5qFbiU9lpZYUdqqBpUNK2OxjBUGeRCb 0NWwATk8x35DzMmZH4ldJ6iJZdaGSM9rj5LwvoBFGgn3YtytDrN8ld+Fw/VQSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671543; a=rsa-sha256; cv=none; b=UGXt1T9gxy94H252YYR3QpgV5Ai3WFplNOvsZL6D/XeK2CsCAksltFM9IZ7PQUb4/4JvXJ +WQW0X8k42rvGBwbq+zKAJPP33NjnzL3ZBzTSN0wBtWmDxeF3ysX0HHhAvsVk+jwhDypT8 7NT4cNSdR9zRmzZtlWf18fcxahvLs4md6Thw4jPKMOFMuIWt4nCZ/WM1L8JCoDq32ayVte pwB2//bLGFPogN69040xpPZEK+UT0GR5E1BPYtCNSxOSXjizYnFuH2z51fbCsG8O3QdFY4 gVWjJ29bTlLD8Gye+YNSYi8oH4XYyUp0TBmv4eu5IMqYLUq9CVsEL6OlrkZsBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7ml1HwMzfbk; Mon, 30 Sep 2024 04:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jh8v087746; Mon, 30 Sep 2024 04:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jhim087743; Mon, 30 Sep 2024 04:45:43 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:43 GMT Message-Id: <202409300445.48U4jhim087743@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: 4fee8d3e92c6 - stable/14 - mfi(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4fee8d3e92c69d5865a7ef1a9102399b6fdeb9bc Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4fee8d3e92c69d5865a7ef1a9102399b6fdeb9bc commit 4fee8d3e92c69d5865a7ef1a9102399b6fdeb9bc Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:24 +0000 mfi(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 701308ef404f552034f8c3e3e912b41bfef28ee6) --- sys/dev/mfi/mfi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 3a61559d4605..f95ba0341a70 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3633,11 +3633,8 @@ out: mfi_aen_entry = malloc(sizeof(struct mfi_aen), M_MFIBUF, M_WAITOK); mtx_lock(&sc->mfi_io_lock); - if (mfi_aen_entry != NULL) { - mfi_aen_entry->p = curproc; - TAILQ_INSERT_TAIL(&sc->mfi_aen_pids, mfi_aen_entry, - aen_link); - } + mfi_aen_entry->p = curproc; + TAILQ_INSERT_TAIL(&sc->mfi_aen_pids, mfi_aen_entry, aen_link); error = mfi_aen_register(sc, l_aen.laen_seq_num, l_aen.laen_class_locale); From nobody Mon Sep 30 04:45:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mm5QdZz5XkSY; Mon, 30 Sep 2024 04:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mm3W44z4FrV; Mon, 30 Sep 2024 04:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqKJvQPfg5EckMCCNO/5+g7ELeLYWLZmwFp5shGyKVg=; b=x90Cir03/dl5+v4Le7kl3ef7zJlZii6IAOH1emlaMy9pDen5U3FH9N/8wfemDqvatNIsnG peFsWx7U0L3uiCjMBhCV8seGQlvnFuare+jO5HcyrGEDiYCCnar6S+WHbPOs7d9dZ/+hYb kgy2cJ7K1x9rtUXROcQUwUcigBa4YgxuTjG5ZKSqwFQl6LKnn156psvVH0x6U+2+uX+kfq m4nni6Z6TF8oPZuNNnvHedT1e3HlW+AZ/dntrW/B9zjWOoDkyN7cfBWWDPD2OKn/O+q1uw kB2GSPBiXoEjqcMtbqVv+rhWNgYKUMKjExPm5+zmWyPkF4Kfszd/XX0NPKoTfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqKJvQPfg5EckMCCNO/5+g7ELeLYWLZmwFp5shGyKVg=; b=EavbMhUrtvhXS7nzzp1RpMzc2omcvnVgkdae6swhOGW9ZnjR2FJE4bogSiSVjzEQrYzdmZ 02pPnxzrxp6BCnwTwqCLEhKq/6ekmt7BzZMXNXASy91X7pkstplZyYBAZ+vbCRb1E3ZiUO c1z+kmjOZN1pwKyEF9EoS4odZshJrIyXkC/EFpDFf/4+d8c1HjoBf8Er1TeGqLcqelON0L y6RCnKiTr8kIv4nOG5nud9QMS50rk8ikD3JOPTGlIrJeWSbM5UQK4t1hOELQrJ0cgYQnHn fSBYCvvzTScGwSSKYE+MA9+WlJl+iXfIIxRK/S5oIE9cqB4naErQxdYBsxUktg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671544; a=rsa-sha256; cv=none; b=GVINs9dyRY36ig0MINfGiZ0ERSQaoRwAZVPJ6l9tADsoe/Y0h6vT6Q/dgbEGE1ulVfI0qJ MBSu2UKLulEZgKsKvGSgGRUOtuJecsjXlI3c7OMqWBlF15HUwvplvCF1StYtQ0V4SvUyHg 7k0sO8I0S01+e31c2x7wrNv0ZGz26xdxA6BQ4ZYcR+w951cCy+6CTxZyaFzx4OZ83hSwdJ f+vjgB49t2w6ftWq1FS3EOMfYdgn/TacsTI1MeA29XX8TAi0U5ZJ89khQyLJzVJBgymIvx ui1/CQkAwqbh2vifyNbzpKpSgZ/npQpkJ0FGiu6KmhATeWL7Z+N6yWBmlXK7wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mm2d9Qzf9W; Mon, 30 Sep 2024 04:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jiCP087795; Mon, 30 Sep 2024 04:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jilf087792; Mon, 30 Sep 2024 04:45:44 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:44 GMT Message-Id: <202409300445.48U4jilf087792@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: cf44738feb83 - stable/14 - mlx(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf44738feb83b03f0726ae1dab83daf371aa2f0a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cf44738feb83b03f0726ae1dab83daf371aa2f0a commit cf44738feb83b03f0726ae1dab83daf371aa2f0a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:24 +0000 mlx(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 556cd18fb07604e3442819b221afb2a19b924dbd) --- sys/dev/mlx/mlx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index bed697b0423c..63a31652682b 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -2075,8 +2075,8 @@ mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu) goto out; } MLX_IO_UNLOCK(sc); - if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK)) == NULL) || - (error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) { + kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK); + if ((error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) { MLX_IO_LOCK(sc); goto out; } From nobody Mon Sep 30 04:45:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mk53drz5Xjxj; Mon, 30 Sep 2024 04:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mk1c75z4FgQ; Mon, 30 Sep 2024 04:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIC+XcId4LkbyGq5dQEuVwLvIAA93EQcQeRGPISfG34=; b=KBBwDvt92jtAfMgaCXPUBQ5kaZoyXlMqae8xI0PEo5jU0ALyXgM2KC2YGCGJ0q4OLpI9OL FGE13GJhnhrFTgI0PQ9ABI1rAEbEsrso3dhCPdmB6J2BFdJZonYyM+bBXmJ1gX8KxoXHN3 qaSnsLyjgkYOA3xYlvGizbZ8Z+sm9Ds9aXqQnhA+ZcwGn2yYoynNibhfFpF+AvdNUL1Zyk 1q1e/S+xPUQ8n1fqdaZmcmqoZyf1CJDteIo+dH1DfSAy0zHFfTeYthFo3zMxF95ORlQt2p QjyChaauJ+9ZrD7fmhnKb4/Zf3FVQ9PrTiiQiVhH9y89EShcEm0mc1QsnF9L/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIC+XcId4LkbyGq5dQEuVwLvIAA93EQcQeRGPISfG34=; b=K88Q5x5kvTrm8dJ+CpQ3/Rv3yDePxmT7N7RtlxeIx9BMPpeDyc0k0M1E3OCt+ZmuT27hqK pn2Ip34ot3UOlXNkacMtzJJMsML38GNWgwBOrCFNHhJw/kwPPsB+Uiv3u5T90ApARiu8aB 6JX1hlOhjH/rgHmJZCC9eTO0kIth7AVQnVlLmwGa2SFhVQsWt92hm23ZW06QsgZDgWVvLg Nn1h+oZDvRVD+vYTfiEX2XwFnNS5PbnoXAgXFBx2TXB3RfAUE9hA0lyKBG8fj/X2aVndcf 4p3FcWSOlpn6hHLds0Di9JNwNhqM8Wz6iW15hpGYH4GhMP0u/oobCE4+N6d6UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671542; a=rsa-sha256; cv=none; b=hNgVZGa/fbb6okRq+DmuCvkf1nhpqwAtqrsugWUKNHshexa5SXOFJs9lzjJtsczaCcSs2k GlKLAyhLdE92YbPAuXHUWH+IhrD0sAKspBtpO+dziasOozba8uKRjTcgqpEcBJ6NvbVmRM Ra6Hsq8Lnbz6w0xV03FFN/4B1G5AW6n5n/lnlgDCFlVChx+MBezTpCl25W4+RDCl9JMibF CQNX4PDwKh3BTedKDsnlrVJu3Lob5NSfPtIxmX9kODl6/OyvO18guViKIfPX/AIkqWBy0B Lrslq+FaOx2rHigmBD9KVrtbal6vC7o0kyZuNQ0cziR+CsNvI0MqHkVOfKTq4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mk0gMBzfbj; Mon, 30 Sep 2024 04:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jfQU087695; Mon, 30 Sep 2024 04:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jf5V087692; Mon, 30 Sep 2024 04:45:41 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:41 GMT Message-Id: <202409300445.48U4jf5V087692@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: 0fa85665105b - stable/14 - mana: Stop checking for failures from malloc/mallocarray/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0fa85665105baa1fafe22608304b4eddb2ad8949 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0fa85665105baa1fafe22608304b4eddb2ad8949 commit 0fa85665105baa1fafe22608304b4eddb2ad8949 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:30 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:24 +0000 mana: Stop checking for failures from malloc/mallocarray/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 1dc7a7b74b5ad37ff7c8dc22f1a710460a5f1dcd) --- sys/dev/mana/gdma_main.c | 19 ------------------- sys/dev/mana/hw_channel.c | 17 ----------------- sys/dev/mana/mana_en.c | 41 ----------------------------------------- 3 files changed, 77 deletions(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index d0438f127b83..090f6382b071 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -868,9 +868,6 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd, int err; queue = malloc(sizeof(*queue), M_DEVBUF, M_WAITOK | M_ZERO); - if (!queue) - return ENOMEM; - gmi = &queue->mem_info; err = mana_gd_alloc_memory(gc, spec->queue_size, gmi); if (err) @@ -962,9 +959,6 @@ mana_gd_create_dma_region(struct gdma_dev *gd, } req = malloc(req_msg_size, M_DEVBUF, M_WAITOK | M_ZERO); - if (!req) - return ENOMEM; - mana_gd_init_req_hdr(&req->hdr, GDMA_CREATE_DMA_REGION, req_msg_size, sizeof(resp)); req->length = length; @@ -1008,9 +1002,6 @@ mana_gd_create_mana_eq(struct gdma_dev *gd, return EINVAL; queue = malloc(sizeof(*queue), M_DEVBUF, M_WAITOK | M_ZERO); - if (!queue) - return ENOMEM; - gmi = &queue->mem_info; err = mana_gd_alloc_memory(gc, spec->queue_size, gmi); if (err) @@ -1056,9 +1047,6 @@ int mana_gd_create_mana_wq_cq(struct gdma_dev *gd, return EINVAL; queue = malloc(sizeof(*queue), M_DEVBUF, M_WAITOK | M_ZERO); - if (!queue) - return ENOMEM; - gmi = &queue->mem_info; err = mana_gd_alloc_memory(gc, spec->queue_size, gmi); if (err) @@ -1480,9 +1468,6 @@ mana_gd_alloc_res_map(uint32_t res_avail, r->map = malloc(n * sizeof(unsigned long), M_DEVBUF, M_WAITOK | M_ZERO); - if (!r->map) - return ENOMEM; - r->size = res_avail; mtx_init(&r->lock_spin, lock_name, NULL, MTX_SPIN); @@ -1616,10 +1601,6 @@ mana_gd_setup_irqs(device_t dev) gc->irq_contexts = malloc(nvec * sizeof(struct gdma_irq_context), M_DEVBUF, M_WAITOK | M_ZERO); - if (!gc->irq_contexts) { - rc = ENOMEM; - goto err_setup_irq_release; - } for (i = 0; i < nvec; i++) { gic = &gc->irq_contexts[i]; diff --git a/sys/dev/mana/hw_channel.c b/sys/dev/mana/hw_channel.c index 1ecd276c0152..1d6a896d79dc 100644 --- a/sys/dev/mana/hw_channel.c +++ b/sys/dev/mana/hw_channel.c @@ -416,8 +416,6 @@ mana_hwc_create_cq(struct hw_channel_context *hwc, cq_size = MINIMUM_SUPPORTED_PAGE_SIZE; hwc_cq = malloc(sizeof(*hwc_cq), M_DEVBUF, M_WAITOK | M_ZERO); - if (!hwc_cq) - return ENOMEM; err = mana_hwc_create_gdma_eq(hwc, eq_size, ctx, callback, &eq); if (err) { @@ -438,10 +436,6 @@ mana_hwc_create_cq(struct hw_channel_context *hwc, comp_buf = mallocarray(q_depth, sizeof(struct gdma_comp), M_DEVBUF, M_WAITOK | M_ZERO); - if (!comp_buf) { - err = ENOMEM; - goto out; - } hwc_cq->hwc = hwc; hwc_cq->comp_buf = comp_buf; @@ -476,8 +470,6 @@ mana_hwc_alloc_dma_buf(struct hw_channel_context *hwc, uint16_t q_depth, dma_buf = malloc(sizeof(*dma_buf) + q_depth * sizeof(struct hwc_work_request), M_DEVBUF, M_WAITOK | M_ZERO); - if (!dma_buf) - return ENOMEM; dma_buf->num_reqs = q_depth; @@ -560,8 +552,6 @@ mana_hwc_create_wq(struct hw_channel_context *hwc, queue_size = MINIMUM_SUPPORTED_PAGE_SIZE; hwc_wq = malloc(sizeof(*hwc_wq), M_DEVBUF, M_WAITOK | M_ZERO); - if (!hwc_wq) - return ENOMEM; err = mana_hwc_create_gdma_wq(hwc, q_type, queue_size, &queue); if (err) @@ -669,8 +659,6 @@ mana_hwc_test_channel(struct hw_channel_context *hwc, uint16_t q_depth, ctx = malloc(q_depth * sizeof(struct hwc_caller_ctx), M_DEVBUF, M_WAITOK | M_ZERO); - if (!ctx) - return ENOMEM; for (i = 0; i < q_depth; ++i) init_completion(&ctx[i].comp_event); @@ -719,9 +707,6 @@ mana_hwc_establish_channel(struct gdma_context *gc, uint16_t *q_depth, gc->cq_table = malloc(gc->max_num_cqs * sizeof(struct gdma_queue *), M_DEVBUF, M_WAITOK | M_ZERO); - if (!gc->cq_table) - return ENOMEM; - gc->cq_table[cq->id] = cq; return 0; @@ -782,8 +767,6 @@ mana_hwc_create_channel(struct gdma_context *gc) int err; hwc = malloc(sizeof(*hwc), M_DEVBUF, M_WAITOK | M_ZERO); - if (!hwc) - return ENOMEM; gd->gdma_context = gc; gd->driver_data = hwc; diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 50a6192e5fbc..d5efb071a07e 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -921,13 +921,6 @@ mana_init_port_context(struct mana_port_context *apc) apc->rxqs = mallocarray(apc->num_queues, sizeof(struct mana_rxq *), M_DEVBUF, M_WAITOK | M_ZERO); - if (!apc->rxqs) { - bus_dma_tag_destroy(apc->tx_buf_tag); - bus_dma_tag_destroy(apc->rx_buf_tag); - apc->rx_buf_tag = NULL; - return ENOMEM; - } - return 0; } @@ -1156,8 +1149,6 @@ mana_cfg_vport_steering(struct mana_port_context *apc, req_buf_size = sizeof(*req) + sizeof(mana_handle_t) * num_entries; req = malloc(req_buf_size, M_DEVBUF, M_WAITOK | M_ZERO); - if (!req) - return ENOMEM; mana_gd_init_req_hdr(&req->hdr, MANA_CONFIG_VPORT_RX, req_buf_size, sizeof(resp)); @@ -1325,8 +1316,6 @@ mana_create_eq(struct mana_context *ac) ac->eqs = mallocarray(gc->max_num_queues, sizeof(struct mana_eq), M_DEVBUF, M_WAITOK | M_ZERO); - if (!ac->eqs) - return ENOMEM; spec.type = GDMA_EQ; spec.monitor_avl_buf = false; @@ -2043,8 +2032,6 @@ mana_create_txq(struct mana_port_context *apc, if_t net) apc->tx_qp = mallocarray(apc->num_queues, sizeof(struct mana_tx_qp), M_DEVBUF, M_WAITOK | M_ZERO); - if (!apc->tx_qp) - return ENOMEM; /* The minimum size of the WQE is 32 bytes, hence * MAX_SEND_BUFFERS_PER_QUEUE represents the maximum number of WQEs @@ -2141,14 +2128,6 @@ mana_create_txq(struct mana_port_context *apc, if_t net) txq->tx_buf_info = malloc(MAX_SEND_BUFFERS_PER_QUEUE * sizeof(struct mana_send_buf_info), M_DEVBUF, M_WAITOK | M_ZERO); - if (unlikely(txq->tx_buf_info == NULL)) { - if_printf(net, - "Failed to allocate tx buf info for SQ %u\n", - txq->gdma_sq->id); - err = ENOMEM; - goto out; - } - snprintf(txq->txq_mtx_name, nitems(txq->txq_mtx_name), "mana:tx(%d)", i); @@ -2156,13 +2135,6 @@ mana_create_txq(struct mana_port_context *apc, if_t net) txq->txq_br = buf_ring_alloc(4 * MAX_SEND_BUFFERS_PER_QUEUE, M_DEVBUF, M_WAITOK, &txq->txq_mtx); - if (unlikely(txq->txq_br == NULL)) { - if_printf(net, - "Failed to allocate buf ring for SQ %u\n", - txq->gdma_sq->id); - err = ENOMEM; - goto out; - } /* Allocate taskqueue for deferred send */ TASK_INIT(&txq->enqueue_task, 0, mana_xmit_taskfunc, txq); @@ -2353,9 +2325,6 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, rxq = malloc(sizeof(*rxq) + RX_BUFFERS_PER_QUEUE * sizeof(struct mana_recv_buf_oob), M_DEVBUF, M_WAITOK | M_ZERO); - if (!rxq) - return NULL; - rxq->ndev = ndev; rxq->num_rx_buf = RX_BUFFERS_PER_QUEUE; rxq->rxq_idx = rxq_idx; @@ -2808,12 +2777,6 @@ mana_probe_port(struct mana_context *ac, int port_idx, *ndev_storage = ndev; apc = malloc(sizeof(*apc), M_DEVBUF, M_WAITOK | M_ZERO); - if (!apc) { - mana_err(NULL, "Failed to allocate port context\n"); - err = ENOMEM; - goto free_net; - } - apc->ac = ac; apc->ndev = ndev; apc->max_queues = gc->max_num_queues; @@ -2892,7 +2855,6 @@ mana_probe_port(struct mana_context *ac, int port_idx, reset_apc: free(apc, M_DEVBUF); -free_net: *ndev_storage = NULL; if_printf(ndev, "Failed to probe vPort %d: %d\n", port_idx, err); if_free(ndev); @@ -2915,9 +2877,6 @@ int mana_probe(struct gdma_dev *gd) return err; ac = malloc(sizeof(*ac), M_DEVBUF, M_WAITOK | M_ZERO); - if (!ac) - return ENOMEM; - ac->gdma_dev = gd; ac->num_ports = 1; gd->driver_data = ac; From nobody Mon Sep 30 04:45:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mq0Vtrz5XkLy; Mon, 30 Sep 2024 04:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mp4tbcz4Fk5; Mon, 30 Sep 2024 04:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=APpUK+0Qb/hGPg+8HgvJUpSghA+7WKi4CnhCPPmQY0U=; b=gCU5W3ZHUh00lpxwX50RtkJFNrOz1y1PRzwZKVkhZF4JGgl70ws1PGnN5PDbvLX+y9/Xwd hV3Jc3Lqorkrc+2GX8TKc51UufbGOsDqrAWqxazVJWiy2oPX6+vOM5Z1ZPMsBZjPuJSbjp noGfcVZe7bXE8Nq1PJnDCYa7Na96Tw/ufpkN8GJF3pT9wbLwAxv3wmA5ahvQZKT2f69kDi NP/rmPSIXB4SgcOrXus+wSfB+pHLuDAuazyyG2TEHqY8FHWhpZOiJrNKMfeDWrX3Mq4x/l LfAjIrZUGzyGbZnMkj9+ORN3ND/fUoGK3WiO3I3TmP+vwA7yZAtkCaOJv53bBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=APpUK+0Qb/hGPg+8HgvJUpSghA+7WKi4CnhCPPmQY0U=; b=YddT/Quwc93EOf1OlU24uF8fqQq/lAiLkBj0eauBymQlRgtkMcPurWQIj3q6NNJtojqUAE yLg5ydm3lt8CutDa14xcHMA37fQ+hfMRcOSccILeS4VV+F5gmda0UpKsoZqJA0jcGpVo/9 rfGLGsjNMvXuIgAW0sHXWLQw80TcKIxLSlX2rexJF22ORZ1o0OAy7+9+UEO8VUVBQtK3AR jfamG5P1KcfB/Id1VL64PxrqJpxOOleYYr3eVQP4knHHiPdqftGjhxl0nLUwK1fnruD3S0 M3fSxaoSEgLT0CSGGzoDFY0cvDvT387zq/XVRAoQZeMZaNA8dXNbcehMoRo/ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671546; a=rsa-sha256; cv=none; b=WCCi0dEaTyIwlJX85VPWDIiF9GMzWLXWwo4PEWWZX9L1h9QPaDIRbfAvJNp4uVaLMtd/2Y sG4Ce41esBzollS3D6ASSsZFagyIdRV4Rsowd+zmYho/YJboKMvkxhq+vju3Xk5J1rrUzY 5v1P+5+WTefzXOwXRs6LbpT1lY2MUxyQSZdfsDC4SLkou9Ex+Wy2GHxKmGZkZVYDPvnHFk IIH8V4p/fe5Ds6v52Tu+vYUtPcnLMRKL1sIgJ2dhFDFyikQ5xP/I0rj/HSVQ9yUwgqQFi7 QFT/qUtjY4b7tZ82CrFbza7LYzsy6XDgl7DZj8HJQE0oJvCbB/dnD5u/JtzlUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mp3v7vzf9X; Mon, 30 Sep 2024 04:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jkAf087898; Mon, 30 Sep 2024 04:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jk7B087895; Mon, 30 Sep 2024 04:45:46 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:46 GMT Message-Id: <202409300445.48U4jk7B087895@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: 3e51da349563 - stable/14 - mrsas(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e51da34956345ca736944c8a296bb9103a01c6c Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3e51da34956345ca736944c8a296bb9103a01c6c commit 3e51da34956345ca736944c8a296bb9103a01c6c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:25 +0000 mrsas(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit a38d9ad473123dca86108651ba10740055720777) --- sys/dev/mrsas/mrsas_ioctl.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/dev/mrsas/mrsas_ioctl.c b/sys/dev/mrsas/mrsas_ioctl.c index 74eacfbeb9fa..8a85544604a4 100644 --- a/sys/dev/mrsas/mrsas_ioctl.c +++ b/sys/dev/mrsas/mrsas_ioctl.c @@ -462,13 +462,6 @@ mrsas_user_command(struct mrsas_softc *sc, struct mfi_ioc_passthru *ioc) kern_sge[0].length = 0; } else { ioctl_temp_data_mem = malloc(ioc->buf_size, M_MRSAS, M_WAITOK); - if (ioctl_temp_data_mem == NULL) { - device_printf(sc->mrsas_dev, "Could not allocate " - "%d memory for temporary passthrough ioctl\n", - ioc->buf_size); - ret = ENOMEM; - goto out; - } /* Copy in data from user space */ ret = copyin(ioc->buf, ioctl_temp_data_mem, ioc->buf_size); @@ -483,12 +476,6 @@ mrsas_user_command(struct mrsas_softc *sc, struct mfi_ioc_passthru *ioc) */ passcmd = malloc(sizeof(struct mrsas_passthru_cmd), M_MRSAS, M_WAITOK); - if (passcmd == NULL) { - device_printf(sc->mrsas_dev, "Could not allocate " - "memory for temporary passthrough cb struct\n"); - ret = ENOMEM; - goto out; - } passcmd->complete = 0; passcmd->sc = sc; passcmd->cmd = cmd; From nobody Mon Sep 30 04:45:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mp1sgXz5XkQD; Mon, 30 Sep 2024 04:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mn4Tzsz4Fgq; Mon, 30 Sep 2024 04:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4m4LrKCtYGwIxS0pI/Dq0kEAGPAXu+ch8Ftz252TGkA=; b=Lxn8INGXGKuaZDjHEi4EH72W4MFnyOouUHt0VR2CVZLsHrSpOMjJL4M7cccArCHcuXOyF0 IbLP2AIKNuVnFjg53TOghiGcLw7LYomLphW3D8BUXiGBH0OMpLafdOQ6NhgMHaeYa/qiG6 gPmymmC5fcyNJba6yPKPqqKavWCUCSCiR9Nf5u58R7yqbshjzPhDBDEC5BtlVsTk/vfYVU MvMflHMrP1I3IY0Qdl5Yn54rdfPdibDA/DsB2wE8uv8AtfBXD0a3P1cK+UHQD/yDbljUIH 79N16eoszUJmN9VQhcnGVfzjPl78ybM10iQkcgfAINTCAuJCWOqjd1YpgBr0Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4m4LrKCtYGwIxS0pI/Dq0kEAGPAXu+ch8Ftz252TGkA=; b=Mr9ps61IkSs+/7ZKCyo4HZt2rdJ+rYmFTG3PMMegoVptNYW7vAkPPqo+Ac4TeX0PoyWRRI 3JswRMxN3QkiVN4BJxz255DFy7kD6qpkSak5LfNlQOOzRlVdI9Lq2rcipuAAHON0I0hpn7 SsZ8jULC8dudQqfB6vsN6L8w4jTUbShPZLL0sNXdDdrcAKILkw8AZZSLxSOm9m2i+hRUuo hsQPqy5lRcxjx632gOqGYvzb9DmbsmbVgm+nKluaWgdEbeaUsQdsTbAqmW67Ax4x6EW9f2 kPOoBUoZUJ9sva+3CFLqpB+QreX/q1IHJdpMUxx1kNk3C9SgTS9hcqrZ1TB7lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671545; a=rsa-sha256; cv=none; b=uXoXLpw07z1GwoS/YhxPlGLS3PnxPFgcY7yTmylLu8sw94dFYn4Z4ACCLJJtyhLMVX9vjw bCHeeKLjDEwLKmgvToh0e7txfcmpPdUcYeVhIanxpKNRQH5aJmPwnKKNYtENvpnoQC5Bwu 64HmaYBEU7JwD5icBkT9iqiQ7u3kbNLmYtKIcArXYW3kT7riOKLt2k1D0/Qbup5KOzzBi6 KTe1mbIkbGYNz7RH1t8t1Vqq1nX5+opcak+VToPu9Ah49mrxtRKFgNH2uCKGVFwjcoKHRH 5A+3wPtHTPttW7ylASIUKiI43YyjIY/mnxZyuwkjI0Ue75jXn567dkZfow2ahQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mn3fkgzfPk; Mon, 30 Sep 2024 04:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jjZD087845; Mon, 30 Sep 2024 04:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jj3t087842; Mon, 30 Sep 2024 04:45:45 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:45 GMT Message-Id: <202409300445.48U4jj3t087842@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: ae8388f726b5 - stable/14 - mpi3mr(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae8388f726b57773b9c7e7cd93966b27d39321dd Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ae8388f726b57773b9c7e7cd93966b27d39321dd commit ae8388f726b57773b9c7e7cd93966b27d39321dd Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:25 +0000 mpi3mr(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 849f9ac370bd66993ce5cc6fca0d2ef9bd03c2c9) --- sys/dev/mpi3mr/mpi3mr_cam.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 4d17bb2338e5..7cc7c76cc202 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -2065,12 +2065,6 @@ mpi3mr_cam_attach(struct mpi3mr_softc *sc) mpi3mr_dprint(sc, MPI3MR_XINFO, "Starting CAM Attach\n"); cam_sc = malloc(sizeof(struct mpi3mr_cam_softc), M_MPI3MR, M_WAITOK|M_ZERO); - if (!cam_sc) { - mpi3mr_dprint(sc, MPI3MR_ERROR, - "Failed to allocate memory for controller CAM instance\n"); - return (ENOMEM); - } - cam_sc->maxtargets = sc->facts.max_perids + 1; TAILQ_INIT(&cam_sc->tgt_list); From nobody Mon Sep 30 04:45:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mr2R60z5XkQH; Mon, 30 Sep 2024 04:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mq5xx5z4FdF; Mon, 30 Sep 2024 04:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vQ1Ey+XJm+K392QC8iBCEtnlxP5VyxY23bMGgDCvQ8o=; b=fME8ss55PLqVOXQFgaL9FIBE+TWQvW3rv/ygTFxloDGr9XItcLC83PLrwp7ta6Bgh86+3N JzAI+cLL70r4NZTh5fRiTie4J9fFh5amr3k17dAkr5EIIUhwi+yAJYdxG1fasn3rEdvqiU O2tJvGVb40tc9ZUSqQ6nVmCq57NHQi2js220+0Q4uD55VChp0n2rJ0NrqzZlN5iH8+1jLE bX/RwnR49Nxc7Z8f1HqzB3PeXsjAVrk8z0uT7ChZASeylP5cPanHjM3HBAfufKSFeOvYwt P6Gl70q8eJtsd6Zd+GGal0xPmTgtYmyqwN+x4OUFrSIRB9RJ+BdeOOUKmWonLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vQ1Ey+XJm+K392QC8iBCEtnlxP5VyxY23bMGgDCvQ8o=; b=Mv4ZpCs9niyF9NA3zXzjXOfLuL9/mfoxhioMnemK4urACH8d/dfajtqOv0CD1Nt5p+ZmNJ J3fL3DpLrjf2LeSKzv7TFCqV46Rz0WeZS9OioJ4W0mLVXm+8fm7fL22TDEVLt1OlZ6k7oc Yrp/hyLs+AdkAKkwC8lTD2MH2qbCw30aYbzOBz7Kl/VijXuEABCdlZ9CKVHIOe086g00RG AS4uanc5lcudX+mREVwgMpPZnn9yrNQ1lGKaV8Pv11JIKjwWgiw8vlJkEENehQ68pzHbyP h+pVzhbMFaFDBTFMw7LEufTfOndld+W79bTzzN+I8ILFD1GAmbc3UHwT8+Jbww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671547; a=rsa-sha256; cv=none; b=wh+GbVGHaLOe/bnae+65bjZ7vC8c+smb2C1H8dq4mFwoG16yTdsOI/EM8GaOySJauUKbtf zkDKwnZO4GNG2M3qcKBpCZCwYAN19Q7vWKDNFmOverEjZVidZRQkc60XHJQOlYWN40EmWO bDzPtj774TN2s9pN4GXgY+ptNZqXJw6M8gr5jeIHKn9n/ehT4vqGbnNhGp8K48dy/WzOZK NSbHIyhEhM+TgnZeB4B29tcqoY75jyVwNy07n1E9algelLi5RhVYuNjdWQyWVBwqiXm5aU tnVznY0Up7YWxZrAaI2ny0ZQIK8okDXTespAhRZ/kDnNw8XwTnZWBEZV9kU5mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mq4th3zfPl; Mon, 30 Sep 2024 04:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jlj6087949; Mon, 30 Sep 2024 04:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jlfe087946; Mon, 30 Sep 2024 04:45:47 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:47 GMT Message-Id: <202409300445.48U4jlfe087946@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: 025c47549419 - stable/14 - pms(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 025c4754941956e24830a9c3c6f5e2466b19a9e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=025c4754941956e24830a9c3c6f5e2466b19a9e1 commit 025c4754941956e24830a9c3c6f5e2466b19a9e1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:25 +0000 pms(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 4fb8a80a78aa65e0b30bd5a74373512c678841c9) --- sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 38 +++------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c index c24d03a178ee..4e697f06a4cf 100644 --- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c +++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c @@ -318,13 +318,6 @@ int agtiapi_getdevlist( struct agtiapi_softc *pCard, sizeof(void *) ); AGTIAPI_PRINTK("agtiapi_getdevlist: portCount %d\n", pCard->portCount); devList = malloc(memNeeded1, TEMP2, M_WAITOK); - if (devList == NULL) - { - AGTIAPI_PRINTK("agtiapi_getdevlist: failed to allocate memory\n"); - ret_val = IOCTL_CALL_FAIL; - agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR; - return ret_val; - } osti_memset(devList, 0, memNeeded1); pPortalData = &pCard->pPortalData[0]; pDeviceHandleList = (bit8*)devList; @@ -970,13 +963,8 @@ static int agtiapi_attach( device_t devx ) } else { - pmsc->pPortalData = (ag_portal_data_t *) - malloc( sizeof(ag_portal_data_t) * pmsc->portCount, + pmsc->pPortalData = malloc( sizeof(ag_portal_data_t) * pmsc->portCount, M_PMC_MPRT, M_ZERO | M_WAITOK ); - if (pmsc->pPortalData == NULL) - { - AGTIAPI_PRINTK( "agtiapi_attach: Portal memory allocation ERROR\n" ); - } } pPortalData = pmsc->pPortalData; @@ -1227,32 +1215,14 @@ STATIC agBOOLEAN agtiapi_InitCardHW( struct agtiapi_softc *pmsc ) pmsc->flags |= AGTIAPI_SYS_INTR_ON; numVal = sizeof(ag_device_t) * pmsc->devDiscover; - pmsc->pDevList = - (ag_device_t *)malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK ); - if( !pmsc->pDevList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d DevList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW\n" ); - return AGTIAPI_FAIL; - } + pmsc->pDevList = malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK ); #ifdef LINUX_PERBI_SUPPORT numVal = sizeof(ag_slr_map_t) * pmsc->devDiscover; - pmsc->pSLRList = - (ag_slr_map_t *)malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK ); - if( !pmsc->pSLRList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d SLRList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW SLRL\n" ); - return AGTIAPI_FAIL; - } + pmsc->pSLRList = malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK ); numVal = sizeof(ag_tgt_map_t) * pmsc->devDiscover; - pmsc->pWWNList = - (ag_tgt_map_t *)malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK ); - if( !pmsc->pWWNList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d WWNList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW WWNL\n" ); - return AGTIAPI_FAIL; - } + pmsc->pWWNList = malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK ); // Get the WWN_to_target_ID mappings from the // holding area which contains the input of the From nobody Mon Sep 30 04:45:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mt34Lhz5XkN1; Mon, 30 Sep 2024 04:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mt0f1Hz4FsX; Mon, 30 Sep 2024 04:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsjqXn+WuPlBswS9+xJ+UnOvx7MtMwbyCE0UiWb8a6w=; b=x8HP+sIT+91sQ/0qexEE4WWw9C6ifnC01mluUhDecMAQcHPK/wUfskEJBf48q6K2U9UeEC rfcJ6YyORiPCq8dkhujoSa6EVu7is8g5NXXATuyhKZ81LWtDQbjuVnfEvUqYRfjl8dr0Ey 8XjuUr8hlHqffInnf3OtZH/Rs2a1IPNhgN5hDzXptiPwJVBNlGbfplsBg8DwmUf/gGHc7Y xx1+wZwGOAXFvXH+69L7y2d2XZVyHsj5MO6wiOoCLlHzlEgwqf1OaNDjxdC5nwfru30eM+ c7o3EeZdJ3SIcWDUGo1s/OCs2KAj3tpgDY77qFVL8tKs4y28G6grYoUosBniwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsjqXn+WuPlBswS9+xJ+UnOvx7MtMwbyCE0UiWb8a6w=; b=Ao9+8GSJ9ocM2ILb9ZgrHwtS6tYXmKlTzGJGRm9RrdSozWSngG5A9lkEJQuVwlgC4C/Jav Moj6sw8Y3V8MTPkyMuDmlk+NcxUYlM0YDvfdiJEiFPR5NLhP0ba+XOLmRF/BQj12Dyy/E0 zBSxnK5sZ2sgzFrPs9VYzl2jTxYTLrp3JKOm8K8W14ZIF2lU/vx5ujYYv51aZ7/iNCLKr3 j/oGEwJYIljXDIiVdVKHKcEZ8M7kgfctcO+LZKBt6A8nxGadOQqtjmwVsjklzI2K9xDrhX EGquZruRoxzbLccjvTrkgg5IXSoYPSGyrhixWXSL7cA20hLFVn1hn9cq1m8lOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671550; a=rsa-sha256; cv=none; b=oRWsB5oxa9BvUMFpqMnQoGh5XhjJgDyyQUvjhyyej9G5a7GvTIqrOtDEEXw0Jc7pMhndrQ /c6iOwqdTXZrxbm7CNfUMJfD262b3a8OEbyStT+EmL7LKMPiI7kaGQS9x1MpyQhz27sibb joNqspq9qut7GoDJewx6b34cO3GIcrlduwgC53y6I/KjHPxMP2UCC8u4qTzvOOskEg3VOd rxfaRxxtUJu4+mTNqSzk0G2HdE4DCEJn5V5wZKQ//EpF/fxf1RKWQsxOS8Zq7vRCt042Zh H7paBSGejSsqeAUAZ9Qm7Tcm7f9OKS0qdcXSoLRrKAl4LJZAOPHvkXHh5/nbbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7ms6fQWzfd0; Mon, 30 Sep 2024 04:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jneC088047; Mon, 30 Sep 2024 04:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jnOA088044; Mon, 30 Sep 2024 04:45:49 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:49 GMT Message-Id: <202409300445.48U4jnOA088044@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: 140a0c8f3981 - stable/14 - sume(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 140a0c8f39816648719d9670fb641c657732439e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=140a0c8f39816648719d9670fb641c657732439e commit 140a0c8f39816648719d9670fb641c657732439e Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:33 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:26 +0000 sume(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 761339c5544a360df9d3bab70675fea246eb6a83) --- sys/dev/sume/if_sume.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/sume/if_sume.c b/sys/dev/sume/if_sume.c index 4113af5a48b3..b6a8eb62219e 100644 --- a/sys/dev/sume/if_sume.c +++ b/sys/dev/sume/if_sume.c @@ -1196,16 +1196,11 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter, { struct riffa_chnl_dir **rp; bus_addr_t hw_addr; - int error, ch; + int ch; device_t dev = adapter->dev; - error = ENOMEM; *p = malloc(SUME_RIFFA_CHANNELS * sizeof(struct riffa_chnl_dir *), M_SUME, M_ZERO | M_WAITOK); - if (*p == NULL) { - device_printf(dev, "malloc(%s) failed.\n", dir); - return (error); - } rp = *p; /* Allocate the chnl_dir structs themselves. */ @@ -1213,11 +1208,6 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter, /* One direction. */ rp[ch] = malloc(sizeof(struct riffa_chnl_dir), M_SUME, M_ZERO | M_WAITOK); - if (rp[ch] == NULL) { - device_printf(dev, "malloc(%s[%d]) riffa_chnl_dir " - "failed.\n", dir, ch); - return (error); - } int err = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, From nobody Mon Sep 30 04:45:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mv4f0Vz5XkN2; Mon, 30 Sep 2024 04:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mv1DSWz4FkZ; Mon, 30 Sep 2024 04:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTpo8xH9IK72iIkVnalzAm9zcYgescylT10AD1Vrs5Q=; b=sXZUlmbb+XDutiRTIcJ8JZHCIk79zaHUF2BxoYWWw5e2h/0rb0JaLOFskUMn09TPiWmfpC g5XsnuX2O2qicZPqPjUOQyXqcwoAmxRp1xdUhmiD8WzaKpD5EKCFI+DjwA2AIQW7N3XunP kRmRVq2yGOQyMG9LJ7UHyJJG4AtQhNJ7zGAt9Gpw999K+RAscIJIlw2VABOURKYdEjYtl7 mupVFnk+Ij+So2B/DDs5dYLimA8O3RUP6EnM25HSobcFSDBwxjnXag5/WSIcri7HLRTrjz 60atD6CxtfCSpa+OGGfcGM5ousBBffQjuqeNm2wwUt9KJ14Ds3SWdzbKaZiVrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTpo8xH9IK72iIkVnalzAm9zcYgescylT10AD1Vrs5Q=; b=F8wI8JLBRRSxyNCQyHeUwzRZLxJG4fHA1HjYY+5m5TVxX0BxzlGrxsQeC7PN+JVBfAbZSH Qv5oknyN34F2VWyrShO6wO3aWvuh6lzi6ub3TFl4XAybL4xlAhbJ/dfJmI8xHEUUvG7BMx onUPapQ2U60VfEXg3iGeGpB2omMSLVg6oEUB16STcUcA07rD8vbGDmVnmmlI3A4QtkOKQl xRFOCAKT2ZiWAkdAmAwkc7heScDcfub7uFz1FW46U6IgbFH3K0+4VTWLdDncG56uqkgMsz apRcrKxz/pjwaYUNk4pEvpNLIIW3mndwMwXeJgVqgCOaO7spojhkeC++KtoxIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671551; a=rsa-sha256; cv=none; b=UqxP7jg7aOu+nB5pj/4pDaNaGYLpqGpp9JBjA/48xIq3gfEaH4KW6+C0Urd18x5dE22fss yjzg00U1aGp9ffJ1PuD+Ra3EIF9P9qQbKyYyr8ZjZVXoBVIbaP9XGeeqXKpJu5zbOzHljr Q+W2RnmzBeCEpkShx6e+O3OOf9nSCMeXY9wUr8RfU87B+o3gkx1ZvQSD62yrstmv5opEok KgzAt5fEYZZR68Zd7WPT2jwPy46RCDjlgPt4Ssq+V+ZiqUh1w1OeeJhXP7kjgUhny+nP4P 9zltydlaRo8kFiHc9iRWcDeOEUdRAWSZ5MipRmOgPuRr82UmDj7kZPSoAmT/AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mv0ZG9zfbm; Mon, 30 Sep 2024 04:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4joGC088100; Mon, 30 Sep 2024 04:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jodh088097; Mon, 30 Sep 2024 04:45:50 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:50 GMT Message-Id: <202409300445.48U4jodh088097@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: bfcaaff418b8 - stable/14 - sound: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bfcaaff418b856ef3d2a5be665566f62824f2f09 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bfcaaff418b856ef3d2a5be665566f62824f2f09 commit bfcaaff418b856ef3d2a5be665566f62824f2f09 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:33 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:26 +0000 sound: Stop checking for failures from malloc(M_WAITOK) Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 59121599bbda1e4c3fc3c6e887cd48cd5e3afc70) --- sys/dev/sound/macio/i2s.c | 6 ++---- sys/dev/sound/usb/uaudio.c | 44 +++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c index 5f8cb3aa15f7..647d66c27bba 100644 --- a/sys/dev/sound/macio/i2s.c +++ b/sys/dev/sound/macio/i2s.c @@ -241,10 +241,8 @@ i2s_attach(device_t self) * Register a hook for delayed attach in order to allow * the I2C controller to attach. */ - if ((i2s_delayed_attach = malloc(sizeof(struct intr_config_hook), - M_TEMP, M_WAITOK | M_ZERO)) == NULL) - return (ENOMEM); - + i2s_delayed_attach = malloc(sizeof(struct intr_config_hook), + M_TEMP, M_WAITOK | M_ZERO); i2s_delayed_attach->ich_func = i2s_postattach; i2s_delayed_attach->ich_arg = sc; diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index c202ac581119..8238629a2a51 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2687,8 +2687,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); - if (ch->buf == NULL) - goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; @@ -3256,31 +3254,27 @@ uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc) malloc(sizeof(*p_mc_new), M_USBDEV, M_WAITOK); int ch; - if (p_mc_new != NULL) { - memcpy(p_mc_new, mc, sizeof(*p_mc_new)); - p_mc_new->next = sc->sc_mixer_root; - sc->sc_mixer_root = p_mc_new; - sc->sc_mixer_count++; + memcpy(p_mc_new, mc, sizeof(*p_mc_new)); + p_mc_new->next = sc->sc_mixer_root; + sc->sc_mixer_root = p_mc_new; + sc->sc_mixer_count++; - /* set default value for all channels */ - for (ch = 0; ch < p_mc_new->nchan; ch++) { - switch (p_mc_new->val_default) { - case 1: - /* 50% */ - p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2; - break; - case 2: - /* 100% */ - p_mc_new->wData[ch] = p_mc_new->maxval; - break; - default: - /* 0% */ - p_mc_new->wData[ch] = p_mc_new->minval; - break; - } + /* set default value for all channels */ + for (ch = 0; ch < p_mc_new->nchan; ch++) { + switch (p_mc_new->val_default) { + case 1: + /* 50% */ + p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2; + break; + case 2: + /* 100% */ + p_mc_new->wData[ch] = p_mc_new->maxval; + break; + default: + /* 0% */ + p_mc_new->wData[ch] = p_mc_new->minval; + break; } - } else { - DPRINTF("out of memory\n"); } } From nobody Mon Sep 30 04:45:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mw6Sftz5Xjxy; Mon, 30 Sep 2024 04:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mw2jfMz4G3P; Mon, 30 Sep 2024 04:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jn1OtV8R8P2UbXOVACQeOC4h/IESsW0SGvU8arVw/XE=; b=hX8mpffM1ZXuypT/NVPhk3NYdu1mq2KrlJ0gfhng+Yl0SRm1Nd869rSY62juZUqHwUtIiV fnP0MbErH37Mj/yZ8e76PXc3Ir1xDW71Al6H7gThqic1x/2Qhm1X/87Dfa+3xV2lzdIDSL DJnvkJ6VccioYkxkhrAKTG20LuqpWcajY9Xs7Nu5TFTxkLOQES2fAePyc4A08ZeDs9eDw1 6G84OBfDShvCsMejW8OxYS80bMBK7T/KPiVLqTGdvljfVLE7Jx1qQa0bQ73KEMdkoOuczp ePvGn8o6MGQhoUEe6OsC8LK87e/n10xM8fcj090yIoIIEoqQfujIbe0bG4EWxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jn1OtV8R8P2UbXOVACQeOC4h/IESsW0SGvU8arVw/XE=; b=q73Z7BEEBSbRCNR2O6tJDMNdLMXjA2A+V+LMMn1lmzbuFGZBv4nrfaV7lgzeUIJPrF2xsG bgOZakD4Vvlu3WGoiatcuQIN+uTVECj8uIF4iRKYzGx+9ZY7tQY93slxqjqgom38zHblZx 9LNgEkTYcVjZIx4wIpN5bwlu5dB2lRehQD/x0YV7+WUKa3N8VgdobhyI7xZwLpsSvlZquj cl3QzOr0CUr54ZXKffLsn+8Jal2qCDNMcqZWYTRSmVtLfbhHy6pa6DHC8evBGGyrQdgRcw WAuLTt1kRIMLYPHmBagSlSikURkqodfSKnav1HzdVoLkYeurRkn8dEUXMDrQzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671552; a=rsa-sha256; cv=none; b=wUFjUeeSy6IqtQIa4SW1x17Fk5vdXzDdFQzeV1DEptXiJYcSd70BETJ/mFenzSozgsbg+a HbnHyFJK+Ze2JTYBSjNjdoJ9N9RmOCNCqepHYsBNTndutgCrQl/nFQp2gqn1pRcmPCWVYT HNRs29No6kC4ZyM4UGJAsl17Q6G3CFtmBrqkz/1xsfveNXPH5jom6LWUOZQrVyVqu7j5Ff g2GcJEdoggS2uLLZh1AS1BM79df/sQuCOg3wXPR9KiACeVDoAf+zC9gMNA7QRvPCogO8lE enRonDnqS/bKc5NHgTjJN3tnu6/xMTizDs7AeArbssF73bIROaJKuHvd4Ha5Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mw1ZZXzf9Y; Mon, 30 Sep 2024 04:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jqls088152; Mon, 30 Sep 2024 04:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jqgt088148; Mon, 30 Sep 2024 04:45:52 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:52 GMT Message-Id: <202409300445.48U4jqgt088148@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: 5a7db2ff56f9 - stable/14 - sdhci(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a7db2ff56f9e08579913ae16850ff82617001dc Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5a7db2ff56f9e08579913ae16850ff82617001dc commit 5a7db2ff56f9e08579913ae16850ff82617001dc Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:27 +0000 sdhci(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit f80483cdd58a032ae2cfb2b9119824e9badc2c91) --- sys/dev/sdhci/sdhci_xenon_acpi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c b/sys/dev/sdhci/sdhci_xenon_acpi.c index f185944ff567..0f4e1da72ac6 100644 --- a/sys/dev/sdhci/sdhci_xenon_acpi.c +++ b/sys/dev/sdhci/sdhci_xenon_acpi.c @@ -88,8 +88,6 @@ sdhci_xenon_acpi_attach(device_t dev) memset(&mmc_helper, 0, sizeof(mmc_helper)); slot = malloc(sizeof(*slot), M_DEVBUF, M_ZERO | M_WAITOK); - if (!slot) - return (ENOMEM); /* * Don't use regularators. From nobody Mon Sep 30 04:45:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7my6Vwyz5XkWG; Mon, 30 Sep 2024 04:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7my4H0Fz4Fyw; Mon, 30 Sep 2024 04:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RXmtd2KOyOpD6OQ3Z9k5NlnvX2A9+DrTlt4TSo2Bzck=; b=G9rO/uLSgx5xjPiOHpkSCO67cuFI3LPu6T98FC/MWQ7OyplkEOd+myt2eaX2daXNVq7Q/z VXrVHWGFtzwrvczdzF0KJflHULVFp9Zjs4aGgUdlZo3lwqBtqZo5xx6tzreOKaQz6RmjqG x9jFomK/Unu9f/mzGVu4pYfGJJCmZ4vCJsCJfm25MbyuNpTvG2gbJrL9v4d9RYB+ye+1fh v4LnNNCmVIFOf952b3DMynOrQczJhc89M70VwL7iXcNLKFoDJ9n7QwpsLUpWHRnwyl2lQ8 Qp4k+yeLEhwkMhD8d4vmGKty6ki02pE7ytlApmJ2gbfFqfPdf5egOXNI/AcLsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RXmtd2KOyOpD6OQ3Z9k5NlnvX2A9+DrTlt4TSo2Bzck=; b=K2Nwmv+nFMhzBXVdgorYcUy0oQIofhmttM9ppgO90BQRiXyES9hz+JmaDUQeu9Ggu0U1hD EE7NStsZN9ZZeHGXfnDwtlc5ZcIhGQABJuEfvjp9rhpw+pUoT44ptOm8F83rHi5ir1Ii5x 9HYcEoDa3ymx/XXmcrvpu9au0eAW+e0kl4tvu5Vw1tYeG2NiZQcGgfq3eFKE7XGn+Hbiq8 TjgRK35knF/FXglWrZuPZinlwhU5LwhsyuyIMCJYw0yAw63TLkXu7GbR8e+Ed5EDkzNGtN P4qaqcGz2U0eyrMpmM3Cdq7YazlgViIPtpPysB6TsFE+7g1lhmLlsNkW9ls8Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671554; a=rsa-sha256; cv=none; b=u/f++n58aOKuNqWNO8GPMdZ5eFAGthYGU9/FPIyzJOzbWkaGEhqQa+jrDVSt529Fq/+h23 rwBIsZC2O1JRGF7C+alSjinXNZsFg2hL3x0YGMpA5tBwYTmilmYs3QnDQk/S3yA004lCo3 ej6xvUs6lo9GSBy5RnLQW/2ZSb2GM3/NyHw5iEn/Y9e5mYoVV9lciKJXs9P0obdF30JbuS 4hCu0ux+x2bxWi64UH7rOqilc6eFxaQrEt3WT7K8J+wzmdj1dQrYXYHS/E2wTp7AIBdPca yDoBWdwNzZaIpZgXPUYaQ9NKJmVbiNt4tUv+uQTk+uEy/rSLgV0CF2VyeFgraw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7my3YJTzdwR; Mon, 30 Sep 2024 04:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jsW1088255; Mon, 30 Sep 2024 04:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4js6u088252; Mon, 30 Sep 2024 04:45:54 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:54 GMT Message-Id: <202409300445.48U4js6u088252@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: 5de9286b9af6 - stable/14 - ae(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5de9286b9af6e2448ab7d3fe749d37dd00b915e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5de9286b9af6e2448ab7d3fe749d37dd00b915e7 commit 5de9286b9af6e2448ab7d3fe749d37dd00b915e7 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:27 +0000 ae(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 3f3f3ca25bc453315c6a1f5d16bfcc1189d41bdd) --- sys/dev/ae/if_ae.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c index 97b96161dfed..d6258af3b6b1 100644 --- a/sys/dev/ae/if_ae.c +++ b/sys/dev/ae/if_ae.c @@ -363,12 +363,6 @@ ae_attach(device_t dev) */ sc->tq = taskqueue_create_fast("ae_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->tq); - if (sc->tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->dev)); From nobody Mon Sep 30 04:45:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mx4Y1lz5XkJY; Mon, 30 Sep 2024 04:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mx2yDxz4FtJ; Mon, 30 Sep 2024 04:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQAcaZhpfbIT9OMb8sYF+qTRpfomMCk0216dky2+Y2E=; b=YYvwk3zt3rOW1mIY3VhFbva0B0e+dN8hirhQPEAo/44jLaMCEUrqkzcfESHedDTez6b7s5 x/JG/MFEXkycsyPUOx+JRkvAjP4he5G7TILQ+7KMv1BkPRUzVRsRZZaC1lhdNLlwTeuzxY zEVxXzJWVnhZQUWVtJbzjAnoIg/JjbXN6r0U4cOhaUlIh477y6PEEQmkSb4JRyb6ykJXqf TtIET0gfVBxitL1XPuVfOdZh2sxyV55SsJr0q4a6sChc41hwc+W54VKuFduuZCIwOuBpBJ oOFkzger/f1BgH1T6JoflB4T74kea+Mm0Bj8dugwksoptPCE5YY5HCN4YoKCQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQAcaZhpfbIT9OMb8sYF+qTRpfomMCk0216dky2+Y2E=; b=kHs88X3qRz1htjgSJ/UhDiLtNiFIsWdaHBunolaPRbixTfLvkkKQGCux72nhIRdpcQvxpO jIMUDfGY6bG4vqDKciGWkI093cp6J5EMgrUhKdOBJV1gJlRYCfyFiv+yUj1lSFEs4LgUOR S9Wi0bTA9Eso3Jlx36cmvm0nnTqxitI2sJ6+FO7TggO44C+348lvZnmfJqHUa3BXBPYJ2k aMnKojba974TvczHdJKIU7+KldTv6/+Kf6hyGqCqe1ENaMx3GG2Yqs+YO/C1QwHLAPzuE7 nKywDDsKVqJ5yLkxAQ0v8US62JXnK4AFDHt5IbL6F8zcr1+sFFwLLAOsvqxY9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671553; a=rsa-sha256; cv=none; b=sT7ZaJaiXZqwD3jV66CkwELAUxr6BiIj41NBgkLARgO4uB+svqu3xgdAiK/9b/sfWjmFcT LTkNic6p/h88a4qXR18alCpv9KtVyebaZKgcfHt+zkhqqGLUwXMjAvF7h0QqoGNOKRAuik 56PSgkEe5LRvzYwJEzEGuuPxGtCJtLyT69D66q2W1uNGxQAwWOO5/PKB3ngr9V6eBYvBlm 66GgBXmq2KUSnJAGj+Toq5PEXZeR3JHa1yE89c/hq7yaPRyMm+P3CxRFHMC3bAU7HdnNoc w9yePvebZNgWLnZ7GGpNxZRXB1mnePcvrd8iT5z4qJUAd5mEWbq03XgjRip8gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mx2J4FzdwQ; Mon, 30 Sep 2024 04:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jrtY088203; Mon, 30 Sep 2024 04:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jrT3088200; Mon, 30 Sep 2024 04:45:53 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:53 GMT Message-Id: <202409300445.48U4jrT3088200@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: 40015f1c11ee - stable/14 - vchiq(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 40015f1c11ee2321485d0dd83cc2edb92236a541 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=40015f1c11ee2321485d0dd83cc2edb92236a541 commit 40015f1c11ee2321485d0dd83cc2edb92236a541 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:27 +0000 vchiq(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 778ea7ed5a23db9c4f9d8dc43a5cea26ded6231c) --- sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c index 279aacd0880a..ab8981e25cb2 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -278,8 +278,6 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle, WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID); bi = malloc(sizeof(*bi), M_VCPAGELIST, M_WAITOK | M_ZERO); - if (bi == NULL) - return VCHIQ_ERROR; ret = create_pagelist((char __user *)offset, size, (dir == VCHIQ_BULK_RECEIVE) From nobody Mon Sep 30 04:45:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n014qxz5XkQb; Mon, 30 Sep 2024 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mz6cNHz4G1R; Mon, 30 Sep 2024 04:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uh6UZU+g5E1r4/5WgUtGyZ17+eLGzCHfEE5uQSee1lc=; b=VZV3QFe9GeD4grIWeOWFqTjCxZo49+ri8dK5Ny/qs1S2f/sXNwu0wdg+cSooBt83xNghar aHHk3gmf967A5iC9KyrFd9r0tKJX9Zx3jX60+kPUGansPr+iwb0ahVT0ZOoaCpEN0DkGDC nXIWNf/Iz1BD5dpNNzmiryxEejI9lzEj6lgqD8yBR3apTJR+73xXtSgdw7rZoczCf4vy4q M3bSox7iwOeOu4EdNPh4Gk+UwUEhkRm7g2DU1Aujm2GeLDbhKUzFtS7iLEH2F/Rm5JEuWf ZaO66MVkDf7cQxiBxW2zsVN+miCChBT+RpMs7OyPAGQyLOWPotUPb1fF86t9gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uh6UZU+g5E1r4/5WgUtGyZ17+eLGzCHfEE5uQSee1lc=; b=eiR2F6KsMBxoZ6zLHjFfc63KcUuzr6dzn18gVHAXnjGX/B/MXRO+jVpplJgc/SxI1DJdb+ jyxmWvXavkWYXWPYxq6jM5W+v+YtjLWQE2V56wKIh2BbP5hAWl04qiLv7vorbM8Sa4MEkN dqPADhClxd1BvnCUJDEhDxQq4HLHdiOPOMdM7F9H4GkFqIR+yC+ztPgYeL5PPg1+6Qa519 tSUPkGVkwtRUJfE1akx9oHOFe4MfXurMrDwaiKgKsWOBG6fSXbWv1hLkRdAtorMdWeSylW oItkK5nc8c0F78xGAe0rAq2OUKCCUbJKPT3RWo+XJ6EAZhS9jbwD5lQxyrgHcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671555; a=rsa-sha256; cv=none; b=yRfSj6pUqn5H9dyVYd1C3Oo9vePdEeNB92L4QA0hKTBOhvvWCaBXNoZxg32aajv4x4zXDo i0W3czsDd9Q4xGH8a0Hn1NxWM2CUjsZXwIr0UMfooDQnUV/fkT8aaMQDjePH0bhVNBf30R FyDzZbmzxrjMve3IxbJNYdr6bsIzO8+bRJMGMp5W6jbTZNOPq07aUz2+ymPCgoHFJ0VY/v w+XCwXNA4AW7+VchS8GJc0h2Q5r2gU6kOzSt16w0TyPwmNGbXRUfPIV6s0gvwxpGZgQees qXdG/K7JDFYtHbn41lU9U+AcOk3kQZRbWYPpSkzMEtXloW9+3s2BiZuBMEFNXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mz4PBhzf9Z; Mon, 30 Sep 2024 04:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jte3088307; Mon, 30 Sep 2024 04:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jteO088304; Mon, 30 Sep 2024 04:45:55 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:55 GMT Message-Id: <202409300445.48U4jteO088304@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: ea86e323e52f - stable/14 - age(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea86e323e52fe5bd7bac73ba2247b5ab0a3df052 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ea86e323e52fe5bd7bac73ba2247b5ab0a3df052 commit ea86e323e52fe5bd7bac73ba2247b5ab0a3df052 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:35 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:27 +0000 age(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 5cece2c24bfa618091e778df488fb2380fcecafe) --- sys/dev/age/if_age.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c index 1a8b4aa6ad3f..180d9a368beb 100644 --- a/sys/dev/age/if_age.c +++ b/sys/dev/age/if_age.c @@ -629,12 +629,6 @@ age_attach(device_t dev) /* Create local taskq. */ sc->age_tq = taskqueue_create_fast("age_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->age_tq); - if (sc->age_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->age_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->age_dev)); From nobody Mon Sep 30 04:45:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n222T3z5XkN9; Mon, 30 Sep 2024 04:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n204KSz4GL2; Mon, 30 Sep 2024 04:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFw1nez+4W7n8oVUGk6ZpCmpm3IhzfPtTnoxsLXKF+A=; b=GIcSJ93eN3Fv4tKs6HFyCIJ1Stm8itM8PAGY/i5btR4BQNaxd3D6uJDTwv3/zAXeOLd5Yu NyyYhJ/ru4YdfVW3MfAo8bXfo6XNU2VJ958RDRvBYhqrHJyKPniWKtJNv28Kdt695fl1kB akNReVZn6Mg+1F73H6ijxZhDpVURx1DyMx7R0k9hlpHwGOc5IeTofDKtPDQTCF3hBmbshm +Csza1zUi2wj2xyOJjnjOxQnnadcHDrc2prRkMJaHmWoGKvk1Gjr36gC6ADbIAwodNyJVu n1lUN+KlTjgRJkeFP/tiJ3x9plTVUcqTmXB8y1/zdVGgaZZalccqtnkKN7ueGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFw1nez+4W7n8oVUGk6ZpCmpm3IhzfPtTnoxsLXKF+A=; b=gIwCta7q+bXAUPAP2ARpllUj5yJm2JS3Q6R1oRiFFsqIgZQzyKedI+1ou4M0O+CS1koIjX iKI2qifGo46FEToXo9h6gpnWwjbzAVvCqW2f1oiM38EvdTEUGHMLt9bXHBBQD0wBKNLBlg TtTBqa8qAp0bzWgeZ6HK3KT/B4O6tDAVnlC3RSCN7gh/Y7e9ecYPtkK3OAWc9eAiLdtf9k CSmTNbO0CZ7lzzuPuHFaPwN+9uq2pY/VT5Z5BMXxR5caoPZNFXMnIEnE5jryODFZ+M2soJ e9jSa1Yz+fXdiDtNMyeig42mbiyqkTUTedj923JzeqHA/oX/RIO9qZBxA9GoqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671558; a=rsa-sha256; cv=none; b=BNO5WawPmPtWLTC50Wfy+qnvK2WdDjzefV9QH2Wqth+EuTnyuGTTjXNXAoWQj3nBOkioRD N/b+/b2ETgmGzOezG7HzXT7jBqC35Lm4S2tISsedJT/YhIMOF8RcdQBjUenzJkbitYkDgy 1as87SMFpFRUIvbTDvOrhhlcp/Ax42b/TjGDc0gIeiRkVGmDlWSfyp6L2vXzd1izqc4xvU xEsofenVbI0E2pB0HEpG36yieft7J8wQ+NRfCfQQKQYlEk0Kmn/OUHxgfZ0kMS7x1Axy5X QedP7KbxJBXlIzCBajZpAnGfAagWFBaI14/2NdSuUwyuK+kWhwMDEZfJ8CmaEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n16BxjzdkV; Mon, 30 Sep 2024 04:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jviL088406; Mon, 30 Sep 2024 04:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jv3G088403; Mon, 30 Sep 2024 04:45:57 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:57 GMT Message-Id: <202409300445.48U4jv3G088403@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: 7ae70062241b - stable/14 - ale(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ae70062241b063e076935a9b8955d27ea84a3b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7ae70062241b063e076935a9b8955d27ea84a3b7 commit 7ae70062241b063e076935a9b8955d27ea84a3b7 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:35 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:28 +0000 ale(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit f5524be39e26e3d7fb774ffe7711602c676a8b9e) --- sys/dev/ale/if_ale.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index e8e7a55e9b8f..eba1a2430be0 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -656,12 +656,6 @@ ale_attach(device_t dev) /* Create local taskq. */ sc->ale_tq = taskqueue_create_fast("ale_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->ale_tq); - if (sc->ale_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->ale_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->ale_dev)); From nobody Mon Sep 30 04:45:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n10wmBz5XkWM; Mon, 30 Sep 2024 04:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n05vGwz4G1c; Mon, 30 Sep 2024 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KzX3UduUvm05P9eNvxLT/BKalSD6azNpAw1wLChZWA=; b=cUGLQ8duyNl/il/eDKlor2KKtvUrHP/OTjHeFdyhMKLYR3MmS+sfle1HfqPE43DUocyMxz PzNMdqbZUMzxt2CFxEl7uwH+M8wjyNLpIFdOFM2zBlgTQs5PpuFR2QwTfWox/vWUSiEkYP RXqq1DWD2fNONCOqWBNkib1Xk2CwHcz6V9nHU5L67dtCkCyS4vPhLW64JGG6ba0WQGcXKc G77LQ9gMAXIurF75f0iPuNv+5DrdId1FEu84jN39mpDs2Sy+vhgxS1WxwWVUvPguQnnQWu EZyleIwzSVQp5xPb7K6R308DCEeErwv364LKqm2n9ozBYpp8njOfuj9KDR4dBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KzX3UduUvm05P9eNvxLT/BKalSD6azNpAw1wLChZWA=; b=QvcwFRbNozoPHxrigKop4wVPWhkGcle4R87EzvETcXYg/XjnTeY+7+mw8ODfTuYJXGKT5F 7tKKfHwGZnIz8kJqbfkFRrnwloJckhh4vXSLwR7keSy4UEALaioANm4Q3HQJnnDaAcxtFX goO9eTgAQ4DXChq6SqNFVzbkoiNUOiEF5s5LfY22T7i11lHz2fLsTwylCgnvyKe0t6JW7c CuDsI9GgrIvfTPW8M1vSbtL4fKF9XwBbJ2nUaNA7QrjU4KmRnWa0F0Xclwk4Af3x9ASGXi rIBY9ZQktB5gu9bIepIFPQdXAf1yBOYAespo8T3JPhr1QBTip0ms0XysTkcQDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671556; a=rsa-sha256; cv=none; b=oWEaNQ/LZVkxi0G5CKgwqx6iOJQQ6P0s08v+o8aGsrF/1GT9A4SjvJRJ/pLG2r3ozfJWQz W5XK4APyXSJ21ekA2ULx9otEw7sqjBRZ1yuU/48lW2MqlBtuIJdn5Ibgju7/LmmcfwXsaw XzNPhJxZQGi+afjd3x9quJ/8ibl+MK/GM1y46Sxc3cvBM4P3Xle9Tz0RzrFWBpSDPPCbFX Ptb8cbirihE42+JsjJzjMg5BtdSshPWhBe+Fj5NgnDKD5fMDlxp5WFNsxRq36oClqINy1Q 7CNbLuYqKzv/SMmdhaqLKDpXlnH6b7JmQYSt0OUWHTA33LW00SNiSJqqDCSWBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n05RXlzfbn; Mon, 30 Sep 2024 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jusU088355; Mon, 30 Sep 2024 04:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jujL088352; Mon, 30 Sep 2024 04:45:56 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:56 GMT Message-Id: <202409300445.48U4jujL088352@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: a6c873a822b5 - stable/14 - alc(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a6c873a822b5dd51861616324abf3ba466958c7e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c873a822b5dd51861616324abf3ba466958c7e commit a6c873a822b5dd51861616324abf3ba466958c7e Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:35 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:28 +0000 alc(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 0cd3976d076218ea10761dc3f38ecf8549768ad5) --- sys/dev/alc/if_alc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c index c83cd1bf6869..08f9f439aace 100644 --- a/sys/dev/alc/if_alc.c +++ b/sys/dev/alc/if_alc.c @@ -1640,12 +1640,6 @@ alc_attach(device_t dev) /* Create local taskq. */ sc->alc_tq = taskqueue_create_fast("alc_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->alc_tq); - if (sc->alc_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->alc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->alc_dev)); From nobody Mon Sep 30 04:45:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n335cGz5XjyB; Mon, 30 Sep 2024 04:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n30xfCz4G9P; Mon, 30 Sep 2024 04:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dUecypT03ROYuJ+2nsOCsEelZ3+bJFmfXEqcD96Q14=; b=G+Fc4i4A170sN+UUnd/D2Z7uqs6O/ny5bjUjFeeAU8xgsn5Z1c+6IYKdUJYHM2cQzazxCO 0DgWmpSqg8xwiZTxfE/hlxvNMVLeBIqvuNph4dQez+rnuCKSyDOKI6I1i0uodB98WvNUNc FTYav/2wXV+n7Imak4mv4EF/2hkiy42OZL2LRHFSWg5ZNa2v0ElD9Oo+My67iG51IRRCfO biTdyiD6Pr4hX1ShXmTudA4FkCgCBSSWjwuZQQbkK61Epzo1VEsC3DmiLhV7US4ln3dM12 4ceTYpdc+Zc8YnD55Ac5FcZEMidlNV904qd/zVumyeS4xGYLuv8y19JtEGNnDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dUecypT03ROYuJ+2nsOCsEelZ3+bJFmfXEqcD96Q14=; b=uWqvBQbcjewa+9xhBhJr7pa9X5x05SQwKokm1qXbYBuIs1DS/K5cBMUmN9B89N7eohwdXi EjCMjYVZ1jbkMSSzkpPtE6icwnnli8dtTGgx+1RRGQXT+Z4rbTx2AhAW/ubCdt5wRt6mb+ qB4/VlYsZL0ofL6iOo+BGyjeY4JL2hsDNVkVqBWVpSsMxsVStsrbMqoR4hPqX8RVLpf0j4 jfIZoxkKoCHNkB3BO6Iapfvl1ee5v96OjTk3EpBS1MCjDsyWdTZL9r3YSjsKGWx39dv23d QaBK2ihs4mdTf/u2fm7fmIz7LZgaqmiOTmpTRXxhuX2KiurEsxTm3B74BibdcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671559; a=rsa-sha256; cv=none; b=ZtVHStWP4pVjHE9Y/v/3XdRRl90Z7f/8nindZm6ZmYItuOpzgYJ10nR7DJHLqS9lQJzsgp j7rCOVS2N1zTAE8tS2UY9Jz/c2EAhz4Lv66uRUBjKdWwdQJNcDpYWfaDj72r7PvDmQYBmz 1bJcnP13DXZUhvym5X5hMLARpGT9Z4G7Ti2pEDHIw4h5uRgn9a6tPcyu1++I1lMZDKKvBj veokUC2eG8zYrxoSsorXgXqOiRs31qGzwsF+xoccsoePQNO0HpdG6Hl1KVuL83Dz6tDZkd SX+kjjUdtsswsSILItdkHEMG79py5aAnHHxQl70E9n9PXcvfXPRdwevEKCZCpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n30YYNzfFx; Mon, 30 Sep 2024 04:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jwvn088458; Mon, 30 Sep 2024 04:45:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jwVv088455; Mon, 30 Sep 2024 04:45:58 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:58 GMT Message-Id: <202409300445.48U4jwVv088455@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: 39c35f6c5445 - stable/14 - axgbe: Stop checking for failures from taskqueue_create(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 39c35f6c5445d09b51a3fd366e8d64434b8fe7f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=39c35f6c5445d09b51a3fd366e8d64434b8fe7f1 commit 39c35f6c5445d09b51a3fd366e8d64434b8fe7f1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:36 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:28 +0000 axgbe: Stop checking for failures from taskqueue_create(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit b29adaaf44f6cf9433c782bbeeefd12d74d395a5) --- sys/dev/axgbe/if_axgbe_pci.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index 7a7c8539405c..5922e29d33a8 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -540,11 +540,6 @@ axgbe_if_attach_pre(if_ctx_t ctx) /* create the workqueue */ pdata->dev_workqueue = taskqueue_create("axgbe", M_WAITOK, taskqueue_thread_enqueue, &pdata->dev_workqueue); - if (pdata->dev_workqueue == NULL) { - axgbe_error("Unable to allocate workqueue\n"); - ret = ENOMEM; - goto free_channels; - } ret = taskqueue_start_threads(&pdata->dev_workqueue, 1, PI_NET, "axgbe dev taskq"); if (ret) { @@ -560,8 +555,6 @@ axgbe_if_attach_pre(if_ctx_t ctx) free_task_queue: taskqueue_free(pdata->dev_workqueue); - -free_channels: axgbe_free_channels(sc); release_bus_resource: From nobody Mon Sep 30 04:46:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n500LPz5XkYZ; Mon, 30 Sep 2024 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n43fJ2z4G6k; Mon, 30 Sep 2024 04:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jLw2rTVtaIuJhdMp9crzPKV8PjV5S05vOvFVF0ilTFg=; b=vBNG6sOG+A6qPjh4P0iqGRRf67U5EfpBpExMySMaFbuIgPGx8WigoSBNBxT0Q9hAFErY7x ueGqNw/xRxHRwnM5cONZzkre0PBzoBetYvn8iBzPWT4wQS4RDSuGpeFSLkbicZhuDDabhW 6mvnqoqaOv5WsAKVTK5BiTfDDC6YRXeCN+wUyj8UE+ID/p/HCNUoIZDhtvrNydCD1DUpYc 6HjOoAsLic0WCiWKbEzhk5zHbWngRnOIr7ZNoEdaEzSaz3WRLJhL7eW7ohX7OsfMXHMinc 3CALoT76GGLvjAmQjyoMNG+rbqhkD1DVr4KAccKSCf27kTex6/2cgJz+enNGTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jLw2rTVtaIuJhdMp9crzPKV8PjV5S05vOvFVF0ilTFg=; b=s/Mn4OfGOGUagFaHlmXe+MIOHh7oVX2WPztAep+nv1xAH2Ohov0XGx9TI6VOBoOapTjpMh L5LLo4Y9YN26cXbDKMQRqdMVV+5T0Dq3qfg5dxLZ6GG63Fvn5qoraQ+1nNNGpK/GDSs8Cw mOylgYucv5af24eDdFVff6UY1AoG7XBHmDsoIni+LW1cF/2YQPWxRppq8HHje0hqhaVyh1 SlPii02p3O8MGwq4epr37RMrZWzVvpRYOxYm+V1k0V+64phk28KikgxUjXKjtz4yjq1jtt 3ZAkljBo+7b89cqgOxxYs50QVAciTxkYTiU70EFOexPz7EIRMd8KEtIFDedh9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671560; a=rsa-sha256; cv=none; b=aBvWNbiMQAhSfuYPLkeuar9UitpHjdlqO7TuOrwQZjH86eNcb+6ritVQdeH6Ao71FXcJHu 4vpgCkUQ5XgM6owMntHuDgZIqnpjIwN2zzMVLTmMiG1+XGqDWw7wW8VS3aYQxAIkd2UUNX /xUepk5gOIT8aYpDcUbGye/d/LuwVrmnIdXGxon/zR8Qdrl82tXrvRpw9DI+JxbrXBoRlV yHArTB9zXRE+uWPYr2xIldUrNxwmUQwva1EKC2rYp0Iy89J9xxjL4L1uiVvdLSBPWqIdp8 Ym4GYXK4JUsIOJdn6ILCl+mHf9Gqgq6JPTtOPR+zDlfnhcXTedyRCjCWV4SBSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n41MHnzdwS; Mon, 30 Sep 2024 04:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4k0t5088513; Mon, 30 Sep 2024 04:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4k0N0088510; Mon, 30 Sep 2024 04:46:00 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:46:00 GMT Message-Id: <202409300446.48U4k0N0088510@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: f5cbe8ce89f1 - stable/14 - bge(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5cbe8ce89f1332e1188b9b315bc2707f50ef3d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f5cbe8ce89f1332e1188b9b315bc2707f50ef3d6 commit f5cbe8ce89f1332e1188b9b315bc2707f50ef3d6 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:36 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:29 +0000 bge(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit d44bc2f07b971fe1f451a1fff0389650a2502422) --- sys/dev/bge/if_bge.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index e8af6530354f..7aa25939fcf0 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -3890,12 +3890,6 @@ again: ~BGE_MSIMODE_ONE_SHOT_DISABLE); sc->bge_tq = taskqueue_create_fast("bge_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->bge_tq); - if (sc->bge_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENOMEM; - goto fail; - } error = taskqueue_start_threads(&sc->bge_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->bge_dev)); if (error != 0) { From nobody Mon Sep 30 04:46:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n71ZSzz5XkNL; Mon, 30 Sep 2024 04:46:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n64WnSz4GD8; Mon, 30 Sep 2024 04:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYfwAUjvFYjdEg45tUZDkvJglUuLFWOUSBXJE/pedgQ=; b=K1ZfOxnuJqb5x0In8+OhsF5BX1R7/TVT6yFrP0bFX9TnUhq/K1gFzQURs30xC8Bj07nc8R b8XRgfoHQ6rNzhbx+Rpmocnev8PhFEbTh3XuCvXdOC8GE7VYhM1ZtFkNtEAdsepvxoIdhB 94gjsNqe4uVst5DsbDfIKW3I9zaHr5JrHCrxGiVFIUa58Wl5P9v9k7nNj+Q7xCvuDluPI5 8UQ8HsINm5Yj/026JSnJMr5ZcfPMeQg1fDurf1TlaAq13fL7rZww9qxRPBEdZGTV/Xb7Em Pbphe7U99JMkS4QdnsevQIkAIUvOwjJMaIyQPn9E0PnwkCqo6L0bJmyLg+qQRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYfwAUjvFYjdEg45tUZDkvJglUuLFWOUSBXJE/pedgQ=; b=y4L0SMCMGMriL4WxXilA1mO7tzo63WoF/uFr74x7F6KfXzj6UCzl4aN03fvWNIUGCaPOdN MnGnXLwVmv7p8+v0B7oOb14dMidkIX2fYCB+lLmpkbWIqT+JbDrFCo/8jHjd4nQBH49vsm sftwmU9lKN54rBxXmZcuenE89L+/+NX2wsVzdkPPqc2E1dPeMHeNT/m17l9KFVuOqQ7U/G Xv9LJOwr0avDSepoIPcBsKOep+ZmTiAd/EraMMyFyICIwcOYkwaoKNLdzHCKZUd0xwvbnT 8y2x/Kwy+i8mEG0vDal1BhxdnatAaVujR25y474hWY5wCO02xivK3Wz4nAoXRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671562; a=rsa-sha256; cv=none; b=bMEvANr+I2JTl5JbiZrkrMZ1oN0lX7ODSCcKYenRN/FfGroKaxNkXpxgwOLfbQW9bWXo1z udKjGalWO8dOGKzhgZPPc8TL4+LEtwaNJYonUmX+nlWGOyJnYWVAG9AD4jNZfq2U30LDi4 OYwc+OF4dA7PbaqePUfz1bkTvBbD+2oz3d7H3gZuD8z5lZbAM9iHGEEpNFvMIK8c1INilt P5aDXPtotV3Q0xQhgDHKEFzfqPHi4J4CJwDzxvRGNMUeaqXfgrKDaua9pfQqtOy+qN5hWy pMwQV6QjEmrtDTo0V5NMfSyS+AvVsWqODH52MY3bhfCOW/tgbRJzdvvcleeP9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n63lZ6zdwT; Mon, 30 Sep 2024 04:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4k2jj088611; Mon, 30 Sep 2024 04:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4k2W8088608; Mon, 30 Sep 2024 04:46:02 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:46:02 GMT Message-Id: <202409300446.48U4k2W8088608@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: f6c8db29aad8 - stable/14 - dpaa2: Stop checking for failures from malloc/taskqueue_create(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6c8db29aad84291fa0975527d4d4b1c2a1d024a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f6c8db29aad84291fa0975527d4d4b1c2a1d024a commit f6c8db29aad84291fa0975527d4d4b1c2a1d024a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:29 +0000 dpaa2: Stop checking for failures from malloc/taskqueue_create(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 36ef39831fe0e89f0b1672340a44c4ac1183158e) --- sys/dev/dpaa2/dpaa2_channel.c | 7 ------- sys/dev/dpaa2/dpaa2_mc.c | 2 -- sys/dev/dpaa2/dpaa2_ni.c | 15 --------------- 3 files changed, 24 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_channel.c b/sys/dev/dpaa2/dpaa2_channel.c index 87b76923a16d..654c6f2baf70 100644 --- a/sys/dev/dpaa2/dpaa2_channel.c +++ b/sys/dev/dpaa2/dpaa2_channel.c @@ -146,12 +146,6 @@ dpaa2_chan_setup(device_t dev, device_t iodev, device_t condev, device_t bpdev, } ch = malloc(sizeof(struct dpaa2_channel), M_DPAA2_CH, M_WAITOK | M_ZERO); - if (ch == NULL) { - device_printf(dev, "%s: malloc() failed\n", __func__); - error = ENOMEM; - goto fail_malloc; - } - ch->ni_dev = dev; ch->io_dev = iodev; ch->con_dev = condev; @@ -281,7 +275,6 @@ fail_dma_setup: /* taskqueue_drain(ch->cleanup_tq, &ch->cleanup_task); */ /* } */ /* taskqueue_free(ch->cleanup_tq); */ -fail_malloc: (void)DPAA2_CMD_CON_DISABLE(dev, child, DPAA2_CMD_TK(&cmd, contk)); fail_con_enable: (void)DPAA2_CMD_CON_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, contk)); diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c index 0deebf7e8b24..02470a3efd6e 100644 --- a/sys/dev/dpaa2/dpaa2_mc.c +++ b/sys/dev/dpaa2/dpaa2_mc.c @@ -484,8 +484,6 @@ dpaa2_mc_manage_dev(device_t mcdev, device_t dpaa2_dev, uint32_t flags) return (EINVAL); di = malloc(sizeof(*di), M_DPAA2_MC, M_WAITOK | M_ZERO); - if (!di) - return (ENOMEM); di->dpaa2_dev = dpaa2_dev; di->flags = flags; di->owners = 0; diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index a21351a20b49..6ed656849709 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -588,11 +588,6 @@ dpaa2_ni_attach(device_t dev) /* Create a taskqueue thread to release new buffers to the pool. */ sc->bp_taskq = taskqueue_create(tq_name, M_WAITOK, taskqueue_thread_enqueue, &sc->bp_taskq); - if (sc->bp_taskq == NULL) { - device_printf(dev, "%s: failed to allocate task queue: %s\n", - __func__, tq_name); - goto close_ni; - } taskqueue_start_threads(&sc->bp_taskq, 1, PI_NET, "%s", tq_name); /* sc->cleanup_taskq = taskqueue_create("dpaa2_ch cleanup", M_WAITOK, */ @@ -1339,21 +1334,11 @@ dpaa2_ni_setup_tx_flow(device_t dev, struct dpaa2_ni_fq *fq) for (uint64_t j = 0; j < DPAA2_NI_BUFS_PER_TX; j++) { buf = malloc(sizeof(struct dpaa2_buf), M_DPAA2_TXB, M_WAITOK); - if (buf == NULL) { - device_printf(dev, "%s: malloc() failed (buf)\n", - __func__); - return (ENOMEM); - } /* Keep DMA tag and Tx ring linked to the buffer */ DPAA2_BUF_INIT_TAGOPT(buf, ch->tx_dmat, tx); buf->sgt = malloc(sizeof(struct dpaa2_buf), M_DPAA2_TXB, M_WAITOK); - if (buf->sgt == NULL) { - device_printf(dev, "%s: malloc() failed (sgt)\n", - __func__); - return (ENOMEM); - } /* Link SGT to DMA tag and back to its Tx buffer */ DPAA2_BUF_INIT_TAGOPT(buf->sgt, ch->sgt_dmat, buf); From nobody Mon Sep 30 04:46:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n54k7sz5Xk3T; Mon, 30 Sep 2024 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n53g4kz4G2d; Mon, 30 Sep 2024 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gY2vGjWD5NvxW1VStnsiDu2iiIfqoSdgObTJ7Hn6ZvQ=; b=UOmpOWI4tMiNcZi6vREvTiDKSx0K1gkF87w5wGFA+tBkp/jLhgI8zvPdmUu97Hl8M4xeut 44IPiRpbmwr5xwg2L9QdLgyqdgQsn32IcVI8FKZZMwlO3sLrEBnlY1JDuluYvaI4nPcWOs J6KwqmRpZtRnN/9HcDglB4bTiOutK3ifQMuZZaIBm0QN+xhlWQJMXiZawZ/15oEvR5PhMU nCN37QHbMajY6Ej/+ZacvmUKrrVATzhBVCN+AVi8MKlZ8mVHTvQ78FvPvjIN8/yH70sIFQ AxU3rZ9MEIhY2IoJp5rl5DoKkeVmBDFpSr7IUr+fRTI/xCKQvmhGJxETTnlJCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gY2vGjWD5NvxW1VStnsiDu2iiIfqoSdgObTJ7Hn6ZvQ=; b=SXlKV7A09+T6IqWMb2zWQlh56s6UaeVPuFqj53wVyQVXgsTkDAST9T1Dxxs3zY/EMKlSTP TrxTsaJxoasw0ZcKqNotUhaOC1y0uRtXiMNaOH5m3zw9AeL14VyaK6EJ/8UMSYeFYcUyet DGjEfAh83okf0XnqWNVkJppUV/fQ3GDkQbKe3PmJwTa2lxX/BxEOUlR1IOBss5ZM83uJ39 XJfiqADUxr4YNmVkH94x6x/4ELoiu7a0GkQz81XdUOAtUONNSX7cwTCiakMxyFZ3gf3efe Hnao3qY14lV/0A1FiKjSUzlskEyHqfgESsqY5a9le7JUmmR/2aoVWShVcUn9/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671561; a=rsa-sha256; cv=none; b=eo8qvcBj6F+4AYIjTa6Yyo7LOSiOG7tgLuhoYIoYOQYHQmaLP55B2/+QSVpg9E2dFhDiHk 3rgnTAZIINSYFCU+EJbo9Q2obSpQ/kHTD0YY4mH0gdHK8/oFDKRR1rGDjgLwzmn7Ka9g14 kENEjvnjKxG77BOUlh7E0w14/Ld7AVXPYTggDkr+qdFpTo6EFAqWLayaJaLus9b1pOwLqv PL8iZmE1cXIxLYu8T+Zp2zMpCRzLSWyazRzBcjaTfG650HeAdxjm1JIlUzL7cZU5n3zuDl CEo4afSVTFm//pMvJZHvJa9chwpT5Bt4FJUvv1fHxe9vi8id23MFCqZ9Hni5DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n52XGfzfbp; Mon, 30 Sep 2024 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4k135088563; Mon, 30 Sep 2024 04:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4k1nw088560; Mon, 30 Sep 2024 04:46:01 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:46:01 GMT Message-Id: <202409300446.48U4k1nw088560@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: e78770d62f8a - stable/14 - cas(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e78770d62f8ad7e10f97defd3bb933623a3ded0c Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e78770d62f8ad7e10f97defd3bb933623a3ded0c commit e78770d62f8ad7e10f97defd3bb933623a3ded0c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:29 +0000 cas(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit af28fc3c191cf572f7def767c60fff59d48947df) --- sys/dev/cas/if_cas.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c index 76d1b713e5bb..1f684097bd3a 100644 --- a/sys/dev/cas/if_cas.c +++ b/sys/dev/cas/if_cas.c @@ -205,11 +205,6 @@ cas_attach(struct cas_softc *sc) TASK_INIT(&sc->sc_tx_task, 1, cas_tx_task, ifp); sc->sc_tq = taskqueue_create_fast("cas_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->sc_tq); - if (sc->sc_tq == NULL) { - device_printf(sc->sc_dev, "could not create taskqueue\n"); - error = ENXIO; - goto fail_ifnet; - } error = taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->sc_dev)); if (error != 0) { @@ -462,7 +457,6 @@ cas_attach(struct cas_softc *sc) bus_dma_tag_destroy(sc->sc_pdmatag); fail_taskq: taskqueue_free(sc->sc_tq); - fail_ifnet: if_free(ifp); return (error); } From nobody Mon Sep 30 04:46:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n90Tlrz5XkNR; Mon, 30 Sep 2024 04:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n86N5Vz4GK5; Mon, 30 Sep 2024 04:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLogIuHRiLExGRnBaA8qfD0ZrrEC6m7xLNNDoHzBRp4=; b=WzMGUonyy3KPIVDxii6HzW/NPG22j2IAg15x1AbTW+rZK8dote2vlhCZKOp5zezRox8po6 mVPtFvHdqZcMt2XgaJwbSz3NRAm2ztQVNUZQMyfeWhbe6Bk3eoq5iVe4P8LsA259JoO/Kp +cBhUpr4juvCXYBPULOFcXt94XZWRC8TSU8xeRTuc0XzpCD3pOqhGImVUkuhR5wyrNKzRF UEB6/my5H+d8mluflddjXsUK1n6H8m4efPlBizQp4ROmthYFZa9pX2mAXb0Ggpx5eCoTF3 MDseZ+XikYs8c0V3XjLNTCvvnSbaOwMmRzkun7IuWL00W0b6jxCy9Ho+k7CqKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLogIuHRiLExGRnBaA8qfD0ZrrEC6m7xLNNDoHzBRp4=; b=Jm+LqV/rCFuNgaggd+qhrmn8JvU1Szm/kFU8B+sz2u7IB/4qY8TDuxIFwKb/KEv05klW3s T+JYmVsWsNJpTihz/zCXHnLf/hiy01Ph1UQBFQ+kSk9Gf2jiF1stuQG/+GYli9iT9lVjrs oUj/rJ5NpbqrMhdp/CYJUI55w30nYDLWw5iq3zuQiUiVfQKfqD45d+6m/RndbidK+QOE9X qChCjZ/cuy8ulmscSQ9o8qbhzAEMkBfNaszo8c6otIM1MZLylpI6U/lZrF8rJ/4OUOwYnC dgrZ+gg0rKINwCJAaDJQ7qWR3yuBQW2fYEoe0UhDpd+gVr8xUqf5muGiv9dXYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671564; a=rsa-sha256; cv=none; b=BGV9kr5hNqcWv1NvLknQRtxPhyViW0tjnr8EWdbG+3ZmiCd7OFjh5vLXoJdKbA8fyo/Wse aPdZ5hCCG+Yc2YsEaL25PqVFuTmfcg/ZNwldYj+kVOlOMHyBZ76Gut592KVqANXm6KCUkS tqzU6nUhqxxm8bCYYNrqYFz2opImi3cZyqs1FDLgE7Ht0rkiO8Rd4FtDFGCuSg7OtRFMTE oH47+Niryuj10zj2ZVsEWgQHLMRWLQnOTleh4tJvmN/56Exc6hw1RptzGn+ol0T7zpvxYp DrgIcM9N9Lgrs7CybP0sFzsxut6XhKPABG8276y9NRwT2E+UHIO+uETPvQivjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n85p29zdkW; Mon, 30 Sep 2024 04:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4k4lh088715; Mon, 30 Sep 2024 04:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4k4GN088712; Mon, 30 Sep 2024 04:46:04 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:46:04 GMT Message-Id: <202409300446.48U4k4GN088712@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: 518e138448b4 - stable/14 - liquidio(4): Stop checking for failures from malloc/taskqueue_create/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 518e138448b46d57030b3e34962e69e6211c8e1b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=518e138448b46d57030b3e34962e69e6211c8e1b commit 518e138448b46d57030b3e34962e69e6211c8e1b Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:30 +0000 liquidio(4): Stop checking for failures from malloc/taskqueue_create/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 57cd8f27b727e7a87312f6f141cfa13807dc81a0) --- sys/dev/liquidio/base/lio_request_manager.c | 9 --------- sys/dev/liquidio/base/lio_response_manager.c | 4 ---- sys/dev/liquidio/lio_main.c | 4 ---- sys/dev/liquidio/lio_sysctl.c | 3 --- 4 files changed, 20 deletions(-) diff --git a/sys/dev/liquidio/base/lio_request_manager.c b/sys/dev/liquidio/base/lio_request_manager.c index f4eae0c8bf31..95eac12ecf3b 100644 --- a/sys/dev/liquidio/base/lio_request_manager.c +++ b/sys/dev/liquidio/base/lio_request_manager.c @@ -159,11 +159,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq, db_tq = &oct->check_db_tq[iq_no]; db_tq->tq = taskqueue_create("lio_check_db_timeout", M_WAITOK, taskqueue_thread_enqueue, &db_tq->tq); - if (db_tq->tq == NULL) { - lio_dev_err(oct, "check db wq create failed for iq %d\n", - iq_no); - return (1); - } TIMEOUT_TASK_INIT(db_tq->tq, &db_tq->work, 0, lio_check_db_timeout, (void *)db_tq); @@ -179,10 +174,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq, oct->instr_queue[iq_no]->br = buf_ring_alloc(LIO_BR_SIZE, M_DEVBUF, M_WAITOK, &oct->instr_queue[iq_no]->enq_lock); - if (oct->instr_queue[iq_no]->br == NULL) { - lio_dev_err(oct, "Critical Failure setting up buf ring\n"); - return (1); - } return (0); } diff --git a/sys/dev/liquidio/base/lio_response_manager.c b/sys/dev/liquidio/base/lio_response_manager.c index 12a3ad60521e..ac5fc6229885 100644 --- a/sys/dev/liquidio/base/lio_response_manager.c +++ b/sys/dev/liquidio/base/lio_response_manager.c @@ -59,10 +59,6 @@ lio_setup_response_list(struct octeon_device *oct) ctq = &oct->dma_comp_tq; ctq->tq = taskqueue_create("lio_dma_comp", M_WAITOK, taskqueue_thread_enqueue, &ctq->tq); - if (ctq->tq == NULL) { - lio_dev_err(oct, "failed to create wq thread\n"); - return (-ENOMEM); - } TIMEOUT_TASK_INIT(ctq->tq, &ctq->work, 0, lio_poll_req_completion, (void *)ctq); diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index 7104ff07674f..3c73a6b10eed 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -1854,10 +1854,6 @@ lio_setup_rx_oom_poll_fn(if_t ifp) rx_status_tq->tq = taskqueue_create("lio_rx_oom_status", M_WAITOK, taskqueue_thread_enqueue, &rx_status_tq->tq); - if (rx_status_tq->tq == NULL) { - lio_dev_err(oct, "unable to create lio rx oom status tq\n"); - return (-1); - } TIMEOUT_TASK_INIT(rx_status_tq->tq, &rx_status_tq->work, 0, lio_poll_check_rx_oom_status, (void *)rx_status_tq); diff --git a/sys/dev/liquidio/lio_sysctl.c b/sys/dev/liquidio/lio_sysctl.c index 729f4d432274..61a7e96098c8 100644 --- a/sys/dev/liquidio/lio_sysctl.c +++ b/sys/dev/liquidio/lio_sysctl.c @@ -744,9 +744,6 @@ lio_get_regs(SYSCTL_HANDLER_ARGS) regbuf = malloc(sizeof(char) * LIO_REGDUMP_LEN_XXXX, M_DEVBUF, M_WAITOK | M_ZERO); - if (regbuf == NULL) - return (error); - switch (oct->chip_id) { case LIO_CN23XX_PF_VID: len += lio_cn23xx_pf_read_csr_reg(regbuf, oct); From nobody Mon Sep 30 04:46:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7n82382z5XkJv; Mon, 30 Sep 2024 04:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7n75QQgz4GJr; Mon, 30 Sep 2024 04:46:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67PQkfs0veJrmg4E5Y9eDPnsZoawdvcZ3ZHU8jhOMoA=; b=XitMbVWfaFsGDCzGP+l+oqx7/THqLEXniQPzsOexYYOabpCO4cKkMu3Yjg3q1Q1WDx4H1L mQRlkwjndu552VQWYv0vmFxM4lS4o3FTAU6B0pjm7BETHyHAsYRN/jtD4Uq3PR7DolruTK pOQXAvr+qfeleTzQZGVlPkCzPHk2HOHHb9nCOJH+Bnf6Ld7fDVvmnTpspr2RgpOBYN0P4R 1Fyt5rIqywaMiKAHVh4ufM0LHIqeMlxP+AqdBLoaEFeY/YnmXXLqiiqissa7LwZhBzfcyb 5xoQWXVrbOVHIEwssZhMzEEkwdjvlpqLggVZ+/xcDagxfAEouMIWwR/SVEYFUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67PQkfs0veJrmg4E5Y9eDPnsZoawdvcZ3ZHU8jhOMoA=; b=Og4JWds0VI2AzmTDdnZtllMOhcLLAb60c7OT+DESxY59iKBtR9e6PqvXximVlh+6n0fb7e ok/B5Y/GyAPstwtC7QE2HhXB6rUWPP0HNk8mDMEqEG1zPTuqa1kZK1SfDXY/LWQfdlnSta KP03qgxj7cX8aH61bw5YKZcQX9AwhK1JZjvugFEEBv3jtwrlo89RYl5iOCqOffWaRteC7w ChG84fTfuXABTMLUmEm7m8zZ1IxiOXKUfNzhn5z/42PT+dbCTfvc7Yu0VDo8jPiVeMbQKZ 2SUrCdjc2bxpX5h4iTXr6+bNvXofgtcBRzqdqHmemrAGyeHuRRTbqOWde5McGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671563; a=rsa-sha256; cv=none; b=ijxniUznDnR+PvttBq+jv01/XZk4SG0mIg3wA0P+x5YGNfd4C386LWK7Xs9ZKHWD391dJR h7lAiQrtUPcxH4cD2vvStAXuM3LMiMf0OYKBkypRdewqylfEkBN52vQrOQhvuJejqDW7wL rffSY1041fqYEF1u6DJrLLjT4/LT9I+3QWP7BpQYS0F5xZq2puMzWrx6tgmtQ7C+9sLPkU uu/iTWXTr06q8LcEAoLSwdsdPwjQXZo3zf/3kfDn5nWo2hzYyq7mo6fqpm0/rnNH0t9u0r kLrD4uSg2ifw0fbl6XDCE5BQaLz0JL2LETSh4eREgXe3/KVNeHtmGYZUXXYU5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n750qxzfFy; Mon, 30 Sep 2024 04:46:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4k3px088665; Mon, 30 Sep 2024 04:46:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4k3px088662; Mon, 30 Sep 2024 04:46:03 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:46:03 GMT Message-Id: <202409300446.48U4k3px088662@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: 6b25a8f07958 - stable/14 - jme(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b25a8f079586f8f3e4badaec402dae1ab39ddb5 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6b25a8f079586f8f3e4badaec402dae1ab39ddb5 commit 6b25a8f079586f8f3e4badaec402dae1ab39ddb5 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:30 +0000 jme(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 3fdef8e855027d5c9bec06e2a53e8f99f7d5694b) --- sys/dev/jme/if_jme.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c index 3631e5f8ffa0..05a67d34b6f8 100644 --- a/sys/dev/jme/if_jme.c +++ b/sys/dev/jme/if_jme.c @@ -873,12 +873,6 @@ jme_attach(device_t dev) /* Create local taskq. */ sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->jme_tq); - if (sc->jme_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->jme_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->jme_dev)); From nobody Mon Sep 30 04:46:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7nB1rF1z5XkK4; Mon, 30 Sep 2024 04:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7nB07JQz4GQD; Mon, 30 Sep 2024 04:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyPYhERmK9pCR2aIY4Mp/7xO9ANSjTDhbWF6DJgVocs=; b=Msik1nYSL10uWjL59ApjC3O8VMVTkgqZ6qTS59eEvRmQ4fspvAUB7GJp2c1UmqzeYA+mPI 3iM4a6aNhdEi2UWOU8/bqL42sNJLcFdZT0zGLUpMa5C57MeDnk6uXEfoHE4AaedEToHdi6 iJ0O3bq1l+VVkbTwJTQ0Gvt75lN4Gv2IVl6SQ59m/lhDjCt5ce9ANIJeDRw8RA0prZEQr3 lylVNfg644BjZ8X4S9HRNusyLPDht9OqnI/ZWYwyW8yQkVTajbW6XzEKcq+TG5O3kepiHL oRTiBCaUHH9PixHLmWxAA5AK2UAJ+oc9IFa9hrM9f3B5jzS8GOwRj+ccaf70jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyPYhERmK9pCR2aIY4Mp/7xO9ANSjTDhbWF6DJgVocs=; b=SA9Jcum9o9f8NbkyHgkZyPBef4kozkDTbzWuI/qLPZ9yD1KY/UFWn+ZEdTUl7yr0hUNkKh oQBf+EFPmKrqz2wwoqvKR3xBV3NzoUyfUUx5NrL50Hb3lLL2Sa6dskNFOjzAjbpnLI+UFA wMDxcAXI99x4Zmds+zv6W+9phm7eL8lvyTU/PlUh5/3I576tvdPY/qgc29S903r80Dggaw ottLISMJQwAEJ3vu+gxWiKgBST723YUnoirllDdKkA4sd2br+aLBHA/m8xjwf00geVOyRc IYwdOI+lNXspto8xLbfgIEfr8xw5jBhIdF9iWB30ia84ljbCrOmf2f8V2ey6tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671566; a=rsa-sha256; cv=none; b=v6zbhqUn/qc6yQOFUVQxVKlWt0kVEgDo+lNLHfuwWbGHyfPanZRkS/X4Ymr1nKqX31D7Pw Sx1YUqUYbljNWceyrB4kJs7Eiy7V/oHs+J4ZxJDqRiOGf3gWayPWP3bbasblpw3HACWW+w YD1K0BvyuhqQB0kWnMaATjyJ3LEdAQ2sIeWY3rD9JjOuZ6ERpmV2DcMql7uH4iIHwOEZJ3 RWY2DJcFErRkfpS6WTXafJCmxNUguMgX0oDOfku+/6jk13+Ax0mSCscfYaFtM9t8jAWKO/ 3xfBzcP9BEXiABF2bOol3diYtKWQXjuHgxoFblesSLWAzbbYE7CenBUZ2GV3Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7n96pQRzf2L; Mon, 30 Sep 2024 04:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4k5A6088767; Mon, 30 Sep 2024 04:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4k5w6088764; Mon, 30 Sep 2024 04:46:05 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:46:05 GMT Message-Id: <202409300446.48U4k5w6088764@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: 70280bc71d28 - stable/14 - mxge(4): Stop checking for failures from taskqueue_create(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70280bc71d28935346f7cc7c41ddd99e58b9604a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=70280bc71d28935346f7cc7c41ddd99e58b9604a commit 70280bc71d28935346f7cc7c41ddd99e58b9604a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:30 +0000 mxge(4): Stop checking for failures from taskqueue_create(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 7ea3fd3bb5f4039c372fd72aeef004fe12454537) --- sys/dev/mxge/if_mxge.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c index 158bb8e5888c..097813b79c0f 100644 --- a/sys/dev/mxge/if_mxge.c +++ b/sys/dev/mxge/if_mxge.c @@ -4616,10 +4616,6 @@ mxge_attach(device_t dev) TASK_INIT(&sc->watchdog_task, 1, mxge_watchdog_task, sc); sc->tq = taskqueue_create("mxge_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->tq); - if (sc->tq == NULL) { - err = ENOMEM; - goto abort_with_nothing; - } err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, /* alignment */ @@ -4816,7 +4812,6 @@ abort_with_tq: taskqueue_free(sc->tq); sc->tq = NULL; } -abort_with_nothing: return err; } From nobody Mon Sep 30 05:07:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GQ6szPz5XlfL; Mon, 30 Sep 2024 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GQ4wwzz4W14; Mon, 30 Sep 2024 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Uph0++etvEeKL12C6bdK6MOYPxkli6joQOkFdWt5QY=; b=QlTAN2lpXLO31wANPlX0Fkda4P03Ajrd99MyPTRhKfPAfcqbNJmNp+Khkoeogr1tblP/XG RPGPRwnaZ+h+7isSGVGC4GaLEUPMP6U6Km8b49rOtuiP3mnjW/Qvz1whLcneafpJXhrl/k +r/qpYuN4gAOB+hej5HiDGQb0lmnuqdWYPcd01GV2lPIxvH+vi1YSihiMrUUpDqNZgcjUq B8H/wjfyGr0geF8Mgt5g53S7n1Cg9k2Ss/vp+nhgZ8JQZO9tXaULEd/M5kYU/OU771nLzF kr7zuCUyVefYCXqCgdHps2wMlwJJb1q55pHTZnxX+VLKnvR6m07jVJ/itXbXng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Uph0++etvEeKL12C6bdK6MOYPxkli6joQOkFdWt5QY=; b=pIfUTo5RxBaVqMfVm5h7L7PHsllxIBTIInBtaCp+plghSm/w1kQKHvm8YcBIxhbnTKXF97 /QK/1lEsWpSmOCVOKnBxK3Kzv2Qe/V6VTqeUOl+RNe0iuFjwrC+Ubk7NfF3CZKLTjLq83o zNP4t1t7gLiNyuCXki6RbqjNLj6HqqztXayjGrD05IaG1eCyX8Faxnphg4RxcIAGytST+t lsCaSHVIx4b29rnymYaRRHmIjXj4QN0fa5si2sYEUcDEUXTFseaSnP+egeJW7yzfAySG3X 1GN/9lmSAmvGm/to9CnJJPhZMlz1mVc7AF3Z26n+KGFb7kNQB6RRQm4q8MGohQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672878; a=rsa-sha256; cv=none; b=fJ/MMMlmBY8hxq9h0jaqPzZaz+l7/PnrBiIXqt/+3ZbKh3MR00zpl8lke3jZBP9LtlaYIq JQeZiM62auks3QCtuVFjji2i+qJghSSebupuDBAaFIUXXH53EfdDo83zUwHKSCtWF81zK4 WTnG3hNvR0oBzOvs6fDMj+WAYoGdjRVBNv5pLmf8RfEhPQyXSKrHpe+zr8o2kcR1MkGw1R vIOvFliLF84g+u4vFE/fWVyWkBZjASwGdOByi6Hu7+Qyqfxk9T0FMMSP6jnCOBcLVLTaI1 ClkRCmZVe5aNQtrRvWLS8XGwS4QpsgMXm3XrAB1ze0la5xexZGVz0DFwV0q4aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GQ4XMtzfqw; Mon, 30 Sep 2024 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U57wKs023938; Mon, 30 Sep 2024 05:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U57wtA023935; Mon, 30 Sep 2024 05:07:58 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:07:58 GMT Message-Id: <202409300507.48U57wtA023935@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: ca22505a15a7 - stable/13 - kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca22505a15a7c1638b6666c4d2858c36d1849939 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ca22505a15a7c1638b6666c4d2858c36d1849939 commit ca22505a15a7c1638b6666c4d2858c36d1849939 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:28 +0000 kern_fail: Stop checking for failures from fp_malloc(M_WAITOK) `fp_malloc` is defined as a macro that redirects to `malloc`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6a2a385507c79abaa9db9eabfdd827362f3dc7ed) (cherry picked from commit fbaf4806511522cdcac7eda3bd5fbcc4b2e2f15c) --- sys/kern/kern_fail.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index f60500b22ef4..2c362b68f24b 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -479,11 +479,10 @@ fail_point_init(struct fail_point *fp, const char *fmt, ...) /* Allocate the name and fill it in. */ name = fp_malloc(n + 1, M_WAITOK); - if (name != NULL) { - va_start(ap, fmt); - vsnprintf(name, n + 1, fmt, ap); - va_end(ap); - } + va_start(ap, fmt); + vsnprintf(name, n + 1, fmt, ap); + va_end(ap); + fp->fp_name = name; fp->fp_location = ""; fp->fp_flags |= FAIL_POINT_DYNAMIC_NAME; From nobody Mon Sep 30 05:07:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GR6nKLz5Xlqm; Mon, 30 Sep 2024 05:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GR65qxz4WTV; Mon, 30 Sep 2024 05:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ECrwU6P69Vi7Xj0hGA47PeJFunc8Yx5UiQIZie29yU=; b=fNHMoM5v3eLnlwSZV84bsvJfX8JgbgAY7Ln4V3HJGpzLFIwenNgHSOiGdXLsuR3VbG7ZZ1 ASPAzKhw3PIuTqswXB1PAgny8HPJ9VY8AKmv9lWT67j/oSALoPu4Nyn8FIrLZ3/Bblt1UI h8Pd3MdGDjMUHBioB5h6OQFL+9TdXo5g2s+rPYkLJoImEBmMZGLznF/Y11kF5uDSIhThcr BTm/mMny9Bm/qJYzj3fsmA0r7AN7c9WzHV4vdZgABSCcnU1k/x4SUcR9m3ZO4KnCM7CbjP N3FQ2zMXpQSNERK3lseMKQzmCODgpwZ+4oa+g8UscCauArBvipPDaoxm6Bf4LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ECrwU6P69Vi7Xj0hGA47PeJFunc8Yx5UiQIZie29yU=; b=HgRWEg427eGATWwJ8JgDxgCbLt4HSeMJBA/a7RUsKV7D5RFct7Fl/Vbf8ot+0enUmXdxNZ UcwgePrEch/jt+t/CEpmf2RsYuz5E3yripONvkYxcF5XXg4ob54SVYu0R/PofkNuam7Clm NLl4MBCG/Q8/+HAtj9K0kZmF1wTcQQMrcBAevhjbgHl5481Rrtsa6HoI7LwMjJHjQKFqJd hTYRMNIRfGavv+Een59dq6eK3V6ajwt/QqSOzyy0QxIeHY1N51vIROJ7A9ci6jK2z4Y3Qc RV/mwrn//5XZrdZpeL5cdyhYs4pwr+jERFCYiFdBmNOQDL0zg9Dt61T5lwP8Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672879; a=rsa-sha256; cv=none; b=myvlCoTX7qS5p0LYHofhc+jmVLlZDdp55uXq5nxKe7ddHfS/01A5U6PmJqaJgMJDBQXU3r 3qLJzeTstWgfMz8d/2/RZF5Hq+Z4ZuXQmy/m+/YEJgqc0fZuZPi+kzoRxkXn4zDy5kzfUP nQ/V3NVO3T+XWoDRlnk8YzJxnYGeNpK570TcJutQa7M+fRWyd+mfT1YKvb4poJgwvN9ozS rcGruQnXEjfn1Uk2KopEoyVaKFUYQxP08fiJmT0nZ0nZd651YqjPgpth27MR1bfFu29VCx ZPqw/hv+VvR+aE2fAAy+gtXaExnOMC6jK/aaYFJws/xWfejBTQOhuUpLYGEE1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GR5jxSzg9v; Mon, 30 Sep 2024 05:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U57x6b023987; Mon, 30 Sep 2024 05:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U57xgZ023984; Mon, 30 Sep 2024 05:07:59 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:07:59 GMT Message-Id: <202409300507.48U57xgZ023984@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: 6b42548c6dd7 - stable/13 - subr_bus: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b42548c6dd757b8f13cb716310555773f5c9c5b Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6b42548c6dd757b8f13cb716310555773f5c9c5b commit 6b42548c6dd757b8f13cb716310555773f5c9c5b Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:17 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:28 +0000 subr_bus: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 99e3bb555cb1ef5572de54be0ffed2aa6fc080cd) (cherry picked from commit 44a6f9c9a0b503f70fb7f1d44bd75a8f68c4833f) --- sys/kern/subr_bus.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index d34bcc3cca58..06c64ef28fba 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -5618,8 +5618,6 @@ sysctl_devices(SYSCTL_HANDLER_ARGS) * Populate the return item, careful not to overflow the buffer. */ udev = malloc(sizeof(*udev), M_BUS, M_WAITOK | M_ZERO); - if (udev == NULL) - return (ENOMEM); udev->dv_handle = (uintptr_t)dev; udev->dv_parent = (uintptr_t)dev->parent; udev->dv_devflags = dev->devflags; From nobody Mon Sep 30 05:08:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GT25DTz5Xlnh; Mon, 30 Sep 2024 05:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GT01t4z4WX5; Mon, 30 Sep 2024 05:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k6PHq0hYzOIykO6N4+4iRowdxKDA4k+gUI/HTygkIqo=; b=YDkYzNF3HZrE3nz0FzvxfKRbhHlHavGpLpez9vcwCvHQu6A+DTMX57JgSVZUqj55tT+7Vh vV0mKIPop+pM/uEIV0JULIQDqgjejFl8cu/QhOAsD48xw/8QO5nFQJVtNXxl0XrNQ50eYS 78FmYuHmlMekBawT0dIrp7ySDQviOxip1n6bgJuMNJBG2yyHOk7ZOekUC7AgTL7cVqYfiN rJkbyRguBHtberEb1unysQx9Rrqv3cbH14BfJOI7Lc6UY+qYxYlkQ3btlY2vqZyNlBd6pf uAEfN3bgi7pZ/Jo9qc6Es5Ita3zonyV/Z9nf06R3M7JeznH+LSLnOeQhmPIGTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k6PHq0hYzOIykO6N4+4iRowdxKDA4k+gUI/HTygkIqo=; b=ZXk0oRSyCGOd44VIigNfNIwjmbRD44bPdF7OSAzc+Z74DDhXOrYZPR90SJvFIg6yvHGK1u WT7WDU9HFKcMQU0TxNBRYF1bYKXdTaNFGvM3JuGfR8oqrjEKmAlcHc2Mcq9CEtSqa0oQGq z++5RfwcwxBdMNPUZfoxFfU7aWwO4zT3qNz2UNkekYV89rMFHCfaBic1fcE0ipZ5ijomvU NMn2qJHQzcL8MefQYnoeT0IC+L/7TZKMtuRrKfCtbstlrvxhsO9+o9ZN3wko6T83nZ20CB 7NgkClvC13Om5nTTiHqTie+sf0TzIOyfLKERSIpRsy1FDkQ0OjO0mskVxEAANw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672881; a=rsa-sha256; cv=none; b=KB/6iDLStEWnTkMhfXFjhVqo6FttlUT3bJuQOYG48Ob73Uk+wa+zQ6Xrre3SZjG2LxuxZt iqcG6pGvQrHuov4LyS1eMjJMBbKkaDQIyqKB2SsCOfD1bqVcIZGn3s9ioeR4D+cDQ0qjio sXyYFY/hnhrRK7Ppfsy9p3oYZZXeobApVqexqx9AYM7JAHopn3FdwJTuVJp8pUyvEGigRB i2x7MWUQKt94BPXDTf8XqyiyckyOAkyswcAGFMd4ShjJSMFfjkhV8u1f4Up+Xn8ZP5ILh4 2wv+BEhu8q7f043p3CrhNtxNfKyiKiufD1j4XUlCce2NQ6BIasQzUwnLvPWaRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GS6m6zzg9w; Mon, 30 Sep 2024 05:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U580po024041; Mon, 30 Sep 2024 05:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U580sY024038; Mon, 30 Sep 2024 05:08:00 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:00 GMT Message-Id: <202409300508.48U580sY024038@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: 8f17a8c8a2d6 - stable/13 - ctl: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8f17a8c8a2d69923d828e638a6fda970f38b73c3 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8f17a8c8a2d69923d828e638a6fda970f38b73c3 commit 8f17a8c8a2d69923d828e638a6fda970f38b73c3 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:18 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:29 +0000 ctl: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 8e6dd4185871cd9b785869178ab2191a0d6c0b53) (cherry picked from commit d2d4758456aa89863ee615dbe1516a01c1fa83b9) --- sys/cam/ctl/ctl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index b0f34cafac80..ed97bb7c2115 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2710,12 +2710,6 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, } entries = malloc(ooa_hdr->alloc_len, M_CTL, M_WAITOK | M_ZERO); - if (entries == NULL) { - printf("%s: could not allocate %d bytes for OOA " - "dump\n", __func__, ooa_hdr->alloc_len); - retval = ENOMEM; - break; - } mtx_lock(&softc->ctl_lock); if ((ooa_hdr->flags & CTL_OOA_FLAG_ALL_LUNS) == 0 && From nobody Mon Sep 30 05:08:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GV3nbTz5Xlnk; Mon, 30 Sep 2024 05:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GV0ydyz4W1Y; Mon, 30 Sep 2024 05:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qUyRXG+kWJhmwGyJQOh6zcDQxT+sY/KDWuGOTEHjFU=; b=n81j/nAjBUD8T+t/siDgDPbyUtKvP8rL9Ccc5HPYPC4N8ycrRWeUzHLeIlxgVEdaM7A8nc d2DoRsPEsLnIAu9PU8worURwcG4jJFnP0QPkxnOTMqQKAeRcpZiMGqLj6/aDQqEHkjJCpl Fh6mL49kbey96DxEb+j+QRQfhh51LsfIL/Ort7k6e8QgpEm/buxFUla/twN/MhJchiCjMe zYaTWO9ZY/IInYhxhidtB8Yqd/d8I00OjaP6w1RAQklhnFrQZwkSGFtwklVFxPCC4Z4Kjb wZexz+FDl8VyMWS/1yvWRJyrU3Zvl9R++cqv3YXb/x57jkUxZssNZK+9eKpdiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qUyRXG+kWJhmwGyJQOh6zcDQxT+sY/KDWuGOTEHjFU=; b=K8jztPRWqxg8H4SIIE7jtD4dBmUsgzzmv9IA48kZ0UBCsQx5bd2UbvDLGz5S1jjsQk0kHn npcGDZdGJpBiuSod+4D5YrTaZ4ZjCJBn/azV/BTZykTU/pIq2Z0P+iawkK7AdjaRmeN/+5 TdoP/+eZn3ixgDWiEIdtrQspkEcjk5iGVzNnzdlT12ranv+EY/eTHKT2hsUMNPKV3IJMzs DPbLJQ2IAR44ZHfYetefwn59SgjlGq+LxFrjc0rNXgGUQYF9XKAbVo1KtTe2G7HWPRdyLk PDZ2Qj6ZqJjJxEiRHCnIzf4KNPt4WeGM83hvwUkK4P9uYNjukA1mJgsk/D/a3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672882; a=rsa-sha256; cv=none; b=dfNrNS/dVj8ym4peS1ue6AZvJ4ahE8eV8cIVU9esVUCA4UG24gNxmgeKBPSFlOjGW1xBxj TQJ+sD9yg2aPo5WdYsLsNjtEsBITOAsW1fVVSok3POTiHTyzrGMd3wL90XVDlSPS4G4078 2G+Hh6Xc7dkMQyd307VYJOzUcZuVMoHDMFFSuuqz0WfrV8dOQGyseYw478lwO9OZ1xgmUI x/BkB2rTd1Cln5kGHQjQMWTR9CPhXsY70X0SqBu/kCMJp2ckZT9RXlHZb7xZapscbS5IQo bPYJ7aU7V7V/k9uLdbDP2IlevGdpRDYhT1NpzCEbCsS28IsmrolYb7CUQC8imw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GV0MQfzgDP; Mon, 30 Sep 2024 05:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U581RY024091; Mon, 30 Sep 2024 05:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U581aP024088; Mon, 30 Sep 2024 05:08:01 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:01 GMT Message-Id: <202409300508.48U581aP024088@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: a4417f586ffc - stable/13 - udf: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4417f586ffc620f69cd6d9914caabd4b8bc0ba6 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a4417f586ffc620f69cd6d9914caabd4b8bc0ba6 commit a4417f586ffc620f69cd6d9914caabd4b8bc0ba6 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:18 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:29 +0000 udf: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 3feb35dc465a8247d70e50792680c230954ef1c1) (cherry picked from commit a77e68b0148d5224a64740c2cb7b25b1efc55335) --- sys/fs/udf/udf_vnops.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index 4d08aa373678..d85bb9970913 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -804,8 +804,6 @@ udf_readdir(struct vop_readdir_args *a) ncookies = uio->uio_resid / 8; cookies = malloc(sizeof(u_long) * ncookies, M_TEMP, M_WAITOK); - if (cookies == NULL) - return (ENOMEM); uiodir.ncookies = ncookies; uiodir.cookies = cookies; uiodir.acookies = 0; From nobody Mon Sep 30 05:08:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GW3WFpz5Xlct; Mon, 30 Sep 2024 05:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GW2L0Kz4WVD; Mon, 30 Sep 2024 05:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LngC0QfyupFFsnE1u6JkMlpIOXMHcLI3VxJYQJkcJo=; b=Z1ypRe/8/mI9cR6MMIqXsPgH58Br8lpSuQWxHkURCSgrlMnrC6a6YYN/SEtPft6A1/9UWz LZpWW2OOXNsejs9sv+ZNYnnh2x6rs66rEyZiB+nw6J0Hr1AOlHT/K8SDWCrpalfQEYICIL nW4282nkeNCu3d3zFav8nPW0p3jUvO1eyt4cEq7F+m3RabMZiELfTK6ZH+YK/nDkXS17bk fcgq0lS+XOvXZcejoCvNTpXD+L9+wpu/QOmkj020MvfdZpDZ37uRvGQFjwva70huZQK+tw Lymwh/IWUQhgGYzzykx+0EANK+F6q113mMnJ/Av3zNF3eO/z2JwsXSOUdQeCHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LngC0QfyupFFsnE1u6JkMlpIOXMHcLI3VxJYQJkcJo=; b=b7RYzBeorAPuYp07HuPkVQOM30UilRxNYZGUJSF7nipNvnuNdgjDjGDG+5YAW9/Pr0ZA3n kbaDOELrER6B98T7QQsym11wI+FAxORyEJQhVe/tJB4VtslHkHA2s2Pcp88l/Ti5c1j/qb u/GqkWnCTAg/50MfKi9bFe8+LtdE1ilbpex2dYu4MxYUJUhvhd139+2ELqlHmvmZK4SM3J G4BPemldFNww7AuqFLkNTVjMJqR6rvwngibtPYa3cq8GE/mOQVepJBYPlPsJU8/6oPr4yT B8vxY27KmLBf6G/RK5tPRAFIVEsK7A0lh/mNl1xxZajfTDZDXJ7PWxknWOsmeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672883; a=rsa-sha256; cv=none; b=GoJHM3dwaizBe9uGHv3xEwUPQ5/c3p7tRK+UtwnwatNOoHe1h+FaxJ/E5aBCdUWBiGVUM7 JxbCso+gxWjMHdXeqvZmZ6owz1cVs1PUKJLD71MK5XSwm59p9JUeko4jkaW7RgYmYLVnaG 4tZ2e4QbSc5MnWwEhV6TNzIFyMJNkuk3KNkLT2gemUb/PDHPpi0zEZPjlKUu4fm2BdnK1w CkEnudiTSm+tt83xVvvuzFZ7n+f1wot5FazWtiur1jxdBq9ODfHb3vHFvZAdZTHDlUMwYu o/3Xs7sA9+cuWdaTvSHXiPx7qK/Cpgb/4UO2oV7DStnrJwm3GYB3X3YTVX5K8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GW1fgvzg83; Mon, 30 Sep 2024 05:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U583K6024148; Mon, 30 Sep 2024 05:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U5834P024145; Mon, 30 Sep 2024 05:08:03 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:03 GMT Message-Id: <202409300508.48U5834P024145@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: f7bcf5725fee - stable/13 - altq: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f7bcf5725fee3b65be9c7ba9cb201b2e469ae504 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f7bcf5725fee3b65be9c7ba9cb201b2e469ae504 commit f7bcf5725fee3b65be9c7ba9cb201b2e469ae504 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:29 +0000 altq: Stop checking for failures from malloc(M_WAITOK) While here, prefer malloc(M_ZERO) over bzero(). MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 2a119886630bb5fe8283e20db5acb7c0cdba31c3) (cherry picked from commit 891fdd020a6826eb98d30284f78000e666f9a263) --- sys/net/altq/altq_subr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index 8000691a7963..4e8e72fdf35c 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -1360,12 +1360,7 @@ acc_add_filter(classifier, filter, class, phandle) return (EINVAL); #endif - afp = malloc(sizeof(struct acc_filter), - M_DEVBUF, M_WAITOK); - if (afp == NULL) - return (ENOMEM); - bzero(afp, sizeof(struct acc_filter)); - + afp = malloc(sizeof(*afp), M_DEVBUF, M_WAITOK | M_ZERO); afp->f_filter = *filter; afp->f_class = class; From nobody Mon Sep 30 05:08:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GX5PYMz5Xlll; Mon, 30 Sep 2024 05:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GX2tszz4WgH; Mon, 30 Sep 2024 05:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jo8CaBkI5Mm4UA2nXKA2+FHujIOnza2Esd7i9/VzwQ8=; b=cs2SsGtL6mSeM9jGcktrKGpO8LkckxizzJ/Casd48Kl2FuGi6mC4fVXqntLHqZ6CWpFhkh gMKTPDnQ0lJcKNfLLgUzz83hewL3cU9CqHOTba42J57kBHZzAGNBDGLplzLf4q9QZPx5nr UO950Y4vT3+CA2VH3RTLrqPSA7PZ46gKNxfBScIRjB743AGX4rA/eSU+yP9tzwcGi/wUuG 3wNkVHiqfUiDFgRu0LTqcHAj9eRqSUe8zV9QsGep4lemSuEjLVJ3+HBYcga0a8NXX0r6wX D9h6XnE3v7C6RqghDniWRmvv7P0l7QK9/fvMmJDsLuIdzVjZXlit5TXbFLp9JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jo8CaBkI5Mm4UA2nXKA2+FHujIOnza2Esd7i9/VzwQ8=; b=HDCuyDZidh3/IG98Ozf3OsWlqk0wtVO1/HjPypUYIvvERp0vula8yWYERJitS44UEpoYr/ prguXc7LP7FRKPT4tn9MPNXRAPVJS0MsCksj6OdFeCQ54J45UkBQXIkA3b7lsXVp/cMMqw YwzHMvJ1QqNCybi3Pokdq9TdYkyj62qcPENp6eoMR9dGEEuEV02Rwp2U7TnMOWrZ8BKrfE aJUDKo4B1/RGueyH14kFp7eenHyzRsPf+HO/tG9zB+oXLiBIzTovCLAdYGtb5aw2COXArm r9lf9vOcRkkVdPqC4+VZPP4tgzdf4ludq3FnOAn73Aw3aaNe/on2Z+Sn2ydbSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672884; a=rsa-sha256; cv=none; b=gqpEngtlUsZ3zJ1mt8FpclRHx7AfMxe6rm/MYk+iY5yl1Zd5X5ueOdDNQPlEINynIwm5Gd fvKJd4ltDfXgxqwT5V6BjtttMp/BwJn/6cDuBFksNPKxZ5Qn4gV/ZOa649QimvtExjjSWW 1rZ16gKuGdYs7a7RS7dbW8Sh+vpEZXDi98jDPDu+L8cBUFi/DrFZJ1M5faEwhyJ66k0fCP ikYCP0wueSV8OrZF6iFx1VRP/8Uitm/iD/cMLlyxMryTWkryyFhSjUTpFpTChQNi8xnhzI j+h+jiAcm4Q/z2WOR8dYmUsTx1MuJCo5zFrH4NwFx0pQhFc1mIISsiQSDfB82Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GX2QjHzftX; Mon, 30 Sep 2024 05:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U584C7024203; Mon, 30 Sep 2024 05:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U584YG024200; Mon, 30 Sep 2024 05:08:04 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:04 GMT Message-Id: <202409300508.48U584YG024200@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: 019abb5cf986 - stable/13 - if_vlan: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 019abb5cf986a851cef6aa65e5a39b4955649357 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=019abb5cf986a851cef6aa65e5a39b4955649357 commit 019abb5cf986a851cef6aa65e5a39b4955649357 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:30 +0000 if_vlan: Stop checking for failures from malloc(M_WAITOK) Fixes: b08d611de835 fix vlan locking to permit sx acquisition in ioctl calls MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 07b16b1e2aeab0b30f68a013de31a4c322a61246) (cherry picked from commit 67971181687f0475dcf72b42d065364efea96251) --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 9d0e6ae66b31..976bda1f5ee4 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -465,11 +465,6 @@ vlan_growhash(struct ifvlantrunk *trunk, int howmuch) return; hash2 = malloc(sizeof(struct ifvlanhead) * n2, M_VLAN, M_WAITOK); - if (hash2 == NULL) { - printf("%s: out of memory -- hash size not changed\n", - __func__); - return; /* We can live with the old hash table */ - } for (j = 0; j < n2; j++) CK_SLIST_INIT(&hash2[j]); for (i = 0; i < n; i++) From nobody Mon Sep 30 05:08:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8GZ1L8vz5Xlnn; Mon, 30 Sep 2024 05:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GY65Knz4WWB; Mon, 30 Sep 2024 05:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU1CveKXENmiSP033J+bMdUxqmhDF2qu+qTlgJefJqQ=; b=g67tGkA61Hz6XCGKcH9Z1/a2JmfOTx92/pe9N0FHt+6hlAq8YaTx/hi/xD222qXFv/LFj4 QA+f6gTvugg/jt66hZ5daJzNdbaE2T6eQkFtb+iEXgqbdgcbHhE1+7ssLbsfxsLNQWt6o+ 2BUxC7iNCLix1SR0ikf4QrfK8k94ksF29v9JWLCl0Ky07MtI0ZEYIiBmfW+EFI2eTAyoph 2Q7y38Xq09pof/UfUy9pWsGPbBnfNcgwAHuawMGQM4S1AmAQF6b8wNBsYzS8/G2qlo9pzx n7u6mLJ6BuORvtNZok5j3mhiO4oiGZnJAKYIxIOgbEeIgiZM2r64n6ejGq7KMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU1CveKXENmiSP033J+bMdUxqmhDF2qu+qTlgJefJqQ=; b=O7FaUm6KS3CGZPCDskprOm5gyXOiWJKfp0OV3dTFJD5OJMa8rPGNRqzxh5OS+BXtwwJlcl 0k2xaefWuZcZGoTf9X0zc1He5RUkkDNqhFD3yIHqJRHOU5+H3+wQyIfJVFf3IgIA7gPxYK X4nw/b0ltrurdTqgKkDsUS644Al6+Y03LWvVWl3AZkH4zph/qQq6rZ8ykUKgiQOBxZODRG rlBTCpNqM9RBFM4ALujk9nfIAKbsfPBY4eMcRzQozAVSfd+tOkeSZCo/4NMVSOh0rNFVxL 5YMPoKnBkFPyWUXzhFPRQR6WbfP6hzkryz8XgOvF716Ewv1d70qS8FT+ZqVa+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672885; a=rsa-sha256; cv=none; b=h+xKAVw5QCoBb695utPq9YaWz3/A/ZapHHda6X+gT/f3ZotbQ2WBlGnYahXQ9ZLGr5iAjl pAWBDXcXi686pBdx+HO2WbjNBw/5l4QiUP5TtSBWkUJEHCjMF3koU+mfJ+iC+rDMBpNaTz XfR8m0y9hkWn3fYHqsQkaPDgFFUc+Wpj+Ed7Sv/bvuxL8Hh1do7+sB8tmOj7ZSsfcBUH/H Rdx7tqJXHyEtvEEOdaSU+eHGLOOH/oCG9ntKRs8Tt8//I6CQzqNgP/fH5tC/6Mdv3l8p7i P46saqdVSkY5iUaVKxjN7gqvkXGwh8pXVZq50QtAEqFHM8M9bEGW6ZrlaRQyuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GY3Q9PzftY; Mon, 30 Sep 2024 05:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U585dv024255; Mon, 30 Sep 2024 05:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U585fv024252; Mon, 30 Sep 2024 05:08:05 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:05 GMT Message-Id: <202409300508.48U585fv024252@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: be02b9a1142e - stable/13 - netsmb: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: be02b9a1142e39dd537056c4917a86a97d901eb3 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=be02b9a1142e39dd537056c4917a86a97d901eb3 commit be02b9a1142e39dd537056c4917a86a97d901eb3 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:30 +0000 netsmb: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6e50988cf822f87a524b8da2fdc35b234078cc2f) (cherry picked from commit ce708880847cb8d87ac0d7499fdb6f08cc33a7f8) --- sys/netsmb/smb_rq.c | 4 ---- sys/netsmb/smb_subr.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c index 71f6e221ace9..0170514f52ce 100644 --- a/sys/netsmb/smb_rq.c +++ b/sys/netsmb/smb_rq.c @@ -65,8 +65,6 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred, int error; rqp = malloc(sizeof(*rqp), M_SMBRQ, M_WAITOK); - if (rqp == NULL) - return ENOMEM; error = smb_rq_init(rqp, layer, cmd, scred); rqp->sr_flags |= SMBR_ALLOCED; if (error) { @@ -377,8 +375,6 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred, int error; t2p = malloc(sizeof(*t2p), M_SMBRQ, M_WAITOK); - if (t2p == NULL) - return ENOMEM; error = smb_t2_init(t2p, layer, setup, scred); t2p->t2_flags |= SMBT2_ALLOCED; if (error) { diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c index 8094f9593957..73961f7a8c81 100644 --- a/sys/netsmb/smb_subr.c +++ b/sys/netsmb/smb_subr.c @@ -150,8 +150,6 @@ smb_memdup(const void *umem, int len) if (len > 8 * 1024) return NULL; p = malloc(len, M_SMBSTR, M_WAITOK); - if (p == NULL) - return NULL; bcopy(umem, p, len); return p; } From nobody Mon Sep 30 05:08:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gb0F6gz5Xlcv; Mon, 30 Sep 2024 05:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8GZ4vNmz4Wgg; Mon, 30 Sep 2024 05:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pj9pqoo3aEpCZsfOUd5JoqERKJMsgiNVdVcOiygw2jE=; b=eUdDVKXQpqVT4JWVw7x1+sc7vT1t0uB4SlHcj13dw9moTSHH9PZCqTTob1rTuVBTbQ5AUx b2nfQx+Iox68lgLmj5ZAV1yD68kqTh7CqHtPAAtS+wDrjQGFHDiFLqPCkj4pHPsQS6+/qL PmEsZHAI/RTKp2NLIJPuTK8HH1BZNTrzFBtRiWnDHBQ8zfEdYGrg+Ofbnrty6aMJQDhafa lAalWRVEnBiMxMLR9W4DDKfSZeLT69PCUummfF4ntKhGRXgCqrxKQOmyS4dSddbHiUIVSU BETdcqgZbu/Zz2/+gGywGntlmIxmE6lFY7/UeWdz4Up9phrwWJLzdL24e+IbmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pj9pqoo3aEpCZsfOUd5JoqERKJMsgiNVdVcOiygw2jE=; b=uyk1Ripmix1N9TbAxCQvyO5eZ3AfNCy3YSdCcxzRig8BAv5Z8pxX7F6Zc9MXQ+tDWSnh35 5LPu2mXqhbshbIhDb+gCnFu5QxDnWJSCRE1oEG9CT1PoPcVliwac70oRZ7hseR3fh37Nd+ dkzrH3kbIlxwSwsCtkXTHfPXwL0/DCYRpyCkr8ppMg7oFcX55rQ2uwfE6RL/5K3G+QVOAm yFpE4YmU59W5UC3lNfwg1yAOwUCR+wzzNgKNRnuaSgb5BIi4Od7bkzbLYZ9G+e2W/I+7+O okeaoIBM4eSuCNvQBmXSgrsQAohzGhionrUlLQYK0L8sC6Q+xyy9GBv5/guN0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672886; a=rsa-sha256; cv=none; b=MSi9m2+GtiX9UI/25Ckiv+mZUfJ5wNFsJRBYF9qEwLAdY2Bju1KOM5c/FvAmVP4aBwOACv r8tXOswiu7SHEND32Im2nsYOZ4OOJqbkLX3F6JXNIAgGR7T/QaHvlFS2rW6/2pVe1Yft0c QtM3Hmuf9ou9iibk3LHWykN7e+TBpPfcwMuoDFe0r4V/vOq+khvLiV+XXnnQTT+JbRbdYG TNDyp4RpNKQFSVS6I92BJu1dZSgMndSUtYtMPUElgzZSYGoc7N7hNJRCReZodsTpHQGxDq bo8cMxh7Io6VHRnv4pElwGG/7laXxwRBeW0Bs9MTwMAEN4y7ENQjBYQqRbawPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8GZ4TFlzftZ; Mon, 30 Sep 2024 05:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U586Et024305; Mon, 30 Sep 2024 05:08:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U586Lq024302; Mon, 30 Sep 2024 05:08:06 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:06 GMT Message-Id: <202409300508.48U586Lq024302@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: 4e98af94a124 - stable/13 - xdr: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e98af94a12408ee38468d2c77d0a19239f5cd95 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4e98af94a12408ee38468d2c77d0a19239f5cd95 commit 4e98af94a12408ee38468d2c77d0a19239f5cd95 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:30 +0000 xdr: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 7a720bf67d73ba565a0a1130065f798870eb5faa) (cherry picked from commit 3d5e539b1f43dec0abd2df61cb958550ef9606a0) --- sys/xdr/xdr_sizeof.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/xdr/xdr_sizeof.c b/sys/xdr/xdr_sizeof.c index 6491fa80dce1..fc341dcaa9df 100644 --- a/sys/xdr/xdr_sizeof.c +++ b/sys/xdr/xdr_sizeof.c @@ -95,10 +95,7 @@ x_inline(XDR *xdrs, u_int len) /* Free the earlier space and allocate new area */ if (xdrs->x_private) free(xdrs->x_private, M_RPC); - if ((xdrs->x_private = (caddr_t) malloc(len, M_RPC, M_WAITOK)) == NULL) { - xdrs->x_base = 0; - return (NULL); - } + xdrs->x_private = malloc(len, M_RPC, M_WAITOK); xdrs->x_base = (caddr_t)(uintptr_t) len; xdrs->x_handy += len; return ((int32_t *) xdrs->x_private); From nobody Mon Sep 30 05:08:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gc0mf9z5XlfV; Mon, 30 Sep 2024 05:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gb5qMrz4WQ1; Mon, 30 Sep 2024 05:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35Mb+vakxCtLu9ivx/BUk6VtrOX3Jqi3fUUE4KwLWC4=; b=E92RS4B0t53eK0RZAEXCiKtIyUQeWN7fY0ZlGScDXjWezcvPkwPvp1sn0sJAGgaZ0MS4yp lMDzUamFYC38eKNmraXnNCRiGduXRptEKS+At1DthEPQcW4NcX85hFNCPhe497Zm5YFxv5 U2CH8OfMSTs9GFj+7V3+MTgIHRDkqsRLPvQ/1iNb22NmztwXYZ869MRB+VrNUiX397XdT3 OWEOSPO09vacF/pZwn0v1KXKe7pFxmb14MuW4GSomfNaGLKZCRclg4kG4+dMXDsb+ctWIe ck7PldjYqqVo110ySw90kRe0yvF4YvIgF3+L2UZDpsWq8Z7qLVTPyB9A/ET/Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35Mb+vakxCtLu9ivx/BUk6VtrOX3Jqi3fUUE4KwLWC4=; b=am+YczsObTT52X404OEvpfo8BZQZE1qyk5fFfyV0OM+2zAd2pZ3QsAwdqttHOr/wkPxUFC krPcFC/fjaoAwE1n8Bg2p5/jdWnD9EGqcOIipy02073LtnxX/m9u88wWHntCsIlpPTNjgR Q05dxYjGKOq67KIkTvsXKbonR3LJ+emLmWYIgLgmz9ZCuKE0SC2uPBoBXc6DxLDgcgdvw+ dJnaoZMbxzQPSZSj5Tof5CFZjbt9IpNjHRQBOvDgwWqxcI81cqWutklvagFXtqawflCSp5 5ZkUctqFMHxrvovT+jFAYP15YL6Cx1F2VMmXx9861zL2A1SEGA5jTicl1FI5Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672887; a=rsa-sha256; cv=none; b=q7ymnxtIjLoPwYlJkg6RhC1qsL/xc636zXkd3mcB66uxxxigdsilZ5wlUDhEekgFMO/6BE vhn9JTvDnlq3b/n4fdEebLfTI+Q/yhNH9uptXxPgoVzI5lOfgg1n7b/TqsuZFsuM245G8F 61babpClCgMXRjfVAd7TJATasQp9dH2uWRiIQL/zP/9+c3dsjgiAXdZVlv8m+4LUtrGxlu 7nepiiQj4yGZU9LNLfyMqF6FygSgyjNKmiYR+WM87aViIV1i8mbb3fDEHhHlOfBuOtsNgd I7S+ChOZAjuYMt33phQIbHUXB8BBIvkI/5/mblCLO3kP/da2wFgJOoCGvaVWHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gb5JFzzg9x; Mon, 30 Sep 2024 05:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U587AO024356; Mon, 30 Sep 2024 05:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U5871o024353; Mon, 30 Sep 2024 05:08:07 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:07 GMT Message-Id: <202409300508.48U5871o024353@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: ebf9b28b19e2 - stable/13 - LinuxKPI: 802.11: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ebf9b28b19e2f5832d954861efba5362b0f38d09 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ebf9b28b19e2f5832d954861efba5362b0f38d09 commit ebf9b28b19e2f5832d954861efba5362b0f38d09 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:31 +0000 LinuxKPI: 802.11: Stop checking for failures from malloc(M_WAITOK) As a consequence lkpi_ieee80211_ifalloc() now does not fail. Remove unneeded NULL check. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 7bcb1228558b4325fab39616e2e3b2573a9e7da6) (cherry picked from commit 7bea79c1ab400fc223d730a89af97dcf4ba09911) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a33149353c75..288ae00b6949 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4372,8 +4372,6 @@ lkpi_ieee80211_ifalloc(void) struct ieee80211com *ic; ic = malloc(sizeof(*ic), M_LKPI80211, M_WAITOK | M_ZERO); - if (ic == NULL) - return (NULL); /* Setting these happens later when we have device information. */ ic->ic_softc = NULL; @@ -4425,10 +4423,6 @@ linuxkpi_ieee80211_alloc_hw(size_t priv_len, const struct ieee80211_ops *ops) /* BSD Specific. */ lhw->ic = lkpi_ieee80211_ifalloc(); - if (lhw->ic == NULL) { - ieee80211_free_hw(hw); - return (NULL); - } IMPROVE(); From nobody Mon Sep 30 05:08:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gd2Dldz5Xlnv; Mon, 30 Sep 2024 05:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gd06rcz4Wvk; Mon, 30 Sep 2024 05:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcsrWBXjjX4n65paWMJk+hTsi4Pd8qE5zovBNjuomkA=; b=Tmnz7t674p7FTAmy5fucOaaaOz+HaRK3koeLS2UtFowrXXzF3uQhn2V9Kfni19KORJJebm 3AoB8JTD4vOD9O+Rycltz9Do1gRfEVHH70Kg8zwSKRF5lKytXGyly+sEJD0e93+jK8b++u R0phSJVQ+RguF7wudmnPmb+wXLdnHYOxNqB5aOp0aNqIJF0FUzDIjLPZ2yyKkkSI66I6x+ AjvFe8Rign0sTw4VYP1sva97hRmEgcTvfTicLTrPoFw1mneEgAD5DiCcafUvJz9iDr7hgh sHB7TjDKrqm4Y6qAANkszQPE6ViY2JhCy8sqnt9p5ozP3B4wSOF29zj1KnTLvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcsrWBXjjX4n65paWMJk+hTsi4Pd8qE5zovBNjuomkA=; b=NAabOe3MKEeUxhcKOynq52wp0ycLhzacp9NB7cg0EY8Q7buwWT5TiLBOcOIGV6RbK0slzN p6Uagd48cyrYQiN3bCglVIBKoGVZ3h9Beovz7Zj27uiZqMLkT06yDK45euPVBbjCS+1nNo 0orJJD/bv7I+2aLoWVEunvH+L+RbsgdwZjC6LwnFAlrC9dQlTMaBsVVfoM+67lDgrrydFU aT+ypD0l+265xTLbashonpqCSzAOeuOOiJ4yU6I6SEMSvLIkxtu5O8Y60oYy0wxaf3lGOj rbrp8r6wm+LKU70SPxgwFwipeBk7/Z1sUprT82JyhoGWC0zsHWKpzfBVJbISww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672889; a=rsa-sha256; cv=none; b=eops+YpEc4XwjfWDJGgzGVXnDV/ARtzy5V6oWz19+jwmO12MA8AJOlVCGqkcj7M2nuI/tl 1H3NLfaXuEPrT1GngLKW+QBEy3Xo/R0zXtMGF1FmmSjKFREYs2VLOs4jue6pVwFHU8ABbC hJKwLepBHP3usnkmWxvu8lJjMJIwtbwigkQSCfT1JL9WN1/ZOZ9S94e3ruV3qeo9Yc5Eqc gV28DXWxnWqtOjgaXSvJt9f3gLzxPGwzFrMgoN7RVv0eRqYbRyCavEDvsX2QjaE8So25ii AzTuP9irxQiV9IfVytW3wBb2sptrlpFDuqdWq5ztp7hnO52jQQPdQfzG4srAtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gc6rQfzg84; Mon, 30 Sep 2024 05:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U588FA024405; Mon, 30 Sep 2024 05:08:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U588TT024402; Mon, 30 Sep 2024 05:08:08 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:08 GMT Message-Id: <202409300508.48U588TT024402@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: a7fff4fb4ec6 - stable/13 - krping: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7fff4fb4ec6e834d801e64df83a169b35cf2048 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a7fff4fb4ec6e834d801e64df83a169b35cf2048 commit a7fff4fb4ec6e834d801e64df83a169b35cf2048 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:31 +0000 krping: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 66c35a6675ff987b52a2018871231658b1980a6c) (cherry picked from commit 905d5420ee1eced55f99ab3ba5c340b685f2f896) --- sys/contrib/rdma/krping/krping_dev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/contrib/rdma/krping/krping_dev.c b/sys/contrib/rdma/krping/krping_dev.c index eea3c772ea4f..59aa19672443 100644 --- a/sys/contrib/rdma/krping/krping_dev.c +++ b/sys/contrib/rdma/krping/krping_dev.c @@ -174,12 +174,7 @@ krping_write(struct cdev *dev, struct uio *uio, int ioflag) char *cp; krping_t *krpingmsg; - krpingmsg = malloc(sizeof *krpingmsg, M_DEVBUF, M_WAITOK|M_ZERO); - if (!krpingmsg) { - uprintf("Could not malloc mem!\n"); - return ENOMEM; - } - + krpingmsg = malloc(sizeof *krpingmsg, M_DEVBUF, M_WAITOK | M_ZERO); cp = krpingmsg->msg; while (uio->uio_resid) { amt = MIN(uio->uio_resid, remain); From nobody Mon Sep 30 05:08:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gf2tnRz5Xlnw; Mon, 30 Sep 2024 05:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gf1Bklz4WqS; Mon, 30 Sep 2024 05:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n9cenK8YHRMZ/DMmFWKCcp4Sc+XLcEzqRNB/BjJu3kg=; b=s3Ev7i/xaWf4h9/BXygX3MGW38HTdkyYIbDqlrLFocp2QYCL6gaiml8638VNK8EARoKvlb Pgiq201mVoVZay5gHhCIEWrD5FcKOTEdbTwSlf0eL0yR7tUz/iVHFtvEmyuxVqcypYCRdb dE8oM5A/kIfLdK89ZBiTUtOZZViWaDWR6COIvt1NR8O7SZlHpO/SHBAdBZ9uwqPKSyvLPr VLRUvPQWoQCGHIK8A4DRqr+SLQ5EvGB9Ir+DQ7yd+ugh22fvWvyS8HpdS2Ihd/pU8UAJ0X tvsqKCG4rvxVY9kyy/tgrNnTLjztZREDVDxnah5ycsV70jtJHc8r1gy4xxxPTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n9cenK8YHRMZ/DMmFWKCcp4Sc+XLcEzqRNB/BjJu3kg=; b=yQWqjvJvHA/njvJHSybs8eG3lxtRl+kktVdqSM6pRdlIz1/n4/XDsoQ1IQGAAa6QC7hKDW qpY2/EtM76P7Y1ir38ssolSIVeXOiqlwxIM50MbIujFruZ5yYBYJCUSPnQ7tWjHiGW8y+m IyQ/cbvvpvJ2gsM28+MBTK9/gOt+uCMlw15fJsg6ZVV1gv6BbJUroxWEvsbsYv0DSJ19q7 ym+YqauIRrf0jReJnz2zYuqNI6TNfcmo2I2XE0YgBwxfWnTQjhYa3UXHPgJjViBHemNLSk oT+HQuP1GDjJApEddosE6dzTjUZRoPWffLjDB8n6RJGRGTzduEo6NIMxKpdrVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672890; a=rsa-sha256; cv=none; b=NRrjcy/xDY5FaDzFWqtylaxMExJjYZvALhl5fwH/FdwTARDREY4rXnY5YC7kSrzaT/5Mu3 miSoLav6S/gMIO3H9jpIN2QGwt3CDiP+KB08X4FYo0g+I1KLuioO6m9zZxSJgOj1dEfhDf ZIozIuHkKZ3oPpkkIS67Vk916oIysMyBdKgV9ArEz9kOYWgzvo3jD84vKYmVS79VDK1xac qPYmsE8q+Pj0OnIx8uxZNpeMPrRmEGsMjhIxizxCMfbcgmzXEsPmTY2kNH49BLr2SmDyB6 f4HrSYfkiDQD1RfaKrTM0JlczxA/fV+6ou1czBRJN99x2ZSd7Y/Qu7x/qBRMmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gf0nQDzg9y; Mon, 30 Sep 2024 05:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58APa024461; Mon, 30 Sep 2024 05:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58AvF024458; Mon, 30 Sep 2024 05:08:10 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:10 GMT Message-Id: <202409300508.48U58AvF024458@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: a8a127328ea4 - stable/13 - tests: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a8a127328ea48a62e87799ce3f1513df1a117e18 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a8a127328ea48a62e87799ce3f1513df1a117e18 commit a8a127328ea48a62e87799ce3f1513df1a117e18 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:21 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:31 +0000 tests: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit aac6c41d4ba9b0a1aef561f6c4bfd284ab369ebf) (cherry picked from commit 6a0ed6fe27ecd9f9b51a6c29bc15f5dbf2ab6c4a) --- sys/tests/framework/kern_testfrwk.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/tests/framework/kern_testfrwk.c b/sys/tests/framework/kern_testfrwk.c index 19714fa76f52..c6b46542a205 100644 --- a/sys/tests/framework/kern_testfrwk.c +++ b/sys/tests/framework/kern_testfrwk.c @@ -192,10 +192,6 @@ kerntest_execute(SYSCTL_HANDLER_ARGS) } /* Grab some memory */ kte = malloc(sizeof(struct kern_test_entry), M_KTFRWK, M_WAITOK); - if (kte == NULL) { - error = ENOMEM; - goto out; - } KTFRWK_LOCK(); TAILQ_FOREACH(li, &kfrwk.kfrwk_testlist, next) { if (strcmp(li->name, kt.name) == 0) { @@ -244,10 +240,6 @@ kern_testframework_register(const char *name, kerntfunc func) return (E2BIG); } te = malloc(sizeof(struct kern_test_list), M_KTFRWK, M_WAITOK); - if (te == NULL) { - error = ENOMEM; - goto out; - } KTFRWK_LOCK(); /* First does it already exist? */ TAILQ_FOREACH(li, &kfrwk.kfrwk_testlist, next) { From nobody Mon Sep 30 05:08:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gg4mRRz5XlLR; Mon, 30 Sep 2024 05:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gg2HrVz4Wkm; Mon, 30 Sep 2024 05:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rpr7lswjwq48ly8LfBQPvwz3SYiAgEPTVYUX4vgjIfY=; b=cumLl9B6lqV8oM0q7WsEObyQbyVuTT8ZYMrLsfhoOHwfAWPV/bevXGtWqBegkqY83kej42 81V96rSlnnMsewJKg6duSCHOfvJ8h6A0jAO3b+s58KXJYpO4CpwifOngexSJnxC8lkHjfK 5SBzt8NjWhFlfWA0dac0B4/NFMWt3rkLqpy8Qu9Ip80Gb61Peu2USYmUk1QE+naAVglHpC AscQyTObJhNVRNKjv1RHoDRMiPHmbLgeJ5yp+LxC0Wn37/H681Owi3XvTBPv3JlJbIs291 FJZxTZz1jT7RbYfhrlf4hYSuS6oPzp3XzodsgjJwDdyQ5ul5PCwuvz8YJ4GeMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rpr7lswjwq48ly8LfBQPvwz3SYiAgEPTVYUX4vgjIfY=; b=w7sqRluyINkiZZxqDtfdq/mso89xpfVvL/6E5oA7OJp1sL+Ophf5Ks6NY+KT/SMTp74gNv 1OJ8sZDsv/3DK/8KpWOsxJy1a+/5S4xiu/zUtyZRJFM9NUf4LuztspHLpCyZTa+Cntfwd9 PLZUCh/yHN7ed12Xfg4OKNnECIcVdgu5XQL6HrzB4MDLpfGxOpGWi9vzTKbSQTJHsbHuK4 5DE/bNVE4q2sHbw4J08qgX5BfA1nNSwTF3oYOWwD1Qd7Q4ArJ2KLP2L03QQYQ+Ia+uOfZk ZpD6vo/0tqgyWEQS0PooiovtBp4xAFKcegA4gkCcgFoIPQAcX3okhUEO1Jrevg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672891; a=rsa-sha256; cv=none; b=n/XR8v2yd5qLlgcYyMKqz91UDcAhOl0AYm5xwUoJn3csWKaM7TWTvVZnnNLhJZmUUATL8u 5jbwlIHpRkWaWrp6BUfl6DISVRXyO+zgHRTXOtq8fc6ek3YuFk2wWcfm1D+TfWcB3TZn6k cc2MRZA4g13Yko6GMD/F1YYCSFhqz/zIYsLXqYDwM5OCpLDb54Gp+vNdUT+//CVZaLzV4v yZFXwICda3GJllC05w3J+AeDDj3A31RyUAK0F33zZwbpyNCCS6scvhbPZzguPEbxRiELdN W7XYqHWL5sxIkNoApNbxhHCFThYSY6zfkheOE4/5XGu1HjyAM0jyz3bs2VC3iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gg1wCSzg85; Mon, 30 Sep 2024 05:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58BtV024512; Mon, 30 Sep 2024 05:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58BGL024509; Mon, 30 Sep 2024 05:08:11 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:11 GMT Message-Id: <202409300508.48U58BGL024509@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: 53922b3c2669 - stable/13 - arm ti: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 53922b3c2669f42f1f030615bbdf5e4e8b00f93f Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=53922b3c2669f42f1f030615bbdf5e4e8b00f93f commit 53922b3c2669f42f1f030615bbdf5e4e8b00f93f Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:32 +0000 arm ti: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit fe6985ef87e1aedf8e5c9b3b959c7dd54a03e2fe) (cherry picked from commit 920288c32900da48136eafc41aa6d020552e36e5) --- sys/arm/ti/ti_pruss.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c index 82fbb0d7ace3..9e0c805478ba 100644 --- a/sys/arm/ti/ti_pruss.c +++ b/sys/arm/ti/ti_pruss.c @@ -186,9 +186,6 @@ ti_pruss_irq_open(struct cdev *dev, int oflags, int devtype, struct thread *td) sc = dev->si_drv1; irqs = malloc(sizeof(struct ctl), M_DEVBUF, M_WAITOK); - if (!irqs) - return (ENOMEM); - irqs->cnt = sc->tstamps.ctl.cnt; irqs->idx = sc->tstamps.ctl.idx; From nobody Mon Sep 30 05:08:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gh5CQSz5XlfY; Mon, 30 Sep 2024 05:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gh3M88z4Wr6; Mon, 30 Sep 2024 05:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKMrRUOn+y5jEph/hYaAkbF8/YB6BFYHYUf3ep87TTE=; b=trMX+WKdhTbqP3Ftms8UubxLNmTHBNMVdEeOZ4/JcyBJdN9jxK6HOa46bBzz/NR8m2+mM5 J4aS7mdavYD8h/iXo95UB9sE05SY/KUSSSBU2DZ3Gd8OdHQm0z6DWhmk3q7hPGsgZ4Pgou S2ZsB9JolGGc2xu89OsK1XWMt0pzxU/+8GIQmIYBX4dieLENg5oipERKBlP7EFgK1ccOMP Ug0uQzpKTAeqT81/J/03I8m5w+TlE3pa6rNyNZHLeG3PmAe3ID26Y1bqEPI5xaGSLpXugs tbA0E12Bm8s8SU01aAm53Qcdb/Q94H11u24ImKw1N3Rs+yO0KaaNoaJ+IK0k6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKMrRUOn+y5jEph/hYaAkbF8/YB6BFYHYUf3ep87TTE=; b=UhxSJ7XAzRsy8XKQhXt/j69P3kTLqKXH7sfrceoIoXSUdUg1uNGTNcHHyHJQ6+zhTSTW0k PYm3NmOd1xB79ylce3bmj1JxKWAHliy+7ZV4H3AJ2+jIRrjxRU8fIHyjVM9PHcBgK1fFJR sxJ/pYXbICyoQxP2y3iaNt2XqwAejqdxerV+L3wJhBSjicpOQAuYMw/Uw7NjSqd96FIvrE Uq9eoJN25GBPRnU+1dqvEsGwvVgQY+rYzX9CcQ49TH4xJaA0rkUEwSnMj/eMzX6C/zg6BD iNanjERdE/PQDa2vtQOnTmAs1oIpOZf8ysMDDX1qNlr5FN8nPUZz142PdJC3/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672892; a=rsa-sha256; cv=none; b=qa2/+N1VLI3dXf8DOt2hjuKclxbv9CAsEj/jD5wN5buKbv+/0sPtLfMTpORmkjqRbfV3vN L5PR8qZMwLSc2psb/+mRIdOnMPuny88IxETncvOM0FzwOhILu8v1IdQzdPXVTsSXQiP8TB cGrUnzjpCySx9d+2+FYDDTe6/y3kbG1a5MMp31tBSXBdAeUIDjA0c131zeXH0NW478YOlI ox0Uw2O157oi2AN8Gyltil8MHrnckxJ9RLowLvF/Mt53dzmpI92jdsFs0Ae4YDdla0wVOD IRFUGDi7+7oo2g3HZSffPzCfXWsDVqaJiD9S5oK4yDQYfS1Lyk17CREA5sAYkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gh2zcbzfx5; Mon, 30 Sep 2024 05:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58CSc024560; Mon, 30 Sep 2024 05:08:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58CIM024557; Mon, 30 Sep 2024 05:08:12 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:12 GMT Message-Id: <202409300508.48U58CIM024557@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: 91b6d79c2f39 - stable/13 - smmu: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91b6d79c2f39199d51f7642410418a8b10dcef0d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=91b6d79c2f39199d51f7642410418a8b10dcef0d commit 91b6d79c2f39199d51f7642410418a8b10dcef0d Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:32 +0000 smmu: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit f75ceecad2157a0d3aca61a4893ab78f2dec21ee) (cherry picked from commit 49995f771b537064daeb2931ce86a13e78f9d977) --- sys/arm64/iommu/smmu.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 40f78041c316..98e8ad14e277 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -931,10 +931,6 @@ smmu_init_strtab_2lvl(struct smmu_softc *sc) sz = strtab->num_l1_entries * sizeof(struct l1_desc); strtab->l1 = malloc(sz, M_SMMU, M_WAITOK | M_ZERO); - if (strtab->l1 == NULL) { - contigfree(strtab->vaddr, l1size, M_SMMU); - return (ENOMEM); - } reg = STRTAB_BASE_CFG_FMT_2LVL; reg |= size << STRTAB_BASE_CFG_LOG2SIZE_S; From nobody Mon Sep 30 05:08:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gj6gwSz5XlLX; Mon, 30 Sep 2024 05:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gj4Lxtz4Wws; Mon, 30 Sep 2024 05:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jf/fIULFnefiq24g9JWO6dyMajOIN4JcntMjzzzHD7o=; b=ERB620v+jy5E7TetKUt+FGcTNRBCcdR2qm3CKrgyq1mRyDyE3bnMH+XsX6Aje8qwKW9B2a fXZSkTtxHRI9F+ke+7ci+3+wQWRtgA3IQiCYpELJ34PBP5sS6StXZ7czv3CHzsI3Fn/tg1 2mhe4RaKsY1OS31470ZBJADkqex2oij/LXyxGqNnyKtz0yUieZSv87UFxICFkUPn6i4k/r ccqQlECycaGvY2CYeW2gTvaIq7UsQDV0cakzmrPKs7dOoHD+Fh8PM9Tyhge8/PYH2Ozjf3 Aaa2t6BvnadAntF/i8G7tc80Fvv/Zi0adDEq2e46R1VDGANPb9jTn+HX+0uWhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jf/fIULFnefiq24g9JWO6dyMajOIN4JcntMjzzzHD7o=; b=wtn/9RYYRCqvUqmJzNRAft4F9CUIdKmuG6of/WBTpfh7+mqAnrqLYwbT8NcrA5ZsJTR6vn uKQW4EO1Bz7BsKqZOFwFQ/pEtBCOjNh6Zd5dofsIq9xbMkblKnl2PMB6qUnG/Sd0y+DlC0 jgDHdJF7tmSloDTpbBljherzwfRFSVtSkHT18ikKgWZS0mNg5r2LwStTf7XaX03Z6WF4H1 MC4D4fuaY7dhTo1ER7sbR9ign0KC4DX0WSgqrTYLvjg/LPihuDq3GQmcXASGQXgnj5sQvB eGRsTfqJycpOJi+/hsLTsu2dUHB+s07379SrY7cVil/gq8mmJh0eNqF8g7KY1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672893; a=rsa-sha256; cv=none; b=pKDggnCciS2Kc8rZ9DQkwJhY1I7bxQpgPhMvXc48MVbXY1mK+3Lc4CUbBC1TMgEiOvNEVB fpU8A8gCGzlr+DkvhBAACIYLha1Z5wd9ZVnUfeZguihkkdAPnvPoSIRcohTogCcRTq8riu UUmdlZKovG9uTFw7Pl8THf/bR1I1rIQkTWxtuEkFAwIpVI6MMIv5FoYOe9EHJh1uMhVjbB tdjWtyqrXALeIltYSXU9dLvZxgagnaMgsqjOlQDDmYpCKXk7LKKGg8dYbdnWZ9OfMBJgZz PbxpvEuBk2azD5rSbPh8a7XH2YRomBZ7T3sGxGQnNM29RRb9BemUVSOkITeWUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gj3zH6zg86; Mon, 30 Sep 2024 05:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58Dpe024608; Mon, 30 Sep 2024 05:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58DSL024605; Mon, 30 Sep 2024 05:08:13 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:13 GMT Message-Id: <202409300508.48U58DSL024605@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: 9113fe381f1e - stable/13 - al_eth: Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9113fe381f1ea848d960315a3d3abdf9b770da07 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9113fe381f1ea848d960315a3d3abdf9b770da07 commit 9113fe381f1ea848d960315a3d3abdf9b770da07 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:32 +0000 al_eth: Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 00ae9c1be02e2db6ede1abd5b787bb9a3fbd76b0) (cherry picked from commit 74887e322101cbc9e531e3acd08a6eb10dd2169e) --- sys/dev/al_eth/al_eth.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/dev/al_eth/al_eth.c b/sys/dev/al_eth/al_eth.c index eb6525a566dd..409769b5ee5f 100644 --- a/sys/dev/al_eth/al_eth.c +++ b/sys/dev/al_eth/al_eth.c @@ -2009,14 +2009,6 @@ al_eth_enable_msix(struct al_eth_adapter *adapter) adapter->msix_entries = malloc(msix_vecs*sizeof(*adapter->msix_entries), M_IFAL, M_ZERO | M_WAITOK); - - if (adapter->msix_entries == NULL) { - device_printf_dbg(adapter->dev, "failed to allocate" - " msix_entries %d\n", msix_vecs); - rc = ENOMEM; - goto exit; - } - /* management vector (GROUP_A) @2*/ adapter->msix_entries[AL_ETH_MGMT_IRQ_IDX].entry = 2; adapter->msix_entries[AL_ETH_MGMT_IRQ_IDX].vector = 0; @@ -2304,9 +2296,6 @@ al_eth_setup_tx_resources(struct al_eth_adapter *adapter, int qid) size = sizeof(struct al_eth_tx_buffer) * tx_ring->sw_count; tx_ring->tx_buffer_info = malloc(size, M_IFAL, M_ZERO | M_WAITOK); - if (tx_ring->tx_buffer_info == NULL) - return (ENOMEM); - tx_ring->descs_size = tx_ring->hw_count * sizeof(union al_udma_desc); q_params->size = tx_ring->hw_count; @@ -2329,10 +2318,6 @@ al_eth_setup_tx_resources(struct al_eth_adapter *adapter, int qid) mtx_init(&tx_ring->br_mtx, "AlRingMtx", NULL, MTX_DEF); tx_ring->br = buf_ring_alloc(AL_BR_SIZE, M_DEVBUF, M_WAITOK, &tx_ring->br_mtx); - if (tx_ring->br == NULL) { - device_printf(dev, "Critical Failure setting up buf ring\n"); - return (ENOMEM); - } /* Allocate taskqueues */ TASK_INIT(&tx_ring->enqueue_task, 0, al_eth_start_xmit, tx_ring); @@ -2481,9 +2466,6 @@ al_eth_setup_rx_resources(struct al_eth_adapter *adapter, unsigned int qid) size += 1; rx_ring->rx_buffer_info = malloc(size, M_IFAL, M_ZERO | M_WAITOK); - if (rx_ring->rx_buffer_info == NULL) - return (ENOMEM); - rx_ring->descs_size = rx_ring->hw_count * sizeof(union al_udma_desc); q_params->size = rx_ring->hw_count; From nobody Mon Sep 30 05:08:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gl2Ldbz5Xlr9; Mon, 30 Sep 2024 05:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gk5csFz4Wrt; Mon, 30 Sep 2024 05:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ycn77/ts7SxkNeLDRlu1c2JmDkV8mc04UoKkZ3e1sU=; b=wxTToD+z6zaQqY98n+cS5I0jUMuB2Jgi09jMbBuZdm8mYxnbVMeWGPaJmVS4krzO11GqDI dbH085fa8a3zpE4UIow/sjFfIS2LvwJryOhhj6enAW3GIBlWGjyNsPkKE+SJiRM1wfUxQE 4/UKflgKceJ8gYGroVP3hztAbO+6LNnc/NzivhzHgfQFSolQFnYWC02PAykIUD1BP6ocbz KriJoske9cSdCH6IG+3F+2PGbvl9SPnse5wFUB6+MM9OSot9ZIQBhF9ecc6A+7WppKrLc/ fAYw/KY5QehX4lRT9oyxz7zaNVD7hu+KoR2s4vGuHRYK0ZCEzaK+jCz05xbOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ycn77/ts7SxkNeLDRlu1c2JmDkV8mc04UoKkZ3e1sU=; b=i9C7nypb+6cLG0uphyhpeNxRn13mRyohbuURVLDwc49eoZP0p7LswiTV2sEi3I1CG0TXkj /xF1hlgGlYbDuFH+CG5aEufXW3/hoTK7exsl4npiUE0h3RfxTGSBYkTL6XOe43t11g5ujY xysMB5K1v82mDStbE8ujsDMwdJ5mtpzd2u5xgZ+Gmld0w0C2LZGLyGqRHQYiLE4qZQfmBL 5MQIL4vJ1SgDbUHPHmSjLxNbnU30CtzOpyTbG6UlPrLX3EYliR++EGn7Zu04gtV+VYw/NO e8/dW0m+4Wj3gkuzBWHlYkjCbCBcDL4PDwXcRvz9bpyrKsLi5KvAJOFaVmpeCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672894; a=rsa-sha256; cv=none; b=QwjB7LeQck8rbM8DM+pcY1mzuO4yjL1mK+VVJGsczQwhaHZOlrptv7g3ID2dm7UB4JJS0R mROg3SWpZPprcvuxFJmbuqPBTE82AKsf32bv6ApiHpVi//32On48F5EOJ6lQTEl2P9fN5r M5w9gCXzBa6Lp9hM9l/5PkX6w7kp6CopvGZdgMGZSEB+J/Qi5nHz6jOOhSV/OKDwAX1R0f dOttnspMHJz27RYzNY8mwfULUGiWI2yvIgIv9EhReR5lYBICypo7mcE8lKhnt4NsklrQin K8+Wxt7o+3Wqw0CHClJSVXKWoXtL/4nOK/Y3ZsOu1Kqk2LSCxNsOZm95tDZkXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gk51W7zgDQ; Mon, 30 Sep 2024 05:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58EvZ024656; Mon, 30 Sep 2024 05:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58EWl024653; Mon, 30 Sep 2024 05:08:14 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:14 GMT Message-Id: <202409300508.48U58EWl024653@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: d40d85672e9d - stable/13 - altera: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d40d85672e9d8154375d8a2ad6d6dabf26865576 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d40d85672e9d8154375d8a2ad6d6dabf26865576 commit d40d85672e9d8154375d8a2ad6d6dabf26865576 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:33 +0000 altera: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit e06e2c84074740a0087193d5929d09f1bc7e1c4b) (cherry picked from commit 66bb507ccb1c9860662a921d231f591ec814d83f) --- sys/dev/altera/msgdma/msgdma.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/altera/msgdma/msgdma.c b/sys/dev/altera/msgdma/msgdma.c index be2c55baaabe..cc560140159c 100644 --- a/sys/dev/altera/msgdma/msgdma.c +++ b/sys/dev/altera/msgdma/msgdma.c @@ -356,11 +356,6 @@ msgdma_desc_alloc(struct msgdma_softc *sc, struct msgdma_channel *chan, /* Descriptors. */ chan->descs = malloc(nsegments * sizeof(struct msgdma_desc *), M_DEVBUF, (M_WAITOK | M_ZERO)); - if (chan->descs == NULL) { - device_printf(sc->dev, - "%s: Can't allocate memory.\n", __func__); - return (-1); - } chan->dma_map = malloc(nsegments * sizeof(bus_dmamap_t), M_DEVBUF, (M_WAITOK | M_ZERO)); chan->descs_phys = malloc(nsegments * sizeof(bus_dma_segment_t), From nobody Mon Sep 30 05:08:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gm1gnWz5XljP; Mon, 30 Sep 2024 05:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gl6Nczz4X23; Mon, 30 Sep 2024 05:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CW5XUxmUpk53nYvvceoc9sb2fPASKUgkNyiQYzLd4k=; b=DHi1O4xuirX749gWTx99SyShuJeQuy7J83XGxwY+lPxtx7Tq0wtEnYT2x7wTKX6n9z9E4V moUH218tbWevQAf1Vm5kaS1g++P2PTOFD5IG10m6ZTWEnUriNKN607TvE1q+ZsWcCUJI91 nQ5peUI+EXfgyZtJ8fRMzRRog5AJ8r6V0YazjdzzG4Jxtvc/D6Wq8usgPbDIdbQt8U1yJz NhIpeFMGUd1hEWEs0rtgYOk189Eq1MIwx0DUo68wzz/cmEpmpb9AhKqjTDCZ+lGIS58DdR 7AIUOn11nBJAL4lVaKD2LlBfwF0LJALSDaLObCBfmnXbwJQjUV2DEx2dYp3yFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CW5XUxmUpk53nYvvceoc9sb2fPASKUgkNyiQYzLd4k=; b=tAxVKioxUs+c/2kK/Jc9tPdkpUx8EIRiOsMz/LxNqixekJ6KnzfB0t2AV+L/Uhs5DVZpOF tkFMN6/ppBXQj18yAgWJ+OISHiDAY3MHz0LrntqBfi/0EzbjV1zmphRdQFeytjB4mbge8R GfbOJuPTr33JMCbANgTjNYz9VJ2U8PxOUkF8KKslCvuIsMxn3LWSv1HXTjsk9eUZjP3I8q SQHWaIc+Hp5bwUiLVwudpu4PB8rxzMjP+g/9aMieXj9H0C6GB2fYRuir6jjkDVNpG00sKI 7Imy4lNuZHhF44J7Mpk/3Zrg2F2Rp410MCICqKOxR1wUvnADX6z46SuqjuyAew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672895; a=rsa-sha256; cv=none; b=yy2idA4I2IN65Fc2PUcFpS4u65pVV/BZwWUrWcxmu7T0J5SGFzP8Y1vww2/83AvCom0zjE GynrAjjlyYYnjhGMAgUMTGJMdvaJwGZnFXOokTG9XPyJwbEF4hynaVap2bxbfh15pXMMk7 b7wCvdWvjsYtstA1lucz1fAddwayBL7PEPv1KaubqgdAF40sV4FlNU3Ake95qsvefd437Z nyIvL3vCDfTK6oZX5gfgNWTabRUGHjJXJeuOHgbmN4ZpvplRs8Yfcj9ggDZ8Ys99Caat1c YyXrdatYgEOpvrgxxGkP4h5f2Kl45YyF4Fvrx+YDKlRzWmDu9bYKSQt6xTcUCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gl60w0zgDR; Mon, 30 Sep 2024 05:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58F2O024715; Mon, 30 Sep 2024 05:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Fkj024712; Mon, 30 Sep 2024 05:08:15 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:15 GMT Message-Id: <202409300508.48U58Fkj024712@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: d0aa34422a53 - stable/13 - ath(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0aa34422a53ddf643d6187713ae453c5935ac89 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d0aa34422a53ddf643d6187713ae453c5935ac89 commit d0aa34422a53ddf643d6187713ae453c5935ac89 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:33 +0000 ath(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 3fdf587ab02f33018bd042094e3d0bd4169352ed) (cherry picked from commit 8c2748b922f579080d4d8ca88a8ada5512a69035) --- sys/dev/ath/if_ath_lna_div.c | 6 ------ sys/dev/ath/if_ath_pci.c | 5 ----- sys/dev/ath/if_ath_spectral.c | 7 ------- 3 files changed, 18 deletions(-) diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c index 1b20591fc64e..0755bb667716 100644 --- a/sys/dev/ath/if_ath_lna_div.c +++ b/sys/dev/ath/if_ath_lna_div.c @@ -96,12 +96,6 @@ ath_lna_div_attach(struct ath_softc *sc) ss = malloc(sizeof(struct if_ath_ant_comb_state), M_TEMP, M_WAITOK | M_ZERO); - if (ss == NULL) { - device_printf(sc->sc_dev, "%s: failed to allocate\n", - __func__); - /* Don't fail at this point */ - return (0); - } /* Fetch the hardware configuration */ OS_MEMZERO(&div_ant_conf, sizeof(div_ant_conf)); diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c index 95e3715dda2b..6e332b6c0c3b 100644 --- a/sys/dev/ath/if_ath_pci.c +++ b/sys/dev/ath/if_ath_pci.c @@ -269,11 +269,6 @@ ath_pci_attach(device_t dev) __func__, fw->data); sc->sc_eepromdata = malloc(fw->datasize, M_TEMP, M_WAITOK | M_ZERO); - if (! sc->sc_eepromdata) { - device_printf(dev, "%s: can't malloc eepromdata\n", - __func__); - goto bad4; - } memcpy(sc->sc_eepromdata, fw->data, fw->datasize); firmware_put(fw, 0); } diff --git a/sys/dev/ath/if_ath_spectral.c b/sys/dev/ath/if_ath_spectral.c index 58f21b526e93..951d66605981 100644 --- a/sys/dev/ath/if_ath_spectral.c +++ b/sys/dev/ath/if_ath_spectral.c @@ -112,13 +112,6 @@ ath_spectral_attach(struct ath_softc *sc) ss = malloc(sizeof(struct ath_spectral_state), M_TEMP, M_WAITOK | M_ZERO); - - if (ss == NULL) { - device_printf(sc->sc_dev, "%s: failed to alloc memory\n", - __func__); - return (-ENOMEM); - } - sc->sc_spectral = ss; (void) ath_hal_spectral_get_config(sc->sc_ah, &ss->spectral_state); From nobody Mon Sep 30 05:08:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gn3JY1z5XlNv; Mon, 30 Sep 2024 05:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gn0N6Lz4X2K; Mon, 30 Sep 2024 05:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObqINiN7nGokQNMlnmkSiWpXYTBYyd7QF446CaKBxOk=; b=Q8/tNb12dHFl49GjnmUHdTHk0KSrALQFAiXxO24n1ZcYzrBDPWri2dvNSduNje+Lz5k6u2 q4r0fI6cRSEWE6K2b6XRmXuZ6fADsMxAqj3PKB55PKDvEVNQ14GtuTcVAd4aPVnLKrPY8X KkZ5Rlb/fA3iJD+4NoYF3xjLNSAIXmjVyOhDyMVyyo+tilM0bnHjjHdxkvH5zsNnzJ/lhn T/FKOxNqTnIWeYB/KTDnTb/pF2o7fuC31eI/izNA4VqgnKQ+50kvvC6hU359pdeYqjLrbM /Zb/7W5Jwq9Mh/zAyoMPSI3P2dY8HUNHY6aNaYc6EPCLnOcExKFCp4w29p6UTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObqINiN7nGokQNMlnmkSiWpXYTBYyd7QF446CaKBxOk=; b=a+fdozpJwTqNDoGo1EX7yf0+iN6aWDPqvdRPovrdafGrkXYt8gKuYc+sZewT8jPgrZL0I6 xMOyZAyx68WG0VPyeHU1Vfqz8Zb6Pvw0mOBUNrLU2CwwbOmAe/B7m+EI4Sx28C8mCQhNj3 XefJTFMX9L2t1as7ogtRUmeUIV6UlHGH5X7p8VXdu5r9pTHSC7hHSNEwGH5mjIEG7jrg4J cokdz3kuhNoW8lQzEMEIHFFjYzCY0GbWt0GUDZEnDTDcjtkWgZKGmZAwfyfxZtDRea2qtb hJg0zgBtIylW6nlR0+q14hhepo5eZLS5ZD+oeL83R7G1FkrXmeDv4H+ERMYKug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672897; a=rsa-sha256; cv=none; b=luth1LfKWMaGXPdlky8+Mu4ihFLoLWgeZxPdHaSKLVHwD17bQvywWpIpZo6ggyUiQmgPjG LUcyJFuZudkKu7O33E1R0HS4hqMk4AhLxn4qsBFsKSFVJP3zg1T/AZuoi1+hQF4MFOBXDu px+gAdyCAqwMKghrcU4RiG9N1qGRHkrEEcx1AF5cD/LCDEzwxwVTIxwtna9Nko4L2Wp2pd yCHqzhkQTc5S7hlEUnTirIRmZWx2e00VD1hEy0s+DF7/0PGkgFsKXwHc3ylTHq9vnrfZ+6 1BoOsmoB/ZjAyAMCRgS5oKShNOq/NYszZRnPgMLieYDSS5g31LNWRf/CNcx8BQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gn00vCzfx6; Mon, 30 Sep 2024 05:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58GlF024768; Mon, 30 Sep 2024 05:08:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Gat024765; Mon, 30 Sep 2024 05:08:16 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:16 GMT Message-Id: <202409300508.48U58Gat024765@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: 55e34ff3a4bb - stable/13 - axgbe: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 55e34ff3a4bb2e7f32116e494805dabe15104f72 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=55e34ff3a4bb2e7f32116e494805dabe15104f72 commit 55e34ff3a4bb2e7f32116e494805dabe15104f72 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:33 +0000 axgbe: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit ab0b996bddd96300d56b7d2aa830e2479cdfa92b) (cherry picked from commit 3db5be68216957067ebaa9c57a70f3dde45887eb) --- sys/dev/axgbe/xgbe-phy-v2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c index 1fd01dc36f41..0ab517f99572 100644 --- a/sys/dev/axgbe/xgbe-phy-v2.c +++ b/sys/dev/axgbe/xgbe-phy-v2.c @@ -3482,8 +3482,6 @@ xgbe_phy_init(struct xgbe_prv_data *pdata) return (ret); phy_data = malloc(sizeof(*phy_data), M_AXGBE, M_WAITOK | M_ZERO); - if (!phy_data) - return (-ENOMEM); pdata->phy_data = phy_data; phy_data->port_mode = XP_GET_BITS(pdata->pp0, XP_PROP_0, PORT_MODE); From nobody Mon Sep 30 05:08:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gp4p8Rz5XlrN; Mon, 30 Sep 2024 05:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gp1YFjz4Wxk; Mon, 30 Sep 2024 05:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S8+wSQbz+PKzgQXggaJkeuc3TtWniwFbOfjN+ghuYQw=; b=VCfYDki/SdCQrWD79m4kh4oazsg9I+5mw5iDu4J3yM5T4fJ6OS2yZyUd5AuttKomU/nfkb hglSNfAqvCyVysaqg61mLfZSGcRURvglxA31HueyLwX/bxNC1eZmb8BIkJ6fHHbycKjXcA +hcudIZdsn0Ey8SGtBKfEiGm/1fCAterw6aW8mDCRSePrOnf+n4oXLOP4f7NWtNoYI4O58 cckpT4yXQoQ7csLSwZK4w6FRWd8NAbb150DSPoxmpEVowHa4Jr9R9Z3Gtf5MdyKgzljdyW TipCVbG7EVfT3MIWBOeHrvbr2YrH8QAPgrbeTA+ntD3lBtb2/y2kRcfjjh22WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S8+wSQbz+PKzgQXggaJkeuc3TtWniwFbOfjN+ghuYQw=; b=G7QkvuvPyZJsRcBDc96bnOABk/l31xMKpwciM15j0DxC9CYO6jgtbo2dQ8ie90k5hw4MSa YZWbc7+ODqckY5R6ci+lsr6rugAdHY7vOD7Wk4aWvrFgjerQZNM3rlbcWcEJ5xLg4UjPfo aUIxk555jqnzbMLl+9Fe10PRflG5uu/Ce0xVGaZnM/YviGqO8wB+KpP+nZmbcmsQJu5ugi kaucg2klbA4oVaRTCVUmMnatYTz9x39A1OQrUsqseCrO3K3c6a4u0cb5wW8698E+k5fb/Z XJBH67a+Pnci6bFoDK7ip84Or8bnb4/zcenGta2HAOl3L/nV5aBZ8snE0w9MPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672898; a=rsa-sha256; cv=none; b=GX4l3l9YruvMdGTbBogw/lX6A/xO56IyzwcF1x7bJkxKJD5GU5DLntoUmXujE2iPehckYE rX40fDO8taNc93t02eTRFBAaVjnV9lam4rdEilQ2AbCxJo9ZWNfwf+Qk7x9rGofEcJbIPt FL8CqQJ2e5R37UlndJ5rl5Ti3cm5uf/i7YMtV9jXoC4Gb3UH6tHAF5xFX6eGo2vz8IT4fY fPGmIO0n4vXjGSXrWTYou1Sc46dk6QwEfZaYtRdzCDTvn+40gPkk/YedVK7lDsumj1IqQ/ e1E5G/ZngkJlA7YcLdMTlsSCDIId0rxUIz8f4TNU17Ta/reBa5/cU2q7uuNyQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gp193szgDS; Mon, 30 Sep 2024 05:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58IFS024816; Mon, 30 Sep 2024 05:08:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58IZH024813; Mon, 30 Sep 2024 05:08:18 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:18 GMT Message-Id: <202409300508.48U58IZH024813@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: 783ec23313de - stable/13 - bnxt(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 783ec23313de492b7fd6bdcf58c6af9aa3a10163 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=783ec23313de492b7fd6bdcf58c6af9aa3a10163 commit 783ec23313de492b7fd6bdcf58c6af9aa3a10163 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:34 +0000 bnxt(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit dcd387aaa5d4409a7e99376e0254029fce1a48a8) (cherry picked from commit e763c326fc85c0d8b3e86d954339aa847f13a934) --- sys/dev/bnxt/bnxt_mgmt.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/dev/bnxt/bnxt_mgmt.c b/sys/dev/bnxt/bnxt_mgmt.c index d54d7a2a2fe1..6ec47e2c1191 100644 --- a/sys/dev/bnxt/bnxt_mgmt.c +++ b/sys/dev/bnxt/bnxt_mgmt.c @@ -141,19 +141,7 @@ bnxt_mgmt_process_hwrm(struct cdev *dev, u_long cmd, caddr_t data, } req = malloc(msg_temp.len_req, M_BNXT, M_WAITOK | M_ZERO); - if(!req) { - device_printf(softc->dev, "%s:%d Memory allocation failed", - __FUNCTION__, __LINE__); - return -ENOMEM; - } - resp = malloc(msg_temp.len_resp, M_BNXT, M_WAITOK | M_ZERO); - if(!resp) { - device_printf(softc->dev, "%s:%d Memory allocation failed", - __FUNCTION__, __LINE__); - ret = -ENOMEM; - goto end; - } if (copyin((void *)msg_temp.usr_req, req, msg_temp.len_req)) { device_printf(softc->dev, "%s:%d Failed to copy data from user\n", @@ -173,12 +161,6 @@ bnxt_mgmt_process_hwrm(struct cdev *dev, u_long cmd, caddr_t data, (num_ind * sizeof(struct dma_info)); msg2 = malloc(size, M_BNXT, M_WAITOK | M_ZERO); - if(!msg2) { - device_printf(softc->dev, "%s:%d Memory allocation failed", - __FUNCTION__, __LINE__); - ret = -ENOMEM; - goto end; - } if (copyin((void *)mgmt_req.req.hreq, msg2, size)) { device_printf(softc->dev, "%s:%d Failed to copy" From nobody Mon Sep 30 05:08:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gq3fvlz5XltK; Mon, 30 Sep 2024 05:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gq2q2Fz4XD7; Mon, 30 Sep 2024 05:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbCFndWmpwU7IeMHTA1bbWuUd20C21EpnUVkzk+E52I=; b=FiQpwecGs+d26CUdSA6kZ5wfkqNNiMx8+hagOoerPeDY/Tpcw6Bmxu9X4PaZQDIOUTSNmf xAwLvz6bw810UHlPzRhhPIf23MLRrVL/H1jB+t5DYnvUAsJ3+pQDXb5OSiOW5Nk4E6Sc26 l/zLz7rWDIGel+IK1lzHb8/sLiT9venjoKifrq8bupfgHWoDTqEOhuVs048ButBzvdGQ1n A8YToMl5xAwB46IyXodQ+Qx6j0E3tul08WgEXodOAh6PiwxClRBx23YAWIvc9/d5NADENo K+YIqlTBzo9/jeoI/YNPapFvvU7yxez48bxmfyXIZQBbZmRCD3lwQUz/x2WHoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbCFndWmpwU7IeMHTA1bbWuUd20C21EpnUVkzk+E52I=; b=GYPikxm9Wc8AU4jfAZYPDCZv25vWLXzpIS0KbRPHDmw8/mouMUmBlDz8NxTIMx1NNDbldD cW+oGSsAp3X3IqSzoKpfVJRmLMA3jEjDFmQiDLR952xud4PfZjUBrw7HmyRES2R/Dsca9m /rVGNjzsfFU1CvJyrfVZ1rppkATJLJ82xclJWoCjHDcGokOyP9mOeBBbLrOUSQPZVclVdK 5p12y5kerSqzQRukI7dsK6D0AqE8TNq53wKm9VlIiIh4TITfPd2vTWbJB4Ux4M6xup+60n G0cPNCEpNzWNM3cW8P/fH/j6phURwW+4Lic0qHJSs2jWVsxjdDhzDSSpFZ/GwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672899; a=rsa-sha256; cv=none; b=Wggeee68vU3ppZnQi/v/sAB/JVxE2b3Z01sdvR/VJlZvyvQ81q0Yel2Of8shcJtSfI5ONW EtFnOyxw7mzLiGyBNiGVrg2cXzPNqRTIA9OwNTtK6J3n+8ymz7rb9g7extHd88CqTieTGq K3INcI+uUCNYL3aylnZ/MQ5VwSHGwlWmM4XwgGzC2V9h6aw3rRp5BZMk/oW4fzeGcO8glx nUJWZio50OEvb74f6t59NpYkD0riyDTJbtXQTEiM9G152UuYApUCbT/3g32B8ij8Zb5MM7 haPraAi6QP/k+InCTFL6o94Jr5BhGaLPU0Qr+jBQENI+DpAHN9RrwHwMTg6Lmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gq2QxYzftb; Mon, 30 Sep 2024 05:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58JSK024864; Mon, 30 Sep 2024 05:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58JpJ024861; Mon, 30 Sep 2024 05:08:19 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:19 GMT Message-Id: <202409300508.48U58JpJ024861@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: 09491167a541 - stable/13 - cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 09491167a54120caf95822500e440ead964b5bb7 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=09491167a54120caf95822500e440ead964b5bb7 commit 09491167a54120caf95822500e440ead964b5bb7 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:34 +0000 cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b) (cherry picked from commit 9216ba1853b76185c85abccbf338f2e4ea71a238) --- sys/dev/cxgb/cxgb_main.c | 4 +--- sys/dev/cxgb/cxgb_sge.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index ba3a065cf806..8c817d751cdc 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -2485,9 +2485,7 @@ set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset) aligned_len = (len + (offset & 3) + 3) & ~3; if (aligned_offset != offset || aligned_len != len) { - buf = malloc(aligned_len, M_DEVBUF, M_WAITOK|M_ZERO); - if (!buf) - return (ENOMEM); + buf = malloc(aligned_len, M_DEVBUF, M_WAITOK | M_ZERO); err = t3_seeprom_read(adapter, aligned_offset, (u32 *)buf); if (!err && aligned_len > 4) err = t3_seeprom_read(adapter, diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index 9d6d181ce64e..de1c1928f350 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -2422,11 +2422,8 @@ t3_sge_alloc_qset(adapter_t *sc, u_int id, int nports, int irq_vec_idx, q->port = pi; q->adap = sc; - if ((q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size, - M_DEVBUF, M_WAITOK, &q->lock)) == NULL) { - device_printf(sc->dev, "failed to allocate mbuf ring\n"); - goto err; - } + q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size, + M_DEVBUF, M_WAITOK, &q->lock); if ((q->txq[TXQ_ETH].txq_ifq = malloc(sizeof(struct ifaltq), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { device_printf(sc->dev, "failed to allocate ifq\n"); From nobody Mon Sep 30 05:08:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gr5vQVz5XltM; Mon, 30 Sep 2024 05:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gr3z7Gz4XDM; Mon, 30 Sep 2024 05:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XzlbqRlfsLvB+xHmqeKMlljzfPdafhDVFmDCOoiPeQ=; b=CKHwpqn3jBFAz+hqzTfzPR3Pz513qYgtyTQkVdtpO93fXOZXsKvkZPQnULlI7fipoVQw18 J+6ZupJso/2Ymq4aq7RN2hweNg+PHM3kSE4f3Ol3n5LkDl3yHlhG0zxq0nqqax+kWkd3tl 3zgKbHykV9adAfwuK8mvcmpaE840DBmBVZOLfHz7fibkU3zb/Erd+4lU38wOwdpRsa3XID f9NkLWQhdChrMo6tfEZ0qJq2EzLp25MHKUUoedWpHsA+8ULy8kLlKiargbjUZKJLwrOn34 uuGkhelF/7EjkjnvcLQS6Y8x/OxljNlQfPRzdATIZBADc3FHsBShuviS4kxBbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XzlbqRlfsLvB+xHmqeKMlljzfPdafhDVFmDCOoiPeQ=; b=Vhm0BN9rLBZi3g3XHREYd92RRS73ZsHuAQpvza84DqORFQvgEtoXn/wNTTClzGrnOV/uoe 7HIStNKZxAqorX1qRSt3NWuroza4YTbaCfJgkto2tpR8XAOIiDPrA3+5wTzqx+vvPLwpwv svIYj6YDrfYYBPJcpke+cojp9bHeQKDtE8P6usjvgizGFS6br9/MmUy7Yjo840bmc29xx9 RIeOpbJd32dmSbopsCGREv0KPbEg4tBoHjZjHzrHIk8Zvn2ZYM2B0RGtNoHIkLH49k/UqU ihmqQxyPqIjXs3AxL7Be1U7lU5AkeM2OeFJz6MmE2Y9Kea323Q16IA1+nW2/eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672900; a=rsa-sha256; cv=none; b=QijNJFQ/vhFoFO34SfeWxH8/OMpDXkKdxyOMUzcLCuFzT26HXm+JTk33jzUujiDvDlcwgB XwSycVAwlhkvIWHm4XFppkYBYif8Es0Bm0y5hPkP8lgVf9V+TzgalxNY8n95lnlGbcSfLr 9uv4bKBuOBx/xCx/kExch6xgYdqueQfZwnsFHGxUjOWNnr8zOCii6RVCgjaXTC9jRImdn/ nrS0ykc4YGnE8FUPYSnHld1kRyP6/F9oDKcG7x2BHKbYm+49TT2F92pE4w5TYzHEM4QzlB dDAWFLxcoDe4BEEMIehPhxZhvABgXPTAskfudZJzVi2ZzwZ8maU8WF7itHAFIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gr3bW7zftc; Mon, 30 Sep 2024 05:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58KRb024912; Mon, 30 Sep 2024 05:08:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Krp024909; Mon, 30 Sep 2024 05:08:20 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:20 GMT Message-Id: <202409300508.48U58Krp024909@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: be61ff389f42 - stable/13 - cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: be61ff389f425e9555ed5078240a05b49aa21556 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=be61ff389f425e9555ed5078240a05b49aa21556 commit be61ff389f425e9555ed5078240a05b49aa21556 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:34 +0000 cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 955b380365af174b3d35905b7b8afae97506a0bd) (cherry picked from commit 09ed34449c795c137d0dd55890486165e2bb0c15) --- sys/dev/cxgbe/cxgbei/cxgbei.c | 3 --- sys/dev/cxgbe/tom/t4_cpl_io.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c index 2f3cc4eb6821..45adcf4338b0 100644 --- a/sys/dev/cxgbe/cxgbei/cxgbei.c +++ b/sys/dev/cxgbe/cxgbei/cxgbei.c @@ -842,9 +842,6 @@ cxgbei_activate(struct adapter *sc) /* per-adapter softc for iSCSI */ ci = malloc(sizeof(*ci), M_CXGBE, M_ZERO | M_WAITOK); - if (ci == NULL) - return (ENOMEM); - rc = cxgbei_init(sc, ci); if (rc != 0) { free(ci, M_CXGBE); diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index e8a78b5f6c1b..e20c92350499 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -2138,11 +2138,6 @@ alloc_aiotx_mbuf(struct kaiocb *job, int len) break; m = mb_alloc_ext_pgs(M_WAITOK, aiotx_free_pgs); - if (m == NULL) { - vm_page_unhold_pages(pgs, npages); - break; - } - m->m_epg_1st_off = pgoff; m->m_epg_npgs = npages; if (npages == 1) { From nobody Mon Sep 30 05:08:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gt0fCcz5XltQ; Mon, 30 Sep 2024 05:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gs59r8z4XK3; Mon, 30 Sep 2024 05:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b75OCzZwkyM+0RMWyyKe3MYcv2e0q/TDlSkzqrNvh0g=; b=ha6udomEdJxbdpp8ed0HdqmNxI+YmIHCn2sLsJqEULhcG2BULeouSVcodRuH1sOVSrlJUx nRh3XZ3ii9ABf50w38yAKDM7SYjPKjEljanaSnBF8rEDbcfzP/lOlfcwQGoGFkmrJtkQk1 3gM2eRhw3iUPSc0BE/qxUyovh33F2XfLblDzC0ACpq5d0mAooJxNudUs0bjbe+ct42hyJT GuxKS87l+jdrvzzXJmV5JF6t2XJoK9Zv3R49tWmB1MnUR6kun286Wi+z4mpXOMuTsphEsC qFs5mZVlRNaycG1MZzdiEtqSmcoCIvJamoYBidFDEZdPGAXG6FqW3pZyloiYTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b75OCzZwkyM+0RMWyyKe3MYcv2e0q/TDlSkzqrNvh0g=; b=Xd2cfWUAXdvdJ2dQuQJyR1gWALACyocXZzo3F1n2yk5mQ0c5KcyEjahHDIzRgbsEo9TeUU km3ED9w73y5hpoDYjF4a7m94EPVOEaoOpL0uIxtgyTlXeWJgOE8deK7kLULzw9rukDA6N1 9TZeLePeWs7CUQbpA/aHqKrYxzbUWiCnGCdR0uXPBnZTve6h8lNXDmWLCGGz2kCCYL7t/j CncN+so6oJDhTOoXZETVbYvVwDDPJ+Oeih5Xh1l4zzJ41y1HSrou6T6U1GmIT2Zfj6zQU3 HOmb3jPLVgo0Gbq097ZszC2baV54zkSjI3cW4BCUM+bzyj3+WkwKqf1G8Mp5ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672901; a=rsa-sha256; cv=none; b=pEpkcADcRqYTflv1mfrvzwpjb7o/I+EyuL7XDOl2vsS4r0UT+SLV5hRBk6TJ0ygBCaCn6E br/HVpiV7h4aA0RFxYfWqHczZr1MgTy+cEJ6FVOCklkuYkRIMoa02ZnVvQOdkK16TmHOqP ZcpoTQF9L3XSRz//jL/K06MBGH4FV1++0IKm2SdbAh2ZzfgwNQc3BKAKXtQD5si1INgWJ8 D+tB+uzMHj+CcNzddv96v+kd0WZg+3iumoEZ20gJDEfqWSOfAypIM2bpimIQHEYrg370SG LRxwpKZegbQGh/UuLsakHNP1IM4lncV0xxJr75P+ROWLMUfka1hhylVFHscSFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gs4lTszg87; Mon, 30 Sep 2024 05:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58Lxn024969; Mon, 30 Sep 2024 05:08:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Lhk024966; Mon, 30 Sep 2024 05:08:21 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:21 GMT Message-Id: <202409300508.48U58Lhk024966@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: 73e399c157a8 - stable/13 - drm2: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73e399c157a82dbe7d1ffd7e0346ead7e2167952 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=73e399c157a82dbe7d1ffd7e0346ead7e2167952 commit 73e399c157a82dbe7d1ffd7e0346ead7e2167952 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:34 +0000 drm2: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6dbf3aca4f5c4f7287f186360c2391f2adfea8d6) (cherry picked from commit 95532d15a12c9cbf7c5e62e912de90919af7db24) --- sys/dev/drm2/drm_buffer.c | 30 ----------------------------- sys/dev/drm2/drm_crtc.c | 45 +------------------------------------------ sys/dev/drm2/ttm/ttm_object.c | 5 ----- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/sys/dev/drm2/drm_buffer.c b/sys/dev/drm2/drm_buffer.c index 8a674397262e..8069f2c8c4c6 100644 --- a/sys/dev/drm2/drm_buffer.c +++ b/sys/dev/drm2/drm_buffer.c @@ -50,45 +50,15 @@ int drm_buffer_alloc(struct drm_buffer **buf, int size) * variable sized */ *buf = malloc(sizeof(struct drm_buffer) + nr_pages*sizeof(char *), DRM_MEM_DRIVER, M_ZERO | M_WAITOK); - - if (*buf == NULL) { - DRM_ERROR("Failed to allocate drm buffer object to hold" - " %d bytes in %d pages.\n", - size, nr_pages); - return -ENOMEM; - } - (*buf)->size = size; for (idx = 0; idx < nr_pages; ++idx) { - (*buf)->data[idx] = malloc(min(PAGE_SIZE, size - idx * PAGE_SIZE), DRM_MEM_DRIVER, M_WAITOK); - - - if ((*buf)->data[idx] == NULL) { - DRM_ERROR("Failed to allocate %dth page for drm" - " buffer with %d bytes and %d pages.\n", - idx + 1, size, nr_pages); - goto error_out; - } - } return 0; - -error_out: - - /* Only last element can be null pointer so check for it first. */ - if ((*buf)->data[idx]) - free((*buf)->data[idx], DRM_MEM_DRIVER); - - for (--idx; idx >= 0; --idx) - free((*buf)->data[idx], DRM_MEM_DRIVER); - - free(*buf, DRM_MEM_DRIVER); - return -ENOMEM; } EXPORT_SYMBOL(drm_buffer_alloc); diff --git a/sys/dev/drm2/drm_crtc.c b/sys/dev/drm2/drm_crtc.c index b9415082e7a1..a163c7455773 100644 --- a/sys/dev/drm2/drm_crtc.c +++ b/sys/dev/drm2/drm_crtc.c @@ -662,13 +662,6 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, plane->funcs = funcs; plane->format_types = malloc(sizeof(uint32_t) * format_count, DRM_MEM_KMS, M_WAITOK); - if (!plane->format_types) { - DRM_DEBUG_KMS("out of memory when allocating plane\n"); - drm_mode_object_put(dev, &plane->base); - ret = -ENOMEM; - goto out; - } - memcpy(plane->format_types, formats, format_count * sizeof(uint32_t)); plane->format_count = format_count; plane->possible_crtcs = possible_crtcs; @@ -725,8 +718,6 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev) nmode = malloc(sizeof(struct drm_display_mode), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!nmode) - return NULL; if (drm_mode_object_get(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) { free(nmode, DRM_MEM_KMS); @@ -1009,9 +1000,6 @@ int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group) group->id_list = malloc(total_objects * sizeof(uint32_t), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!group->id_list) - return -ENOMEM; - group->num_crtcs = 0; group->num_connectors = 0; group->num_encoders = 0; @@ -1997,10 +1985,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, connector_set = malloc(crtc_req->count_connectors * sizeof(struct drm_connector *), DRM_MEM_KMS, M_WAITOK); - if (!connector_set) { - ret = -ENOMEM; - goto out; - } for (i = 0; i < crtc_req->count_connectors; i++) { set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr; @@ -2522,11 +2506,6 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, } clips = malloc(num_clips * sizeof(*clips), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!clips) { - ret = -ENOMEM; - goto out_err1; - } - ret = copy_from_user(clips, clips_ptr, num_clips * sizeof(*clips)); if (ret) { @@ -2773,15 +2752,10 @@ struct drm_property *drm_property_create(struct drm_device *dev, int flags, property = malloc(sizeof(struct drm_property), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!property) - return NULL; - if (num_values) { + if (num_values) property->values = malloc(sizeof(uint64_t)*num_values, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!property->values) - goto fail; - } ret = drm_mode_object_get(dev, &property->base, DRM_MODE_OBJECT_PROPERTY); if (ret) @@ -2907,9 +2881,6 @@ int drm_property_add_enum(struct drm_property *property, int index, prop_enum = malloc(sizeof(struct drm_property_enum), DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!prop_enum) - return -ENOMEM; - strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN); prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0'; prop_enum->value = value; @@ -3103,9 +3074,6 @@ static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev blob = malloc(sizeof(struct drm_property_blob)+length, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!blob) - return NULL; - ret = drm_mode_object_get(dev, &blob->base, DRM_MODE_OBJECT_BLOB); if (ret) { free(blob, DRM_MEM_KMS); @@ -3433,10 +3401,6 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, crtc->gamma_store = malloc(gamma_size * sizeof(uint16_t) * 3, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (!crtc->gamma_store) { - crtc->gamma_size = 0; - return -ENOMEM; - } return 0; } @@ -3631,13 +3595,6 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, mtx_unlock(&dev->event_lock); e = malloc(sizeof *e, DRM_MEM_KMS, M_WAITOK | M_ZERO); - if (e == NULL) { - mtx_lock(&dev->event_lock); - file_priv->event_space += sizeof e->event; - mtx_unlock(&dev->event_lock); - goto out; - } - e->event.base.type = DRM_EVENT_FLIP_COMPLETE; e->event.base.length = sizeof e->event; e->event.user_data = page_flip->user_data; diff --git a/sys/dev/drm2/ttm/ttm_object.c b/sys/dev/drm2/ttm/ttm_object.c index 8c373618d7ac..31af15cf4c56 100644 --- a/sys/dev/drm2/ttm/ttm_object.c +++ b/sys/dev/drm2/ttm/ttm_object.c @@ -282,11 +282,6 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, if (unlikely(ret != 0)) return ret; ref = malloc(sizeof(*ref), M_TTM_OBJ_REF, M_WAITOK); - if (unlikely(ref == NULL)) { - ttm_mem_global_free(mem_glob, sizeof(*ref)); - return -ENOMEM; - } - ref->hash.key = base->hash.key; ref->obj = base; ref->tfile = tfile; From nobody Mon Sep 30 05:08:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gv2784z5Xlfm; Mon, 30 Sep 2024 05:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gt6Sr2z4X7m; Mon, 30 Sep 2024 05:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CS3I/aSdTWay7xqz0dipQgPch4xxAEEWPIBtmmW+s6g=; b=j5QKQEffvDdOwMVVpzVBke3I7izOhETekHKBoxYVqMzAJufSW+tu5Py/3MPCgaumAFSjMv 7o6vIPEy0OQ50Ttw82mxyIOeZcjlSBL/gvsByU6c+SlxrM3VzUdYDIcMygbhS8LXLzjMtI L6gF12d87yWqYyKnuY/6wpNsxlGO44YO6IjCGcqDvaleir0uM7kZnrqOMMSx8y94aI5u/X Nmu3uHOgRS3AfU8biWTe8uLY/id9ELCHbiD9XCZnYZws31ct8zzqCI+Q1eLc66regeJAfm 0TpTMP/SuUBxIA1tyljTTqwsk7e5mwblVix+ALTe08f4fJChMWV5k9ytSbA+eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CS3I/aSdTWay7xqz0dipQgPch4xxAEEWPIBtmmW+s6g=; b=AuqeJp0eXB0ViNMm/ZFscCndCicFHnx3W2E/4hrfAAKnBG/+QT9KgjlfG23G+FuUS75/O2 X8xGwTRuT1ACii6/WRp2siqg9ZyPr1DXhm0CTVwTWyQNVuPs7aW28FKMCVFqFMaZa7Cq1U rrH/LFIO8n69ZSfQfXWLQl0naNOLaO9mqMms9lS86BuJA/iHCn4TIdh2XMSkfVpBAEYDIc PCC6zoS15vWLKQRW9lT7hR3b6JUDH8ZfyeYhj9MWISnw9lLLAx7PrK9DvRSgQfZ19WZ5oG jmE+3u2zay8lCN80OVL0qJEXnK94uHVB8yv8BwW6xoxhAD0vO3VTYj1pDwogtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672902; a=rsa-sha256; cv=none; b=loSaUW4YSZOVe5qTt1qyXMfQ5HVNtF/FtJyk1KB1FWDeZRFFOuEJuk7G5BDxRTZvlOu0Dp 4tf2X6xwCyRIJNlplewtVKqpQBIVNQlKrBEOf0zYAfrPZQc8ElRFvg2xlD7GmV9L7DpHIw vdpKwUI7xA40Nl9TDpdXzZD4GoR4wbbq1iDGQ/9RpWGUspGKzMcNYOxbHFiF8wsACJvs8i SLAy7MpMaC5R7TgIBPf4Zh6+sN3iWY9AQdGQDLn8f4AkqdoXceQ+rPgOPjuFPXW6qG69IK r4hD7YklFfa39D2WoB08/PiGhol+0M5yLoOSzodStSEQZAWsmfr79hHxT8Twwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gt63JVzfyw; Mon, 30 Sep 2024 05:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58MQ9025017; Mon, 30 Sep 2024 05:08:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58McD025014; Mon, 30 Sep 2024 05:08:22 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:22 GMT Message-Id: <202409300508.48U58McD025014@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: 568cb5592586 - stable/13 - ena(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 568cb55925868abe61d4f04e86128ab7312495b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=568cb55925868abe61d4f04e86128ab7312495b2 commit 568cb55925868abe61d4f04e86128ab7312495b2 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:35 +0000 ena(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 51971340bd3ff41591adbbfca68e9e753f6eb135) (cherry picked from commit 8c2d777a223d56d63c55552e8ca1d689f7c58b06) --- sys/dev/ena/ena_rss.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c index d90a7fbb253a..41fa9c62f94a 100644 --- a/sys/dev/ena/ena_rss.c +++ b/sys/dev/ena/ena_rss.c @@ -279,12 +279,9 @@ ena_rss_indir_init(struct ena_adapter *adapter) struct ena_indir *indir = adapter->rss_indir; int rc; - if (indir == NULL) { + if (indir == NULL) adapter->rss_indir = indir = malloc(sizeof(struct ena_indir), M_DEVBUF, M_WAITOK | M_ZERO); - if (indir == NULL) - return (ENOMEM); - } rc = ena_rss_indir_get(adapter, indir->table); if (rc != 0) { From nobody Mon Sep 30 05:08:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gw4knCz5Xljc; Mon, 30 Sep 2024 05:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gw0SmBz4XBZ; Mon, 30 Sep 2024 05:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DnMNXBPelpjM5P57rMM0Iy8v9rb6qbavoIa0Se9o1VU=; b=uy/vISjlgj+uGV4ymwOq8nBM6hSWUv6vjUv+VX8qcEAoNz39JPy/uY6b2bPfDlZF1dOoox nPPj/CXJpOTa2Ogj2DlhIe6KpuPerx23Zqar3T+ljy/pnjJqya10hQ73BbYgpKVtp3ybzi 0aalg8kC2JW0ctZMV+PMJcD8LU2CfTkCjyJgqLZPLXPzdYf9Muvq5fX3eKEQa5Fzr1eX8+ 7ToFfLXCi/DXVJWUMspKFvj4bmTtp6bG+8DUaiUuHvsoLRBdmi6b+6ta4etczxm/fPW754 fAtLwk852qObHJHvgWoga/SHwojXvUMNp0L0ZwxQ89kBZBpGW3uWZdreUNttFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DnMNXBPelpjM5P57rMM0Iy8v9rb6qbavoIa0Se9o1VU=; b=kfJSIn9TQEfKDLj8dbIV6RyTM4+dS72xzZHadlsltXpf0OSm/gohudWgAmKrJppq2MPScZ jXcWmFwjF12yMQP9IoRwE9bn2Rc31dErEu9+fDjyky/jcRBeZgBSEgK08cmLIagt3T/1nM ui9MiG79z5MTvzV33Jd8zofgITy3p1u/ySstI+DKxqZnt0bo6TakJxOnlep2QYCZo0HsFr 5sZ0CUQHywkx2vSG9OJI9Yq234CiBAESRqFz5pkgTP2f55xyiv3fY0SVh1MAYkWEvRlwZB sEp3PRrWMcdyK5zNvE+tp6E7dAidyh9zhrstaYFarUQfky5XZzDrKPuDKYSmDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672904; a=rsa-sha256; cv=none; b=hhM9Cpz48HQUe3g6fkPKX1e9WvS4lphEpwq2u//AAELOeslJzRYtw4JA4TDu27ZD5DKblh OjpHNEQh0jJVd+/wSDw2600QADMHRcQkqYZZJEpwkWqXohMY+8snDIlHolKEVwFgyKhk80 xsFcgNt1cKytRdxq4p3rExWxyU57Iaho4HSEtnaCXvF0sviBCQNmzjtAcZsro8QSDT4Pv0 mlSp/Gk6kqhSsj0gmzZhc61pxJwG50nPMePc4KiHu4r3X2nTYotQOhvpX0ByOlfNMIa4wd Ti5mHioeHfk7gOzURQXHPFGkzukkrbLW8udcOIU2/hHPRAxeubqAlzZEWsanIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gw0536zfx7; Mon, 30 Sep 2024 05:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58NMh025065; Mon, 30 Sep 2024 05:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58NQk025062; Mon, 30 Sep 2024 05:08:23 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:23 GMT Message-Id: <202409300508.48U58NQk025062@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: f5f9d9d4039d - stable/13 - etherswitch: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5f9d9d4039d27e1d1536ffca372dddedbd664d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f9d9d4039d27e1d1536ffca372dddedbd664d0 commit f5f9d9d4039d27e1d1536ffca372dddedbd664d0 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:27 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:35 +0000 etherswitch: Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 48741f4ceca71523aa1fa8da3bb78b184fad4aca) (cherry picked from commit e78c315e8941ff39d89c45ffa5841b8028a3bbce) --- sys/dev/etherswitch/infineon/adm6996fc.c | 22 ++++------------------ sys/dev/etherswitch/micrel/ksz8995ma.c | 22 ++++------------------ 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c index 39e85270bb70..9acc513a02b7 100644 --- a/sys/dev/etherswitch/infineon/adm6996fc.c +++ b/sys/dev/etherswitch/infineon/adm6996fc.c @@ -185,10 +185,6 @@ adm6996fc_attach_phys(struct adm6996fc_softc *sc) if_initname(sc->ifp[port], name, port); sc->miibus[port] = malloc(sizeof(device_t), M_ADM6996FC, M_WAITOK | M_ZERO); - if (sc->miibus[port] == NULL) { - err = ENOMEM; - goto failed; - } err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port], adm6996fc_ifmedia_upd, adm6996fc_ifmedia_sts, \ BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0); @@ -261,12 +257,6 @@ adm6996fc_attach(device_t dev) sc->portphy = malloc(sizeof(int) * sc->numports, M_ADM6996FC, M_WAITOK | M_ZERO); - if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL || - sc->portphy == NULL) { - err = ENOMEM; - goto failed; - } - /* * Attach the PHYs and complete the bus enumeration. */ @@ -287,14 +277,10 @@ adm6996fc_attach(device_t dev) return (0); failed: - if (sc->portphy != NULL) - free(sc->portphy, M_ADM6996FC); - if (sc->miibus != NULL) - free(sc->miibus, M_ADM6996FC); - if (sc->ifname != NULL) - free(sc->ifname, M_ADM6996FC); - if (sc->ifp != NULL) - free(sc->ifp, M_ADM6996FC); + free(sc->portphy, M_ADM6996FC); + free(sc->miibus, M_ADM6996FC); + free(sc->ifname, M_ADM6996FC); + free(sc->ifp, M_ADM6996FC); return (err); } diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c index 15e03039b5f4..737c3f7a50f3 100644 --- a/sys/dev/etherswitch/micrel/ksz8995ma.c +++ b/sys/dev/etherswitch/micrel/ksz8995ma.c @@ -231,10 +231,6 @@ ksz8995ma_attach_phys(struct ksz8995ma_softc *sc) if_initname(sc->ifp[port], name, port); sc->miibus[port] = malloc(sizeof(device_t), M_KSZ8995MA, M_WAITOK | M_ZERO); - if (sc->miibus[port] == NULL) { - err = ENOMEM; - goto failed; - } err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port], ksz8995ma_ifmedia_upd, ksz8995ma_ifmedia_sts, \ BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0); @@ -311,12 +307,6 @@ ksz8995ma_attach(device_t dev) sc->portphy = malloc(sizeof(int) * sc->numports, M_KSZ8995MA, M_WAITOK | M_ZERO); - if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL || - sc->portphy == NULL) { - err = ENOMEM; - goto failed; - } - /* * Attach the PHYs and complete the bus enumeration. */ @@ -345,14 +335,10 @@ ksz8995ma_attach(device_t dev) return (0); failed: - if (sc->portphy != NULL) - free(sc->portphy, M_KSZ8995MA); - if (sc->miibus != NULL) - free(sc->miibus, M_KSZ8995MA); - if (sc->ifname != NULL) - free(sc->ifname, M_KSZ8995MA); - if (sc->ifp != NULL) - free(sc->ifp, M_KSZ8995MA); + free(sc->portphy, M_KSZ8995MA); + free(sc->miibus, M_KSZ8995MA); + free(sc->ifname, M_KSZ8995MA); + free(sc->ifp, M_KSZ8995MA); return (err); } From nobody Mon Sep 30 05:08:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gy12p8z5XlpF; Mon, 30 Sep 2024 05:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gx1jLlz4XBs; Mon, 30 Sep 2024 05:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpPwaRYfdVSDD2LdwDQY0CYg/cpAKMDzNVp0XtU8ac8=; b=dLN5/e6HXoRI1DzZr4qEHdW4jWs+Ka9Y3wAdkg0CtOkhmqQvptzZarZDoDW7oMo89fd6cq o0nR7S2US3hHMaVorPXMKX8kaD9eAnT5Pw8W4pU7ISuFFmtw0iOqqen+NGhjW52ZRvwV9S 3OX1rPE89XgZ6AskCXT38b1rLbQR5C22PQAYBkSfnatXB6gIlfpIMRJaF/q0Xs5ttnIny6 CHbHmNDVtI3M22RXc5NHZovdSTrLp0UV3lXYEFPIgLM3PGP13P76zd/r5kX1wZHBBXeO+O zqBO6HM/MzrgKGRKhAGHVxzgyyJfJYhOyQ7mvKIvMXOHo6tBMjlxgFD2YBIlmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpPwaRYfdVSDD2LdwDQY0CYg/cpAKMDzNVp0XtU8ac8=; b=Ol50a1teTZkOWBOxGDoD6TQ7hqPMccZiSlCCfjo1pG8GqXRjbtG1r/DVCwARizKkNYwWF4 11kuTL6FHgwa6Vgdsa/Yx/TvvT2kVcpqWRoo5NFk4iXzoD1H9GSaHiSPIgVS3diSLPKcqI J661rNtBpSK86sdjSK+ntI/rzpyOBCx1QCrWYMM04ZZHJtW6fF084nZBnSLG/dL8ItZ3qw liA0r2NF6zNiW8AT3v4K6l1Ps4rYHVl5mvJyiOORu+j6XGzJRYY1XmnM5y6p0oKxx2vB/8 4au9KFEXN61FZ82skjbekTzWYF30y3PjVbMOUJimTFGHM/8n1v52H9t/I1cBGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672905; a=rsa-sha256; cv=none; b=dop0b9ZN+ACYN2T5MY5CEvFXAd1ZKj9gs6pK6bvavq9SpvFtltQpnNVyVZboVLJ6BUic5v o03I0npeLzNFCXOwwOPubxY6YIEDVnoZ0WLnfXc9W8zBcAfoApyaLgPCbY4h0dEy7WV8Rv HEWXsGcgAY4kB3mco7RSA3cwrwPaeeKX22un31s76zslWN3t8L0SxHBL9Sb6UP693VQ9qh 5pj5rUHsexvBplwoIuM8m33htMNJRM1jTDo3/kAPrbq6+yDyeMba+0sbfVPQ//BkC9e8va tSYWFUV3PkbyeYacN3agRC011XpCS9lJk51TtVz1QGnXw59Y0U0pO/ws+ysVdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gx1Kchzfqx; Mon, 30 Sep 2024 05:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58P2s025113; Mon, 30 Sep 2024 05:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58PTV025110; Mon, 30 Sep 2024 05:08:25 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:25 GMT Message-Id: <202409300508.48U58PTV025110@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: 97cc0b1fa252 - stable/13 - fwip(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 97cc0b1fa2529372c56c78de8e410fd02d13aa65 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=97cc0b1fa2529372c56c78de8e410fd02d13aa65 commit 97cc0b1fa2529372c56c78de8e410fd02d13aa65 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:28 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:36 +0000 fwip(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 4d47c7ca7baa1ae76cc1fc72ec85b475f1efd41d) (cherry picked from commit f3af527260242c570b3e2bea56287f1ad5abb7b7) --- sys/dev/firewire/if_fwip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c index f7f2db4589d5..89b34aab4257 100644 --- a/sys/dev/firewire/if_fwip.c +++ b/sys/dev/firewire/if_fwip.c @@ -306,13 +306,9 @@ fwip_init(void *arg) xferq->psize = MCLBYTES; xferq->queued = 0; xferq->buf = NULL; - xferq->bulkxfer = (struct fw_bulkxfer *) malloc( + xferq->bulkxfer = malloc( sizeof(struct fw_bulkxfer) * xferq->bnchunk, M_FWIP, M_WAITOK); - if (xferq->bulkxfer == NULL) { - printf("if_fwip: malloc failed\n"); - return; - } STAILQ_INIT(&xferq->stvalid); STAILQ_INIT(&xferq->stfree); STAILQ_INIT(&xferq->stdma); From nobody Mon Sep 30 05:08:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gz6K2vz5XlmP; Mon, 30 Sep 2024 05:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gz3V6Mz4XG4; Mon, 30 Sep 2024 05:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9KunISfC+cNf94G4uHtZWE4z0tAbuOBDMoBm54mRWZs=; b=dGQRrZ00ZrTO4a5K/OJk7YtJHA/oy0COqi+KekYKJ85mRJdMtUtYAEKAYmLNLqxpv4Nv3I hf+J0YR4KS5fqtQbZKNh9LmO30F5lCUQeYjC8E3BqIS7hK/oDkel5OS3X8zrpdnQLCEZXG vijRSP/oVwmq7VotnPPP8jrt6BSqcOJHZlvS0OA7lrh+I9v68THdJxGWwiJbfKLjLFNSrj qQHWElZOJc8Wsc3Jx+mR31yZ77gletC5U89FYdUo1Mfi162UyRoMcrd/y46MCjuJ77WgHh pv6Xd2gQYUahT2ePce7L3LRUUNobRBnjNx4SoFbHWJigb7k3chgl8N3//Ts/7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9KunISfC+cNf94G4uHtZWE4z0tAbuOBDMoBm54mRWZs=; b=Hw14M+9IJulKwtSLqpk7mLMOV1DNLAxo01QLFylQr6f9uvlmCoMK3hHSXoHwN2Lb7vBBRG 5Zx6FVnb70pEKySrUHwdM0RdbgqzoHkakd+199hTkCfz8rE76vlFetDZrYcdNm7/koHqsu 7qpAS9+XHwMT7+jZu291fJlHIfZDAJLpw6Ro0QiqpDppRWv5lPMeCTYbbXYxaTy7bial4l wdwrTVCLTMQuv3v62pNZMFiYgm94UdEYkT7yapFcgayxZ16iCPgnqoYtq+qOJ01O+/iZW+ EBGmsYAAaMpAd7YxJgvy+mdHZafhaFJfeCrGNjdzcwof+WrDmxzFEql9qglrTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672907; a=rsa-sha256; cv=none; b=OmSjG612fWo5ZlDL+7VL8oXmA71ifSweHbw+YyOChny1BkWZ7SL6UxDFNSHnMShvJQPHM4 thm9XVCUHhLtw5V61IXAelULY7CdDzGzS6Nl87eMiUnOl0Ck+d4HUgT8djxNe1DTYqJtgk /mbOtwJAOAfgWsZ7xchCtwe59qKq8YYNcxSZmONP+4E9eTvhLpwPZv+bpwGu/P4SLrFOFZ tT7T8bFv1HV3TiI8oV8Yf45aPGw2c6Y0+ImVkzlikLEQuIkid0ifiHOiTu13x3EYugEsce pobR8kEE0ZyQYVcluhcGKm+TaPe+sfSovUxnVijVpGAY1IYuV5j1HFnWuMwfQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gz36f7zgB0; Mon, 30 Sep 2024 05:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58R0Y025218; Mon, 30 Sep 2024 05:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58RCV025215; Mon, 30 Sep 2024 05:08:27 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:27 GMT Message-Id: <202409300508.48U58RCV025215@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: 736dfe255d89 - stable/13 - hptnr(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 736dfe255d8918188eb5b6cc4b64b0297dc6f15d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=736dfe255d8918188eb5b6cc4b64b0297dc6f15d commit 736dfe255d8918188eb5b6cc4b64b0297dc6f15d Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:36 +0000 hptnr(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit a3ec5d3ee7579a26790a86ca4c074512946ab964) (cherry picked from commit c860df902b6d010cb18490580c776c4b0a6a9123) --- sys/dev/hptnr/hptnr_osm_bsd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index 067b8530cd3e..d605cf7712f3 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -165,7 +165,6 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext) f->tag, f->count, f->size, f->count*f->size)); for (i=0; icount; i++) { p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK); - if (!p) return (ENXIO); *p = f->head; f->head = p; } @@ -1389,10 +1388,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1611,19 +1606,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } - + hpt_do_ioctl(&ioctl_args); if (ioctl_args.result==HPT_IOCTL_RESULT_OK) { From nobody Mon Sep 30 05:08:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8Gy56nwz5Xlfn; Mon, 30 Sep 2024 05:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8Gy2RScz4X8W; Mon, 30 Sep 2024 05:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m9Blf9L4ustoAbC5LUpbLeU6zf8IreOPvaEmuvdiV2Q=; b=nPWnPcsVjUIxWy+XQJRKySf5xFZhWE/gRh5gFfcM4NzGp8smXUOSIjNI0W4kNkefHaWSGH CzOD1dgECj6BgcSR6mn79FAGKOX4/kXmlH2i7/vbYWYWmFXvaZUnfJ4KRvxfrmOiSPpwn3 N+PznT5dSxWuidXbOf4b+IkfsviBPddVoJxxu5mMnhgxCIDGbrtzuLRkz2EF50xpHrj9N2 C3f9Gxqh4neHwwn4HuX0pVSj1tKWSt94EOEoYm3Qyaresja3xbdFFyUwsxEmhUlL1ZcRBN 2oXquCUe51hmJOwnCXRfcOp0FZxj00S3Dt9jtcIvnVS/g04LFp5QxdwaV+G0NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m9Blf9L4ustoAbC5LUpbLeU6zf8IreOPvaEmuvdiV2Q=; b=Qc5/wAN8MdwXASFmelQpjDqXg5JaM9wRzvW/qa1qnfO1mH9IvuDsmmX9YfRhA5wT8I4beM /N6qpAC/CMHloT8+EagIVHt+WNhwqPaG3uh/yaxi52vEPWLlpY+Bt+yH6Rf+0G+wim28Ng UuLwnnUpfLV5h6LSWFjHz3c5UWKMk4+YCNak81SJCokj43sZNJ40OYDUJw8ckAmLpy2pB4 uh7N6i5LRniZP6AsvLvQh/ZWImC9dWUg3p330jlzSII35qr2FGqbBqZp6R9Cub07RpQxiS ihDm9GXzmy6/qjwBs/Ga5kLnXEhdeLEt06+9OiOoQg/ZD4LA59zB80/0R58hsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672906; a=rsa-sha256; cv=none; b=iw5nQ0l+Y5PnT4+rz8yYuoINSmE7hbLewaZiF7L1z/gnu3sg5BNrOmb0A3VoFta4dwRhyV HrVRivRq3x1q4CCesa0RLbwD6zys0tsCw3/K2Qf+gsF/sSYacQQk5uQXl5MmtE+7N13t6M bBcGi2P/9FfpUyjHLVopicR70TTz8IjH4b6aRUrBQ0MVa7e1kQzWKQrE+jcpxYAu5uRrhT vvrT29mId4ISVJkuMV9CCi4okgdbWwCFy3fjZSNMv8Gc281hu+1EZoei3vcdZs+5Gk6Pmf EQ5q1QKmwlK06nwL+Uv7Ivi9U4SCKoplq7mXnrSxwAQOS2cmdJGpLCoEAWPOsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8Gy23T5zfx8; Mon, 30 Sep 2024 05:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58QBs025162; Mon, 30 Sep 2024 05:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Qom025159; Mon, 30 Sep 2024 05:08:26 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:26 GMT Message-Id: <202409300508.48U58Qom025159@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: 3df0c68bdb28 - stable/13 - hpt27xx(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3df0c68bdb28647f60b2b1cd34fb8cea390315ca Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3df0c68bdb28647f60b2b1cd34fb8cea390315ca commit 3df0c68bdb28647f60b2b1cd34fb8cea390315ca Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:28 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:36 +0000 hpt27xx(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 28e413a699838df6fa5b0504c9ceb92a515037d9) (cherry picked from commit 0341c77f203e5200470657a428f8ce63f2dc9988) --- sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c index 2c760d2e9009..dfa4d7c3baee 100644 --- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c @@ -94,9 +94,6 @@ static int hpt_attach(device_t dev) size = him->get_adapter_size(&pci_id); hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK); - if (!hba->ldm_adapter.him_handle) - return ENXIO; - hba->pcidev = dev; hba->pciaddr.tree = 0; hba->pciaddr.bus = pci_get_bus(dev); @@ -114,10 +111,6 @@ static int hpt_attach(device_t dev) if (!ldm_register_adapter(&hba->ldm_adapter)) { size = ldm_get_vbus_size(); vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK); - if (!vbus_ext) { - free(hba->ldm_adapter.him_handle, M_DEVBUF); - return ENXIO; - } memset(vbus_ext, 0, sizeof(VBUS_EXT)); vbus_ext->ext_type = EXT_TYPE_VBUS; ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext); @@ -168,7 +161,6 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext) f->tag, f->count, f->size, f->count*f->size)); for (i=0; icount; i++) { p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK); - if (!p) return (ENXIO); *p = f->head; f->head = p; } @@ -1109,10 +1101,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1328,18 +1316,13 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } hpt_do_ioctl(&ioctl_args); From nobody Mon Sep 30 05:08:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H10RdTz5XlmT; Mon, 30 Sep 2024 05:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H04LSLz4XGC; Mon, 30 Sep 2024 05:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/SEmSLW4Lte93woYMQxXuAVv/dPHUCbNYju7Ja+y5eA=; b=dsJcBupxhDR68uZJbdMxaTCEGccym4H6XOUMTyvka+LlV5WJgO7xbbOJVCs2l7mNNYUcE0 b5JRKRfuu2PJAJKWxfEfvmRo13YxYUb52cmRGS9TJIfCPL9VmTQwocbotLHStTOBfMR78V 7g1wAHqLi0paiV3l0aIdJncKF/oFpvWhcLRqeOeobj3Hd9vtx6GWAquxzecK0MndKN5G2S JnxqD2vwIzUOAsSPuN94opjXwcuAhGpFiUXaWUAxZwYgFfVztB02WHlCpcpnL19ptD9lDj 9LQcRxxnqmtILoU63KyzmYP54xuxsXz/x91MIF10g6UEjYXL1zjIr5/i0iFNFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/SEmSLW4Lte93woYMQxXuAVv/dPHUCbNYju7Ja+y5eA=; b=Dl+KNPC0ebyITxuQpE17vuDtESmKYsrmDPM/mvyd/wuoE8W47MpAie6f45vxdhlpIn+jUz DlGQHB7b1T3vhGIXfIYOnauq8Hnc1NNTbSTo/XArTfQJ2xu6MkBoIEG45dLcVKPuht7uBE 1INeKJ66rtFr8/ugwTJjpJBE4J5p7cAer0XU93Nddyi5wsoNLYT7b062FnZlk4BbwwvxC8 mnyEh98xTiXhj48WFpN5MBovRD8myXA4xqmoUzOWVRUAFiYBzz0Q8sMh0ZcnbTU9r/y0bO D/OvMkzsstwP+1molU25oxoQwfOwHJySUQ4aL/GzzCqLE6IO9bdR4AbYZISCcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672908; a=rsa-sha256; cv=none; b=tLsDCxQst7FU/QNBNmHHwVOl3vKH1DJPYOXsK2ywo+newjcEmAhUsgXXobGEnvLLbYnpUj AcQSPVLC4H3S5Nw8l4RK6you2eHqeEdaJTBuL/enX2riqI/LwyDDokN+Gy/z6N9wPb3I9u pBvxH9a0wdx8hrtLlqvKY1HGgRTzEzk7xccUXj9ZaYNj59egYVNawI0VgxZLxmYPSEcbHy ELDTgWb2zUNEnsLQVnjJ08Mxc7W4c5zitvyA+YJDVN46NBhSWAcuTqyJHPzM8anhfCRt9D MR3Q6f5eqovM/L/ddfVy4XHk8/58OLxXQ+QXBBYwxUyfZqRui8dzbZFAHROP6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H03y5ZzfQq; Mon, 30 Sep 2024 05:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58SaU025266; Mon, 30 Sep 2024 05:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58S9i025263; Mon, 30 Sep 2024 05:08:28 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:28 GMT Message-Id: <202409300508.48U58S9i025263@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: e86d353a893f - stable/13 - hptrr(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e86d353a893f5f57ba420fef5fd5a1486ab64ae9 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e86d353a893f5f57ba420fef5fd5a1486ab64ae9 commit e86d353a893f5f57ba420fef5fd5a1486ab64ae9 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:36 +0000 hptrr(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 92b0370ec65d5287a1deec84fd513e320a8da736) (cherry picked from commit e4de0a965faaff171e6061714478c8f4eaec8cb1) --- sys/dev/hptrr/hptrr_osm_bsd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index fd102397716c..ca1e5714d33e 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -1032,10 +1032,6 @@ static void hpt_final_init(void *dummy) for (i=0; ivbus_ext = vbus_ext; ext->next = vbus_ext->cmdext_list; vbus_ext->cmdext_list = ext; @@ -1253,19 +1249,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru if (ioctl_args.nInBufferSize) { ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK); - if (!ioctl_args.lpInBuffer) - goto invalid; if (copyin((void*)piop->lpInBuffer, ioctl_args.lpInBuffer, piop->nInBufferSize)) goto invalid; } - if (ioctl_args.nOutBufferSize) { + if (ioctl_args.nOutBufferSize) ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO); - if (!ioctl_args.lpOutBuffer) - goto invalid; - } - + hpt_do_ioctl(&ioctl_args); if (ioctl_args.result==HPT_IOCTL_RESULT_OK) { From nobody Mon Sep 30 05:08:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H24tl1z5Xltd; Mon, 30 Sep 2024 05:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H15y3Bz4XJc; Mon, 30 Sep 2024 05:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Dd0Zw0s8CMkb/YVA2XmWlMR0iVSP5apJksKRcTrXig=; b=YECyy4P/N7UhsNqkbZJVAtTJ5Sa6flsYll5Hns2Pur0uk5N/AhvBHGFM7CWvq0XYvrBSxe iWM5lrdp3ntC/wL6Usrd29kqJxS51g1DTiFpFSusotCV9FNZSPJTrXWQ0fQbUMUEmyhq/T J/EOxApuzy91Egs36Jk9hnNCyUrpKiz42dXxlrCdQiK7k6NvdRCbD04nV1GBgBuywtxxoK K72py6VzYKSfHYdFmGqVp4sR/ZJP7tWcDWZ5QhUVAY4EAKGKDs9HCSggYWISRzmHE4/lzL s52+ldfLRmshiTsOhgwewFWUMgpboaiPOwl7DeZzhu4pQfRpx9sEsBlIdFhdFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Dd0Zw0s8CMkb/YVA2XmWlMR0iVSP5apJksKRcTrXig=; b=QLj59G1TcRAxQv4eGUKUKAr1QDaZgXI2s0FIAwwfxvhYo2UlhmcX/16JwXN8brExbC/F9z 7irilks74RIMvEPsIvF7BYnP7gkcnRa+OfQkBRnEgTXpV0jrZfucsnHI/sVs2skVWI/aWy kgNRwSyX0L7J6ic5zM4Is8dQK73RdGNdm/UljnRYPRfwVlnCQiidVfoYuik/+OQBvGukVG 0Lw5afYj1ECByHGudiTDoN1h6wkrC594n0y+sKD1PrmEf67dVQ6LFisz2oToTyTHWuWG3s gHl/6nAs7mrO1vfhfE0+B7yQ2ITM/oOryMPtyd1oQumi88seb3tf/rCyGkd52Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672909; a=rsa-sha256; cv=none; b=weHGW7blWzBYwQ4VsWEqEOutymYRPauRE5uLn44GZugnErYk2H6f9VLdDbX7gia/LR3dQ3 eBLC/WmXg/IHfpfhQeRQ2SOPD5/8uejb8m5wZl1BnfSEVcSakzYAqrZUkgo7SlQduhXLa4 jOKIR7sY9QVRpcIIkZAH2mS90xWbshWhsdvxYz+FH2XTwUDqJvirNwAjVxgovDW5Pac0/g m61KGXav18VmHdRVl1OJG+h4+xcyY0dA4C0c4Qe8DaZCdaM4g6IAPlrnGXr+ZCpIGl/tFT K0oe90IpXS+q6OknIn94wN8YdQx4TxGXgzXaQxC5jEptBOb9eFH5LTFST1lrRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H15YCPzfx9; Mon, 30 Sep 2024 05:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58T7q025314; Mon, 30 Sep 2024 05:08:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Tmp025311; Mon, 30 Sep 2024 05:08:29 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:29 GMT Message-Id: <202409300508.48U58Tmp025311@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: 438e078d3166 - stable/13 - ice(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 438e078d3166feafa4e7887471faa1da3e70a74a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=438e078d3166feafa4e7887471faa1da3e70a74a commit 438e078d3166feafa4e7887471faa1da3e70a74a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:37 +0000 ice(4): Stop checking for failures from malloc(M_WAITOK) As a consequence now ice_alloc_vsi_qmap() does not fail. Remove unneeded error checks. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 5f97656fa334b494d70866cb1bfff406d3efd92d) (cherry picked from commit bb8c6f43256d234d492c267d74526fc62102b23d) --- sys/dev/ice/ice_lib.c | 24 +++--------------------- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/if_ice_iflib.c | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 0fb1ba0158f1..0f9efc3ec6cf 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -426,31 +426,21 @@ ice_setup_pf_vsi(struct ice_softc *sc) * all queues for this VSI are not yet assigned an index and thus, * not ready for use. * - * Returns an error code on failure. */ -int +void ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, const int max_rx_queues) { - struct ice_softc *sc = vsi->sc; int i; MPASS(max_tx_queues > 0); MPASS(max_rx_queues > 0); /* Allocate Tx queue mapping memory */ - if (!(vsi->tx_qmap = - (u16 *) malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK))) { - device_printf(sc->dev, "Unable to allocate Tx qmap memory\n"); - return (ENOMEM); - } + vsi->tx_qmap = malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK); /* Allocate Rx queue mapping memory */ - if (!(vsi->rx_qmap = - (u16 *) malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK))) { - device_printf(sc->dev, "Unable to allocate Rx qmap memory\n"); - goto free_tx_qmap; - } + vsi->rx_qmap = malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK); /* Mark every queue map as invalid to start with */ for (i = 0; i < max_tx_queues; i++) { @@ -459,14 +449,6 @@ ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, for (i = 0; i < max_rx_queues; i++) { vsi->rx_qmap[i] = ICE_INVALID_RES_IDX; } - - return 0; - -free_tx_qmap: - free(vsi->tx_qmap, M_ICE); - vsi->tx_qmap = NULL; - - return (ENOMEM); } /** diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index cfd848d370bb..6c010cffc0fd 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -830,7 +830,7 @@ void ice_free_bar(device_t dev, struct ice_bar_info *bar); void ice_set_ctrlq_len(struct ice_hw *hw); void ice_release_vsi(struct ice_vsi *vsi); struct ice_vsi *ice_alloc_vsi(struct ice_softc *sc, enum ice_vsi_type type); -int ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, +void ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues, const int max_rx_queues); void ice_free_vsi_qmaps(struct ice_vsi *vsi); int ice_initialize_vsi(struct ice_vsi *vsi); diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index 05574efe62ce..455da99ea8d2 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -638,12 +638,8 @@ reinit_hw: */ ice_setup_pf_vsi(sc); - err = ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max, + ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max, scctx->isc_nrxqsets_max); - if (err) { - device_printf(dev, "Unable to allocate VSI Queue maps\n"); - goto free_main_vsi; - } /* Allocate MSI-X vectors (due to isc_flags IFLIB_SKIP_MSIX) */ err = ice_allocate_msix(sc); @@ -3525,12 +3521,7 @@ ice_setup_mirror_vsi(struct ice_mirr_if *mif) mif->vsi = vsi; /* Reserve VSI queue allocation from PF queues */ - ret = ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES); - if (ret) { - device_printf(dev, "%s: Unable to allocate mirror VSI queue maps (%d queues): %s\n", - __func__, ICE_DEFAULT_VF_QUEUES, ice_err_str(ret)); - goto release_vsi; - } + ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES); vsi->num_tx_queues = vsi->num_rx_queues = ICE_DEFAULT_VF_QUEUES; /* Assign Tx queues from PF space */ From nobody Mon Sep 30 05:08:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H30DGCz5Xlfy; Mon, 30 Sep 2024 05:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H26SqCz4XYl; Mon, 30 Sep 2024 05:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DJREBRccXVS7g9UwdZUR4hXtoXs11eVJpKQHYYZsfTo=; b=ydDAa7VyNt9ssw8SqptIE3otHju11LDm7dA07zPihNhlqxTZAH9sOx20G1Pv0PWA3qOwrq orLTypa6cxNpZdP9RiWz+9dtLttbvLFrlUvpz++6EBwhDtnfFYB8OnRwsxWMuAMFko9hJK 3MZtqbYVujCZdRKQNjEqwC5WeOZx2m6abqMDH5b8pnHKk8R5wB2+IXLLAGCKI12XQAZpxr Z7lkQub68FRtm7pdCwGLkMt5zv+gnSdOi21JiKGYmAf4kpKOfIFpORUxNV1kMz0b2XAS9J sHuisJWhzm2f0K3jUuyHuuXNEkqKZOatnMHNXpzN7z9pHBRNzLJ5A49pFhI9Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DJREBRccXVS7g9UwdZUR4hXtoXs11eVJpKQHYYZsfTo=; b=rBQMkwXFfvPCE3ArbMC3yafYNL9ziFcHEABELS+T44XpUsd08w06+/EXHzmkjneejflRBU XN7hGTrWrXHUu2FsF1OaqOHEMZ9wIR6f3xtAqXlL6IMmazRDvPBF0FzRFODHpudx7RmODp agRLR4JUHu5aKBfY945rlRCnKNiCRpO+wpdOfdQXXreB4wtCDbZqDZ93RlkN02/YdR5WtR QOu2wp2v2taP+ftFqsLp9dh6+q3qas/jByWCHgnUzm/pCTg9wMz7PSfnOErKq/oZTycoB2 9Qdhn/bQj+azY1hzJavGmfojptipDVm+9z/fvqvLEmnqHDeeNVY2tjnGDgcvAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672910; a=rsa-sha256; cv=none; b=y4IAgIloCnWAGhuqhP/mZsYwyLRpFzzKcl9LzlFeqjbFq6sAzrqkTvqNvszoJWDpThO2nx 1aXJfDs9ya6VGN2a71Yg1+drcwC6vRu++jnhRyRhHt57AdJdeKyhc2Cu3z3Ov6AtDTb0Fw SE6UMJ4D4rLfG0fPYNQ7B/peOTkPk3sB4ObC9edFQQ7aydFd5zRWHA14t3b0yFmO0WEFaB uH2tV2w7PCXfTCd8gIWuFirrBSAnrqvmNvszh9Tg7zWVyI181Kb/aP40D478xVK8bvGsEP rreVThsl6Tptpa9ROBHhG3na4pnn7Ezq1OpQtvz/G6gAsdAeIACPpJAWMesToQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H263txzftd; Mon, 30 Sep 2024 05:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58UfJ025364; Mon, 30 Sep 2024 05:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58URK025361; Mon, 30 Sep 2024 05:08:30 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:30 GMT Message-Id: <202409300508.48U58URK025361@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: 20805d47938b - stable/13 - iser(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20805d47938b9e3ae936b50d257fc2f40ad1081f Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=20805d47938b9e3ae936b50d257fc2f40ad1081f commit 20805d47938b9e3ae936b50d257fc2f40ad1081f Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:30 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:37 +0000 iser(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 40a6bbc4284111790d9240f8a24ef11a9a9ecb07) (cherry picked from commit ec68da0a7e6e8041672f515a6d09fe43ce8838a1) --- sys/dev/iser/iser_verbs.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/dev/iser/iser_verbs.c b/sys/dev/iser/iser_verbs.c index f5f057b961ef..f0c7e524ccf0 100644 --- a/sys/dev/iser/iser_verbs.c +++ b/sys/dev/iser/iser_verbs.c @@ -212,8 +212,6 @@ iser_create_device_ib_res(struct iser_device *device) device->comps = malloc(device->comps_used * sizeof(*device->comps), M_ISER_VERBS, M_WAITOK | M_ZERO); - if (!device->comps) - goto comps_err; max_cqe = min(ISER_MAX_CQ_LEN, ib_dev->attrs.max_cqe); @@ -280,7 +278,6 @@ cq_err: ib_dealloc_pd(device->pd); pd_err: free(device->comps, M_ISER_VERBS); -comps_err: ISER_ERR("failed to allocate an IB resource"); return (1); } @@ -343,11 +340,6 @@ iser_create_fastreg_desc(struct ib_device *ib_device, struct ib_pd *pd) int ret; desc = malloc(sizeof(*desc), M_ISER_VERBS, M_WAITOK | M_ZERO); - if (!desc) { - ISER_ERR("Failed to allocate a new fastreg descriptor"); - return (NULL); - } - ret = iser_alloc_reg_res(ib_device, pd, &desc->rsc); if (ret) { ISER_ERR("failed to allocate reg_resources"); @@ -509,9 +501,6 @@ iser_device_find_by_ib_device(struct rdma_cm_id *cma_id) goto inc_refcnt; device = malloc(sizeof *device, M_ISER_VERBS, M_WAITOK | M_ZERO); - if (device == NULL) - goto out; - /* assign this device to the device */ device->ib_device = cma_id->device; /* init the device and link it into ig device list */ From nobody Mon Sep 30 05:08:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H44PLXz5Xljm; Mon, 30 Sep 2024 05:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H40yz5z4XWV; Mon, 30 Sep 2024 05:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y8lUxYlZKmLxSnKYxl9zmszxaknFZAU2B7wH0BAnjfk=; b=DX+XtApZGB0xoWEd5xG2CXxDRulC5zr1djZlgLB52ZvagznemVT3vG1nl0m9CqxbLadPXL MT/cErBbVgtRIEYr8m/Qx3xFtrIYaaTZ1MoCIca4djybi7mhvGDTAowKCtAMZNYQQYJu3Y f4ub1dbnaK21fJkjPDQtJMjaFb00riSzMUTWYU1adr3QFI/X6g/1BERjgCtlRTYnYxq8BV r+to+C2y4D97Tlf0CE0C9b11wsZ+ohseJHQzf48/HJoDPFkXJsOFil+WKcR+nOH8iNBDzM y89DeoG3pHN7dOD9r5hE8CPEcHcizu7rgyj524ZjBHItvtUxtt3th2FLPqd1jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y8lUxYlZKmLxSnKYxl9zmszxaknFZAU2B7wH0BAnjfk=; b=i+zAuZk86nR0Th8jKJquGZ5nyxHynvSzqN46JL9qd3h+BlsujltwAwotLV8xFY3Rs5kQwX EWFrtxbTLQ1tNsxdikFejtwfnOkbLCvboW1bzNs51p5b9p2ngkmWA1+E/6gyOu0yOOnL8t j6sCOILp0tT6deDs3qseeqSIPUt71mTkvPkNyNU26/pWEwQES8j5YUPnUGiPcK8gN/JJMY MvBGdn5HfnL3dQde2SUKVIz29OUvekIwl9wXFataKdyNoHG5yUacE6sOKKP2UJVVX7JLSc XJl/5XSXXknS+iJtAXKUJneGr3zWVQuFai7bEHix/3jxu3Tq9H8Z4fvmasMDdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672912; a=rsa-sha256; cv=none; b=uHG6MonGwMk0xmGfaz2erP9+IOCYpFOXt6kpfbBXmvmnAaifBaSzDePtFbnR1ECkwAf0tF 0z/d6uGassDumCtrMJwx/RIJBx/HB87QzSixblasz7RITVHeVDeMd0RzyxuTAiCs7qQMZQ 2sEk0AlL6XCIgwsq3JC7AsGJYtlpEU9GRLoma0x/wdNaSy3xaSorPnvxIEZSqGw7u+kafp R/VerAxVJxe6JFzxsHEG9VMUPmeomTLIgnSsIp/uG6GwT5EkX2cgU3hPavTvUVjCzSLqgy 4tvCwASfHyO/u632AUlT5RPOhONrPaRkZEpyCVkGXWxGiRxzK8p0ze+i6KLkBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H40XjFzg88; Mon, 30 Sep 2024 05:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58VsJ025412; Mon, 30 Sep 2024 05:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58Vqk025409; Mon, 30 Sep 2024 05:08:31 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:31 GMT Message-Id: <202409300508.48U58Vqk025409@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: 909623bc1a28 - stable/13 - mfi(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 909623bc1a28966ca11bb23dc863c579bbb5fff4 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=909623bc1a28966ca11bb23dc863c579bbb5fff4 commit 909623bc1a28966ca11bb23dc863c579bbb5fff4 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:37 +0000 mfi(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 701308ef404f552034f8c3e3e912b41bfef28ee6) (cherry picked from commit 4fee8d3e92c69d5865a7ef1a9102399b6fdeb9bc) --- sys/dev/mfi/mfi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 81bf8ae450bb..4a7bee6e1bbc 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3635,11 +3635,8 @@ out: mfi_aen_entry = malloc(sizeof(struct mfi_aen), M_MFIBUF, M_WAITOK); mtx_lock(&sc->mfi_io_lock); - if (mfi_aen_entry != NULL) { - mfi_aen_entry->p = curproc; - TAILQ_INSERT_TAIL(&sc->mfi_aen_pids, mfi_aen_entry, - aen_link); - } + mfi_aen_entry->p = curproc; + TAILQ_INSERT_TAIL(&sc->mfi_aen_pids, mfi_aen_entry, aen_link); error = mfi_aen_register(sc, l_aen.laen_seq_num, l_aen.laen_class_locale); From nobody Mon Sep 30 05:08:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H65cz5z5Xltm; Mon, 30 Sep 2024 05:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H63nGMz4Xg2; Mon, 30 Sep 2024 05:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FDPp/Smo0p9Qd6Lv0aItZgJS8hVjbRwST78vq++ljwA=; b=dnvlDedJp93RtIOMNj0BQxtIQR1pcHLE6u7y/PVLjMLNSuJ8j8BoazV9wVYHR+YEDUe2Jf BX3FMy+XNPt5bYkUF7ocH9YSPCwImxQLkEYsmmxJj9puJtVpz5BFwWvlxNVQwuituUdn64 NwOM1oVAoMFfmQbJMQxd/ceztA+YaObglrgg1Liaj4gEhZP2tOQcR3r/JjpNBqQF8gY3gg xVqNDSMTef5pI+OINi3+rGnW8EjubKYOyE5g8l3c1QwKciwQ+buCK88IJrC3AZtAOx6jmK EMxsZRcnFNjsReudY6xmJM1NXmaLUc3wulCng0iqlMjKcFX6IDRB3wEttvN3UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FDPp/Smo0p9Qd6Lv0aItZgJS8hVjbRwST78vq++ljwA=; b=HNGX4kvsPsgiW+ywhcs9kYWm52COvdTpaP+mSbEv8R1VWHWZU/UGO6QhKQ1NK2qK9ma9sG lTZ9HhsS+RqrWEnrLgOAC6Gvh/L8lkkKjccwcyvRVvi/lF66VKVTLqalCRJ4U1mku2C43t 33pg0obJPhzfSPyacIhV7Vwls9aFyQoxkSYNomEqD1GgzY9uq84jN9veGVxCtEx7JC5nvH vziC/X6QylmyLwMcVABf0GdGSCRCdlyGv9NkTgv3fvs1OKPdZCBlmgvmGEAV2BvEUHR1tn h2YAS+V1rGHX8/a0IB015Y2HbicB2oWtiz0dH3hBraisqCfn0HHKSlPE32z4iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672914; a=rsa-sha256; cv=none; b=G5NiZUX4juFA4ZLvgbLTn6D0xGZDufYKBI+i7SMgAURoaejY10PGLWB/UnPWL7WWZJC7n/ H/M+eep16cViAWWQWM19ggU3xalqPB9+JChowMABjAKK5TZGytGF5AcDIKU4fvZQ9+VyHU QvqKImLVjwW95NmYt+8IHkAtGbgP1CP1Jvuxjy9Gk4qh30my7lpf4RhyDcXNNZqVgDavbO qSX/Iz1juCT1VljUXgEacD+U8v+gbq+iKuqrmQsehgFfJ/6koFVAgJRegeAX34QsABHzrE xMRzl8gEgghc6ZrYQ72bAW+aek2ITfNh2dlt3Y9f0YuNOTkF77y5NVlgrXU2Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H62v0Szfyx; Mon, 30 Sep 2024 05:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58Y2E025514; Mon, 30 Sep 2024 05:08:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58YIh025511; Mon, 30 Sep 2024 05:08:34 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:34 GMT Message-Id: <202409300508.48U58YIh025511@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: 5d9c2687c3c8 - stable/13 - pms(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d9c2687c3c89e5cff9b76fc88f5417c6651354c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5d9c2687c3c89e5cff9b76fc88f5417c6651354c commit 5d9c2687c3c89e5cff9b76fc88f5417c6651354c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:38 +0000 pms(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 4fb8a80a78aa65e0b30bd5a74373512c678841c9) (cherry picked from commit 025c4754941956e24830a9c3c6f5e2466b19a9e1) --- sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 38 +++------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c index 3368897d1d19..29290ec94ec7 100644 --- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c +++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c @@ -318,13 +318,6 @@ int agtiapi_getdevlist( struct agtiapi_softc *pCard, sizeof(void *) ); AGTIAPI_PRINTK("agtiapi_getdevlist: portCount %d\n", pCard->portCount); devList = malloc(memNeeded1, TEMP2, M_WAITOK); - if (devList == NULL) - { - AGTIAPI_PRINTK("agtiapi_getdevlist: failed to allocate memory\n"); - ret_val = IOCTL_CALL_FAIL; - agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR; - return ret_val; - } osti_memset(devList, 0, memNeeded1); pPortalData = &pCard->pPortalData[0]; pDeviceHandleList = (bit8*)devList; @@ -968,13 +961,8 @@ static int agtiapi_attach( device_t devx ) } else { - pmsc->pPortalData = (ag_portal_data_t *) - malloc( sizeof(ag_portal_data_t) * pmsc->portCount, + pmsc->pPortalData = malloc( sizeof(ag_portal_data_t) * pmsc->portCount, M_PMC_MPRT, M_ZERO | M_WAITOK ); - if (pmsc->pPortalData == NULL) - { - AGTIAPI_PRINTK( "agtiapi_attach: Portal memory allocation ERROR\n" ); - } } pPortalData = pmsc->pPortalData; @@ -1225,32 +1213,14 @@ STATIC agBOOLEAN agtiapi_InitCardHW( struct agtiapi_softc *pmsc ) pmsc->flags |= AGTIAPI_SYS_INTR_ON; numVal = sizeof(ag_device_t) * pmsc->devDiscover; - pmsc->pDevList = - (ag_device_t *)malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK ); - if( !pmsc->pDevList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d DevList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW\n" ); - return AGTIAPI_FAIL; - } + pmsc->pDevList = malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK ); #ifdef LINUX_PERBI_SUPPORT numVal = sizeof(ag_slr_map_t) * pmsc->devDiscover; - pmsc->pSLRList = - (ag_slr_map_t *)malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK ); - if( !pmsc->pSLRList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d SLRList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW SLRL\n" ); - return AGTIAPI_FAIL; - } + pmsc->pSLRList = malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK ); numVal = sizeof(ag_tgt_map_t) * pmsc->devDiscover; - pmsc->pWWNList = - (ag_tgt_map_t *)malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK ); - if( !pmsc->pWWNList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d WWNList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW WWNL\n" ); - return AGTIAPI_FAIL; - } + pmsc->pWWNList = malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK ); // Get the WWN_to_target_ID mappings from the // holding area which contains the input of the From nobody Mon Sep 30 05:08:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H54czjz5Xlwy; Mon, 30 Sep 2024 05:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H51mM5z4XZB; Mon, 30 Sep 2024 05:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+MXnc8LBnL9fhFziy75DpoQ0yRbGVhQ/sZ3kLYukl0=; b=yYaqpc8vj0y59gVV5BxdCyfawZO2UaNJRhMg9tRHl9R+zmPMtpoPHsSjKNYkIEHIOE1HG/ VQH+a0l+zMQKrHtDBxGKmqeIZSj2ikZlqvOrRLKQmqhhd6UEYu42pF+3+RUTIASdOO1pfM o3jRdDyE7yAoDpPIGuGQCfI3RGfEL+nodbEwz0rJzQzZKMJ4krfwBKJZUFLGiIIs4T+oaq KdME2sEHJ6sl3VZ84rRcC+np3/r254aQ0cvoCqhbGTJAsc4hlzP+u19fgQjl6607AI18KY NAnQhek/Xp2dTpeYbb2+Q/QHgAH/kAEDqzZHBDd34dvGtZE+AYoCLNJ23C7fcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+MXnc8LBnL9fhFziy75DpoQ0yRbGVhQ/sZ3kLYukl0=; b=A6JQ43LtvAZlb8xfA9Svs2/69AjU7mmm6YFOLB0jMLWYlG3tpCuYIWAthBMWkqPVkBgd6K a/S/cc+P7gdL9pUwXjI1fGm6DCP/nM/iRD+zvlSTgU+Z7L5MZoW0/kf9egy5KnVMo8oOls rb2XmqjKEAzHA7l6TrEVVMkpS9oro9QClsKP/0DKGidpHKc5gai6ta/YrqZFu3f9rfwvKj OmyNirGw+zPERFBdiSw0yf1tZ6Nyu7Y2gVZFN3+Kvp5tJR5A5r68BUQDX7uAtXbORHR+i/ L6ICiCfQ1FDCJ9X9pct56opeOWpbhu4SQ2WHJUgE04KnLGLB28NLr23dwHWylg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672913; a=rsa-sha256; cv=none; b=JxnDl6hTIScaHYDzxY26B0THnA7BDch72DpRcv6RoYiodfquJA1lHvRVScNz+dtyM53kPf Wlluoyn9LVidVZAg12259sOwRzj9SPnGdsJchJpzoST1CBam3In6/woow/uLHbYFKXrMZK ymoylqMsuSA44sN4kiV8361963Obm5M3n0Zok7+tktmVDO5X7EkndG/GFjiL8VFcMWvxP8 pvDTecC5l77xDHwd1D64o2m/hfI6jkeJMgkkRfY1RSnNk05WCI28CuTCExlYjmYqP+WtYY RchYqoF/izHpLetzkEDk76hHaDhw3F4Jq4gEbfNpfnKmb2VJookv5zlr3E5zNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H51LZ1zfqy; Mon, 30 Sep 2024 05:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58XGs025466; Mon, 30 Sep 2024 05:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58XTd025463; Mon, 30 Sep 2024 05:08:33 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:33 GMT Message-Id: <202409300508.48U58XTd025463@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: 6f7d5f52c19b - stable/13 - mlx(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6f7d5f52c19bad9e260425b6f5c3cde7a83cadd1 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7d5f52c19bad9e260425b6f5c3cde7a83cadd1 commit 6f7d5f52c19bad9e260425b6f5c3cde7a83cadd1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:31 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:38 +0000 mlx(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 556cd18fb07604e3442819b221afb2a19b924dbd) (cherry picked from commit cf44738feb83b03f0726ae1dab83daf371aa2f0a) --- sys/dev/mlx/mlx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index e3590df73283..b074be4c98e8 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -2077,8 +2077,8 @@ mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu) goto out; } MLX_IO_UNLOCK(sc); - if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK)) == NULL) || - (error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) { + kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK); + if ((error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) { MLX_IO_LOCK(sc); goto out; } From nobody Mon Sep 30 05:08:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H76vTGz5Xltp; Mon, 30 Sep 2024 05:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H74YgCz4Xcm; Mon, 30 Sep 2024 05:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e1iVWFIKBXFs+S2dzJmNd2nIcYoSM2J4AYrWiiXHMKw=; b=lLEWbJ97i5hFJACiLwJolg0BOqXvhbodBWnFwNDizRKgSqrsQeFE3z/1mFK7k6eaw95v0H EAjuBdw899DpNU7y0bBGwW1n+qmUYRnzPJJYPRFo63VeBzn4dir/K4Vy5cLHqkH3yxZmuc ZqtKdM+X+gqvwQ04ZdU3E+PT+bHkzZ7h9f+T0+vnhOFU+roxWYgikd8JMLNf1VuLh8gY0h 5708nCLabR0vHR3usTSB18omL0lhJHpFPXHJLhpYHJLTuHMfu5lbjUSLFQitAxVcktyFyB QUP7IC42rsIetbg8bv7O6J83X3VDWzuA1PWRVdD+Ynzw4U/+C4XNOxeG3/IJkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e1iVWFIKBXFs+S2dzJmNd2nIcYoSM2J4AYrWiiXHMKw=; b=YhTUDpWN1/fVTlOahoINHKJSYnNO8S/LRHyq+XOzhmQjAXD/h2t/AL9gPybN1p/jXdherQ aKk8M87zY9g/zNl2z13/vPGF3FztBUOAjosmsCbWYLiC+Bbf9v2lzGZ9CV0MZ8xFCByZcL ZNV7A1OrYMgdVfrPHgw8PPG8yWZdBVjlu86nxVbC+C/uhG2sZufLry/njd20iQq2eMjChH rluJDowT0ODjFvc8/xCOLDRVczUzZvxsbyal3RgmvkZjQwVXy59/5eXO1kbP5jh+OGntyd Dze08VL0j5BMYCCtesnNELuQ2k+JqnZobgonnoIBu6xgiaVoug6Nh3bX7MrlJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672915; a=rsa-sha256; cv=none; b=fDTIZIBvZR7EXORXqIA04Usi1G607nPylANgkb/QDWrl+rz9VrHv3790QGxyYrYyuzBl+u 87lo5JpS+tdCBFy9kKA3LuPaCHFxUgraJewTLdlOybyxCP1dNsQeBbG+wJJeSj4jVdhm09 EtMd5bXpLJGJKybsNmADcW5ZErcEn7hmNuvF9uJWf+jJMW6OOUuIIF9wQEFcO3S9xlr8ni DKdv/HW6bDc9aj2r9NpHqw7ObUAtpo6Fm3ssBy1t4alvLWj+2uC9kLcYcZ+5Bt7zooGXMn SIB4JeEqbRU4RVzYwRPbXcf5AyamnusgESPyPJqR9HKahMqn2wegJujMPZebkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H748Xszfr0; Mon, 30 Sep 2024 05:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58Z0u025563; Mon, 30 Sep 2024 05:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58ZRf025560; Mon, 30 Sep 2024 05:08:35 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:35 GMT Message-Id: <202409300508.48U58ZRf025560@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: 68c96d15d3e2 - stable/13 - sume(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68c96d15d3e2107bd5b60825bae32ab3cd848593 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=68c96d15d3e2107bd5b60825bae32ab3cd848593 commit 68c96d15d3e2107bd5b60825bae32ab3cd848593 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:33 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:38 +0000 sume(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 761339c5544a360df9d3bab70675fea246eb6a83) (cherry picked from commit 140a0c8f39816648719d9670fb641c657732439e) --- sys/dev/sume/if_sume.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/sume/if_sume.c b/sys/dev/sume/if_sume.c index 59e4dbc9d02e..0868a5b00e87 100644 --- a/sys/dev/sume/if_sume.c +++ b/sys/dev/sume/if_sume.c @@ -1203,16 +1203,11 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter, { struct riffa_chnl_dir **rp; bus_addr_t hw_addr; - int error, ch; + int ch; device_t dev = adapter->dev; - error = ENOMEM; *p = malloc(SUME_RIFFA_CHANNELS * sizeof(struct riffa_chnl_dir *), M_SUME, M_ZERO | M_WAITOK); - if (*p == NULL) { - device_printf(dev, "malloc(%s) failed.\n", dir); - return (error); - } rp = *p; /* Allocate the chnl_dir structs themselves. */ @@ -1220,11 +1215,6 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter, /* One direction. */ rp[ch] = malloc(sizeof(struct riffa_chnl_dir), M_SUME, M_ZERO | M_WAITOK); - if (rp[ch] == NULL) { - device_printf(dev, "malloc(%s[%d]) riffa_chnl_dir " - "failed.\n", dir, ch); - return (error); - } int err = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, From nobody Mon Sep 30 05:08:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8H91MVRz5Xlmd; Mon, 30 Sep 2024 05:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8H85FtSz4XSB; Mon, 30 Sep 2024 05:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6wBe0nC+fkEIx+Ms33Snzcf0EPcW8L6ioVHqA+Fhsw=; b=fvAmRvXiTD6lWvq1+/rOFhahNQjPnBQWYVtFR37bQjyCbyBGHZ8gt8QF3lkawgjahnFuRO 15NM3OtmXyiMw7OxkrZ2A13eDTpdL2GcnHqt/SvT1r4QJ/K80QKhd3FMi4iwTXHW2HP3Ue NDzYCg9hAOECjObKa8rgAzCaArb82ZRNmJX7Wy6a/rbTOIkMy/+oIGXd5JfiHDKLsd6dKX zqs0iF27yj7xnXQJbw3XjMk+q6OFpPRlwpyKB8wmbhueWYg15vIEnQh7eEWfRnxhmvfNcP FqjZVNS7mPm3Pp3TgfZhrX2o1eRjXgTQe75BIxW66on7uezGLRnVd89Rpx0I8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6wBe0nC+fkEIx+Ms33Snzcf0EPcW8L6ioVHqA+Fhsw=; b=sE5Q2lQt4pRhR21i5RcsLFcqzC/nypQI0x9qWHJIUbkk5XO6dwRqfqf99Ek8v5zsnnYieN nWeBNnRqcjcO3YY0nHBd+pSOZuhEEXoRImAnsc45Y2mEUzlPJ6HiBYCYNDLNbCaohVwI5j 6gWez1tlP91ZVOEpW+AF0bOiRA9rX83EnW7iAXC6WrBdHaTiqOGTora0ffB9WaKoEAe+NZ cyppeaen2eYjTDKicHahrEdMhBDNKW2436O4Jj71hh9W+FMfB2ABrSm9eS+NwnMAha4ZKC cvwy7mwXdn3+u1Ua4D5p5iX96VQvL1dlZqsV40uhbuIDtsXJF4cNG9O8H2Focg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672916; a=rsa-sha256; cv=none; b=TCBexQrEe9eSPh4HSb9vvDV5TExWcWjfqvprNxeHadO4fJRtxfo3++3/LfH8RjhoqQefGF fF75+Ibol4mCPBJBQOYSTD46Te9crLleyY2F2H33JuvXQt4t7NJm+Rdy7WVTQiZpTm502Q lRRs6jtnGXY+gTC6ZwTGCIftfILpGK5rXNe4TVEkNkMY3NZazNKKjiH4Ou7uXsEmuJTEsv MuStajJPc9+YPvg8gYiiJS4jakkwVIdWLjizYeMy1a4KnWFCSI69drFqRfRu25BUQkfeJS TW9K33gri5+8Q5lyVXFgjQ+BxFE3TFCckQ3wevbMJBRzeMLOQn5vecDUn9rrNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H84sTvzftf; Mon, 30 Sep 2024 05:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58a8j025616; Mon, 30 Sep 2024 05:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58aUu025613; Mon, 30 Sep 2024 05:08:36 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:36 GMT Message-Id: <202409300508.48U58aUu025613@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: 36fb983d227d - stable/13 - sound: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36fb983d227decf10b26b666000fa69e832eb641 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=36fb983d227decf10b26b666000fa69e832eb641 commit 36fb983d227decf10b26b666000fa69e832eb641 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:33 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:39 +0000 sound: Stop checking for failures from malloc(M_WAITOK) Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 59121599bbda1e4c3fc3c6e887cd48cd5e3afc70) (cherry picked from commit bfcaaff418b856ef3d2a5be665566f62824f2f09) --- sys/dev/sound/macio/i2s.c | 6 ++---- sys/dev/sound/usb/uaudio.c | 44 +++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c index a769b9d81652..814bdd7e6bdc 100644 --- a/sys/dev/sound/macio/i2s.c +++ b/sys/dev/sound/macio/i2s.c @@ -242,10 +242,8 @@ i2s_attach(device_t self) * Register a hook for delayed attach in order to allow * the I2C controller to attach. */ - if ((i2s_delayed_attach = malloc(sizeof(struct intr_config_hook), - M_TEMP, M_WAITOK | M_ZERO)) == NULL) - return (ENOMEM); - + i2s_delayed_attach = malloc(sizeof(struct intr_config_hook), + M_TEMP, M_WAITOK | M_ZERO); i2s_delayed_attach->ich_func = i2s_postattach; i2s_delayed_attach->ich_arg = sc; diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index df6df8fd8e96..b2fd6096f323 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2634,8 +2634,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); - if (ch->buf == NULL) - goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; @@ -3204,31 +3202,27 @@ uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc) malloc(sizeof(*p_mc_new), M_USBDEV, M_WAITOK); int ch; - if (p_mc_new != NULL) { - memcpy(p_mc_new, mc, sizeof(*p_mc_new)); - p_mc_new->next = sc->sc_mixer_root; - sc->sc_mixer_root = p_mc_new; - sc->sc_mixer_count++; + memcpy(p_mc_new, mc, sizeof(*p_mc_new)); + p_mc_new->next = sc->sc_mixer_root; + sc->sc_mixer_root = p_mc_new; + sc->sc_mixer_count++; - /* set default value for all channels */ - for (ch = 0; ch < p_mc_new->nchan; ch++) { - switch (p_mc_new->val_default) { - case 1: - /* 50% */ - p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2; - break; - case 2: - /* 100% */ - p_mc_new->wData[ch] = p_mc_new->maxval; - break; - default: - /* 0% */ - p_mc_new->wData[ch] = p_mc_new->minval; - break; - } + /* set default value for all channels */ + for (ch = 0; ch < p_mc_new->nchan; ch++) { + switch (p_mc_new->val_default) { + case 1: + /* 50% */ + p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2; + break; + case 2: + /* 100% */ + p_mc_new->wData[ch] = p_mc_new->maxval; + break; + default: + /* 0% */ + p_mc_new->wData[ch] = p_mc_new->minval; + break; } - } else { - DPRINTF("out of memory\n"); } } From nobody Mon Sep 30 05:08:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HB2mWKz5Xlrx; Mon, 30 Sep 2024 05:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HB0qqGz4XrT; Mon, 30 Sep 2024 05:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbtBbIYIeG9I7flMk6iJtYaKAa6KbxCj+FfFlNXjJuo=; b=dNAfuvpkQ/ieRLAW1g/Ou+nFK9uDORXEJkMTjIVeVNvO7rIMJE7FpCaBjSKD0TjynOJM13 Jg3GF0s6MYBdVnI+Sfv8UXQuPuSm4QM4XGtF/2Lv7pMJjV/iGUiEyFK9/b7t+wRQF0cEZg HQkV2F4ufoGt8inXnJqHxaaU8FeWszZ/PT6soTAXECIZMnGvdvvpnWxE4Fbyj2ArvoxbfZ rpOEv7Oc2bLo1s9odORoTmpiVcozgcdscvNqDxfjyIT5FqDnw8lp+xBsokf/RHDwe8EZaf NnwsXKIEiyx55kXV/cnq5J1l/79cFxcMJEGZaB5nZTzeSCLJYeSbztcW4b9pEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbtBbIYIeG9I7flMk6iJtYaKAa6KbxCj+FfFlNXjJuo=; b=veJIklsb3U+Z9GYEDCi0OsHq0sXhANOTJErRxF6SpSkKAKppVXkQ/8nU3D3juWv9rfqTFT +CaME2HGFsuheRWaewmsd4mC6D+JABamdIxJ7rYV1QN7nTkSERrtUrib8TGqplk1gVfDnb 8D+mIQiTeFn2lNb5j57XdtAgXW1hNKO2VRd6HTGOY0A1iVzz6acxcB389qsqkeB0kh0tt2 92ZXjOHveQ5uCIINEnuvQO5bClscLfXZMhFpPAVs0TMeRTI9PTS4IwxR6o9+reOQhK0Hw3 6GBJrv7qfu1iXOmJtcyU6BFFkTPbpXEbwLGpL2L/UxuFRhRt+tJGzNrTRpPQtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672918; a=rsa-sha256; cv=none; b=hVU1V4gWe1DY2IS0hUoagdZPLyJZLlHHlYRL0UuXEqMThWAxNMtv0d2og/CPtnWteyBGmG IdPq9j7pKj0tpn77sh8R1xNm78DKHr9wCfdUhA6+l0ThVSPZh6bJfJAe8rxonu3AV6H3/E qwUvvyz9vdAm0N/lzgdB+PNp1CHizddJEQkCeWdo3RWpzl50E0qEF6vthHXPH2ZshhwkJd dqSNDFiLAcTIJPOPSsx1ePGNQ4yyy9rsesq4kW29OaOwWzyndWc+3PsqFu8vbBHwQ0bPGC 9nXm/hZg9nh+5QE4SHPmhJBBmNk48jkYA9PCyWresrDm52haP3lod/4tc3fqeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8H96J9Wzfyy; Mon, 30 Sep 2024 05:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58bFe025664; Mon, 30 Sep 2024 05:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58b8R025661; Mon, 30 Sep 2024 05:08:37 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:37 GMT Message-Id: <202409300508.48U58b8R025661@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: eded71c830ee - stable/13 - sdhci(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eded71c830ee9cb85dee897418e47e2828116eb1 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=eded71c830ee9cb85dee897418e47e2828116eb1 commit eded71c830ee9cb85dee897418e47e2828116eb1 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:39 +0000 sdhci(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit f80483cdd58a032ae2cfb2b9119824e9badc2c91) (cherry picked from commit 5a7db2ff56f9e08579913ae16850ff82617001dc) --- sys/dev/sdhci/sdhci_xenon_acpi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c b/sys/dev/sdhci/sdhci_xenon_acpi.c index 8699b26cff68..f130f03fc572 100644 --- a/sys/dev/sdhci/sdhci_xenon_acpi.c +++ b/sys/dev/sdhci/sdhci_xenon_acpi.c @@ -88,8 +88,6 @@ sdhci_xenon_acpi_attach(device_t dev) memset(&mmc_helper, 0, sizeof(mmc_helper)); slot = malloc(sizeof(*slot), M_DEVBUF, M_ZERO | M_WAITOK); - if (!slot) - return (ENOMEM); /* * Don't use regularators. From nobody Mon Sep 30 05:08:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HC3dmxz5XlgB; Mon, 30 Sep 2024 05:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HC0gbzz4Xm5; Mon, 30 Sep 2024 05:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WOwSZjnFBF67YWEzTOsg+11v3iXItzvcQE/Gk9FUus=; b=PwKCsTr6UVwqVeL4LxwU5PQUFBEC5yLpjn+IQw/2rYM6Xeq9dfXeFlIOkSlfzts7mp5Mh0 nF13jwnKcyjZnqrZcrV3qdeJ3t4qYR8J5/V9rHkAzDtoLi1n20mqD66Kxts0CmZf2TIiho U6i0LH9pZB4QqsA5wd2bV3FIcm7NFdYYfFcu17INwptEW/HsqxOalXYjIxYZFq/iu0Vcws L0ADd7OGchsTQccwugOVL7zVFgjsXV867vs+YAv4US0c9hnYcB3rHnWy/r72u/Ujp0+iOX 8/5O/HYD8iubvsk7ZLuqaxCLuGYN9DM5NHrFSzGfk9P2iUXa2B7YufEqNS7Aig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WOwSZjnFBF67YWEzTOsg+11v3iXItzvcQE/Gk9FUus=; b=PH45vkamkWEzNS0MqcKUgO+AzdUypzVh9NHbGq1NU545nfjsmU4vibiBbLqDrinCS53EPc EZeeia/4ignzB1nm+YNwRosRbCt3Pj20a233R4n7HCLZABnkEudN6CCeS26SW3PxUaPcy1 NkC4mnXzsz5ZVecrNRA1MfC7dGl42cdQYai3Zpyb1jUqvn0eI0SVrDH8iQ9b/h1sO857Er ZwgdXnTZNBM6Kn5piS5VWmhmFPuM1mfCB3y0OqbR73TM1goxdl9KbXSbnD5Indqs3I56IK Ag0F0nEqf+FzuK/BDGZipSMK7sAft2aRAP4Tj6KeH+l73e2ZPd1yOXZwa/fu9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672919; a=rsa-sha256; cv=none; b=ILxCYKARnnz9grJmz7RO8pAuLJeJqzMq2DjoTHKPaSh0PiIKV0kIaxpJnuyA6I8Ep3xc+h x/NNEpekBl+2mhisJMr0RCIaoXDCU+jgyUXBnqKljfA0jNbqgL9kyjSyMYJGrCzEq1Ln8X F1z8Nab6A2DqZIGENpAFyz5LdHcEt74JQbbOCYJ7ruSNRIFrPutMmt1vQJwzu/vmoFnspS xbCyQPj3CaPnoeS5zW1HbDXOvIGBEX93fJOBBZuRWphRf9eELRjJ62RIyPREDvd45bx6S1 wcn7fgKhsNVJH5Vf8qpqNPzf7DdVJgUP3Qpb6NBA9htaRqhHSDVK7J1xL+Th4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HC0HrrzgGW; Mon, 30 Sep 2024 05:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58c6t025718; Mon, 30 Sep 2024 05:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58ceX025715; Mon, 30 Sep 2024 05:08:38 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:38 GMT Message-Id: <202409300508.48U58ceX025715@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: c55da1eaf79e - stable/13 - vchiq(4): Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c55da1eaf79e977ca95dc58ab6cf90908ae969e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c55da1eaf79e977ca95dc58ab6cf90908ae969e6 commit c55da1eaf79e977ca95dc58ab6cf90908ae969e6 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:39 +0000 vchiq(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 778ea7ed5a23db9c4f9d8dc43a5cea26ded6231c) (cherry picked from commit 40015f1c11ee2321485d0dd83cc2edb92236a541) --- sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c index 279aacd0880a..ab8981e25cb2 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -278,8 +278,6 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle, WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID); bi = malloc(sizeof(*bi), M_VCPAGELIST, M_WAITOK | M_ZERO); - if (bi == NULL) - return VCHIQ_ERROR; ret = create_pagelist((char __user *)offset, size, (dir == VCHIQ_BULK_RECEIVE) From nobody Mon Sep 30 05:08:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HF4Tccz5Xls4; Mon, 30 Sep 2024 05:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HF2zGzz4XvD; Mon, 30 Sep 2024 05:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCDj60Lppoh54Fnv+pAIokPc8gc3oj+cUA21BDuvcKU=; b=oXIlgSM9h1zz1qE3gI4UHaNXUhv/mwBFbSkcX0EAJ4pn9xg0vHczEOHAsVSGOFYkVLgZHI krmcI284Rc97YyPhmHn3A0LYB7ShBAdipnmFPHM2ZDlHWsVzB+/Iw5iBMQVm6cQ0WspPsj 3Rb+Zy0q3ncmyZAvi+htOvpQjA4Bim/JB2uIYO19oQfHWkgYKzjhZfzbACWsdEedVGq5t5 j/xaJxYOiY3uyK5DSLVLXx0c7l8Mz2R0BaAEfIdAI6fqDQfGwLr/tBfUwQzKt/U1ZHGyzK 8z5d69YOq/DM2c2K+i6f05uqCDIyf9OA2kHGsJO922oGjOYxJMPJGMlBr1SU1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCDj60Lppoh54Fnv+pAIokPc8gc3oj+cUA21BDuvcKU=; b=MLDWf+GiRVObB9gBMNIOq1z27SgptfGyjIXACdXkXt5Bpuu4MDHrxiP9Ckwk/iqOJUp2R0 y8t7uGBQ2ReP17P9WquQinHRtUmx0gUMiNT9eZXswQ7uYXcZ6DfeJp1gGWB2zGp/Y8cUNM 89id5aOs25nMu2+UAlQtrEWv9LFz4fNUdPZRly87SAt+W1Y77cYLMtfkk1FTPEUBGieGRT Bj3noyatNeS5hBZ4Bg8yNZuIhwv3c3GHZIokL9i9pSS+AtuRN0gXJ0xUBcgofVM2i6lai6 3OgJltC3CTrC3L2NNZN2L+7b/aeR4i2maZ0mveXurRaSfxtVLu6kpv6M8y/oaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672921; a=rsa-sha256; cv=none; b=fo5ehYOHiOuQ7dA2k0UonZUnXmUmgWFNYUQ6H87bbDkkSqOvejs6uxxSHNlIKtB285sJH8 q2jSn6hEazkSXmBB4+qEx1qjyvgmw4S2dwv43wPGx+koZkew/s9IA58DBfkldeRZOrOtxT pDxm19q7tkw3/nWRzA/wha+L2Z6gbZkg6jMpCIELuUdh0KFWPlpbTg7lZg6pW1UfzhAqEm ZLPdvl1Xj9/83BjmjrRXCyhUu9dAtFWFU5FDHXDEp9d5biYxDCTNLCrO1JbrOeV0f8bcHs w6HSFEuTNwIPD41ZX3UfsTzhFxd0b8r+m9RmOt5v7JoW4Itl1QacLY7sXcI6BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HF2bVPzg8B; Mon, 30 Sep 2024 05:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58ffT025815; Mon, 30 Sep 2024 05:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58fpw025812; Mon, 30 Sep 2024 05:08:41 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:41 GMT Message-Id: <202409300508.48U58fpw025812@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: 0b1ac58493b1 - stable/13 - age(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b1ac58493b16e55c882473567962b157ebbc775 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0b1ac58493b16e55c882473567962b157ebbc775 commit 0b1ac58493b16e55c882473567962b157ebbc775 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:35 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:40 +0000 age(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 5cece2c24bfa618091e778df488fb2380fcecafe) (cherry picked from commit ea86e323e52fe5bd7bac73ba2247b5ab0a3df052) --- sys/dev/age/if_age.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c index c459493ba67b..7bb494d81de2 100644 --- a/sys/dev/age/if_age.c +++ b/sys/dev/age/if_age.c @@ -638,12 +638,6 @@ age_attach(device_t dev) /* Create local taskq. */ sc->age_tq = taskqueue_create_fast("age_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->age_tq); - if (sc->age_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->age_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->age_dev)); From nobody Mon Sep 30 05:08:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HD4YFMz5Xlx9; Mon, 30 Sep 2024 05:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HD1rrPz4XYC; Mon, 30 Sep 2024 05:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqEg/VZ1ZlUxOhBWaosm60hd2VXkofctF+2B8KYyrPU=; b=rz72J8O7+hANfcpIIQJ4Fp+lWKID6BQJsqepzY4e+6KmYDrLpejs0vxvwqln+tCEJRYRLp NUYgcvB8Sb0VcgP+bQ4oA7j0g1pHH5gsSCszguj/M+d/qdqq1UJEnOvuk6XLXP+0x5P3+l SSjtX+UNgGlhPjSTF/GoqgS4Gpyaa43fQH2kCfVqPoorSa8cfCijTj4ESV5PRb2nFirzWd 1piGsL80i2hJzy68mendBtxCGCVF3TWYxgRZcucVm4i+MDluSjQU+DofKHHohSuS1TdjSQ +t2boLt7eZt2NLeNz+rrFovu9e+P8JTmVQe+6dpVH8vv9t0zk2/U/gqVzU0bNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqEg/VZ1ZlUxOhBWaosm60hd2VXkofctF+2B8KYyrPU=; b=dJDuXXF2PH6tSi++TXKygiNBTUWotJ893yTCdpo1UmLUA1bJDfxLVaw49BXWgl2hpE1ECL ZLQ99mZ6kEhWkBGi2Xksg8YStuAwtb0PKzSIztNfmUdS6qb5z3eI8lD4vb1cxS5ZLHMJFM b4gEG8DpeTq/3JcJIDRMWpNk6RT47JZY+9oYBOYpWEDtkk1ciz78Bztib+0XYJphKYtsYE plW/UEQUu/u4DKPe55fACQ7u6oFPWS5/yzNQt9Wk7od8kjpt2k8tr3ssxkv+5fPw9ZtBq9 8avS/3X23Bf5l3YS0ZSLpZ2wET5vyMTJjv/kTe1niwSbu1ldFtSXYsY+9Wvbjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672920; a=rsa-sha256; cv=none; b=ey5Ww+aR7EcJqoLvg5BAq8n3bR839tTcjIaMb+I+wdWmc5oOPgpgzlOqo++hp/+3r25xTw ffiTz1ecWQfNC5+N3a6om0ESs81557qAJ3YWrKiLUkLlxepMkKJQgVq4odiN4NuZ+cfpdb mM3JdYJHPRjJ79cqcutJlZvAGsrxOt5bVdqF+CGLzyHsJoP1ZSiL4NZ26G11wr1xIllJpP +rZKRQj/bT2BrNLqjONnqhVb8E8fvlE9wAupwarEcKjoqtFyYWIioGQuVK9EK3xaKl1jtT f29a81WanyEdeQvvw8lDr3D3gJ24q2t7CqNKP62HrZK5nm8DS1+eOk63v1YwxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HD1QJhzg89; Mon, 30 Sep 2024 05:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58e6i025766; Mon, 30 Sep 2024 05:08:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58eHf025763; Mon, 30 Sep 2024 05:08:40 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:40 GMT Message-Id: <202409300508.48U58eHf025763@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: 3e90f15df4c0 - stable/13 - ae(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3e90f15df4c06b47e9b991baffcfca7ae7ad804c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3e90f15df4c06b47e9b991baffcfca7ae7ad804c commit 3e90f15df4c06b47e9b991baffcfca7ae7ad804c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:40 +0000 ae(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 3f3f3ca25bc453315c6a1f5d16bfcc1189d41bdd) (cherry picked from commit 5de9286b9af6e2448ab7d3fe749d37dd00b915e7) --- sys/dev/ae/if_ae.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c index dfff2ce22063..f8e83dc3c563 100644 --- a/sys/dev/ae/if_ae.c +++ b/sys/dev/ae/if_ae.c @@ -371,12 +371,6 @@ ae_attach(device_t dev) */ sc->tq = taskqueue_create_fast("ae_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->tq); - if (sc->tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->dev)); From nobody Mon Sep 30 05:08:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HG502kz5XlvB; Mon, 30 Sep 2024 05:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HG3gFhz4Xf1; Mon, 30 Sep 2024 05:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4HBQJVo+TDDjZeYkO0Un1IVjWuRYRZIhuGpLvVzoZzU=; b=DSoA2AXzrRxnhzzVoTtr/3f7lqPUjd5jFXYryDYqv77ZnEDo0lw/M1LxpkBBKWn/HJysAO gdxirobq/QmX/eTXRc70jzSfOG/rYEPWWqb+Hb2xV42ajHChhwRpppl6MQesLanRIF3uUG Rnw6O4TL1G7+YDQGmUgFvHz7DC384iWcqRkr67cIC3yQID8b61n8pS0dbhWPjvRii4l5AH nNqMsfXWUgGM7S+xsv4UFhQaRIumJgchfIik/hgrGflB2PL8YhPVc/ps49vhB2KAqgHlb/ M67oBh2Fz6wL0jIE7dJVbctmgES7sA2wZwhQD/1DSwwJ9mbQZTy7KzxcDRgtog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4HBQJVo+TDDjZeYkO0Un1IVjWuRYRZIhuGpLvVzoZzU=; b=cQxbyxPqYns6UzXPeccXghEuHwTLF5gkl3TehEtrwGZpS5ieLDvxqVmt3WE+8svz9CQBDZ fddsgX0kGeXpbNHWPqA6IWoyNFVvy0fcOx6vqmfJDB5PKapooevfNvisZKahwedH2YjF/B T5Zr0/naZhkQOxck9vDx6425NsFQVM+ySKRDi3vRjDvACDhlmhIXAvEH2RZtEp6CgsoRlf 7XRqZcC9z5qGlT87/XL4FbJnQ/B97ejUapRN/QzegTESrWh+NZS+fze3aIuRXwu6hOoEGJ /d8F5dhLkbFzwiwgzGonlqI2U44ldWOwKVUKmfYy2hFSAMlmqz/PORXzD2FcWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672922; a=rsa-sha256; cv=none; b=UR2cWl7ed3TORGrfHUcPT/i+wPK92eqyKaGyBeGjdUzx4urK9W+srp2kI1VVkP65jLLv+I LDAMucG1dBqj2jNwgPmnWCrkmFa0x1NWCsUizIjb7riqLWGpcytrENcmkU7PcqDMFiWoDs nd+1yFLlkE3/XKdaEjA1k1sLG2e4gdq6P0nOu7jKPHcOc+9pBex/hWlaIdHwXBZHJoxM22 yBbkwoSJMQpWDXVMZF9zPPpttdQ37rt37x5Q7sWUZI+UJHXrquCe0chlp7PjazhNeQAshl TJ333Gm43e32TiBMs60h6/YmIffrraH9bUSbLRlFfByZ3oKHADDuvLU8zxLTqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HG3Hpszg8C; Mon, 30 Sep 2024 05:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58gLo025863; Mon, 30 Sep 2024 05:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58gRj025860; Mon, 30 Sep 2024 05:08:42 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:42 GMT Message-Id: <202409300508.48U58gRj025860@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: 8b872247de88 - stable/13 - alc(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b872247de889c9b8faa9bb309728a83e993de0d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8b872247de889c9b8faa9bb309728a83e993de0d commit 8b872247de889c9b8faa9bb309728a83e993de0d Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:35 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:41 +0000 alc(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 0cd3976d076218ea10761dc3f38ecf8549768ad5) (cherry picked from commit a6c873a822b5dd51861616324abf3ba466958c7e) --- sys/dev/alc/if_alc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c index edd3981fba7b..c4e66fe8e1be 100644 --- a/sys/dev/alc/if_alc.c +++ b/sys/dev/alc/if_alc.c @@ -1627,12 +1627,6 @@ alc_attach(device_t dev) /* Create local taskq. */ sc->alc_tq = taskqueue_create_fast("alc_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->alc_tq); - if (sc->alc_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->alc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->alc_dev)); From nobody Mon Sep 30 05:08:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HJ126Sz5Xldg; Mon, 30 Sep 2024 05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HH58Vmz4Xt7; Mon, 30 Sep 2024 05:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j4QWf/2xFxkIUGR/cdc/F2iZS+JbQWqRjGZSYtOtmFU=; b=EFwrKY3oNTq1JDJ0F39kpWITSQiGpvXAMcItzM/+fkHZ2j1bMphoyR4CqlzfCIWcTbKd1k QYzlkpsNBvVEQ9BU+N5p/rhIcQW+dHa7tVtjpml9cT+Zy7tlRWqbVFeLLvexcSZwrY3QKr AXj9RfwoJgUMsaLREqVycWRSy4/opSkGnDhL02xc1aOy9TMDp0QUE9t02x7Ds/KWGCHC2M 6QL7EBkH/qgQg4s6Nu14o31IFwYkR7Jb1vuFFIDAhP+Q+pcSRsbLauLPqGlsE0i/GbszBy 12vafFLV9bZl6o4bfY80EcHLR8XDkkFsExpJt5DRxBillc1M4RLFcgf/8288xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j4QWf/2xFxkIUGR/cdc/F2iZS+JbQWqRjGZSYtOtmFU=; b=JRohAicwiE3sK/GWDz8IICF745okZ+VWaWYW7DkRBmu++eeCD6RJcb0wK1XXjyvmDG8SG5 J0hgm0xn2MtQC/hqep9nipMoltkUG0XqrHcR6gFyFPGaTDURMLPMZ+CvINV9iCUzYNEYZc uxn2JrngFjEBhewXI8MBB1nkS9WOIb5qEsXOR61Ch7w23pdjWt1VEkWOIZc2vXhj+9Fwty GLzt+kw919Cdj+KqJWOFlhsSrQJf8htmmQtcE+SzG1/YCk9jEFAYo5zj/YH7012XJwCHyo AGdaAneUoM9ip/vS7jkq0lr0u2LPEZ/RGrw/cBW+B22U/yM7REApbH+9hqGYAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672923; a=rsa-sha256; cv=none; b=j4JxfkHh95i9uSf5kyDaSqVWEPr5sqAK/0hb35urAiPPtjmDrUyv0G0oqedolONEzd8/JM C15OosD8ZB1cr1ZiKZzPqSvwX41YMdoGKog6AEA+XuE0VIzo3vfLNNbPRW08/+OQDvrz+q 3rIGT/l60J/q1sycNjYv/mJ5F4OawnMN6P5a4OxO7qhB2kVBD4i/cgd6uNN8rjfO6xKsGo SFx0OJ18I4DnyXAG6cqrINSBt/x5N4vTOO06QjZcyW6p72y6SoPL16q+0+Pw4qjhKHCAN2 EFO7zrPi3YG9hfBCbhQ3j9foGoIceIJNoTMaV2bZJFc4WcaLsG5DLF5crZZRWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HH4jBZzgDT; Mon, 30 Sep 2024 05:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58hH8025911; Mon, 30 Sep 2024 05:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58hIN025908; Mon, 30 Sep 2024 05:08:43 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:43 GMT Message-Id: <202409300508.48U58hIN025908@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: 26e17489cd06 - stable/13 - ale(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 26e17489cd06ab1ab89d650b16ecffa95c270689 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=26e17489cd06ab1ab89d650b16ecffa95c270689 commit 26e17489cd06ab1ab89d650b16ecffa95c270689 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:35 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:41 +0000 ale(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit f5524be39e26e3d7fb774ffe7711602c676a8b9e) (cherry picked from commit 7ae70062241b063e076935a9b8955d27ea84a3b7) --- sys/dev/ale/if_ale.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index 535a129024d5..a04d9dc651d3 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -665,12 +665,6 @@ ale_attach(device_t dev) /* Create local taskq. */ sc->ale_tq = taskqueue_create_fast("ale_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->ale_tq); - if (sc->ale_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->ale_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->ale_dev)); From nobody Mon Sep 30 05:08:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HK1dsVz5XlvH; Mon, 30 Sep 2024 05:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HJ61ysz4Xmr; Mon, 30 Sep 2024 05: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=1727672924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIQ+Tuv4LX7RiZg38HD7kGWdhsZcLvi2QBSB3DtDxJk=; b=KEMTBG+g1rzUjQKsmCs+fbn71HL3fC5zJwox38GwFu8E8N6I3w33S5tvDhZIWLCye0w0Cw d6Zafl/BkH03E6a3SychJd3tZyGXFUSZBJ36+jGCFksj5gnI/eGRvkkgtjPDBh+JO+t5Ix GHHn0XnZjeMK76mhVg3gdOuJo4f66m0VFqQDHwHgxlQfDiBAMY6hR+ANy1z4fNhnkozdKo ly1wXT7g6JzJsgtIlZjuoTa6n1UwS2sOtdzduuOgc7ZOUGSSiH5Ad/KYphstJnw04M3RqO PXVhIePBvBwU3UaE+u4rNkVkBkPJoZcBnW2RjJkvZLxLGLqyHLSJoCMhHBoeng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIQ+Tuv4LX7RiZg38HD7kGWdhsZcLvi2QBSB3DtDxJk=; b=RNVa/0m0W8vvBNJwggzFGKXbAdr2QgQd9DksCdfdd8NkPhIjnF3x9R1V5xSI9Yk7WpY1nx LXdytO5C1P7ekgBbae6h8o9Pubxkkzb65+vJaiKTlmkL78A2Fkq1l9HWc4OfBfiwsLeLuF uN/rWEPIbWFi0/MxyQb2Gs+crhy/JcfN9efgYmqJZgmT+uIEHslIjRONkVhd0Ds0oaVjrN 23QyECl318iaZRokL9zZKxg+e4mzAR/UEKXvu6NgorbDGlANO22zpPlIyamKcfIx63cmG9 bsHGABqSXnquJI+EIym1w+YFZziunIcocW+mXURdnvybec2aGaCaZtKXx3O0sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672924; a=rsa-sha256; cv=none; b=O/CZ3GhMwnF5tTo6WK3uu8sQVaOGM5wSmesJjTSGsiTkHWpvWBfT/qpYBvBvD/bRG21uRV z00Ryzi4ZTlCdp+Pw/Rbx3HX+crJaH9vyJhCaaX8n7LOJtHM5++7OColYQwLfxEo21J7jN ABbM9knKy3kr6KmUW/3U/tHDUdK0jkG3P0Z4C8tmFS3+/PdjoP98Dtkgq5KwoZyctQ3vu6 PQOzxQHGEl9eZ1szi56QqgtV8h0XS9w/yJ5fGy86/v6x2A0qVkL9Nt7zEyknpcTbKE5b2B 27MvGSfdNz7DVqIpGHoWq2btFmwyBHBcamAdjjZh4fC6FJGfpyIbhLefoRuwmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HJ5dtxzgDV; Mon, 30 Sep 2024 05:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58igV025965; Mon, 30 Sep 2024 05:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58iCh025962; Mon, 30 Sep 2024 05:08:44 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:44 GMT Message-Id: <202409300508.48U58iCh025962@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: b620bc6e1dfa - stable/13 - axgbe: Stop checking for failures from taskqueue_create(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b620bc6e1dfad5c1838a3027cb902d64180bdd7a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b620bc6e1dfad5c1838a3027cb902d64180bdd7a commit b620bc6e1dfad5c1838a3027cb902d64180bdd7a Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:36 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:41 +0000 axgbe: Stop checking for failures from taskqueue_create(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit b29adaaf44f6cf9433c782bbeeefd12d74d395a5) (cherry picked from commit 39c35f6c5445d09b51a3fd366e8d64434b8fe7f1) --- sys/dev/axgbe/if_axgbe_pci.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index cd498bf1b5d7..679de1c6092a 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -540,11 +540,6 @@ axgbe_if_attach_pre(if_ctx_t ctx) /* create the workqueue */ pdata->dev_workqueue = taskqueue_create("axgbe", M_WAITOK, taskqueue_thread_enqueue, &pdata->dev_workqueue); - if (pdata->dev_workqueue == NULL) { - axgbe_error("Unable to allocate workqueue\n"); - ret = ENOMEM; - goto free_channels; - } ret = taskqueue_start_threads(&pdata->dev_workqueue, 1, PI_NET, "axgbe dev taskq"); if (ret) { @@ -560,8 +555,6 @@ axgbe_if_attach_pre(if_ctx_t ctx) free_task_queue: taskqueue_free(pdata->dev_workqueue); - -free_channels: axgbe_free_channels(sc); release_bus_resource: From nobody Mon Sep 30 05:08:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HL3hLvz5XlkD; Mon, 30 Sep 2024 05:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HL01ybz4Xn4; Mon, 30 Sep 2024 05:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XFDntZLmqBJBqRvBaRcJcnZMecw7cQ/pWwHjfyZUL1g=; b=kNNBG7dvitTyd1VyHp9ta+W2UWY3XkbNMCA6sqflyO7SbEIgg573oWqirD1OTaB56s9YPJ Gp/9EKQYolQV/ZzvubTqlzAwXsJqpi/lzsgSSNhIP3PNcsI+xlFWjg3A0gMITZ4H8Xze7X bqQyA+tuA6cuHjKufAiqZBj3TQm0MBqpNN7Ty1W54ISr0onn+M11O3bUSDkT5/Bzz2mJKe eH9zPdEa0O1Ny1glJdbm31UIrDYWkqf5brVv8h1yH6/hhGq5IHkRC+GP3B1WYebz2oYpMz 3U614Jrj9sJDca+rQEKNPiHcXHKNwnLe6idKQfksWRypf8Zq3PClg11R+fupWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XFDntZLmqBJBqRvBaRcJcnZMecw7cQ/pWwHjfyZUL1g=; b=SFfvq0QQ1ATNCLmnQX0vLogNmUFJigEDAbXhqGnGOBauvplbHToNz5jOtM7JO3ewXcYUxy n68P/3ZPjpqyFLmON39dNhjVUaiuUF8k1AlRMat9s1oPW/yeXF+UV7TyfKSbIO6eEQZGmP 7a85Hs2+EquKTyOeaaAgsBVi+DpIlYnL/RrcRvzldp4k6m2zVw6IIcZNJ5TLbR3QBTEg8v qU03PLMSG+3sI5CZoUZptH3QNgzrkC6kmFRKHauLQYI+m6CTc4GCEA/uiH8x2Kfbkbghnn DoBru8fawWSSCyQKft/hE520ZqUKUySNOe2aSYJPfMJhPhJb0KPo+mXfeIbnew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672926; a=rsa-sha256; cv=none; b=TxoNN4ddSS0jSIOhH/pE6Q0G1DJqmGMdKnpzUHxsDFTN8MKHsFsM7S009JTce6f5vVke6s K9jZlvPbw+zCHbdIBre8dqtvn/MW8UIksSh4ljbkMYzWG8/+TEvQBKIyqaQ2tXI9BR9TEa GRGAf1Pl/pHL+mxwx/uJOyGhi3tXkHeRENwnztsujDWqkEsRLHkHJXYew+Q9/4FXL5V5LI ILXQgIrNu4TS9cMkTJKhfrZR6FMUh2/Fzs6AyAKo4R34GmpiuGYn+VSMZvOzgD+uSOHL5g VJK2Riz7rBUWLgrZp+bsg6Oi9lMBTrK/MK1h9WglmIE1tppiH4qeMruSMzrS3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HK6lBRzg00; Mon, 30 Sep 2024 05:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58jXJ026013; Mon, 30 Sep 2024 05:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58jjZ026010; Mon, 30 Sep 2024 05:08:45 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:45 GMT Message-Id: <202409300508.48U58jjZ026010@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: 617dcd17a5c9 - stable/13 - bge(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 617dcd17a5c930702ceb28f32016bc3bf3494c93 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=617dcd17a5c930702ceb28f32016bc3bf3494c93 commit 617dcd17a5c930702ceb28f32016bc3bf3494c93 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:36 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:42 +0000 bge(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit d44bc2f07b971fe1f451a1fff0389650a2502422) (cherry picked from commit f5cbe8ce89f1332e1188b9b315bc2707f50ef3d6) --- sys/dev/bge/if_bge.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index dcd65f9348d6..91b33492b2d2 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -3897,12 +3897,6 @@ again: ~BGE_MSIMODE_ONE_SHOT_DISABLE); sc->bge_tq = taskqueue_create_fast("bge_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->bge_tq); - if (sc->bge_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENOMEM; - goto fail; - } error = taskqueue_start_threads(&sc->bge_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->bge_dev)); if (error != 0) { From nobody Mon Sep 30 05:08:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HM5Gn7z5Xlmv; Mon, 30 Sep 2024 05:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HM1Z6Kz4XrH; Mon, 30 Sep 2024 05:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZFvewP66HRiyknGDVdLgSYXVsLLWDBVAFaKxQVZ6B6M=; b=pbo3iQ/ra1H+dAJda3V8vi7suseMHcTg1CtXIzetgzQCTH+zEtGvChg0oxMnDfmC/qrNXE NQnI2HdfaojrSY0/NRprg2XA/p/xlvTHyOhxHeA7QjoTC4tuUJoQ+K5YGHIh4RUG2iwqNB C3ppx4cq1s+QCdrOSQvavlzAyASfKnzA9JD5g0dzO8kOUfVjA7fWjVHH6z//rVFLsr139U ZKZYc9ZKyWK2iMFcL4kY/zDadMGlS+wEaQ7XuNewgVd5s/lPAql0W3gR21X0jG8cts80W5 OwNNTDbJ1+bZPXJM4gZz0RXTBWpnJJlqty1EOwXn0W0LWxLjT2hOmHHegHZobw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZFvewP66HRiyknGDVdLgSYXVsLLWDBVAFaKxQVZ6B6M=; b=WjsOEI5ZWDrcsYPpPK2h6/b/t6EwAiPCpyd3tqBm9BuwuPaEOP7ivu2rJ3lwfKi7mjHEvO UwqlnqHEbe2MPAaUWpxB9njJ/5WaChgC8Vg6VlJoyx3FYi0KYj6oiANIU8GOipMFgAdP8c pClD+qrQP8J4FuV6bhvMzoKWCKscksAbu4ux8kdQL0Yx1KUU0sus89fCLu/5Hc/cgQEr3Q 4UpaY9Fx2jUGX57k6+2B/135s671X52X0bLFadS4+CBWPTc/mZHUe6Ngp2aD4at7AYNwXG Dqpb9A9AOIalozAv7fgl0dWP+7Tkkjk44f0drzxX/UjcDBZOwivg0guCnLszKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672927; a=rsa-sha256; cv=none; b=RL+AL4T+H5TtSFhw/+PwbtZeklnNm3QZXO+u4EXHwaCGdZKRJUsh4JlUCv3dWL3jZRqVgK pxLUjpH4tL2WnfackpaheJS1QurT3+kWBKMeLuGJFRROLJ6tBh4/wGm5Ho8MdtfqJ5iq+u WQdlLDj4wglJyiydqVhr+aMYDgGVe0w/2rFNYzDH5dTCPvQ5+wpDkn4FHsctJZIiIQuf3g fqlxkIa1i9wmFjThiY7Gs0kPAyjWOcscX6vnnxzc1kdup4dbrrOoaHpWtBlvJfWhi2pICa Wzz+ObU5PgbpPVFYR/4fF505TXm5mDu2UeCYtAW9a+CxZsc9EQLjIlmeRf5pjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HM0njNzfr1; Mon, 30 Sep 2024 05:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58lwV026061; Mon, 30 Sep 2024 05:08:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58lkT026058; Mon, 30 Sep 2024 05:08:47 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:47 GMT Message-Id: <202409300508.48U58lkT026058@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: 545f28e021eb - stable/13 - cas(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 545f28e021eb9cb65c6abf7f4221f78d017565e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=545f28e021eb9cb65c6abf7f4221f78d017565e4 commit 545f28e021eb9cb65c6abf7f4221f78d017565e4 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:42 +0000 cas(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit af28fc3c191cf572f7def767c60fff59d48947df) (cherry picked from commit e78770d62f8ad7e10f97defd3bb933623a3ded0c) --- sys/dev/cas/if_cas.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c index 79a577208a2f..8071635c20e0 100644 --- a/sys/dev/cas/if_cas.c +++ b/sys/dev/cas/if_cas.c @@ -210,11 +210,6 @@ cas_attach(struct cas_softc *sc) TASK_INIT(&sc->sc_tx_task, 1, cas_tx_task, ifp); sc->sc_tq = taskqueue_create_fast("cas_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->sc_tq); - if (sc->sc_tq == NULL) { - device_printf(sc->sc_dev, "could not create taskqueue\n"); - error = ENXIO; - goto fail_ifnet; - } error = taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->sc_dev)); if (error != 0) { @@ -467,7 +462,6 @@ cas_attach(struct cas_softc *sc) bus_dma_tag_destroy(sc->sc_pdmatag); fail_taskq: taskqueue_free(sc->sc_tq); - fail_ifnet: if_free(ifp); return (error); } From nobody Mon Sep 30 05:08:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HN4DQ6z5XlxR; Mon, 30 Sep 2024 05:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HN2YlRz4YCB; Mon, 30 Sep 2024 05:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djiH1Stk9dsKcg+MtORaXrbO4hCOVzy8mZnwD8aZn9c=; b=OHZdeuwgqvXpSbN5pdH9FVbI+ZbE0x23+diI+2HBRy8PybxwpvUkbT0a4n9CLtK2k7YNHA Ql+LxvLw95F8//zjUhDDW6oSNd79zfvHBk5QYpipLSEyH7QIme/a13F12Ae5+625bsVLTG CmiojQbehFgswRk6C5vcTtfu6bYD6oKjI1eRWve3pWjHwW89jSwOi9mpxVp4r1X2VzN23I tdODLEd5sbO4DiPvqZVgGsJ1IuvenINbisX535QRdC5JV8zHm9mrHmEPPefy0RW7b+auxN XYpnUGtIJ0Rryx9mXhPR9thqZ+4a/OiuiyVlXDlde106RNtwL4PmBFdyJ9iNiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djiH1Stk9dsKcg+MtORaXrbO4hCOVzy8mZnwD8aZn9c=; b=ATWBJ7sgBWsqb/5sM+YJUOzrMKfcvRtpaHnGDfyo5vsjNk9R403BUGeTG5dJ7UCckVuDwk SGXJSZoUME/eO1JF6PXTW9kXKn71PcNJgvo6S/U782HEZQJJ05Ufai7D8h0C2Wl8v4shiv +8HdUVkgzyM2HOBjHO/O1QGyF3cpim4IpwF5sss9FRx2YhXddoqQZFm5u3ytQjOJDN8cbe FGLH33NLmn3SZHCxcmhWvLlzxW0nDy4QAJvqLV+tw/YRAJSGkX0mevIBvAb+6aeZ7ETeMf 2JWBF7iQ29K1W1v1EtiuCkyevQbIwDFFCOiKGQFvV8iQKYhmzLSG/Oyhr8I63g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672928; a=rsa-sha256; cv=none; b=X6bmd4/dQZVBZ+0d7e2QFMGxw7QlI5xsVyvd1OCqK/enhLa68l7LHQoVyHQ8MNNqcETazX 0H5ct9eFVzjr/T6G1nSxHDlPqiEDKJJlwHoob10O/MO/dOY0RukQTqBVJeeRh4vi1uh+JA omLypLxVq/ThTFAmR/rKByt2GXfdvhRfQOTFBKjmoGHWmmQ0JMLbV9K3G8xfdU9x3G5m4K RBEi63v0cCm1V9pCXavWnCrQF6ImfWl3WbQUoDFiwuaFXbNXKSpdJRfxmlqKDmCB8joQjX K6PAbqINbnibWOMgUMO4Ysa6VvP+H6AWgwSEb9wUqe3rlydHlumAB6XGoFmCog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HN1zsDzgB1; Mon, 30 Sep 2024 05:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58mB9026109; Mon, 30 Sep 2024 05:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58m8d026106; Mon, 30 Sep 2024 05:08:48 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:48 GMT Message-Id: <202409300508.48U58m8d026106@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: 7b7353261e4e - stable/13 - jme(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b7353261e4eb0e118d9dea2fb7f260204b88aad Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7b7353261e4eb0e118d9dea2fb7f260204b88aad commit 7b7353261e4eb0e118d9dea2fb7f260204b88aad Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:43 +0000 jme(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 3fdef8e855027d5c9bec06e2a53e8f99f7d5694b) (cherry picked from commit 6b25a8f079586f8f3e4badaec402dae1ab39ddb5) --- sys/dev/jme/if_jme.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c index 03503da27e57..219ac675308d 100644 --- a/sys/dev/jme/if_jme.c +++ b/sys/dev/jme/if_jme.c @@ -882,12 +882,6 @@ jme_attach(device_t dev) /* Create local taskq. */ sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->jme_tq); - if (sc->jme_tq == NULL) { - device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); - error = ENXIO; - goto fail; - } taskqueue_start_threads(&sc->jme_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->jme_dev)); From nobody Mon Sep 30 05:08:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HQ07jcz5XlsK; Mon, 30 Sep 2024 05:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HP3ZSnz4Y08; Mon, 30 Sep 2024 05:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQzuqgjEwi4ZImrrMbdvKNjkMk+MLflnbYch0SsoNcQ=; b=ul7YhE96nbdjUAuX21VFs5k4YZgUB/leBPrNSqvbtwyCbouhPzpVvTAxPjiv/vFJXvw0bz 1L/ovqCtUsqBNlPppl7l9h1SnOBYh442CBjha5+u8HJ9zdo/iun5NLNxulQm/4cM42CDeo He8qDuzOcIJD7PxSDPJnb0JOwmC7f5IZBUbM+J/E/+HYBT87/2iR0cfXRMaL9JauO6Y41h ymKOxfDRd/xNePucPZg7682fz5zr1125jZ2DSmbUZnaW5+Ok2umsNM8wLKyLnY03VZk6uM kxYvCdLsqJ6ByXINyb9rKXi1hkVgbnO/MtCH71mDbkncqWphPCD/BoYkr6xwfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQzuqgjEwi4ZImrrMbdvKNjkMk+MLflnbYch0SsoNcQ=; b=JW7xDRtauBVBf+0RBeLyCWl4b0NU0R2v8/IhKTX/joGPK8MSGFZgE90itUklpghxK1vjLm eej1D6rSknjgR39wrZeR2FT5x7T8WaVMxQWkaIQydeiuWl6FAPoIwNMnY+nxIl6ZLVkEn/ KRBUP9bicJmXT4x8APYl9HdYWyBWYeu9jY/9XToFiJ6eJirRehRUk6ZTkAXAIeT1lXwGc7 ifF2iRWk68v4n8lmwGTbTnp9q/8ESXaY8QuJPwW1NVeLEOr6oIvwSesJmRZcr3Lcx4QLGI 2St/vRKYPAnosGm4nME2EiazNxbfp1yAkGqBHd4zVeYYX1odHCSlxMxZBTk4Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672929; a=rsa-sha256; cv=none; b=QZnq8CtC0JykDWILwT6U4AdF1v3hbexLCpU6P7NGuKqF9LB0iLkQvCaiYofgJ2/HoQJQXy KywjkhWhuksRmszAZz5CmFITurjFmEEOhpiu7faYWRPGhPisS0wom1n/7xlkxFqYhwxaSB xauTAKcJTXv/TWn97fDdXRFI9c6ZxKJiIz6QzD6NLJeJG341icOp/LGxoMif3+wSaEn+Mc /jfPGruLVyQjgBFRj9kPuqHusdYmdFrasJyGOwDRWdAZe5kC+tE96FzlEqIcsebzOkQxJg CGt9RUSe4tSNRz0jLTbZ0Ipyb6Ww+b09yy8noIkkULlpinyOIxzX5Pm7ClhwRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HP3B1lzgDW; Mon, 30 Sep 2024 05:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58nOx026157; Mon, 30 Sep 2024 05:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58nC3026154; Mon, 30 Sep 2024 05:08:49 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:49 GMT Message-Id: <202409300508.48U58nC3026154@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: 7000dd2e2912 - stable/13 - liquidio(4): Stop checking for failures from malloc/taskqueue_create/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7000dd2e2912c15209f7e60538f8e7ba8f525339 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7000dd2e2912c15209f7e60538f8e7ba8f525339 commit 7000dd2e2912c15209f7e60538f8e7ba8f525339 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:43 +0000 liquidio(4): Stop checking for failures from malloc/taskqueue_create/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 57cd8f27b727e7a87312f6f141cfa13807dc81a0) (cherry picked from commit 518e138448b46d57030b3e34962e69e6211c8e1b) --- sys/dev/liquidio/base/lio_request_manager.c | 9 --------- sys/dev/liquidio/base/lio_response_manager.c | 4 ---- sys/dev/liquidio/lio_main.c | 4 ---- sys/dev/liquidio/lio_sysctl.c | 3 --- 4 files changed, 20 deletions(-) diff --git a/sys/dev/liquidio/base/lio_request_manager.c b/sys/dev/liquidio/base/lio_request_manager.c index 75dabf4839a7..fedf0ee17893 100644 --- a/sys/dev/liquidio/base/lio_request_manager.c +++ b/sys/dev/liquidio/base/lio_request_manager.c @@ -159,11 +159,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq, db_tq = &oct->check_db_tq[iq_no]; db_tq->tq = taskqueue_create("lio_check_db_timeout", M_WAITOK, taskqueue_thread_enqueue, &db_tq->tq); - if (db_tq->tq == NULL) { - lio_dev_err(oct, "check db wq create failed for iq %d\n", - iq_no); - return (1); - } TIMEOUT_TASK_INIT(db_tq->tq, &db_tq->work, 0, lio_check_db_timeout, (void *)db_tq); @@ -179,10 +174,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq, oct->instr_queue[iq_no]->br = buf_ring_alloc(LIO_BR_SIZE, M_DEVBUF, M_WAITOK, &oct->instr_queue[iq_no]->enq_lock); - if (oct->instr_queue[iq_no]->br == NULL) { - lio_dev_err(oct, "Critical Failure setting up buf ring\n"); - return (1); - } return (0); } diff --git a/sys/dev/liquidio/base/lio_response_manager.c b/sys/dev/liquidio/base/lio_response_manager.c index 12a3ad60521e..ac5fc6229885 100644 --- a/sys/dev/liquidio/base/lio_response_manager.c +++ b/sys/dev/liquidio/base/lio_response_manager.c @@ -59,10 +59,6 @@ lio_setup_response_list(struct octeon_device *oct) ctq = &oct->dma_comp_tq; ctq->tq = taskqueue_create("lio_dma_comp", M_WAITOK, taskqueue_thread_enqueue, &ctq->tq); - if (ctq->tq == NULL) { - lio_dev_err(oct, "failed to create wq thread\n"); - return (-ENOMEM); - } TIMEOUT_TASK_INIT(ctq->tq, &ctq->work, 0, lio_poll_req_completion, (void *)ctq); diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index 54878bc6a12c..9b990282d7f5 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -1863,10 +1863,6 @@ lio_setup_rx_oom_poll_fn(struct ifnet *ifp) rx_status_tq->tq = taskqueue_create("lio_rx_oom_status", M_WAITOK, taskqueue_thread_enqueue, &rx_status_tq->tq); - if (rx_status_tq->tq == NULL) { - lio_dev_err(oct, "unable to create lio rx oom status tq\n"); - return (-1); - } TIMEOUT_TASK_INIT(rx_status_tq->tq, &rx_status_tq->work, 0, lio_poll_check_rx_oom_status, (void *)rx_status_tq); diff --git a/sys/dev/liquidio/lio_sysctl.c b/sys/dev/liquidio/lio_sysctl.c index e9ad95772164..5228077b8af8 100644 --- a/sys/dev/liquidio/lio_sysctl.c +++ b/sys/dev/liquidio/lio_sysctl.c @@ -744,9 +744,6 @@ lio_get_regs(SYSCTL_HANDLER_ARGS) regbuf = malloc(sizeof(char) * LIO_REGDUMP_LEN_XXXX, M_DEVBUF, M_WAITOK | M_ZERO); - if (regbuf == NULL) - return (error); - switch (oct->chip_id) { case LIO_CN23XX_PF_VID: len += lio_cn23xx_pf_read_csr_reg(regbuf, oct); From nobody Mon Sep 30 05:08:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8HR16m8z5Xln4; Mon, 30 Sep 2024 05:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8HQ5tVLz4YFm; Mon, 30 Sep 2024 05:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtEFra1kB6R/JxHFtfLczwjt0D/Ji9f6Vo1qgSy0Xug=; b=XoBKkMMAnPdH7EvOpD3pzjEKoy71xZ7svlZDz+X6oKMvf1ABLZDg4x7stC9C/j8Ico+HC1 lzHPpsL6IbpDyQkXKuFrr1swjHP7HZMQ70W2PmM1h2CZBmyaKX5c1bYe4x5dW6MmHNHAMo gNVkt9Ui3uAMnmQpvDQ1fz9vmr197P9iTnGbJ4VE5HpiYdnRSsmk51bk9eSZP2EBMVEg3P G9d/zFtwnJphBxUZLR8a9WFTrgFNftRaOOnsluL6e+g3bH7ai/zdg1NX2KQwap+DETGtye qOpYyhrI/hh61VV6wpHr4ib/KtH9vehkRxDtcwL3yLHApoCIWkB0yqNMKZbckw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtEFra1kB6R/JxHFtfLczwjt0D/Ji9f6Vo1qgSy0Xug=; b=UGdAjqEqsyOlV15/mxbHq2NQTCcJjTyycfJaczpOoKo+L1zmwCdGGjRMmHlYOtGB6HWIRv ekF/fIj4x52RxHjCQzSE8FMvpeWhPDKM2rm9rIltbQ+PZECepYkItcHxyT2iCIbOwTCwni rUFDSHITr8sfNH5TK+vpIvKiqvk+6nr0MLC6Rgr37OCv6Xm4/+MF2Y7CxZbapvQH26try3 +B3vugGNnSrOqdhnvfvulrkjWKT4eIlDjsIGoFQ14JktJTXAeHWnNi7ZAwH1ERNjstdrF2 3zx/fe5/i1xGJ1sMTPcTB5MmLAQD3PVj9kIQqXAUgj+/kFBN7gI9VcYPFM4pwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672930; a=rsa-sha256; cv=none; b=hDhaDA4c5LwnaY23IrbnNdQSLShwyiWFkABuDlYy7elmKr8Lu+F3O/8rqchLdaxuMbKjLW 73xEENr/2nKDdhkyvN3Jfg1QGVeOTyw389p8hiuKikgNAZlBVKLLHUaW9KWWD1oQfzbSdT 3fi5Jj3lhMvFYw5qR22WzY1qbOU6n9mMu37Ow0Ynw0+RI8hnFhfNRo1bNMcrUSPXylbLoa EzNS/jfmr3/4AAY7FzhtO2Md1UJH9BgVcGLtCmsWSsRTWqBQyS1wLZhQgvDfAOmwwoQNsm oBy7IHelEvi9oAcbse2afNpNZLzo4fDyqWWr5Ns2EJGJ9CdLQfk1IW2HShjWvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8HQ4Q7Pzg8D; Mon, 30 Sep 2024 05:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U58ou6026211; Mon, 30 Sep 2024 05:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58o1n026208; Mon, 30 Sep 2024 05:08:50 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:50 GMT Message-Id: <202409300508.48U58o1n026208@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: 1290de0d5400 - stable/13 - mxge(4): Stop checking for failures from taskqueue_create(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1290de0d5400dd21930de0e1e022fc22fffecc1c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1290de0d5400dd21930de0e1e022fc22fffecc1c commit 1290de0d5400dd21930de0e1e022fc22fffecc1c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:43 +0000 mxge(4): Stop checking for failures from taskqueue_create(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45853 (cherry picked from commit 7ea3fd3bb5f4039c372fd72aeef004fe12454537) (cherry picked from commit 70280bc71d28935346f7cc7c41ddd99e58b9604a) --- sys/dev/mxge/if_mxge.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c index 440265762e7a..8e136470cdb1 100644 --- a/sys/dev/mxge/if_mxge.c +++ b/sys/dev/mxge/if_mxge.c @@ -4757,10 +4757,6 @@ mxge_attach(device_t dev) TASK_INIT(&sc->watchdog_task, 1, mxge_watchdog_task, sc); sc->tq = taskqueue_create("mxge_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->tq); - if (sc->tq == NULL) { - err = ENOMEM; - goto abort_with_nothing; - } err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, /* alignment */ @@ -4965,7 +4961,6 @@ abort_with_tq: taskqueue_free(sc->tq); sc->tq = NULL; } -abort_with_nothing: return err; } From nobody Mon Sep 30 05:09:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH8J23D0Jz5XlyJ; Mon, 30 Sep 2024 05:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8J22Wddz4Z56; Mon, 30 Sep 2024 05:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWGvrOzBM/rJwTNYwYEPw2/sfF3MaDmuKHAWPlO+W4g=; b=PrFRY9tyJBDULe19rhHPUwv+jGWCcvA/t0QGXEdOcPFnjQ6QupAkMJsOqXmc6j0bsYo5u3 xL9W0llX5vTJBj2t+xzSI/zVslvDg/+lGCyzV5LbP8F5rzCZxqydjnAYPfqtL7HFtXsH39 NWg4j3ZeAbQec0Ql4vzYov2NeZB24EZdeL076q/tOggnavos1bPBOskG1nSp51xI5rAylV 4+IDo/1EaJ6HV4XZ3LwXPryoFSBnbFzlKmu51ePgf6ABvBpQVlPwSTaHSfYB2QZk+KaYqs f3zBllU8RaW6QqTN9QaT6Cv1T8JW0yceM/Ql3J1pkPcmIQRS3K72TWvgNT9vGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWGvrOzBM/rJwTNYwYEPw2/sfF3MaDmuKHAWPlO+W4g=; b=FQLA+mcasiLDUs1aRnoBvf6ON1NG3pyy/QHAfM9VEECUxfllHDPMgCDjoC0WY3vX7f+vir BpzACGu6rcew+YZNIjv70FCTy7+okW9nHic/1M2j2/7OnNPgc0PyuGiMsjI8XlbDSdFSVe 0UrGvzkdv34sUQLvTKSDl0/tIUqetz3lD7xtlrsR3A6CIw2Q+wUkeQXJl4BxeJhYB8rGsS dkkyOdDKjYoAAMaEYfw3/I+SImajaEvsHEv/l2waS5ymyHTUV9JR9DDQ94r7rdDYSj5yU8 qo7920nbvNpWmNuXZSIflXo0YbUwA31duYLxWa0ZV2nzWAOP+gujCt0JPtG4Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672962; a=rsa-sha256; cv=none; b=niUPS7XGVFeUe1oN78X9frwwCdHzMO4pVjmI7dcnDqB4jcsN7huMiHH/r+608yGoGttzZd dmpjq9OOuWI901zSyyK5GR3t3XPbqh7oZWkFg+yMmrGCFDD5+77Gwsv4Cz1VthXh0ctAop PBkm7za9Qu2JSkgFf3oOk+rD2VUxGhhY+1EOa+C0YQrizq+sfBIx1HIC31IsAiaAgDcGP2 7ZSyyZQ6051f7Iq9GV6j98K4xGc27wXKlVWKpiymR3wctMTTeq75Yx5QI/lLHdtcgG/WMm zK4CQ6tLcWp5yYFsSL9e62q7U0m9xhNSG5u2e/MIc5DcnRkyIDWWHnCn+Jev6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH8J21FfGzftg; Mon, 30 Sep 2024 05:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U59MxQ026638; Mon, 30 Sep 2024 05:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U59MTh026635; Mon, 30 Sep 2024 05:09:22 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:09:22 GMT Message-Id: <202409300509.48U59MTh026635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: aad507854efd - main - Fix the cross-build after recent commits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aad507854efd13c4387394e88d5667cc6f060933 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aad507854efd13c4387394e88d5667cc6f060933 commit aad507854efd13c4387394e88d5667cc6f060933 Author: Kyle Evans AuthorDate: 2024-09-30 04:54:32 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 05:08:49 +0000 Fix the cross-build after recent commits - Provide a sys/md4.h in the cross-build environment to fix bootstrap of libmd. - flua now exposes WTRAPPED which isn't incredibly common- make it conditional, we probably won't be using it in any bootstrap context any time soon. Fixes: 442e0975ee4b3 ("Consolidate md4 implementations written in C") Fixes: c2caf3b3313fe ("flua: posix: add more useful functions [...]") --- libexec/flua/modules/lposix.c | 2 + tools/build/cross-build/include/common/sys/md4.h | 91 ++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index 9ca57d409d10..77e152754b8c 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -529,7 +529,9 @@ luaopen_posix_sys_wait(lua_State *L) lua_pushflag(L, WCONTINUED); lua_pushflag(L, WSTOPPED); +#ifdef WTRAPPED lua_pushflag(L, WTRAPPED); +#endif lua_pushflag(L, WEXITED); lua_pushflag(L, WNOWAIT); #undef lua_pushflag diff --git a/tools/build/cross-build/include/common/sys/md4.h b/tools/build/cross-build/include/common/sys/md4.h new file mode 100644 index 000000000000..e00675e9f462 --- /dev/null +++ b/tools/build/cross-build/include/common/sys/md4.h @@ -0,0 +1,91 @@ +/* MD4.H - header file for MD4C.C + */ + +/*- + SPDX-License-Identifier: RSA-MD + + Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + rights reserved. + + License to copy and use this software is granted provided that it + is identified as the "RSA Data Security, Inc. MD4 Message-Digest + Algorithm" in all material mentioning or referencing this software + or this function. + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD4 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. + + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" + without express or implied warranty of any kind. + + These notices must be retained in any copies of any part of this + documentation and/or software. + */ + +#ifndef _SYS_MD4_H_ +#define _SYS_MD4_H_ +/* MD4 context. */ +typedef struct MD4Context { + u_int32_t state[4]; /* state (ABCD) */ + u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ + unsigned char buffer[64]; /* input buffer */ +} MD4_CTX; + +#include + +#ifndef _KERNEL + +/* Ensure libmd symbols do not clash with libcrypto */ + +#ifndef MD4Init +#define MD4Init _libmd_MD4Init +#endif +#ifndef MD4Update +#define MD4Update _libmd_MD4Update +#endif +#ifndef MD4Pad +#define MD4Pad _libmd_MD4Pad +#endif +#ifndef MD4Final +#define MD4Final _libmd_MD4Final +#endif +#ifndef MD4End +#define MD4End _libmd_MD4End +#endif +#ifndef MD4Fd +#define MD4Fd _libmd_MD4Fd +#endif +#ifndef MD4FdChunk +#define MD4FdChunk _libmd_MD4FdChunk +#endif +#ifndef MD4File +#define MD4File _libmd_MD4File +#endif +#ifndef MD4FileChunk +#define MD4FileChunk _libmd_MD4FileChunk +#endif +#ifndef MD4Data +#define MD4Data _libmd_MD4Data +#endif + +#endif + +__BEGIN_DECLS +void MD4Init(MD4_CTX *); +void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); +void MD4Pad(MD4_CTX *); +void MD4Final(unsigned char [__min_size(16)], MD4_CTX *); +#ifndef _KERNEL +char * MD4End(MD4_CTX *, char *); +char * MD4Fd(int, char *); +char * MD4FdChunk(int, char *, off_t, off_t); +char * MD4File(const char *, char *); +char * MD4FileChunk(const char *, char *, off_t, off_t); +char * MD4Data(const void *, unsigned int, char *); +#endif +__END_DECLS + +#endif /* _SYS_MD4_H_ */ From nobody Mon Sep 30 06:33:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHB976Lqrz5XrJf; Mon, 30 Sep 2024 06:33:31 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-ua1-f43.google.com (mail-ua1-f43.google.com [209.85.222.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHB963mdXz4tJp; Mon, 30 Sep 2024 06:33:30 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of antoine.brodin.freebsd@gmail.com designates 209.85.222.43 as permitted sender) smtp.mailfrom=antoine.brodin.freebsd@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-ua1-f43.google.com with SMTP id a1e0cc1a2514c-84e9edc17beso1010328241.0; Sun, 29 Sep 2024 23:33:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727678009; x=1728282809; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7EmrDi0gRYOCGnIoV4EuOpTZRk2lUjqai8qASGdp1CE=; b=faOaHN6bv9nipXc0z2rh166g8L81KEwQ1hnoT31Z/UoTVS5V2VshADDMybFRXN/YP3 bNCzslQX7OFxeMipOeFpygiL2EdgUXa4JT0D+x6h/B63lSbALXQN0aTK23qiift3iiE8 SY8NxvtbEmb071572GxPrJns33euIGM/qbTHsAHl3EGT/bpWefJ+30P1P2jtwM5iDg37 Y7mM5xBtrS3kAc3k1pjh5xKpbAkcubA7TomvECBlBCRriscR1jC+dT7gQRyktqDlT1FM 2NdheOizmEq9Xoq9jI+yN9tF/nUgrWfqWmKUDDe+l+mmvmriGuMZYpd9bYOWIn3cB8Tz 2Chg== X-Forwarded-Encrypted: i=1; AJvYcCW8Tk97rxKE53uKEHJGVh7IcJ17uidJP4mSOepMxvmbKcad6jfcgxQcySiJkuP1RCqCoItWrYQByZspdxjd40rCV0zGQC8=@freebsd.org, AJvYcCWUGGDciUh1mNmmx/aIHSugzqqmA2LvtasssNSbI8oU4bz9ovWZWx3LrpDtz30ImuVKy6mxmv3pbrtl1Dgtn0k7he9d@freebsd.org X-Gm-Message-State: AOJu0YxIwbuZCJRr4XkiCpUggZ7J1wkg/T37upPkNGaD1tEtvhf9ywC0 xDPeEXg0DUzn6D60PnFpYopzYO9TJ4aw/pQCh7Ffr3D5smMWz4zVj6MGTXNohK+Zxchqw472d3v ua2bCwQeTA7mCtYf8ATBjiZsKoA9oDPrp X-Google-Smtp-Source: AGHT+IFSQNwOwqsS8R1PM9GD4lAi04O2YUIE42amJQCP53rZcugxsngE2p08HXu5IsXQSLOSYmv+E8OH2bukfiZ3tLc= X-Received: by 2002:a05:6122:923:b0:4ed:185:258c with SMTP id 71dfb90a1353d-507816b475dmr5786432e0c.2.1727678009253; Sun, 29 Sep 2024 23:33:29 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202409271933.48RJX0dH066668@gitrepo.freebsd.org> In-Reply-To: <202409271933.48RJX0dH066668@gitrepo.freebsd.org> From: Antoine Brodin Date: Mon, 30 Sep 2024 08:33:18 +0200 Message-ID: Subject: Re: git: 1235d276b78a - main - lib{c,sys}: stop exposing errno symbol To: Brooks Davis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.77 / 15.00]; NEURAL_HAM_SHORT(-0.98)[-0.982]; NEURAL_HAM_LONG(-0.98)[-0.978]; NEURAL_HAM_MEDIUM(-0.91)[-0.909]; FORGED_SENDER(0.30)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ARC_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.222.43:from]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.222.43:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4XHB963mdXz4tJp X-Spamd-Bar: -- On Fri, Sep 27, 2024 at 9:33=E2=80=AFPM Brooks Davis w= rote: > > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D1235d276b78a769bded01d51c9= bf3cdc480db9fb > > commit 1235d276b78a769bded01d51c9bf3cdc480db9fb > Author: Brooks Davis > AuthorDate: 2024-09-27 19:27:46 +0000 > Commit: Brooks Davis > CommitDate: 2024-09-27 19:27:46 +0000 > > lib{c,sys}: stop exposing errno symbol > > Officially since C11 (and in reality FreeBSD since 3.0 with commit > 1b46cb523df3) errno has been defined to be a macro. Rename the symbo= l > to __libsys_errno and move it to FBSDprivate_1.0 and confine it entie= rly > to libsys for use by libthr. Add a FBSD_1.0 compat symbol for existi= ng > binaries that were incorrectly linked to the errno symbol during > libc.so.7's lifetime. > > This deliberately breaks linking software that directly links to errn= o. > Such software is broken and will fail in surprising ways if it become= s > threaded (e.g., if it triggers loading of a pam or nss module that > uses threads.) > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D46780 > --- > lib/libsys/Makefile | 2 ++ > lib/libsys/Symbol.map | 1 + > lib/libsys/Symbol.sys.map | 1 - > lib/libsys/__error.c | 10 +++++----- > lib/libthr/sys/thr_error.c | 5 ++--- > lib/libthr/thread/thr_rtld.c | 7 +++---- > 6 files changed, 13 insertions(+), 13 deletions(-) Hello, This breaks some ports: https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/cdb-0.75.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/checkpassword-0.90.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/clockspeed-0.62_6.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/copytape-1.0_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/daemontools-0.76_19.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/dot-forward-0.71_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/faces-1.7.7_13.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/fastforward-0.51_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/gkermit-1.0_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/ja-edict-19990714_6.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/ja-mh-6.8.4.j3.05_7.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/mess822-0.58_3.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/mpeg_encode-1.5b.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/pbasic-2.1_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/qlogtools-3.1_4.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/qmail-contrib-0.1_3.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/qmail-dk-0.54_2.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/qmail-rblchk-2.4.1_2.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/qmailanalog-0.70_4.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/queue-fix-1.4_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/serialmail-0.75_4.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/sliderule-1.0_11.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/socket-1.2_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/viz-1.1.1_2.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/xml-format-0.2_1.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/xspread-3.1.1c_5.log https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/20= 24-09-27_21h05m12s/logs/errors/xtrojka-1.2.3_4.log Cheers, Antoine From nobody Mon Sep 30 09:06:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHFYT4NF5z5Y1XZ; Mon, 30 Sep 2024 09:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHFYT30Zrz55xc; Mon, 30 Sep 2024 09:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727687181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYxHhMKzan0H+towtMBFJgoEBUwaBi+E0S6QW7Jl6E8=; b=Lcn3DW18FyvUidcb5T4RhyhVre1AHEk2Fs4X6yrpel3axdYFU1lT4SF9zV5d/5ci/dhFsH JAhfJQqr3pcNsRC0ZfQgtKFT1OC3O7zzGGBMpTdjWog9Gl2offJIKL5HKACc2x1Y5AsMs8 cV0LLtLUUw1LajHdppd7cOgpzLk+w2BECtdPA8YLmmIea7KB30amE9iGmzjv/tnZoyDwx4 6BCztjIy7WdvAU4Jg19gNrNuc634kPdKxPPf379UHDEBmJ+uCjcMny+3lM8BP70fCpQW0u A2+A2ZY9AJFDL5jSbz2/BMX1GuYrNHzHzlbB3cOyd30cJQP3vi7kcTXI/VCwVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727687181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYxHhMKzan0H+towtMBFJgoEBUwaBi+E0S6QW7Jl6E8=; b=EaYZbtbRWGiISS0Jo+UZ1QkgcZUOCxLUCy1IEKNjjpk6VUYlxvAgIGL3jcazoBwmYSR9NL NIDFSjYnzt78chhJWXCY4UslC61TS6sO8Zp0ICfvpf3JYdLHpPuTF3TpoxBMqZOpl847Av jaL5WlIilOXXhIghm+4qcrKRJJbHrc7086zLOHL10lpyYrbHjOyjsTNna1Jla2S2VBCGu7 0XiNfscMI6+0CfHQVhgPhDDH+iM9YLgcS+8bCmZxAwVkuqvtLfm+tyK+/lwc1foDkRbuTf zXEjXE/EtAdFGPmF4tJKSiOj+hGE3WXsKOd42We2YadSYz4YrN7kYkWhWfsAfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727687181; a=rsa-sha256; cv=none; b=vKKWzk0YTo5K9OoPrI4xpAn7a8sekQywLD9VSqEE7LRs3IcW4TxG7OoetpGrWEOPaTxTMg f4ygdSoKT1z2QrEtY9+1LiJ9FIBDGzW+ywfW1LkjHGoJ5PVOTWen2EF0vkJf65zQD4WtD7 gje1u1lF8zfRMj/Y7hHi/gpT0XqxTl1kIg6IqTkherN4jtHsjGcG6I7TUIBsGzptAVbMN+ ZUS7u8I+4WLOHlZuIeXz9yD/hyYLkaBjPa3ip7qJW/Kq6oYUmrw6acMzq86jfcbyVH0z3q NC10i44ba82505q9o9Y0XNrblTJS8+qaILnA/ZRutYLXP2HbfJecFctBr0cHOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHFYT284XznDW; Mon, 30 Sep 2024 09:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U96LB0031584; Mon, 30 Sep 2024 09:06:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U96L0u031581; Mon, 30 Sep 2024 09:06:21 GMT (envelope-from git) Date: Mon, 30 Sep 2024 09:06:21 GMT Message-Id: <202409300906.48U96L0u031581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3ec4fbdd98f2 - main - pf tests: Add test for max-src-states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ec4fbdd98f21463c8d12f1468a07f45100680cf Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3ec4fbdd98f21463c8d12f1468a07f45100680cf commit 3ec4fbdd98f21463c8d12f1468a07f45100680cf Author: Kajetan Staszkiewicz AuthorDate: 2024-09-28 21:24:47 +0000 Commit: Kristof Provost CommitDate: 2024-09-30 07:48:40 +0000 pf tests: Add test for max-src-states Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46840 --- tests/sys/netpfil/pf/src_track.sh | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/sys/netpfil/pf/src_track.sh b/tests/sys/netpfil/pf/src_track.sh index eb053dd84a90..2038393a240e 100755 --- a/tests/sys/netpfil/pf/src_track.sh +++ b/tests/sys/netpfil/pf/src_track.sh @@ -120,8 +120,74 @@ max_src_conn_rule_cleanup() pft_cleanup } +max_src_states_rule_head() +{ + atf_set descr 'Max states per source per rule' + atf_set require.user root +} + +max_src_states_rule_body() +{ + setup_router_server_ipv6 + + # Clients will connect from another network behind the router. + # This allows for using multiple source addresses and for tester jail + # to not respond with RST packets for SYN+ACKs. + jexec router route add -6 2001:db8:44::0/64 2001:db8:42::2 + jexec server route add -6 2001:db8:44::0/64 2001:db8:43::1 + + pft_set_rules router \ + "block" \ + "pass inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in on ${epair_tester}b inet6 proto tcp from port 4210:4219 keep state (max-src-states 3 source-track rule) label rule_A" \ + "pass in on ${epair_tester}b inet6 proto tcp from port 4220:4229 keep state (max-src-states 3 source-track rule) label rule_B" \ + "pass out on ${epair_server}a keep state" + + # The option max-src-states prevents even the initial SYN packet going + # through. It's enough that we check ping_server_check_reply, no need to + # bother checking created states. + + # 2 connections from host ::1 matching rule_A will be allowed, 1 will fail to create a state. + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4211 --fromaddr 2001:db8:44::1 + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4212 --fromaddr 2001:db8:44::1 + ping_server_check_reply exit:1 --ping-type=tcp3way --send-sport=4213 --fromaddr 2001:db8:44::1 + + # 2 connections from host ::1 matching rule_B will be allowed, 1 will fail to create a state. + # Limits from rule_A don't interfere with rule_B. + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4221 --fromaddr 2001:db8:44::1 + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4222 --fromaddr 2001:db8:44::1 + ping_server_check_reply exit:1 --ping-type=tcp3way --send-sport=4223 --fromaddr 2001:db8:44::1 + + # 2 connections from host ::2 matching rule_B will be allowed, 1 will fail to create a state. + # Limits for host ::1 will not interfere with host ::2. + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4224 --fromaddr 2001:db8:44::2 + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4225 --fromaddr 2001:db8:44::2 + ping_server_check_reply exit:1 --ping-type=tcp3way --send-sport=4226 --fromaddr 2001:db8:44::2 + + # We will check the resulting source nodes, though. + # Order of source nodes in output is not guaranteed, find each one separately. + nodes=$(mktemp) || exit 1 + jexec router pfctl -qvsS > $nodes + for node_regexp in \ + '2001:db8:44::1 -> :: \( states 2, connections 2, rate [0-9/\.]+s \)\s+age [0-9:]+, 6 pkts, [0-9]+ bytes, filter rule 3' \ + '2001:db8:44::1 -> :: \( states 2, connections 2, rate [0-9/\.]+s \)\s+age [0-9:]+, 6 pkts, [0-9]+ bytes, filter rule 4' \ + '2001:db8:44::2 -> :: \( states 2, connections 2, rate [0-9/\.]+s \)\s+age [0-9:]+, 6 pkts, [0-9]+ bytes, filter rule 4' \ + ; do + cat $nodes | tr '\n' ' ' | grep -qE "$node_regexp" || atf_fail "Source nodes not matching expected output" + done + + # Check if limit counters have been properly set. + jexec router pfctl -qvvsi | grep -qE 'max-src-states\s+3\s+' || atf_fail "max-src-states not set to 3" +} + +max_src_states_rule_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "source_track" atf_add_test_case "max_src_conn_rule" + atf_add_test_case "max_src_states_rule" } From nobody Mon Sep 30 10:57:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHJ1R0qjVz5Y6xw; Mon, 30 Sep 2024 10:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHJ1R04v2z40YG; Mon, 30 Sep 2024 10:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727693835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1POTjNReMUbvIHjlDEMp7xXCd4TZE+nSRH0JSfwO+ns=; b=NELVr6Ka76TliraHKy9zecnxF7H7srcg46qNsiQT1eUi/qr9TZmnkWaTWKWhJ+vwfC41AR 3sF4NUrr9onJ8kotCNGf+9ypWxCN5LXqfIasUf1q5oT/CzxqLSREbZQfGX5nqyyaTR93WB MzYuNdjxW+Zf6KlBZroWLLS7V3Fi/sE8ORoYV0+PS0JTSfinI3kqRP7ANAfa724FrMqXqw bf5JYDwgd+uPbxXfwL5Qo/67tngX6u2Qs8zyIuX+4G9ehLoWHIlgYhYCx7ZND4F766Ci/D Vg8FeSH5/a4MoEJnQKSCixza0xlowO0XRpajzLngVRt8/m4oSB3wAqiSrjac7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727693835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1POTjNReMUbvIHjlDEMp7xXCd4TZE+nSRH0JSfwO+ns=; b=nKt1vrG8bkoUA8gWHueaed864VOCWE2aokOK6xk8/X2pEz7WSPdJLbcny8v6e/8K2QJIfw +RcnV2K0x1ldV82aNnMxd3SZbnwuHMoYxqBWtr7ll1rvGLzsXkASZM/nrkV7h1+bRJUhb8 D3Uy98oSbgRHH2DgN9FOLgt3KjY2IZ5I/BlTallF/kkdUEC3lXMTMtbdMH5lSTdP4jpBUc Ynl7gb1eWaaBsZP994M0KUsUv7d41ndQUlKW9o2KaR63IJJ8OdIqkTx2yoF8h9ep5eoUNd UxuRLUd2q2mnjOpBvVZorCvEZ0xDonad3uA0vCnwgCa0JH2GnhmBiH+tpv8P+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727693835; a=rsa-sha256; cv=none; b=Qit2Wq2HKxxqTiN1KKUM7nW6ssxAdrOX1hOUDhiL7xq8bZacvnXWKILVB+xU0qKJtRFnP1 dDWAd58Nj4XNNLJBx6AUlTEQm/YYuzZPGek7I/Hq7gnhWonWYfWBVqFwjFQ7ZkbimYgvBa tgFze8hQnTgqaZB3wmPKXbh0vwZfKtrAuvX6/Ui09OJxyVALAXcSL341uTY0gjYoCFI81V OP8PauKI94nTWomNum2nUQ9w0YqwkNvF/nhFzii1VRy++torZ3cWtXBXScN9JEBbGYkxtD NcQ8RcuuyfGaruX0y5UdNtajokp+DoaGQmJEEwzRouypcS9zTegoBNQRtP7sFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHJ1Q6nyZzqdv; Mon, 30 Sep 2024 10:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UAvEFo017285; Mon, 30 Sep 2024 10:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UAvEQe017282; Mon, 30 Sep 2024 10:57:14 GMT (envelope-from git) Date: Mon, 30 Sep 2024 10:57:14 GMT Message-Id: <202409301057.48UAvEQe017282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 8e3d252901e8 - main - pf: Split pf_map_addr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e3d252901e8e99cbaa2e09e7219e96c8daaa3fe Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e3d252901e8e99cbaa2e09e7219e96c8daaa3fe commit 8e3d252901e8e99cbaa2e09e7219e96c8daaa3fe Author: Kajetan Staszkiewicz AuthorDate: 2024-09-30 09:15:40 +0000 Commit: Kristof Provost CommitDate: 2024-09-30 09:16:24 +0000 pf: Split pf_map_addr() Split pf_map_addr() into 2 functions: - pf_map_addr() handles just the address mapping algorithms, it is used in pf_route() and pf_route6() in case of stateless route-to, where source nodes would never be created - pf_map_addr_sn() handles source nodes and calls pf_map_addr() for address mapping algorightms, it is used everywhere else, like NAT rules, which are always stateful Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46776 --- sys/net/pfvar.h | 3 ++ sys/netpfil/pf/pf.c | 8 ++-- sys/netpfil/pf/pf_lb.c | 109 ++++++++++++++++++++++++++++++------------------- 3 files changed, 72 insertions(+), 48 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 3afbabf30d4d..dfc42c16547f 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2618,6 +2618,9 @@ int pf_step_out_of_keth_anchor(struct pf_keth_anchor_stackframe *, int *); u_short pf_map_addr(u_int8_t, struct pf_krule *, + struct pf_addr *, struct pf_addr *, + struct pfi_kkif **nkif, struct pf_addr *); +u_short pf_map_addr_sn(u_int8_t, struct pf_krule *, struct pf_addr *, struct pf_addr *, struct pfi_kkif **nkif, struct pf_addr *, struct pf_ksrc_node **); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1634c856f51f..19e0014ce4eb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5451,7 +5451,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (r->rt) { /* pf_map_addr increases the reason counters */ - if ((reason = pf_map_addr(pd->af, r, pd->src, &s->rt_addr, + if ((reason = pf_map_addr_sn(pd->af, r, pd->src, &s->rt_addr, &s->rt_kif, NULL, &sn)) != 0) goto csfailed; s->rt = r->rt; @@ -7801,7 +7801,6 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct pfi_kkif *nkif = NULL; struct ifnet *ifp = NULL; struct pf_addr naddr; - struct pf_ksrc_node *sn = NULL; int error = 0; uint16_t ip_len, ip_off; uint16_t tmp; @@ -7884,7 +7883,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, goto bad_locked; } pf_map_addr(AF_INET, r, (struct pf_addr *)&ip->ip_src, - &naddr, &nkif, NULL, &sn); + &naddr, &nkif, NULL); if (!PF_AZERO(&naddr, AF_INET)) dst.sin_addr.s_addr = naddr.v4.s_addr; ifp = nkif ? nkif->pfik_ifp : NULL; @@ -8053,7 +8052,6 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct pfi_kkif *nkif = NULL; struct ifnet *ifp = NULL; struct pf_addr naddr; - struct pf_ksrc_node *sn = NULL; int r_rt, r_dir; KASSERT(m && *m && r && oifp, ("%s: invalid parameters", __func__)); @@ -8133,7 +8131,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, goto bad_locked; } pf_map_addr(AF_INET6, r, (struct pf_addr *)&ip6->ip6_src, - &naddr, &nkif, NULL, &sn); + &naddr, &nkif, NULL); if (!PF_AZERO(&naddr, AF_INET6)) PF_ACPY((struct pf_addr *)&dst.sin6_addr, &naddr, AF_INET6); diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index b322bd65cfd3..007e8606ee8a 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -264,7 +264,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, } } - if (pf_map_addr(af, r, saddr, naddr, NULL, &init_addr, sn)) + if (pf_map_addr_sn(af, r, saddr, naddr, NULL, &init_addr, sn)) goto failed; if (proto == IPPROTO_ICMP) { @@ -385,7 +385,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, * pick a different source address since we're out * of free port choices for the current one. */ - if (pf_map_addr(af, r, saddr, naddr, NULL, &init_addr, sn)) + if (pf_map_addr_sn(af, r, saddr, naddr, NULL, &init_addr, sn)) return (1); break; case PF_POOL_NONE: @@ -448,47 +448,11 @@ pf_get_mape_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, u_short pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, - struct pf_addr *naddr, struct pfi_kkif **nkif, struct pf_addr *init_addr, - struct pf_ksrc_node **sn) + struct pf_addr *naddr, struct pfi_kkif **nkif, struct pf_addr *init_addr) { u_short reason = PFRES_MATCH; struct pf_kpool *rpool = &r->rpool; struct pf_addr *raddr = NULL, *rmask = NULL; - struct pf_srchash *sh = NULL; - - /* Try to find a src_node if none was given and this - is a sticky-address rule. */ - if (*sn == NULL && r->rpool.opts & PF_POOL_STICKYADDR && - (r->rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) - *sn = pf_find_src_node(saddr, r, af, &sh, false); - - /* If a src_node was found or explicitly given and it has a non-zero - route address, use this address. A zeroed address is found if the - src node was created just a moment ago in pf_create_state and it - needs to be filled in with routing decision calculated here. */ - if (*sn != NULL && !PF_AZERO(&(*sn)->raddr, af)) { - /* If the supplied address is the same as the current one we've - * been asked before, so tell the caller that there's no other - * address to be had. */ - if (PF_AEQ(naddr, &(*sn)->raddr, af)) { - reason = PFRES_MAPFAILED; - goto done; - } - - PF_ACPY(naddr, &(*sn)->raddr, af); - if (nkif) - *nkif = (*sn)->rkif; - if (V_pf_status.debug >= PF_DEBUG_NOISY) { - printf("pf_map_addr: src tracking maps "); - pf_print_host(saddr, 0, af); - printf(" to "); - pf_print_host(naddr, 0, af); - if (nkif) - printf("@%s", (*nkif)->pfik_name); - printf("\n"); - } - goto done; - } mtx_lock(&rpool->mtx); /* Find the route using chosen algorithm. Store the found route @@ -646,6 +610,68 @@ pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, if (nkif) *nkif = rpool->cur->kif; +done_pool_mtx: + mtx_unlock(&rpool->mtx); + + if (reason) { + counter_u64_add(V_pf_status.counters[reason], 1); + } + + return (reason); +} + +u_short +pf_map_addr_sn(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, + struct pf_addr *naddr, struct pfi_kkif **nkif, struct pf_addr *init_addr, + struct pf_ksrc_node **sn) +{ + u_short reason = 0; + struct pf_kpool *rpool = &r->rpool; + struct pf_srchash *sh = NULL; + + /* Try to find a src_node if none was given and this + is a sticky-address rule. */ + if (*sn == NULL && r->rpool.opts & PF_POOL_STICKYADDR && + (r->rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) + *sn = pf_find_src_node(saddr, r, af, &sh, false); + + /* If a src_node was found or explicitly given and it has a non-zero + route address, use this address. A zeroed address is found if the + src node was created just a moment ago in pf_create_state and it + needs to be filled in with routing decision calculated here. */ + if (*sn != NULL && !PF_AZERO(&(*sn)->raddr, af)) { + /* If the supplied address is the same as the current one we've + * been asked before, so tell the caller that there's no other + * address to be had. */ + if (PF_AEQ(naddr, &(*sn)->raddr, af)) { + reason = PFRES_MAPFAILED; + goto done; + } + + PF_ACPY(naddr, &(*sn)->raddr, af); + if (nkif) + *nkif = (*sn)->rkif; + if (V_pf_status.debug >= PF_DEBUG_NOISY) { + printf("pf_map_addr: src tracking maps "); + pf_print_host(saddr, 0, af); + printf(" to "); + pf_print_host(naddr, 0, af); + if (nkif) + printf("@%s", (*nkif)->pfik_name); + printf("\n"); + } + goto done; + } + + /* + * Source node has not been found. Find a new address and store it + * in variables given by the caller. + */ + if (pf_map_addr(af, r, saddr, naddr, nkif, init_addr) != 0) { + /* pf_map_addr() sets reason counters on its own */ + goto done; + } + if (*sn != NULL) { PF_ACPY(&(*sn)->raddr, naddr, af); if (nkif) @@ -661,9 +687,6 @@ pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, printf("\n"); } -done_pool_mtx: - mtx_unlock(&rpool->mtx); - done: if (reason) { counter_u64_add(V_pf_status.counters[reason], 1); @@ -841,7 +864,7 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off, int tries; uint16_t cut, low, high, nport; - reason = pf_map_addr(pd->af, r, saddr, naddr, NULL, NULL, sn); + reason = pf_map_addr_sn(pd->af, r, saddr, naddr, NULL, NULL, sn); if (reason != 0) goto notrans; if ((r->rpool.opts & PF_POOL_TYPEMASK) == PF_POOL_BITMASK) From nobody Mon Sep 30 12:01:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKRx2L43z5YBr7; Mon, 30 Sep 2024 12:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKRx1ZJBz4GG0; Mon, 30 Sep 2024 12:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727697709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gPwSeq4YgExJSf0hh+DLHQsfQwTYOBgc5tmnGcEdFl0=; b=IT2tGMG/mbONHBOjwofaAutil/jX+/Gn14133yM1ODO7/1t4aqKK40IPaffAMA0MsZ9iS4 FDMTYjUgXLOQ/olanq1DqgqctcCOTwgJXUooff0bd5x2YslbgQgW/F5ibaUVOuiQ3Uymv1 HQdTtqd88rqoopEZhuHczbRv+EoVrMOTgWdo36BimyJHcOnzk64eWUSqpynp6nuleLoTnp uzL11512qOFCtOybDw8AREPxjDu7r/EQPQy718I0WykdbUGHd0DNiPSFPQHSxTiPz/7MGu NqJIXUCIBUVHjgw1N8QWhSxKA/yRnUlw45Y+AtobkF1qqIfvloiRBN4KAwHtEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727697709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gPwSeq4YgExJSf0hh+DLHQsfQwTYOBgc5tmnGcEdFl0=; b=nutmI097/PZrdyBLcCXGfciiCzdTpIh8QByeOpozIcETJgfG7SXCBETdGSMZ3eP3Y/0Tda 7DFEJ33IE78YXd1Lb3evbUdH1o4+b6MImm6VmJcNLhNbNnw8cUxtNQe12/dhdgJtAkIUZu V+QcFZbf7kj4VgYZgViYWcDAs1C2YJvbSmhy1o+0n0QbGFP4aLLM8/ygVFLnuTKSvVjo/S 1bqYPEgwabfJqRHvneF5xppiU0bT1sVwi+riN0TyHlXwnbkmv852413CmC0eee2QTrV6D+ 27nu8veRMa3vJ40FnMiil8ILZa0L3BCzR1e3de+ma/azGhxsp3lu5deZPFc7Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727697709; a=rsa-sha256; cv=none; b=uos6IF87M4LmDDe7y/LcoyD9L2B/bMW87eQ1XD/Az1i4qKlp0QMukCLCRumKQXcQ9iP4VU EE3XPM36XPZreAWosO5Kw7VMt7myTmRXTn25fGjR87yUt+PiOspJM5V7z9KOCQau9BjqIW 5VKuKK/41U0ir6u1vY9ULdQowcZX7eA1AmqmS3aBOJ7EldTpEPYa9tHmFz+V+gLD5FiMor 2Vyp/T0UEWLwoQrJObe4Rj/7kyxJf4CgPTNj4FHoFqlXf2jKjNtIM55nXZe4yduldQHZwl ZcJYlXDaEq7J0mPgmDsNgloFJnBp1EfOLFgJ5IDZvFkeDYcrVOBiyVS7lroBZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKRx19TYzsHC; Mon, 30 Sep 2024 12:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UC1nXi033224; Mon, 30 Sep 2024 12:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UC1n0V033221; Mon, 30 Sep 2024 12:01:49 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:01:49 GMT Message-Id: <202409301201.48UC1n0V033221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8934002959e0 - main - bhyve: avoid buffer overflow in pci_vtcon_control_send List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8934002959e02bcf5e3262730c3a731af95afb15 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8934002959e02bcf5e3262730c3a731af95afb15 commit 8934002959e02bcf5e3262730c3a731af95afb15 Author: Pierre Pronchery AuthorDate: 2024-07-24 18:23:12 +0000 Commit: Ed Maste CommitDate: 2024-09-30 12:01:28 +0000 bhyve: avoid buffer overflow in pci_vtcon_control_send The program copies an input buffer to an output buffer without verifying that the size of the input buffer is less than the size of the output buffer, leading to a buffer overflow. Inside the function pci_vtcon_control_send, the length of the iov buffer is not validated before copy of the payload. Reported by: Synacktiv Reviewed by: markj Security: HYP-19 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46105 --- usr.sbin/bhyve/pci_virtio_console.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c index 921cb29032cf..4b957322b395 100644 --- a/usr.sbin/bhyve/pci_virtio_console.c +++ b/usr.sbin/bhyve/pci_virtio_console.c @@ -580,11 +580,15 @@ pci_vtcon_control_send(struct pci_vtcon_softc *sc, n = vq_getchain(vq, &iov, 1, &req); assert(n == 1); + if (iov.iov_len < sizeof(struct pci_vtcon_control)) + goto out; + memcpy(iov.iov_base, ctrl, sizeof(struct pci_vtcon_control)); if (payload != NULL && len > 0) memcpy((uint8_t *)iov.iov_base + sizeof(struct pci_vtcon_control), payload, len); +out: vq_relchain(vq, req.idx, sizeof(struct pci_vtcon_control) + len); vq_endchains(vq, 1); } From nobody Mon Sep 30 12:11:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKg90zd2z5YCPD; Mon, 30 Sep 2024 12:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKg90TRVz4Jk5; Mon, 30 Sep 2024 12:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727698293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQ1oudjSaN+zvegD2jUJrL8AD17xdT3EGsD9D/uJDUI=; b=KssgrJ8eFqKGfMMzhrlaFI0eui9M9iqj8p/w9+H1a9ufVkDeN4T3bjP4BsFxsTbDMW3ik2 KrZ0x+CWEfPvjr+IQW641ZhXl05v7FlJW53IWb3fOwMNFrpsRUEY3AmRxIm93xjbdCFdMe XyIfvDqFLSa3s8WJItP2xxfPGZvPiLIHt1V5HwCHCc9bwLVMkmlTAuVuH3r5YwaFbTvU5X zwSGl8YzlkV758b40cgBLRB0VP5X3sXLUtrIO+I5kmITYDK+vFTqKHBlU2MCmi0P1eDwou ulzqsklgPu2vAFgTQAWddyzsyAssIjo4bjhXFI/JskCJzVlH+mBDkf0LwzNAUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727698293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQ1oudjSaN+zvegD2jUJrL8AD17xdT3EGsD9D/uJDUI=; b=oNCAl+oYeRvkQNLIUiacYDhnFTTbFwGZZOCRaOBSQ+jFbH7CYS8jC326/VETmkLsKGkN7P nlNj0W1pR0P0he5qm9XjVHMaCv/t7Jn0371b1+TzttywzHqCte5qIPE8jfAuFKq4FhRjIs kNJFF8Qc1Q1wBiWrkfmfFl1Fslpn7tuBv0vPQwh11Ex1czJ32TQaaP1NzOY2cRStPQP3sh a8GQ4Oubcckih3FJKseycew1/Nab8/QyqU56PzALAFTlklXNERbMqxz+zHcYasAo1/XeKB HzNpsiqQLhMF3SYIf9HjaxSYvfbC0iyxbJNqH233lNiWykHXSkH4DVgccEnPVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727698293; a=rsa-sha256; cv=none; b=bQYKI6cqyWWrsebdj6IaS3aRmEephWPC8R3YQlxRqFT5EWzsheC8g4C2Qak9ds14238uTR 95XxRGI2jQOKtCNZa4DnfOGAET3MlDkknj+CU2jfLHbFECpjV3zesi8bfFUDYd4BJSfUTz jn4S4RfHX51jWXa3yCbUyAky8KReqRPvlf/OmCAzyYWovr2dlFM9cOG4FQ1NxqN8PqoKoW RIXCXb05wNDKJWJmBQf+crQ4DBO374ArxdVgI4tkK0DiCfgWcYqqeSspA4bUWromorwLvS p/D0U4pScTf08qMi+UqdAU8rymDxOdp/SqDBX2h9DAUMv5Wm+iRQ9zToGNWE/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 4XHKg872t5zsVB; Mon, 30 Sep 2024 12:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCBW2L053349; Mon, 30 Sep 2024 12:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCBWwY053346; Mon, 30 Sep 2024 12:11:32 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:11:32 GMT Message-Id: <202409301211.48UCBWwY053346@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: a03acfa43410 - stable/14 - bhyve: initialize register value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a03acfa43410b3a449fa8d5b1dbba20e0bf02d5a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a03acfa43410b3a449fa8d5b1dbba20e0bf02d5a commit a03acfa43410b3a449fa8d5b1dbba20e0bf02d5a Author: Pierre Pronchery AuthorDate: 2024-07-24 19:33:26 +0000 Commit: Ed Maste CommitDate: 2024-09-30 12:11:15 +0000 bhyve: initialize register value In case of an error in a code pattern like ``` uint64_t val; error = memread(vcpu, gpa, &val, 1, arg); error = vie_update_register(vcpu, reg, val, size); ``` uninitialized stack data would be used. Reported by: Synacktiv Reviewed by: markj Security: HYP-21 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46107 (cherry picked from commit 94693ec7c85363f9b0098247489cea3efdb183f9) --- sys/amd64/vmm/vmm_ioport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm_ioport.c b/sys/amd64/vmm/vmm_ioport.c index ec270df80c3e..3caea7deac16 100644 --- a/sys/amd64/vmm/vmm_ioport.c +++ b/sys/amd64/vmm/vmm_ioport.c @@ -101,7 +101,7 @@ static int emulate_inout_port(struct vcpu *vcpu, struct vm_exit *vmexit, bool *retu) { ioport_handler_func_t handler; - uint32_t mask, val; + uint32_t mask, val = 0; int error; /* From nobody Mon Sep 30 12:11:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKgZ6wgWz5YBw4; Mon, 30 Sep 2024 12:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKgZ6Qxpz4JtS; Mon, 30 Sep 2024 12:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727698314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fy2bxPcK4J2XhQ/qLBTF6TjT3DUwBMhHNjWYNzfW6wA=; b=PCXKkPzSLq9/890IEVvKDN08xov6uIZ+8vK0YXEyiaLovUZQN2n5E3b9XXxMliRSKAkRbs lYqGwqfTVNa/OEUSzCffZqsQvzud77ouPHJ9IhShhGWtJH6TeYJCwJxCJKeQr5UkWsv6Gn A4yi8yvDz9n0E1R5aCYAx/eoJ4qrfzBp7mRitW/KBF/W3lLqo9NfRifgS3FKk7EBDz8MpY dGYX43lL9ysOC/suMNZTwhaj+zMHd9QK7/+CQp4LmMe1hgS9AYJPQTLPhI4T/bz5sjKQhN QOECkBDX6vnpsxS3HmgrGBlWsHMYZXIOVs/1zNiY3ew8G33XZbpssLzKQZXGbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727698314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fy2bxPcK4J2XhQ/qLBTF6TjT3DUwBMhHNjWYNzfW6wA=; b=CzChTzXGNcXWhLeWhiyyNWtnNZF4zRMSXy1gJVnSGQ7kj4Qo1HbSbJedicLmpkezp52v3s L0Dtf6XmGJ2x/DDCg63UBows94F4jDjM+F+IMmc59PEEDP2DWUpyKW6cVEl5NpSeeNQClZ ODfwViyDqXsD+nKgW6OxkAk84LhMO7RjOca7V5ZKobhQ94CZHbgh0mTUYOU7hA3tqiTdW2 0hE8JUL3bigaYJzNvUNq+vua+Cu8o/4UfvclHR1iFZ4CMFdS6mI/E5NdgQFJ787IzG/eDI XD+bq+ijjO36Ukv0NpKN4249oGGP8hSGw6vQuJ+n0fgIg26hBEktAicXuAW8+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727698314; a=rsa-sha256; cv=none; b=h1ucL67YfZ0xm6N9jgv7ty1NGDCa2G9vnnfV7wsLdZUEgxgoHZ6VdnZdoPnfoX2XyrGHOf 66W8HAuOZuhJeMN+HTL3k9ca4hR+JTG3WYHrjdpCY5G1d3HENXPu1EyusWiWTcOKaYa0Bg jRkrKRzwVJ0qeqxbJCuLTQJSJVA3bOf1lXgN4fMml9yepTyWuJrVZRFJTg8F5dw5r3jFdU WzzVGitMaVDf+xmrotvizUKGQ9fztLk9Gob5+shp4vsszgiZmoS7NDhAi2Dvtu3HwJvNBN uMTbQWnF8IbZMyxfYvvW69e/jzL9g0zNvl88++MBniJw1Hbhjb8ZcNEcOxfBAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKgZ5rxhzssw; Mon, 30 Sep 2024 12:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCBsJF053536; Mon, 30 Sep 2024 12:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCBslq053533; Mon, 30 Sep 2024 12:11:54 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:11:54 GMT Message-Id: <202409301211.48UCBslq053533@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: 32e077f273d9 - stable/13 - bhyve: initialize register value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 32e077f273d90c377faaddc5333758940cc52cef Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=32e077f273d90c377faaddc5333758940cc52cef commit 32e077f273d90c377faaddc5333758940cc52cef Author: Pierre Pronchery AuthorDate: 2024-07-24 19:33:26 +0000 Commit: Ed Maste CommitDate: 2024-09-30 12:11:47 +0000 bhyve: initialize register value In case of an error in a code pattern like ``` uint64_t val; error = memread(vcpu, gpa, &val, 1, arg); error = vie_update_register(vcpu, reg, val, size); ``` uninitialized stack data would be used. Reported by: Synacktiv Reviewed by: markj Security: HYP-21 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46107 (cherry picked from commit 94693ec7c85363f9b0098247489cea3efdb183f9) (cherry picked from commit a03acfa43410b3a449fa8d5b1dbba20e0bf02d5a) --- sys/amd64/vmm/vmm_ioport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm_ioport.c b/sys/amd64/vmm/vmm_ioport.c index ec270df80c3e..3caea7deac16 100644 --- a/sys/amd64/vmm/vmm_ioport.c +++ b/sys/amd64/vmm/vmm_ioport.c @@ -101,7 +101,7 @@ static int emulate_inout_port(struct vcpu *vcpu, struct vm_exit *vmexit, bool *retu) { ioport_handler_func_t handler; - uint32_t mask, val; + uint32_t mask, val = 0; int error; /* From nobody Mon Sep 30 12:23:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKx41BpZz5YD7F; Mon, 30 Sep 2024 12:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKx40y0vz4LXY; Mon, 30 Sep 2024 12:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P+yTFUno4FTC87sdLCXBenKonerGz6gDH6c1XmTgh9M=; b=jmhDtoWONCF8awloGlO0xY2SQAZuepvFDY2PU4cX+VPZMyeJJh49vBLl06q17iiYH3QmPr y/HD+zOVGhWDl6BZuZkVlS5TiVIiHsXKTsCdS+TkADRgb4ARBuO72bHofoP5563uP2f8uT CtMA6FK1+QW+Q0O4Qpgv8SQr2ix2QOiN3THOdTX5eo450r61Wy9ZDxLXI7Mah1xAxYxXWj jKjmsmvL2ztjgh0vmN/C/AAQKYDZtDE38/7uIiV8iq3Cqxpjv7p+gtG9R/THZJRnnllAqB kiN/eIMXYZiMeufcUQFw6zDoKxduYvBUsESmjUNT87LfRIJK2e5MA34pJEuYiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P+yTFUno4FTC87sdLCXBenKonerGz6gDH6c1XmTgh9M=; b=PaZDGngpayPfBmHEeOhAvtnOEXJbHA1tH+LIN0AVDktgZ3n2wkNOsimEsyLI2OP8kZLIG9 dM0I0+qOhobHSodl5lOu78IhKFy30OHPwHGv9jIpWxpSistkWjO4C7PJpSZAn7LrbDZtVR L0Gbr/S+XiIU+L58fxoAxviYwF3pKmZz3t0dpBvgscjqeB1xJCT4BcjNkom/N3c0i11ox6 yS93k+hg4/D+hD0mo7YiehAUpJFeBv1kCAWya8F0a1v3FP/m4H97Di+pkmNDNchUpGRRi9 Q/pPMgzfRvnmawKWplTQMjYZ9OMnbPuksTJzapYDUP4edbY6k0y1Znwv1JnN5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699016; a=rsa-sha256; cv=none; b=BFv1f4/0DcVjyBaVvorxaNz0+N0aGp67zPgHUKaMBct3Hlzd73O6K4KaKs/8nABRz48kjq BAOZtB3C9kekIBJER36OTiNyQUCKjoEYPPLhmJjfrfZOYA8TmC1aXeOQis0lg2chN/x3UN ueFG4liei23nzwBkYSyRTzH3Q4uxG7U1eQGXtFdrQvAs6kKZovPCtPm8VxSjZocJACg1I4 Wycyqpk0Jlm437N6rLejT4BAMCsJAqoS3wuxfnH1bpJE6pxQYsPDWUFzCEVgtMJ/BMsCsi WK0Gl2Lr1KSY75CdnHTWefN05d7PvLRR1051auitJfAv6cnoyhXZl2wwpfzR8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKx40XhczsZm; Mon, 30 Sep 2024 12:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNauc070851; Mon, 30 Sep 2024 12:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNaHE070848; Mon, 30 Sep 2024 12:23:36 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:36 GMT Message-Id: <202409301223.48UCNaHE070848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 332c426328db - main - arm64: Initial SVE support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 332c426328dbb30a6b2e69d9b1e8298d77d85bd1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=332c426328dbb30a6b2e69d9b1e8298d77d85bd1 commit 332c426328dbb30a6b2e69d9b1e8298d77d85bd1 Author: Andrew Turner AuthorDate: 2024-09-27 13:36:35 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Initial SVE support Add initial kernel support for SVE. This detects if SVE is present on all CPUs, and if so allows for the use of SVE in the future. As the SVE registers are a superset of the VFP registers we don't need to restore the VFP registers when SVE is enabled. Ths interface to enable SVE is provided, but not used until SVE is supported in signals and with ptrace. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43306 --- sys/arm64/arm64/exec_machdep.c | 2 + sys/arm64/arm64/trap.c | 3 +- sys/arm64/arm64/vfp.c | 606 +++++++++++++++++++++++++++++++++++++++-- sys/arm64/include/armreg.h | 7 + sys/arm64/include/pcb.h | 8 +- sys/arm64/include/vfp.h | 6 + 6 files changed, 610 insertions(+), 22 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 1bff70450b69..6fece751cc25 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -606,6 +606,8 @@ sys_sigreturn(struct thread *td, struct sigreturn_args *uap) if (copyin(uap->sigcntxp, &uc, sizeof(uc))) return (EFAULT); + /* Stop an interrupt from causing the sve state to be dropped */ + td->td_sa.code = -1; error = set_mcontext(td, &uc.uc_mcontext); if (error != 0) return (error); diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 6cc1933095c8..35defef90837 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -734,7 +734,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame) break; } - KASSERT((td->td_pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, + KASSERT( + (td->td_pcb->pcb_fpflags & ~(PCB_FP_USERMASK|PCB_FP_SVEVALID)) == 0, ("Kernel VFP flags set while entering userspace")); KASSERT( td->td_pcb->pcb_fpusaved == &td->td_pcb->pcb_fpustate, diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index c65108a83399..d57927991c03 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -30,11 +30,13 @@ #ifdef VFP #include #include +#include #include #include #include #include #include +#include #include @@ -60,6 +62,63 @@ struct fpu_kern_ctx { static uma_zone_t fpu_save_area_zone; static struct vfpstate *fpu_initialstate; +static u_int sve_max_vector_len; + +static size_t +_sve_buf_size(u_int sve_len) +{ + size_t len; + + /* 32 vector registers */ + len = (size_t)sve_len * 32; + /* + * 16 predicate registers and the fault fault register, each 1/8th + * the size of a vector register. + */ + len += ((size_t)sve_len * 17) / 8; + /* + * FPSR and FPCR + */ + len += sizeof(uint64_t) * 2; + + return (len); +} + +size_t +sve_max_buf_size(void) +{ + MPASS(sve_max_vector_len > 0); + return (_sve_buf_size(sve_max_vector_len)); +} + +size_t +sve_buf_size(struct thread *td) +{ + struct pcb *pcb; + + pcb = td->td_pcb; + MPASS(pcb->pcb_svesaved != NULL); + MPASS(pcb->pcb_sve_len > 0); + + return (_sve_buf_size(pcb->pcb_sve_len)); +} + +static void * +sve_alloc(void) +{ + void *buf; + + buf = malloc(sve_max_buf_size(), M_FPUKERN_CTX, M_WAITOK | M_ZERO); + + return (buf); +} + +static void +sve_free(void *buf) +{ + free(buf, M_FPUKERN_CTX); +} + void vfp_enable(void) { @@ -71,13 +130,30 @@ vfp_enable(void) isb(); } +static void +sve_enable(void) +{ + uint32_t cpacr; + + cpacr = READ_SPECIALREG(cpacr_el1); + /* Enable FP */ + cpacr = (cpacr & ~CPACR_FPEN_MASK) | CPACR_FPEN_TRAP_NONE; + /* Enable SVE */ + cpacr = (cpacr & ~CPACR_ZEN_MASK) | CPACR_ZEN_TRAP_NONE; + WRITE_SPECIALREG(cpacr_el1, cpacr); + isb(); +} + void vfp_disable(void) { uint32_t cpacr; cpacr = READ_SPECIALREG(cpacr_el1); + /* Disable FP */ cpacr = (cpacr & ~CPACR_FPEN_MASK) | CPACR_FPEN_TRAP_ALL1; + /* Disable SVE */ + cpacr = (cpacr & ~CPACR_ZEN_MASK) | CPACR_ZEN_TRAP_ALL1; WRITE_SPECIALREG(cpacr_el1, cpacr); isb(); } @@ -171,9 +247,266 @@ vfp_restore(struct vfpstate *state) } static void -vfp_save_state_common(struct thread *td, struct pcb *pcb) +sve_store(void *state, u_int sve_len) +{ + vm_offset_t f_start, p_start, z_start; + uint64_t fpcr, fpsr; + + /* + * Calculate the start of each register groups. There are three + * groups depending on size, with the First Fault Register (FFR) + * stored with the predicate registers as we use one of them to + * temporarily hold it. + * + * +-------------------------+-------------------+ + * | Contents | Register size | + * z_start -> +-------------------------+-------------------+ + * | | | + * | 32 Z regs | sve_len | + * | | | + * p_start -> +-------------------------+-------------------+ + * | | | + * | 16 Predicate registers | 1/8 size of Z reg | + * | 1 First Fault register | | + * | | | + * f_start -> +-------------------------+-------------------+ + * | | | + * | FPSR/FPCR | 32 bit | + * | | | + * +-------------------------+-------------------+ + */ + z_start = (vm_offset_t)state; + p_start = z_start + sve_len * 32; + f_start = p_start + (sve_len / 8) * 17; + + __asm __volatile( + ".arch_extension sve \n" + "str z0, [%0, #0, MUL VL] \n" + "str z1, [%0, #1, MUL VL] \n" + "str z2, [%0, #2, MUL VL] \n" + "str z3, [%0, #3, MUL VL] \n" + "str z4, [%0, #4, MUL VL] \n" + "str z5, [%0, #5, MUL VL] \n" + "str z6, [%0, #6, MUL VL] \n" + "str z7, [%0, #7, MUL VL] \n" + "str z8, [%0, #8, MUL VL] \n" + "str z9, [%0, #9, MUL VL] \n" + "str z10, [%0, #10, MUL VL] \n" + "str z11, [%0, #11, MUL VL] \n" + "str z12, [%0, #12, MUL VL] \n" + "str z13, [%0, #13, MUL VL] \n" + "str z14, [%0, #14, MUL VL] \n" + "str z15, [%0, #15, MUL VL] \n" + "str z16, [%0, #16, MUL VL] \n" + "str z17, [%0, #17, MUL VL] \n" + "str z18, [%0, #18, MUL VL] \n" + "str z19, [%0, #19, MUL VL] \n" + "str z20, [%0, #20, MUL VL] \n" + "str z21, [%0, #21, MUL VL] \n" + "str z22, [%0, #22, MUL VL] \n" + "str z23, [%0, #23, MUL VL] \n" + "str z24, [%0, #24, MUL VL] \n" + "str z25, [%0, #25, MUL VL] \n" + "str z26, [%0, #26, MUL VL] \n" + "str z27, [%0, #27, MUL VL] \n" + "str z28, [%0, #28, MUL VL] \n" + "str z29, [%0, #29, MUL VL] \n" + "str z30, [%0, #30, MUL VL] \n" + "str z31, [%0, #31, MUL VL] \n" + /* Store the predicate registers */ + "str p0, [%1, #0, MUL VL] \n" + "str p1, [%1, #1, MUL VL] \n" + "str p2, [%1, #2, MUL VL] \n" + "str p3, [%1, #3, MUL VL] \n" + "str p4, [%1, #4, MUL VL] \n" + "str p5, [%1, #5, MUL VL] \n" + "str p6, [%1, #6, MUL VL] \n" + "str p7, [%1, #7, MUL VL] \n" + "str p8, [%1, #8, MUL VL] \n" + "str p9, [%1, #9, MUL VL] \n" + "str p10, [%1, #10, MUL VL] \n" + "str p11, [%1, #11, MUL VL] \n" + "str p12, [%1, #12, MUL VL] \n" + "str p13, [%1, #13, MUL VL] \n" + "str p14, [%1, #14, MUL VL] \n" + "str p15, [%1, #15, MUL VL] \n" + ".arch_extension nosve \n" + : : "r"(z_start), "r"(p_start)); + + /* Save the FFR if needed */ + /* TODO: Skip if in SME streaming mode (when supported) */ + __asm __volatile( + ".arch_extension sve \n" + "rdffr p0.b \n" + "str p0, [%0, #16, MUL VL] \n" + /* + * Load the old p0 value to ensure it is consistent if we enable + * without calling sve_restore, e.g. switch to a kernel thread and + * back. + */ + "ldr p0, [%0, #0, MUL VL] \n" + ".arch_extension nosve \n" + : : "r"(p_start)); + + __asm __volatile( + ".arch_extension fp \n" + "mrs %0, fpsr \n" + "mrs %1, fpcr \n" + "stp %w0, %w1, [%2] \n" + ".arch_extension nofp \n" + : "=&r"(fpsr), "=&r"(fpcr) : "r"(f_start)); +} + +static void +sve_restore(void *state, u_int sve_len) +{ + vm_offset_t f_start, p_start, z_start; + uint64_t fpcr, fpsr; + + /* See sve_store for the layout of the state buffer */ + z_start = (vm_offset_t)state; + p_start = z_start + sve_len * 32; + f_start = p_start + (sve_len / 8) * 17; + + __asm __volatile( + ".arch_extension sve \n" + "ldr p0, [%0, #16, MUL VL] \n" + "wrffr p0.b \n" + ".arch_extension nosve \n" + : : "r"(p_start)); + + __asm __volatile( + ".arch_extension sve \n" + "ldr z0, [%0, #0, MUL VL] \n" + "ldr z1, [%0, #1, MUL VL] \n" + "ldr z2, [%0, #2, MUL VL] \n" + "ldr z3, [%0, #3, MUL VL] \n" + "ldr z4, [%0, #4, MUL VL] \n" + "ldr z5, [%0, #5, MUL VL] \n" + "ldr z6, [%0, #6, MUL VL] \n" + "ldr z7, [%0, #7, MUL VL] \n" + "ldr z8, [%0, #8, MUL VL] \n" + "ldr z9, [%0, #9, MUL VL] \n" + "ldr z10, [%0, #10, MUL VL] \n" + "ldr z11, [%0, #11, MUL VL] \n" + "ldr z12, [%0, #12, MUL VL] \n" + "ldr z13, [%0, #13, MUL VL] \n" + "ldr z14, [%0, #14, MUL VL] \n" + "ldr z15, [%0, #15, MUL VL] \n" + "ldr z16, [%0, #16, MUL VL] \n" + "ldr z17, [%0, #17, MUL VL] \n" + "ldr z18, [%0, #18, MUL VL] \n" + "ldr z19, [%0, #19, MUL VL] \n" + "ldr z20, [%0, #20, MUL VL] \n" + "ldr z21, [%0, #21, MUL VL] \n" + "ldr z22, [%0, #22, MUL VL] \n" + "ldr z23, [%0, #23, MUL VL] \n" + "ldr z24, [%0, #24, MUL VL] \n" + "ldr z25, [%0, #25, MUL VL] \n" + "ldr z26, [%0, #26, MUL VL] \n" + "ldr z27, [%0, #27, MUL VL] \n" + "ldr z28, [%0, #28, MUL VL] \n" + "ldr z29, [%0, #29, MUL VL] \n" + "ldr z30, [%0, #30, MUL VL] \n" + "ldr z31, [%0, #31, MUL VL] \n" + /* Store the predicate registers */ + "ldr p0, [%1, #0, MUL VL] \n" + "ldr p1, [%1, #1, MUL VL] \n" + "ldr p2, [%1, #2, MUL VL] \n" + "ldr p3, [%1, #3, MUL VL] \n" + "ldr p4, [%1, #4, MUL VL] \n" + "ldr p5, [%1, #5, MUL VL] \n" + "ldr p6, [%1, #6, MUL VL] \n" + "ldr p7, [%1, #7, MUL VL] \n" + "ldr p8, [%1, #8, MUL VL] \n" + "ldr p9, [%1, #9, MUL VL] \n" + "ldr p10, [%1, #10, MUL VL] \n" + "ldr p11, [%1, #11, MUL VL] \n" + "ldr p12, [%1, #12, MUL VL] \n" + "ldr p13, [%1, #13, MUL VL] \n" + "ldr p14, [%1, #14, MUL VL] \n" + "ldr p15, [%1, #15, MUL VL] \n" + ".arch_extension nosve \n" + : : "r"(z_start), "r"(p_start)); + + __asm __volatile( + ".arch_extension fp \n" + "ldp %w0, %w1, [%2] \n" + "msr fpsr, %0 \n" + "msr fpcr, %1 \n" + ".arch_extension nofp \n" + : "=&r"(fpsr), "=&r"(fpcr) : "r"(f_start)); +} + +/* + * Sync the VFP registers to the SVE register state, e.g. in signal return + * when userspace may have changed the vfp register values and expect them + * to be used when the signal handler returns. + */ +void +vfp_to_sve_sync(struct thread *td) +{ + struct pcb *pcb; + uint32_t *fpxr; + + pcb = td->td_pcb; + if (pcb->pcb_svesaved == NULL) + return; + + MPASS(pcb->pcb_fpusaved != NULL); + + /* Copy the VFP registers to the SVE region */ + for (int i = 0; i < nitems(pcb->pcb_fpusaved->vfp_regs); i++) { + __uint128_t *sve_reg; + + sve_reg = (__uint128_t *)((uintptr_t)pcb->pcb_svesaved + + i * pcb->pcb_sve_len); + *sve_reg = pcb->pcb_fpusaved->vfp_regs[i]; + } + + fpxr = (uint32_t *)((uintptr_t)pcb->pcb_svesaved + + (32 * pcb->pcb_sve_len) + (17 * pcb->pcb_sve_len / 8)); + fpxr[0] = pcb->pcb_fpusaved->vfp_fpsr; + fpxr[1] = pcb->pcb_fpusaved->vfp_fpcr; +} + +/* + * Sync the SVE registers to the VFP register state. + */ +void +sve_to_vfp_sync(struct thread *td) +{ + struct pcb *pcb; + uint32_t *fpxr; + + pcb = td->td_pcb; + if (pcb->pcb_svesaved == NULL) + return; + + MPASS(pcb->pcb_fpusaved == &pcb->pcb_fpustate); + + /* Copy the SVE registers to the VFP saved state */ + for (int i = 0; i < nitems(pcb->pcb_fpusaved->vfp_regs); i++) { + __uint128_t *sve_reg; + + sve_reg = (__uint128_t *)((uintptr_t)pcb->pcb_svesaved + + i * pcb->pcb_sve_len); + pcb->pcb_fpusaved->vfp_regs[i] = *sve_reg; + } + + fpxr = (uint32_t *)((uintptr_t)pcb->pcb_svesaved + + (32 * pcb->pcb_sve_len) + (17 * pcb->pcb_sve_len / 8)); + pcb->pcb_fpusaved->vfp_fpsr = fpxr[0]; + pcb->pcb_fpusaved->vfp_fpcr = fpxr[1]; +} + +static void +vfp_save_state_common(struct thread *td, struct pcb *pcb, bool full_save) { uint32_t cpacr; + bool save_sve; + + save_sve = false; critical_enter(); /* @@ -181,14 +514,49 @@ vfp_save_state_common(struct thread *td, struct pcb *pcb) * i.e. return if we are trapping on FP access. */ cpacr = READ_SPECIALREG(cpacr_el1); - if ((cpacr & CPACR_FPEN_MASK) == CPACR_FPEN_TRAP_NONE) { - KASSERT(PCPU_GET(fpcurthread) == td, - ("Storing an invalid VFP state")); + if ((cpacr & CPACR_FPEN_MASK) != CPACR_FPEN_TRAP_NONE) + goto done; + KASSERT(PCPU_GET(fpcurthread) == td, + ("Storing an invalid VFP state")); + + /* + * Also save the SVE state. As SVE depends on the VFP being + * enabled we can rely on only needing to check this when + * the VFP unit has been enabled. + */ + if ((cpacr & CPACR_ZEN_MASK) == CPACR_ZEN_TRAP_NONE) { + /* If SVE is enabled it should be valid */ + MPASS((pcb->pcb_fpflags & PCB_FP_SVEVALID) != 0); + + /* + * If we are switching while in a system call skip saving + * SVE registers. The ABI allows us to drop them over any + * system calls, however doing so is expensive in SVE + * heavy userspace code. This would require us to disable + * SVE for all system calls and trap the next use of them. + * As an optimisation only disable SVE on context switch. + */ + if (td->td_frame == NULL || + (ESR_ELx_EXCEPTION(td->td_frame->tf_esr) != EXCP_SVC64 && + td->td_sa.code != (u_int)-1)) + save_sve = true; + } + + if (save_sve) { + KASSERT(pcb->pcb_svesaved != NULL, + ("Storing to a NULL SVE state")); + sve_store(pcb->pcb_svesaved, pcb->pcb_sve_len); + if (full_save) + sve_to_vfp_sync(td); + } else { + pcb->pcb_fpflags &= ~PCB_FP_SVEVALID; vfp_store(pcb->pcb_fpusaved); - dsb(ish); - vfp_disable(); } + dsb(ish); + vfp_disable(); + +done: critical_exit(); } @@ -199,7 +567,7 @@ vfp_save_state(struct thread *td, struct pcb *pcb) KASSERT(pcb != NULL, ("NULL vfp pcb")); KASSERT(td->td_pcb == pcb, ("Invalid vfp pcb")); - vfp_save_state_common(td, pcb); + vfp_save_state_common(td, pcb, true); } void @@ -213,7 +581,7 @@ vfp_save_state_savectx(struct pcb *pcb) MPASS(pcb->pcb_fpusaved == NULL); pcb->pcb_fpusaved = &pcb->pcb_fpustate; - vfp_save_state_common(curthread, pcb); + vfp_save_state_common(curthread, pcb, true); } void @@ -221,7 +589,7 @@ vfp_save_state_switch(struct thread *td) { KASSERT(td != NULL, ("NULL vfp thread")); - vfp_save_state_common(td, td->td_pcb); + vfp_save_state_common(td, td->td_pcb, false); } /* @@ -231,21 +599,40 @@ vfp_save_state_switch(struct thread *td) void vfp_new_thread(struct thread *newtd, struct thread *oldtd, bool fork) { - struct pcb *newpcb; + struct pcb *newpcb, *oldpcb; newpcb = newtd->td_pcb; + oldpcb = oldtd->td_pcb; /* Kernel threads start with clean VFP */ if ((oldtd->td_pflags & TDP_KTHREAD) != 0) { newpcb->pcb_fpflags &= - ~(PCB_FP_STARTED | PCB_FP_KERN | PCB_FP_NOSAVE); + ~(PCB_FP_STARTED | PCB_FP_SVEVALID | PCB_FP_KERN | + PCB_FP_NOSAVE); } else { MPASS((newpcb->pcb_fpflags & (PCB_FP_KERN|PCB_FP_NOSAVE)) == 0); + + /* + * The only SVE register state to be guaranteed to be saved + * a system call is the lower bits of the Z registers as + * these are aliased with the existing FP registers. Because + * we can only create a new thread or fork through a system + * call it is safe to drop the SVE state in the new thread. + */ + newpcb->pcb_fpflags &= ~PCB_FP_SVEVALID; if (!fork) { newpcb->pcb_fpflags &= ~PCB_FP_STARTED; } } + newpcb->pcb_svesaved = NULL; + if (oldpcb->pcb_svesaved == NULL) + newpcb->pcb_sve_len = sve_max_vector_len; + else + KASSERT(newpcb->pcb_sve_len == oldpcb->pcb_sve_len, + ("%s: pcb sve vector length differs: %x != %x", __func__, + newpcb->pcb_sve_len, oldpcb->pcb_sve_len)); + newpcb->pcb_fpusaved = &newpcb->pcb_fpustate; newpcb->pcb_vfpcpu = UINT_MAX; } @@ -272,23 +659,48 @@ vfp_reset_state(struct thread *td, struct pcb *pcb) ("pcb_fpusaved should point to pcb_fpustate.")); pcb->pcb_fpustate.vfp_fpcr = VFPCR_INIT; pcb->pcb_fpustate.vfp_fpsr = 0; + /* XXX: Memory leak when using SVE between fork & exec? */ + pcb->pcb_svesaved = NULL; pcb->pcb_vfpcpu = UINT_MAX; pcb->pcb_fpflags = 0; } -void -vfp_restore_state(void) +static void +vfp_restore_state_common(struct thread *td, int flags) { struct pcb *curpcb; u_int cpu; + bool restore_sve; + + KASSERT(td == curthread, ("%s: Called with non-current thread", + __func__)); critical_enter(); cpu = PCPU_GET(cpuid); - curpcb = curthread->td_pcb; - curpcb->pcb_fpflags |= PCB_FP_STARTED; + curpcb = td->td_pcb; - vfp_enable(); + /* + * If SVE has been used and the base VFP state is in use then + * restore the SVE registers. A non-base VFP state should only + * be used by the kernel and SVE should onlu be used by userspace. + */ + restore_sve = false; + if ((curpcb->pcb_fpflags & PCB_FP_SVEVALID) != 0 && + curpcb->pcb_fpusaved == &curpcb->pcb_fpustate) { + MPASS(curpcb->pcb_svesaved != NULL); + /* SVE shouldn't be enabled in the kernel */ + MPASS((flags & PCB_FP_KERN) == 0); + restore_sve = true; + } + + if (restore_sve) { + MPASS((curpcb->pcb_fpflags & PCB_FP_SVEVALID) != 0); + sve_enable(); + } else { + curpcb->pcb_fpflags |= PCB_FP_STARTED; + vfp_enable(); + } /* * If the previous thread on this cpu to use the VFP was not the @@ -296,14 +708,104 @@ vfp_restore_state(void) * cpu we need to restore the old state. */ if (PCPU_GET(fpcurthread) != curthread || cpu != curpcb->pcb_vfpcpu) { - vfp_restore(curthread->td_pcb->pcb_fpusaved); - PCPU_SET(fpcurthread, curthread); + /* + * The VFP registers are the lower 128 bits of the SVE + * registers. Use the SVE store state if it was previously + * enabled. + */ + if (restore_sve) { + MPASS(td->td_pcb->pcb_svesaved != NULL); + sve_restore(td->td_pcb->pcb_svesaved, + td->td_pcb->pcb_sve_len); + } else { + vfp_restore(td->td_pcb->pcb_fpusaved); + } + PCPU_SET(fpcurthread, td); curpcb->pcb_vfpcpu = cpu; } critical_exit(); } +void +vfp_restore_state(void) +{ + struct thread *td; + + td = curthread; + vfp_restore_state_common(td, td->td_pcb->pcb_fpflags); +} + +bool +sve_restore_state(struct thread *td) +{ + struct pcb *curpcb; + void *svesaved; + uint64_t cpacr; + + KASSERT(td == curthread, ("%s: Called with non-current thread", + __func__)); + + curpcb = td->td_pcb; + + /* The SVE state should alias the base VFP state */ + MPASS(curpcb->pcb_fpusaved == &curpcb->pcb_fpustate); + + /* SVE not enabled, tell the caller to raise a fault */ + if (curpcb->pcb_sve_len == 0) { + /* + * The init pcb is created before we read the vector length. + * Set it to the default length. + */ + if (sve_max_vector_len == 0) + return (false); + + MPASS(curpcb->pcb_svesaved == NULL); + curpcb->pcb_sve_len = sve_max_vector_len; + } + + if (curpcb->pcb_svesaved == NULL) { + /* SVE should be disabled so will be invalid */ + MPASS((curpcb->pcb_fpflags & PCB_FP_SVEVALID) == 0); + + /* + * Allocate the SVE buffer of this thread. + * Enable interrupts so the allocation can sleep + */ + svesaved = sve_alloc(); + + critical_enter(); + + /* Restore the VFP state if needed */ + cpacr = READ_SPECIALREG(cpacr_el1); + if ((cpacr & CPACR_FPEN_MASK) != CPACR_FPEN_TRAP_NONE) { + vfp_restore_state_common(td, curpcb->pcb_fpflags); + } + + /* + * Set the flags after enabling the VFP as the SVE saved + * state will be invalid. + */ + curpcb->pcb_svesaved = svesaved; + curpcb->pcb_fpflags |= PCB_FP_SVEVALID; + sve_enable(); + + critical_exit(); + } else { + vfp_restore_state_common(td, curpcb->pcb_fpflags); + + /* Enable SVE if it wasn't previously enabled */ + if ((curpcb->pcb_fpflags & PCB_FP_SVEVALID) == 0) { + critical_enter(); + sve_enable(); + curpcb->pcb_fpflags |= PCB_FP_SVEVALID; + critical_exit(); + } + } + + return (true); +} + void vfp_init_secondary(void) { @@ -348,6 +850,74 @@ vfp_init(const void *dummy __unused) SYSINIT(vfp, SI_SUB_CPU, SI_ORDER_ANY, vfp_init, NULL); +static void +sve_thread_dtor(void *arg __unused, struct thread *td) +{ + sve_free(td->td_pcb->pcb_svesaved); +} + +static void +sve_pcpu_read(void *arg) +{ + u_int *len; + uint64_t vl; + + len = arg; + + /* Enable SVE to read zcr_el1 and VFP for rdvl */ + sve_enable(); + + /* Set the longest vector length */ + WRITE_SPECIALREG(ZCR_EL1_REG, ZCR_LEN_MASK); + isb(); + + /* Read the real vector length */ + __asm __volatile( + ".arch_extension sve \n" + "rdvl %0, #1 \n" + ".arch_extension nosve \n" + : "=&r"(vl)); + + vfp_disable(); + + len[PCPU_GET(cpuid)] = vl; +} + +static void +sve_init(const void *dummy __unused) +{ + u_int *len_list; + uint64_t reg; + int i; + + if (!get_kernel_reg(ID_AA64PFR0_EL1, ®)) + return; + + if (ID_AA64PFR0_SVE_VAL(reg) == ID_AA64PFR0_SVE_NONE) + return; + + len_list = malloc(sizeof(*len_list) * (mp_maxid + 1), M_TEMP, + M_WAITOK | M_ZERO); + smp_rendezvous(NULL, sve_pcpu_read, NULL, len_list); + + sve_max_vector_len = ZCR_LEN_BYTES(ZCR_LEN_MASK); + CPU_FOREACH(i) { + if (bootverbose) + printf("CPU%d SVE vector length: %u\n", i, len_list[i]); + sve_max_vector_len = MIN(sve_max_vector_len, len_list[i]); + } + free(len_list, M_TEMP); + + if (bootverbose) + printf("SVE with %u byte vectors\n", sve_max_vector_len); + + if (sve_max_vector_len > 0) { + EVENTHANDLER_REGISTER(thread_dtor, sve_thread_dtor, NULL, + EVENTHANDLER_PRI_ANY); + } +} +SYSINIT(sve, SI_SUB_SMP, SI_ORDER_ANY, sve_init, NULL); + struct fpu_kern_ctx * fpu_kern_alloc_ctx(u_int flags) { diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 2c4707679432..667353831f48 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2607,6 +2607,13 @@ #define VBAR_EL12_op2 0 /* ZCR_EL1 - SVE Control Register */ +#define ZCR_EL1 MRS_REG(ZCR_EL1) +#define ZCR_EL1_REG MRS_REG_ALT_NAME(ZCR_EL1_REG) +#define ZCR_EL1_REG_op0 3 +#define ZCR_EL1_REG_op1 0 +#define ZCR_EL1_REG_CRn 1 +#define ZCR_EL1_REG_CRm 2 +#define ZCR_EL1_REG_op2 0 #define ZCR_LEN_SHIFT 0 #define ZCR_LEN_MASK (0xf << ZCR_LEN_SHIFT) #define ZCR_LEN_BYTES(x) ((((x) & ZCR_LEN_MASK) + 1) * 16) diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index d7392d5f2032..273b53cdc6cf 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -59,17 +59,19 @@ struct pcb { u_int pcb_flags; #define PCB_SINGLE_STEP_SHIFT 0 #define PCB_SINGLE_STEP (1 << PCB_SINGLE_STEP_SHIFT) - uint32_t pcb_pad1; + u_int pcb_sve_len; /* The SVE vector length */ struct vfpstate *pcb_fpusaved; int pcb_fpflags; #define PCB_FP_STARTED 0x00000001 +#define PCB_FP_SVEVALID 0x00000002 #define PCB_FP_KERN 0x40000000 #define PCB_FP_NOSAVE 0x80000000 /* The bits passed to userspace in get_fpcontext */ -#define PCB_FP_USERMASK (PCB_FP_STARTED) +#define PCB_FP_USERMASK (PCB_FP_STARTED | PCB_FP_SVEVALID) u_int pcb_vfpcpu; /* Last cpu this thread ran VFP code */ - uint64_t pcb_reserved[5]; + void *pcb_svesaved; + uint64_t pcb_reserved[4]; /* * The userspace VFP state. The pcb_fpusaved pointer will point to diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index 47d068d6050c..fc93908add0b 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -80,6 +80,12 @@ void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *); void vfp_save_state_savectx(struct pcb *); void vfp_save_state_switch(struct thread *); +void vfp_to_sve_sync(struct thread *); +void sve_to_vfp_sync(struct thread *); + +size_t sve_max_buf_size(void); +size_t sve_buf_size(struct thread *); +bool sve_restore_state(struct thread *); struct fpu_kern_ctx; From nobody Mon Sep 30 12:23:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKx52Bk6z5YD2V; Mon, 30 Sep 2024 12:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKx51VPXz4LXZ; Mon, 30 Sep 2024 12:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1JiI1o6DrCeD4jCrw8PpI6NONl+mlAXhi4w4pIsNCrs=; b=fI9ifPh0QEmm0cJMIoHU/7Ga4ad3QVPEmPBLId6c2DM0ectRwPPzy1pG8OD067AXWywkcB /Bzn1zwvE4XP2kYSHD0R+wigHACoohZKJ/87pMuBSh/N+54iLLuJpsji+F6zbrBboaRRvy sLctIglT5Wr7cWkmwXsrWp22viTqDgM8ptzQaT+8KdTJKE8jc4wjq5/FaXJRf8q0LWOBa3 8PPrr7ZhQcbglt7jIkGi+jxvNswJxpfVyNvEaqljDp8frhYfN7mjWpq3p2MuYMuBeWJlvq UYVyuFtZJOF2QI6ASxr859MNqZ9ecPg2jtRNz/i57fFUXg/zZz2cbMy3ujXEEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1JiI1o6DrCeD4jCrw8PpI6NONl+mlAXhi4w4pIsNCrs=; b=b6qY3qPwXHthldd0FZg9bVxwhVGWIhJtIgmD+z9P9zuS8z2rOIISdNFAsyX6IxyqJ6gz/1 NchXuxzDLAt9UNZrv7VNE1/KQurYJK4JIITMhpVJX3wdV/hNAZ2rZGEmVOMiJ9MWwnNuMX 7YXapDReEb9HJSHumM4+5NpxaHDateTgMXuaKczxFErZ8B8480wDPUBr018q3KvTERTe3D vb5s12io9cf9Z13pJvop/fV95Z0tiieip1VlH5a18RBc4phwmUKTER8V4f01WBJeKXqp92 EhKScTp7cYTLH4vtyCgSYuQ+z9RmvV/hal1OZVDFNqxqhWNA0M96slb0OS39cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699017; a=rsa-sha256; cv=none; b=miQEYX2vDAxEeucyrajWJiCi4o5QO0eGPtKg/mlNPppnt6VYtySlLij7mykACoxd6als/f EvVkC8KmscmgL4eNDgFxA6tiBmzMAkLYuoBvuqHqWeKS5cKtg34r5hMK8jdhISMeGVPmDA E2RZMzrfHEkjBWNgZX7m5pTF+vNLriJW/a5rFMrKRXqsASY3CIW+VDFVEUdIwPF/1ohywx YIsJrGpV4Tl5SeP5VNv/4A4veI7oSYWVHFI853Sap8gIPkcY3+iBqgcfYsfJUREmyTSYjQ YO2ejxQMharA3cZN9hvg8dFQ26L6nIulI2GEYBTiCx2AEfgraA7MjgBSM7NeXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKx515RfztHk; Mon, 30 Sep 2024 12:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNb85070915; Mon, 30 Sep 2024 12:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNbd4070912; Mon, 30 Sep 2024 12:23:37 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:37 GMT Message-Id: <202409301223.48UCNbd4070912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e45132e97803 - main - arm64: Add the SVE registers to the signal frame List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e45132e978030f0aa964d975a9fbad5614f260bd Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e45132e978030f0aa964d975a9fbad5614f260bd commit e45132e978030f0aa964d975a9fbad5614f260bd Author: Andrew Turner AuthorDate: 2024-09-27 13:37:03 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Add the SVE registers to the signal frame Use the new extended register support in the arm64 signal frame to handle the SVE registers. As these registers alias the VFP registers we use the floating point register values to restore the lower bits of the SVE registers. This is to support software that doesn't understand SVE to continue working. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43307 --- sys/arm64/arm64/exec_machdep.c | 88 +++++++++++++++++++++++++++++++++++++++++- sys/arm64/include/ucontext.h | 8 ++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 6fece751cc25..6a536233a62d 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -463,9 +463,10 @@ set_mcontext(struct thread *td, mcontext_t *mcp) #define PSR_13_MASK 0xfffffffful struct arm64_reg_context ctx; struct trapframe *tf = td->td_frame; + struct pcb *pcb; uint64_t spsr; vm_offset_t addr; - int error; + int error, seen_types; bool done; spsr = mcp->mc_gpregs.gp_spsr; @@ -511,7 +512,11 @@ set_mcontext(struct thread *td, mcontext_t *mcp) /* Read any register contexts we find */ if (mcp->mc_ptr != 0) { addr = mcp->mc_ptr; + pcb = td->td_pcb; + +#define CTX_TYPE_FLAG_SVE (1 << 0) + seen_types = 0; done = false; do { if (!__is_aligned(addr, @@ -523,6 +528,38 @@ set_mcontext(struct thread *td, mcontext_t *mcp) return (error); switch (ctx.ctx_id) { +#ifdef VFP + case ARM64_CTX_SVE: { + struct sve_context sve_ctx; + size_t buf_size; + + if ((seen_types & CTX_TYPE_FLAG_SVE) != 0) + return (EINVAL); + seen_types |= CTX_TYPE_FLAG_SVE; + + if (pcb->pcb_svesaved == NULL) + return (EINVAL); + + /* XXX: Check pcb_svesaved is valid */ + + buf_size = sve_buf_size(td); + /* Check the size is valid */ + if (ctx.ctx_size != + (sizeof(sve_ctx) + buf_size)) + return (EINVAL); + + memset(pcb->pcb_svesaved, 0, + sve_max_buf_size()); + + /* Copy the SVE registers from userspace */ + if (copyin((void *)(addr + sizeof(sve_ctx)), + pcb->pcb_svesaved, buf_size) != 0) + return (EINVAL); + + pcb->pcb_fpflags |= PCB_FP_SVEVALID; + break; + } +#endif case ARM64_CTX_END: done = true; break; @@ -532,6 +569,8 @@ set_mcontext(struct thread *td, mcontext_t *mcp) addr += ctx.ctx_size; } while (!done); + +#undef CTX_TYPE_FLAG_SVE } return (0); @@ -592,7 +631,7 @@ set_fpcontext(struct thread *td, mcontext_t *mcp) sizeof(mcp->mc_fpregs.fp_q)); curpcb->pcb_fpustate.vfp_fpcr = mcp->mc_fpregs.fp_cr; curpcb->pcb_fpustate.vfp_fpsr = mcp->mc_fpregs.fp_sr; - curpcb->pcb_fpflags = mcp->mc_fpregs.fp_flags & PCB_FP_USERMASK; + curpcb->pcb_fpflags = mcp->mc_fpregs.fp_flags & PCB_FP_STARTED; } #endif } @@ -612,6 +651,13 @@ sys_sigreturn(struct thread *td, struct sigreturn_args *uap) if (error != 0) return (error); + /* + * Sync the VFP and SVE registers. To be backwards compatible we + * use the VFP registers to restore the lower bits of the SVE + * register it aliases. + */ + vfp_to_sve_sync(td); + /* Restore signal mask. */ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0); @@ -637,9 +683,47 @@ sendsig_ctx_end(struct thread *td, vm_offset_t *addrp) return (true); } +static bool +sendsig_ctx_sve(struct thread *td, vm_offset_t *addrp) +{ + struct sve_context ctx; + struct pcb *pcb; + size_t buf_size; + vm_offset_t ctx_addr; + + pcb = td->td_pcb; + /* Do nothing if sve hasn't started */ + if (pcb->pcb_svesaved == NULL) + return (true); + + MPASS(pcb->pcb_svesaved != NULL); + + buf_size = sve_buf_size(td); + + /* Address for the full context */ + *addrp -= sizeof(ctx) + buf_size; + ctx_addr = *addrp; + + memset(&ctx, 0, sizeof(ctx)); + ctx.sve_ctx.ctx_id = ARM64_CTX_SVE; + ctx.sve_ctx.ctx_size = sizeof(ctx) + buf_size; + ctx.sve_vector_len = pcb->pcb_sve_len; + ctx.sve_flags = 0; + + /* Copy out the header and data */ + if (copyout(&ctx, (void *)ctx_addr, sizeof(ctx)) != 0) + return (false); + if (copyout(pcb->pcb_svesaved, (void *)(ctx_addr + sizeof(ctx)), + buf_size) != 0) + return (false); + + return (true); +} + typedef bool(*ctx_func)(struct thread *, vm_offset_t *); static const ctx_func ctx_funcs[] = { sendsig_ctx_end, /* Must be first to end the linked list */ + sendsig_ctx_sve, NULL, }; diff --git a/sys/arm64/include/ucontext.h b/sys/arm64/include/ucontext.h index dedbd061ec6b..a4f0ee243b3a 100644 --- a/sys/arm64/include/ucontext.h +++ b/sys/arm64/include/ucontext.h @@ -62,6 +62,14 @@ struct arm64_reg_context { }; #define ARM64_CTX_END 0xa5a5a5a5 +#define ARM64_CTX_SVE 0x00657673 + +struct sve_context { + struct arm64_reg_context sve_ctx; + __uint16_t sve_vector_len; + __uint16_t sve_flags; + __uint16_t sve_reserved[2]; +}; struct __mcontext { struct gpregs mc_gpregs; From nobody Mon Sep 30 12:23:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKx63ZRKz5YDHP; Mon, 30 Sep 2024 12:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKx62B2Xz4Ls9; Mon, 30 Sep 2024 12:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYhiDDcyDu7HkrbuXSVG0B8veK7Tbznc5pRdBE++aEA=; b=ENq7pshurJ+BuM9P+ZMUqUSkZuKhkxcWPtvIzbyjypDLrwkvkpAdOPEaQospLUxtBrXrf2 sht/Y/ti+e/2/0lD8Sw87ffZ2W8plARCdnMuv77gVGXk3MhoHzfzedKmMyEaemG2+JgORU ZHuXtEDkDEW90eslyoWUtpkECJhO2hvDLaLz8wnsD8MTV0G8TS9/yKnItdB64pIyGF7iEG xvZeNUOeJl6OSI2yvDaBZLm8zYPGrt0rK6fk7bMy+R3Qw3rrovnjO6VYyX2khCKuSQFfPa 5Z5V63pMAsW2NdxGUk1XraIXn02BL7plTwgcS8HwWLd3YzdADzjuRVTAQR6ACg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYhiDDcyDu7HkrbuXSVG0B8veK7Tbznc5pRdBE++aEA=; b=TQWz4yJPf5g2ROynwvRKLN9mJi/3H8kDc5JuASvi8cf+IqcnoJpfFyrYdQfYxv5TY6amUH KZZ893ogD1HxnBteLkjWh1dyfP2opTTvBgQKz7wNN7wnCNJPZ42Xn+WVi8+Z0CFgbWZCuB EFKieUsaFKakAAO1nAzOJNekvrHXsOU0id601lPWa1uex+ejt89PtcYuJlQMjCfNDRp8J+ tS4fAzdY7dBfoRYrIz2TB8hrJczOJa5abh67Xy65FzXO8YXsCl8VlqL56GsI0vqHygl87F APjiLq7YVW6NwO3I4JQN14DlP0YUPj/Q5Qyr+qRwsP/lBqbUEmciruo9KW0LoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699018; a=rsa-sha256; cv=none; b=npER8E6xeCSS7PAP/DGgVDfm7IqvrUo5Xa0X4kMlnkOrceH+Js9yVx0+vVL705+XLQMy+M 9GH5fV/yTcZ/9LCkAOJA31dSGL8Qowiqhy3W0mkakeAeAdq++b152xTqxl0F7oglSIuKB1 G0ZRuBQDaTsfKvG6GsIM73nU7l0dUjSFh3HnxtBh9jQ+P7HRWW9vWFewVHFoUbHju5oQua OCMH17G3/aMtGMuaFDjJReClR36kOXH1tOLQlUBeXZ+ek6sZ7HCQqWB1LS7R8hWLQ0WGFx 0Ta+imXKzp7/93NGFUOS/7xTLHZKMkkQN5Ryf53TH4lEuyrEwSyCd7NIGYj20g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKx61p6VzsCD; Mon, 30 Sep 2024 12:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNcxa070960; Mon, 30 Sep 2024 12:23:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNcJM070957; Mon, 30 Sep 2024 12:23:38 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:38 GMT Message-Id: <202409301223.48UCNcJM070957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 87a58d931db7 - main - arm64: Add an SVE sysarch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87a58d931db7b40d8d225a7edb82b78937078b7f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=87a58d931db7b40d8d225a7edb82b78937078b7f commit 87a58d931db7b40d8d225a7edb82b78937078b7f Author: Andrew Turner AuthorDate: 2024-09-27 13:37:10 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Add an SVE sysarch To allow for user space to read the SVE vector length add a sysarch handler to return the value to userspace. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43308 --- sys/arm64/arm64/sys_machdep.c | 13 +++++++++++++ sys/arm64/include/sysarch.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/sys/arm64/arm64/sys_machdep.c b/sys/arm64/arm64/sys_machdep.c index eedc57f7c572..81b8ef73d9c0 100644 --- a/sys/arm64/arm64/sys_machdep.c +++ b/sys/arm64/arm64/sys_machdep.c @@ -28,6 +28,7 @@ */ #include +#include #include #include #include @@ -36,14 +37,19 @@ #include #include +#include #include #include +#include + int sysarch(struct thread *td, struct sysarch_args *uap) { struct arm64_guard_page_args gp_args; + struct pcb *pcb; vm_offset_t eva; + unsigned long sve_len; int error; switch (uap->op) { @@ -73,6 +79,13 @@ sysarch(struct thread *td, struct sysarch_args *uap) error = pmap_bti_set(vmspace_pmap(td->td_proc->p_vmspace), trunc_page(gp_args.addr), round_page(eva)); break; + case ARM64_GET_SVE_VL: + pcb = td->td_pcb; + sve_len = pcb->pcb_sve_len; + error = EINVAL; + if (sve_len != 0) + error = copyout(&sve_len, uap->parms, sizeof(sve_len)); + break; default: error = EINVAL; break; diff --git a/sys/arm64/include/sysarch.h b/sys/arm64/include/sysarch.h index 83094943423a..b7846651c031 100644 --- a/sys/arm64/include/sysarch.h +++ b/sys/arm64/include/sysarch.h @@ -46,6 +46,9 @@ struct arm64_guard_page_args { __size_t len; }; +#define ARM64_GET_SVE_VL 0x200 +/* Reserved ARM64_SET_SVE_VL 0x201 */ + #ifndef _KERNEL __BEGIN_DECLS From nobody Mon Sep 30 12:23:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKx76ggrz5YDHS; Mon, 30 Sep 2024 12:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKx73zyTz4LPx; Mon, 30 Sep 2024 12:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkbzKiFriJ8X+C3G77V3Lx8EU04ADWDzGp3bx7Ig4C0=; b=uWEi7XhbRJqZvtIlRYCi4c1HV9p57kxHYDJc5dgs2Ktgfv9b8YKwOnNEUrZSvM48VzWFGN NUfNdUZlpF+0mp3oRrdA6D2wBMsLXlMzfogXYAJ8SmFXzxz1/o/DrJ533074DvnhBvQCKg H3RWhK4Iu2b7pnl/aGs3F5gU+4eRYyY7lnPkDHeDo9jN9T7FsJ+AlUVA7FZ4Sebda0Ib41 N4CStUvunT6WHGBRrO5+r59FgswxZS4R/wAXuo8pjdgw2K5W7s0qMnLSnLBIXZXmsypC/2 kComJjBYlitvl0YUik6z1sRuEDZDWA8LSEagdk0ellrSAmoF/y0fNxTVFGeG+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkbzKiFriJ8X+C3G77V3Lx8EU04ADWDzGp3bx7Ig4C0=; b=IOM9RU425PGnIkfajJzB7z7HqiwqTDnuYfb1/rpkZxwIQu+zrwfiCNAEizGGNN2r3IcIVz 0OdB5sOBRGlpS3DDZoeHwgknNZkTOl0cnr8RNeqX1AaBpJHRuPVl7qvkfPxUI6Jqw9uTGl 08+OaCV6xS25LIbiobcewiEKr3GoYsfTOsK9pf3S0lMJ/m+keYExtGPMKTU1C/AuOEyXz7 hb/9FBLylf8gc//r5PWdxhcKJmCWhu0frXSUUflIBHR2U+2g8I5XldcDmPvYu4pYdSZHoM d9DJ4rwc8QPyypHp1UFQPmHV+Ch4f+xpG+czZIsmmE+pprXHcg4G9UbB096Fig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699019; a=rsa-sha256; cv=none; b=sj4wavq424K2iA3+x1x8OSh2WUzCy6TzmhQYjSJDbG1F+Ob4O1l1FwO+Eg+znhKh/f2cVn Yj6cVWg+actwiJ81mPQGmxJPO2EFROhr37btfOwv4LCVko5Sfg+nqsz082zthsGasUoUUS 5ihtpoahFUd++qlYRlfZSdlybL2yOnhVWP3MVN2jZBgJio8R28O1ectuIaofrdTFlbgThQ gAfgzLvErwscB6U7BRDrios0zn4BJcWhPmy18weH9rQhTipy9Ylk6RVR54W3dqRDQiIkIC vteNzXbXgnsMBpEBQv0T96Gh8YAy12K8Tahr9O9SoIikE3+ts1u/Udlj0avOSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKx739nJzsZn; Mon, 30 Sep 2024 12:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNd3K071011; Mon, 30 Sep 2024 12:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNdNK071008; Mon, 30 Sep 2024 12:23:39 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:39 GMT Message-Id: <202409301223.48UCNdNK071008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: aab60068943d - main - arm64: Support SVE in ptrace and core dumps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aab60068943d733b0b4573e5481c543ab3d45a00 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aab60068943d733b0b4573e5481c543ab3d45a00 commit aab60068943d733b0b4573e5481c543ab3d45a00 Author: Andrew Turner AuthorDate: 2024-09-27 13:37:17 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Support SVE in ptrace and core dumps Add the NT_ARM_SVE note type and use it to access the SVE registers from ptrace. This allows userspace to modify the full SVE register values. Try to follow the Linux semantics to allow debuggers to use this with minimal changes. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43309 --- sys/arm64/arm64/vfp.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/arm64/include/reg.h | 13 +++++ sys/sys/elf_common.h | 1 + 3 files changed, 155 insertions(+) diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index d57927991c03..a3aa77ed6180 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -30,12 +30,14 @@ #ifdef VFP #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -918,6 +920,145 @@ sve_init(const void *dummy __unused) } SYSINIT(sve, SI_SUB_SMP, SI_ORDER_ANY, sve_init, NULL); +static bool +get_arm64_sve(struct regset *rs, struct thread *td, void *buf, + size_t *sizep) +{ + struct svereg_header *header; + struct pcb *pcb; + size_t buf_size; + uint16_t sve_flags; + + pcb = td->td_pcb; + + /* If there is no SVE support in HW then we don't support NT_ARM_SVE */ + if (pcb->pcb_sve_len == 0) + return (false); + + sve_flags = 0; + if ((pcb->pcb_fpflags & PCB_FP_SVEVALID) == 0) { + /* If SVE hasn't been used yet provide the VFP registers */ + buf_size = sizeof(struct fpreg); + sve_flags |= SVEREG_FLAG_FP; + } else { + /* We have SVE registers */ + buf_size = sve_buf_size(td); + sve_flags |= SVEREG_FLAG_SVE; + KASSERT(pcb->pcb_svesaved != NULL, ("%s: no saved sve", + __func__)); + } + + if (buf != NULL) { + KASSERT(*sizep == sizeof(struct svereg_header) + buf_size, + ("%s: invalid size", __func__)); + + if (td == curthread && (pcb->pcb_fpflags & PCB_FP_STARTED) != 0) + vfp_save_state(td, pcb); + + header = buf; + memset(header, 0, sizeof(*header)); + + header->sve_size = sizeof(struct svereg_header) + buf_size; + header->sve_maxsize = sizeof(struct svereg_header) + + sve_max_buf_size(); + header->sve_vec_len = pcb->pcb_sve_len; + header->sve_max_vec_len = sve_max_vector_len; + header->sve_flags = sve_flags; + + if ((sve_flags & SVEREG_FLAG_REGS_MASK) == SVEREG_FLAG_FP) { + struct fpreg *fpregs; + + fpregs = (void *)(&header[1]); + memcpy(fpregs->fp_q, pcb->pcb_fpustate.vfp_regs, + sizeof(fpregs->fp_q)); + fpregs->fp_cr = pcb->pcb_fpustate.vfp_fpcr; + fpregs->fp_sr = pcb->pcb_fpustate.vfp_fpsr; + } else { + memcpy((void *)(&header[1]), pcb->pcb_svesaved, + buf_size); + } + } + *sizep = sizeof(struct svereg_header) + buf_size; + + return (true); +} + +static bool +set_arm64_sve(struct regset *rs, struct thread *td, void *buf, size_t size) +{ + struct svereg_header *header; + struct pcb *pcb; + size_t buf_size; + uint16_t sve_flags; + + pcb = td->td_pcb; + + /* If there is no SVE support in HW then we don't support NT_ARM_SVE */ + if (pcb->pcb_sve_len == 0) + return (false); + + sve_flags = 0; + if ((pcb->pcb_fpflags & PCB_FP_SVEVALID) == 0) { + /* + * If the SVE state is invalid it provide the FP registers. + * This may be beause it hasn't been used, or it has but + * was switched out in a system call. + */ + buf_size = sizeof(struct fpreg); + sve_flags |= SVEREG_FLAG_FP; + } else { + /* We have SVE registers */ + MPASS(pcb->pcb_svesaved != NULL); + buf_size = sve_buf_size(td); + sve_flags |= SVEREG_FLAG_SVE; + KASSERT(pcb->pcb_svesaved != NULL, ("%s: no saved sve", + __func__)); + } + + if (size != sizeof(struct svereg_header) + buf_size) + return (false); + + header = buf; + /* Sanity checks on the header */ + if (header->sve_size != sizeof(struct svereg_header) + buf_size) + return (false); + + if (header->sve_maxsize != sizeof(struct svereg_header) + + sve_max_buf_size()) + return (false); + + if (header->sve_vec_len != pcb->pcb_sve_len) + return (false); + + if (header->sve_max_vec_len != sve_max_vector_len) + return (false); + + if (header->sve_flags != sve_flags) + return (false); + + if ((sve_flags & SVEREG_FLAG_REGS_MASK) == SVEREG_FLAG_FP) { + struct fpreg *fpregs; + + fpregs = (void *)(&header[1]); + memcpy(pcb->pcb_fpustate.vfp_regs, fpregs->fp_q, + sizeof(fpregs->fp_q)); + pcb->pcb_fpustate.vfp_fpcr = fpregs->fp_cr; + pcb->pcb_fpustate.vfp_fpsr = fpregs->fp_sr; + } else { + /* Restore the SVE registers */ + memcpy(pcb->pcb_svesaved, (void *)(&header[1]), buf_size); + } + + return (true); +} + +static struct regset regset_arm64_sve = { + .note = NT_ARM_SVE, + .get = get_arm64_sve, + .set = set_arm64_sve, +}; +ELF_REGSET(regset_arm64_sve); + struct fpu_kern_ctx * fpu_kern_alloc_ctx(u_int flags) { diff --git a/sys/arm64/include/reg.h b/sys/arm64/include/reg.h index c699752197a8..4226385480e8 100644 --- a/sys/arm64/include/reg.h +++ b/sys/arm64/include/reg.h @@ -63,6 +63,19 @@ struct fpreg32 { int dummy; }; +#define SVEREG_FLAG_REGS_MASK 0x0001 +#define SVEREG_FLAG_FP 0x0000 +#define SVEREG_FLAG_SVE 0x0001 + +struct svereg_header { + __uint32_t sve_size; + __uint32_t sve_maxsize; + __uint16_t sve_vec_len; + __uint16_t sve_max_vec_len; + __uint16_t sve_flags; + __uint16_t sve_reserved; +}; + struct dbreg { __uint8_t db_debug_ver; __uint8_t db_nbkpts; diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 6cb92d1011fe..ec5bbbf9f0e6 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -826,6 +826,7 @@ typedef struct { #define NT_X86_XSTATE 0x202 /* x86 XSAVE extended state. */ #define NT_ARM_VFP 0x400 /* ARM VFP registers */ #define NT_ARM_TLS 0x401 /* ARM TLS register */ +#define NT_ARM_SVE 0x405 /* ARM SVE registers */ #define NT_ARM_ADDR_MASK 0x406 /* arm64 address mask (e.g. for TBI) */ /* GNU note types. */ From nobody Mon Sep 30 12:23:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKx86P5jz5YDHW; Mon, 30 Sep 2024 12:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKx84YxJz4LVN; Mon, 30 Sep 2024 12:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHKE8fqVEfxZEBCbOTExUy89ZanFNRM3gfq+m0ojPyU=; b=LYZzUrPLApYcsNJpX4xu6xLvtfZHkYMI1FnVHST5KG5tlhEMYb/uK5dI7lGUJnp95y/qMl 6a5+PQ7kfRneO880JJGsiW1D3Z5wysx3mx4e0aksUF0kMZnfOdVnCfFNIbHNNHIH3mzgoa HqahBijOYitkrYTitUVj8T296ErYpDSxfKUG/lXaskIFA3UZe6lQqoOLNUhbRMSDyHSGyl GAUvnmOKxCiHAiBhkQlrFH7GGpC3ivwRMPg5fK7e3ZpW45odgvp8ssWnQJzCbQNAHFCsJ2 bo/ybgNMa8hzmo7On4W+x2ztAcBjCKJPSmfrAYgH/oPS2lK2gHof/FsPorwVaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHKE8fqVEfxZEBCbOTExUy89ZanFNRM3gfq+m0ojPyU=; b=bwTjc2QjQfGMlbsWlNB9WGQbQ04eR286qpPR8yIaDbCnfxWXTSwV9l9VYcu2odpWA2Dsxg FEjCjUchGg6pudiNUK69PJd0vCfQda8GImQPnN+5GUCE7JWl7fsRXOr012FGyUfBJB2CFG RA18nmU8GWKJln8q7urBlElYcfATaYch1d5ebuarI3aE5q+U85rlOMJK9TuiudiBAZ5vOC WbeMsk1wBR0gP25ZxCqxMP4BsySLRluTCvCdC0DrXq2AIJkra6P3vtPvLk53EhxGmYLEGI QX2yxmyvt+2L7ZPN/SLpSCrkwMddxZXNknfLydH69Ac7BR83im10MF278fEnTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699020; a=rsa-sha256; cv=none; b=iLOxb5+qyS88+yynmx1gJ6NmmITs/xOc2uHCST7Q7oU0NN08AeQGH21fev2TvlzgAH3mjB 85JZ5z/dvD3Rq0aAUX54rXGdiOriw8gAogppufYHrJ12oso+0JjCorbAEVm9E4SzHOjPph n9YlC4Afb1foKDapVWJcMletMJcqdtL4MPbFnzEMhMS3tQpQfbILG6sDMyQl9FTzKTjEYQ qApxJ9BDWbM3a3vxSIXNHL9799VcVHUadRLMWdsPk24E6nZJAor2fP22wiCFETrMU4RsI+ Vk+Mw+AU1g2valjUOpjoK8TMqV3DnNH7Kyw2pfSnWLvUIgK9N23ST22Lvy1UeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKx849xFztBw; Mon, 30 Sep 2024 12:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNe2H071064; Mon, 30 Sep 2024 12:23:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNeDO071061; Mon, 30 Sep 2024 12:23:40 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:40 GMT Message-Id: <202409301223.48UCNeDO071061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: fe5ed2496e44 - main - arm64: Don't trap SVE to EL2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe5ed2496e44aec018a6215175bba225b20d81fd Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fe5ed2496e44aec018a6215175bba225b20d81fd commit fe5ed2496e44aec018a6215175bba225b20d81fd Author: Andrew Turner AuthorDate: 2024-09-27 13:41:08 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Don't trap SVE to EL2 As with floating point instructions don't trap SVE instructions to the hypervisor. This lets us handle then in the kernel. Reviewed by: imp (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43303 --- sys/arm64/include/hypervisor.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 0a138006b108..1ba1756ecdf2 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -55,11 +55,12 @@ /* Valid if HCR_EL2.E2H == 0 */ #define CPTR_TRAP_ALL 0xc01037ff /* Enable all traps */ #define CPTR_RES0 0x7fefc800 -#define CPTR_RES1 0x000033ff +#define CPTR_RES1 0x000032ff #define CPTR_TFP 0x00000400 #define CPTR_TTA 0x00100000 /* Valid if HCR_EL2.E2H == 1 */ #define CPTR_E2H_TRAP_ALL 0xd0000000 +#define CPTR_E2H_ZPEN 0x00030000 #define CPTR_E2H_FPEN 0x00300000 #define CPTR_E2H_TTA 0x10000000 /* Unconditionally valid */ From nobody Mon Sep 30 12:23:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKxB10xPz5YDK8; Mon, 30 Sep 2024 12:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKx95cywz4Lsr; Mon, 30 Sep 2024 12:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LA4jvNLeGJhEG8Rdt+O2UUzPloQ+sE8xSIIjzRRibGM=; b=C9NyCN1qC+qK5SZ1WEc5yHUO3KxCXVWG1zfw25y2e5Z21TbNdH72UvBFdHyEKuIUhpTqyw Yg2Mh5c5nYDBpdhjpzaIs5JzkfDsk11Drdav5/E8bi9mfvF08zoU2k8iI4n13zgKASViik e8j4VLvQ3dGkJDHPJ0mNZZ+crVfgiKMmD+xBgfIY2gLXJ1nBaIfam+DUBoDtfwWcybSNpx 37ATw7OWZjODURSWTr9Vt76OdblkF3Y0H78KB0O2M4lBLHihKiHx348zitaauJE9cKUKSK yUhiPlC417G/hII1jbKf2On8b9tGmPwIBgAA13Svzcpdx1ZpSv4tMabonIuUaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LA4jvNLeGJhEG8Rdt+O2UUzPloQ+sE8xSIIjzRRibGM=; b=kCrt6aLHoKXg1ze+vqdIxB06wgPZ58pWGnprWu0W8nLTcDaecwU6kaBgEMVwiN//5jjUYL S3pYfLz2A/gn/3sh5s1pApZBFco9cCEe8K8n0SKoYjqA5YlzXQ4Tu/tPyjz/eXIOY9Jyc1 82Wd6NuMYuNcu74iDgeuzLKhc/XFGBghcK7G5eUg8EFRasBVaIlv4Kf2hYLPgAGmoooPTD 6PLrMvUn/NIo9fq4R1qwkgKlLHX99xRFKwV4J23JM3Noomaze7h4Z6zRrAwaNz2PTX88ok Q9NJwrvipWbTJkbSOEZloYgd37pJlktyamjHDSUKD11TpsTAbZxWNGjLkWLwWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699021; a=rsa-sha256; cv=none; b=WtqTbDi7dgXsxXygrOvOgwZMOhYuL+KanLxHr/bLb6dymT8zlQGp6Dg+iPDmlgreURPZPK F9gq7VzAWoFvtPjM3C/+4rZyeVJ967ZgEIVJIQ1/UlfRO2XBst4SDoPU7AqOXes4BqrREb Ifi2W494AP9Os4ff3CWWouidja4EInT26T2AIhG67F7SKjRDavII8tGlkg9YWj4REMS8vF AmLLiJ6MuHkCI2Kqn0OfU/7AmThKVWWDSZwyXtqlOcDi5nZmRRMCHi6Nw6Sxeeq2LSz8Tq 4odnRF4ZZQJUrws0VqmO2LT5oJDFLVzf3htLNs1uNWpZjVEAjI3fSvxyl0D69A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKx95BxNzsZp; Mon, 30 Sep 2024 12:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNfHM071106; Mon, 30 Sep 2024 12:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNfH4071103; Mon, 30 Sep 2024 12:23:41 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:41 GMT Message-Id: <202409301223.48UCNfH4071103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 205c1007be6d - main - arm64: Enable SVE in userspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 205c1007be6d57b2eb8620f79384cb2299dde40e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=205c1007be6d57b2eb8620f79384cb2299dde40e commit 205c1007be6d57b2eb8620f79384cb2299dde40e Author: Andrew Turner AuthorDate: 2024-09-27 14:06:03 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Enable SVE in userspace Report when SVE is present and allow it to be used by calling sve_restore_state on an SVE exception from userspace. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43310 --- sys/arm64/arm64/identcpu.c | 82 ++++++++++++++++++++++++++++++++++++++-------- sys/arm64/arm64/trap.c | 6 ++-- sys/arm64/include/armreg.h | 1 + 3 files changed, 74 insertions(+), 15 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index eead0051d315..3bf4f9a80c90 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1383,13 +1383,10 @@ static const struct mrs_field_value id_aa64pfr0_sve[] = { MRS_FIELD_VALUE_END, }; -#if 0 -/* Enable when we add SVE support */ static const struct mrs_field_hwcap id_aa64pfr0_sve_caps[] = { MRS_HWCAP(1, HWCAP_SVE, ID_AA64PFR0_SVE_IMPL), MRS_HWCAP_END }; -#endif static const struct mrs_field_value id_aa64pfr0_ras[] = { MRS_FIELD_VALUE(ID_AA64PFR0_RAS_NONE, ""), @@ -1463,7 +1460,8 @@ static const struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(ID_AA64PFR0, AMU, false, MRS_EXACT, id_aa64pfr0_amu), MRS_FIELD(ID_AA64PFR0, MPAM, false, MRS_EXACT, id_aa64pfr0_mpam), MRS_FIELD(ID_AA64PFR0, SEL2, false, MRS_EXACT, id_aa64pfr0_sel2), - MRS_FIELD(ID_AA64PFR0, SVE, false, MRS_EXACT, id_aa64pfr0_sve), + MRS_FIELD_HWCAP_SPLIT(ID_AA64PFR0, SVE, false, MRS_LOWER, MRS_EXACT, + id_aa64pfr0_sve, id_aa64pfr0_sve_caps), MRS_FIELD(ID_AA64PFR0, RAS, false, MRS_EXACT, id_aa64pfr0_ras), MRS_FIELD(ID_AA64PFR0, GIC, false, MRS_EXACT, id_aa64pfr0_gic), MRS_FIELD_HWCAP(ID_AA64PFR0, AdvSIMD, true, MRS_LOWER, @@ -1578,59 +1576,117 @@ static const struct mrs_field_value id_aa64zfr0_f64mm[] = { MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_f64mm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEF64MM, ID_AA64ZFR0_F64MM_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_f32mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, F32MM, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_f32mm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEF32MM, ID_AA64ZFR0_F32MM_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_i8mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, I8MM, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_i8mm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEI8MM, ID_AA64ZFR0_I8MM_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_sm4[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, SM4, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_sm4_caps[] = { + MRS_HWCAP(2, HWCAP2_SVESM4, ID_AA64ZFR0_SM4_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_sha3[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, SHA3, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_sha3_caps[] = { + MRS_HWCAP(2, HWCAP2_SVESHA3, ID_AA64ZFR0_SHA3_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_bf16[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, BF16, NONE, BASE), MRS_FIELD_VALUE(ID_AA64ZFR0_BF16_EBF, "BF16+EBF"), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_bf16_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEBF16, ID_AA64ZFR0_BF16_BASE), + MRS_HWCAP(2, HWCAP2_SVE_EBF16, ID_AA64ZFR0_BF16_EBF), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_bitperm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, BitPerm, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_bitperm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEBITPERM, ID_AA64ZFR0_BitPerm_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_aes[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, AES, NONE, BASE), MRS_FIELD_VALUE(ID_AA64ZFR0_AES_PMULL, "AES+PMULL"), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_aes_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEAES, ID_AA64ZFR0_AES_BASE), + MRS_HWCAP(2, HWCAP2_SVEPMULL, ID_AA64ZFR0_AES_PMULL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_svever[] = { MRS_FIELD_VALUE(ID_AA64ZFR0_SVEver_SVE1, "SVE1"), MRS_FIELD_VALUE(ID_AA64ZFR0_SVEver_SVE2, "SVE2"), + MRS_FIELD_VALUE(ID_AA64ZFR0_SVEver_SVE2P1, "SVE2P1"), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_svever_caps[] = { + MRS_HWCAP(2, HWCAP2_SVE2, ID_AA64ZFR0_SVEver_SVE2), + MRS_HWCAP(2, HWCAP2_SVE2P1, ID_AA64ZFR0_SVEver_SVE2P1), + MRS_HWCAP_END, +}; + static const struct mrs_field id_aa64zfr0_fields[] = { - MRS_FIELD(ID_AA64ZFR0, F64MM, false, MRS_EXACT, id_aa64zfr0_f64mm), - MRS_FIELD(ID_AA64ZFR0, F32MM, false, MRS_EXACT, id_aa64zfr0_f32mm), - MRS_FIELD(ID_AA64ZFR0, I8MM, false, MRS_EXACT, id_aa64zfr0_i8mm), - MRS_FIELD(ID_AA64ZFR0, SM4, false, MRS_EXACT, id_aa64zfr0_sm4), - MRS_FIELD(ID_AA64ZFR0, SHA3, false, MRS_EXACT, id_aa64zfr0_sha3), - MRS_FIELD(ID_AA64ZFR0, BF16, false, MRS_EXACT, id_aa64zfr0_bf16), - MRS_FIELD(ID_AA64ZFR0, BitPerm, false, MRS_EXACT, id_aa64zfr0_bitperm), - MRS_FIELD(ID_AA64ZFR0, AES, false, MRS_EXACT, id_aa64zfr0_aes), - MRS_FIELD(ID_AA64ZFR0, SVEver, false, MRS_EXACT, id_aa64zfr0_svever), + MRS_FIELD_HWCAP(ID_AA64ZFR0, F64MM, false, MRS_LOWER, + id_aa64zfr0_f64mm, id_aa64zfr0_f64mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, F32MM, false, MRS_LOWER, + id_aa64zfr0_f32mm, id_aa64zfr0_f32mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, I8MM, false, MRS_LOWER, id_aa64zfr0_i8mm, + id_aa64zfr0_i8mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SM4, false, MRS_LOWER, id_aa64zfr0_sm4, + id_aa64zfr0_sm4_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SHA3, false, MRS_LOWER, id_aa64zfr0_sha3, + id_aa64zfr0_sha3_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, BF16, false, MRS_LOWER, id_aa64zfr0_bf16, + id_aa64zfr0_bf16_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, BitPerm, false, MRS_LOWER, + id_aa64zfr0_bitperm, id_aa64zfr0_bitperm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, AES, false, MRS_LOWER, id_aa64zfr0_aes, + id_aa64zfr0_aes_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SVEver, false, MRS_LOWER, + id_aa64zfr0_svever, id_aa64zfr0_svever_caps), MRS_FIELD_END, }; diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 35defef90837..fa0b46111a34 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -639,8 +639,10 @@ do_el0_sync(struct thread *td, struct trapframe *frame) #endif break; case EXCP_SVE: - call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_elr, - exception); + /* Returns true if this thread can use SVE */ + if (!sve_restore_state(td)) + call_trapsignal(td, SIGILL, ILL_ILLTRP, + (void *)frame->tf_elr, exception); userret(td, frame); break; case EXCP_SVC32: diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 667353831f48..08a046762a58 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1583,6 +1583,7 @@ #define ID_AA64ZFR0_SVEver_VAL(x) ((x) & ID_AA64ZFR0_SVEver_MASK #define ID_AA64ZFR0_SVEver_SVE1 (UL(0x0) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_SVEver_SVE2 (UL(0x1) << ID_AA64ZFR0_SVEver_SHIFT) +#define ID_AA64ZFR0_SVEver_SVE2P1 (UL(0x2) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_AES_SHIFT 4 #define ID_AA64ZFR0_AES_MASK (UL(0xf) << ID_AA64ZFR0_AES_SHIFT) #define ID_AA64ZFR0_AES_VAL(x) ((x) & ID_AA64ZFR0_AES_MASK From nobody Mon Sep 30 12:23:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKxC0txcz5YD2f; Mon, 30 Sep 2024 12:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKxB6W87z4Lqg; Mon, 30 Sep 2024 12:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kwrG8a4N72euxXXJuW1Gjt4s/QEqazfy/vvK+5Hhcmo=; b=aVFogh+FG3OzzwgNG8GFUxm55OwM1X57exFs41REJ7THrEBXXUgM5OuLfg/bVxcYiGniSh DfX5X5kc9xmTH9qjed0TqHCPQ8la7SwexWAImMaOApFrEG86h3hAVS/H6Er2YqZ7BPQ+aw qJV8RdMxNjJD6rco/lA2QUxDsxvCXMrp33DotNrN67d8J900MS/8cZRUze6HECbT7LxoKl OmErXDNkIt/GrH5oDA0NSf+u9GFHZsB78ItS3hsJwHIzhLZau2pDBlUs8fjKatNfz1PLw5 cDf1q7UwdRWl9am4TG7vv8YwAvfbggAU/jNOoSx5E+Gokd/Tq13mPec1rGganQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kwrG8a4N72euxXXJuW1Gjt4s/QEqazfy/vvK+5Hhcmo=; b=cUpHLq+6PoF4y9nyU9PhKwPruZroMMTEKTLyl1ZJhOvA4qQp3AGmE4MREfkGUuaHJcBpVh g8o5HknOsSpDv8i5GIuyoHlxcfnttrBvL9FgNRNDX1+7risJTQaoEOfD9jcUly2XbxWWdQ ni6NtD86SyCnahNCebsSq4WeUnEHwaEI6fSpz8GSGHrovFZOsokgCcZhbx+3MASGNFUup8 ZfQkf9SFBPKCVrWIQaoptobB2MFWHuJ9jP7OROlu+jTwz86kf/ENl6T8PmA+8eXwcGp94p CCQsggPr79lSmBRpVP8/fYBaL3ASdoeTbl61dn53WqrD7N5HK1bfR382pY0mnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699022; a=rsa-sha256; cv=none; b=TEQ88GLzF2G90Zaax7VA97GJqc4tbV3XGlJrEJdLuBwBhA92QWjJu6Wvx/igWEgDS7IPpm n3dCOpmlAhpgXcJnNGhJBQgjXzD8MlOiMWQoiCnBp4Zh1kTg5DAcYJr8EOcLbBLj/queIR K48uOLHAGllg4pb6IbseQduRzAnnZrFvKGa7/4bR/9+4gMDaef+3WpA+L71txp+rZbOht+ +xdM81OxexYeUNr0c2g2yRxnB95DMkzEUwzgq+LGMRuejEPpBzTZSxx41YyKrTqDb5lqwA 6NS+02TUPHSJkLaH/z2OpM7frN49Kl/A2vwabumKaIyzdI/F4scjfvY4HjsDlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKxB5rllzsZq; Mon, 30 Sep 2024 12:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNgCU071163; Mon, 30 Sep 2024 12:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNgSJ071160; Mon, 30 Sep 2024 12:23:42 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:42 GMT Message-Id: <202409301223.48UCNgSJ071160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 33f2cf4ad460 - main - arm64: Switch to ACPI by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f commit 33f2cf4ad460ca46bdc77ae50914c76e76fe0e0f Author: Andrew Turner AuthorDate: 2024-09-27 15:12:13 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 arm64: Switch to ACPI by default When the FreeBSD/arm64 port was created we only supported FDT. We now also support ACPI, and have for many years. When this support was added we kept FDT as the default. There are some setups where both ACPI tables and a FDT DTB are passed into the kernel. In most of these cases the DTB is only used to pass in minimal information. To handle the cases where both are passed in prefer ACPI over FDT. Reviewed by: bz, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46750 --- sys/arm64/arm64/machdep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index f9885f4d4e0a..b61fec3fdd11 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -801,10 +801,10 @@ bus_probe(void) } /* If no order or an invalid order was set use the default */ if (arm64_bus_method == ARM64_BUS_NONE) { - if (has_fdt) - arm64_bus_method = ARM64_BUS_FDT; - else if (has_acpi) + if (has_acpi) arm64_bus_method = ARM64_BUS_ACPI; + else if (has_fdt) + arm64_bus_method = ARM64_BUS_FDT; } /* From nobody Mon Sep 30 12:23:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKxD4TQrz5YCs3; Mon, 30 Sep 2024 12:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKxD0Rd2z4LYJ; Mon, 30 Sep 2024 12:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMS2ks4TAjIM5hDICj6ulTdRKiTwKHZJjM/g3OI4siY=; b=Wm482MnD+dr1qkKcbRF8iSIsat7G2yfNiDia84R99/FJnR0tANKXk8MRMyrC0GEG66Ulfs ygonRkJ8harrmhfwlagUzCPFSo2xUiXKnB/9NYktDjEu3tcubPS+pniuZEzSwvH72nFiyK RJp+Gxe1S8hIDl4b0x/CuFLIAER1P1Fdh2ujrHMTtrspfgK40DyIDc6aTjH+i0xeOz8hf4 AkqZNleGd5IZD5IPlCWaGletOmFt1NQBXBnx2CdOItgmNde6fEcYO0Hwt32kTHNoNHrAMA Z+efiOdTMcDXSkzhR4YULBj4yGSQ6NSRkbs849mLJ/1eqZQG+DiLTwjzQsf5oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMS2ks4TAjIM5hDICj6ulTdRKiTwKHZJjM/g3OI4siY=; b=gN3/dZsRaNtlw7ExdbPEqUSOalQClgQIBQfLlXa348MAvP0YC3lVCsw3Xblo4aFYJoJw8J WINa/D0ehbDUlMXHPq3xr3GYJw20KcTlU4jRpx2d4agkUft2A1QcQfvMKoYThKEq7pLKRe 0JqJ3nL6yTX5vSqv+n10AkJtWqUP4uWZzr3fZRsC498/2SECzBkxKGacl6EOT+NIHVIAJD 2cZPksOoUhTTfeMaK7M0X+HJ+AMeEDizYnu12sMnVsUlpwwzh3pXXsEyTczgMVISqgTlj8 51poxzf6pfUP054In9Xf6v+vezcHgZaKdqazvR+cLKdxo7jU40Sz6hInsfp8rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699024; a=rsa-sha256; cv=none; b=uTu7fQbcrNjgV4j7MnqVvgQ202m9gnB3HYgalOcoWUmRRUMmSvL/6MJ0cvRKvzTy9OQZhn lpcqjWH03ZPHOmPKj9n1sdXsuxooSFpMd8CSqkY+uW3pKSJwLd/ym7K0ol/Nx3uZoZDXhm nq+pyt/Gyf5AR00xWwM+Hz351ttu5LRrrw73DEc6klJ3dcsodK+klnDs6MDtionePRA/mi y5judHtUNT3mVLlHGe62gJ50AT+d0GZNk1wSK84osDksejIcHMWcpKrtAON44GdQriEOYx F3BZXbHPrP0nVUEI0VQSyW6R77oD+AN2TClGRbC0Wr0zBYHxHWuI+M89Eb997Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKxD01x8ztBx; Mon, 30 Sep 2024 12:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNhvm071206; Mon, 30 Sep 2024 12:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNhil071203; Mon, 30 Sep 2024 12:23:43 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:43 GMT Message-Id: <202409301223.48UCNhil071203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a707b81ccb31 - main - tests: Add a buf_ring test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a707b81ccb31e621f2e0325de150d730ed717419 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a707b81ccb31e621f2e0325de150d730ed717419 commit a707b81ccb31e621f2e0325de150d730ed717419 Author: Andrew Turner AuthorDate: 2024-09-27 15:13:25 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:23 +0000 tests: Add a buf_ring test Add a simple test for sys/buf_ring.h. This enqueues and dequeues items in the buf_ring to ensure the simple operations are correct. There are no checks for multiple threads operating on buf_ring_enqueue or buf_ring_dequeue_mc as they can be probabilistic and depend on the architecture memory model. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46147 --- tests/sys/sys/Makefile | 1 + tests/sys/sys/buf_ring_test.c | 126 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/tests/sys/sys/Makefile b/tests/sys/sys/Makefile index 8d9cd552d9d2..40060911856f 100644 --- a/tests/sys/sys/Makefile +++ b/tests/sys/sys/Makefile @@ -5,6 +5,7 @@ TESTSDIR= ${TESTSBASE}/sys/sys ATF_TESTS_C= arb_test \ bitset_test \ bitstring_test \ + buf_ring_test \ qmath_test \ rb_test \ splay_test \ diff --git a/tests/sys/sys/buf_ring_test.c b/tests/sys/sys/buf_ring_test.c new file mode 100644 index 000000000000..5ee1b1cc094b --- /dev/null +++ b/tests/sys/sys/buf_ring_test.c @@ -0,0 +1,126 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Arm Ltd + */ + +#include + +#include +#include + +#include + +#include + +static void critical_enter(void); +static void critical_exit(void); + +#include + +static void +critical_enter(void) +{ +} + +static void +critical_exit(void) +{ +} + +static void * +buf_ring_dequeue_peek(struct buf_ring *br) +{ + void *val; + + val = buf_ring_peek(br); + if (val != NULL) + buf_ring_advance_sc(br); + return (val); +} + +static void * +buf_ring_dequeue_peek_clear_sc(struct buf_ring *br) +{ + void *val; + + val = buf_ring_peek_clear_sc(br); + if (val != NULL) + buf_ring_advance_sc(br); + return (val); +} + +#define MC_SC_TEST(dequeue_func) \ +ATF_TC_WITHOUT_HEAD(dequeue_func); \ +ATF_TC_BODY(dequeue_func, tc) \ +{ \ + struct buf_ring *br; \ + \ + br = buf_ring_alloc(4); \ + ATF_REQUIRE_MSG(br != NULL, "buf_ring_alloc returned NULL"); \ + \ + ATF_REQUIRE(dequeue_func(br) == NULL); \ + ATF_REQUIRE(buf_ring_count(br) == 0); \ + ATF_REQUIRE(!buf_ring_full(br)); \ + ATF_REQUIRE(buf_ring_empty(br)); \ + \ + /* Try filling the buf_ring */ \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)1) == 0); \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)2) == 0); \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)3) == 0); \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)4) == ENOBUFS); \ + \ + ATF_REQUIRE(buf_ring_count(br) == 3); \ + ATF_REQUIRE(buf_ring_full(br)); \ + ATF_REQUIRE(!buf_ring_empty(br)); \ + \ + /* Partially empty it */ \ + ATF_REQUIRE(dequeue_func(br) == (void *)1); \ + ATF_REQUIRE(dequeue_func(br) == (void *)2); \ + \ + ATF_REQUIRE(buf_ring_count(br) == 1); \ + ATF_REQUIRE(!buf_ring_full(br)); \ + ATF_REQUIRE(!buf_ring_empty(br)); \ + \ + /* Add more items */ \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)5) == 0); \ + ATF_REQUIRE(buf_ring_count(br) == 2); \ + \ + /* Finish emptying it */ \ + ATF_REQUIRE(dequeue_func(br) == (void *)3); \ + ATF_REQUIRE(dequeue_func(br) == (void *)5); \ + ATF_REQUIRE(dequeue_func(br) == NULL); \ + \ + ATF_REQUIRE(buf_ring_count(br) == 0); \ + ATF_REQUIRE(!buf_ring_full(br)); \ + ATF_REQUIRE(buf_ring_empty(br)); \ + \ + for (uintptr_t i = 0; i < 8; i++) { \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)(i + 100)) == 0); \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)(i + 200)) == 0); \ + ATF_REQUIRE(buf_ring_enqueue(br, (void *)(i + 300)) == 0); \ + ATF_REQUIRE(buf_ring_count(br) == 3); \ + ATF_REQUIRE(dequeue_func(br) == (void *)(i + 100)); \ + ATF_REQUIRE(dequeue_func(br) == (void *)(i + 200)); \ + ATF_REQUIRE(dequeue_func(br) == (void *)(i + 300)); \ + \ + ATF_REQUIRE(!buf_ring_full(br)); \ + ATF_REQUIRE(buf_ring_empty(br)); \ + } \ + \ + buf_ring_free(br); \ +} + +MC_SC_TEST(buf_ring_dequeue_sc) +MC_SC_TEST(buf_ring_dequeue_mc) +MC_SC_TEST(buf_ring_dequeue_peek) +MC_SC_TEST(buf_ring_dequeue_peek_clear_sc) + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, buf_ring_dequeue_sc); + ATF_TP_ADD_TC(tp, buf_ring_dequeue_mc); + ATF_TP_ADD_TC(tp, buf_ring_dequeue_peek); + ATF_TP_ADD_TC(tp, buf_ring_dequeue_peek_clear_sc); + return (atf_no_error()); +} From nobody Mon Sep 30 12:23:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKxF2DZcz5YD7P; Mon, 30 Sep 2024 12:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKxF1Q9Yz4Lw2; Mon, 30 Sep 2024 12:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRIDa2cBiev/qLK0YWVB6ywFoYCkp1MS64opzDSnj0o=; b=qCz5oc6r4719bt8iPKT8gSf7mq1up+lk9VR/ARaCHmprRUb71if+IvAUnltVMr81Yp9pPT eBsxesFiJIjW5wWDNpQIWgzc9mExzbaLqyd3DkqWmG2rslJPYe77KeTHk/SC+P8+DBK0Cs fXp8k/2CSZ06YzqNHsAUcNOByUjIpgqQTmE53fZOSFJH3bfOfzDcfugLQMn6RYVjtBV1T/ wmrnlDYLpTggqltN/7cntY2B4ab4GkZkmc/MdqCDbFjtU83sfTCh0nyIuV6CaOLPXdgiSs O72dcqaz7iWRGkEQ/NLnUULPVl3xwQlqNtSd0mqpPNcVNHuAuQ+CRR+fZTOBSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRIDa2cBiev/qLK0YWVB6ywFoYCkp1MS64opzDSnj0o=; b=FcfalCgAlQOQBpteCTjKvIhI8XxPi038g5UJ3d1dH2a0dSpc2ryuCTjk7oQaXBMztxJcZw bETTbCvLyl5z9pIXCkDR04yziwW4ubvzvMolPNZnIiqgaJ1nlJ7o588dEtLpaOpw3i2yHz UbfdLrkJRsSsNBDab3fJcelS9qGcdCP08It6o9mnlHACapDIpZ4vLggTiBYgYiRnwCkRTn QvOa85mDBQ48IoQHLaIaXRHVVDftEn4UBUt2L94fMv+ZSNumim4/LuQjuaCG5/ceVFZse1 +h7KfhnhFNvOnl7ZasBv42BbEESLjxtiwg1kSNNILTbbP16y8RF1EY5j2Hen6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699025; a=rsa-sha256; cv=none; b=yrTEyOFIh5vWB+kEKMvmJGACBKxUTBGcEWuD/Bvs0Y/9Za1Q+IG7o16Tc3YqS+75Ujl9jD e7YnmFMef7li6XI20renhnPOZqoJFKuvTOjZamFSI0dNXPnKAER6LyW0f4sM1Ff2iYf2bt 8paXIIHdPtapg6fBWwmRgDq+xYcQEcw/YLbZNzukbkA+hpT1dh6k7v5SggG6Lktr4mJslH PZw4aOqT8bdjYJHp6rVQJkTZWZiInzurUbjWzxdOx26IkMHJwr4kVnuw2BYJzfzNXFlkQD PI5OWkVc0EHOxEODordrzliPwZnuY5VOHSDv9IfIZ6yb5uybquN7guvXFSJ8iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKxF0jwPztBy; Mon, 30 Sep 2024 12:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNiXC071249; Mon, 30 Sep 2024 12:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNis9071246; Mon, 30 Sep 2024 12:23:44 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:44 GMT Message-Id: <202409301223.48UCNis9071246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e189296153a2 - main - tests: Add buf_ring overflow checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e189296153a232e6066af7e4ddab0430d3b6677d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e189296153a232e6066af7e4ddab0430d3b6677d commit e189296153a232e6066af7e4ddab0430d3b6677d Author: Andrew Turner AuthorDate: 2024-09-27 15:13:53 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:24 +0000 tests: Add buf_ring overflow checks Check enqueue works correctly when the offsets overflow Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46156 --- tests/sys/sys/buf_ring_test.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/sys/sys/buf_ring_test.c b/tests/sys/sys/buf_ring_test.c index 5ee1b1cc094b..611fb23788cc 100644 --- a/tests/sys/sys/buf_ring_test.c +++ b/tests/sys/sys/buf_ring_test.c @@ -10,6 +10,7 @@ #include #include +#include #include @@ -116,11 +117,64 @@ MC_SC_TEST(buf_ring_dequeue_mc) MC_SC_TEST(buf_ring_dequeue_peek) MC_SC_TEST(buf_ring_dequeue_peek_clear_sc) +ATF_TC_WITHOUT_HEAD(overflow); +ATF_TC_BODY(overflow, tc) +{ + struct buf_ring *br; + + br = buf_ring_alloc(4); + ATF_REQUIRE_MSG(br != NULL, "buf_ring_alloc returned NULL"); + + br->br_prod_head = br->br_cons_head = br->br_prod_tail = + br->br_cons_tail = UINT32_MAX - 1; + ATF_REQUIRE(buf_ring_count(br) == 0); + ATF_REQUIRE(!buf_ring_full(br)); + ATF_REQUIRE(buf_ring_empty(br)); + + ATF_REQUIRE(buf_ring_enqueue(br, (void *)1) == 0); + ATF_REQUIRE(buf_ring_count(br) == 1); + ATF_REQUIRE(!buf_ring_full(br)); + ATF_REQUIRE(!buf_ring_empty(br)); + + ATF_REQUIRE(buf_ring_enqueue(br, (void *)2) == 0); + ATF_REQUIRE(buf_ring_count(br) == 2); + ATF_REQUIRE(!buf_ring_full(br)); + ATF_REQUIRE(!buf_ring_empty(br)); + + ATF_REQUIRE(buf_ring_enqueue(br, (void *)3) == 0); + ATF_REQUIRE(buf_ring_count(br) == 3); + ATF_REQUIRE(buf_ring_full(br)); + ATF_REQUIRE(!buf_ring_empty(br)); + + ATF_REQUIRE(br->br_prod_head == 1); + ATF_REQUIRE(br->br_prod_tail == 1); + ATF_REQUIRE(br->br_cons_head == UINT32_MAX - 1); + ATF_REQUIRE(br->br_cons_tail == UINT32_MAX - 1); + + ATF_REQUIRE(buf_ring_dequeue_sc(br) == (void *)1); + ATF_REQUIRE(buf_ring_count(br) == 2); + ATF_REQUIRE(!buf_ring_full(br)); + ATF_REQUIRE(!buf_ring_empty(br)); + + ATF_REQUIRE(buf_ring_dequeue_sc(br) == (void *)2); + ATF_REQUIRE(buf_ring_count(br) == 1); + ATF_REQUIRE(!buf_ring_full(br)); + ATF_REQUIRE(!buf_ring_empty(br)); + + ATF_REQUIRE(buf_ring_dequeue_sc(br) == (void *)3); + ATF_REQUIRE(buf_ring_count(br) == 0); + ATF_REQUIRE(!buf_ring_full(br)); + ATF_REQUIRE(buf_ring_empty(br)); + + buf_ring_free(br); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, buf_ring_dequeue_sc); ATF_TP_ADD_TC(tp, buf_ring_dequeue_mc); ATF_TP_ADD_TC(tp, buf_ring_dequeue_peek); ATF_TP_ADD_TC(tp, buf_ring_dequeue_peek_clear_sc); + ATF_TP_ADD_TC(tp, overflow); return (atf_no_error()); } From nobody Mon Sep 30 12:23:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKxG647zz5YDHg; Mon, 30 Sep 2024 12:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKxG2DdLz4LYb; Mon, 30 Sep 2024 12:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bEPkZnzjz52nZcxwn3JdrdIUTYppHUK19qUX90Jc7PM=; b=U5WMU8Zu0qwXTtafbpFqRDLdT3bKG+EdvyamCaYy7A8BjoE6vL8QT/c7CQCnwMzOFRovxz 4mU5pbXeqW1wYv4VLT9QKiYFO7kJg0sAcR/NI5g7T5eN+zGtZU/YNB16GSqGbV5vGasWKO 5ho/Q/MAqrcogEL9/62jwpAVrnkmVKsU0pFtn9OXnejxU3nxZNzm/SP6VVIO2vhiWv5uwk DhgiwndajBTJwYyEKyc9eQgZuZZMtHyILkrzpUhIUdPfYiqhll1Bfak+sSCfJ5uKm4M0ae ckGyTHl40XAyEcpt5yAUrq211JL9jV/Z0LwMPD3nkIRM+Tkdi5QC8mpuQPdO+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bEPkZnzjz52nZcxwn3JdrdIUTYppHUK19qUX90Jc7PM=; b=vdvnER9xg3vsVCElLRnE1vUVA2vgFdVsHmcKkwp68PS2MCDXCDC0PlLuKqMwykO3O47oFQ 8sMRwwIYMUiVXwNRztvuGwRr/gMCE900OH/ltaxL3tt5zn3k6ZwViIjV9zz3OBNJtZvUlw FdQAhzJldfjWsM+V5FwAt1jVWUZDwS2eJUgLrwoqPgZk/E5s4OCSc2dN8NbTsAXdK3Ai2s skcJw3DXw435/OOD3mX2iq3LGx5wLn/O1LsY0CmJsjPlQfAG1VmHEKaqfmFRuwpmA1oZZ9 X90ugNPp6Ucx5YEkCuNrC9ICRbyhNNi1TyhQzRve0Yi5uxSCmoK9o5u/TZIrRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699026; a=rsa-sha256; cv=none; b=XLTSnhb8JzDIsdI6Yj7F5wsL8Gh0LJ1BbGLeA28d9uVtlQot5GnErz52pDYZfK2yklfrJJ k59+ByJMxR287lBpzStmHpkr2wbiLt5fDekaZR/gtNjAV6sXgoMhX0iyV9rNpPTZKxjxYC s7oSHRU9qcdrr749ZxI9aHNJFCTCeCONJzwbnYPWd64GCV7X0VV9hypFaMZakNNevKCL9z oODXgg6reHjTgmGcaezmfoh0imS2OXTIk9pst+qpmDr3HOE0KkSHeylAjAEyBC/UMa03dn 0mHpCcNTKmOnrAKqhY9m2x68+OXxteft/OzD4BJbTcMEFdR4XJcFxids5fOeMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKxG1qv0zsxw; Mon, 30 Sep 2024 12:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNkrx071292; Mon, 30 Sep 2024 12:23:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNkkK071289; Mon, 30 Sep 2024 12:23:46 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:46 GMT Message-Id: <202409301223.48UCNkkK071289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8e95079e1758 - main - buf_ring: Add a threaded test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e95079e175854b84e57c521b34b4b52f7ae9cb1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8e95079e175854b84e57c521b34b4b52f7ae9cb1 commit 8e95079e175854b84e57c521b34b4b52f7ae9cb1 Author: Andrew Turner AuthorDate: 2024-09-27 15:14:32 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:24 +0000 buf_ring: Add a threaded test Add a threaded test for buf_ring.h used to help find issues with it on architectures with a weak memory order. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46158 --- tools/test/buf_ring/Makefile | 7 + tools/test/buf_ring/buf_ring_test.c | 322 ++++++++++++++++++++++++++++++++++++ tools/test/buf_ring/run.sh | 16 ++ 3 files changed, 345 insertions(+) diff --git a/tools/test/buf_ring/Makefile b/tools/test/buf_ring/Makefile new file mode 100644 index 000000000000..a94a1044f04e --- /dev/null +++ b/tools/test/buf_ring/Makefile @@ -0,0 +1,7 @@ +PROG= buf_ring_test +WARNS= 6 +MAN= + +LDFLAGS+=-pthread + +.include diff --git a/tools/test/buf_ring/buf_ring_test.c b/tools/test/buf_ring/buf_ring_test.c new file mode 100644 index 000000000000..6f12aa9dfea1 --- /dev/null +++ b/tools/test/buf_ring/buf_ring_test.c @@ -0,0 +1,322 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Arm Ltd. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* #define DEBUG_BUFRING */ + +#ifdef DEBUG_BUFRING +static void +panic(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "\n"); + exit(1); +} +#endif + +static void +critical_enter(void) +{ +} + +static void +critical_exit(void) +{ +} + +#include "../../../sys/sys/buf_ring.h" + +#define PROD_ITERATIONS 100000000 + +static enum { + CT_UNKNOWN, + CT_MC, + CT_MC_MT, + CT_SC, + CT_PEEK, + CT_PEEK_CLEAR, +} cons_type = CT_UNKNOWN; + +static unsigned int prod_count; + +static struct buf_ring *br; +static _Atomic bool prod_done = false; +static _Atomic int prod_done_count = 0; +static _Atomic size_t total_cons_count = 0; + +static uint64_t *mt_seen; + +static void * +producer(void *arg) +{ + int id, rv; + + id = (int)(uintptr_t)arg; + + for (size_t i = 0; i < PROD_ITERATIONS;) { + rv = buf_ring_enqueue(br, (void *)(i * prod_count + 1 + id)); + if (rv == 0) { + i++; + } + } + if ((unsigned int)atomic_fetch_add(&prod_done_count, 1) == + (prod_count - 1)) + atomic_store(&prod_done, true); + + return (NULL); +} + +static void * +consumer(void *arg) +{ + void *val; + size_t *max_vals; + size_t consume_count, curr; + int id; + + (void)arg; + + max_vals = calloc(prod_count, sizeof(*max_vals)); + assert(max_vals != NULL); + + /* Set the initial value to be the expected value */ + for (unsigned int i = 1; i < prod_count; i++) { + max_vals[i] = (int)(i - prod_count); + } + + consume_count = 0; + while (!atomic_load(&prod_done) || !buf_ring_empty(br)) { + switch(cons_type) { + case CT_MC: + case CT_MC_MT: + val = buf_ring_dequeue_mc(br); + break; + case CT_SC: + val = buf_ring_dequeue_sc(br); + break; + case CT_PEEK: + val = buf_ring_peek(br); + if (val != NULL) + buf_ring_advance_sc(br); + break; + case CT_PEEK_CLEAR: + val = buf_ring_peek_clear_sc(br); + if (val != NULL) + buf_ring_advance_sc(br); + break; + case CT_UNKNOWN: + __unreachable(); + } + if (val != NULL) { + consume_count++; + curr = (size_t)(uintptr_t)val; + id = curr % prod_count; + if (cons_type != CT_MC_MT) { + if (curr != max_vals[id] + prod_count) + printf("Incorrect val: %zu Expect: %zu " + "Difference: %zd\n", curr, + max_vals[id] + prod_count, + curr - max_vals[id] - prod_count); + } else { + size_t idx, bit; + + idx = ((size_t)(uintptr_t)val - 1) / + (sizeof(*mt_seen) * NBBY); + bit = ((size_t)(uintptr_t)val - 1) % + (sizeof(*mt_seen) * NBBY); + + if (atomic_testandset_64(&mt_seen[idx], bit)) + printf("Repeat ID: %zx\n", (size_t)(uintptr_t)val); + } + + max_vals[id] = (uintptr_t)val; + } + } + + atomic_fetch_add(&total_cons_count, consume_count); + + for (unsigned int i = 0; i < prod_count; i++) + printf("max[%d] = %zu\n", i, max_vals[i]); + + return (NULL); +} + +static struct option longopts[] = { + { "buf-size", required_argument, NULL, 'b' }, + { "cons-type", required_argument, NULL, 'c' }, + { "prod-count", required_argument, NULL, 'p' }, + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 }, +}; + +static void +usage(void) +{ + errx(1, "test --cons-type= --prod-count= [--buf-size=]"); +} + +static uint32_t +next_power_of_2(uint32_t x) +{ + x--; + x |= x >> 1; + x |= x >> 2; + x |= x >> 4; + x |= x >> 8; + x |= x >> 16; + x++; + return (x); +} + +int +main(int argc, char *argv[]) +{ + pthread_t *prod; + pthread_t cons[2]; + const char *errstr; + uint32_t size; + int ch, ret; + + size = 0; + while ((ch = getopt_long(argc, argv, "bf:", longopts, NULL)) != -1) { + switch(ch) { + case 'b': + errstr = NULL; + size = strtonum(optarg, 1, UINT_MAX, &errstr); + if (errstr != NULL) { + errx(1, "--bufsize=%s: %s", optarg, errstr); + } + if (!powerof2(size)) { + errx(1, "--bufsize needs a power of 2 size"); + } + break; + case 'c': + if (strcmp(optarg, "mc") == 0) { + cons_type = CT_MC; + } else if (strcmp(optarg, "mc-mt") == 0) { + cons_type = CT_MC_MT; + } else if (strcmp(optarg, "sc") == 0) { + cons_type = CT_SC; + } else if (strcmp(optarg, "peek") == 0) { + cons_type = CT_PEEK; + } else if (strcmp(optarg, "peek-clear") == 0) { + cons_type = CT_PEEK_CLEAR; + } else { + errx(1, "Unknown --cons-type: %s", optarg); + } + break; + case 'p': + errstr = NULL; + prod_count = strtonum(optarg, 1, UINT_MAX, &errstr); + if (errstr != NULL) { + errx(1, "--prod-count=%s: %s", optarg, errstr); + } + break; + case 'h': + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (cons_type == CT_UNKNOWN) + errx(1, "No cons-type set"); + + if (prod_count == 0) + errx(1, "prod-count is not set"); + + if (size == 0) + size = next_power_of_2(prod_count); + + if (cons_type == CT_MC_MT) { + size_t entries; + + entries = (size_t)PROD_ITERATIONS * prod_count; + entries = roundup2(entries, sizeof(*mt_seen)); + mt_seen = calloc(entries / (sizeof(*mt_seen) * NBBY), + sizeof(*mt_seen)); + } + + br = buf_ring_alloc(size); + + ret = pthread_create(&cons[0], NULL, consumer, NULL); + assert(ret == 0); + if (cons_type == CT_MC_MT) { + ret = pthread_create(&cons[1], NULL, consumer, NULL); + assert(ret == 0); + } + + prod = calloc(prod_count, sizeof(*prod)); + assert(prod != NULL); + for (unsigned i = 0; i < prod_count; i++) { + ret = pthread_create(&prod[i], NULL, producer, + (void *)(uintptr_t)i); + assert(ret == 0); + } + + for (unsigned int i = 0; i < prod_count; i++) { + ret = pthread_join(prod[i], NULL); + assert(ret == 0); + } + ret = pthread_join(cons[0], NULL); + assert(ret == 0); + if (cons_type == CT_MC_MT) { + ret = pthread_join(cons[1], NULL); + assert(ret == 0); + } + + printf("Expected: %zu\n", (size_t)PROD_ITERATIONS * prod_count); + printf("Received: %zu\n", total_cons_count); + + buf_ring_free(br); + + return (0); +} diff --git a/tools/test/buf_ring/run.sh b/tools/test/buf_ring/run.sh new file mode 100755 index 000000000000..5bd033150362 --- /dev/null +++ b/tools/test/buf_ring/run.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +run() { + kind=$1 + echo Testing ${kind} + buf_ring_test --cons-type=${kind} --prod-count=2 --buf-size=4 +} + +OBJDIR=$(make -V.OBJDIR) +export PATH=${OBJDIR}:${PATH} + +run mc +run sc +run peek +run peek-clear +run mc-mt From nobody Mon Sep 30 12:23:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHKxH5PDdz5YD2m; Mon, 30 Sep 2024 12:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHKxH3CGYz4M1c; Mon, 30 Sep 2024 12:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xOxOWxdkcMnpNCI3LU/nw3z05OgaVhb+mBGoTue+QaU=; b=Buvj4NhHCTn4y7z/9ThSiELkj28ZTzdXopGpXql2f0jMtBsBXsXD+nnG54fPVBj6gsgEQR zpVgprJE3Eo52SjZYbQUs+C6CTcsAUms5CZz79CDp37bS9cCwDcN5xFwSPWMfIT61LE7CG wjhI6/XD/JKCUtwg2uNs8C3ZufPEO0ijLbWv9HiYwzPeP2Pmvuv0ebCP34ogmfKG6/gD7U PnpivNnCmhZ8YpG+o0z19AF5nsWo6qAPWv0dCPcTDkT0wYfv5VDTmwrH23KxQHc16/2weZ L1mPh3CQkD5TLeDhlEfTKi16bcjMe0zjEElJm6OBtN7CAtc2JaS9BcdmjLm9GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727699027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xOxOWxdkcMnpNCI3LU/nw3z05OgaVhb+mBGoTue+QaU=; b=ZqCrpSSGfB2X4jccGtdIUFIE+S3MnenzEzwE0I48WMWwtN19h1ZLSOREPEuMdMpQtTVzZz 52GpzhmmfWW1/IqwnQRhRbd0p6pSMQYNjhXHJKsyT3F6EbVDRrSkuO7sSq6xSoGC14H7ej Qiijc6qqgUUF3Teq7FmXLYDZDvNrjFCanOSlGkelah3yKreE/6cbi4lLxccxb0fmQkVoAf pSggIiP1a1NNkTjkehcPxYM+zPOvKTBquzLmZEGZM/JrXhhad6p5jkoI4G9Uh8nyEtmD96 dKpQCEVTUxVIVYSKpW46GoJLRrsc3vg2Y0+yRN/mWj8EE9G+zm3tb1WIX59s0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727699027; a=rsa-sha256; cv=none; b=sMgG/IaUExHs7T8lRMD1RcZXMM7VdVe1KbMUmLPHYZGZaK82SEF3SQRCVnc7uFovKcK7FX 9CJcg2r9WqQ5Dv2D8CD+ub2j6KcbwgUzpeE3369aJwp16/03LlyX8fq6p/29fFjUoSiu7O hsLPFRgfXtIYf3BcdJYhKK//r+l3J1VRKTghcZDdLlGh/m1AI9Z97hI0h+jo7Webv5+bL+ WDSRJNn5K9zLOt/luLZlpFw+AqTlkZ901IZ0VVZe2rI8zW/S1O2bopElqHoeZTtid/2xdS JCdAsFOc0bMzQQv3szcsnxuCCQFoq6oHdv2D6Tb2BrjDD8R2VOg8sJolT5b/UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHKxH2qKzzsZr; Mon, 30 Sep 2024 12:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UCNlq6071340; Mon, 30 Sep 2024 12:23:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UCNlhK071337; Mon, 30 Sep 2024 12:23:47 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:23:47 GMT Message-Id: <202409301223.48UCNlhK071337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 90cd9c203eb5 - main - buf_ring: Use atomic accesses for head/tail values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90cd9c203eb536581e19a6fdfe43e6dedb22089f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=90cd9c203eb536581e19a6fdfe43e6dedb22089f commit 90cd9c203eb536581e19a6fdfe43e6dedb22089f Author: Andrew Turner AuthorDate: 2024-09-27 15:15:32 +0000 Commit: Andrew Turner CommitDate: 2024-09-30 12:04:24 +0000 buf_ring: Use atomic accesses for head/tail values Use explicit atomic load/store operations for all producer and consumer head and tail accesses. This allows us to remove the volatile annotation from these variables. Reviewed by: alc, imp, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46380 --- sys/sys/buf_ring.h | 59 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index c99cf81d8b6d..9a4bfa9fb549 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -51,13 +51,13 @@ * */ struct buf_ring { - volatile uint32_t br_prod_head; - volatile uint32_t br_prod_tail; + uint32_t br_prod_head; + uint32_t br_prod_tail; int br_prod_size; int br_prod_mask; uint64_t br_drops; - volatile uint32_t br_cons_head __aligned(CACHE_LINE_SIZE); - volatile uint32_t br_cons_tail; + uint32_t br_cons_head __aligned(CACHE_LINE_SIZE); + uint32_t br_cons_tail; int br_cons_size; int br_cons_mask; #if defined(DEBUG_BUFRING) && defined(_KERNEL) @@ -83,10 +83,12 @@ buf_ring_enqueue(struct buf_ring *br, void *buf) * via drbr_peek(), and then re-added via drbr_putback() and * trigger a spurious panic. */ - for (uint32_t i = br->br_cons_head; i != br->br_prod_head; i++) + for (uint32_t i = atomic_load_32(&br->br_cons_head); + i != atomic_load_32(&br->br_prod_head); i++) if (br->br_ring[i & mask] == buf) panic("buf=%p already enqueue at %d prod=%d cons=%d", - buf, i, br->br_prod_tail, br->br_cons_tail); + buf, i, atomic_load_32(&br->br_prod_tail), + atomic_load_32(&br->br_cons_tail)); #endif critical_enter(); do { @@ -106,8 +108,8 @@ buf_ring_enqueue(struct buf_ring *br, void *buf) if ((int32_t)(cons_tail + br->br_prod_size - prod_next) < 1) { rmb(); - if (prod_head == br->br_prod_head && - cons_tail == br->br_cons_tail) { + if (prod_head == atomic_load_32(&br->br_prod_head) && + cons_tail == atomic_load_32(&br->br_cons_tail)) { br->br_drops++; critical_exit(); return (ENOBUFS); @@ -127,7 +129,7 @@ buf_ring_enqueue(struct buf_ring *br, void *buf) * that preceded us, we need to wait for them * to complete */ - while (br->br_prod_tail != prod_head) + while (atomic_load_32(&br->br_prod_tail) != prod_head) cpu_spinwait(); atomic_store_rel_32(&br->br_prod_tail, prod_next); critical_exit(); @@ -173,7 +175,7 @@ buf_ring_dequeue_mc(struct buf_ring *br) * that preceded us, we need to wait for them * to complete */ - while (br->br_cons_tail != cons_head) + while (atomic_load_32(&br->br_cons_tail) != cons_head) cpu_spinwait(); atomic_store_rel_32(&br->br_cons_tail, cons_next); @@ -195,7 +197,7 @@ buf_ring_dequeue_sc(struct buf_ring *br) void *buf; mask = br->br_cons_mask; - cons_head = br->br_cons_head; + cons_head = atomic_load_32(&br->br_cons_head); prod_tail = atomic_load_acq_32(&br->br_prod_tail); cons_next = cons_head + 1; @@ -204,7 +206,7 @@ buf_ring_dequeue_sc(struct buf_ring *br) return (NULL); cons_idx = cons_head & mask; - br->br_cons_head = cons_next; + atomic_store_32(&br->br_cons_head, cons_next); buf = br->br_ring[cons_idx]; #ifdef DEBUG_BUFRING @@ -213,9 +215,9 @@ buf_ring_dequeue_sc(struct buf_ring *br) if (!mtx_owned(br->br_lock)) panic("lock not held on single consumer dequeue"); #endif - if (br->br_cons_tail != cons_head) + if (atomic_load_32(&br->br_cons_tail) != cons_head) panic("inconsistent list cons_tail=%d cons_head=%d", - br->br_cons_tail, cons_head); + atomic_load_32(&br->br_cons_tail), cons_head); #endif atomic_store_rel_32(&br->br_cons_tail, cons_next); return (buf); @@ -235,13 +237,13 @@ buf_ring_advance_sc(struct buf_ring *br) mask = br->br_cons_mask; #endif - cons_head = br->br_cons_head; - prod_tail = br->br_prod_tail; + cons_head = atomic_load_32(&br->br_cons_head); + prod_tail = atomic_load_32(&br->br_prod_tail); cons_next = cons_head + 1; if (cons_head == prod_tail) return; - br->br_cons_head = cons_next; + atomic_store_32(&br->br_cons_head, cons_next); #ifdef DEBUG_BUFRING br->br_ring[cons_head & mask] = NULL; #endif @@ -267,12 +269,13 @@ buf_ring_advance_sc(struct buf_ring *br) static __inline void buf_ring_putback_sc(struct buf_ring *br, void *new) { - uint32_t mask; + uint32_t cons_idx, mask; mask = br->br_cons_mask; - KASSERT((br->br_cons_head & mask) != (br->br_prod_tail & mask), + cons_idx = atomic_load_32(&br->br_cons_head) & mask; + KASSERT(cons_idx != (atomic_load_32(&br->br_prod_tail) & mask), ("Buf-Ring has none in putback")) ; - br->br_ring[br->br_cons_head & mask] = new; + br->br_ring[cons_idx] = new; } /* @@ -291,7 +294,7 @@ buf_ring_peek(struct buf_ring *br) #endif mask = br->br_cons_mask; prod_tail = atomic_load_acq_32(&br->br_prod_tail); - cons_head = br->br_cons_head; + cons_head = atomic_load_32(&br->br_cons_head); if (cons_head == prod_tail) return (NULL); @@ -312,7 +315,7 @@ buf_ring_peek_clear_sc(struct buf_ring *br) mask = br->br_cons_mask; prod_tail = atomic_load_acq_32(&br->br_prod_tail); - cons_head = br->br_cons_head; + cons_head = atomic_load_32(&br->br_cons_head); if (cons_head == prod_tail) return (NULL); @@ -332,22 +335,26 @@ static __inline int buf_ring_full(struct buf_ring *br) { - return (br->br_prod_head == br->br_cons_tail + br->br_cons_size - 1); + return (atomic_load_32(&br->br_prod_head) == + atomic_load_32(&br->br_cons_tail) + br->br_cons_size - 1); } static __inline int buf_ring_empty(struct buf_ring *br) { - return (br->br_cons_head == br->br_prod_tail); + return (atomic_load_32(&br->br_cons_head) == + atomic_load_32(&br->br_prod_tail)); } static __inline int buf_ring_count(struct buf_ring *br) { + uint32_t cons_tail, prod_tail; - return ((br->br_prod_size + br->br_prod_tail - br->br_cons_tail) - & br->br_prod_mask); + cons_tail = atomic_load_32(&br->br_cons_tail); + prod_tail = atomic_load_32(&br->br_prod_tail); + return ((br->br_prod_size + prod_tail - cons_tail) & br->br_prod_mask); } #ifdef _KERNEL From nobody Mon Sep 30 13:20:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHMC42pY8z5YGjd; Mon, 30 Sep 2024 13:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHMC42PMSz4VJt; Mon, 30 Sep 2024 13:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727702448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8q5n4RYHEY4CZHLgoO2NbzvBgi0aQoIAy+7kbFwbhdQ=; b=K8Osid9hUGikllKySD6Ez9HjhT3MN9cOf+el0Cwmb2nrEIhiFD5gAzgRQ90woI/4yhY8EJ jEYhGSSib20MBYARiV5axYj5JNvEn6AHo2VSxsBfsdAO8N44Iy1Obptqx0rm5iPHLLz1bV eAfsQsI2zyRs12zJOL5ndswF91pKQBnm4PQVo+sRQQ6VfntRAPr3wfDKqXmwbG8LoFp/tJ iRFUctYwpHlCd5eSaUrVYvTqmP6rqhPqGUifFl2b+TjxGjUngI6cUW288HhbfAJIAyJdxJ YFM/NCNRqP7/ma2D2dT8K6SR6K+0rkSKsc3fg9y0GqKrtN94Vz+wBiJrBw2nIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727702448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8q5n4RYHEY4CZHLgoO2NbzvBgi0aQoIAy+7kbFwbhdQ=; b=Idv8eStpXwJP5j9WlkAHReVxj9OrLchiQMDKbWW6zfRKCcbUejZYDF7cROPE7biCUrSekD sMGUb5Jwz5zu7CuJUAIs2PfC4UucTwtNjrGjSsxSfuIA4vURr3W6W45JQQgD6BiE3pLrOA nqMAUPDv5KH+g7tAP5eWd8tAc92wJ8sxX8psv65C/faaQfPg9MvETcjJEbt6YXO22QdjlF ofhn156ITGkRSPUtZd9ZVuMaV4dSzxmTBoJJv0VLTLhEIIlRGG9K7IAwOYsN0Z9NRvF3fC rlHE8I+u2GtYg2mmYavjGB2dROChJcegqv+tTeZCjfXsNtUb/3MU3EntIgkOlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727702448; a=rsa-sha256; cv=none; b=faSK2YFbi5ZVV2+g7pJdUZ+a5yAAP550nbBVtKgTT/PSf0lFpcrgAEaHCl9/daLIY5XnEn ARTHuGFWVfr1jR2ZD5JQiln3+P/ViP2TXG2ZpBxdPDwzAWO1fkD/qhKa41yJjiJGolK82n UiWgHe6JlRmSUhXPqmaOfXQeHOyi/pBoLAW9qjnw7bGXMgkMyie90ngIyJlMyYnq3TXnAu FMTtsfoQW38tDEu0RHJZ9w8c3mzXTGJkpXWPG3pGWTAUaOBk3zl1Lta2mgSeuUTC5ajOdx KcGYxNjIaKX97YrVMhu+lVnH7s/rn6ycJITUqno7MB3FPLvJXlW1LgZByWZ7wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHMC421gzztpt; Mon, 30 Sep 2024 13:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UDKmuP067501; Mon, 30 Sep 2024 13:20:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UDKmMY067498; Mon, 30 Sep 2024 13:20:48 GMT (envelope-from git) Date: Mon, 30 Sep 2024 13:20:48 GMT Message-Id: <202409301320.48UDKmMY067498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 335a234d72be - stable/13 - LinuxKPI: 802.11: support manual lladdr changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 335a234d72be2a042e60ddd93a2644ffdc27e515 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=335a234d72be2a042e60ddd93a2644ffdc27e515 commit 335a234d72be2a042e60ddd93a2644ffdc27e515 Author: Bjoern A. Zeeb AuthorDate: 2024-07-25 07:53:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-09-30 12:19:05 +0000 LinuxKPI: 802.11: support manual lladdr changes Allow a user to change the "ether" address by ifconfig while a VAP is not UP. Compared to net80211 (given we have no callback) we register an eventhandler per-vif (a global one would force us to use hacks to derive if a vap is indeed also a lkpi_80211 vif). Sponsored by: The FreeBSD Foundation PR: 277356 Tested by: lwhsu Differential Revision: https://reviews.freebsd.org/D46121 (cherry picked from commit 4aff4048f5b1b6ab0b905726853ba6083e37cc37) --- sys/compat/linuxkpi/common/src/linux_80211.c | 30 ++++++++++++++++++++++++++++ sys/compat/linuxkpi/common/src/linux_80211.h | 1 + 2 files changed, 31 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 288ae00b6949..ef742125dbac 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2751,6 +2751,32 @@ lkpi_ic_wme_update(struct ieee80211com *ic) return (0); /* unused */ } +/* + * Change link-layer address on the vif (if the vap is not started/"UP"). + * This can happen if a user changes 'ether' using ifconfig. + * The code is based on net80211/ieee80211_freebsd.c::wlan_iflladdr() but + * we do use a per-[l]vif event handler to be sure we exist as we + * cannot assume that from every vap derives a vif and we have a hard + * time checking based on net80211 information. + */ +static void +lkpi_vif_iflladdr(void *arg, struct ifnet *ifp) +{ + struct epoch_tracker et; + struct ieee80211_vif *vif; + + NET_EPOCH_ENTER(et); + /* NB: identify vap's by if_init; left as an extra check. */ + if (ifp->if_init != ieee80211_init || (ifp->if_flags & IFF_UP) != 0) { + NET_EPOCH_EXIT(et); + return; + } + + vif = arg; + IEEE80211_ADDR_COPY(vif->bss_conf.addr, IF_LLADDR(ifp)); + NET_EPOCH_EXIT(et); +} + static struct ieee80211vap * lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, enum ieee80211_opmode opmode, int flags, @@ -2799,6 +2825,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], vif->bss_conf.vif = vif; /* vap->iv_myaddr is not set until net80211::vap_setup or vap_attach. */ IEEE80211_ADDR_COPY(vif->bss_conf.addr, mac); + lvif->lvif_ifllevent = EVENTHANDLER_REGISTER(iflladdr_event, + lkpi_vif_iflladdr, vif, EVENTHANDLER_PRI_ANY); vif->bss_conf.link_id = 0; /* Non-MLO operation. */ vif->bss_conf.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ @@ -2972,6 +3000,8 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) lhw = ic->ic_softc; hw = LHW_TO_HW(lhw); + EVENTHANDLER_DEREGISTER(iflladdr_event, lvif->lvif_ifllevent); + LKPI_80211_LHW_LVIF_LOCK(lhw); TAILQ_REMOVE(&lhw->lvif_head, lvif, lvif_entry); LKPI_80211_LHW_LVIF_UNLOCK(lhw); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index a48cf719c693..516bc78a8c13 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -159,6 +159,7 @@ struct lkpi_sta { struct lkpi_vif { TAILQ_ENTRY(lkpi_vif) lvif_entry; struct ieee80211vap iv_vap; + eventhandler_tag lvif_ifllevent; struct mtx mtx; struct wireless_dev wdev; From nobody Mon Sep 30 14:22:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHNZm6HmRz5X9mt; Mon, 30 Sep 2024 14:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHNZm4J9Hz4RKL; Mon, 30 Sep 2024 14:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727706176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C3Hvnq6L8uHm6LLjNJbjvZTiKHsottqxGl0pCHrHBMY=; b=FVqD1l6m2Qp5R/OmCKofyn9bDV/Rk9bFQ8DOXWgDDR6z1c2uJB4YhnzqscKT0CjmT0vTjm 7nDoKziLIs1yvbUicKO4SeNZvQuKI7RiDPeLjyk+IssghORz1ftmQlYmIiInewR8koaoPv SSGVMenTCPpJewpcROzgJ5O7aAGU1+h12rmpNEA5PcrF5dThXVulivuKyybVZKvjHdLUs6 /FD+dWqZFC5LvRXzffYVKJDk3lmnYyteVNRxxcmJSul6FhdaJggoxeX2UvdbMpJoojd3F6 sxYBqT3RIYLJmevvcl+oHlref2ZybpIa5bPets0qYGS2x4PHch7NXoJ1+AgWwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727706176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C3Hvnq6L8uHm6LLjNJbjvZTiKHsottqxGl0pCHrHBMY=; b=aUySjtw27aI8NmSOaLMlHEXcy+Yd60m3jGc2OdYCFhgl1+LVogPwb82qtC78MduJONGG3h oXgBizolbcO8KhEYJSCLG+kXa4dZ52jRJuMscqAZDexHVeYf+eXk1imK/5bDFPSqquF4XC iNh36mLwjRzRLsNqPVz6tkTVXLjh7np6Y4ApXRylQvEUnXfmXAYYuvXNftSasxACadhXvK ZFQSJx6uqd40OlRH5ebbSuzvHqpGa2/EiRj7viWUTFUINEO4KCCT+3qpKH9ZeZncURD0ZS 9GfpF0xBgBaTWYYBLRR8NhVYuWpSuGhEEa6FZ5ktt6clZHwvtMR7c5iyh+dCuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727706176; a=rsa-sha256; cv=none; b=St0Bqq0CESt4qmTXqiOJ0raeP1nwmgvtqEIZHW57J9MdlM9VBaNfVticfIMy1aKn7BSm9b caO/rv3qjGSxYnf1rKza+xqm665YRI74CNoNZ7ByC2bW5Bug68kQpLgNO3KILKQ5PexT0u sv2Kz/sDB7G8hFPbhJESbYUgaQAP5A0+OmtjyWGbBL3P/bIAS+qhWPuqRudazVyGHx0mea uiwLV1cH0nXSSLHKYelu6+21e+XFWOeL9XhnT9tfz99+29aE/sXgzasVFh8hrpMMl7dxoy ZyadygyqJJaYJ2giduIpUMk9CqOsq9+kzpgHPbS4o+jGq7G8xxmYTZCmNIQXpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHNZm3vSXzxB3; Mon, 30 Sep 2024 14:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UEMu3u005511; Mon, 30 Sep 2024 14:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UEMuHU005508; Mon, 30 Sep 2024 14:22:56 GMT (envelope-from git) Date: Mon, 30 Sep 2024 14:22:56 GMT Message-Id: <202409301422.48UEMuHU005508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 030c387f5d74 - main - tzsetup: correct timezone symlink target List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 030c387f5d74a66d0d5950e3450d6da24237fb2e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=030c387f5d74a66d0d5950e3450d6da24237fb2e commit 030c387f5d74a66d0d5950e3450d6da24237fb2e Author: Ed Maste AuthorDate: 2024-09-21 11:13:27 +0000 Commit: Ed Maste CommitDate: 2024-09-30 14:22:34 +0000 tzsetup: correct timezone symlink target In chroot mode tzsetup prepended the chroot path to the symlink target, which is not correct. Use the same path for the symlink regardless of chroot mode. PR: 281332 Reported by: scf, Herbert J. Skuhra Reviewed by: olce Fixes: 5e16809c953f ("tzsetup: symlink /etc/localtime instead of co...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46725 --- usr.sbin/tzsetup/tzsetup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 617de4efb765..914eeb145a09 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -877,19 +877,19 @@ main(int argc, char **argv) else strlcpy(path_zonetab, dztpath, sizeof(path_zonetab)); strcpy(path_iso3166, _PATH_ISO3166); - strcpy(path_zoneinfo, _PATH_ZONEINFO); strcpy(path_localtime, _PATH_LOCALTIME); strcpy(path_db, _PATH_DB); strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK); } else { sprintf(path_zonetab, "%s/%s", chrootenv, _PATH_ZONETAB); sprintf(path_iso3166, "%s/%s", chrootenv, _PATH_ISO3166); - sprintf(path_zoneinfo, "%s/%s", chrootenv, _PATH_ZONEINFO); sprintf(path_localtime, "%s/%s", chrootenv, _PATH_LOCALTIME); sprintf(path_db, "%s/%s", chrootenv, _PATH_DB); sprintf(path_wall_cmos_clock, "%s/%s", chrootenv, _PATH_WALL_CMOS_CLOCK); } + /* Symlink target is the same regardless of chroot */ + strcpy(path_zoneinfo, _PATH_ZONEINFO); /* Override the user-supplied umask. */ (void)umask(S_IWGRP | S_IWOTH); From nobody Mon Sep 30 15:53:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHQZk1Y38z5XHXL; Mon, 30 Sep 2024 15:53:02 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHQZk12H1z4ZpR; Mon, 30 Sep 2024 15:53:02 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727711582; 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=RzfaYgC32uB7Ls0sANtwQ6kcNIs4a+BeDMGeu3+ALpc=; b=Xc/bM0vWMfZ9cKyc6XozeZJV9a+kqBIsZ4/j9DwF5BxXmMvGoDylmte99WAxGOAaszhtXc PQAEFmSE3zEJyv7xPndnVMTkskUQoZz5SMMhnBZp98p+5gGMN9bd8nfdVKa9hkj/moK0sQ 7qbtUopbPoI/+nfc/D79N09uKUcnSUnGQjdOy3ztrA5/z0HQrTy/PttjZ0VCj8fWS1J93k zr4a8npy5Ov1WidDZB/vWDZVrS/viND8+xbM3XeM0+64HGUj8eoEE3MXm+a61jLx1y5A2s /fELZew/6jAKy2IFHrdrXvfjSRySsf3rL7wALHLKHjk1dGai/hyXE9j3YL32IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727711582; 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=RzfaYgC32uB7Ls0sANtwQ6kcNIs4a+BeDMGeu3+ALpc=; b=ksQtcntZRAW0BuW+dYA/+0Y9kMTspWBzw9DinneMztSrqK2GaukblowOV69wBY9FMvAJDX JVy2xZNk054rIiF9pEZ+VD4vTLmjArExC5gJa7ntCZLciKYC+CIwxRyiTShTLId1Kula7k N094NICQCUR6MJcT+C01h7RyqKeOa75jP7FaHZzs8h3KDoCVjUin9YvsJd7AAJZ3OcSild u4uhOipslKmDkLbEhnhlqXccoifMVnmd9+CnKjS3lkM0OIsE00cOjzPiXC3b+sNWfU00kL gYL8bBldZPthnC73uUy14+Wft0PMw9pdx+efPFVexlP3XUhSjOMquznNB8yPug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727711582; a=rsa-sha256; cv=none; b=cRyio/17l93fY+sKhN3qC2NjlgQSq+gKHTkQ2uh3czBnLYuuB7/b0m2OSQDNaYs75GEGXC KWh9qJoZADNshKnuxBCXwBLVPxu5JFKpGeE4afyMlZaThihmHumiAKNzSu/pCPZbAI35dy l8sLAbvj5TOknsf6Hbs9VGjfB05a7vWwvUtnhIO87/L1o2aIG4/tWXt2WRX6gN4wilgyns ybdUgPaIBShsXbdrksiHKCbnImC5hFhU+X+L4c1n7VgYx2maHM3h6cG53M5OMQpXD7/kIn Sy8FGWO9kNsQcTXUk2ilI9u5wCAPGYQPQnSMXx+2yN4ze/J757L0EIE9xB12Nw== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XHQZk0MwTzNrs; Mon, 30 Sep 2024 15:53:02 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 5101D3C019B; Mon, 30 Sep 2024 15:53:01 +0000 (UTC) Date: Mon, 30 Sep 2024 15:53:01 +0000 From: Brooks Davis To: Antoine Brodin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1235d276b78a - main - lib{c,sys}: stop exposing errno symbol Message-ID: References: <202409271933.48RJX0dH066668@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Mon, Sep 30, 2024 at 08:33:18AM +0200, Antoine Brodin wrote: > On Fri, Sep 27, 2024 at 9:33???PM Brooks Davis wrote: > > > > The branch main has been updated by brooks: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1235d276b78a769bded01d51c9bf3cdc480db9fb > > > > commit 1235d276b78a769bded01d51c9bf3cdc480db9fb > > Author: Brooks Davis > > AuthorDate: 2024-09-27 19:27:46 +0000 > > Commit: Brooks Davis > > CommitDate: 2024-09-27 19:27:46 +0000 > > > > lib{c,sys}: stop exposing errno symbol > > > > Officially since C11 (and in reality FreeBSD since 3.0 with commit > > 1b46cb523df3) errno has been defined to be a macro. Rename the symbol > > to __libsys_errno and move it to FBSDprivate_1.0 and confine it entierly > > to libsys for use by libthr. Add a FBSD_1.0 compat symbol for existing > > binaries that were incorrectly linked to the errno symbol during > > libc.so.7's lifetime. > > > > This deliberately breaks linking software that directly links to errno. > > Such software is broken and will fail in surprising ways if it becomes > > threaded (e.g., if it triggers loading of a pam or nss module that > > uses threads.) > > > > Reviewed by: kib > > Differential Revision: https://reviews.freebsd.org/D46780 > > --- > > lib/libsys/Makefile | 2 ++ > > lib/libsys/Symbol.map | 1 + > > lib/libsys/Symbol.sys.map | 1 - > > lib/libsys/__error.c | 10 +++++----- > > lib/libthr/sys/thr_error.c | 5 ++--- > > lib/libthr/thread/thr_rtld.c | 7 +++---- > > 6 files changed, 13 insertions(+), 13 deletions(-) > > Hello, > > This breaks some ports: Thank you for the list (that's more than I expected). I'll work on updates. The fix is to replace extern int errno; with #include -- Brooks > > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/cdb-0.75.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/checkpassword-0.90.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/clockspeed-0.62_6.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/copytape-1.0_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/daemontools-0.76_19.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/dot-forward-0.71_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/faces-1.7.7_13.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/fastforward-0.51_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/gkermit-1.0_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/ja-edict-19990714_6.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/ja-mh-6.8.4.j3.05_7.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/mess822-0.58_3.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/mpeg_encode-1.5b.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/pbasic-2.1_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/qlogtools-3.1_4.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/qmail-contrib-0.1_3.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/qmail-dk-0.54_2.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/qmail-rblchk-2.4.1_2.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/qmailanalog-0.70_4.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/queue-fix-1.4_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/serialmail-0.75_4.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/sliderule-1.0_11.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/socket-1.2_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/viz-1.1.1_2.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/xml-format-0.2_1.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/xspread-3.1.1c_5.log > https://pkg-status.freebsd.org/gohan05/data/maini386PR281667-default-foo/2024-09-27_21h05m12s/logs/errors/xtrojka-1.2.3_4.log > > Cheers, > > Antoine > From nobody Mon Sep 30 17:56:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHTJm4F9sz5XQXD; Mon, 30 Sep 2024 17:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHTJm3d06z4nFT; Mon, 30 Sep 2024 17:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727718968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MGS9W+viEjTEB34dNppqh6wI57/pZZTFrvbnzP5tS0=; b=tEZS63RWweHl08/h7PJWpVdFuIkSP/tZaxy6Ruec5ZTtFDtR5fBeqdumkdXGPPoRLmNNLp IXVrnQ0+7mf/YFv/jYp5wr6L+Nt/FBCH/LpiW+vTY5o2QU46IZVh2oQWuoY+MiRuI45b+5 TIiWoyemsMIlP/lS/RyN7JuZxL0vPNpXFq4hx/mjx9Lwb0Ys1VzKE6ewdbkp5Baq3IboNv kDZ2LBCiqgOXLk6y17pJYyvMDLuyI5v5lk4EWEfr0gbPcdWxonQUOFb3yW1q12QJ7wQ2Au hVlgnwlCPJvpbAJ9XcCuZHN//a1q0tdKtBoHWfRdRM6tEP73TNXDktmAttQ/xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727718968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MGS9W+viEjTEB34dNppqh6wI57/pZZTFrvbnzP5tS0=; b=wk7OGsNAAIHTCLr54AD/1Swvepn8C/PJohe+uyCHACSgkVwkS584GKPzeGJV8t4VRPhOtj u937f3zRtucmqJCFrVYvTMI1NLbFfUA/wyg8yw8Av744GrCfUzng0wZXoO4d5z5gwpJ+Cy Rnxl8ThrFe7LrshuT2r9ggPPu8j859Hg47J4BLXG3xCdTd7ZGVX2Wotd/fmZXZ8ZVfMJII HHxVYlnX13sIQ7HfBNObvMmwYctBimWlaLMGcYNTF23WlEhzjJI3YKUXAmEPi9K8loVl8T Fss7sdwHlnt/EjcWe4cjSmkb4jzzu1DIrhAOlStXwtMVX7cV2uhPYDWS+gVMfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727718968; a=rsa-sha256; cv=none; b=mDdwuzRm0BDvpc59ped28bveI6X59QsFz2WWmo/EATro/hSEqfWMCh6f/WSKp7E8RQNWiI XjTzrPoGkOsOS6oTRUD/EBZkAmopO2rgI5JW+bmazujMPhVF4nB00gCKjdCv/ouKuQFkSu BRQUGojkCTXf0wzkMipvbmo11JY3m90Xt4CJrpiagBRYwqGYLq9YhdkgGue5wbJfs/Fvhw 1eeM/Hw/scZnd5b/u/y8reJTH+SgtaQ/SQpnfLUIKNeep5HUUWblTXKn0KsfdxLfkhiBM1 /OQbKIgo+A4qmfYqld9O0XIquEV6BmFrfivX7OE7ryXNgIVUrPFs/g8hko7H2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHTJm37Vxz130q; Mon, 30 Sep 2024 17:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UHu8ia064882; Mon, 30 Sep 2024 17:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UHu8q9064879; Mon, 30 Sep 2024 17:56:08 GMT (envelope-from git) Date: Mon, 30 Sep 2024 17:56:08 GMT Message-Id: <202409301756.48UHu8q9064879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: a2e4f45480c2 - main - tcp: whitespace cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2e4f45480c248036b002904ddbceef20ba7c523 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a2e4f45480c248036b002904ddbceef20ba7c523 commit a2e4f45480c248036b002904ddbceef20ba7c523 Author: Michael Tuexen AuthorDate: 2024-09-30 17:53:57 +0000 Commit: Michael Tuexen CommitDate: 2024-09-30 17:53:57 +0000 tcp: whitespace cleanup No functional change intended. Reported by: markj MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/netinet/tcp_syncache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 19145446988e..04a964cf40cc 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -229,7 +229,7 @@ syncache_free(struct syncache *sc) { if (sc->sc_ipopts) - (void) m_free(sc->sc_ipopts); + (void)m_free(sc->sc_ipopts); if (sc->sc_cred) crfree(sc->sc_cred); #ifdef MAC @@ -1520,7 +1520,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, * forget it and use the new one we've been given. */ if (sc->sc_ipopts) - (void) m_free(sc->sc_ipopts); + (void)m_free(sc->sc_ipopts); sc->sc_ipopts = ipopts; } /* @@ -1605,7 +1605,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, __func__)); SCH_UNLOCK(sch); if (ipopts) - (void) m_free(ipopts); + (void)m_free(ipopts); goto done; } } From nobody Mon Sep 30 18:03:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHTSn6J4Jz5XRWB; Mon, 30 Sep 2024 18:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHTSn5fg9z4pKn; Mon, 30 Sep 2024 18:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727719385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p2U8awywpzZnZcYzNyzM6jIBGCoJtjB7IAkPEJwNX4c=; b=FcdAzLi8V2+Sn0n2Ptqphmy8p0YXKN7DTGcQ0hrrdF5UDZRsbPnUziJRs57QVvReTQ/G28 9JJEo1mkxUM84ziHTXk624Mc3ZZEJppUW575kYyEbSKkqcjvlNZ5IelUUdWartPpwNiOFj yLI8bzDixmuSKFdgvj67h3A1r6YKvCm41umIYIyzxhMmuKzu66VdkJc46x9qhwJO5MiLQZ sPCvtFEhnPNeoKvoFhzFwFWLhM11tQ7FY81cQ2lWoWcIyw4JKGciGS+nMUppUXQhIOQRYD kd1PNprCkrFu84SgFoARkWq9Tf8TSOLJ9NSleETj4sN7UFTW6i41ZaH/5U5/Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727719385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p2U8awywpzZnZcYzNyzM6jIBGCoJtjB7IAkPEJwNX4c=; b=u6PGdlzYw3pOIlocLldqGWvG6AbGqZrEXXBioy2wG9IT5msQRF4nDKWSFESvqm3P3fP+JH nSOoAowi4FID8/zY21jP4uSAG8a/P5iRyc60hgtuAsIeDVfdCjcrQTK1b19djYClivcxcm DjG0JY6IoGsSyjwvlajuWwh7x03wk+0nvS+nA10tfeIoaOK105QeXNjDGrPoKUJ6vMBzSP mdl2CGGsVITve76ejs34pAixfiCb2hjrDdVd7XCIeLuWSH/KQDWtCABDGb+enzbUU3fOYh iQvF7iG0CURqIbFlV9+nbtyhrDMw9WyDCTSSQxykueaYbRVX3dmgDvXnvSIQUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727719385; a=rsa-sha256; cv=none; b=Zgh0uwfQejZitrkhL3wHGd+XASNZWO2azJh0Bp0YRTLH6mBsmw5Y7YORGUiGhLx9FZDknF T5JVsfcujKCyZc7RW5Bp71Q9r8Xav87L2e1dvFH8k66zMhZ53dcJ+/1l3q69stxAtiBZe1 AtRvbUgGJIEpba3a5BAWIUY/2Mfm58jXmscw17qiUlj/iLAIbgL6ej/bZd0wqcJ5mW1xFA 9R020fGEU3jHtMacmOPK5JCUgtI0baUC9LQ0zuZLRY1cTTdJ7xekAvqHuaxBwDc9tFRio4 wuywZYJWu0FQAgxKmqKZvl7sg+qPZsvY+pLFyE1MMni58ARjvpsGsEe+mexWyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHTSn5FdSz13mh; Mon, 30 Sep 2024 18:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UI35eF082492; Mon, 30 Sep 2024 18:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UI35ii082489; Mon, 30 Sep 2024 18:03:05 GMT (envelope-from git) Date: Mon, 30 Sep 2024 18:03:05 GMT Message-Id: <202409301803.48UI35ii082489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 01eb635d1295 - main - tcp: improve mbuf handling when processing SYN segments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01eb635d12953e24ee5fae69692c28e4aab4f0f6 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=01eb635d12953e24ee5fae69692c28e4aab4f0f6 commit 01eb635d12953e24ee5fae69692c28e4aab4f0f6 Author: Michael Tuexen AuthorDate: 2024-09-30 18:00:04 +0000 Commit: Michael Tuexen CommitDate: 2024-09-30 18:00:04 +0000 tcp: improve mbuf handling when processing SYN segments When the sysctl-variable net.inet.ip.accept_sourceroute is non-zero, an mbuf would be leaked when processing a SYN-segment containing an IPv4 strict or loose source routing option, when the on-stack syncache entry is used or there is an error related to processing TCP MD5 options. Fix this by freeing the mbuf whenever an error occurred or the on-stack syncache entry is used. Reviewed by: markj, rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46839 --- sys/netinet/tcp_syncache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 04a964cf40cc..cb175d07c4d2 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1604,8 +1604,6 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, ("%s: bucket unexpectedly unlocked", __func__)); SCH_UNLOCK(sch); - if (ipopts) - (void)m_free(ipopts); goto done; } } @@ -1775,6 +1773,8 @@ tfo_expanded: #ifdef MAC mac_syncache_destroy(&maclabel); #endif + if (ipopts) + (void)m_free(ipopts); } return (rv); } From nobody Mon Sep 30 18:57:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHVhL6PBlz5XW0V; Mon, 30 Sep 2024 18:58:10 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHVhL43rgz40W4; Mon, 30 Sep 2024 18:58:10 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Mon, 30 Sep 2024 20:57:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1727722683; bh=h1vmoDHvBUVzHzb6Y8U0mMSsR69ye8WZ9xjzQbtXy+M=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=dNHSAHN3Nm8nxzHP+9Y3lSsunokQZRX6sUKQLvEm5KKFX/d+afo52t43oMRzZ6Xrc bPJK2sQiIQSB4/U/9EARmqx9+ZYEzYZCHORefdfQRrD/xwM1BCARKpHz7DLYTvLZw6 tTYl+K1fsD1cOxih8kCbb3NoEzi3C9guXCqLlg//+Jc95EZnUXcBfu6jhprA2NGa1D I9VgUAxqyo3FjRGEZMS+HRafjYK8ccE4dsIxL5+tncXbcOyj6A0gzMsPd3DJ0xnYcK /HUhWA4ocNvZAnx6JUXxBUgjR7J3I0WQCL+HhYAntJoSaapygvfX4dKlKsoYFm5D5d ebWWa+Oj3nyRQ== Message-ID: <87wmit2cmj.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Kyle Evans Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) In-Reply-To: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> References: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Queue-Id: 4XHVhL43rgz40W4 X-Spamd-Bar: ---- On Mon, 30 Sep 2024 05:36:04 +0200, Kyle Evans wrote: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e7a629c851d747772cc138efcb0418809ecdea55 > > commit e7a629c851d747772cc138efcb0418809ecdea55 > Author: Kyle Evans > AuthorDate: 2022-03-08 15:39:52 +0000 > Commit: Kyle Evans > CommitDate: 2024-09-30 03:34:18 +0000 > > libmd, kern, stand: consolidate md5 implementations (NFC) > > Reduce the number of md5c.c between the three of these from two to one > by just reaching into the kernel build for both userland builds. The > precedent for this already exists for sha2 in both cases. > > _libmd_ symbol privatization bits have been moved to sys/md5.h and > md5.h remains to #include for compatibility. > > This stops exporting MD5Pad() in the process because the kernel stopped > exporting it in 502a35d60f4c. soversion is bumped accordingly. > > This also renames the libc version of stack_protector.c; it previously > only worked by coincidence because .PATH ordering worked out such that > we got the right one, but this is not the case anymore. Remove the > landmine. > > PR: 280784 (exp-run) > Reviewed by: allanjude, delphij > Differential Revision: https://reviews.freebsd.org/D34497 > --- > ObsoleteFiles.inc | 3 + > lib/libc/Makefile | 2 +- > lib/libc/md/Makefile.inc | 2 +- > lib/libc/secure/Makefile.inc | 2 +- > .../{stack_protector.c => libc_stack_protector.c} | 0 > lib/libcrypt/Makefile | 2 +- > lib/libmd/Makefile | 3 +- > lib/libmd/md5.h | 40 --- > lib/libmd/md5c.c | 344 --------------------- > lib/libssp/Makefile | 2 +- > stand/libsa/Makefile | 4 +- > sys/kern/md5c.c | 23 +- > sys/sys/md5.h | 42 +++ > 13 files changed, 72 insertions(+), 397 deletions(-) Don't run make delete-old-libs. :-) Does this change break building ports-mgmt/pkg (on arm64)? --- pkg --- cc -o pkg add.o alias.o annotate.o audit.o autoremove.o check.o clean.o config.o create.o delete.o event.o fetch.o globals.o info.o install.o key.o lock.o main.o plugins.o query.o register.o repo.o rquery.o search.o set.o shell.o shlib.o ssh.o stats.o triggers.o update.o updating.o upgrade.o utils.o version.o which.o -fstack-protector-strong -Wl,-Bstatic -Wl,-whole-archive -L/usr/ports/ports-mgmt/pkg/work/pkg-1.21.3/libpkg -lpkg_flat -Wl,-no-whole-archive -Wl,-Bdynamic -lelf -ljail -lssl -lcrypto -larchive -lbz2 -lz -llzma -lprivatezstd -lm -pthread -lutil -lmd -Wl,--export-dynamic --- pkg-static --- cc -o pkg-static add.o alias.o annotate.o audit.o autoremove.o check.o clean.o config.o create.o delete.o event.o fetch.o globals.o info.o install.o key.o lock.o main.o plugins.o query.o register.o repo.o rquery.o search.o set.o shell.o shlib.o ssh.o stats.o triggers.o update.o updating.o upgrade.o utils.o version.o which.o -static -L/usr/ports/ports-mgmt/pkg/work/pkg-1.21.3/libpkg -lpkg_flat -lelf -ljail -lssl -lcrypto -larchive -lbz2 -lz -llzma -lprivatezstd -lm -pthread -lutil -lmd ld: error: duplicate symbol: SHA256_Transform >>> defined at sha256.c >>> sha256.o:(SHA256_Transform) in archive /usr/lib/libcrypto.a >>> defined at sha256c.c >>> sha256c.o:(SHA256_Transform_resolver) in archive /usr/lib/libmd.a cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [pkg-static] Error code 1 -- Herbert From nobody Mon Sep 30 19:11:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHW0F6hP1z5XWjV; Mon, 30 Sep 2024 19:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHW0F4Yzsz427F; Mon, 30 Sep 2024 19:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727723517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lsR/jS4KkbQJb2EUP1fK9gQgguwMKNQjxHLMj6SZrEQ=; b=pTBAcJdiA30P3yD+pb78en6b7Uz67qFJqIDVVkJCx6wiO+hI40/QTeTLyDfq2lZTLmkSG+ vTkmR2ZKaUx1WH2gczn5+pkiF5xjDU67R3h417/PWDggKQ4GWujGLLqWzbL7ytr4kDGgFg UaZd9R1BZes3gmm+I2KL5esv94Jz6xfDFVHLM4lqa+/rsuInjRi1eI36sQ8xlmarZGC1yP BmWw23VzIDnlKH29rzPdOA+ZhgtbDVhPS6cjsw7y70ljuknIa2vakR48qCQMhTF5IGEg3v B6V4tWkeUXq37S6Lg94AkUlHdN+TiOG17AkQL6U1MF8nvOO2GFHKsj5tBzlthA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727723517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lsR/jS4KkbQJb2EUP1fK9gQgguwMKNQjxHLMj6SZrEQ=; b=jZ3vn/j6cuBfDb2OlRGmWbmlAxuVMo8Qu2SbA+hvhCczofwnWrrTyoThRibV2kqlxBedoi ZSSBH/kN9LQj4LiWflWNDoUx2DPKuIJ5nvPD5sWRxY2PQSGmgiB1LqCBC0bHWlZJugzJTL rI5GbYYqDxUieJRLR6n9fXFtEor+03TfKIzdtjs21aZvni/K2X5iLRINhmjkTsg5UsXYih FrqkSXgJrVuLdvmTWJ031cQU/Ta5sJQija/HKF0ME9jmrcn5pfIr8tf7WJAaZ3xZMskTVi lO+Zi5WmdY2LKs5fhu+yAAbDQ4/Syez4gE1HC/IvjGlAWWYbqVSBRauvJGxBKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727723517; a=rsa-sha256; cv=none; b=JQVolPClkxLV/jdJHWZOnhsiOH46vrgYgoWB8pIUI3VXCyFNZIkc6M0lqnSNKEgAoBrPzp 261l0QhE/1Wse0fQtAPO/GeHbH8fWXcoQNjpiUeAuEjzeEHYLwtgpDSsZWoDgj4uYNT20a 7Gm3aj3apc9h+nnl4kVHA1JRcekkGJXEqMUyI1jAN2xK0/rUa+E5c4Buq3yYiZFQMr2bpy R4EYcDeNQWY6FvWknDoRQI1UM+6B+qPs504AogwYWtrFjOI7vlHnaGSfR6yXnhOQUlC+Kj Hl4bTuJamSxHT9KqWDrc5RvokEIPgJT54Yl8altrmPQuah+j1Abrhy+EE4/WFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHW0F49fNz1552; Mon, 30 Sep 2024 19:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UJBvkJ001473; Mon, 30 Sep 2024 19:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UJBvAN001470; Mon, 30 Sep 2024 19:11:57 GMT (envelope-from git) Date: Mon, 30 Sep 2024 19:11:57 GMT Message-Id: <202409301911.48UJBvAN001470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 57671d5ccc81 - main - tcp: further cleanup old options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57671d5ccc8123a512b3e2f1dc2e69ff7aca828c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=57671d5ccc8123a512b3e2f1dc2e69ff7aca828c commit 57671d5ccc8123a512b3e2f1dc2e69ff7aca828c Author: Gleb Smirnoff AuthorDate: 2024-09-30 19:11:37 +0000 Commit: Gleb Smirnoff CommitDate: 2024-09-30 19:11:37 +0000 tcp: further cleanup old options They all were experimental and some comments refer to internal Netflix versions. There is not reason to leak that into the header. Style unused options so that they have the available value aligned with really used values. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D46779 --- sys/netinet/tcp.h | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 794bfc62eca5..613019a575e8 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -209,7 +209,7 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) #define TCP_CONGESTION 64 /* get/set congestion control algorithm */ #define TCP_CCALGOOPT 65 /* get/set cc algorithm specific options */ #define TCP_MAXUNACKTIME 68 /* maximum time without making progress (sec) */ - /* unused; was TCP_MAXPEAKRATE */ +/* unused 69 */ #define TCP_IDLE_REDUCE 70 /* Reduce cwnd on idle input */ #define TCP_REMOTE_UDP_ENCAPS_PORT 71 /* Enable TCP over UDP tunneling via the specified port */ #define TCP_DELACK 72 /* socket option for delayed ack */ @@ -231,53 +231,52 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) /* Options for Rack and BBR */ #define TCP_REUSPORT_LB_NUMA 1026 /* set listen socket numa domain */ #define TCP_RACK_MBUF_QUEUE 1050 /* Do we allow mbuf queuing if supported */ - /* unused; was TCP_RACK_PROP */ +/* unused 1051 */ #define TCP_RACK_TLP_REDUCE 1052 /* RACK TLP cwnd reduction (bool) */ - /* unused; was TCP_RACK_PACE_REDUCE */ +/* unused 1053 */ #define TCP_RACK_PACE_MAX_SEG 1054 /* Max TSO size we will send */ #define TCP_RACK_PACE_ALWAYS 1055 /* Use the always pace method */ - /* unused; was TCP_RACK_PROP_RATE */ +/* unused 1056 */ #define TCP_RACK_PRR_SENDALOT 1057 /* Allow PRR to send more than one seg */ #define TCP_RACK_MIN_TO 1058 /* Minimum time between rack t-o's in ms */ - /* unused; was TCP_RACK_EARLY_RECOV */ +/* unused 1059 */ #define TCP_RACK_EARLY_SEG 1060 /* If early recovery max segments */ #define TCP_RACK_REORD_THRESH 1061 /* RACK reorder threshold (shift amount) */ #define TCP_RACK_REORD_FADE 1062 /* Does reordering fade after ms time */ #define TCP_RACK_TLP_THRESH 1063 /* RACK TLP theshold i.e. srtt+(srtt/N) */ #define TCP_RACK_PKT_DELAY 1064 /* RACK added ms i.e. rack-rtt + reord + N */ - /* unused; was TCP_RACK_TLP_INC_VAR */ - /* unused */ +/* unused 1065 */ +/* unused 1066 */ #define TCP_BBR_IWINTSO 1067 /* Initial TSO window for BBRs first sends */ - /* unused; was TCP_BBR_RECFORCE */ +/* unused 1068 */ #define TCP_BBR_STARTUP_PG 1069 /* Startup pacing gain */ #define TCP_BBR_DRAIN_PG 1070 /* Drain pacing gain */ - /* unused; was TCP_BBR_RWND_IS_APP */ +/* unused 1071 */ #define TCP_BBR_PROBE_RTT_INT 1072 /* How long in useconds between probe-rtt */ - /* unused; was TCP_BBR_ONE_RETRAN */ +/* unused 1073 */ #define TCP_BBR_STARTUP_LOSS_EXIT 1074 /* Do we exit a loss during startup if not 20% incr */ - /* unused; was TCP_BBR_USE_LOWGAIN */ +/* unused 1075 */ #define TCP_BBR_TSLIMITS 1076 /* Do we use experimental Timestamp limiting for our algo */ -#define TCP_BBR_PACE_OH 1077 /* Reused in 4.2 for pacing overhead setting */ - /* unused; was TCP_BBR_HOLD_TARGET */ +#define TCP_BBR_PACE_OH 1077 /* pacing overhead setting */ +/* unused 1078 */ #define TCP_BBR_USEDEL_RATE 1079 /* Enable use of delivery rate for loss recovery */ #define TCP_BBR_MIN_RTO 1080 /* Min RTO in milliseconds */ #define TCP_BBR_MAX_RTO 1081 /* Max RTO in milliseconds */ - /* unused; was TCP_BBR_REC_OVER_HPTS */ +/* unused 1082 */ #define TCP_BBR_ALGORITHM 1083 /* What measurement algo does BBR use netflix=0, google=1 */ - /* unused; was TCP_BBR_DRAIN_INC_EXTRA */ - /* unused; was TCP_BBR_STARTUP_EXIT_EPOCH */ +/* unused 1084 */ +/* unused 1085 */ #define TCP_BBR_PACE_PER_SEC 1086 #define TCP_BBR_PACE_DEL_TAR 1087 #define TCP_BBR_PACE_SEG_MAX 1088 #define TCP_BBR_PACE_SEG_MIN 1089 #define TCP_BBR_PACE_CROSS 1090 - /* unused */ - /* unused; was TCP_RACK_IDLE_REDUCE_HIGH */ - /* unused; was TCP_RACK_MIN_PACE */ - /* unused; was TCP_RACK_GP_INCREASE */ +/* unused 1091 */ +/* unused 1092 */ +/* unused 1093 */ +/* unused 1094 */ #define TCP_RACK_TLP_USE 1095 -#define TCP_BBR_TMR_PACE_OH 1096 /* Recycled in 4.2 */ - /* unused; was TCP_BBR_EXTRA_GAIN */ +#define TCP_BBR_TMR_PACE_OH 1096 /* ??? */ #define TCP_RACK_DO_DETECTION 1097 /* Recycle of extra gain for rack, attack detection */ #define TCP_BBR_RACK_RTT_USE 1098 /* what RTT should we use 0, 1, or 2? */ #define TCP_BBR_RETRAN_WTSO 1099 @@ -318,7 +317,7 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) #define TCP_REC_ABC_VAL 1134 /* Do we use the ABC value for recovery or the override one from sysctl */ #define TCP_RACK_MEASURE_CNT 1135 /* How many measurements are required in GP pacing */ #define TCP_DEFER_OPTIONS 1136 /* Defer options until the proper number of measurements occur, does not defer TCP_RACK_MEASURE_CNT */ - /* unused; was TCP_FAST_RSM_HACK */ +/* unused 1137 */ #define TCP_RACK_PACING_BETA 1138 /* Changing the beta for pacing */ #define TCP_RACK_PACING_BETA_ECN 1139 /* Changing the beta for ecn with pacing */ #define TCP_RACK_TIMER_SLOP 1140 /* Set or get the timer slop used */ @@ -330,7 +329,7 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) #define TCP_RACK_PACING_DIVISOR 1146 /* Pacing divisor given to rate-limit code for burst sizing */ #define TCP_RACK_PACE_MIN_SEG 1147 /* Pacing min seg size rack will use */ #define TCP_RACK_DGP_IN_REC 1148 /* Do we use full DGP in recovery? */ - /* unused; was TCP_POLICER_DETECT */ +/* unused 1149 */ #define TCP_HYBRID_PACING 1150 /* Hybrid pacing enablement */ #define TCP_PACING_DND 1151 /* When pacing with rr_config=3 can sacks disturb us */ #define TCP_SS_EEXIT 1152 /* Do we do early exit from slowtart if no b/w growth */ @@ -340,7 +339,7 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) #define TCP_REC_IS_DYN 1156 /* Do we allow timely to change recovery multiplier? */ #define TCP_SIDECHAN_DIS 1157 /* Disable/enable the side-channel */ #define TCP_FILLCW_RATE_CAP 1158 /* Set a cap for DGP's fillcw */ - /* unused; was TCP_POLICER_MSS */ +/* unused 1159 */ #define TCP_STACK_SPEC_INFO 1160 /* Get stack specific information (if present) */ #define RACK_CSPR_IS_FCC 1161 #define TCP_GP_USE_LTBW 1162 /* how we use lt_bw 0=not, 1=min, 2=max */ From nobody Mon Sep 30 19:44:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHWk01WZWz5XZ2s; Mon, 30 Sep 2024 19:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHWk00nFQz47Zm; Mon, 30 Sep 2024 19:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727725480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nqAKdUVIBSII+S+hLXiGT01l/Pj/P547JZRXhjvL7Q=; b=WJpxMYkKGpolSzTwcQf+FlFpd7K7Ep5SAM2B7dUbOy+rgbabtcLxe6uQno/N4pb/OVrsBV dB314a35BF3tfYWzBTlPDs+8RGYRLkbB4FGp0t4vO1xkRgofMiSAFBHSTKO1SSOgmIaR0k Ym7rSM8JMHu7tTd1gvWKC3DIdpO/VFWW2OC5hVSP4i2iVE687b1MvxEGOtS6ncOuqtTSK8 ragLCNIKKl87/BPjOADXOaPDrW+Jo3Hpw5BFMnc5tOxLSiyGp866hzjd+hBeB2tQ5scPfG N0ldkXd3WmuKTmtmQoRwJeoHErOfoT0+os+pIn+PfH2jovN3MdJ0kQ1vkPvDZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727725480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nqAKdUVIBSII+S+hLXiGT01l/Pj/P547JZRXhjvL7Q=; b=elLdFo/ZGXSRz66Jc6RcLg8PlWG/jhRuGsjVPKiFFi4i7uUrxyrk4oUJvp9tUCjVr3n1Xg GdyHwA1mcbXH7KCNDUBfGg51wYzjl+XiEAf/+9jyd3I5s6kNi7pFIhxqC++bMzydbrRExk 8ZWkbCGm9b62qXHzWBrQYGq83vdAPdG1J4+kguUXUnjNKj5fXO0VMREKJ5vk+qijnzpX6O Of9cIGvtVMT1/jwirXfFfqNJXylBTyyPFz8IYRL40X/fVY6ptPdzC7plT6GKTMTpsjPVzt i5gu2+7PkaAGWjoxDMrT1/fp2fKB41kyzMu/i9tFLkUH0NI7Iv40IBXOwrdoHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727725480; a=rsa-sha256; cv=none; b=hsbQ02xHZZM2pcYrlCZEdvu2SUHVpHB2cYa2gfGh15SKfkddaXzJJa2aQiyRvfrVI6ls2j 1D34YuDJIidNxKvwl9cQOkHnPBU0mBjuc3uuIAKPkcyrTNJjLT2UDRUfJtI0G90ZN0UZvQ GSM3wNhJZ+dokW8k1jK3eLkQkyAYCHio5pU6HfZX8Dl3G7zrUIp0JsMzW2TCOuaEYbAH4I GpmeMTr6fV9y+btANwwN8MjCPsIZsjc508uRDpgj1d1Xt4K9z9KcfVKKOl07zeXYQb1sMD +MOFvZKkbCfnfUNHBomge+Ma65Yt8JYQJgevcjHcsTrhdaOJa2K1j7xVHhhvNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHWk00PDgz15pK; Mon, 30 Sep 2024 19:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UJidt9055222; Mon, 30 Sep 2024 19:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UJidGL055220; Mon, 30 Sep 2024 19:44:39 GMT (envelope-from git) Date: Mon, 30 Sep 2024 19:44:39 GMT Message-Id: <202409301944.48UJidGL055220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4fa4693dcdd8 - main - btx: Align the PXE prompt with other options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fa4693dcdd8176f1d12cce5f026eb2052036dfc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4fa4693dcdd8176f1d12cce5f026eb2052036dfc commit 4fa4693dcdd8176f1d12cce5f026eb2052036dfc Author: Tatsuki Makino AuthorDate: 2024-09-30 19:41:42 +0000 Commit: John Baldwin CommitDate: 2024-09-30 19:41:42 +0000 btx: Align the PXE prompt with other options To fit within in the same space, drop the newline before the PXE prompt to make room for the additional space character. PR: 281494 --- stand/i386/boot0/boot0.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S index 80c7702840c1..6c48e380a32b 100644 --- a/stand/i386/boot0/boot0.S +++ b/stand/i386/boot0/boot0.S @@ -581,7 +581,7 @@ intx13: # Prepare CHS parameters */ prompt: #ifdef PXE - .ascii "\nF6 PXE\r" + .ascii "F6 PXE\r" #endif .ascii "\nBoot:" item: .ascii " "; .byte ' '|0x80 From nobody Mon Sep 30 19:48:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHWpS3fChz5XZgx; Mon, 30 Sep 2024 19:48:32 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHWpS0hHRz49QR; Mon, 30 Sep 2024 19:48:32 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=citron; t=1727725703; x=1728392369; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: author:from:subject:date:to:cc:resent-author:resent-date:resent-from: resent-sender:resent-to:resent-cc:resent-reply-to:resent-message-id: in-reply-to:references:mime-version:content-type: content-transfer-encoding:content-disposition:content-id: content-description:message-id:mail-followup-to:openpgp:blahblahblah; bh=q/Lo0boy7KD4RMRwngtyZedl+5Nrj6GcRZeISm7zofA=; b=HESQGc3Dm2ZxgZuilUfOguQtYG8trVjliTDYxJo6tkq67Hd9smJihMpuC0jtnaE7BASl62PJ ZAy8+KvhDAsHnkYkRHcQpBcP8liYDfR3h0rKO5G6F9IPhLkTKWhejBWrJSVCYOO46FceBD0O8g WYvKVa6syTxACVJzfspeZdGe+p/3RBeD6HhXiGHmovzYoApJsnM5+VHLL9ya8vykzqEu3K+Ddi 76J5vBotBTadYDdiwo+CMh2wJcxnnrsUbq9eG8JrrkKkQCTmSP2doUtG0C1cO7rh6MyjxWbBJJ Xp0eKCIJo0BG/ho7FEO9icsSI+ZiykiTA2QRR9hd6CaJbb1w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=orange; t=1727725703; x=1728392369; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: author:from:subject:date:to:cc:resent-author:resent-date:resent-from: resent-sender:resent-to:resent-cc:resent-reply-to:resent-message-id: in-reply-to:references:mime-version:content-type: content-transfer-encoding:content-disposition:content-id: content-description:message-id:mail-followup-to:openpgp:blahblahblah; bh=q/Lo0boy7KD4RMRwngtyZedl+5Nrj6GcRZeISm7zofA=; b=kVHln+lk0aSOqSvOE7Z9wGkrdKHgOYK0/Od5lon9oPvlVWLCA+Wo7MtLpInK0/tGHv6GOD5D yIMrEvG2gtVVCQ== Date: Mon, 30 Sep 2024 21:48:22 +0200 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Kyle Evans Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c2caf3b3313f - main - flua: lposix: add more useful functions for general purpose scripts Message-ID: <20240930194822.k7nwRuRt@steffen%sdaoden.eu> In-Reply-To: <202409300353.48U3rZM7000710@gitrepo.freebsd.org> References: <202409300353.48U3rZM7000710@gitrepo.freebsd.org> Mail-Followup-To: Kyle Evans , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org User-Agent: s-nail v14.9.25-608-ge479530e8d OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. 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:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Queue-Id: 4XHWpS0hHRz49QR X-Spamd-Bar: ---- List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org .. i have zero idea (and only look at time), but .. Kyle Evans wrote in <202409300353.48U3rZM7000710@gitrepo.freebsd.org>: |commit c2caf3b3313fe73bfc9b4b984c21da8d571f8798 |Author: Kyle Evans |AuthorDate: 2023-03-11 06:03:02 +0000 |Commit: Kyle Evans |CommitDate: 2024-09-30 03:52:20 +0000 | | flua: lposix: add more useful functions for general purpose scripts ... |+static int |+lua_read(lua_State *L) |+{ |+ char *buf; |+ ssize_t ret; |+ size_t sz; |+ int error, fd, narg; |+ |+ narg = lua_gettop(L); |+ luaL_argcheck(L, narg == 2, 1, |+ "read takes exactly two arguments (fd, size)"); |+ |+ fd = luaL_checkinteger(L, 1); |+ sz = luaL_checkinteger(L, 2); |+ |+ if (fd < 0) { |+ error = EBADF; |+ goto err; |+ } |+ |+ buf = malloc(sz); |+ if (buf == NULL) |+ goto err; |+ |+ /* |+ * For 0-byte reads, we'll still push the empty string and let the |+ * caller deal with EOF to match lposix semantics. |+ */ |+ ret = read(fd, buf, sz); |+ if (ret >= 0) |+ lua_pushlstring(L, buf, ret); |+ else if (ret < 0) |+ error = errno; /* Save to avoid clobber by free() */ |+ |+ free(buf); |+ if (error != 0) ^ uninit in ret>=0 case. ("Even clang should get it" (stupid me).) |+ goto err; |+ /* Just the string pushed. */ |+ return (1); |+err: ... --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Mon Sep 30 19:59:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHX3L4fw2z5XZyM; Mon, 30 Sep 2024 19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHX3L4CXhz4DR6; Mon, 30 Sep 2024 19:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=se627TDXf+L83fZiVNSr2uoxRn/XkwTEiMTbKLHmpOo=; b=KjJqIMQ4Y8KZ5QbSv6a/R/KQ0MqBlXNL7dhiLuVzIki18wEP7tviDTA6MACqk0jNJniC6b 3+bee6E77N0wLxDIZkTHoQO/ePtUPeCA6lViy427BHat2oWqKhD8HwJVK2KmORvaqep5rM ieExNX7sSF67GtmgIDo+kxTeWwMGkFiv95uWAG4X5DMYkNVpXTAxkIVc6lNeSnHcuGIjPN OU6I9LNj5wxOqqiTWt/qrXDKp/jdL8ryhyif0qxXpJnHTcespQNI6NaJtvepV3cEXC3N4b pd7kNaiSbk2sLpyD0O7EKEeSGL8yYkCVrpY5KH3nNFmBeUi96Qhf95kjOOfZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=se627TDXf+L83fZiVNSr2uoxRn/XkwTEiMTbKLHmpOo=; b=OvAkig+irvFqOgFkWtajnv+o1AE3Zv9fqBd1jGC0akSes6qLPk718PD6R/pwQFWFBVjh4o JeacWZFgudXTbQFgn5bK2gkVF5AdCOo+aCtTPZI5itntVSpc2HhIdFKXYNBcswdycQZ10f uNLJIHpt3Q6XG/9mi2nVOBa2BdmFcBqApW/VLwChjsUQOiTHwr8v2rng8Cp63YqyTSkOmB dEzeHjR5r1jp8pxe/8i3RASXrfVS1wN+2BHndEShqGRRnjlA0JGZylOGF0zpubMyOB1+Of E28ueCLwr/OIlnhGX48UfnILkUZY7gqhV/i0Lg/q1kepVB4bPfq9noIUoKlWOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727726382; a=rsa-sha256; cv=none; b=AkKxKZJdtFHw5JY4PEDXiRVfgcKkDLkmPQkxhvXam1baDHzaPTHnRVoEdVJvidVvINEBtN HlRlT5hl0tiZtoxVcN7O4XlNQ7PUtNjZt3X+SZIw9LTU7cmfqh9UQtn6nrR+95CJKUYlb9 PiYBzx2A+fGsGK76I7ZpQhUtcG6R7ZRmtubiBoIa7uyiUlrI+l5vwULRPQPuxHM0gtwiY1 JNFC/JFz5j8uOECtrnZEKuDfnqjMswovxL4MnbXbPAJ9YLi8D6wbF6Q87ENOhWun0u4/bc QHOkJj5n5B4zDksnQmOMDIEyYnfmTq+t50B/g/3qvwNhYiQ+Kcwle47Ep3rnag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHX3L3psFz16p2; Mon, 30 Sep 2024 19:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UJxgIx073187; Mon, 30 Sep 2024 19:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UJxgug073184; Mon, 30 Sep 2024 19:59:42 GMT (envelope-from git) Date: Mon, 30 Sep 2024 19:59:42 GMT Message-Id: <202409301959.48UJxgug073184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c02bc0aa0b22 - main - libmd: re-apply masking of _Transform names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c02bc0aa0b22009e4bc209efae99c877167e1161 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c02bc0aa0b22009e4bc209efae99c877167e1161 commit c02bc0aa0b22009e4bc209efae99c877167e1161 Author: Kyle Evans AuthorDate: 2024-09-30 19:54:42 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 19:59:31 +0000 libmd: re-apply masking of _Transform names Visibility can get complicated when, e.g., ifuncs are involved. In particular, SHA256/SHA512 on aarch64 use ifuncs for their _Transform implementations, which then exposes global symbols of the same name that break things trying to statically link both libcrypto and libmd. Revert this part of the _Transform removal to fix the pkg-static build on aarch64. Fixes: 81de655acd2 ("libmd: stop exporting Transform() symbols") --- lib/libmd/ripemd.h | 3 +++ lib/libmd/sha.h | 3 +++ sys/crypto/sha2/sha256.h | 3 +++ sys/crypto/sha2/sha512.h | 3 +++ sys/crypto/sha2/sha512t.h | 6 ++++++ 5 files changed, 18 insertions(+) diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h index 07293dad0e5f..252483be0a17 100644 --- a/lib/libmd/ripemd.h +++ b/lib/libmd/ripemd.h @@ -109,6 +109,9 @@ __BEGIN_DECLS #ifndef RIPEMD160_Data #define RIPEMD160_Data _libmd_RIPEMD160_Data #endif +#ifndef RIPEMD160_Transform +#define RIPEMD160_Transform _libmd_RIPEMD160_Transform +#endif #ifndef ripemd160_block #define ripemd160_block _libmd_ripemd160_block diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h index cd4a899bee49..3d1cd8da3ae2 100644 --- a/lib/libmd/sha.h +++ b/lib/libmd/sha.h @@ -138,6 +138,9 @@ __BEGIN_DECLS #ifndef SHA1_Data #define SHA1_Data _libmd_SHA1_Data #endif +#ifndef SHA1_Transform +#define SHA1_Transform _libmd_SHA1_Transform +#endif #ifndef sha1_block #define sha1_block _libmd_sha1_block diff --git a/sys/crypto/sha2/sha256.h b/sys/crypto/sha2/sha256.h index 77237c466bd9..150f1b63b9c2 100644 --- a/sys/crypto/sha2/sha256.h +++ b/sys/crypto/sha2/sha256.h @@ -72,6 +72,9 @@ __BEGIN_DECLS #ifndef SHA256_Data #define SHA256_Data _libmd_SHA256_Data #endif +#ifndef SHA256_Transform +#define SHA256_Transform _libmd_SHA256_Transform +#endif void SHA256_Init(SHA256_CTX *); void SHA256_Update(SHA256_CTX *, const void *, size_t); diff --git a/sys/crypto/sha2/sha512.h b/sys/crypto/sha2/sha512.h index b78fde7dc22f..206b7e63dc34 100644 --- a/sys/crypto/sha2/sha512.h +++ b/sys/crypto/sha2/sha512.h @@ -71,6 +71,9 @@ __BEGIN_DECLS #ifndef SHA512_Data #define SHA512_Data _libmd_SHA512_Data #endif +#ifndef SHA512_Transform +#define SHA512_Transform _libmd_SHA512_Transform +#endif void SHA512_Init(SHA512_CTX *); void SHA512_Update(SHA512_CTX *, const void *, size_t); diff --git a/sys/crypto/sha2/sha512t.h b/sys/crypto/sha2/sha512t.h index dc8025e4a74f..26a6909cbbac 100644 --- a/sys/crypto/sha2/sha512t.h +++ b/sys/crypto/sha2/sha512t.h @@ -68,6 +68,9 @@ __BEGIN_DECLS #ifndef SHA512_224_Data #define SHA512_224_Data _libmd_SHA512_224_Data #endif +#ifndef SHA512_224_Transform +#define SHA512_224_Transform _libmd_SHA512_224_Transform +#endif #ifndef SHA512_256_Init #define SHA512_256_Init _libmd_SHA512_256_Init @@ -96,6 +99,9 @@ __BEGIN_DECLS #ifndef SHA512_256_Data #define SHA512_256_Data _libmd_SHA512_256_Data #endif +#ifndef SHA512_256_Transform +#define SHA512_256_Transform _libmd_SHA512_256_Transform +#endif void SHA512_224_Init(SHA512_CTX *); void SHA512_224_Update(SHA512_CTX *, const void *, size_t); From nobody Mon Sep 30 19:59:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHX3M5xrLz5Xb6n; Mon, 30 Sep 2024 19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHX3M4yQRz4DNW; Mon, 30 Sep 2024 19: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=1727726383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIFeXhzJhGdTIHGt1MUGWwe/OlOYN6tNjlh3DukpTak=; b=BnfghXkVRQ3Da6jb9jJ8H+jpgaZnUimZAultSpV1/q+phUdQjAfn2/oirYIVgr71hJk3QH jejRsdYWzzbv24J/yDYrVSTs98t9vfSIIgmBrJGtclC9LyJXnURXsDoReKw4xOZsWd2eKx BvdHcfu4iv/GX6i3Q3NwRzoOWY8iljXh4LFUZCw3xIElRKbV2exaMT+mY6LrWZ68io9zxV iXEyEBMQbiJvU9IPhhmx2upHDibTU5GUNvxVR/JQ1hX1V84nutB0VDDu66Wm1UtA6CfmJT Iq6QtDClGJvsY/F89ZPH93/IKrfHmbopHxx40SmTw10dT2L3tpKc9KDgQANmcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIFeXhzJhGdTIHGt1MUGWwe/OlOYN6tNjlh3DukpTak=; b=ZXjXQCPgrdK4kLQdLbKws1Lwd5NCISM2d98QesuI187DOA4J4MYKCpYrmJmpasEzRqS3dK zZz9jhvAlDsydqoMXr57/YuEEBBvhtRZjBDoXQcIZnOnmm+AMwKQuzGP7lI+A10ZzvMy9T kiruIJqeaze4XJjsAa4gPn0BFJiuoUgR9pGbLJcCFfAyti2dfaEvPRHqvtm/JqUYrKbqKN MIXWpJTOVk8tkiIIBMGZKi5bO7vaY/xe7ZIyVwEzjo6ieHHY1FYmTwpMfYTORIUWWDgpJb 9mqOAucBHCACbfTxNW8nMBmb1fKw09fyPiMGuKHNUoCo0VCPPUPTqQ3puo8vSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727726383; a=rsa-sha256; cv=none; b=ln59xHNEnGO0kpo5OyQO5jSYNMuHGripqae4tZFlH/QNDnAObE6nqn7uQZ18EFR7acPKK9 ZZtj4aAVk9izXOwrJA1AI8vzvAPnTRsCduSBMdMd8AItpze1LQKk+YN2o1mbyo5q/5U/Td G4Vm14pMQlTILFXQBxkc13MMYR7aNEP5TCwB3tGKDZIOo1qHU0GagH1JAwsRSPt88jxtUP zar1HgA0G9PYk5oL8CJbFC3SNgvjwsvIfrI4FHI1XuvBcSOkWj91oACA0risQO+n130f6f 2JcD/77t/6oL/5HkUzZWVU58bq8P2TOUohWEWg28t1CxRyRwrMLQcStAi/8N6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHX3M4Z42z1643; Mon, 30 Sep 2024 19:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UJxh3G073242; Mon, 30 Sep 2024 19:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UJxhS3073239; Mon, 30 Sep 2024 19:59:43 GMT (envelope-from git) Date: Mon, 30 Sep 2024 19:59:43 GMT Message-Id: <202409301959.48UJxhS3073239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c4564a47c1ad - main - ObsoleteFiles: fix the libmd.so version bump order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4564a47c1ad9ef4c93c2ea415f7dfb771741a99 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c4564a47c1ad9ef4c93c2ea415f7dfb771741a99 commit c4564a47c1ad9ef4c93c2ea415f7dfb771741a99 Author: Kyle Evans AuthorDate: 2024-09-30 19:57:40 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 19:59:37 +0000 ObsoleteFiles: fix the libmd.so version bump order This changeset started two years ago, but the entry was not tweaked upon final commit to reflect reality. Fixes: e7a629c851d7 ("libmd, kern, stand: consolidate md5 [...]") --- ObsoleteFiles.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 9ecf5a8c3ecf..01f2609353cd 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240930: libmd bumped to version 7 +OLD_LIBS+=lib/libmd.so.6 + # 20240914 libpcap upgrade from 1.10.4 to 1.10.5 OLD_FILES+=contrib/libpcap/pcap-haiku.cpp OLD_FILES+=contrib/libpcap/pcap-rpcap-int.h @@ -3230,9 +3233,6 @@ OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.in OLD_DIRS+=usr/tests/usr.bin/uuencode OLD_DIRS+=usr/tests/usr.bin/uudecode -# 20220308: libmd bumped to version 7 -OLD_LIBS+=lib/libmd.so.6 - # 20220318: snd_ds1 and snd_maestro drivers removed OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz From nobody Mon Sep 30 20:04:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHX973CPHz5XbMX; Mon, 30 Sep 2024 20:04:43 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHX972gqXz4FDw; Mon, 30 Sep 2024 20:04:43 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726683; 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:autocrypt:autocrypt; bh=H69CKAdl9tNgCFDmMq4vEatgrerbqcAZtPpX4M6hG5w=; b=GoozPE0K32uHPe4EqarniM4GHEKuK5e3B0ChPE1q+YnqWQLd5h25wwdE0cxcyt7soOpXkd 1m1zAeGjKY7wVfALvc1SW3wHyz0cg+rN211N9nnxZvzHl3sukf3Nc3XRzgxva12P/p5htC nnJrz5X8566MzpL+/NqGHmIHlGYb9WPTn8M8X1gmV6NGb3qxqelJkEgpRclJFs9DtMIMnh YXu9wS91eZKEvAiXPHWLntC4/Jh4YVuEcYA/MP3xRf2VgpBVqPU6WEHmHgntRqP0R3+xGc Co1o55y04P3tpTLSOOxatapr+nJXmRRFwTlj1/W/uXDWt4EXbzyWxpOYkRpF4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726683; 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:autocrypt:autocrypt; bh=H69CKAdl9tNgCFDmMq4vEatgrerbqcAZtPpX4M6hG5w=; b=BwSNAG+M5bSVmsNZdmgUKa7OKjBQazd0jbJSqu7SWA7QzbgfWJ6jwWnEjX8/CdihZTILW5 c2bHz4INthHo9MlvzP9g9Kk37IaNmIjf7QEAL50Koztx/7tlkquc3Hr1peA33wx8o2Jgpq AsjF7D+6hIMUmC7PTcuKqZsFnsUG5gE4B1vORSHB9VK2JfsC7qIUI6EVTfc3mSITbCbTk1 Z3mwpB+0hW9MpEh4whycxDCYwQNA5sMKc4PbLdZZ+Dmw6KJ8jHdd02g8F9F+uGezP2Zv3O wYP9LTZ5HV8OUNdqiUaQTRHkYHz8VPVIpZ9JYYe/zmYKkIdBfnaivUejK1bpZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727726683; a=rsa-sha256; cv=none; b=kD/XB5CBr4R566WnmP+2ZLrx1VX9AHB+m4Jtu/kBLsshEroVCVqauPHrqryAEpX97RsHKt KJjttZUHzcRDfvqSPsYrEd0P8YmeoHANb29LqrEkQY70cg04BUI11f/D1gwEF50S4eE6IX M57vxvhf8vzwXqvqc+/ibOVz9JCLScC6B18C2JlQ0F6ZcFGKIxpS68tgCdJsNcF2kUnx2u FY2hDxzNwg7e0g4LRwhpYxzqlZ63KyxtykrsUTukDfJB87f5Ao1rLyvL2d0hvHdyTskYe7 khQ96AGErq9lC+2NQn9qjXFBfATFuLP5ilKkiN3yIo+vw40gbd3mi19H9prkvA== Received: from [10.216.0.105] (unknown [188.243.165.67]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: fluffy) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XHX962y84zTBr; Mon, 30 Sep 2024 20:04:42 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Message-ID: Date: Mon, 30 Sep 2024 23:04:39 +0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) To: "Herbert J. Skuhra" , Kyle Evans Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> <87wmit2cmj.wl-herbert@gojira.at> Content-Language: ru, en-GB, en-US From: Dima Panov Autocrypt: addr=fluffy@FreeBSD.org; keydata= xsFNBEp+xiUBEAD01RkOYcyzU/Fnam2FI7PPwYqW00SwVmfUHihvVniiaMwzaYzchb+mzSha NsqRgjIN/i59OBpnS25OXMLEpQP7jDJnY2xKyJN2H4qn1HPHkF9cYuqvqkm+r5459g+2ZoGY 9Sr1PA0XSzXJMSQ1nRK3cFfqlN/L2//P36U5VuOWXGZUTwr/n2B/N0HAsYsqDOdjofLg7x9z 8p8elqwJbT/O4ltg8JBVAnof+FzqefYW4CzqkHRjq/9ORiGYh14ST9ECsCaVpfdDUTor0wgp JqzCN1HsQcHqgdMmOqigWIgN7Eg4MRQU3LDCISrNJ/45zvcKUXR0RHOjnSuflYba74q58XhZ 4eCTqHeMHjA8st4IWRzy9l0V4RunnZxjOTb806jyIhdxcb2m8o5tXwsqjf0TQ7vYowDHrQ6g XlhPg4Jvvwf+BwlB2p+w7Cs/Y9QA0YHnIOIVZAwU1wv66YSI9IDL2AbnY2gQGx+dkHiC3S5L G8HcPrMcjayyThKKIi5KQsWa3snFeK5ky+cRpVEOPQfUXFOas++91v90Xe9j+lsmRofsyvuy gzoaZE2fud0kCsOgYEg+kiLPlQicNAx5IToOs8BrVFLcxmbPKuVBfbLdWsYLjXGzbXEmzV9f NDZ1r1uNmVema8YYCiNjUDZhxIfKt8nbp6cx8UgVLGRVDEfXeQARAQABzTdEaW1hIFBhbm92 IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxmbHVmZnlARnJlZUJTRC5PUkc+wsF2BBMBAgAg BQJKfsYlAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ+4ugndU5jyk6dhAArHclTYjw VRjDnoRfO3Zfj9Ssab9Vrbo7DNFWeAqPE3OTCmiq9Q0fzRHzmhVyedYMm9qNA3i0J1De3KTn LanXOrBIqsmmZpSqmrp/xXdZngDLW5H6hpE0f2PeAPwxrb9uBQax8WMR7Z4STSHAP4GRjve3 0wNNS0MlawGllcs9VKRxG5PsDA8k3ACTSjdpQ76RWldORN4LA8M40yHRX377SGMzO+XsCeOw ad65GKyLrx+6Gnd3PMOjVCJCrqd04Jgqg9G0xKNImchwIZ5ulx9jAt+ixfNbY6hwslleqimr 2t5+MMqo6dRrvJ+BsR8NHt9vGi2Jy4+4smg05fR18fck0Sk4vCYyVvtvnOk3qZf0F8zJu06G cjWWC2ZbDPbmksWXFIMxoJbyVxK55xOqcFs0t12sR6gbVJb8Nb88WrQub3MgePyMF6R3Tkfa OqkjvQur1xC2AXESTxtJw1FkdGSb3UopNKgvSPHSLFW8B0LbyDxdYRTRWPGGEUhFP6tdXi5R vb1210ks2EQAqF4Cm3iRIhYgtZvQqQgMSiO9fVyeJ0U6dYGDtg2Boi+NtXKRdmtL7pRSnI3n fAbVJ05Hhd7PBnJeob6R08nHRo9DdAG7o8ToM+egUAuEsEvoRV+v4f6k3mShdxE7gG/anwVy eh3n6LGwg9KHDr1X2FODsLLxgUjOwU0ESn7GJQEQAMBTMHQgb0vcPMAiRvb357ihlh/YYA22 FXj4p3XTrDlBlRL0QCRq1I8XDeQmL3mG3s3NBtDXSefnNM06jZ3XCAfHIDBdxJJvQZZCXfvL p/JK7nnEuqoeqT6/oKs1MeZVdUnvh1nZhphs+Z6dl01GIE8YDpzT1JMD2f3G9PHChGi3Ddzq m3VdXt/87khYJkPbaf6EN5+vDthKgMjba8jwbQ+7IUPqkfnNFIZS6irZ2LYb79BLNI5JSl9l ReSfEX2d8ByQlLzuf0TS4voy3nWGeCyj6BIOMiRSxg+hZmJLYxhNkyK4GQVCt/rLT7dIfBQM syBbX0Qw2NOcfba9VgdPZBgdrawwB4/xF9SA3NB0J0lUjhjpH9iG8NxlpleEg8OSUApyFZEJ q2A/flns4kKzNH7AGYDOFORytDzA3qkgCJrZ7nzQSsdtZ2qbyAoze0tl+YrShJhOcmQBtFem omhWVeJ8T/Bw1KH8M1ihrENBTSzYzLvN18YjNP6P0Dh/7Zda5yYI8fNqd84K3Uq5xBiI0S6+ qxViw84z2tJj8TxiNqFAk7Tbeo2Ximtq7uQ9UnFRSK3jw96yi19KU9rQQZs0xUjN5gn/tF5l BZWKjwuZCkcOiI0EWHAR+ATAEsFNXcuoC9CAGK5HFW4nI4WtE3pv1KYvivlGtF1wzf0Qrhye RrmxABEBAAHCwV8EGAECAAkFAkp+xiUCGwwACgkQ+4ugndU5jymgKg//RvnI7zEDKv6nQUqK RyLawPTrCKCtQ2vSoWyTNgRB6byNS1w5wNSAMnqaESx2bdhauaxe167VEJYqgQy241yFslpC 6v/xlH25Ppos+Jg6AKaQG/JABHO6Co4tHtBbNmM+14HESxAodA4NJuEU19iIPjRhUKC8F8R9 xBmW1uLpPiljU9Km0P3EIKjAdtdZNeMLhwsbSHBwJROFrxFGiTzWNREWZoZpQxgSbHYhwYbx HEbJi1cybl9IQvSGHrysctZsxD04Jxh6ogaziiT8aV6ear6BNh008yRf61FvrinfG3USLR3i JO8aHap4QGCPjZ3cyT+DEq8/zVfDdeidTeNEhSgRKk856RcA+yAE79KYdKkvmDUiC8poAJ7F GEYHMB+g/1+LczCr2g9GYkiB/53boYfU9esYYlarxCgedCrwXv6T48FZ3xxoH3XJ2KV8K6M8 CUb04jj3kEeCwq+R6Bk2ZXrnMzyQmmn223X+Zp89B/gchH32JY8y3j7BICcoZmgMu62XNMgW I/hRgfi3JlVCne6XPj3/w00JYG7vo+eTJOflqYr3WRTPYh7DxzYtshZswHmmkZtwizUQUZzF 9dX2CM8nY7cKucEmtcnUpjGwXMOufa/DmCTlk8ggRZ0ukCUZOlIA4ILxp95sS2oqyucARv+p wMWvrqJ/LfbZexSsIjI= Organization: FreeBSD.org In-Reply-To: <87wmit2cmj.wl-herbert@gojira.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------5hKMGnTbw1rFV4IU0isGTs0x" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------5hKMGnTbw1rFV4IU0isGTs0x Content-Type: multipart/mixed; boundary="------------Vyxt5kh9qTx0u9QdlgzUWkVz"; protected-headers="v1" From: Dima Panov To: "Herbert J. Skuhra" , Kyle Evans Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: Subject: Re: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) References: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> <87wmit2cmj.wl-herbert@gojira.at> In-Reply-To: <87wmit2cmj.wl-herbert@gojira.at> --------------Vyxt5kh9qTx0u9QdlgzUWkVz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SGVsbG8hDQoNCk9uIDMwLjA5LjIwMjQgMjE6NTcsIEhlcmJlcnQgSi4gU2t1aHJhIHdyb3Rl Og0KPiBPbiBNb24sIDMwIFNlcCAyMDI0IDA1OjM2OjA0ICswMjAwLCBLeWxlIEV2YW5zIHdy b3RlOg0KPj4NCj4+IFRoZSBicmFuY2ggbWFpbiBoYXMgYmVlbiB1cGRhdGVkIGJ5IGtldmFu czoNCj4+DQo+PiBVUkw6IGh0dHBzOi8vY2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9p ZD1lN2E2MjljODUxZDc0Nzc3MmNjMTM4ZWZjYjA0MTg4MDllY2RlYTU1DQo+Pg0KPj4gY29t bWl0IGU3YTYyOWM4NTFkNzQ3NzcyY2MxMzhlZmNiMDQxODgwOWVjZGVhNTUNCj4+IEF1dGhv cjogICAgIEt5bGUgRXZhbnMgPGtldmFuc0BGcmVlQlNELm9yZz4NCj4+IEF1dGhvckRhdGU6 IDIwMjItMDMtMDggMTU6Mzk6NTIgKzAwMDANCj4+IENvbW1pdDogICAgIEt5bGUgRXZhbnMg PGtldmFuc0BGcmVlQlNELm9yZz4NCj4+IENvbW1pdERhdGU6IDIwMjQtMDktMzAgMDM6MzQ6 MTggKzAwMDANCj4+DQo+PiAgICAgIGxpYm1kLCBrZXJuLCBzdGFuZDogY29uc29saWRhdGUg bWQ1IGltcGxlbWVudGF0aW9ucyAoTkZDKQ0KPj4gICAgICANCj4+ICAgICAgUmVkdWNlIHRo ZSBudW1iZXIgb2YgbWQ1Yy5jIGJldHdlZW4gdGhlIHRocmVlIG9mIHRoZXNlIGZyb20gdHdv IHRvIG9uZQ0KPj4gICAgICBieSBqdXN0IHJlYWNoaW5nIGludG8gdGhlIGtlcm5lbCBidWls ZCBmb3IgYm90aCB1c2VybGFuZCBidWlsZHMuICBUaGUNCj4+ICAgICAgcHJlY2VkZW50IGZv ciB0aGlzIGFscmVhZHkgZXhpc3RzIGZvciBzaGEyIGluIGJvdGggY2FzZXMuDQo+PiAgICAg IA0KPj4gICAgICBfbGlibWRfIHN5bWJvbCBwcml2YXRpemF0aW9uIGJpdHMgaGF2ZSBiZWVu IG1vdmVkIHRvIHN5cy9tZDUuaCBhbmQNCj4+ICAgICAgbWQ1LmggcmVtYWlucyB0byAjaW5j bHVkZSA8c3lzL21kNS5oPiBmb3IgY29tcGF0aWJpbGl0eS4NCj4+ICAgICAgDQo+PiAgICAg IFRoaXMgc3RvcHMgZXhwb3J0aW5nIE1ENVBhZCgpIGluIHRoZSBwcm9jZXNzIGJlY2F1c2Ug dGhlIGtlcm5lbCBzdG9wcGVkDQo+PiAgICAgIGV4cG9ydGluZyBpdCBpbiA1MDJhMzVkNjBm NGMuICBzb3ZlcnNpb24gaXMgYnVtcGVkIGFjY29yZGluZ2x5Lg0KPj4gICAgICANCj4+ICAg ICAgVGhpcyBhbHNvIHJlbmFtZXMgdGhlIGxpYmMgdmVyc2lvbiBvZiBzdGFja19wcm90ZWN0 b3IuYzsgaXQgcHJldmlvdXNseQ0KPj4gICAgICBvbmx5IHdvcmtlZCBieSBjb2luY2lkZW5j ZSBiZWNhdXNlIC5QQVRIIG9yZGVyaW5nIHdvcmtlZCBvdXQgc3VjaCB0aGF0DQo+PiAgICAg IHdlIGdvdCB0aGUgcmlnaHQgb25lLCBidXQgdGhpcyBpcyBub3QgdGhlIGNhc2UgYW55bW9y ZS4gIFJlbW92ZSB0aGUNCj4+ICAgICAgbGFuZG1pbmUuDQo+PiAgICAgIA0KPj4gICAgICBQ UjogICAgICAgICAgICAgMjgwNzg0IChleHAtcnVuKQ0KPj4gICAgICBSZXZpZXdlZCBieTog ICAgYWxsYW5qdWRlLCBkZWxwaGlqDQo+PiAgICAgIERpZmZlcmVudGlhbCBSZXZpc2lvbjog IGh0dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9EMzQ0OTcNCj4+IC0tLQ0KPj4gICBPYnNv bGV0ZUZpbGVzLmluYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMyAr DQo+PiAgIGxpYi9saWJjL01ha2VmaWxlICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAyICstDQo+PiAgIGxpYi9saWJjL21kL01ha2VmaWxlLmluYyAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAyICstDQo+PiAgIGxpYi9saWJjL3NlY3VyZS9NYWtlZmls ZS5pbmMgICAgICAgICAgICAgICAgICAgICAgIHwgICAyICstDQo+PiAgIC4uLi97c3RhY2tf cHJvdGVjdG9yLmMgPT4gbGliY19zdGFja19wcm90ZWN0b3IuY30gIHwgICAwDQo+PiAgIGxp Yi9saWJjcnlwdC9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAy ICstDQo+PiAgIGxpYi9saWJtZC9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAzICstDQo+PiAgIGxpYi9saWJtZC9tZDUuaCAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgIDQwIC0tLQ0KPj4gICBsaWIvbGlibWQvbWQ1Yy5jICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDM0NCAtLS0tLS0tLS0tLS0tLS0t LS0tLS0NCj4+ICAgbGliL2xpYnNzcC9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDIgKy0NCj4+ICAgc3RhbmQvbGlic2EvTWFrZWZpbGUgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDQgKy0NCj4+ICAgc3lzL2tlcm4vbWQ1Yy5jICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMjMgKy0NCj4+ICAgc3lzL3N5 cy9tZDUuaCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgNDIgKysr DQo+PiAgIDEzIGZpbGVzIGNoYW5nZWQsIDcyIGluc2VydGlvbnMoKyksIDM5NyBkZWxldGlv bnMoLSkNCj4gDQo+IERvbid0IHJ1biBtYWtlIGRlbGV0ZS1vbGQtbGlicy4gOi0pDQo+IA0K PiBEb2VzIHRoaXMgY2hhbmdlIGJyZWFrIGJ1aWxkaW5nIHBvcnRzLW1nbXQvcGtnIChvbiBh cm02NCk/DQo+IA0KPiAtLS0gcGtnIC0tLQ0KPiBjYyAtbyBwa2cgYWRkLm8gYWxpYXMubyBh bm5vdGF0ZS5vIGF1ZGl0Lm8gYXV0b3JlbW92ZS5vIGNoZWNrLm8gY2xlYW4ubyBjb25maWcu byBjcmVhdGUubyBkZWxldGUubyBldmVudC5vIGZldGNoLm8gZ2xvYmFscy5vIGluZm8ubyBp bnN0YWxsLm8ga2V5Lm8gbG9jay5vIG1haW4ubyBwbHVnaW5zLm8gcXVlcnkubyByZWdpc3Rl ci5vIHJlcG8ubyBycXVlcnkubyBzZWFyY2gubyBzZXQubyBzaGVsbC5vIHNobGliLm8gc3No Lm8gc3RhdHMubyB0cmlnZ2Vycy5vIHVwZGF0ZS5vIHVwZGF0aW5nLm8gdXBncmFkZS5vIHV0 aWxzLm8gdmVyc2lvbi5vIHdoaWNoLm8gIC1mc3RhY2stcHJvdGVjdG9yLXN0cm9uZyAgLVds LC1Cc3RhdGljICAtV2wsLXdob2xlLWFyY2hpdmUgLUwvdXNyL3BvcnRzL3BvcnRzLW1nbXQv cGtnL3dvcmsvcGtnLTEuMjEuMy9saWJwa2cgLWxwa2dfZmxhdCAtV2wsLW5vLXdob2xlLWFy Y2hpdmUgICAgLVdsLC1CZHluYW1pYyAtbGVsZiAtbGphaWwgLWxzc2wgLWxjcnlwdG8gLWxh cmNoaXZlIC1sYnoyIC1seiAtbGx6bWEgLWxwcml2YXRlenN0ZCAtbG0gLXB0aHJlYWQgLWx1 dGlsIC1sbWQgIC1XbCwtLWV4cG9ydC1keW5hbWljDQo+IC0tLSBwa2ctc3RhdGljIC0tLQ0K PiBjYyAtbyBwa2ctc3RhdGljIGFkZC5vIGFsaWFzLm8gYW5ub3RhdGUubyBhdWRpdC5vIGF1 dG9yZW1vdmUubyBjaGVjay5vIGNsZWFuLm8gY29uZmlnLm8gY3JlYXRlLm8gZGVsZXRlLm8g ZXZlbnQubyBmZXRjaC5vIGdsb2JhbHMubyBpbmZvLm8gaW5zdGFsbC5vIGtleS5vIGxvY2su byBtYWluLm8gcGx1Z2lucy5vIHF1ZXJ5Lm8gcmVnaXN0ZXIubyByZXBvLm8gcnF1ZXJ5Lm8g c2VhcmNoLm8gc2V0Lm8gc2hlbGwubyBzaGxpYi5vIHNzaC5vIHN0YXRzLm8gdHJpZ2dlcnMu byB1cGRhdGUubyB1cGRhdGluZy5vIHVwZ3JhZGUubyB1dGlscy5vIHZlcnNpb24ubyB3aGlj aC5vIC1zdGF0aWMgLUwvdXNyL3BvcnRzL3BvcnRzLW1nbXQvcGtnL3dvcmsvcGtnLTEuMjEu My9saWJwa2cgLWxwa2dfZmxhdCAgLWxlbGYgLWxqYWlsIC1sc3NsIC1sY3J5cHRvIC1sYXJj aGl2ZSAtbGJ6MiAtbHogLWxsem1hIC1scHJpdmF0ZXpzdGQgLWxtIC1wdGhyZWFkIC1sdXRp bCAtbG1kDQo+IGxkOiBlcnJvcjogZHVwbGljYXRlIHN5bWJvbDogU0hBMjU2X1RyYW5zZm9y bQ0KPj4+PiBkZWZpbmVkIGF0IHNoYTI1Ni5jDQo+Pj4+ICAgICAgICAgICAgIHNoYTI1Ni5v OihTSEEyNTZfVHJhbnNmb3JtKSBpbiBhcmNoaXZlIC91c3IvbGliL2xpYmNyeXB0by5hDQo+ Pj4+IGRlZmluZWQgYXQgc2hhMjU2Yy5jDQo+Pj4+ICAgICAgICAgICAgIHNoYTI1NmMubzoo U0hBMjU2X1RyYW5zZm9ybV9yZXNvbHZlcikgaW4gYXJjaGl2ZSAvdXNyL2xpYi9saWJtZC5h DQo+IGNjOiBlcnJvcjogbGlua2VyIGNvbW1hbmQgZmFpbGVkIHdpdGggZXhpdCBjb2RlIDEg KHVzZSAtdiB0byBzZWUgaW52b2NhdGlvbikNCj4gKioqIFtwa2ctc3RhdGljXSBFcnJvciBj b2RlIDENCj4gDQoNCg0KYWxzbywgdGhpcyBwcmV2ZW50IHRvIHJ1biBhbnl0aGluZyBidWls ZGVkIHdpdGggbGlibWQuc28uNg0KDQokIHBrZyB1cGcNCmxkLWVsZi5zby4xOiAvdXNyL2xv Y2FsL2xpYi9jb21wYXQvcGtnL2xpYm1kLnNvLjY6IHVuc3VwcG9ydGVkIGZpbGUgbGF5b3V0 DQoNCi0tIA0KU2luY2VyZWx5LA0KRGltYSAoZmx1ZmZ5QEZyZWVCU0Qub3JnLCBodHRwczov L3QubWUvRmx1ZmZ5QlNELCBAZmx1ZmZ5Om1hdHJpeC1kZXYuZnJlZWJzZC5vcmcpDQooZGVz a3RvcCwga2RlLCB4MTEsIG9mZmljZSwgcG9ydHMtc2VjdGVhbSlARnJlZUJTRCB0ZWFtDQoN Cg== --------------Vyxt5kh9qTx0u9QdlgzUWkVz-- --------------5hKMGnTbw1rFV4IU0isGTs0x Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEELTAsy5mEEwxvh7r8+4ugndU5jykFAmb7BFcFAwAAAAAACgkQ+4ugndU5jyms ahAAuf8n+qbAcLXRQs1xI6kEwU0haRZ96d5sapiV5V1s6JioWhYx2i6CuDY9ANsCcKIpzXlKOe/g 8kU18/iZvEh8Ns7nH8c7V7CWc/j483QXO1Yn7GGPT9PznIxnDnKcqmF+ppy1DqeyVV7OJ8linl9k sfvml0fkn7E+1+rVJwFzMOa5KzbGIlHRG4oAkZDrbMuI3zH9KaJJBMz5+6gvvZQ1lfwr2tMFL24f Dsa1y7MtB0BqnhbapCC7aLOntBf2mMx0TybZwr0WFFrHG5/sU7SdIDMCHN0Q0l24Ht4YuATealZe GlUZZHlfyHdSJ9KuQRUq4OnlNCd4mEPGn1dJPjb4xjh8xQKyHnfjcL1w4adwExl42ZELQR3CI/lA g4txOB1xRpxNCeyy65eEux0aK5HsUDceub14k1m3qY3aAFpqVw5egmwUqGLHr+ceOmFyg9vJEJmm sJ/Jg3H5+BQjbS6dgn81aSGftBHpCnrBEty0TSPkdSJKFD800LhBofgIQoJAIArWK9ORvofZxTzl pOC1JI37R5XufCw7wqShCbTY/CeWx/rrzJGhebwYR9DxlafC0OIhJ3+kIYIKSLg7RFVV7MQIfqsr P1ISz2aApdbVKtBuDOWzlckd/C8/Idl6d85l3j8HGdOoZ+PA4zYpQ0LxW/Scz8E8/IVptgJXqZ5W Ics= =gdDI -----END PGP SIGNATURE----- --------------5hKMGnTbw1rFV4IU0isGTs0x-- From nobody Mon Sep 30 20:32:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHXn41pWwz5XdN4; Mon, 30 Sep 2024 20:32:24 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHXn41D9nz4HGD; Mon, 30 Sep 2024 20:32:24 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727728344; 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=v7rqxePVlmOQNdC2fDBKzQtMmixemUeOthw7K+v6dvA=; b=j9OiTm10Chs9jQ97HM9bAt35rcuXTsoVSBXLv2Bx5sbcc/Fy2ufkXpaFCdl/6NICgy2Teu 8sbZwm+Tts/fmyA5pmu4omXz/wOS46zlpu5SHzmeck8pQUxfY6SjbQ4Cbwwy6NK4v5HHdJ b/ZwpQv6+WsQAs3i5+tD2JK9v9ZssK+K+Xzldinbs9bR5K6raKcMSqJA922wJx5SfdasED LhMzGKfocr9Fo7jJtq0GoWpnPjCfvgTs1Fkgx9MJfP1tMzrPqFM4BdyKqHjE2elvjnCySP D8GhxazcJntbxG+7r7eyA9kCkdjqkptdZMs/aeCHh7frzdFCEPa9MWtYy6s7xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727728344; 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=v7rqxePVlmOQNdC2fDBKzQtMmixemUeOthw7K+v6dvA=; b=WgupIUnVH/ZA0OcoS500dt275Qo9ODSd5UI3lLva94nWRKRpjgqORNV2gZJ9GCXFz548gW e7bL0CpQZmgtGdDKY8ZJma47++vHS0IihaABtyOng4/vJXsk8VK/aUC4Ct5oVli0I9LEtx I0HGsLQrVX7uDYFOGFtlrVAHlBO9ic5RzEsgC2sQQPr0gRK96i1l49a82eoS6eDOoa4aY2 giswYOXkCJ2UWs80S4pgHcBjUoVGYAdciaeNsrxa0EUPwvwIvSzhkCC4dMGDoSQs+M9idk jxxEMTfJlOuNYqbQ92wHgCYk1KdWha8XB04IjDnCs+u2pF8TDIyVmiw/xddeNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727728344; a=rsa-sha256; cv=none; b=E5H1Ufi+Pyyq+TLlpuWUOmaenDgtlrgDFGaZmIND+XiypYNVC4PwXwLBjrBRK8vb9iIMVC j/8Ke2PJ6fC43UA5MzYz0z06hVBJJVffavrWr99dkj+5U+w7QSkNJ0hI+HK2T28YhLTHVo RfQOvAHpn9tOKK7rfQCkYz3vUJngapTRsow3KXyOTwrc7Iw/5POcdzqbaZos5n+WDeMWQk crGUOUtLSq9eVA+p3nX70qoOaA2aH5SYbf+U3V78DizULXy3Hqgx0DaC9M7EuVDLbKviXE JPmXHIInEg6OytdmhBFRLOOYzk83lgiZgZwRPqKbj962LEElW/DXlpDOS5INWg== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XHXn34PnyzSQX; Mon, 30 Sep 2024 20:32:23 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Mon, 30 Sep 2024 15:32:21 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) To: Dima Panov , "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> <87wmit2cmj.wl-herbert@gojira.at> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 9/30/24 15:04, Dima Panov wrote: > Hello! > > On 30.09.2024 21:57, Herbert J. Skuhra wrote: >> On Mon, 30 Sep 2024 05:36:04 +0200, Kyle Evans wrote: >>> >>> The branch main has been updated by kevans: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=e7a629c851d747772cc138efcb0418809ecdea55 >>> >>> commit e7a629c851d747772cc138efcb0418809ecdea55 >>> Author:     Kyle Evans >>> AuthorDate: 2022-03-08 15:39:52 +0000 >>> Commit:     Kyle Evans >>> CommitDate: 2024-09-30 03:34:18 +0000 >>> >>>      libmd, kern, stand: consolidate md5 implementations (NFC) >>>      Reduce the number of md5c.c between the three of these from two >>> to one >>>      by just reaching into the kernel build for both userland >>> builds.  The >>>      precedent for this already exists for sha2 in both cases. >>>      _libmd_ symbol privatization bits have been moved to sys/md5.h and >>>      md5.h remains to #include for compatibility. >>>      This stops exporting MD5Pad() in the process because the kernel >>> stopped >>>      exporting it in 502a35d60f4c.  soversion is bumped accordingly. >>>      This also renames the libc version of stack_protector.c; it >>> previously >>>      only worked by coincidence because .PATH ordering worked out >>> such that >>>      we got the right one, but this is not the case anymore.  Remove the >>>      landmine. >>>      PR:             280784 (exp-run) >>>      Reviewed by:    allanjude, delphij >>>      Differential Revision:  https://reviews.freebsd.org/D34497 >>> --- >>>   ObsoleteFiles.inc                                  |   3 + >>>   lib/libc/Makefile                                  |   2 +- >>>   lib/libc/md/Makefile.inc                           |   2 +- >>>   lib/libc/secure/Makefile.inc                       |   2 +- >>>   .../{stack_protector.c => libc_stack_protector.c}  |   0 >>>   lib/libcrypt/Makefile                              |   2 +- >>>   lib/libmd/Makefile                                 |   3 +- >>>   lib/libmd/md5.h                                    |  40 --- >>>   lib/libmd/md5c.c                                   | 344 >>> --------------------- >>>   lib/libssp/Makefile                                |   2 +- >>>   stand/libsa/Makefile                               |   4 +- >>>   sys/kern/md5c.c                                    |  23 +- >>>   sys/sys/md5.h                                      |  42 +++ >>>   13 files changed, 72 insertions(+), 397 deletions(-) >> >> Don't run make delete-old-libs. :-) >> >> Does this change break building ports-mgmt/pkg (on arm64)? >> >> --- pkg --- >> cc -o pkg add.o alias.o annotate.o audit.o autoremove.o check.o >> clean.o config.o create.o delete.o event.o fetch.o globals.o info.o >> install.o key.o lock.o main.o plugins.o query.o register.o repo.o >> rquery.o search.o set.o shell.o shlib.o ssh.o stats.o triggers.o >> update.o updating.o upgrade.o utils.o version.o which.o >> -fstack-protector-strong  -Wl,-Bstatic  -Wl,-whole-archive >> -L/usr/ports/ports-mgmt/pkg/work/pkg-1.21.3/libpkg -lpkg_flat >> -Wl,-no-whole-archive    -Wl,-Bdynamic -lelf -ljail -lssl -lcrypto >> -larchive -lbz2 -lz -llzma -lprivatezstd -lm -pthread -lutil -lmd >> -Wl,--export-dynamic >> --- pkg-static --- >> cc -o pkg-static add.o alias.o annotate.o audit.o autoremove.o check.o >> clean.o config.o create.o delete.o event.o fetch.o globals.o info.o >> install.o key.o lock.o main.o plugins.o query.o register.o repo.o >> rquery.o search.o set.o shell.o shlib.o ssh.o stats.o triggers.o >> update.o updating.o upgrade.o utils.o version.o which.o -static >> -L/usr/ports/ports-mgmt/pkg/work/pkg-1.21.3/libpkg -lpkg_flat  -lelf >> -ljail -lssl -lcrypto -larchive -lbz2 -lz -llzma -lprivatezstd -lm >> -pthread -lutil -lmd >> ld: error: duplicate symbol: SHA256_Transform >>>>> defined at sha256.c >>>>>             sha256.o:(SHA256_Transform) in archive >>>>> /usr/lib/libcrypto.a >>>>> defined at sha256c.c >>>>>             sha256c.o:(SHA256_Transform_resolver) in archive >>>>> /usr/lib/libmd.a >> cc: error: linker command failed with exit code 1 (use -v to see >> invocation) >> *** [pkg-static] Error code 1 >> > This one is fixed in c02bc0aa0b22009e4bc, sorry about that. I forgot that exp-runs are inherently x86, and there's some aarch64 specific bits in here that shouldn't have been missed. > > also, this prevent to run anything builded with libmd.so.6 > > $ pkg upg > ld-elf.so.1: /usr/local/lib/compat/pkg/libmd.so.6: unsupported file layout > This one doesn't seem to make any sense, though. That message in particular implies the elf header itself is damaged somehow. Thanks, Kyle Evans From nobody Mon Sep 30 22:51:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHbsq24x2z5Xp0t; Mon, 30 Sep 2024 22:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHbsq1fHpz4Zmp; Mon, 30 Sep 2024 22:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727736703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKs/9MxWRMfWkEl7WWUMx7+0s8DThSTQFSuEbzXwr58=; b=xSZacP05zagP+tOYlYNKJOvGrBCHlXfgKgDZLkZ8BNuPK7Gi+T89sqTAdXEqOzdB5Qd7TK Umc+mr9klhujoZJXkiwjStxuu5hIy2EZdbi53lYRgNMKzf5TbmF07+fpiazNsMf9KTmSVa swBdZVSNmtWQDobx2/H+0l4BnVSgfRNFK/3pATRAyhBTycmnhg+HXamp+q5PoKWmGWp51d GA8/ohYI99LFYAc3YdziVcZh3BDj4MBQ5BUIxpJXtqzDbfwwky2Oj+XtD6ehIrFQftoPdB xFGh9VYUXSobiUIc0uoHkrCTQNhret165AShNMUTQbc7rD3JeWfGrmGWLPXMLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727736703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKs/9MxWRMfWkEl7WWUMx7+0s8DThSTQFSuEbzXwr58=; b=GsKxhxntlq/3G5gczN6K8IwVXAuj/amJJD+gL0Rj1DE4S0nSpZRGNwUVRJti/AxL6Q39cK Vc3z9iqJ01VwW7ITOZPQwt0qIK0ldA/zIqMPgeO4Ley3DjRc18e3AjW4FDZ55q9Q3wmxph EcGYrDi6M4FQOB2bqC5NsTrR9XXUt7bcqLXAt3Xzjhch+Ts0doBrUORpwevnbFZyRDtPUU J/M5PLr3PJSQfFgurPXaS+vg+dEkladX2Oe62M4BuMjq8pG7CYBHJk/8KpQ2gc3TOiAB54 BM1aSk7sMuNprRMQnt88mBJe/QcBKuNoWfN8v9b+FNuqz7VD2/kNfv14oxeetQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727736703; a=rsa-sha256; cv=none; b=PakGzSitbIQpeoaBpChuuSbifi7DazJX62geBFIZ9fqw82pzY9ZO9/o8iCGg9XbuuuHBY+ rDcB7AjvfIOKieMMrKYVXPbvAU4ca7K3QEN0TBB83sd10TYktnIKu9QpguLy/n955D+AbN 6s+mrZplxo2k6Zy4UjEbIv7DGUagLsEGyPILcKyU6R7+sOF3iQUgVpXvFoE4kTGsvdTwxS vc4yzlbb+4de0606fMlTUlvMB3TyNc3SMhkm+7pjyhU32VY49ry8ZRhRGSr7qPMz9kGVL5 akgnj8HyGtKqUHeXVq7lhFjvM4rnkNbCsWygoqLV0TYGSPDpt7DIwXR0zYZMHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHbsq1Fm7z1C5W; Mon, 30 Sep 2024 22:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UMphLV076701; Mon, 30 Sep 2024 22:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UMphjP076698; Mon, 30 Sep 2024 22:51:43 GMT (envelope-from git) Date: Mon, 30 Sep 2024 22:51:43 GMT Message-Id: <202409302251.48UMphjP076698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: eb345e05ac66 - main - nfsd: Fix close handling when vfs.nfsd.enable_locallocks=1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb345e05ac6602eeef0c33fce9025bbc8ec44d0f Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=eb345e05ac6602eeef0c33fce9025bbc8ec44d0f commit eb345e05ac6602eeef0c33fce9025bbc8ec44d0f Author: Rick Macklem AuthorDate: 2024-09-30 22:49:57 +0000 Commit: Rick Macklem CommitDate: 2024-09-30 22:49:57 +0000 nfsd: Fix close handling when vfs.nfsd.enable_locallocks=1 nfsrv_freeopen() was being called after the mutex lock was released, making it possible for other kernel threads to change the lists while nfsrv_freeopen() took the nfsstateid out of the lists. This patch moves the code around "if (nfsrv_freeopen(stp, vp, 1 p) == 0) {" into nfsrv_freeopen(), so that it can remove the nfsstateid structure from all lists before unlocking the mutex. This should avoid any race between CLOSE and other nfsd threads updating the NFSv4 state. The patch does not affect semantics when vfs.nfsd.enable_locallocks=0. PR: 280978 Tested by: Matthew L. Dailey MFC after: 1 week --- sys/fs/nfsserver/nfs_nfsdstate.c | 62 +++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 6b40e0f64141..6cd8c1c861ec 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -139,7 +139,7 @@ static void nfsrv_dumpaclient(struct nfsclient *clp, struct nfsd_dumpclients *dumpp); static void nfsrv_freeopenowner(struct nfsstate *stp, int cansleep, NFSPROC_T *p); -static int nfsrv_freeopen(struct nfsstate *stp, vnode_t vp, int cansleep, +static void nfsrv_freeopen(struct nfsstate *stp, vnode_t vp, int cansleep, NFSPROC_T *p); static void nfsrv_freelockowner(struct nfsstate *stp, vnode_t vp, int cansleep, NFSPROC_T *p); @@ -1566,7 +1566,7 @@ nfsrv_freeopenowner(struct nfsstate *stp, int cansleep, NFSPROC_T *p) while (nstp != LIST_END(&stp->ls_open)) { tstp = nstp; nstp = LIST_NEXT(nstp, ls_list); - (void) nfsrv_freeopen(tstp, NULL, cansleep, p); + nfsrv_freeopen(tstp, NULL, cansleep, p); } if (stp->ls_op) nfsrvd_derefcache(stp->ls_op); @@ -1581,12 +1581,11 @@ nfsrv_freeopenowner(struct nfsstate *stp, int cansleep, NFSPROC_T *p) * are no other opens on the file. * Returns 1 if it free'd the nfslockfile, 0 otherwise. */ -static int +static void nfsrv_freeopen(struct nfsstate *stp, vnode_t vp, int cansleep, NFSPROC_T *p) { struct nfsstate *nstp, *tstp; struct nfslockfile *lfp; - int ret; LIST_REMOVE(stp, ls_hash); LIST_REMOVE(stp, ls_list); @@ -1595,35 +1594,46 @@ nfsrv_freeopen(struct nfsstate *stp, vnode_t vp, int cansleep, NFSPROC_T *p) lfp = stp->ls_lfp; /* * Now, free all lockowners associated with this open. + * Note that, if vp != NULL, nfsrv_freelockowner() will + * not call nfsrv_freeallnfslocks(), so it needs to be called, below. */ LIST_FOREACH_SAFE(tstp, &stp->ls_open, ls_list, nstp) nfsrv_freelockowner(tstp, vp, cansleep, p); + if (vp != NULL) { + KASSERT(cansleep != 0, ("nfsrv_freeopen: cansleep == 0")); + mtx_assert(NFSSTATEMUTEXPTR, MA_OWNED); + /* + * Only called with vp != NULL for Close when + * vfs.nfsd.enable_locallocks != 0. + * Lock the lfp so that it will not go away and do the + * nfsrv_freeallnfslocks() call that was not done by + * nfsrv_freelockowner(). + */ + nfsrv_locklf(lfp); + NFSUNLOCKSTATE(); + NFSVOPUNLOCK(vp); + nfsrv_freeallnfslocks(stp, vp, cansleep, p); + NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY); + NFSLOCKSTATE(); + nfsrv_unlocklf(lfp); + } + /* * The nfslockfile is freed here if there are no locks * associated with the open. * If there are locks associated with the open, the * nfslockfile structure can be freed via nfsrv_freelockowner(). - * Acquire the state mutex to avoid races with calls to - * nfsrv_getlockfile(). */ - if (cansleep != 0) - NFSLOCKSTATE(); if (lfp != NULL && LIST_EMPTY(&lfp->lf_open) && LIST_EMPTY(&lfp->lf_deleg) && LIST_EMPTY(&lfp->lf_lock) && LIST_EMPTY(&lfp->lf_locallock) && LIST_EMPTY(&lfp->lf_rollback) && lfp->lf_usecount == 0 && - (cansleep != 0 || nfsv4_testlock(&lfp->lf_locallock_lck) == 0)) { + nfsv4_testlock(&lfp->lf_locallock_lck) == 0) nfsrv_freenfslockfile(lfp); - ret = 1; - } else - ret = 0; - if (cansleep != 0) - NFSUNLOCKSTATE(); free(stp, M_NFSDSTATE); NFSD_VNET(nfsstatsv1_p)->srvopens--; nfsrv_openpluslock--; - return (ret); } /* @@ -1636,7 +1646,8 @@ nfsrv_freelockowner(struct nfsstate *stp, vnode_t vp, int cansleep, LIST_REMOVE(stp, ls_hash); LIST_REMOVE(stp, ls_list); - nfsrv_freeallnfslocks(stp, vp, cansleep, p); + if (vp == NULL) + nfsrv_freeallnfslocks(stp, vp, cansleep, p); if (stp->ls_op) nfsrvd_derefcache(stp->ls_op); free(stp, M_NFSDSTATE); @@ -3431,7 +3442,6 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid, { struct nfsstate *stp; struct nfsclient *clp; - struct nfslockfile *lfp; u_int32_t bits; int error = 0, gotstate = 0, len = 0; u_char *clidp = NULL; @@ -3526,9 +3536,7 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid, NFSBCOPY(clp->lc_id, clidp, len); gotstate = 1; } - NFSUNLOCKSTATE(); } else if (new_stp->ls_flags & NFSLCK_CLOSE) { - lfp = stp->ls_lfp; if (retwriteaccessp != NULL) { if ((stp->ls_flags & NFSLCK_WRITEACCESS) != 0) *retwriteaccessp = 1; @@ -3536,20 +3544,10 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid, *retwriteaccessp = 0; } if (nfsrv_dolocallocks != 0 && !LIST_EMPTY(&stp->ls_open)) { - /* Get the lf lock */ - nfsrv_locklf(lfp); - NFSUNLOCKSTATE(); ASSERT_VOP_ELOCKED(vp, "nfsrv_openupdate"); - NFSVOPUNLOCK(vp); - if (nfsrv_freeopen(stp, vp, 1, p) == 0) { - NFSLOCKSTATE(); - nfsrv_unlocklf(lfp); - NFSUNLOCKSTATE(); - } - NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY); + nfsrv_freeopen(stp, vp, 1, p); } else { - (void) nfsrv_freeopen(stp, NULL, 0, p); - NFSUNLOCKSTATE(); + nfsrv_freeopen(stp, NULL, 0, p); } } else { /* @@ -3567,8 +3565,8 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid, if ((nd->nd_flag & ND_NFSV41) != 0 && stp->ls_stateid.seqid == 0) stp->ls_stateid.seqid = 1; - NFSUNLOCKSTATE(); } + NFSUNLOCKSTATE(); /* * If the client just confirmed its first open, write a timestamp From nobody Mon Sep 30 23:37:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHctX4lvpz5Xqpm; Mon, 30 Sep 2024 23:37:24 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHctX3wBRz4fDn; Mon, 30 Sep 2024 23:37:24 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727739444; 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=PCWTXA8r26Zg3msSfBDFQKZsrzpEG5vKRhLUwgSY7YU=; b=r2vFf+uYdRXFyoRfalWrrJDzZLfJPtYfPPVx77V08zgU0pZLZfKjGS99ke9x01BSA83Nd3 wDDXiGVdXl+GCXaJiFFxdPwbdiKPZEv8q743sDK2iJwucNg33V8Paid/gK33i1KwPNIXWg IOhT1YzS3wnkRNV6SfM03z2axK8q8ON2KTK20reopzq094WS3HLg5cvbcVBOVR0fReaaJW jbCCJlToc43aq3VQcis/UyjNczRC3+XdzfX4IBrKeO0Yh/akYFxIlaj6vRmuCbwoHXn0nP o3AGxuldws/Y7948QEbh+vbS3gGSas/025K7Qb3Q1jxDujkcq9eak8bahiT26w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727739444; 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=PCWTXA8r26Zg3msSfBDFQKZsrzpEG5vKRhLUwgSY7YU=; b=vBAUSPVU6dPcUTEXMwQor7+RZxUWCzGzzO3q/RrpfV8Ko8TVAcbDLmhZ3Xk1Xza6zqMPf8 5/YRzKWOSaSxleqOlDqped40xN22FVJzl7YYjoXKRUeupo3hL5j1kyVLoaqOSi3udWQD/3 rN10j7hZlNFg+WWYLzBtje+s6OOIi8k62A/rifX3lPRczaKX1XNiSgmKSuOoH9pQJIIMJG /sa9Bgqw8FD91ax3kyWC0zJDOh9JyNvgMlDoUizuqk5yx+5Np7x48qn5B+dL3Pc/GO/Wd4 ieAMeVbrlp5R3kSV1n9WrAcA5aEcpS0SXyLIT7HHZ8z//diU8gnfilMK9OSKPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727739444; a=rsa-sha256; cv=none; b=WUaYL8LjHTukLo/69IWVsp6sQRyKByBumAWNCR2ucxheczT8O+bGmEk1xjKtjYNdZ4RDMd FFmh4HPgrHs1ICnGFqBGQToagnNpG1FR6JJo0w5KozsfVyEA8MVaZ/kYPovPrnvTWjh+9Q wVqrNGmcDMoy7t4G/fdo6hvupQ5Y172254Eh4Hp/jfFy19zqCl9iGtmuDEFG6dqBxJtTAq d0WQJgSzWESZCTWZzwmTs5hpToIGsmS8ZBXIGITb3VreV7QHQQHWIvNqpexi3QbuKyIXdx e4kMdUl0Rj51FTm10C4aylkuXiiyp/0lmUXP8Ie0LMmPXU53lIk+wjvZnEH+CQ== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XHctX3FnNzXjp; Mon, 30 Sep 2024 23:37:24 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 008D93C019B; Mon, 30 Sep 2024 23:37:23 +0000 (UTC) Date: Mon, 30 Sep 2024 23:37:23 +0000 From: Brooks Davis To: Antoine Brodin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1235d276b78a - main - lib{c,sys}: stop exposing errno symbol Message-ID: References: <202409271933.48RJX0dH066668@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Mon, Sep 30, 2024 at 03:53:01PM +0000, Brooks Davis wrote: > On Mon, Sep 30, 2024 at 08:33:18AM +0200, Antoine Brodin wrote: > > On Fri, Sep 27, 2024 at 9:33???PM Brooks Davis wrote: > > > > > > The branch main has been updated by brooks: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1235d276b78a769bded01d51c9bf3cdc480db9fb > > > > > > commit 1235d276b78a769bded01d51c9bf3cdc480db9fb > > > Author: Brooks Davis > > > AuthorDate: 2024-09-27 19:27:46 +0000 > > > Commit: Brooks Davis > > > CommitDate: 2024-09-27 19:27:46 +0000 > > > > > > lib{c,sys}: stop exposing errno symbol > > > > > > Officially since C11 (and in reality FreeBSD since 3.0 with commit > > > 1b46cb523df3) errno has been defined to be a macro. Rename the symbol > > > to __libsys_errno and move it to FBSDprivate_1.0 and confine it entierly > > > to libsys for use by libthr. Add a FBSD_1.0 compat symbol for existing > > > binaries that were incorrectly linked to the errno symbol during > > > libc.so.7's lifetime. > > > > > > This deliberately breaks linking software that directly links to errno. > > > Such software is broken and will fail in surprising ways if it becomes > > > threaded (e.g., if it triggers loading of a pam or nss module that > > > uses threads.) > > > > > > Reviewed by: kib > > > Differential Revision: https://reviews.freebsd.org/D46780 > > > --- > > > lib/libsys/Makefile | 2 ++ > > > lib/libsys/Symbol.map | 1 + > > > lib/libsys/Symbol.sys.map | 1 - > > > lib/libsys/__error.c | 10 +++++----- > > > lib/libthr/sys/thr_error.c | 5 ++--- > > > lib/libthr/thread/thr_rtld.c | 7 +++---- > > > 6 files changed, 13 insertions(+), 13 deletions(-) > > > > Hello, > > > > This breaks some ports: > > Thank you for the list (that's more than I expected). I'll work on > updates. The fix is to replace I've updated all the maintainer-less ports. The majority were djbware. I was quite tempted to set deprecation notices as most produce many warnings with a modern compiler. These warning are easy to fix, but it's clear no one cares. For ports with maintainers I've filed bugs with fixes and pushed them all to https://github.com/brooksdavis/freebsd-ports/tree/errno-fixes -- Brooks From nobody Tue Oct 1 01:18:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHg7f4Bcbz5Xy6X; Tue, 01 Oct 2024 01:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHg7f2lm9z4sS3; Tue, 1 Oct 2024 01:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727745534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zq5u0m8ZFAVjz36Ej6UzUveS9mLaGWg9G+842UgSsFo=; b=teRpNZUtonMlj/Z8QovPeHcRLXd2Pg6Vu5iBH+notqLugCu3xIELroT1xyQ2rVoWH8TmMk h21itcStrPff9Duig3pUuCGhLDN/sc2ea6yLKcWd/6yXqA2yGbIoIJYbo9RS61iAgyVYDY zIP5aPeBXtbRJzTl98lAdnZFXk48RddsXyC1cRIHZIMT8dwjsOeN3iHA1OD8mvuxSb5IPl D/BXJJWnPEVIFWcbgfRcDt0wJSc6q6/cDb7sM1uqzf64MYWwpoAjMb0ygOz1wBiSj9CJPj HbYGkg2c+rWqkL3N4Ah90N+TsxFICIrC6pCf3EP63LR/Q0P2D6k4boo7iWrcNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727745534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zq5u0m8ZFAVjz36Ej6UzUveS9mLaGWg9G+842UgSsFo=; b=RRjUYp2gNfPjSiHF3rq6K842N4amHnUwvdz+VdR7g4qKWbz6NnjNbIjREywrjI5VGV1RB1 N5kqDOy5RaVqoq6z3SGXxtWh6tfVsBAQZT7Z1mv6S9JsKcCiYRhQ7fo2wRh/J2ztBaOhPT t36lNZL7uBDCSuyiW0ubyURkO/A3csZ1CHMFG9adNyKEnJdd++A9beTf9mbEUeL7O7FK/p sni1dKmXEYGlhHZL3uysV6lD15kT+8zYTtdDESs71OIDeOi4tvqQPPBD4BJw1aLq69cvFz XKcFgf/uBRUSSOua2a9hwaX3qslE+Rymbay0kLWREuXmgMgIDzPyggxbEIc8og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727745534; a=rsa-sha256; cv=none; b=E8Fi0oo1Ndwhg8S+4of53b0GyyScLD+AAYWZGnMZp30tDOOzjojH1bu5ItzbZUlraqCcRk 75hMx87h12U6q3r4VXEg2Ew59Ls/6jATs8P+d1dPgW/IwJ05MXaQLav7asZDXUPWlafpnX aGwCTgpln5lDLxtac/xgPpo7DALAomIk33Hy8LsMqTuxPJBSTl3ZUcIRp8gGXy62fzcGyZ 2UNousGWJH3QnNOIOb+zOUoyUwAvNZL+FmmoAWHaEMDiV3XK0f19MI3kW+hsOJ5Kp/26++ l0HSoCZRmZBh8hs8tvQOHGQi/0EaXSc4js6LVvLQmad7XFFvn1r536yBedaZJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHg7f2N9jzHJ1; Tue, 1 Oct 2024 01:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4911Isbb016540; Tue, 1 Oct 2024 01:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4911IsF1016537; Tue, 1 Oct 2024 01:18:54 GMT (envelope-from git) Date: Tue, 1 Oct 2024 01:18:54 GMT Message-Id: <202410010118.4911IsF1016537@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: dd7a4da0e967 - stable/13 - msun: update Clang bug reference in fma test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd7a4da0e9677069e037a7f0125f0fab5886cd45 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dd7a4da0e9677069e037a7f0125f0fab5886cd45 commit dd7a4da0e9677069e037a7f0125f0fab5886cd45 Author: Ed Maste AuthorDate: 2024-06-12 00:23:44 +0000 Commit: Ed Maste CommitDate: 2024-10-01 01:18:15 +0000 msun: update Clang bug reference in fma test LLVM bugzilla bug 8100 became issue #8472 with the migration to GitHub. https://github.com/llvm/llvm-project/issues/8472 (cherry picked from commit 92927b8bcf51dcbcf99d633c1b3cab3cab2373ac) (cherry picked from commit 6cd4450c6c9a83a0fd9430df7ec02c4c3203ad25) --- lib/msun/src/s_fma.c | 4 ++-- lib/msun/src/s_fmal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 0788bb2d47e8..a3dff85a430a 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -245,7 +245,7 @@ fma(double x, double y, double z) zs = copysign(DBL_MIN, zs); fesetround(FE_TONEAREST); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile double vxs = xs; /* @@ -277,7 +277,7 @@ fma(double x, double y, double z) * rounding modes. */ fesetround(oround); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile double vrlo = r.lo; adj = vrlo + xy.lo; return (ldexp(r.hi + adj, spread)); diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c index 0d5e2c0bc98f..20ff2886565b 100644 --- a/lib/msun/src/s_fmal.c +++ b/lib/msun/src/s_fmal.c @@ -226,7 +226,7 @@ fmal(long double x, long double y, long double z) zs = copysignl(LDBL_MIN, zs); fesetround(FE_TONEAREST); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile long double vxs = xs; /* @@ -258,7 +258,7 @@ fmal(long double x, long double y, long double z) * rounding modes. */ fesetround(oround); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile long double vrlo = r.lo; adj = vrlo + xy.lo; return (ldexpl(r.hi + adj, spread)); From nobody Tue Oct 1 01:18:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHg7g6JgVz5XxpH; Tue, 01 Oct 2024 01:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHg7g4wnsz4sV6; Tue, 1 Oct 2024 01:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727745535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MS9jUI1bNHtfUkhUZ3ARf3KWGUH7so8yn3WBuykhjrI=; b=U8WGSWV3atVosSe9mQauJXlMDEZ6oILo49q4hRosqaPBrDjd9vutcghamAiCBIiBF+OFS9 UOwJr3ggUfr9XlNeVJ5Pk2Ih/BV9ut5+I41DY48j+9PMH1DzFoU0fWRE4uxGpkMGc5+qWW d4f8h4TvCxvaCqig6B/i3rqznLZ0kpSYHvjvmbxiaKGtFiGtRbS217qlFH5iE9dCVF9emQ DXMFZoXYnjOGknk/5pkzCN9rEOFQeHank+L0pSSC1DEeJeC0KzaoXDqamjzbbhOVdTCU1j 7ObIjz14W0MNjkll4kriYlgeIuquUH7cuxv1zS0LQEZehJXSWAFVSR7VkTTRKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727745535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MS9jUI1bNHtfUkhUZ3ARf3KWGUH7so8yn3WBuykhjrI=; b=SqUyELe7dQ9uCujYAWyd5HR19ZsdMrV/pbLgXU2hiITxyVtUAroYTF9Rj27KDBDKhiWKA2 5tkzq9oVY2JlqWwAzJ0zlJUMjH9ZBl1WonIQtZUL2gSftfqovYNNgZWBThemU3Ljqrulw3 g/e9zyrFWpKFGQqw8AhDDYiEwxDIRk0ZdLBKsRXwnU/242xr75JxGWR2QFyvX0vkYJFjzq rWcLgCLq6ZNNyr7OKF4nd5l0SuRrL78pW/6e8dfIhJCOFX5QVoGKz0WUZ88M3JOD05qqH3 1+WQSa/youZEG8kShFFrsJQM6pG80i8OZ4T5PqukZGeUsI8RjLg+UFF2/Gn8bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727745535; a=rsa-sha256; cv=none; b=Ar3WR6xA9aO4/Qtbu1D4/fpvfmaI0s2cCKxaeboKj1A3GEdy98A9Hqz2HkNNfPn7r0kzOT /vVlsR/fkQDTAAz7rfQvgnBwO6DHYyhdLr8s8ZjzXLC1VDuxsC7kWQHLPDdWN8zNVfXjXf YTDDQsBJQpsYzXJwIf6rxzDofZZU7HCJWVfqPApCcXKnZX9G90euQVDVwb6HmB/mEXXXfX I+dsAjPI/ZfT48P/kDooZZzkgmDzRCQqlLEZVPbCVnbxs5E8UpU1fnQ24+UQKJYwXpfLvu JWpixIJPK+JQLDsbIUXVUTgWjfsMyg2MRPcdcZC/UnUKghWroRAmGkOhsYw6dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHg7g3Np0zGyN; Tue, 1 Oct 2024 01:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4911ItCf016594; Tue, 1 Oct 2024 01:18:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4911ItK0016591; Tue, 1 Oct 2024 01:18:55 GMT (envelope-from git) Date: Tue, 1 Oct 2024 01:18:55 GMT Message-Id: <202410010118.4911ItK0016591@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: 047870a3b1af - stable/13 - libm: add parens to clarify expressions in fma, fmal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 047870a3b1afca73ecc777376e658c68b23ef975 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=047870a3b1afca73ecc777376e658c68b23ef975 commit 047870a3b1afca73ecc777376e658c68b23ef975 Author: Ed Maste AuthorDate: 2024-06-18 01:30:44 +0000 Commit: Ed Maste CommitDate: 2024-10-01 01:18:15 +0000 libm: add parens to clarify expressions in fma, fmal Obtained from: NetBSD (cherry picked from commit 001606523a48ca2aa440c985db47327a00671358) (cherry picked from commit d1d8c9114751ee481aa6ff980caa2640f8d6848d) --- lib/msun/src/s_fma.c | 6 +++--- lib/msun/src/s_fmal.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index a3dff85a430a..017067c6c92a 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -223,17 +223,17 @@ fma(double x, double y, double z) case FE_TONEAREST: return (z); case FE_TOWARDZERO: - if (x > 0.0 ^ y < 0.0 ^ z < 0.0) + if ((x > 0.0) ^ (y < 0.0) ^ (z < 0.0)) return (z); else return (nextafter(z, 0)); case FE_DOWNWARD: - if (x > 0.0 ^ y < 0.0) + if ((x > 0.0) ^ (y < 0.0)) return (z); else return (nextafter(z, -INFINITY)); default: /* FE_UPWARD */ - if (x > 0.0 ^ y < 0.0) + if ((x > 0.0) ^ (y < 0.0)) return (nextafter(z, INFINITY)); else return (z); diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c index 20ff2886565b..acaaaaf3678d 100644 --- a/lib/msun/src/s_fmal.c +++ b/lib/msun/src/s_fmal.c @@ -204,17 +204,17 @@ fmal(long double x, long double y, long double z) case FE_TONEAREST: return (z); case FE_TOWARDZERO: - if (x > 0.0 ^ y < 0.0 ^ z < 0.0) + if ((x > 0.0) ^ (y < 0.0) ^ (z < 0.0)) return (z); else return (nextafterl(z, 0)); case FE_DOWNWARD: - if (x > 0.0 ^ y < 0.0) + if ((x > 0.0) ^ (y < 0.0)) return (z); else return (nextafterl(z, -INFINITY)); default: /* FE_UPWARD */ - if (x > 0.0 ^ y < 0.0) + if ((x > 0.0) ^ (y < 0.0)) return (nextafterl(z, INFINITY)); else return (z); From nobody Tue Oct 1 01:19:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHg8f5VN1z5XyDg; Tue, 01 Oct 2024 01:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHg8f4j23z4tT9; Tue, 1 Oct 2024 01:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727745586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+X32XH6VuoP/m+i4G5sTyEy7atc1IdVs8QvJDCvSrBw=; b=UiRl6QlJYjIbDN8LJ5Uh8bfDmV1JOhni8aAhlkPNusjcMFev2N1Q81HCvMwFZyhl5jjnaB gnZ2hE9Klt9V2usUaKCCa/vW+O848rLiRiZgWQvXs5+IejvVaaUbMybLPlFfVYaWrG8ZvH oxpaARZo66iKSjh3dLHyLaP1t+DRn7HlYQSLAU3kxsYQxNP1g6Q66MosMP0nIQfDcj+G+7 /HjV0uhnVsKcWkOhbGOP7PYUa+5+QnZySSv1KKhoMZTyQlIM6N+G9MKN2ejekxYYjUciUV 39R8EMWzcmz45PRqKtKdSq7+6z6gb5ONMt/7fDVG8NsBRCEixcaarePgp7pUgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727745586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+X32XH6VuoP/m+i4G5sTyEy7atc1IdVs8QvJDCvSrBw=; b=PnRt0gwEqRdl9uXuDpNQOLfvoGnNOMwwwrOufLenlNiLis+yBYv6tiDe6EGi/ttbpSHM59 pOkUcB32t5MtOuUjVYDVo2zUn2A/Ftjb6D/xecF0LKpMoRomOM7fp6MzB6oVX7VIuQ9Qkl 3wEInqWb5a2EGAKjbJVoZgXe+ubYMATY1Ow26aBAJV5vzIQ4RUglczjVerSzZHxbx88VGB ZAMWBfYSXHu7XnUQh6R8o1skqygLMztltkwRB3blMsIU5Zw1flVyh4DL3LvA6lD5W4iacd 2iHcS0kTQRe4dQW2gNFDbM3og4FsLLDN2EB/q6qDSDbICOhM/uTGSnP1ONsMtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727745586; a=rsa-sha256; cv=none; b=bN1/l0BFywAZTkNHKAvyJSXAY+6pCZcteRf+JZ0q0Q5tTIO1zKBklmMIFFDr3kDhdfsjkR p3xKOLT871u9HQnArMJ8cJwx2jlnKvfMb0cYgJ6g6TUFdjUTQNzpjsFxbwZxcl0dtJs4zl X2n/xrIiV/bQlonUpFju8LSIo26sWmS7LDZCcEmTHgWPHzMmIBcvghaZ/yTy/EFu/XjG/J 0tv+VnvFvVGJFC0JfCes9LXpU9GkQljPrwFWH6YLdFFk5NZWUDDLQu5Pd0LRBdyJk65jBi A5Lqyj0VVVhJuCjM3LD7bH6W3tLoOT9MjCykPn8BWoPgZ47bxoS/sRsS8cSKCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHg8f49vzzHGq; Tue, 1 Oct 2024 01:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4911JkKB016802; Tue, 1 Oct 2024 01:19:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4911Jk59016799; Tue, 1 Oct 2024 01:19:46 GMT (envelope-from git) Date: Tue, 1 Oct 2024 01:19:46 GMT Message-Id: <202410010119.4911Jk59016799@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: 3d77026d8a48 - stable/13 - libm: fma: correct zero sign with small inputs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d77026d8a48a8d056a145b56f288f838c159afc Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d77026d8a48a8d056a145b56f288f838c159afc commit 3d77026d8a48a8d056a145b56f288f838c159afc Author: Steve Kargl AuthorDate: 2024-06-16 23:41:38 +0000 Commit: Ed Maste CommitDate: 2024-10-01 01:19:13 +0000 libm: fma: correct zero sign with small inputs This is a fixed version of 888796ade284. PR: 277783 Reported by: Victor Stinner Reviewed by: emaste MFC after: 1 week (cherry picked from commit 888796ade2842486d3167067e8034254c38aadd3) (cherry picked from commit e77ad954bb825983b4346b9cc646c9c910b1be24) (cherry picked from commit 34f746cc7f8a8dd261027a8b392b76e70adc8438) (cherry picked from commit dc39004bc670fe33ae6759816380c93a37268dd6) --- lib/msun/src/s_fma.c | 4 ++-- lib/msun/src/s_fmal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 017067c6c92a..fb12c0369fec 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -261,14 +261,14 @@ fma(double x, double y, double z) spread = ex + ey; - if (r.hi == 0.0) { + if (r.hi == 0.0 && xy.lo == 0) { /* * When the addends cancel to 0, ensure that the result has * the correct sign. */ fesetround(oround); volatile double vzs = zs; /* XXX gcc CSE bug workaround */ - return (xy.hi + vzs + ldexp(xy.lo, spread)); + return (xy.hi + vzs); } if (oround != FE_TONEAREST) { diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c index acaaaaf3678d..f7aa42287d7a 100644 --- a/lib/msun/src/s_fmal.c +++ b/lib/msun/src/s_fmal.c @@ -242,14 +242,14 @@ fmal(long double x, long double y, long double z) spread = ex + ey; - if (r.hi == 0.0) { + if (r.hi == 0.0 && xy.lo == 0) { /* * When the addends cancel to 0, ensure that the result has * the correct sign. */ fesetround(oround); volatile long double vzs = zs; /* XXX gcc CSE bug workaround */ - return (xy.hi + vzs + ldexpl(xy.lo, spread)); + return (xy.hi + vzs); } if (oround != FE_TONEAREST) { From nobody Tue Oct 1 04:28:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlLM6lf6z5YBF0; Tue, 01 Oct 2024 04:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlLM6DMjz4LqZ; Tue, 1 Oct 2024 04:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIs5KyxQzWrtM6BDYo2d7sXFTBq//4vei7QXZvbHo2Y=; b=Q6PSoce6zCtnwfdVZ2UJO/L5NJ067e4F3AS7dzshytftIeeM8jQsJ8LN0MBnwL/ciEgKJn afmuOCHkL7nQzwWTHGooLWYy52qX8hF5HCva5TZb7vehjQZ1dXk0CqJatYTr4WyyGycLMk yNtByiLDRXiZmx9ANipQhVQmAGwoasLnjWDuEtgx3L4xeTWUnL+8OdHe+VPPkutXYEYEVz /9jPElY0Q87emS8zPLlTimMo586c9k4hFIBVIPtP+xTZ8qsj///r2wCApwGd7u0vmKrTK9 opTQdOmdkGQv2TzgendKeoGq+I/V7ZqNOTOjTo7ATp0P9ftyknMzm+TwFHw+gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIs5KyxQzWrtM6BDYo2d7sXFTBq//4vei7QXZvbHo2Y=; b=ONxYPZ99jqabhxt/aaZjNNCB5pblcGWktanGjbXPwKn/+Nxf3z3gDFNh2AMgeOQhKGVFWx iMohT+pFJXBV+IaBIxWW6A9mKtaTkzCcfpnGpdn2Pv2h15oCbnFlQP85/REAutJOFRFFSf f9KPw9C/H1wCpBB6p181H6ZG7GOJCuE3PBI+jjrtWD4k7PX2SzHOfK/etYW7lgMVjR3t7K +WNpEaXCM2uc0BVopvbKQWX96+/lIKZbepkPRbtJyYznpX645L++WBbbKkFdHhEvMnB3ga qSz+Zf7ryAWLQX//Zxu75O3NRYYuRhwxiCnIrgDVLvUrjskvm5LXWWyCKQyyNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727756907; a=rsa-sha256; cv=none; b=txYfLL1kLZiw+s8hKdcmQNmUEsQ+B4cHvTOcZBuLS7a0j8USoNYcQXCyhAZ7Yc1Ulz7wp5 mwNwaQMDUVdkyhzmJWKw+v2K95eBQ5JX+7uMx1eNemPIWAx+TkzPkPH8hQ8kh4BbkO/fU5 vF6bi0OHXm2GSFkji5TeR3LUSEb7CGY8J06zcO8kcofecQPfmd+Qowltu5qe6JTllyyKdV /4IklRWnmWsMxGUValvDN+VxmrUNCBML6vO9ZZoKkJr948WwvgxelpKF57OxyvcIRyl1ND /6N3cN95Rmxo1hnQ/wfEA69fGm90fg4tbwu6ukZssAI2kLs2vKl0Gl3xfmiY3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlLM5nVKzMwk; Tue, 1 Oct 2024 04:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914SRHW038931; Tue, 1 Oct 2024 04:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914SRP3038928; Tue, 1 Oct 2024 04:28:27 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:28:27 GMT Message-Id: <202410010428.4914SRP3038928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: b35f0aa4952c - main - stdio.h: don't expose rsize_t unless __EXT1_VISIBLE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b35f0aa4952cf03f1b2093b110607c13dd2ec991 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b35f0aa4952cf03f1b2093b110607c13dd2ec991 commit b35f0aa4952cf03f1b2093b110607c13dd2ec991 Author: Graham Percival AuthorDate: 2024-09-30 16:37:59 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 03:07:43 +0000 stdio.h: don't expose rsize_t unless __EXT1_VISIBLE PR: 281768 Fixes: c13559d31e90 MFC after: 1 week --- include/stdio.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/stdio.h b/include/stdio.h index b0190d25eb4f..ee3ab3bfb986 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -48,10 +48,13 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif +#if __EXT1_VISIBLE +/* ISO/IEC 9899:2011 K.3.3.2 */ #ifndef _RSIZE_T_DEFINED #define _RSIZE_T_DEFINED typedef size_t rsize_t; #endif +#endif /* __EXT1_VISIBLE */ #if __POSIX_VISIBLE >= 200809 #ifndef _OFF_T_DECLARED From nobody Tue Oct 1 04:29:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlMf0BHmz5YBMS; Tue, 01 Oct 2024 04:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlMd71ntz4M5Y; Tue, 1 Oct 2024 04:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6FsNhEtkE35S0hBjx3u87AkHlMq8Y5Ip2rHz1UqdSmM=; b=Rvc2JcODbFmpcqBJSY7lNF0hU0Ws9Hhv7619+vj6LtO/73hz3Qeo1V0S39ZoGlOUhFdcVd lO/e2pHcoKnmKYpNNToZjWyaHKiaoZaipAS/Ny3JWc/O8oZ9Vy4tS1nCbcyPRHKjdm1SdG j5teqPfztqU/lvwT6wVnyTtjMS9C1t64iz5JwZ9MXtoPcuP3wD5UuQB4GYluxenoUgY7nx kPkhsVpCkuEsJe2apZ2jvbA2hRAoZAR7fUYiyuPUbgSY4uev62zSri60YbdapTuVDJcJcO 2+J+jbq6Ayi6N6eXfDhdsqWsS1QgX68OW+B2jmpo3/y/n6nvEXJzV5ZReh8DaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6FsNhEtkE35S0hBjx3u87AkHlMq8Y5Ip2rHz1UqdSmM=; b=vZXytXnRRbsc9GGvP8sSSrifW4zl1Xm4wyY3EIJkTFw+qDCDJv5wtUxGSeEvGdMEGbuVB/ dTJnoo37ZWEpkXXvAM1mk4pLaNEqn8vWcpuBx2ji0+qs01IEN6fjtmhIGPxqVIerioQ52x ruzq5oJ7rScBN/l+UxKukgTjPLd8i0CbwZwFx7kwwe1oEvqlCsk4uMuuIXEuRAf0np+GTY ViqnPSloSmUyQKvQ/6SWltU5LoMTRLOGMpfEq046h55n0mQDFoq/yUpaNEbdUqgtLIIKSD WtodYz/ni5BSdb3gDprAJOuKPUF+lFhNXITuSseq0x6/JDKI/7fGrULg64Yhmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727756973; a=rsa-sha256; cv=none; b=cV8FlPEHTZWhhTRGn9q0OQqKuIxlbCPNLr7NGzU9UYsEwapEGcCj/C0NyBHsEjETqWSBOD DcpuPSyXOLCYgov3BkPrAnuaI4adKDa93Y4rE/GYTNBMacYPNU9X0y8O9uWiGijQOtP+2K 6Iv+OOGSkxelyLnLUeiI262pxzqaFbKaoOGiO9BzqzNxRUwevpHV0JUZtYHSSpYXFajm9J J/GmprxVV4yt4NRXz9IZ6y96wLnBmDIwd16mLT/Db8EmVVe+09g4GMl2xBmb1QSbmcSpcD 39UNeGVK4rLOfMDgRK1qKS5YyLSwJSNqzy5GNPefhxe3RrfujN+ljft1tfPZMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlMd6dH7zNMv; Tue, 1 Oct 2024 04:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914TXcC039221; Tue, 1 Oct 2024 04:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914TWZd039214; Tue, 1 Oct 2024 04:29:32 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:29:32 GMT Message-Id: <202410010429.4914TWZd039214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: aff29dd3641d - stable/14 - wpa: Import 2.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aff29dd3641d2ab3c67b82772f4b76ba3171e757 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=aff29dd3641d2ab3c67b82772f4b76ba3171e757 commit aff29dd3641d2ab3c67b82772f4b76ba3171e757 Author: Cy Schubert AuthorDate: 2024-07-21 18:59:44 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 04:28:54 +0000 wpa: Import 2.11 Following is a changelog of new features and fixes to wpa: hostapd: * Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * HE/IEEE 802.11ax/Wi-Fi 6 - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * SAE: add support for fetching the password from a RADIUS server * support OpenSSL 3.0 API changes * support background radar detection and CAC with some additional drivers * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) * EAP-SIM/AKA: support IMSI privacy * improve 4-way handshake operations - use Secure=1 in message 3 during PTK rekeying * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases to avoid interoperability issues * support new SAE AKM suites with variable length keys * support new AKM for 802.1X/EAP with SHA384 * extend PASN support for secure ranging * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) - this is based on additional details being added in the IEEE 802.11 standard - the new implementation is not backwards compatible * improved ACS to cover additional channel types/bandwidths * extended Multiple BSSID support * fix beacon protection with FT protocol (incorrect BIGTK was provided) * support unsynchronized service discovery (USD) * add preliminary support for RADIUS/TLS * add support for explicit SSID protection in 4-way handshake (a mitigation for CVE-2023-52424; disabled by default for now, can be enabled with ssid_protection=1) * fix SAE H2E rejected groups validation to avoid downgrade attacks * use stricter validation for some RADIUS messages * a large number of other fixes, cleanup, and extensions wpa_supplicant: * Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * MACsec - add support for GCM-AES-256 cipher suite - remove incorrect EAP Session-Id length constraint - add hardware offload support for additional drivers * HE/IEEE 802.11ax/Wi-Fi 6 - support BSS color updates - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * support OpenSSL 3.0 API changes * improve EAP-TLS support for TLSv1.3 * EAP-SIM/AKA: support IMSI privacy * improve mitigation against DoS attacks when PMF is used * improve 4-way handshake operations - discard unencrypted EAPOL frames in additional cases - use Secure=1 in message 2 during PTK rekeying * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases to avoid interoperability issues * support new SAE AKM suites with variable length keys * support new AKM for 802.1X/EAP with SHA384 * improve cross-AKM roaming with driver-based SME/BSS selection * PASN - extend support for secure ranging - allow PASN implementation to be used with external programs for Wi-Fi Aware * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) - this is based on additional details being added in the IEEE 802.11 standard - the new implementation is not backwards compatible, but PMKSA caching with FT-EAP was, and still is, disabled by default * support a pregenerated MAC (mac_addr=3) as an alternative mechanism for using per-network random MAC addresses * EAP-PEAP: require Phase 2 authentication by default (phase2_auth=1) to improve security for still unfortunately common invalid configurations that do not set ca_cert * extend SCS support for QoS Characteristics * extend MSCS support * support unsynchronized service discovery (USD) * add support for explicit SSID protection in 4-way handshake (a mitigation for CVE-2023-52424; disabled by default for now, can be enabled with ssid_protection=1) - in addition, verify SSID after key setup when beacon protection is used * fix SAE H2E rejected groups validation to avoid downgrade attacks * a large number of other fixes, cleanup, and extensions Merge commit '6377230b3cf4f238dcd0dc2d76ff25943d3040e5' (cherry picked from commit a90b9d0159070121c221b966469c3e36d912bf82) --- contrib/wpa/CONTRIBUTIONS | 2 +- contrib/wpa/README | 2 +- contrib/wpa/hostapd/Android.mk | 28 +- contrib/wpa/hostapd/ChangeLog | 37 + contrib/wpa/hostapd/Makefile | 30 +- contrib/wpa/hostapd/README | 2 +- contrib/wpa/hostapd/android.config | 6 + contrib/wpa/hostapd/config_file.c | 481 +- contrib/wpa/hostapd/config_file.h | 7 +- contrib/wpa/hostapd/ctrl_iface.c | 1460 +++-- contrib/wpa/hostapd/defconfig | 21 +- contrib/wpa/hostapd/hostapd.conf | 356 +- contrib/wpa/hostapd/hostapd.eap_user | 4 +- contrib/wpa/hostapd/hostapd_cli.c | 217 +- contrib/wpa/hostapd/logwatch/hostapd | 65 - contrib/wpa/hostapd/main.c | 142 +- contrib/wpa/hs20/client/Android.mk | 10 + contrib/wpa/hs20/client/est.c | 37 +- contrib/wpa/hs20/client/osu_client.c | 115 +- contrib/wpa/hs20/client/spp_client.c | 1 - contrib/wpa/src/Makefile | 2 +- contrib/wpa/src/ap/acs.c | 568 +- contrib/wpa/src/ap/acs.h | 3 + contrib/wpa/src/ap/airtime_policy.c | 2 +- contrib/wpa/src/ap/ap_config.c | 205 +- contrib/wpa/src/ap/ap_config.h | 226 +- contrib/wpa/src/ap/ap_drv_ops.c | 359 +- contrib/wpa/src/ap/ap_drv_ops.h | 84 +- contrib/wpa/src/ap/ap_list.c | 6 +- contrib/wpa/src/ap/ap_mlme.c | 4 +- contrib/wpa/src/ap/authsrv.c | 94 + contrib/wpa/src/ap/beacon.c | 1212 +++- contrib/wpa/src/ap/beacon.h | 4 + contrib/wpa/src/ap/bss_load.c | 2 +- contrib/wpa/src/ap/comeback_token.c | 139 + contrib/wpa/src/ap/comeback_token.h | 21 + contrib/wpa/src/ap/ctrl_iface_ap.c | 599 +- contrib/wpa/src/ap/ctrl_iface_ap.h | 17 + contrib/wpa/src/ap/dfs.c | 608 +- contrib/wpa/src/ap/dpp_hostapd.c | 1417 ++++- contrib/wpa/src/ap/dpp_hostapd.h | 5 + contrib/wpa/src/ap/drv_callbacks.c | 881 ++- contrib/wpa/src/ap/fils_hlp.c | 10 +- contrib/wpa/src/ap/gas_query_ap.c | 10 +- contrib/wpa/src/ap/gas_serv.c | 11 +- contrib/wpa/src/ap/gas_serv.h | 2 +- contrib/wpa/src/ap/hostapd.c | 1441 ++++- contrib/wpa/src/ap/hostapd.h | 169 +- contrib/wpa/src/ap/hw_features.c | 233 +- contrib/wpa/src/ap/hw_features.h | 12 + contrib/wpa/src/ap/ieee802_11.c | 4030 ++++++++----- contrib/wpa/src/ap/ieee802_11.h | 83 +- contrib/wpa/src/ap/ieee802_11_auth.c | 162 +- contrib/wpa/src/ap/ieee802_11_auth.h | 5 +- contrib/wpa/src/ap/ieee802_11_eht.c | 1405 +++++ contrib/wpa/src/ap/ieee802_11_he.c | 87 +- contrib/wpa/src/ap/ieee802_11_ht.c | 5 +- contrib/wpa/src/ap/ieee802_11_shared.c | 215 +- contrib/wpa/src/ap/ieee802_11_vht.c | 32 +- contrib/wpa/src/ap/ieee802_1x.c | 233 +- contrib/wpa/src/ap/ieee802_1x.h | 2 +- contrib/wpa/src/ap/nan_usd_ap.c | 267 + contrib/wpa/src/ap/nan_usd_ap.h | 46 + contrib/wpa/src/ap/ndisc_snoop.c | 1 + contrib/wpa/src/ap/neighbor_db.c | 74 +- contrib/wpa/src/ap/neighbor_db.h | 1 + contrib/wpa/src/ap/pmksa_cache_auth.c | 32 +- contrib/wpa/src/ap/pmksa_cache_auth.h | 4 + contrib/wpa/src/ap/preauth_auth.c | 4 +- contrib/wpa/src/ap/rrm.c | 121 + contrib/wpa/src/ap/rrm.h | 2 + contrib/wpa/src/ap/sta_info.c | 469 +- contrib/wpa/src/ap/sta_info.h | 96 +- contrib/wpa/src/ap/utils.c | 14 +- contrib/wpa/src/ap/wmm.c | 7 - contrib/wpa/src/ap/wnm_ap.c | 216 +- contrib/wpa/src/ap/wpa_auth.c | 2459 ++++++-- contrib/wpa/src/ap/wpa_auth.h | 103 +- contrib/wpa/src/ap/wpa_auth_ft.c | 615 +- contrib/wpa/src/ap/wpa_auth_glue.c | 269 +- contrib/wpa/src/ap/wpa_auth_i.h | 47 +- contrib/wpa/src/ap/wpa_auth_ie.c | 95 +- contrib/wpa/src/ap/wpa_auth_kay.c | 45 +- contrib/wpa/src/ap/wps_hostapd.c | 5 +- contrib/wpa/src/ap/x_snoop.c | 5 + contrib/wpa/src/build.rules | 2 +- contrib/wpa/src/common/brcm_vendor.h | 8 +- contrib/wpa/src/common/common_module_tests.c | 2 +- contrib/wpa/src/common/defs.h | 67 +- contrib/wpa/src/common/dpp.c | 883 ++- contrib/wpa/src/common/dpp.h | 132 +- contrib/wpa/src/common/dpp_crypto.c | 239 +- contrib/wpa/src/common/dpp_i.h | 19 +- contrib/wpa/src/common/dpp_pkex.c | 59 +- contrib/wpa/src/common/dpp_reconfig.c | 18 +- contrib/wpa/src/common/dpp_tcp.c | 916 ++- contrib/wpa/src/common/dragonfly.c | 9 +- contrib/wpa/src/common/gas_server.c | 79 +- contrib/wpa/src/common/gas_server.h | 5 +- contrib/wpa/src/common/hw_features_common.c | 303 +- contrib/wpa/src/common/hw_features_common.h | 12 +- contrib/wpa/src/common/ieee802_11_common.c | 1090 +++- contrib/wpa/src/common/ieee802_11_common.h | 89 +- contrib/wpa/src/common/ieee802_11_defs.h | 722 ++- contrib/wpa/src/common/nan.h | 98 + contrib/wpa/src/common/nan_de.c | 1395 +++++ contrib/wpa/src/common/nan_de.h | 145 + contrib/wpa/src/common/ocv.c | 5 +- contrib/wpa/src/common/ptksa_cache.c | 74 +- contrib/wpa/src/common/ptksa_cache.h | 47 +- contrib/wpa/src/common/qca-vendor.h | 6323 +++++++++++++++++++- contrib/wpa/src/common/sae.c | 139 +- contrib/wpa/src/common/sae.h | 14 +- contrib/wpa/src/common/version.h | 2 +- contrib/wpa/src/common/wpa_common.c | 995 ++- contrib/wpa/src/common/wpa_common.h | 134 +- contrib/wpa/src/common/wpa_ctrl.c | 16 +- contrib/wpa/src/common/wpa_ctrl.h | 36 + contrib/wpa/src/crypto/crypto.h | 117 +- contrib/wpa/src/crypto/crypto_gnutls.c | 5 + contrib/wpa/src/crypto/crypto_internal.c | 5 + contrib/wpa/src/crypto/crypto_libtomcrypt.c | 5 + contrib/wpa/src/crypto/crypto_linux.c | 5 + contrib/wpa/src/crypto/crypto_module_tests.c | 281 + contrib/wpa/src/crypto/crypto_nettle.c | 5 + contrib/wpa/src/crypto/crypto_none.c | 5 + contrib/wpa/src/crypto/crypto_openssl.c | 2622 +++++++- contrib/wpa/src/crypto/crypto_wolfssl.c | 2043 ++++++- contrib/wpa/src/crypto/fips_prf_internal.c | 11 +- contrib/wpa/src/crypto/fips_prf_openssl.c | 15 + contrib/wpa/src/crypto/sha1-pbkdf2.c | 3 + contrib/wpa/src/crypto/sha256-internal.c | 3 - contrib/wpa/src/crypto/sha256.c | 21 +- contrib/wpa/src/crypto/sha384.c | 6 +- contrib/wpa/src/crypto/sha512-internal.c | 3 - contrib/wpa/src/crypto/sha512.c | 6 +- contrib/wpa/src/crypto/tls.h | 18 +- contrib/wpa/src/crypto/tls_gnutls.c | 1 + contrib/wpa/src/crypto/tls_internal.c | 11 +- contrib/wpa/src/crypto/tls_none.c | 1 + contrib/wpa/src/crypto/tls_openssl.c | 564 +- contrib/wpa/src/crypto/tls_openssl_ocsp.c | 26 +- contrib/wpa/src/crypto/tls_wolfssl.c | 284 +- contrib/wpa/src/drivers/driver.h | 964 ++- contrib/wpa/src/drivers/driver_atheros.c | 31 +- contrib/wpa/src/drivers/driver_bsd.c | 16 +- contrib/wpa/src/drivers/driver_common.c | 44 + contrib/wpa/src/drivers/driver_hostap.c | 20 +- contrib/wpa/src/drivers/driver_macsec_linux.c | 76 +- contrib/wpa/src/drivers/driver_macsec_qca.c | 4 +- contrib/wpa/src/drivers/driver_ndis.c | 8 +- contrib/wpa/src/drivers/driver_nl80211.c | 3443 ++++++++--- contrib/wpa/src/drivers/driver_nl80211.h | 113 +- contrib/wpa/src/drivers/driver_nl80211_capa.c | 354 +- contrib/wpa/src/drivers/driver_nl80211_event.c | 1291 +++- contrib/wpa/src/drivers/driver_nl80211_scan.c | 127 +- contrib/wpa/src/drivers/driver_roboswitch.c | 2 +- contrib/wpa/src/drivers/driver_wext.c | 11 +- contrib/wpa/src/drivers/driver_wired.c | 2 +- contrib/wpa/src/drivers/linux_ioctl.c | 11 +- contrib/wpa/src/drivers/ndis_events.c | 5 +- contrib/wpa/src/drivers/netlink.c | 6 +- contrib/wpa/src/drivers/nl80211_copy.h | 626 +- contrib/wpa/src/eap_common/eap_defs.h | 2 +- contrib/wpa/src/eap_common/eap_pwd_common.c | 23 +- contrib/wpa/src/eap_common/eap_sake_common.c | 19 +- contrib/wpa/src/eap_peer/eap.c | 44 + contrib/wpa/src/eap_peer/eap_aka.c | 198 +- contrib/wpa/src/eap_peer/eap_config.h | 46 +- contrib/wpa/src/eap_peer/eap_fast.c | 14 +- contrib/wpa/src/eap_peer/eap_i.h | 9 + contrib/wpa/src/eap_peer/eap_mschapv2.c | 30 +- contrib/wpa/src/eap_peer/eap_peap.c | 40 +- contrib/wpa/src/eap_peer/eap_pwd.c | 33 +- contrib/wpa/src/eap_peer/eap_sim.c | 202 +- contrib/wpa/src/eap_peer/eap_teap.c | 61 +- contrib/wpa/src/eap_peer/eap_tls.c | 15 +- contrib/wpa/src/eap_peer/eap_tls_common.c | 27 +- contrib/wpa/src/eap_peer/eap_tls_common.h | 5 + contrib/wpa/src/eap_peer/eap_ttls.c | 32 +- contrib/wpa/src/eap_peer/eap_wsc.c | 14 +- contrib/wpa/src/eap_server/eap.h | 12 + contrib/wpa/src/eap_server/eap_i.h | 7 + contrib/wpa/src/eap_server/eap_server_aka.c | 126 +- contrib/wpa/src/eap_server/eap_server_eke.c | 1 + contrib/wpa/src/eap_server/eap_server_fast.c | 14 +- contrib/wpa/src/eap_server/eap_server_mschapv2.c | 28 +- contrib/wpa/src/eap_server/eap_server_peap.c | 18 + contrib/wpa/src/eap_server/eap_server_pwd.c | 33 +- contrib/wpa/src/eap_server/eap_server_sim.c | 133 +- contrib/wpa/src/eap_server/eap_server_teap.c | 39 +- contrib/wpa/src/eap_server/eap_server_tls.c | 10 +- contrib/wpa/src/eap_server/eap_server_tls_common.c | 18 +- contrib/wpa/src/eap_server/eap_server_ttls.c | 3 +- contrib/wpa/src/eap_server/eap_tls_common.h | 2 + contrib/wpa/src/eapol_auth/eapol_auth_sm.c | 26 +- contrib/wpa/src/eapol_auth/eapol_auth_sm.h | 5 +- contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h | 4 + contrib/wpa/src/eapol_supp/eapol_supp_sm.c | 17 +- contrib/wpa/src/eapol_supp/eapol_supp_sm.h | 18 +- contrib/wpa/src/fst/fst_group.c | 12 +- contrib/wpa/src/fst/fst_iface.c | 2 +- contrib/wpa/src/fst/fst_session.c | 6 +- contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 9 +- contrib/wpa/src/l2_packet/l2_packet_linux.c | 4 +- contrib/wpa/src/p2p/p2p.c | 123 +- contrib/wpa/src/p2p/p2p.h | 12 +- contrib/wpa/src/p2p/p2p_build.c | 20 +- contrib/wpa/src/p2p/p2p_dev_disc.c | 10 +- contrib/wpa/src/p2p/p2p_go_neg.c | 121 +- contrib/wpa/src/p2p/p2p_group.c | 14 +- contrib/wpa/src/p2p/p2p_i.h | 19 +- contrib/wpa/src/p2p/p2p_invitation.c | 31 +- contrib/wpa/src/p2p/p2p_parse.c | 27 +- contrib/wpa/src/p2p/p2p_pd.c | 43 +- contrib/wpa/src/p2p/p2p_sd.c | 23 +- contrib/wpa/src/p2p/p2p_utils.c | 84 +- contrib/wpa/src/pae/ieee802_1x_cp.c | 15 +- contrib/wpa/src/pae/ieee802_1x_kay.c | 74 +- contrib/wpa/src/pae/ieee802_1x_kay.h | 5 +- contrib/wpa/src/pae/ieee802_1x_secy_ops.c | 20 + contrib/wpa/src/pae/ieee802_1x_secy_ops.h | 1 + contrib/wpa/src/pasn/Makefile | 16 + contrib/wpa/src/pasn/pasn_common.c | 232 + contrib/wpa/src/pasn/pasn_common.h | 228 + contrib/wpa/src/pasn/pasn_initiator.c | 1406 +++++ contrib/wpa/src/pasn/pasn_responder.c | 1032 ++++ contrib/wpa/src/radius/radius.c | 297 +- contrib/wpa/src/radius/radius.h | 35 +- contrib/wpa/src/radius/radius_client.c | 789 ++- contrib/wpa/src/radius/radius_client.h | 27 +- contrib/wpa/src/radius/radius_das.c | 10 + contrib/wpa/src/radius/radius_server.c | 15 + contrib/wpa/src/rsn_supp/pmksa_cache.c | 260 +- contrib/wpa/src/rsn_supp/pmksa_cache.h | 105 +- contrib/wpa/src/rsn_supp/preauth.c | 19 +- contrib/wpa/src/rsn_supp/tdls.c | 332 +- contrib/wpa/src/rsn_supp/wpa.c | 2190 +++++-- contrib/wpa/src/rsn_supp/wpa.h | 88 +- contrib/wpa/src/rsn_supp/wpa_ft.c | 328 +- contrib/wpa/src/rsn_supp/wpa_i.h | 65 +- contrib/wpa/src/rsn_supp/wpa_ie.c | 36 +- contrib/wpa/src/tls/libtommath.c | 8 - contrib/wpa/src/tls/pkcs1.c | 6 +- contrib/wpa/src/tls/tlsv1_client_read.c | 3 +- contrib/wpa/src/tls/tlsv1_common.c | 6 +- contrib/wpa/src/tls/tlsv1_common.h | 3 +- contrib/wpa/src/tls/tlsv1_server_write.c | 2 +- contrib/wpa/src/utils/browser.c | 10 + contrib/wpa/src/utils/common.c | 15 +- contrib/wpa/src/utils/common.h | 38 + contrib/wpa/src/utils/crc32.c | 2 +- contrib/wpa/src/utils/crc32.h | 2 +- contrib/wpa/src/utils/http-utils.h | 1 + contrib/wpa/src/utils/http_curl.c | 73 +- contrib/wpa/src/utils/ip_addr.c | 19 + contrib/wpa/src/utils/ip_addr.h | 2 + contrib/wpa/src/utils/os.h | 42 +- contrib/wpa/src/utils/os_unix.c | 195 +- contrib/wpa/src/utils/trace.c | 6 +- contrib/wpa/src/utils/wpa_debug.c | 10 +- contrib/wpa/src/utils/wpa_debug.h | 1 + contrib/wpa/src/utils/wpabuf.h | 6 + contrib/wpa/src/wps/ndef.c | 6 + contrib/wpa/src/wps/wps.c | 5 +- contrib/wpa/src/wps/wps.h | 5 + contrib/wpa/src/wps/wps_attr_parse.c | 13 +- contrib/wpa/src/wps/wps_enrollee.c | 6 +- contrib/wpa/src/wps/wps_er.c | 4 +- contrib/wpa/src/wps/wps_i.h | 1 + contrib/wpa/src/wps/wps_registrar.c | 15 +- contrib/wpa/wpa_supplicant/Android.mk | 228 +- contrib/wpa/wpa_supplicant/ChangeLog | 50 + contrib/wpa/wpa_supplicant/Makefile | 308 +- contrib/wpa/wpa_supplicant/README | 4 +- contrib/wpa/wpa_supplicant/README-HS20 | 33 +- contrib/wpa/wpa_supplicant/README-NAN-USD | 147 + contrib/wpa/wpa_supplicant/README-WPS | 24 +- contrib/wpa/wpa_supplicant/android.config | 15 + contrib/wpa/wpa_supplicant/ap.c | 293 +- contrib/wpa/wpa_supplicant/ap.h | 24 +- contrib/wpa/wpa_supplicant/bgscan.h | 2 +- contrib/wpa/wpa_supplicant/bgscan_learn.c | 10 +- contrib/wpa/wpa_supplicant/bgscan_simple.c | 64 +- contrib/wpa/wpa_supplicant/bss.c | 563 +- contrib/wpa/wpa_supplicant/bss.h | 29 + contrib/wpa/wpa_supplicant/bssid_ignore.c | 30 +- contrib/wpa/wpa_supplicant/config.c | 487 +- contrib/wpa/wpa_supplicant/config.h | 150 +- contrib/wpa/wpa_supplicant/config_file.c | 108 +- contrib/wpa/wpa_supplicant/config_none.c | 3 +- contrib/wpa/wpa_supplicant/config_ssid.h | 114 +- contrib/wpa/wpa_supplicant/config_winreg.c | 5 +- contrib/wpa/wpa_supplicant/ctrl_iface.c | 1707 +++++- contrib/wpa/wpa_supplicant/ctrl_iface.h | 2 + contrib/wpa/wpa_supplicant/ctrl_iface_unix.c | 3 + .../wpa/wpa_supplicant/dbus/dbus_dict_helpers.c | 100 + .../wpa/wpa_supplicant/dbus/dbus_dict_helpers.h | 9 + contrib/wpa/wpa_supplicant/dbus/dbus_new.c | 142 +- contrib/wpa/wpa_supplicant/dbus/dbus_new.h | 24 + .../wpa/wpa_supplicant/dbus/dbus_new_handlers.c | 784 ++- .../wpa/wpa_supplicant/dbus/dbus_new_handlers.h | 7 + .../wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 94 +- contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c | 209 +- contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h | 5 + .../wpa/wpa_supplicant/dbus/dbus_new_introspect.c | 2 +- contrib/wpa/wpa_supplicant/defconfig | 53 + .../wpa_supplicant/doc/docbook/wpa_supplicant.sgml | 48 +- contrib/wpa/wpa_supplicant/dpp_supplicant.c | 2184 ++++++- contrib/wpa/wpa_supplicant/dpp_supplicant.h | 5 + contrib/wpa/wpa_supplicant/driver_i.h | 124 +- contrib/wpa/wpa_supplicant/eapol_test.c | 146 +- contrib/wpa/wpa_supplicant/events.c | 1741 +++++- contrib/wpa/wpa_supplicant/examples/dpp-nfc.py | 10 +- contrib/wpa/wpa_supplicant/gas_query.c | 56 +- contrib/wpa/wpa_supplicant/hs20_supplicant.c | 17 +- contrib/wpa/wpa_supplicant/ibss_rsn.c | 32 +- contrib/wpa/wpa_supplicant/ibss_rsn.h | 3 +- contrib/wpa/wpa_supplicant/interworking.c | 124 +- contrib/wpa/wpa_supplicant/main.c | 2 + contrib/wpa/wpa_supplicant/mbo.c | 25 +- contrib/wpa/wpa_supplicant/mesh.c | 16 +- contrib/wpa/wpa_supplicant/mesh_mpm.c | 74 +- contrib/wpa/wpa_supplicant/mesh_rsn.c | 27 +- contrib/wpa/wpa_supplicant/nan_usd.c | 513 ++ contrib/wpa/wpa_supplicant/nan_usd.h | 46 + contrib/wpa/wpa_supplicant/notify.c | 103 +- contrib/wpa/wpa_supplicant/notify.h | 14 +- contrib/wpa/wpa_supplicant/offchannel.c | 10 +- contrib/wpa/wpa_supplicant/op_classes.c | 150 +- contrib/wpa/wpa_supplicant/p2p_supplicant.c | 483 +- contrib/wpa/wpa_supplicant/p2p_supplicant.h | 13 +- contrib/wpa/wpa_supplicant/p2p_supplicant_sd.c | 14 +- contrib/wpa/wpa_supplicant/pasn_supplicant.c | 1712 ++---- contrib/wpa/wpa_supplicant/preauth_test.c | 8 +- contrib/wpa/wpa_supplicant/robust_av.c | 341 +- contrib/wpa/wpa_supplicant/rrm.c | 132 +- contrib/wpa/wpa_supplicant/scan.c | 774 ++- contrib/wpa/wpa_supplicant/scan.h | 30 +- contrib/wpa/wpa_supplicant/sme.c | 948 ++- contrib/wpa/wpa_supplicant/sme.h | 14 +- .../systemd/wpa_supplicant-nl80211.service.arg.in | 2 +- .../systemd/wpa_supplicant.service.arg.in | 2 +- contrib/wpa/wpa_supplicant/utils/log2pcap.py | 9 +- contrib/wpa/wpa_supplicant/wmm_ac.c | 6 +- contrib/wpa/wpa_supplicant/wnm_sta.c | 532 +- contrib/wpa/wpa_supplicant/wnm_sta.h | 30 +- contrib/wpa/wpa_supplicant/wpa_cli.c | 144 +- contrib/wpa/wpa_supplicant/wpa_passphrase.c | 25 +- contrib/wpa/wpa_supplicant/wpa_priv.c | 11 +- contrib/wpa/wpa_supplicant/wpa_supplicant.c | 1679 ++++-- contrib/wpa/wpa_supplicant/wpa_supplicant.conf | 109 +- contrib/wpa/wpa_supplicant/wpa_supplicant_i.h | 286 +- .../wpa_supplicant/wpa_supplicant_template.conf | 2 + contrib/wpa/wpa_supplicant/wpas_glue.c | 159 +- contrib/wpa/wpa_supplicant/wpas_glue.h | 2 + contrib/wpa/wpa_supplicant/wpas_kay.c | 53 +- contrib/wpa/wpa_supplicant/wpas_module_tests.c | 3 + contrib/wpa/wpa_supplicant/wps_supplicant.c | 166 +- contrib/wpa/wpa_supplicant/wps_supplicant.h | 13 + share/mk/src.libnames.mk | 4 + usr.sbin/wpa/Makefile.inc | 1 - usr.sbin/wpa/hostapd/Makefile | 3 +- usr.sbin/wpa/src/Makefile | 1 + usr.sbin/wpa/src/pasn/Makefile | 20 + usr.sbin/wpa/wpa_supplicant/Makefile | 2 +- 366 files changed, 66259 insertions(+), 12716 deletions(-) diff --git a/contrib/wpa/CONTRIBUTIONS b/contrib/wpa/CONTRIBUTIONS index b2064dc83443..6c8187cb190d 100644 --- a/contrib/wpa/CONTRIBUTIONS +++ b/contrib/wpa/CONTRIBUTIONS @@ -37,7 +37,7 @@ without moderation. You can subscribe to the list at this address: http://lists.infradead.org/mailman/listinfo/hostap The message should contain an inlined patch against the current -development branch (i.e., the master branch of +development branch (i.e., the main branch of git://w1.fi/hostap.git). Please make sure the software you use for sending the patch does not corrupt whitespace. If that cannot be fixed for some reason, it is better to include an attached version of the diff --git a/contrib/wpa/README b/contrib/wpa/README index 1470c4f23582..8392bb354fac 100644 --- a/contrib/wpa/README +++ b/contrib/wpa/README @@ -1,7 +1,7 @@ wpa_supplicant and hostapd -------------------------- -Copyright (c) 2002-2022, Jouni Malinen and contributors +Copyright (c) 2002-2024, Jouni Malinen and contributors All Rights Reserved. These programs are licensed under the BSD license (the one with diff --git a/contrib/wpa/hostapd/Android.mk b/contrib/wpa/hostapd/Android.mk index bf26e41c6b23..573564d5b0de 100644 --- a/contrib/wpa/hostapd/Android.mk +++ b/contrib/wpa/hostapd/Android.mk @@ -154,6 +154,7 @@ OBJS += src/utils/crc32.c OBJS += src/common/ieee802_11_common.c OBJS += src/common/wpa_common.c OBJS += src/common/hw_features_common.c +OBJS += src/common/ptksa_cache.c OBJS += src/eapol_auth/eapol_auth_sm.c @@ -237,6 +238,8 @@ L_CFLAGS += -DCONFIG_OCV OBJS += src/common/ocv.c endif +NEED_AES_UNWRAP=y + ifdef CONFIG_IEEE80211R L_CFLAGS += -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP OBJS += src/ap/wpa_auth_ft.c @@ -256,6 +259,7 @@ L_CFLAGS += -DCONFIG_SAE OBJS += src/common/sae.c ifdef CONFIG_SAE_PK L_CFLAGS += -DCONFIG_SAE_PK +NEED_AES_SIV=y OBJS += src/common/sae_pk.c endif NEED_ECC=y @@ -294,6 +298,12 @@ ifdef CONFIG_IEEE80211AC L_CFLAGS += -DCONFIG_IEEE80211AC endif +ifdef CONFIG_IEEE80211BE +CONFIG_IEEE80211AX=y +L_CFLAGS += -DCONFIG_IEEE80211BE +OBJS += src/ap/ieee802_11_eht.c +endif + ifdef CONFIG_IEEE80211AX L_CFLAGS += -DCONFIG_IEEE80211AX endif @@ -572,6 +582,12 @@ L_CFLAGS += -DCONFIG_DPP3 endif endif +ifdef CONFIG_NAN_USD +OBJS += src/common/nan_de.c +OBJS += src/ap/nan_usd_ap.c +L_CFLAGS += -DCONFIG_NAN_USD +endif + ifdef CONFIG_PASN L_CFLAGS += -DCONFIG_PASN L_CFLAGS += -DCONFIG_PTKSA_CACHE @@ -579,7 +595,6 @@ NEED_HMAC_SHA256_KDF=y NEED_HMAC_SHA384_KDF=y NEED_SHA256=y NEED_SHA384=y -OBJS += src/common/ptksa_cache.c endif ifdef CONFIG_EAP_IKEV2 @@ -632,6 +647,11 @@ ifdef CHAP OBJS += src/eap_common/chap.c endif +ifdef CONFIG_RADIUS_TLS +TLS_FUNCS=y +L_CFLAGS += -DCONFIG_RADIUS_TLS +endif + ifdef TLS_FUNCS NEED_DES=y # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) @@ -653,6 +673,7 @@ L_CFLAGS += -DCONFIG_TLSV12 endif ifeq ($(CONFIG_TLS), openssl) +L_CFLAGS += -DCRYPTO_RSA_OAEP_SHA256 ifdef TLS_FUNCS OBJS += src/crypto/tls_openssl.c OBJS += src/crypto/tls_openssl_ocsp.c @@ -825,7 +846,9 @@ endif ifdef NEED_AES_ENCBLOCK AESOBJS += src/crypto/aes-encblock.c endif +ifneq ($(CONFIG_TLS), openssl) AESOBJS += src/crypto/aes-omac1.c +endif ifdef NEED_AES_UNWRAP ifneq ($(CONFIG_TLS), openssl) NEED_AES_DEC=y @@ -1026,6 +1049,9 @@ endif ifdef NEED_AP_MLME OBJS += src/ap/wmm.c OBJS += src/ap/ap_list.c +OBJS += src/ap/comeback_token.c +OBJS += src/pasn/pasn_responder.c +OBJS += src/pasn/pasn_common.c OBJS += src/ap/ieee802_11.c OBJS += src/ap/hw_features.c OBJS += src/ap/dfs.c diff --git a/contrib/wpa/hostapd/ChangeLog b/contrib/wpa/hostapd/ChangeLog index 279298e4d4d4..1c8240d333c4 100644 --- a/contrib/wpa/hostapd/ChangeLog +++ b/contrib/wpa/hostapd/ChangeLog @@ -1,5 +1,42 @@ ChangeLog for hostapd +2024-07-20 - v2.11 + * Wi-Fi Easy Connect + - add support for DPP release 3 + - allow Configurator parameters to be provided during config exchange + * HE/IEEE 802.11ax/Wi-Fi 6 + - various fixes + * EHT/IEEE 802.11be/Wi-Fi 7 + - add preliminary support + * SAE: add support for fetching the password from a RADIUS server + * support OpenSSL 3.0 API changes + * support background radar detection and CAC with some additional + drivers + * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) + * EAP-SIM/AKA: support IMSI privacy + * improve 4-way handshake operations + - use Secure=1 in message 3 during PTK rekeying + * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases + to avoid interoperability issues + * support new SAE AKM suites with variable length keys + * support new AKM for 802.1X/EAP with SHA384 + * extend PASN support for secure ranging + * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) + - this is based on additional details being added in the IEEE 802.11 + standard + - the new implementation is not backwards compatible + * improved ACS to cover additional channel types/bandwidths + * extended Multiple BSSID support + * fix beacon protection with FT protocol (incorrect BIGTK was provided) + * support unsynchronized service discovery (USD) + * add preliminary support for RADIUS/TLS + * add support for explicit SSID protection in 4-way handshake + (a mitigation for CVE-2023-52424; disabled by default for now, can be + enabled with ssid_protection=1) + * fix SAE H2E rejected groups validation to avoid downgrade attacks + * use stricter validation for some RADIUS messages + * a large number of other fixes, cleanup, and extensions + 2022-01-16 - v2.10 * SAE changes - improved protection against side channel attacks diff --git a/contrib/wpa/hostapd/Makefile b/contrib/wpa/hostapd/Makefile index e37c13b27a6e..ca4439234a11 100644 --- a/contrib/wpa/hostapd/Makefile +++ b/contrib/wpa/hostapd/Makefile @@ -84,6 +84,7 @@ OBJS += ../src/ap/beacon.o OBJS += ../src/ap/bss_load.o OBJS += ../src/ap/neighbor_db.o OBJS += ../src/ap/rrm.o +OBJS += ../src/common/ptksa_cache.o OBJS_c = hostapd_cli.o OBJS_c += ../src/common/wpa_ctrl.o @@ -167,7 +168,7 @@ OBJS += ../src/eapol_auth/eapol_auth_sm.o ifdef CONFIG_CODE_COVERAGE -CFLAGS += -O0 -fprofile-arcs -ftest-coverage +CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE LIBS += -lgcov LIBS_c += -lgcov LIBS_h += -lgcov @@ -276,6 +277,8 @@ CFLAGS += -DCONFIG_OCV OBJS += ../src/common/ocv.o endif +NEED_AES_UNWRAP=y + ifdef CONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP OBJS += ../src/ap/wpa_auth_ft.o @@ -295,6 +298,7 @@ CFLAGS += -DCONFIG_SAE OBJS += ../src/common/sae.o ifdef CONFIG_SAE_PK CFLAGS += -DCONFIG_SAE_PK +NEED_AES_SIV=y OBJS += ../src/common/sae_pk.o endif NEED_ECC=y @@ -339,6 +343,12 @@ ifdef CONFIG_IEEE80211AC CFLAGS += -DCONFIG_IEEE80211AC endif +ifdef CONFIG_IEEE80211BE +CONFIG_IEEE80211AX=y +CFLAGS += -DCONFIG_IEEE80211BE +OBJS += ../src/ap/ieee802_11_eht.o +endif + ifdef CONFIG_IEEE80211AX CFLAGS += -DCONFIG_IEEE80211AX OBJS += ../src/ap/ieee802_11_he.o @@ -598,6 +608,12 @@ CFLAGS += -DCONFIG_DPP3 endif endif +ifdef CONFIG_NAN_USD +OBJS += ../src/common/nan_de.o +OBJS += ../src/ap/nan_usd_ap.o +CFLAGS += -DCONFIG_NAN_USD +endif + ifdef CONFIG_PASN CFLAGS += -DCONFIG_PASN CFLAGS += -DCONFIG_PTKSA_CACHE @@ -605,7 +621,6 @@ NEED_HMAC_SHA256_KDF=y NEED_HMAC_SHA384_KDF=y NEED_SHA256=y NEED_SHA384=y -OBJS += ../src/common/ptksa_cache.o endif ifdef CONFIG_EAP_IKEV2 @@ -667,6 +682,11 @@ ifdef CHAP OBJS += ../src/eap_common/chap.o endif +ifdef CONFIG_RADIUS_TLS +TLS_FUNCS=y +CFLAGS += -DCONFIG_RADIUS_TLS +endif + ifdef TLS_FUNCS NEED_DES=y # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) @@ -708,6 +728,7 @@ endif endif ifeq ($(CONFIG_TLS), openssl) +CFLAGS += -DCRYPTO_RSA_OAEP_SHA256 CONFIG_CRYPTO=openssl ifdef TLS_FUNCS OBJS += ../src/crypto/tls_openssl.o @@ -932,11 +953,13 @@ endif ifdef NEED_AES_ENCBLOCK AESOBJS += ../src/crypto/aes-encblock.o endif +ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), wolfssl) AESOBJS += ../src/crypto/aes-omac1.o endif endif +endif ifdef NEED_AES_UNWRAP ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) @@ -1172,6 +1195,9 @@ endif ifdef NEED_AP_MLME OBJS += ../src/ap/wmm.o OBJS += ../src/ap/ap_list.o +OBJS += ../src/ap/comeback_token.o +OBJS += ../src/pasn/pasn_responder.o +OBJS += ../src/pasn/pasn_common.o OBJS += ../src/ap/ieee802_11.o OBJS += ../src/ap/hw_features.o OBJS += ../src/ap/dfs.o diff --git a/contrib/wpa/hostapd/README b/contrib/wpa/hostapd/README index 739c964d44d8..1a0248fce422 100644 --- a/contrib/wpa/hostapd/README +++ b/contrib/wpa/hostapd/README @@ -2,7 +2,7 @@ hostapd - user space IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2022, Jouni Malinen and contributors +Copyright (c) 2002-2024, Jouni Malinen and contributors All Rights Reserved. This program is licensed under the BSD license (the one with diff --git a/contrib/wpa/hostapd/android.config b/contrib/wpa/hostapd/android.config index c8b3afabef8d..522de87266d5 100644 --- a/contrib/wpa/hostapd/android.config +++ b/contrib/wpa/hostapd/android.config @@ -121,6 +121,9 @@ CONFIG_PKCS12=y # Build IPv6 support for RADIUS operations CONFIG_IPV6=y +# Include support fo RADIUS/TLS into the RADIUS client +#CONFIG_RADIUS_TLS=y + # IEEE Std 802.11r-2008 (Fast BSS Transition) #CONFIG_IEEE80211R=y @@ -212,3 +215,6 @@ CONFIG_NO_RANDOM_POOL=y # release under this optional build parameter. This functionality is subject to # be completely removed in a future release. CONFIG_WEP=y + +# Wi-Fi Aware unsynchronized service discovery (NAN USD) +#CONFIG_NAN_USD=y diff --git a/contrib/wpa/hostapd/config_file.c b/contrib/wpa/hostapd/config_file.c index b14728d1b507..3fb059770d49 100644 --- a/contrib/wpa/hostapd/config_file.c +++ b/contrib/wpa/hostapd/config_file.c @@ -1,6 +1,6 @@ /* * hostapd / Configuration file parser - * Copyright (c) 2003-2018, Jouni Malinen + * Copyright (c) 2003-2024, Jouni Malinen * * This software may be distributed under the terms of the BSD license. * See README for more details. @@ -118,52 +118,6 @@ static int hostapd_config_read_vlan_file(struct hostapd_bss_config *bss, #endif /* CONFIG_NO_VLAN */ -int hostapd_acl_comp(const void *a, const void *b) -{ - const struct mac_acl_entry *aa = a; - const struct mac_acl_entry *bb = b; - return os_memcmp(aa->addr, bb->addr, sizeof(macaddr)); -} - - -int hostapd_add_acl_maclist(struct mac_acl_entry **acl, int *num, - int vlan_id, const u8 *addr) -{ - struct mac_acl_entry *newacl; - - newacl = os_realloc_array(*acl, *num + 1, sizeof(**acl)); - if (!newacl) { - wpa_printf(MSG_ERROR, "MAC list reallocation failed"); - return -1; - } - - *acl = newacl; - os_memcpy((*acl)[*num].addr, addr, ETH_ALEN); - os_memset(&(*acl)[*num].vlan_id, 0, sizeof((*acl)[*num].vlan_id)); - (*acl)[*num].vlan_id.untagged = vlan_id; - (*acl)[*num].vlan_id.notempty = !!vlan_id; - (*num)++; - - return 0; -} - - -void hostapd_remove_acl_mac(struct mac_acl_entry **acl, int *num, - const u8 *addr) -{ - int i = 0; - - while (i < *num) { - if (os_memcmp((*acl)[i].addr, addr, ETH_ALEN) == 0) { - os_remove_in_array(*acl, *num, sizeof(**acl), i); - (*num)--; - } else { - i++; - } - } -} - - static int hostapd_config_read_maclist(const char *fname, struct mac_acl_entry **acl, int *num) { @@ -713,6 +667,10 @@ static int hostapd_config_parse_key_mgmt(int line, const char *value) val |= WPA_KEY_MGMT_FT_IEEE8021X_SHA384; #endif /* CONFIG_SHA384 */ #endif /* CONFIG_IEEE80211R_AP */ +#ifdef CONFIG_SHA384 + else if (os_strcmp(start, "WPA-EAP-SHA384") == 0) + val |= WPA_KEY_MGMT_IEEE8021X_SHA384; +#endif /* CONFIG_SHA384 */ else if (os_strcmp(start, "WPA-PSK-SHA256") == 0) val |= WPA_KEY_MGMT_PSK_SHA256; else if (os_strcmp(start, "WPA-EAP-SHA256") == 0) @@ -720,8 +678,12 @@ static int hostapd_config_parse_key_mgmt(int line, const char *value) #ifdef CONFIG_SAE else if (os_strcmp(start, "SAE") == 0) val |= WPA_KEY_MGMT_SAE; + else if (os_strcmp(start, "SAE-EXT-KEY") == 0) + val |= WPA_KEY_MGMT_SAE_EXT_KEY; else if (os_strcmp(start, "FT-SAE") == 0) val |= WPA_KEY_MGMT_FT_SAE; + else if (os_strcmp(start, "FT-SAE-EXT-KEY") == 0) + val |= WPA_KEY_MGMT_FT_SAE_EXT_KEY; #endif /* CONFIG_SAE */ #ifdef CONFIG_SUITEB else if (os_strcmp(start, "WPA-EAP-SUITE-B") == 0) @@ -1058,6 +1020,78 @@ static int add_r1kh(struct hostapd_bss_config *bss, char *value) return 0; } + + +int hostapd_config_read_rxkh_file(struct hostapd_bss_config *conf, + const char *fname) +{ + FILE *f; + char buf[256], *pos; + int line = 0, errors = 0; + + if (!fname) + return 0; + + f = fopen(fname, "r"); + if (!f) { + wpa_printf(MSG_ERROR, "rxkh file '%s' not found.", fname); + return -1; + } + + while (fgets(buf, sizeof(buf), f)) { + line++; + + if (buf[0] == '#') + continue; + pos = buf; + while (*pos != '\0') { + if (*pos == '\n') { + *pos = '\0'; + break; + } + pos++; + } + if (buf[0] == '\0') + continue; + + pos = os_strchr(buf, '='); + if (!pos) { + wpa_printf(MSG_ERROR, "Line %d: Invalid line '%s'", + line, buf); + errors++; + continue; + } + *pos = '\0'; + pos++; + + if (os_strcmp(buf, "r0kh") == 0) { + if (add_r0kh(conf, pos) < 0) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid r0kh '%s'", + line, pos); + errors++; + } + } else if (os_strcmp(buf, "r1kh") == 0) { + if (add_r1kh(conf, pos) < 0) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid r1kh '%s'", + line, pos); + errors++; + } + } + } + + fclose(f); + + if (errors) { + wpa_printf(MSG_ERROR, + "%d errors in configuring RxKHs from '%s'", + errors, fname); + return -1; + } + return 0; +} + #endif /* CONFIG_IEEE80211R_AP */ @@ -1644,6 +1678,8 @@ static int parse_anqp_elem(struct hostapd_bss_config *bss, char *buf, int line) return 0; } +#endif /* CONFIG_INTERWORKING */ + static int parse_qos_map_set(struct hostapd_bss_config *bss, char *buf, int line) @@ -1685,8 +1721,6 @@ static int parse_qos_map_set(struct hostapd_bss_config *bss, return 0; } -#endif /* CONFIG_INTERWORKING */ - #ifdef CONFIG_HS20 static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf, @@ -2197,6 +2231,7 @@ static int add_airtime_weight(struct hostapd_bss_config *bss, char *value) *** 122364 LINES SKIPPED *** From nobody Tue Oct 1 04:29:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlMg2FJbz5YBHK; Tue, 01 Oct 2024 04:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlMg0v0Rz4M3Z; Tue, 1 Oct 2024 04:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLe9JT5ojI1KDghKsSg1q8OZeqztO5KOm1uAWHKSw24=; b=nIHawDE8hK9oSfSEFLhsdE2dSAW11a8Y/QQY5V12DNjn8I2G2Bb/m1UI+0wqFj8zebw+XI AjpFr88EWeW70hHJX6IBDPWtC7Y4jEb4cYwTIdY0M0yFZpuJjhFW8ew3v+gceqPKuY+sWv WLV1J677W9oX79ofLX1Qz3x7rMtDg9Dpau069ckWD8DOVQXiIsNbwwC6Uwb07NNR/k3shB HJ2XiMz4Ppg29Uz5oSdezfzkyRwVfhWKfm5WfsiZkZNm/KXzjICVriziJJQ3SfMCFbl+Gl i6yzQB3xoUzDdXMwqQh6lfeSeUYopEWcY1JAEqKW0AKoVLcmJeUKi4K4xNSDHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLe9JT5ojI1KDghKsSg1q8OZeqztO5KOm1uAWHKSw24=; b=TeqwiSbmocpZfah7hb3JMuv0BuHwx/S45N7eEodxagkoPX7M8/m6MjBBLPZB99VZLbIGUo UWtrDDMeifGDX0b0XRT28Y2JZk1oY8Yzv9hOcOo/TfqQuSWK7LCKDaBGW8sDmoKo1VkUPY U9ohtNzv3v96sX2X1lwoWjYETxQIBJBjQL5enBheZzzmSk9IJmLa3oJfkFvxGBY1atIYpA UhAPvq/rZWWdnveql4eIKZyO3TC9Lr0gX46S5ELKuxsv2XJmZcq+FeKbSYC0Ys20us8nqN LYtXAm++DC9KKvI6kI6yyCh5C2pLWxkIkhsiLP9Phy2Ne1pz18bDYV8u2o7oaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727756975; a=rsa-sha256; cv=none; b=U8ceitiYvi+s91mIEIS5iQxWykkE+m0SFSnwMP+PGGvBXMlfdLsBibEiQqs9cUT3I9+u1S BYxr7EcGCWHIS9+ZNg2G/I7ajOs49W1FCktKuDO5yJJxOYG7DLB5nVeG45RyLuggQ6rGiI 56gicdfmbn7c6wbCnyHo78XMsHn2j6JLWwW+1aPbcX4bdUggfCTGN/nzwT9VpoPLGXLW2s H+gIVK5dZIeiz8XG9JYzugPx6Czpud82mj6tnDJA52DTANxcX9zmZxovDgC2fH9NrfzmjY Z713txgnFKsAttWDadSJ3Hws6xOX2awaG7tQ0iM4iua0Ofx0I+dJLBGGA2k6Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlMg0SNqzMvC; Tue, 1 Oct 2024 04:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914TYO4039260; Tue, 1 Oct 2024 04:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914TYQT039257; Tue, 1 Oct 2024 04:29:34 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:29:34 GMT Message-Id: <202410010429.4914TYQT039257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: dbb02466420b - stable/14 - wpa: Fix gcc build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbb02466420b6c799277046cbc2f55ad3d8357e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=dbb02466420b6c799277046cbc2f55ad3d8357e3 commit dbb02466420b6c799277046cbc2f55ad3d8357e3 Author: Cy Schubert AuthorDate: 2024-07-24 15:04:33 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 04:28:54 +0000 wpa: Fix gcc build Order of libraries still matters with GCC toolchains. Moving the wpapasn library before the wpacommon specification resolves the link problem. This issue was not detected by make universe. Fixes: a90b9d015907 (cherry picked from commit 8880825df1f805fc02dbb8476df8183d4ec3781c) --- usr.sbin/wpa/wpa_supplicant/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index a107157fbf73..3cb1d1c18689 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -52,7 +52,7 @@ CFLAGS+=-DCONFIG_BACKEND_FILE LIBADD+=pcap util wpadrivers wpaeapol_supp \ wpaeap_server \ wpaeap_peer wpaeap_common wpal2_packet wparsn_supp wpatls wpawps \ - wpacommon wpacrypto wpautils wpapasn + wpapasn wpacommon wpacrypto wpautils # User customizations to the wpa_supplicant build environment CFLAGS+=${WPA_SUPPLICANT_CFLAGS} From nobody Tue Oct 1 04:29:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlMh2bnsz5YBHN; Tue, 01 Oct 2024 04:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlMh1X50z4MJs; Tue, 1 Oct 2024 04:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=itkvDfNnN/nyC6rr6xJZ7RbSYyO+oLXFA3vM56DUnfA=; b=M7MvQ6u34lFhYb3fxb5wJ3fwR+P68eOxVCxecrNlYbZGjBowQRGEn3IiywQVLi2Umh2oAG iPE9fKQlHTUkt1D0ju/tLgXJM5y0OqkVzVS6hamR7qZY8IWDw04HOwv56wB0XRrY6Sj26v 65yF/zoLwrSbNG2pc8Ej9cAtUOFJ8LYxD+wgHVVcYYDSS7fmb9YUvBKMEDQvJAOEpIreFx Ko4fsM2xGKk/NImsXi34s8LV4Zo//PrD0qSCahKgG9bRNJp213CTDDKLG7mM6c2eDmeIsA RCmOnxXg6+EYnhIMyzG9jDeukHPiZ63jkahijnpF8F6DVa7BQHIBK9dmqHS2aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727756976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=itkvDfNnN/nyC6rr6xJZ7RbSYyO+oLXFA3vM56DUnfA=; b=WI7201CIIQ00pSvI7wUteyU7cItJFU08aPk9Df17FWEpVR3BBLcCezXhLnx1qAysanLPVE /8Tn4NiRwTTA0eVYsngetquSQxWrcGMs2a7ZGjEBVtWepEZb7j6txXslfvM3LkeBSFPuHu o8AUZORgM8hLCuN/sEHdF633jNDT4ObFpxHntg5pmAjiqL7Q/ooVmvuvrQzo2uB+jz7kn5 5l+RO2t7W8+F+ttyN2ayYTLx0dmbmxO648jtYzz1I/+OKgR0MRUNAjmYaGRDPYOw+fkQWY ffb4nUhcMOfjDhApDKkcczM7w+AnwsHFYnTFOxGM+eWRr1dCFI+iHoTwOLsjnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727756976; a=rsa-sha256; cv=none; b=yhYNWIHnXYjUZ76jHHRaxWNPMEaCE+RZBntPc6QU9wlRIM9o5XOzX3IBI+66SUDKVZHqX4 xqJyZSe/AOUYghGgAZpBkFr20zA0IFUJE2WktxBgmcEEsNq6VabiO3zPs2QKjdgpQDwJ+P wl4nK/J8YHZ3TnkDsUPhy8a5nQ4ZXoZUWJ046V4y0BMfWzhAdPegKP0C8IvMMUZOVODZjP 7cX5ypa8h6W+lNOckhUmN0L+uxkalLQU4ykI067L0wLxXTeBzEU1yvVknhGvVZIzVcCXrd 1F71h5PvtqD6kqxxYAAAnsbO36zXc+lFAdKS7ZIhz8wTA2XqPeg2yuH+yFv+cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlMh1843zMwl; Tue, 1 Oct 2024 04:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914TaEP039308; Tue, 1 Oct 2024 04:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914TawJ039305; Tue, 1 Oct 2024 04:29:36 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:29:36 GMT Message-Id: <202410010429.4914TawJ039305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4bb56e2a6520 - stable/14 - ntp: Improve descriptions in man pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bb56e2a6520efd3472589b4bf70ebc0669e3be6 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb56e2a6520efd3472589b4bf70ebc0669e3be6 commit 4bb56e2a6520efd3472589b4bf70ebc0669e3be6 Author: Alexander Ziaee AuthorDate: 2024-08-05 19:37:42 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 04:28:54 +0000 ntp: Improve descriptions in man pages + ntpd added to ntp.conf(5) description (search keywords) + expand NTP so these pages are shown when `apropos time` + "standard" => "reference" for increased consistency - removed redundant or duplicated search keywords ntp.org bug: https://bugs.ntp.org/show_bug.cgi?id=3936 Reviewed by: Harlan Stenn Reviewed by: Cy Schubert (cherry picked from commit c7a33fe37d7688cb21c743f68256680e003210ad) --- contrib/ntp/ntpd/ntp.conf.def | 2 +- contrib/ntp/ntpd/ntp.keys.def | 2 +- contrib/ntp/ntpd/ntpd-opts.def | 2 +- contrib/ntp/ntpq/ntpq-opts.def | 2 +- contrib/ntp/sntp/sntp-opts.def | 2 +- contrib/ntp/util/ntp-keygen-opts.def | 2 +- usr.sbin/ntp/doc/ntp-keygen.8 | 2 +- usr.sbin/ntp/doc/ntp.conf.5 | 2 +- usr.sbin/ntp/doc/ntp.keys.5 | 2 +- usr.sbin/ntp/doc/ntpd.8 | 2 +- usr.sbin/ntp/doc/ntpq.8 | 2 +- usr.sbin/ntp/doc/sntp.8 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/ntp/ntpd/ntp.conf.def b/contrib/ntp/ntpd/ntp.conf.def index 444e3b35e351..aba3c25ab464 100644 --- a/contrib/ntp/ntpd/ntp.conf.def +++ b/contrib/ntp/ntpd/ntp.conf.def @@ -9,7 +9,7 @@ autogen definitions options; // file name. prog-name = "ntp.conf"; file-path = "/etc/ntp.conf"; -prog-title = "Network Time Protocol (NTP) daemon configuration file format"; +prog-title = "Network Time Protocol daemon (ntpd) configuration format"; /* explain: Additional information whenever the usage routine is invoked */ explain = <<- _END_EXPLAIN diff --git a/contrib/ntp/ntpd/ntp.keys.def b/contrib/ntp/ntpd/ntp.keys.def index e73ce4d06a1b..b0c9717e5906 100644 --- a/contrib/ntp/ntpd/ntp.keys.def +++ b/contrib/ntp/ntpd/ntp.keys.def @@ -10,7 +10,7 @@ autogen definitions options; // file name. prog-name = "ntp.keys"; file-path = "/etc/ntp.keys"; -prog-title = "NTP symmetric key file format"; +prog-title = "Network Time Protocol symmetric key format"; /* explain: Additional information whenever the usage routine is invoked */ explain = <<- _END_EXPLAIN diff --git a/contrib/ntp/ntpd/ntpd-opts.def b/contrib/ntp/ntpd/ntpd-opts.def index 00d35115dc43..6d4952a637c2 100644 --- a/contrib/ntp/ntpd/ntpd-opts.def +++ b/contrib/ntp/ntpd/ntpd-opts.def @@ -5,7 +5,7 @@ autogen definitions options; #include copyright.def prog-name = "ntpd"; -prog-title = "NTP daemon program"; +prog-title = "set clock via Network Time Protocol daemon"; argument = "[ ... ]"; #include ntpdbase-opts.def diff --git a/contrib/ntp/ntpq/ntpq-opts.def b/contrib/ntp/ntpq/ntpq-opts.def index 85655a9d66cc..1189e81efe40 100644 --- a/contrib/ntp/ntpq/ntpq-opts.def +++ b/contrib/ntp/ntpq/ntpq-opts.def @@ -7,7 +7,7 @@ autogen definitions options; #include autogen-version.def prog-name = "ntpq"; -prog-title = "standard NTP query program"; +prog-title = "query Network Time Protocol servers"; argument = '[ host ...]'; flag = { diff --git a/contrib/ntp/sntp/sntp-opts.def b/contrib/ntp/sntp/sntp-opts.def index 7664b1bf08b9..d468b6ef8bf5 100644 --- a/contrib/ntp/sntp/sntp-opts.def +++ b/contrib/ntp/sntp/sntp-opts.def @@ -6,7 +6,7 @@ autogen definitions options; #include copyright.def prog-name = "sntp"; -prog-title = "standard Simple Network Time Protocol client program"; +prog-title = "reference Simple Network Time Protocol client"; argument = '[ hostname-or-IP ...]'; #include homerc.def diff --git a/contrib/ntp/util/ntp-keygen-opts.def b/contrib/ntp/util/ntp-keygen-opts.def index 632dbbec778d..5c06bded15fd 100644 --- a/contrib/ntp/util/ntp-keygen-opts.def +++ b/contrib/ntp/util/ntp-keygen-opts.def @@ -7,7 +7,7 @@ autogen definitions options; #include autogen-version.def prog-name = "ntp-keygen"; -prog-title = "Create a NTP host key"; +prog-title = "create a Network Time Protocol host key"; package = ntp; include = '#include '; diff --git a/usr.sbin/ntp/doc/ntp-keygen.8 b/usr.sbin/ntp/doc/ntp-keygen.8 index ad7b844d27de..3e8ffd9dbf58 100644 --- a/usr.sbin/ntp/doc/ntp-keygen.8 +++ b/usr.sbin/ntp/doc/ntp-keygen.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntp-keygen -.Nd Create a NTP host key +.Nd create a Network Time Protocol host key .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5 index 9e23a2294c48..71fb7c668db2 100644 --- a/usr.sbin/ntp/doc/ntp.conf.5 +++ b/usr.sbin/ntp/doc/ntp.conf.5 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntp.conf -.Nd Network Time Protocol (NTP) daemon configuration file format +.Nd Network Time Protocol daemon (ntpd) configuration format .Sh SYNOPSIS .Nm .Op Fl \-option\-name diff --git a/usr.sbin/ntp/doc/ntp.keys.5 b/usr.sbin/ntp/doc/ntp.keys.5 index d235f3b5f7dd..6bec2880163e 100644 --- a/usr.sbin/ntp/doc/ntp.keys.5 +++ b/usr.sbin/ntp/doc/ntp.keys.5 @@ -12,7 +12,7 @@ .Sh NAME .Nm ntp.keys -.Nd NTP symmetric key file format +.Nd Network Time Protocol symmetric key format .Sh SYNOPSIS .Nm .Op Fl \-option\-name diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8 index 74bc07793048..83beac3632a9 100644 --- a/usr.sbin/ntp/doc/ntpd.8 +++ b/usr.sbin/ntp/doc/ntpd.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntpd -.Nd NTP daemon program +.Nd set clock via Network Time Protocol daemon .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8 index e6c66ed71d97..21f15926a0ab 100644 --- a/usr.sbin/ntp/doc/ntpq.8 +++ b/usr.sbin/ntp/doc/ntpq.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntpq -.Nd standard NTP query program +.Nd query Network Time Protocol servers .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options diff --git a/usr.sbin/ntp/doc/sntp.8 b/usr.sbin/ntp/doc/sntp.8 index 94c3c2816035..4509b6efa222 100644 --- a/usr.sbin/ntp/doc/sntp.8 +++ b/usr.sbin/ntp/doc/sntp.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm sntp -.Nd standard Simple Network Time Protocol client program +.Nd reference Simple Network Time Protocol client .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options From nobody Tue Oct 1 04:30:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlNW1df7z5YBBh; Tue, 01 Oct 2024 04:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlNW19Q6z4MsM; Tue, 1 Oct 2024 04:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727757019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tIzBd+P+FjjMfuFv/pT/6CZDwdwG+/x9BgjHm8+7GU=; b=E1P4avf2ZWbntgwmy6K73CUsr9L+qlKNliu0sH97EAXnOMIfES+fbuUaQZhPcuwwteOQPw f8jqDc0Ew+85iyiZXTvE0RJNQhH4cIA8g9+mBRD5UfgIXeCq1EbdfgCqACVgc1KJzbfj1U Gh2duVi/1kdgiigEID1BG+nbE85jHXrifjGjJ6kDKyCLP6jrNdm+cscBJGkZFTaYw2xHFy 8UfTsa9oLhDWLjwEa/qey0q9gVRdmGADEGbk1bm4XM6EcOO9P3AV/RbP5nsOKuS7oKAxHR MXc3ULYpcWNR6WznTPmypucocpdWC5rmU3290NYRCssE8jmlvU9oOZUMx0q1UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727757019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tIzBd+P+FjjMfuFv/pT/6CZDwdwG+/x9BgjHm8+7GU=; b=Xv3PgoqvMr8O5Va0cZCCPJReaRuB6YWVa3kQhlW/bkcA2D9Kh+hBPBrgpISdRW/y6xULQB DwLFaVJ9ARztc8vV2YObt52I32Ho/oHlzNwDGauBOlDJgaYYr48aRb9cGvthRxmD2TeIFA Wfd99XRGoi85r1/aUi2Ol7+YRzw6B2Yz4wFKMOIdcZstCMCgRP9hlY1AEDvMMixphI4O5D aw3WuUCF9YYf5GPqdHK63eWi1TAM8gPyQsNc8M+/XXax7yfEmqxPlsPvzidGE8bUE8saq9 qHP8zxofPn/P68RZear6V/K2i9YP0A0iMhwP1VfDH2IeqXVHDGhMhFTpuuXSMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727757019; a=rsa-sha256; cv=none; b=dTXOzgdD6jC1QzfeOe08joPkLHD9QBlSaHUJbK+FTekXz/6OwzzgMGGUSLX16FbeNHyeuF he8sdtuBMMKQ9ar5X8FXLKqH6jlS6doQszUEQBNbUHX3wJL2GJUl1soJWVI6b8hmkJuJcD N2dOYtD3Oysiy2UYa8avx5wHhrcu/hC88zpjMcK5AeXpLUB/JfkpbDfyXk6cewp3/WDDcF rlNMxsHJj+EA10aTLkcdksDtTO9Jhz+r9zQ/GcvE6OR+M2rNDhtBmBJXugfyHfQ4ZbtTnt QZx+tG2xm4c2/vm4VlKtIBnlaKEjkuj8vLTmAVp7kUm837MemNm97hgkRzZ4JQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlNW0mNCzNBx; Tue, 1 Oct 2024 04:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914UJwW048099; Tue, 1 Oct 2024 04:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914UHe8048088; Tue, 1 Oct 2024 04:30:17 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:30:17 GMT Message-Id: <202410010430.4914UHe8048088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 87b2a3073aaf - stable/13 - wpa: Import 2.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 87b2a3073aafe52aeaa966abf12b79e8f029622d Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=87b2a3073aafe52aeaa966abf12b79e8f029622d commit 87b2a3073aafe52aeaa966abf12b79e8f029622d Author: Cy Schubert AuthorDate: 2024-07-21 18:59:44 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 04:29:48 +0000 wpa: Import 2.11 Following is a changelog of new features and fixes to wpa: hostapd: * Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * HE/IEEE 802.11ax/Wi-Fi 6 - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * SAE: add support for fetching the password from a RADIUS server * support OpenSSL 3.0 API changes * support background radar detection and CAC with some additional drivers * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) * EAP-SIM/AKA: support IMSI privacy * improve 4-way handshake operations - use Secure=1 in message 3 during PTK rekeying * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases to avoid interoperability issues * support new SAE AKM suites with variable length keys * support new AKM for 802.1X/EAP with SHA384 * extend PASN support for secure ranging * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) - this is based on additional details being added in the IEEE 802.11 standard - the new implementation is not backwards compatible * improved ACS to cover additional channel types/bandwidths * extended Multiple BSSID support * fix beacon protection with FT protocol (incorrect BIGTK was provided) * support unsynchronized service discovery (USD) * add preliminary support for RADIUS/TLS * add support for explicit SSID protection in 4-way handshake (a mitigation for CVE-2023-52424; disabled by default for now, can be enabled with ssid_protection=1) * fix SAE H2E rejected groups validation to avoid downgrade attacks * use stricter validation for some RADIUS messages * a large number of other fixes, cleanup, and extensions wpa_supplicant: * Wi-Fi Easy Connect - add support for DPP release 3 - allow Configurator parameters to be provided during config exchange * MACsec - add support for GCM-AES-256 cipher suite - remove incorrect EAP Session-Id length constraint - add hardware offload support for additional drivers * HE/IEEE 802.11ax/Wi-Fi 6 - support BSS color updates - various fixes * EHT/IEEE 802.11be/Wi-Fi 7 - add preliminary support * support OpenSSL 3.0 API changes * improve EAP-TLS support for TLSv1.3 * EAP-SIM/AKA: support IMSI privacy * improve mitigation against DoS attacks when PMF is used * improve 4-way handshake operations - discard unencrypted EAPOL frames in additional cases - use Secure=1 in message 2 during PTK rekeying * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases to avoid interoperability issues * support new SAE AKM suites with variable length keys * support new AKM for 802.1X/EAP with SHA384 * improve cross-AKM roaming with driver-based SME/BSS selection * PASN - extend support for secure ranging - allow PASN implementation to be used with external programs for Wi-Fi Aware * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) - this is based on additional details being added in the IEEE 802.11 standard - the new implementation is not backwards compatible, but PMKSA caching with FT-EAP was, and still is, disabled by default * support a pregenerated MAC (mac_addr=3) as an alternative mechanism for using per-network random MAC addresses * EAP-PEAP: require Phase 2 authentication by default (phase2_auth=1) to improve security for still unfortunately common invalid configurations that do not set ca_cert * extend SCS support for QoS Characteristics * extend MSCS support * support unsynchronized service discovery (USD) * add support for explicit SSID protection in 4-way handshake (a mitigation for CVE-2023-52424; disabled by default for now, can be enabled with ssid_protection=1) - in addition, verify SSID after key setup when beacon protection is used * fix SAE H2E rejected groups validation to avoid downgrade attacks * a large number of other fixes, cleanup, and extensions Merge commit '6377230b3cf4f238dcd0dc2d76ff25943d3040e5' (cherry picked from commit a90b9d0159070121c221b966469c3e36d912bf82) --- contrib/wpa/CONTRIBUTIONS | 2 +- contrib/wpa/README | 2 +- contrib/wpa/hostapd/Android.mk | 28 +- contrib/wpa/hostapd/ChangeLog | 37 + contrib/wpa/hostapd/Makefile | 30 +- contrib/wpa/hostapd/README | 2 +- contrib/wpa/hostapd/android.config | 6 + contrib/wpa/hostapd/config_file.c | 481 +- contrib/wpa/hostapd/config_file.h | 7 +- contrib/wpa/hostapd/ctrl_iface.c | 1460 +++-- contrib/wpa/hostapd/defconfig | 21 +- contrib/wpa/hostapd/hostapd.conf | 356 +- contrib/wpa/hostapd/hostapd.eap_user | 4 +- contrib/wpa/hostapd/hostapd_cli.c | 217 +- contrib/wpa/hostapd/logwatch/hostapd | 65 - contrib/wpa/hostapd/main.c | 142 +- contrib/wpa/hs20/client/Android.mk | 10 + contrib/wpa/hs20/client/est.c | 37 +- contrib/wpa/hs20/client/osu_client.c | 115 +- contrib/wpa/hs20/client/spp_client.c | 1 - contrib/wpa/src/Makefile | 2 +- contrib/wpa/src/ap/acs.c | 568 +- contrib/wpa/src/ap/acs.h | 3 + contrib/wpa/src/ap/airtime_policy.c | 2 +- contrib/wpa/src/ap/ap_config.c | 205 +- contrib/wpa/src/ap/ap_config.h | 226 +- contrib/wpa/src/ap/ap_drv_ops.c | 359 +- contrib/wpa/src/ap/ap_drv_ops.h | 84 +- contrib/wpa/src/ap/ap_list.c | 6 +- contrib/wpa/src/ap/ap_mlme.c | 4 +- contrib/wpa/src/ap/authsrv.c | 94 + contrib/wpa/src/ap/beacon.c | 1212 +++- contrib/wpa/src/ap/beacon.h | 4 + contrib/wpa/src/ap/bss_load.c | 2 +- contrib/wpa/src/ap/comeback_token.c | 139 + contrib/wpa/src/ap/comeback_token.h | 21 + contrib/wpa/src/ap/ctrl_iface_ap.c | 599 +- contrib/wpa/src/ap/ctrl_iface_ap.h | 17 + contrib/wpa/src/ap/dfs.c | 608 +- contrib/wpa/src/ap/dpp_hostapd.c | 1417 ++++- contrib/wpa/src/ap/dpp_hostapd.h | 5 + contrib/wpa/src/ap/drv_callbacks.c | 881 ++- contrib/wpa/src/ap/fils_hlp.c | 10 +- contrib/wpa/src/ap/gas_query_ap.c | 10 +- contrib/wpa/src/ap/gas_serv.c | 11 +- contrib/wpa/src/ap/gas_serv.h | 2 +- contrib/wpa/src/ap/hostapd.c | 1441 ++++- contrib/wpa/src/ap/hostapd.h | 169 +- contrib/wpa/src/ap/hw_features.c | 233 +- contrib/wpa/src/ap/hw_features.h | 12 + contrib/wpa/src/ap/ieee802_11.c | 4030 ++++++++----- contrib/wpa/src/ap/ieee802_11.h | 83 +- contrib/wpa/src/ap/ieee802_11_auth.c | 162 +- contrib/wpa/src/ap/ieee802_11_auth.h | 5 +- contrib/wpa/src/ap/ieee802_11_eht.c | 1405 +++++ contrib/wpa/src/ap/ieee802_11_he.c | 87 +- contrib/wpa/src/ap/ieee802_11_ht.c | 5 +- contrib/wpa/src/ap/ieee802_11_shared.c | 215 +- contrib/wpa/src/ap/ieee802_11_vht.c | 32 +- contrib/wpa/src/ap/ieee802_1x.c | 233 +- contrib/wpa/src/ap/ieee802_1x.h | 2 +- contrib/wpa/src/ap/nan_usd_ap.c | 267 + contrib/wpa/src/ap/nan_usd_ap.h | 46 + contrib/wpa/src/ap/ndisc_snoop.c | 1 + contrib/wpa/src/ap/neighbor_db.c | 74 +- contrib/wpa/src/ap/neighbor_db.h | 1 + contrib/wpa/src/ap/pmksa_cache_auth.c | 32 +- contrib/wpa/src/ap/pmksa_cache_auth.h | 4 + contrib/wpa/src/ap/preauth_auth.c | 4 +- contrib/wpa/src/ap/rrm.c | 121 + contrib/wpa/src/ap/rrm.h | 2 + contrib/wpa/src/ap/sta_info.c | 469 +- contrib/wpa/src/ap/sta_info.h | 96 +- contrib/wpa/src/ap/utils.c | 14 +- contrib/wpa/src/ap/wmm.c | 7 - contrib/wpa/src/ap/wnm_ap.c | 216 +- contrib/wpa/src/ap/wpa_auth.c | 2459 ++++++-- contrib/wpa/src/ap/wpa_auth.h | 103 +- contrib/wpa/src/ap/wpa_auth_ft.c | 615 +- contrib/wpa/src/ap/wpa_auth_glue.c | 269 +- contrib/wpa/src/ap/wpa_auth_i.h | 47 +- contrib/wpa/src/ap/wpa_auth_ie.c | 95 +- contrib/wpa/src/ap/wpa_auth_kay.c | 45 +- contrib/wpa/src/ap/wps_hostapd.c | 5 +- contrib/wpa/src/ap/x_snoop.c | 5 + contrib/wpa/src/build.rules | 2 +- contrib/wpa/src/common/brcm_vendor.h | 8 +- contrib/wpa/src/common/common_module_tests.c | 2 +- contrib/wpa/src/common/defs.h | 67 +- contrib/wpa/src/common/dpp.c | 883 ++- contrib/wpa/src/common/dpp.h | 132 +- contrib/wpa/src/common/dpp_crypto.c | 239 +- contrib/wpa/src/common/dpp_i.h | 19 +- contrib/wpa/src/common/dpp_pkex.c | 59 +- contrib/wpa/src/common/dpp_reconfig.c | 18 +- contrib/wpa/src/common/dpp_tcp.c | 916 ++- contrib/wpa/src/common/dragonfly.c | 9 +- contrib/wpa/src/common/gas_server.c | 79 +- contrib/wpa/src/common/gas_server.h | 5 +- contrib/wpa/src/common/hw_features_common.c | 303 +- contrib/wpa/src/common/hw_features_common.h | 12 +- contrib/wpa/src/common/ieee802_11_common.c | 1090 +++- contrib/wpa/src/common/ieee802_11_common.h | 89 +- contrib/wpa/src/common/ieee802_11_defs.h | 722 ++- contrib/wpa/src/common/nan.h | 98 + contrib/wpa/src/common/nan_de.c | 1395 +++++ contrib/wpa/src/common/nan_de.h | 145 + contrib/wpa/src/common/ocv.c | 5 +- contrib/wpa/src/common/ptksa_cache.c | 74 +- contrib/wpa/src/common/ptksa_cache.h | 47 +- contrib/wpa/src/common/qca-vendor.h | 6323 +++++++++++++++++++- contrib/wpa/src/common/sae.c | 139 +- contrib/wpa/src/common/sae.h | 14 +- contrib/wpa/src/common/version.h | 2 +- contrib/wpa/src/common/wpa_common.c | 995 ++- contrib/wpa/src/common/wpa_common.h | 134 +- contrib/wpa/src/common/wpa_ctrl.c | 16 +- contrib/wpa/src/common/wpa_ctrl.h | 36 + contrib/wpa/src/crypto/crypto.h | 117 +- contrib/wpa/src/crypto/crypto_gnutls.c | 5 + contrib/wpa/src/crypto/crypto_internal.c | 5 + contrib/wpa/src/crypto/crypto_libtomcrypt.c | 5 + contrib/wpa/src/crypto/crypto_linux.c | 5 + contrib/wpa/src/crypto/crypto_module_tests.c | 281 + contrib/wpa/src/crypto/crypto_nettle.c | 5 + contrib/wpa/src/crypto/crypto_none.c | 5 + contrib/wpa/src/crypto/crypto_openssl.c | 2622 +++++++- contrib/wpa/src/crypto/crypto_wolfssl.c | 2043 ++++++- contrib/wpa/src/crypto/fips_prf_internal.c | 11 +- contrib/wpa/src/crypto/fips_prf_openssl.c | 15 + contrib/wpa/src/crypto/sha1-pbkdf2.c | 3 + contrib/wpa/src/crypto/sha256-internal.c | 3 - contrib/wpa/src/crypto/sha256.c | 21 +- contrib/wpa/src/crypto/sha384.c | 6 +- contrib/wpa/src/crypto/sha512-internal.c | 3 - contrib/wpa/src/crypto/sha512.c | 6 +- contrib/wpa/src/crypto/tls.h | 18 +- contrib/wpa/src/crypto/tls_gnutls.c | 1 + contrib/wpa/src/crypto/tls_internal.c | 11 +- contrib/wpa/src/crypto/tls_none.c | 1 + contrib/wpa/src/crypto/tls_openssl.c | 564 +- contrib/wpa/src/crypto/tls_openssl_ocsp.c | 26 +- contrib/wpa/src/crypto/tls_wolfssl.c | 284 +- contrib/wpa/src/drivers/driver.h | 964 ++- contrib/wpa/src/drivers/driver_atheros.c | 31 +- contrib/wpa/src/drivers/driver_bsd.c | 16 +- contrib/wpa/src/drivers/driver_common.c | 44 + contrib/wpa/src/drivers/driver_hostap.c | 20 +- contrib/wpa/src/drivers/driver_macsec_linux.c | 76 +- contrib/wpa/src/drivers/driver_macsec_qca.c | 4 +- contrib/wpa/src/drivers/driver_ndis.c | 8 +- contrib/wpa/src/drivers/driver_nl80211.c | 3443 ++++++++--- contrib/wpa/src/drivers/driver_nl80211.h | 113 +- contrib/wpa/src/drivers/driver_nl80211_capa.c | 354 +- contrib/wpa/src/drivers/driver_nl80211_event.c | 1291 +++- contrib/wpa/src/drivers/driver_nl80211_scan.c | 127 +- contrib/wpa/src/drivers/driver_roboswitch.c | 2 +- contrib/wpa/src/drivers/driver_wext.c | 11 +- contrib/wpa/src/drivers/driver_wired.c | 2 +- contrib/wpa/src/drivers/linux_ioctl.c | 11 +- contrib/wpa/src/drivers/ndis_events.c | 5 +- contrib/wpa/src/drivers/netlink.c | 6 +- contrib/wpa/src/drivers/nl80211_copy.h | 626 +- contrib/wpa/src/eap_common/eap_defs.h | 2 +- contrib/wpa/src/eap_common/eap_pwd_common.c | 23 +- contrib/wpa/src/eap_common/eap_sake_common.c | 19 +- contrib/wpa/src/eap_peer/eap.c | 44 + contrib/wpa/src/eap_peer/eap_aka.c | 198 +- contrib/wpa/src/eap_peer/eap_config.h | 46 +- contrib/wpa/src/eap_peer/eap_fast.c | 14 +- contrib/wpa/src/eap_peer/eap_i.h | 9 + contrib/wpa/src/eap_peer/eap_mschapv2.c | 30 +- contrib/wpa/src/eap_peer/eap_peap.c | 40 +- contrib/wpa/src/eap_peer/eap_pwd.c | 33 +- contrib/wpa/src/eap_peer/eap_sim.c | 202 +- contrib/wpa/src/eap_peer/eap_teap.c | 61 +- contrib/wpa/src/eap_peer/eap_tls.c | 15 +- contrib/wpa/src/eap_peer/eap_tls_common.c | 27 +- contrib/wpa/src/eap_peer/eap_tls_common.h | 5 + contrib/wpa/src/eap_peer/eap_ttls.c | 32 +- contrib/wpa/src/eap_peer/eap_wsc.c | 14 +- contrib/wpa/src/eap_server/eap.h | 12 + contrib/wpa/src/eap_server/eap_i.h | 7 + contrib/wpa/src/eap_server/eap_server_aka.c | 126 +- contrib/wpa/src/eap_server/eap_server_eke.c | 1 + contrib/wpa/src/eap_server/eap_server_fast.c | 14 +- contrib/wpa/src/eap_server/eap_server_mschapv2.c | 28 +- contrib/wpa/src/eap_server/eap_server_peap.c | 18 + contrib/wpa/src/eap_server/eap_server_pwd.c | 33 +- contrib/wpa/src/eap_server/eap_server_sim.c | 133 +- contrib/wpa/src/eap_server/eap_server_teap.c | 39 +- contrib/wpa/src/eap_server/eap_server_tls.c | 10 +- contrib/wpa/src/eap_server/eap_server_tls_common.c | 18 +- contrib/wpa/src/eap_server/eap_server_ttls.c | 3 +- contrib/wpa/src/eap_server/eap_tls_common.h | 2 + contrib/wpa/src/eapol_auth/eapol_auth_sm.c | 26 +- contrib/wpa/src/eapol_auth/eapol_auth_sm.h | 5 +- contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h | 4 + contrib/wpa/src/eapol_supp/eapol_supp_sm.c | 17 +- contrib/wpa/src/eapol_supp/eapol_supp_sm.h | 18 +- contrib/wpa/src/fst/fst_group.c | 12 +- contrib/wpa/src/fst/fst_iface.c | 2 +- contrib/wpa/src/fst/fst_session.c | 6 +- contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 9 +- contrib/wpa/src/l2_packet/l2_packet_linux.c | 4 +- contrib/wpa/src/p2p/p2p.c | 123 +- contrib/wpa/src/p2p/p2p.h | 12 +- contrib/wpa/src/p2p/p2p_build.c | 20 +- contrib/wpa/src/p2p/p2p_dev_disc.c | 10 +- contrib/wpa/src/p2p/p2p_go_neg.c | 121 +- contrib/wpa/src/p2p/p2p_group.c | 14 +- contrib/wpa/src/p2p/p2p_i.h | 19 +- contrib/wpa/src/p2p/p2p_invitation.c | 31 +- contrib/wpa/src/p2p/p2p_parse.c | 27 +- contrib/wpa/src/p2p/p2p_pd.c | 43 +- contrib/wpa/src/p2p/p2p_sd.c | 23 +- contrib/wpa/src/p2p/p2p_utils.c | 84 +- contrib/wpa/src/pae/ieee802_1x_cp.c | 15 +- contrib/wpa/src/pae/ieee802_1x_kay.c | 74 +- contrib/wpa/src/pae/ieee802_1x_kay.h | 5 +- contrib/wpa/src/pae/ieee802_1x_secy_ops.c | 20 + contrib/wpa/src/pae/ieee802_1x_secy_ops.h | 1 + contrib/wpa/src/pasn/Makefile | 16 + contrib/wpa/src/pasn/pasn_common.c | 232 + contrib/wpa/src/pasn/pasn_common.h | 228 + contrib/wpa/src/pasn/pasn_initiator.c | 1406 +++++ contrib/wpa/src/pasn/pasn_responder.c | 1032 ++++ contrib/wpa/src/radius/radius.c | 297 +- contrib/wpa/src/radius/radius.h | 35 +- contrib/wpa/src/radius/radius_client.c | 789 ++- contrib/wpa/src/radius/radius_client.h | 27 +- contrib/wpa/src/radius/radius_das.c | 10 + contrib/wpa/src/radius/radius_server.c | 15 + contrib/wpa/src/rsn_supp/pmksa_cache.c | 260 +- contrib/wpa/src/rsn_supp/pmksa_cache.h | 105 +- contrib/wpa/src/rsn_supp/preauth.c | 19 +- contrib/wpa/src/rsn_supp/tdls.c | 332 +- contrib/wpa/src/rsn_supp/wpa.c | 2190 +++++-- contrib/wpa/src/rsn_supp/wpa.h | 88 +- contrib/wpa/src/rsn_supp/wpa_ft.c | 328 +- contrib/wpa/src/rsn_supp/wpa_i.h | 65 +- contrib/wpa/src/rsn_supp/wpa_ie.c | 36 +- contrib/wpa/src/tls/libtommath.c | 8 - contrib/wpa/src/tls/pkcs1.c | 6 +- contrib/wpa/src/tls/tlsv1_client_read.c | 3 +- contrib/wpa/src/tls/tlsv1_common.c | 6 +- contrib/wpa/src/tls/tlsv1_common.h | 3 +- contrib/wpa/src/tls/tlsv1_server_write.c | 2 +- contrib/wpa/src/utils/browser.c | 10 + contrib/wpa/src/utils/common.c | 15 +- contrib/wpa/src/utils/common.h | 38 + contrib/wpa/src/utils/crc32.c | 2 +- contrib/wpa/src/utils/crc32.h | 2 +- contrib/wpa/src/utils/http-utils.h | 1 + contrib/wpa/src/utils/http_curl.c | 73 +- contrib/wpa/src/utils/ip_addr.c | 19 + contrib/wpa/src/utils/ip_addr.h | 2 + contrib/wpa/src/utils/os.h | 42 +- contrib/wpa/src/utils/os_unix.c | 195 +- contrib/wpa/src/utils/trace.c | 6 +- contrib/wpa/src/utils/wpa_debug.c | 10 +- contrib/wpa/src/utils/wpa_debug.h | 1 + contrib/wpa/src/utils/wpabuf.h | 6 + contrib/wpa/src/wps/ndef.c | 6 + contrib/wpa/src/wps/wps.c | 5 +- contrib/wpa/src/wps/wps.h | 5 + contrib/wpa/src/wps/wps_attr_parse.c | 13 +- contrib/wpa/src/wps/wps_enrollee.c | 6 +- contrib/wpa/src/wps/wps_er.c | 4 +- contrib/wpa/src/wps/wps_i.h | 1 + contrib/wpa/src/wps/wps_registrar.c | 15 +- contrib/wpa/wpa_supplicant/Android.mk | 228 +- contrib/wpa/wpa_supplicant/ChangeLog | 50 + contrib/wpa/wpa_supplicant/Makefile | 308 +- contrib/wpa/wpa_supplicant/README | 4 +- contrib/wpa/wpa_supplicant/README-HS20 | 33 +- contrib/wpa/wpa_supplicant/README-NAN-USD | 147 + contrib/wpa/wpa_supplicant/README-WPS | 24 +- contrib/wpa/wpa_supplicant/android.config | 15 + contrib/wpa/wpa_supplicant/ap.c | 293 +- contrib/wpa/wpa_supplicant/ap.h | 24 +- contrib/wpa/wpa_supplicant/bgscan.h | 2 +- contrib/wpa/wpa_supplicant/bgscan_learn.c | 10 +- contrib/wpa/wpa_supplicant/bgscan_simple.c | 64 +- contrib/wpa/wpa_supplicant/bss.c | 563 +- contrib/wpa/wpa_supplicant/bss.h | 29 + contrib/wpa/wpa_supplicant/bssid_ignore.c | 30 +- contrib/wpa/wpa_supplicant/config.c | 487 +- contrib/wpa/wpa_supplicant/config.h | 150 +- contrib/wpa/wpa_supplicant/config_file.c | 108 +- contrib/wpa/wpa_supplicant/config_none.c | 3 +- contrib/wpa/wpa_supplicant/config_ssid.h | 114 +- contrib/wpa/wpa_supplicant/config_winreg.c | 5 +- contrib/wpa/wpa_supplicant/ctrl_iface.c | 1707 +++++- contrib/wpa/wpa_supplicant/ctrl_iface.h | 2 + contrib/wpa/wpa_supplicant/ctrl_iface_unix.c | 3 + .../wpa/wpa_supplicant/dbus/dbus_dict_helpers.c | 100 + .../wpa/wpa_supplicant/dbus/dbus_dict_helpers.h | 9 + contrib/wpa/wpa_supplicant/dbus/dbus_new.c | 142 +- contrib/wpa/wpa_supplicant/dbus/dbus_new.h | 24 + .../wpa/wpa_supplicant/dbus/dbus_new_handlers.c | 784 ++- .../wpa/wpa_supplicant/dbus/dbus_new_handlers.h | 7 + .../wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 94 +- contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c | 209 +- contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h | 5 + .../wpa/wpa_supplicant/dbus/dbus_new_introspect.c | 2 +- contrib/wpa/wpa_supplicant/defconfig | 53 + .../wpa_supplicant/doc/docbook/wpa_supplicant.sgml | 48 +- contrib/wpa/wpa_supplicant/dpp_supplicant.c | 2184 ++++++- contrib/wpa/wpa_supplicant/dpp_supplicant.h | 5 + contrib/wpa/wpa_supplicant/driver_i.h | 124 +- contrib/wpa/wpa_supplicant/eapol_test.c | 146 +- contrib/wpa/wpa_supplicant/events.c | 1741 +++++- contrib/wpa/wpa_supplicant/examples/dpp-nfc.py | 10 +- contrib/wpa/wpa_supplicant/gas_query.c | 56 +- contrib/wpa/wpa_supplicant/hs20_supplicant.c | 17 +- contrib/wpa/wpa_supplicant/ibss_rsn.c | 32 +- contrib/wpa/wpa_supplicant/ibss_rsn.h | 3 +- contrib/wpa/wpa_supplicant/interworking.c | 124 +- contrib/wpa/wpa_supplicant/main.c | 2 + contrib/wpa/wpa_supplicant/mbo.c | 25 +- contrib/wpa/wpa_supplicant/mesh.c | 16 +- contrib/wpa/wpa_supplicant/mesh_mpm.c | 74 +- contrib/wpa/wpa_supplicant/mesh_rsn.c | 27 +- contrib/wpa/wpa_supplicant/nan_usd.c | 513 ++ contrib/wpa/wpa_supplicant/nan_usd.h | 46 + contrib/wpa/wpa_supplicant/notify.c | 103 +- contrib/wpa/wpa_supplicant/notify.h | 14 +- contrib/wpa/wpa_supplicant/offchannel.c | 10 +- contrib/wpa/wpa_supplicant/op_classes.c | 150 +- contrib/wpa/wpa_supplicant/p2p_supplicant.c | 483 +- contrib/wpa/wpa_supplicant/p2p_supplicant.h | 13 +- contrib/wpa/wpa_supplicant/p2p_supplicant_sd.c | 14 +- contrib/wpa/wpa_supplicant/pasn_supplicant.c | 1712 ++---- contrib/wpa/wpa_supplicant/preauth_test.c | 8 +- contrib/wpa/wpa_supplicant/robust_av.c | 341 +- contrib/wpa/wpa_supplicant/rrm.c | 132 +- contrib/wpa/wpa_supplicant/scan.c | 774 ++- contrib/wpa/wpa_supplicant/scan.h | 30 +- contrib/wpa/wpa_supplicant/sme.c | 948 ++- contrib/wpa/wpa_supplicant/sme.h | 14 +- .../systemd/wpa_supplicant-nl80211.service.arg.in | 2 +- .../systemd/wpa_supplicant.service.arg.in | 2 +- contrib/wpa/wpa_supplicant/utils/log2pcap.py | 9 +- contrib/wpa/wpa_supplicant/wmm_ac.c | 6 +- contrib/wpa/wpa_supplicant/wnm_sta.c | 532 +- contrib/wpa/wpa_supplicant/wnm_sta.h | 30 +- contrib/wpa/wpa_supplicant/wpa_cli.c | 144 +- contrib/wpa/wpa_supplicant/wpa_passphrase.c | 25 +- contrib/wpa/wpa_supplicant/wpa_priv.c | 11 +- contrib/wpa/wpa_supplicant/wpa_supplicant.c | 1679 ++++-- contrib/wpa/wpa_supplicant/wpa_supplicant.conf | 109 +- contrib/wpa/wpa_supplicant/wpa_supplicant_i.h | 286 +- .../wpa_supplicant/wpa_supplicant_template.conf | 2 + contrib/wpa/wpa_supplicant/wpas_glue.c | 159 +- contrib/wpa/wpa_supplicant/wpas_glue.h | 2 + contrib/wpa/wpa_supplicant/wpas_kay.c | 53 +- contrib/wpa/wpa_supplicant/wpas_module_tests.c | 3 + contrib/wpa/wpa_supplicant/wps_supplicant.c | 166 +- contrib/wpa/wpa_supplicant/wps_supplicant.h | 13 + share/mk/src.libnames.mk | 4 + usr.sbin/wpa/Makefile.inc | 1 - usr.sbin/wpa/hostapd/Makefile | 3 +- usr.sbin/wpa/src/Makefile | 1 + usr.sbin/wpa/src/pasn/Makefile | 20 + usr.sbin/wpa/wpa_supplicant/Makefile | 2 +- 366 files changed, 66259 insertions(+), 12716 deletions(-) diff --git a/contrib/wpa/CONTRIBUTIONS b/contrib/wpa/CONTRIBUTIONS index b2064dc83443..6c8187cb190d 100644 --- a/contrib/wpa/CONTRIBUTIONS +++ b/contrib/wpa/CONTRIBUTIONS @@ -37,7 +37,7 @@ without moderation. You can subscribe to the list at this address: http://lists.infradead.org/mailman/listinfo/hostap The message should contain an inlined patch against the current -development branch (i.e., the master branch of +development branch (i.e., the main branch of git://w1.fi/hostap.git). Please make sure the software you use for sending the patch does not corrupt whitespace. If that cannot be fixed for some reason, it is better to include an attached version of the diff --git a/contrib/wpa/README b/contrib/wpa/README index 1470c4f23582..8392bb354fac 100644 --- a/contrib/wpa/README +++ b/contrib/wpa/README @@ -1,7 +1,7 @@ wpa_supplicant and hostapd -------------------------- -Copyright (c) 2002-2022, Jouni Malinen and contributors +Copyright (c) 2002-2024, Jouni Malinen and contributors All Rights Reserved. These programs are licensed under the BSD license (the one with diff --git a/contrib/wpa/hostapd/Android.mk b/contrib/wpa/hostapd/Android.mk index bf26e41c6b23..573564d5b0de 100644 --- a/contrib/wpa/hostapd/Android.mk +++ b/contrib/wpa/hostapd/Android.mk @@ -154,6 +154,7 @@ OBJS += src/utils/crc32.c OBJS += src/common/ieee802_11_common.c OBJS += src/common/wpa_common.c OBJS += src/common/hw_features_common.c +OBJS += src/common/ptksa_cache.c OBJS += src/eapol_auth/eapol_auth_sm.c @@ -237,6 +238,8 @@ L_CFLAGS += -DCONFIG_OCV OBJS += src/common/ocv.c endif +NEED_AES_UNWRAP=y + ifdef CONFIG_IEEE80211R L_CFLAGS += -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP OBJS += src/ap/wpa_auth_ft.c @@ -256,6 +259,7 @@ L_CFLAGS += -DCONFIG_SAE OBJS += src/common/sae.c ifdef CONFIG_SAE_PK L_CFLAGS += -DCONFIG_SAE_PK +NEED_AES_SIV=y OBJS += src/common/sae_pk.c endif NEED_ECC=y @@ -294,6 +298,12 @@ ifdef CONFIG_IEEE80211AC L_CFLAGS += -DCONFIG_IEEE80211AC endif +ifdef CONFIG_IEEE80211BE +CONFIG_IEEE80211AX=y +L_CFLAGS += -DCONFIG_IEEE80211BE +OBJS += src/ap/ieee802_11_eht.c +endif + ifdef CONFIG_IEEE80211AX L_CFLAGS += -DCONFIG_IEEE80211AX endif @@ -572,6 +582,12 @@ L_CFLAGS += -DCONFIG_DPP3 endif endif +ifdef CONFIG_NAN_USD +OBJS += src/common/nan_de.c +OBJS += src/ap/nan_usd_ap.c +L_CFLAGS += -DCONFIG_NAN_USD +endif + ifdef CONFIG_PASN L_CFLAGS += -DCONFIG_PASN L_CFLAGS += -DCONFIG_PTKSA_CACHE @@ -579,7 +595,6 @@ NEED_HMAC_SHA256_KDF=y NEED_HMAC_SHA384_KDF=y NEED_SHA256=y NEED_SHA384=y -OBJS += src/common/ptksa_cache.c endif ifdef CONFIG_EAP_IKEV2 @@ -632,6 +647,11 @@ ifdef CHAP OBJS += src/eap_common/chap.c endif +ifdef CONFIG_RADIUS_TLS +TLS_FUNCS=y +L_CFLAGS += -DCONFIG_RADIUS_TLS +endif + ifdef TLS_FUNCS NEED_DES=y # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) @@ -653,6 +673,7 @@ L_CFLAGS += -DCONFIG_TLSV12 endif ifeq ($(CONFIG_TLS), openssl) +L_CFLAGS += -DCRYPTO_RSA_OAEP_SHA256 ifdef TLS_FUNCS OBJS += src/crypto/tls_openssl.c OBJS += src/crypto/tls_openssl_ocsp.c @@ -825,7 +846,9 @@ endif ifdef NEED_AES_ENCBLOCK AESOBJS += src/crypto/aes-encblock.c endif +ifneq ($(CONFIG_TLS), openssl) AESOBJS += src/crypto/aes-omac1.c +endif ifdef NEED_AES_UNWRAP ifneq ($(CONFIG_TLS), openssl) NEED_AES_DEC=y @@ -1026,6 +1049,9 @@ endif ifdef NEED_AP_MLME OBJS += src/ap/wmm.c OBJS += src/ap/ap_list.c +OBJS += src/ap/comeback_token.c +OBJS += src/pasn/pasn_responder.c +OBJS += src/pasn/pasn_common.c OBJS += src/ap/ieee802_11.c OBJS += src/ap/hw_features.c OBJS += src/ap/dfs.c diff --git a/contrib/wpa/hostapd/ChangeLog b/contrib/wpa/hostapd/ChangeLog index 279298e4d4d4..1c8240d333c4 100644 --- a/contrib/wpa/hostapd/ChangeLog +++ b/contrib/wpa/hostapd/ChangeLog @@ -1,5 +1,42 @@ ChangeLog for hostapd +2024-07-20 - v2.11 + * Wi-Fi Easy Connect + - add support for DPP release 3 + - allow Configurator parameters to be provided during config exchange + * HE/IEEE 802.11ax/Wi-Fi 6 + - various fixes + * EHT/IEEE 802.11be/Wi-Fi 7 + - add preliminary support + * SAE: add support for fetching the password from a RADIUS server + * support OpenSSL 3.0 API changes + * support background radar detection and CAC with some additional + drivers + * support RADIUS ACL/PSK check during 4-way handshake (wpa_psk_radius=3) + * EAP-SIM/AKA: support IMSI privacy + * improve 4-way handshake operations + - use Secure=1 in message 3 during PTK rekeying + * OCV: do not check Frequency Segment 1 Channel Number for 160 MHz cases + to avoid interoperability issues + * support new SAE AKM suites with variable length keys + * support new AKM for 802.1X/EAP with SHA384 + * extend PASN support for secure ranging + * FT: Use SHA256 to derive PMKID for AKM 00-0F-AC:3 (FT-EAP) + - this is based on additional details being added in the IEEE 802.11 + standard + - the new implementation is not backwards compatible + * improved ACS to cover additional channel types/bandwidths + * extended Multiple BSSID support + * fix beacon protection with FT protocol (incorrect BIGTK was provided) + * support unsynchronized service discovery (USD) + * add preliminary support for RADIUS/TLS + * add support for explicit SSID protection in 4-way handshake + (a mitigation for CVE-2023-52424; disabled by default for now, can be + enabled with ssid_protection=1) + * fix SAE H2E rejected groups validation to avoid downgrade attacks + * use stricter validation for some RADIUS messages + * a large number of other fixes, cleanup, and extensions + 2022-01-16 - v2.10 * SAE changes - improved protection against side channel attacks diff --git a/contrib/wpa/hostapd/Makefile b/contrib/wpa/hostapd/Makefile index e37c13b27a6e..ca4439234a11 100644 --- a/contrib/wpa/hostapd/Makefile +++ b/contrib/wpa/hostapd/Makefile @@ -84,6 +84,7 @@ OBJS += ../src/ap/beacon.o OBJS += ../src/ap/bss_load.o OBJS += ../src/ap/neighbor_db.o OBJS += ../src/ap/rrm.o +OBJS += ../src/common/ptksa_cache.o OBJS_c = hostapd_cli.o OBJS_c += ../src/common/wpa_ctrl.o @@ -167,7 +168,7 @@ OBJS += ../src/eapol_auth/eapol_auth_sm.o ifdef CONFIG_CODE_COVERAGE -CFLAGS += -O0 -fprofile-arcs -ftest-coverage +CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE LIBS += -lgcov LIBS_c += -lgcov LIBS_h += -lgcov @@ -276,6 +277,8 @@ CFLAGS += -DCONFIG_OCV OBJS += ../src/common/ocv.o endif +NEED_AES_UNWRAP=y + ifdef CONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP OBJS += ../src/ap/wpa_auth_ft.o @@ -295,6 +298,7 @@ CFLAGS += -DCONFIG_SAE OBJS += ../src/common/sae.o ifdef CONFIG_SAE_PK CFLAGS += -DCONFIG_SAE_PK +NEED_AES_SIV=y OBJS += ../src/common/sae_pk.o endif NEED_ECC=y @@ -339,6 +343,12 @@ ifdef CONFIG_IEEE80211AC CFLAGS += -DCONFIG_IEEE80211AC endif +ifdef CONFIG_IEEE80211BE +CONFIG_IEEE80211AX=y +CFLAGS += -DCONFIG_IEEE80211BE +OBJS += ../src/ap/ieee802_11_eht.o +endif + ifdef CONFIG_IEEE80211AX CFLAGS += -DCONFIG_IEEE80211AX OBJS += ../src/ap/ieee802_11_he.o @@ -598,6 +608,12 @@ CFLAGS += -DCONFIG_DPP3 endif endif +ifdef CONFIG_NAN_USD +OBJS += ../src/common/nan_de.o +OBJS += ../src/ap/nan_usd_ap.o +CFLAGS += -DCONFIG_NAN_USD +endif + ifdef CONFIG_PASN CFLAGS += -DCONFIG_PASN CFLAGS += -DCONFIG_PTKSA_CACHE @@ -605,7 +621,6 @@ NEED_HMAC_SHA256_KDF=y NEED_HMAC_SHA384_KDF=y NEED_SHA256=y NEED_SHA384=y -OBJS += ../src/common/ptksa_cache.o endif ifdef CONFIG_EAP_IKEV2 @@ -667,6 +682,11 @@ ifdef CHAP OBJS += ../src/eap_common/chap.o endif +ifdef CONFIG_RADIUS_TLS +TLS_FUNCS=y +CFLAGS += -DCONFIG_RADIUS_TLS +endif + ifdef TLS_FUNCS NEED_DES=y # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) @@ -708,6 +728,7 @@ endif endif ifeq ($(CONFIG_TLS), openssl) +CFLAGS += -DCRYPTO_RSA_OAEP_SHA256 CONFIG_CRYPTO=openssl ifdef TLS_FUNCS OBJS += ../src/crypto/tls_openssl.o @@ -932,11 +953,13 @@ endif ifdef NEED_AES_ENCBLOCK AESOBJS += ../src/crypto/aes-encblock.o endif +ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) ifneq ($(CONFIG_TLS), wolfssl) AESOBJS += ../src/crypto/aes-omac1.o endif endif +endif ifdef NEED_AES_UNWRAP ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) @@ -1172,6 +1195,9 @@ endif ifdef NEED_AP_MLME OBJS += ../src/ap/wmm.o OBJS += ../src/ap/ap_list.o +OBJS += ../src/ap/comeback_token.o +OBJS += ../src/pasn/pasn_responder.o +OBJS += ../src/pasn/pasn_common.o OBJS += ../src/ap/ieee802_11.o OBJS += ../src/ap/hw_features.o OBJS += ../src/ap/dfs.o diff --git a/contrib/wpa/hostapd/README b/contrib/wpa/hostapd/README index 739c964d44d8..1a0248fce422 100644 --- a/contrib/wpa/hostapd/README +++ b/contrib/wpa/hostapd/README @@ -2,7 +2,7 @@ hostapd - user space IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2022, Jouni Malinen and contributors +Copyright (c) 2002-2024, Jouni Malinen and contributors All Rights Reserved. This program is licensed under the BSD license (the one with diff --git a/contrib/wpa/hostapd/android.config b/contrib/wpa/hostapd/android.config index c8b3afabef8d..522de87266d5 100644 --- a/contrib/wpa/hostapd/android.config +++ b/contrib/wpa/hostapd/android.config @@ -121,6 +121,9 @@ CONFIG_PKCS12=y # Build IPv6 support for RADIUS operations CONFIG_IPV6=y +# Include support fo RADIUS/TLS into the RADIUS client +#CONFIG_RADIUS_TLS=y + # IEEE Std 802.11r-2008 (Fast BSS Transition) #CONFIG_IEEE80211R=y @@ -212,3 +215,6 @@ CONFIG_NO_RANDOM_POOL=y # release under this optional build parameter. This functionality is subject to # be completely removed in a future release. CONFIG_WEP=y + +# Wi-Fi Aware unsynchronized service discovery (NAN USD) +#CONFIG_NAN_USD=y diff --git a/contrib/wpa/hostapd/config_file.c b/contrib/wpa/hostapd/config_file.c index b14728d1b507..3fb059770d49 100644 --- a/contrib/wpa/hostapd/config_file.c +++ b/contrib/wpa/hostapd/config_file.c @@ -1,6 +1,6 @@ /* * hostapd / Configuration file parser - * Copyright (c) 2003-2018, Jouni Malinen + * Copyright (c) 2003-2024, Jouni Malinen * * This software may be distributed under the terms of the BSD license. * See README for more details. @@ -118,52 +118,6 @@ static int hostapd_config_read_vlan_file(struct hostapd_bss_config *bss, #endif /* CONFIG_NO_VLAN */ -int hostapd_acl_comp(const void *a, const void *b) -{ - const struct mac_acl_entry *aa = a; - const struct mac_acl_entry *bb = b; - return os_memcmp(aa->addr, bb->addr, sizeof(macaddr)); -} - - -int hostapd_add_acl_maclist(struct mac_acl_entry **acl, int *num, - int vlan_id, const u8 *addr) -{ - struct mac_acl_entry *newacl; - - newacl = os_realloc_array(*acl, *num + 1, sizeof(**acl)); - if (!newacl) { - wpa_printf(MSG_ERROR, "MAC list reallocation failed"); - return -1; - } - - *acl = newacl; - os_memcpy((*acl)[*num].addr, addr, ETH_ALEN); - os_memset(&(*acl)[*num].vlan_id, 0, sizeof((*acl)[*num].vlan_id)); - (*acl)[*num].vlan_id.untagged = vlan_id; - (*acl)[*num].vlan_id.notempty = !!vlan_id; - (*num)++; - - return 0; -} - - -void hostapd_remove_acl_mac(struct mac_acl_entry **acl, int *num, - const u8 *addr) -{ - int i = 0; - - while (i < *num) { - if (os_memcmp((*acl)[i].addr, addr, ETH_ALEN) == 0) { - os_remove_in_array(*acl, *num, sizeof(**acl), i); - (*num)--; - } else { - i++; - } - } -} - - static int hostapd_config_read_maclist(const char *fname, struct mac_acl_entry **acl, int *num) { @@ -713,6 +667,10 @@ static int hostapd_config_parse_key_mgmt(int line, const char *value) val |= WPA_KEY_MGMT_FT_IEEE8021X_SHA384; #endif /* CONFIG_SHA384 */ #endif /* CONFIG_IEEE80211R_AP */ +#ifdef CONFIG_SHA384 + else if (os_strcmp(start, "WPA-EAP-SHA384") == 0) + val |= WPA_KEY_MGMT_IEEE8021X_SHA384; +#endif /* CONFIG_SHA384 */ else if (os_strcmp(start, "WPA-PSK-SHA256") == 0) val |= WPA_KEY_MGMT_PSK_SHA256; else if (os_strcmp(start, "WPA-EAP-SHA256") == 0) @@ -720,8 +678,12 @@ static int hostapd_config_parse_key_mgmt(int line, const char *value) #ifdef CONFIG_SAE else if (os_strcmp(start, "SAE") == 0) val |= WPA_KEY_MGMT_SAE; + else if (os_strcmp(start, "SAE-EXT-KEY") == 0) + val |= WPA_KEY_MGMT_SAE_EXT_KEY; else if (os_strcmp(start, "FT-SAE") == 0) val |= WPA_KEY_MGMT_FT_SAE; + else if (os_strcmp(start, "FT-SAE-EXT-KEY") == 0) + val |= WPA_KEY_MGMT_FT_SAE_EXT_KEY; #endif /* CONFIG_SAE */ #ifdef CONFIG_SUITEB else if (os_strcmp(start, "WPA-EAP-SUITE-B") == 0) @@ -1058,6 +1020,78 @@ static int add_r1kh(struct hostapd_bss_config *bss, char *value) return 0; } + + +int hostapd_config_read_rxkh_file(struct hostapd_bss_config *conf, + const char *fname) +{ + FILE *f; + char buf[256], *pos; + int line = 0, errors = 0; + + if (!fname) + return 0; + + f = fopen(fname, "r"); + if (!f) { + wpa_printf(MSG_ERROR, "rxkh file '%s' not found.", fname); + return -1; + } + + while (fgets(buf, sizeof(buf), f)) { + line++; + + if (buf[0] == '#') + continue; + pos = buf; + while (*pos != '\0') { + if (*pos == '\n') { + *pos = '\0'; + break; + } + pos++; + } + if (buf[0] == '\0') + continue; + + pos = os_strchr(buf, '='); + if (!pos) { + wpa_printf(MSG_ERROR, "Line %d: Invalid line '%s'", + line, buf); + errors++; + continue; + } + *pos = '\0'; + pos++; + + if (os_strcmp(buf, "r0kh") == 0) { + if (add_r0kh(conf, pos) < 0) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid r0kh '%s'", + line, pos); + errors++; + } + } else if (os_strcmp(buf, "r1kh") == 0) { + if (add_r1kh(conf, pos) < 0) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid r1kh '%s'", + line, pos); + errors++; + } + } + } + + fclose(f); + + if (errors) { + wpa_printf(MSG_ERROR, + "%d errors in configuring RxKHs from '%s'", + errors, fname); + return -1; + } + return 0; +} + #endif /* CONFIG_IEEE80211R_AP */ @@ -1644,6 +1678,8 @@ static int parse_anqp_elem(struct hostapd_bss_config *bss, char *buf, int line) return 0; } +#endif /* CONFIG_INTERWORKING */ + static int parse_qos_map_set(struct hostapd_bss_config *bss, char *buf, int line) @@ -1685,8 +1721,6 @@ static int parse_qos_map_set(struct hostapd_bss_config *bss, return 0; } -#endif /* CONFIG_INTERWORKING */ - #ifdef CONFIG_HS20 static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf, @@ -2197,6 +2231,7 @@ static int add_airtime_weight(struct hostapd_bss_config *bss, char *value) *** 122364 LINES SKIPPED *** From nobody Tue Oct 1 04:30:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlNX2xkkz5YBHY; Tue, 01 Oct 2024 04:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlNX1qS7z4Mkg; Tue, 1 Oct 2024 04:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727757020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPYdJibu4ldnsndAsI5Oig5qImVdtV9G1J4UUwhRsXY=; b=F4bO9tsc1hPXz8reA4gB4q6cmjulNeVrT7a08tGXyJuOqy95Gt6N2v58/GzwMLgCAElZY2 JB1fDy5q7TxinCW32ETqMIqbI41fnS4LhjVGW160+AMnnjsfOSsLFqKP0RWh85hfmtvWxI qSgEfCaWZa4+Bd56bsJ+n2hxJl2m66VRUyU2tTmBvZYQOm+r7faV2HGuM1IesJrfewiJ/J H8oFpdWKgnNyeapXpioTN8yxDm+OyP3U48kfiVg3gTqHxC8LFO7DjIuCynrpOBSjyF0Smt 0FdQNeaW2coKehDbJ0woyHRu3tKvGJPgPHA6QW4+ogzNZMVpu6Yc52FFwUG1wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727757020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPYdJibu4ldnsndAsI5Oig5qImVdtV9G1J4UUwhRsXY=; b=oIbLepIORGQK/Q02MPNHN7rSiPH+DbBuLFaUrkFn9xh3kZupdWNrfkgqGuB1z7GISODMr9 Q6LHfirZp7AyxKt25QFdMt5Vagm4zxeuyNUYm4GBWRGZnol7n+M4n63qcEi351SFqfzCFI Txc7/B0Dhf5BLj10RI7FZxf9WeUXFDX82Oi6fps1bJz/B44qPoCkhefyGaTT1sSHWr+f9h +uGjQneyKijHQQ01ZNWyAb+dKXGxaFhYFGevBdoNg5LKu4fMiideAxZBU40TDa/gPqWd/A ouOixUoS2iMv8vQDM+czAD1nrBRCGnksn6P5rXeWbwf7RkJzG1HGRE1nrIcYng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727757020; a=rsa-sha256; cv=none; b=JbwVraBZazN5I0IjmMJYBFdb2dlIRCiVQB0Y1SjjCWvxo9xKhlXWbWlevXtgzw5W0yI+Ik e8TqqAUxADbhO76n2/ui0qvkEHPtQ+NcdKDYwCqfARJ8x02S3OCEoSbz6IbqSjqspj7dH6 YW/ahlnD/ofRs3UVWAZ2t6XIqVlCiRr8iKr+SAjztpyM4JeRvGCn+QpFWBf9ILpT55t92i vN2+aSTiRrtfIN1z1LGmkCL9//uZ/vRbbAhfTZHiJK9C3rhquMlpnBHwlxzwHyu6AWE7kz d1OcBbBDQXmPtu14jQQNRpXyxcJMx0A7ActWY+G517AFQ3NCnfOPW0VYO0zV3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlNX1Qv9zNMw; Tue, 1 Oct 2024 04:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914UKdI048138; Tue, 1 Oct 2024 04:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914UKBM048135; Tue, 1 Oct 2024 04:30:20 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:30:20 GMT Message-Id: <202410010430.4914UKBM048135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b4e224360e92 - stable/13 - wpa: Fix gcc build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4e224360e92f8ddd63360c0017273ccdac6324b Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e224360e92f8ddd63360c0017273ccdac6324b commit b4e224360e92f8ddd63360c0017273ccdac6324b Author: Cy Schubert AuthorDate: 2024-07-24 15:04:33 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 04:29:48 +0000 wpa: Fix gcc build Order of libraries still matters with GCC toolchains. Moving the wpapasn library before the wpacommon specification resolves the link problem. This issue was not detected by make universe. Fixes: a90b9d015907 (cherry picked from commit 8880825df1f805fc02dbb8476df8183d4ec3781c) --- usr.sbin/wpa/wpa_supplicant/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index a107157fbf73..3cb1d1c18689 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -52,7 +52,7 @@ CFLAGS+=-DCONFIG_BACKEND_FILE LIBADD+=pcap util wpadrivers wpaeapol_supp \ wpaeap_server \ wpaeap_peer wpaeap_common wpal2_packet wparsn_supp wpatls wpawps \ - wpacommon wpacrypto wpautils wpapasn + wpapasn wpacommon wpacrypto wpautils # User customizations to the wpa_supplicant build environment CFLAGS+=${WPA_SUPPLICANT_CFLAGS} From nobody Tue Oct 1 04:30:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHlNY6p2Qz5YBFS; Tue, 01 Oct 2024 04:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHlNY4349z4MnH; Tue, 1 Oct 2024 04:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727757021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6vJ8w2Qnt7dZ5YR4d02rQ14RqjAhfwkDCFA1ZIYrBs=; b=oRR1FcyH5Pf7iuSTU+VxTILUC8NyuDPQnzG6Fh76wjl4ab1k9R3tDKehiEnVXsriYGErdm DVM3dOBqJJedBXOQQHHL7XuDMijGl5GJHSerXOmPIMskL6qcKNFon+0iNqZa/AB4O5Ft7R OxAcogFgqBSN9imvcfzbwcLP3NQRLQjVrux5UcONnJhXvr9VkcL0JXxBt9YeSnrVMZ1CKt 6YfFy844p6DeFInx/NyHg8ntGdWfopKGVdjkCSvtruFURJFeiQwuVPFpPF3iUZ7Zz36QHA PDxsPa3y6Tt4bD9wfw2kba3FPJcDEraSzXr0gY1v/Ty/GbP52umgoI6BY+s8SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727757021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6vJ8w2Qnt7dZ5YR4d02rQ14RqjAhfwkDCFA1ZIYrBs=; b=er1EnW9hxGhmgEBrIWm7N8BS7FTCQWqVRu6XMofXKSxAhjqxXPfuwt1u8cEyickg0VL5mk pIQh5q9pFK6yJavqnBMaJ7+fwJ19sNu6SN83JeQ2wdgdXwKpTkWlmA3QLskF3QWgGv1YDM 3AWfiJpTkBf6/DJM93qK7jmynLOcV6FSxKvml+IG3Xnnff3d+c2RbUI/rdJYAC1eZ4aoyH LKvuxyYsSRADcLjVlH/yocPy8IcHlbVD02fMeKsVHi970JeC4imAv0dwuS8kwE3bC8dd7H t+4i+BLsmELsTd0isaU7psaRyqbzNVosWI3acoBP3jq8lp3BZpqeKG625HuFZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727757021; a=rsa-sha256; cv=none; b=s5WroMubC1J+z4wXE2C931rLvVbpk5JNu/dQaTbRIn77M2CCHGCkkjqlZ+cbl6mVPPwN1Q Th0YVrwWFCv2Yvrvf1m+BE+ZfBFFpIyGjg51767lSd9pdfyqcGu9AkKQSM8Mr2Z34fX1LM VC4c4nAyOkcmvag043gCL+w9BrRpSek48W3PRvorhNZRev5SJvtutBbrW9iUrpTFZEyWPU B9AgPpLHcYWKSFtT6LN/fOVuvhubNoKWQzT/gDiqPUznQi5ZcNNNgPMCvQfK0RJAioEQZq 4QpAldwtv8Ltnp+orl5FBfMYuwcTUfmK5Li9AvHVIkZnwAw1hSnuue/Pg2/Z1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHlNY2pVMzNMx; Tue, 1 Oct 2024 04:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4914ULMM048183; Tue, 1 Oct 2024 04:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4914UL85048180; Tue, 1 Oct 2024 04:30:21 GMT (envelope-from git) Date: Tue, 1 Oct 2024 04:30:21 GMT Message-Id: <202410010430.4914UL85048180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 33ad485f47a5 - stable/13 - ntp: Improve descriptions in man pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 33ad485f47a51057bf5af9e45f4f32fc610f469e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=33ad485f47a51057bf5af9e45f4f32fc610f469e commit 33ad485f47a51057bf5af9e45f4f32fc610f469e Author: Alexander Ziaee AuthorDate: 2024-08-05 19:37:42 +0000 Commit: Cy Schubert CommitDate: 2024-10-01 04:29:48 +0000 ntp: Improve descriptions in man pages + ntpd added to ntp.conf(5) description (search keywords) + expand NTP so these pages are shown when `apropos time` + "standard" => "reference" for increased consistency - removed redundant or duplicated search keywords ntp.org bug: https://bugs.ntp.org/show_bug.cgi?id=3936 Reviewed by: Harlan Stenn Reviewed by: Cy Schubert (cherry picked from commit c7a33fe37d7688cb21c743f68256680e003210ad) --- contrib/ntp/ntpd/ntp.conf.def | 2 +- contrib/ntp/ntpd/ntp.keys.def | 2 +- contrib/ntp/ntpd/ntpd-opts.def | 2 +- contrib/ntp/ntpq/ntpq-opts.def | 2 +- contrib/ntp/sntp/sntp-opts.def | 2 +- contrib/ntp/util/ntp-keygen-opts.def | 2 +- usr.sbin/ntp/doc/ntp-keygen.8 | 2 +- usr.sbin/ntp/doc/ntp.conf.5 | 2 +- usr.sbin/ntp/doc/ntp.keys.5 | 2 +- usr.sbin/ntp/doc/ntpd.8 | 2 +- usr.sbin/ntp/doc/ntpq.8 | 2 +- usr.sbin/ntp/doc/sntp.8 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/ntp/ntpd/ntp.conf.def b/contrib/ntp/ntpd/ntp.conf.def index 444e3b35e351..aba3c25ab464 100644 --- a/contrib/ntp/ntpd/ntp.conf.def +++ b/contrib/ntp/ntpd/ntp.conf.def @@ -9,7 +9,7 @@ autogen definitions options; // file name. prog-name = "ntp.conf"; file-path = "/etc/ntp.conf"; -prog-title = "Network Time Protocol (NTP) daemon configuration file format"; +prog-title = "Network Time Protocol daemon (ntpd) configuration format"; /* explain: Additional information whenever the usage routine is invoked */ explain = <<- _END_EXPLAIN diff --git a/contrib/ntp/ntpd/ntp.keys.def b/contrib/ntp/ntpd/ntp.keys.def index e73ce4d06a1b..b0c9717e5906 100644 --- a/contrib/ntp/ntpd/ntp.keys.def +++ b/contrib/ntp/ntpd/ntp.keys.def @@ -10,7 +10,7 @@ autogen definitions options; // file name. prog-name = "ntp.keys"; file-path = "/etc/ntp.keys"; -prog-title = "NTP symmetric key file format"; +prog-title = "Network Time Protocol symmetric key format"; /* explain: Additional information whenever the usage routine is invoked */ explain = <<- _END_EXPLAIN diff --git a/contrib/ntp/ntpd/ntpd-opts.def b/contrib/ntp/ntpd/ntpd-opts.def index 00d35115dc43..6d4952a637c2 100644 --- a/contrib/ntp/ntpd/ntpd-opts.def +++ b/contrib/ntp/ntpd/ntpd-opts.def @@ -5,7 +5,7 @@ autogen definitions options; #include copyright.def prog-name = "ntpd"; -prog-title = "NTP daemon program"; +prog-title = "set clock via Network Time Protocol daemon"; argument = "[ ... ]"; #include ntpdbase-opts.def diff --git a/contrib/ntp/ntpq/ntpq-opts.def b/contrib/ntp/ntpq/ntpq-opts.def index 85655a9d66cc..1189e81efe40 100644 --- a/contrib/ntp/ntpq/ntpq-opts.def +++ b/contrib/ntp/ntpq/ntpq-opts.def @@ -7,7 +7,7 @@ autogen definitions options; #include autogen-version.def prog-name = "ntpq"; -prog-title = "standard NTP query program"; +prog-title = "query Network Time Protocol servers"; argument = '[ host ...]'; flag = { diff --git a/contrib/ntp/sntp/sntp-opts.def b/contrib/ntp/sntp/sntp-opts.def index 7664b1bf08b9..d468b6ef8bf5 100644 --- a/contrib/ntp/sntp/sntp-opts.def +++ b/contrib/ntp/sntp/sntp-opts.def @@ -6,7 +6,7 @@ autogen definitions options; #include copyright.def prog-name = "sntp"; -prog-title = "standard Simple Network Time Protocol client program"; +prog-title = "reference Simple Network Time Protocol client"; argument = '[ hostname-or-IP ...]'; #include homerc.def diff --git a/contrib/ntp/util/ntp-keygen-opts.def b/contrib/ntp/util/ntp-keygen-opts.def index 632dbbec778d..5c06bded15fd 100644 --- a/contrib/ntp/util/ntp-keygen-opts.def +++ b/contrib/ntp/util/ntp-keygen-opts.def @@ -7,7 +7,7 @@ autogen definitions options; #include autogen-version.def prog-name = "ntp-keygen"; -prog-title = "Create a NTP host key"; +prog-title = "create a Network Time Protocol host key"; package = ntp; include = '#include '; diff --git a/usr.sbin/ntp/doc/ntp-keygen.8 b/usr.sbin/ntp/doc/ntp-keygen.8 index ad7b844d27de..3e8ffd9dbf58 100644 --- a/usr.sbin/ntp/doc/ntp-keygen.8 +++ b/usr.sbin/ntp/doc/ntp-keygen.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntp-keygen -.Nd Create a NTP host key +.Nd create a Network Time Protocol host key .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5 index 9e23a2294c48..71fb7c668db2 100644 --- a/usr.sbin/ntp/doc/ntp.conf.5 +++ b/usr.sbin/ntp/doc/ntp.conf.5 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntp.conf -.Nd Network Time Protocol (NTP) daemon configuration file format +.Nd Network Time Protocol daemon (ntpd) configuration format .Sh SYNOPSIS .Nm .Op Fl \-option\-name diff --git a/usr.sbin/ntp/doc/ntp.keys.5 b/usr.sbin/ntp/doc/ntp.keys.5 index d235f3b5f7dd..6bec2880163e 100644 --- a/usr.sbin/ntp/doc/ntp.keys.5 +++ b/usr.sbin/ntp/doc/ntp.keys.5 @@ -12,7 +12,7 @@ .Sh NAME .Nm ntp.keys -.Nd NTP symmetric key file format +.Nd Network Time Protocol symmetric key format .Sh SYNOPSIS .Nm .Op Fl \-option\-name diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8 index 74bc07793048..83beac3632a9 100644 --- a/usr.sbin/ntp/doc/ntpd.8 +++ b/usr.sbin/ntp/doc/ntpd.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntpd -.Nd NTP daemon program +.Nd set clock via Network Time Protocol daemon .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8 index e6c66ed71d97..21f15926a0ab 100644 --- a/usr.sbin/ntp/doc/ntpq.8 +++ b/usr.sbin/ntp/doc/ntpq.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm ntpq -.Nd standard NTP query program +.Nd query Network Time Protocol servers .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options diff --git a/usr.sbin/ntp/doc/sntp.8 b/usr.sbin/ntp/doc/sntp.8 index 94c3c2816035..4509b6efa222 100644 --- a/usr.sbin/ntp/doc/sntp.8 +++ b/usr.sbin/ntp/doc/sntp.8 @@ -8,7 +8,7 @@ .\" and the template file agmdoc-cmd.tpl .Sh NAME .Nm sntp -.Nd standard Simple Network Time Protocol client program +.Nd reference Simple Network Time Protocol client .Sh SYNOPSIS .Nm .\" Mixture of short (flag) options and long options From nobody Tue Oct 1 10:12:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHtz012DCz5XcX7; Tue, 01 Oct 2024 10:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHtz00g7yz4sDH; Tue, 1 Oct 2024 10:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727777532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEx/5w50IG2UP2qWYKXZwjdubzJVlzrTGXN2eqICY9g=; b=t/jkh0/9rWkFj5+OeCAHjfuY/fdF5NWLH602S3x76JW68i+0dWTEJdnl8HQs3JBaWREQZO sT/RfhiKmhljqiFj4RGbLxsxz4MKiQ6o0i1ZuDJyR1/wdYFW2b9R5F81srKkWh3t1329KX 7tza4RqqxpFsH1jh+RlhrkplUMMZ5d+2orLKA5SjdSAI5clfga9MPnIGoYRAK80Q0qBUok ol0946T9XmmVq0XH1sTc614RaAmnsx8RFsl7LpL4qrzyWYc625UZy182SzWQyL9hISoPfp UkepnWCgk3jfk3joHRq6yAG7RA+shkdS5HHs1uIUi4rKvuxF8IdJe00uYaitYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727777532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEx/5w50IG2UP2qWYKXZwjdubzJVlzrTGXN2eqICY9g=; b=FcNWlB855Xr5mo07JwKJi22PqQWQ20yFUkifRYIw66iIBCyCALThEoCcJ16AM/iLooBlf8 VamHnvgw4ezSAYMcYkkZgqexe52tE4KieZkpcYeNDLssuWNnmIADdpn0dZWd9+gMEkxKML Xf1HqlxLv3BHRpX5nrVSskh2InrcdsRb6XkqdIvc7ZLPyAyJJtNe5SXol60G2q96yt7pnS KWlvRgSKVnGfd+ZlMIaqni1MkAhFshqw9QJFoF/QlDf14AIurzZwqW56zL9xy1VtjXRR2f k361twO1cbzp0KkB/l0eydQT8BF4J31ekRl2l8hh9rYLDe9lIblTAagjv7v9vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727777532; a=rsa-sha256; cv=none; b=CHhGq83yi3tCHHfVaSuoksuUwH6kLbPAQcMPcASAS4Zs0FzMMjqA5tMX+fTtnsjGsmteJS AIxDPLJROtBfrIkL8jSNPIsVxj7o/txvIJPVF+5kqvv3mU24ARA24SvSDMH1in6XNqZGUW nWxp6X1SIl1JyTLG/AsWR6qbSQTp6cpbqBORgTRSQPXzf2CuT8FLbJCr4fUTYpggC1qrIw v1XO7QBntwwrbUQHr601PrNxoy4pW/4uB+lfA2beW960CuKpLVJJln5gLSFREteI/i5vav VVueCYt1gwfBKCObg7U68+xBN1NC2jAtG2NdPvKel8hynaMn0eDMJOYKx/qFbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHtz00GRVzZJK; Tue, 1 Oct 2024 10:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491ACB5j031658; Tue, 1 Oct 2024 10:12:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491ACBJ8031655; Tue, 1 Oct 2024 10:12:11 GMT (envelope-from git) Date: Tue, 1 Oct 2024 10:12:11 GMT Message-Id: <202410011012.491ACBJ8031655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 288bec2b2bd1 - main - pf: fold pf_test_fragment() into pf_test_rule() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 288bec2b2bd10d80cdc35a687e8a373f5931c80d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=288bec2b2bd10d80cdc35a687e8a373f5931c80d commit 288bec2b2bd10d80cdc35a687e8a373f5931c80d Author: Kristof Provost AuthorDate: 2024-09-13 15:07:06 +0000 Commit: Kristof Provost CommitDate: 2024-10-01 07:55:13 +0000 pf: fold pf_test_fragment() into pf_test_rule() Reduces code and fixes a bunch of bugs with fragment handling not being in sync with the rest of the ruleset. Much feedback from mpf, bluhm & markus Thanks to Tony Sarendal for help with testing ok bluhm; various previous versions ok henning, claudio, mpf, markus Note that while this changes the order of src addr/src port/dst addr/dst port skips this doesn't actually affect the kernel/userspace ABI. The kernel always recalculates skip steps. As a result we have to fix one of the pfctl parser tests. Note that this is an order change that does not affect what packets are acceppted or dropped. Obtained from: OpenBSD, mcbride , 04c69899a7 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46705 --- sbin/pfctl/parse.y | 4 +- sbin/pfctl/pfctl_optimize.c | 2 +- sbin/pfctl/tests/files/pf0004.ok | 24 +-- sys/net/pfvar.h | 2 + sys/netpfil/pf/pf.c | 450 ++++++++++++++++----------------------- sys/netpfil/pf/pf.h | 4 +- 6 files changed, 198 insertions(+), 288 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 9d95122f9826..ad25f1996d36 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6073,10 +6073,10 @@ expand_rule(struct pfctl_rule *r, LOOP_THROUGH(struct node_proto, proto, protos, LOOP_THROUGH(struct node_icmp, icmp_type, icmp_types, LOOP_THROUGH(struct node_host, src_host, src_hosts, - LOOP_THROUGH(struct node_port, src_port, src_ports, - LOOP_THROUGH(struct node_os, src_os, src_oses, LOOP_THROUGH(struct node_host, dst_host, dst_hosts, + LOOP_THROUGH(struct node_port, src_port, src_ports, LOOP_THROUGH(struct node_port, dst_port, dst_ports, + LOOP_THROUGH(struct node_os, src_os, src_oses, LOOP_THROUGH(struct node_uid, uid, uids, LOOP_THROUGH(struct node_gid, gid, gids, diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 7440bf8a506d..9858f38b8671 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -249,8 +249,8 @@ static const char *skip_comparitors_names[PF_SKIP_COUNT]; { "af", PF_SKIP_AF, skip_cmp_af }, \ { "proto", PF_SKIP_PROTO, skip_cmp_proto }, \ { "saddr", PF_SKIP_SRC_ADDR, skip_cmp_src_addr }, \ - { "sport", PF_SKIP_SRC_PORT, skip_cmp_src_port }, \ { "daddr", PF_SKIP_DST_ADDR, skip_cmp_dst_addr }, \ + { "sport", PF_SKIP_SRC_PORT, skip_cmp_src_port }, \ { "dport", PF_SKIP_DST_PORT, skip_cmp_dst_port } \ } diff --git a/sbin/pfctl/tests/files/pf0004.ok b/sbin/pfctl/tests/files/pf0004.ok index 5fca4a50f7b1..87b71cdeff3d 100644 --- a/sbin/pfctl/tests/files/pf0004.ok +++ b/sbin/pfctl/tests/files/pf0004.ok @@ -15,48 +15,48 @@ block drop in proto tcp from any port >= 80 to any port 1024:2048 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = ircd block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = ircd -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = ircd block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = ircd +block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = ircd block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = ircd block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = ircd -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = ircd block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = ircd +block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = ircd block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 +block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 +block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 +block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535 diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index dfc42c16547f..79dcd0d65985 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1619,6 +1619,8 @@ struct pf_pdesc { * state code. Easier than tags */ #define PFDESC_TCP_NORM 0x0001 /* TCP shall be statefully scrubbed */ #define PFDESC_IP_REAS 0x0002 /* IP frags would've been reassembled */ + u_int16_t virtual_proto; +#define PF_VPROTO_FRAGMENT 256 sa_family_t af; u_int8_t proto; u_int8_t tos; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 19e0014ce4eb..ccfe1a0fcd96 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -333,9 +333,6 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, static int pf_state_key_addr_setup(struct pf_pdesc *, struct mbuf *, int, struct pf_state_key_cmp *, int, struct pf_addr *, int, struct pf_addr *, int); -static int pf_test_fragment(struct pf_krule **, struct pfi_kkif *, - struct mbuf *, struct pf_pdesc *, - struct pf_krule **, struct pf_kruleset **); static int pf_tcp_track_full(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, struct pf_pdesc *, u_short *, int *); @@ -2962,13 +2959,13 @@ pf_calc_skip_steps(struct pf_krulequeue *rules) if (cur->src.neg != prev->src.neg || pf_addr_wrap_neq(&cur->src.addr, &prev->src.addr)) PF_SET_SKIP_STEPS(PF_SKIP_SRC_ADDR); + if (cur->dst.neg != prev->dst.neg || + pf_addr_wrap_neq(&cur->dst.addr, &prev->dst.addr)) + PF_SET_SKIP_STEPS(PF_SKIP_DST_ADDR); if (cur->src.port[0] != prev->src.port[0] || cur->src.port[1] != prev->src.port[1] || cur->src.port_op != prev->src.port_op) PF_SET_SKIP_STEPS(PF_SKIP_SRC_PORT); - if (cur->dst.neg != prev->dst.neg || - pf_addr_wrap_neq(&cur->dst.addr, &prev->dst.addr)) - PF_SET_SKIP_STEPS(PF_SKIP_DST_ADDR); if (cur->dst.port[0] != prev->dst.port[0] || cur->dst.port[1] != prev->dst.port[1] || cur->dst.port_op != prev->dst.port_op) @@ -4877,6 +4874,14 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) return (action); } +#define PF_TEST_ATTRIB(t, a)\ + do { \ + if (t) { \ + r = a; \ + goto nextrule; \ + } \ + } while (0) + static int pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, struct mbuf *m, int off, struct pf_pdesc *pd, struct pf_krule **am, @@ -4916,7 +4921,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, pd->lookup.done = 1; } - switch (pd->proto) { + switch (pd->virtual_proto) { case IPPROTO_TCP: sport = th->th_sport; dport = th->th_dport; @@ -5131,108 +5136,136 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); - if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; - else if (r->direction && r->direction != pd->dir) - r = r->skip[PF_SKIP_DIR].ptr; - else if (r->af && r->af != af) - r = r->skip[PF_SKIP_AF].ptr; - else if (r->proto && r->proto != pd->proto) - r = r->skip[PF_SKIP_PROTO].ptr; - else if (PF_MISMATCHAW(&r->src.addr, saddr, af, - r->src.neg, kif, M_GETFIB(m))) - r = r->skip[PF_SKIP_SRC_ADDR].ptr; - /* tcp/udp only. port_op always 0 in other cases */ - else if (r->src.port_op && !pf_match_port(r->src.port_op, - r->src.port[0], r->src.port[1], sport)) - r = r->skip[PF_SKIP_SRC_PORT].ptr; - else if (PF_MISMATCHAW(&r->dst.addr, daddr, af, - r->dst.neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; - /* tcp/udp only. port_op always 0 in other cases */ - else if (r->dst.port_op && !pf_match_port(r->dst.port_op, - r->dst.port[0], r->dst.port[1], dport)) - r = r->skip[PF_SKIP_DST_PORT].ptr; - /* icmp only. type always 0 in other cases */ - else if (r->type && r->type != icmptype + 1) - r = TAILQ_NEXT(r, entries); - /* icmp only. type always 0 in other cases */ - else if (r->code && r->code != icmpcode + 1) - r = TAILQ_NEXT(r, entries); - else if (r->tos && !(r->tos == pd->tos)) - r = TAILQ_NEXT(r, entries); - else if (r->rule_flag & PFRULE_FRAGMENT) - r = TAILQ_NEXT(r, entries); - else if (pd->proto == IPPROTO_TCP && - (r->flagset & th->th_flags) != r->flags) - r = TAILQ_NEXT(r, entries); - /* tcp/udp only. uid.op always 0 in other cases */ - else if (r->uid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(pd, m), 1)) && - !pf_match_uid(r->uid.op, r->uid.uid[0], r->uid.uid[1], - pd->lookup.uid)) - r = TAILQ_NEXT(r, entries); - /* tcp/udp only. gid.op always 0 in other cases */ - else if (r->gid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(pd, m), 1)) && - !pf_match_gid(r->gid.op, r->gid.gid[0], r->gid.gid[1], - pd->lookup.gid)) - r = TAILQ_NEXT(r, entries); - else if (r->prio && - !pf_match_ieee8021q_pcp(r->prio, m)) - r = TAILQ_NEXT(r, entries); - else if (r->prob && - r->prob <= arc4random()) - r = TAILQ_NEXT(r, entries); - else if (r->match_tag && !pf_match_tag(m, r, &tag, - pd->pf_mtag ? pd->pf_mtag->tag : 0)) - r = TAILQ_NEXT(r, entries); - else if (r->rcv_kif && !pf_match_rcvif(m, r)) - r = TAILQ_NEXT(r, entries); - else if (r->os_fingerprint != PF_OSFP_ANY && - (pd->proto != IPPROTO_TCP || !pf_osfp_match( + PF_TEST_ATTRIB(pfi_kkif_match(r->kif, kif) == r->ifnot, + r->skip[PF_SKIP_IFP].ptr); + PF_TEST_ATTRIB(r->direction && r->direction != pd->dir, + r->skip[PF_SKIP_DIR].ptr); + PF_TEST_ATTRIB(r->af && r->af != af, + r->skip[PF_SKIP_AF].ptr); + PF_TEST_ATTRIB(r->proto && r->proto != pd->proto, + r->skip[PF_SKIP_PROTO].ptr); + PF_TEST_ATTRIB(PF_MISMATCHAW(&r->src.addr, saddr, af, + r->src.neg, kif, M_GETFIB(m)), + r->skip[PF_SKIP_SRC_ADDR].ptr); + PF_TEST_ATTRIB(PF_MISMATCHAW(&r->dst.addr, daddr, af, + r->dst.neg, NULL, M_GETFIB(m)), + r->skip[PF_SKIP_DST_ADDR].ptr); + switch (pd->virtual_proto) { + case PF_VPROTO_FRAGMENT: + /* tcp/udp only. port_op always 0 in other cases */ + PF_TEST_ATTRIB((r->src.port_op || r->dst.port_op), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB((pd->proto == IPPROTO_TCP && r->flagset), + TAILQ_NEXT(r, entries)); + /* icmp only. type/code always 0 in other cases */ + PF_TEST_ATTRIB((r->type || r->code), + TAILQ_NEXT(r, entries)); + /* tcp/udp only. {uid|gid}.op always 0 in other cases */ + PF_TEST_ATTRIB((r->gid.op || r->uid.op), + TAILQ_NEXT(r, entries)); + break; + + case IPPROTO_TCP: + PF_TEST_ATTRIB((r->flagset & th->th_flags) != r->flags, + TAILQ_NEXT(r, entries)); + /* FALLTHROUGH */ + case IPPROTO_SCTP: + case IPPROTO_UDP: + /* tcp/udp only. port_op always 0 in other cases */ + PF_TEST_ATTRIB(r->src.port_op && !pf_match_port(r->src.port_op, + r->src.port[0], r->src.port[1], sport), + r->skip[PF_SKIP_SRC_PORT].ptr); + /* tcp/udp only. port_op always 0 in other cases */ + PF_TEST_ATTRIB(r->dst.port_op && !pf_match_port(r->dst.port_op, + r->dst.port[0], r->dst.port[1], dport), + r->skip[PF_SKIP_DST_PORT].ptr); + /* tcp/udp only. uid.op always 0 in other cases */ + PF_TEST_ATTRIB(r->uid.op && (pd->lookup.done || (pd->lookup.done = + pf_socket_lookup(pd, m), 1)) && + !pf_match_uid(r->uid.op, r->uid.uid[0], r->uid.uid[1], + pd->lookup.uid), + TAILQ_NEXT(r, entries)); + /* tcp/udp only. gid.op always 0 in other cases */ + PF_TEST_ATTRIB(r->gid.op && (pd->lookup.done || (pd->lookup.done = + pf_socket_lookup(pd, m), 1)) && + !pf_match_gid(r->gid.op, r->gid.gid[0], r->gid.gid[1], + pd->lookup.gid), + TAILQ_NEXT(r, entries)); + break; + + case IPPROTO_ICMP: + case IPPROTO_ICMPV6: + /* icmp only. type always 0 in other cases */ + PF_TEST_ATTRIB(r->type && r->type != icmptype + 1, + TAILQ_NEXT(r, entries)); + /* icmp only. type always 0 in other cases */ + PF_TEST_ATTRIB(r->code && r->code != icmpcode + 1, + TAILQ_NEXT(r, entries)); + break; + + default: + break; + } + PF_TEST_ATTRIB(r->tos && !(r->tos == pd->tos), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB(r->prio && + !pf_match_ieee8021q_pcp(r->prio, m), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB(r->prob && + r->prob <= arc4random(), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB(r->match_tag && !pf_match_tag(m, r, &tag, + pd->pf_mtag ? pd->pf_mtag->tag : 0), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB(r->rcv_kif && !pf_match_rcvif(m, r), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB((r->rule_flag & PFRULE_FRAGMENT && + pd->virtual_proto != PF_VPROTO_FRAGMENT), + TAILQ_NEXT(r, entries)); + PF_TEST_ATTRIB(r->os_fingerprint != PF_OSFP_ANY && + (pd->virtual_proto != IPPROTO_TCP || !pf_osfp_match( pf_osfp_fingerprint(pd, m, off, th), - r->os_fingerprint))) - r = TAILQ_NEXT(r, entries); - else { - if (r->tag) - tag = r->tag; - if (r->anchor == NULL) { - if (r->action == PF_MATCH) { - ri = malloc(sizeof(struct pf_krule_item), M_PF_RULE_ITEM, M_NOWAIT | M_ZERO); - if (ri == NULL) { - REASON_SET(&reason, PFRES_MEMORY); - goto cleanup; - } - ri->r = r; - SLIST_INSERT_HEAD(&match_rules, ri, entry); - pf_counter_u64_critical_enter(); - pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); - pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); - pf_counter_u64_critical_exit(); - pf_rule_to_actions(r, &pd->act); - if (r->log || pd->act.log & PF_LOG_MATCHES) - PFLOG_PACKET(kif, m, - r->action, PFRES_MATCH, r, - a, ruleset, pd, 1); - } else { - match = 1; - *rm = r; - *am = a; - *rsm = ruleset; - if (pd->act.log & PF_LOG_MATCHES) - PFLOG_PACKET(kif, m, - r->action, PFRES_MATCH, r, - a, ruleset, pd, 1); + r->os_fingerprint)), + TAILQ_NEXT(r, entries)); + /* FALLTHROUGH */ + if (r->tag) + tag = r->tag; + if (r->anchor == NULL) { + if (r->action == PF_MATCH) { + ri = malloc(sizeof(struct pf_krule_item), M_PF_RULE_ITEM, M_NOWAIT | M_ZERO); + if (ri == NULL) { + REASON_SET(&reason, PFRES_MEMORY); + goto cleanup; } - if ((*rm)->quick) - break; - r = TAILQ_NEXT(r, entries); - } else - pf_step_into_anchor(anchor_stack, &asd, - &ruleset, PF_RULESET_FILTER, &r, &a, - &match); - } + ri->r = r; + SLIST_INSERT_HEAD(&match_rules, ri, entry); + pf_counter_u64_critical_enter(); + pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); + pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); + pf_counter_u64_critical_exit(); + pf_rule_to_actions(r, &pd->act); + if (r->log || pd->act.log & PF_LOG_MATCHES) + PFLOG_PACKET(kif, m, + r->action, PFRES_MATCH, r, + a, ruleset, pd, 1); + } else { + match = 1; + *rm = r; + *am = a; + *rsm = ruleset; + if (pd->act.log & PF_LOG_MATCHES) + PFLOG_PACKET(kif, m, + r->action, PFRES_MATCH, r, + a, ruleset, pd, 1); + } + if ((*rm)->quick) + break; + r = TAILQ_NEXT(r, entries); + } else + pf_step_into_anchor(anchor_stack, &asd, + &ruleset, PF_RULESET_FILTER, &r, &a, + &match); +nextrule: if (r == NULL && pf_step_out_of_anchor(anchor_stack, &asd, &ruleset, PF_RULESET_FILTER, &r, &a, &match)) break; @@ -5252,7 +5285,8 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, PFLOG_PACKET(kif, m, r->action, reason, r, a, ruleset, pd, 1); } - if ((r->action == PF_DROP) && + if (pd->virtual_proto != PF_VPROTO_FRAGMENT && + (r->action == PF_DROP) && ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { @@ -5270,8 +5304,9 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, if (pd->act.rtableid >= 0) M_SETFIB(m, pd->act.rtableid); - if (!state_icmp && (r->keep_state || nr != NULL || - (pd->flags & PFDESC_TCP_NORM))) { + if (pd->virtual_proto != PF_VPROTO_FRAGMENT && + (!state_icmp && (r->keep_state || nr != NULL || + (pd->flags & PFDESC_TCP_NORM)))) { int action; action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, @@ -5595,133 +5630,6 @@ drop: return (PF_DROP); } -static int -pf_test_fragment(struct pf_krule **rm, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd, struct pf_krule **am, - struct pf_kruleset **rsm) -{ - struct pf_krule *r, *a = NULL; - struct pf_kruleset *ruleset = NULL; - struct pf_krule_slist match_rules; - struct pf_krule_item *ri; - sa_family_t af = pd->af; - u_short reason; - int tag = -1; - int asd = 0; - int match = 0; - struct pf_kanchor_stackframe anchor_stack[PF_ANCHOR_STACKSIZE]; - - PF_RULES_RASSERT(); - - r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); - SLIST_INIT(&match_rules); - while (r != NULL) { - pf_counter_u64_add(&r->evaluations, 1); - if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; - else if (r->direction && r->direction != pd->dir) - r = r->skip[PF_SKIP_DIR].ptr; - else if (r->af && r->af != af) - r = r->skip[PF_SKIP_AF].ptr; - else if (r->proto && r->proto != pd->proto) - r = r->skip[PF_SKIP_PROTO].ptr; - else if (PF_MISMATCHAW(&r->src.addr, pd->src, af, - r->src.neg, kif, M_GETFIB(m))) - r = r->skip[PF_SKIP_SRC_ADDR].ptr; - else if (PF_MISMATCHAW(&r->dst.addr, pd->dst, af, - r->dst.neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; - else if (r->tos && !(r->tos == pd->tos)) - r = TAILQ_NEXT(r, entries); - else if (r->os_fingerprint != PF_OSFP_ANY) - r = TAILQ_NEXT(r, entries); - else if (pd->proto == IPPROTO_UDP && - (r->src.port_op || r->dst.port_op)) - r = TAILQ_NEXT(r, entries); - else if (pd->proto == IPPROTO_TCP && - (r->src.port_op || r->dst.port_op || r->flagset)) - r = TAILQ_NEXT(r, entries); - else if ((pd->proto == IPPROTO_ICMP || - pd->proto == IPPROTO_ICMPV6) && - (r->type || r->code)) - r = TAILQ_NEXT(r, entries); - else if (r->prio && - !pf_match_ieee8021q_pcp(r->prio, m)) - r = TAILQ_NEXT(r, entries); - else if (r->prob && r->prob <= - (arc4random() % (UINT_MAX - 1) + 1)) - r = TAILQ_NEXT(r, entries); - else if (r->match_tag && !pf_match_tag(m, r, &tag, - pd->pf_mtag ? pd->pf_mtag->tag : 0)) - r = TAILQ_NEXT(r, entries); - else { - if (r->anchor == NULL) { - if (r->action == PF_MATCH) { - ri = malloc(sizeof(struct pf_krule_item), M_PF_RULE_ITEM, M_NOWAIT | M_ZERO); - if (ri == NULL) { - REASON_SET(&reason, PFRES_MEMORY); - goto cleanup; - } - ri->r = r; - SLIST_INSERT_HEAD(&match_rules, ri, entry); - pf_counter_u64_critical_enter(); - pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); - pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); - pf_counter_u64_critical_exit(); - pf_rule_to_actions(r, &pd->act); - if (r->log) - PFLOG_PACKET(kif, m, - r->action, PFRES_MATCH, r, - a, ruleset, pd, 1); - } else { - match = 1; - *rm = r; - *am = a; - *rsm = ruleset; - } - if ((*rm)->quick) - break; - r = TAILQ_NEXT(r, entries); - } else - pf_step_into_anchor(anchor_stack, &asd, - &ruleset, PF_RULESET_FILTER, &r, &a, - &match); - } - if (r == NULL && pf_step_out_of_anchor(anchor_stack, &asd, - &ruleset, PF_RULESET_FILTER, &r, &a, &match)) - break; - } - r = *rm; - a = *am; - ruleset = *rsm; - - REASON_SET(&reason, PFRES_MATCH); - - /* apply actions for last matching pass/block rule */ - pf_rule_to_actions(r, &pd->act); - - if (r->log) - PFLOG_PACKET(kif, m, r->action, reason, r, a, ruleset, pd, 1); - - if (r->action != PF_PASS) - return (PF_DROP); - - if (tag > 0 && pf_tag_packet(m, pd, tag)) { - REASON_SET(&reason, PFRES_MEMORY); - goto cleanup; - } - - return (PF_PASS); - -cleanup: - while ((ri = SLIST_FIRST(&match_rules))) { - SLIST_REMOVE_HEAD(&match_rules, entry); - free(ri, M_PF_RULE_ITEM); - } - - return (PF_DROP); -} - static int pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, struct pf_pdesc *pd, u_short *reason, @@ -8556,7 +8464,8 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, static int pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, u_short *action, u_short *reason, struct pfi_kkif *kif, struct pf_krule **a, - struct pf_krule **r, struct pf_kruleset **ruleset, int *off, int *hdrlen, + struct pf_krule **r, struct pf_kstate **s, struct pf_kruleset **ruleset, + int *off, int *hdrlen, struct inpcb *inp, struct pf_rule_actions *default_actions) { @@ -8589,7 +8498,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, pd->sport = pd->dport = NULL; pd->ip_sum = &h->ip_sum; pd->proto_sum = NULL; - pd->proto = h->ip_p; + pd->virtual_proto = pd->proto = h->ip_p; pd->dir = dir; pd->sidx = (dir == PF_IN) ? 0 : 1; pd->didx = (dir == PF_IN) ? 1 : 0; @@ -8600,9 +8509,21 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, if (h->ip_hl > 5) /* has options */ pd->badopts++; - /* fragments not reassembled handled later */ - if (h->ip_off & htons(IP_MF | IP_OFFMASK)) - return (0); + if (h->ip_off & htons(IP_MF | IP_OFFMASK)) { + /* + * handle fragments that aren't reassembled by + * normalization + */ + pd->virtual_proto = PF_VPROTO_FRAGMENT; + if (kif == NULL || r == NULL) /* pflog */ + *action = PF_DROP; + else + *action = pf_test_rule(r, s, kif, m, *off, + pd, a, ruleset, inp, *hdrlen); + if (*action != PF_PASS) + REASON_SET(reason, PFRES_FRAG); + return (-1); + } break; } @@ -8624,17 +8545,19 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, pd->tos = IPV6_DSCP(h); pd->tot_len = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr); *off = ((caddr_t)h - m->m_data) + sizeof(struct ip6_hdr); - pd->proto = h->ip6_nxt; + pd->virtual_proto = pd->proto = h->ip6_nxt; pd->act.rtableid = -1; do { switch (pd->proto) { case IPPROTO_FRAGMENT: + pd->virtual_proto = PF_VPROTO_FRAGMENT; if (kif == NULL || r == NULL) /* pflog */ *action = PF_DROP; else - *action = pf_test_fragment(r, kif, - m, pd, a, ruleset); + *action = pf_test_rule(r, s, kif, m, *off, + pd, a, ruleset, inp, + *hdrlen); if (*action == PF_DROP) REASON_SET(reason, PFRES_FRAG); return (-1); @@ -8682,7 +8605,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, *off += (opt6.ip6e_len + 2) * 4; else *off += (opt6.ip6e_len + 1) * 8; - pd->proto = opt6.ip6e_nxt; + pd->virtual_proto = pd->proto = opt6.ip6e_nxt; /* goto the next header */ break; } @@ -9000,7 +8923,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 } if (pf_setup_pdesc(af, dir, &pd, m, &action, &reason, kif, &a, &r, - &ruleset, &off, &hdrlen, default_actions) == -1) { + &s, &ruleset, &off, &hdrlen, inp, default_actions) == -1) { if (action != PF_PASS) pd.act.log |= PF_LOG_FORCE; goto done; @@ -9060,32 +8983,17 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 m_tag_delete(m, mtag); } - switch (af) { -#ifdef INET - case AF_INET: - /* handle fragments that didn't get reassembled by normalization */ - if (h->ip_off & htons(IP_MF | IP_OFFMASK)) { - action = pf_test_fragment(&r, kif, m, &pd, &a, &ruleset); - goto done; - } - break; -#endif #ifdef INET6 - case AF_INET6: - /* - * we do not support jumbogram. if we keep going, zero ip6_plen - * will do something bad, so drop the packet for now. - */ - if (htons(h6->ip6_plen) == 0) { - action = PF_DROP; - REASON_SET(&reason, PFRES_NORM); /*XXX*/ - goto done; - } - break; -#endif - default: - panic("Unknown af %d", af); + /* + * we do not support jumbogram. if we keep going, zero ip6_plen + * will do something bad, so drop the packet for now. + */ + if (af == AF_INET6 && htons(h6->ip6_plen) == 0) { + action = PF_DROP; + REASON_SET(&reason, PFRES_NORM); /*XXX*/ + goto done; } +#endif switch (pd.proto) { case IPPROTO_TCP: { diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h index 063abe83274b..77d4ea6c5e70 100644 --- a/sys/netpfil/pf/pf.h +++ b/sys/netpfil/pf/pf.h @@ -491,8 +491,8 @@ struct pf_rule { #define PF_SKIP_AF 2 #define PF_SKIP_PROTO 3 #define PF_SKIP_SRC_ADDR 4 -#define PF_SKIP_SRC_PORT 5 -#define PF_SKIP_DST_ADDR 6 +#define PF_SKIP_DST_ADDR 5 +#define PF_SKIP_SRC_PORT 6 #define PF_SKIP_DST_PORT 7 #define PF_SKIP_COUNT 8 union pf_rule_ptr skip[PF_SKIP_COUNT]; From nobody Tue Oct 1 10:12:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHtz13lmRz5XcRW; Tue, 01 Oct 2024 10:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHtz11j47z4s6s; Tue, 1 Oct 2024 10:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727777533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=or5LBrqkquC7Brc0v9CiaWD/4YUd25luUk2+TSRVKfc=; b=QMM4kiccNM+pjKyhwBOk680tNAjM5bxEPzz9wO9MAEtZ7Gp0sC7EJstgeEUKIIHuK3N4aE qEJf0B7GP5VFgokWWXHHpEOZAGCgT/ZMFfmyT4vXuC3ZXIvXKLuDILjkdHO1a/fRoU6sUL 3AWYcMeQiwI2aWPrhq75QzOGnU3CclcyHWr3bhjnJSUvphF6AHevLzkHUZLOFgpEkn4ldZ yuiDOfdsZkWarRLKu9rKLd8ARp248Rypnc0vP0RrphsG1h11J4RpBAvFY71cXG7WUPVdG9 7jztyDRTsM/pC0wT16VWY49+0hFWimm+8oLQU5Al7rjzJrVbumhWxShpc110xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727777533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=or5LBrqkquC7Brc0v9CiaWD/4YUd25luUk2+TSRVKfc=; b=xEItnDDS9YO19WijpUo0e6OAEmesihZhlZ7d106lPgcjDeyrt/DxIyrtuuLloBixmnJYQc DcrgSXrYVSLAPUJVW4acrCnNFK1MUvbQSmWbaYcxq6NQdwFVyfE+V5Vx4Hn4nhCYpdTJUa oMcWOzcRKPIuArQ8l1CZkpSwHE5U4fVKoMx7geWBeKrYD5M/gYJ3RlpMOhgyRie+ceZw9u P46aBAM5bfoMpCn+ZptS3TDqdCvcSMnxqd3xUvXB4qYt257AWChQiDPuwLciTMIIe11Mxh U8uvJs8HxeSaEWL4tNJxGQP8BSOvhnx1xY3lIrSzeZlnetv83xn48UmIF0VaNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727777533; a=rsa-sha256; cv=none; b=JgL1DuR3CGmw15YrLGtqTF82SjSlZlpetzdAprCk2Fom1o2zgiZPXu1UPgeBMBPXfNEAyE I2doeI58FyYPSzx9YaaPkEN7yszXCL4ZaWDZOtkDpIE9XgWPd6kHBFFYBUWcMB/t/2Us7Q pauvUGDagWTK+l4HuaXhJxeXFPmdugZJyElmgbuO7OG9l+Qf+xruKz0Axsl13M/ZzIwEFD oFovXQgxxu0ITv+gCRyvIfHCb5CVMOmtKXeI/bLLFYsiQv9mPtEh3sZ4PBLipJX/tjMgMz GOYUSubDGfYoQRcW7LNVMjo64Z0l1taz+pHC/jaYEY8WknSl5Mjdc75E0MHqjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHtz11JF3zYCN; Tue, 1 Oct 2024 10:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491ACD3E031700; Tue, 1 Oct 2024 10:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491ACDkj031697; Tue, 1 Oct 2024 10:12:13 GMT (envelope-from git) Date: Tue, 1 Oct 2024 10:12:13 GMT Message-Id: <202410011012.491ACDkj031697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1b745d8b23e4 - main - pf: move normalisation into pf_setup_pdesc() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b745d8b23e465872e171579cfc944bd57e5501a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b745d8b23e465872e171579cfc944bd57e5501a commit 1b745d8b23e465872e171579cfc944bd57e5501a Author: Kristof Provost AuthorDate: 2024-09-16 11:58:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-01 07:55:14 +0000 pf: move normalisation into pf_setup_pdesc() This simplifies the code slightly, and brings us closer to the OpenBSD code. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46707 --- sys/netpfil/pf/pf.c | 111 ++++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ccfe1a0fcd96..51b4cebc88e9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8462,12 +8462,16 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, } static int -pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, +pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, u_short *action, u_short *reason, struct pfi_kkif *kif, struct pf_krule **a, struct pf_krule **r, struct pf_kstate **s, struct pf_kruleset **ruleset, int *off, int *hdrlen, struct inpcb *inp, struct pf_rule_actions *default_actions) { + struct mbuf *m = *m0; + + memset(pd, 0, sizeof(*pd)); + pd->dir = dir; TAILQ_INIT(&pd->sctp_multihome_jobs); if (default_actions != NULL) @@ -8486,6 +8490,22 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, case AF_INET: { struct ip *h; + if (__predict_false(m->m_len < sizeof(struct ip)) && + (m = *m0 = m_pullup(*m0, sizeof(struct ip))) == NULL) { + DPFPRINTF(PF_DEBUG_URGENT, + ("pf_test: m_len < sizeof(struct ip), pullup failed\n")); + *action = PF_DROP; + REASON_SET(reason, PFRES_SHORT); + return (-1); + } + + if (pf_normalize_ip(m0, kif, reason, pd) != PF_PASS) { + /* We do IP header normalization and packet reassembly here */ + *action = PF_DROP; + return (-1); + } + m = *m0; + h = mtod(m, struct ip *); *off = h->ip_hl << 2; if (*off < (int)sizeof(*h)) { @@ -8533,6 +8553,23 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, struct ip6_hdr *h; int terminal = 0; + if (__predict_false(m->m_len < sizeof(struct ip6_hdr)) && + (m = *m0 = m_pullup(*m0, sizeof(struct ip6_hdr))) == NULL) { + DPFPRINTF(PF_DEBUG_URGENT, + ("pf_test6: m_len < sizeof(struct ip6_hdr)" + ", pullup failed\n")); + *action = PF_DROP; + REASON_SET(reason, PFRES_SHORT); + return (-1); + } + + /* We do IP header normalization and packet reassembly here */ + if (pf_normalize_ip6(m0, kif, reason, pd) != PF_PASS) { + *action = PF_DROP; + return (-1); + } + m = *m0; + h = mtod(m, struct ip6_hdr *); pd->src = (struct pf_addr *)&h->ip6_src; pd->dst = (struct pf_addr *)&h->ip6_dst; @@ -8855,65 +8892,44 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 return (PF_PASS); } +#ifdef INET6 + /* + * If we end up changing IP addresses (e.g. binat) the stack may get + * confused and fail to send the icmp6 packet too big error. Just send + * it here, before we do any NAT. + */ + if (af == AF_INET6 && dir == PF_OUT && pflags & PFIL_FWD && + IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { + PF_RULES_RUNLOCK(); + *m0 = NULL; + icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, IN6_LINKMTU(ifp)); + return (PF_DROP); + } +#endif + if (__predict_false(! M_WRITABLE(*m0))) { m = *m0 = m_unshare(*m0, M_NOWAIT); if (*m0 == NULL) return (PF_DROP); } - memset(&pd, 0, sizeof(pd)); - pd.dir = dir; + if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, kif, &a, &r, + &s, &ruleset, &off, &hdrlen, inp, default_actions) == -1) { + if (action != PF_PASS) + pd.act.log |= PF_LOG_FORCE; + goto done; + } + m = *m0; switch (af) { #ifdef INET case AF_INET: - if (__predict_false(m->m_len < sizeof(struct ip)) && - (m = *m0 = m_pullup(*m0, sizeof(struct ip))) == NULL) { - DPFPRINTF(PF_DEBUG_URGENT, - ("pf_test: m_len < sizeof(struct ip), pullup failed\n")); - PF_RULES_RUNLOCK(); - return (PF_DROP); - } - - if (pf_normalize_ip(m0, kif, &reason, &pd) != PF_PASS) { - /* We do IP header normalization and packet reassembly here */ - action = PF_DROP; - goto done; - } - m = *m0; /* pf_normalize messes with m0 */ h = mtod(m, struct ip *); ttl = h->ip_ttl; break; #endif #ifdef INET6 case AF_INET6: - /* - * If we end up changing IP addresses (e.g. binat) the stack may get - * confused and fail to send the icmp6 packet too big error. Just send - * it here, before we do any NAT. - */ - if (dir == PF_OUT && pflags & PFIL_FWD && IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { - PF_RULES_RUNLOCK(); - *m0 = NULL; - icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, IN6_LINKMTU(ifp)); - return (PF_DROP); - } - - if (__predict_false(m->m_len < sizeof(struct ip6_hdr)) && - (m = *m0 = m_pullup(*m0, sizeof(struct ip6_hdr))) == NULL) { - DPFPRINTF(PF_DEBUG_URGENT, - ("pf_test6: m_len < sizeof(struct ip6_hdr)" - ", pullup failed\n")); - PF_RULES_RUNLOCK(); - return (PF_DROP); - } - - /* We do IP header normalization and packet reassembly here */ - if (pf_normalize_ip6(m0, kif, &reason, &pd) != PF_PASS) { - action = PF_DROP; - goto done; - } - m = *m0; /* pf_normalize messes with m0 */ h6 = mtod(m, struct ip6_hdr *); ttl = h6->ip6_hlim; break; @@ -8922,13 +8938,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 panic("Unknown af %d", af); } - if (pf_setup_pdesc(af, dir, &pd, m, &action, &reason, kif, &a, &r, - &s, &ruleset, &off, &hdrlen, inp, default_actions) == -1) { - if (action != PF_PASS) - pd.act.log |= PF_LOG_FORCE; - goto done; - } - if (pd.pf_mtag != NULL && (pd.pf_mtag->flags & PF_MTAG_FLAG_ROUTE_TO)) { pd.pf_mtag->flags &= ~PF_MTAG_FLAG_ROUTE_TO; From nobody Tue Oct 1 13:26:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHzHf0SmYz5XqmN; Tue, 01 Oct 2024 13:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHzHf00Ggz3xdr; Tue, 1 Oct 2024 13:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727789214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/giH4piECFVvFrzp8Hgnia0OfAwyJ/R1pi5KUHOWW8M=; b=w7TCK6bRQonJ+dvu1nR498iFOfu6fdwC5EIM5vKeAoKcK5lyBUAQKjoJbUcP6IxLM4HjiU miRTfTSjNj4Uj/pFrh38Ttp7UV4BXAYE4TUnLRKHRz2moqwjRiC++yeovi46m9F+0kfDiE yOOnnxhU/SRx9CIgu3mQLMa/Iy9eN87ePl8vPDSynj71Utc4yIgX06A7wDHJQ5Q56CNLXf hPRM6l7JMhJLjfy2kYo6gJgc2QpdEp4ECJZ4vb87UZ1XATvMXHeJr3F+pzbIfWyUS79XbO kuUI3Kx0PkXxW6CfepASJh5RIvx73i8l7RRnY9ZyBq2FNsl+TrE0YXyjkVPhBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727789214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/giH4piECFVvFrzp8Hgnia0OfAwyJ/R1pi5KUHOWW8M=; b=t+B51bYAvCivysKziMQU61elVwnhz6CRAsexuj6S7n28mgaiP1D/oxJ9JLNiuO/gifCLdY 02AnnKIkw8wnkuDEbuXSHdzKItsOtKGFH1TilyOx48Gc2kTu23lq/ljSEpUAV1WYc67z/S G2j0GRXydqy0D+rnVkNyUn+PSm223Gjoa7DZrw/R6L2XqYHkciuY6ZReaNMgnGaKe9zQjx LjLyoNS5v9DBFx9btxvZc4M1Mzjjn3bVdPdmHe6WKpBA8bphkJn2uA0AS2wQEAIDoH68F9 LH9H6COncuIAYlS9pRmzHrF6BelQP4oMBipNBvmFHlqTaZ8w7hTb1ILEBN35ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727789214; a=rsa-sha256; cv=none; b=mNxNv2eczKl6dxnJuO5Wl4XlfwVPZDNFJ4fj+Zf8BlPc2Hog1cCG2REAjFvTMgFKhIOaGl 3G1980eA8P+OGdfJ3loV8e7EU89vmM2U0CGeTvOAuL4yux4aOj/YN4Qo4/L17pd2f/nEkf 0qY/HN0UXfTbYyZmHG+Yd+VEOPgtRJFWOd9KJpMboplBqAZU4SC/FcfmFRkG2S3TdlDDQn XKkOU1VAki+JvXv6ZeeIv+kPaYJa74oM+5XNrcAUcxUWrfU93Pw+6X8nkaKfbLLaP82jQw 1ONfYRGMmSiLORyQcXUjAhl36YrMNl1XjXHcaCJgGrEB5eDG7P1WhhRXLEmmEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHzHd6ZSbzftc; Tue, 1 Oct 2024 13:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491DQrjk054259; Tue, 1 Oct 2024 13:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491DQrPu054256; Tue, 1 Oct 2024 13:26:53 GMT (envelope-from git) Date: Tue, 1 Oct 2024 13:26:53 GMT Message-Id: <202410011326.491DQrPu054256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c2fe7156e992 - main - amd64/mp_machdep.c: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2fe7156e992a295756206f59c282b9e971b8c91 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c2fe7156e992a295756206f59c282b9e971b8c91 commit c2fe7156e992a295756206f59c282b9e971b8c91 Author: Konstantin Belousov AuthorDate: 2024-10-01 11:32:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-01 11:32:19 +0000 amd64/mp_machdep.c: style Wrap long lines. Remove redundand declaration. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/amd64/amd64/mp_machdep.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 12abb8b6bf8b..00e99f9df192 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -102,16 +102,15 @@ void *bootpcpu; extern u_int mptramp_la57; extern u_int mptramp_nx; -smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = &smp_targeted_tlb_shootdown_native; +smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = + &smp_targeted_tlb_shootdown_native; + /* * Local data and functions. */ static int start_ap(int apic_id, vm_paddr_t boot_address); -void -smp_targeted_tlb_shootdown_native(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2, - smp_invl_cb_t curcpu_cb, enum invl_op_codes op); /* * Initialize the IPI handlers and start up the AP's. */ @@ -586,8 +585,8 @@ invl_scoreboard_slot(u_int cpu) * completion. */ void -smp_targeted_tlb_shootdown_native(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2, - smp_invl_cb_t curcpu_cb, enum invl_op_codes op) +smp_targeted_tlb_shootdown_native(pmap_t pmap, vm_offset_t addr1, + vm_offset_t addr2, smp_invl_cb_t curcpu_cb, enum invl_op_codes op) { cpuset_t mask; uint32_t generation, *p_cpudone; From nobody Tue Oct 1 13:26:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHzHg1G0Vz5XrB6; Tue, 01 Oct 2024 13:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHzHg0mRPz3xmw; Tue, 1 Oct 2024 13:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727789215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s22povjPYNM1MnZyxopGhU67QE18DCiiOMh2ZJoBdC8=; b=t0kOBCl9fdFlqtDr7KBiR9lTC77SToTrvLl2C/c+OdaVcVpfcTT4ykhqqH6IXhYXbt1M5m 4FuQLJ67b9UXMTa3Bgu8TTBlNayiQugxliwPRswCxHa1TbxG+eP+jTOBMnINb4iKL6aF62 XwWPaGMuNDiB/5TngIJv3h0//wZrTrsLetyy27CpjKYcgCXy1/xPYHnOWaeh7KieOx3Z/C F8WxEfvIW8jhtJnxKEHSsbyDnGP5EHxIawi4CWEH7t5wT10H3l0p6mgRfsVJI4mOhgSohk OAPHOiM6e4GXspIS4TBl4dLRURtwREdL7OuRRsT/u/jb93JQO9sToc4Kgsm3Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727789215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s22povjPYNM1MnZyxopGhU67QE18DCiiOMh2ZJoBdC8=; b=P/sD3pANgZnQq5EKizp5rZwSAXkk71K0M7sum++lgkCUK2z5cSuyqi8otF28uTx6BCBs93 kJc5kWbtC4HVDHYSfD7xZUShHPPP8sRuZbhwTu4zGR6KjYio/qntZlibWrsjl7TwcrAIj/ OFCQWxsP9KC1ajZwzBacXNpkaraV9Cg7Y7zYlOVI+8Uw0Uyrmo2x4Cvg71O62RMcfbxo70 PtLXfnSlaJ9joc/WWb2aDD7qeflDu7NOTBgGlVlGAWFenDQAvdqtEt0XkUAnf/PgVJ4dWo n9sOxY/AUVVCD8SAZad6qz0YdPI5RqcpK9VNIBa2cw10j0RZW7M/hyzS6u2yUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727789215; a=rsa-sha256; cv=none; b=YA20e0mzGoSaX/kDeaDPk8iuty1QPg6LMgb2hSJFH+vZHkLszVzGjUNTfZUluARRmlhiQy WQ0QloBTprEPBDXY8qNc/umS7jYK/K17Cxe6FgIEHB0ypNNG42F3jGXpcTeKmiQnCvNMCI nbEqf2e5wEXm6WE54dlxoW1GDMQ364yBzi6wbxyD1g4ySHJ8I1pkXwK/NhPmKDTsNHinJ6 6sBaLK+QrZQuoPobSdivDb5TSPJur7eVHtzjQUDx9uKXdY8PEnDFZYHgWrRkY3pBdVOG93 4Av6yvVm31g2G2OZlKl16pP1XSV/RiAXh0I72fYclbJ4Hwj5zYtzvwsaj8gVXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHzHg0NWPzftd; Tue, 1 Oct 2024 13:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491DQsNJ054304; Tue, 1 Oct 2024 13:26:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491DQsqR054301; Tue, 1 Oct 2024 13:26:54 GMT (envelope-from git) Date: Tue, 1 Oct 2024 13:26:54 GMT Message-Id: <202410011326.491DQsqR054301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6dcffb980fa3 - main - hyperv: call smp_targeted_tlb_shootdown_native() with pin List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dcffb980fa3026092f79107ee7668918c9f5490 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6dcffb980fa3026092f79107ee7668918c9f5490 commit 6dcffb980fa3026092f79107ee7668918c9f5490 Author: Konstantin Belousov AuthorDate: 2024-10-01 11:45:23 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-01 11:45:23 +0000 hyperv: call smp_targeted_tlb_shootdown_native() with pin Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/hyperv/vmbus/hyperv_mmu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/hyperv/vmbus/hyperv_mmu.c b/sys/dev/hyperv/vmbus/hyperv_mmu.c index 7c29fe294093..8e982974161c 100644 --- a/sys/dev/hyperv/vmbus/hyperv_mmu.c +++ b/sys/dev/hyperv/vmbus/hyperv_mmu.c @@ -241,7 +241,6 @@ do_ex_hypercall: critical_exit(); return; native: - sched_unpin(); critical_exit(); return smp_targeted_tlb_shootdown_native(pmap, addr1, addr2, curcpu_cb, op); From nobody Tue Oct 1 14:06:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ09H0hDLz5XtXw; Tue, 01 Oct 2024 14:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ09G6yr8z442G; Tue, 1 Oct 2024 14:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727791587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZx/92qJeu8UNQiPu09V0i/tuz53j2wV6EDs8M6ahQY=; b=QjJVIFM/lajPxSGJMS/cOD14qjowFY+v6sDzp0qypdeJx2ygdNVLi9ZyXLIxU/nW+2ITWg p9cLtqS93TW/K+bBRGGo6JFMIarjYTxGCwZXh3nRzs13SX52gMXnJYjEhdnY5CyT8oq073 QzZs9rEns/xuqI3pt6ptmONMnC52iMLqmLHzJDuKLJLLSza3jS9XvTfiz9h1FpvDjudFm8 HCl047C3SixAvwR1rHcBh/XDhmjq/ygt8AltpFh3LvxN8GakvADpNZ0S4532CGoqTD6njn 8g/CaZMu5SnCJOCbskJk3WxG5Ruz68iVvQ0FaNecHxTh3/eLiuOHtj1WlGUVOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727791587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZx/92qJeu8UNQiPu09V0i/tuz53j2wV6EDs8M6ahQY=; b=m9mibV8VUvjsQg/ksXu1P5mTdKrYl91NiL35MYcWnDDvAR/65/st2wyBOj0heQ0tDNAsll dS+xFxsJzPOCGp4/yZdSMy8iDjYI0me3NaWCUTT0lfKFHQgm9I5EycpgLZ8vpJJFdhqq9c SFg3vjp8ELYLzd7BlmWtvvh5X5Ip9IjFO6fLUB+twIqTQmi6Fo5aEcBQiUUGPHNw08c7Wv 5RxjaWztLut2RiLGtw4sey3LqW6sD/5725DbwaB5Cw0Xrh+N0mX64yn9rjiuBirzogoV4T RWMLK6dFl1IVxUzo/gfMw3e/IYRSM7J6ccPZ3gP+J4BM20xwgQYZZwdIN9p2QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727791587; a=rsa-sha256; cv=none; b=rwLrWZAgX7G4Eg4qZToGBJOZ8VJpYlWkCBGpJQfcJjm6A4CRvTDnzcnHxYP09DMjHe2CW8 //iA2LO263/vqAqUUUvu16nBVzP80QrNVlS8GkX24GzYt6wNj5TOx8/16sTOp2MuxA8sWe zDKfgObgL8SMOwzA8wlNY+LVLnP/KafpnVj/rYJoFUDEuyJxuv2MHWgrOsTRtJf49uYbUh xJFZPa2fM08uw3c2tflX6dijU7o20kwui0rHDwt5zhjNuqzMjIzqSOh8LG1MEJH/dNRt9O TeZmmKfpJReUrZelaRrfbHT0XPS6jBHEb5d0YjbLPukOkFaPZg0kg5jvbwySIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ09G6RPNzgby; Tue, 1 Oct 2024 14:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491E6Qej023782; Tue, 1 Oct 2024 14:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491E6Q09023780; Tue, 1 Oct 2024 14:06:26 GMT (envelope-from git) Date: Tue, 1 Oct 2024 14:06:26 GMT Message-Id: <202410011406.491E6Q09023780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 215fd38e2915 - main - ctl: skip the test if ctladm is missing (WITHOUT_ISCSI) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 215fd38e2915d142cb4b0245f137329ef4da5a12 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=215fd38e2915d142cb4b0245f137329ef4da5a12 commit 215fd38e2915d142cb4b0245f137329ef4da5a12 Author: Olivier Cochard AuthorDate: 2024-10-01 13:59:47 +0000 Commit: Olivier Cochard CommitDate: 2024-10-01 13:59:47 +0000 ctl: skip the test if ctladm is missing (WITHOUT_ISCSI) Reviewed by: asomers Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46853 --- tests/sys/cam/ctl/prevent.sh | 10 +++++----- tests/sys/cam/ctl/read_buffer.sh | 10 +++++----- tests/sys/cam/ctl/start_stop_unit.sh | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/sys/cam/ctl/prevent.sh b/tests/sys/cam/ctl/prevent.sh index a5a187dad8ff..315bedc39581 100644 --- a/tests/sys/cam/ctl/prevent.sh +++ b/tests/sys/cam/ctl/prevent.sh @@ -36,7 +36,7 @@ allow_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } allow_body() { @@ -63,7 +63,7 @@ allow_idempotent_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } allow_idempotent_body() { @@ -89,7 +89,7 @@ nonremovable_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL may not be used on non-removable media" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent + atf_set "require.progs" "sg_prevent ctladm" } nonremovable_body() { @@ -108,7 +108,7 @@ prevent_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } prevent_body() { @@ -130,7 +130,7 @@ prevent_idempotent_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } prevent_idempotent_body() { diff --git a/tests/sys/cam/ctl/read_buffer.sh b/tests/sys/cam/ctl/read_buffer.sh index e54b0dadc134..98515943dd40 100644 --- a/tests/sys/cam/ctl/read_buffer.sh +++ b/tests/sys/cam/ctl/read_buffer.sh @@ -35,7 +35,7 @@ basic_head() { atf_set "descr" "READ BUFFER can retrieve data previously written by WRITE BUFFER" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer sg_write_buffer + atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm" } basic_body() { @@ -66,7 +66,7 @@ desc_head() { atf_set "descr" "READ BUFFER can retrieve the buffer size via the DESCRIPTOR mode" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer + atf_set "require.progs" "sg_read_buffer ctladm" } desc_body() { @@ -84,7 +84,7 @@ length_head() { atf_set "descr" "READ BUFFER can limit its length with the LENGTH field" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer sg_write_buffer + atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm" } length_body() { @@ -113,7 +113,7 @@ offset_head() { atf_set "descr" "READ BUFFER accepts the BUFFER OFFSET field" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer sg_write_buffer + atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm" } offset_body() { @@ -142,7 +142,7 @@ uninitialized_head() { atf_set "descr" "READ BUFFER buffers are zero-initialized" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer + atf_set "require.progs" "sg_read_buffer ctladm" } uninitialized_body() { diff --git a/tests/sys/cam/ctl/start_stop_unit.sh b/tests/sys/cam/ctl/start_stop_unit.sh index 163011c8f574..a1160b35e4a7 100644 --- a/tests/sys/cam/ctl/start_stop_unit.sh +++ b/tests/sys/cam/ctl/start_stop_unit.sh @@ -40,7 +40,7 @@ eject_head() { atf_set "descr" "START STOP UNIT can eject a CDROM device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } eject_body() { @@ -68,7 +68,7 @@ load_head() { atf_set "descr" "START STOP UNIT can load a CDROM device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } load_body() { @@ -97,7 +97,7 @@ start_head() { atf_set "descr" "START STOP UNIT can start a device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } start_body() { @@ -123,7 +123,7 @@ stop_head() { atf_set "descr" "START STOP UNIT can stop a device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } stop_body() { From nobody Tue Oct 1 15:30:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ22M0GYlz5Y0Hx; Tue, 01 Oct 2024 15:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ22L6m6Gz4Bsj; Tue, 1 Oct 2024 15:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mbYlegZVcVFqS5Dfq1QYJaCvFDY6azlIKFgNcWtejR8=; b=PAbso+ZWPHWGeaxUDg+OdzV38/JkpChncyA1o18tg/3Y4inII/snkDz8x7vafgpENJTFXR jI+DvuJMLNTiZVX+Juo05iKhNX/3n9UigBuO1a1nTXDjaJJDYO3hb+Cd+5w9kTAGJuse/C EHpxVYhTMKXMMasOs/dfBW6odHW+zxN8Mnxbz/4405RIeHuYY+7/ZNZtkJuocA/yQ6cKhG JOd+9WePrULwZ3EAZWm2VSvt7ZPDUoxPOtmrMUMSM6nPbHIdgzlbt4bEAJ3n/cNKVT6azt cLi9s+Q05MR9jiXsvuR6WeEy5SkEE2XRQN18Z8RCUeKE2WiUHhITVo9bPPyuaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mbYlegZVcVFqS5Dfq1QYJaCvFDY6azlIKFgNcWtejR8=; b=iR20QJA0h/Qa/IYEJJt32I7EO/AL0kO5xpjVmDoNW53KSC9C/HA+ArWmpCQXcX02LUkehC jdCLtWlQp+QJOENOgf56A/COPhnaISHKS9f4GhGrydhAYEgHUzU3g5rgNF6oEs7f865+fF tu5i95pBRCxIYVw6svx8IHU0bSVGpoP8oZ+FVeTmbQklhJ1epGCmSgxabTTtSKXILCOEI6 GSyQ9FoSVinU7vr8fLALZVRPo38coyaMTy1iTH1ElVQO1JQkLBuQmBZxId5MXGwKK993fj XKu+JzpD74yJSvebGjElp39gq10XWxN0dx7b+131EQWNqor1DbsCN5PV6yEV7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727796634; a=rsa-sha256; cv=none; b=A81oGFpRmBwPKBeu2wBBLYCBCPr+DFT3jZwSEiQNJussTgUqY/xqxF4iCGM3o+xgmtrkkO PEJtxEoq+m5D+tVY5m0ZAuewf0SkiDmfwyjoOxIj0A4KsuPUIxbxk9nM6ENEYJNiIuV3HT NvWXwVHKQ3FoSGqh4c52t1TyhIQ5G52F8Af8wPienw7vCD0wvZEuMiCmNokHd8yqYiuRDl Bum5xwK/kEkbeZRDPgGes9jQnL2rLlFtnkinTO47VjQpd2ANAqWDnd2+fTjrFfsxQl73Sv OlYdt7pg8Hka65P9nDbffesCvn7flkUGRAi+QJNVcRC4OzaPG5140HKNBWL4rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ22L641Yzk4n; Tue, 1 Oct 2024 15:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491FUYF6067211; Tue, 1 Oct 2024 15:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491FUYjh067208; Tue, 1 Oct 2024 15:30:34 GMT (envelope-from git) Date: Tue, 1 Oct 2024 15:30:34 GMT Message-Id: <202410011530.491FUYjh067208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 941f8aceac1b - main - hhook: Sprinkle const qualifiers where appropriate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 941f8aceac1b6c16ca4d96b52e60ab437c4f9207 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=941f8aceac1b6c16ca4d96b52e60ab437c4f9207 commit 941f8aceac1b6c16ca4d96b52e60ab437c4f9207 Author: Zhenlei Huang AuthorDate: 2024-10-01 15:28:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-01 15:28:37 +0000 hhook: Sprinkle const qualifiers where appropriate No functional change intended. MFC after: 1 week --- sys/kern/kern_hhook.c | 8 ++++---- sys/sys/hhook.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_hhook.c b/sys/kern/kern_hhook.c index 602cd28990f0..7085ac717b26 100644 --- a/sys/kern/kern_hhook.c +++ b/sys/kern/kern_hhook.c @@ -127,7 +127,7 @@ hhook_run_hooks(struct hhook_head *hhh, void *ctx_data, struct osd *hosd) * Register a new helper hook function with a helper hook point. */ int -hhook_add_hook(struct hhook_head *hhh, struct hookinfo *hki, uint32_t flags) +hhook_add_hook(struct hhook_head *hhh, const struct hookinfo *hki, uint32_t flags) { struct hhook *hhk, *tmp; int error; @@ -184,7 +184,7 @@ hhook_add_hook(struct hhook_head *hhh, struct hookinfo *hki, uint32_t flags) * struct in the array. */ int -hhook_add_hook_lookup(struct hookinfo *hki, uint32_t flags) +hhook_add_hook_lookup(const struct hookinfo *hki, uint32_t flags) { struct hhook_head **heads_to_hook, *hhh; int error, i, n_heads_to_hook; @@ -242,7 +242,7 @@ tryagain: * Remove a helper hook function from a helper hook point. */ int -hhook_remove_hook(struct hhook_head *hhh, struct hookinfo *hki) +hhook_remove_hook(struct hhook_head *hhh, const struct hookinfo *hki) { struct hhook *tmp; @@ -269,7 +269,7 @@ hhook_remove_hook(struct hhook_head *hhh, struct hookinfo *hki) * virtual instances of the hook point if it is virtualised). */ int -hhook_remove_hook_lookup(struct hookinfo *hki) +hhook_remove_hook_lookup(const struct hookinfo *hki) { struct hhook_head *hhh; diff --git a/sys/sys/hhook.h b/sys/sys/hhook.h index 084023ccb546..f83389fec2e3 100644 --- a/sys/sys/hhook.h +++ b/sys/sys/hhook.h @@ -107,14 +107,14 @@ struct hhook_head { /* Public KPI functions. */ void hhook_run_hooks(struct hhook_head *hhh, void *ctx_data, struct osd *hosd); -int hhook_add_hook(struct hhook_head *hhh, struct hookinfo *hki, +int hhook_add_hook(struct hhook_head *hhh, const struct hookinfo *hki, uint32_t flags); -int hhook_add_hook_lookup(struct hookinfo *hki, uint32_t flags); +int hhook_add_hook_lookup(const struct hookinfo *hki, uint32_t flags); -int hhook_remove_hook(struct hhook_head *hhh, struct hookinfo *hki); +int hhook_remove_hook(struct hhook_head *hhh, const struct hookinfo *hki); -int hhook_remove_hook_lookup(struct hookinfo *hki); +int hhook_remove_hook_lookup(const struct hookinfo *hki); int hhook_head_register(int32_t hhook_type, int32_t hhook_id, struct hhook_head **hhh, uint32_t flags); From nobody Tue Oct 1 15:30:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ22N1rMWz5Y0Yl; Tue, 01 Oct 2024 15:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ22N1D2cz4CpG; Tue, 1 Oct 2024 15:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7i6WNlGFjSQxOAxfaZHHe9ghity9tAn31xpY8Wph1E=; b=eWY/mnMHL8K9Da7p+++JtCXEkf6YDPbw4dxGPwEtgH+A5ddsXdteacGhUG3uHXO9G2UgWR K1pn2omOZ9dMLDNQpGUXtA4WcWhwdZcgOWsObU5xL50ppwOwxhgDTnoofv4SeqtWt8Aubk Gs0rRrNrnUdlo2phTIAXuTh7HrIYD9v8q7LpQogE/2EiQ5MCBz2dvvaX38S7Ro5gTHZdx+ 4j66X/8OXhuX5r4e9TPohl4hYrXqpNfWiMH9Gq3+9OKQL7DHS6N6Py1o3PLzKugWWslnQ2 uLocPUn7cM8QxvgDd2ztdRFGL0cXZGFzsNVKVnNgf2j4/mQWWQG8fEv534p0lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7i6WNlGFjSQxOAxfaZHHe9ghity9tAn31xpY8Wph1E=; b=r4X6KupIOyz5ItJ/YOms7UkpOF6Tw+fPUSMKvowKxcQKz4qcoiaBc2zo/3IUQ4IUeGqyOU iSmfgF0gNrgsQQnhIHoIcgOg1igskPgxtEkmvrrdC42Ob/jG9F3JjObQD6lyIUswRHGTXg sxQjn1Z5YsSqQTRJQdPg82rrGTbKgIGTXZ1vP+bwG1EZc76gQXSfCww8hiL1htPrZJiD0x DRDjnyvCd4/6gYObkBWrMffrU5/IzBdjmDoqbHbfTFm4OAgJ6EBN5P95csFtzxLG1N+Vux ZYE9BrKT4XmEQNxsPFTaKjm5NOxHg9v/1GxZ9svLuaHxbnZkLnFRu8xJKGjqpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727796636; a=rsa-sha256; cv=none; b=J5EJdKVdDLdmt2J1/oXK9FYDcfmWVLvCq04FF06NBK2kw1FGmNtEY/Z73S0M5Nyjx4gExp szNIs+uXT4RqhS5VoRgyE9WmkzqyyNZI2m1TXcN+hR3V9pZVwdE1WMUsXdnkyTxIvsGdIU NRP/Hu14MJHuNe88tnPjIx1nB+v1wFWsRNSZXmOt2hTMBtrbJm8jtPodjXC25Ejl7Ia8yy e7lShj0oByj3FKTjKn7ILyqWQhWwCXdoGH1cQ/zQ7T570qNaVk1CdwJ70kqRu8AHXNFbU4 o4lz07MsbyN4YW66hlkhYnuXGIaVDxZ3QN9WkSqK075cW54M4NFuZLX19EbRXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ22N0LpgzjY4; Tue, 1 Oct 2024 15:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491FUZub067259; Tue, 1 Oct 2024 15:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491FUZrL067256; Tue, 1 Oct 2024 15:30:35 GMT (envelope-from git) Date: Tue, 1 Oct 2024 15:30:35 GMT Message-Id: <202410011530.491FUZrL067256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 89937323bddd - main - khelp: Sprinkle const qualifiers where appropriate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89937323bddd41fd8b92430c3ece48d3e32c2c23 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=89937323bddd41fd8b92430c3ece48d3e32c2c23 commit 89937323bddd41fd8b92430c3ece48d3e32c2c23 Author: Zhenlei Huang AuthorDate: 2024-10-01 15:28:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-01 15:28:37 +0000 khelp: Sprinkle const qualifiers where appropriate No functional change intended. MFC after: 1 week --- share/man/man9/khelp.9 | 6 +++--- sys/kern/kern_khelp.c | 4 ++-- sys/sys/khelp.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man9/khelp.9 b/share/man/man9/khelp.9 index 39515eef237c..d619f385d513 100644 --- a/share/man/man9/khelp.9 +++ b/share/man/man9/khelp.9 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2011 +.Dd October 1, 2024 .Dt KHELP 9 .Os .Sh NAME @@ -48,8 +48,8 @@ .Fn "int khelp_destroy_osd" "struct osd *hosd" .Fn "int32_t khelp_get_id" "char *hname" .Fn "void * khelp_get_osd" "struct osd *hosd" "int32_t id" -.Fn "int khelp_add_hhook" "struct hookinfo *hki" "uint32_t flags" -.Fn "int khelp_remove_hhook" "struct hookinfo *hki" +.Fn "int khelp_add_hhook" "const struct hookinfo *hki" "uint32_t flags" +.Fn "int khelp_remove_hhook" "const struct hookinfo *hki" .Fn KHELP_DECLARE_MOD "hname" "hdata" "hhooks" "version" .Fn KHELP_DECLARE_MOD_UMA "hname" "hdata" "hhooks" "version" "ctor" "dtor" .Sh DESCRIPTION diff --git a/sys/kern/kern_khelp.c b/sys/kern/kern_khelp.c index 1ab56780f394..4a7e93ff69fa 100644 --- a/sys/kern/kern_khelp.c +++ b/sys/kern/kern_khelp.c @@ -253,7 +253,7 @@ khelp_get_id(char *hname) } int -khelp_add_hhook(struct hookinfo *hki, uint32_t flags) +khelp_add_hhook(const struct hookinfo *hki, uint32_t flags) { int error; @@ -267,7 +267,7 @@ khelp_add_hhook(struct hookinfo *hki, uint32_t flags) } int -khelp_remove_hhook(struct hookinfo *hki) +khelp_remove_hhook(const struct hookinfo *hki) { int error; diff --git a/sys/sys/khelp.h b/sys/sys/khelp.h index 2ef45806c35a..7aadb6a58faa 100644 --- a/sys/sys/khelp.h +++ b/sys/sys/khelp.h @@ -70,8 +70,8 @@ void * khelp_get_osd(struct osd *hosd, int32_t id); int32_t khelp_get_id(char *hname); -int khelp_add_hhook(struct hookinfo *hki, uint32_t flags); +int khelp_add_hhook(const struct hookinfo *hki, uint32_t flags); -int khelp_remove_hhook(struct hookinfo *hki); +int khelp_remove_hhook(const struct hookinfo *hki); #endif /* _SYS_KHELP_H_ */ From nobody Tue Oct 1 15:30:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ22P40qKz5Y0Yn; Tue, 01 Oct 2024 15:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ22P1zLDz4Cm7; Tue, 1 Oct 2024 15:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lyKzQ1ZOn+kHbJhM65fuPF9pzuxe33U7D6Ui8bt9IYk=; b=wIAjK69jVT4zAbUK6NPwRVdDvdTziIDoltgvVLfReIZMP4VK1mHOKaQa43j8k5QTU/zE1A Uc1Sexm4lkA116lHtt+Vka2K5DUvR3Ox5hxywdfkbMLj+0A4mP7YFLCuwKzfZJ7oMcoQo9 T7daobPwhbBSnYFLrIGbBnVCah28qI8uMGlNCq8Gah3KhjtpF6ah8yTV0Mr+2RBfIFLKbm PcquBGzFoC35g3ANDdBItHWYNM7tJnv++envmvpYydiBqHTdpsYQhvceCKj/vDrXJnBQmK LjMomSz4wUCtDLVyLLFzJ7bRVKshhGeB0xAWdMeHQk8wTQxgvmjxOHSlIIcp8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lyKzQ1ZOn+kHbJhM65fuPF9pzuxe33U7D6Ui8bt9IYk=; b=U4Y+lBINQ9hI7mwVSE2gdjjD8Zc0KPnsL3L3BhjbcRoVMnI3ZLanPYyRgHQYqSdY+pYAcz WJmeiABMicAznoryvRq5yN2PZ0vP9i75i/ovNawkN6HM4srFmF3HDYV2lsMr3zPMmdIItY ZIjezksQKqmThXZ55K8lyk5sIW3nX5CVXhbvl3s+HzH4X3mB+SygnvEZIzKXPfdFuwV/c2 bEyNF81Cy82ariGDKyWYEfruK1MM2O+qgHWYC4P8P7Fa0MSwNbi/rkeSaBcdeTdhmCTEML zQy5KBnbSwQ76+iLcPX0RIHfQ0sqB63inMfCAB1QJgnh/kfLM1O2LSfHP3gnjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727796637; a=rsa-sha256; cv=none; b=gjGc1VlSPbnuA0mVzpx3eeJ2lYctwL5Jr5/cusqrIIaugIwIDuKCxDG9NFEER86BEJRlAg 60qYZigCwf8zML0a+NS4lLIT+jS6d9AETeYIjeZjYr7BjRBzP/n1/0QZwuM62T4pVw2jB9 +u4+5XodlDPoSMI1dEikoXxuywR/F2KY2CDLhsQVHl3DmirtcYv5F13HE2Vh0ysGs3dj3x v0lz3j4wskxYxmDe/hMfCwriY9exf70JlG9JvnCBcCIFrscDM2eHqFnixeVPlJaZrfog84 Jw+J0T5KBwuu8Mp9xvpenArr9gKEMsh8AI99Ot1Q7VNKAe+vJ912QY19zuMmiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ22P1HWZzk4p; Tue, 1 Oct 2024 15:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491FUboM067301; Tue, 1 Oct 2024 15:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491FUb7V067298; Tue, 1 Oct 2024 15:30:37 GMT (envelope-from git) Date: Tue, 1 Oct 2024 15:30:37 GMT Message-Id: <202410011530.491FUb7V067298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 7643141e9314 - main - if_enc(4): Make enc_add_hhooks() void List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7643141e9314f1eac0d9ac08457410509e6829ad Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7643141e9314f1eac0d9ac08457410509e6829ad commit 7643141e9314f1eac0d9ac08457410509e6829ad Author: Zhenlei Huang AuthorDate: 2024-10-01 15:28:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-01 15:28:37 +0000 if_enc(4): Make enc_add_hhooks() void As for the consumer `enc_add_hhooks()`, `hhook_add_hook()` will never fail for the given parameters. Meanwhile, to build the module if_enc(4), at least option INET or INET6 is required, so no need for the error EPFNOSUPPORT. No functional change intended. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46770 --- sys/net/if_enc.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 18587dc1cb46..3c7ae38324c3 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -96,7 +96,7 @@ static int enc_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); static int enc_clone_create(struct if_clone *, int, caddr_t); static void enc_clone_destroy(struct ifnet *); -static int enc_add_hhooks(struct enc_softc *); +static void enc_add_hhooks(struct enc_softc *); static void enc_remove_hhooks(struct enc_softc *); static const char encname[] = "enc"; @@ -315,13 +315,12 @@ enc_hhook(int32_t hhook_type, int32_t hhook_id, void *udata, void *ctx_data, return (0); } -static int +static void enc_add_hhooks(struct enc_softc *sc) { struct hookinfo hki; - int error; + int error __diagused; - error = EPFNOSUPPORT; hki.hook_func = enc_hhook; hki.hook_helper = NULL; hki.hook_udata = sc; @@ -330,28 +329,23 @@ enc_add_hhooks(struct enc_softc *sc) hki.hook_type = HHOOK_TYPE_IPSEC_IN; error = hhook_add_hook(V_ipsec_hhh_in[HHOOK_IPSEC_INET], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); hki.hook_type = HHOOK_TYPE_IPSEC_OUT; error = hhook_add_hook(V_ipsec_hhh_out[HHOOK_IPSEC_INET], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); #endif #ifdef INET6 hki.hook_id = AF_INET6; hki.hook_type = HHOOK_TYPE_IPSEC_IN; error = hhook_add_hook(V_ipsec_hhh_in[HHOOK_IPSEC_INET6], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); hki.hook_type = HHOOK_TYPE_IPSEC_OUT; error = hhook_add_hook(V_ipsec_hhh_out[HHOOK_IPSEC_INET6], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); #endif - return (error); } static void @@ -394,8 +388,7 @@ vnet_enc_init_proto(void *unused __unused) { KASSERT(V_enc_sc != NULL, ("%s: V_enc_sc is %p\n", __func__, V_enc_sc)); - if (enc_add_hhooks(V_enc_sc) != 0) - enc_clone_destroy(V_enc_sc->sc_ifp); + enc_add_hhooks(V_enc_sc); } VNET_SYSINIT(vnet_enc_init_proto, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, vnet_enc_init_proto, NULL); From nobody Tue Oct 1 15:34:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ2772Ttgz5Y0sB; Tue, 01 Oct 2024 15:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ2771lbkz4Fkc; Tue, 1 Oct 2024 15:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuB1cSxMXAUm6x1t2cGNMwrRz2dOZHtdjSfI7v7ksFM=; b=dIk3kP+tGRjXWEcKLpPGyPw8vReDJj0CcuWsRtgI9KFYo+XK0BgpwRN7KiaOwmxMxHPkFZ nnFD+0NRe23h+dIw0p+qmAOigXhOIVGcWFrHInNrHA3O1oTgpUUQTwh7Bs/QebDzZcMjWR Jg7qJAL4PJvpU32tVkwPByqg0jJWRgVmgCZDkzsJpvW1VX8qW6CYg/YB+uNht6kp5n71vR 6FqqFYKCAwk9uPMHelyF93KzTvMnCcBmtpflMN/Fyewz2fyVsNdXieeczqQXTe//wAp4db jqlTH2IQCt2k84BS5GFxFllfQJmAiB5EZyk/GETqA0a+6TT5KQc084XsD50EvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727796883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuB1cSxMXAUm6x1t2cGNMwrRz2dOZHtdjSfI7v7ksFM=; b=UEN1Eye7UveajmE53bzMMdRXF7oNhmdUQEuiATw8sIN1UYJ2UjSuOZizdKTKQrCG014ye+ FgspVX3vbg624vImKTs3tANfrvnAPJjEugaNEjuUJwr78loUBGfUFQwbca1D9VcJUFLIXy e/oqqTwGCIJsNuAjpVUxMa0Yoch9f9bOlP9WZHjFwdttZrCsZIX+AkHnYpyXpjus7Wl0/z eUA2aaVD7dvhIlBNjFGFu52BeYZmCJEJnDl7X30ydHhvZjwVbBqinhwVduhQbZxyfJU9wN pEKFglB/hwKjkW8PCNMXF8heXG0V8Fcag8zZMVEN/i8XaR5gvqoBmL3pZ6bzxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727796883; a=rsa-sha256; cv=none; b=HQjGz1pvNnwG5nHqf/2WBFlXlUCzHZ1au4yGzOiEHBWb+G8EbiI+D9mROiXqlAluSMVkIH 5Uw5h+QiQtClCuxDzfW+f4+AOBVpB1Nz1ICcLsxoq7uEwLEoopV/XZEmivJinPXPVdQCgj LPxRGiEPc4/eOALmRtE7YEqTFVO2PSEQXh9gzqdSLV5PETc6q8vEHmD2GIb2zPTs3D+4g9 iG10sGkLNlnkCDFRB9O4h3vkWZP+ARWyxdWflLYNhpWBpqzcWXcT91BU76Jd8Kx3RVA1vY XFLV8eUP3lmqryKuSBpkJ3nCsbpbUqNL5uASn5ZY3FwlkWwMkEKmnBo6c/rZHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ27710lCzjxN; Tue, 1 Oct 2024 15:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491FYhYE074344; Tue, 1 Oct 2024 15:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491FYhdV074341; Tue, 1 Oct 2024 15:34:43 GMT (envelope-from git) Date: Tue, 1 Oct 2024 15:34:43 GMT Message-Id: <202410011534.491FYhdV074341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 2eacb0841c7d - main - tcp: small cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2eacb0841c7dfc92030abc433e53cd31383a0648 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2eacb0841c7dfc92030abc433e53cd31383a0648 commit 2eacb0841c7dfc92030abc433e53cd31383a0648 Author: Michael Tuexen AuthorDate: 2024-10-01 15:32:18 +0000 Commit: Michael Tuexen CommitDate: 2024-10-01 15:34:35 +0000 tcp: small cleanup No functional change intended. Reviewed by: cc, glebius, markj, rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46850 --- sys/netinet/tcp_syncache.c | 59 ++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index cb175d07c4d2..d0068a9d313b 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1567,49 +1567,46 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, goto donenoprobe; } - if (tfo_cookie_valid) { - bzero(&scs, sizeof(scs)); - sc = &scs; - goto skip_alloc; - } - + KASSERT(sc == NULL, ("sc(%p) != NULL", sc)); /* * Skip allocating a syncache entry if we are just going to discard * it later. */ - if (!locked) { + if (!locked || tfo_cookie_valid) { bzero(&scs, sizeof(scs)); sc = &scs; - } else - sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO); - if (sc == NULL) { - /* - * The zone allocator couldn't provide more entries. - * Treat this as if the cache was full; drop the oldest - * entry and insert the new one. - */ - TCPSTAT_INC(tcps_sc_zonefail); - if ((sc = TAILQ_LAST(&sch->sch_bucket, sch_head)) != NULL) { - sch->sch_last_overflow = time_uptime; - syncache_drop(sc, sch); - syncache_pause(inc); - } + } else { sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO); if (sc == NULL) { - if (V_tcp_syncookies) { - bzero(&scs, sizeof(scs)); - sc = &scs; - } else { - KASSERT(locked, - ("%s: bucket unexpectedly unlocked", - __func__)); - SCH_UNLOCK(sch); - goto done; + /* + * The zone allocator couldn't provide more entries. + * Treat this as if the cache was full; drop the oldest + * entry and insert the new one. + */ + TCPSTAT_INC(tcps_sc_zonefail); + sc = TAILQ_LAST(&sch->sch_bucket, sch_head); + if (sc != NULL) { + sch->sch_last_overflow = time_uptime; + syncache_drop(sc, sch); + syncache_pause(inc); + } + sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO); + if (sc == NULL) { + if (V_tcp_syncookies) { + bzero(&scs, sizeof(scs)); + sc = &scs; + } else { + KASSERT(locked, + ("%s: bucket unexpectedly unlocked", + __func__)); + SCH_UNLOCK(sch); + goto done; + } } } } -skip_alloc: + KASSERT(sc != NULL, ("sc == NULL")); if (!tfo_cookie_valid && tfo_response_cookie_valid) sc->sc_tfo_cookie = &tfo_response_cookie; From nobody Tue Oct 1 16:11:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ2y46VF4z5Y2jD; Tue, 01 Oct 2024 16:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ2y461H1z4JFd; Tue, 1 Oct 2024 16:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727799116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PaTZtMXtdAHBuotKu/s8JT/e+Pu094GCrgBt+mEIYfE=; b=W33xaLbLyembGvT6V5xuUza5m6WmwfjuWUlcRqGWSW1ACwJP+5f5iblz5VNXwR7sI3mQpK nNHCpoL0CyVl3Cewtf49nEPgZWCoDzhXYxhqYpm0VWhFzmC8aFSY28ILcEB3CeVoM7B/yy ztL6Ih/O4KCB6Ni/JEb+V3a8l29Xiz/Lqk8m23BSyxibrtJanDNJzohPyfCdn/MsJWnRw8 GRUAPhgQW6o3MW5QaZo9riFK1ydxQDqVspV0vYoh+oBAqcMtU6Xbsbe+Fb7cb5p8fl3hhI PyshWbRIr1ro+Ay/SLZzUQjR5CNbVMetGbh6i8kRVkF22X6cQF9oPB3EFRhOPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727799116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PaTZtMXtdAHBuotKu/s8JT/e+Pu094GCrgBt+mEIYfE=; b=oqzvxivlGzsw1Vaj0VGgeu1lo7tCUXhGQe1jXnDmNs5BJzRgMQr3BLcY06+kXSYJiTimCF kDx/VAtHb4ZhlyM/7+3IcnoKDXqr9wwlYirVPgrbnNFK3rsSm3/SsRL55m1dbEYvCDvCYX 0wTtWI2lmesD9E89QCMno/XNfS9PPsmr0bG58r5RrTSiil1CpqnB1XdFhxMzZjZKmc2oCY 25WGIbHMWo6Akdm/29GZyCZ+1sa3sj54bNPOj3yajo80uFr/N5PBATLfJBWL+skEm6FqAD 64n2jRYmjHvI645yl78yqc0UkN4Xfk2U/GMCB+gkTf6pzkg5QmDb/43CiK2ifw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727799116; a=rsa-sha256; cv=none; b=gKKplz+wGjiRXWjD84Jo9NUsjw0mEwMwf/NMTMjBZaf4pWZkxVm9BuUTxUiis53AV4w1Xx KGZQfwm+2nNUZGCjlRB8dliYtOueBSWG6FKzIiz3E7O/b9T7KS/59BBK5gFfP5Iuz8Jxcx kUDQVCm5tDbfdRPs4JR24JOQ2z4oaDDQyLi+A98LAd4tluB7alKTMhgnaOscd5mt6tehoO WSnaKLF9gTQ10F4aEk9PC+eYrWOVcF3HhJnhFEr8w14DYoMkeZs7OfvV4JSY62oDtcM79d paHv9GUpAGKkfoTyYAtSkZZSSVs2TIVqcFL42kPYKCdYwiFfqzaNs8MveZzCsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ2y45dMNzkYd; Tue, 1 Oct 2024 16:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491GBuNQ037539; Tue, 1 Oct 2024 16:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491GBuXs037536; Tue, 1 Oct 2024 16:11:56 GMT (envelope-from git) Date: Tue, 1 Oct 2024 16:11:56 GMT Message-Id: <202410011611.491GBuXs037536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e668866c82f4 - main - sysent: Remove comment aligning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e668866c82f487fe36c4e732e3ce18ae9c44260f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e668866c82f487fe36c4e732e3ce18ae9c44260f commit e668866c82f487fe36c4e732e3ce18ae9c44260f Author: agge3 AuthorDate: 2024-09-25 10:49:04 +0000 Commit: Brooks Davis CommitDate: 2024-10-01 16:08:41 +0000 sysent: Remove comment aligning Comment aligning was inconsistent and required a ton of book-keeping. Replaced comment aligning with a simple, single tab out. Pull Request: https://github.com/freebsd/freebsd-src/pull/1441 Signed-off-by: agge3 --- sys/tools/makesyscalls.lua | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index a87c8c421313..fcabe8e5e284 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -637,15 +637,6 @@ local function get_mask_pat(pflags) return mask end -local function align_sysent_comment(col) - write_line("sysent", "\t") - col = col + 8 - col % 8 - while col < 56 do - write_line("sysent", "\t") - col = col + 8 - end -end - local function strip_arg_annotations(arg) arg = arg:gsub("_Contains_[^ ]*[_)] ?", "") arg = arg:gsub("_In[^ ]*[_)] ?", "") @@ -888,20 +879,17 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, write_line("sysent", string.format("\t{ .sy_narg = %s, .sy_call = (sy_call_t *)", argssize)) - local column = 8 + 2 + #argssize + 15 if flags & known_flags.SYSMUX ~= 0 then write_line("sysent", string.format( "nosys, .sy_auevent = AUE_NULL, " .. ".sy_flags = %s, .sy_thrcnt = SY_THR_STATIC },", sysflags)) - column = column + #"nosys" + #"AUE_NULL" + 3 elseif flags & known_flags.NOSTD ~= 0 then write_line("sysent", string.format( "lkmressys, .sy_auevent = AUE_NULL, " .. ".sy_flags = %s, .sy_thrcnt = SY_THR_ABSENT },", sysflags)) - column = column + #"lkmressys" + #"AUE_NULL" + 3 else if funcname == "nosys" or funcname == "lkmnosys" or funcname == "sysarch" or funcname:find("^freebsd") or @@ -909,17 +897,14 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, write_line("sysent", string.format( "%s, .sy_auevent = %s, .sy_flags = %s, .sy_thrcnt = %s },", funcname, auditev, sysflags, thr_flag)) - column = column + #funcname + #auditev + #sysflags + 3 else write_line("sysent", string.format( "sys_%s, .sy_auevent = %s, .sy_flags = %s, .sy_thrcnt = %s },", funcname, auditev, sysflags, thr_flag)) - column = column + #funcname + #auditev + #sysflags + 7 end end - align_sysent_comment(column) - write_line("sysent", string.format("/* %d = %s */\n", + write_line("sysent", string.format("\t/* %d = %s */\n", sysnum, funcalias)) write_line("sysnames", string.format("\t\"%s\",\t\t\t/* %d = %s */\n", funcalias, sysnum, funcalias)) @@ -987,9 +972,8 @@ local function handle_obsol(sysnum, funcname, comment) write_line("sysent", "\t{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, " .. ".sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },") - align_sysent_comment(34) - write_line("sysent", string.format("/* %d = obsolete %s */\n", + write_line("sysent", string.format("\t/* %d = obsolete %s */\n", sysnum, comment)) write_line("sysnames", string.format( "\t\"obs_%s\",\t\t\t/* %d = obsolete %s */\n", @@ -1058,17 +1042,13 @@ local function handle_compat(sysnum, thr_flag, flags, sysflags, rettype, ".sy_auevent = %s, .sy_flags = 0, " .. ".sy_thrcnt = SY_THR_ABSENT },", "0", "lkmressys", "AUE_NULL")) - align_sysent_comment(8 + 2 + #"0" + 15 + #"lkmressys" + - #"AUE_NULL" + 3) else write_line("sysent", string.format( "\t{ %s(%s,%s), .sy_auevent = %s, .sy_flags = %s, .sy_thrcnt = %s },", wrap, argssize, funcname, auditev, sysflags, thr_flag)) - align_sysent_comment(8 + 9 + #argssize + 1 + #funcname + - #auditev + #sysflags + 4) end - write_line("sysent", string.format("/* %d = %s %s */\n", + write_line("sysent", string.format("\t/* %d = %s %s */\n", sysnum, descr, funcalias)) write_line("sysnames", string.format( "\t\"%s.%s\",\t\t/* %d = %s %s */\n", @@ -1098,7 +1078,7 @@ local function handle_unimpl(sysnum, sysstart, sysend, comment) write_line("sysent", string.format( "\t{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, " .. ".sy_auevent = AUE_NULL, .sy_flags = 0, " .. - ".sy_thrcnt = SY_THR_ABSENT },\t\t\t/* %d = %s */\n", + ".sy_thrcnt = SY_THR_ABSENT },\t/* %d = %s */\n", sysnum, comment)) write_line("sysnames", string.format( "\t\"#%d\",\t\t\t/* %d = %s */\n", From nobody Tue Oct 1 16:11:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ2y62z5vz5Y2KP; Tue, 01 Oct 2024 16:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ2y60jKSz4JM9; Tue, 1 Oct 2024 16:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727799118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AcBpQZULalJ26OioWP2SojQuTxszLcO4MJdnAuVWLq8=; b=MCqIJKy7RgMtFePn9uKofkKfbWGdASLv0FwtDvnqHefne/KwqZlB6Wama2t52ZWip8NkVP 9H2JzrPIsu0XXwicWv9S9Ajy8vIvU5c3ggoBPc7OKYFO/a55xhBQK6PtXXnZ06h1jxuX6p Q3T90/JkLNcFlcrBPydbOZuhvRBsFEvmYC4HSVpGHoIPzmIlvai9bh/15aMf03S23n+eq/ NkXK8yHQCuJGY0uOQ8sXU87+pAKN9fYxO5e8AiKX+boaXba+PkaI+W/gcT1/npvIbRdJ7W A/ERkobRmzz4NRUfH/fKIrY/TRiQHR/xzRaslCOAS5T7Pzt+7Qqthg8iiIDtvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727799118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AcBpQZULalJ26OioWP2SojQuTxszLcO4MJdnAuVWLq8=; b=DOVmzTDxM7/FIY/CvT8Q8SegbURBPG1dLb07hQ+7XITCubvPM3MsUF+ASBK9YLrL4lM53h PU9TauJnrdafOsU1nkQ0alVUgnMd4TNL5OjGeJ1zHZc0RvenXhEw6W0mGGlL5aVC6cP7rD IKVHa/oGJTmJbX0MK2VKMnnRwXyq/LMphAdqxmFImt/ssRFY5FT1KQZUqZqz90SKwpJSdV JgPzw6JTxxhRppejZosBT/JvPTHx97ya7WZfM/nR7XiQH3HSP8ZB3Ff+M3d603pH0wsBCq E6KUqjK9BhLy7KNrTr36Mq6dTR9BLLtaio4eQbUKQylPCiNmOwfAD7i+lPaIaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727799118; a=rsa-sha256; cv=none; b=b/DBCV/EidmcQMuZBXryY9y8g0lF7DiPVajVY6jE5Cx6f7+yDfBXp0z0EFhZSAxHMRx74+ g5LaU1oqVgN/LS/jtMvFNhJeOSiZuoYFhocA2fS7iM1PhnOT+N/6iJF9/WfDqC1+1jAyci zO2Am5V9iN+il3JGcOltL3kk5BPySEckbJg6EgsNshevALQh/nUx3x7Ui5I3AOX5yRdkzU 1bx8xozO/xwZdetlQbpCYAaN11Gb28Gf+Q1v3bBCl0OW1yoanPG8rlxCXCB89DuhyAN+Z2 uTU23XlVSEnKVDlBh+H00G+t6vVHWcx0vGnb0nl3Z/dFHX2e/+ZcicgL3gBepg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ2y575B7zkss; Tue, 1 Oct 2024 16:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491GBvvH037585; Tue, 1 Oct 2024 16:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491GBvGg037582; Tue, 1 Oct 2024 16:11:57 GMT (envelope-from git) Date: Tue, 1 Oct 2024 16:11:57 GMT Message-Id: <202410011611.491GBvGg037582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 13227efc5b03 - main - sysent: regen removing comment alignment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13227efc5b034bfa31c90a3b75f9d006c77c6c90 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=13227efc5b034bfa31c90a3b75f9d006c77c6c90 commit 13227efc5b034bfa31c90a3b75f9d006c77c6c90 Author: Brooks Davis AuthorDate: 2024-10-01 16:10:08 +0000 Commit: Brooks Davis CommitDate: 2024-10-01 16:10:08 +0000 sysent: regen removing comment alignment --- sys/amd64/linux/linux_sysent.c | 212 ++++++++++----------- sys/amd64/linux32/linux32_sysent.c | 90 ++++----- sys/arm64/linux/linux_sysent.c | 314 ++++++++++++++++---------------- sys/compat/freebsd32/freebsd32_sysent.c | 242 ++++++++++++------------ sys/i386/linux/linux_sysent.c | 78 ++++---- sys/kern/init_sysent.c | 204 ++++++++++----------- 6 files changed, 570 insertions(+), 570 deletions(-) diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c index e5a0ff377de5..8413d2723551 100644 --- a/sys/amd64/linux/linux_sysent.c +++ b/sys/amd64/linux/linux_sysent.c @@ -148,7 +148,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_sigaltstack_args), .sy_call = (sy_call_t *)linux_sigaltstack, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 131 = linux_sigaltstack */ { .sy_narg = AS(linux_utime_args), .sy_call = (sy_call_t *)linux_utime, .sy_auevent = AUE_UTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 132 = linux_utime */ { .sy_narg = AS(linux_mknod_args), .sy_call = (sy_call_t *)linux_mknod, .sy_auevent = AUE_MKNOD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 133 = linux_mknod */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 134 = uselib */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 134 = uselib */ { .sy_narg = AS(linux_personality_args), .sy_call = (sy_call_t *)linux_personality, .sy_auevent = AUE_PERSONALITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 135 = linux_personality */ { .sy_narg = AS(linux_ustat_args), .sy_call = (sy_call_t *)linux_ustat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 136 = linux_ustat */ { .sy_narg = AS(linux_statfs_args), .sy_call = (sy_call_t *)linux_statfs, .sy_auevent = AUE_STATFS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 137 = linux_statfs */ @@ -176,7 +176,7 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_adjtimex, .sy_auevent = AUE_ADJTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 159 = linux_adjtimex */ { .sy_narg = AS(linux_setrlimit_args), .sy_call = (sy_call_t *)linux_setrlimit, .sy_auevent = AUE_SETRLIMIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 160 = linux_setrlimit */ { .sy_narg = AS(chroot_args), .sy_call = (sy_call_t *)sys_chroot, .sy_auevent = AUE_CHROOT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 161 = chroot */ - { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sync, .sy_auevent = AUE_SYNC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 162 = sync */ + { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sync, .sy_auevent = AUE_SYNC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 162 = sync */ { .sy_narg = AS(acct_args), .sy_call = (sy_call_t *)sys_acct, .sy_auevent = AUE_ACCT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 163 = acct */ { .sy_narg = AS(settimeofday_args), .sy_call = (sy_call_t *)sys_settimeofday, .sy_auevent = AUE_SETTIMEOFDAY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 164 = settimeofday */ { .sy_narg = AS(linux_mount_args), .sy_call = (sy_call_t *)linux_mount, .sy_auevent = AUE_MOUNT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 165 = linux_mount */ @@ -188,18 +188,18 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_setdomainname_args), .sy_call = (sy_call_t *)linux_setdomainname, .sy_auevent = AUE_SYSCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 171 = linux_setdomainname */ { .sy_narg = AS(linux_iopl_args), .sy_call = (sy_call_t *)linux_iopl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 172 = linux_iopl */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioperm, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 173 = linux_ioperm */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 174 = create_module */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 174 = create_module */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_init_module, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 175 = linux_init_module */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_delete_module, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 176 = linux_delete_module */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 177 = get_kernel_syms */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 178 = query_module */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 177 = get_kernel_syms */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 178 = query_module */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_quotactl, .sy_auevent = AUE_QUOTACTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 179 = linux_quotactl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 180 = nfsservctl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 181 = getpmsg */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 182 = putpmsg */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 183 = afs_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 184 = tuxcall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 185 = security */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 180 = nfsservctl */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 181 = getpmsg */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 182 = putpmsg */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 183 = afs_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 184 = tuxcall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 185 = security */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_gettid, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 186 = linux_gettid */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_readahead, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 187 = linux_readahead */ { .sy_narg = AS(linux_setxattr_args), .sy_call = (sy_call_t *)linux_setxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 188 = linux_setxattr */ @@ -219,17 +219,17 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_sys_futex_args), .sy_call = (sy_call_t *)linux_sys_futex, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 202 = linux_sys_futex */ { .sy_narg = AS(linux_sched_setaffinity_args), .sy_call = (sy_call_t *)linux_sched_setaffinity, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 203 = linux_sched_setaffinity */ { .sy_narg = AS(linux_sched_getaffinity_args), .sy_call = (sy_call_t *)linux_sched_getaffinity, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 204 = linux_sched_getaffinity */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 205 = set_thread_area */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 205 = set_thread_area */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 206 = linux_io_setup */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_destroy, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 207 = linux_io_destroy */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_getevents, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 208 = linux_io_getevents */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_submit, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 209 = linux_io_submit */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_cancel, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 210 = linux_io_cancel */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 211 = get_thread_area */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 211 = get_thread_area */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_lookup_dcookie, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 212 = linux_lookup_dcookie */ { .sy_narg = AS(linux_epoll_create_args), .sy_call = (sy_call_t *)linux_epoll_create, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 213 = linux_epoll_create */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 214 = epoll_ctl_old */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 215 = epoll_wait_old */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 214 = epoll_ctl_old */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 215 = epoll_wait_old */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_remap_file_pages, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 216 = linux_remap_file_pages */ { .sy_narg = AS(linux_getdents64_args), .sy_call = (sy_call_t *)linux_getdents64, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 217 = linux_getdents64 */ { .sy_narg = AS(linux_set_tid_address_args), .sy_call = (sy_call_t *)linux_set_tid_address, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 218 = linux_set_tid_address */ @@ -250,7 +250,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_epoll_ctl_args), .sy_call = (sy_call_t *)linux_epoll_ctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 233 = linux_epoll_ctl */ { .sy_narg = AS(linux_tgkill_args), .sy_call = (sy_call_t *)linux_tgkill, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 234 = linux_tgkill */ { .sy_narg = AS(linux_utimes_args), .sy_call = (sy_call_t *)linux_utimes, .sy_auevent = AUE_UTIMES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 235 = linux_utimes */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 236 = vserver */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 236 = vserver */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mbind, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 237 = linux_mbind */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_set_mempolicy, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 238 = linux_set_mempolicy */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_get_mempolicy, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 239 = linux_get_mempolicy */ @@ -290,7 +290,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_set_robust_list_args), .sy_call = (sy_call_t *)linux_set_robust_list, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 273 = linux_set_robust_list */ { .sy_narg = AS(linux_get_robust_list_args), .sy_call = (sy_call_t *)linux_get_robust_list, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 274 = linux_get_robust_list */ { .sy_narg = AS(linux_splice_args), .sy_call = (sy_call_t *)linux_splice, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 275 = linux_splice */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_tee, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 276 = linux_tee */ + { .sy_narg = 0, .sy_call = (sy_call_t *)linux_tee, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 276 = linux_tee */ { .sy_narg = AS(linux_sync_file_range_args), .sy_call = (sy_call_t *)linux_sync_file_range, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 277 = linux_sync_file_range */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_vmsplice, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 278 = linux_vmsplice */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_move_pages, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 279 = linux_move_pages */ @@ -349,95 +349,95 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_statx_args), .sy_call = (sy_call_t *)linux_statx, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 332 = linux_statx */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 333 = linux_io_pgetevents */ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 334 = linux_rseq */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 335 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 336 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 337 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 338 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 339 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 340 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 341 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 342 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 343 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 344 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 345 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 346 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 347 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 348 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 349 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 350 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 351 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 352 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 353 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 354 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 355 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 356 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 357 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 358 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 359 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 360 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 361 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 362 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 363 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 364 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 365 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 366 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 367 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 368 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 369 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 370 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 371 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 372 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 373 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 374 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 375 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 376 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 377 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 378 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 379 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 380 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 381 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 382 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 383 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 384 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 385 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 386 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 390 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 391 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 392 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 393 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 394 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 395 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 396 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 397 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 398 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 399 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 400 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 401 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 402 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 403 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 404 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 405 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 406 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 407 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 408 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 409 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 410 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 411 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 412 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 413 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 414 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 416 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 417 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 418 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 419 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 420 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 421 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 422 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 423 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 335 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 336 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 337 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 338 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 339 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 340 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 341 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 342 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 343 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 344 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 345 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 346 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 347 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 348 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 349 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 350 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 351 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 352 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 353 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 354 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 355 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 356 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 357 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 358 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 359 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 360 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 361 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 362 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 363 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 364 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 365 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 366 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 367 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 368 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 369 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 370 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 371 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 372 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 373 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 374 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 375 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 376 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 377 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 378 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 379 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 380 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 381 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 382 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 383 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 384 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 385 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 386 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 390 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 391 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 392 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 393 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 394 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 395 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 396 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 397 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 398 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 399 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 400 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 401 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 402 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 403 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 404 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 405 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 406 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 407 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 408 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 409 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 410 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 411 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 412 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 413 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 414 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 416 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 417 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 418 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 419 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 420 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 421 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 422 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 423 = nosys */ { .sy_narg = AS(linux_pidfd_send_signal_args), .sy_call = (sy_call_t *)linux_pidfd_send_signal, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 424 = linux_pidfd_send_signal */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 425 = linux_io_uring_setup */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_enter, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 426 = linux_io_uring_enter */ diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index 024bca613c11..add9844254ce 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -15,7 +15,7 @@ /* The casts are bogus but will do for now. */ struct sysent linux32_sysent[] = { - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 0 = setup */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 0 = setup */ { .sy_narg = AS(linux_exit_args), .sy_call = (sy_call_t *)linux_exit, .sy_auevent = AUE_EXIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 1 = linux_exit */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_fork, .sy_auevent = AUE_FORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 2 = linux_fork */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 3 = read */ @@ -32,7 +32,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_mknod_args), .sy_call = (sy_call_t *)linux_mknod, .sy_auevent = AUE_MKNOD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 14 = linux_mknod */ { .sy_narg = AS(linux_chmod_args), .sy_call = (sy_call_t *)linux_chmod, .sy_auevent = AUE_CHMOD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 15 = linux_chmod */ { .sy_narg = AS(linux_lchown16_args), .sy_call = (sy_call_t *)linux_lchown16, .sy_auevent = AUE_LCHOWN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 16 = linux_lchown16 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 17 = break */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 17 = break */ { .sy_narg = AS(linux_stat_args), .sy_call = (sy_call_t *)linux_stat, .sy_auevent = AUE_STAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 18 = linux_stat */ { .sy_narg = AS(linux_lseek_args), .sy_call = (sy_call_t *)linux_lseek, .sy_auevent = AUE_LSEEK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 19 = linux_lseek */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_getpid, .sy_auevent = AUE_GETPID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 20 = linux_getpid */ @@ -43,15 +43,15 @@ struct sysent linux32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_stime, .sy_auevent = AUE_SETTIMEOFDAY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 25 = linux_stime */ { .sy_narg = AS(linux_ptrace_args), .sy_call = (sy_call_t *)linux_ptrace, .sy_auevent = AUE_PTRACE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 26 = linux_ptrace */ { .sy_narg = AS(linux_alarm_args), .sy_call = (sy_call_t *)linux_alarm, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 27 = linux_alarm */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 28 = fstat */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 28 = fstat */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_pause, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 29 = linux_pause */ { .sy_narg = AS(linux_utime_args), .sy_call = (sy_call_t *)linux_utime, .sy_auevent = AUE_UTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 30 = linux_utime */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 31 = stty */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 32 = gtty */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 31 = stty */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 32 = gtty */ { .sy_narg = AS(linux_access_args), .sy_call = (sy_call_t *)linux_access, .sy_auevent = AUE_ACCESS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 33 = linux_access */ { .sy_narg = AS(linux_nice_args), .sy_call = (sy_call_t *)linux_nice, .sy_auevent = AUE_NICE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 34 = linux_nice */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 35 = ftime */ - { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sync, .sy_auevent = AUE_SYNC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 36 = sync */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 35 = ftime */ + { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sync, .sy_auevent = AUE_SYNC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 36 = sync */ { .sy_narg = AS(linux_kill_args), .sy_call = (sy_call_t *)linux_kill, .sy_auevent = AUE_KILL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 37 = linux_kill */ { .sy_narg = AS(linux_rename_args), .sy_call = (sy_call_t *)linux_rename, .sy_auevent = AUE_RENAME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 38 = linux_rename */ { .sy_narg = AS(linux_mkdir_args), .sy_call = (sy_call_t *)linux_mkdir, .sy_auevent = AUE_MKDIR, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 39 = linux_mkdir */ @@ -59,7 +59,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(dup_args), .sy_call = (sy_call_t *)sys_dup, .sy_auevent = AUE_DUP, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 41 = dup */ { .sy_narg = AS(linux_pipe_args), .sy_call = (sy_call_t *)linux_pipe, .sy_auevent = AUE_PIPE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 42 = linux_pipe */ { .sy_narg = AS(linux_times_args), .sy_call = (sy_call_t *)linux_times, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 43 = linux_times */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 44 = prof */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 44 = prof */ { .sy_narg = AS(linux_brk_args), .sy_call = (sy_call_t *)linux_brk, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 45 = linux_brk */ { .sy_narg = AS(linux_setgid16_args), .sy_call = (sy_call_t *)linux_setgid16, .sy_auevent = AUE_SETGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 46 = linux_setgid16 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_getgid16, .sy_auevent = AUE_GETGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 47 = linux_getgid16 */ @@ -68,12 +68,12 @@ struct sysent linux32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_getegid16, .sy_auevent = AUE_GETEGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 50 = linux_getegid16 */ { .sy_narg = AS(acct_args), .sy_call = (sy_call_t *)sys_acct, .sy_auevent = AUE_ACCT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 51 = acct */ { .sy_narg = AS(linux_umount_args), .sy_call = (sy_call_t *)linux_umount, .sy_auevent = AUE_UMOUNT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 52 = linux_umount */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 53 = lock */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 53 = lock */ { .sy_narg = AS(linux_ioctl_args), .sy_call = (sy_call_t *)linux_ioctl, .sy_auevent = AUE_IOCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 54 = linux_ioctl */ { .sy_narg = AS(linux_fcntl_args), .sy_call = (sy_call_t *)linux_fcntl, .sy_auevent = AUE_FCNTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 55 = linux_fcntl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 56 = mpx */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 56 = mpx */ { .sy_narg = AS(setpgid_args), .sy_call = (sy_call_t *)sys_setpgid, .sy_auevent = AUE_SETPGRP, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 57 = setpgid */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 58 = ulimit */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 58 = ulimit */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_olduname, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 59 = linux_olduname */ { .sy_narg = AS(umask_args), .sy_call = (sy_call_t *)sys_umask, .sy_auevent = AUE_UMASK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 60 = umask */ { .sy_narg = AS(chroot_args), .sy_call = (sy_call_t *)sys_chroot, .sy_auevent = AUE_CHROOT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 61 = chroot */ @@ -101,7 +101,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_symlink_args), .sy_call = (sy_call_t *)linux_symlink, .sy_auevent = AUE_SYMLINK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 83 = linux_symlink */ { .sy_narg = AS(linux_lstat_args), .sy_call = (sy_call_t *)linux_lstat, .sy_auevent = AUE_LSTAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 84 = linux_lstat */ { .sy_narg = AS(linux_readlink_args), .sy_call = (sy_call_t *)linux_readlink, .sy_auevent = AUE_READLINK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 85 = linux_readlink */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 86 = linux_uselib */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 86 = linux_uselib */ { .sy_narg = AS(swapon_args), .sy_call = (sy_call_t *)sys_swapon, .sy_auevent = AUE_SWAPON, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 87 = swapon */ { .sy_narg = AS(linux_reboot_args), .sy_call = (sy_call_t *)linux_reboot, .sy_auevent = AUE_REBOOT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 88 = linux_reboot */ { .sy_narg = AS(linux_readdir_args), .sy_call = (sy_call_t *)linux_readdir, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 89 = linux_readdir */ @@ -113,10 +113,10 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(fchown_args), .sy_call = (sy_call_t *)sys_fchown, .sy_auevent = AUE_FCHOWN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 95 = fchown */ { .sy_narg = AS(linux_getpriority_args), .sy_call = (sy_call_t *)linux_getpriority, .sy_auevent = AUE_GETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 96 = linux_getpriority */ { .sy_narg = AS(setpriority_args), .sy_call = (sy_call_t *)sys_setpriority, .sy_auevent = AUE_SETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 97 = setpriority */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 98 = profil */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 98 = profil */ { .sy_narg = AS(linux_statfs_args), .sy_call = (sy_call_t *)linux_statfs, .sy_auevent = AUE_STATFS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 99 = linux_statfs */ { .sy_narg = AS(linux_fstatfs_args), .sy_call = (sy_call_t *)linux_fstatfs, .sy_auevent = AUE_FSTATFS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 100 = linux_fstatfs */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 101 = ioperm */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 101 = ioperm */ { .sy_narg = AS(linux_socketcall_args), .sy_call = (sy_call_t *)linux_socketcall, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 102 = linux_socketcall */ { .sy_narg = AS(linux_syslog_args), .sy_call = (sy_call_t *)linux_syslog, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 103 = linux_syslog */ { .sy_narg = AS(linux_setitimer_args), .sy_call = (sy_call_t *)linux_setitimer, .sy_auevent = AUE_SETITIMER, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 104 = linux_setitimer */ @@ -127,8 +127,8 @@ struct sysent linux32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_uname, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 109 = linux_uname */ { .sy_narg = AS(linux_iopl_args), .sy_call = (sy_call_t *)linux_iopl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 110 = linux_iopl */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_vhangup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 111 = linux_vhangup */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 112 = idle */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 113 = vm86old */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 112 = idle */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 113 = vm86old */ { .sy_narg = AS(linux_wait4_args), .sy_call = (sy_call_t *)linux_wait4, .sy_auevent = AUE_WAIT4, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 114 = linux_wait4 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 115 = linux_swapoff */ { .sy_narg = AS(linux_sysinfo_args), .sy_call = (sy_call_t *)linux_sysinfo, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 116 = linux_sysinfo */ @@ -138,21 +138,21 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_clone_args), .sy_call = (sy_call_t *)linux_clone, .sy_auevent = AUE_RFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 120 = linux_clone */ { .sy_narg = AS(linux_setdomainname_args), .sy_call = (sy_call_t *)linux_setdomainname, .sy_auevent = AUE_SYSCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 121 = linux_setdomainname */ { .sy_narg = AS(linux_newuname_args), .sy_call = (sy_call_t *)linux_newuname, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 122 = linux_newuname */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 123 = modify_ldt */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 123 = modify_ldt */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_adjtimex, .sy_auevent = AUE_ADJTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 124 = linux_adjtimex */ { .sy_narg = AS(linux_mprotect_args), .sy_call = (sy_call_t *)linux_mprotect, .sy_auevent = AUE_MPROTECT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 125 = linux_mprotect */ { .sy_narg = AS(linux_sigprocmask_args), .sy_call = (sy_call_t *)linux_sigprocmask, .sy_auevent = AUE_SIGPROCMASK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 126 = linux_sigprocmask */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 127 = create_module */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 127 = create_module */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_init_module, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 128 = linux_init_module */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_delete_module, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 129 = linux_delete_module */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 130 = get_kernel_syms */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 130 = get_kernel_syms */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_quotactl, .sy_auevent = AUE_QUOTACTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 131 = linux_quotactl */ { .sy_narg = AS(getpgid_args), .sy_call = (sy_call_t *)sys_getpgid, .sy_auevent = AUE_GETPGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 132 = getpgid */ { .sy_narg = AS(fchdir_args), .sy_call = (sy_call_t *)sys_fchdir, .sy_auevent = AUE_FCHDIR, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 133 = fchdir */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_bdflush, .sy_auevent = AUE_BDFLUSH, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 134 = linux_bdflush */ { .sy_narg = AS(linux_sysfs_args), .sy_call = (sy_call_t *)linux_sysfs, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 135 = linux_sysfs */ { .sy_narg = AS(linux_personality_args), .sy_call = (sy_call_t *)linux_personality, .sy_auevent = AUE_PERSONALITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 136 = linux_personality */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 137 = afs_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 137 = afs_syscall */ { .sy_narg = AS(linux_setfsuid16_args), .sy_call = (sy_call_t *)linux_setfsuid16, .sy_auevent = AUE_SETFSUID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 138 = linux_setfsuid16 */ { .sy_narg = AS(linux_setfsgid16_args), .sy_call = (sy_call_t *)linux_setfsgid16, .sy_auevent = AUE_SETFSGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 139 = linux_setfsgid16 */ { .sy_narg = AS(linux_llseek_args), .sy_call = (sy_call_t *)linux_llseek, .sy_auevent = AUE_LSEEK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 140 = linux_llseek */ @@ -181,10 +181,10 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_mremap_args), .sy_call = (sy_call_t *)linux_mremap, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 163 = linux_mremap */ { .sy_narg = AS(linux_setresuid16_args), .sy_call = (sy_call_t *)linux_setresuid16, .sy_auevent = AUE_SETRESUID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 164 = linux_setresuid16 */ { .sy_narg = AS(linux_getresuid16_args), .sy_call = (sy_call_t *)linux_getresuid16, .sy_auevent = AUE_GETRESUID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 165 = linux_getresuid16 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 166 = vm86 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 167 = query_module */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 166 = vm86 */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 167 = query_module */ { .sy_narg = AS(linux_poll_args), .sy_call = (sy_call_t *)linux_poll, .sy_auevent = AUE_POLL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 168 = linux_poll */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 169 = nfsservctl */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 169 = nfsservctl */ { .sy_narg = AS(linux_setresgid16_args), .sy_call = (sy_call_t *)linux_setresgid16, .sy_auevent = AUE_SETRESGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 170 = linux_setresgid16 */ { .sy_narg = AS(linux_getresgid16_args), .sy_call = (sy_call_t *)linux_getresgid16, .sy_auevent = AUE_GETRESGID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 171 = linux_getresgid16 */ { .sy_narg = AS(linux_prctl_args), .sy_call = (sy_call_t *)linux_prctl, .sy_auevent = AUE_PRCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 172 = linux_prctl */ @@ -203,8 +203,8 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_capset_args), .sy_call = (sy_call_t *)linux_capset, .sy_auevent = AUE_CAPSET, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 185 = linux_capset */ { .sy_narg = AS(linux_sigaltstack_args), .sy_call = (sy_call_t *)linux_sigaltstack, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 186 = linux_sigaltstack */ { .sy_narg = AS(linux_sendfile_args), .sy_call = (sy_call_t *)linux_sendfile, .sy_auevent = AUE_SENDFILE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 187 = linux_sendfile */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 188 = getpmsg */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 189 = putpmsg */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 188 = getpmsg */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 189 = putpmsg */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 190 = linux_vfork */ { .sy_narg = AS(linux_getrlimit_args), .sy_call = (sy_call_t *)linux_getrlimit, .sy_auevent = AUE_GETRLIMIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 191 = linux_getrlimit */ { .sy_narg = AS(linux_mmap2_args), .sy_call = (sy_call_t *)linux_mmap2, .sy_auevent = AUE_MMAP, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 192 = linux_mmap2 */ @@ -237,10 +237,10 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_madvise_args), .sy_call = (sy_call_t *)linux_madvise, .sy_auevent = AUE_MADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 219 = linux_madvise */ { .sy_narg = AS(linux_getdents64_args), .sy_call = (sy_call_t *)linux_getdents64, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 220 = linux_getdents64 */ { .sy_narg = AS(linux_fcntl64_args), .sy_call = (sy_call_t *)linux_fcntl64, .sy_auevent = AUE_FCNTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 221 = linux_fcntl64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 222 = */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 223 = */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 222 = */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 223 = */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_gettid, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 224 = linux_gettid */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 225 = linux_readahead */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 225 = linux_readahead */ { .sy_narg = AS(linux_setxattr_args), .sy_call = (sy_call_t *)linux_setxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 226 = linux_setxattr */ { .sy_narg = AS(linux_lsetxattr_args), .sy_call = (sy_call_t *)linux_lsetxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 227 = linux_lsetxattr */ { .sy_narg = AS(linux_fsetxattr_args), .sy_call = (sy_call_t *)linux_fsetxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 228 = linux_fsetxattr */ @@ -259,14 +259,14 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_sched_setaffinity_args), .sy_call = (sy_call_t *)linux_sched_setaffinity, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 241 = linux_sched_setaffinity */ { .sy_narg = AS(linux_sched_getaffinity_args), .sy_call = (sy_call_t *)linux_sched_getaffinity, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 242 = linux_sched_getaffinity */ { .sy_narg = AS(linux_set_thread_area_args), .sy_call = (sy_call_t *)linux_set_thread_area, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 243 = linux_set_thread_area */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 244 = linux_get_thread_area */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 245 = linux_io_setup */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 246 = linux_io_destroy */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 247 = linux_io_getevents */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 248 = linux_io_submit */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = linux_io_cancel */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 244 = linux_get_thread_area */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 245 = linux_io_setup */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 246 = linux_io_destroy */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 247 = linux_io_getevents */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 248 = linux_io_submit */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = linux_io_cancel */ { .sy_narg = AS(linux_fadvise64_args), .sy_call = (sy_call_t *)linux_fadvise64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 250 = linux_fadvise64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 251 = */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 251 = */ { .sy_narg = AS(linux_exit_group_args), .sy_call = (sy_call_t *)linux_exit_group, .sy_auevent = AUE_EXIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 252 = linux_exit_group */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_lookup_dcookie, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 253 = linux_lookup_dcookie */ { .sy_narg = AS(linux_epoll_create_args), .sy_call = (sy_call_t *)linux_epoll_create, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 254 = linux_epoll_create */ @@ -288,7 +288,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_tgkill_args), .sy_call = (sy_call_t *)linux_tgkill, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 270 = linux_tgkill */ { .sy_narg = AS(linux_utimes_args), .sy_call = (sy_call_t *)linux_utimes, .sy_auevent = AUE_UTIMES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 271 = linux_utimes */ { .sy_narg = AS(linux_fadvise64_64_args), .sy_call = (sy_call_t *)linux_fadvise64_64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 272 = linux_fadvise64_64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 273 = vserver */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 273 = vserver */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mbind, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 274 = linux_mbind */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_get_mempolicy, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 275 = linux_get_mempolicy */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_set_mempolicy, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 276 = linux_set_mempolicy */ @@ -300,7 +300,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_mq_getsetattr_args), .sy_call = (sy_call_t *)linux_mq_getsetattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 282 = linux_mq_getsetattr */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_kexec_load, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 283 = linux_kexec_load */ { .sy_narg = AS(linux_waitid_args), .sy_call = (sy_call_t *)linux_waitid, .sy_auevent = AUE_WAIT6, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 284 = linux_waitid */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 285 = */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 285 = */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_add_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 286 = linux_add_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_request_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 287 = linux_request_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_keyctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 288 = linux_keyctl */ @@ -330,7 +330,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_get_robust_list_args), .sy_call = (sy_call_t *)linux_get_robust_list, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 312 = linux_get_robust_list */ { .sy_narg = AS(linux_splice_args), .sy_call = (sy_call_t *)linux_splice, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 313 = linux_splice */ { .sy_narg = AS(linux_sync_file_range_args), .sy_call = (sy_call_t *)linux_sync_file_range, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 314 = linux_sync_file_range */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_tee, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 315 = linux_tee */ + { .sy_narg = 0, .sy_call = (sy_call_t *)linux_tee, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 315 = linux_tee */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_vmsplice, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 316 = linux_vmsplice */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_move_pages, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 317 = linux_move_pages */ { .sy_narg = AS(linux_getcpu_args), .sy_call = (sy_call_t *)linux_getcpu, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 318 = linux_getcpu */ @@ -402,12 +402,12 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_arch_prctl_args), .sy_call = (sy_call_t *)linux_arch_prctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 384 = linux_arch_prctl */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 385 = linux_io_pgetevents */ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 386 = linux_rseq */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 390 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 391 = nosys */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 392 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 390 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 391 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 392 = nosys */ { .sy_narg = AS(linux_semget_args), .sy_call = (sy_call_t *)linux_semget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 393 = linux_semget */ { .sy_narg = AS(linux_semctl_args), .sy_call = (sy_call_t *)linux_semctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 394 = linux_semctl */ { .sy_narg = AS(linux_shmget_args), .sy_call = (sy_call_t *)linux_shmget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 395 = linux_shmget */ @@ -430,7 +430,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_utimensat_time64_args), .sy_call = (sy_call_t *)linux_utimensat_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 412 = linux_utimensat_time64 */ { .sy_narg = AS(linux_pselect6_time64_args), .sy_call = (sy_call_t *)linux_pselect6_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 413 = linux_pselect6_time64 */ { .sy_narg = AS(linux_ppoll_time64_args), .sy_call = (sy_call_t *)linux_ppoll_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 414 = linux_ppoll_time64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 416 = linux_io_pgetevents_time64 */ { .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */ diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index ac93f9bb3a54..722ada465730 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -14,11 +14,11 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 0 = linux_io_setup */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 1 = linux_io_destroy */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 2 = linux_io_submit */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 3 = linux_io_cancel */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 4 = linux_io_getevents */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 0 = linux_io_setup */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 1 = linux_io_destroy */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 2 = linux_io_submit */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 3 = linux_io_cancel */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 4 = linux_io_getevents */ { .sy_narg = AS(linux_setxattr_args), .sy_call = (sy_call_t *)linux_setxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 5 = linux_setxattr */ { .sy_narg = AS(linux_lsetxattr_args), .sy_call = (sy_call_t *)linux_lsetxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 6 = linux_lsetxattr */ { .sy_narg = AS(linux_fsetxattr_args), .sy_call = (sy_call_t *)linux_fsetxattr, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 7 = linux_fsetxattr */ @@ -53,10 +53,10 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_symlinkat_args), .sy_call = (sy_call_t *)linux_symlinkat, .sy_auevent = AUE_SYMLINKAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 36 = linux_symlinkat */ { .sy_narg = AS(linux_linkat_args), .sy_call = (sy_call_t *)linux_linkat, .sy_auevent = AUE_LINKAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 37 = linux_linkat */ { .sy_narg = AS(linux_renameat_args), .sy_call = (sy_call_t *)linux_renameat, .sy_auevent = AUE_RENAMEAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 38 = linux_renameat */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 39 = linux_umount2 */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 39 = linux_umount2 */ { .sy_narg = AS(linux_mount_args), .sy_call = (sy_call_t *)linux_mount, .sy_auevent = AUE_MOUNT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 40 = linux_mount */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_pivot_root, .sy_auevent = AUE_PIVOT_ROOT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 41 = linux_pivot_root */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 42 = nfsservctl */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 42 = nfsservctl */ { .sy_narg = AS(linux_statfs_args), .sy_call = (sy_call_t *)linux_statfs, .sy_auevent = AUE_STATFS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 43 = linux_statfs */ { .sy_narg = AS(linux_fstatfs_args), .sy_call = (sy_call_t *)linux_fstatfs, .sy_auevent = AUE_FSTATFS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 44 = linux_fstatfs */ { .sy_narg = AS(linux_truncate_args), .sy_call = (sy_call_t *)linux_truncate, .sy_auevent = AUE_TRUNCATE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 45 = linux_truncate */ @@ -74,7 +74,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(close_args), .sy_call = (sy_call_t *)sys_close, .sy_auevent = AUE_CLOSE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 57 = close */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_vhangup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 58 = linux_vhangup */ { .sy_narg = AS(linux_pipe2_args), .sy_call = (sy_call_t *)linux_pipe2, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 59 = linux_pipe2 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 60 = linux_quotactl */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 60 = linux_quotactl */ { .sy_narg = AS(linux_getdents64_args), .sy_call = (sy_call_t *)linux_getdents64, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 61 = linux_getdents64 */ { .sy_narg = AS(linux_lseek_args), .sy_call = (sy_call_t *)linux_lseek, .sy_auevent = AUE_LSEEK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 62 = linux_lseek */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = read */ @@ -91,11 +91,11 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_signalfd4, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 74 = linux_signalfd4 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_vmsplice, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 75 = linux_vmsplice */ { .sy_narg = AS(linux_splice_args), .sy_call = (sy_call_t *)linux_splice, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 76 = linux_splice */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_tee, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 77 = linux_tee */ + { .sy_narg = 0, .sy_call = (sy_call_t *)linux_tee, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 77 = linux_tee */ { .sy_narg = AS(linux_readlinkat_args), .sy_call = (sy_call_t *)linux_readlinkat, .sy_auevent = AUE_READLINKAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 78 = linux_readlinkat */ { .sy_narg = AS(linux_newfstatat_args), .sy_call = (sy_call_t *)linux_newfstatat, .sy_auevent = AUE_FSTATAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 79 = linux_newfstatat */ { .sy_narg = AS(linux_newfstat_args), .sy_call = (sy_call_t *)linux_newfstat, .sy_auevent = AUE_FSTAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 80 = linux_newfstat */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 81 = linux_sync */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 81 = linux_sync */ { .sy_narg = AS(fsync_args), .sy_call = (sy_call_t *)sys_fsync, .sy_auevent = AUE_FSYNC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 82 = fsync */ { .sy_narg = AS(linux_fdatasync_args), .sy_call = (sy_call_t *)linux_fdatasync, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 83 = linux_fdatasync */ { .sy_narg = AS(linux_sync_file_range_args), .sy_call = (sy_call_t *)linux_sync_file_range, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 84 = linux_sync_file_range */ @@ -142,7 +142,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_sched_get_priority_max_args), .sy_call = (sy_call_t *)linux_sched_get_priority_max, .sy_auevent = AUE_SCHED_GET_PRIORITY_MAX, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 125 = linux_sched_get_priority_max */ { .sy_narg = AS(linux_sched_get_priority_min_args), .sy_call = (sy_call_t *)linux_sched_get_priority_min, .sy_auevent = AUE_SCHED_GET_PRIORITY_MIN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 126 = linux_sched_get_priority_min */ { .sy_narg = AS(linux_sched_rr_get_interval_args), .sy_call = (sy_call_t *)linux_sched_rr_get_interval, .sy_auevent = AUE_SCHED_RR_GET_INTERVAL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 127 = linux_sched_rr_get_interval */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 128 = restart_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 128 = restart_syscall */ { .sy_narg = AS(linux_kill_args), .sy_call = (sy_call_t *)linux_kill, .sy_auevent = AUE_KILL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 129 = linux_kill */ { .sy_narg = AS(linux_tkill_args), .sy_call = (sy_call_t *)linux_tkill, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 130 = linux_tkill */ { .sy_narg = AS(linux_tgkill_args), .sy_call = (sy_call_t *)linux_tgkill, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 131 = linux_tgkill */ @@ -227,7 +227,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_shutdown_args), .sy_call = (sy_call_t *)linux_shutdown, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 210 = linux_shutdown */ { .sy_narg = AS(linux_sendmsg_args), .sy_call = (sy_call_t *)linux_sendmsg, .sy_auevent = AUE_SENDMSG, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 211 = linux_sendmsg */ { .sy_narg = AS(linux_recvmsg_args), .sy_call = (sy_call_t *)linux_recvmsg, .sy_auevent = AUE_RECVMSG, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 212 = linux_recvmsg */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 213 = linux_readahead */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 213 = linux_readahead */ { .sy_narg = AS(linux_brk_args), .sy_call = (sy_call_t *)linux_brk, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 214 = linux_brk */ { .sy_narg = AS(munmap_args), .sy_call = (sy_call_t *)sys_munmap, .sy_auevent = AUE_MUNMAP, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 215 = munmap */ { .sy_narg = AS(linux_mremap_args), .sy_call = (sy_call_t *)linux_mremap, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 216 = linux_mremap */ @@ -258,22 +258,22 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_perf_event_open, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 241 = linux_perf_event_open */ { .sy_narg = AS(linux_accept4_args), .sy_call = (sy_call_t *)linux_accept4, .sy_auevent = AUE_ACCEPT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 242 = linux_accept4 */ { .sy_narg = AS(linux_recvmmsg_args), .sy_call = (sy_call_t *)linux_recvmmsg, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 243 = linux_recvmmsg */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 244 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 245 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 246 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 247 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 248 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 250 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 251 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 252 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 253 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 254 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 255 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 256 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 257 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 258 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 259 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 244 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 245 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 246 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 247 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 248 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 250 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 251 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 252 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 253 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 254 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 255 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 256 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 257 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 258 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 259 = unimpl_md_syscall */ { .sy_narg = AS(linux_wait4_args), .sy_call = (sy_call_t *)linux_wait4, .sy_auevent = AUE_WAIT4, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 260 = linux_wait4 */ { .sy_narg = AS(linux_prlimit64_args), .sy_call = (sy_call_t *)linux_prlimit64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 261 = linux_prlimit64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_fanotify_init, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 262 = linux_fanotify_init */ @@ -309,135 +309,135 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 292 = linux_io_pgetevents */ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 293 = linux_rseq */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_kexec_file_load, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 294 = linux_kexec_file_load */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 295 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 296 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 297 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 298 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 299 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 300 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 301 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 302 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 303 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 304 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 305 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 306 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 307 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 308 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 309 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 310 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 311 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 312 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 313 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 314 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 315 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 316 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 317 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 318 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 319 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 320 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 321 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 322 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 323 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 324 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 325 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 326 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 327 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 328 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 329 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 330 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 331 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 332 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 333 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 334 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 335 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 336 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 337 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 338 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 339 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 340 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 341 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 342 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 343 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 344 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 345 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 346 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 347 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 348 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 349 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 350 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 351 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 352 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 353 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 354 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 355 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 356 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 357 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 358 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 359 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 360 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 361 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 362 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 363 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 364 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 365 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 366 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 367 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 368 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 369 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 370 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 371 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 372 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 373 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 374 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 375 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 376 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 377 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 378 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 379 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 380 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 381 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 382 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 383 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 384 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 385 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 386 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 390 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 391 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 392 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 393 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 394 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 395 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 396 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 397 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 398 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 399 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 400 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 401 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 402 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 403 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 404 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 405 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 406 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 407 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 408 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 409 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 410 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 411 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 412 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 413 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 414 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 416 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 417 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 418 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 419 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 420 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 421 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 422 = unimpl_md_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 423 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 295 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 296 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 297 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 298 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 299 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 300 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 301 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 302 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 303 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 304 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 305 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 306 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 307 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 308 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 309 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 310 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 311 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 312 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 313 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 314 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 315 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 316 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 317 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 318 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 319 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 320 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 321 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 322 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 323 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 324 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 325 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 326 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 327 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 328 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 329 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 330 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 331 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 332 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 333 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 334 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 335 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 336 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 337 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 338 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 339 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 340 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 341 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 342 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 343 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 344 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 345 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 346 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 347 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 348 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 349 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 350 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 351 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 352 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 353 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 354 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 355 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 356 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 357 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 358 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 359 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 360 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 361 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 362 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 363 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 364 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 365 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 366 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 367 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 368 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 369 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 370 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 371 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 372 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 373 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 374 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 375 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 376 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 377 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 378 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 379 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 380 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 381 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 382 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 383 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 384 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 385 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 386 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 390 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 391 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 392 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 393 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 394 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 395 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 396 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 397 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 398 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 399 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 400 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 401 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 402 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 403 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 404 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 405 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 406 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 407 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 408 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 409 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 410 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 411 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 412 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 413 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 414 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 416 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 417 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 418 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 419 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 420 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 421 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 422 = unimpl_md_syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 423 = unimpl_md_syscall */ { .sy_narg = AS(linux_pidfd_send_signal_args), .sy_call = (sy_call_t *)linux_pidfd_send_signal, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 424 = linux_pidfd_send_signal */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 425 = linux_io_uring_setup */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_enter, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 426 = linux_io_uring_enter */ diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index c8ddecc7f131..f95f00308624 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -61,7 +61,7 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 0 = syscall */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 0 = syscall */ { .sy_narg = AS(exit_args), .sy_call = (sy_call_t *)sys_exit, .sy_auevent = AUE_EXIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 1 = exit */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_fork, .sy_auevent = AUE_FORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 2 = fork */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 3 = read */ @@ -72,7 +72,7 @@ struct sysent freebsd32_sysent[] = { { compat(AS(ocreat_args),creat), .sy_auevent = AUE_CREAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 8 = old creat */ { .sy_narg = AS(link_args), .sy_call = (sy_call_t *)sys_link, .sy_auevent = AUE_LINK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 9 = link */ { .sy_narg = AS(unlink_args), .sy_call = (sy_call_t *)sys_unlink, .sy_auevent = AUE_UNLINK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 10 = unlink */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 11 = obsolete execv */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 11 = obsolete execv */ { .sy_narg = AS(chdir_args), .sy_call = (sy_call_t *)sys_chdir, .sy_auevent = AUE_CHDIR, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 12 = chdir */ { .sy_narg = AS(fchdir_args), .sy_call = (sy_call_t *)sys_fchdir, .sy_auevent = AUE_FCHDIR, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 13 = fchdir */ { compat11(AS(freebsd11_mknod_args),mknod), .sy_auevent = AUE_MKNOD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 14 = freebsd11 mknod */ @@ -124,38 +124,38 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(umask_args), .sy_call = (sy_call_t *)sys_umask, .sy_auevent = AUE_UMASK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 60 = umask */ { .sy_narg = AS(chroot_args), .sy_call = (sy_call_t *)sys_chroot, .sy_auevent = AUE_CHROOT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 61 = chroot */ { compat(AS(ofreebsd32_fstat_args),freebsd32_fstat), .sy_auevent = AUE_FSTAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 62 = old freebsd32_fstat */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 63 = obsolete ogetkerninfo */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 63 = obsolete ogetkerninfo */ { compat(0,getpagesize), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 64 = old getpagesize */ { .sy_narg = AS(msync_args), .sy_call = (sy_call_t *)sys_msync, .sy_auevent = AUE_MSYNC, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 65 = msync */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 69 = obsolete sbrk */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 70 = obsolete sstk */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 69 = obsolete sbrk */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 70 = obsolete sstk */ { compat(AS(ofreebsd32_mmap_args),freebsd32_mmap), .sy_auevent = AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 71 = old freebsd32_mmap */ { compat11(AS(freebsd11_vadvise_args),vadvise), .sy_auevent = AUE_O_VADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 72 = freebsd11 vadvise */ { .sy_narg = AS(munmap_args), .sy_call = (sy_call_t *)sys_munmap, .sy_auevent = AUE_MUNMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 73 = munmap */ { .sy_narg = AS(freebsd32_mprotect_args), .sy_call = (sy_call_t *)freebsd32_mprotect, .sy_auevent = AUE_MPROTECT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 74 = freebsd32_mprotect */ { .sy_narg = AS(madvise_args), .sy_call = (sy_call_t *)sys_madvise, .sy_auevent = AUE_MADVISE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 75 = madvise */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 76 = obsolete vhangup */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 77 = obsolete vlimit */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 76 = obsolete vhangup */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 77 = obsolete vlimit */ { .sy_narg = AS(mincore_args), .sy_call = (sy_call_t *)sys_mincore, .sy_auevent = AUE_MINCORE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 78 = mincore */ { .sy_narg = AS(getgroups_args), .sy_call = (sy_call_t *)sys_getgroups, .sy_auevent = AUE_GETGROUPS, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 79 = getgroups */ { .sy_narg = AS(setgroups_args), .sy_call = (sy_call_t *)sys_setgroups, .sy_auevent = AUE_SETGROUPS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 80 = setgroups */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_getpgrp, .sy_auevent = AUE_GETPGRP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 81 = getpgrp */ { .sy_narg = AS(setpgid_args), .sy_call = (sy_call_t *)sys_setpgid, .sy_auevent = AUE_SETPGRP, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 82 = setpgid */ { .sy_narg = AS(freebsd32_setitimer_args), .sy_call = (sy_call_t *)freebsd32_setitimer, .sy_auevent = AUE_SETITIMER, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 83 = freebsd32_setitimer */ - { compat(0,wait), .sy_auevent = AUE_WAIT4, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 84 = old wait */ + { compat(0,wait), .sy_auevent = AUE_WAIT4, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 84 = old wait */ { .sy_narg = AS(swapon_args), .sy_call = (sy_call_t *)sys_swapon, .sy_auevent = AUE_SWAPON, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 85 = swapon */ { .sy_narg = AS(freebsd32_getitimer_args), .sy_call = (sy_call_t *)freebsd32_getitimer, .sy_auevent = AUE_GETITIMER, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 86 = freebsd32_getitimer */ { compat(AS(ogethostname_args),gethostname), .sy_auevent = AUE_SYSCTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 87 = old gethostname */ { compat(AS(osethostname_args),sethostname), .sy_auevent = AUE_SYSCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 88 = old sethostname */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_getdtablesize, .sy_auevent = AUE_GETDTABLESIZE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 89 = getdtablesize */ { .sy_narg = AS(dup2_args), .sy_call = (sy_call_t *)sys_dup2, .sy_auevent = AUE_DUP2, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 90 = dup2 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 91 = reserved for local use */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 91 = reserved for local use */ { .sy_narg = AS(freebsd32_fcntl_args), .sy_call = (sy_call_t *)freebsd32_fcntl, .sy_auevent = AUE_FCNTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 92 = freebsd32_fcntl */ { .sy_narg = AS(freebsd32_select_args), .sy_call = (sy_call_t *)freebsd32_select, .sy_auevent = AUE_SELECT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 93 = freebsd32_select */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 94 = reserved for local use */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 94 = reserved for local use */ { .sy_narg = AS(fsync_args), .sy_call = (sy_call_t *)sys_fsync, .sy_auevent = AUE_FSYNC, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 95 = fsync */ *** 1068 LINES SKIPPED *** From nobody Tue Oct 1 17:47:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ54K6xm4z5Y8GH; Tue, 01 Oct 2024 17:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ54K60gdz4VPR; Tue, 1 Oct 2024 17:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727804849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/XELrk6ZB0yGJVxCkbvFUIGgfzcf6x2HlECRZBJJOrQ=; b=mYDJhj6DcjOjT90r2GbtnB3erPD+RtARMSMroJDeJhBjXnz+kciK19MpEzVXYNMMfv3yh+ GvTnd72NmoCLQEdgXaUYX0p1WM77MJbPrAblZBaSK94Auvz3t3qLLM0QnPdMaIgdsUYgop Ee0XINByJm1T37GivzbbTZEizcZEJyohJ3bwZqRhzb4SCYVGaUWXXeIURKSn8hDXZk65Zq DJUl/WkxFp23sNGt4nHSusBZV8C5cvzLlztmkAuYMLnBPDfF2vabUBEtvaEtcg5xIAAut8 rV2W/hYk6EZ+C44K3E7V68NjeeexSj/oYEafaAWC4MXxyPK6LuF6WDq0Z3EuNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727804849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/XELrk6ZB0yGJVxCkbvFUIGgfzcf6x2HlECRZBJJOrQ=; b=c2rA4QPf+KmP0mX561gD+fvTxrq7Fg03330H5PSkp/yHFplNrVo6yZJDQRh9fGrjg/A/pU tPJHZcY4eX5qODLRso/0cIc3tkC3di+fnyvBXGPn2RefnVZ0+XN6AixduyoQvTSBv91+4q O+w1O6vyIxuqvsj+iv6uUe/Bc11JzLI9qa/t+8SCK5EiC8G3pqznEjZ+HB8IwR1wgmYkMI xyyIrGgcpu0XPfsKph7QQQAvMRsUVT/LO6hSNfV/ZYAwFQ/cM6qHCJLpbg6TDRtbsZao1k 6B114a80jNFzpB+E75MsylCexXcrnO9Bhplpu89M6QFGnVyZKgv2nU7CDkZdiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727804849; a=rsa-sha256; cv=none; b=gz8OP54Bsk/rPd/neMkYAVMExSeJoMul5qCzn4w+sf7hbbGDqM4awU3yr5FNpL0B+yd9H8 yjzPTlZXB+BoOMn4uO/COP2hzr/m5ufaDBEwhnYLKc/usiOnVjCOKzX2K6lv85KqJdJ4eT ObWNnfj/NY1mpbgz33udcEBMGN3EPZNmEw4o/vsI4zXHTvfJcRluJ50VkO1tB4j6Ram9f1 k3jO1obtR+331Nax100ji8NQkKzNWJ4i5PJwDV9rkfHAMFFIHnxKtS+oWRfW7aAMPy8XDN 4/r5tIwTydsID1shLo2c8mkTTWErqHq8Jh3VwK9P0Rx87kLZcSdPmZrIieJrUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ54K5TcPzmll; Tue, 1 Oct 2024 17:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491HlTOW095073; Tue, 1 Oct 2024 17:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491HlTIs095070; Tue, 1 Oct 2024 17:47:29 GMT (envelope-from git) Date: Tue, 1 Oct 2024 17:47:29 GMT Message-Id: <202410011747.491HlTIs095070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0d490c6a445a - main - sysent: make header comments more consistent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d490c6a445a5e94e5d50b65aa96ab72eeafe15f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0d490c6a445a5e94e5d50b65aa96ab72eeafe15f commit 0d490c6a445a5e94e5d50b65aa96ab72eeafe15f Author: Brooks Davis AuthorDate: 2024-10-01 17:01:50 +0000 Commit: Brooks Davis CommitDate: 2024-10-01 17:44:03 +0000 sysent: make header comments more consistent An upcoming refactor appends do-not-merge comments to all headers centrally to do the same to reduce the final diff. Headers also start with a comment line (for /*) and end with a blank line. --- sys/tools/makesyscalls.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index fcabe8e5e284..5e6c40c801d4 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -1533,13 +1533,19 @@ write_line("syshdr", string.format([[/* ]], generated_tag)) -write_line("sysmk", string.format([[# FreeBSD system call object files. +write_line("sysmk", string.format([[ +# +# FreeBSD system call object files. +# # DO NOT EDIT-- this file is automatically %s. +# + MIASM = ]], generated_tag)) write_line("libsysmap", string.format([[/* * FreeBSD system call symbols. - * DO NOT EDIT-- this file is automatically %s. + * + * DO NOT EDIT-- this file is automatically %s. */ FBSDprivate_1.0 { ]], generated_tag)) @@ -1549,7 +1555,7 @@ write_line("libsys_h", string.format([[/* * * Do not use directly, include instead. * - * DO NOT EDIT-- this file is automatically %s. + * DO NOT EDIT-- this file is automatically %s. */ #ifndef __LIBSYS_H_ #define __LIBSYS_H_ @@ -1568,8 +1574,9 @@ write_line("libsys_h", string.format([[/* write_line("systrace", string.format([[/* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically %s. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically %s. */ static void From nobody Tue Oct 1 17:47:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ54M1KCyz5Y8K3; Tue, 01 Oct 2024 17:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ54L6L5mz4V7Y; Tue, 1 Oct 2024 17:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727804850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X9NlrQ4BbF+9VR/Q9xMf4vV47LuzEOO7SmWxZNaInpE=; b=gmI4P3z1pg+QnChXhoHYW7Um3ZAgRkIaspyAJwxJ7oHp3dHxZwjnCxJGuYJEvcPxXypwqY IT0hksRkwbc761GSlksZS1zZ+BGunqT/yW3pjHdYTyqpcSP8k735Azn80IqfcWMNaHLTzP C6HtSOWkee/lzjjN2feA+sY1CIfpCGjyqkcvyzyjilXL0DhsLdt4ZA2W0a2w4oz+uz4C/Y Futq5UtrVLiYefyXFSJcZeSivIYUYJv7cSl/Tz2a7PEkSiQIfpOaSQCLeRdW8Qw5T4sJp3 m4XsldlYrK7Yvrzho3LOmnTPqd3IoYFl0VWWSHCVu3+2/27LWDonfNK3YKFqPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727804850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X9NlrQ4BbF+9VR/Q9xMf4vV47LuzEOO7SmWxZNaInpE=; b=u9rIo69MwdN5crd08Y97sBuAonfO+Z69RmnEUETpFIQsWy3N5mZCn6sEjrnhcXACw1IHSj 5xrcPwdKhU6diup2T4zD90tlIrCYDFKH2rKbvTJX/2qa3xQnxRmnafCq1TAOzlCRdf426A nNYUiY3y2FbVCDmLVlVsvBpqxCEPR63WvVI0MZXLMvtaDAlls6OIOhil/3ydOSaBJGBcBF CyqUbqtsV5akMIefpuWVz2fDANcTUjoh2rlLON/AQFhjbQ3xWxgNZM19c6UCENcSqb4KWc KoFnzo54w+bVUeQkiovs6KAYrPOfs4TscIUsgexoReslwd/E/wcH7B9oG7nkUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727804850; a=rsa-sha256; cv=none; b=XVKRGxUs3byLla86uyp/spvbCuVdhlBLf0QX6kEsho3nKGCcGAN8UVaak3h7DUQ3m8c/S7 8nqpUUghDs9LWwzXJ9NADggi0LBFTZH1jzmFZjBAupgHz7Wn/NoWPvoP4mRiP/Tjj+bBdY zY8E9Bwm3TH52Vtir5phgRa80o4/wBxz77e/I9/0tU7vyRc3JlhpCrrTBVSb1vosqsfizG +QfrvtW7cOE+eitdFVlYd7DmcQOtZ1wjDZkZwz8xjb8cqUpSRGnm54RJOW5amonshMCXbA /wRP5kBtMkznuD+mQyHbdPM4BVIcrrA8xN9xGWnXrlRSpDBYbcYaKBT1jq3QFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ54L5xpZznVJ; Tue, 1 Oct 2024 17:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491HlU8G095113; Tue, 1 Oct 2024 17:47:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491HlUwp095110; Tue, 1 Oct 2024 17:47:30 GMT (envelope-from git) Date: Tue, 1 Oct 2024 17:47:30 GMT Message-Id: <202410011747.491HlUwp095110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d9d2e3ab7cf2 - main - sysent: regen comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9d2e3ab7cf2b60ac5afe0d1a0a14d5bc39d7061 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d9d2e3ab7cf2b60ac5afe0d1a0a14d5bc39d7061 commit d9d2e3ab7cf2b60ac5afe0d1a0a14d5bc39d7061 Author: Brooks Davis AuthorDate: 2024-10-01 17:04:21 +0000 Commit: Brooks Davis CommitDate: 2024-10-01 17:46:40 +0000 sysent: regen comments --- lib/libsys/_libsys.h | 2 +- lib/libsys/syscalls.map | 3 ++- sys/amd64/linux/linux_systrace_args.c | 3 ++- sys/amd64/linux32/linux32_systrace_args.c | 3 ++- sys/arm64/linux/linux_systrace_args.c | 3 ++- sys/compat/freebsd32/freebsd32_systrace_args.c | 3 ++- sys/i386/linux/linux_systrace_args.c | 3 ++- sys/kern/systrace_args.c | 3 ++- sys/sys/syscall.mk | 4 ++++ 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index 4565740a25bc..fcb10ad40c8e 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -3,7 +3,7 @@ * * Do not use directly, include instead. * - * DO NOT EDIT-- this file is automatically @generated. + * DO NOT EDIT-- this file is automatically @generated. */ #ifndef __LIBSYS_H_ #define __LIBSYS_H_ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 3d952c691afd..334077c6bb2f 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -1,6 +1,7 @@ /* * FreeBSD system call symbols. - * DO NOT EDIT-- this file is automatically @generated. + * + * DO NOT EDIT-- this file is automatically @generated. */ FBSDprivate_1.0 { _syscall; diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index 0126fdf7aa5a..d0738267b35a 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -1,8 +1,9 @@ /* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically @generated. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically @generated. */ static void diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index a37de1d753dd..cf9d5b64a87f 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1,8 +1,9 @@ /* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically @generated. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically @generated. */ static void diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 73b3bf107486..9e7b0935e560 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1,8 +1,9 @@ /* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically @generated. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically @generated. */ static void diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 9992242dba25..80b4a2ed0109 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -4,8 +4,9 @@ /* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically @generated. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically @generated. */ static void diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 4ec9ca460802..041ee80fd4ff 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1,8 +1,9 @@ /* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically @generated. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically @generated. */ static void diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 2454a8b5137b..c2e1f22cbf87 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1,8 +1,9 @@ /* * System call argument to DTrace register array converstion. * - * DO NOT EDIT-- this file is automatically @generated. * This file is part of the DTrace syscall provider. + * + * DO NOT EDIT-- this file is automatically @generated. */ static void diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 6c8830042045..4aa282724ab5 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -1,5 +1,9 @@ +# # FreeBSD system call object files. +# # DO NOT EDIT-- this file is automatically @generated. +# + MIASM = \ syscall.o \ exit.o \ From nobody Wed Oct 2 06:37:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJQ8K46X8z5Y3L5; Wed, 02 Oct 2024 06:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJQ8K3ZqJz4cxw; Wed, 2 Oct 2024 06:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727851025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvwcK97TF6cIg8PFkMJsIn/7pRacQSfFZj/UFA996lE=; b=KiH550ZumsXn1qlkMVgw2tBK6SljrCrqwxlpFPnkISPRsmq5xS0V+9lJyitwty77mzZckD Os3r4B5QtZhw4X4TYIZUi33Rf4tT/lreEjZKGbgFwofBFfbJHqoRgCyYTKYk6k5WpniTuL Gm+IMbZu4f+142rAxA+qalCxFVMQ7Hruk3tIWKHvJ5QK3FjQ1IU8p47/0yJoGmXHcwtnnc G7M/BCqTy61MsT0Idvn8O9rQ4s+x2O8Gutq+GoUuSGEV2+j16G6eB1J0LycZ41fH9jrsOG e4An9/KtaO5qKAwHfazrxpKRzIYGbEcrWWq9PRbqsM1fMrdpqr9x2WKBiZG3aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727851025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvwcK97TF6cIg8PFkMJsIn/7pRacQSfFZj/UFA996lE=; b=SLIQ/NTiVIpQWTvvHjHTZ3xjeRQ2nx9jp1XE3gBF8g5qKlTffyXagj/XARWmjGCr/kcIe5 QzOFueI7i66xw+bnbADvkgghdevr0EP80App7bn7SbIFvyajqkCbV+Qsqp/A7yjp8hAcvO VKnVScP92SMEUnh3eM0MeUrq+ABOh9qdCiFn4FuW9gkG71Sjy4aYqtuZoLArLkYu8AFIsH mUeaDZ+VTiMMGXByDgPYVH2vaEvX8uGwuEZBEbyAy4ZsyH8LShb1AeCiCD2NMYt8T4m/It JY1viiXz2tpWozy+Rg3ogapZKOIVajIft7rmsjED1Ifk/1vhMaLpL5RV18Lr3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727851025; a=rsa-sha256; cv=none; b=MiZKdQtew7hDWbIubxNqIwREl8yxSNc5+vbrfTWaWP74dIyUB99f9wWL1TnCsuO6/8nkR9 1E3S43a9s26Hm/uY2qcpngRiznnNBNhc37XIiG2M8KRV5GK0k9GnB3GajhBPdlm5tD4PkH hpK8NSj2KJKdQ7olWdSBSLynh+yMz2gyXRLY958GTRzj3A3eUeVQg08x+MxXrF32iRkoOd QCIM5FzbAvgKvjI93Bp1Vk/7fat67gekw1k9Je6osNurT1cD2XDCwioAHb8UOw/BRFukeD n/dUMmd+gHvfX9tusQLI0FUGOaJJB2Ej1eMpQfHUbdLhtgmM+0dfbV/GecQt+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 4XJQ8K2rkFz19lc; Wed, 2 Oct 2024 06:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4926b5UK000308; Wed, 2 Oct 2024 06:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4926b5Ns000305; Wed, 2 Oct 2024 06:37:05 GMT (envelope-from git) Date: Wed, 2 Oct 2024 06:37:05 GMT Message-Id: <202410020637.4926b5Ns000305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Takanori Watanabe Subject: git: f5a04b16b189 - main - acpidump: add 's' option to parse dsdt and ssdt's separately. In some machine, they may not be parsed if they are concatinated into one image. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: takawata X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5a04b16b1895b331d6b54534321a8395fc2d5de Auto-Submitted: auto-generated The branch main has been updated by takawata: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a04b16b1895b331d6b54534321a8395fc2d5de commit f5a04b16b1895b331d6b54534321a8395fc2d5de Author: Takanori Watanabe AuthorDate: 2023-06-22 10:08:21 +0000 Commit: Takanori Watanabe CommitDate: 2024-10-02 06:36:41 +0000 acpidump: add 's' option to parse dsdt and ssdt's separately. In some machine, they may not be parsed if they are concatinated into one image. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46796 --- usr.sbin/acpi/acpidump/acpi.c | 16 ++++++++++++++++ usr.sbin/acpi/acpidump/acpidump.8 | 14 +++++++++++++- usr.sbin/acpi/acpidump/acpidump.c | 11 +++++++++-- usr.sbin/acpi/acpidump/acpidump.h | 1 + 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index af0068649fbb..fe68b5062351 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2643,6 +2643,22 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HEADER *dsdp) perror("rmdir"); } +void +aml_disassemble_separate(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HEADER *dsdp) +{ + ACPI_TABLE_HEADER *ssdt = NULL; + + aml_disassemble(NULL, dsdp); + if (rsdt != NULL) { + for (;;) { + ssdt = sdt_from_rsdt(rsdt, "SSDT", ssdt); + if (ssdt == NULL) + break; + aml_disassemble(NULL, ssdt); + } + } +} + void sdt_print_all(ACPI_TABLE_HEADER *rsdp) { diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8 index dc8f724ea738..f193b9a3511a 100644 --- a/usr.sbin/acpi/acpidump/acpidump.8 +++ b/usr.sbin/acpi/acpidump/acpidump.8 @@ -133,13 +133,25 @@ The following options are supported by .Nm : .Bl -tag -width indent .It Fl d -Disassemble the DSDT into ASL using +Concatenate the DSDT and the SSDT's into single image and disassemble the image into ASL using .Xr iasl 8 and print the results to stdout. .It Fl t Dump the contents of the various fixed tables listed above. .It Fl h Displays usage and exit. +.It Fl s +Disassemble each of the DSDT and the SSDT's into ASL using +.Xr iasl 8 +and print the results to stdout. +This will avoid +.Xr iasl 8 +error on disassembling concatenated image. +If both +.Fl d +and +.Fl s +are specified, the last option is effective. .It Fl v Enable verbose messages. .It Fl f Ar dsdt_input diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c index 23978aca010b..0fad7e68ef47 100644 --- a/usr.sbin/acpi/acpidump/acpidump.c +++ b/usr.sbin/acpi/acpidump/acpidump.c @@ -65,7 +65,7 @@ main(int argc, char *argv[]) if (argc < 2) usage(progname); - while ((c = getopt(argc, argv, "dhtvf:o:")) != -1) { + while ((c = getopt(argc, argv, "dhtvsf:o:")) != -1) { switch (c) { case 'd': dflag = 1; @@ -82,6 +82,9 @@ main(int argc, char *argv[]) case 'o': dsdt_output_file = optarg; break; + case 's': + dflag = 2; + break; case 'h': default: usage(progname); @@ -136,7 +139,11 @@ main(int argc, char *argv[]) if (dflag) { if (vflag) warnx("disassembling DSDT, iasl messages follow"); - aml_disassemble(rsdt, sdt); + if (dflag == 1) { + aml_disassemble(rsdt, sdt); + } else { + aml_disassemble_separate(rsdt, sdt); + } if (vflag) warnx("iasl processing complete"); } diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h index 80f86a748d76..872facbad59d 100644 --- a/usr.sbin/acpi/acpidump/acpidump.h +++ b/usr.sbin/acpi/acpidump/acpidump.h @@ -144,6 +144,7 @@ void sdt_print_all(ACPI_TABLE_HEADER *); /* Disassemble the AML in the DSDT */ void aml_disassemble(ACPI_TABLE_HEADER *, ACPI_TABLE_HEADER *); +void aml_disassemble_separate(ACPI_TABLE_HEADER *, ACPI_TABLE_HEADER *); /* Routines for accessing tables in physical memory */ ACPI_TABLE_RSDP *acpi_find_rsd_ptr(void); From nobody Wed Oct 2 09:15:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTgJ2WYwz5YFDR; Wed, 02 Oct 2024 09:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTgJ211mz4qdx; Wed, 2 Oct 2024 09:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727860540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xfoxD8Tl3D8+dPBlfpT33D3SQZ2bS60sFOn23J4VPG0=; b=UqPPB2raWsb+poS6JrQMP3Es66/tVs2S33Xix+PwQteS0cyU832rhrnPQXSSIy8Nvjdn1o 3ec1k8b7Nfib9gPrp2HaG+ky+kYvntfczlnURhnuqHtsnf0oFeeDqU5LhatltJ+yoCkrEE yvWRARCtZlA/UUO6+DhFVcC5BRL9iWkvlcKzc56zUYKCpPOrQxPSjddCjUqYx4s5nwZ7x8 6jBfo911QYsiBZ6fcsDSqZKzSDVSgv+ZoGFLquR9lovXnY5dVnpiGJ5gxc9oiR4g+34Jaf lsPvrrd9Pum0/lhPpL2FFADBrI3fYQ1OCiJGIpOKvRjIUnu8MPvTScx2kEe5xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727860540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xfoxD8Tl3D8+dPBlfpT33D3SQZ2bS60sFOn23J4VPG0=; b=DTTQUNuwTt5OAwG04ywZ387RPuSG+ZMV+gN3uL1TMZj9deZkSoS0GI9cnJbUFybtOT+gxY naijmRFmuy4+doEOKOQWwhrsK5N5x6mGb7P+IbWSFP0rBIeoaEXCPDxcgLsFfC/O7lPrpf A9IEBa3Nm5npvfddrrg7OHyiN1dc2D2EK7sGauR7eWtK/HFv+UEiEwsBkN/OZJXuqZeJx2 g4s2Ho2EvQxc+IQox1XPQ1qXKJdULTrfLeJAZEs5PTISXm5oIFLxrZUQS6xWAKBfz5XI5g D3Yw1FUVzqu5LvRhwlcZ9cTZGvZoLaRBGCyrfE9aj60lOavk8ft/blwSoFuBig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727860540; a=rsa-sha256; cv=none; b=sYu9VPiuM+9bROU4Z4lwi0wDyRGXoWTG7Q+lQBh3mSRzANB6GlzEPKyVJ175W+dANrOe2T cSrFDfMIrsdJkyQOY2MDAPwS/Z+KLwvJPp4fFsQAJU8j4hwH+fo8IvSO8XmTxKbYQNniCM /n79SlRwXFEB6kWGCqaJJk0zUr8qKo0/ixjL+8KlTTP0BbBIp1SNGo4Ux1tZqusjpDnOzP GKLZ4ZA5w4gn8GUoFq7EQdLMR0iCd4RRV2cfwg5OvLqrlDHRZShm5jIC+F98ujdsmoZ+5e A9M7Tk1jczEcExScIjJG9B/QTnA0bIOgxV7RIgMI2Sb+DVZj648vUa0uU4zQcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTgJ1cCJz1F0B; Wed, 2 Oct 2024 09:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929FeF9072511; Wed, 2 Oct 2024 09:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929FeIE072508; Wed, 2 Oct 2024 09:15:40 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:15:40 GMT Message-Id: <202410020915.4929FeIE072508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2ab84513e930 - stable/14 - rc.d/dnctl: Chmod +x for consistency with other rc scripts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ab84513e93076331aa698e36ca8781c02b3c3ed Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ab84513e93076331aa698e36ca8781c02b3c3ed commit 2ab84513e93076331aa698e36ca8781c02b3c3ed Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-22 11:35:50 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:11:20 +0000 rc.d/dnctl: Chmod +x for consistency with other rc scripts MFC after: 1 week Approved by: bnovkov (cherry picked from commit 91fac46bf7cff03c3471422c67281041c5fa0f1f) --- libexec/rc/rc.d/dnctl | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libexec/rc/rc.d/dnctl b/libexec/rc/rc.d/dnctl old mode 100644 new mode 100755 From nobody Wed Oct 2 09:15:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTgK5HC8z5YFG7; Wed, 02 Oct 2024 09:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTgK33jqz4qPb; Wed, 2 Oct 2024 09:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727860541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YQpNmxIV2N/stdHoOcVrRJtQoUh13DmPk9un/5/XMIs=; b=k6Q6ME0Nsf4qxyDQOTkTAEAyQdSEoEhcXZN+KpWav7+sw67nrjfDtnaVn3BxS53H2Mijua q09l30JeKu5u7cuZGwHIoWAl+QND0GbeAqkFfgzR0OgqasPj9UTlp+tgsFh4a0C/tVmax4 EtyjO6ZQIjyFPLcpcKLEcrCopCp2ZTZ4B1QaDjN+8HEcyOAGdVFn282ha7UWSs9m69ALaU EiLy4o+kQOjWJqQAGKWEvQaaMpsIxGN+qBv+0V5dmqBr6Xz7eR6h9tm+jPyl91eneSl0xx X8xWU8oQH6S/v5q3Y0O1WsDzB0BoEgzCmipzawdWV621E4/NDtWxai48k4eznQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727860541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YQpNmxIV2N/stdHoOcVrRJtQoUh13DmPk9un/5/XMIs=; b=Q1JVvvARncTM6zcu4cvwTfJejioeeLD2AkC087yoyKKNe5VjrSri1Y7TGCSUpS2u/ytW7h tAIvy4oMHby/x2snJVLdQ3o8WxjMNlzaULJmx8Ts7odXaODrOS5e2aTe4JSNPCoaUBaIGa amPC3+HWRpqScXeL6yOYGuw9Qs1JqPZjUFcnLtbeyGcaAwLjSUKfMYRaldSduO7IVGdmau bgYD3TXNa2cqEOQL0skiy03TY2Ou05Bl6kYNkOpgihmyB9mQBcBd4Pt3f4+0bcc+MlSzza 3KoG75JNFBeu22cAWTzq+f4Lq6tF1kHmUcKaA1QOgY7hgStt/0+pSaYfXFmlsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727860541; a=rsa-sha256; cv=none; b=v5oxnmX2Xwm09QZ7D7hCMRHIgy8vEyavYMfgpvIRHJVof+uh1fnr7+fa1JmFciq5tSeA9F IVdmL3KuOSu4yrOEDHN50JHazhtl4Lw3i/lRgKX6hkuEIsMBrPuenjtl6NuL3c9MccZXK0 Q4B2KNkJSDywQE5ltu0771D2BqMTanYpC7WKn73nJFw6x/Vuj1Tj7f+2Ip7olL5L23DT7l yIW83fzJNxUzGaYTI5M90LOiPldCbmde4+wqAeEoXl/EVo4cOse+56TIdjr1tDqUGJ0DLo oTu3xpVTwmzkMew7br2Qp0Zq945guIXJ621mIjcuRJKcV6cFqyb9XctRqP1GsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTgK2gKGz1FF6; Wed, 2 Oct 2024 09:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929Ff6x072571; Wed, 2 Oct 2024 09:15:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929Ff8J072568; Wed, 2 Oct 2024 09:15:41 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:15:41 GMT Message-Id: <202410020915.4929Ff8J072568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 422394b81b1b - stable/14 - rc.subr.8: Do not use mdoc macros for Bl width List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 422394b81b1b7e06aac2e977591301437ea3e3f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=422394b81b1b7e06aac2e977591301437ea3e3f3 commit 422394b81b1b7e06aac2e977591301437ea3e3f3 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-22 11:42:12 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:13:20 +0000 rc.subr.8: Do not use mdoc macros for Bl width Macros do not expand there. MFC after: 1 week (cherry picked from commit 859868156a1658af71d57ee6c77c10fc192aa74a) --- share/man/man8/rc.subr.8 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index a32347a09eb2..8da84bb39d6b 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 18, 2024 +.Dd September 22, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -114,7 +114,7 @@ The .Ar action argument may be one of the following: -.Bl -tag -width ".Cm remove" +.Bl -tag -width "remove" .It Cm add .Ar file is now being backed up by or possibly re-entered into this backup mechanism. @@ -345,7 +345,7 @@ scripts to be implemented in a small amount of shell code. .Ar argument is searched for in the list of supported commands, which may be one of: -.Bl -tag -width ".Cm restart" -offset indent +.Bl -tag -width "restart" -offset indent .It Cm start Start the service. This should check that the service is to be started as specified by @@ -381,7 +381,7 @@ If or .Va procname is set, also support: -.Bl -tag -width ".Cm restart" -offset indent +.Bl -tag -width "status" -offset indent .It Cm poll Wait for the command to exit. .It Cm status @@ -393,7 +393,7 @@ Other supported commands are listed in the optional variable .Pp .Ar argument may have one of the following prefixes which alters its operation: -.Bl -tag -width ".Li force" -offset indent +.Bl -tag -width "force" -offset indent .It Li fast Skip the check for an existing running process, and sets @@ -437,7 +437,7 @@ but only certain small classes of them. .Ic run_rc_command uses the following shell variables to control its behaviour. Unless otherwise stated, these are optional. -.Bl -tag -width ".Va procname" -offset indent +.Bl -tag -width "procname" -offset indent .It Va name The name of this script. This is not optional. @@ -727,7 +727,7 @@ if .Ar argument Ns Va _cmd is not defined, then a default method is provided by .Ic run_rc_command : -.Bl -tag -width ".Sy Argument" -offset indent +.Bl -tag -width "Argument" -offset indent .It Sy Argument .Sy Default method .It Cm start @@ -796,7 +796,7 @@ The following variables are available to the methods as well as after .Ic run_rc_command has completed: -.Bl -tag -width ".Va rc_service" -offset indent +.Bl -tag -width "rc_service" -offset indent .It Va rc_arg Argument provided to .Ic run_rc_command , @@ -937,7 +937,7 @@ and then .Ar message . .El .Sh FILES -.Bl -tag -width ".Pa /etc/rc.subr" -compact +.Bl -tag -width "/etc/rc.subr" -compact .It Pa /etc/rc.subr The .Nm From nobody Wed Oct 2 09:29:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzh2qZGz5YG3w; Wed, 02 Oct 2024 09:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzh259qz3wtj; Wed, 2 Oct 2024 09:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwWUc+b93Qzfs1TWflF4fIecxNpu15v2WJ8bsa2Ilxs=; b=nrp+AdMXR95UCjAW4ARYfPx5PxuuaeRx30UMgbx5PEO291+C1IWJFQ1/aaGL4K8s0U2tdW 1wDSbNPpqx2IDnyCDiVYQxBkzgXtQM0ydNnHtv4gFjMsQQAi/Id6ktekKxtUh9odHkGd6c vWKoz3sfGr5ke63b2rwO1BOmsv9QQU4bzWpR1kJEYbaORyWgs2wvVVv4imnjk5aVbE2yYS V8WBrdPq7bf8xTVHITfBdFTONV1Tdtl+HO4h1A7E0U0b1/XzJwZEm8nZdm6RCrmu/YrGkg t5dEefcWN1NL9eUFY/1AZNDxVMsvCSj5focW7oSSa16QffJJv4UAw7WTVzROvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwWUc+b93Qzfs1TWflF4fIecxNpu15v2WJ8bsa2Ilxs=; b=yKiDEfy/3tVMcOex6rxLDzqBJFNwBFR0WUXqnFWSUUdU0d/Z77MbnxJSQWIudL8C/X7uo8 5zSS1eZpg/7VUH13HGxd1TjqlQL2tDK3fHWVaEu8WB9aLfx9ItRTT9K3hQQl1sxatPaYEM pr68DWKiZNJsDhrHacxFEoqT3tzxymEhs1/cJw60HE1bGfdojzMZe0OaWWLo8f5DmmeEJL 3aZK/rJZEhj0+WQeh8g/F/LF/NFKNlPhzYXCX3HNgIstX0hUPLSmNoeFN1fJVzKsfrzTuf zRhnUkBb5b7VCR7c0oMrrSI9NVlqih5a1fDFS3oTL8vAHAjKbMTlrAfjbONWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861392; a=rsa-sha256; cv=none; b=GGs2RWSLV2VSainz3EaPJh7q8Wu366TLJnDf0d2Mb7+z8IPocq+MIgkVbcTkPWQ35ge7An 74kAz8ZNxbW0xH2C26SBPUctyNdZl7kGX/sootZ48wJJ33HF9u9iaPiJzXMFGa7pGM0KsM 4Rby+h5bnFmU80qaLvsDfwLtc4xy2uOsXXzW9zvgmJNESRK/Xs8wjsw8N9PD/9lEtjNp1p DKYGrrgTCkv6D6yg0CJDKIzGmgpsjh9VxPBE6MtkqVXrtLHUuMqWcPj0hjY91VVCYyxu/S aH3t1ekRd1YA3knPVPn1cQ1Pi4wLX82d3qYA0lK08t8rN/KXvIT+4EPFh47T6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzh1hjDz1FFm; Wed, 2 Oct 2024 09:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929TqiW090147; Wed, 2 Oct 2024 09:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929Tq46090144; Wed, 2 Oct 2024 09:29:52 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:52 GMT Message-Id: <202410020929.4929Tq46090144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: cd28988c0b0a - stable/14 - rc.8: Remove false information about rc.d/local List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd28988c0b0ad9ecc1d891935a3387187efef4ce Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd28988c0b0ad9ecc1d891935a3387187efef4ce commit cd28988c0b0ad9ecc1d891935a3387187efef4ce Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-20 09:07:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:24:34 +0000 rc.8: Remove false information about rc.d/local It does not handle scripts in /usr/local/etc/rc.d/. Instead, it takes care of /etc/rc.local and /etc/rc.shutdown.local. MFC after: 2 weeks (cherry picked from commit 9dc67a70650b99872316d7ff95ef45ea4c5b455a) --- share/man/man8/rc.8 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index 2097c85fdc4d..fa736ce50394 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -31,6 +31,7 @@ .\" @(#)rc.8 8.2 (Berkeley) 12/11/93 .\" .Dd June 1, 2023 +.Dd September 20, 2024 .Dt RC 8 .Os .Sh NAME @@ -447,18 +448,6 @@ is not set, when going from single-user to multi-user mode for example, the script does not do anything. .Pp The -.Pa /etc/rc.d/local -script can execute scripts from multiple -.Nm rc.d/ -directories. -The default location includes -.Pa /usr/local/etc/rc.d/ , -but these may be overridden with the -.Va local_startup -.Xr rc.conf 5 -variable. -.Pp -The .Pa /etc/rc.d/serial script is used to set any special configurations for serial devices. .Pp From nobody Wed Oct 2 09:29:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzj3xY5z5YG3y; Wed, 02 Oct 2024 09:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzj3P1dz3wrD; Wed, 2 Oct 2024 09:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGEX3D7GSe834O3VZ0HFmx72cTZv9hI4CM63yFqQinI=; b=DPAn9vEyoWk/dFinG+ghYow1aSO1fhmF5sNOo7sTUFvKtJvTO9LxENn3akGUK7gog2paLY rjoxgG2ID44oWSK+k/obFn3T0Kc/fA3jzQf5AffFIl9vS8P7UNhWsdhYMf3WMcEw7G+k8p kpuQd/tw2D29Z0GJrwZ2fXQEU+PCDpPpI45INXl6dAcSd3LWWg3eT/6RYpv8dOGkuFckNp 58WxLw3CCZbtioVIYxWKwo+PYYL264YXjROBVweUBbL6Jq6RuMdGGkkU6W8+Wx7qtniLLk xkBr09mg5uUjXkoY88j/7yFvK3fJ6f+4yf+k1qnJUiV78r8sB9cKybTVyuFcBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGEX3D7GSe834O3VZ0HFmx72cTZv9hI4CM63yFqQinI=; b=Y0zL/0Dd0BxDGBN4Lhn21l4pogLY87bBGJfGjC0hq3/iXoWohnDr69mUzCN6tnol4U0bBS Zr/4B5Plfj0FTL1xhisUp13Cz4Zd/2f+LxSJG37/gJ2iYO0HLRkNICnbc3bq+jNld4kVM7 xFWbXhcDGhKCJW1fKbgY4AbVYoXRWpWqV45KDlrc0joRRrmMPCWE7fBgOUS7V6GYVAd4hr yDsM+OJkONGW+uJTZOA7NxI1ElHQ34mXCC5rzrvwWzVgoO++uRruVheqirQCVS4BAYXk8r LzI5Z7q/H4NVtcc0hwGZwajnaxen/TQDaZZIMlii/zTwFTEdgKM0K80aFymiSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861393; a=rsa-sha256; cv=none; b=PjBG0X4mvaislH4/y+xGCVkJjZUsAeB82VklaNQQBEbE1dPWbu9ZN/r/Esgj6fTUmb+Vwm 3OiNlG2tD6QfnumoO3s3ltOFRfQs1+9N3Z2Jb/nKbb39+KqkH4JsF4avAcC0wUmqJCpI9T jJza1Gut3yot3kDzY0uxuN7elufcVQWAEXCpwGhyko3Lm1MOMybJduORqmjCYg8OxjYGEF 3COVR2Z7HpWlCcSGfj+0mO9GJP1XWFlSY9v9LfTcMim84l4OANChI4WwzSL9vZv3Nnv5+r noHw/CQRW8BDDiiJJd5pXW0mwvqK6L9qekV9lGijcLVBfSEjP4HrfPF3+sM8eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzj300tz1FBd; Wed, 2 Oct 2024 09:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929TrR7090207; Wed, 2 Oct 2024 09:29:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929Trg8090204; Wed, 2 Oct 2024 09:29:53 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:53 GMT Message-Id: <202410020929.4929Trg8090204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e3b57f1485e7 - stable/14 - rc.subr: Consistently use an absolute path for sysrc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e3b57f1485e7e1aed0285b953c4cca746c78a938 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b57f1485e7e1aed0285b953c4cca746c78a938 commit e3b57f1485e7e1aed0285b953c4cca746c78a938 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-20 09:27:34 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:27:00 +0000 rc.subr: Consistently use an absolute path for sysrc MFC after: 2 weeks Approved by: christos (cherry picked from commit 401516dbc54e4a4cba3085cd605fbf6cf8293b79) --- libexec/rc/rc.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 05d46f74e598..5140f2a1addc 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1113,8 +1113,8 @@ run_rc_command() delete) _files= - for _file in $(sysrc -lEs "$name"); do - _out=$(sysrc -Fif $_file "$rcvar") && _files="$_files $_file" + for _file in $(/usr/sbin/sysrc -lEs "$name"); do + _out=$(/usr/sbin/sysrc -Fif $_file "$rcvar") && _files="$_files $_file" done /usr/sbin/sysrc -x "$rcvar" && echo "$rcvar deleted in ${_files# }" # delete file in rc.conf.d if desired and empty. From nobody Wed Oct 2 09:29:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzk6YGFz5YG1X; Wed, 02 Oct 2024 09:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzk4LvWz3wrd; Wed, 2 Oct 2024 09:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jLYliVKb9JgvDKshNsPQFTof7ysZHkl8mBupU6jRJhY=; b=w8fNrsbKYpYw/4XufX2PMLIwbmPY2BD99l7jhCtGyVhdLghys5PLgkjQ7hTCuxUFRYfLQY bCZ6tb2ODwb9ouUDDeDNQFtyqta5rnoJ4B5qX7ydh0aWg6b5mP7G6udNV3gLfm5dPWpZLT lFXHk0gUbMmggLY+vVVPRCCJyj4MlPigFq27CUYUSOGCzrjG8aUpB2TfL3hVOneCG6GvuE IjKt2GE8vYASV37sUkUDqDpoEqEDJNLI21AaW1xoztlCYVoYeOzG9Je4f4HE2r09/0iRto SEn3D23fOt6o20CrmJD+UUXb8PW8jAGnUE+ky0NHliAtH/WOOHeI0oWXLPn93w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jLYliVKb9JgvDKshNsPQFTof7ysZHkl8mBupU6jRJhY=; b=sAEPuoBYpjeuNG9w7ogNhO93zazD7KElxne6QLSUc06/ZxFNn07OnWTUUn/kzQfL//gMeT bd9DCCp7Tnah+13YazDMg+q0/rt0n6S9J5LO3sM2fed57xlAz66uPv52/kxgZf7J03UEOM od2R0a6QMu62mISZpBnvZPiujiOACM9T/bQEWEFYFAx5Dlk5WCuNqgT7yZ+sxHcoHwW81m Ybs6SJ9h65d5bJkIlR+PzylyYJjwDBJn6ESAofhC1LlZwQ3Jtb3+iXB3BRhB8xvPxb/HCo qr3RqiuxKoT5Vs1J83kNYm42tfgt/r2Onb2RtkEmf01FfofCviZk55oI2nX1jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861394; a=rsa-sha256; cv=none; b=Mtn6H7SnQ/DUHmK0WubKQvbHig0HhMWFBK2BT0EIVIM3Tf4j7plC/1WDxy+5KH5mMt/yxS ntY+KbSIQSAVBpxRpO6/8fNtrwpIz9fEfSa/0LO3W3tuEUvquw0rtIhbCY2cM8hPG4dYjm 3VrYWopvMNuRlW5Op/zYLhS6aXV9RHPoVKZauAct/30o35nJ7zjp1eaARrGkTo2XPxs6MB UBm6vtxaXFTkuPGud7iW7lAuyFX+9zdabSaxFh98OuP1A+q9nY/8SdJVywwx2i31/EwdTn I0zlfUEvXvkXKtQaCdoF5yYOTClXQwifk1ESF1/9th9xe122wFdvF4NduQffZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzk3mrDz1F8f; Wed, 2 Oct 2024 09:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929TsSA090275; Wed, 2 Oct 2024 09:29:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929TsVs090272; Wed, 2 Oct 2024 09:29:54 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:54 GMT Message-Id: <202410020929.4929TsVs090272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a12fc31ce9e1 - stable/14 - rc.subr.8: Fix the Bl macro of a list which is actually a table List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a12fc31ce9e1d8668aeb7e6832fc188777a4da99 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=a12fc31ce9e1d8668aeb7e6832fc188777a4da99 commit a12fc31ce9e1d8668aeb7e6832fc188777a4da99 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-22 18:21:17 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:27:14 +0000 rc.subr.8: Fix the Bl macro of a list which is actually a table MFC after: 2 weeks (cherry picked from commit 6e414739fc95663836a5a10a8cf13e0211fd5efc) --- share/man/man8/rc.subr.8 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 8da84bb39d6b..2dd46cf50c2b 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -727,17 +727,16 @@ if .Ar argument Ns Va _cmd is not defined, then a default method is provided by .Ic run_rc_command : -.Bl -tag -width "Argument" -offset indent -.It Sy Argument -.Sy Default method -.It Cm start +.Bl -column "Argument" "Default Method" -offset indent +.It Sy Argument Ta Sy Default method +.It Cm start Ta If .Va command is not running and .Ic checkyesno Va rcvar succeeds, start .Va command . -.It Cm stop +.It Cm stop Ta Determine the PIDs of .Va command with @@ -749,7 +748,7 @@ or those PIDs, and run .Ic wait_for_pids on those PIDs. -.It Cm reload +.It Cm reload Ta Similar to .Cm stop , except that it uses @@ -766,21 +765,21 @@ It can be enabled via if appropriate: .Pp .Dl "extra_commands=reload" -.It Cm restart +.It Cm restart Ta Runs the .Cm stop method, then the .Cm start method. -.It Cm status +.It Cm status Ta Show the PID of .Va command , or some other script specific status operation. -.It Cm poll +.It Cm poll Ta Wait for .Va command to exit. -.It Cm rcvar +.It Cm rcvar Ta Display which .Xr rc.conf 5 variable is used (if any). From nobody Wed Oct 2 09:29:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzl461Pz5YG42; Wed, 02 Oct 2024 09:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzl1T60z3wxX; Wed, 2 Oct 2024 09:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvpIu9ypIhANOCGzI1ktKH7F+8vwhoeo0iowxvQJjMc=; b=scLQEBHfzzfH0Mlwn358GRpDcNG6rPaVScR7NvSdcDhjH5rMbmaQk3uWrsKIYVMKRkaSeK Rbq2CwfL4i6SXeFCvJymJr6ZQ3uvBw1v8M8BNOB/cOI+gQmuXKYKsAUP9s8qN6P2CU/Xoz q7NCViALj22Obz8YR2UhCr4VFCC5eVPUN8dVy76SvIHA/4Gx3cfrfvczuxK8uRfPgaH6P4 fNm/psNXa9DtIKxw0a3qz1qy9z2gf00L2H5o1JJ8tSIeh/+M0nZ2QMQ3JmbjJpbhHJYUR2 ibsLUzY5fr4BBXCVRLIXhUrgaHX6eRSp6FfQaPzqCQcir+R9O9J88ko9RRFvxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvpIu9ypIhANOCGzI1ktKH7F+8vwhoeo0iowxvQJjMc=; b=iXRaGkccseDtSnCR2MRkNGVe0fIywWORYyQy5L3Sqc+tTEt9kz55qVcqzzIdc+mWi5xsjv rGRvxhAJmFVMY1jMljWPhsmy0+H1YbQuQcNrN/8tOK8ZVazxr9mRC6uNe2A7mEPji/pxul th+qg89Y7ZetvtD6f2TGinwVG0zxWIGNS6TYwLaUDMNmrYl2AtHsSexs4uDIsHKUc9w/tz e9nRueHCX99+bs6GNLCW8cJ9yFpN2DwN2X7kLA1TUz3c/LwFUVV7gQdfgyF1t80izO0h5F tQRtQ3lH9Ww9M7v4XuWa0MK5JceB6nQoZWj/kZi9zIAcr7PCJCldAFRn8wm81A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861395; a=rsa-sha256; cv=none; b=sXr12abd7hQnvV8F3QE+/KVmobuUW5IVtYNUnBPm0YLUL3JORfTWdPsvlkf3TO7K3AgcYo tiOP/UKEICPlMS1aCgsfartSmuC+07uvMQdQc5S7p6iNMJzDtoZScmy1paWMwv3rcpe5sh hnDsyA8oly85gUpKCEP4F0HPivBeV9ElfGqFC8gDcD59AsP7KX0p7cfR/IrGbSjRlHzFrI O9hKxxr5JnAE7LFN/Aequ5w74wZButKBSW74WtmTMElQ6/+6VuJxHfObDK2ytJOoQFuswx XxN63pdNhSjwcvjXcii9mVraCevaVILWFRv1OWC+TYjIufyIlCLDDxDmE8e2fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzl13jnz1Dxb; Wed, 2 Oct 2024 09:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929Ttio090397; Wed, 2 Oct 2024 09:29:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929Tt9a090394; Wed, 2 Oct 2024 09:29:55 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:55 GMT Message-Id: <202410020929.4929Tt9a090394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b13093260ad4 - stable/13 - rc.subr.8: Do not use mdoc macros for Bl width List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b13093260ad4122ff1e875df9eaee0d243d9e46e Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b13093260ad4122ff1e875df9eaee0d243d9e46e commit b13093260ad4122ff1e875df9eaee0d243d9e46e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-22 11:42:12 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:22:58 +0000 rc.subr.8: Do not use mdoc macros for Bl width Macros do not expand there. MFC after: 1 week (cherry picked from commit 859868156a1658af71d57ee6c77c10fc192aa74a) --- share/man/man8/rc.subr.8 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 9126cc5e8ac6..888e9f914b99 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 18, 2024 +.Dd September 22, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -114,7 +114,7 @@ The .Ar action argument may be one of the following: -.Bl -tag -width ".Cm remove" +.Bl -tag -width "remove" .It Cm add .Ar file is now being backed up by or possibly re-entered into this backup mechanism. @@ -345,7 +345,7 @@ scripts to be implemented in a small amount of shell code. .Ar argument is searched for in the list of supported commands, which may be one of: -.Bl -tag -width ".Cm restart" -offset indent +.Bl -tag -width "restart" -offset indent .It Cm start Start the service. This should check that the service is to be started as specified by @@ -381,7 +381,7 @@ If or .Va procname is set, also support: -.Bl -tag -width ".Cm restart" -offset indent +.Bl -tag -width "status" -offset indent .It Cm poll Wait for the command to exit. .It Cm status @@ -393,7 +393,7 @@ Other supported commands are listed in the optional variable .Pp .Ar argument may have one of the following prefixes which alters its operation: -.Bl -tag -width ".Li force" -offset indent +.Bl -tag -width "force" -offset indent .It Li fast Skip the check for an existing running process, and sets @@ -437,7 +437,7 @@ but only certain small classes of them. .Ic run_rc_command uses the following shell variables to control its behaviour. Unless otherwise stated, these are optional. -.Bl -tag -width ".Va procname" -offset indent +.Bl -tag -width "procname" -offset indent .It Va name The name of this script. This is not optional. @@ -724,7 +724,7 @@ if .Ar argument Ns Va _cmd is not defined, then a default method is provided by .Ic run_rc_command : -.Bl -tag -width ".Sy Argument" -offset indent +.Bl -tag -width "Argument" -offset indent .It Sy Argument .Sy Default method .It Cm start @@ -793,7 +793,7 @@ The following variables are available to the methods as well as after .Ic run_rc_command has completed: -.Bl -tag -width ".Va rc_service" -offset indent +.Bl -tag -width "rc_service" -offset indent .It Va rc_arg Argument provided to .Ic run_rc_command , @@ -934,7 +934,7 @@ and then .Ar message . .El .Sh FILES -.Bl -tag -width ".Pa /etc/rc.subr" -compact +.Bl -tag -width "/etc/rc.subr" -compact .It Pa /etc/rc.subr The .Nm From nobody Wed Oct 2 09:29:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzm41P5z5YG1Y; Wed, 02 Oct 2024 09:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzm2MbHz3wmQ; Wed, 2 Oct 2024 09:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJrGyawM3JJ4xKjIRXhoSsporJaWQtv9Y+OZ+wQ5jsg=; b=yIFcCrAf7fGzeZyXubEUegdZSm5/DImaHguF8cafxjJe+KWeeaUM3azbQzxpiSdmIApCvD WHPiGUZaYCzs4LqK11uFSKBvMpXHfd/pzF9kmTbXS88nhvosQjFbyHu/3ocDIeADq3S7V9 Gu3ZuNRY+Kt0a0kyrTAmQkWOOHp65VWnZdoXv02MAU8JPes4eAOpgEFGtLXm7bJ0TAwH20 RLrc+RnAwDacBfnzwqdyK+s5sb4O/6a5geXVE2QwgpIk9qMeNtI1MUSc3CxY+9NRHf2UIS m879rJPExvyPEAQXL6/S9zofz1pa53QkwH7W2YsY3U5lczrR0DD5yp62iPukhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJrGyawM3JJ4xKjIRXhoSsporJaWQtv9Y+OZ+wQ5jsg=; b=IN9XkNiKvXER2u/iS3Ss31K1WZ5Ad40gmBQDEDz9jNtBNvSzh9m6jYtxP7jdGz9+tmskom h+G4Jo0fysZRcGhFu8m85kMzwDytsjm4ls9/MM1T7ujEt70ma+YEHB1dwVVbSfZG+bNHuT TOH71AfmHWY2Rw4Kz9uwucZQ4MSGD36/E+QfHTHIA0nh9/jQP+nSV+OMGg+6DJ1BI/9KpA 6iKq9Ba+IiDAjzP44yvhjmA2LFHM92BauyC+TmpuTLiK4jJfDScfK7KcnOPVxPOfQDkSpw rOUn7NMLs3U5ZBKcdRltil/nP1AOQ+DpJ9Mw/V7oMs3+Q268hy4ayXFVeZPTpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861396; a=rsa-sha256; cv=none; b=mD2px1fY8DBF6b1FM7NQ4NmEw8GZTe4/aGTVw4Cwblg/KncHk5tkL7rlMlMWrTsNjzlRgH PLp3Nu19byZqBf4DarwKCSByitkaAqapuhvcIvU0BquhGsHjfLO4lOsj5FKL33SB8A4Yqv ivMs5RPGcuHfvpU4dwWzN+M0ydpXPM8je3rNwfFDK72OUePVF91ZTZQbI7kQjV9kCdw+pB O/J5xRmF1eR8yv5wXZgrMkRRjL/IhZIhFYflyBRpwwMQBIdZ3qDsbM1ru/ff5xhDvGXfE4 9kNMI6SJFhRiTjPJtuMzrxmJC3DMPGLLeGBeHKKbUH/PS7hO6bhETlIp9I9q3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzm1zX2z1FBf; Wed, 2 Oct 2024 09:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929Tu26090475; Wed, 2 Oct 2024 09:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929TuPC090472; Wed, 2 Oct 2024 09:29:56 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:56 GMT Message-Id: <202410020929.4929TuPC090472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d51260ef9447 - stable/13 - rc.8: Remove false information about rc.d/local List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d51260ef94479a5e967d2b9eca74abc29c57d65c Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d51260ef94479a5e967d2b9eca74abc29c57d65c commit d51260ef94479a5e967d2b9eca74abc29c57d65c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-20 09:07:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:25:33 +0000 rc.8: Remove false information about rc.d/local It does not handle scripts in /usr/local/etc/rc.d/. Instead, it takes care of /etc/rc.local and /etc/rc.shutdown.local. MFC after: 2 weeks (cherry picked from commit 9dc67a70650b99872316d7ff95ef45ea4c5b455a) --- share/man/man8/rc.8 | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index 2097c85fdc4d..104dbbcdfbc9 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -30,7 +30,7 @@ .\" .\" @(#)rc.8 8.2 (Berkeley) 12/11/93 .\" -.Dd June 1, 2023 +.Dd September 20, 2024 .Dt RC 8 .Os .Sh NAME @@ -447,18 +447,6 @@ is not set, when going from single-user to multi-user mode for example, the script does not do anything. .Pp The -.Pa /etc/rc.d/local -script can execute scripts from multiple -.Nm rc.d/ -directories. -The default location includes -.Pa /usr/local/etc/rc.d/ , -but these may be overridden with the -.Va local_startup -.Xr rc.conf 5 -variable. -.Pp -The .Pa /etc/rc.d/serial script is used to set any special configurations for serial devices. .Pp From nobody Wed Oct 2 09:29:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzp6d2yz5YFwR; Wed, 02 Oct 2024 09:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzp4GRzz3x1Q; Wed, 2 Oct 2024 09:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zJQUQG8Ih54zP/ZJieztQKmcgfhxm4bfu1OUqPQ5xE0=; b=NH0u3k2mwqzV0BVq8B5LAG8TT2qYk/O0KhlKYGO8rjfTHT3MpxhlO3qtTwG5058uQg5kPD m805APJ9RuQi8BN+08o61sBHLf5P/rFvFA/G35pHvdN2E4F8IVzyMjGzAxIYIuZKgttK87 KMXUUU2FPWywIU+LGKp29Jxbm28/Wp66R3fkoMtEgjVAM8KLL3gO/UZYmo0K8oRG687RUK gge+JeOtQg1IyrIhWQa7/w2Ip9y7xrhVBUM74pg4jefrwLvsraIXKsOIx5mB8ysGl2BtMm W6N5+Z9kzRAi2aVCSzG0br1eF4UcJg5Og4halGGODTE6oBJUnajvbIzAQwDdGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zJQUQG8Ih54zP/ZJieztQKmcgfhxm4bfu1OUqPQ5xE0=; b=h3xbUnzaOkV0Jd9/ZtPriDRQgbMkC87W1t79gG94BBzjjGwOnpvDQSFiWTmBYFMeon2RBj Mh3KZtqtPFbVVGkFgDye2YRCsn2fG+TAv54JxVivxozlJVaRJwlHqXzv1XAX19Lur3eELZ 52CwDl4E1Sncmtjd9Lk1Ri29kiDakNYrDzR+XHzdym7Z13le6WLlxV3ysc4NUgtKi4v1UX VXdHUcBBxWNTgHSBj+rYjvVQr6fw1+MuPVl1hbVxrfyXZ+MGbb9hsQhAx6EkOBEX7RHrHg gfV++3+5jAa8HYZDMwV/1n1hnooYegdUZ60IPqZVGCjxdkuC9+aBz5RyEJQSKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861398; a=rsa-sha256; cv=none; b=r2pUGoB8LAAaEnb6upmq2v/EknQ5iBRlg1drCzT5pPHaUXzW9UF/Wqb9EhXrExzobh7vTq DwWTEoFms90LakTDqzS/YIFKVMWreEt2PrjtVjscgwSyZOv+nuIeXcA1/YlSNbgtsL6kfY SVnFtU+uc8fq1EuFh5qn6Ba1FJDGTlRl3AYiE0+Ta6IqOdkm7jffGvnULky3kjp522Xvzh eH3rl6Cd94IZKSjp/qK7/Mf+OZYQ5q/h4cn0C39Nq7kANV4+fxa9uxihjmS+AtINddUUAq jj76RNg8CL7FVJ2iflEAR3vc/gkGb7EK5LYOnwFs3TdfnNSkyKC9iLle0uysYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzp3t6jz1FBg; Wed, 2 Oct 2024 09:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929TwQ0090600; Wed, 2 Oct 2024 09:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929TwEZ090597; Wed, 2 Oct 2024 09:29:58 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:58 GMT Message-Id: <202410020929.4929TwEZ090597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 416612c63772 - stable/13 - rc.subr.8: Fix the Bl macro of a list which is actually a table List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 416612c6377266f20def000ea0b68d04d1ed8bd6 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=416612c6377266f20def000ea0b68d04d1ed8bd6 commit 416612c6377266f20def000ea0b68d04d1ed8bd6 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-22 18:21:17 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:27:12 +0000 rc.subr.8: Fix the Bl macro of a list which is actually a table MFC after: 2 weeks (cherry picked from commit 6e414739fc95663836a5a10a8cf13e0211fd5efc) --- share/man/man8/rc.subr.8 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 888e9f914b99..b506eb1d6ee3 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -724,17 +724,16 @@ if .Ar argument Ns Va _cmd is not defined, then a default method is provided by .Ic run_rc_command : -.Bl -tag -width "Argument" -offset indent -.It Sy Argument -.Sy Default method -.It Cm start +.Bl -column "Argument" "Default Method" -offset indent +.It Sy Argument Ta Sy Default method +.It Cm start Ta If .Va command is not running and .Ic checkyesno Va rcvar succeeds, start .Va command . -.It Cm stop +.It Cm stop Ta Determine the PIDs of .Va command with @@ -746,7 +745,7 @@ or those PIDs, and run .Ic wait_for_pids on those PIDs. -.It Cm reload +.It Cm reload Ta Similar to .Cm stop , except that it uses @@ -763,21 +762,21 @@ It can be enabled via if appropriate: .Pp .Dl "extra_commands=reload" -.It Cm restart +.It Cm restart Ta Runs the .Cm stop method, then the .Cm start method. -.It Cm status +.It Cm status Ta Show the PID of .Va command , or some other script specific status operation. -.It Cm poll +.It Cm poll Ta Wait for .Va command to exit. -.It Cm rcvar +.It Cm rcvar Ta Display which .Xr rc.conf 5 variable is used (if any). From nobody Wed Oct 2 09:29:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJTzn71Skz5YGBh; Wed, 02 Oct 2024 09:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJTzn3C0gz3wqd; Wed, 2 Oct 2024 09:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yNZbfLTwQWrqaBy4qgdSO9Fp0r0i5SDzW/vO1caM8T4=; b=TccJPPlBc3twy4nChshZNx72bv55PVY8C4W4jzFcQTxG+dY1FNgXJXIyrOBVr1wrKuRjvB TlwM7TEY3slaOZIWYKGzeOaiNy7Kwl4eHOYktpPQ0TZKRiA7YDd7OIBwaBPEYZL4VqbE65 jzyrDepKXDyIgKCU+JviPEIh5J+j3aweNB8nEnZnJMV0BZBrbgrtDHcaktNlXatxyKWUq2 27NQ2hQd9XLJZCKNkuWkpv4G2MTbqxQAWvkbn7X80gpI0nXQs/Yts0RGVab/JBzARblFEb FIFsSzcLItUMQ/hHPuQtssPsMSN2LcOhzn3yXcscwGNDn7hcg19Y/kvpgG0L/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727861397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yNZbfLTwQWrqaBy4qgdSO9Fp0r0i5SDzW/vO1caM8T4=; b=RhMnx7bH3ElTQdYhMMU75arqRczPBm8xs3hoewq3V5mX4Racc2bNHgTpphfXy9tKjSWEUp weTl90cOINjb25t7J6W8NTLnavi9HchKRDDtRjQvGfQWopqldCT6nXT6UA86bM5Al7oVHt Z43WtgE71CxxhfBKnOBkV7DJZlwdLxyctMOWBfU5Zmkf8iTBrd8GIOKII+R3wrMqbyOi/V Ji7YTHczsDi3r2TjAdz7alRGVNWwyZA404NgFo9ZpsdZtx9xn2qNa5kH+ETG2S8bPx+viG XIyg0IW2y9j/pil+Jidqu2ruQA4mZFoB4opsgIIB+AEmANd7vuUGjFhc3MjIcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727861397; a=rsa-sha256; cv=none; b=x5FPrRRrX/TQiYDOPmwxbfhF0w3qmOKTimEr/lWR9NTFaedvHrC2vfJoMRQFkJaTB0KJP1 ShQz2YhhJ4+4lNhmOeJMT0ngDD03mgqCZQeZXlCeMAd4BOKoDFC/mcGGsojJWZ5GFGv14y Bp/g5SNCSZ2jlB1oyTn8NhfaTN0HVeJLswtahLTlxDtTqX2Xwk64J4wU83dwOnP74MPOdp w03Kur0PS7vo7h5ErEK8vI0Jxbet6TyU+uZHmFvvSZYcE4i1KUxl7LGdo2+gwk5furX2Ss dkuI9P66vfCjxIPUkl6qYyapsXbp5LkpAKVZKFzDFsxEwFCudljc8kEaTb4YTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJTzn2q3Jz1Fg6; Wed, 2 Oct 2024 09:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4929Tvil090533; Wed, 2 Oct 2024 09:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4929TvTO090530; Wed, 2 Oct 2024 09:29:57 GMT (envelope-from git) Date: Wed, 2 Oct 2024 09:29:57 GMT Message-Id: <202410020929.4929TvTO090530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 35d8a02eead8 - stable/13 - rc.subr: Consistently use an absolute path for sysrc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35d8a02eead8a3fb4da232ad27935834d135b3ae Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=35d8a02eead8a3fb4da232ad27935834d135b3ae commit 35d8a02eead8a3fb4da232ad27935834d135b3ae Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-09-20 09:27:34 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-02 09:27:05 +0000 rc.subr: Consistently use an absolute path for sysrc MFC after: 2 weeks Approved by: christos (cherry picked from commit 401516dbc54e4a4cba3085cd605fbf6cf8293b79) --- libexec/rc/rc.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index f1eeb81a5d39..99dcc41c50a1 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1086,8 +1086,8 @@ run_rc_command() delete) _files= - for _file in $(sysrc -lEs "$name"); do - _out=$(sysrc -Fif $_file "$rcvar") && _files="$_files $_file" + for _file in $(/usr/sbin/sysrc -lEs "$name"); do + _out=$(/usr/sbin/sysrc -Fif $_file "$rcvar") && _files="$_files $_file" done /usr/sbin/sysrc -x "$rcvar" && echo "$rcvar deleted in ${_files# }" # delete file in rc.conf.d if desired and empty. From nobody Wed Oct 2 12:20:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJYn65JSQz5YRpX; Wed, 02 Oct 2024 12:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJYn63x99z4XLm; Wed, 2 Oct 2024 12:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727871658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZA3Tq95jH9+UkMBWcBy14AVxmuYeM5q5UYcVlMbkX8=; b=LE8fAervarzFYxiyTOuDg9tmF+07O5igHNCwBNSNcRTgtII1FMdmXDkhJcKGbS/ic7D7pu kgiGcNrE3AUUeN83o703wfOHLY32wW9u3xgk1a8V5ayS/MBTbU2jEk5LCOfW3Qz6Tdjs3O uS1BY+mTb3zLclNskrOR60td80AUT7/l8DPaXddOS3FF6Ff8o2LKuQ9HJvyGxFvIuG6wzn uRndS2k6J33Le1MaxLZ6JnrJGnIAqcVHUUS620gHGmibmTmT2s5H3Asrq0YHOMIQ6C13sV LjBdz+gNJKcGT2uUVlFs+/tssr3nPCSJO4P2S8tGizLQG1SACNty0bfKcalhSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727871658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZA3Tq95jH9+UkMBWcBy14AVxmuYeM5q5UYcVlMbkX8=; b=mamkIOBikA+PMkd2BXufzlmseyKPd4JoMmF4XH7h4KFq8T05M2vr60qgWD1Ywg6pyDgy6Q B9/h5An8Oi812+zEerzpQPlfxP+9Sq/pUzkRk9i584hVf/R0o4uKVMZo2pJP6feERWPlAa hkWmYREosCR4qucWGAJ4Br2ZUs0apknX0h6M6LFe3eAHQItvYwGdwWp5JhM08aZBIyTY/v G2Ls5jglU7SDNve27ZHM3cb34vhWcLl5f7RPUM1aQKKSvOcZZY3btyljfJ7ahocQkTYhJS Wj4G0WcJe/chfxe/E2tQDxOCZ7c8LqGeghrfiwabVd6SuuiOstzPa0y8cx1fmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727871658; a=rsa-sha256; cv=none; b=dKFxUINYC2ZtgOGz7JvFmnU7enGuRf1LtDm/KjCI+otobWlMjnIYfRcjdVe2BQXPqDnhC2 FEAbd3yrMy3nFGr1/hNla0lcJVaI7J1qX1a8TGiy5Ryp4rsGjv5VVeNyQIAkzj+379l6wB +w5tY6TUOVyv/fzDPVg++152cX0F9dNHuRdWhZSkqRj+KrlWpyW8ZbFL8deRHwfA2NSo5T O7jMGxV0BtAXoWp1GKhqsOgFN+pu5/pe0++MBdmIMbRbWjdxH+YN6XeHW8iroLuFEhxc0Y CQykdRKNsD00VM/MCtYh6SzGhUUfZeY2MFG9BktfrlXrY+Z/t/DQj5WTum71JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJYn63Dshz1KjC; Wed, 2 Oct 2024 12:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492CKwcP091505; Wed, 2 Oct 2024 12:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492CKwUl091502; Wed, 2 Oct 2024 12:20:58 GMT (envelope-from git) Date: Wed, 2 Oct 2024 12:20:58 GMT Message-Id: <202410021220.492CKwUl091502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c17a0f62da17 - main - pf tests: use unique pid files for inetd processes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c17a0f62da173df5e4a5433dfb90ef9f8dab98d4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c17a0f62da173df5e4a5433dfb90ef9f8dab98d4 commit c17a0f62da173df5e4a5433dfb90ef9f8dab98d4 Author: Kristof Provost AuthorDate: 2024-10-02 09:59:23 +0000 Commit: Kristof Provost CommitDate: 2024-10-02 10:03:19 +0000 pf tests: use unique pid files for inetd processes Ensure that we don't conflict with other inetd processes running in other jails by setting an explicit pid file (rather than relying on the default /var/run/ inetd.pid). This could lead to failure to start inetd, which in turn could cause test failures. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/ether.sh | 4 ++-- tests/sys/netpfil/pf/utils.subr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/netpfil/pf/ether.sh b/tests/sys/netpfil/pf/ether.sh index 0369e0e57ee6..104baf468aa4 100644 --- a/tests/sys/netpfil/pf/ether.sh +++ b/tests/sys/netpfil/pf/ether.sh @@ -286,7 +286,7 @@ captive_body() # Run the echo server only on the gw, so we know we've redirectly # correctly if we get an echo message. - jexec gw /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf + jexec gw /usr/sbin/inetd -p ${PWD}/echo_inetd.pid $(atf_get_srcdir)/echo_inetd.conf # Confirm that we're getting redirected atf_check -s exit:0 -o match:"^foo$" -x "echo foo | nc -N 198.51.100.2 7" @@ -304,7 +304,7 @@ captive_body() atf_check -s exit:1 -x "echo foo | nc -N 198.51.100.2 7" # Start a server in srv - jexec srv /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf + jexec srv /usr/sbin/inetd -p ${PWD}/echo_inetd.pid $(atf_get_srcdir)/echo_inetd.conf # And now we can talk to that one. atf_check -s exit:0 -o match:"^foo$" -x "echo foo | nc -N 198.51.100.2 7" diff --git a/tests/sys/netpfil/pf/utils.subr b/tests/sys/netpfil/pf/utils.subr index 0b7ee621e6fa..c854ad5e69d8 100644 --- a/tests/sys/netpfil/pf/utils.subr +++ b/tests/sys/netpfil/pf/utils.subr @@ -217,7 +217,7 @@ setup_router_server_ipv4() jexec server route add -net ${net_tester} ${net_server_host_router} inetd_conf=$(mktemp) echo "discard stream tcp nowait root internal" > $inetd_conf - jexec server inetd $inetd_conf + jexec server inetd -p ${PWD}/inetd.pid $inetd_conf } # Create a bare router jail. @@ -271,7 +271,7 @@ setup_router_server_ipv6() jexec server route add -6 ${net_tester} ${net_server_host_router} inetd_conf=$(mktemp) echo "discard stream tcp6 nowait root internal" > $inetd_conf - jexec server inetd $inetd_conf + jexec server inetd -p ${PWD}/inetd.pid $inetd_conf } # Ping the dummy static NDP target. From nobody Wed Oct 2 12:20:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJYn76t4Bz5YRxG; Wed, 02 Oct 2024 12:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJYn74ddYz4XNq; Wed, 2 Oct 2024 12:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727871659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkwvZsQSesuR28I78GZ7co0iYdtp5Nkjlr2iP7ZXXH0=; b=avXpe+AlX8DBmTPE5kD9TIzyjz65QjSqXlBo8fNi6/2f/nqcMFKaOgehpqCJh+1VYnkxr6 +HSKfOxkCDOEm9YyBDN/wJz/B19aAX+71iiLopbTFoXyIiyOcmC0VXjpbdQIrxxivCQ2Ag IbyDXbsHOs10hLli1jl2uHzB539wUUtN64UWdlvxlEME3QeD63CzfkO4tE0w3dtXlOX5Zy MQHapjG2hhPu5CZ8TKi+SXmrMIdsuX+VpFxTPulUSF9aWkWmAH66ZgGXK5HNZyQc9Stsw7 PW8laYMc3FKEB47PEPiOk4Tp2OZwQHjY+X6B6szMPSaAQbVtyZPuHTJxbuX/+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727871659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkwvZsQSesuR28I78GZ7co0iYdtp5Nkjlr2iP7ZXXH0=; b=hva5DM6Er0+MOdKqhpBaG9ZdAjomPpzvv4Scm5vSRgIihT+jtuJRqd9Q3xyJJhVOKjUy9R J/0hoidVJdZ43p2d7GNLyrlG7tgXg4fQq1dHFjBhQTiZ8v2jwq7fuVzoOSjd2+jpALrMen 0JEbbfSWqpbwubpJuFVFDqy3P92F4Qq9/i4i9VmGKAdF06K9jZBgWs9OvWosYHfH/PgOGr UizmaUKVzjx8sumq/bekGp+p/6/Kscwq/Bgs8i8mjk/jnIY4Rtc9BtWZib+BvcWjP64OL2 LmPfDTjeOjLL0FX/2rUQyK6cDbHlNHqZ1T5uANimafI6uVPZC0rOT6UhUuEjWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727871659; a=rsa-sha256; cv=none; b=Em9kWE6fcuHxnqgjKx3/sQYLkJEyBFRYV8f7oAQfcaGFWja86Au3Qyg0f477lkle99NxdP FtHcR+4FwrEPP/RROH/v2JryVmt+ssAolspPxkH/XqgORzUtDE3QRKoUyB26E0iQfQgDrf r8SSz4ZHF6z6H8sYh5nVxTjYPfZJNjsrTeS6fqPiywgZZ/1AB5ZMcEORW5DAsivrZi7CMh 8QVu5kP3Q78Jw1mze8PwKkHIYCjhJFbTmCpf+djfLZO8OlIGuruBN6b2/K78D56YjZqxTb +Yz1IoT0KZ0iGWDkpKEDQiiY6erVwcddRLsffmVD0HbOj2Ec9AN1F9oeLZc0aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJYn74FgGz1LDN; Wed, 2 Oct 2024 12:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492CKxr0091546; Wed, 2 Oct 2024 12:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492CKxkQ091543; Wed, 2 Oct 2024 12:20:59 GMT (envelope-from git) Date: Wed, 2 Oct 2024 12:20:59 GMT Message-Id: <202410021220.492CKxkQ091543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6bbef793552c - main - pf: Remove struct pf_pdesc->nat_rule List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bbef793552cf6167c88c9d8e55e1874256f0d51 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6bbef793552cf6167c88c9d8e55e1874256f0d51 commit 6bbef793552cf6167c88c9d8e55e1874256f0d51 Author: Kajetan Staszkiewicz AuthorDate: 2024-10-02 10:05:04 +0000 Commit: Kristof Provost CommitDate: 2024-10-02 10:05:08 +0000 pf: Remove struct pf_pdesc->nat_rule The variable struct pd->nat_rule is set only during rule evaluation, that is only for the first packet of a connection. Use struct pf_kstate->nat_rule instead. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46867 --- sys/net/pfvar.h | 1 - sys/netpfil/pf/pf.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 79dcd0d65985..53bc77d14537 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1602,7 +1602,6 @@ struct pf_pdesc { char any[0]; } hdr; - struct pf_krule *nat_rule; /* nat/rdr rule applied to packet */ struct pf_addr *src; /* src address */ struct pf_addr *dst; /* dst address */ u_int16_t *sport; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 51b4cebc88e9..b28503112db6 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5131,7 +5131,6 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, } if (nr->natpass) r = NULL; - pd->nat_rule = nr; } while (r != NULL) { @@ -7900,7 +7899,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, error = EMSGSIZE; KMOD_IPSTAT_INC(ips_cantfrag); if (r_rt != PF_DUPTO) { - if (s && pd->nat_rule != NULL) + if (s && s->nat_rule.ptr != NULL) PACKET_UNDO_NAT(m0, pd, (ip->ip_hl << 2) + (ip_off & IP_OFFMASK), s); @@ -8113,7 +8112,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, else { in6_ifstat_inc(ifp, ifs6_in_toobig); if (r_rt != PF_DUPTO) { - if (s && pd->nat_rule != NULL) + if (s && s->nat_rule.ptr != NULL) PACKET_UNDO_NAT(m0, pd, ((caddr_t)ip6 - m0->m_data) + sizeof(struct ip6_hdr), s); @@ -8771,7 +8770,7 @@ pf_counters_inc(int action, struct pf_pdesc *pd, struct pfi_kkif *kif, struct pf_kstate *s, struct pf_krule *r, struct pf_krule *a) { - struct pf_krule *tr, *nr; + struct pf_krule *tr; int dir = pd->dir; int dirndx; @@ -8823,10 +8822,12 @@ pf_counters_inc(int action, struct pf_pdesc *pd, pf_counter_u64_add_protected(&ri->r->bytes[dirndx], pd->tot_len); } } + tr = r; - nr = (s != NULL) ? s->nat_rule.ptr : pd->nat_rule; - if (nr != NULL && r == &V_pf_default_rule) - tr = nr; + if (s != NULL && s->nat_rule.ptr != NULL && + r == &V_pf_default_rule) + tr = s->nat_rule.ptr; + if (tr->src.addr.type == PF_ADDR_TABLE) pfr_update_stats(tr->src.addr.p.tbl, (s == NULL) ? pd->src : From nobody Wed Oct 2 15:52:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJfSt4x5cz5XjJB; Wed, 02 Oct 2024 15:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJfSt4V56z40YQ; Wed, 2 Oct 2024 15:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Q3ED+CMEEh1dC3oC4Z3Eb16SsAZLUni+j9X8gCI+fU=; b=TnfYTdIl+PZB9Dv0t4MTo2Yfmeee/SSnQ6MH2IDi6dmRx9dGwp+AMhxI3XwkuS8SE/iCgv 9WlRbQRrABew9+xQUOYBiFfLPez9N/FcRvqFGOUJ7gNyIDGYaaj/8OpRWO3pVe4wnNp+I4 +O3h0XD6JeJgrFzDyREw23/HiXBGb5OCZM7vvHne7dcMFtEkeK6uKTSU1EA6OITfgRFBrs bnHVIIVdYv0LdU06UFZmogz3+gHMVyZAGYrUCfwg5+WyFZFgSdCoBbAd8RoDlbj5sB0s4F 62eap+U+djQgFE9WnpLFh3uB9VlXU6+C1NjUbpyznDVNGzKc8OtQsj9A6xQZvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Q3ED+CMEEh1dC3oC4Z3Eb16SsAZLUni+j9X8gCI+fU=; b=fUsW3kJoui/9oYDM/9pGl8JLQUqcRqSZ49qAonVM78RU7tj/6v2eDrz4F4WFnPNafANimV H3+qZRJqkXb6UzySoy04zF5wHYpF3MSM2sgBPQ42oArHW5pccqnY4cSxb8QMQvqrQPyO1V 9bNQPJd1HdcRkaDNoikZ8LNHFyUPA92ORmqnQOXzIFiO4w81N30VBRqfMCqahWBm4XG8Qk UrrtPuW8/d1VxLPaH9tWfHpRI/p3PV8d3aduUQa68zR5H/ujYnDeuH+LrVnaOHdvcKau5K S4PoGphZ6rlmb7Z78qjaWeIH3nlwM6pteSeeACX2M3C72FwiKcAGDJz8XknqPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727884334; a=rsa-sha256; cv=none; b=IwKH+bY0klaTw1sIypDw9WxbSgMrUkNoWl0pqv52w9nvsBDLtuR9bzBiqMktXGUNhQRAU8 ZvH8oSHakDsw5X8t/JgOlm+GeK2dOV4Ki0zFTdo9sR2xDAWBRUFC77f3pBR/96Padsd0wv TeXPx66gPFzKrY7Cw+R17A/XkJ+UsrcH8QrB9yeLPVhjYu4Rs8PtQgtjxtquQNyBhPEgHf J6YC5ntb2/IX4+wtjdZbMpbXq4RqdF8MABa0kJy2NnAbDzSG4qm0nwu6iHH3YYtbcsrp6k Udn8zHHEuLcBWmKcEpGlWkpGkh3i+oWPXngHzw9UG9auC24YMC76BtkppO3D4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJfSt3ysWz1QVT; Wed, 2 Oct 2024 15:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492FqE4A049150; Wed, 2 Oct 2024 15:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492FqEQh049147; Wed, 2 Oct 2024 15:52:14 GMT (envelope-from git) Date: Wed, 2 Oct 2024 15:52:14 GMT Message-Id: <202410021552.492FqEQh049147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: fe55d62ab9a5 - main - Revert "stdio.h: don't expose rsize_t unless __EXT1_VISIBLE" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe55d62ab9a5bb930dde3fcf54e836bc915de5bc Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fe55d62ab9a5bb930dde3fcf54e836bc915de5bc commit fe55d62ab9a5bb930dde3fcf54e836bc915de5bc Author: Cy Schubert AuthorDate: 2024-10-02 15:51:00 +0000 Commit: Cy Schubert CommitDate: 2024-10-02 15:51:56 +0000 Revert "stdio.h: don't expose rsize_t unless __EXT1_VISIBLE" This change has caused a number of port build failures. Let's revert this for now and request an exp-run. This reverts commit b35f0aa4952cf03f1b2093b110607c13dd2ec991. --- include/stdio.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index ee3ab3bfb986..b0190d25eb4f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -48,13 +48,10 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif -#if __EXT1_VISIBLE -/* ISO/IEC 9899:2011 K.3.3.2 */ #ifndef _RSIZE_T_DEFINED #define _RSIZE_T_DEFINED typedef size_t rsize_t; #endif -#endif /* __EXT1_VISIBLE */ #if __POSIX_VISIBLE >= 200809 #ifndef _OFF_T_DECLARED From nobody Wed Oct 2 15:55:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJfY80MNBz5Xjgk; Wed, 02 Oct 2024 15:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJfY76z8Rz40qg; Wed, 2 Oct 2024 15:55:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/wlnaWfGlWyGR8cfFGwa4UYdzuokywc+pTaIny5oI58=; b=FrMexlmVFrBRZA0OsVNe4PRmLBVK7KscIPq136uJSOwUvTuUZmAisFVMei9yLVwLfKQjVh WfJ5qMQ8y3sHQr/3MHnQfaXL/8vK/rTRnWE8sy93iCRe4sTHoUrWEPaULgu2bBMnB0LXEN voum4j8K02mW9n+EmDzfNX4Z9WwWG14uw1RCOF/JS2lSNtGzSwiRysBTmoyAZMKrOYZdJX kg8w5Tj8N43kiMAPeAi9LqQ89s1znA5C4F29Wu1R4hdTH0ZybjhHLYUqJtFUfQdOH+9i6j Rv1bi1cyQRNykU+F0bCdbVMPp+NGckmHjq5nKg9sz9urpHpdj1SNau6dy+38VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/wlnaWfGlWyGR8cfFGwa4UYdzuokywc+pTaIny5oI58=; b=RE7soR4j6gdAiau712n/UZe95Ed1np7hi4jUKKd9xLsUcqkSjvQKUlGHSRiTo80za7nYl0 lORDwIR//tJsENGNybAG3HxovjxQHHS8N9UVy5tIpdWpzQHDCrTsxEwiMvxS7ZOJ5AH91R hrOx+B6dy0zxDjBGlFRf89CuN207n5CWzbdf47+QFWQ3czyD/QOxp9guujwJikCJh54im/ eSYHFNyH8/ow0sNIPwddreWBmcghL6cnB2rRbPeZ48j3xbQjLE9lCF2UEjxMmWVmhVQv1O duQX1M/FA//Z+iI9g5nKzkijAJzNBTnjR9rO+atdzheRAWSZiZjUJXr6dLdnCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727884556; a=rsa-sha256; cv=none; b=woQtwPU1nzEXb/VxKmRmZlLnSBhyRNPPO6Rj3QNsVX6Y5m3tohR2HqkkDC88Wd/zWfF5Hn 7Qom9uT97PsD4dU4My0XiguG72vet/1O6+dur796SyfteoiubUdv4Xe3t86cd33+0WVVSF PEwz7aO91r753SH9Pio8mKu3/opFwqSH9vEOFkK3cxs9iECgyT91M9ppR2A9mFNOUsr1tK QQWRMn0HOwJmB/JFmoQDRSSgKvod8yHuN2NBJCYLC9yrr0p8zbJh3AC549DwIL0/Jy4wye WjJq1vewyFXPAZbhneyOyE8RHTvUb1dYasCBdeQTpLFIDEIZgwRr8jOzxa12iQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJfY76ZPQz1RW0; Wed, 2 Oct 2024 15:55:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492FttLS050813; Wed, 2 Oct 2024 15:55:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492FttA0050810; Wed, 2 Oct 2024 15:55:55 GMT (envelope-from git) Date: Wed, 2 Oct 2024 15:55:55 GMT Message-Id: <202410021555.492FttA0050810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4e859e67dde2 - main - libdiff: Implement diff coloring. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e859e67dde2cb4a583d340b27793a255f62f53e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4e859e67dde2cb4a583d340b27793a255f62f53e commit 4e859e67dde2cb4a583d340b27793a255f62f53e Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 15:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-02 15:55:06 +0000 libdiff: Implement diff coloring. This patch got accidentally left out when libdiff was imported. The rest of the code (command-line option etc.) was present, just not the part that actually prints ANSI color codes. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46873 --- contrib/libdiff/include/diff_output.h | 4 ++ contrib/libdiff/lib/diff_output.c | 69 ++++++++++++++++++++++++++++------- usr.bin/diff/diffreg_new.c | 2 + 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/contrib/libdiff/include/diff_output.h b/contrib/libdiff/include/diff_output.h index d2568c5a2b50..500ee6427574 100644 --- a/contrib/libdiff/include/diff_output.h +++ b/contrib/libdiff/include/diff_output.h @@ -110,3 +110,7 @@ int diff_output_chunk_right_version(struct diff_output_info **output_info, const char *diff_output_get_label_left(const struct diff_input_info *info); const char *diff_output_get_label_right(const struct diff_input_info *info); + +void diff_output_set_colors(bool _color, + const char *_del_code, + const char *_add_code); diff --git a/contrib/libdiff/lib/diff_output.c b/contrib/libdiff/lib/diff_output.c index 3b84608882f6..2a0d95896e1a 100644 --- a/contrib/libdiff/lib/diff_output.c +++ b/contrib/libdiff/lib/diff_output.c @@ -30,6 +30,22 @@ #include "diff_internal.h" +static bool color; +static const char *del_code = "31"; +static const char *add_code = "32"; + +void +diff_output_set_colors(bool _color, + const char *_del_code, + const char *_add_code) +{ + color = _color; + if (_del_code) + del_code = _del_code; + if (_add_code) + add_code = _add_code; +} + static int get_atom_byte(int *ch, struct diff_atom *atom, off_t off) { @@ -66,12 +82,25 @@ diff_output_lines(struct diff_output_info *outinfo, FILE *dest, off_t outoff = 0, *offp; uint8_t *typep; int rc; + bool colored; if (outinfo && outinfo->line_offsets.len > 0) { unsigned int idx = outinfo->line_offsets.len - 1; outoff = outinfo->line_offsets.head[idx]; } + if (color) { + colored = true; + if (*prefix == '-' || *prefix == '<') + printf("\033[%sm", del_code); + else if (*prefix == '+' || *prefix == '>') + printf("\033[%sm", add_code); + else + colored = false; + } else { + colored = false; + } + foreach_diff_atom(atom, start_atom, count) { off_t outlen = 0; int i, ch, nbuf = 0; @@ -80,14 +109,16 @@ diff_output_lines(struct diff_output_info *outinfo, FILE *dest, size_t n; n = strlcpy(buf, prefix, sizeof(buf)); - if (n >= DIFF_OUTPUT_BUF_SIZE) /* leave room for '\n' */ - return ENOBUFS; + if (n >= DIFF_OUTPUT_BUF_SIZE) { /* leave room for '\n' */ + rc = ENOBUFS; + goto out; + } nbuf += n; if (len) { rc = get_atom_byte(&ch, atom, len - 1); if (rc) - return rc; + goto out; if (ch == '\n') len--; } @@ -95,11 +126,13 @@ diff_output_lines(struct diff_output_info *outinfo, FILE *dest, for (i = 0; i < len; i++) { rc = get_atom_byte(&ch, atom, i); if (rc) - return rc; + goto out; if (nbuf >= DIFF_OUTPUT_BUF_SIZE) { wlen = fwrite(buf, 1, nbuf, dest); - if (wlen != nbuf) - return errno; + if (wlen != nbuf) { + rc = errno; + goto out; + } outlen += wlen; nbuf = 0; } @@ -107,25 +140,35 @@ diff_output_lines(struct diff_output_info *outinfo, FILE *dest, } buf[nbuf++] = '\n'; wlen = fwrite(buf, 1, nbuf, dest); - if (wlen != nbuf) - return errno; + if (wlen != nbuf) { + rc = errno; + goto out; + } outlen += wlen; if (outinfo) { ARRAYLIST_ADD(offp, outinfo->line_offsets); - if (offp == NULL) - return ENOMEM; + if (offp == NULL) { + rc = ENOMEM; + goto out; + } outoff += outlen; *offp = outoff; ARRAYLIST_ADD(typep, outinfo->line_types); - if (typep == NULL) - return ENOMEM; + if (typep == NULL) { + rc = ENOMEM; + goto out; + } *typep = *prefix == ' ' ? DIFF_LINE_CONTEXT : *prefix == '-' ? DIFF_LINE_MINUS : *prefix == '+' ? DIFF_LINE_PLUS : DIFF_LINE_NONE; } } - return DIFF_RC_OK; + rc = DIFF_RC_OK; +out: + if (colored) + printf("\033[m"); + return rc; } int diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index a7a40ec12ec9..af9104559986 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -253,6 +253,8 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) goto done; } + if (color) + diff_output_set_colors(color, del_code, add_code); if (diff_format == D_NORMAL) { rc = diff_output_plain(NULL, stdout, &info, result, false); } else if (diff_format == D_EDIT) { From nobody Wed Oct 2 15:55:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJfY91Smtz5Xjpt; Wed, 02 Oct 2024 15:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJfY90xVyz40qh; Wed, 2 Oct 2024 15:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4W5yyUrvzCYnlbW+P9PP5g1/Rg6oJYdyng53mTR11N8=; b=WRox+LjhTjozuCYKcryNwkyjXZGLJTC4BuXAfFkS6WAJa/IuwMqUUX0Cvbl/Zu/n++JndY eNeSzeBF179+wtFQX5EZELXlbylYPctUeyfA4ERchmFqB9rjQHLa+ZJYzmWl1JtRnAuhox r/4ULyj8iQ1qBYD7LZ4HFKfS1gsVB2TfibenSvReQtTq2KuVRDP+ZvO6sFFjf/yoOeLK6d /r+yB8qe4/4DXh3rQY1u8NrXHW0UjU4v94MwffDHs2Z/ZWno07HkevXL0L81Oj91w5LRz1 VVvWaefufKkmIgLRB5oCNjN6T6M6uo7z1GGErnxyJX6POLn+0XJhcNGLThVTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4W5yyUrvzCYnlbW+P9PP5g1/Rg6oJYdyng53mTR11N8=; b=scQ8SysvOKGiOIUlPS+NR/yaCXKiJfjQ2InJJeDIbky1s7I16L3h5Yk+7P0WtrZa6xiVPP omTbUK1HM6cofhAUM4cPU8Kh5rDEgCCp+lZJxd26et9gmKZNFcZZFxDcD2SnVqcBGfXig+ YJHU+Mc3Y0TgshqCpEsrf9Zx2H2NEXZ+WDkTrA66/cloidJk5s62L9vWh15ZXdJA2GkPCE 1oDD1lCjEcLzMimv+x7O+Gr7SHXHSarqujQeW+sGydENvmdZH+Z/FGTrTZqrspMCVf2Ina WQk5FJAmGFQ8AugmWWJz90Vs2t8nFiLLQt7Wtggesy5wsm3lJQw24emfNjH1+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727884557; a=rsa-sha256; cv=none; b=h0hBwvotxRHe039vafnB0KPu/39lWn8majhvoRrjAzKgzCt/Off663QmnbXcboO5uuWmxv 9DvTHNJsVpyRFG5jeUbWlrGFha689lX1eK7ncoMV5V3eWmGQPGlp7jNatqTtrL+PqlfScq 2zkz6slsC4azx6sgRWL56Pg243Pc72eTRZmoMEgNPWCPCvS3VjnPqOi17JboshJKCkJ+HD UTyP/OOya1keCK+YRVG7YERIrs1gB3BWagVVC68BBnRXjSFzlz+bL83iaS0c6T6HkDAXD3 7UdlztUkklkNwP0JpNDlRfqMa2v6Gkv9Tpc6UOy5MmUyOSpTPfSiElx4pukF4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJfY90YP9z1RDg; Wed, 2 Oct 2024 15:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ftu8Q050867; Wed, 2 Oct 2024 15:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ftu50050864; Wed, 2 Oct 2024 15:55:56 GMT (envelope-from git) Date: Wed, 2 Oct 2024 15:55:56 GMT Message-Id: <202410021555.492Ftu50050864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2201f7c49f11 - main - Build BSD diff3 if GNU diff3 is disabled. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2201f7c49f11acc636d8d8be4b660a42a4ae4e58 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2201f7c49f11acc636d8d8be4b660a42a4ae4e58 commit 2201f7c49f11acc636d8d8be4b660a42a4ae4e58 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 15:54:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-02 15:55:06 +0000 Build BSD diff3 if GNU diff3 is disabled. MFC after: 3 weeks Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46799 --- tools/build/mk/OptionalObsoleteFiles.inc | 5 ----- tools/build/options/WITHOUT_GNU_DIFF | 5 ++++- tools/build/options/WITH_GNU_DIFF | 2 ++ usr.bin/Makefile | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c0118bcbf6cb..121905ad9158 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2073,11 +2073,6 @@ OLD_FILES+=usr/tests/usr.bin/dc/inout OLD_DIRS+=usr/tests/usr.bin/dc .endif -.if ${MK_GNU_DIFF} == no -OLD_FILES+=usr/bin/diff3 -OLD_FILES+=usr/share/man/man1/diff3.1.gz -.endif - .if ${MK_GOOGLETEST} == no OLD_FILES+=usr/include/private/gmock/gmock-actions.h OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h diff --git a/tools/build/options/WITHOUT_GNU_DIFF b/tools/build/options/WITHOUT_GNU_DIFF index 889e878668f6..4ea9f6f4a363 100644 --- a/tools/build/options/WITHOUT_GNU_DIFF +++ b/tools/build/options/WITHOUT_GNU_DIFF @@ -1,2 +1,5 @@ Do not build GNU -.Xr diff3 1 . +.Xr diff3 1 ; +build BSD +.Xr diff3 1 +instead. diff --git a/tools/build/options/WITH_GNU_DIFF b/tools/build/options/WITH_GNU_DIFF index 6ccea1c7f28e..cc7fbf25119a 100644 --- a/tools/build/options/WITH_GNU_DIFF +++ b/tools/build/options/WITH_GNU_DIFF @@ -1,2 +1,4 @@ Build and install GNU +.Xr diff3 1 +instead of BSD .Xr diff3 1 . diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 039dd8ed2f87..88786a0dd7e0 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -212,6 +212,9 @@ SUBDIR+= gh-bc SUBDIR.${MK_OPENSSL}+= bc SUBDIR.${MK_OPENSSL}+= dc .endif +.if ${MK_GNU_DIFF} == "no" +SUBDIR+= diff3 +.endif SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper From nobody Wed Oct 2 15:55:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJfYB3wdmz5Xjgp; Wed, 02 Oct 2024 15:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJfYB2RZJz4161; Wed, 2 Oct 2024 15:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kO0xSquQ2S491AR3W45ky+AI1++/bE7Yi1vDsaUGnEo=; b=mMxSBczlEF6VI1bUK/UNFMgdHXpLcnmCBADqNgYQbcCKMXoiTwu7oJsbTRkd4I23Qorjvg ts15cDcUtnwU1OTboi97aY2rbqAIVixGCqtjBDhlnn5bct0Jv2/18kXDKr7NYQ3FUBunb6 4nQD4KQod8UCu7GbJg1qIsXQARmFNgOg+IHKzjv5KTVEwP8Iyj/JjsjDzP5Yhqkljc9V+l CphiOjbfiCeMcCzTKY7bHlZoI2hgsl1w10BZ91t1jXayDY5KFWgZK59sbZc+C+Xi301F9Q aJOY927S/b3YgFqXXZYvBNgI0h5A+Wi6sKOoF42Jn4wobbk2rsUSb8wyHFm7Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kO0xSquQ2S491AR3W45ky+AI1++/bE7Yi1vDsaUGnEo=; b=Akokby/mEEb39ZTqqw5+IjRkCzqVeaaOczomjgcbfTwvFavwdRjFAfcNOe1aYig2oDTsLA YGoDIT0o4UvIREjzAwz/AwAneQGqzlI5JBftJ5gE1Eo9fIggBH1l5821JcKBn5sFukJzNw jjguIqt+CSgFy5uqlVOzqFaE4NPJAzkFYE8/BDSbZMfH4dl/cE5wagHYWGwy3Lr0Cccq1c GApx84q44DNyYdREg0EG0Ey8exV8fCzpYuvkoyS9Ptjs+c9aw/JUxWuTnF+R3DXS+PUBiY M3cexlthy77zfPN4oVkqDY05+ukTKLiVPFheht/mUu6THEI1M98jjXiXWsAzpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727884558; a=rsa-sha256; cv=none; b=sMeCP5Yd7nOp3GWCDn7SmUU4ojq1vQ17VaOOBW2s1QnIX3xfkWhDpVe/cFmanvww2OSvj/ gunc6lmwzFBrElgKkpFU16ans+VvqEzZUaMG6NGi5vEPZedFghvboYmFjzRfbzrTm/B9DO u4ayminFDU2HSILFLA2Q8a2xCBQG1WPPUYb2Gwl6Vh+NgzP5MQ9DdLNqA30Vx4cuLNQovQ ay7TMd/MQV0AxICZVrcqKj7HH81UrN8L0aOZopRy6EYXa5FxC10ELAF+M7zx3eNvgw0UTi rQCvyMd+IjRM2znZMhrANQ6v8NpS2Hu00GhxE9TZStD655abyOVRL1tNVTYwAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJfYB1smCz1RB3; Wed, 2 Oct 2024 15:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ftw9m050933; Wed, 2 Oct 2024 15:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492FtwoO050930; Wed, 2 Oct 2024 15:55:58 GMT (envelope-from git) Date: Wed, 2 Oct 2024 15:55:58 GMT Message-Id: <202410021555.492FtwoO050930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 26bd374e7268 - main - locate.updatedb: Revert to using cat to copy the db. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26bd374e72681860af4bf9d639308ad245949460 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=26bd374e72681860af4bf9d639308ad245949460 commit 26bd374e72681860af4bf9d639308ad245949460 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 15:54:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-02 15:55:06 +0000 locate.updatedb: Revert to using cat to copy the db. This script is usually run unprivileged, so install fails to create a temporary file while copying the finished database. Revert to using cat, which can overwrite the existing file as it is usually owned by the same user which is running the script. Fixes: f62c1f3f8e91 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46872 --- usr.bin/locate/locate/updatedb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh index ca1a79116a91..7d42cbb2260d 100644 --- a/usr.bin/locate/locate/updatedb.sh +++ b/usr.bin/locate/locate/updatedb.sh @@ -96,5 +96,5 @@ then echo "updatedb: locate database $tmp is empty" >&2 exit 1 fi - install $tmp $FCODES + cat $tmp >$FCODES fi From nobody Wed Oct 2 16:45:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJgdr4RfMz5XmD0; Wed, 02 Oct 2024 16:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJgdr3fx5z4C98; Wed, 2 Oct 2024 16:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727887504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6PR1t2AMof/MB8bj0HA2FJjr9/p9bfuj674TCTAySQ=; b=EoLP6D+nJF768Tnp8mgHHQ0QKGNA3AOu87+aCPY0BXKze3Koo/o62secHu8O7CvAFRWfFc WyNsuR6HTYn0P3LkIR975p6DZNdUxzl4kBRsMI86UjG5VaeKhvuFRn5Pn/9hzuiLyIOJYQ 3uRRnJZi0LMWCGOydYpzCDnE+b+UjNAdQ8wRa4VeBWDqN7vau49KjqIQfEl4RQgaKWOFk9 FREXjWzuLF8zrR3JcldYZZsDuRWKJsxhbNRfyg8rX/Ft3Z0XF2PDKvojgaG5JDxiDQGlf7 c3+sXR4pS2nIMADBrV8bMFhCOG+JDowcu7acBw3fk+p1xrvAt6bZYXjEpFVnWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727887504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6PR1t2AMof/MB8bj0HA2FJjr9/p9bfuj674TCTAySQ=; b=P2Z2Co6VmjvTynTalpwcadPxl04fT+m+q3SN16RvCCVy3Lix2eV+K0EUn4xG8XQV1oGf3e /d8czal+irBUB3ngCy6ir6oSymoIGrZWqjVhGJBhmQae9cssbzMZZvVd4jaX2KI7FVX6EF Imlq/agkU+kZgJ7CAobwJN9TkMnP2jabTrEA6QBPnb6JfpBcSqob01c3rjI6Ya/5VxIg4X TtUNHTKb4z6EhjrBqNkaTwdsmMhJljSJgnbfrBQ0KUGDCwbulwV55ZtFkru5T53GkdZX4Z emxVOvhW9vMyLrjfJVs6Hd3HYh990MotccRAcRsjJ1kJv6f8bqnA1UqChbTZRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727887504; a=rsa-sha256; cv=none; b=MOvdiKTLuO7dFjVaRQjrlgG2vhoZVQQ8Ro9KNNMCh+q4BIB6TJmvSFMR2O6UbfESsPO4jZ N/8W8dFvKnJC6W0iV6XG81EoYg0P0BI6ZAPfJyxI9eLyHsHMcrTejUn8rEQT5oxHsb0po4 IhxrHhRKJ2IN4lzOLjg65n678bdbmsd1mdZUCRYF35fIECx+EFvppYUjMyiAZ1+09fof4B qrGaENR/A+fRMqEI+ouNuCXcXVInID3C8iUysd2KcHD1WhwDKM0BhufnHeh0FpTpzegFJI 1EhUFGNmFtRDveNsAVBQ9O9YbCKjwrnfHGsCtpCTEhaXG+06Z5Ge4M6mBs7GvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJgdr3FdxzF05; Wed, 2 Oct 2024 16:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Gj4rG035942; Wed, 2 Oct 2024 16:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Gj4Sb035939; Wed, 2 Oct 2024 16:45:04 GMT (envelope-from git) Date: Wed, 2 Oct 2024 16:45:04 GMT Message-Id: <202410021645.492Gj4Sb035939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 51fda658baa3 - main - vmm: Properly handle writes spanning across two pages in vm_handle_db List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51fda658baa3f80c9778f3a9873fbf67df87119b Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=51fda658baa3f80c9778f3a9873fbf67df87119b commit 51fda658baa3f80c9778f3a9873fbf67df87119b Author: Bojan Novković AuthorDate: 2024-09-29 11:10:10 +0000 Commit: Bojan Novković CommitDate: 2024-10-02 16:43:36 +0000 vmm: Properly handle writes spanning across two pages in vm_handle_db The vm_handle_db function is responsible for writing correct status register values into memory when a guest VM is being single-stepped using the RFLAGS.TF mechanism. However, it currently does not properly handle an edge case where the resulting write spans across two pages. This commit fixes this by making vm_handle_db use two vm_copy_info structs. Security: HYP-09 Reviewed by: markj --- sys/amd64/vmm/vmm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index a2c2b342bee4..5484d71cefd2 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1795,7 +1795,7 @@ vm_handle_db(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) int error, fault; uint64_t rsp; uint64_t rflags; - struct vm_copyinfo copyinfo; + struct vm_copyinfo copyinfo[2]; *retu = true; if (!vme->u.dbg.pushf_intercept || vme->u.dbg.tf_shadow_val != 0) { @@ -1804,21 +1804,21 @@ vm_handle_db(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) vm_get_register(vcpu, VM_REG_GUEST_RSP, &rsp); error = vm_copy_setup(vcpu, &vme->u.dbg.paging, rsp, sizeof(uint64_t), - VM_PROT_RW, ©info, 1, &fault); + VM_PROT_RW, copyinfo, nitems(copyinfo), &fault); if (error != 0 || fault != 0) { *retu = false; return (EINVAL); } /* Read pushed rflags value from top of stack. */ - vm_copyin(©info, &rflags, sizeof(uint64_t)); + vm_copyin(copyinfo, &rflags, sizeof(uint64_t)); /* Clear TF bit. */ rflags &= ~(PSL_T); /* Write updated value back to memory. */ - vm_copyout(&rflags, ©info, sizeof(uint64_t)); - vm_copy_teardown(©info, 1); + vm_copyout(&rflags, copyinfo, sizeof(uint64_t)); + vm_copy_teardown(copyinfo, nitems(copyinfo)); return (0); } From nobody Wed Oct 2 16:53:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJgqQ2yjkz5Xmv0; Wed, 02 Oct 2024 16:53:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJgqP3Jymz4DsL; Wed, 2 Oct 2024 16:53:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id vywps65ayMArNw2bIsFgZr; Wed, 02 Oct 2024 16:53:20 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id w2bHsMjaXGvSVw2bIs23kO; Wed, 02 Oct 2024 16:53:20 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FpSm/Hrq c=1 sm=1 tr=0 ts=66fd7a80 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=IkcTkHD0fZMA:10 a=DAUX931o1VcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=gj-MK6H-zlxleXcIoy4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B1F0F284; Wed, 02 Oct 2024 09:53:18 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id AA05628D; Wed, 02 Oct 2024 09:53:18 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Bojan =?utf-8?Q?Novkovi=C4=87?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 51fda658baa3 - main - vmm: Properly handle writes spanning across two pages in vm_handle_db In-reply-to: <202410021645.492Gj4Sb035939@gitrepo.freebsd.org> References: <202410021645.492Gj4Sb035939@gitrepo.freebsd.org> Comments: In-reply-to Bojan =?utf-8?Q?Novkovi=C4=87?= message dated "Wed, 02 Oct 2024 16:45:04 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Date: Wed, 02 Oct 2024 09:53:18 -0700 Message-Id: <20241002165318.AA05628D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJabPpCMrcY6bIy/JaczWDhwEiAff7G+IJTXsRqzQ41jp9014E+5PalOSZpfhuzA2tGm6i/M/U/3HXurXUMjKPpXFe1/+7HR4OKqVjzzORt4szZdrvb4 0VDCCkrA7ixlZUPIXTjtXTsN3icnfd5f2W6QFeFHgE6W+nzV5jxoeDMPsUW9DVFMYR9q2OBITO/snMYmDo8q3XrCBo6N1RhOc6gIZh+YVrJnGa/NTrIygxuF Ge7lJpVy7DGnGupSNR824v/lE8obVcZkwW7CsY40phbKYygRQ6jR+M2PogV6GJkMOPF/RCfdeE2a9scn6bc93FShc/sm3gI5+56NEa0GSUs= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XJgqP3Jymz4DsL X-Spamd-Bar: ---- In message <202410021645.492Gj4Sb035939@gitrepo.freebsd.org>, Bojan =?utf-8?Q?N ovkovi=C4=87?= writes: > The branch main has been updated by bnovkov: > > URL: https://cgit.FreeBSD.org/src/commit/?id=51fda658baa3f80c9778f3a9873fbf67 > df87119b > > commit 51fda658baa3f80c9778f3a9873fbf67df87119b > Author: Bojan Novković > AuthorDate: 2024-09-29 11:10:10 +0000 > Commit: Bojan Novković > CommitDate: 2024-10-02 16:43:36 +0000 > > vmm: Properly handle writes spanning across two pages in vm_handle_db > > The vm_handle_db function is responsible for writing correct status > register values into memory when a guest VM is being single-stepped > using the RFLAGS.TF mechanism. However, it currently does not properly > handle an edge case where the resulting write spans across two pages. > This commit fixes this by making vm_handle_db use two vm_copy_info > structs. > > Security: HYP-09 Where can we find this vulnerability documented? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Oct 2 16:59:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJgxw4MKJz5XnLt; Wed, 02 Oct 2024 16:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJgxw3cScz4FPf; Wed, 2 Oct 2024 16:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727888340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SfoY1rGkECWQipEWcN8Q/2Qy/DwGAFa9L2SNJpT1kxY=; b=wrs5XndsEm8Pe9WyFmI1b6pzY5m2gjNCktxV8K2nsKF0QZQpW2hOPk9Vq847tdJlXvxFQF crj1nvAR5YP5PPXVjPzi2BKq2boEDQ/l3qmlQY1iCSqX76oamUGIkG0NkdKxS02p3NrqVZ MgLP0YeaZ/xKpP40d48He+P9vv/yfZtBfP6x3TpxOd0yxlMGlCEmJyo03no30iaCFueI3r rv0qLEP92+b0EDX7A5RYHAddSL6Ajvtfooo8eXk3Ltl05T8neFUJnaPj2StPc9P7fF7E3g dGWYGzm50tNyv6uN0DV+O6lQBJI+vQ2bubSJB4lV2/PYE33Z3t+tlv6itElOaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727888340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SfoY1rGkECWQipEWcN8Q/2Qy/DwGAFa9L2SNJpT1kxY=; b=htjZV535KsS6bmVtHqm8yEL2/lTR68VyHflytJCsV8rx0IJU8MDJCJBwew2PXBbk451LGE RnWO82OMhDZRcS2SrRazbNBywfIoBA4FMCJGv9QRRZqv7Zt4owSP5d0fADDVRC42cFX3Kv BPRsFTusl2SZ0hl0VNgLLXeIQw3AitDYw1iMCrvpvHjyF1zU9OrKJTEL045uWJ/2r8q1ko VKaosQQIeXYBsp+YjL6JAv5Ic2rz0B3cZZhymK3hmFTSpqqbChsv934ySOAladkGHl3C0H bbX55rTPDq1mpL7JaYQO7xCguSfat/RbuKeHAXcIvYtvRTuXcZsThJ/2GcZsYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727888340; a=rsa-sha256; cv=none; b=sOpurHh6Ut5gf1268B/goCdD3oBiGnzH3TnasC2OaL/RaQ0/SwryElYRplqrxm6Ea0O11U OI55wD+RdHUVw/ny1xVBZKSRtYDKCGScp1zfFtuy6mFSMTjWmS4v6khgtEiCblyXp8UQBZ 5LpB1pMoxkdppqajZQQs12kLOSmq9n/1wr9r3LPZ3oZy77+IuwnThDijf5S2Ykhh9ybP9a U30pkp+BIvQcSytbgtupovU98Bnkf4W/j927T2gqW7VE0+9X4743hDKwancB1WHqWGFjA1 29S12ZDiqaDBh9LCxWwhWnTjWsEnGzpUZ+jbKYXhVpmuqNIaXIB7XnR6zYSUVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJgxw3627zFDS; Wed, 2 Oct 2024 16:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Gx0ug054036; Wed, 2 Oct 2024 16:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Gx0El054033; Wed, 2 Oct 2024 16:59:00 GMT (envelope-from git) Date: Wed, 2 Oct 2024 16:59:00 GMT Message-Id: <202410021659.492Gx0El054033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d19fa9c1b72b - main - vmm: avoid potential KASSERT kernel panic in vm_handle_db List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d19fa9c1b72bc52e51524abcc59ad844012ec365 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d19fa9c1b72bc52e51524abcc59ad844012ec365 commit d19fa9c1b72bc52e51524abcc59ad844012ec365 Author: Pierre Pronchery AuthorDate: 2024-07-25 14:40:35 +0000 Commit: Ed Maste CommitDate: 2024-10-02 16:58:45 +0000 vmm: avoid potential KASSERT kernel panic in vm_handle_db If the guest VM emits the exit code VM_EXITCODE_DB the kernel will execute the function named vm_handle_db. If the value of rsp is not page aligned and if rsp+sizeof(uint64_t) spans across two pages, the function vm_copy_setup will need two structs vm_copyinfo to prepare the copy operation. For instance is rsp value is 0xFFC, two vm_copyinfo objects are needed: * address=0xFFC, len=4 * address=0x1000, len=4 The vulnerability was addressed by commit 51fda658baa ("vmm: Properly handle writes spanning across two pages in vm_handle_db"). Still, replace the KASSERT with an error return as a more defensive approach. Reported by: Synacktiv Reviewed by markj, emaste Security: HYP-09 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46133 --- sys/amd64/vmm/vmm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 5484d71cefd2..12ebc1671641 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -2810,7 +2810,8 @@ vm_copy_setup(struct vcpu *vcpu, struct vm_guest_paging *paging, nused = 0; remaining = len; while (remaining > 0) { - KASSERT(nused < num_copyinfo, ("insufficient vm_copyinfo")); + if (nused >= num_copyinfo) + return (EFAULT); error = vm_gla2gpa(vcpu, paging, gla, prot, &gpa, fault); if (error || *fault) return (error); From nobody Wed Oct 2 17:48:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJj2l31ZHz5XrCW; Wed, 02 Oct 2024 17:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJj2l2QLnz4Jm8; Wed, 2 Oct 2024 17:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727891295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7BdoZxauLPwZr/A4/qvYubLt3Ru72QLbPYOqLfIS2o=; b=lRnS2jclYmBtgb8JWw/4/SqSBgg4UpYz/7tGdQhm3sIY3y35Ui123LWkxg4RHR6XIpBdv6 1twDlVhn1b7cngzvcjUtRxxFvAsm8gq7x08bessQ0brnprVcHMOipZb3xp11s4SOsIaSIv Dzh3OaAr15f2OVTJK0y0wutmkZKeeV6pCqCd4gHY1jGxU02UFI1WChmaW+KZ6hl2g4aIqA RxB9NJlN0a3uBAs87rt4MLQzyQZevrAXoAr4MBykTg7qwfysaPFLdcZogfml2PVqiTrPPO usge50/41dZJZzdjTTN64LrrCR/Xx7m0CKRAgKuIftUMmc0u67bIfQEGD14QTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727891295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7BdoZxauLPwZr/A4/qvYubLt3Ru72QLbPYOqLfIS2o=; b=nUM1DPzZ+IOgozf3XHgltX213FPI3xq0GVUTbuFEwv+iNIPyASCLKLDCeI1KRO8EDtcWIf U32LGLNVyZ8saSjfP6EY+NBKouon8s+zlpDjUJUGhyTD29J1SoqIFzr8mB/xxHYyqaZyZG 9XTuo4sbvuXoXoHxVXcey5rrl8ayfVQaUL3nsvQs8EnGDbK2akk1voIiDTh6yi75HLlwhe JYHA/7QnfZj4QMCrFjiziVNyykN24aWPkgZrz5rNCzTxsekohlkrGEehhQqbmfUS6nMKzg perO78uIWBfrYF5cJj3A4tAVukBXiKVw2w3hmmgwTt5H2A5aYWda5q5URxelaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727891295; a=rsa-sha256; cv=none; b=ZSwLbOx+tW6zl3+aQkyIVWACCKBjDUHnNB+BBAT9bYhQrE3hZQdJPyR/2cWydopgJDXCkC SY7IFP5udpDZDd+Vm6yKQ3CF9goXz3Yk/R8sCPxHbLfZNm+kNDXP9fgWgqzg1nmpZdBOGp UnE1KzJ7N8hqdCSOHeSQ2BGrXakk4mB1pjx52z55bqpFG6vHAjASZoli7tamOOxtOLdCiA kjMDPs/WYMsMSgFrZPJCMpY4d7CkV2Q94Ny7FBzeeHnM15nBzugoGCkn308CQNFN+rmjLw 5WSiySShXj4qeMqD/hiJV5K8T4ql1OBvngQDEhTfRSrTgs8BYNNa19a3yoAMLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJj2l1vMmzFrD; Wed, 2 Oct 2024 17:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492HmFOK038338; Wed, 2 Oct 2024 17:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492HmFg1038335; Wed, 2 Oct 2024 17:48:15 GMT (envelope-from git) Date: Wed, 2 Oct 2024 17:48:15 GMT Message-Id: <202410021748.492HmFg1038335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c25e55bcf80b - main - include: ssp: hide gets_s behind __EXT1_VISIBLE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c25e55bcf80b7fc5384c34948404ae9d65c29bab Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c25e55bcf80b7fc5384c34948404ae9d65c29bab commit c25e55bcf80b7fc5384c34948404ae9d65c29bab Author: Kyle Evans AuthorDate: 2024-10-02 17:46:02 +0000 Commit: Kyle Evans CommitDate: 2024-10-02 17:47:55 +0000 include: ssp: hide gets_s behind __EXT1_VISIBLE These were supposed to match the visibility of the system's declaration, but this one was overlooked. Fix it now so that `rsize_t` can be hidden appropriately. Reported by: Shawn Webb (and now others) --- include/ssp/stdio.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ssp/stdio.h b/include/ssp/stdio.h index f7a390f315a4..630683951e4b 100644 --- a/include/ssp/stdio.h +++ b/include/ssp/stdio.h @@ -50,7 +50,9 @@ __ssp_redirect(size_t, fread, (void *__restrict __buf, size_t __len, size_t __nmemb, FILE *__restrict __fp), (__buf, __len, __nmemb, __fp)); __ssp_redirect(size_t, fread_unlocked, (void *__restrict __buf, size_t __len, size_t __nmemb, FILE *__restrict __fp), (__buf, __len, __nmemb, __fp)); +#if __EXT1_VISIBLE __ssp_redirect(char *, gets_s, (char *__buf, rsize_t __len), (__buf, __len)); +#endif /* __EXT1_VISIBLE */ __ssp_redirect_raw(char *, tmpnam, tmpnam, (char *__buf), (__buf), 1, __ssp_bos, L_tmpnam); #endif From nobody Wed Oct 2 17:53:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJj943Srqz5XrkR; Wed, 02 Oct 2024 17:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJj942m4kz4KKZ; Wed, 2 Oct 2024 17:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727891624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r3zaFw6+r225Y4L99AMRtOu0bdub2Qt0HWpA17NZYds=; b=F+3coQmgHCwKA+N1G54mbBKYrnfM6Bps4ZQ2DxoYuC1erIqTWf45P8icdFs6cctVsYOO7Y CwRrKU8tIPe5rHD7UY+OzwONI70VWTuSmHZ9egWwwSzKFiLq5ofD6JQjNmVmRIvOxTe/lE wy1B5eE+Gk1VCR4U7TiJgKwBSdue9j9U2fkpQOnFVrBwRWBQQHLbg96ifodB0WuvXY2wbr c+Dd1fOFZ1Caj7E8IRlpvrBd1+aEtIXbgOYOfBMB/V8AFIQ2f6Fmi0aqVUTbJ/1XjdNyUC FPuHQ73uMevlUC2lFQ1jTlNCXV/8AIPBMAD6ztbC0y/mZxwK1hk35RmyHJ4u3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727891624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r3zaFw6+r225Y4L99AMRtOu0bdub2Qt0HWpA17NZYds=; b=wFSicJ0/S3ZLJPWXJwf/xeCpc+/cL3AAzugMs7GL2ja8lcUzf/GWzPYSI7qP5mBCl5cREU pMkAhDUWaKA/fRMpr+D5KQ0S3tvfBRktoHdOs95O7a0ziq6o7Bz07cTTvENmTrOFcgGoZ1 adwiQ20zcwLFUmPyE+GLCyilIeOuDUEioOdihtWRhFu+4Vq06L98eFMIVOTJ48exq+2Ssd sDNlWQ02MN9SBdVJUWXgnL71ii1zXAARxxJjNz6fQyvTbvew7rs/FXyECqMjtO3xTH+VU3 4ERqXOey5YE1t15GDidHgYe1IN+Hn6A8wSRhXGR1BdyDC3Iye/ZY+Gr6zhCjSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727891624; a=rsa-sha256; cv=none; b=uX3Guc8GcR4WCFFYvUJOMbr10GNWeJYC1p15bwXTpYde23lSJTkajfo7G2FFsIfLhYelyk hX9a2vnJzwZ1r2FOg0BUphyjXSXUG2OajOe5o6RmL9K6NsPxP90xlNfczlXpV81M/7rs0X LQ0F3hPuu+nrq9GzyRg+/B1msnCoueVV5iWgBnIF7EiTG2emTeLjgbGbj/B3RYJAHTbY07 qsxDYUjGHdGK4qANzQis0XwJAkYH3OjxAKQPZcK833qRIIMvk4671zWaSDFkXyuTBxP2dP O/Pau/NGzK6n2Z3xYSk/OfaK+QDaxTg9dKKrHUxhy54bhvOVMquZ8rwAZBP6KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJj942L08zGkw; Wed, 2 Oct 2024 17:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492HriJg054767; Wed, 2 Oct 2024 17:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492HriHG054764; Wed, 2 Oct 2024 17:53:44 GMT (envelope-from git) Date: Wed, 2 Oct 2024 17:53:44 GMT Message-Id: <202410021753.492HriHG054764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e5c64b2662ff - main - pf: replace union pf_krule_ptr with struct pf_krule in in-kernel structs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5c64b2662ffddd6593099d9333fc7f1cea0f785 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c64b2662ffddd6593099d9333fc7f1cea0f785 commit e5c64b2662ffddd6593099d9333fc7f1cea0f785 Author: Kajetan Staszkiewicz AuthorDate: 2024-10-02 12:21:47 +0000 Commit: Kristof Provost CommitDate: 2024-10-02 17:53:26 +0000 pf: replace union pf_krule_ptr with struct pf_krule in in-kernel structs There is no need for the union pf_krule_ptr for kernel-only structs like pf_kstate and pf_ksrc_node. The rules are always accessed by pointer. The rule numbers are a leftover from using the same structure for pfctl(8) and pf(4). Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46868 --- sys/net/pfvar.h | 15 ++-- sys/netpfil/pf/if_pfsync.c | 8 +- sys/netpfil/pf/pf.c | 180 ++++++++++++++++++++++----------------------- sys/netpfil/pf/pf_ioctl.c | 30 ++++---- sys/netpfil/pf/pf_lb.c | 16 ++-- sys/netpfil/pf/pf_nl.c | 6 +- sys/netpfil/pf/pf_norm.c | 58 +++++++-------- sys/netpfil/pf/pf_nv.c | 8 +- sys/netpfil/pf/pflow.c | 6 +- 9 files changed, 161 insertions(+), 166 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 53bc77d14537..b5d56ab45ce7 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -761,18 +761,13 @@ struct pf_keth_rule { uint32_t ridentifier; }; -union pf_krule_ptr { - struct pf_krule *ptr; - u_int32_t nr; -}; - RB_HEAD(pf_krule_global, pf_krule); RB_PROTOTYPE(pf_krule_global, pf_krule, entry_global, pf_krule_compare); struct pf_krule { struct pf_rule_addr src; struct pf_rule_addr dst; - union pf_krule_ptr skip[PF_SKIP_COUNT]; + struct pf_krule *skip[PF_SKIP_COUNT]; char label[PF_RULE_MAX_LABEL_COUNT][PF_RULE_LABEL_SIZE]; uint32_t ridentifier; char ifname[IFNAMSIZ]; @@ -889,7 +884,7 @@ struct pf_ksrc_node { struct pf_addr addr; struct pf_addr raddr; struct pf_krule_slist match_rules; - union pf_krule_ptr rule; + struct pf_krule *rule; struct pfi_kkif *rkif; counter_u64_t bytes[2]; counter_u64_t packets[2]; @@ -1089,9 +1084,9 @@ struct pf_kstate { struct pf_state_peer src; struct pf_state_peer dst; struct pf_krule_slist match_rules; - union pf_krule_ptr rule; - union pf_krule_ptr anchor; - union pf_krule_ptr nat_rule; + struct pf_krule *rule; + struct pf_krule *anchor; + struct pf_krule *nat_rule; struct pf_addr rt_addr; struct pf_state_key *key[2]; /* addresses stack and wire */ struct pf_udp_mapping *udp_mapping; diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 82a42c874a8f..0dd1b480b313 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -702,9 +702,9 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); pf_state_peer_ntoh(&sp->pfs_1301.dst, &st->dst); - st->rule.ptr = r; - st->nat_rule.ptr = NULL; - st->anchor.ptr = NULL; + st->rule = r; + st->nat_rule = NULL; + st->anchor = NULL; st->pfsync_time = time_uptime; st->sync_state = PFSYNC_S_NONE; @@ -1974,7 +1974,7 @@ pfsync_insert_state(struct pf_kstate *st) if (st->state_flags & PFSTATE_NOSYNC) return; - if ((st->rule.ptr->rule_flag & PFRULE_NOSYNC) || + if ((st->rule->rule_flag & PFRULE_NOSYNC) || st->key[PF_SK_WIRE]->proto == IPPROTO_PFSYNC) { st->state_flags |= PFSTATE_NOSYNC; return; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b28503112db6..b5a18c37a89b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -436,14 +436,14 @@ BOUND_IFACE(struct pf_kstate *st, struct pfi_kkif *k) SDT_PROBE2(pf, ip, , bound_iface, st, k); /* Floating unless otherwise specified. */ - if (! (st->rule.ptr->rule_flag & PFRULE_IFBOUND)) + if (! (st->rule->rule_flag & PFRULE_IFBOUND)) return (V_pfi_all); /* * Initially set to all, because we don't know what interface we'll be * sending this out when we create the state. */ - if (st->rule.ptr->rt == PF_REPLYTO) + if (st->rule->rt == PF_REPLYTO) return (V_pfi_all); /* Don't overrule the interface for states created on incoming packets. */ @@ -461,15 +461,15 @@ BOUND_IFACE(struct pf_kstate *st, struct pfi_kkif *k) #define STATE_INC_COUNTERS(s) \ do { \ struct pf_krule_item *mrm; \ - counter_u64_add(s->rule.ptr->states_cur, 1); \ - counter_u64_add(s->rule.ptr->states_tot, 1); \ - if (s->anchor.ptr != NULL) { \ - counter_u64_add(s->anchor.ptr->states_cur, 1); \ - counter_u64_add(s->anchor.ptr->states_tot, 1); \ + counter_u64_add(s->rule->states_cur, 1); \ + counter_u64_add(s->rule->states_tot, 1); \ + if (s->anchor != NULL) { \ + counter_u64_add(s->anchor->states_cur, 1); \ + counter_u64_add(s->anchor->states_tot, 1); \ } \ - if (s->nat_rule.ptr != NULL) { \ - counter_u64_add(s->nat_rule.ptr->states_cur, 1);\ - counter_u64_add(s->nat_rule.ptr->states_tot, 1);\ + if (s->nat_rule != NULL) { \ + counter_u64_add(s->nat_rule->states_cur, 1);\ + counter_u64_add(s->nat_rule->states_tot, 1);\ } \ SLIST_FOREACH(mrm, &s->match_rules, entry) { \ counter_u64_add(mrm->r->states_cur, 1); \ @@ -480,11 +480,11 @@ BOUND_IFACE(struct pf_kstate *st, struct pfi_kkif *k) #define STATE_DEC_COUNTERS(s) \ do { \ struct pf_krule_item *mrm; \ - if (s->nat_rule.ptr != NULL) \ - counter_u64_add(s->nat_rule.ptr->states_cur, -1);\ - if (s->anchor.ptr != NULL) \ - counter_u64_add(s->anchor.ptr->states_cur, -1); \ - counter_u64_add(s->rule.ptr->states_cur, -1); \ + if (s->nat_rule != NULL) \ + counter_u64_add(s->nat_rule->states_cur, -1);\ + if (s->anchor != NULL) \ + counter_u64_add(s->anchor->states_cur, -1); \ + counter_u64_add(s->rule->states_cur, -1); \ SLIST_FOREACH(mrm, &s->match_rules, entry) \ counter_u64_add(mrm->r->states_cur, -1); \ } while (0) @@ -828,14 +828,14 @@ pf_src_connlimit(struct pf_kstate **state) (*state)->src.tcp_est = 1; pf_add_threshold(&(*state)->src_node->conn_rate); - if ((*state)->rule.ptr->max_src_conn && - (*state)->rule.ptr->max_src_conn < + if ((*state)->rule->max_src_conn && + (*state)->rule->max_src_conn < (*state)->src_node->conn) { counter_u64_add(V_pf_status.lcounters[LCNT_SRCCONN], 1); bad++; } - if ((*state)->rule.ptr->max_src_conn_rate.limit && + if ((*state)->rule->max_src_conn_rate.limit && pf_check_threshold(&(*state)->src_node->conn_rate)) { counter_u64_add(V_pf_status.lcounters[LCNT_SRCCONNRATE], 1); bad++; @@ -848,7 +848,7 @@ pf_src_connlimit(struct pf_kstate **state) (*state)->timeout = PFTM_PURGE; pf_set_protostate(*state, PF_PEER_BOTH, TCPS_CLOSED); - if ((*state)->rule.ptr->overload_tbl == NULL) + if ((*state)->rule->overload_tbl == NULL) return (1); /* Schedule overloading and flushing task. */ @@ -858,7 +858,7 @@ pf_src_connlimit(struct pf_kstate **state) bcopy(&(*state)->src_node->addr, &pfoe->addr, sizeof(pfoe->addr)); pfoe->af = (*state)->key[PF_SK_WIRE]->af; - pfoe->rule = (*state)->rule.ptr; + pfoe->rule = (*state)->rule; pfoe->dir = (*state)->direction; PF_OVERLOADQ_LOCK(); SLIST_INSERT_HEAD(&V_pf_overloadqueue, pfoe, next); @@ -941,7 +941,7 @@ pf_overload_task(void *v, int pending) SLIST_FOREACH(pfoe, &queue, next) if (sk->af == pfoe->af && ((pfoe->rule->flush & PF_FLUSH_GLOBAL) || - pfoe->rule == s->rule.ptr) && + pfoe->rule == s->rule) && ((pfoe->dir == PF_OUT && PF_AEQ(&pfoe->addr, &sk->addr[1], sk->af)) || (pfoe->dir == PF_IN && @@ -976,7 +976,7 @@ pf_find_src_node(struct pf_addr *src, struct pf_krule *rule, sa_family_t af, *sh = &V_pf_srchash[pf_hashsrc(src, af)]; PF_HASHROW_LOCK(*sh); LIST_FOREACH(n, &(*sh)->nodes, entry) - if (n->rule.ptr == rule && n->af == af && + if (n->rule == rule && n->af == af && ((af == AF_INET && n->addr.v4.s_addr == src->v4.s_addr) || (af == AF_INET6 && bcmp(&n->addr, src, sizeof(*src)) == 0))) break; @@ -1053,14 +1053,14 @@ pf_insert_src_node(struct pf_ksrc_node **sn, struct pf_krule *rule, (*sn)->lock = &sh->lock; (*sn)->af = af; - (*sn)->rule.ptr = rule; + (*sn)->rule = rule; PF_ACPY(&(*sn)->addr, src, af); LIST_INSERT_HEAD(&sh->nodes, *sn, entry); (*sn)->creation = time_uptime; (*sn)->ruletype = rule->action; (*sn)->states = 1; - if ((*sn)->rule.ptr != NULL) - counter_u64_add((*sn)->rule.ptr->src_nodes, 1); + if ((*sn)->rule != NULL) + counter_u64_add((*sn)->rule->src_nodes, 1); PF_HASHROW_UNLOCK(sh); counter_u64_add(V_pf_status.scounters[SCNT_SRC_NODE_INSERT], 1); } else { @@ -1082,8 +1082,8 @@ pf_unlink_src_node(struct pf_ksrc_node *src) PF_SRC_NODE_LOCK_ASSERT(src); LIST_REMOVE(src, entry); - if (src->rule.ptr) - counter_u64_add(src->rule.ptr->src_nodes, -1); + if (src->rule) + counter_u64_add(src->rule->src_nodes, -1); } u_int @@ -2481,13 +2481,13 @@ pf_state_expires(const struct pf_kstate *state) ("pf_state_expires: timeout == PFTM_UNLINKED")); KASSERT((state->timeout < PFTM_MAX), ("pf_state_expires: timeout > PFTM_MAX")); - timeout = state->rule.ptr->timeout[state->timeout]; + timeout = state->rule->timeout[state->timeout]; if (!timeout) timeout = V_pf_default_rule.timeout[state->timeout]; - start = state->rule.ptr->timeout[PFTM_ADAPTIVE_START]; - if (start && state->rule.ptr != &V_pf_default_rule) { - end = state->rule.ptr->timeout[PFTM_ADAPTIVE_END]; - states = counter_u64_fetch(state->rule.ptr->states_cur); + start = state->rule->timeout[PFTM_ADAPTIVE_START]; + if (start && state->rule != &V_pf_default_rule) { + end = state->rule->timeout[PFTM_ADAPTIVE_END]; + states = counter_u64_fetch(state->rule->states_cur); } else { start = V_pf_default_rule.timeout[PFTM_ADAPTIVE_START]; end = V_pf_default_rule.timeout[PFTM_ADAPTIVE_END]; @@ -2520,8 +2520,8 @@ pf_purge_expired_src_nodes(void) if (cur->states == 0 && cur->expire <= time_uptime) { pf_unlink_src_node(cur); LIST_INSERT_HEAD(&freelist, cur, entry); - } else if (cur->rule.ptr != NULL) - cur->rule.ptr->rule_ref |= PFRULE_REFS; + } else if (cur->rule != NULL) + cur->rule->rule_ref |= PFRULE_REFS; PF_HASHROW_UNLOCK(sh); } @@ -2536,8 +2536,8 @@ pf_src_tree_remove_state(struct pf_kstate *s) struct pf_ksrc_node *sn; uint32_t timeout; - timeout = s->rule.ptr->timeout[PFTM_SRC_NODE] ? - s->rule.ptr->timeout[PFTM_SRC_NODE] : + timeout = s->rule->timeout[PFTM_SRC_NODE] ? + s->rule->timeout[PFTM_SRC_NODE] : V_pf_default_rule.timeout[PFTM_SRC_NODE]; if (s->src_node != NULL) { @@ -2584,7 +2584,7 @@ pf_unlink_state(struct pf_kstate *s) if (s->src.state == PF_TCPS_PROXY_DST) { /* XXX wire key the right one? */ - pf_send_tcp(s->rule.ptr, s->key[PF_SK_WIRE]->af, + pf_send_tcp(s->rule, s->key[PF_SK_WIRE]->af, &s->key[PF_SK_WIRE]->addr[1], &s->key[PF_SK_WIRE]->addr[0], s->key[PF_SK_WIRE]->port[1], @@ -2674,11 +2674,11 @@ relock: pf_unlink_state(s); goto relock; } - s->rule.ptr->rule_ref |= PFRULE_REFS; - if (s->nat_rule.ptr != NULL) - s->nat_rule.ptr->rule_ref |= PFRULE_REFS; - if (s->anchor.ptr != NULL) - s->anchor.ptr->rule_ref |= PFRULE_REFS; + s->rule->rule_ref |= PFRULE_REFS; + if (s->nat_rule != NULL) + s->nat_rule->rule_ref |= PFRULE_REFS; + if (s->anchor != NULL) + s->anchor->rule_ref |= PFRULE_REFS; s->kif->pfik_flags |= PFI_IFLAG_REFS; SLIST_FOREACH(mrm, &s->match_rules, entry) mrm->r->rule_ref |= PFRULE_REFS; @@ -2901,8 +2901,8 @@ pf_print_state_parts(struct pf_kstate *s, printf("]"); } printf(" %u:%u", s->src.state, s->dst.state); - if (s->rule.ptr) - printf(" @%d", s->rule.ptr->nr); + if (s->rule) + printf(" @%d", s->rule->nr); } } @@ -2932,7 +2932,7 @@ pf_print_flags(u_int8_t f) #define PF_SET_SKIP_STEPS(i) \ do { \ while (head[i] != cur) { \ - head[i]->skip[i].ptr = cur; \ + head[i]->skip[i] = cur; \ head[i] = TAILQ_NEXT(head[i], entries); \ } \ } while (0) @@ -5136,19 +5136,19 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); PF_TEST_ATTRIB(pfi_kkif_match(r->kif, kif) == r->ifnot, - r->skip[PF_SKIP_IFP].ptr); + r->skip[PF_SKIP_IFP]); PF_TEST_ATTRIB(r->direction && r->direction != pd->dir, - r->skip[PF_SKIP_DIR].ptr); + r->skip[PF_SKIP_DIR]); PF_TEST_ATTRIB(r->af && r->af != af, - r->skip[PF_SKIP_AF].ptr); + r->skip[PF_SKIP_AF]); PF_TEST_ATTRIB(r->proto && r->proto != pd->proto, - r->skip[PF_SKIP_PROTO].ptr); + r->skip[PF_SKIP_PROTO]); PF_TEST_ATTRIB(PF_MISMATCHAW(&r->src.addr, saddr, af, r->src.neg, kif, M_GETFIB(m)), - r->skip[PF_SKIP_SRC_ADDR].ptr); + r->skip[PF_SKIP_SRC_ADDR]); PF_TEST_ATTRIB(PF_MISMATCHAW(&r->dst.addr, daddr, af, r->dst.neg, NULL, M_GETFIB(m)), - r->skip[PF_SKIP_DST_ADDR].ptr); + r->skip[PF_SKIP_DST_ADDR]); switch (pd->virtual_proto) { case PF_VPROTO_FRAGMENT: /* tcp/udp only. port_op always 0 in other cases */ @@ -5173,11 +5173,11 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, /* tcp/udp only. port_op always 0 in other cases */ PF_TEST_ATTRIB(r->src.port_op && !pf_match_port(r->src.port_op, r->src.port[0], r->src.port[1], sport), - r->skip[PF_SKIP_SRC_PORT].ptr); + r->skip[PF_SKIP_SRC_PORT]); /* tcp/udp only. port_op always 0 in other cases */ PF_TEST_ATTRIB(r->dst.port_op && !pf_match_port(r->dst.port_op, r->dst.port[0], r->dst.port[1], dport), - r->skip[PF_SKIP_DST_PORT].ptr); + r->skip[PF_SKIP_DST_PORT]); /* tcp/udp only. uid.op always 0 in other cases */ PF_TEST_ATTRIB(r->uid.op && (pd->lookup.done || (pd->lookup.done = pf_socket_lookup(pd, m), 1)) && @@ -5401,9 +5401,9 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, REASON_SET(&reason, PFRES_MEMORY); goto csfailed; } - s->rule.ptr = r; - s->nat_rule.ptr = nr; - s->anchor.ptr = a; + s->rule = r; + s->nat_rule = nr; + s->anchor = a; bcopy(match_rules, &s->match_rules, sizeof(s->match_rules)); memcpy(&s->act, &pd->act, sizeof(struct pf_rule_actions)); @@ -5936,11 +5936,11 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (*state)->src.state == TCPS_SYN_SENT) { /* Send RST for state mismatches during handshake */ if (!(th->th_flags & TH_RST)) - pf_send_tcp((*state)->rule.ptr, pd->af, + pf_send_tcp((*state)->rule, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), 0, TH_RST, 0, 0, - (*state)->rule.ptr->return_ttl, true, 0, 0, + (*state)->rule->return_ttl, true, 0, 0, (*state)->act.rtableid); src->seqlo = 0; src->seqhi = 1; @@ -6074,7 +6074,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) REASON_SET(reason, PFRES_SYNPROXY); return (PF_DROP); } - pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, + pf_send_tcp((*state)->rule, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, (*state)->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, true, 0, 0, @@ -6105,7 +6105,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) (*state)->src.max_win = MAX(ntohs(th->th_win), 1); if ((*state)->dst.seqhi == 1) (*state)->dst.seqhi = htonl(arc4random()); - pf_send_tcp((*state)->rule.ptr, pd->af, + pf_send_tcp((*state)->rule, pd->af, &sk->addr[pd->sidx], &sk->addr[pd->didx], sk->port[pd->sidx], sk->port[pd->didx], (*state)->dst.seqhi, 0, TH_SYN, 0, @@ -6121,12 +6121,12 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) } else { (*state)->dst.max_win = MAX(ntohs(th->th_win), 1); (*state)->dst.seqlo = ntohl(th->th_seq); - pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, + pf_send_tcp((*state)->rule, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ntohl(th->th_seq) + 1, TH_ACK, (*state)->src.max_win, 0, 0, false, (*state)->tag, 0, (*state)->act.rtableid); - pf_send_tcp((*state)->rule.ptr, pd->af, + pf_send_tcp((*state)->rule, pd->af, &sk->addr[pd->sidx], &sk->addr[pd->didx], sk->port[pd->sidx], sk->port[pd->didx], (*state)->src.seqhi + 1, (*state)->src.seqlo + 1, @@ -6875,7 +6875,7 @@ pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, return (-1); /* Is this ICMP message flowing in right direction? */ - if ((*state)->rule.ptr->type && + if ((*state)->rule->type && (((!inner && (*state)->direction == direction) || (inner && (*state)->direction != direction)) ? PF_IN : PF_OUT) != icmp_dir) { @@ -7899,7 +7899,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, error = EMSGSIZE; KMOD_IPSTAT_INC(ips_cantfrag); if (r_rt != PF_DUPTO) { - if (s && s->nat_rule.ptr != NULL) + if (s && s->nat_rule != NULL) PACKET_UNDO_NAT(m0, pd, (ip->ip_hl << 2) + (ip_off & IP_OFFMASK), s); @@ -8112,7 +8112,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, else { in6_ifstat_inc(ifp, ifs6_in_toobig); if (r_rt != PF_DUPTO) { - if (s && s->nat_rule.ptr != NULL) + if (s && s->nat_rule != NULL) PACKET_UNDO_NAT(m0, pd, ((caddr_t)ip6 - m0->m_data) + sizeof(struct ip6_hdr), s); @@ -8431,8 +8431,8 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, sizeof(struct sockaddr_in6)); } - if (s != NULL && s->nat_rule.ptr != NULL && - s->nat_rule.ptr->action == PF_RDR && + if (s != NULL && s->nat_rule != NULL && + s->nat_rule->action == PF_RDR && ( #ifdef INET (pd->af == AF_INET && IN_LOOPBACK(ntohl(pd->dst->v4.s_addr))) || @@ -8795,10 +8795,10 @@ pf_counters_inc(int action, struct pf_pdesc *pd, if (s != NULL) { struct pf_krule_item *ri; - if (s->nat_rule.ptr != NULL) { - pf_counter_u64_add_protected(&s->nat_rule.ptr->packets[dirndx], + if (s->nat_rule != NULL) { + pf_counter_u64_add_protected(&s->nat_rule->packets[dirndx], 1); - pf_counter_u64_add_protected(&s->nat_rule.ptr->bytes[dirndx], + pf_counter_u64_add_protected(&s->nat_rule->bytes[dirndx], pd->tot_len); } if (s->src_node != NULL) { @@ -8824,9 +8824,9 @@ pf_counters_inc(int action, struct pf_pdesc *pd, } tr = r; - if (s != NULL && s->nat_rule.ptr != NULL && + if (s != NULL && s->nat_rule != NULL && r == &V_pf_default_rule) - tr = s->nat_rule.ptr; + tr = s->nat_rule; if (tr->src.addr.type == PF_ADDR_TABLE) pfr_update_stats(tr->src.addr.p.tbl, @@ -9024,8 +9024,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + r = s->rule; + a = s->anchor; } else if (s == NULL) { /* Validate remote SYN|ACK, re-create original SYN if * valid. */ @@ -9072,8 +9072,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + r = s->rule; + a = s->anchor; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp, hdrlen); @@ -9089,8 +9089,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + r = s->rule; + a = s->anchor; } else if (s == NULL) { action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp, hdrlen); @@ -9109,8 +9109,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + r = s->rule; + a = s->anchor; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp, hdrlen); @@ -9128,8 +9128,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + r = s->rule; + a = s->anchor; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp, hdrlen); @@ -9141,8 +9141,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + r = s->rule; + a = s->anchor; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp, hdrlen); @@ -9224,9 +9224,9 @@ done: * see tcp_input() and in_pcblookup_listen(). */ if (dir == PF_IN && action == PF_PASS && (pd.proto == IPPROTO_TCP || - pd.proto == IPPROTO_UDP) && s != NULL && s->nat_rule.ptr != NULL && - (s->nat_rule.ptr->action == PF_RDR || - s->nat_rule.ptr->action == PF_BINAT) && + pd.proto == IPPROTO_UDP) && s != NULL && s->nat_rule != NULL && + (s->nat_rule->action == PF_RDR || + s->nat_rule->action == PF_BINAT) && pf_is_loopback(af, pd.dst)) m->m_flags |= M_SKIP_FIREWALL; @@ -9284,9 +9284,9 @@ done: struct pf_krule *lr; struct pf_krule_item *ri; - if (s != NULL && s->nat_rule.ptr != NULL && - s->nat_rule.ptr->log & PF_LOG_ALL) - lr = s->nat_rule.ptr; + if (s != NULL && s->nat_rule != NULL && + s->nat_rule->log & PF_LOG_ALL) + lr = s->nat_rule; else lr = r; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 6e2fcd358b68..8081960933a2 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1551,8 +1551,8 @@ pf_src_node_copy(const struct pf_ksrc_node *in, struct pf_src_node *out) bcopy(&in->addr, &out->addr, sizeof(struct pf_addr)); bcopy(&in->raddr, &out->raddr, sizeof(struct pf_addr)); - if (in->rule.ptr != NULL) - out->rule.nr = in->rule.ptr->nr; + if (in->rule != NULL) + out->rule.nr = in->rule->nr; for (int i = 0; i < 2; i++) { out->bytes[i] = counter_u64_fetch(in->bytes[i]); @@ -2355,7 +2355,7 @@ relock_DIOCKILLSTATES: continue; if (psk->psk_label[0] && - ! pf_label_match(s->rule.ptr, psk->psk_label)) + ! pf_label_match(s->rule, psk->psk_label)) continue; if (psk->psk_ifname[0] && strcmp(psk->psk_ifname, @@ -5613,18 +5613,18 @@ pfsync_state_export(union pfsync_state_union *sp, struct pf_kstate *st, int msg_ pf_state_peer_hton(&st->src, &sp->pfs_1301.src); pf_state_peer_hton(&st->dst, &sp->pfs_1301.dst); - if (st->rule.ptr == NULL) + if (st->rule == NULL) sp->pfs_1301.rule = htonl(-1); else - sp->pfs_1301.rule = htonl(st->rule.ptr->nr); - if (st->anchor.ptr == NULL) + sp->pfs_1301.rule = htonl(st->rule->nr); + if (st->anchor == NULL) sp->pfs_1301.anchor = htonl(-1); else - sp->pfs_1301.anchor = htonl(st->anchor.ptr->nr); - if (st->nat_rule.ptr == NULL) + sp->pfs_1301.anchor = htonl(st->anchor->nr); + if (st->nat_rule == NULL) sp->pfs_1301.nat_rule = htonl(-1); else - sp->pfs_1301.nat_rule = htonl(st->nat_rule.ptr->nr); + sp->pfs_1301.nat_rule = htonl(st->nat_rule->nr); pf_state_counter_hton(st->packets[0], sp->pfs_1301.packets[0]); pf_state_counter_hton(st->packets[1], sp->pfs_1301.packets[1]); @@ -5679,18 +5679,18 @@ pf_state_export(struct pf_state_export *sp, struct pf_kstate *st) pf_state_peer_hton(&st->src, &sp->src); pf_state_peer_hton(&st->dst, &sp->dst); - if (st->rule.ptr == NULL) + if (st->rule == NULL) sp->rule = htonl(-1); else - sp->rule = htonl(st->rule.ptr->nr); - if (st->anchor.ptr == NULL) + sp->rule = htonl(st->rule->nr); + if (st->anchor == NULL) sp->anchor = htonl(-1); else - sp->anchor = htonl(st->anchor.ptr->nr); - if (st->nat_rule.ptr == NULL) + sp->anchor = htonl(st->anchor->nr); + if (st->nat_rule == NULL) sp->nat_rule = htonl(-1); else - sp->nat_rule = htonl(st->nat_rule.ptr->nr); + sp->nat_rule = htonl(st->nat_rule->nr); sp->packets[0] = st->packets[0]; sp->packets[1] = st->packets[1]; diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 007e8606ee8a..16fbcd49b3c8 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -158,32 +158,32 @@ pf_match_translation(struct pf_pdesc *pd, struct mbuf *m, int off, pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; + r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) - r = r->skip[PF_SKIP_DIR].ptr; + r = r->skip[PF_SKIP_DIR]; else if (r->af && r->af != pd->af) - r = r->skip[PF_SKIP_AF].ptr; + r = r->skip[PF_SKIP_AF]; else if (r->proto && r->proto != pd->proto) - r = r->skip[PF_SKIP_PROTO].ptr; + r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&src->addr, saddr, pd->af, src->neg, kif, M_GETFIB(m))) r = r->skip[src == &r->src ? PF_SKIP_SRC_ADDR : - PF_SKIP_DST_ADDR].ptr; + PF_SKIP_DST_ADDR]; else if (src->port_op && !pf_match_port(src->port_op, src->port[0], src->port[1], sport)) r = r->skip[src == &r->src ? PF_SKIP_SRC_PORT : - PF_SKIP_DST_PORT].ptr; + PF_SKIP_DST_PORT]; else if (dst != NULL && PF_MISMATCHAW(&dst->addr, daddr, pd->af, dst->neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; + r = r->skip[PF_SKIP_DST_ADDR]; else if (xdst != NULL && PF_MISMATCHAW(xdst, daddr, pd->af, 0, NULL, M_GETFIB(m))) r = TAILQ_NEXT(r, entries); else if (dst != NULL && dst->port_op && !pf_match_port(dst->port_op, dst->port[0], dst->port[1], dport)) - r = r->skip[PF_SKIP_DST_PORT].ptr; + r = r->skip[PF_SKIP_DST_PORT]; else if (r->match_tag && !pf_match_tag(m, r, &tag, pd->pf_mtag ? pd->pf_mtag->tag : 0)) r = TAILQ_NEXT(r, entries); diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index ca90e0b5b140..15fe341ce57e 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -192,9 +192,9 @@ dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, struct pf_kstate *s, nlattr_add_u64(nw, PF_ST_ID, s->id); nlattr_add_u32(nw, PF_ST_CREATORID, htonl(s->creatorid)); - nlattr_add_u32(nw, PF_ST_RULE, s->rule.ptr ? s->rule.ptr->nr : -1); - nlattr_add_u32(nw, PF_ST_ANCHOR, s->anchor.ptr ? s->anchor.ptr->nr : -1); - nlattr_add_u32(nw, PF_ST_NAT_RULE, s->nat_rule.ptr ? s->nat_rule.ptr->nr : -1); + nlattr_add_u32(nw, PF_ST_RULE, s->rule ? s->rule->nr : -1); + nlattr_add_u32(nw, PF_ST_ANCHOR, s->anchor ? s->anchor->nr : -1); + nlattr_add_u32(nw, PF_ST_NAT_RULE, s->nat_rule ? s->nat_rule->nr : -1); nlattr_add_u64(nw, PF_ST_PACKETS0, s->packets[0]); nlattr_add_u64(nw, PF_ST_PACKETS1, s->packets[1]); diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index d1a1e84db9dc..18a9cff2a5c2 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1079,21 +1079,21 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; + r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) - r = r->skip[PF_SKIP_DIR].ptr; + r = r->skip[PF_SKIP_DIR]; else if (r->af && r->af != AF_INET) - r = r->skip[PF_SKIP_AF].ptr; + r = r->skip[PF_SKIP_AF]; else if (r->proto && r->proto != h->ip_p) - r = r->skip[PF_SKIP_PROTO].ptr; + r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&r->src.addr, (struct pf_addr *)&h->ip_src.s_addr, AF_INET, r->src.neg, kif, M_GETFIB(m))) - r = r->skip[PF_SKIP_SRC_ADDR].ptr; + r = r->skip[PF_SKIP_SRC_ADDR]; else if (PF_MISMATCHAW(&r->dst.addr, (struct pf_addr *)&h->ip_dst.s_addr, AF_INET, r->dst.neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; + r = r->skip[PF_SKIP_DST_ADDR]; else if (r->match_tag && !pf_match_tag(m, r, &tag, pd->pf_mtag ? pd->pf_mtag->tag : 0)) r = TAILQ_NEXT(r, entries); @@ -1242,23 +1242,23 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; + r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) - r = r->skip[PF_SKIP_DIR].ptr; + r = r->skip[PF_SKIP_DIR]; else if (r->af && r->af != AF_INET6) - r = r->skip[PF_SKIP_AF].ptr; + r = r->skip[PF_SKIP_AF]; #if 0 /* header chain! */ else if (r->proto && r->proto != h->ip6_nxt) - r = r->skip[PF_SKIP_PROTO].ptr; + r = r->skip[PF_SKIP_PROTO]; #endif else if (PF_MISMATCHAW(&r->src.addr, (struct pf_addr *)&h->ip6_src, AF_INET6, r->src.neg, kif, M_GETFIB(m))) - r = r->skip[PF_SKIP_SRC_ADDR].ptr; + r = r->skip[PF_SKIP_SRC_ADDR]; else if (PF_MISMATCHAW(&r->dst.addr, (struct pf_addr *)&h->ip6_dst, AF_INET6, r->dst.neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; + r = r->skip[PF_SKIP_DST_ADDR]; else break; } @@ -1406,25 +1406,25 @@ pf_normalize_tcp(struct pfi_kkif *kif, struct mbuf *m, int ipoff, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; + r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) - r = r->skip[PF_SKIP_DIR].ptr; + r = r->skip[PF_SKIP_DIR]; else if (r->af && r->af != af) - r = r->skip[PF_SKIP_AF].ptr; + r = r->skip[PF_SKIP_AF]; else if (r->proto && r->proto != pd->proto) - r = r->skip[PF_SKIP_PROTO].ptr; + r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&r->src.addr, pd->src, af, r->src.neg, kif, M_GETFIB(m))) - r = r->skip[PF_SKIP_SRC_ADDR].ptr; + r = r->skip[PF_SKIP_SRC_ADDR]; else if (r->src.port_op && !pf_match_port(r->src.port_op, r->src.port[0], r->src.port[1], th->th_sport)) - r = r->skip[PF_SKIP_SRC_PORT].ptr; + r = r->skip[PF_SKIP_SRC_PORT]; else if (PF_MISMATCHAW(&r->dst.addr, pd->dst, af, r->dst.neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; + r = r->skip[PF_SKIP_DST_ADDR]; else if (r->dst.port_op && !pf_match_port(r->dst.port_op, r->dst.port[0], r->dst.port[1], th->th_dport)) - r = r->skip[PF_SKIP_DST_PORT].ptr; + r = r->skip[PF_SKIP_DST_PORT]; else if (r->os_fingerprint != PF_OSFP_ANY && !pf_osfp_match( pf_osfp_fingerprint(pd, m, off, th), r->os_fingerprint)) @@ -1855,7 +1855,7 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd, * packet got delayed in transit for much longer than * this packet. */ - if ((ts_fudge = state->rule.ptr->timeout[PFTM_TS_DIFF]) == 0) + if ((ts_fudge = state->rule->timeout[PFTM_TS_DIFF]) == 0) ts_fudge = V_pf_default_rule.timeout[PFTM_TS_DIFF]; /* Calculate max ticks since the last timestamp */ @@ -2212,25 +2212,25 @@ pf_normalize_sctp(int dir, struct pfi_kkif *kif, struct mbuf *m, int ipoff, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) - r = r->skip[PF_SKIP_IFP].ptr; + r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != dir) - r = r->skip[PF_SKIP_DIR].ptr; + r = r->skip[PF_SKIP_DIR]; else if (r->af && r->af != af) - r = r->skip[PF_SKIP_AF].ptr; + r = r->skip[PF_SKIP_AF]; else if (r->proto && r->proto != pd->proto) - r = r->skip[PF_SKIP_PROTO].ptr; + r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&r->src.addr, pd->src, af, r->src.neg, kif, M_GETFIB(m))) - r = r->skip[PF_SKIP_SRC_ADDR].ptr; + r = r->skip[PF_SKIP_SRC_ADDR]; else if (r->src.port_op && !pf_match_port(r->src.port_op, r->src.port[0], r->src.port[1], sh->src_port)) - r = r->skip[PF_SKIP_SRC_PORT].ptr; + r = r->skip[PF_SKIP_SRC_PORT]; else if (PF_MISMATCHAW(&r->dst.addr, pd->dst, af, r->dst.neg, NULL, M_GETFIB(m))) - r = r->skip[PF_SKIP_DST_ADDR].ptr; + r = r->skip[PF_SKIP_DST_ADDR]; else if (r->dst.port_op && !pf_match_port(r->dst.port_op, r->dst.port[0], r->dst.port[1], sh->dest_port)) - r = r->skip[PF_SKIP_DST_PORT].ptr; + r = r->skip[PF_SKIP_DST_PORT]; else { rm = r; break; diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index 016fe52f54d8..87c2211a84e0 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -703,7 +703,7 @@ pf_krule_to_nvrule(struct pf_krule *rule) for (int i = 0; i < PF_SKIP_COUNT; i++) { nvlist_append_number_array(nvl, "skip", - rule->skip[i].ptr ? rule->skip[i].ptr->nr : -1); + rule->skip[i] ? rule->skip[i]->nr : -1); } for (int i = 0; i < PF_RULE_MAX_LABEL_COUNT; i++) { @@ -969,11 +969,11 @@ pf_state_to_nvstate(const struct pf_kstate *s) nvlist_add_nvlist(nvl, "rt_addr", tmp); nvlist_destroy(tmp); - nvlist_add_number(nvl, "rule", s->rule.ptr ? s->rule.ptr->nr : -1); + nvlist_add_number(nvl, "rule", s->rule ? s->rule->nr : -1); nvlist_add_number(nvl, "anchor", - s->anchor.ptr ? s->anchor.ptr->nr : -1); + s->anchor ? s->anchor->nr : -1); nvlist_add_number(nvl, "nat_rule", - s->nat_rule.ptr ? s->nat_rule.ptr->nr : -1); + s->nat_rule ? s->nat_rule->nr : -1); nvlist_add_number(nvl, "creation", s->creation / 1000); expire = pf_state_expires(s); diff --git a/sys/netpfil/pf/pflow.c b/sys/netpfil/pf/pflow.c index a437f0259af5..8157ddc1c751 100644 --- a/sys/netpfil/pf/pflow.c +++ b/sys/netpfil/pf/pflow.c @@ -641,7 +641,7 @@ copy_flow_data(struct pflow_flow *flow1, struct pflow_flow *flow2, htonl(st->expire); flow1->tcp_flags = flow2->tcp_flags = 0; flow1->protocol = flow2->protocol = sk->proto; - flow1->tos = flow2->tos = st->rule.ptr->tos; + flow1->tos = flow2->tos = st->rule->tos; } static void @@ -678,7 +678,7 @@ copy_flow_ipfix_4_data(struct pflow_ipfix_flow4 *flow1, (pf_get_uptime() - st->expire))); flow1->protocol = flow2->protocol = sk->proto; - flow1->tos = flow2->tos = st->rule.ptr->tos; + flow1->tos = flow2->tos = st->rule->tos; } static void @@ -717,7 +717,7 @@ copy_flow_ipfix_6_data(struct pflow_ipfix_flow6 *flow1, (pf_get_uptime() - st->expire))); flow1->protocol = flow2->protocol = sk->proto; - flow1->tos = flow2->tos = st->rule.ptr->tos; + flow1->tos = flow2->tos = st->rule->tos; } static void From nobody Wed Oct 2 17:56:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJjDf2xMfz5Xryx; Wed, 02 Oct 2024 17:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJjDf2RfYz4LH3; Wed, 2 Oct 2024 17:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727891810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtOxleQuJ6rLHAmBiRgOSoDoT7BfEvd73O/WdNfawC8=; b=fSFUtUtlMTEhDTkHQhag4p5vw66GM5ozM2YhYR1UNpqqNmzRvombbazs2UQYrKJOGuNbbR t4Dx+y7rkVr9pE1yhAjTpcHpZ14hHTaOgrZIWl6OxBEkzurHGI4PAmW2I/dJ2B6ty0cXTi D2hAyIqBbPx4mxcwue6pCRAMoJqPb6oqNFNmbgnFMPej9SnFmylBzA9ZLA6r04cSHMjtr2 +r4gueZIQCpaAUTB69IMlXlgrotPSSPtrCm5Pn1CIKUgFcRdqtP+IXgSM9U/qP7olI+dAN oo6xRrf6IePwNmzmJngQ/BT+trDbUEParDqgCdMoYM4GDVHsg6nNYX18SDSv+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727891810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtOxleQuJ6rLHAmBiRgOSoDoT7BfEvd73O/WdNfawC8=; b=SOwyz3OdPGQx2T4EbZxFivOv3MXgFg/UFnil0Yx/pLttfr9t4qEVuPDwcUCXqknSABU6/T HRwcBvCPNcsUNRN1JEJjYVptEuLaKakS74+eAXpYvwvJ47Namim3jCRGZ8AL7ODdWUwwm2 626RQTpd5pYtbhVMuFe4LWnOQEwDmLqMFB/9kb4JNyY+qCV0D0K/5BqV2C9W4rB7nkLO24 Kgz2AOJl49Qmo0HGymojcCq+05rG75Zmah+ofmJXzXmkt3LBGh2WlCLtPZGfk6w9fEdGIO Knm8efgnqNbdx4VfeIbY2dRKW/SrZeSqNEoJEwf89NUyssDuY78p1YLBFzV9vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727891810; a=rsa-sha256; cv=none; b=J6+YAh0MpGysb6y1Fv3KSiMaTsTgi/IDKLFaaV8zGf9JwIAEoJ9p1YmikUnH0HUZA/dirp xwDYr+NtO2VJgF6cFTKU2J2gD0fL9mLfFi2j2hkVSzKWaNRFPGq5WoCQMLhasOTdS/g6HN futoi2kRkIVb6OoOPUmXu67P/clJhhYMEbUGY00yGG/y6K9fHPnnmbGq6d/ADuL7F8KFHW A2o2NgNnj5Me0dWB2gbJSmZGjSv8v0tuLYPqrhlERSAAx1ry9aorJMFC6qbjOZ9VH/IOeg RL7ZEsSOlH79ZBoQEpwlYuVyviF+mSqau1kNGpskAnpqyO6RNVTgSTovoTZRCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJjDf1sTszGF2; Wed, 2 Oct 2024 17:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Huo0k055426; Wed, 2 Oct 2024 17:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492HuoHI055423; Wed, 2 Oct 2024 17:56:50 GMT (envelope-from git) Date: Wed, 2 Oct 2024 17:56:50 GMT Message-Id: <202410021756.492HuoHI055423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1c82bbd8650a - main - pf: Fix NOINET and NOINET6 build. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c82bbd8650ab2c7247342dac7460d18fea90ed0 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1c82bbd8650ab2c7247342dac7460d18fea90ed0 commit 1c82bbd8650ab2c7247342dac7460d18fea90ed0 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 17:50:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-02 17:54:10 +0000 pf: Fix NOINET and NOINET6 build. The issue was only apparent when ALTQ was not enabled, which is why it was not revealed by `make universe`. Fixes: 27f54be50bb Reviewed by: kp, imp Differential Revision: https://reviews.freebsd.org/D46877 --- sys/netpfil/pf/pf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b5a18c37a89b..bbed285ab9f8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8854,8 +8854,12 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 struct pfi_kkif *kif; u_short action, reason = 0; struct mbuf *m = *m0; +#ifdef INET struct ip *h = NULL; +#endif +#ifdef INET6 struct ip6_hdr *h6 = NULL; +#endif struct m_tag *mtag; struct pf_krule *a = NULL, *r = &V_pf_default_rule; struct pf_kstate *s = NULL; @@ -9210,10 +9214,14 @@ done: else pd.pf_mtag->qid = pd.act.qid; /* Add hints for ecn. */ +#ifdef INET if (af == AF_INET) pd.pf_mtag->hdr = h; - else +#endif +#ifdef INET6 + if (af == AF_INET6) pd.pf_mtag->hdr = h6; +#endif } } #endif /* ALTQ */ From nobody Wed Oct 2 18:02:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJjLx1TDSz5XsJc; Wed, 02 Oct 2024 18:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJjLx12yNz4Lw4; Wed, 2 Oct 2024 18:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727892137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAahJSBwUUoJrNznbg/JKWyN1T0zA94fkgsjrfPLOEE=; b=mTPMoV5QkoiFJTLRM+Id1fjrhqZ82pGYPtVBz1uu1ZDDRCvPm3QhUU2GBPyc/D5cd9LY9C QhhAde067d1oKQLuCCnVU/8lxk4UkVpPHadcGVIQhH/oVvFvfZUOtr7tU8MicvbE1YK1Qo j4VNghE6BpQFsFbMIaSKWYG2/r7EHuRVXafOY84um9mxinetZ3D9TsDfCpAzOUaUnwexfR o2r3SlwyqNzIq7nkeiW4W0sSgs1S+sqI+Wi+M4+w1rujd0Q6YseO5guLVQy6zd05xFCxOJ mgcUI0ldaym6UEWAg8jg7sU7hlFih0dezExfbWWzEzf/LGa0ORvhd4yX/wjS7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727892137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAahJSBwUUoJrNznbg/JKWyN1T0zA94fkgsjrfPLOEE=; b=YvoA9Cm9YRLM7LI9j4P4Rp+aerNHWZndJTWYJ/0Fld7H3N5TBog8aYPzP/SmziCj/q57lr whJRr3DNPsRkZwsH5YmdOUOr3NiXVkDZ8r0kghTL6jNXhFISP7EyNG+oW5mvc3VYmGgGOa lfDX1sObV/6K4AELkiD7hOv0cs69l38i9F9joWpOrDzt034bynkJ1FhMEsEzi6jU4w+Hr4 rN+eX4xhE4wfINcaSZ/GzY5I9zjteGzjb3aNKZqQFJqPiKZOH3MixS614wiEnBYJYU4gB1 50lZ9b+xR/RPUkwpjonfWwexMfLzLDax19PXLc17dh78JD3aqGEbs5AY3Hbarg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727892137; a=rsa-sha256; cv=none; b=KWwETM1z8FwiJiHRxzmYbWHNVRbKhWoSq4SyU7bshznXVSFKWWmG4lRcHyWoRWLCghqYn+ XHl4fGURjpbTSEQJWNzGahfSYs3MMjOa3IGVVOTOX8qX+a/lwKx56yVmHQyyn5eRhMKpZd 7gLrC1XUUdDxhIBqKN70OY1e+yyDz0KOw9Zl/pyM0+Xd9YaYaP+3QKSJcp5n1AigFBC6AO ZKIwRn83y+RH/W2fHI40gvO8BVeOn6UYQi2Ndhrrz5Cka232v8JhivKSAErX/lsEsy37H8 TI6z+bewgtZiRIB1PAchUxBnC1Tgwm7AgsJ6EoYxEiaGK4I2lF1WKw76DV4/PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJjLx0XMfzGtw; Wed, 2 Oct 2024 18:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492I2GNe070115; Wed, 2 Oct 2024 18:02:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492I2GoI070112; Wed, 2 Oct 2024 18:02:16 GMT (envelope-from git) Date: Wed, 2 Oct 2024 18:02:16 GMT Message-Id: <202410021802.492I2GoI070112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: eb84c129d6d6 - main - stdio.h: don't expose rsize_t unless __EXT1_VISIBLE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb84c129d6d6b82238575946ba3552c9310f24f9 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=eb84c129d6d6b82238575946ba3552c9310f24f9 commit eb84c129d6d6b82238575946ba3552c9310f24f9 Author: Graham Percival AuthorDate: 2024-09-30 00:06:29 +0000 Commit: Cy Schubert CommitDate: 2024-10-02 18:01:39 +0000 stdio.h: don't expose rsize_t unless __EXT1_VISIBLE This is how the other typedefs for rsize_t handle it (in , , and ). In particular, we shouldn't have any rsize_t if a C environment earlier C11 was requested. This reapplies b35f0aa4952c, chasing c25e55bcf80b, fixing ports build failures following b35f0aa4952c without c25e55bcf80b. PR: 281768 Sponsored by: Tarsnap Backup Inc. Signed-off-by: Graham Percival --- include/stdio.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/stdio.h b/include/stdio.h index b0190d25eb4f..ee3ab3bfb986 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -48,10 +48,13 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif +#if __EXT1_VISIBLE +/* ISO/IEC 9899:2011 K.3.3.2 */ #ifndef _RSIZE_T_DEFINED #define _RSIZE_T_DEFINED typedef size_t rsize_t; #endif +#endif /* __EXT1_VISIBLE */ #if __POSIX_VISIBLE >= 200809 #ifndef _OFF_T_DECLARED From nobody Wed Oct 2 18:12:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJjbD1fmlz5XsqJ; Wed, 02 Oct 2024 18:12:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJjbC5mX4z4MVN; Wed, 2 Oct 2024 18:12:55 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-82aa3f65864so5238939f.2; Wed, 02 Oct 2024 11:12:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727892774; x=1728497574; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L+/6xpKb/AxU7vQvZ4GN2e9sWdWmkO6Tf8XNvSWk6vA=; b=r9jmM+z4RJu88kbYsRoot6akCZJofPNV7jHj0soI9ymLBcLQFUaTi3zRS+pKKna3s9 1S032zVJP4SdFsjkTb70hmmApFMtKsek6lOMVOkQfLUtJrwWanLNitx5o+Y849+Q6OxD SdHoklOYs37yGIs4TVVT4k/MTtwKnZOhuDkD99znB/vcveqvnVjHcAmkhL/QNFtwCzKz ZKw8Z/RzLv0lx/E1qlbCgHzgLOegSG/SFsfLqLyudOpvusYshWi011Z2XOup0uveYpzu 8YZ3kepvUO+qU5Eyzb12ZFtVtT1+O5qVBD4+vui5bd+R48E9xMczgzjKewqSmnH13b/I 1n/A== X-Forwarded-Encrypted: i=1; AJvYcCUTVowraxsdZO4shdiZYklxnPo9oK1w0wd/+F8uhBb5FqYX1fVhhyVZLAheTyov1rpKUPjBDerB2xcIvHYDEp0ZAutH@freebsd.org, AJvYcCVbrO0apzp5WlUzArB7sMvGtWfgZ2uruoZyooGebEohO4n5PUmGlWCllyGblLpuywH0p3pmfWdKZ+RksRlCMghAMFqzcTE=@freebsd.org, AJvYcCVkdMgIDlI+8V/oUpnwtacwLaNdipW7D6Z+RtX+KVBAWH2HyfHz18Tybkd+MV7wyVs0KKOnXFaef4jPvWrJMcw=@freebsd.org X-Gm-Message-State: AOJu0Yw9oOcyDYfjfM1DoxqHr8evRIg5OUQBUkNmANG9rCTLGp1/XFTS wX9kk3Pf4oe0eix8yc396pFUbjDs1KJeM+83pKLmQ2WpN63xGr2tUjMwTubV7IAPK2CKZleVrg8 JlLzJk17KLlZPJxfNAk9Ciynm2nJu7/ri X-Google-Smtp-Source: AGHT+IFggk7fMBkhf7XsH6uQ2ftBwyjHUJKO/e2pkOBXQDY9du1UssSrK4WKTBI9MmDhfeS6ucD7gFUora8uPXD7EmM= X-Received: by 2002:a05:6602:6b09:b0:82a:2143:8 with SMTP id ca18e2360f4ac-834d848471bmr485622439f.10.1727892774286; Wed, 02 Oct 2024 11:12:54 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202410021645.492Gj4Sb035939@gitrepo.freebsd.org> <20241002165318.AA05628D@slippy.cwsent.com> In-Reply-To: <20241002165318.AA05628D@slippy.cwsent.com> From: Ed Maste Date: Wed, 2 Oct 2024 14:12:43 -0400 Message-ID: Subject: Re: git: 51fda658baa3 - main - vmm: Properly handle writes spanning across two pages in vm_handle_db To: Cy Schubert Cc: =?UTF-8?Q?Bojan_Novkovi=C4=87?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" 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:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4XJjbC5mX4z4MVN X-Spamd-Bar: ---- On Wed, 2 Oct 2024 at 12:53, Cy Schubert wrote: > > > vmm: Properly handle writes spanning across two pages in vm_handle_db > > > > ... > > Security: HYP-09 > > Where can we find this vulnerability documented? With support from the Alpha-Omega project the FreeBSD Foundation commissioned Synacktiv to perform a code audit of two FreeBSD subsystems: bhyve (kernel vmm and userspace device models), and kernel code reachable from within a Capsicum sandbox. These HYP-* and CAP-* tags reference vulnerabilities in the Synacktiv report. Recent SAs (SA-24:09.libnv, SA-24:10.bhyve, SA-24:11.ctl, SA-24:12.bhyve, SA-24:14.umtx, SA-24:15.bhyve) are fixes for issues identified as "critical" or "high" severity. Remaining issues are "medium" or lower severity. The report will be made public after the appropriate issues have been addressed. From nobody Wed Oct 2 18:31:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJk0933hXz5Xtm7; Wed, 02 Oct 2024 18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJk092Sspz4NsP; Wed, 2 Oct 2024 18: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=1727893865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jJ/Ibmsjvc6JEPPMuYh29kgAgeza2G5uiUOC2C+I/7M=; b=tldXOc21OIgN1ST7AriWVmnGvWOQZpw5rYXXoOSg2r2mhfmYnHIwMLnoYelQEbJr7+vav3 isf3Wu15Pf04AW5lCmB5846IF0ZG9GnwDQK9AsR1S/DNHt8g+k6LQYZ8yOzzbaN5dHJGqM oJF3mDlTUdwRo2WkMSHhHMC6TkmIw3yineoeyBcMuy6PE5H9hzRnSefC4CGWkFb0/10Tsv /IfPoKCd+fWEMTFeQV5N1cW9gYCUMBsLlDMm8KAgCZk0kK06mhO1V8Yd9JfppJyP5qtss9 kvHIA9bIXvExYkvX+Sq71Bs+/N0Pvtwd0bfWeLvUwYJdq0KcnNWWVt2uf8A8Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727893865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jJ/Ibmsjvc6JEPPMuYh29kgAgeza2G5uiUOC2C+I/7M=; b=qq7me8d76WyM52lsyzABSlpCBZUjnqXIj1GbEK6HvhM06kM6Wofd2wjFYJinTZYxacQyUp 4w2qXab2QCH1l7Pv4GzabGsonWvfCfgKR8tdDN5yNAzscxbDbFfHA0u8D/ed+iTSvzKPx1 jMDpE9upKpwtk3K3KC/0UF7TbEC29a0npaVRo0L4CqIQQTXb9v/3Z2pYkm9bSG/6Gqleui z0DT1QqXtrwmXDgstqETiZhtCnGdNOB5o/bLDZMBYwYaJ8tyOxzz03Kr4ALUKfzqUyBC9m S0yKAgozBK8A1/H6LeVAxVEXrILsckoM4NwsyBZgyYgyc8OEz9e+O73n4cHPsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727893865; a=rsa-sha256; cv=none; b=WfzCJIuoVotAEPW0xHTAMJKQK/3kKGyzh7j5siHvZ1SHNexgArT1yYHuA7vCRL17/fzxwx /l6YZ1ceOqJpFmN4rQsWifGkRE7OLh1D3/rdZeGWZOfawHzVM9RMnfo1qDSNFfi/AA2DaG jllMd9jU7jCdD8KI87RMrYI0PrBQAarDEsZpJl7pHaDfnZRAiZJF8pNsuhKVvBLreel0i/ rSgtP8zp2gXH8xwzjdb0RmdW/D/y4mOOuKtp1QcaEwXUGZlhTUhoCIvPao3V5nScXT5bbE rqUgdGh7Z9rcxLiCqyzQjkYMsmJvAFF7MJBV/qn0of3Q0NLNwUi5AVmfmsOt3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJk0924pjzHJS; Wed, 2 Oct 2024 18:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492IV5fN017904; Wed, 2 Oct 2024 18:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492IV5PJ017901; Wed, 2 Oct 2024 18:31:05 GMT (envelope-from git) Date: Wed, 2 Oct 2024 18:31:05 GMT Message-Id: <202410021831.492IV5PJ017901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ab03b790627c - main - uart: Add entry for an Intel UART List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab03b790627c19884c374d5d15e419c8be448c89 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ab03b790627c19884c374d5d15e419c8be448c89 commit ab03b790627c19884c374d5d15e419c8be448c89 Author: Warner Losh AuthorDate: 2024-10-02 16:06:00 +0000 Commit: Warner Losh CommitDate: 2024-10-02 18:29:24 +0000 uart: Add entry for an Intel UART While we really should infer this baud-clock rate in some cases, use the right baud-clock for this device. Sponsored by: Netflix --- sys/dev/uart/uart_dev_ns8250.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 1a58600c8039..7aef4df97e12 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -464,6 +464,7 @@ static struct acpi_uart_compat_data acpi_compat_data[] = { {"MRVL0001", &uart_ns8250_class, ACPI_DBG2_16550_SUBSET, 2, 0, 200000000, UART_F_BUSY_DETECT, "Marvell / Synopsys Designware UART"}, {"SCX0006", &uart_ns8250_class, 0, 2, 0, 62500000, UART_F_BUSY_DETECT, "SynQuacer / Synopsys Designware UART"}, {"HISI0031", &uart_ns8250_class, 0, 2, 0, 200000000, UART_F_BUSY_DETECT, "HiSilicon / Synopsys Designware UART"}, + {"INTC1006", &uart_ns8250_class, 0, 2, 0, 25000000, 0, "Intel ARM64 UART"}, {"NXP0018", &uart_ns8250_class, 0, 0, 0, 350000000, UART_F_BUSY_DETECT, "NXP / Synopsys Designware UART"}, {"PNP0500", &uart_ns8250_class, 0, 0, 0, 0, 0, "Standard PC COM port"}, {"PNP0501", &uart_ns8250_class, 0, 0, 0, 0, 0, "16550A-compatible COM port"}, From nobody Wed Oct 2 18:31:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJk0B4Pl8z5XvBV; Wed, 02 Oct 2024 18:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJk0B3HMTz4NfY; Wed, 2 Oct 2024 18: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=1727893866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZN8YXEGdgqaL5uIiahrSoy2roet6ZH84yLHLNdkyls=; b=hYOdlRXoMa+ZZT3YxUHpCdSMm9YeFZVUF2/zKvO/x3pDN2FbWZUp0rWt0/IFWMCoL52KwX 7H1FwTCIrHXe9iUkg9ldpMI16t0gUfF0NIVueHHoYi084Lkdijbs++sLnOYkgPHbPhPtuz KhaDLejyW4PLMBh0sp2tNImwJnge0T3EZxGcE92SYvS/oxQMkSHXMf1RRIm47rSK0XOKrE 85Z6DE74hckVVGSi0u3eXZ/d4gub9mI2uy/uSl0PhrjHpITjZijEgavCW8FQ4Id7zbiRvh /vZabk/YvJe8EnLU8oK3/rLD2KMU1zajwsz7ts/GIMtYKk81OUqqJl88IJzpgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727893866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZN8YXEGdgqaL5uIiahrSoy2roet6ZH84yLHLNdkyls=; b=Vup1Pg91SNAlsbiBz0GqSBhDH0lmZvut05TDkqROrwYdMNZvlzyyvh9HaEjqsvP2OK3up8 QowOHLW3e4JmaJ64a+82DslZi++AQaokwZ8K+KMk53R0O/DKA5DiBpdkHCpbfnjnNfwv9o Zj5Y8Ak9OaCzjQEPAPIBYwKOT8NdPCpVmR/ZefZpS1OQlHchAo3SOCZ7lL+OivqOwec4I+ BKJkrFd1sFoc158npq5AK6cuLqMdSQY/sjuig+vGvLZyAeKsXTMxqtrh4T/NI26vZDsWc2 mpsZ7MJrPQCPpa6PFl48/IvkqjsQAWOevhHvFb5svJnMEjVxHOkeIUFxWZ78Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727893866; a=rsa-sha256; cv=none; b=O86bFt+mkTECdfovgSu+i2aEdkoFplp+UwqNwN1EedFqhrSlZAKcW37inSaL4KuVsTIXIy lR5DcjrKJwZ+gMkCcEVFI6OtIK9e/Eei561vKk9p+V7DqVMFnV5/8/D3/T6NyKqhgIopvc tNrp9LmBPOquSUdx97HvnqiFY8GtAgf1QiZo/0Z7cjlM+8d/4fLoHmGuJEM3yFYlxGPvbK 3lPnDbdfQTFoYXVriVP3A89Woo91GEO0+pvzp9FIphHmFRMXomnqL3V51V8mqRsfJ3qbRQ XgjfeC3ONhf8YO51PSaMD6UnH3ZMj8VzZY54dodKNIDVIzubkzDNUJIP2XTknA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJk0B2cdczHJT; Wed, 2 Oct 2024 18:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492IV6be018864; Wed, 2 Oct 2024 18:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492IV6Nw018853; Wed, 2 Oct 2024 18:31:06 GMT (envelope-from git) Date: Wed, 2 Oct 2024 18:31:06 GMT Message-Id: <202410021831.492IV6Nw018853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cd8c3af747cc - main - ACPI: Treat all 20-element _BIX entires as revision 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd8c3af747cc300c8257c315c7576644e2bb86ff Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8c3af747cc300c8257c315c7576644e2bb86ff commit cd8c3af747cc300c8257c315c7576644e2bb86ff Author: Bartosz Fabianowski AuthorDate: 2024-10-02 18:21:28 +0000 Commit: Warner Losh CommitDate: 2024-10-02 18:30:15 +0000 ACPI: Treat all 20-element _BIX entires as revision 0 Some Fujitsu Lifebooks return an invalid _BIX object. The first element of _BIX is a revision number, which indicates what elements will follow: * ACPI 4.0 defined _BIX revision 0 with 20 elements. * ACPI 6.0 introduced _BIX revision 1 with 21 elements. The problem is that the offending Lifebooks have the a non-zero _BIX revision, but provide 20 fields only. The ACPICA parser chokes on this [1], but that seems to be inconsequential. More importantly, our own battery info handling code also verifies that for revision > 0, there are at least 21 fields - and refuses to process the invalid _BIX. One workaround would be to introduce special case / quirk handling for Fujitsu Lifebooks. A better one is to relax the requirements check: If there are only 20 elements, treat the _BIX as revision 0, no matter what revision number was provided by the device. Linux doesn't run into this problem by the way because it only supports the 20 fields defined in the ACPI 4.0 spec [3]. It never looks at the revision number or the 21st field added in ACPI 6.0. [1] https://cgit.freebsd.org/src/tree/sys/contrib/dev/acpica/components/namespace/nsprepkg.c#n815 [2] https://cgit.freebsd.org/src/tree/sys/dev/acpica/acpi_cmbat.c#n371 [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/acpi/battery.c#n418 PR: 252030 Reviewed by: imp MFC After: 2 weeks --- sys/dev/acpica/acpi_cmbat.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index aeda34c3acff..35032244af19 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -398,8 +398,17 @@ acpi_cmbat_get_bix(void *arg) sc->bix.rev != ACPI_BIX_REV_1) ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_1); } else if (ACPI_PKG_VALID_EQ(res, 20)) {/* ACPI 4.0 _BIX */ - if (sc->bix.rev != ACPI_BIX_REV_0) - ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_0); + /* + * Some models claim to be rev.1, but have a _BIX with only 20 + * members. Be lenient and treat this as a valid rev.0 _BIX. + */ + if (sc->bix.rev != ACPI_BIX_REV_0) { + ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), + "_BIX containing too few objects for revision %u. " + "Treating as revision %u instead.\n", + sc->bix.rev, ACPI_BIX_REV_0); + sc->bix.rev = ACPI_BIX_REV_0; + } } else if (ACPI_PKG_VALID(res, 22)) { /* _BIX with 22 or more members. */ if (ACPI_BIX_REV_MIN_CHECK(sc->bix.rev, ACPI_BIX_REV_1 + 1)) { From nobody Wed Oct 2 19:13:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJkx94Rxgz5XxnZ; Wed, 02 Oct 2024 19:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJkx93w3yz4Srq; Wed, 2 Oct 2024 19:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727896413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UTTIKiapDAwMF9QKz5wNOTjQMPfIikCUmu8dd8W3jTc=; b=aimZ5fDymVWN5FX9Wrs4a5axKQMbbjxrFI7wvHa4qT3T5bxBC2FkHSLuJLWdR9L5dDoOXF klIfdOvAZrblnqY6l3oz4s+CUOuk068KaW9ZeS2FI+z+kL1fQpD/Ym1otOV/s9wNoS+NT+ wqOQXLS9mTQohMUn+GT9kShEgyX4LK+ktcgjmrYdqZuZD3EDDcl01xMv7JHQAgwXgSfLdv i3Dw1iEYe84W9YF08zzM+VDfCD6tvbfLetDyQAThkyAADCDNiwcI40oqxXqqW2gHy1u6Im EQB3dhkISFpHNX/qLU43B8nIWosNbU1Cy4g6+zIjIxUIV55uxQ+V9hAnATmLsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727896413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UTTIKiapDAwMF9QKz5wNOTjQMPfIikCUmu8dd8W3jTc=; b=wtzM1EkOvrjWjX9e8TCLMgEkuK3nmP4armKFKp0EYq5I0xfcpgaz42Wu8xX2nJk3tFptm0 7Qv9IQrMZNFP7tkVLWgCxEJcs7UMyt2hRXb7TyLCM0/YT+O1nJLh1VYN4k4FFLCqLn/ORj cGjJMe7BtpYzO2FFIGQ4hoA+gGh/CORRLlrh0QYMOy444WToxWi32b5knvi1zotyTYvdB+ sJ0SAHIBvEJ1pSNoeSljJxNAcNhhRHVcC3V6QdM/v6L7cZwagXPp7NMSVNT9sjGOlrrd39 wEQwZQZM1bz3WJ0AaweAG/gKjQ8nLFkGXTFxcQE5XikwUkWvK5V/nMsZjMjzUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727896413; a=rsa-sha256; cv=none; b=Rrl4lJm5DUL73ZNq2yWKbDUQtGiSeay2yTg7UjyOJB/GjmdFfjEL6M0f1uGlkv6AWJTrtr fxxUr4/brwSeZOyPdpbsih0UODhB4DvJi6oMuwasVTUAle0eyuuuyCRxSsctq4fCMLnmqI KLtxP/2KRYaMfzBj44Mol+DdvQWoknukIfObP5ivWhVz7qYBxCXBJMJJa7GknqPmrgZtX8 LqZzkgDNa/cO96FZA8LaJ6YgOOhvpA3oNePWjY7jlxdR64/dLPznKEGP5ktF8kKCtLtwrc ufHr8f0/egNihiF360nhkfZHsfDmR1HYvjX4kyx54N4KptHqjIkF43ABZ/e5Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJkx92wHHzJbd; Wed, 2 Oct 2024 19:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JDXnF092461; Wed, 2 Oct 2024 19:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JDXP9092458; Wed, 2 Oct 2024 19:13:33 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:13:33 GMT Message-Id: <202410021913.492JDXP9092458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c08e016f000c - main - unix: Use a dedicated mtx pool for vnode name locks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c08e016f000ce417a6fb413025ab81ad66cbdfff Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c08e016f000ce417a6fb413025ab81ad66cbdfff commit c08e016f000ce417a6fb413025ab81ad66cbdfff Author: John Baldwin AuthorDate: 2024-10-02 19:12:37 +0000 Commit: John Baldwin CommitDate: 2024-10-02 19:12:37 +0000 unix: Use a dedicated mtx pool for vnode name locks mtxpool_sleep should be used as a leaf lock since it is a general purpose pool shared across many consumers. Holding a pool lock while acquiring other locks (e.g. the socket buffer lock in soreserve()) can trigger LOR warnings for unrelated code. Reviewed by: glebius Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D46792 --- sys/kern/uipc_usrreq.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 0f01afa97878..fc1559fb1fb1 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -112,6 +112,7 @@ static int unp_rights; /* (g) File descriptors in flight. */ static struct unp_head unp_shead; /* (l) List of stream sockets. */ static struct unp_head unp_dhead; /* (l) List of datagram sockets. */ static struct unp_head unp_sphead; /* (l) List of seqpacket sockets. */ +static struct mtx_pool *unp_vp_mtxpool; struct unp_defer { SLIST_ENTRY(unp_defer) ud_link; @@ -679,7 +680,7 @@ uipc_close(struct socket *so) vplock = NULL; if ((vp = unp->unp_vnode) != NULL) { - vplock = mtx_pool_find(mtxpool_sleep, vp); + vplock = mtx_pool_find(unp_vp_mtxpool, vp); mtx_lock(vplock); } UNP_PCB_LOCK(unp); @@ -748,7 +749,7 @@ uipc_detach(struct socket *so) UNP_PCB_UNLOCK_ASSERT(unp); restart: if ((vp = unp->unp_vnode) != NULL) { - vplock = mtx_pool_find(mtxpool_sleep, vp); + vplock = mtx_pool_find(unp_vp_mtxpool, vp); mtx_lock(vplock); } UNP_PCB_LOCK(unp); @@ -1953,7 +1954,7 @@ unp_connectat(int fd, struct socket *so, struct sockaddr *nam, unp = sotounpcb(so); KASSERT(unp != NULL, ("unp_connect: unp == NULL")); - vplock = mtx_pool_find(mtxpool_sleep, vp); + vplock = mtx_pool_find(unp_vp_mtxpool, vp); mtx_lock(vplock); VOP_UNP_CONNECT(vp, &unp2); if (unp2 == NULL) { @@ -2561,6 +2562,7 @@ unp_init(void *arg __unused) TASK_INIT(&unp_defer_task, 0, unp_process_defers, NULL); UNP_LINK_LOCK_INIT(); UNP_DEFERRED_LOCK_INIT(); + unp_vp_mtxpool = mtx_pool_create("unp vp mtxpool", 32, MTX_DEF); } SYSINIT(unp_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, unp_init, NULL); @@ -3441,7 +3443,7 @@ vfs_unp_reclaim(struct vnode *vp) ("vfs_unp_reclaim: vp->v_type != VSOCK")); active = 0; - vplock = mtx_pool_find(mtxpool_sleep, vp); + vplock = mtx_pool_find(unp_vp_mtxpool, vp); mtx_lock(vplock); VOP_UNP_CONNECT(vp, &unp); if (unp == NULL) From nobody Wed Oct 2 19:13:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJkxB4rGRz5XxYM; Wed, 02 Oct 2024 19:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJkxB4BNvz4Srt; Wed, 2 Oct 2024 19:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727896414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0bGZ9gnvEfaA75VJTEQH7/6wp1MA69Dj3fYYdLqUYQ=; b=Kwsl3B70ldU/mqtnLEoaDo91B7L25uvBgXgOQxa+SmpuyaMWPkoMxRcMOAB2rF1aMxVEPf dRNyERv2cQDR6pBaFjwSsfbmklG2HsPUBSS//WZ8RA0T5uLBtUVbpyIfHh6bTq8pZ8T1FA SBwuFx2nBRMTIBO9KImuAqmBdJTvC3lk5jvVtZ8DW6JyzXygLAY4zyRU2HG2BqeDI2rrAi DBTLrPRriDHDBmpQjkzib7Xa1FJWrwMozGsZRhs9skG6CFsTBxfPZW5Tt4qzs+47cnATLS de660iM/EEhMY8W8taaIAeOksSUjlwr324JOBWUwGTR8rZ20GBelQCzUIaQX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727896414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0bGZ9gnvEfaA75VJTEQH7/6wp1MA69Dj3fYYdLqUYQ=; b=KtiC1WIpPDrfX3Cv+v2KsriZ7pJCqi/RNTZngcu+jfuiB1VY2FmtBj33TNYhkGGaVsyAdG UsBE9YaxifM03GEzzrvjDZt5rHK+D6Ij/Wn6hMBUceNHvQMATUcAj6Xc0IRhbGlJzUySps /RogH9wl3gGqpXrsbvjZiykI0tKGl0QrZxcmdMnxLpi6CbNsc7aIzQAgbGfvSumYWvLjdm Um9MjJTQXZqfLfzzHXfRl+XdaZ2TufpgIAuAwhotN7SVjclPUWscU3VdhtaNuSqTRojNbG 8TK6hBuOrAHhuqvRS7XAa6IW4cdcPH2hYiL+LDM7MV9Xd1yYgidkEz4YbLu3sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727896414; a=rsa-sha256; cv=none; b=X8M1Ha2zTmS3zMyuU7omWQY99L/TOjVE7UJRG7kAenxpySoPLgvWO9QaViZMBJBLW+T8Z1 bN4TcldL9FWg71LLJOqXmsT8hYKpDoLLvsL/NnSPH3c3Fn6vibmyrrtwV1JeciGlTwKoI+ C0uoTrpYGz8GLeUTAXUwjk1G9f9pEhovRa3MpGSTke6XMoxYsr+lDIcUiJ90ZktOxNVK8L O+96KxFXVTKiogTD5OfTn+LxbMLLHGmHforlO780TdrkM/feQrcHkaH83IHOqbP6NOFPN7 zeOqeHsO/DcjvsKITTIoTnWAE5zQNXG0MZuSzRT6Ineo6JLPux4lQmOm2WsHYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJkxB3nlZzJFS; Wed, 2 Oct 2024 19:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JDYeZ092514; Wed, 2 Oct 2024 19:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JDY5j092511; Wed, 2 Oct 2024 19:13:34 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:13:34 GMT Message-Id: <202410021913.492JDY5j092511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 519981e3c09c - main - tcp_output: Clear FIN if tcp_m_copym truncates output length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 519981e3c09c2875b136635459c87ab24d3104e2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=519981e3c09c2875b136635459c87ab24d3104e2 commit 519981e3c09c2875b136635459c87ab24d3104e2 Author: John Baldwin AuthorDate: 2024-10-02 19:12:37 +0000 Commit: John Baldwin CommitDate: 2024-10-02 19:12:37 +0000 tcp_output: Clear FIN if tcp_m_copym truncates output length Reviewed by: rscheff, tuexen, gallatin Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D46824 --- sys/netinet/tcp_output.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index fe1f15c26338..78ecfe5289b6 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1078,13 +1078,18 @@ send: sbsndptr_adv(&so->so_snd, mb, len); m->m_len += len; } else { + int32_t old_len; + if (SEQ_LT(tp->snd_nxt, tp->snd_max)) msb = NULL; else msb = &so->so_snd; + old_len = len; m->m_next = tcp_m_copym(mb, moff, &len, if_hw_tsomaxsegcount, if_hw_tsomaxsegsize, msb, hw_tls); + if (old_len != len) + flags &= ~TH_FIN; if (len <= (tp->t_maxseg - optlen)) { /* * Must have ran out of mbufs for the copy From nobody Wed Oct 2 19:53:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlq15NJcz5Y1Rq; Wed, 02 Oct 2024 19:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlq14pHwz4Xm8; Wed, 2 Oct 2024 19:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLvi/ICzF+SIaG1X+j+gNN5xaEr6eIWpbwC/sclZkgQ=; b=VJVQjVLJdU4CYY1GiO4Pj5YOZIbXHb7I5zqzFfi6uDIgQ2C8bYe3aC2wAqeA868LTTsvrs phRe01HBpP9RV07GW20bxPKy7DXdfn/oSO+y3EzPfnHy26UDn+dTBzMYoOT9z796/orXYx tBqM9sHxz/aqt7ciVcE0ijsXHX9ZjGkB9XEttseyYTfpb7VVXIWBIGA4e0y2Bxqr+lSfYy 2MxEVddGmlBRszzuHCq91/651RHuiDebYzByTpBbqZY86DROdR+BEk4UM9dyP46FUjYUkH NWOR72G9ajGgU41myyNrO65IrsyC+3H+/Xxsbp4hwoorps1r9oc4b5EzUiPJSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLvi/ICzF+SIaG1X+j+gNN5xaEr6eIWpbwC/sclZkgQ=; b=jvBKpZC+EZKa6Or4c/Tvh+E+w7vRR55PSe6X+t25zA5soijRmj9Hye5S/TbMV3f3XY85aQ 8BKkqKb1ARaqpTH3FgAkRmLsgFm1CswMpEX8saFNuFXJSdUpdawXasGFBjq7F2rKA1JBLB wINpA/LIJVkl07vwCbkg08VrzPlQ2CVPgNAvuH5xMrcSnd6Fd9QGYZRLTGI36WTQ+HcDol p8xs+SEBMRgOzl8V/HuQKKZMPAwA1RF+VQHmerdOjpdGthGZ9UXIzbYboCxm4ZPW1VlDv7 YQ316ieYJx2Nc7DtIctIVVYR6jLMuof0mrPwC3N7QDfyrdexSF5IWdxUlqwFbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898797; a=rsa-sha256; cv=none; b=XZK4aQWcnjrQpKVCKMFL/zK3RtYrYR9Wl67wO5cJmiPjPNVAeqP+k4lKCaK7Vshd0g0Oon QUX4vvc+msCazDOS5T36/Q2dufTGMvSYTCKOh7wqwS9r6YRxDU1xx2v5pO9qrxionATW2L aPXJZ2linbb2A/j7URbaqCRa21ctULcrZO8Ww83QDi3SrG6TS7EU8vv4V1v+mkKJjOKTTH vsEzvnQkhB85o8ogS3XSCnvBe7275cSZgFrtwNyYF7Hskl/zuAExSpKAew7kVQ8sKowBYp ufFZrp/Cu2EwfkYzDuJmCszn0UiCheMbDCFt3MQISjMF61gXBYfx19qK/cXFzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlq145g4zKcD; Wed, 2 Oct 2024 19:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JrHnO060486; Wed, 2 Oct 2024 19:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JrHao060483; Wed, 2 Oct 2024 19:53:17 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:53:17 GMT Message-Id: <202410021953.492JrHao060483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2726df27627b - stable/14 - e1000: Add sysctls for some missing MAC stats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2726df27627b4674246db5e56cb3ec98f797b587 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2726df27627b4674246db5e56cb3ec98f797b587 commit 2726df27627b4674246db5e56cb3ec98f797b587 Author: Kevin Bowling AuthorDate: 2024-09-24 09:39:33 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:51:43 +0000 e1000: Add sysctls for some missing MAC stats Sponsored by: Blue Box Systems (cherry picked from commit aa7d086ad94642fa40375db9976177fc9e54a2cf) --- sys/dev/e1000/if_em.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index e2d8535143ef..5fb46c9f6dce 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4304,6 +4304,10 @@ em_update_stats_counters(struct e1000_softc *sc) sc->stats.roc += E1000_READ_REG(&sc->hw, E1000_ROC); sc->stats.rjc += E1000_READ_REG(&sc->hw, E1000_RJC); + sc->stats.mgprc += E1000_READ_REG(&sc->hw, E1000_MGTPRC); + sc->stats.mgpdc += E1000_READ_REG(&sc->hw, E1000_MGTPDC); + sc->stats.mgptc += E1000_READ_REG(&sc->hw, E1000_MGTPTC); + sc->stats.tor += E1000_READ_REG(&sc->hw, E1000_TORH); sc->stats.tot += E1000_READ_REG(&sc->hw, E1000_TOTH); @@ -4520,6 +4524,9 @@ em_add_hw_stats(struct e1000_softc *sc) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "missed_packets", CTLFLAG_RD, &sc->stats.mpc, "Missed Packets"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_length_errors", + CTLFLAG_RD, &sc->stats.rlec, + "Receive Length Errors"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_no_buff", CTLFLAG_RD, &sc->stats.rnbc, "Receive No Buffers"); @@ -4560,6 +4567,18 @@ em_add_hw_stats(struct e1000_softc *sc) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "xoff_txd", CTLFLAG_RD, &sc->stats.xofftxc, "XOFF Transmitted"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "unsupported_fc_recvd", + CTLFLAG_RD, &sc->stats.fcruc, + "Unsupported Flow Control Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_recvd", + CTLFLAG_RD, &sc->stats.mgprc, + "Management Packets Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_drop", + CTLFLAG_RD, &sc->stats.mgpdc, + "Management Packets Dropped"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_txd", + CTLFLAG_RD, &sc->stats.mgptc, + "Management Packets Transmitted"); /* Packet Reception Stats */ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_recvd", From nobody Wed Oct 2 19:53:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlq25P5mz5Y1dN; Wed, 02 Oct 2024 19:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlq24nhsz4Xm9; Wed, 2 Oct 2024 19:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+DMTW5+gN21DrlXyYSWvERaTtZjiwQBVOJ8mB1ZuQGk=; b=lb3zSBHmYyj8ueL7CBMyZtLvcIKqeEzHR43I1qn97eUDgDxpMlyqsMyEYHNt/vgNcCWQoE klUFNXgFPdltI6iuzKr+uOc45woza617h7k+ncGHpJzthjoNvVb7Wr2Jx45uxaBIB3x3Ar PfYK3OSd1zeYMKLWNjuPmV9pf2hkpghhk+C+8NN56bucyT7v2fjRAxdBVRH2g/X3OrNXo6 Ln2AQp29ywx3wpQ93ADEBsu8GURgCuINAAdYljtwlay+sPuM3SUQa44vxWcX2/2WhiSMs1 nI/uSLzANhXHv3BxO+WyZkepPTJ5qVu5x1Zuhy475rAtCnSHa1YNGAFt8/iw7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+DMTW5+gN21DrlXyYSWvERaTtZjiwQBVOJ8mB1ZuQGk=; b=tTGDshprlesZemKq98QT6qD1swEAnchHFSxqRJWYT16RqDLchv8bsJiy5UUN5UQ62vHzYQ Ot9i5twPUI31Ax2wt+nq5vdtb3UzIxH0iCaLzPjRsWkLHv+ADTp6YcCiPciZOdb0fdv4lP IwRJV0QIWh9zg1gZePeysE248GSWR/P/pNKHlp657eXWLUhJrnatjA/YuJLiBI1SO+SS6t LIRUB9/kRYCdrngf+bc/1CQcInHNqRuMwc82OiMFBjzMEFdbpCnxLR8snFbBfbscDy33yT +k2VsItq+N/UwMk+/5EkBRH/EYccfhaH4T65QZfllztIgkr8VPXVwnE4MSAY8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898798; a=rsa-sha256; cv=none; b=GRuQJMY1UlvZHF3Hof0+IaclxP/OPLFTHACWKvzFZhXPhnj0rOeruJUQSSyKCM354IqFnI A53GXlRZIkA69gtD1LpiopzgVxloRdBkgk8HvnLoGjwWBTQ+hT/d72ACBDUk+is5+SACDG elRHtRzD44jhKq18V6QK+4NlKMmuP3+Xy9lQJ5TCXz0m+EJ+J6TPii9ybLuBsE1YDlLN1x 5eM4y6qrYmliJhFyb2qlpwec2e33IEV4AXW6X+ygsQFC/33cs2wkuX6Ot7hc81TQnvNQLR OlxaTUXr44AKWKnSz5ypolfkQ5FQjbqjbK8smEzgZaFCvxw38rgIpkH4HogX8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlq24PQZzJng; Wed, 2 Oct 2024 19:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JrIu9060528; Wed, 2 Oct 2024 19:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JrI5f060525; Wed, 2 Oct 2024 19:53:18 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:53:18 GMT Message-Id: <202410021953.492JrI5f060525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4ce45606add9 - stable/14 - e1000: Handle igb EEE sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ce45606add99d568d5b7ae6354c18a378e29482 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4ce45606add99d568d5b7ae6354c18a378e29482 commit 4ce45606add99d568d5b7ae6354c18a378e29482 Author: Kevin Bowling AuthorDate: 2024-09-24 10:12:40 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:52:02 +0000 e1000: Handle igb EEE sysctl Sponsored by: Blue Box Systems (cherry picked from commit 2e78e568c268e4ba846ab140d9ac6b42886f8ec7) --- sys/dev/e1000/if_em.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 5fb46c9f6dce..d06627bcfda1 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1094,7 +1094,10 @@ em_if_attach_pre(if_ctx_t ctx) " due to SOL/IDER session.\n"); /* Sysctl for setting Energy Efficient Ethernet */ - hw->dev_spec.ich8lan.eee_disable = eee_setting; + if (hw->mac.type < igb_mac_min) + hw->dev_spec.ich8lan.eee_disable = eee_setting; + else + hw->dev_spec._82575.eee_disable = eee_setting; SYSCTL_ADD_PROC(ctx_list, child, OID_AUTO, "eee_control", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, em_sysctl_eee, "I", "Disable Energy Efficient Ethernet"); @@ -4981,11 +4984,17 @@ em_sysctl_eee(SYSCTL_HANDLER_ARGS) struct e1000_softc *sc = (struct e1000_softc *) arg1; int error, value; - value = sc->hw.dev_spec.ich8lan.eee_disable; + if (sc->hw.mac.type < igb_mac_min) + value = sc->hw.dev_spec.ich8lan.eee_disable; + else + value = sc->hw.dev_spec._82575.eee_disable; error = sysctl_handle_int(oidp, &value, 0, req); if (error || req->newptr == NULL) return (error); - sc->hw.dev_spec.ich8lan.eee_disable = (value != 0); + if (sc->hw.mac.type < igb_mac_min) + sc->hw.dev_spec.ich8lan.eee_disable = (value != 0); + else + sc->hw.dev_spec._82575.eee_disable = (value != 0); em_if_init(sc->ctx); return (0); From nobody Wed Oct 2 19:53:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlq44xtVz5Y1dP; Wed, 02 Oct 2024 19:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlq369MGz4Xjy; Wed, 2 Oct 2024 19:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rRNzM4ocTI6OhkbVboczRSeRKa/QI6QxBqx19JuUMM=; b=UuLHEgiI4FVSUpcX526Bf3OxWMKRiAQNZ2qSBiCvtZRnArdceJnPtjTqMq9Vg7sGdRTGEA E5VI5YA3knp6Cir1iRi65NQ0BTWP/nywK5023ZDEcAYaQIXsKKfW49R0+mAd7PsbFS/aB7 aclPeIWZt94kZixXi5VShsfCoaDb0we9AOZi8Tr6e4WZNuB6k0x2234sOTKUoe0+8xpfG3 6zv8FGTzgV4TGjdSitaAmSwtvHFucAeLM24VPbytYgBbgPgk14Zj8M5w2rQTqj3SIyI8CS Fd6zB39/WG7vx2AArkYiO4VQrmVL+xjsaa8mwIhHLb8TbleCeONqfIxJe9PJ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rRNzM4ocTI6OhkbVboczRSeRKa/QI6QxBqx19JuUMM=; b=UiWbVPLEUZ1xBoermaoR9dvnFDMpoaDhuFfoz8cmbcs0ag+rfem2EzHLLCBDR6klGbTefz GqGO8VeSB1zqizIvMU1oUHq9ayXYPAj2S4QfLnP0Fu0vzz+72P95i7h0zMhEe1y2Z5Tu+D Ew07d6I9nOVoorCz7/mZOgZDjENwqscXcJpBinaht79O9QrbxeoYwLGDWUAYa81U+vFvmZ 1tJz1ZbxbOqzhHbnWkc1TwlQ6jr3Iopm0u2GCK4BVnIWq5ynyBi7cRhMF87BrdsY65J5/M /eR5vdgzQMaB6aRYOxeFtkbNgzl5pSoJ1mrH3xRoyGBYS7f9NdnXVxmRtzyNIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898799; a=rsa-sha256; cv=none; b=pk+M8q8RYZIB4B775zkuMXq6hYMyVx9sIQ3Xyy04owdS73FWJdm2OPKxIKO3Kjg3k/G5GR 5taUuOE8PzfFlJV8/a1fTHrQDbszkoirOqOtHh5vAbuboZHDDt817UBr24YkKGedK0sFO3 /APGxFa2/a1tELaS/pzfWRKrEIr77/dgynFsCrLEn7S0BNF7IaeQ0ePt6yALUFM+dXicYR nlPjf8G0gqgZag2llOjNBegN0n4ds6X5o/jwI6jIqce9/j2py+8/Z7RWtotxAp83ZeJAFg qIv20DkFL8/L4mTj5wQPaVOyAh0NvzP/qa3dL0YxVTvmnjFs0atomi0LzSkETA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlq35lMlzJnh; Wed, 2 Oct 2024 19:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JrJh4060576; Wed, 2 Oct 2024 19:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JrJM7060573; Wed, 2 Oct 2024 19:53:19 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:53:19 GMT Message-Id: <202410021953.492JrJM7060573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 262f8dd6143e - stable/14 - e1000: Add sysctl for igb(4) DMA Coalesce List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 262f8dd6143e2cedea055763c5a453dedd449f85 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=262f8dd6143e2cedea055763c5a453dedd449f85 commit 262f8dd6143e2cedea055763c5a453dedd449f85 Author: Kevin Bowling AuthorDate: 2024-09-24 10:25:24 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:52:13 +0000 e1000: Add sysctl for igb(4) DMA Coalesce This feature can increase efficiency at the expense of latency It does not work well with the default interrupt delay, but expose the otherwise unconnected code in the driver in case people want to experiment. See https://www.intel.com/content/dam/support/us/en/documents/network/adapter/pro100/sb/466827_intel_r__dma_coalescing_white_paper_v003.pdf Sponsored by: Blue Box Systems (cherry picked from commit c9021340a3266f924bf721182f14f2d265d8a82c) --- sys/dev/e1000/if_em.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index d06627bcfda1..ad12171487f6 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -354,6 +354,7 @@ static void em_enable_vectors_82574(if_ctx_t); static int em_set_flowcntl(SYSCTL_HANDLER_ARGS); static int em_sysctl_eee(SYSCTL_HANDLER_ARGS); +static int igb_sysctl_dmac(SYSCTL_HANDLER_ARGS); static void em_if_led_func(if_ctx_t, int); static int em_get_regs(SYSCTL_HANDLER_ARGS); @@ -855,6 +856,12 @@ em_if_attach_pre(if_ctx_t ctx) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, em_get_rs, "I", "Dump RS indexes"); + if (hw->mac.type >= e1000_i350) { + SYSCTL_ADD_PROC(ctx_list, child, OID_AUTO, "dmac", + CTLTYPE_INT | CTLFLAG_RW, sc, 0, + igb_sysctl_dmac, "I", "DMA Coalesce"); + } + scctx->isc_tx_nsegments = EM_MAX_SCATTER; scctx->isc_nrxqsets_max = scctx->isc_ntxqsets_max = em_set_num_queues(ctx); if (bootverbose) @@ -4973,6 +4980,55 @@ em_set_flowcntl(SYSCTL_HANDLER_ARGS) return (error); } +/* + * Manage DMA Coalesce: + * Control values: + * 0/1 - off/on + * Legal timer values are: + * 250,500,1000-10000 in thousands + */ +static int +igb_sysctl_dmac(SYSCTL_HANDLER_ARGS) +{ + struct e1000_softc *sc = (struct e1000_softc *) arg1; + int error; + + error = sysctl_handle_int(oidp, &sc->dmac, 0, req); + + if ((error) || (req->newptr == NULL)) + return (error); + + switch (sc->dmac) { + case 0: + /* Disabling */ + break; + case 1: /* Just enable and use default */ + sc->dmac = 1000; + break; + case 250: + case 500: + case 1000: + case 2000: + case 3000: + case 4000: + case 5000: + case 6000: + case 7000: + case 8000: + case 9000: + case 10000: + /* Legal values - allow */ + break; + default: + /* Do nothing, illegal value */ + sc->dmac = 0; + return (EINVAL); + } + /* Reinit the interface */ + em_if_init(sc->ctx); + return (error); +} + /* * Manage Energy Efficient Ethernet: * Control values: From nobody Wed Oct 2 19:53:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlq52qPvz5Y1dS; Wed, 02 Oct 2024 19:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlq46pvXz4Xxl; Wed, 2 Oct 2024 19:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzwSMT1SnOFmckZ+NpcOnPUkNfHnw9WL5HMMmt2ZpRM=; b=h4GT2ChHhN1frCcxIA1eLFnBoeY9xYFgv6My9/WlAOcopWkqGF7J3YxYOE5U2uISkzX0m4 H+jrRg1nODum2Fv6HM1B6tbEhcD+XLzKt0+KjXIGsdwcOn61HT2KTC4zBFjfaEwVN82qmT S2xMzt0sTJc+hSJN2myvXziwZrqrRG8CRe0iLmUYGaYI1mdIUnG/vCAW3xP5k7le01BBzr KxVgBhA1FDd7Avl3OCnVbEmsisN1Z8igmViUcvvmu9cRbAk5xF0iumKpatcP2K6GqxVa0j 6glzXnYuIpXWdwV/OPkt8nzB7P22adeQ4h2gPO3T7gFJ5/dminRR8XDpC7eo6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzwSMT1SnOFmckZ+NpcOnPUkNfHnw9WL5HMMmt2ZpRM=; b=drQ14YgMg7YbXo/kXMSnUTPSuUFK7H15KVCe5XXMcZ9fJNfQQHhJetqU8hTUpSs+nLxf2s w1VVwiTPDuSuebl2JGmWFGX2Ygnejh13aD+NpIpNb5LPYG+PHjVRS9Ijqto2xmeLKqb9fS zuY2Cgxh1aOCjjVxxGNuRyT2vm5GQsiIu1CArjbXUmeFMRMpRn5rokMg8HZfQtWtYAjCU5 9oRKSIJvjjQnjQ973A9Mz8fVEA+y9v3gohw03V9n6sKAdFTOS71uYrh2rI5qPaonopUX4W Y0s0stOWEAU9TPIbK06fy4eJRzjz5CHN+Bax7NcXt2t9UrTP1NYjPbVZcL3vBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898801; a=rsa-sha256; cv=none; b=CJXh8Ym2IQk5tUxdrn8drGSQMU8ulRHb4UOeRSTPVvT9V4mBpp8/sPUQWAuPJcpg9cl0Wp 3NDlC6ObeePpiyebH+r+Y0rTREaSrZDd7UxbuaLf0oXSk+lOpxKALoZPcoiRcCLIu3Ozh0 1m/McwBFdzEBrEOHSkWePjYjFX5d0jgATvZJBBrYOyfxyGNSVe6BQHk4qcSiZ3A/RsmTHP +HbT6SmfnQV1HlgKMVdz9HXHz+Hft8gLQReg5IEmbQydC5gg5QHl9sleXnjbWp6DqwohrH pVHK2XFD5eZjTsVhNPj53b7Z8MLyGngvZ9Hgxc/ypv0XGy4PNFj8FFOYZZIdPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlq46R20zKnd; Wed, 2 Oct 2024 19:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JrKR5060622; Wed, 2 Oct 2024 19:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JrKe6060619; Wed, 2 Oct 2024 19:53:20 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:53:20 GMT Message-Id: <202410021953.492JrKe6060619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e0a44adb80e0 - stable/14 - e1000: Delay safe_pause switch until SI_SUB_CLOCKS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e0a44adb80e00e05649bc064d9014b3fec8d0980 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e0a44adb80e00e05649bc064d9014b3fec8d0980 commit e0a44adb80e00e05649bc064d9014b3fec8d0980 Author: Joyu Liao AuthorDate: 2024-09-25 09:19:13 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:52:27 +0000 e1000: Delay safe_pause switch until SI_SUB_CLOCKS Based on sysinit_sub_id, SI_SUB_CLOCKS is after SI_SUB_CONFIGURE. SI_SUB_CONFIGURE  = 0x3800000,  /* Configure devices */   At this stage, the variable “cold” will be set to 0. SI_SUB_CLOCKS    = 0x4800000,  /* real-time and stat clocks*/ At this stage, the clock configuration will be done, and the real-time clock can be used. In the e1000 driver, if the API safe_pause_* are called between SI_SUB_CONFIGURE and SI_SUB_CLOCKS stages, it will choose the wrong clock source. The API safe_pause_* uses “cold” the value of which is updated in SI_SUB_CONFIGURE, to decide if the real-time clock source is ready. However, the real-time clock is not ready til the SI_SUB_CLOCKS routines are done. Obtained from: Juniper Networks Differential Revision: https://reviews.freebsd.org/D42920 (cherry picked from commit 930a1e6f3d2dd629774f1b48b1acf7ba482ab659) --- sys/dev/e1000/e1000_osdep.c | 10 ++++++++++ sys/dev/e1000/e1000_osdep.h | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/e1000_osdep.c b/sys/dev/e1000/e1000_osdep.c index 8016ee352068..8b598f18cf12 100644 --- a/sys/dev/e1000/e1000_osdep.c +++ b/sys/dev/e1000/e1000_osdep.c @@ -34,6 +34,16 @@ #include "e1000_api.h" +int e1000_use_pause_delay = 0; + +static void +e1000_enable_pause_delay(void *use_pause_delay) +{ + *((int *)use_pause_delay) = 1; +} + +SYSINIT(enable_pause_delay, SI_SUB_CLOCKS, SI_ORDER_ANY, e1000_enable_pause_delay, &e1000_use_pause_delay); + /* * NOTE: the following routines using the e1000 * naming style are provided to the shared diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h index bddb97afd8b9..893979025f01 100644 --- a/sys/dev/e1000/e1000_osdep.h +++ b/sys/dev/e1000/e1000_osdep.h @@ -79,9 +79,11 @@ ms_scale(int x) { } } +extern int e1000_use_pause_delay; + static inline void safe_pause_us(int x) { - if (cold) { + if (!e1000_use_pause_delay) { DELAY(x); } else { pause("e1000_delay", max(1, x/(1000000/hz))); @@ -90,7 +92,7 @@ safe_pause_us(int x) { static inline void safe_pause_ms(int x) { - if (cold) { + if (!e1000_use_pause_delay) { DELAY(x*1000); } else { pause("e1000_delay", ms_scale(x)); From nobody Wed Oct 2 19:53:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlq62Dnzz5Y1Ry; Wed, 02 Oct 2024 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlq612T0z4Xy3; Wed, 2 Oct 2024 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cb7c1P8d5J2Z7j/ye/LscShG0cwctRTToq6jxEEksQI=; b=xynfG5y7jt2wJ8QSqivxJcPP4hMEN9r7pvNdt3e6GIFF/80L/ngoVkehoz/+esSO7NQ/iA O5oM3ITiBTl+1CsvWyWj+z05PVqsY2gUTwLr53pKBS/Q02vv2RCb50OHXeF4dpOmRiMNMf KOnkgLoDnOkefUL4WH9AtPjp6OthYyo8wwDgQwlLbOnDYY+jm9QlOkrIQl5dK2BHFsSaZz mm0ra0euK12OmYNRnkw5evaOPhe73RRo79HBAYWp4AfLlrWqshiewDJ2MVkBLxuLvTCYrg E2E8WlzO7N0GqceaE5szZJtgvfVRHjyaOkly8mHVNFxfH4FXFES+zkRqphJ9EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cb7c1P8d5J2Z7j/ye/LscShG0cwctRTToq6jxEEksQI=; b=yRrY2tVltDQvV+GIoAYUDLqtPty1ZBKn65z+5wgrADoGQqNFu++LBqEPQlLcezqWTAsOt6 oNIkugavBtKwax0K4tfuB/SLRGq68Z41tzJ8HWKCBB3Hnjtz5whoG05xTsJ/Or68Owfvoq l8W19cZRckkdvic6sS6HzGwxSue1HGIANTUgnPz8JkSbQTm5hJ56C5SKLEjkWBcubZUQwA iZOrSqMakkdBG7kInHShwuS9/4LEfLMm9Qmpp5tky30dm0vhLctecnR67QUoRi6LvAmoaI EIUyDoaL9odG8P5JFc9ROqLGmcOk/wWbR5MrYu3ET0TiLP2eVhRC3D4Ldy7ckw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898802; a=rsa-sha256; cv=none; b=M/4+0L/YD5X6JikYxW6+sD7ir+RTs6CxDnK/BSREMcm12NdMwLEsYBnXV/aWUBB7MT1ixF 1+Pn6OhqArrBSuwFSngKfGOo2NftIfQcGPZvMvTdXTkXwc/k6Vri8HwZ9432J8GNCsveYC EZ4iys5tnzedX1s+Hn3a0i/RlkCspR7K+2vod9/uZ8aSNJd1HIp/HutgNeLtuYhigfGbdC +W5cwVkaUTlnNAZ4fu9MumBi+Y13yMAvjdM/QsdsojsqHh2odqbcbDXJJ41kBpSPKcJhCp 6GbyjUtuo+agOzvFNEMdbTCJUAVotz5Sv0uuBPwjv+07Hs79mYFbg/Y03ZWqhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlq60bFxzKHD; Wed, 2 Oct 2024 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JrLlq060665; Wed, 2 Oct 2024 19:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JrLDI060661; Wed, 2 Oct 2024 19:53:21 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:53:21 GMT Message-Id: <202410021953.492JrLDI060661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: d3c81ec4e90d - stable/14 - iflib: Simplify iflib_legacy_setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d3c81ec4e90dfea3d2ecb2dc759f4f104bed0ce1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c81ec4e90dfea3d2ecb2dc759f4f104bed0ce1 commit d3c81ec4e90dfea3d2ecb2dc759f4f104bed0ce1 Author: Krzysztof Galazka AuthorDate: 2024-09-25 20:28:52 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:52:39 +0000 iflib: Simplify iflib_legacy_setup Follow the pattern from iflib_irq_alloc_generic function and use iflib_fast_intr as a handler for RX only interrupts. Also remove some intermediate variables and use consistent way for referencing queue's structures. Signed-off-by: Krzysztof Galazka Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46061 (cherry picked from commit 36a001923836e280e750b76947b8705fcc47b0b7) --- sys/net/iflib.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 8cb0d0610a21..fa6227f3f80a 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -6424,15 +6424,11 @@ iflib_legacy_setup(if_ctx_t ctx, driver_filter_t filter, void *filter_arg, int * device_t dev; struct grouptask *gtask; struct resource *res; - struct taskqgroup *tqg; - void *q; int err, tqrid; bool rx_only; - q = &ctx->ifc_rxqs[0]; - info = &rxq[0].ifr_filter_info; - gtask = &rxq[0].ifr_task; - tqg = qgroup_if_io_tqg; + info = &rxq->ifr_filter_info; + gtask = &rxq->ifr_task; tqrid = *rid; rx_only = (ctx->ifc_sctx->isc_flags & IFLIB_SINGLE_IRQ_RX_ONLY) != 0; @@ -6440,17 +6436,17 @@ iflib_legacy_setup(if_ctx_t ctx, driver_filter_t filter, void *filter_arg, int * info->ifi_filter = filter; info->ifi_filter_arg = filter_arg; info->ifi_task = gtask; - info->ifi_ctx = rx_only ? ctx : q; + info->ifi_ctx = rxq; dev = ctx->ifc_dev; /* We allocate a single interrupt resource */ - err = _iflib_irq_alloc(ctx, irq, tqrid, rx_only ? iflib_fast_intr_ctx : + err = _iflib_irq_alloc(ctx, irq, tqrid, rx_only ? iflib_fast_intr : iflib_fast_intr_rxtx, NULL, info, name); if (err != 0) return (err); - NET_GROUPTASK_INIT(gtask, 0, _task_fn_rx, q); + NET_GROUPTASK_INIT(gtask, 0, _task_fn_rx, rxq); res = irq->ii_res; - taskqgroup_attach(tqg, gtask, q, dev, res, name); + taskqgroup_attach(qgroup_if_io_tqg, gtask, rxq, dev, res, name); GROUPTASK_INIT(&txq->ift_task, 0, _task_fn_tx, txq); taskqgroup_attach(qgroup_if_io_tqg, &txq->ift_task, txq, dev, res, From nobody Wed Oct 2 19:53:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlq738jdz5Y1Ps; Wed, 02 Oct 2024 19:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlq71zgMz4Y1D; Wed, 2 Oct 2024 19:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsmA+nL/XvHXHuIotDlu4bVlKRdA8pzUhfCZ5YNZm/I=; b=iiNqZBb+M9SWDbDLmkEhPGza0jnaYygZ3oIoWD56PU3SKH6EBrYemjzrNVcB+njX7DwZlh 3uf0A5KR/TsCW83Jvgrkd2zNK8Tx6SADehfvZEkJM6PKCogo3dXJa3tm7bcF8GUepzcR+r ZGqQFdh2tWJ7coimfqHBstv6aIRvTXbKpOY5m389mPtfjPjBCDW7MV63MSITpuaNqZksKc rSgiGFzdavTNjS8pdOxLUxw6QUx+UowXIy7vhbzENs9ZPYlnDXwqnpeqLYRM1yajPurasc LUSRz1W9Z9ZHalvr0TnxvUATGLo7Z/WoWjLlW+ZVDSOL/yIaOjZsme0wnONBVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsmA+nL/XvHXHuIotDlu4bVlKRdA8pzUhfCZ5YNZm/I=; b=fuCQxCNJvDhXvHZoo6ar3YPYyDTbQxshZuOGztlKNgjQeNIyKJZOl8nRM+U/oUtq5IjlTZ 0Pozta8HoQ5kQaw/nxa1anlMzB7jqCELqocJqSnBTe/FpGs1GTImm2EzTlLERbQlUsK+uv v8/hPllnqcWjErtBnWm5mkN6hwevcHefNppGuFzKIiUzu0JvcQd+mrV19N95BlkHN76LhH LYQHc2smjvdo8lsdR4ZgTpD7rFlnxRlFElyNP+p1eCt42ZC38SSBkzJFwwPQARcdnZK74W /nQTGuGaVKnY0iZT3JhW9Bpq+X3euI0pFbjKFl/y5GH30xjJ65AVXowgPifrkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898803; a=rsa-sha256; cv=none; b=R4Igkr7gXwdC/j3O/mUlnDW8xsLW3JCeB6v+01UIbnlTP8WPduoODqDkKAr4nhwZ0Mf2eQ BuykpuMU8MaTbRxmlraSc5+aEjsk2OVLBhk5d/5UqO/I6SCFi8WmcX1XEm+KWcl9axG2Bz FpQ1JpKcz/I7lft5sASn3CmgxArm4Y3TONqIKgAdf++n8xkiY48llH8jF361ECuLZScLQJ 4qY7Hi8L3AfnQ2QQfSxCebHb0pFwp/1sRu7gUqy9cUCQSHLhD3TNQpRpaHZ6BIAZ/lqAqO h6axqJ3+iM6OOw4hEIXg2A4UoJ9ek+DYL7labjTIpCHSmFXsrwrqrXI7kfeCuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlq71X41zKWW; Wed, 2 Oct 2024 19:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JrN9a060720; Wed, 2 Oct 2024 19:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JrNhn060717; Wed, 2 Oct 2024 19:53:23 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:53:23 GMT Message-Id: <202410021953.492JrNhn060717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: b3834306579f - stable/14 - pci_iov: Add a device_printf if out of bus numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b3834306579f3a59338f3faed3f588b30a56317e Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b3834306579f3a59338f3faed3f588b30a56317e commit b3834306579f3a59338f3faed3f588b30a56317e Author: Val Packett AuthorDate: 2024-09-25 22:17:16 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:52:53 +0000 pci_iov: Add a device_printf if out of bus numbers Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D20591 (cherry picked from commit 6a4f0c063718781c5e3eddbeff0da7b89d290d1e) --- sys/dev/pci/pci_iov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/pci/pci_iov.c b/sys/dev/pci/pci_iov.c index ff3ac0e64271..60325e8cd491 100644 --- a/sys/dev/pci/pci_iov.c +++ b/sys/dev/pci/pci_iov.c @@ -736,6 +736,7 @@ pci_iov_config(struct cdev *cdev, struct pci_iov_arg *arg) /* We don't yet support allocating extra bus numbers for VFs. */ if (pci_get_bus(dev) != PCI_RID2BUS(last_rid)) { + device_printf(dev, "not enough PCIe bus numbers for VFs\n"); error = ENOSPC; goto out; } From nobody Wed Oct 2 19:54:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlrp2V5Pz5Y1BR; Wed, 02 Oct 2024 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlrp1y9cz4Z1x; Wed, 2 Oct 2024 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+2yUzSZgO15uSDfX3JJBPbPYTEAMsfv3uP0bip2Gy0=; b=oMsqs5V2UnJ+TezWsMjvzxYyJDviXwRFNLoK3NeHuhKZTLhdZd6DKVa55tywgm8LiWM6EF jMCA/QQCmK8xDP03RzovpHMig9XQAMMpFdz5dCtaRqwAioNDZ2RM/uKk4Mr9gqUfhbUMYQ QR9R78pJdfKDwdJsinjBCrxGxbS43x/TrrW3b0FjVOUsFs/AyqVst8EUmt3VW7MclBQFzC Ztzav/qIU4eUnd/YYZGz9jbq9hbLWqecNodgY0ytWWqJsAKGxFg0E6oGs+Fw1b/O3sU/24 lM6ED4ZntetE3vlUKBT9t8OfrqSJg+/hTmK5nzbx3zkldJY4NfHhNPMSKz2ysg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+2yUzSZgO15uSDfX3JJBPbPYTEAMsfv3uP0bip2Gy0=; b=yeMgwYXiDG2bVy+v5QA4UJlAUyUtWRuSAhCMSOwKjo6s/eCYDL3yLgLDMAvkD46crC+2kq NaQEYoYAFSLbZBZwac7XS324uq5ppPXdnX22lq/yYmJRtfH587eaI9wR7ph/IiTq97Owdz Y2t/rcqHBF659CU2xrO70GQQoP+YY6pMpxa4plNjRBuPA1ksIJmNKDwKGDfr6WW8w0He1u s+F+pToSkDU9RolE7e1LZLmEkOmj0oY4MXpfGRiOJZqQhpRDwSJ2tPz7j0ygunUp1YEHCj E+IZ5saR5m8kYCQ9OaWSZsIxARL78G+Cvme36vcv8fTWtvoaslLBRR6t7FP+UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898890; a=rsa-sha256; cv=none; b=WN8O3cbYRZYxi5BY9YAeffiTv8QFiEqgbF4lXKORqMg+Hfi3AC5TANvAb61k7vcnxE/9Lf P6mEZp8bh2vRySe22q+HPitYI93wTX+kkNWQeI4s1ArmpvjYFctkWKQ5JFglyiLMDVDkzQ I72MSCxFANoYHnGGhAYX4qKYSyi62JnjDgKsq7XzN/9JzvoPzbQyHKVa/pXkNlPMSFkzyZ do4bfXSyOXm96mZ5S7VaoRGn5F3U0ys61kOIWa8y24EnQjvKU4tvADXN2nab+aut3q4H2J cySe7kuakhPcNGCtSQGTmLcgK9i5X+X5/U8ngjTC0FPFeRMP/OdrrH8orazH6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlrp1PWJzJnj; Wed, 2 Oct 2024 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Jsow2061142; Wed, 2 Oct 2024 19:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Jso4D061139; Wed, 2 Oct 2024 19:54:50 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:54:50 GMT Message-Id: <202410021954.492Jso4D061139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e86189c62b22 - stable/13 - e1000: Add sysctls for some missing MAC stats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e86189c62b22e7ec2bde6ea2cdbc4e356307cbc2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e86189c62b22e7ec2bde6ea2cdbc4e356307cbc2 commit e86189c62b22e7ec2bde6ea2cdbc4e356307cbc2 Author: Kevin Bowling AuthorDate: 2024-09-24 09:39:33 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:54:34 +0000 e1000: Add sysctls for some missing MAC stats Sponsored by: Blue Box Systems (cherry picked from commit aa7d086ad94642fa40375db9976177fc9e54a2cf) --- sys/dev/e1000/if_em.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index bf612d465ef0..97b298d2ec6f 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4306,6 +4306,10 @@ em_update_stats_counters(struct e1000_softc *sc) sc->stats.roc += E1000_READ_REG(&sc->hw, E1000_ROC); sc->stats.rjc += E1000_READ_REG(&sc->hw, E1000_RJC); + sc->stats.mgprc += E1000_READ_REG(&sc->hw, E1000_MGTPRC); + sc->stats.mgpdc += E1000_READ_REG(&sc->hw, E1000_MGTPDC); + sc->stats.mgptc += E1000_READ_REG(&sc->hw, E1000_MGTPTC); + sc->stats.tor += E1000_READ_REG(&sc->hw, E1000_TORH); sc->stats.tot += E1000_READ_REG(&sc->hw, E1000_TOTH); @@ -4522,6 +4526,9 @@ em_add_hw_stats(struct e1000_softc *sc) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "missed_packets", CTLFLAG_RD, &sc->stats.mpc, "Missed Packets"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_length_errors", + CTLFLAG_RD, &sc->stats.rlec, + "Receive Length Errors"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_no_buff", CTLFLAG_RD, &sc->stats.rnbc, "Receive No Buffers"); @@ -4562,6 +4569,18 @@ em_add_hw_stats(struct e1000_softc *sc) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "xoff_txd", CTLFLAG_RD, &sc->stats.xofftxc, "XOFF Transmitted"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "unsupported_fc_recvd", + CTLFLAG_RD, &sc->stats.fcruc, + "Unsupported Flow Control Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_recvd", + CTLFLAG_RD, &sc->stats.mgprc, + "Management Packets Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_drop", + CTLFLAG_RD, &sc->stats.mgpdc, + "Management Packets Dropped"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_txd", + CTLFLAG_RD, &sc->stats.mgptc, + "Management Packets Transmitted"); /* Packet Reception Stats */ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_recvd", From nobody Wed Oct 2 19:55:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlt74LNXz5Y1NZ; Wed, 02 Oct 2024 19:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlt73mD1z4ZZK; Wed, 2 Oct 2024 19:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iFFAYWFaQcLkSAMlPbSWfu9yirTlCaku1NBhNQTh9O0=; b=rXrRSKpG4FsyHgQKhA5d/8ffzK8haOqsuJxF8Vh27QMDCoew7eiL5VfIq70l74Xc9Z52r2 UEX0zelUKWwspEx88nD6kwZBeD1iyZq2saZsKOw9Y3ka4V1ZT1Me2DwN+oCLpwNcm3K35h bq93/d88OhwsxIvT8BEqupGRFXHJGJ+JQzZT4hKRgT2aTop7sjeT2yXw10b0qQQahReXy+ /INMiSqUKY3FBAzjcu4rMKQ4IeAB1shOahdG4Nhdch8fqfzjNqzYaB5yKGP3aqbe/2DEsV qTBUSuLTucmYlg7kOdKNmxJj2aTlypDuQG2hyLheBScyFfgBVuJ9gOXAsdZasg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iFFAYWFaQcLkSAMlPbSWfu9yirTlCaku1NBhNQTh9O0=; b=DFAxpc4x98MvAjy7EDdW5LLY5+sJ/JdSHFTQ5kjKFE6+rhlPYpz1E7i2oFo/rD3Q8XKS5Q pgDhZcoSEbkOyQ824oCbJRCrDkDQkaGHki1OCdhGHwaxjfDhbYojV4Hnrwq3MLaiGfsdXj VJxo1R302L30G0ud68c21wdPlveS2m0cl3AMEZpDUM9WArqCzEOZuiTYY280Xfi7SvrA/n lqaRmlJ18yPwg+KsQyZTpcQ0q4dGC6N1diuX2gKynZLdZmB2rWlc1BSi6b2SD8qNzcVeRw foK4zZGru1q9xeawDvRJYcmERqwKt4pS88zV3iOUqBuZjNQBW1HYXuks60wfEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898959; a=rsa-sha256; cv=none; b=b/gQAVv29riFH4yF22KyyT/Po3XHLi6wSn9nwIAUCdcOQlTErYa+HDvCmJv5zIGP8xrALU hdtK3eXnbib3mxUCatYejOIccQAc2TEeskq1DNOYb5xJMu0sG4LBMLlJYQffBHFcn+iyUI kg8+hvakOfnYK2Ll6kqk7nnn8Yr6hvIhJ4hTw2L9k32nkPCJ6W7HW8fqMUv+370PHHn9bC /7zuvDCLuVq11ATEtPdTi6j/TPeK5+XeXy0WE1ia3yckNjZgccl2wKU/AH3OtIaFTtwKln EfB/5G5Q7z3oCEHok9dmqoTfvHq0NSTEdkEtavPLwrzPCat9rs8DGpjAHH8ywA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlt73GfQzKTP; Wed, 2 Oct 2024 19:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492JtxFK061461; Wed, 2 Oct 2024 19:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492JtxAe061458; Wed, 2 Oct 2024 19:55:59 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:55:59 GMT Message-Id: <202410021955.492JtxAe061458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 999b6a9818ef - stable/13 - e1000: Handle igb EEE sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 999b6a9818ef872278fa12b92bd738e3ebfbe7de Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=999b6a9818ef872278fa12b92bd738e3ebfbe7de commit 999b6a9818ef872278fa12b92bd738e3ebfbe7de Author: Kevin Bowling AuthorDate: 2024-09-24 10:12:40 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:55:01 +0000 e1000: Handle igb EEE sysctl Sponsored by: Blue Box Systems (cherry picked from commit 2e78e568c268e4ba846ab140d9ac6b42886f8ec7) --- sys/dev/e1000/if_em.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 97b298d2ec6f..c328d03dca83 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1096,7 +1096,10 @@ em_if_attach_pre(if_ctx_t ctx) " due to SOL/IDER session.\n"); /* Sysctl for setting Energy Efficient Ethernet */ - hw->dev_spec.ich8lan.eee_disable = eee_setting; + if (hw->mac.type < igb_mac_min) + hw->dev_spec.ich8lan.eee_disable = eee_setting; + else + hw->dev_spec._82575.eee_disable = eee_setting; SYSCTL_ADD_PROC(ctx_list, child, OID_AUTO, "eee_control", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, em_sysctl_eee, "I", "Disable Energy Efficient Ethernet"); @@ -4983,11 +4986,17 @@ em_sysctl_eee(SYSCTL_HANDLER_ARGS) struct e1000_softc *sc = (struct e1000_softc *) arg1; int error, value; - value = sc->hw.dev_spec.ich8lan.eee_disable; + if (sc->hw.mac.type < igb_mac_min) + value = sc->hw.dev_spec.ich8lan.eee_disable; + else + value = sc->hw.dev_spec._82575.eee_disable; error = sysctl_handle_int(oidp, &value, 0, req); if (error || req->newptr == NULL) return (error); - sc->hw.dev_spec.ich8lan.eee_disable = (value != 0); + if (sc->hw.mac.type < igb_mac_min) + sc->hw.dev_spec.ich8lan.eee_disable = (value != 0); + else + sc->hw.dev_spec._82575.eee_disable = (value != 0); em_if_init(sc->ctx); return (0); From nobody Wed Oct 2 19:56:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJlt859l7z5Y1YW; Wed, 02 Oct 2024 19:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlt84c21z4ZTn; Wed, 2 Oct 2024 19:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JpHopi0as5pl8d4+RmePhiq519uSKuVUaIagrgudd2s=; b=XwaHRoCzEV2RugoZ6Lz4qp+PqABFzbmakJDfHcXcVAtGqM4W8e/ix91vSslCn2C650GQlN kDAgME1Uu7zBHmufqvbBn5OBicjwGjI/k/gp2pXquqULVReaA4ZncVHM5hZnWh7fR4yv3a ATVElaGYQX/Of7WVkU094rNmQIq4obGnArbp5afCiNsDvoBXipeNpoJ14lqCAVI7rNxpZ8 y15aJ3EtO2WDzzmLoYBPpv+T+khU+huCKmXHwYDPpebo/J9QChPSWTAyp/g799Ux+YcbQ8 Yo4B6aIe1J1Xal9Xp22anZ4iQ2aXQeL9UQJxJcjf0mILP82cVegfVsvsne6O9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JpHopi0as5pl8d4+RmePhiq519uSKuVUaIagrgudd2s=; b=nFW2Fi1joXEh6sZOQ9b64S8Lh16VPSc1MRJuyH1iGXZTY7Ja51m2JMnlFuZhadytjzMjpl KR4Ij0Pf1K1dlOVKFTFhIBcTYDT2v6FVQl6BtbyGoCbG4TeWUBCs1m7bKWYVOW3oGH125q pVly4PbSRk3BY6AmmbQGItCKH1KGujtEnazwrzONObUQUe8phC7e0MqhCySfjnU3+NebUv L811HngDDDGSFb++PuJKpTX1FlqSuEJhbpyrNUEaNLV8RdhcRAbBWZn+0Vax3oMpOk+gEC yRVtwHhybr1Kb8yonk4Vt98vO4wMYfkMkkRY/auhIxL9rOQl1eGHYZh4SDvK7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898960; a=rsa-sha256; cv=none; b=j1M+MYDdaJONUcbNhchPAf1ID2duG8jFv7nKomODmP6d6JQJi3Y7tKM/MdaWe6/mWFZW2G ulSPKbC1UrGbzwVj6pSF6UNq5mr6m6fTiVZBPH4xb4t9p9v3h7blLprRBkj8yxjY08i7yd wrgVl7GrIOXOmtsdJu0G4YwRFSbfaxIzZ2yyETzDCjgtDXDuLGL2pMKPrYGnOatw0PyQVf GcaQJtj463aHJcJJeus+J+VMGGakiksicRbAeVQXbFDHC1/kvB4xZ4CfZmI86laaNFEw8j Laq2cQafoR3NO3L8V484zEyCfEjYzbXaOBd1eJUPjMeYeKP1ceVCnKgSzZMVcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlt84CKLzKHF; Wed, 2 Oct 2024 19:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ju09S061527; Wed, 2 Oct 2024 19:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ju0Nr061524; Wed, 2 Oct 2024 19:56:00 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:56:00 GMT Message-Id: <202410021956.492Ju0Nr061524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 8688a242b515 - stable/13 - e1000: Add sysctl for igb(4) DMA Coalesce List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8688a242b51535c0860e06a98ca00bd94fc95254 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=8688a242b51535c0860e06a98ca00bd94fc95254 commit 8688a242b51535c0860e06a98ca00bd94fc95254 Author: Kevin Bowling AuthorDate: 2024-09-24 10:25:24 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:55:12 +0000 e1000: Add sysctl for igb(4) DMA Coalesce This feature can increase efficiency at the expense of latency It does not work well with the default interrupt delay, but expose the otherwise unconnected code in the driver in case people want to experiment. See https://www.intel.com/content/dam/support/us/en/documents/network/adapter/pro100/sb/466827_intel_r__dma_coalescing_white_paper_v003.pdf Sponsored by: Blue Box Systems (cherry picked from commit c9021340a3266f924bf721182f14f2d265d8a82c) --- sys/dev/e1000/if_em.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index c328d03dca83..6d9eedae3df4 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -354,6 +354,7 @@ static void em_enable_vectors_82574(if_ctx_t); static int em_set_flowcntl(SYSCTL_HANDLER_ARGS); static int em_sysctl_eee(SYSCTL_HANDLER_ARGS); +static int igb_sysctl_dmac(SYSCTL_HANDLER_ARGS); static void em_if_led_func(if_ctx_t, int); static int em_get_regs(SYSCTL_HANDLER_ARGS); @@ -857,6 +858,12 @@ em_if_attach_pre(if_ctx_t ctx) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, em_get_rs, "I", "Dump RS indexes"); + if (hw->mac.type >= e1000_i350) { + SYSCTL_ADD_PROC(ctx_list, child, OID_AUTO, "dmac", + CTLTYPE_INT | CTLFLAG_RW, sc, 0, + igb_sysctl_dmac, "I", "DMA Coalesce"); + } + scctx->isc_tx_nsegments = EM_MAX_SCATTER; scctx->isc_nrxqsets_max = scctx->isc_ntxqsets_max = em_set_num_queues(ctx); if (bootverbose) @@ -4975,6 +4982,55 @@ em_set_flowcntl(SYSCTL_HANDLER_ARGS) return (error); } +/* + * Manage DMA Coalesce: + * Control values: + * 0/1 - off/on + * Legal timer values are: + * 250,500,1000-10000 in thousands + */ +static int +igb_sysctl_dmac(SYSCTL_HANDLER_ARGS) +{ + struct e1000_softc *sc = (struct e1000_softc *) arg1; + int error; + + error = sysctl_handle_int(oidp, &sc->dmac, 0, req); + + if ((error) || (req->newptr == NULL)) + return (error); + + switch (sc->dmac) { + case 0: + /* Disabling */ + break; + case 1: /* Just enable and use default */ + sc->dmac = 1000; + break; + case 250: + case 500: + case 1000: + case 2000: + case 3000: + case 4000: + case 5000: + case 6000: + case 7000: + case 8000: + case 9000: + case 10000: + /* Legal values - allow */ + break; + default: + /* Do nothing, illegal value */ + sc->dmac = 0; + return (EINVAL); + } + /* Reinit the interface */ + em_if_init(sc->ctx); + return (error); +} + /* * Manage Energy Efficient Ethernet: * Control values: From nobody Wed Oct 2 19:56:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJltB0M2Sz5Y1Bd; Wed, 02 Oct 2024 19:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJlt968q4z4ZZd; Wed, 2 Oct 2024 19: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=1727898961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LX2wJHmvKpRNU7Osoi4YEk74szlAd/R9w2Um6AYRFk=; b=tR9MCd8Fwc5B72Yi6mT/b+qMJuGi53LbhQD4BGmv2/WVnB3ikaJOz/a65QeBQLUFf/ClUq IcOlbLBn2SL1vwrs0COENLAmBfYT1qbuzvfLerp6IB3Zyym8EW8H8E86I7eMY6xFKVHiIg qdIekBreNXbBNZ1Ip6xM4Gf6C32gvFGCtdastgjxCnH024I50df4ViT/4SfpysYMmAJeIA zApassZ3J5O2IlaJ4mQ/az4985BtETaDgQ0tSUyD/9kATBzybM32+99oJNbZjxC7WzfiTq kTJL5309jI1+juRWZRFOZlQSQB2N8125AQO2CQzC38Rg3Hs0T0svxRXveLCDVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LX2wJHmvKpRNU7Osoi4YEk74szlAd/R9w2Um6AYRFk=; b=A2lKZVa0stuMwg2Ybw3tbCjRpfF6V2Ef8VgBZ/b+SgePCATJHyTydq+rSQRZ1I6VUmtpFA rExExWjzDStQXgPgKSqpTlBAQ7tF79yDClJUempmY3vuAXl0Sq3WtA+gL9ijnZINC/LuPB ymC2OaZdTjczDS9pakOTyk9LR+klP2btOOuk17XHWVwZDuaIkhptvC/ZP0w5Jgd2QYpyLj ZOIed6JcgbioaLuZXxmjVzJZYuwDL2xU3aTVO8KCKtQ5g90hyFGVNyli8e+Hi5EKaolvHu 2Dwn6zSfFZlr0Z+SrWSEssrujTdmO5zxqd6HEG667CFEgq6uUQcXYJ+GkloCqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898961; a=rsa-sha256; cv=none; b=xqutvpGZL/Nw6b/VOthKSc4fTOS6qAbP5MeR5Gu37kO/xL4mRZQ4yRnrPY3T0nwswocIBt iELvv7lxpX2xbLBZDi+qOSOW+VpKP4N+nA5Ov4rYeL7kESbZU/6Ge0tsUTKO7qWFJzvsHJ AFzkiFkijF2lyJNtM0M/DB827bbf+eRPR/REa9umsSuyQEQtrLvgq3WvVqL1OE5Dr08xxm /V5dEtP/vj0PUNkoFGHtV++0FQmYJNkNG3P3KILxISv7p5BD8gxvR9qKwJMiT29wOzNI4V 77XX5L+QLkUdCeEzJUnFUnEJ/3J/VluV9til1aCdrx84xg3U9hBvEpp9peLV5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJlt95BrGzKTQ; Wed, 2 Oct 2024 19:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ju1Pf061572; Wed, 2 Oct 2024 19:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ju1UG061569; Wed, 2 Oct 2024 19:56:01 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:56:01 GMT Message-Id: <202410021956.492Ju1UG061569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2e3489289853 - stable/13 - e1000: Delay safe_pause switch until SI_SUB_CLOCKS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e3489289853557277c29fce1a9816918cba576e Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2e3489289853557277c29fce1a9816918cba576e commit 2e3489289853557277c29fce1a9816918cba576e Author: Joyu Liao AuthorDate: 2024-09-25 09:19:13 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:55:23 +0000 e1000: Delay safe_pause switch until SI_SUB_CLOCKS Based on sysinit_sub_id, SI_SUB_CLOCKS is after SI_SUB_CONFIGURE. SI_SUB_CONFIGURE  = 0x3800000,  /* Configure devices */   At this stage, the variable “cold” will be set to 0. SI_SUB_CLOCKS    = 0x4800000,  /* real-time and stat clocks*/ At this stage, the clock configuration will be done, and the real-time clock can be used. In the e1000 driver, if the API safe_pause_* are called between SI_SUB_CONFIGURE and SI_SUB_CLOCKS stages, it will choose the wrong clock source. The API safe_pause_* uses “cold” the value of which is updated in SI_SUB_CONFIGURE, to decide if the real-time clock source is ready. However, the real-time clock is not ready til the SI_SUB_CLOCKS routines are done. Obtained from: Juniper Networks Differential Revision: https://reviews.freebsd.org/D42920 (cherry picked from commit 930a1e6f3d2dd629774f1b48b1acf7ba482ab659) --- sys/dev/e1000/e1000_osdep.c | 10 ++++++++++ sys/dev/e1000/e1000_osdep.h | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/e1000_osdep.c b/sys/dev/e1000/e1000_osdep.c index 8016ee352068..8b598f18cf12 100644 --- a/sys/dev/e1000/e1000_osdep.c +++ b/sys/dev/e1000/e1000_osdep.c @@ -34,6 +34,16 @@ #include "e1000_api.h" +int e1000_use_pause_delay = 0; + +static void +e1000_enable_pause_delay(void *use_pause_delay) +{ + *((int *)use_pause_delay) = 1; +} + +SYSINIT(enable_pause_delay, SI_SUB_CLOCKS, SI_ORDER_ANY, e1000_enable_pause_delay, &e1000_use_pause_delay); + /* * NOTE: the following routines using the e1000 * naming style are provided to the shared diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h index 2af2746dfadf..a64344a24998 100644 --- a/sys/dev/e1000/e1000_osdep.h +++ b/sys/dev/e1000/e1000_osdep.h @@ -79,9 +79,11 @@ ms_scale(int x) { } } +extern int e1000_use_pause_delay; + static inline void safe_pause_us(int x) { - if (cold) { + if (!e1000_use_pause_delay) { DELAY(x); } else { pause("e1000_delay", max(1, x/(1000000/hz))); @@ -90,7 +92,7 @@ safe_pause_us(int x) { static inline void safe_pause_ms(int x) { - if (cold) { + if (!e1000_use_pause_delay) { DELAY(x*1000); } else { pause("e1000_delay", ms_scale(x)); From nobody Wed Oct 2 19:56:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJltC2GvZz5Y1bh; Wed, 02 Oct 2024 19:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJltB6g2Dz4ZYW; Wed, 2 Oct 2024 19:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVNROi03aguIIdU9Rh/DUU0IyEUzGK+0QmA4gUx96SA=; b=hNKQifwDorel39fJiVZpHCdx+23RLU2UmYAcX7mT+ihYPqtnQwzJuDkS4WTY0rCh9H8g0I S06BGjP2cKjGnu+S6tTF3e41xfmb20QVODx7pp7ozaWc1fUJgHw6uvNXcpm/Kooy0CIXHV IthkRTiMoWu199XDPOhGc5tk1BbMzvvTUpl4+RILSqkoFOjTqO/0Na+pCCLSKx/FF1aJ7T TvdEKgOQ/+jbspW86TH0diQ39/Ngk3UIgdvC51r/eq9ojFrUw+Eg97BkoqNRXWaaynG8IB Tf/2Ds+ATGyr7+09JOoUin9QJsxJ/9udFmpuyAkBhNuCr+TtpDux2IXiOwokeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVNROi03aguIIdU9Rh/DUU0IyEUzGK+0QmA4gUx96SA=; b=inGa1rJxL4+D9p4N8MmumKVSMxkJLpkK16Dsy9067E0bimjxb2MOwK+oRc1lLshFe3uMIZ Ai/qOojAaW24S/YrR8PlI2tF7KPofcYXNW1hx6BU4/mLZ/g4hx3K7XZ816IGZt1Q5hO9u3 VaOiMcKhYQiDjzsmohyWDeaS+tBFLTD/pjSLy4flIvl325dbGUPLkSY62ppPLcctynCVUL sPHdQaLTkvwzW+MJd0IRQJaoT7VPZZXC+TP9YLnkC21yk0gsPhZqpbom+Gy549nk64FCEE xxU3RphgNDcaPi92BFsggY5tEeu//S6aFB3P1EPnKd43q9FXcMvQo5ah62NtdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898963; a=rsa-sha256; cv=none; b=GIxsQIZAZB74+YcvAHgIgDTBxZ6c9iQHlQolj2iu++foN9o5cDlD3hTViOo3d8B+p8EJg9 v2Iwf8FZYC7au2nBMaKCnQAsxbrdQ526ms17zamKDZwzM/b7BAW3/hUsgK0YH4/Cstg3W2 ubzGHm/h/jGPt+Te3/PgRqKSIdBM1ziGbXL/yHvVinA+kcLKkc0ZpFMhRm58nSghbkWuXL kVA45X7yE/4I/fvGk2zf7Ko7cKpqsZA82ledjutn5ERmS6yIFb5MErUQk7LzLFksG6OE02 nB0CHFzXASDsS+xqbmMJi/Su3eHYd8tla4Lt3VNKRvSy/BFcPel7vuda3dMOXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJltB6Cw4zKYd; Wed, 2 Oct 2024 19:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ju2in061612; Wed, 2 Oct 2024 19:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ju2cl061609; Wed, 2 Oct 2024 19:56:02 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:56:02 GMT Message-Id: <202410021956.492Ju2cl061609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: fa0f7eefb92b - stable/13 - iflib: Simplify iflib_legacy_setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fa0f7eefb92b01fc55358b59f2d65581edfa07bf Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fa0f7eefb92b01fc55358b59f2d65581edfa07bf commit fa0f7eefb92b01fc55358b59f2d65581edfa07bf Author: Krzysztof Galazka AuthorDate: 2024-09-25 20:28:52 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:55:36 +0000 iflib: Simplify iflib_legacy_setup Follow the pattern from iflib_irq_alloc_generic function and use iflib_fast_intr as a handler for RX only interrupts. Also remove some intermediate variables and use consistent way for referencing queue's structures. Signed-off-by: Krzysztof Galazka Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46061 (cherry picked from commit 36a001923836e280e750b76947b8705fcc47b0b7) --- sys/net/iflib.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 252fb3b529ed..6f91c0c7f2d8 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -6652,15 +6652,11 @@ iflib_legacy_setup(if_ctx_t ctx, driver_filter_t filter, void *filter_arg, int * device_t dev; struct grouptask *gtask; struct resource *res; - struct taskqgroup *tqg; - void *q; int err, tqrid; bool rx_only; - q = &ctx->ifc_rxqs[0]; - info = &rxq[0].ifr_filter_info; - gtask = &rxq[0].ifr_task; - tqg = qgroup_if_io_tqg; + info = &rxq->ifr_filter_info; + gtask = &rxq->ifr_task; tqrid = *rid; rx_only = (ctx->ifc_sctx->isc_flags & IFLIB_SINGLE_IRQ_RX_ONLY) != 0; @@ -6668,17 +6664,17 @@ iflib_legacy_setup(if_ctx_t ctx, driver_filter_t filter, void *filter_arg, int * info->ifi_filter = filter; info->ifi_filter_arg = filter_arg; info->ifi_task = gtask; - info->ifi_ctx = rx_only ? ctx : q; + info->ifi_ctx = rxq; dev = ctx->ifc_dev; /* We allocate a single interrupt resource */ - err = _iflib_irq_alloc(ctx, irq, tqrid, rx_only ? iflib_fast_intr_ctx : + err = _iflib_irq_alloc(ctx, irq, tqrid, rx_only ? iflib_fast_intr : iflib_fast_intr_rxtx, NULL, info, name); if (err != 0) return (err); - NET_GROUPTASK_INIT(gtask, 0, _task_fn_rx, q); + NET_GROUPTASK_INIT(gtask, 0, _task_fn_rx, rxq); res = irq->ii_res; - taskqgroup_attach(tqg, gtask, q, dev, res, name); + taskqgroup_attach(qgroup_if_io_tqg, gtask, rxq, dev, res, name); GROUPTASK_INIT(&txq->ift_task, 0, _task_fn_tx, txq); taskqgroup_attach(qgroup_if_io_tqg, &txq->ift_task, txq, dev, res, From nobody Wed Oct 2 19:56:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJltD2g3cz5Y1Bf; Wed, 02 Oct 2024 19:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJltD0VMWz4ZKG; Wed, 2 Oct 2024 19:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E6N46ssnz8pdTNgmow0iuCgS2l/boXmhX3JvjJBOUSM=; b=fLBodcMEP5aAqX42BqdcwyWPEeu/N1c937EdSDQVku9ZeXyhPIQDzZYWyGusOKfV/ROa3d yoDQYV/7v11dqgitWpzkyCvfZAkNor+7q5hVQFeA2Mz0BHBB28ANrh+DB4e5/VawZlx6XJ 5u3+2SLZXA4Lh13m3JWH7a9Nr4PVq6m3U+PW1PPxqJrjS5T/s+l0zpZOTv5mks4n2hSABu 53lqHqeG2T4P7EaAKymWy2hv8XfUwTi7yH+/pIca6ivZKsc7C2mqejNVshZvhg1r1LYY1W LdvvxryUZs/qgTFYtKBp3xQwZklnmyUSfw2h9/FlL+K/ygvbN9AE9XsW2nr7kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E6N46ssnz8pdTNgmow0iuCgS2l/boXmhX3JvjJBOUSM=; b=iKmTIUN/yV/m2y6waN4a+aoy67D6wDQlcGTH/MrALJ7PgVXureZPsZavCn5US/Qq1KkxId H26Ull6Uuv+Juv1m63LFzOH8AyIyQ964RDKsUvXR/+paCwLtw6cPPst+S/9mpzVCA2PiK2 n4gXjfeSE6DB34Oe2i5GvRiy9c3gXpjmtPBUH/eSj5lEqD29B17Ug8WWmc/KNOoy/D6VqD BMydjjtMjkx9FbDkZyiHgXSEHWstGvre8701fCLOkOmsCmrSFxj++zeN2ut9xa+OYfb9xH Q66N9mrXmeKGMmUBKL3E3d0UXUudiHFJ6ju7gGuHvUoShu8AI43oQLdYWj12fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898964; a=rsa-sha256; cv=none; b=dgavAQBob04MnLWQV1F2bGcfVhyZZ+SardxGhC8rVWxrRwFPnahZ+yQHzC9XaxC+gdzTM1 QcmehyGFza0Ws9CVoiEiKmBcH87o8AtW9CBc264pHZ695RM9Cl5+Xuh31b/iXXaRu/MVnc AQ6I98k9gSqt6catGorNaDGblJy7d8e0wp7fINNy0ac0n8vJ1LmazK5rFDOpBJRo6ea7d1 u3IomCIssF8S791iaoCrf+2M+E9DKLXH6ILseUt7h07UuCPqX9zB6OZJ0dgpNrtR4XlLh6 B7bz3OOtYA1O/mMDJ2vzxFTVpuE9B4o2LsZ90/TBloBRnsZepkOCliwQo2ierg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJltD06wRzKTR; Wed, 2 Oct 2024 19:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ju38I061669; Wed, 2 Oct 2024 19:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ju30F061666; Wed, 2 Oct 2024 19:56:03 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:56:03 GMT Message-Id: <202410021956.492Ju30F061666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 37bea3b062ea - stable/13 - pci_iov: Add a device_printf if out of bus numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37bea3b062eaeff8c015d628981ab97cc9c90e56 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=37bea3b062eaeff8c015d628981ab97cc9c90e56 commit 37bea3b062eaeff8c015d628981ab97cc9c90e56 Author: Val Packett AuthorDate: 2024-09-25 22:17:16 +0000 Commit: Kevin Bowling CommitDate: 2024-10-02 19:55:48 +0000 pci_iov: Add a device_printf if out of bus numbers Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D20591 (cherry picked from commit 6a4f0c063718781c5e3eddbeff0da7b89d290d1e) --- sys/dev/pci/pci_iov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/pci/pci_iov.c b/sys/dev/pci/pci_iov.c index db7210cb729a..90e4e8e5d0b7 100644 --- a/sys/dev/pci/pci_iov.c +++ b/sys/dev/pci/pci_iov.c @@ -732,6 +732,7 @@ pci_iov_config(struct cdev *cdev, struct pci_iov_arg *arg) /* We don't yet support allocating extra bus numbers for VFs. */ if (pci_get_bus(dev) != PCI_RID2BUS(last_rid)) { + device_printf(dev, "not enough PCIe bus numbers for VFs\n"); error = ENOSPC; goto out; } From nobody Wed Oct 2 19:56:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJltG60Hcz5Y1WM; Wed, 02 Oct 2024 19:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJltG566Wz4Zf1; Wed, 2 Oct 2024 19:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7sDbrDTgOjnaorHEajMKFkOex2h+ccfDGWbioDvu30s=; b=Xx1RzhJaxWtPnKM56JmtUfW7/v/ipXqQ+quyK23PSx7oSbgxnMlyiLeTGpMXyc7YXih9O8 lG0fmC6ir33i3XLfSoeEoSF8Oggd8YSo8PMhfEKQMUnq4Rga8+r7s9BIlIipNeZ1acipef xbD/9Ug7Qz2j2kOANXW7wRCTiTFTkdgNY7jVLIg1CQCup2rURyz9nObFNk1ByZmZiP0G+U vCk+/1eeGhpni7v1+bEJr2ANDfVKPl087NJSw00A/zD27jeDITLOSRfNhEngs8VKwS63RE yQzagrJ7btm1gl4kLKEAT5KODJpcayvzY5uvVyeyrZb50Rl5Syw9wopFmZZEJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727898966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7sDbrDTgOjnaorHEajMKFkOex2h+ccfDGWbioDvu30s=; b=IgpRJWUOdPyrdur/Jv8Cmn//9T+h7hvTe++CTNmw+mEVcoqCdpu2p4W3lvVy/lOA1I1uNT YolXqffNfnxsMI8sblqlNi6CMfyFtN0WRKQpsG/RgABdjoWJLmC4+9VbpDDqbRyvZ8Gn+E a3YTcCg6Vk48elyenY5TdrA/+yzI5GqVjlnkcpf10fBWLvCKITbjn9peNR3jVI5Ru2F9sA iyiSgVs5OMUL7Ld5aY5BzeAIRfYAiJYyu0uXr+bv1C0MpkVY1iOyyTdHiQrJYQ7t05BW+r XWNbM5Jwu8cfpzi3DCmrVJXQ5yeORXwBSLgR8ojcW3fpNwu4LhdJurZLi/VkbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727898966; a=rsa-sha256; cv=none; b=sx0rUllO1468XCuTN+y+JVHGNxE9yNm4HvYHyVuxdzl+2dhObVaeW4NmNrCNw4f8ftQb1V f9MW7KjmTMbNxBNGsQp95Z4GsXp8lldCKaU+TcPnuUyhTocdv8/EAavvmAej6IGqUBfNUK bC815x+w82wTQuL6fkRtOeuit9neriuLNKiJUVf+CpEiG5DJHX/NxS64O36EtNIlZcV1Po HgQEaZwIlK/cJCOpubewL/5PE8mBIphTmD7CHCSDB03i7JQWH+TF81JgG4YuJs/XYlqjlR tyIcIrc2xRfytI4yvddkXtyEJYgD4hp1xm+xjM0hzTUCFMuduJIR9+x3xR7rdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJltG4HRFzKcG; Wed, 2 Oct 2024 19:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492Ju6W3061833; Wed, 2 Oct 2024 19:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ju6Yh061830; Wed, 2 Oct 2024 19:56:06 GMT (envelope-from git) Date: Wed, 2 Oct 2024 19:56:06 GMT Message-Id: <202410021956.492Ju6Yh061830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e3953c036f9d - main - sys: Chase libmd version bump with a __FreeBSD_version bump List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3953c036f9d66c85b8e19f99f0710b3288ce5fb Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e3953c036f9d66c85b8e19f99f0710b3288ce5fb commit e3953c036f9d66c85b8e19f99f0710b3288ce5fb Author: Kyle Evans AuthorDate: 2024-10-02 19:54:24 +0000 Commit: Kyle Evans CommitDate: 2024-10-02 19:55:52 +0000 sys: Chase libmd version bump with a __FreeBSD_version bump Ports need to be rebuilt anew following this change to get off of the old libmd.so.6. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 79d188c93230..3d772d551ffe 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500023 +#define __FreeBSD_version 1500024 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Oct 2 20:37:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJmnt6YSZz5Y3kW; Wed, 02 Oct 2024 20:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJmnt5zm4z4fyf; Wed, 2 Oct 2024 20:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727901442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MXUUiBjLZgdJAdJLPxu76zMLNPTUxjJ/dUIzVM2bRxg=; b=pLdv6a1cQeMP+zHKrVvRwBo4Yit2SAz+nFvRsurtsS7bvhNuS/AlX+1dEeTRebf7Sp4BS1 mALtv8HwRsLQQKKMB+HsQyx/M6RYKYvEOKoJoHFRDBPJgwTyS1Y+oCweUcWBBCGXa+nqot ZosTesud3ruTW7LcEWwj+1ogdN+LxKsW8EUO3UXJrrzIs2SyBsHOF7shrPZXBCDMkP4E8G P0/S8J6t4e1kdxaMeKQIaFRJ2bQFNYhCihzspk+E839I4ynAJFgZBAADFm6cQJvr1wksnR u8VmP3tRU+c14UpGAOVZjU7LRS8QVOVVmiAOaNmrKN2iS4Y22z1FoEW32Hgkyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727901442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MXUUiBjLZgdJAdJLPxu76zMLNPTUxjJ/dUIzVM2bRxg=; b=F8erM4GxjJXXCAiz//3c6cbvQxOL96Ei1bCw4vw/ShEtEAyzSDBcoob3HnNUw8m6LHKZIW i9vXz0CzUjhG58Wkv6njnOp+yc/ElBb9um/NGTRYVLd9lTepE0vScf1elmVl/c7cnJqulQ OrsXosv3MMthRJOb+rpiNAwKPfBuBrhBYHiD3HY2q5fE+cENF0JyjLpP9hzmiKGdsoSSRN hX9hNdJSp5ObGRG7+e7v8c14rpAAVMmm+4FN9f9YlCUq6+NxRigpIMUVIHkvdrOd5JQ2Eq QnHtb31Lz/576ATUtRLJsiZfyxwEdEEUj5N/ClBlttL2ogmpZEDik71uVp2RqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727901442; a=rsa-sha256; cv=none; b=njiPVjjb/FuzL6UB8PfM00PhhdFrWCnyaTKtKr8XBOiBOVBpw6uu+8+42a5BIBm9Pkymbn dCtnwxViWUhXmeICM9cY6DGsaZPeNEupBSDENAY94OKvSZ51iDQNkt+OuRNxmzvowGzqJY drpljIFy4vd81g2mhJJr1QyWSx6XcJqFvSxCMA66B7SRwB+KgKIReqsxi8XuimWxT0wO1B cM+AoHnik7nANbCiTqHkhf4tB1DIF0xBVAgcgav+caEK55fdJq2zLY39yNjQWs5Ue169oU RjCpqvjA3bPIkq0+aIFOBC4/aU/VLtP0r+rYSrQ8jLIx122yeXXOAolc/3KNeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJmnt596wzLXs; Wed, 2 Oct 2024 20:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492KbMJj030095; Wed, 2 Oct 2024 20:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492KbMbO030092; Wed, 2 Oct 2024 20:37:22 GMT (envelope-from git) Date: Wed, 2 Oct 2024 20:37:22 GMT Message-Id: <202410022037.492KbMbO030092@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: ed03c3099086 - stable/14 - bhyve: avoid TOCTOU on iov_len in virtio_vq_recordon() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed03c309908687bdb9f71dc6d9c9c8a92c54fc20 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed03c309908687bdb9f71dc6d9c9c8a92c54fc20 commit ed03c309908687bdb9f71dc6d9c9c8a92c54fc20 Author: Pierre Pronchery AuthorDate: 2024-08-27 13:57:32 +0000 Commit: Ed Maste CommitDate: 2024-10-02 20:37:09 +0000 bhyve: avoid TOCTOU on iov_len in virtio_vq_recordon() Avoid a race condition when accessing guest memory, by reading memory contents only once. This has also been applied to _vq_record() in sys/dev/beri/virtio/virtio.c, as per markj@'s suggestion. Reported by: Synacktiv Reviewed by: markj Security: HYP-10 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45735 (cherry picked from commit 869d760cb9d7a307faa2fbe8c1c2b238a81b74d4) --- sys/dev/beri/virtio/virtio.c | 11 ++++++++--- usr.sbin/bhyve/virtio.c | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/dev/beri/virtio/virtio.c b/sys/dev/beri/virtio/virtio.c index c249d1c9d37b..7302bc39d799 100644 --- a/sys/dev/beri/virtio/virtio.c +++ b/sys/dev/beri/virtio/virtio.c @@ -107,12 +107,17 @@ paddr_unmap(void *phys, uint32_t size) static inline void _vq_record(uint32_t offs, int i, volatile struct vring_desc *vd, struct iovec *iov, int n_iov, uint16_t *flags) { + uint32_t len; + uint64_t addr; + if (i >= n_iov) return; - iov[i].iov_base = paddr_map(offs, be64toh(vd->addr), - be32toh(vd->len)); - iov[i].iov_len = be32toh(vd->len); + len = atomic_load_32(&vd->len); + addr = atomic_load_64(&vd->addr); + iov[i].iov_base = paddr_map(offs, be64toh(addr), + be32toh(len)); + iov[i].iov_len = be32toh(len); if (flags != NULL) flags[i] = be16toh(vd->flags); } diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index 0aeafa011bbc..5e8f8a8d322a 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -217,10 +217,15 @@ static inline void _vq_record(int i, struct vring_desc *vd, struct vmctx *ctx, struct iovec *iov, int n_iov, struct vi_req *reqp) { + uint32_t len; + uint64_t addr; + if (i >= n_iov) return; - iov[i].iov_base = paddr_guest2host(ctx, vd->addr, vd->len); - iov[i].iov_len = vd->len; + len = atomic_load_32(&vd->len); + addr = atomic_load_64(&vd->addr); + iov[i].iov_len = len; + iov[i].iov_base = paddr_guest2host(ctx, addr, len); if ((vd->flags & VRING_DESC_F_WRITE) == 0) reqp->readable++; else From nobody Wed Oct 2 20:38:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJmq73m3Wz5Y444; Wed, 02 Oct 2024 20:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJmq72DgHz4gK5; Wed, 2 Oct 2024 20:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727901507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yucrtEe3Stqhl8+v/gVPdZgmnG57fY/pVOgsAsAmI18=; b=vqnJrgPR7aIH52/lY57AoIx29vcgh4nKI+NwEwZaBaok5T4xQCRoPKwhXsN/23TIcPulVI 5qNE6fh9SOohgrgEe0JsqL3Vdc2PAOEEuIuMSCoYKYTlCaEKdCwj6yTFiwxTpOiLLq5uWG jEBynct/n5Uf8IFHKKUdajM3KBuAg5C+V+GOrOz2X2eWCpfbGO7qEFm+cS/LGb56OPt5Xh 7HWgb3GleUf1W1EzgD5PVj5XjKXc2gvoStg47jxwMq+jXufLWsQmYGxZ7hya4k+MIY4k0x oF4Ckl/DuDuNmkX1Vhpr1CAwSao0uvKKSTNMmLCuW/82N01E66ZFviJTnS0KiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727901507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yucrtEe3Stqhl8+v/gVPdZgmnG57fY/pVOgsAsAmI18=; b=m3hf6qDbvgBlDk7kv92xrsvNOuF0yCUL6ihLslYMLD/PbBhhj7dMAHZpCrkdr/ZqkPYiXT 0Bz35wgA5QKj+vz9eYNti256m3Sbe4whzdDP2q1S2EhaIe2vAM/zQOT6OAwCmhgXQZQgQ2 ZiNDfmruhWGlQwpjHFOw1KLRSFJppRAGtAu4/xtf7Q4LZ4ckW6mreMrOUlJmwmG9aKx7xM LO5hbCNqRa3w+I07voSsgyfjKhkB2Nl4PpKtZyrVzfW+qqWj+Mk4njhia3iYbSjHjQ8s8P CVH6GFzhtaQBD2nSc1VseeGyJyU0ZSXfNOI9oi/EHLJBnFcxz60Ac7p/iAs/PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727901507; a=rsa-sha256; cv=none; b=cqbvaj3LTTUq/GbzlFvMbykm4ZJ7tpY3PkYqQGEOwT9tSPq2XABSzf+hsVIJSrxUNWl6o1 5GJHJnweTDf5Ka6exTAyMO3syCewNl/s5MIL2w6UzDhQFzlaceAk+odRoOJNpjGE1JPvNr Yj0hZ9U/0bIO/c6g2sRYZPfLT3WFR98sbVUpZA0KNeAx55oAt7YA1EmxmtIXSAXn1xjKie 9q8vobPoViFQ4HgSHcleC3mmXUnqvLrprYMb/y78ZQCmZNa9V4TVlUvOkT/mM+uJJMpiLW lx2aYxK043jf2Z/9JyAUvOxMgwId+1gDRk0ZAzvj6bKFdl6ljhIHo2nOnz6X9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJmq700pbzLM3; Wed, 2 Oct 2024 20:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492KcQ7T030358; Wed, 2 Oct 2024 20:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492KcQ92030355; Wed, 2 Oct 2024 20:38:26 GMT (envelope-from git) Date: Wed, 2 Oct 2024 20:38:26 GMT Message-Id: <202410022038.492KcQ92030355@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: 6eb7879f4261 - stable/13 - bhyve: avoid TOCTOU on iov_len in virtio_vq_recordon() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6eb7879f426129aa38f4e8b0d57ab7456e4eb351 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6eb7879f426129aa38f4e8b0d57ab7456e4eb351 commit 6eb7879f426129aa38f4e8b0d57ab7456e4eb351 Author: Pierre Pronchery AuthorDate: 2024-08-27 13:57:32 +0000 Commit: Ed Maste CommitDate: 2024-10-02 20:37:49 +0000 bhyve: avoid TOCTOU on iov_len in virtio_vq_recordon() Avoid a race condition when accessing guest memory, by reading memory contents only once. This has also been applied to _vq_record() in sys/dev/beri/virtio/virtio.c, as per markj@'s suggestion. Reported by: Synacktiv Reviewed by: markj Security: HYP-10 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45735 (cherry picked from commit 869d760cb9d7a307faa2fbe8c1c2b238a81b74d4) (cherry picked from commit ed03c309908687bdb9f71dc6d9c9c8a92c54fc20) --- sys/dev/beri/virtio/virtio.c | 11 ++++++++--- usr.sbin/bhyve/virtio.c | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/dev/beri/virtio/virtio.c b/sys/dev/beri/virtio/virtio.c index c249d1c9d37b..7302bc39d799 100644 --- a/sys/dev/beri/virtio/virtio.c +++ b/sys/dev/beri/virtio/virtio.c @@ -107,12 +107,17 @@ paddr_unmap(void *phys, uint32_t size) static inline void _vq_record(uint32_t offs, int i, volatile struct vring_desc *vd, struct iovec *iov, int n_iov, uint16_t *flags) { + uint32_t len; + uint64_t addr; + if (i >= n_iov) return; - iov[i].iov_base = paddr_map(offs, be64toh(vd->addr), - be32toh(vd->len)); - iov[i].iov_len = be32toh(vd->len); + len = atomic_load_32(&vd->len); + addr = atomic_load_64(&vd->addr); + iov[i].iov_base = paddr_map(offs, be64toh(addr), + be32toh(len)); + iov[i].iov_len = be32toh(len); if (flags != NULL) flags[i] = be16toh(vd->flags); } diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index 5294da670677..d11f5683e7b7 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -215,10 +215,15 @@ static inline void _vq_record(int i, struct vring_desc *vd, struct vmctx *ctx, struct iovec *iov, int n_iov, struct vi_req *reqp) { + uint32_t len; + uint64_t addr; + if (i >= n_iov) return; - iov[i].iov_base = paddr_guest2host(ctx, vd->addr, vd->len); - iov[i].iov_len = vd->len; + len = atomic_load_32(&vd->len); + addr = atomic_load_64(&vd->addr); + iov[i].iov_len = len; + iov[i].iov_base = paddr_guest2host(ctx, addr, len); if ((vd->flags & VRING_DESC_F_WRITE) == 0) reqp->readable++; else From nobody Wed Oct 2 21:41:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJpCZ6nFsz5Y7g2; Wed, 02 Oct 2024 21:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJpCZ22Vdz4njh; Wed, 2 Oct 2024 21:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727905274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLy0v65ROqSkWzHPexv9j49sm2qdwGugdP4eUAKCtsY=; b=jXYNsycyycc+nZTqwUfPaX1zolzqVe08Egy0J+thbYWAMKE+0ZqWw4/VHqkwAEY0uHwpGJ QRA1GnuxHooyTJ/233EQ4oAcMWngtOZDnEDL5VdL0pS/sqLit8cgeYNpGUFm3kmhhCMqyM CL2d1vav8EhnHNx5oAy6XRbJXlwTwrkzF7q9GqnUgiMd8PYHLcToCNSiNh3I1RRxqqzLU3 kJK5eniA//34xsgj3bdazTy0bAtAOIyZ7b7DRu4U7rq0mrxnLU006Rk1XvKnqoOXTnaPKe G6KoXXqd+kuta6FTyhdXjCmpTPY91EwbkHOsZXaezm20AtmnIS5kvmS17MLIng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727905274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLy0v65ROqSkWzHPexv9j49sm2qdwGugdP4eUAKCtsY=; b=aX+DhcOOxuvJTsRV/c6goUBIivjdg4tDNT3xwgW0nVVa1LgJYZblbpVp+aEzMmDiEBYZ06 F29n3kWA2QIj4agdns3/Q3qbkiYiKAvT6b29MawbF3Jo8mtBJMk+YKDWK/eDNGOS6Yi+h0 Ul6ajjFQS6pjMsPXXy/CfFdZEiThv2SlxJ7OhVb1yEiVSUTF3iaeaSvuuMPNf/StOQrcd1 QiMQzfRSR600IIa0XYoKUe0W1viKLAgakznKjyqTPBcAXB55a7V00kFEwU5LirgiXJbf/k VD8pQRgCMTQcHea755y6kxavV+ePkq5GMuiZ9pa0CE6UNO+AmaHQD92C2yPTsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727905274; a=rsa-sha256; cv=none; b=q5r7g1vf8ynLOV+7YmIxzuU/Nznb+/Z/wXYt8BYNB/Or3PoKeenkUm2vwtd4FxaLN8PYRt xGQ64DBqCHgVmxewGCsVZ/Zesi0nAm/ViHKiVC+JSGsqMFE1H07IbMeJxmepEJk6Gpflny eW3uFXI2FJeLYvDzEz6971vW/RexsMII1TtrhL0bTvwclhW1jZY2m9PKcQlOQmUPUBdI37 ctCw1pOfPeu7Pf6bVIP45sG3j/xrPLb6UVJQbOKOLNcSa4IxHlP0AUnra7OXLvjFDoM4gY vd74/n/8ek8N5kWtlZZHN6EbmwjZZikxtuLnOBwlnEQ8mfA+txIQqy4C/RlTAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJpCZ1cSPzN2X; Wed, 2 Oct 2024 21:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492LfEsm043612; Wed, 2 Oct 2024 21:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492LfE2l043599; Wed, 2 Oct 2024 21:41:14 GMT (envelope-from git) Date: Wed, 2 Oct 2024 21:41:14 GMT Message-Id: <202410022141.492LfE2l043599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ad152571b8fd - main - bhyve uart: Fix errors from GCC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad152571b8fd69d93ca0e44d80c9b49308b36eae Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ad152571b8fd69d93ca0e44d80c9b49308b36eae commit ad152571b8fd69d93ca0e44d80c9b49308b36eae Author: John Baldwin AuthorDate: 2024-10-02 21:31:59 +0000 Commit: John Baldwin CommitDate: 2024-10-02 21:31:59 +0000 bhyve uart: Fix errors from GCC - Place 'static' before other qualifiers (-Wold-style-declaration) - Correct the order of arguments to calloc (-Wcalloc-transposed-args) Reported by: GCC 14 Fixes: 1f903953fbf8 bhyve: Add raw tcp to uart backend --- usr.sbin/bhyve/uart_backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/uart_backend.c b/usr.sbin/bhyve/uart_backend.c index a09764190137..32490105fecf 100644 --- a/usr.sbin/bhyve/uart_backend.c +++ b/usr.sbin/bhyve/uart_backend.c @@ -293,7 +293,7 @@ done: static void uart_tcp_listener(int fd, enum ev_type type __unused, void *arg) { - const static char tcp_error_msg[] = "Socket already connected\n"; + static const char tcp_error_msg[] = "Socket already connected\n"; struct uart_socket_softc *socket_softc = (struct uart_socket_softc *) arg; struct uart_softc *sc = socket_softc->softc; @@ -473,7 +473,7 @@ uart_tcp_backend(struct uart_softc *sc, const char *path, * Set the connection softc structure, which includes both the softc * and the drain function provided by the frontend. */ - if ((socket_softc = calloc(sizeof(struct uart_socket_softc), 1)) == + if ((socket_softc = calloc(1, sizeof(struct uart_socket_softc))) == NULL) goto clean; From nobody Thu Oct 3 07:29:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK3Gl2kQMz5XsFm; Thu, 03 Oct 2024 07:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK3Gl1wdkz4svx; Thu, 3 Oct 2024 07:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727940591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sljeUFESCdprWuXwwKOlraEa7Zqwy1gA6QJ/vXN099c=; b=wL2iOOAByI+OqpeC7Ggexo2VM0XDZx2dWY48G6ZJYTO1S2ek3GhGurDlJENsJAOkMsJBRK 1Z3hg6PK8lRjECvsMPZxBsddBkTM3Jt51txozXLazckRyZUYZmOlmTF/cb0hKQOEXJLvgT O1E4zyx4r+mS6hrpW7zF/H7YTRsB9wlhbkIqBOwEjbN6VBtlw/jjpAxaRkt8sSF+ylXRLt /NevgN4qCeGbGLRPzOuaU8NLKqzhj6EOccn54ZR8T/LJU23TNEENYqftIGopRy2dEiZ/VA 5fhQD/YUWLkkv780o80zfYyWN8uEUk3QZ3cIFRJNDnW4rKsUiXgf6l5Fj7+RLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727940591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sljeUFESCdprWuXwwKOlraEa7Zqwy1gA6QJ/vXN099c=; b=wQEZUZNIZR1ZfHyFkHnCuonlKowSqqwe1+fYRZIk20X0PwrvQxwetJTpUQmc74EfiQT/0h xCIrxlzaZtUgqDYK8INhLibd2mVhwkbsUIC7GQxQmuCI7pNpDVe1LTmQp0dIkn/ckILXNl GyxvX1DSEn49O2Lp995LlFtItKnmfGOX43X38cuvxfbrsDXRruQsPvmIfjD++Ys+2cJG17 csuwIigmpwnFbEQoHVFpmx6tLWO1BD05moREHlATE131P+3zgEDrhNYvyg+2ApgEGHpdoG GHwFJHxO+QNV4L7Tq1q1EPc8lkxAe47jl+rvkey5m9GAOtIamW/bC7/+IpiSXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727940591; a=rsa-sha256; cv=none; b=m4LWZMUrz69Am4q3OEfFslASovOCup7v4xELjebuA0NLWkxiVoMj9VBwgEdHPh+MRAPc5e Yg3HQruCAnJY1ZRw0rIy2mTb4TBS79tukuTBGDC0LnzUdEcNtRDLBCTJVpF6B63CDMThKi d7PNNpt1cYTavlVXD5NXT9Gtk5u1GCRJ7YcPzdJmsdUvvpyTXkiZhZL21mVXlVl4Hilnnf 52l68bC4cgJ57c/ELNSg0j/tYyoZ/KXALVANr/jTALsSMJsQOovoyfgVP/6NbEXSDe4ZEf NuD2fH9ZebdUO84JIC0oZ6hgUjRRHxU6LqMtuyElE9ESK+D0A9XHGG4o/IR1FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK3Gl1WHbzh0f; Thu, 3 Oct 2024 07:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4937TpaS035011; Thu, 3 Oct 2024 07:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4937TprF035008; Thu, 3 Oct 2024 07:29:51 GMT (envelope-from git) Date: Thu, 3 Oct 2024 07:29:51 GMT Message-Id: <202410030729.4937TprF035008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: eb8326421e6b - main - iommu_qi_seq_processed: use atomic to read hw-written seq number List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb8326421e6b35b0dee1a8db669914a97bce5cdf Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8326421e6b35b0dee1a8db669914a97bce5cdf commit eb8326421e6b35b0dee1a8db669914a97bce5cdf Author: Konstantin Belousov AuthorDate: 2024-10-03 03:51:20 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-03 06:19:09 +0000 iommu_qi_seq_processed: use atomic to read hw-written seq number otherwise iommu_qi_wait_for_seq() can be legitimately optimized out. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/iommu_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c index 8ff15cc86cb8..db8f94eb584f 100644 --- a/sys/x86/iommu/iommu_utils.c +++ b/sys/x86/iommu/iommu_utils.c @@ -350,8 +350,8 @@ iommu_qi_seq_processed(struct iommu_unit *unit, x86c = IOMMU2X86C(unit); gen = x86c->inv_waitd_gen; - return (pseq->gen < gen || - (pseq->gen == gen && pseq->seq <= x86c->inv_waitd_seq_hw)); + return (pseq->gen < gen || (pseq->gen == gen && pseq->seq <= + atomic_load_64(&x86c->inv_waitd_seq_hw))); } void From nobody Thu Oct 3 11:44:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK8wK3W2yz5YCWh; Thu, 03 Oct 2024 11:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK8wK3Bbfz4LPn; Thu, 3 Oct 2024 11:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727955857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiaFu9tVV8KAVeREu2cRjwOkEq5ExERZuthE7WFg0BI=; b=mbx9sz7R7qVOcDwr3+vDeQQLgQlD6MZL5mjd8zt9GroCDuOXPX0jxJ5uXcg2Td6PnTojXU ssrSzr0sXJv4Wzb7PyudJZ/rR6ZdJSkmm2xCLJHhZaUTGcTzf5Iz+YR7Qoi2TPRMROPq9F KuRrueHOeoNwK5jF1lLkSkWi3qkpZwRthEi4Vy2U2MSSDO4wZ+6+hFKE2xRRsLhGcWRm8t dOvI7r+cQphOYKAEobHiitjgdr9vUmgZcqMOlgGrDX2UKCyhqyYtuHXlYd88bifWgg4oX3 HwkG9GshE7snISX/TjWuM6AsPfi6mELiFJOi2Rz9NF81PbI3uCMs/NYCKbfrYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727955857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiaFu9tVV8KAVeREu2cRjwOkEq5ExERZuthE7WFg0BI=; b=Gf3A2s/pYL4pAqVzs1RWtuiF96HsgOL2eDz+u/RSO7QKXkBil0EtCC2eKUkGLTII02em9G 9SwMMfRHjurSZRyaZJ755aTyFnQYJSkFEJFd1HAYv7EcO4DkBJiNRNwG9DE3UH4QQJEDRZ PzTXKnvFSxG7BwnzcLjSZLHGO/+mRcdWAE5hQXQJU5yVH4uwN+lw2uzoB2zR2x547quzU9 FxPrNf2nAOH60Lm6gg5Un9CtGvt2TzWPqZe0gdvkl6I5fVgOTSgg4n6Kd3uC6EXB7f6K++ eCAqqAWKT7fpdj97wQSgOy8X5EwrmWwKdXMmhl1bAO3iscHl4LXcLnBfo111lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727955857; a=rsa-sha256; cv=none; b=t3l9KzK18CusWnTtOsOIaUXxacxpR0fwRc7AI7bdX5904w+96lffPb7rZK5AzYdAt0dmOo WFfvxwl5pAzyEJgL0n7muFwX/IcXi9DVnGvNqTlNUwXMqOsLljMDL5AcXhN6byMZLowxlZ MX+k3QQXxfaP72kWePIC4t0k1dLyBv63FU0DjxeIVVo0OeZ3Tx8yI1PT2jdLJZAaw3cvQ3 PvrGiX5P9x+FwWck9LrQuVrqcBBL6kpx4Rm1cgDGZT4R8OuGyrd/M2g30dIqeJ+lvJ7ykr ZeSn8vbD3kt4IGJ5JNevqqaJFrp8KovYKcmIOSxhCAk7xVGA+iiRfyFKatvAbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK8wK2hSczpgy; Thu, 3 Oct 2024 11:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493BiHix077945; Thu, 3 Oct 2024 11:44:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493BiHuN077942; Thu, 3 Oct 2024 11:44:17 GMT (envelope-from git) Date: Thu, 3 Oct 2024 11:44:17 GMT Message-Id: <202410031144.493BiHuN077942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 94a294e59d17 - main - stress2: Added test scenarios for bug report List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94a294e59d1772f316fef613b83e92f37294954c Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=94a294e59d1772f316fef613b83e92f37294954c commit 94a294e59d1772f316fef613b83e92f37294954c Author: Peter Holm AuthorDate: 2024-10-03 11:41:33 +0000 Commit: Peter Holm CommitDate: 2024-10-03 11:41:33 +0000 stress2: Added test scenarios for bug report --- tools/test/stress2/misc/mmap44.sh | 2 +- tools/test/stress2/misc/mmap45.sh | 230 ++++++++++++++++++++++++++++++ tools/test/stress2/misc/mmap46.sh | 233 ++++++++++++++++++++++++++++++ tools/test/stress2/misc/mmap47.sh | 237 +++++++++++++++++++++++++++++++ tools/test/stress2/misc/mmap48.sh | 289 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 990 insertions(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/mmap44.sh b/tools/test/stress2/misc/mmap44.sh index 5865491e1dea..f5999ac62536 100755 --- a/tools/test/stress2/misc/mmap44.sh +++ b/tools/test/stress2/misc/mmap44.sh @@ -219,7 +219,7 @@ mount /dev/md$mdstart $mntpoint mp2=${mntpoint}2 mkdir -p $mp2 mount | grep -q "on $mp2 " && umount -f $mp2 -mount -t nfs 127.0.0.1:$mntpoint $mp2; s=$? +mount -t nfs -o retrycnt=3 127.0.0.1:$mntpoint $mp2 || exit 1 sleep .2 here=`pwd` diff --git a/tools/test/stress2/misc/mmap45.sh b/tools/test/stress2/misc/mmap45.sh new file mode 100755 index 000000000000..59450b41bb5e --- /dev/null +++ b/tools/test/stress2/misc/mmap45.sh @@ -0,0 +1,230 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Demonstrate issue described in: +# [Bug 276002] nfscl: data corruption using both copy_file_range and mmap'd I/O + +# Issue seen: +# +# 8994c8994 +# < 0431020 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f +# --- +# > 0431020 10 11 ee 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f +# 256 -rw------- 1 root wheel 262144 Feb 28 19:44 file +# 256 -rw------- 1 root wheel 262144 Feb 28 19:43 file.orig +# 19:44:34, elapsed 0 days, 00:13.59 +# Failed with exit code 2 after 13 loops. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +log=/tmp/$prog.log +serial=/tmp/$prog.serial +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } +rpcinfo 2>/dev/null | grep -q mountd || exit 0 + +cat > /tmp/$prog.c < +#include + +#include +#include +#include +#include +#include +#include +#include + +static off_t siz; +static pthread_mutex_t write_mutex; +static int fd, go; +static char *cp; + +static void * +memread(void *arg __unused) +{ + int i; + char c; + + while (go == 1) { + i = arc4random() % siz; + c = cp[i]; + if (c != 0x77) /* No unused vars here */ + usleep(arc4random() % 400); + } + return (0); +} + +static void * +memwrite(void *arg __unused) +{ + int i; + char c; + + while (go == 1) { + i = arc4random() % siz; + pthread_mutex_lock(&write_mutex); + c = cp[i]; + cp[i] = 0xee; /* This value seems to linger with NFS */ + cp[i] = c; + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 400); + } + return (0); +} + +static void * +wr(void *arg __unused) +{ + off_t pos; + int r, s; + char buf[1024]; + + while (go == 1) { + s = arc4random() % sizeof(buf) + 1; + pos = arc4random() % (siz - s); + pthread_mutex_lock(&write_mutex); + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if ((r = read(fd, buf, s)) != s) { + fprintf(stderr, "r = %d, s = %d, pos = %d\n", r, s, (int)pos); + err(1, "read():2"); + } + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if (write(fd, buf, s) != s) + err(1, "write()"); + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 400); + } + return (0); +} + +static void * +s1(void *arg __unused) +{ + + while (go == 1) { + if (fdatasync(fd) == -1) + err(1, "fdatasync()"); + usleep(arc4random() % 1000); + } + return (0); +} + +static void * +s2(void *arg __unused) +{ + + while (go == 1) { + if (fsync(fd) == -1) + err(1, "fdatasync()"); + usleep(arc4random() % 1000); + } + return (0); +} + +int +main(int argc, char *argv[]) +{ + struct stat st; + pthread_t tp[10]; + int e, i; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); + } + if ((fd = open(argv[1], O_RDWR)) == -1) + err(1, "open(%s)", argv[1]); + if (fstat(fd, &st) == -1) + err(1, "stat(%s)", argv[1]); + siz = st.st_size; + cp = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (cp == MAP_FAILED) + err(1, "mmap()"); + + go = 1; + pthread_mutex_init(&write_mutex, NULL); + if ((e = pthread_create(&tp[0], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[1], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[2], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[3], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[4], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[5], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[6], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[7], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[8], NULL, s1, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[9], NULL, s2, NULL)) != 0) + errc(1, e, "pthread_create"); + + sleep(60); + go = 0; + for (i = 0; i < (int)(sizeof(tp) / sizeof(tp[0])); i++) + pthread_join(tp[i], NULL); + if (munmap(cp, siz) == -1) + err(1, "munmap()"); + close(fd); +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +mycc -o $serial -Wall -Wextra -O2 ../tools/serial.c || exit 1 +mount | grep -q "on $mntpoint " && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -s 5g -u $mdstart +newfs -n $newfs_flags /dev/md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint + +mp2=${mntpoint}2 +mkdir -p $mp2 +mount | grep -q "on $mp2 " && umount -f $mp2 +mount -t nfs -o retrycnt=3 127.0.0.1:$mntpoint $mp2 || exit 1 +sleep .2 + +here=`pwd` +cd $mp2 +$here/../testcases/swap/swap -t 5m -i 20 > /dev/null & +sleep 2 + +size=262144 +$serial file $size +cp file file.orig + +s=0 +/tmp/$prog file || s=1 + +while pgrep -q swap; do pkill swap; done +wait +if ! cmp -s file.orig file; then + od -t x1 file.orig > /var/tmp/$prog.file1 + od -t x1 file > /var/tmp/$prog.file2 + diff /var/tmp/$prog.file1 /var/tmp/$prog.file2 > $log + head -20 $log + rm /var/tmp/$prog.file1 /var/tmp/$prog.file2 + ls -ls file.orig file + s=2 +fi + +cd $here +umount $mp2 +umount $mntpoint +mdconfig -d -u $mdstart +rm -f $serial /tmp/$prog /tmp/$prog.c $log +exit $s diff --git a/tools/test/stress2/misc/mmap46.sh b/tools/test/stress2/misc/mmap46.sh new file mode 100755 index 000000000000..a739f36f3f9e --- /dev/null +++ b/tools/test/stress2/misc/mmap46.sh @@ -0,0 +1,233 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Demonstrate issue described in: +# [Bug 276002] nfscl: data corruption using both copy_file_range and mmap'd I/O + +# Issue seen: +# +# 8994c8994 +# < 0431020 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f +# --- +# > 0431020 10 11 ee 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f +# 256 -rw------- 1 root wheel 262144 Feb 28 19:44 file +# 256 -rw------- 1 root wheel 262144 Feb 28 19:43 file.orig +# 19:44:34, elapsed 0 days, 00:13.59 +# Failed with exit code 2 after 13 loops. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +log=/tmp/$prog.log +serial=/tmp/$prog.serial +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } +rpcinfo 2>/dev/null | grep -q mountd || exit 0 + +cat > /tmp/$prog.c < +#include + +#include +#include +#include +#include +#include +#include +#include + +static off_t siz; +static pthread_mutex_t write_mutex; +static int fd, go; +static char *cp; + +static void * +memread(void *arg __unused) +{ + int i; + char c; + + while (go == -1) + usleep(50); + while (go == 1) { + i = arc4random() % siz; + c = cp[i]; + if (c != 0x77) /* No unused vars here */ + usleep(arc4random() % 200); + } + return (0); +} + +static void * +memwrite(void *arg __unused) +{ + int i; + char c; + + while (go == -1) + usleep(50); + while (go == 1) { + i = arc4random() % siz; + pthread_mutex_lock(&write_mutex); + c = cp[i]; + cp[i] = 0xee; /* This value seems to linger with NFS */ + cp[i] = c; + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 200); + } + return (0); +} + +static void * +wr(void *arg __unused) +{ + off_t pos; + int r, s; + char buf[1024]; + + while (go == -1) + usleep(50); + while (go == 1) { + s = arc4random() % sizeof(buf) + 1; + pos = arc4random() % (siz - s); + pthread_mutex_lock(&write_mutex); + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if ((r = read(fd, buf, s)) != s) { + fprintf(stderr, "r = %d, s = %d, pos = %d\n", r, s, (int)pos); + err(1, "read():2"); + } + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if (write(fd, buf, s) != s) + err(1, "write()"); + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 200); + } + return (0); +} + +static void * +tr(void *arg __unused) +{ + while (go == -1) + usleep(50); + while (go == 1) { + if (ftruncate(fd, siz) == -1) /* No size change */ + err(1, "truncate)"); + usleep(arc4random() % 1000); + } + return (0); +} + +int +main(int argc, char *argv[]) +{ + struct stat st; + pthread_t tp[13]; + int e, i; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); + } + if ((fd = open(argv[1], O_RDWR)) == -1) + err(1, "open(%s)", argv[1]); + if (fstat(fd, &st) == -1) + err(1, "stat(%s)", argv[1]); + siz = st.st_size; + cp = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (cp == MAP_FAILED) + err(1, "mmap()"); + + go = -1; + pthread_mutex_init(&write_mutex, NULL); + if ((e = pthread_create(&tp[0], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[1], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[2], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[3], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[4], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[5], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[6], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[7], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[8], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[9], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[10], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[11], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[12], NULL, tr, NULL)) != 0) + errc(1, e, "pthread_create"); + + sleep(1); + go = 1; + sleep(60); + go = 0; + for (i = 0; i < (int)(sizeof(tp) / sizeof(tp[0])); i++) + pthread_join(tp[i], NULL); + if (munmap(cp, siz) == -1) + err(1, "munmap()"); + close(fd); +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +mycc -o $serial -Wall -Wextra -O2 ../tools/serial.c || exit 1 +mount | grep -q "on $mntpoint " && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -s 5g -u $mdstart +newfs -n $newfs_flags /dev/md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint + +mp2=${mntpoint}2 +mkdir -p $mp2 +mount | grep -q "on $mp2 " && umount -f $mp2 +mount -t nfs -o retrycnt=3 127.0.0.1:$mntpoint $mp2 || exit 1 +sleep .2 + +here=`pwd` +cd $mp2 +$here/../testcases/swap/swap -t 5m -i 20 > /dev/null & +sleep 2 + +size=262144 +$serial file $size +cp file file.orig + +s=0 +/tmp/$prog file || s=1 + +while pgrep -q swap; do pkill swap; done +wait +if ! cmp -s file.orig file; then + od -t x1 file.orig > /var/tmp/$prog.file1 + od -t x1 file > /var/tmp/$prog.file2 + diff /var/tmp/$prog.file1 /var/tmp/$prog.file2 > $log + head -20 $log + rm /var/tmp/$prog.file1 /var/tmp/$prog.file2 + ls -ls file.orig file + s=2 +fi + +cd $here +umount $mp2 +umount $mntpoint +mdconfig -d -u $mdstart +rm -f $serial /tmp/$prog /tmp/$prog.c $log +exit $s diff --git a/tools/test/stress2/misc/mmap47.sh b/tools/test/stress2/misc/mmap47.sh new file mode 100755 index 000000000000..43778a193202 --- /dev/null +++ b/tools/test/stress2/misc/mmap47.sh @@ -0,0 +1,237 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Demonstrate issue described in: +# [Bug 276002] nfscl: data corruption using both copy_file_range and mmap'd I/O + +# This version only uses mapped read/write, read(2)/write(2) and ftruncate(2) + +# Issue seen: + +# 19:50:53 Start test of mmap47.sh +# 19:51:56, elapsed 0 days, 00:01.03 +# 19:53:01, elapsed 0 days, 00:02.08 +# 19:54:06, elapsed 0 days, 00:03.13 +# 19:55:40, elapsed 0 days, 00:04.47 +# 617c617 +# < 0023200 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f +# --- +# > 0023200 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e ee +# 256 -rw------- 1 root wheel 262144 Mar 1 19:56 file +# 256 -rw------- 1 root wheel 262144 Mar 1 19:55 file.orig +# 19:56:44, elapsed 0 days, 00:05.51 +# Failed with exit code 2 after 5 loops of mmap47.sh. +# 19:56 /usr/src/tools/test/stress2/misc $ + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +log=/tmp/$prog.log +serial=/tmp/$prog.serial +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } +rpcinfo 2>/dev/null | grep -q mountd || exit 0 + +cat > /tmp/$prog.c < +#include + +#include +#include +#include +#include +#include +#include +#include + +static off_t siz; +static pthread_mutex_t write_mutex; +static int fd, go; +static char *cp; + +static void * +memread(void *arg __unused) +{ + int i; + char c; + + while (go == -1) + usleep(50); + while (go == 1) { + i = arc4random() % siz; + c = cp[i]; + if (c != 0x77) /* No unused vars here */ + usleep(arc4random() % 200); + } + return (0); +} + +static void * +memwrite(void *arg __unused) +{ + int i; + char c; + + while (go == -1) + usleep(50); + while (go == 1) { + i = arc4random() % siz; + pthread_mutex_lock(&write_mutex); + c = cp[i]; + cp[i] = 0xee; /* This value seems to linger with NFS */ + cp[i] = c; + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 200); + } + return (0); +} + +static void * +wr(void *arg __unused) +{ + off_t pos; + int r, s; + char buf[1024]; + + while (go == -1) + usleep(50); + while (go == 1) { + s = arc4random() % sizeof(buf) + 1; + pos = arc4random() % (siz - s); + pthread_mutex_lock(&write_mutex); + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if ((r = read(fd, buf, s)) != s) { + fprintf(stderr, "r = %d, s = %d, pos = %d\n", r, s, (int)pos); + err(1, "read():2"); + } + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if (write(fd, buf, s) != s) + err(1, "write()"); + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 200); + } + return (0); +} + +/* Both ftruncate() and fdatasync() triggers the problem */ + +static void * +tr(void *arg __unused) +{ + while (go == -1) + usleep(50); + while (go == 1) { +#if 0 + if (ftruncate(fd, siz) == -1) /* No size change */ + err(1, "truncate)"); +#else + if (fdatasync(fd) == -1) + err(1, "fdatasync()"); +#endif + usleep(arc4random() % 1000); + } + return (0); +} + +int +main(int argc, char *argv[]) +{ + struct stat st; + pthread_t tp[31]; + int e, i, idx; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); + } + if ((fd = open(argv[1], O_RDWR)) == -1) + err(1, "open(%s)", argv[1]); + if (fstat(fd, &st) == -1) + err(1, "stat(%s)", argv[1]); + siz = st.st_size; + cp = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (cp == MAP_FAILED) + err(1, "mmap()"); + + go = -1; + pthread_mutex_init(&write_mutex, NULL); + idx = 0; + for (i = 0; i < (int)(arc4random() % 10 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 10 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 10 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + } + if ((e = pthread_create(&tp[idx++], NULL, tr, NULL)) != 0) + errc(1, e, "pthread_create"); + + sleep(1); + go = 1; + sleep(60); + go = 0; + for (i = 0; i < idx; i++) + pthread_join(tp[i], NULL); + if (munmap(cp, siz) == -1) + err(1, "munmap()"); + close(fd); +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +mycc -o $serial -Wall -Wextra -O2 ../tools/serial.c || exit 1 +mount | grep -q "on $mntpoint " && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -s 5g -u $mdstart +newfs -n $newfs_flags /dev/md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint + +mp2=${mntpoint}2 +mkdir -p $mp2 +mount | grep -q "on $mp2 " && umount -f $mp2 +mount -t nfs -o retrycnt=3 127.0.0.1:$mntpoint $mp2 || exit 1 +sleep .2 + +here=`pwd` +cd $mp2 +$here/../testcases/swap/swap -t 5m -i 20 > /dev/null & +sleep 2 + +size=262144 +$serial file $size +cp file file.orig + +s=0 +/tmp/$prog file || s=1 + +while pgrep -q swap; do pkill swap; done +wait +if ! cmp -s file.orig file; then + od -t x1 file.orig > /var/tmp/$prog.file1 + od -t x1 file > /var/tmp/$prog.file2 + diff /var/tmp/$prog.file1 /var/tmp/$prog.file2 > $log + head -20 $log + rm /var/tmp/$prog.file1 /var/tmp/$prog.file2 + ls -ls file.orig file + s=2 +fi + +cd $here +umount $mp2 +umount $mntpoint +mdconfig -d -u $mdstart +rm -f $serial /tmp/$prog /tmp/$prog.c $log +exit $s diff --git a/tools/test/stress2/misc/mmap48.sh b/tools/test/stress2/misc/mmap48.sh new file mode 100755 index 000000000000..35da78a98c26 --- /dev/null +++ b/tools/test/stress2/misc/mmap48.sh @@ -0,0 +1,289 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Demonstrate issue described in: +# [Bug 276002] nfscl: data corruption using both copy_file_range and mmap'd I/O + +# This version only uses mapped read/write, read(2)/write(2), fstat(2) and ftruncate(2) + +# Issue seen: +# 20241003 10:04:24 all: mmap48.sh +# 5257c5257 +# < 0244200 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f +# --- +# > 0244200 80 81 82 83 84 85 86 87 88 ee 8a 8b 8c 8d 8e 8f +# 256 -rw------- 1 root wheel 262144 Oct 3 10:05 file +# 256 -rw------- 1 root wheel 262144 Oct 3 10:04 file.orig +# FAIL mmap48.sh exit code 2 + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +log=/tmp/$prog.log +serial=/tmp/$prog.serial +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } +rpcinfo 2>/dev/null | grep -q mountd || exit 0 + +cat > /tmp/$prog.c < +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static off_t siz; +static pthread_mutex_t write_mutex; +static int fd, go; +static char *cp; + +#define THREADS 100 + +static void * +memread(void *arg __unused) +{ + int i; + char c; + + if (arc4random() % 100 < 10) + return (0); + pthread_set_name_np(pthread_self(), __func__); + while (go == -1) + usleep(50); + while (go == 1) { + i = arc4random() % siz; + c = cp[i]; + if (c != 0x77) /* No unused vars here */ + usleep(arc4random() % 400); + } + return (NULL); +} + +static void * +memwrite(void *arg __unused) +{ + int i; + char c; + + if (arc4random() % 100 < 10) + return (0); + pthread_set_name_np(pthread_self(), __func__); + while (go == -1) + usleep(50); + while (go == 1) { + i = arc4random() % siz; + pthread_mutex_lock(&write_mutex); + c = cp[i]; + cp[i] = 0xee; /* This value seems to linger with NFS */ + cp[i] = c; + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 400); + } + return (NULL); +} + +static void * +wr(void *arg __unused) +{ + off_t pos; + int r, s; + char buf[1024]; + + if (arc4random() % 100 < 10) + return (0); + pthread_set_name_np(pthread_self(), __func__); + while (go == -1) + usleep(50); + while (go == 1) { + s = arc4random() % sizeof(buf) + 1; + pos = arc4random() % (siz - s); + pthread_mutex_lock(&write_mutex); + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if ((r = read(fd, buf, s)) != s) { + fprintf(stderr, "r = %d, s = %d, pos = %d\n", r, s, (int)pos); + err(1, "read():2"); + } + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if (write(fd, buf, s) != s) + err(1, "write()"); + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 200); + } + return (NULL); +} + +/* Both ftruncate() and fdatasync() triggers the problem */ + +static void * +sy(void *arg __unused) +{ + + if (arc4random() % 100 < 10) + return (0); + pthread_set_name_np(pthread_self(), __func__); + while (go == -1) + usleep(50); + while (go == 1) { + if (fdatasync(fd) == -1) + err(1, "fdatasync()"); + usleep(arc4random() % 1000); + } + return (NULL); +} + +static void * +tr(void *arg __unused) +{ + + if (arc4random() % 100 < 10) + return (0); + pthread_set_name_np(pthread_self(), __func__); + while (go == -1) + usleep(50); + while (go == 1) { + if (ftruncate(fd, siz) == -1) /* No size change */ + err(1, "truncate)"); + usleep(arc4random() % 1000); + } + return (NULL); +} + +static void * +fs(void *arg __unused) +{ + struct stat st; + + if (arc4random() % 100 < 10) + return (0); + pthread_set_name_np(pthread_self(), __func__); + while (go == -1) + usleep(50); + while (go == 1) { + if (fstat(fd, &st) == -1) + err(1, "stat()"); + usleep(arc4random() % 1000); + } + return (NULL); +} + +int +main(int argc, char *argv[]) +{ + struct stat st; + pthread_t tp[THREADS]; + int e, i, idx; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); + } + if ((fd = open(argv[1], O_RDWR)) == -1) + err(1, "open(%s)", argv[1]); + if (fstat(fd, &st) == -1) + err(1, "stat(%s)", argv[1]); + siz = st.st_size; + cp = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (cp == MAP_FAILED) + err(1, "mmap()"); + + go = -1; + pthread_mutex_init(&write_mutex, NULL); + idx = 0; + for (i = 0; i < (int)(arc4random() % 3 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 3 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 3 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 3 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, fs, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 3 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, tr, NULL)) != 0) + errc(1, e, "pthread_create"); + } + for (i = 0; i < (int)(arc4random() % 3 + 1); i++) { + if ((e = pthread_create(&tp[idx++], NULL, sy, NULL)) != 0) + errc(1, e, "pthread_create"); + } *** 59 LINES SKIPPED *** From nobody Thu Oct 3 11:58:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK9DJ4ykVz5YDVc; Thu, 03 Oct 2024 11:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK9DJ4Stmz4MP4; Thu, 3 Oct 2024 11:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727956688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/Mi41ywo8d8AU7jtAa3YoRxaGd73/BLP+magnCoHY0=; b=gqF4a459sjt2/i9OR2pW3OVNyxHkzjYu3eNHjjCey/+Pw7MO10ZLT0hElX4E2RWQ+JTuaE QMC2bTV2vLdVUkxx9bw7NAhXTHgoi7gD0eGpSRIPUPLgcnb5XGn2NyZTzyL0eUJa60V7o4 6eNSr9Yo/FZAxVPFBFM+EUki4t8GcAwYqcA8DscQyzrvNTpOpLFiWLGAkXXlMcQy3ljYoB DZHsVW/1py8UBoKIq10obdFA7mapDlakyZIOpZlWR7KhstPjebUIW88tuHymx9hDOzUyHj RvnyEqmXJMwgdOwYikxp5wDk8cBIA6khB+w3wW4nHMoLF0GeGQjFUlKR11yL/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727956688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/Mi41ywo8d8AU7jtAa3YoRxaGd73/BLP+magnCoHY0=; b=DJI9/MYLCnb7sTxvxrPnl11YBryW68nt7PpJTQodFFnagfh73ccoH5bI3rzUQ75Vsa9SPo dVG9QmIj78i01CE2vgdPwv31KrJiQs3wVd32GllB4WPB0EKZfMi3C7q8pUB/TNFejdyP5f Kq2Upz+10QCF+iRjFsgSvzMjZR23TRCAjOJ73ndFgxJhaZpMpGnh5K/e2SGgmjHPV2pEG+ RQmx+GIOMgw74S3UJE/HhtsFblsRbl+FxPG4HGEiLMvo/scDbyLlsETsRyfj/Rb4bLqayG VcRjfcu8TpgH8Dgf8CBeVDLGYkHcjMyFGZjNoVxk2pBcK4qOzOTevIxjSKdHPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727956688; a=rsa-sha256; cv=none; b=Pb9BR3hwVe2a1vGIAydAHX3OoLdtAi0zC63k/kDfqj0TbaJwtO6bKkNFuNWSgnm0wYs3Vm uPwg98LEG4at+Efp1rWZqqPy1yvxtZgu8JULSC/EhrB1/WdXGHJJoaGWZnbMkYS+fSaRbK PkUVqsgq3Ptn2QMREm9xSQm1u1pZ3446hsOqRzwki3BZA+Qb5iovdD1TG/UKx3jfMdmmq5 uBLzuY8ZeMSiXmwB2AD3kz0jq/PYFBUaQPy8LLcvbIDiG+CcS0Wp78YNNP2jZPU9GxZEQ9 m31jjl3RQzOSrnvB/LaU0jA1oSR+LUpiegZfF+uObTpQY/PV7kV/v+fUHkiCkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK9DJ3vNmzpkV; Thu, 3 Oct 2024 11:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493Bw8sj095467; Thu, 3 Oct 2024 11:58:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493Bw8hi095463; Thu, 3 Oct 2024 11:58:08 GMT (envelope-from git) Date: Thu, 3 Oct 2024 11:58:08 GMT Message-Id: <202410031158.493Bw8hi095463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 65074f6f3115 - main - pf: fix double ruleset evaluation for fragments sent to dummynet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65074f6f3115a066e5beda31787df626aed03696 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=65074f6f3115a066e5beda31787df626aed03696 commit 65074f6f3115a066e5beda31787df626aed03696 Author: Kajetan Staszkiewicz AuthorDate: 2024-10-03 08:28:57 +0000 Commit: Kristof Provost CommitDate: 2024-10-03 11:49:57 +0000 pf: fix double ruleset evaluation for fragments sent to dummynet The function `pf_setup_pdesc()` handles ruleset evaluation for non-reassembled packets. Having it called before `pf_mtag` is checked for flags `PF_MTAG_FLAG_ROUTE_TO` and `PF_MTAG_FLAG_DUMMYNET` will cause loops for fragmented packets if reassembly is disabled. Move `pd` zeroing and `pf_mtag` extraction from `pf_setup_pdesc()` to a separate function `pf_init_pdesc()` and change the order of function calls: first call `pf_init_pdesc()`, then check if the currently processed packet has been reinjected from dummynet, finally call `pf_setup_pdesc()`. Add functionality of sending UDP packets to `pft_ping.py` with fragmentation support and fix broken IPv6 reassembly. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46880 --- sys/netpfil/pf/pf.c | 62 +++++++++-------- tests/sys/netpfil/common/pft_ping.py | 107 +++++++++++++++++++++++++++-- tests/sys/netpfil/common/sniffer.py | 13 ++-- tests/sys/netpfil/pf/fragmentation_pass.sh | 43 ++++++++++++ 4 files changed, 188 insertions(+), 37 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index bbed285ab9f8..7edf65ae4a09 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8460,6 +8460,13 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, return (0); } +static void +pf_init_pdesc(struct pf_pdesc *pd, struct mbuf *m) +{ + memset(pd, 0, sizeof(*pd)); + pd->pf_mtag = pf_find_mtag(m); +} + static int pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, u_short *action, u_short *reason, struct pfi_kkif *kif, struct pf_krule **a, @@ -8469,21 +8476,18 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, { struct mbuf *m = *m0; - memset(pd, 0, sizeof(*pd)); + pd->af = af; pd->dir = dir; TAILQ_INIT(&pd->sctp_multihome_jobs); if (default_actions != NULL) memcpy(&pd->act, default_actions, sizeof(pd->act)); - pd->pf_mtag = pf_find_mtag(m); if (pd->pf_mtag && pd->pf_mtag->dnpipe) { pd->act.dnpipe = pd->pf_mtag->dnpipe; pd->act.flags = pd->pf_mtag->dnflags; } - pd->af = af; - switch (af) { #ifdef INET case AF_INET: { @@ -8918,30 +8922,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 return (PF_DROP); } - if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, kif, &a, &r, - &s, &ruleset, &off, &hdrlen, inp, default_actions) == -1) { - if (action != PF_PASS) - pd.act.log |= PF_LOG_FORCE; - goto done; - } - m = *m0; - - switch (af) { -#ifdef INET - case AF_INET: - h = mtod(m, struct ip *); - ttl = h->ip_ttl; - break; -#endif -#ifdef INET6 - case AF_INET6: - h6 = mtod(m, struct ip6_hdr *); - ttl = h6->ip6_hlim; - break; -#endif - default: - panic("Unknown af %d", af); - } + pf_init_pdesc(&pd, m); if (pd.pf_mtag != NULL && (pd.pf_mtag->flags & PF_MTAG_FLAG_ROUTE_TO)) { pd.pf_mtag->flags &= ~PF_MTAG_FLAG_ROUTE_TO; @@ -8974,6 +8955,31 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 return (PF_PASS); } + if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, kif, &a, &r, + &s, &ruleset, &off, &hdrlen, inp, default_actions) == -1) { + if (action != PF_PASS) + pd.act.log |= PF_LOG_FORCE; + goto done; + } + m = *m0; + + switch (af) { +#ifdef INET + case AF_INET: + h = mtod(m, struct ip *); + ttl = h->ip_ttl; + break; +#endif +#ifdef INET6 + case AF_INET6: + h6 = mtod(m, struct ip6_hdr *); + ttl = h6->ip6_hlim; + break; +#endif + default: + panic("Unknown af %d", af); + } + if (__predict_false(ip_divert_ptr != NULL) && ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL)) { struct pf_divert_mtag *dt = (struct pf_divert_mtag *)(mtag+1); diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index d8aafc884265..1caa26abe5f6 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -103,7 +103,7 @@ def send_icmp_ping(send_params): ip6 = prepare_ipv6(send_params) icmp = sp.ICMPv6EchoRequest(data=sp.raw(build_payload(send_length))) if send_frag_length: - for packet in sp.fragment(ip6 / icmp, fragsize=send_frag_length): + for packet in sp.fragment6(ip6 / icmp, fragSize=send_frag_length): packets.append(ether / packet) else: packets.append(ether / ip6 / icmp) @@ -141,6 +141,39 @@ def send_tcp_syn(send_params): sp.sendp(req, iface=send_params['sendif'], verbose=False) +def send_udp(send_params): + LOGGER.debug(f'Sending UDP ping') + packets = [] + send_length = send_params['length'] + send_frag_length = send_params['frag_length'] + ether = sp.Ether() + if ':' in send_params['dst_address']: + ip6 = prepare_ipv6(send_params) + udp = sp.UDP( + sport=send_params.get('sport'), dport=send_params.get('dport'), + ) + raw = sp.Raw(load=build_payload(send_length)) + if send_frag_length: + for packet in sp.fragment6(ip6 / udp / raw, fragSize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip6 / udp / raw) + else: + ip = prepare_ipv4(send_params) + udp = sp.UDP( + sport=send_params.get('sport'), dport=send_params.get('dport'), + ) + raw = sp.Raw(load=build_payload(send_length)) + if send_frag_length: + for packet in sp.fragment(ip / udp / raw, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip / udp / raw) + + for packet in packets: + sp.sendp(packet, iface=send_params['sendif'], verbose=False) + + def send_ping(ping_type, send_params): if ping_type == 'icmp': send_icmp_ping(send_params) @@ -149,8 +182,10 @@ def send_ping(ping_type, send_params): ping_type == 'tcp3way' ): send_tcp_syn(send_params) + elif ping_type == 'udp': + send_udp(send_params) else: - raise Exception('Unspported ping type') + raise Exception('Unsupported ping type') def check_ipv4(expect_params, packet): @@ -345,6 +380,30 @@ def check_tcp(expect_params, packet): return True +def check_udp(expect_params, packet): + expect_length = expect_params['length'] + udp = packet.getlayer(sp.UDP) + if not udp: + LOGGER.debug('Packet is not UDP!') + return False + raw = packet.getlayer(sp.Raw) + if not raw: + LOGGER.debug('Packet contains no payload!') + return False + if raw.load != build_payload(expect_length): + LOGGER.debug(f'Payload magic does not match len {len(raw.load)} vs {expect_length}!') + return False + orig_chksum = udp.chksum + udp.chksum = None + newpacket = sp.Ether(sp.raw(packet[sp.Ether])) + new_chksum = newpacket[sp.UDP].chksum + if new_chksum and orig_chksum != new_chksum: + LOGGER.debug(f'Wrong UDP checksum {orig_chksum}, expected {new_chksum}!') + return False + + return True + + def check_tcp_syn_request_4(expect_params, packet): if not check_ipv4(expect_params, packet): return False @@ -391,6 +450,14 @@ def check_tcp_3way_4(args, packet): return False +def check_udp_request_4(expect_params, packet): + if not check_ipv4(expect_params, packet): + return False + if not check_udp(expect_params, packet): + return False + return True + + def check_tcp_syn_request_6(expect_params, packet): if not check_ipv6(expect_params, packet): return False @@ -437,6 +504,13 @@ def check_tcp_3way_6(args, packet): return False +def check_udp_request_6(expect_params, packet): + if not check_ipv6(expect_params, packet): + return False + if not check_udp(expect_params, packet): + return False + return True + def check_tcp_syn_request(args, packet): expect_params = args['expect_params'] src_address = expect_params.get('src_address') @@ -481,6 +555,21 @@ def check_tcp_3way(args, packet): return check_tcp_3way_4(args, packet) +def check_udp_request(args, packet): + expect_params = args['expect_params'] + src_address = expect_params.get('src_address') + dst_address = expect_params.get('dst_address') + if not (src_address or dst_address): + raise Exception('Source or destination address must be given to match the tcp syn request!') + if ( + (src_address and ':' in src_address) or + (dst_address and ':' in dst_address) + ): + return check_udp_request_6(expect_params, packet) + else: + return check_udp_request_4(expect_params, packet) + + def setup_sniffer( recvif, ping_type, sniff_type, expect_params, defrag, send_params, ): @@ -494,8 +583,10 @@ def setup_sniffer( checkfn = check_tcp_syn_reply elif ping_type == 'tcp3way' and sniff_type == 'reply': checkfn = check_tcp_3way + elif ping_type == 'udp' and sniff_type == 'request': + checkfn = check_udp_request else: - raise Exception('Unspported ping or sniff type') + raise Exception('Unspported ping and sniff type combination') return Sniffer( {'send_params': send_params, 'expect_params': expect_params}, @@ -513,7 +604,7 @@ def parse_args(): parser.add_argument('--to', required=True, help='The destination IP address for the ping request') parser.add_argument('--ping-type', - choices=('icmp', 'tcpsyn', 'tcp3way'), + choices=('icmp', 'tcpsyn', 'tcp3way', 'udp'), help='Type of ping: ICMP (default) or TCP SYN or 3-way TCP handshake', default='icmp') parser.add_argument('--fromaddr', @@ -612,7 +703,13 @@ def main(): sniffers = [] if send_params['frag_length']: - defrag = True + if ( + (send_params['src_address'] and ':' in send_params['src_address']) or + (send_params['dst_address'] and ':' in send_params['dst_address']) + ): + defrag = 'IPv6' + else: + defrag = 'IPv4' else: defrag = False diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py index 14305a37278c..583b27d34ca6 100644 --- a/tests/sys/netpfil/common/sniffer.py +++ b/tests/sys/netpfil/common/sniffer.py @@ -56,14 +56,19 @@ class Sniffer(threading.Thread): def run(self): self.packets = [] - if self._defrag: - # With fragment reassembly we can't stop the sniffer after catching - # the good packets, as those have not been reassembled. We must - # wait for sniffer to finish and check returned packets instead. + # With fragment reassembly we can't stop the sniffer after catching + # the good packets, as those have not been reassembled. We must + # wait for sniffer to finish and check returned packets instead. + if self._defrag == 'IPv4': self.packets = sp.sniff(session=sp.IPSession, iface=self._recvif, timeout=self._timeout, started_callback=self._startedCb) for p in self.packets: self._checkPacket(p) + elif self._defrag == 'IPv6': + self.packets = sp.sniff(session=sp.DefaultSession, iface=self._recvif, + timeout=self._timeout, started_callback=self._startedCb) + for p in sp.defragment6(self.packets): + self._checkPacket(p) else: self.packets = sp.sniff(iface=self._recvif, stop_filter=self._checkPacket, timeout=self._timeout, diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh index d505accba5f2..99d2c827b239 100644 --- a/tests/sys/netpfil/pf/fragmentation_pass.sh +++ b/tests/sys/netpfil/pf/fragmentation_pass.sh @@ -553,6 +553,48 @@ dummynet_nat_cleanup() pft_cleanup } +atf_test_case "dummynet_fragmented" "cleanup" +dummynet_fragmented_head() +{ + atf_set descr 'Test dummynet on NATed fragmented traffic' + atf_set require.user root +} + +dummynet_fragmented_body() +{ + pft_init + dummynet_init + + # No test for IPv6. IPv6 fragment reassembly can't be disabled. + setup_router_dummy_ipv4 + + jexec router dnctl pipe 1 config delay 1 + + pft_set_rules router \ + "set reassemble no" \ + "block" \ + "pass inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in on ${epair_tester}b inet proto udp dnpipe (1, 1)" \ + "pass out on ${epair_server}a inet proto udp" \ + + ping_dummy_check_request exit:0 --ping-type=udp --send-length=10000 --send-frag-length=1280 + + rules=$(mktemp) || exit 1 + jexec router pfctl -qvsr > $rules + + # Count that fragmented packets have hit the rule only once and that + # they have not created states. There is no stateful firewall support + # for fragmented packets. + grep -A2 'pass in on epair0b inet proto udp all keep state dnpipe(1, 1)' $rules | + grep -qE 'Packets: 8\s+Bytes: 10168\s+States: 0\s+' || + atf_fail "Fragmented packets not counted correctly" +} + +dummynet_fragmented_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "too_many_fragments" @@ -566,4 +608,5 @@ atf_init_test_cases() atf_add_test_case "reassemble_slowpath" atf_add_test_case "dummynet" atf_add_test_case "dummynet_nat" + atf_add_test_case "dummynet_fragmented" } From nobody Thu Oct 3 13:52:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKCmL4815z5YLkd; Thu, 03 Oct 2024 13:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKCmL34hJz4V5j; Thu, 3 Oct 2024 13:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727963554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CyyJMBCKP0bn19SQhEFSE4ZgHdtJ2XsrTfrcX8oH7PQ=; b=TNSbFrIkUJBsyt6Y8a0orRnz+XbypVJdLU/7b11FJBVK5wLo99xSxE7eZwWJVCTlXZu/yq NobYj5lhl/R558BJgDmsoDk8XSyuUKT6E5IzLsTxD5PS7o6lt5CGDW5FLNvEavkWNU1tfb HhP/02fPAMn8ckPD66oaqkNQBs8HE43QW6Z90KxFpLiTRL1W9gbWHybIKRA0pnQyA5IL61 rk6Yp5NddsVX2arWEHHYgMR3d5SOIDQK1vm7Y3D8pJXqVHVIHfT+jzrFcBWz4UnYimdc5i g1bzF1FuuZ0UXJrz7pKcCqFokWWf0goPsq2nx9Cg44OqNN5FnC9TdP1PvEaBow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727963554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CyyJMBCKP0bn19SQhEFSE4ZgHdtJ2XsrTfrcX8oH7PQ=; b=jegy3pEpopMiEIxYLFsYCOKfDUB3/HBpQzS7kgVY/+UR0dyor0DoRwyCleK2nxvk0Zk57W K4+tccMSqH2xcoGm6Jmu5vuIoVY0UzZgo/9Z9C0gNTFaFshCUrjfirXEsNuFGQ1mgCIa6f LQ51rMClZjJpbanS9rv2C7ubuagr1AcrYgqAoZqoqwdYWZnneArvnbQvzYZaa+LG7DGHaA xFNogQEcOLYbmlfLYpJGpccuiCa0JhX8+XbYyXOVonWTCzBw/jmVxlHt401mRzt7oLhyq0 NfSVlDygA7LoR1Me6xwzdzue/uw5eRoak5/94PXFjgAYmiTkozdwtDOALTNkzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727963554; a=rsa-sha256; cv=none; b=aIyy1hd/3JgtdUTssGpfHJx1a5uuQ3UBGqNNroujNAqWcHMrr2sLPtEIewwZJeA3o5Bbtq GAmu9UqdWUxEr3JOsPDT5fTDD3ffbhYuaZ22RHYQ3AMvyDCqWiZlJQwfNTdLPlsxFLML5l ksdW330WiRzMmVqFC+MFvl3FYIWI+ig3CH8xzderclOV/bs/D4r9bREi/CiqvG12GOrALr moclHGVThfw5ExvVzQLV7uKOUad3YdrhxuzV1qeLc0ugvezKlLZCe9WOQKOTPJ4OYetVyn t84q1Syzi9/736o3EyVKzW6bJZroi6/n1xz6pAsSAVORBSYwlo45/bqRbiQoCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKCmL2h71zstX; Thu, 3 Oct 2024 13:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493DqYgF097300; Thu, 3 Oct 2024 13:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493DqYH4097297; Thu, 3 Oct 2024 13:52:34 GMT (envelope-from git) Date: Thu, 3 Oct 2024 13:52:34 GMT Message-Id: <202410031352.493DqYH4097297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 79a0d14fa05c - main - loader: dosfs fails to access directory data with large cluster number List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79a0d14fa05c75038caa52099289effb85732f88 Auto-Submitted: auto-generated The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=79a0d14fa05c75038caa52099289effb85732f88 commit 79a0d14fa05c75038caa52099289effb85732f88 Author: Toomas Soome AuthorDate: 2024-10-03 11:54:11 +0000 Commit: Toomas Soome CommitDate: 2024-10-03 13:51:59 +0000 loader: dosfs fails to access directory data with large cluster number fsize is using 2 bytes for cluster number, but with fat32 we actually do have 4 bytes and with large disks the high bytes will be in use. illumos issue: https://www.illumos.org/issues/16821 Sponsored by: MNX Cloud, Inc. MFC after: 1 week --- stand/libsa/dosfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c index 7fbbf65989ae..2ee95bf2c601 100644 --- a/stand/libsa/dosfs.c +++ b/stand/libsa/dosfs.c @@ -815,7 +815,7 @@ fsize(DOS_FS *fs, DOS_DE *de) int n; if (!(size = cv4(de->size)) && de->attr & FA_DIR) { - if (!(c = cv2(de->clus))) { + if (!(c = stclus(fs->fatsz, de))) { size = fs->dirents * sizeof(DOS_DE); } else { if ((n = fatcnt(fs, c)) == -1) From nobody Thu Oct 3 15:07:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKFQk26Dhz5YQys; Thu, 03 Oct 2024 15:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKFQk1DWkz4f0S; Thu, 3 Oct 2024 15:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727968046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6VBPrZSyCIKoDvfO8rhPX6tLoHihoprHYWjqbpwLnBo=; b=qWGY3Z0pInOKzpEqgxEWcICZ9Ddz5YgC5OOfBayeX0ajpFxPvvxfvK6RGw/bo0kt3BgAz/ sWlGyyWg71ZsVc82qJD8pDysFRKaUB4ko/E4a8Flu2tK90fiGowTG6DVm6y254IMEBV0Zl NDVX+5YW0zU3VAywSqtmkvQqqOFGawvfTHoHMVYxGvXP2vlxqZYShlrEKQVcYzkuCKFsKu Sn9hJ5d5IcaoBcf18T2iHw0J/cx3uH6l+c9ubwiCkF/tqt0vYEEE/qezjdZ6YI7VdLe9fJ f7okmG1ka7mHsLmoxilwiBBubPZXmoqC/CJaWsbRfdfAJfj9CIm4OKte13BW3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727968046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6VBPrZSyCIKoDvfO8rhPX6tLoHihoprHYWjqbpwLnBo=; b=ZPDg0A5pJgZ4BCITLid3iDWKheZxufpUC3hLUcahvbHGWNfIyVF7RGjKmonGEr3GBUuUdd +r3gmNwxnzCoT4+h29XanzQAWmEaTzvmK/4p6HYi3XeAPj4mHt5MuFKSP8VSc8rYy3Lhit il6E2ezcEr8TTtytQFRXRKcjL+6a0s4RRwjfzyiUSO+EZ3FYhyoWH32TZnbyRA02kjomVK Y2FKg8Imx5x1sqpB5usrUQFXiNiFo4+mxrMW5/ApipPJZvK6EqGllFq7qC6DEtrYOk0/aq 8I4SWCctrM383viiAKUnhnREOVSXnWVquIrZQVRQUNA0LSowm+JqBXkWeL8TvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727968046; a=rsa-sha256; cv=none; b=mJTxOoteMg6y0VapywDU0+f1sdGGkGAdVC0sjm8KstJ8396w/SaTO0M2KTIrbxxfYBlzZt dTZJ/AM1nmDzbdol1hwCsg+mYIAZlEgUe7VihYOzSUQUlk0rVvuwbtaQ+sMYI//FOKNXoL AwlxKWiXlFtVl3Vm/XJzAtBYipB5CBSfvdpMS4zhwGvEXwqYRFXMFhnVr/mcXEGJZ3ZgLs JuLr7SLfZBBf/iVzpri8RaMWStULRDf4cDa1s/JsL28tkBkAXtam/1iMJ4Ge/kfD+6xfZp XzS5OnaWjdzBOciJWXhtXZnIl1r35xOtYLEJjev43I80UMOoGeCd8T5ExuGD7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKFQk0GD2zw3y; Thu, 3 Oct 2024 15:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493F7PdZ018714; Thu, 3 Oct 2024 15:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493F7Pac018711; Thu, 3 Oct 2024 15:07:25 GMT (envelope-from git) Date: Thu, 3 Oct 2024 15:07:25 GMT Message-Id: <202410031507.493F7Pac018711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 5b21d4ad060a - main - Ensure that soft updates are not enabled by default when using mdmfs(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b21d4ad060acb06c72e0458daebec9bcbf0cefd Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=5b21d4ad060acb06c72e0458daebec9bcbf0cefd commit 5b21d4ad060acb06c72e0458daebec9bcbf0cefd Author: Kirk McKusick AuthorDate: 2024-10-03 15:05:42 +0000 Commit: Kirk McKusick CommitDate: 2024-10-03 15:06:28 +0000 Ensure that soft updates are not enabled by default when using mdmfs(8) When soft updates began being enabled by default that change carried over to mdmfs(8) which does not want or need them. This fix ensures that they are only enabled in mdmfs(8) when requested with the -U flag. Reported by: Ivan Rozhuk Tested by: Ivan Rozhuk PR: 279308 MFC after: 1 week --- include/paths.h | 3 +++ sbin/mdmfs/mdmfs.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/paths.h b/include/paths.h index 86900664230b..f8861ea4e5a8 100644 --- a/include/paths.h +++ b/include/paths.h @@ -89,6 +89,7 @@ #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" #define _PATH_TTY "/dev/tty" +#define _PATH_TUNEFS "/sbin/tunefs" #define _PATH_UNIX "don't use _PATH_UNIX" #define _PATH_UFSSUSPEND "/dev/ufssuspend" #define _PATH_VI "/usr/bin/vi" @@ -138,6 +139,8 @@ __END_DECLS #define _PATH_REBOOT "/rescue/reboot" #undef _PATH_RM #define _PATH_RM "/rescue/rm" +#undef _PATH_TUNEFS +#define _PATH_TUNEFS "/rescue/tunefs" #undef _PATH_VI #define _PATH_VI "/rescue/vi" #undef _PATH_WALL diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index 93fa9e8ff0c0..69149b3fb465 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -104,7 +104,7 @@ main(int argc, char **argv) bool detach, softdep, autounit, newfs; const char *mtpoint, *size_arg, *skel, *unitstr; char *p; - int ch, idx; + int ch, idx, rv; void *set; unsigned long ul; @@ -357,6 +357,13 @@ main(int argc, char **argv) do_mdconfig_attach(mdconfig_arg, mdtype); if (newfs) do_newfs(newfs_arg); + if (!softdep) { + rv = run(NULL, "%s %s /dev/%s%d", _PATH_TUNEFS, + "-n disable", mdname, unit); + if (rv) + errx(1, "tunefs exited %s %d", run_exitstr(rv), + run_exitnumber(rv)); + } do_mount_md(mount_arg, mtpoint); } From nobody Thu Oct 3 16:07:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKGmV6nKkz5YVSM; Thu, 03 Oct 2024 16:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKGmV6GQcz4lpN; Thu, 3 Oct 2024 16:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727971674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+Jyu1AUKzYZVanX1iYy/V6cq8fDr2ytEIew6k6bJWg=; b=BejUYWcXGs0vFJh1lNkBTb3mKRsRugmLkm2fMO1LQ8EL9dOrnZLDHvOs6+G9Vt/dK3Jevs 3LQ2ZvCS6E/eM/GK/D85JZncf5K/qKvKQXYtohHixTnSHNA9dj+tL4hsar25AYoXuUNDaF Qne2W75CkIEswaAJXZH8xUaLxG3WQ6A8x9IV8nkDMC1NRrGBzL7kyLum0Q1Et4We2yl0cE ra0tqmOtUaagoTTLiLrATWn9XInRxU+6sQl8rl6lqWfFY7hdrAU3PXYoXDPa2b/gUN62AR lsLRpFrZDQZLdwV2UOajy95oLuaC38a9sbXvOZ9qKw2ctV8/qwPmfT6GAt7mQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727971674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+Jyu1AUKzYZVanX1iYy/V6cq8fDr2ytEIew6k6bJWg=; b=DMH/TC4vqJTJDM444st6fohGiiW8dvTBnHUUP38XUihtmf8V0rg/JlvbOwn249l0cQHGJ0 JsYz7KIYPHhHqdcERWRrLpvNttVc7gDxIDgf3kOvIWwqrrmvSsCGFNZjuknd7MlDH090Mq rLSG0G1AeCDNAtCYFxMeeVKDI9qQ/17IOod/1QFXQTpTmC2MAtVwYYvMAfhqldiQi1MtHS 6rPgXyevQFaWrUjI+irAY9SGFT63IqTXofwxiYGXcV3gfmPTYl8dp//LUqUgwLhQ/fegYG 0jlCAoDy2YWvJN5K/fOANNZF5Noh1oLOE6nJuX40mhnhl6deR2DWhZXfzWT2gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727971674; a=rsa-sha256; cv=none; b=ZOKaX0SuzyfBbDlbSajiypg5s6cszU5xTMS6d4EAHKnvCnpvOXFWvaDl/yzhFoFTVzyygK RUIM7URrx2xRGR13zmZnkjyl00MTFbW3xIdYeQrStXlaFfJsNbdp4yuC3bZKdDR84uD2s8 t+5JgVmNvuZwNvEHEVix4SNjo6NXUGfGeSnvxAh07in4t5HvfkWRbYMxiW33sQC4TB43Xm d6FilGzelw6jYCVAbKvvJOZNG1fRPisCuFRflNiu3mram7UgPkcBKUjNAGHIE7xVpjNm64 CdAqMeKyHrCJHtZ/6w89DrMpCiqJyStBN8SaCk+sKlbtk5AMI0g2HUaANV1Pkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKGmV5sYMzx5T; Thu, 3 Oct 2024 16:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493G7s3K020329; Thu, 3 Oct 2024 16:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493G7sZI020326; Thu, 3 Oct 2024 16:07:54 GMT (envelope-from git) Date: Thu, 3 Oct 2024 16:07:54 GMT Message-Id: <202410031607.493G7sZI020326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 59f5f100b774 - main - openzfs: Reduce local diffs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59f5f100b774de8824fb2fc1a8a11a93bbc2dafd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59f5f100b774de8824fb2fc1a8a11a93bbc2dafd commit 59f5f100b774de8824fb2fc1a8a11a93bbc2dafd Author: John Baldwin AuthorDate: 2024-10-03 16:07:43 +0000 Commit: John Baldwin CommitDate: 2024-10-03 16:07:43 +0000 openzfs: Reduce local diffs These are all local diffs that have no functional change. Reviewed by: mav, emaste Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D46530 --- sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h | 2 -- sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h index 2fd806e1a0b5..cf3c712c6af2 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h @@ -49,9 +49,7 @@ #include #include -/* FreeBSD doesn't support floating point on powerpc kernel yet */ #define kfpu_allowed() 0 - #define kfpu_initialize(tsk) do {} while (0) #define kfpu_begin() do {} while (0) #define kfpu_end() do {} while (0) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h index 6b4f4011ee48..8e93b558dfe8 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h @@ -40,7 +40,6 @@ #define kfpu_allowed() 1 #define kfpu_initialize(tsk) do {} while (0) - #define kfpu_begin() { \ if (__predict_false(!is_fpu_kern_thread(0))) \ fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX);\ diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 9e8a4d62f641..4d539461886b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -686,7 +686,7 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) * The check below facilitates the idiom of repeating calls until the * count to return is 0. */ - if (zfs_uio_offset(&uio) == 3 * sizeof(entry)) { + if (zfs_uio_offset(&uio) == 3 * sizeof (entry)) { return (0); } From nobody Thu Oct 3 17:08:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKJ6m4kKYz5YYZn; Thu, 03 Oct 2024 17:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKJ6m4DHRz4sdb; Thu, 3 Oct 2024 17:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727975328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4XnHe64b29DVM6uJcgf/ifrF1+cVjd4gV+mgynxgkI0=; b=WnVYM4pORbQsxirB0IZEdGt0iNrhyLwS8cfATfhErjPH1jZ9TGuurBN7T78kovTS/Zst7H S7lv0bdYJmDsH2vrxHF7Cpu0zBZu2Nv+mCbiGMWD/uU6YpHfjEbCr33Hbic1/sHnM1PYuS Oh4foQuSvUGjAIlaklrVKdCCQ8KMBS/gv/K8QXInJaLcxWIGc5t2xpOX+t/dxlq2Q+q+oy 93lzCXbozgc3Nob7RlooUyWLOKwwq2ifPOTmJ8tE5JtLCWhD1GNjx6BQAQc90Ldr9vZG+1 T7lMN1KdSE0RhaNvISi7/YxKKdzsgQUBa6NNjwYPY/cg2pKn7AaFaOFwxduVDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727975328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4XnHe64b29DVM6uJcgf/ifrF1+cVjd4gV+mgynxgkI0=; b=GaXHp4sQB0yEH54pAcPQTD/LjLBrEKOrrXwO4UEGVdXVz6JF3GKyZiMXF2IJGAIeA1J+9F 0ZSaiREkeIHJeVvYcWszbyhfiHKcQ90sw1UioXTNzaMBXTY6FzGtQHZt5u8nQZImwc4tLl 8MzUDxWliYx07oEjzMYpxlwAXLaEFST5rLqmu+EMq3drpM/ILis2A+VTwjVYOtJzG296KD 90xKCXcWRXoc/UFdaH6K67yI/y4ziL43KVtds2DgUeeGBGfkevW6o8IfrwXJBka0VwLxpD JBByoz011Ql3d1j6V0vcJvqTUkYGIeUBfmk9o94nRirf0Y0vF4TFFWHprWqhdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727975328; a=rsa-sha256; cv=none; b=kbVWKxw+eh0zDcJjTrrU5JVDoz+k13Q9OEXQodJmofP0UJpW67wzHd+RVLD59bLpSwRMiS 0kMRe8XqmaqN3OMinttTdbZRXAJn5yQ+6GCeSW4fL9Wf55cnVPbnxrkw336BQsKSnHC9Ok 2bgxWB8zC8W2qgb3sMcqGSQRZfEHTnxqgBAwNKHqbGV8eR8naFufQTgVjeJoj+I/bck+TE 16DVABQAJMpFd2HLkDwLxEirZkFggr4LNmVMTBl+kVOLQCMtLS5eVq8ekc1kg2N12XNXPH Ww1+A//yqMI8iYZcOXZX9nFZ1NYMOGfEKNGlWkBGevaQea71W7NNkpZlVvY2Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKJ6m3qxWzywb; Thu, 3 Oct 2024 17:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493H8mx3021562; Thu, 3 Oct 2024 17:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493H8mVu021559; Thu, 3 Oct 2024 17:08:48 GMT (envelope-from git) Date: Thu, 3 Oct 2024 17:08:48 GMT Message-Id: <202410031708.493H8mVu021559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0f1d5bfb7297 - main - sysent: fix a couple more do-no-edit comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f1d5bfb7297aca850a8c499a7b7fd0fd440cd50 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0f1d5bfb7297aca850a8c499a7b7fd0fd440cd50 commit 0f1d5bfb7297aca850a8c499a7b7fd0fd440cd50 Author: Brooks Davis AuthorDate: 2024-10-03 16:59:32 +0000 Commit: Brooks Davis CommitDate: 2024-10-03 17:01:30 +0000 sysent: fix a couple more do-no-edit comments Add blank like after comment to align with upcoming refactor for makesysent.lua. Fixes: 0d490c6a445a sysent: make header comments more consistent --- sys/tools/makesyscalls.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 5e6c40c801d4..054e19e24d43 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -1547,6 +1547,7 @@ write_line("libsysmap", string.format([[/* * * DO NOT EDIT-- this file is automatically %s. */ + FBSDprivate_1.0 { ]], generated_tag)) @@ -1557,6 +1558,7 @@ write_line("libsys_h", string.format([[/* * * DO NOT EDIT-- this file is automatically %s. */ + #ifndef __LIBSYS_H_ #define __LIBSYS_H_ From nobody Thu Oct 3 17:08:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKJ6n5SmWz5YYlG; Thu, 03 Oct 2024 17:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKJ6n4nbdz4sb2; Thu, 3 Oct 2024 17:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727975329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fspuXci2qgD4w1FCuBClfnBUyzixQEfr0kqXuGtU8qY=; b=CB00pEi4M+kr882Anesxi0xKPIl7jMvq7ubtSQoFpnC5zDs/4bLRpc+lxo9PVLEiNjREXR 1Yv0jHcf/vJLP4dXGdDIF/5cTqpAyyNtFo4/4K2gBtr+DQj4ICYshbLrM87Q7eE7M7ddqr nhmOF/WhZmmVeHEM06IPI4oUj+CY0Zc/+0tLCHYQ1vOaCpy5jta2FWaMRS0SHAH6x185qg KfJ5DgORL7kfCN2paONA67ls8+9/Uv/fjLDHhhCkxOsxWeeJKkpSnC1ghYXPXQjE6Fe2m3 KZmJ56J6wADPy6vIgHW/mnxjhnBFVZLkjR7e3MgTLUuqB7Ggmxl8wRhLQilYVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727975329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fspuXci2qgD4w1FCuBClfnBUyzixQEfr0kqXuGtU8qY=; b=V532FEOr7rW3IqCgOc09hWEE5SsrA91aGEuReYdNWnyLoqQaQNamw43LHyw06txsFeM/w1 x/ZElX1XdT8H6uPUaRBxFIEDL4qIXVhleyPmg+RG2E/1ZWVBQ4dCUDCRReWX89iWRxtHNY OG7do4Dp/SIJ8jsVKFaGv/uUltmAAKlvjwbYZapkytPTNSfdHJonFwdZvBrLFl0ImseQiY oSVNwzJ0nmb/wbZfdNNXZNiHo1wfwU43lCcNz1wdrScvPpLtB30VOTJi/o7dcsliyOJMp3 rUiiB4OazHTy/qwmLV3kdmtPYjmd3sQBZuhCP/i/T2WEwJmXhtMXCmvI0ZibnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727975329; a=rsa-sha256; cv=none; b=RA2waZucKj8+NCOQRi8buxFcvmzIjfzdLg/7oMCC9UoTHKRE9//IAkoG1e8GGEP06Zfhli 3sJ6WgkGz08bHaneFubHgwCIGQk+4hLb+OizMc0fHeFn1yMS/g+6LyaA+Qfy+R/FLExuuK eWq+ZlkMJ1698xFGTr/r7fh7ZvWgfGBiaexhDyqW6pNdnwnx7PU9judSjiv7SLTmH9KJlG 8fHUUcH3zcyb8351JaJwYxYOR6u3gXVORsaWPk+sGkCKJ285zUanOOIvQ4dAxnBr6hh3k2 ncODdir9sQQozaN7JRO1S4TsT/zP4WKEquASjMQDhkFmpRidLNMel0zI6Jq+cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKJ6n4P6yzyM8; Thu, 3 Oct 2024 17:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493H8nNT021604; Thu, 3 Oct 2024 17:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493H8n3Y021601; Thu, 3 Oct 2024 17:08:49 GMT (envelope-from git) Date: Thu, 3 Oct 2024 17:08:49 GMT Message-Id: <202410031708.493H8n3Y021601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a57e881d3297 - main - sysent: regen comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a57e881d3297eb1d37d0edeee28362a23824a1d4 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a57e881d3297eb1d37d0edeee28362a23824a1d4 commit a57e881d3297eb1d37d0edeee28362a23824a1d4 Author: Brooks Davis AuthorDate: 2024-10-03 17:00:49 +0000 Commit: Brooks Davis CommitDate: 2024-10-03 17:01:30 +0000 sysent: regen comments --- lib/libsys/_libsys.h | 1 + lib/libsys/syscalls.map | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index fcb10ad40c8e..00d966661786 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -5,6 +5,7 @@ * * DO NOT EDIT-- this file is automatically @generated. */ + #ifndef __LIBSYS_H_ #define __LIBSYS_H_ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 334077c6bb2f..62a2a2005262 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -3,6 +3,7 @@ * * DO NOT EDIT-- this file is automatically @generated. */ + FBSDprivate_1.0 { _syscall; __sys_syscall; From nobody Thu Oct 3 17:50:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKK2W2cqTz5Ybnj; Thu, 03 Oct 2024 17:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKK2W0qGVz4vwc; Thu, 3 Oct 2024 17:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727977811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0nqykDUdJG9HVxNZbbPVloHv4aeBeaKChjhOGdlLIQM=; b=MdknsbOqOQyNC4axwBDg/5yrxTXfrpCESFSz+MEboVNEqIbjiXKyumQ0iXmExS//TFLHqx XzhxnoUY5PoNee4yDS+VDwnqDC4KXl5GPBFGQz5OItTCnY5hqZmcMPbbkHKgl6OcRtfyAf Kcr2Gjqqe1Tramrls8CfUmGdAfg7Jxa9sOfIpI5Ep5k261OxaSi2tIbQO2wt9F+veIsDKQ 2HwtwoolBtRl1ooxK08lWGJqocyQ1x0yQ2u95raiFwgFznYd24CQsVsZxXyZwaORpFKuoY YQPzAfrgcgwhTjSOLFEOBfkYFHTsjdSwiJqvkKvnupgkxv2f8t1XmNjT+066Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727977811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0nqykDUdJG9HVxNZbbPVloHv4aeBeaKChjhOGdlLIQM=; b=LYyZ25IAaKOcWjqFnc9tt4EBsOZcZ20c/BsrfjxWHz6hvOEGzwuigh5xzk29eq0duOBaIS 1Rct7wX4cnoBx6czgRG9MCtHkgMnb3XM7zh8DkDTCiajsOzrWn4dbL8jjfw69w9PpSmGxH SrV+ppkUyOdd6CSzOLh0HV4XLUlQMt4qR2Tn1B6z1hu3uKlIfAM28XydMjoYmk8YndoAD3 lAkwmvStFjZf+2B/k6NsL0g9lwZbaaWDuzHa8Ql97tIjWFVPKwLfJPsX8kSlVBZ3h3+cb8 XumsI6GT00s6e+/GO9blc02pA37qBJSGRCFrr2oEMY6r07oQKbZNFqRgmeNAqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727977811; a=rsa-sha256; cv=none; b=TYUWwiGXinR2EW3bs/G01nSGUOKiTV+KSnsq3qAdHkOpFtKa4Lvag8J6mOtoEhcoI0O14q Rtf1z/HiUYUlFWKovfWzy/Xl1pUoZ2QtGM6Q/7jgS+MABWWlOPJ+5HtagQLvWhF93hvtDi 8s4x3GkZlWip+fAK6/tKiVDkj/VL9KUQLyvfaK0c2U3whC/VDixp3KoGB4+GJNJuMOCQ2J TKioNjxNjpUcZJdi7kColaQRZ9Ihhfj/vGqmUFei0qnZoDs9/TMUCeqoUbaCaJgwb0dHVH a1+rHNm5UfNAQn9uMkT5qikPjVlldvC2YWArBr6XOeQ067UuYG7n7bJJNq3D6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKK2W0Qpdz10PS; Thu, 3 Oct 2024 17:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493HoBNW093341; Thu, 3 Oct 2024 17:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493HoAa4093336; Thu, 3 Oct 2024 17:50:10 GMT (envelope-from git) Date: Thu, 3 Oct 2024 17:50:10 GMT Message-Id: <202410031750.493HoAa4093336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2d69f02c5745 - main - stats.3: Fix "skipping end of block" syntax errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d69f02c5745a89c01bcd76389d53fd2a4189f02 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2d69f02c5745a89c01bcd76389d53fd2a4189f02 commit 2d69f02c5745a89c01bcd76389d53fd2a4189f02 Author: Graham Percival AuthorDate: 2024-09-24 18:11:03 +0000 Commit: Mitchell Horne CommitDate: 2024-10-03 17:49:09 +0000 stats.3: Fix "skipping end of block" syntax errors These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. There was a small misunderstanding about the mdoc format: a 1-line enclosure does not need a closing tag. For example, Pc is for closing an Po; if a line uses Pq (enclose the remainder of this line), there's no need for Pc. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1434 --- share/man/man3/stats.3 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/share/man/man3/stats.3 b/share/man/man3/stats.3 index 4dfb1dac63a2..7fe1fa613def 100644 --- a/share/man/man3/stats.3 +++ b/share/man/man3/stats.3 @@ -102,17 +102,17 @@ .Fc .Ft struct voistatspec .Fo "STATS_VSS_CRHIST<32|64>_USR" -.Fa Sy "HBKTS" Ns Pq Sy "CRBKT" Ns ( Em "lb" ) , "..." Pc , +.Fa Sy "HBKTS" Ns Pq Sy "CRBKT" Ns ( Em "lb" ) , "..." , .Fa "vsdflags" .Fc .Ft struct voistatspec .Fo "STATS_VSS_DRHIST<32|64>_USR" -.Fa Sy "HBKTS" Ns Pq Sy "DRBKT" Ns ( Em "lb" , "ub" ) , "..." Pc , +.Fa Sy "HBKTS" Ns Pq Sy "DRBKT" Ns ( Em "lb" , "ub" ) , "..." , .Fa "vsdflags" .Fc .Ft struct voistatspec .Fo "STATS_VSS_DVHIST<32|64>_USR" -.Fa Sy "HBKTS" Ns Pq Sy "DVBKT" Ns ( Em "val" ) , "..." Pc , +.Fa Sy "HBKTS" Ns Pq Sy "DVBKT" Ns ( Em "val" ) , "..." , .Fa "vsdflags" .Fc .Ft struct voistatspec @@ -316,16 +316,16 @@ The maximum VOI value. The minimum VOI value. .It Dv VS_STYPE_HIST A static bucket histogram of VOI values, including a count of -.Dq out-of-band/bucket Dc +.Dq out-of-band/bucket values which did not match any bucket. Histograms can be specified as -.Dq Em C Ns ontinuous Em R Ns ange Dc -.Pq CRHIST Pc , -.Dq Em D Ns iscrete Em R Ns ange Dc -.Pq DRHIST Pc +.Dq Em C Ns ontinuous Em R Ns ange +.Pq CRHIST , +.Dq Em D Ns iscrete Em R Ns ange +.Pq DRHIST or -.Dq Em D Ns iscrete Em V Ns alue Dc -.Pq DVHIST Pc , +.Dq Em D Ns iscrete Em V Ns alue +.Pq DVHIST , with 32 or 64 bit bucket counters, depending on the VOI semantics. .It Dv VS_STYPE_TDGST A dynamic bucket histogram of VOI values based on the t-digest method @@ -433,15 +433,15 @@ Where templates need to be referenced via textual means, for example via a MIB variable, the following string based template spec formats can be used: .Bl -enum .It -.Qq Qc Ns +.Qq Ns : .Ns , for example -.Qq TCP_DEFAULT Qc Ns +.Qq TCP_DEFAULT Ns :1731235399 .It -.Qq Qc +.Qq .Ns , for example -.Qq TCP_DEFAULT Qc +.Qq TCP_DEFAULT .It : .Ns , for example From nobody Thu Oct 3 17:50:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKK2X2FN2z5Ybsg; Thu, 03 Oct 2024 17:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKK2X1jn8z3x0m; Thu, 3 Oct 2024 17:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727977812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTWgvfNuci1mnSfVveNbrS8abPO6N55FZshR488dZ1U=; b=OZc/hNSozUTlpODszyomRmM8dXB4sdYA+yFBSmL/V+KvQTMWkdphDtWrPPjfEeHThMCjCb zQJcIFdllEd4k01duANPn9xTKbpKd8Jtypkb8axvwxAB5v4V9N6uYG5vko8NlteMkMm4uK jqtjq/J7MDN4DiDHrvDLNVnqFMD0BCD+TpKMEn/0woz+beJQybxkGYtWGHqj42PSNLq7Uw tbAVNb8NVrWUsrA11VNLX9TuphFGgvCpeHtDtvyOPU7yh9AvQS+TaYA3KiavJ5UzjLVg0u u05aI9Ae5GGK52XMdV/847XYmOT5MNzNuf57zuHOxdD2BQOGg/P4QlifYVKkmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727977812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTWgvfNuci1mnSfVveNbrS8abPO6N55FZshR488dZ1U=; b=B3VJTZRjOa3XlLIEC9+0vW9DM+z5HLBZKLPEypAKCD75RHEL1I77YY9WxNDjlGCgsHE+1s WJLUlUEJRAO558tEPlS6kAQ3p/w61v8rHBgU6gZKjTK4lFls1fqcu1be4Aa09kyrfXZlJ4 E0TuYbcN1ndgIcsb4WOJ9ES/qjwUvQ4/e2TZ+ozRM4IsH0+Cx/P48usXScm4kOpfEp/pyh xHbJ9dCZyJqs0P9sApv8jZCV1bW7IOadiz8A1TIkUldvGNfx3UjETJsmGA2C/Ek2y3uyId Tvo+f1k3C1eBNyX+kKUk59Ns2Ysa0UVDH9MrJUSmdm1jGqFW5Aq1o5Y+pYK3kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727977812; a=rsa-sha256; cv=none; b=TosxXM0O14tSTAV7FCzko3qhm19RvzvofbT7SC2Ieg5OoucDX+gV/eJtXEytdftdsPVQe5 cDJBQIi22KSD+96QEZQPhbAj9M3OlL7CSkjpDOnl8QLra6BFJnzi/Fvi73IXhSAcxcgHDu DwzaLsWG28BA8jzQyR/4hIIfwO8h24a/VL2jOBBEHeCjV7aROkFOqypdttf1d5ugGy2po+ 7GaMFoDbCPrCwUbOlihIVO7fC2S4eQ9reZqY5VdxerBoLtxawop4vB5bsioopHxrPkMQvI ESWhwAD0egUC1abU6NRoTAoPFhUUMVuiaKrNEtrCa/yXxhpgPj0MQ+Ltybq1yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKK2X1KKhz117D; Thu, 3 Oct 2024 17:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493HoCVF094027; Thu, 3 Oct 2024 17:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493HoC4a094017; Thu, 3 Oct 2024 17:50:12 GMT (envelope-from git) Date: Thu, 3 Oct 2024 17:50:12 GMT Message-Id: <202410031750.493HoC4a094017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 4f2ef756a404 - main - manuals: Fix "skipping end of block" .Ed errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f2ef756a404df70272b79c16fa7b1689cb0118b Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4f2ef756a404df70272b79c16fa7b1689cb0118b commit 4f2ef756a404df70272b79c16fa7b1689cb0118b Author: Graham Percival AuthorDate: 2024-09-24 18:28:20 +0000 Commit: Mitchell Horne CommitDate: 2024-10-03 17:49:23 +0000 manuals: Fix "skipping end of block" .Ed errors These were reported by `mandoc -T lint ...` as errors; this commit only handles unnecessary .Ed commands. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1435 --- lib/libcapsicum/capsicum_helpers.3 | 1 - sbin/ggate/ggatel/ggatel.8 | 1 - share/man/man4/ahc.4 | 1 - share/man/man4/ahd.4 | 2 -- share/man/man4/ddb.4 | 2 -- share/man/man4/xen.4 | 1 - share/man/man5/pf.conf.5 | 1 - share/man/man7/networking.7 | 1 - share/man/man9/domain.9 | 1 - 9 files changed, 11 deletions(-) diff --git a/lib/libcapsicum/capsicum_helpers.3 b/lib/libcapsicum/capsicum_helpers.3 index 38dd329ef2f3..fdb4f6f87977 100644 --- a/lib/libcapsicum/capsicum_helpers.3 +++ b/lib/libcapsicum/capsicum_helpers.3 @@ -175,7 +175,6 @@ Functions and .Fn caph_cache_catpages can not fail. -.Ed .Sh SEE ALSO .Xr cap_enter 2 , .Xr cap_rights_limit 2 , diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8 index 0dd4f30041c5..512e4ab9d187 100644 --- a/sbin/ggate/ggatel/ggatel.8 +++ b/sbin/ggate/ggatel/ggatel.8 @@ -133,7 +133,6 @@ To get details about the failure, should be called with the .Fl v option. -.Ed .Sh SEE ALSO .Xr geom 4 , .Xr ggatec 8 , diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 index 582b34fe2071..8bc689cb8395 100644 --- a/share/man/man4/ahc.4 +++ b/share/man/man4/ahc.4 @@ -170,7 +170,6 @@ A hint to define whether the SCSI target mode is enabled, defaults to disabled A hint to define whether memory mapped io is enabled or disabled for this adapter, defaults to enabled (0 -- disabled, 1 -- enabled). .El -.Ed .Sh HARDWARE The .Nm diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4 index e7f9b73f085a..d7404662a06b 100644 --- a/share/man/man4/ahd.4 +++ b/share/man/man4/ahd.4 @@ -108,7 +108,6 @@ and the host adapter's .Tn SCSI ID. .El -.Ed .Sh CONFIGURATION OPTIONS To statically configure one or more controllers to assume the target role: .Pp @@ -130,7 +129,6 @@ They are: .It Va hint.ahd. Ns Ar N Ns Va .tmode_enable A hint to define whether the SCSI target mode is enabled (0 -- disabled, 1 -- enabled). .El -.Ed .Sh HARDWARE The .Nm diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index f3443cbac127..b3fc3231f6b4 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -299,7 +299,6 @@ If the modifier has been specified, contents of structs nested up to .Ar depth levels deep will also be included in the output. -.Ed .Pp .It Ic pprint struct Ns Oo Li / Ns Cm d depth Ic Oc Oo Ar name Oc Ns Op Ns Ar addr Print memory at @@ -313,7 +312,6 @@ If the modifier has been specified, contents of structs nested up to .Ar depth levels deep will also be included in the output. -.Ed .Pp .It Xo .Ic write Ns Op Li / Ns Cm bhl diff --git a/share/man/man4/xen.4 b/share/man/man4/xen.4 index 15312866dae6..284b09bc87b7 100644 --- a/share/man/man4/xen.4 +++ b/share/man/man4/xen.4 @@ -39,7 +39,6 @@ PVH mode only. .Pp Xen support is built by default in the i386 and amd64 GENERIC kernels; note however that host mode is only available on amd64. -.Ed .Sh DESCRIPTION The Xen Hypervisor allows multiple virtual machines to be run on a single computer system. diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 28cd2407b41a..9531f18e8858 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -2124,7 +2124,6 @@ pass in proto tcp to port 22 set prio (2, 5) Only match packets which were received on the specified .Ar interface (or interface group). -.Ed .It Ar tag Aq Ar string Packets matching this rule will be tagged with the specified string. diff --git a/share/man/man7/networking.7 b/share/man/man7/networking.7 index 03e80793e98d..acd61f2864a7 100644 --- a/share/man/man7/networking.7 +++ b/share/man/man7/networking.7 @@ -43,7 +43,6 @@ Identify your Wi-Fi hardware: .Ed .Pp Configure your Wi-Fi hardware as wlan0 interface: -.Ed .Bd -literal -offset 2n .Ic # sysrc wlans_iwn0="wlan0" .Ed diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index eaa279cef996..dab8cff89e12 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -183,7 +183,6 @@ has an empty slot in its .Va dom_protosw . Dynamically added protocol can later be unloaded with .Fn protosw_unregister . -.Ed .Sh RETURN VALUES The .Fn domain_add From nobody Thu Oct 3 17:50:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKK2Y542Xz5Ybsk; Thu, 03 Oct 2024 17:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKK2Y3bhTz3wvn; Thu, 3 Oct 2024 17:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727977813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+QEuSXwzE14gOn+G4bFB0c72aezT/FKfKZxr5yO56M=; b=HFdK63A7DSlFSQKDDm/XS3TgrA7lmsxJFBsOAdj4M7516sGlXfgKS0xeJTXrDkVVRxYp/H YPccWN1NCT3Hou8sM+BXAGlcdVtvgHPKxd0lc13vWTd/c7VbOvyxjNRUYFWr4kJ13QmkiB UvtuJlKCFRH8N3iWQUdMz/bV7/N2mNUs91hPTSGYxZ5ES5FbcKAPmwFInyAQme2/CqHRtq Cz1X/VtT+rlp5HaYQ/xfonwGB1JEdM9Fo4dZfnDMB0DE+Sj6ehcmy9dNMcD1FpUAUxjeyW FQgwfiDJilWQWQ5FfVQewEOk05o+Tpz3zONteGojnMxJIHzQUpstQxRiH2QuzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727977813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+QEuSXwzE14gOn+G4bFB0c72aezT/FKfKZxr5yO56M=; b=MxuFg56mDyClgLPhcRUPCcrSGPLyD9ZMYxCvAGs1CIpQdsE5TA0qGtl/j5XhvajU5vTg39 zNol1GuWlN5oU2HGe9mf0UcT7e3Hd9fohrspqd8cg58ujnvoExnONp1PNPK4RXS39W6D/Z aw7W3YCrPZQNOIbt4m6CmJU6rp1eoA7qAbuYh0qCCdqwbbce1ZYMREz10/EtgQ7MnoWpoU UevPbYaJKC9mueyytCM71d3nhfnHntT5/jAFPJERCiZW+fcDxQBwJtuKrX/+670JzM4IUs hrbXTv2g5HxPhGLVwRoG3pQ48wkP9ZUq4S0Ya1JB1yeByz2gqMt2CQK7svKDcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727977813; a=rsa-sha256; cv=none; b=P21/pAImfZBr2zy6rSbIZJl/EMNJYA0ktlmtFvr65mXwh6oYp57/33k3R2QU2kxWpJHAsP gYFNxFA/KwSXrlukDhRtqxdgce2yGT6yQaf5JMhu18J0p+pr8yQF1O4rDqK1QDsDtRcc4q IrFc/pzu4Po3oT5UH2jMROD5yuL8EtoKur4uN/4POzB2Ny/3Jh+g612gvg+llxu8jrwgGt A6J2ITwNBCHIUf1VJ7emY2M4CXLunyaelB1DHq44GTdzfqXpqQF4RWxUikRiCgxqTZ+7hb OafLOv7PoubykMDUpHTavLUtm2XReEITkl5FkxiZGhqD3885iAgumiGF1IFPXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKK2Y1ydGz10gD; Thu, 3 Oct 2024 17:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493HoDF1094688; Thu, 3 Oct 2024 17:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493HoDlu094678; Thu, 3 Oct 2024 17:50:13 GMT (envelope-from git) Date: Thu, 3 Oct 2024 17:50:13 GMT Message-Id: <202410031750.493HoDlu094678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c013ca2cf772 - main - manuals: Fix typos in -offset for .Bd and .Bl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c013ca2cf772194de340aeb452a6ccfe7e1cecd8 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c013ca2cf772194de340aeb452a6ccfe7e1cecd8 commit c013ca2cf772194de340aeb452a6ccfe7e1cecd8 Author: Graham Percival AuthorDate: 2024-09-24 18:34:26 +0000 Commit: Mitchell Horne CommitDate: 2024-10-03 17:49:31 +0000 manuals: Fix typos in -offset for .Bd and .Bl The intended value is: -offset indent If there's any typo such that the value doesn't match the pre-defined strings, then the offset is the same width as the value. So by chance, "-offset -ident" ended up being a standard-width indent (since the default indent is 6 chars, and "-ident" also has 6 chars), whereas "-offset -indent" had a longer indent, and "-offset ident" had a shorter one. Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1436 --- bin/sh/sh.1 | 4 ++-- share/man/man4/efidev.4 | 2 +- share/man/man4/vmd.4 | 2 +- share/man/man5/motd.5 | 2 +- share/man/man7/arch.7 | 2 +- usr.bin/elfctl/elfctl.1 | 4 ++-- usr.sbin/binmiscctl/binmiscctl.8 | 4 ++-- usr.sbin/pwd_mkdb/pwd_mkdb.8 | 2 +- usr.sbin/service/service.8 | 16 ++++++++-------- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 849133540cdd..1ce26ecba328 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -1074,13 +1074,13 @@ command. Commands may be grouped by writing either .Pp .Sm off -.Bd -literal -offset -ident +.Bd -literal -offset indent .Po Ar list Pc .Ed .Sm on .Pp or -.Bd -literal -offset -ident +.Bd -literal -offset indent .No { Ar list ; } .Ed .Pp diff --git a/share/man/man4/efidev.4 b/share/man/man4/efidev.4 index 684a93340d7f..defae1f31bea 100644 --- a/share/man/man4/efidev.4 +++ b/share/man/man4/efidev.4 @@ -34,7 +34,7 @@ .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: -.Bd -ragged -offset -indent +.Bd -ragged -offset indent .Cd "options EFIRT" .Ed .Pp diff --git a/share/man/man4/vmd.4 b/share/man/man4/vmd.4 index 2d6a06bc10e3..590a368f006b 100644 --- a/share/man/man4/vmd.4 +++ b/share/man/man4/vmd.4 @@ -34,7 +34,7 @@ .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: -.Bd -ragged -offset -indent +.Bd -ragged -offset indent .Cd "device vmd" .Ed .Pp diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5 index 86cb8f723634..5dce1ccd52ae 100644 --- a/share/man/man5/motd.5 +++ b/share/man/man5/motd.5 @@ -25,7 +25,7 @@ and the contents are written to can be updated without a system reboot by manually restarting the motd service after updating .Pa /etc/motd.template : -.Bd -literal -offset -ident -compact +.Bd -literal -offset indent -compact service motd restart .Ed .Pp diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 21d2b156af87..3fa45af16ba6 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -168,7 +168,7 @@ execution state, however older arm binaries are not supported by .Fx . .Pp On all supported architectures: -.Bl -column -offset -indent "long long" "Size" +.Bl -column -offset indent "long long" "Size" .It Sy Type Ta Sy Size .It short Ta 2 .It int Ta 4 diff --git a/usr.bin/elfctl/elfctl.1 b/usr.bin/elfctl/elfctl.1 index 2dbe04ee0ed2..5ba016b664a3 100644 --- a/usr.bin/elfctl/elfctl.1 +++ b/usr.bin/elfctl/elfctl.1 @@ -87,12 +87,12 @@ elfctl -e +noaslr file .Ed .Pp Features may be specified as numerical values: -.Bd -literal -offset -indent +.Bd -literal -offset indent elfctl -e =0x0001,0x0004 file .Ed .Pp Features may also be specified as a single combined value: -.Bd -literal -offset -indent +.Bd -literal -offset indent elfctl -e =0x5 file .Ed .Sh SEE ALSO diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 4a4890146b57..17bce41a3212 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -308,13 +308,13 @@ specified in the .Nm command. Using the example above: -.Bd -literal -offset -ident +.Bd -literal -offset indent mkdir $D/usr/local/bin cp /usr/local/bin/qemu-arm-static $D/usr/local/bin .Ed .Pp Now the user can chroot into the environment normally, as root: -.Bd -literal -offset -ident +.Bd -literal -offset indent chroot $D .Ed .Sh SEE ALSO diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8 index d28d5dc0ab2c..262a07f4ef3c 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.8 +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8 @@ -139,7 +139,7 @@ A Version 7 format password file. .Sh EXAMPLES Regenerate the password database after manually editing or replacing the password file: -.Bd -literal -offset -indent +.Bd -literal -offset indent /usr/sbin/pwd_mkdb -p /etc/master.passwd .Ed .Sh COMPATIBILITY diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 2c5dfa3f3a66..380fbc8c1269 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -141,39 +141,39 @@ For a full list of commands available in most rc.d scripts, see .Xr rc 8 . .Pp Enable a service, then start it: -.Bd -literal -offset -indent +.Bd -literal -offset indent service sshd enable service sshd start .Ed .Pp Stop a service, then disable it: -.Bd -literal -offset -indent +.Bd -literal -offset indent service sshd stop service sshd disable .Ed .Pp Start a service which is not enabled: -.Bd -literal -offset -indent +.Bd -literal -offset indent service sshd onestart .Ed .Pp Report the status of a service: -.Bd -literal -offset -ident +.Bd -literal -offset indent service named status .Ed .Pp Restart a service running in a jail: -.Bd -literal -offset -indent +.Bd -literal -offset indent service -j dns named restart .Ed .Pp Start a service with a specific environment variable set: -.Bd -literal -offset -indent +.Bd -literal -offset indent service -E LC_ALL=C.UTF-8 named start .Ed .Pp Report a verbose listing of all available services: -.Bd -literal -offset -indent +.Bd -literal -offset indent service -rv .Ed .Pp @@ -189,7 +189,7 @@ complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' \e The following programmable completion entry can be used in .Xr bash 1 for the names of the rc.d scripts: -.Bd -literal -offset -ident +.Bd -literal -offset indent _service () { local cur cur=${COMP_WORDS[COMP_CWORD]} From nobody Thu Oct 3 20:52:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKP4W3PvCz5Yn35; Thu, 03 Oct 2024 20:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKP4W2vg1z4Gqy; Thu, 3 Oct 2024 20:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727988731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UA7EbUqEJn+nDImF40xfr68G7i49j5JnAJwlU3tkAV8=; b=MalnMZNpOE1rREyxvE/WsUdw4vK1iN1vIEeAr0wE8/9hnzbGGGfwxSNHpGIYl2cQ8M3zUr YRE6JjJCXy0157xGH0xUmgRwbTHq3M1tfLLLRmL+aaxocjCIocvl8cwq+Li6qP6QXNFzIg YNwSP1Qe4dGWs9noI99gkIVbt/1HINhPFYBaTGvhMYGtqmLPU55r/RVK6oq5gaeXH3Q/fE 6ZQj70NytT5wpb4+sQOSfGt370J/jJRsdMSo652KtG6O/PVst5zuDb3mYiNzUwpyHZfSZg QmljDgK5HuZvynCq4FB09z91knvn7+xhNKnYt750R2v5lkXVopNkKdYksSlOSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727988731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UA7EbUqEJn+nDImF40xfr68G7i49j5JnAJwlU3tkAV8=; b=cG7zVc4v+ZdZmPi8rPItS4141Et+9PtwO4baGyQzlzoISWMlms69tq6Cs6Ax+Xj3PXrglN rOK8sSk6QDhM1ei+EeFLseLaVfiVV0hIzCa/TvbuHWjRTJ/6H75FOwPZ49HrBO0yFkG+Dh kV/OBFek7u2yr/T9tbG0NPd1+Pd/LkfKSBIUHEx3jKdX6e94LOfq57ohF0R2ddSDJFJJNc 6a0/cHWroHrJ/BhxMYaLm3dc3q139/KXYMQZw+5G7mPEkP/R37KrQjPJUp7LulG9gdyOsM PsSuaFvjR4S+Qakg6G9ShoGnDy5HphwQp3HdvdiT9UpsjwLcKtxlLLWofAr4/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727988731; a=rsa-sha256; cv=none; b=So2dnJ5BmsBdVNFISeOs5WNFS/viOTMOkcQ+QENUmiOznl3tbpPG8Xqijg4Psx3XuXy+ML Aocq5kYlCZpmRrdE8Xu6bJ1DD0OUttmeHSQ8BevP+eMihXjStlzFlJQ1vb1N6PMqyevzqG d9jkjf2ZgfvN7efyDwAcbfUtyZJpSs1Q6cR10Pvx/IcpuqAdiRf2Xv1g6UpxJtSdXwXE5c fDqGZklzni/dkzFyn1dlRmp5N8XiwgMI8mUMI7AFgf5YIBlB5UnDvm2q3YV6xWuzIzIdn4 ivGRAwATeSR4i+usZgBVKYD9SVLvFunuoCB8qs66ByUJC8C5KwOEop4oQhQEsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKP4W2Vrtz15b8; Thu, 3 Oct 2024 20:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493KqBO2014664; Thu, 3 Oct 2024 20:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493KqBc5014661; Thu, 3 Oct 2024 20:52:11 GMT (envelope-from git) Date: Thu, 3 Oct 2024 20:52:11 GMT Message-Id: <202410032052.493KqBc5014661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Danilo Egea Gondolfo Subject: git: fd3d13678e9e - main - sglist.9: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danilo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd3d13678e9e82635fe4274a3668cd2ceb642cdd Auto-Submitted: auto-generated The branch main has been updated by danilo: URL: https://cgit.FreeBSD.org/src/commit/?id=fd3d13678e9e82635fe4274a3668cd2ceb642cdd commit fd3d13678e9e82635fe4274a3668cd2ceb642cdd Author: Danilo Egea Gondolfo AuthorDate: 2024-09-28 11:08:50 +0000 Commit: Danilo Egea Gondolfo CommitDate: 2024-10-03 20:50:57 +0000 sglist.9: fix typo In the explanation section sglist_append_mbuf is duplicated. The second reference is meant to be sglist_append_single_mbuf. Approved by: mhorne (src) Pull Request: https://github.com/freebsd/freebsd-src/pull/1439 --- share/man/man9/sglist.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/sglist.9 b/share/man/man9/sglist.9 index 49d0cbfd1871..f4930134e7cf 100644 --- a/share/man/man9/sglist.9 +++ b/share/man/man9/sglist.9 @@ -285,7 +285,7 @@ to the scatter/gather list .Fa sg . .Pp The -.Nm sglist_append_mbuf +.Nm sglist_append_single_mbuf function appends the physical address ranges described by a single mbuf .Fa m to the scatter/gather list From nobody Thu Oct 3 21:14:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKPZh0lTGz5XKWx; Thu, 03 Oct 2024 21:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKPZh0B2Bz4J0R; Thu, 3 Oct 2024 21:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727990092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwqKgy1qfjyBwAHlu8T8lM54TtjxZAw+ww/YTHBxysw=; b=RX4q4EvGnUiaYQ4dQKqEtLWakIRnmX7ZnajQ0/zPunwUW6DSKOcnjGIxyad1QZ9Qy+Negh b+2VzTkJf4WVM/Bh/zIWUALr+vBwIioIjHqLaepvzCBWt0RlDtg+bCbnPLog6OE8mNyefl tr8SlB5FDKMFPen/s2laVHMta5RxCzYr0CUhTGJtL24mSGlvYu6i9qvXSYfwcYyV8eBH1c fldg9iIWkpeYKWQeGMUA8dmqLhHPCKVCY9/e/qcNHrAI9Qydg+qgSgUGm/ml6xGClWaGsF 3M9m9TR1bMc1+dKcbkISmgh0N1DDaT4j28t22hqkcIXdWqWNHM4ioZhjzLV+hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727990092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwqKgy1qfjyBwAHlu8T8lM54TtjxZAw+ww/YTHBxysw=; b=N4326uxX58BOsDB8yHxTLgQ+0jCZQdbI8IjGkCCrbA1JnNuNkF98CNcAZJ/vUOzNOaJbJ9 Rf7yOvZWFkEXNemiOaBtrc7JUwKV8lFX2c838Q+FhvI2rce4JeyzUWV3dExJY5W1etccR0 LsLvlBT0JUEM1gS9+gudV5ZQ9hRY15bDafn+2e9mR3A2PQ0ZYJ9uFBEv7C56O5maazyGmv 4bz98L01YqGiZhvSqFwCISzwvq2iSfpvCfqipIv0UI7KYNsQ7gZH/WhvB0fAj6V/sVZF5K ZBuuUgk40k5xjPpJoG6aNjTI6BW+n8tmcBwgkIdQXA/nioYLdqnXXdE5m5UYhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727990092; a=rsa-sha256; cv=none; b=v/OUJQ7q99Ysrw8DLNStuvjuZoE68gXtFRuECGx6AoY6vQl8WeHYoH9DDeVeKJ+ThmE0sH kmjM22bpLt2xL8rr2zhUIEjy8twK0jg1HR8DRu7ixTyzURBnz7Rgxe7HB9HPQu50PoqHgM V5U93xaA0CwelRkg/y5lHxZs10+FkzxGYW/deQQ5UlatbgIg9Uz8ygtmKLakM1h9cM841/ fy8biIJrX9FBsaikDA/0OKoUgKgeaVMJPBhf/D+IYoT7OL03qdoHCfPpRdFX6KEyyqtXmc sewLtkhjF84CJE/pqTkr86t+LmRc2vGFNdAIhj83VrQE/c0ZfdLjNnf1xk5ttg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKPZg6pS4z160M; Thu, 3 Oct 2024 21:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493LEpJo051306; Thu, 3 Oct 2024 21:14:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493LEpR1051303; Thu, 3 Oct 2024 21:14:51 GMT (envelope-from git) Date: Thu, 3 Oct 2024 21:14:51 GMT Message-Id: <202410032114.493LEpR1051303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e94a1d6a7f2e - main - bhyve: improve bounds checks in hda_codec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e94a1d6a7f2eb932850e1db418bf34d5c6991ce8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e94a1d6a7f2eb932850e1db418bf34d5c6991ce8 commit e94a1d6a7f2eb932850e1db418bf34d5c6991ce8 Author: Pierre Pronchery AuthorDate: 2024-07-24 14:56:54 +0000 Commit: Ed Maste CommitDate: 2024-10-03 21:14:11 +0000 bhyve: improve bounds checks in hda_codec The function hda_codec_command is vulnerable to buffer over-read, the payload value is extracted from the command and used as an array index without any validation. Fortunately, the payload value is capped at 255, so the information disclosure is limited and only a small part of .rodata of bhyve binary can be disclosed. The risk is low because the leaked information is not sensitive. An attacker may be able to validate the version of the bhyve binary using this information disclosure (layout of .rodata information, ex: jmp_tables) before executing an exploit. Reported by: Synacktiv Reviewed by: christos, emaste Security: HYP-13 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46098 --- usr.sbin/bhyve/hda_codec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c index 1866149c020a..b7d6ec043675 100644 --- a/usr.sbin/bhyve/hda_codec.c +++ b/usr.sbin/bhyve/hda_codec.c @@ -521,7 +521,6 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) payload = cmd_data & 0xffff; } - assert(cad == hci->cad); assert(hci); hops = hci->hops; @@ -530,7 +529,10 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) sc = (struct hda_codec_softc *)hci->priv; assert(sc); - assert(nid < sc->no_nodes); + if (cad != hci->cad || nid >= sc->no_nodes) { + DPRINTF("Invalid command data"); + return (-1); + } if (!hops->response) { DPRINTF("The controller ops does not implement \ @@ -540,7 +542,8 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) switch (verb) { case HDA_CMD_VERB_GET_PARAMETER: - res = sc->get_parameters[nid][payload]; + if (payload < HDA_CODEC_PARAMS_COUNT) + res = sc->get_parameters[nid][payload]; break; case HDA_CMD_VERB_GET_CONN_LIST_ENTRY: res = sc->conn_list[nid][0]; From nobody Thu Oct 3 22:22:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKR4K1Djbz5XQQs; Thu, 03 Oct 2024 22:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKR4K0mnxz4Mjj; Thu, 3 Oct 2024 22:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727994129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBo5WC9ht3NjELsr7B0YODt0rRm33J/uJlCzb1i8lbQ=; b=vTcjnSLsrbNS5bCwoOmSDbFcFoED7SqgpMRA/oWgixSIKI1uHgyi80TkpLfFhop7/9oC18 UmLaw8c0g2mPw3C1HDAewTIwrQ8mrnW/V7QxE4RrpFJckUmFjmRhBqiGX8Rr5X9RD+BjRT /mqN1WfgeiCA/T+fjfqZpFvtnv4sb0uJFY6iwQtTWZKzHYMJsdOFrhFG3RhOMYqqOGg1lx eRs5/e4PgSCmO8DsLUmzyUoPhm1OzVanLDhinI9a7k8XDLxAfrue4MIDAcIanoKjHLAc9M Vsm1/GM7ysEVHtWxAEO4kr4REiDOaVCkvWtcWCh8x47lbZ/AR/WtDTSBQ05ZjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727994129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBo5WC9ht3NjELsr7B0YODt0rRm33J/uJlCzb1i8lbQ=; b=pVzDnEiJ+hbQRqrEuZ5NiTf7O1KgFkgz6THvkluW2hbhqoenxlDzSPsxAgwOdaUJiD5g0J lC7pM7yWEYu+oZq7VKMzR9xBmJ2KuiUr2NzPEL9O90oI4lp+cLXYx5t2XVJNgpc0T++Ctq 6DcI0WMEVKbuNaHRqOq1zFzzlsyQbgTB0tOw47xzFJEB+79XEDtLFKxTJm9z9clSwi5BdO VXGzjy0TMjhheqzaiELCPE8brgrzjVn2jVRL/q5E9OH7YIpWnxd2+SMBhEC7171NqvjRxr KsyvvuCxRA+RU3+dXWuZQMZ9ddbZ7MIko2V7+SkKhRZQiQXHes+eQYEcam1Wxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727994129; a=rsa-sha256; cv=none; b=TBLR59xautyn2ZKPIlYE0mnXROWk+xrdUh4h8LeRaD2nBuTUwutKM2zCDJOakAxvzu3+hy I79zt1kmpY1MTdYzsinWKnlCNZjeC6OoxHniKhPR1egmLnjbT54HVj8ZBTJKqvsLv1sRNB 64ECb1imIcyvL9VqYdGTyMyOmnUe+zMKGd936IlnafPENjPkAkX58jY6llZq98zAWHBIL7 WQBqtYqm/gF24nxmjBoJfBwSYfRgnfBeQRiQyHI8C0fMthtnKKtawo5vytm/1c74oHcIxu Vd5/OjZWxstChUNXfI0GQs2OCSxWo+pXoUGisqMLSOE+cMiSMWdXah3LxFAwqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKR4K0N6bz17ln; Thu, 3 Oct 2024 22:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493MM8vM069062; Thu, 3 Oct 2024 22:22:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493MM8rP069059; Thu, 3 Oct 2024 22:22:08 GMT (envelope-from git) Date: Thu, 3 Oct 2024 22:22:08 GMT Message-Id: <202410032222.493MM8rP069059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 618ae939b7f9 - main - zfsd: replace vdevs with the AUX faulted state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 618ae939b7f95a197a0518cbb390a572bb90c6d0 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=618ae939b7f95a197a0518cbb390a572bb90c6d0 commit 618ae939b7f95a197a0518cbb390a572bb90c6d0 Author: Alan Somers AuthorDate: 2024-10-03 21:54:28 +0000 Commit: Alan Somers CommitDate: 2024-10-03 22:21:46 +0000 zfsd: replace vdevs with the AUX faulted state Without this patch, vdevs faulted via AUX state would not be replaced once the appropriate drive is replaced. ZFS does not internally use that state, but a drive can be manually forced into such a state with a command like zinject. Submitted by: Goran Mekić Sponsored by: ConnectWise MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46866 --- cddl/usr.sbin/zfsd/case_file.cc | 2 +- tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib | 2 +- .../zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh | 26 +++++++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc index f9fd84da7277..7adfb08b75c6 100644 --- a/cddl/usr.sbin/zfsd/case_file.cc +++ b/cddl/usr.sbin/zfsd/case_file.cc @@ -288,7 +288,7 @@ CaseFile::ReEvaluate(const string &devPath, const string &physPath, Vdev *vdev) return (/*consumed*/false); } - if (VdevState() > VDEV_STATE_CANT_OPEN) { + if (VdevState() > VDEV_STATE_FAULTED) { /* * For now, newly discovered devices only help for * devices that are missing. In the future, we might diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib b/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib index a4a7ef80ed9f..6369387ba069 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib @@ -52,7 +52,7 @@ function wait_for_pool_dev_state_change function wait_for_pool_removal { typeset -i timeout=$1 - wait_for_pool_dev_state_change $timeout $REMOVAL_DISK "REMOVED|UNAVAIL" + wait_for_pool_dev_state_change $timeout $REMOVAL_DISK "REMOVED|UNAVAIL|FAULTED" } function wait_until_scrubbed diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh index 4eb04d60809e..7ad7a9113402 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh @@ -83,19 +83,25 @@ typeset SPARE_NOP=${DISK4}.nop typeset OTHER_DISKS="${DISK1} ${DISK2}" typeset OTHER_NOPS=${OTHER_DISKS//~(E)([[:space:]]+|$)/.nop\1} set -A MY_KEYWORDS "mirror" "raidz1" "raidz2" +set -A MY_FAILURES "FAULTED" "REMOVED" ensure_zfsd_running log_must create_gnops $OTHER_DISKS $SPARE_DISK -for keyword in "${MY_KEYWORDS[@]}" ; do - log_must create_gnop $REMOVAL_DISK $PHYSPATH - log_must create_pool $TESTPOOL $keyword $REMOVAL_NOP $OTHER_NOPS spare $SPARE_NOP - log_must $ZPOOL set autoreplace=on $TESTPOOL +for failure in "${MY_FAILURES[@]}" ; do + for keyword in "${MY_KEYWORDS[@]}" ; do + log_must create_gnop $REMOVAL_DISK $PHYSPATH + log_must create_pool $TESTPOOL $keyword $REMOVAL_NOP $OTHER_NOPS spare $SPARE_NOP + log_must $ZPOOL set autoreplace=on $TESTPOOL - log_must destroy_gnop $REMOVAL_DISK - log_must wait_for_pool_removal 20 - log_must create_gnop $NEW_DISK $PHYSPATH - verify_assertion - destroy_pool "$TESTPOOL" - log_must destroy_gnop $NEW_DISK + if [ $failure = "FAULTED" ]; then + log_must zinject -d $REMOVAL_NOP -A fault $TESTPOOL + fi + log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 + log_must create_gnop $NEW_DISK $PHYSPATH + verify_assertion + destroy_pool "$TESTPOOL" + log_must destroy_gnop $NEW_DISK + done done log_pass From nobody Thu Oct 3 22:51:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKRjn2V38z5XRpx; Thu, 03 Oct 2024 22:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKRjn1dYfz4PHt; Thu, 3 Oct 2024 22:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727995869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bp4LAUfdOgNgE8E+f4RjRYqDI12Ywk1Cahj8/FDmT8=; b=SG6BrH2KCd0VI2W/dAMUIuARtGTP7A7WVEjzFm0NBLaPALRgR9CRZvJZvue8gTTOFWxFs8 zEwVw59JX1T6bLGEVZVc8l3mOPUJi5+EEMvGImq5J2bDJZBqXIrlKKPMzgfSipZPIRpDcC 2FTWdamGOXk7Ve7++CxsSjFpBqIBopYuLiL20Uk1tSs5jDzQ6eEDSnLXys/pdbgo7sHQVh ZxlvPqn2RzHnLmHDZoK0RgEfB8najtL4UL2RXKOP1tLbTvUZvF1LF5IoCNCvCg/R7R2GAj 5QmJJ8GePpSRc0HEF9IbHUlF9Ccu7E58YTMZ5dobxqXleJorLiA6sS7YsF5nLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727995869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bp4LAUfdOgNgE8E+f4RjRYqDI12Ywk1Cahj8/FDmT8=; b=JGaf0RDPtmxF0KhR780CF2k7yUm1E796dXOPQoT+aOYiMSn9uJADi5oglKmXZmu4WndlQv 2P8U77qzvNC4gjDaIkji8zAd5+5msjyAEbLuy4lzFl4U/CUlvU0qGvMK9i1qkwN65RNj0T PTTqbZGSvhOyCAIg7LyeUqiXT6fQj6RENSHYEJW27QWRJgVcwBq9E7rpzkx/2OgdZdM0wE qjyaTFAraU0oRYc/Q/aCLuFWWsZ9By+8EKkOy60zp2GvB6g6R4y/WfRqG0ru1DTEvgYjN+ HJRMBd/senMaXHpPPkWdkXYv9YAiKVvYJmO+3IVbV8NXGUdcrIWdvzORDpH1vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727995869; a=rsa-sha256; cv=none; b=skkMUZIyWWxKo6NMopNJ9Cg4aO6K03DjIi6omv6VBDw+Ni633KhffnReuplUyx70S8lakU eLRv74i4YSXfbGe2H/uA61AYLVKAEg8VrETP9Br++5LCGbD6ElPwdcUGTdYu+XVfg8pdm/ aU3oztnj76PGrDQg8euCG1ZfR69AZMmaKSEgcSBYxXS8FGIfjCPF5W6Zv9RpPIY/9IjDMg DTOuee4/XC/+Uq1FcTbtgQPF1T+ECaIBk4UKt494ADSibvBcSKE//6mseTsFQWc69ZuyTy HhivH4EW6+r9exIA9RXRzOEpn7o3RM4lYKCbVFggxjypJ4DhPcFOHpPl1utJNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKRjn1DZnz18cw; Thu, 3 Oct 2024 22:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493Mp9l0017063; Thu, 3 Oct 2024 22:51:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493Mp9nG017060; Thu, 3 Oct 2024 22:51:09 GMT (envelope-from git) Date: Thu, 3 Oct 2024 22:51:09 GMT Message-Id: <202410032251.493Mp9nG017060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8375d2b9c653 - stable/13 - agp.4: Add a deprecation notice to the man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8375d2b9c653b77dcfe887c51eee16c52f585012 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8375d2b9c653b77dcfe887c51eee16c52f585012 commit 8375d2b9c653b77dcfe887c51eee16c52f585012 Author: Mark Johnston AuthorDate: 2024-09-19 10:06:49 +0000 Commit: Mark Johnston CommitDate: 2024-10-03 22:50:57 +0000 agp.4: Add a deprecation notice to the man page The driver is giant-locked and thus already prints a deprecation warning when attaching. The device file interface was broken in 14.0 and 14.1, see commit 12500c14281d, but it took a very long time for anyone to notice, and in that case it was only because of some code which probes all device files. Relnotes: yes Reviewed by: imp, jhb, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46542 (cherry picked from commit 0abe2d3903cc4569705d491f8ac6d2edea01c26f) --- share/man/man4/agp.4 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4 index 40da98a6b3f3..8fea599a9b3d 100644 --- a/share/man/man4/agp.4 +++ b/share/man/man4/agp.4 @@ -30,6 +30,11 @@ .Nd "generic interface to the Accelerated Graphics Port (AGP)" .Sh SYNOPSIS .Cd "device agp" +.Sh DEPRECATION NOTICE +The +.Nm +driver is slated to be removed in +.Fx 15.0 . .Sh DESCRIPTION The .Nm From nobody Fri Oct 4 00:01:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKTHQ2dxRz5XXTX; Fri, 04 Oct 2024 00:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKTHQ1Qcgz4V48; Fri, 4 Oct 2024 00:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728000114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/xDKyVYvmw6/XstVgt2ned1oL98pXGO3OkAqLNLEGY=; b=nbvy9QauIoWkmzrv4mpSuabnWgv+SMLFJYMt6P8+/2xpdF7juEl7msRzQiXUiBpVMTa+Hb OA0Pnyi575AalIgj8tSHycx0WM1+49+r5SW760LY9u75Fc5Be5g+sJ3eYB7WAW3ZJeEMhV xZpiggrHgsX1ZzTVOqZA3nyzqFmWhPYZ1ZzldY9fxEp3yTkq/Rttm1eGY58m8tu7n8xGN2 gmtSTJbrqq2TF1uq5u2scMT4UpzFcHLNgqny+v6T5WeSxrNGGaisxYFJNfo3NSGbIgUSV9 i1j6H3vmhltWIobKSesNTAqrRn4hki8615lKetumPi00BLLL1IFlUE+irFnqOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728000114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/xDKyVYvmw6/XstVgt2ned1oL98pXGO3OkAqLNLEGY=; b=xNJ98z5go08kfH/PrIgbisBTQ8BUIjuTgtGWIxbrKwhWhbFbqjZXcyIYaMa3Q/fW1jhWUG bJceyNlvJDWW6XfvyS3TekIplWOwHK5Co4XFDXbWron9HJjCOZp3YSbYa4MwAa7JmW2/fP sc6bjYLuOJi3g5cz/stCb7RwQ88/tS8vv5rm77FTJaEwJCMGTpgQqKVHwWoC8bVbtVLaO1 m6jerQupwgILVl7IioGDH/rVEHq/ToQjIfzjfjPNrYhkBef5r3kx2nEO+Df8vjFhvwM9Vj 2hmMd/VvceyRkSB9zf40HeuBYSZ/Rp35eD4RH2dccY0uUvWneEDWUgmn/ia1Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728000114; a=rsa-sha256; cv=none; b=mJIW/AHpMnNomxDkdgizCsX0A+RKaJD11YmfH351vit2D2PQRIqH9GfmMAz5kA2gJlAJGZ oyzqrXuWTzofsdJtEcPgRCjNhvJecWSnqSyvD3E+ZeFXTEnuui4q+eYZb8Kgm2USg6ascO BEtWIH0QguXML+oBevClqtaWFRRpMy0HZ/sgMlQrBTIC9wZPGq04l0twySVI9BsqweIfqF +Y/CsK7aIH/fXI/PYnqNyDwAM1YYu0FlySewPy3V2kBmlb2Ev+RRlof1eJtwWqyD7tBRbF PtROWN9RqLkfC8Y4/WxUJMmuXX55bXGRtGzu/8OShr1UfoeApTQvCM4irxn7tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKTHQ11wPz1BML; Fri, 4 Oct 2024 00:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49401sZd039591; Fri, 4 Oct 2024 00:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49401sBs039588; Fri, 4 Oct 2024 00:01:54 GMT (envelope-from git) Date: Fri, 4 Oct 2024 00:01:54 GMT Message-Id: <202410040001.49401sBs039588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 593d7a1634b5 - main - apcidump: Add dumping SPCR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 593d7a1634b5536f0ce2935305c3a5d1d6dd56bd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=593d7a1634b5536f0ce2935305c3a5d1d6dd56bd commit 593d7a1634b5536f0ce2935305c3a5d1d6dd56bd Author: Warner Losh AuthorDate: 2024-10-03 22:48:27 +0000 Commit: Warner Losh CommitDate: 2024-10-04 00:01:07 +0000 apcidump: Add dumping SPCR When we find a SPCR (Serial Port Console Redirection) TABLE, print all the details. This includes support for the recent Revision 3 and Revision 4 tables, though I've not encountered them in the wild yet, so that code is untested. https://learn.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table Sponsored by: Netflix --- usr.sbin/acpi/acpidump/acpi.c | 170 +++++++++++++++++++++++++++++++++++++- usr.sbin/acpi/acpidump/acpidump.8 | 1 + 2 files changed, 168 insertions(+), 3 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index fe68b5062351..95ecb42825eb 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1257,18 +1257,180 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } + static void acpi_handle_tpm2(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_TPM2 *tpm2; - + printf (BEGIN_COMMENT); acpi_print_sdt(sdp); tpm2 = (ACPI_TABLE_TPM2 *) sdp; printf ("\t\tControlArea=%jx\n", tpm2->ControlAddress); - printf ("\t\tStartMethod=%x\n", tpm2->StartMethod); + printf ("\t\tStartMethod=%x\n", tpm2->StartMethod); + printf (END_COMMENT); +} + +static int spcr_xlate_baud(uint8_t r) +{ + static int rates[] = { 9600, 19200, -1, 57600, 115200 }; + _Static_assert(nitems(rates) == 7 - 3 + 1, "rates array size incorrect"); + + if (r == 0) + return (0); + + if (r < 3 || r > 7) + return (-1); + + return (rates[r - 3]); +} + +static const char *spcr_interface_type(int ift) +{ + static const char *if_names[] = { + [0x00] = "Fully 16550-compatible", + [0x01] = "16550 subset compatible with DBGP Revision 1", + [0x02] = "MAX311xE SPI UART", + [0x03] = "Arm PL011 UART", + [0x04] = "MSM8x60 (e.g. 8960)", + [0x05] = "Nvidia 16550", + [0x06] = "TI OMAP", + [0x07] = "Reserved (Do Not Use)", + [0x08] = "APM88xxxx", + [0x09] = "MSM8974", + [0x0a] = "SAM5250", + [0x0b] = "Intel USIF", + [0x0c] = "i.MX 6", + [0x0d] = "(deprecated) Arm SBSA (2.x only) Generic UART supporting only 32-bit accesses", + [0x0e] = "Arm SBSA Generic UART", + [0x0f] = "Arm DCC", + [0x10] = "BCM2835", + [0x11] = "SDM845 with clock rate of 1.8432 MHz", + [0x12] = "16550-compatible with parameters defined in Generic Address Structure", + [0x13] = "SDM845 with clock rate of 7.372 MHz", + [0x14] = "Intel LPSS", + [0x15] = "RISC-V SBI console (any supported SBI mechanism)", + }; + + if (ift >= (int)nitems(if_names) || if_names[ift] == NULL) + return ("Reserved"); + return (if_names[ift]); +} + +static const char *spcr_interrupt_type(int ift) +{ + static char buf[100]; + +#define APPEND(b,s) \ + if ((ift & (b)) != 0) { \ + if (strlen(buf) > 0) \ + strlcat(buf, ",", sizeof(buf)); \ + strlcat(buf, s, sizeof(buf)); \ + } + + *buf = '\0'; + APPEND(0x01, "PC/AT IRQ"); + APPEND(0x02, "I/O APIC"); + APPEND(0x04, "I/O SAPIC"); + APPEND(0x08, "ARMH GIC"); + APPEND(0x10, "RISC-V PLIC/APLIC"); + +#undef APPEND + + return (buf); +} + +static const char *spcr_terminal_type(int type) +{ + static const char *term_names[] = { + [0] = "VT100", + [1] = "Extended VT100", + [2] = "VT-UTF8", + [3] = "ANSI", + }; + + if (type >= (int)nitems(term_names) || term_names[type] == NULL) + return ("Reserved"); + return (term_names[type]); +} + +/* + * Serial Port Console Redirection version 3 and 4 are too new to have proper + * definitions in ACPI headers, so provide them. + */ +#pragma pack(1) +struct SPCR_3 +{ + ACPI_TABLE_SPCR spcr2; + UINT32 UARTClockFrequency; +}; + +struct SPCR_4 +{ + struct SPCR_3 spcr3; + UINT32 PreciseBaudRate; + UINT16 NamespaceStringLength; + UINT16 NamespaceStringOffset; +}; +#pragma pack() + +static void acpi_handle_spcr(ACPI_TABLE_HEADER *sdp) +{ + ACPI_TABLE_SPCR *spcr; + + printf (BEGIN_COMMENT); + acpi_print_sdt(sdp); + + /* Rev 1 and 2 are the same size */ + spcr = (ACPI_TABLE_SPCR *) sdp; + printf ("\tInterfaceType=%d (%s)\n", spcr->InterfaceType, + spcr_interface_type(spcr->InterfaceType)); + printf ("\tSerialPort="); + acpi_print_gas(&spcr->SerialPort); + printf ("\n\tInterruptType=%#x (%s)\n", spcr->InterruptType, + spcr_interrupt_type(spcr->InterruptType)); + printf ("\tPcInterrupt=%d (%s)\n", spcr->PcInterrupt, + (spcr->InterruptType & 0x1) ? "Valid" : "Invalid"); + printf ("\tInterrupt=%d\n", spcr->Interrupt); + printf ("\tBaudRate=%d (%d)\n", spcr_xlate_baud(spcr->BaudRate), spcr->BaudRate); + printf ("\tParity=%d\n", spcr->Parity); + printf ("\tStopBits=%d\n", spcr->StopBits); + printf ("\tFlowControl=%d\n", spcr->FlowControl); + printf ("\tTerminalType=%d (%s)\n", spcr->TerminalType, + spcr_terminal_type(spcr->TerminalType)); + printf ("\tPciDeviceId=%#04x\n", spcr->PciDeviceId); + printf ("\tPciVendorId=%#04x\n", spcr->PciVendorId); + printf ("\tPciBus=%d\n", spcr->PciBus); + printf ("\tPciDevice=%d\n", spcr->PciDevice); + printf ("\tPciFunction=%d\n", spcr->PciFunction); + printf ("\tPciFlags=%d\n", spcr->PciFlags); + printf ("\tPciSegment=%d\n", spcr->PciSegment); + + /* Rev 3 added UARTClockFrequency */ + if (sdp->Revision >= 3) { + struct SPCR_3 *spcr3 = (struct SPCR_3 *)sdp; + + printf("\tUARTClockFrequency=%jd", + (uintmax_t)spcr3->UARTClockFrequency); + } + + /* Rev 4 added PreciseBaudRate and Namespace* */ + if (sdp->Revision >= 4) { + struct SPCR_4 *spcr4 = (struct SPCR_4 *)sdp; + + printf("\tPreciseBaudRate=%jd", + (uintmax_t)spcr4->PreciseBaudRate); + if (spcr4->NamespaceStringLength > 0 && + spcr4->NamespaceStringOffset >= sizeof(*spcr4) && + sdp->Length >= spcr4->NamespaceStringOffset + + spcr4->NamespaceStringLength) { + printf ("\tNamespaceString='%s'\n", + (char *)sdp + spcr4->NamespaceStringOffset); + } + } + printf (END_COMMENT); } - + static const char * devscope_type2str(int type) { @@ -2468,6 +2630,8 @@ acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp) acpi_handle_lpit(sdp); else if (!memcmp(sdp->Signature, ACPI_SIG_TPM2, 4)) acpi_handle_tpm2(sdp); + else if (!memcmp(sdp->Signature, ACPI_SIG_SPCR, 4)) + acpi_handle_spcr(sdp); else { printf(BEGIN_COMMENT); acpi_print_sdt(sdp); diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8 index f193b9a3511a..9703741f418f 100644 --- a/usr.sbin/acpi/acpidump/acpidump.8 +++ b/usr.sbin/acpi/acpidump/acpidump.8 @@ -112,6 +112,7 @@ utility dumps contents of the following tables: .It RSD PTR .It RSDT .It SLIT +.It SPCR Serial Port Console Redirection .It SRAT .It TCPA .It TPM2 From nobody Fri Oct 4 00:22:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKTlP3JYRz5XZ9w; Fri, 04 Oct 2024 00:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKTlP17Stz4WPq; Fri, 4 Oct 2024 00:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728001361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OY8KoQ8EYvC9++34TupyaXk1cRu2qokLZ3KWrvAkrM=; b=h2fkbFiN5A4hWJbstY1t+cFvvdBgMcIRaFY3pTtwS40/Mkcfwz19CmDizuo2LH81hhZDEx 8ckAv5Ua3Hcat+6IhPp1iLHQ+M2YsJX/9UyKK3TiJmp4he/vFlMGOErDvshUUXfXh3mSKw hOmmhR1e3iuK7ip7TLjsMRemVRLC2ir6wqGas+eQdaaxdDkv7QBK546Co2z2p6dJYfb7aK o/hv1rfWc+hJVK45QEYCZNVdMt2KYksqx3dXt08XmYHA2llvhQ/anPnx0MJLVpi51TCKOh uTItUpZYiQomw6nm8cb/35qM+4LYrdtu8WCecPuodKVXAwzQUcaxTWIYoFIsZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728001361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OY8KoQ8EYvC9++34TupyaXk1cRu2qokLZ3KWrvAkrM=; b=Q7UvW1Q4S7nsSDuLQthgqvGTfg/yX6PfHG69ZkQgWP9y6FoJsUjSOpzvlRsbUKVRsPZEAm RFsb/nwNAR1PNCKJsdcQSxQDATJbsu1wSWboJ5HaJ4OXP9BDRCzz27/LzkfBgy3YGP31Qc ViFmhDcMxKbJ60AekGEn8mOSKsdiK5JdkSnVlqHaxBzehMCddSKrQc7HENScL6XEPdnbxz xah5uVEylRMwGg108lVayk52ezYkWIXl481tbirWtrpzfnYoePxqTZdoS1a+4yWLxdp173 gCTvcabV5qN+jtH0PrtSO6sxdf0Xgz5ojIj4EOuYYa/VABuNRVizyEoGG5uxrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728001361; a=rsa-sha256; cv=none; b=AHRNNrGCcukMHqg4v2OUua8qkH2rCOV0UzYVjIE0V+5LYFh+kw5QtCaHO4eshIFJjT0pHo iqo5Rnh5li16glnrxx+oGvPKKYEUyBycY7uY54VapjclhB5LYXB+MJjwgBufeLjCxLp3GB stm7zNR8B/Cf0HsNEWOXVf4R/pkUDBfwWnllBj2kV50R1aWAmVyStyH0IUcgvsxWiJ+eeX vPEFHzsAJaDDVq7OAKwR3QemZCJ38jTKFtuJsu5tY7XGdPCGTUfBsdcptdurnkCn6vOAKX PD9VRhclmDaJ2hWrurHtvf9NA6tLHT1xG26iyiDCcmDPpuJ4hs/ICWkbUYLNnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKTlP0kdCz1BL9; Fri, 4 Oct 2024 00:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4940Mfpo073209; Fri, 4 Oct 2024 00:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4940MejF073206; Fri, 4 Oct 2024 00:22:40 GMT (envelope-from git) Date: Fri, 4 Oct 2024 00:22:40 GMT Message-Id: <202410040022.4940MejF073206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 64b0f52be2c9 - main - ctl: limit memory allocation in pci_virtio_scsi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64b0f52be2c9d7bcecebfeef393f8ec56cb85f47 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=64b0f52be2c9d7bcecebfeef393f8ec56cb85f47 commit 64b0f52be2c9d7bcecebfeef393f8ec56cb85f47 Author: Pierre Pronchery AuthorDate: 2024-07-19 17:32:27 +0000 Commit: Ed Maste CommitDate: 2024-10-04 00:22:34 +0000 ctl: limit memory allocation in pci_virtio_scsi The virtio_scsi device allows a VM guest to directly send SCSI commands (ctsio->cdb array) to the kernel driver exposed on /dev/cam/ctl (ctl.ko). All kernel commands accessible from the guest are defined by ctl_cmd_table. The command ctl_persistent_reserve_out (cdb[0]=0x5F and cbd[1]=0) allows the caller to call malloc() with an arbitrary size (uint32_t). This can be used by the guest to overload the kernel memory (DOS attack). Reported by: Synacktiv Reviewed by: asomers Security: HYP-08 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46044 --- sys/cam/ctl/ctl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index b1367cd79fab..da147f0ec914 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -8269,6 +8269,18 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio) param_len = scsi_4btoul(cdb->length); + /* validate the parameter length */ + if (param_len != 24) { + ctl_set_invalid_field(ctsio, + /*sks_valid*/ 1, + /*command*/ 1, + /*field*/ 5, + /*bit_valid*/ 1, + /*bit*/ 0); + ctl_done((union ctl_io *)ctsio); + return (CTL_RETVAL_COMPLETE); + } + if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) { ctsio->kern_data_ptr = malloc(param_len, M_CTL, M_WAITOK); ctsio->kern_data_len = param_len; From nobody Fri Oct 4 06:41:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKf8p6jM2z5Y1hy; Fri, 04 Oct 2024 06:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKf8p67TPz3wkX; Fri, 4 Oct 2024 06:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pCUj/4sTQIFPcD04qco6g3iWXUFhW3m15eLuLQxU3k=; b=qBLNUGvSsUreJQwxOA1MvEy1gHyhy/c5s89QcdS0KdXuIcL5I3SgRZq05MVHenlbvOxmEy b6xsHcwNKQ0YcyqbUEAop8DfyEKpPJ476kVaFWrBaftluE3nWzpB6sdZw9SBiEK8Q70k7w 2mVlmFN/cn9PqGOFIUm8nnSmYb0Y21Kv7J39GPhICkbn6d6+yczUKzt3hDkCf2O5rx9HhO AMfmhspHuArALnFsOBR0cDOVeB2VaNY+CQG9nlrjZwix3ASc3tdzi4gD6HDN4DWJVF8wT/ +kK8ymdVImGtcApxFoxLxDThaCGHtiWSnrNbdZpT+yEtcr/swB4ao2AXk+uZ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pCUj/4sTQIFPcD04qco6g3iWXUFhW3m15eLuLQxU3k=; b=AMNxcChem2ykALQyLJYHKusif79c1tVU3Cyx/mNaIej+EutNzDnV4LlxVdb3YHBDH9aXRP l6fmsFc4v/XymjqJP9mbWNVTCDgPJgYCezC2JjBP+NYUeu3WrxFHJL2g39/qb1WCv2/OQI 1LFV8xl/V2N3KqB6Ch5tV2CAPPTK4MJ0i9LuSzceYK/8zs2PRgVGM/tf/wRU5R71VEv+qb r3cQSHamCuqFsNJNFOjTt5ySkLjc+/l5epUCKNdRZ2HoT1fSMeMH13p7Em7mpsaLnWTlex xLqGg1qSkVyLWjpxhU4j2HVJu5Ts+JGJLtHA+S2rf+PEfMUgiXhDOhV7p3lwXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728024106; a=rsa-sha256; cv=none; b=Qyo1RKWWIPjvtUEzxEwF4kqSefc0ccG1xlDXy9/TgPF/tcOaY3H2K1D0HrPxkeepua6Q56 79Hz/LVBEh6w5rUJjveioLHLpupFvOm2xGaTy329ZaK2Q1dFR+cncW0+ingjp2SmRfbBGH DQLmfBP1/FFoI6XzYSqRYgkks5RlFClMewNvOR44Mx4+4SoEFnri6ZivdzCCpklzLf1/V5 nG6ugyluEUvmLHY37ZSWKpRcMkY2APkkj7XTNBMOMlr2m/MKmby4OHOetx5F+Qi9K3ZATh b+uJjU5CsdmX4nFTmUYIdkWkzozQYAji1xcteR3AhLA7Wt6Rk5iBE5j0eLXDTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKf8p5kx6zNJ4; Fri, 4 Oct 2024 06:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4946fkiC013822; Fri, 4 Oct 2024 06:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4946fkna013819; Fri, 4 Oct 2024 06:41:46 GMT (envelope-from git) Date: Fri, 4 Oct 2024 06:41:46 GMT Message-Id: <202410040641.4946fkna013819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e31c5d398138 - stable/14 - e1000: Clean up legacy absolute and packet timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e31c5d398138c14be0a262af331bd823785f61d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e31c5d398138c14be0a262af331bd823785f61d9 commit e31c5d398138c14be0a262af331bd823785f61d9 Author: Kevin Bowling AuthorDate: 2024-09-27 06:08:01 +0000 Commit: Kevin Bowling CommitDate: 2024-10-04 06:41:20 +0000 e1000: Clean up legacy absolute and packet timers The absolute and packet timers only apply to lem and em with some only applying to the later. This cleans up the sysctl tree to only show these where applicable and stops writing to unexpected registers for igb. Sponsored by: BBOX.io (cherry picked from commit 1c578f1c93112d3d53820f8b6b411488b83f0ab2) --- sys/dev/e1000/if_em.c | 116 +++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index ad12171487f6..cdadec17e355 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1033,27 +1033,25 @@ em_if_attach_pre(if_ctx_t ctx) e1000_get_bus_info(hw); /* Set up some sysctls for the tunable interrupt delays */ - em_add_int_delay_sysctl(sc, "rx_int_delay", - "receive interrupt delay in usecs", &sc->rx_int_delay, - E1000_REGISTER(hw, E1000_RDTR), em_rx_int_delay_dflt); - em_add_int_delay_sysctl(sc, "tx_int_delay", - "transmit interrupt delay in usecs", &sc->tx_int_delay, - E1000_REGISTER(hw, E1000_TIDV), em_tx_int_delay_dflt); - em_add_int_delay_sysctl(sc, "rx_abs_int_delay", - "receive interrupt delay limit in usecs", - &sc->rx_abs_int_delay, - E1000_REGISTER(hw, E1000_RADV), - em_rx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "tx_abs_int_delay", - "transmit interrupt delay limit in usecs", - &sc->tx_abs_int_delay, - E1000_REGISTER(hw, E1000_TADV), - em_tx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "itr", - "interrupt delay limit in usecs/4", - &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), - DEFAULT_ITR); + if (hw->mac.type < igb_mac_min) { + em_add_int_delay_sysctl(sc, "rx_int_delay", + "receive interrupt delay in usecs", &sc->rx_int_delay, + E1000_REGISTER(hw, E1000_RDTR), em_rx_int_delay_dflt); + em_add_int_delay_sysctl(sc, "tx_int_delay", + "transmit interrupt delay in usecs", &sc->tx_int_delay, + E1000_REGISTER(hw, E1000_TIDV), em_tx_int_delay_dflt); + } + if (hw->mac.type >= e1000_82540 && hw->mac.type < igb_mac_min) { + em_add_int_delay_sysctl(sc, "rx_abs_int_delay", + "receive interrupt delay limit in usecs", &sc->rx_abs_int_delay, + E1000_REGISTER(hw, E1000_RADV), em_rx_abs_int_delay_dflt); + em_add_int_delay_sysctl(sc, "tx_abs_int_delay", + "transmit interrupt delay limit in usecs", &sc->tx_abs_int_delay, + E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); + em_add_int_delay_sysctl(sc, "itr", + "interrupt delay limit in usecs/4", &sc->tx_itr, + E1000_REGISTER(hw, E1000_ITR), DEFAULT_ITR); + } hw->mac.autoneg = DO_AUTO_NEG; hw->phy.autoneg_wait_to_complete = false; @@ -2287,18 +2285,19 @@ igb_configure_queues(struct e1000_softc *sc) break; } - /* Set the starting interrupt rate */ - if (em_max_interrupt_rate > 0) + /* Set the igb starting interrupt rate */ + if (em_max_interrupt_rate > 0) { newitr = (4000000 / em_max_interrupt_rate) & 0x7FFC; - if (hw->mac.type == e1000_82575) - newitr |= newitr << 16; - else - newitr |= E1000_EITR_CNT_IGNR; + if (hw->mac.type == e1000_82575) + newitr |= newitr << 16; + else + newitr |= E1000_EITR_CNT_IGNR; - for (int i = 0; i < sc->rx_num_queues; i++) { - rx_que = &sc->rx_queues[i]; - E1000_WRITE_REG(hw, E1000_EITR(rx_que->msix), newitr); + for (int i = 0; i < sc->rx_num_queues; i++) { + rx_que = &sc->rx_queues[i]; + E1000_WRITE_REG(hw, E1000_EITR(rx_que->msix), newitr); + } } return; @@ -3274,12 +3273,16 @@ em_initialize_transmit_unit(if_ctx_t ctx) tipg |= DEFAULT_82543_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; } - E1000_WRITE_REG(hw, E1000_TIPG, tipg); - E1000_WRITE_REG(hw, E1000_TIDV, sc->tx_int_delay.value); + if (hw->mac.type < igb_mac_min) { + E1000_WRITE_REG(hw, E1000_TIPG, tipg); + E1000_WRITE_REG(hw, E1000_TIDV, sc->tx_int_delay.value); + + if (sc->tx_int_delay.value > 0) + sc->txd_cmd |= E1000_TXD_CMD_IDE; + } - if(hw->mac.type >= e1000_82540) - E1000_WRITE_REG(hw, E1000_TADV, - sc->tx_abs_int_delay.value); + if (hw->mac.type >= e1000_82540) + E1000_WRITE_REG(hw, E1000_TADV, sc->tx_abs_int_delay.value); if (hw->mac.type == e1000_82571 || hw->mac.type == e1000_82572) { tarc = E1000_READ_REG(hw, E1000_TARC(0)); @@ -3304,16 +3307,13 @@ em_initialize_transmit_unit(if_ctx_t ctx) E1000_WRITE_REG(hw, E1000_TARC(0), tarc); } - if (sc->tx_int_delay.value > 0) - sc->txd_cmd |= E1000_TXD_CMD_IDE; - /* Program the Transmit Control Register */ tctl = E1000_READ_REG(hw, E1000_TCTL); tctl &= ~E1000_TCTL_CT; tctl |= (E1000_TCTL_PSP | E1000_TCTL_RTLC | E1000_TCTL_EN | (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT)); - if (hw->mac.type >= e1000_82571) + if (hw->mac.type >= e1000_82571 && hw->mac.type < igb_mac_min) tctl |= E1000_TCTL_MULR; /* This write will effectively turn on the transmit unit. */ @@ -3381,17 +3381,29 @@ em_initialize_receive_unit(if_ctx_t ctx) if (!em_disable_crc_stripping) rctl |= E1000_RCTL_SECRC; - if (hw->mac.type >= e1000_82540) { - E1000_WRITE_REG(hw, E1000_RADV, - sc->rx_abs_int_delay.value); + /* lem/em default interrupt moderation */ + if (hw->mac.type < igb_mac_min) { + if (hw->mac.type >= e1000_82540) { + E1000_WRITE_REG(hw, E1000_RADV, sc->rx_abs_int_delay.value); - /* - * Set the interrupt throttling rate. Value is calculated - * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) + /* + * Set the interrupt throttling rate. Value is calculated + * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) + */ + E1000_WRITE_REG(hw, E1000_ITR, DEFAULT_ITR); + } + + /* XXX TEMPORARY WORKAROUND: on some systems with 82573 + * long latencies are observed, like Lenovo X60. This + * change eliminates the problem, but since having positive + * values in RDTR is a known source of problems on other + * platforms another solution is being sought. */ - E1000_WRITE_REG(hw, E1000_ITR, DEFAULT_ITR); + if (hw->mac.type == e1000_82573) + E1000_WRITE_REG(hw, E1000_RDTR, 0x20); + else + E1000_WRITE_REG(hw, E1000_RDTR, sc->rx_int_delay.value); } - E1000_WRITE_REG(hw, E1000_RDTR, sc->rx_int_delay.value); if (hw->mac.type >= em_mac_min) { uint32_t rfctl; @@ -3441,16 +3453,6 @@ em_initialize_receive_unit(if_ctx_t ctx) } E1000_WRITE_REG(hw, E1000_RXCSUM, rxcsum); - /* - * XXX TEMPORARY WORKAROUND: on some systems with 82573 - * long latencies are observed, like Lenovo X60. This - * change eliminates the problem, but since having positive - * values in RDTR is a known source of problems on other - * platforms another solution is being sought. - */ - if (hw->mac.type == e1000_82573) - E1000_WRITE_REG(hw, E1000_RDTR, 0x20); - for (i = 0, que = sc->rx_queues; i < sc->rx_num_queues; i++, que++) { struct rx_ring *rxr = &que->rxr; /* Setup the Base and Length of the Rx Descriptor Ring */ From nobody Fri Oct 4 06:41:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKf8r2Zksz5Y1cc; Fri, 04 Oct 2024 06:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKf8r0PCxz3x4l; Fri, 4 Oct 2024 06:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pkmcxd+6Us61eX9IqyHQy4PGURlmsJTzwiAeVn+uEHE=; b=KrIQQWcvSMMeWR6Whe+MIGtiWxUHnjp7gU3Myz16u4vgHwT319GYIlfDKJoRqnEoV6EqFF mqT7PGz2gkk03zakHHV5a8085g2/vcsz9DTaEDZ9dWupxi7QhweIY8Y3etbcwetNsGK5nB MIIqMePeyAl2k/Xw7rJm/niMDFbAHaqhngjdTPP549Q0PtskgIZIjvv3RBoM7yZqjpkXnT 94+vx6HL9OtdAWe+ufNdCJFO0M+o6Kdujtyewa6t2/Y5twevV/dBn/twvWKeNVIPfDIQXJ M8PlGdp8yH4m62Xj2fgiv4f0D8t5xdsAJepiTnrjKvc0yvIZMWG0XhjqssRC3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pkmcxd+6Us61eX9IqyHQy4PGURlmsJTzwiAeVn+uEHE=; b=srHCfHyGlOBLNhufVFoTGfmnYZwr5jFND5/ksitT+sKTvuh2cfJCzunkERQmtiVSsyer7P ORc5VtwlCjUlDOna4ywxuAmufCRJFYprKVERf/P53atiBrAKP4Ph8y5XF0110tmYkYsi5R CE2mXZ3d2vqW+EdFHTZ9t/UsusueqJrbN7XRK2fuGBHgQ0aUMeWPI9kcPwO/fPwjUEmRTa kRef8gUROeRtLUIRAA/ynYJhVj2fw+ct8Kb8fyAKPUYEcPi/MtZ+rIJlpDToQMbvw5iqEv Q0MXsQr0azniICwMAaszqmCC35muTBVKRlDcLFGZKdT6PPX4sJn9lhb1nY0T+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728024108; a=rsa-sha256; cv=none; b=etD8Kb7jWx3UXDnhasY9Hj4nrsIsaqW0JLuJvJy3dqG3qYXKQqcNbagFyq0yQqImwUiEGj wBXd1h5ssEuU7KA6Sdv3GYgoOXjq8RBD/G+xjEypKAnNm5Bbwxh8eWD4hC0OKw0y25D+9c 6QBLiWsBOR/TDwAkaru7Y2sDREBgKRWOkCBNAqFsAhR3y77lEnmtD3Q3XN8l658Sce2dF8 mn0gkRFs9QUidvaoW4xAB0sesBV517etnOfKzMhwUZnwMnB1OHOjeT8wktQ3ul6v6c9doW 4RGSs9+iJ4e/uqWFcWqR+DFkxhFkiXULXkhVYPdBVDt343ewJb414PtppWpG/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 4XKf8r00sDzNJ6; Fri, 4 Oct 2024 06:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4946flxX013873; Fri, 4 Oct 2024 06:41:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4946flwj013870; Fri, 4 Oct 2024 06:41:47 GMT (envelope-from git) Date: Fri, 4 Oct 2024 06:41:47 GMT Message-Id: <202410040641.4946flwj013870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 88cd12ec4248 - stable/14 - e1000: Clean up ITR/EITR in preparation for AIM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 88cd12ec4248a92921cacdf618a6384ca5ed0248 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=88cd12ec4248a92921cacdf618a6384ca5ed0248 commit 88cd12ec4248a92921cacdf618a6384ca5ed0248 Author: Kevin Bowling AuthorDate: 2024-09-27 08:03:31 +0000 Commit: Kevin Bowling CommitDate: 2024-10-04 06:41:34 +0000 e1000: Clean up ITR/EITR in preparation for AIM Provide macros to derive the various needed values and make it a bit more clear the differences between em and igb. The igb default EITR was not landing at the right offset. Respect the 'max_interrupt_rate' tunable. Sponsored by: BBOX.io (cherry picked from commit 9bf9164fc8aad1ca828c725413e06462aef1e4dd) --- sys/dev/e1000/if_em.c | 20 ++++++++------------ sys/dev/e1000/if_em.h | 11 +++++++++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index cdadec17e355..b9c6131e6741 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -499,9 +499,6 @@ static driver_t igb_if_driver = { #define EM_TICKS_TO_USECS(ticks) ((1024 * (ticks) + 500) / 1000) #define EM_USECS_TO_TICKS(usecs) ((1000 * (usecs) + 512) / 1024) -#define MAX_INTS_PER_SEC 8000 -#define DEFAULT_ITR (1000000000/(MAX_INTS_PER_SEC * 256)) - /* Allow common code without TSO */ #ifndef CSUM_TSO #define CSUM_TSO 0 @@ -551,7 +548,7 @@ SYSCTL_INT(_hw_em, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &eee_setting, 0, /* ** Tuneable Interrupt rate */ -static int em_max_interrupt_rate = 8000; +static int em_max_interrupt_rate = EM_INTS_PER_SEC; SYSCTL_INT(_hw_em, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &em_max_interrupt_rate, 0, "Maximum interrupts per second"); @@ -1050,7 +1047,8 @@ em_if_attach_pre(if_ctx_t ctx) E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); em_add_int_delay_sysctl(sc, "itr", "interrupt delay limit in usecs/4", &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), DEFAULT_ITR); + E1000_REGISTER(hw, E1000_ITR), + EM_INTS_TO_ITR(em_max_interrupt_rate)); } hw->mac.autoneg = DO_AUTO_NEG; @@ -2287,7 +2285,7 @@ igb_configure_queues(struct e1000_softc *sc) /* Set the igb starting interrupt rate */ if (em_max_interrupt_rate > 0) { - newitr = (4000000 / em_max_interrupt_rate) & 0x7FFC; + newitr = IGB_INTS_TO_EITR(em_max_interrupt_rate); if (hw->mac.type == e1000_82575) newitr |= newitr << 16; @@ -3386,11 +3384,9 @@ em_initialize_receive_unit(if_ctx_t ctx) if (hw->mac.type >= e1000_82540) { E1000_WRITE_REG(hw, E1000_RADV, sc->rx_abs_int_delay.value); - /* - * Set the interrupt throttling rate. Value is calculated - * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) - */ - E1000_WRITE_REG(hw, E1000_ITR, DEFAULT_ITR); + /* Set the default interrupt throttling rate */ + E1000_WRITE_REG(hw, E1000_ITR, + EM_INTS_TO_ITR(em_max_interrupt_rate)); } /* XXX TEMPORARY WORKAROUND: on some systems with 82573 @@ -3418,7 +3414,7 @@ em_initialize_receive_unit(if_ctx_t ctx) if (hw->mac.type == e1000_82574) { for (int i = 0; i < 4; i++) E1000_WRITE_REG(hw, E1000_EITR_82574(i), - DEFAULT_ITR); + EM_INTS_TO_ITR(em_max_interrupt_rate)); /* Disable accelerated acknowledge */ rfctl |= E1000_RFCTL_ACK_DIS; } diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 244762e8ed0d..7219dc57c333 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -244,8 +244,15 @@ #define IGB_MEDIA_RESET (1 << 0) /* Define the starting Interrupt rate per Queue */ -#define IGB_INTS_PER_SEC 8000 -#define IGB_DEFAULT_ITR ((1000000/IGB_INTS_PER_SEC) << 2) +#define EM_INTS_PER_SEC 8000 +#define EM_INTS_MULTIPLIER 256 +#define EM_ITR_DIVIDEND 1000000000 +#define EM_INTS_TO_ITR(i) (EM_ITR_DIVIDEND/(i * EM_INTS_MULTIPLIER)) +#define IGB_ITR_DIVIDEND 1000000 +#define IGB_ITR_SHIFT 2 +#define IGB_QVECTOR_MASK 0x7FFC +#define IGB_INTS_TO_EITR(i) (((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK) << \ + IGB_ITR_SHIFT) #define IGB_LINK_ITR 2000 #define I210_LINK_DELAY 1000 From nobody Fri Oct 4 06:42:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKf9t1YxWz5Y1d6; Fri, 04 Oct 2024 06:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKf9t11Nlz3y2h; Fri, 4 Oct 2024 06:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RiFY/ZTCmc5Guae3nQc/cuR0cbF1EG9aiR2Bctvd3+Y=; b=nwNN5x+qRdRt54wVRtERElLroF2hdbFCrXmrJxxj3KGhLctaDT7pDyGASc20aboIGOin8c kRLBAuwcUVAU8ObMijcGnAoFV27XZH9JBxq7T95CMsuOEEpujTHB4zXLdbvZVs7reS/bzs ww0/HJGJn+BdeTDvuMZ/xTlCzI8cbYqZFrPeYPJINSlIXBZ5wQLiwZ9t3RPG956fUTfKQJ tWDH8AVnvWcEuI7QShsuWwB3y088kQVo3yzOoXOXwfkuqnY1RGfkTxVXAIaUQvRpMl/rr9 gjrLJirIJ5WFDeAgKsUyYxQyNyr2pgWLQbv3XPNo0VQYg1I7VRV+j7fpQ8W5/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RiFY/ZTCmc5Guae3nQc/cuR0cbF1EG9aiR2Bctvd3+Y=; b=uc+N+jxAthn/3OaTXHOrXvMiLKCQjvMCCz6CpB2EJdhBRtBfNqWuD6xDl+RnLie6zz4z1r Yr2OZc5CrJR8hZhSx2UTm6OVphcD8wtViuX7cS0MtyOfRlkw8RcfG8P0g/BqaS10dzgCtQ MqTUTlb/vzxUPkdRvcp+6FHVOYCQpXj2N1z3Y3u10Rne57rEjHqUEvyAeeRSLFgsL1p7Ik kipcvTgWFTEQgbEkLRNVvsoHUGpg356uhZQw//UarsqiS/tHit0GgJNUAlL0+ERD1fDeGq wAKj3gM5c9QplUHYJXlevfVStENAfKXriorjbUpeLdYQtJ0BRfpZ8BhEzXHuEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728024162; a=rsa-sha256; cv=none; b=x0J9oHKqOKgog/KpPvefIWVAG/N45D20RLnmrw2mXSU1QKWeYYO0Sx535qy82zr55uJisF V0JcmoxQMcrnBpAiJaKij9048LbWy+EKQlOqIpkXLwo/YznzuSOSRtKsaFQPabA35DhI35 BkgfUABKlviJk2yfNKRmamp8onkn1AOmb9dFrJI+7Ly+qv9SwZZqtZ1Q4juh8XUlR1kz/C rQwV3i2DrsCOGe4u7cNVnNuLvtOiwBbBX/no2H8zJmq18soutiZO5PdN1eMISWdEugPrLy PHCtOy8J39EuBBrpzlRJ74LMgcEwUMwnHN74sYNTXyabyPWwgJ9c2jb/DATpJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKf9t044dzNJJ; Fri, 4 Oct 2024 06:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4946gf8V016634; Fri, 4 Oct 2024 06:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4946gfZC016631; Fri, 4 Oct 2024 06:42:41 GMT (envelope-from git) Date: Fri, 4 Oct 2024 06:42:41 GMT Message-Id: <202410040642.4946gfZC016631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 6ccd24f18376 - stable/13 - e1000: Clean up legacy absolute and packet timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ccd24f18376fb44285509a2e3c6469bdebdc108 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6ccd24f18376fb44285509a2e3c6469bdebdc108 commit 6ccd24f18376fb44285509a2e3c6469bdebdc108 Author: Kevin Bowling AuthorDate: 2024-09-27 06:08:01 +0000 Commit: Kevin Bowling CommitDate: 2024-10-04 06:42:10 +0000 e1000: Clean up legacy absolute and packet timers The absolute and packet timers only apply to lem and em with some only applying to the later. This cleans up the sysctl tree to only show these where applicable and stops writing to unexpected registers for igb. Sponsored by: BBOX.io (cherry picked from commit 1c578f1c93112d3d53820f8b6b411488b83f0ab2) --- sys/dev/e1000/if_em.c | 116 +++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 6d9eedae3df4..8a3178d737b2 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1035,27 +1035,25 @@ em_if_attach_pre(if_ctx_t ctx) e1000_get_bus_info(hw); /* Set up some sysctls for the tunable interrupt delays */ - em_add_int_delay_sysctl(sc, "rx_int_delay", - "receive interrupt delay in usecs", &sc->rx_int_delay, - E1000_REGISTER(hw, E1000_RDTR), em_rx_int_delay_dflt); - em_add_int_delay_sysctl(sc, "tx_int_delay", - "transmit interrupt delay in usecs", &sc->tx_int_delay, - E1000_REGISTER(hw, E1000_TIDV), em_tx_int_delay_dflt); - em_add_int_delay_sysctl(sc, "rx_abs_int_delay", - "receive interrupt delay limit in usecs", - &sc->rx_abs_int_delay, - E1000_REGISTER(hw, E1000_RADV), - em_rx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "tx_abs_int_delay", - "transmit interrupt delay limit in usecs", - &sc->tx_abs_int_delay, - E1000_REGISTER(hw, E1000_TADV), - em_tx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "itr", - "interrupt delay limit in usecs/4", - &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), - DEFAULT_ITR); + if (hw->mac.type < igb_mac_min) { + em_add_int_delay_sysctl(sc, "rx_int_delay", + "receive interrupt delay in usecs", &sc->rx_int_delay, + E1000_REGISTER(hw, E1000_RDTR), em_rx_int_delay_dflt); + em_add_int_delay_sysctl(sc, "tx_int_delay", + "transmit interrupt delay in usecs", &sc->tx_int_delay, + E1000_REGISTER(hw, E1000_TIDV), em_tx_int_delay_dflt); + } + if (hw->mac.type >= e1000_82540 && hw->mac.type < igb_mac_min) { + em_add_int_delay_sysctl(sc, "rx_abs_int_delay", + "receive interrupt delay limit in usecs", &sc->rx_abs_int_delay, + E1000_REGISTER(hw, E1000_RADV), em_rx_abs_int_delay_dflt); + em_add_int_delay_sysctl(sc, "tx_abs_int_delay", + "transmit interrupt delay limit in usecs", &sc->tx_abs_int_delay, + E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); + em_add_int_delay_sysctl(sc, "itr", + "interrupt delay limit in usecs/4", &sc->tx_itr, + E1000_REGISTER(hw, E1000_ITR), DEFAULT_ITR); + } hw->mac.autoneg = DO_AUTO_NEG; hw->phy.autoneg_wait_to_complete = false; @@ -2289,18 +2287,19 @@ igb_configure_queues(struct e1000_softc *sc) break; } - /* Set the starting interrupt rate */ - if (em_max_interrupt_rate > 0) + /* Set the igb starting interrupt rate */ + if (em_max_interrupt_rate > 0) { newitr = (4000000 / em_max_interrupt_rate) & 0x7FFC; - if (hw->mac.type == e1000_82575) - newitr |= newitr << 16; - else - newitr |= E1000_EITR_CNT_IGNR; + if (hw->mac.type == e1000_82575) + newitr |= newitr << 16; + else + newitr |= E1000_EITR_CNT_IGNR; - for (int i = 0; i < sc->rx_num_queues; i++) { - rx_que = &sc->rx_queues[i]; - E1000_WRITE_REG(hw, E1000_EITR(rx_que->msix), newitr); + for (int i = 0; i < sc->rx_num_queues; i++) { + rx_que = &sc->rx_queues[i]; + E1000_WRITE_REG(hw, E1000_EITR(rx_que->msix), newitr); + } } return; @@ -3276,12 +3275,16 @@ em_initialize_transmit_unit(if_ctx_t ctx) tipg |= DEFAULT_82543_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; } - E1000_WRITE_REG(hw, E1000_TIPG, tipg); - E1000_WRITE_REG(hw, E1000_TIDV, sc->tx_int_delay.value); + if (hw->mac.type < igb_mac_min) { + E1000_WRITE_REG(hw, E1000_TIPG, tipg); + E1000_WRITE_REG(hw, E1000_TIDV, sc->tx_int_delay.value); + + if (sc->tx_int_delay.value > 0) + sc->txd_cmd |= E1000_TXD_CMD_IDE; + } - if(hw->mac.type >= e1000_82540) - E1000_WRITE_REG(hw, E1000_TADV, - sc->tx_abs_int_delay.value); + if (hw->mac.type >= e1000_82540) + E1000_WRITE_REG(hw, E1000_TADV, sc->tx_abs_int_delay.value); if (hw->mac.type == e1000_82571 || hw->mac.type == e1000_82572) { tarc = E1000_READ_REG(hw, E1000_TARC(0)); @@ -3306,16 +3309,13 @@ em_initialize_transmit_unit(if_ctx_t ctx) E1000_WRITE_REG(hw, E1000_TARC(0), tarc); } - if (sc->tx_int_delay.value > 0) - sc->txd_cmd |= E1000_TXD_CMD_IDE; - /* Program the Transmit Control Register */ tctl = E1000_READ_REG(hw, E1000_TCTL); tctl &= ~E1000_TCTL_CT; tctl |= (E1000_TCTL_PSP | E1000_TCTL_RTLC | E1000_TCTL_EN | (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT)); - if (hw->mac.type >= e1000_82571) + if (hw->mac.type >= e1000_82571 && hw->mac.type < igb_mac_min) tctl |= E1000_TCTL_MULR; /* This write will effectively turn on the transmit unit. */ @@ -3383,17 +3383,29 @@ em_initialize_receive_unit(if_ctx_t ctx) if (!em_disable_crc_stripping) rctl |= E1000_RCTL_SECRC; - if (hw->mac.type >= e1000_82540) { - E1000_WRITE_REG(hw, E1000_RADV, - sc->rx_abs_int_delay.value); + /* lem/em default interrupt moderation */ + if (hw->mac.type < igb_mac_min) { + if (hw->mac.type >= e1000_82540) { + E1000_WRITE_REG(hw, E1000_RADV, sc->rx_abs_int_delay.value); - /* - * Set the interrupt throttling rate. Value is calculated - * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) + /* + * Set the interrupt throttling rate. Value is calculated + * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) + */ + E1000_WRITE_REG(hw, E1000_ITR, DEFAULT_ITR); + } + + /* XXX TEMPORARY WORKAROUND: on some systems with 82573 + * long latencies are observed, like Lenovo X60. This + * change eliminates the problem, but since having positive + * values in RDTR is a known source of problems on other + * platforms another solution is being sought. */ - E1000_WRITE_REG(hw, E1000_ITR, DEFAULT_ITR); + if (hw->mac.type == e1000_82573) + E1000_WRITE_REG(hw, E1000_RDTR, 0x20); + else + E1000_WRITE_REG(hw, E1000_RDTR, sc->rx_int_delay.value); } - E1000_WRITE_REG(hw, E1000_RDTR, sc->rx_int_delay.value); if (hw->mac.type >= em_mac_min) { uint32_t rfctl; @@ -3443,16 +3455,6 @@ em_initialize_receive_unit(if_ctx_t ctx) } E1000_WRITE_REG(hw, E1000_RXCSUM, rxcsum); - /* - * XXX TEMPORARY WORKAROUND: on some systems with 82573 - * long latencies are observed, like Lenovo X60. This - * change eliminates the problem, but since having positive - * values in RDTR is a known source of problems on other - * platforms another solution is being sought. - */ - if (hw->mac.type == e1000_82573) - E1000_WRITE_REG(hw, E1000_RDTR, 0x20); - for (i = 0, que = sc->rx_queues; i < sc->rx_num_queues; i++, que++) { struct rx_ring *rxr = &que->rxr; /* Setup the Base and Length of the Rx Descriptor Ring */ From nobody Fri Oct 4 06:42:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKf9v27jLz5Y258; Fri, 04 Oct 2024 06:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKf9v1X8Mz3y0y; Fri, 4 Oct 2024 06:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xlz13UzUnx9VCQA3Q8xhbKAIunXYgxSc3f9mler0pgk=; b=IEyZeuJUnC3Skd7BDYW7/FRpNE/19uvH0xBzavTPXrehUDZxFlahqwhbc6HbJFbGp1Vvjn DZ70j2KiMRTJHUrJmUGEp/61QI0pTic0NXL/3R0EpVpHbv8w7e+KQOfLpPlyT0ZB0GECVt P+StmvegWNwTxz1Fi9IpqMLGWMr23ywKvEEKhlo6IVHQZ1Ci26p4OaDIV9pDFmKuV+C6r9 pOmvSWGP/+3QFglr5I5rqm9G6TF3UNbImMNVsaZMhV7gKAUWrIdGY83yXmz5xANYAtbws6 GexHmf6IpZ/aoCOC+76NtYG+w00JX++Se8zdBjjOqb+A9IqvP4UN6eJykstPIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728024163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xlz13UzUnx9VCQA3Q8xhbKAIunXYgxSc3f9mler0pgk=; b=I3w7JV71/SngOr42zoRdlvg7NaCXcVJfhbPTZYW0LjVaX/Qhs0xlkWFGIAAwLsRtJ3tS68 MRfS3dJmMf2//+1GrS/d1w+KiuGX+15QjVxCROOtU1Pl5/UiNW67Oe2o15vkBt0OBDGDTA BDgI+vrR4hirTDBUSYJyhayfRP41QbcGAecbelZgipsTYUNC7F8Xbujjlrtmmon/X4+ES4 aW2NDNzrMC4e2B2vI8s1yOHevx7L3kaYk8Rfdjnw1RxnRS28U3sA2XYh8hk2vvqi6frql2 qTl7vHTWrv6gxLZ5U1ur2zswnvMFmoG3XnXKN+ob8z3LY+Ffu0uXRnBt0K2EUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728024163; a=rsa-sha256; cv=none; b=l62p2XX7rTpfNbJPEUbF9o/peSETbf5FtQ8umWtdXN1k25Fw6mQu3EdFi7lgohxAAh4Pt9 /DRXS5EfMH1jStpFclwWl14sq81wqroPUKTgwtG4v3odfP0trc93B0mCCwcVx9zaO85HKb 95buiz5usd1Iof+nZu4YRHGKChKCCIp/6mlSlZ+tT2CX/Yrd5R+xcolc/tLh10dvRqyTW3 dC4+bcsOdLkVFx9B8Gik2pdpGuE7AKUhyJoar/ByhLPyi5UZGMSm4mquHPYICYqZ0JwWdv IufDWkI9i1jE2Dm4VACJgYn4DligZXtR5sDEK+9rKpRsRRE8VYfuZ3kZwilr0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKf9v17H8zPJc; Fri, 4 Oct 2024 06:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4946ghME016685; Fri, 4 Oct 2024 06:42:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4946ghEB016682; Fri, 4 Oct 2024 06:42:43 GMT (envelope-from git) Date: Fri, 4 Oct 2024 06:42:43 GMT Message-Id: <202410040642.4946ghEB016682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 94227aef87bd - stable/13 - e1000: Clean up ITR/EITR in preparation for AIM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94227aef87bd5233b0996d9ff23d1f839229b20f Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=94227aef87bd5233b0996d9ff23d1f839229b20f commit 94227aef87bd5233b0996d9ff23d1f839229b20f Author: Kevin Bowling AuthorDate: 2024-09-27 08:03:31 +0000 Commit: Kevin Bowling CommitDate: 2024-10-04 06:42:31 +0000 e1000: Clean up ITR/EITR in preparation for AIM Provide macros to derive the various needed values and make it a bit more clear the differences between em and igb. The igb default EITR was not landing at the right offset. Respect the 'max_interrupt_rate' tunable. Sponsored by: BBOX.io (cherry picked from commit 9bf9164fc8aad1ca828c725413e06462aef1e4dd) --- sys/dev/e1000/if_em.c | 20 ++++++++------------ sys/dev/e1000/if_em.h | 11 +++++++++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 8a3178d737b2..41d3ba093bab 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -501,9 +501,6 @@ static driver_t igb_if_driver = { #define EM_TICKS_TO_USECS(ticks) ((1024 * (ticks) + 500) / 1000) #define EM_USECS_TO_TICKS(usecs) ((1000 * (usecs) + 512) / 1024) -#define MAX_INTS_PER_SEC 8000 -#define DEFAULT_ITR (1000000000/(MAX_INTS_PER_SEC * 256)) - /* Allow common code without TSO */ #ifndef CSUM_TSO #define CSUM_TSO 0 @@ -553,7 +550,7 @@ SYSCTL_INT(_hw_em, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &eee_setting, 0, /* ** Tuneable Interrupt rate */ -static int em_max_interrupt_rate = 8000; +static int em_max_interrupt_rate = EM_INTS_PER_SEC; SYSCTL_INT(_hw_em, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &em_max_interrupt_rate, 0, "Maximum interrupts per second"); @@ -1052,7 +1049,8 @@ em_if_attach_pre(if_ctx_t ctx) E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); em_add_int_delay_sysctl(sc, "itr", "interrupt delay limit in usecs/4", &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), DEFAULT_ITR); + E1000_REGISTER(hw, E1000_ITR), + EM_INTS_TO_ITR(em_max_interrupt_rate)); } hw->mac.autoneg = DO_AUTO_NEG; @@ -2289,7 +2287,7 @@ igb_configure_queues(struct e1000_softc *sc) /* Set the igb starting interrupt rate */ if (em_max_interrupt_rate > 0) { - newitr = (4000000 / em_max_interrupt_rate) & 0x7FFC; + newitr = IGB_INTS_TO_EITR(em_max_interrupt_rate); if (hw->mac.type == e1000_82575) newitr |= newitr << 16; @@ -3388,11 +3386,9 @@ em_initialize_receive_unit(if_ctx_t ctx) if (hw->mac.type >= e1000_82540) { E1000_WRITE_REG(hw, E1000_RADV, sc->rx_abs_int_delay.value); - /* - * Set the interrupt throttling rate. Value is calculated - * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) - */ - E1000_WRITE_REG(hw, E1000_ITR, DEFAULT_ITR); + /* Set the default interrupt throttling rate */ + E1000_WRITE_REG(hw, E1000_ITR, + EM_INTS_TO_ITR(em_max_interrupt_rate)); } /* XXX TEMPORARY WORKAROUND: on some systems with 82573 @@ -3420,7 +3416,7 @@ em_initialize_receive_unit(if_ctx_t ctx) if (hw->mac.type == e1000_82574) { for (int i = 0; i < 4; i++) E1000_WRITE_REG(hw, E1000_EITR_82574(i), - DEFAULT_ITR); + EM_INTS_TO_ITR(em_max_interrupt_rate)); /* Disable accelerated acknowledge */ rfctl |= E1000_RFCTL_ACK_DIS; } diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 244762e8ed0d..7219dc57c333 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -244,8 +244,15 @@ #define IGB_MEDIA_RESET (1 << 0) /* Define the starting Interrupt rate per Queue */ -#define IGB_INTS_PER_SEC 8000 -#define IGB_DEFAULT_ITR ((1000000/IGB_INTS_PER_SEC) << 2) +#define EM_INTS_PER_SEC 8000 +#define EM_INTS_MULTIPLIER 256 +#define EM_ITR_DIVIDEND 1000000000 +#define EM_INTS_TO_ITR(i) (EM_ITR_DIVIDEND/(i * EM_INTS_MULTIPLIER)) +#define IGB_ITR_DIVIDEND 1000000 +#define IGB_ITR_SHIFT 2 +#define IGB_QVECTOR_MASK 0x7FFC +#define IGB_INTS_TO_EITR(i) (((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK) << \ + IGB_ITR_SHIFT) #define IGB_LINK_ITR 2000 #define I210_LINK_DELAY 1000 From nobody Fri Oct 4 07:45:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKgZb63ktz5Y5j6; Fri, 04 Oct 2024 07:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKgZb5TDhz437H; Fri, 4 Oct 2024 07:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728027943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htIAc26rdfI5FPV+avL7s6kuqkYIaeGVdLb8AP6DLsk=; b=CnwKuNYlcXyw7m0qjomYqHl76aG871axcoArNASwURejaZDtIB4gC0te7qXA7Jw4e71t/t vjiqgmY18Oto7GcgfBO7JRLa+MP/ydUCca05ehQ0N43FGNY0C+W7UXdEHU/Xdnn1vLh3yU AIKO7ed0oRT4J5sROgZ/ql+ZeRUwDLmIYPhYgIn8pa98I2cD2K8IzHFQG3KvEzyp3dZO2D AhwvJLtAXp+cTFRonbGat5pDeJMJM80o7GZzBL767u0NQ4ouVt0W5UJtcg/L/gcv+oyLWE KQpMQVpYwuDUlLQTI3GxcPmxnXLTRD5FBwoc6q8QOk/LEo1C4VMk/3PKdU5yUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728027943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htIAc26rdfI5FPV+avL7s6kuqkYIaeGVdLb8AP6DLsk=; b=YGlQspMbgNwILL+NnwCT2ukOOVUo0RJkSyQv4c5vnvrlYcMBguiws0UyWIi25yheCy1uLY blj08BOQVPX7WfzJMrtOLw9PI9gVhkXHbEiZBwEedPSSBoypHCbNfbjc82Yug+Cy09SLr1 sXCT8FYfihUqBi++8g921boeRMbIvXrwNZeH4OROJndqX4qD5L8A3Tjl6QO43Er4zzmvZl DYOk3sGzzzGYTKDmt40jNu9qFIWxL7RDn2SVDLUUUvUSz6dEpKur/mSs3ecqjdIyuVQpmy Leky7VzdW8ZBDUHPB5E6eYTJfOkGW7MB6K8ItBveWULdwDWUcwuvPb7y/1QBdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728027943; a=rsa-sha256; cv=none; b=BU16LVZj7FPPu+k5JMV2YVxkG1oFMwFaX0Nk3I4cRqxJH4/+p182483Lqxmg4rZzhKWi1o BqpxC4aejsKqV2vGsabtGeRPxypf5hVz2tC6B8gu7ZacXLMdKQFFh40atkIHO3RiEftcfb b0xvRJedOozX59s210yE52OobwQO+/N4Yj4C94cdqdiXHjwxeb7ly6ExyUOJSZaW9T6iib IXmCSjIfiY9c1zdk1D/ZwnwHaV94GPXSPG/4awjBFzKIeaflKdsrhXOm6LHQJ3wXMTxmD/ 6g7jZCiDwLZmapzTKwSoPtLdx0fQ2KmqgVb76uAeyVS8XKKga6iRqA7ghhG6uQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKgZb4n2DzQTh; Fri, 4 Oct 2024 07:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4947jh8c018493; Fri, 4 Oct 2024 07:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4947jhwn018490; Fri, 4 Oct 2024 07:45:43 GMT (envelope-from git) Date: Fri, 4 Oct 2024 07:45:43 GMT Message-Id: <202410040745.4947jhwn018490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 75734c4360fc - main - tmpfs: check residence in data_locked List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75734c4360fcd5c70ab9650683ae47ca11aea15f Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=75734c4360fcd5c70ab9650683ae47ca11aea15f commit 75734c4360fcd5c70ab9650683ae47ca11aea15f Author: Doug Moore AuthorDate: 2024-10-04 07:44:19 +0000 Commit: Doug Moore CommitDate: 2024-10-04 07:44:19 +0000 tmpfs: check residence in data_locked tmpfs_seek_data_locked should return the offset of the first page either resident in memory or in swap, but may return an offset to a nonresident page. Check for residence to fix that. Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D46879 --- sys/fs/tmpfs/tmpfs_vnops.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index b278c3153863..fa9945a9074a 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -2099,7 +2099,7 @@ static off_t tmpfs_seek_data_locked(vm_object_t obj, off_t noff) { vm_page_t m; - vm_pindex_t p, p_m, p_swp; + vm_pindex_t p, p_swp; p = OFF_TO_IDX(noff); m = vm_page_find_least(obj, p); @@ -2108,15 +2108,24 @@ tmpfs_seek_data_locked(vm_object_t obj, off_t noff) * Microoptimize the most common case for SEEK_DATA, where * there is no hole and the page is resident. */ - if (m != NULL && vm_page_any_valid(m) && m->pindex == p) + if (m != NULL && m->pindex == p && vm_page_any_valid(m)) return (noff); p_swp = swap_pager_find_least(obj, p); if (p_swp == p) return (noff); - p_m = m == NULL ? obj->size : m->pindex; - return (IDX_TO_OFF(MIN(p_m, p_swp))); + /* + * Find the first resident page after p, before p_swp. + */ + while (m != NULL && m->pindex < p_swp) { + if (vm_page_any_valid(m)) + return (IDX_TO_OFF(m->pindex)); + m = TAILQ_NEXT(m, listq); + } + if (p_swp == OBJ_MAX_SIZE) + p_swp = obj->size; + return (IDX_TO_OFF(p_swp)); } static off_t From nobody Fri Oct 4 08:33:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhdX0LYnz5Y8Kp; Fri, 04 Oct 2024 08:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhdW6kXjz46Qb; Fri, 4 Oct 2024 08:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ohwn7d1RG4zvEXbE8/VyaqmsQ8R/sZvNluYpQ2z75iI=; b=gZKr0Y3BhgSbr+GyInJCuvQTEZjrf7zi502q0bcAkeR7Xo05X5nhSll5qk/aqUliMbXuiK 0YBistiI0MYWoE+uR3ABS/a+FYnNkhWj6d5uQ+D5Sg3LOfWD8zEC/KNxjXYbR8JQY5y4Kh edYA5tNXsGeEesIDxtmZg5Sk1P/jlQPlSZIO2Z+CV/xJsFsWWnrzX3rB2eWsu/f/lSuBnS UH9dkr4bvDQkxtcMrLMYZBG6NIHeRy0O8EkBxhP6dmCZ3Z3y2iNevGAaHeha40jiNnO+D3 HOYLiEHt+DPPRzObF7qp6HC7+HarFw+cd0e6U6qcIsOTV6HE9rXXiQA0QLzCwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ohwn7d1RG4zvEXbE8/VyaqmsQ8R/sZvNluYpQ2z75iI=; b=lLZXckrjKk0j3unMyHiQBUXYVi0QEk1iDZigZ99Fk7U6JGinSl33X2uUEPd3ZjxlQz98a5 6lsfMiyHOPbmEJnN6U36xAM+HWWwXrk+i2FpmvOZ0NFRujmBOW/BhI1g6TuFV7vmtT9UeU ZZ7LkHURHzia/3uDqT1LPJGa/99L2zxPlL1pbBD40xz3R991goTLEbCUcLxdZwJrmUHRo5 XO0FCx3Dc5FiAwzBOXyrUwxXZ05mZJFoc2VBzPli9WV4xDxWNFsgc6hYo4qcVX85xR6MYy 1RZX/6XUC5w5VJxw+S/MFl/bWNqbLnlEBijHFe/StiSzbE4THEvbDXAKOSGn6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728030799; a=rsa-sha256; cv=none; b=nybV5LSfgu/lVqoSRLzDzsmknUn4IJmFm+kDB8yiGVBDOyD+b8zTUC58FpvtCzndViKjly DgCcHf6FL33GRg7g/TB6Dn2zWnLrKYZmp42eG5RxsXS9nJl7/7CojCdZXeg4kXAZebS6OM 05NYQ6/Y0/4qJAkbvemuZjOLIdx3nzL+ZEZZ0HiHCIVc+leA/AH05JLGgRdfs/t42jHFEH NOLLlnJg+Aco10L+EhnNWyzguGq/yRJBwMBhIyiRX90NDmP43ZgfECDaPPfPYwWrqRnsk6 MqWJcoaurEnpUUMzCeXo6AlzpcNrRaNRt4zpfNcXDEUMb9hlu+s1KfhU6qBdQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhdW6D1nzS0f; Fri, 4 Oct 2024 08:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948XJb4003120; Fri, 4 Oct 2024 08:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948XJ1J003117; Fri, 4 Oct 2024 08:33:19 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:33:19 GMT Message-Id: <202410040833.4948XJ1J003117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 290a02913765 - stable/14 - extattr(9): Mention system namespace restrictions in a jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 290a029137657e5af0918c9546e6fc880d3ea867 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=290a029137657e5af0918c9546e6fc880d3ea867 commit 290a029137657e5af0918c9546e6fc880d3ea867 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:12:51 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-04 08:33:05 +0000 extattr(9): Mention system namespace restrictions in a jail Reported by: netchild Reviewed by: gbe Differential revision: https://reviews.freebsd.org/D41676 MFC after: 1 week (cherry picked from commit 315d7bbbb4e4b35d195a0a74ede229b1f64d42cc) --- share/man/man9/extattr.9 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9 index 3a49746d1eb1..c765a55e9059 100644 --- a/share/man/man9/extattr.9 +++ b/share/man/man9/extattr.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 23, 1999 +.Dd September 1, 2023 .Dt EXTATTR 9 .Os .Sh NAME @@ -54,6 +54,10 @@ attribute data is protected according the normal discretionary and mandatory protections associated with the data in the file or directory; system attribute data is protected such that appropriate privilege is required to directly access or manipulate these attributes. +By default processes in a +.Xr jail 8 +can not access to the system attribute data unless allow.extattr +configuration parameter is specified. .Pp Reads of extended attribute data may return specific contiguous regions of the meta-data, in the style of @@ -77,6 +81,7 @@ Appropriate vnode extended attribute calls are: and .Xr VOP_SETEXTATTR 9 . .Sh SEE ALSO +.Xr jail 8 , .Xr VFS 9 , .Xr VFS_EXTATTRCTL 9 , .Xr VOP_GETEXTATTR 9 , From nobody Fri Oct 4 08:33:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhdY1PJ8z5Y8ZW; Fri, 04 Oct 2024 08:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhdY0kc1z46Kt; Fri, 4 Oct 2024 08:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VcGw/BJ7NF+ly2ctxXFrJ//xAR3CIcVGo+L955xUUO0=; b=g2/D9fuuY1n2OKBHu3BVzqhRKJC9Xe6fBXouu0bt5Ih+a47vVcZ5bTM7YyDHCTJpfZAMnC v1m5QVm/fCAGRfkZ7bDpPgqW4NdjXXjTFilvoXSqf01QX/f1P3+g0n3CABRZ7jGoiK8hbR AjvgzMmXLLSXZTI1pFfLH00fPQsPpsy3XRjvtRtR30yHRtU5CXMSPpjtMsdQoOG5DQy0wh o6JLAsjmpsP5eOOKW7x3AFtAEzIRB8puNE8uGfQyGgY3tyKRUQKquzsRwzH94GlnjNUFA0 1cRjsJ4roN2qxkeyJisLm94quI9ezJqTHAK/ca3oYgzrNzUH7IvW6SwNHMHLiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VcGw/BJ7NF+ly2ctxXFrJ//xAR3CIcVGo+L955xUUO0=; b=W6Z6DCWMlEtw+gOJPXgTYVanfWYjs0k9WXkRBfp1eoJFHXCfsMkUrp8A7SjOifbshZM7NF zNARiffrFmLJUNHE1Hx/zWFoqXPAlRSmf12YI8XGfgAJPQVNgkpjT7+dTOFcS56q0wV87t xRoWRWhqs9T6PGOuadNci/Q8gSEBlfrbMW8loisorqsJlTy6e0N3xVbbkonQGvDpiAdySn CBuxd1T2H7NbJWfImvnKakXH8xag11HpKamP2TWkojZQuSNwbIkb57wHgUderXIoWyBbv3 liIG542w4w028Xw6MJnRuMcRZhUFWzgbhN+Qpz3c/AQjwmDmlAWd2B+/5I4Egg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728030801; a=rsa-sha256; cv=none; b=XKDxxMtRZdYAwfgAFdDl0ntVNkKsW7TRTjv6ACZUBl4liigVGII9rPBuYh5DxH//ZVsYyO vkJpAxUC1CsEkNBGMoeBWMPS1LFMDwkOnyChZ7EwGwqTKs0GbwfoB/YFhCQKCvV4ZQx7CT rgH3y9HU64XSezuEcBEQ9jcqAO+jeHTGFNqdrlFdRV3kTPCXVn89SOQPZtI9+L+rbvA5Cc YQKN4gJKQv2WxXIGPRgw/u2HgNFNsnAMwNjX21DdibIYyD7o6DmNnbpogVojQ0QZo7gB+I dgDdBJXTFMjZo6NQcuzaoDScz0pW/WpbemY2m+1kCg6Csb2zKrvpw+xfCj5IgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhdY0LCtzS0g; Fri, 4 Oct 2024 08:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948XKjU003175; Fri, 4 Oct 2024 08:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948XKif003172; Fri, 4 Oct 2024 08:33:20 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:33:20 GMT Message-Id: <202410040833.4948XKif003172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ffa1a342697d - stable/14 - extattr.9: Improve the fragment about jail(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ffa1a342697d7bfc53bf2e0c467fee3ed475a858 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ffa1a342697d7bfc53bf2e0c467fee3ed475a858 commit ffa1a342697d7bfc53bf2e0c467fee3ed475a858 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:59:35 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-04 08:33:05 +0000 extattr.9: Improve the fragment about jail(8) Fixes: 315d7bbbb4e4 extattr(9): Mention system namespace restrictions MFC after: 1 week (cherry picked from commit e8fc6a9980d9367f6fd4fee795a35e104104397e) --- share/man/man9/extattr.9 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9 index c765a55e9059..8ccc0b77be09 100644 --- a/share/man/man9/extattr.9 +++ b/share/man/man9/extattr.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 1, 2023 +.Dd September 5, 2023 .Dt EXTATTR 9 .Os .Sh NAME @@ -54,9 +54,10 @@ attribute data is protected according the normal discretionary and mandatory protections associated with the data in the file or directory; system attribute data is protected such that appropriate privilege is required to directly access or manipulate these attributes. -By default processes in a +By default, processes in a .Xr jail 8 -can not access to the system attribute data unless allow.extattr +cannot access the system attribute data unless the +.Va allow.extattr configuration parameter is specified. .Pp Reads of extended attribute data may return specific contiguous regions of From nobody Fri Oct 4 08:33:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhdb2mFYz5Y8Ps; Fri, 04 Oct 2024 08:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhdb027jz46R6; Fri, 4 Oct 2024 08:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bozT/+rNZrED3XaVUWZYPZtEGt/bXVjFD7Vu/KSmfhQ=; b=tNs5XoSaDzbM7wj1OCmEWfPtcozyBqCf/MQZzsAlgZZlaVwvNDbpnmXUx1lGB0ns6owR17 a3Vymhm0vkUp7upL5w0r+h5qp/hRr8oYhp6Ssc6KcGqLrp6nHwf7UmwjJuJKknxQJ/EKMs 85kJBauOGcahTRAfAhEqnv/zGO9CKi1rdZIKt1VjcRkGfnMyIhyhdCoz+Wu0yXDU+S8fXU aAbQxFedQn+iY9IKIIyY9XUdNKDnAqBrD7IQUZ8ZtFl7iKr2wDi+2wZxDTTuwpfoTHxQb2 jv9URGx4C/vppc9C5eGMcWcbmGx9/b4GrIfM29uOVieEVhS2GIz++9z7G6oNyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bozT/+rNZrED3XaVUWZYPZtEGt/bXVjFD7Vu/KSmfhQ=; b=KmiQ248oyV6WqvQBX9r+1ih5+Wm1jljUm05DZbjfUlEDQUJH7n1FHqFK+A4IdRs8l62bVk +abC4F5NLORhDLDXmXJX6wWdYzFnVbllow7fvIeVswBTHVSff/TpkZSLz1iZ9qUvlp8Sxl j8IbcsuNSpKx+/JvUOHqZVnl+9/INvKsbb4p2T5h3/vCyKZR7IOMlcBgMPEgCwD5RGqpQ5 6RUNy8IsJZcj8SZ+diQH+0MAx9V3yNcX00PQW2MF/wY5IDh5Uhq3MbtQp1C/ATetDdRDaB 1Q1RLeYdk1NG0vdOXndvcKKdla45Z1N5hWE9iCSV2PXNd2p91Kr+MtkK7JDeDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728030803; a=rsa-sha256; cv=none; b=Tz0v9B5qzmdhLVd5itqc+v6AXqfJ+jtC4jpW7CERYUWpyOhgDhLjh5HMvD6oATUUZe/Y62 FbterCFJY9A6Y4gYe6Glf9OYTWkNMNqOTbIDcK+dLfdzWBCBrT8rNYjbSReu3lE0vQXnXo 0aAZTdPDE66bouVPWd3ekhd/CkOvnsm+SQjA1hVRjQBEcj/yuK9007yrYaxtqAS20BZrtR 5iuID4orppEM9zsHfWUqOaV7XBIvWrYiUmxhoQ35rjYMdeQckYG+2gTyJ3Gh/V7Cnz9GD0 d0d60YTSlRzmbPGuDq059oySEwQd/mDRqkX2ATrM5pcYZTCIsrrl37z4l80maA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhdZ6jYszRWt; Fri, 4 Oct 2024 08:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948XMoN003321; Fri, 4 Oct 2024 08:33:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948XMaH003318; Fri, 4 Oct 2024 08:33:22 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:33:22 GMT Message-Id: <202410040833.4948XMaH003318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ca2d3fdff035 - stable/13 - extattr(9): Mention system namespace restrictions in a jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca2d3fdff03597d9df4ff871170453cd76513e5c Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca2d3fdff03597d9df4ff871170453cd76513e5c commit ca2d3fdff03597d9df4ff871170453cd76513e5c Author: Dmitry Chagin AuthorDate: 2023-09-01 08:12:51 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-04 08:33:11 +0000 extattr(9): Mention system namespace restrictions in a jail Reported by: netchild Reviewed by: gbe Differential revision: https://reviews.freebsd.org/D41676 MFC after: 1 week (cherry picked from commit 315d7bbbb4e4b35d195a0a74ede229b1f64d42cc) --- share/man/man9/extattr.9 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9 index 3a49746d1eb1..c765a55e9059 100644 --- a/share/man/man9/extattr.9 +++ b/share/man/man9/extattr.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 23, 1999 +.Dd September 1, 2023 .Dt EXTATTR 9 .Os .Sh NAME @@ -54,6 +54,10 @@ attribute data is protected according the normal discretionary and mandatory protections associated with the data in the file or directory; system attribute data is protected such that appropriate privilege is required to directly access or manipulate these attributes. +By default processes in a +.Xr jail 8 +can not access to the system attribute data unless allow.extattr +configuration parameter is specified. .Pp Reads of extended attribute data may return specific contiguous regions of the meta-data, in the style of @@ -77,6 +81,7 @@ Appropriate vnode extended attribute calls are: and .Xr VOP_SETEXTATTR 9 . .Sh SEE ALSO +.Xr jail 8 , .Xr VFS 9 , .Xr VFS_EXTATTRCTL 9 , .Xr VOP_GETEXTATTR 9 , From nobody Fri Oct 4 08:33:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhdc37g9z5Y8XZ; Fri, 04 Oct 2024 08:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhdc1LhWz46LK; Fri, 4 Oct 2024 08:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oX7mW/SUQDC9K7o9b3p6UjzP0yOuzDnZNPtw7hm4guE=; b=R1FYLO84y6/kmu3KsctsL16XHhnR6Dbt64+jBMqtQwaDcy3Rhbqe3RpePu/PPEInUlZlzj Qly5y5sYliclZfU5ftjwpn9xEsTfaHW6oktCtR3JGrLRBM+h9QFhNE/cOvKEQF/w+aH2or 6GpJBgCIS8wBfDeI8UnmWWMcf9CKJtBcHruUDYJDPxRF8o5OWLCuT6m4hJk2A1NVssrDSK jqhnuFzcM+jA1Wd3vkiZBM7jErNhnuXZ+e/HtJ8HK4GhlG77QVozL3IdLuf9YbSYvQuzox zDgpa/4EMOMcp3cGx3r2l4Up8oEmbsJ281nCnFOdvwI6nkvv/N3moQNuwe33SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728030804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oX7mW/SUQDC9K7o9b3p6UjzP0yOuzDnZNPtw7hm4guE=; b=xJFWsBAH0ZWNtth6oDy4W0U6YCHaiqPpbutj3M7LZ905ApRd6EfWTYN2Pn9WSYjN/IhXPe G1FoNI1tY8RKnGrSZuRWS4NPN0PWIpQzINqGLr+rRIdc1J6mJIYIxlTXBVA6K8WsJH2t6c XRK6xXaTdSm05b5JunhLwRuJ4m0CwShLIlN6QA9z8QMiu9QkKPmd0nn49Emz5q7qt6fxHU 6Wd8KzNvb4qNNqlq7tunrA68c3b/HW1zXdq8yZVNKlM/ku4rIduh6VgM4Uv2qqFZ20DXc4 tNab/bVcFCyzFN2M1DeouDdhQNiwYViURHYLsZM2gIV2nrkQNZjQ5eXurb/XeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728030804; a=rsa-sha256; cv=none; b=dogrVT5uT/iIx2y6qJm92hBUwXNuKIWHsrqCmjHeo+TbvusFJS6VlDeicMD1RaYxpNmwsg UQF6+6aJLq9FbhwjsHXh9VaHi3c/GJcHHRmrMXbFXHsbzhLZxwXh2CoBN6EeGdJL2gwxM3 x5zENSz6GfCpk3kJ3b8bPKzFydET+5/Gw+9hcwYXoEgq2qfTjJ1VFw4vKGL058+t//wINH eigYkxRl7EuS6rgZ4uhsYLX2NoZcJgPzFeoaoRa5ZBKS76stvPJRNHCPsBDjcG4/LFXNDh SMbrE5ecJGDnv5WNVBtHP5tP3DAYQD4xK7sKJnnPcairZVe0iuQ7IaJ1zumlnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhdc0y9zzRb1; Fri, 4 Oct 2024 08:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948XOO4003366; Fri, 4 Oct 2024 08:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948XNtX003363; Fri, 4 Oct 2024 08:33:23 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:33:23 GMT Message-Id: <202410040833.4948XNtX003363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: bb91fa71bbb7 - stable/13 - extattr.9: Improve the fragment about jail(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb91fa71bbb7de8ee7b624ca313d73c91594cdb8 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb91fa71bbb7de8ee7b624ca313d73c91594cdb8 commit bb91fa71bbb7de8ee7b624ca313d73c91594cdb8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:59:35 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-04 08:33:11 +0000 extattr.9: Improve the fragment about jail(8) Fixes: 315d7bbbb4e4 extattr(9): Mention system namespace restrictions MFC after: 1 week (cherry picked from commit e8fc6a9980d9367f6fd4fee795a35e104104397e) --- share/man/man9/extattr.9 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9 index c765a55e9059..8ccc0b77be09 100644 --- a/share/man/man9/extattr.9 +++ b/share/man/man9/extattr.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 1, 2023 +.Dd September 5, 2023 .Dt EXTATTR 9 .Os .Sh NAME @@ -54,9 +54,10 @@ attribute data is protected according the normal discretionary and mandatory protections associated with the data in the file or directory; system attribute data is protected such that appropriate privilege is required to directly access or manipulate these attributes. -By default processes in a +By default, processes in a .Xr jail 8 -can not access to the system attribute data unless allow.extattr +cannot access the system attribute data unless the +.Va allow.extattr configuration parameter is specified. .Pp Reads of extended attribute data may return specific contiguous regions of From nobody Fri Oct 4 08:45:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhvR0z07z5Y99q; Fri, 04 Oct 2024 08:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhvR0PDpz47nZ; Fri, 4 Oct 2024 08:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RebegqqSwgkGXVLX/cWYtW3hcAI3t4u3o78UiP63qT4=; b=f2Y/jhR1GXG53gnPbqTcpzJxhYguP5aVtOW6Z5iQAbVUFzuRwOAL9pnO63cDdJniajCjyB 4m1eaPXMnhjx4CWBKMSvpMca2RJ8FpwZxgvpcVI/4+b0u+PmjDsr1bXsGbFmavzy0d3nQN XDplr+iVDxVjW0GIHWvjMDHWZwBpISByxlXuKVzkUV9O5wiFhTHTkJXgjEjghK3MA3EwqJ XYqRp/6TM/ZmK1CsUn+pfRdn5dUAwQvm+/V2T4wD9nqvzozZVfDZ198YNO4R36HVsMLtBJ 5WxqCc8VYm+cVHy58r9ANqrutSqON/lIWIchZmqQz3wVbdn5uQw5w+wXI8q0zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RebegqqSwgkGXVLX/cWYtW3hcAI3t4u3o78UiP63qT4=; b=Q9dhRJh/s5/9P5z1CN3EClsgwmnFMsd+a6qkSIxRu+J10wneOXJSoAw+0MGV9vukmLknrc dLpmmxtIZA8jA/OM1rdcoPzZ7YDu7LUgzjkMBnhgpoOQIeC+W6zRVk2+3MJYu3TtaU2Q4y u/lshNQiDTNZzNQ5+qrMwNI1dsYOytDHx2HiXkwW3GPCNnbsR2PSHpN+hGG1vvvHEiqXpX MmhLVc6xO+HdDPA0Hok9CzEdkS4qvXueSGycwMAlrqOaf1jZ9iLY+NLtj2x2O438JGzkm1 leBzmsQbYzd2jcHlnnlxOsWwkiqtpiKZdt56kygzZLyYEc5tVFbIIcwzji8Tlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728031523; a=rsa-sha256; cv=none; b=xjpA49xOJ1leUiZuOMH7L7Rn7PowDVWTdwbpeu/DOHSEEolOLabF3J6iEBU1FkJaJGjCXS xpw8i7wfYvbLBhnqeLr3GTAmMBaCO/0i+RXYXcnIZv6K7wgl5k1o6dVhdBZ8yFypIqZK+I 1OuJfj70hqN1Dw2ip5wCDQxYfnP51qEb+bo8kHVHmfWcByEua72u/PjmHf6/41orQC9Xb5 EwuRsT4a3wKKkYgk/YzxPGOee72cu1nJycnAu5fmTGudBFoBYD26HVk/e+/h+TD6lS4V+3 RC/m9d27sNMjJ0L4Fq0FdvQEvS8JpSvb3cL8KlRWK0EsP3QDQqj39/Z1oK1ezA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhvQ6b5RzRXQ; Fri, 4 Oct 2024 08:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948jMnu020771; Fri, 4 Oct 2024 08:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948jMOs020768; Fri, 4 Oct 2024 08:45:22 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:45:22 GMT Message-Id: <202410040845.4948jMOs020768@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: 6bffebee7e57 - stable/13 - bitset: Fix __BIT_FFS_AT()'s herald comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6bffebee7e576553006b108ed7e8518164101502 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6bffebee7e576553006b108ed7e8518164101502 commit 6bffebee7e576553006b108ed7e8518164101502 Author: Olivier Certner AuthorDate: 2024-06-03 19:22:12 +0000 Commit: Olivier Certner CommitDate: 2024-10-04 08:44:18 +0000 bitset: Fix __BIT_FFS_AT()'s herald comment The manual page is correct though. No functional change. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Event: Kitchener-Waterloo Hackathon 202406 Sponsored by: The FreeBSD Foundation (cherry picked from commit f3ab0d86e8070c73bf2e2852341f8e5c709f5682) Approved by: emaste (mentor) --- sys/sys/bitset.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 5ff2bb76a4ab..2e15df7de4dd 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -220,8 +220,9 @@ } while (0) /* - * Note that `start` and the returned value from __BIT_FFS_AT are - * 1-based bit indices. + * 'start' and 'end' are 0-based bit (runtime) indices. Note that, as for ffs(), + * the returned index is 1-based, 0 being reserved to indicate that no bits are + * set. */ #define __BIT_FFS_AT(_s, p, start) __extension__ ({ \ __size_t __i; \ From nobody Fri Oct 4 08:45:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhvS1nG8z5Y99r; Fri, 04 Oct 2024 08:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhvS0NvRz47x2; Fri, 4 Oct 2024 08:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4E1ALgzKNY7s2L56Oi2hPBWrnVq+6sCiBtrp70TN+yI=; b=v91TiALjq1hFG1GypHCcMfpHed69sfBQyZjQA1lxn5ew92iBbfeYCFVgOyLOTPRgeOYKPO /GaiZo/J+wXN6W6w8qJwejn7BwofCRtDgPpCEI6u1jW77KsydtJk7L05W7V+vGP7amQTSg 08OPfLmeHmJuUzMBvYhuEuqxmiSlsTBA/CYnqhssK7h6eu3BNsBTb+BG4sypVdg2QtxGw4 McsmaA2Be4z8labq+blecnXx5SSuuISdh1rswYSd4QcXeruy8VK4JxtGCo0cjb3oiDnY9H jRPjebv/zQAWq3Ti/1X9QddkJ8vJX1aOe3r5QOrk03pYPPuzggh+1p/onCbUgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4E1ALgzKNY7s2L56Oi2hPBWrnVq+6sCiBtrp70TN+yI=; b=JETNy1U6Ust0W/ESWxmazt9F6PXN306sQUz4VcMsXJbgCR9ORJouBY8sk8qstPowEt8r21 Kys0cygSzSw1wR28pbpJu4nnzkhrl7GTQR5NYjyQ8TTEahRJYVTBK00cFLiz2W/dOkV+CE PCnfJKcg2WSMCvkglA+9gMR+CxqVI19O0d6Atz5ivK9qLpoliAHGRNNvlKmLou6VHs60Ta uyartbrW4Z8q2lvQccE7KdamCyvmlK/s4G9ilng1VLUPbSm1pF7X2UOUszL06YM1Ais/FU ds40qV37lkiMkkmMxpKXQ5xMf9L3r0+ZrYfPhWMvynyGj+kivBscd1s7PvOTaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728031524; a=rsa-sha256; cv=none; b=UCng5JZQ4pQKgbObUmXMtXtkznmPpm8FYSQ9SbdP3MRCzNjjmt8cHVgdvHjbwIz/VUFT+A 0ZG+c9eyR2/y0yJlL2N6MsCb0H4K8Y/T7W7dqZxycFDYmSxQqe0ygh7se592Qo1PKg0wRB GJlt3l7HOmDi4IwLe2TLWcDKsmS+0dPNYavFYr7MmGPn8VCfbtAstH+Yx4GRha/VwYEjj+ 5G21cn8zGzo33sths1IUAhgIshlIbtRvZhGCt46K10AXRaHnALYJ2/nRUpsbU34nbofGsD T+ENxUBgTgzbrrsPTvVbE+DapsazTunP9sgUjCBQ9VoT6GUpWlVNj57JnOH8Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhvS001YzRXR; Fri, 4 Oct 2024 08:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948jNWZ020819; Fri, 4 Oct 2024 08:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948jNYm020816; Fri, 4 Oct 2024 08:45:23 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:45:23 GMT Message-Id: <202410040845.4948jNYm020816@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: c6ec13c12901 - stable/13 - bitset: __BIT_FFS_AT(): Fix herald comment, take 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c6ec13c12901ca3eab0f610742df7b0292e9b830 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ec13c12901ca3eab0f610742df7b0292e9b830 commit c6ec13c12901ca3eab0f610742df7b0292e9b830 Author: Olivier Certner AuthorDate: 2024-09-03 10:08:49 +0000 Commit: Olivier Certner CommitDate: 2024-10-04 08:44:23 +0000 bitset: __BIT_FFS_AT(): Fix herald comment, take 2 Remove the reference to the nonexistent 'end' parameter. While here, rephrase a bit. I did the initial comment fix (commit "bitset: Fix __BIT_FFS_AT()'s herald comment", f3ab0d86e8070c73) as part of an experiment introducing macros to operate on ranges of bits in a bitset and subject to a predicate (a generalization of some code used in some pending modifications of the ULE scheduler), which was finally ditched as being too verbose and impractical to use. I however then forgot to remove the reference to 'end'. No functional change. Noted by: emaste Approved by: emaste (mentor) MFC after: 3 days MFC with: f3ab0d86e807 Sponsored by: The FreeBSD Foundation (cherry picked from commit ad4cf76ec4d4524381350e77b02b9abe24eb4b02) Approved by: emaste (mentor) --- sys/sys/bitset.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 2e15df7de4dd..16bccbdcaf0b 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -220,9 +220,8 @@ } while (0) /* - * 'start' and 'end' are 0-based bit (runtime) indices. Note that, as for ffs(), - * the returned index is 1-based, 0 being reserved to indicate that no bits are - * set. + * 'start' is a 0-based bit index. By contrast, and as for ffs(), the returned + * index is 1-based, 0 being reserved to indicate that no bits are set. */ #define __BIT_FFS_AT(_s, p, start) __extension__ ({ \ __size_t __i; \ From nobody Fri Oct 4 08:45:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhvr0Z2mz5Y8rQ; Fri, 04 Oct 2024 08:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhvq75Psz48sL; Fri, 4 Oct 2024 08:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tezcUkJWP4FUphq58FqMaNOI5U4dCp3nrP0jAmiOad0=; b=oAkKigUxeFIN2gDn+WpZ6Tg+4qXUK8Vp0Es79f8fIMj09t5lqHh5wGI8NhXqec1jb0jE7c ltWQUFKXP6UAMDf7he2NSAvCxRBlIWtAYuYlDUKwYbLlMfJlsLqgfPwDjlGutyQzvEVjgf NFohRW79ex+G2AuHZ/mc5Nd/cdu8N1kBp0CNj9W3ilkK4r2i0ZKFF7xD9SEuvOS+H+gGm6 IW6jp2tsdZ11Src9MS1KL5wlyyJ1wKLZVzcAQ0C5uwCqWHrP+GDU9cuHTkwmT4ig2LPTuw hgVdTGDNev8PLeVgy8FgPbkrgsE/ArdwWVsuPvxaC639zSY9yXPGtcFxlwZ0Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tezcUkJWP4FUphq58FqMaNOI5U4dCp3nrP0jAmiOad0=; b=OCAbFZaHLvbxOvDk8I6lVk5Gq7VEQ4Vtlp6bFYsylFNRv6SlpfkaTLi8HcuVrJTsxTSbHd 3+w+0wdIJQT69TSs143J0ZrTEnMmdTItv+3j8EC1iNa8vBOSCs9UEyMwGAG8XL4Z0KlEGg rIUEYYPAkicFYUeth2uozNEVzAkmN9Zlk11rdyHVHvgwLI/y/3V/d/lCOfMXgzimMB3Ov4 n1Hmg+PhKPLD1hGSXi/itWbu0BwkxBThr2cVfnhFcsW1efvctbkKBJsax2fAES1jBeKtSr lZGo7OfTRVuHju2Tp+x2NEZ9A683BpWgu1KoFgNRHpGtZZ3ogOMWMuSRF3KwpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728031544; a=rsa-sha256; cv=none; b=SxqM4jvJ0pPCpp8RPMyUCzIVPSLpWUziznYJiLA4V31r0UypU273Sl479tXgevId9Ii6gm u8lf8xjLIVr3JhgKtcVt4OghnWtUVzv55dDZezNcpmemjB/8E5zXH3BdWUUiIko/jV8TKS 0yOvSLPQfR5SSFVugHAUlxZEnuMG97MMtd+6uFIPj88+dd4yjAdgG9V4MONRW2RDdufvJz BF/HLnFDTDKCCQK/tIYbMoJC3LPsWTYsIi91obHX4u6BbJFFmB123YZrxmQKLi7D9No510 olHcSvUhPPG51e13cJDjFjRRHlI14qkPYqJJyTwqOm0YGZNZZobBBTRxnj76Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhvq6hRxzRqB; Fri, 4 Oct 2024 08:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948jhbn020997; Fri, 4 Oct 2024 08:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948jhhw020994; Fri, 4 Oct 2024 08:45:43 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:45:43 GMT Message-Id: <202410040845.4948jhhw020994@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: e6dc191e43ac - stable/14 - bitset: Fix __BIT_FFS_AT()'s herald comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6dc191e43ac25492890a1227983de5e2d811db8 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e6dc191e43ac25492890a1227983de5e2d811db8 commit e6dc191e43ac25492890a1227983de5e2d811db8 Author: Olivier Certner AuthorDate: 2024-06-03 19:22:12 +0000 Commit: Olivier Certner CommitDate: 2024-10-04 08:42:41 +0000 bitset: Fix __BIT_FFS_AT()'s herald comment The manual page is correct though. No functional change. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Event: Kitchener-Waterloo Hackathon 202406 Sponsored by: The FreeBSD Foundation (cherry picked from commit f3ab0d86e8070c73bf2e2852341f8e5c709f5682) Approved by: emaste (mentor) --- sys/sys/bitset.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 4afac9b172e8..2b26e8bcdbf9 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -232,8 +232,9 @@ } while (0) /* - * Note that `start` and the returned value from __BIT_FFS_AT are - * 1-based bit indices. + * 'start' and 'end' are 0-based bit (runtime) indices. Note that, as for ffs(), + * the returned index is 1-based, 0 being reserved to indicate that no bits are + * set. */ #define __BIT_FFS_AT(_s, p, start) __extension__ ({ \ __size_t __i; \ From nobody Fri Oct 4 08:45:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKhvs2D9Pz5Y9B2; Fri, 04 Oct 2024 08:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKhvs119Sz48Yd; Fri, 4 Oct 2024 08:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RBkk5q61hn7qE3aT5YtL6o0hYLw71Tg4JvS+pHbN9yg=; b=jUpR0qq8yrHVGR0rDe9S7mdOkmjNez+2kOcljGsAg2N8AxuuGhYOAbbFQQOBDjswcSXg/I IT+7ukBirf6uXT3Paqc9OBn71OxJU1lF94rBMbzPKRYU3fOJy72HNvMMM6bRBL1IQ1i0Tn QMwpd++nkozfX6OgzTzcL1UCaOrSNZAZSOSyglkrjwPAUh2OQ7rdM+xUm2SyqzMSTl2iru N/gCZANK8wP+k/DH+JH4P0uV9tPnF+pNxSzcVO/PozwoMjfTL9YyRTzsIzmataG7yNbK0h V09GJ7ny3L/Z2c6dfeILVpXQpjdz7asG8iE7bUA0rsBM/KwIpDvLS8wva+W4ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728031545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RBkk5q61hn7qE3aT5YtL6o0hYLw71Tg4JvS+pHbN9yg=; b=Ci/irX9XKeQSaNQuQVCc7pyd5Vl83i1eU2lsUL+sc2DaB/9zbGYq4U82rRBHXIv+58TCMt JmGNhuI3WLIicCdkEfbicSGu1tltz4zzoLmzKwUmhkI7BL5X2NNAum72hSjLP6/IAInlU3 58BKXoT6MIVc3TiFJ+IJEwX+EG29xlNatADv6vNCQXV14wX+/dYlZA/F/TC3gcHTPSct8k zKgWCEReiwq4rL8u/NlJD9tV/1gQe+6XYzMwtUu0ADoEWT34UR0EkSp38y5XXQuTWhXoib ayQLrPheGlcpANklRkT3Q55hfyxpP6xEmP30a7Cv6r1BdNndN3ezT13L7krsRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728031545; a=rsa-sha256; cv=none; b=cPa1yGCH5l6mqmMWucOAFyMHlRMlL90dih+1w2iXaSUEH/QIspgeKwz8ibvN4DogR5KVqU oi/2i4RJRV5Qe29/erOs3/rvQTGCO0eR2X6BPMSTJeKKRflGp7Ii4r7m9BJ9ECkM0X400g za0g1wVTrhFK9TT8s2SRYyyG8JERHw8fgcGRVD+jsetUpij9PBKVLRzuVixJfdJohexuR2 R9TYXdu7zuAHoY7DHmIqLGlu7czrDZ6HmEFN4hBzgMlsXuoTVCW6pI4fMUvsSJsRrqtkVn Ebx8ZuCRkxrCvtc6NfXtBXqEbyL45n+wDcKSbLHPhD0ePfG7k6xmgU1d+mJI4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKhvs0HYxzSDb; Fri, 4 Oct 2024 08:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4948jiuq021045; Fri, 4 Oct 2024 08:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4948jiNo021042; Fri, 4 Oct 2024 08:45:44 GMT (envelope-from git) Date: Fri, 4 Oct 2024 08:45:44 GMT Message-Id: <202410040845.4948jiNo021042@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: a257beee44ab - stable/14 - bitset: __BIT_FFS_AT(): Fix herald comment, take 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a257beee44abaffac0cc087d8492499740359922 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a257beee44abaffac0cc087d8492499740359922 commit a257beee44abaffac0cc087d8492499740359922 Author: Olivier Certner AuthorDate: 2024-09-03 10:08:49 +0000 Commit: Olivier Certner CommitDate: 2024-10-04 08:42:46 +0000 bitset: __BIT_FFS_AT(): Fix herald comment, take 2 Remove the reference to the nonexistent 'end' parameter. While here, rephrase a bit. I did the initial comment fix (commit "bitset: Fix __BIT_FFS_AT()'s herald comment", f3ab0d86e8070c73) as part of an experiment introducing macros to operate on ranges of bits in a bitset and subject to a predicate (a generalization of some code used in some pending modifications of the ULE scheduler), which was finally ditched as being too verbose and impractical to use. I however then forgot to remove the reference to 'end'. No functional change. Noted by: emaste Approved by: emaste (mentor) MFC after: 3 days MFC with: f3ab0d86e807 Sponsored by: The FreeBSD Foundation (cherry picked from commit ad4cf76ec4d4524381350e77b02b9abe24eb4b02) Approved by: emaste (mentor) --- sys/sys/bitset.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 2b26e8bcdbf9..d7e0b4cd7e41 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -232,9 +232,8 @@ } while (0) /* - * 'start' and 'end' are 0-based bit (runtime) indices. Note that, as for ffs(), - * the returned index is 1-based, 0 being reserved to indicate that no bits are - * set. + * 'start' is a 0-based bit index. By contrast, and as for ffs(), the returned + * index is 1-based, 0 being reserved to indicate that no bits are set. */ #define __BIT_FFS_AT(_s, p, start) __extension__ ({ \ __size_t __i; \ From nobody Fri Oct 4 13:43:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKqWD1xMGz5XnW9; Fri, 04 Oct 2024 13:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKqWD1PCkz4rk4; Fri, 4 Oct 2024 13:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728049400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lhyy7r+Fp2Y+/EjTR7OCgWooxEBKZDfhjutMIIWmId8=; b=nz0EuK2iY9WD3gciIHpmgRXH/FYxli/4C+C3QriAgKCtjVOblMIPsvFGssy9oavcPR6ohX +QF3cpMGJrq/84ZURaAt5+odtKFQmhgQa6Y8A+mtJ5sPXXoOTtDqf5ZwKGiBlFp8ytH0N5 J7NWqmQlCIk/pk96NymqMKG+YzHcad5bBT/6wz3WOvYTWGymO2EqNYTRXfXUDy/6vJaYYC 8UozOd1f8swFqmlEz6HaXIW/wxDrI+rnbyIQY8XAsTSGjArHFBX+9l6PrRE5rR8g0IWYTA q44djUqbfx83d2FToifBAO+l2qaxLRLrsM7w11s7Fl4bmjoNZwq8xI37DZ4MtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728049400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lhyy7r+Fp2Y+/EjTR7OCgWooxEBKZDfhjutMIIWmId8=; b=xg8Sybcw2NdlFC4i5iT76Mdh3/6mHVw0+CTzWuJICH2d5PALf7/QWXUn6Pk5siJlX9uRks +WAttleg8iarTBiTJysWevbL+QGA74DBNZcf3A3ZXwRUkBMlvdzS9RGEqAEy/pHg905OZ9 BJFApU/bYiZjtbt4wv6E0dnNJ6UUtK3FYrHpWaUnZoYCa1jjmVTmCUCXcuvqpsPnu+xjvj huHIz64u4p0bumvhjrm/FqYm9RmEFIbvTxRGpSUwrF/mpzn1aIZ/SP5VgR61/OPJDAJ18/ mIw8Y/YCDomocqXwLl6jnXnIB+1SgPDuEADvin9s1uHk73oFCqx/60dslwg56w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728049400; a=rsa-sha256; cv=none; b=JpTp8Jy70qGC8dWbhg00aXoqoV4WKPZ+CxSoZIvl1EoVxG+iwpboQqYojw3BSXqIAMnagM HuplkA2QXgQUOGNK8ZteVxQffGHq0n6f1jz4MJBL9GD8GpVJfbR41W+Y61bEwu18kaY8Xv lFMZjZWqExMJJbqcOGTQbmXGpyoNyiYZy4UT8e0+X/XM44quG9NCqMT73kLNb/6u68GuuD Aq6pY2d9w3lWuSjtEh0m2gfpnvnJj5G1dym5uf8waTbzdqgsaqw8vlf2cYd7iyJNtWl/yz XAmv2hmRLctOQpEOcDvsjp50jX+wxj2cZVORgvwjoe9+AGwYKjwF4VegksXKOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKqWD10NNzcP6; Fri, 4 Oct 2024 13:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494DhKhZ027840; Fri, 4 Oct 2024 13:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494DhKR4027837; Fri, 4 Oct 2024 13:43:20 GMT (envelope-from git) Date: Fri, 4 Oct 2024 13:43:20 GMT Message-Id: <202410041343.494DhKR4027837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 34aa6f2c2db5 - main - pflogd: Move struct definitions out of header file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34aa6f2c2db5cc9655f201a1ef01adbb9fb484d5 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=34aa6f2c2db5cc9655f201a1ef01adbb9fb484d5 commit 34aa6f2c2db5cc9655f201a1ef01adbb9fb484d5 Author: Joseph Mingrone AuthorDate: 2024-10-03 19:49:51 +0000 Commit: Joseph Mingrone CommitDate: 2024-10-04 13:41:53 +0000 pflogd: Move struct definitions out of header file In libpcap 1.10.5, two structures that we relied on, pcap_timeval and pcap_sf_pkthdr, were made private. As a workaround, we initially defined the structures in pflogd.h. After further investigation, mostly by kp@, we concluded that it is reasonable to define these structures ourselves since they represent a file format and thus are unlikely to change from under us. We will stick with this solution but move the definitions out of the header file to prevent others from using pflogd.h to access them. Another solution that was considered was using libpcap's pcap_dump() function to write packets, but there are blockers. For example, pflogd writes to a memory buffer, and libpcap lacks support for this. Reviewed by: kp MFC after: 3 days Event: EuroBSDCon 2024 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46894 --- contrib/pf/pflogd/pflogd.c | 11 +++++++++++ contrib/pf/pflogd/pflogd.h | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c index 6df97f8b84f4..e24553dfc37b 100644 --- a/contrib/pf/pflogd/pflogd.c +++ b/contrib/pf/pflogd/pflogd.c @@ -74,6 +74,17 @@ char errbuf[PCAP_ERRBUF_SIZE]; int log_debug = 0; unsigned int delay = FLUSH_DELAY; +struct pcap_timeval { + bpf_u_int32 tv_sec; /* seconds */ + bpf_u_int32 tv_usec; /* microseconds */ +}; + +struct pcap_sf_pkthdr { + struct pcap_timeval ts; /* time stamp */ + bpf_u_int32 caplen; /* length of portion present */ + bpf_u_int32 len; /* length of this packet (off wire) */ +}; + char *copy_argv(char * const *); void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *); void dump_packet_nobuf(u_char *, const struct pcap_pkthdr *, const u_char *); diff --git a/contrib/pf/pflogd/pflogd.h b/contrib/pf/pflogd/pflogd.h index 6e6b588d24bf..596e69692614 100644 --- a/contrib/pf/pflogd/pflogd.h +++ b/contrib/pf/pflogd/pflogd.h @@ -40,19 +40,6 @@ int priv_open_log(void); int priv_move_log(void); pcap_t *pcap_open_live_fd(int fd, int snaplen, char *ebuf); -/* XXX TODO: Investigate a permanent solution, rather than defining these two - structures here. */ -struct pcap_timeval { - bpf_u_int32 tv_sec; /* seconds */ - bpf_u_int32 tv_usec; /* microseconds */ -}; - -struct pcap_sf_pkthdr { - struct pcap_timeval ts; /* time stamp */ - bpf_u_int32 caplen; /* length of portion present */ - bpf_u_int32 len; /* length of this packet (off wire) */ -}; - void set_pcap_filter(void); /* File descriptor send/recv */ void send_fd(int, int); From nobody Fri Oct 4 15:31:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKsvn3FzVz5XwSQ; Fri, 04 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKsvn2rTCz3wl7; Fri, 4 Oct 2024 15: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=1728055877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Akh5nCgIYi/F2DIo4prGxOkCE9hzy3wGevIgTqEFphA=; b=uHkGpw4O9FDFzJP7BFBTRwTmhe1uWgD6DxIXwD40NlAKgPlH8EnWBvAohGhdEpWM3FKDkD qtxP0ekk+uD8bpRVCTjgVhKJN+ZTs+1i7Z1fbmMREbhF399zD8dRYxAsKBrbIcgQgnkNZJ 8cRv3gByGbHM7AlIkVXTYY1KPloeRGkvVxwMk61GFczEuN1j7N8SxeIzXWMLsYLry2jqTO HMCBBYWpwEaiS5d8FUsIDxg2/jdJ1UbjEqm+SXHNYoeVQtQdpfCM+KQOzUzgUV+xHYYvM5 EJvo6u/WZ1Cd9SjkAXbB+pWa1+y3xt3Evgl0LYA2iRKL2IqwIu2kPtWo+4nHqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728055877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Akh5nCgIYi/F2DIo4prGxOkCE9hzy3wGevIgTqEFphA=; b=MFzKU5X4GLt/1LLOovTksd6lrA2U4F8oHwxpfkXTJuIogGAvPktflAcoLBv1EQKVw+hAG6 g5zhGCCNfKxqtiiCK8R4aRf2Gfi5Nq9TxhpLdSvZlJGsuD5RxUKjGReJJTd4pCO8mx15Ct euNaDJD5xxdJGZq3k7RngQ0wjsXQnarXHcwEPJeTk4jm+WTD74N+gE+zpwO5KOdFrqQj4D YYoBsPkuSEOxH+eZnaONDKluyoG4By1ZEhkuA/SEPW9wGuTU5b/c9aHQHF1gQEA+3HEFSV PAlovV3i9lwLL4gkyTmIRlvJSdZYS6ATqplIv//eFEiZEJkYU2uyoD2kaKqPMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728055877; a=rsa-sha256; cv=none; b=iAi9nixT2Gv2FeUopwh11Z8CsZzjNuVw+vfvad/DYEHEFAsvQ+arGPyKHp2teVcTNt1nVF qgcnTmMv+e0EDyyXTgWMuqTQrY0fSzfSd9kpyEEstbr4sftuqLLzaoRmXBi7Hlnvo34LDh UPXQZBR9adhlUQwXjzsy9JnYFcoHDzt8f4N3y8RVUYnG1IvU//lCheZFYlnxCHlhrxnjfU bdxYpIeA8SE1pVExwUsLkYzDAmMEKHp0Gnq+PcMw7Q9HLWS66si7SYUhBMEWWvJm07Yx5O oSnuP5V3vv62b+rd0z2qL2K4N9LWNEA0+ztVNtI8EFk6wzfeUZTmwAxqfIw5ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKsvn2Cv3zfj4; Fri, 4 Oct 2024 15:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494FVH5b008561; Fri, 4 Oct 2024 15:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494FVHJ2008558; Fri, 4 Oct 2024 15:31:17 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:31:17 GMT Message-Id: <202410041531.494FVHJ2008558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 48979e8def00 - main - arm64: Support HWCAP2_AFP and HWCAP2_RPRES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48979e8def00b69a07880e7827af7e32d5e377ff Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=48979e8def00b69a07880e7827af7e32d5e377ff commit 48979e8def00b69a07880e7827af7e32d5e377ff Author: Andrew Turner AuthorDate: 2024-10-04 13:08:36 +0000 Commit: Andrew Turner CommitDate: 2024-10-04 14:06:29 +0000 arm64: Support HWCAP2_AFP and HWCAP2_RPRES These add alternative behaviour to some floating-point instructions so don't need any kernel support and can just be exposed to userspace. Sponsored by: Arm Ltd --- sys/arm64/arm64/identcpu.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 3bf4f9a80c90..0e82381a9ac6 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -942,6 +942,11 @@ static const struct mrs_field_value id_aa64isar2_rpres[] = { MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64isar2_rpres_caps[] = { + MRS_HWCAP(2, HWCAP2_RPRES, ID_AA64ISAR2_RPRES_IMPL), + MRS_HWCAP_END +}; + static const struct mrs_field_value id_aa64isar2_wfxt[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR2, WFxT, NONE, IMPL), MRS_FIELD_VALUE_END, @@ -956,7 +961,8 @@ static const struct mrs_field id_aa64isar2_fields[] = { id_aa64isar2_apa3, id_aa64isar2_apa3_caps), MRS_FIELD_HWCAP(ID_AA64ISAR2, GPA3, false, MRS_EXACT, id_aa64isar2_gpa3, id_aa64isar2_gpa3_caps), - MRS_FIELD(ID_AA64ISAR2, RPRES, false, MRS_EXACT, id_aa64isar2_rpres), + MRS_FIELD_HWCAP(ID_AA64ISAR2, RPRES, false, MRS_LOWER, + id_aa64isar2_rpres, id_aa64isar2_rpres_caps), MRS_FIELD(ID_AA64ISAR2, WFxT, false, MRS_EXACT, id_aa64isar2_wfxt), MRS_FIELD_END, }; @@ -1099,6 +1105,11 @@ static const struct mrs_field_value id_aa64mmfr1_afp[] = { MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64mmfr1_afp_caps[] = { + MRS_HWCAP(2, HWCAP2_AFP, ID_AA64MMFR1_AFP_IMPL), + MRS_HWCAP_END +}; + static const struct mrs_field_value id_aa64mmfr1_hcx[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, HCX, NONE, IMPL), MRS_FIELD_VALUE_END, @@ -1165,7 +1176,8 @@ static const struct mrs_field id_aa64mmfr1_fields[] = { MRS_FIELD(ID_AA64MMFR1, CMOVW, false, MRS_EXACT, id_aa64mmfr1_cmovw), MRS_FIELD(ID_AA64MMFR1, TIDCP1, false, MRS_EXACT, id_aa64mmfr1_tidcp1), MRS_FIELD(ID_AA64MMFR1, nTLBPA, false, MRS_EXACT, id_aa64mmfr1_ntlbpa), - MRS_FIELD(ID_AA64MMFR1, AFP, false, MRS_EXACT, id_aa64mmfr1_afp), + MRS_FIELD_HWCAP(ID_AA64MMFR1, AFP, false, MRS_LOWER, id_aa64mmfr1_afp, + id_aa64mmfr1_afp_caps), MRS_FIELD(ID_AA64MMFR1, HCX, false, MRS_EXACT, id_aa64mmfr1_hcx), MRS_FIELD(ID_AA64MMFR1, ETS, false, MRS_EXACT, id_aa64mmfr1_ets), MRS_FIELD(ID_AA64MMFR1, TWED, false, MRS_EXACT, id_aa64mmfr1_twed), From nobody Fri Oct 4 15:56:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTQ31rxz5Xxj7; Fri, 04 Oct 2024 15:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTQ2Dlzz4148; Fri, 4 Oct 2024 15:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GUpWaf0d680nwdLEus8cgjge/JDuQksPyuu2GMJK0c=; b=eq+AKqKKKrhjU/XQEuukL6oDpgGAe6ipQxDwR+3KFZw0W5brN8QkZOZJ3iJyasjuEz2oA6 xDj6xvKWZiTjMz0f2Vs1MJ+X5FCP6KLxjxwHY4Hhiy4u4G+0EvN5/K0b+UtG1GkfcAlLhT B6jalVn0GNcd/ab9chh7hoIc2JLS/+TUk1Lcu8dkylzzH1MQNHEIGbFL2zooQr8LVtp37p gOrZVvjcHnPof4fmmBryycb41khrs8K5fB1gfZKTdJDnkYrZXZA4xmnUJthNtf4NrZAtde pO+OwyxR9I7PKqz8BIsi3UxfnbLZYt/HAli75K4Ur3hrXwxkjlP86s0OPFWTKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GUpWaf0d680nwdLEus8cgjge/JDuQksPyuu2GMJK0c=; b=Z+JaZrLQYYn8j8Zn5FKgE3PnAqYBrIndfyl/ki/sMo/jCc6dzMhNCxSDlvuSwEzOvycNOm d9PcF0HtFAF/nQKJs6K5FTOyX1nXFtG3Kr7C2BHRg58rLZDGgGKxgkTbU4YsgNipE5dbEU ww96s9gUT7duF/Isa1Css+Duxv88gmVRXNER7f/hEoaLmAqXSt9WYPZiLrujJ4UO5gE8mR cRTu6Ku9QeOSRxO09/gfJXJW6e+JnKEZ/3eZeoSayyEgKvQl93+OHCUykUu2gSiv5nV8CH rBZV7DX27eohygXL52/Oyxbxb/HApR4MqSEa6uvOF88ofjfM9m34lCCEJSDeUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057418; a=rsa-sha256; cv=none; b=kVQhUShbmmBGcnqN4pMn6JG7Sdyfnhf0eZRUxQFKLvjlRWGTK0Uy1mgsSQdrknN+8+0Z3B mvwi53GppZd2GBWvh780tGMU/Sh0n/nIMaq1/epUfe36e7pqZ3BDBs/+IQQKdai6wCH9pV RFERhEiQUT9qBzGMNxmYGekm2ZlXikafNlpdgBsJCdxtZVaNigBh5uOCFJeHwtU+XRVgW/ jFEB/UBcH9DdYmiQYP4lHxTa0LYAvivIsSL0bItPNqCSzoadcO9JOdMLhrGDZU5fonBeD6 PAO+u3jb72gOOJ8OuY17Lb3J+wkprEowPgB3Jgf0+biI7lCe/pzxHeXCTzQs7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTQ1l2mzhCT; Fri, 4 Oct 2024 15:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494FuwoQ048224; Fri, 4 Oct 2024 15:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fuw46048221; Fri, 4 Oct 2024 15:56:58 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:56:58 GMT Message-Id: <202410041556.494Fuw46048221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 92af7c97e197 - stable/14 - agp.4: Add a deprecation notice to the man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 92af7c97e197bb47be85030102f1a0ffbf3eb608 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=92af7c97e197bb47be85030102f1a0ffbf3eb608 commit 92af7c97e197bb47be85030102f1a0ffbf3eb608 Author: Mark Johnston AuthorDate: 2024-09-19 10:06:49 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 agp.4: Add a deprecation notice to the man page The driver is giant-locked and thus already prints a deprecation warning when attaching. The device file interface was broken in 14.0 and 14.1, see commit 12500c14281d, but it took a very long time for anyone to notice, and in that case it was only because of some code which probes all device files. Relnotes: yes Reviewed by: imp, jhb, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46542 (cherry picked from commit 0abe2d3903cc4569705d491f8ac6d2edea01c26f) --- share/man/man4/agp.4 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4 index de19349caa08..2aeb01850085 100644 --- a/share/man/man4/agp.4 +++ b/share/man/man4/agp.4 @@ -30,6 +30,11 @@ .Nd "generic interface to the Accelerated Graphics Port (AGP)" .Sh SYNOPSIS .Cd "device agp" +.Sh DEPRECATION NOTICE +The +.Nm +driver is slated to be removed in +.Fx 15.0 . .Sh DESCRIPTION The .Nm From nobody Fri Oct 4 15:56:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTR3ccyz5Xy2p; Fri, 04 Oct 2024 15:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTR2nzMz40qQ; Fri, 4 Oct 2024 15:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF901b3462kKdYStOAqfzovyg7ISG6ktbFXM9UhEhnI=; b=h3hGFJmFg4JQ9v20+tdzrbgncKtOmJCjhfw2m5hh22iSefuazEJm9ru2CPo8EW1x1lFlf+ 4913AGv65YI43vLo6hz2vnuigFitO0JbS9m7M8fSg12g5reQbe5I0GAnHNVYUqmf6JjGa7 nQBgZcqx9WpcrIKOEqXMZqogXb0MnwAxzzRBNYKTa6EmtJVVGJMWKqRpnXiC7XhA35RocP B4VoboRP4aHrZIPq1RJC/Nm62hlBsXzowQB8rPXQ8uIvIWAsSreF0+O5WeSpcmjAlQqoF+ I3EsqOeTP05anE7qsY9mcAkBM6QpbMlOT0M8IZbFRcfQInA2/YUivo2k0sqO+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF901b3462kKdYStOAqfzovyg7ISG6ktbFXM9UhEhnI=; b=YdohVXGrxCyDmH+ry4zt36LZ6EtLGHTXYoPm/uHgzWc+uRzhOUALisEFIdt0UWxJjp9I8W KpU+FflhMfQK3G83SarrDe+T5iV63i+DPXJfDPAUJ7EOYnUbLxVCqWz7YkOpsSm8DGsb4f UkFvqfJjLSwMnWILV86GL3JxhOSA7yv8cy/RG8norLgjul7ZWhrGFDECREQIugY6/YB+2F ZnLoGLqksWdBrTbyP0vcLUQJIi/OHB4U122PKbMvwoh8O/SzeugmkSrBkgiV3pi9vP3zRT f2DEkPsnAsL9g7irTuxg8UtsKWcMsxLbNX+jjtm84sx/86Enn6WAnEWNsQ8Qrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057419; a=rsa-sha256; cv=none; b=Ic7/Pv7CP/Hl6VfUU6La3n6J2dpdIZOsYqW9efjwJxXWfmuX4moymQ0tCOi3YCPr7fbbgs 0uottFKtIN1oQFLaLyrVBC0Y9f2N1izFAKCXXIMxc54onI0OShvlF4ND20z6KNWKvMzl0o u0Fpui3D8Y7zXgJVKObxrCuf3hUSKiOm/8ibVjOo9OzTG430FxCv3CkBTQNq5zEcNGPsFt AZWX725ymI//wm6dhdkWwn5WECcmYQBwzl+dBA34MJnZ+WNrWnQ7jhHoAVxaoP1abfQ6KH 5jMZxWooHmE1OM5HgZWQ6bhnl5J39yQLEGpk95y73km3ATtCcOyfUZIrJxcR7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTR2N3mzhFx; Fri, 4 Oct 2024 15:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494FuxNR048279; Fri, 4 Oct 2024 15:56:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494FuxO7048276; Fri, 4 Oct 2024 15:56:59 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:56:59 GMT Message-Id: <202410041556.494FuxO7048276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 893caa2ab166 - stable/14 - netmap: Make the memory ops function pointer table const List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 893caa2ab166b8d6428483172bcd61156407652f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=893caa2ab166b8d6428483172bcd61156407652f commit 893caa2ab166b8d6428483172bcd61156407652f Author: Mark Johnston AuthorDate: 2024-09-19 09:56:30 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 netmap: Make the memory ops function pointer table const No functional change intended. Reviewed by: vmaffione MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D46664 (cherry picked from commit 1ae4951ba7bb203d9a29892792960f0869759d35) --- sys/dev/netmap/netmap_mem2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 23954b377f9b..1ba966e7666a 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -179,7 +179,7 @@ struct netmap_mem_d { /* list of all existing allocators, sorted by nm_id */ struct netmap_mem_d *prev, *next; - struct netmap_mem_ops *ops; + const struct netmap_mem_ops *ops; struct netmap_obj_params params[NETMAP_POOLS_NR]; @@ -533,7 +533,7 @@ static struct netmap_obj_params netmap_min_priv_params[NETMAP_POOLS_NR] = { * running in netmap mode. * Virtual (VALE) ports will have each its own allocator. */ -extern struct netmap_mem_ops netmap_mem_global_ops; /* forward */ +extern const struct netmap_mem_ops netmap_mem_global_ops; /* forward */ struct netmap_mem_d nm_mem = { /* Our memory allocator. */ .pools = { [NETMAP_IF_POOL] = { @@ -1670,7 +1670,7 @@ error: */ static void * _netmap_mem_private_new(size_t size, struct netmap_obj_params *p, int grp_id, - struct netmap_mem_ops *ops, uint64_t memtotal, int *perr) + const struct netmap_mem_ops *ops, uint64_t memtotal, int *perr) { struct netmap_mem_d *d = NULL; int i, err = 0; @@ -2177,7 +2177,7 @@ netmap_mem2_deref(struct netmap_mem_d *nmd, struct netmap_adapter *na) } -struct netmap_mem_ops netmap_mem_global_ops = { +const struct netmap_mem_ops netmap_mem_global_ops = { .nmd_get_lut = netmap_mem2_get_lut, .nmd_get_info = netmap_mem2_get_info, .nmd_ofstophys = netmap_mem2_ofstophys, From nobody Fri Oct 4 15:57:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTS6L1yz5XxWp; Fri, 04 Oct 2024 15:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTS48BBz4173; Fri, 4 Oct 2024 15:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1KPO9t6YTq8L/oONu9jN4u27Z1AsLhTf7TS55K0T0l8=; b=qF4yonHd4wvCVttxzIzifijQjjESyeTmoCZw8v/lZburIfZw176toXNi0x/yhsRVTOkTYQ s/pd4RbeADH4/eUvHAvsv2ZYUArLPsmpVT15GjY0rorXfjF9NQiJYIG/zTY0hUiViKNp3Y BkqZiib8bDsgsHpc48KUIdVeqIP6lzyz2ocaefPjEfMBgyTGqb/zvCRHwet5m4+O+zShro uWjpRDcogVt1cS9iDcEqek/bYNjwIiCaGMRyfewbKsRnyHEnziGXXojjwGHrlKKBhVoJKa kx3N+CZCaFGbX+8wvq0loEuHoqoJZ1N03wZHSp2kVPukGTO5nt3+9L9F0Tna9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1KPO9t6YTq8L/oONu9jN4u27Z1AsLhTf7TS55K0T0l8=; b=X6Mf1yWKx9Y2sJa0UhaFi12dYVPeh0nSb22He79Mzv31g6xjrwwMY8Iztf2IwO5joUV7YE OdvMbbmYLUK8CmeubKEq/Zqtw4oIPurJT6qk8TSzQT+/kbvXAj0Zpdch7+FgTSMIBlMFfn SPj5QmZJjU4KzSJEcGP4Q4bcln3CCyBU0yJjv5Cn9Uk5tO3OY9rI4XePjCpzU0D1gvsoi5 5yAr89dAoRv0xIMCVJ14afoFNBb1p+tzzHxRtvBrMe6/A/h5hwtLEkhmAsyTg+OF1syxxg C1G7VbWYHHqGPnTJxtzVRLzcbAHqGLr4fm2TdyA3dmJgh5xDPIf0JaOH9ySUJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057420; a=rsa-sha256; cv=none; b=DAd2euNaJkItU6qleCGLWxil4ymKXq3kBN3M8tUagFEowsXKa1kTuNLOW4xtP61zYxtL1i RAfF70rVr19JhKvZ++3kCltq3vpGhUUOekaNZaDf1zcaxH9klaF8V//9P0Lax6atWqxEDz ILXZO0J2yU2RymRRw1NZGRlANO/Yv8YxlwtjtENKkzc+TfVY/sxL5XBgF6l0FxYmxToIS3 vRKPWQ26xSvuqeEocUzbkiq1XpRW6l11ETymRLZvRJnYsJLKNUVF4pWGnjY5Jbxf56k5fs Vlv47i3J5Cgxe59r9lMWH69QRzBj4jDs0ieDJDHJtODN9Vhz6eLc2cnrZG97Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTS3kp0zhFy; Fri, 4 Oct 2024 15:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv0GA048333; Fri, 4 Oct 2024 15:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv0Wj048330; Fri, 4 Oct 2024 15:57:00 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:00 GMT Message-Id: <202410041557.494Fv0Wj048330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7ebda9886eda - stable/14 - iflib: Use if_alloc_dev() to allocate the ifnet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ebda9886eda8956df5a24423396a52ffce5e4e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7ebda9886eda8956df5a24423396a52ffce5e4e6 commit 7ebda9886eda8956df5a24423396a52ffce5e4e6 Author: Mark Johnston AuthorDate: 2024-09-19 09:21:05 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 iflib: Use if_alloc_dev() to allocate the ifnet This ensures that the ifnet's NUMA affinity is accurate. Reviewed by: kbowling MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D46667 (cherry picked from commit 767723ddebe9c76a2d4a45a50d9b0efc9f2f91d7) --- sys/net/iflib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index fa6227f3f80a..a2e2c3efa1ad 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5750,7 +5750,7 @@ iflib_register(if_ctx_t ctx) CTX_LOCK_INIT(ctx); STATE_LOCK_INIT(ctx, device_get_nameunit(ctx->ifc_dev)); - ifp = ctx->ifc_ifp = if_alloc(IFT_ETHER); + ifp = ctx->ifc_ifp = if_alloc_dev(IFT_ETHER, dev); /* * Initialize our context's device specific methods From nobody Fri Oct 4 15:57:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTV0QFGz5Xxfh; Fri, 04 Oct 2024 15:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTT507sz40qy; Fri, 4 Oct 2024 15:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cc0rKOhcxbWP70VPZ2vXADyFeEIwXZbXDFd/GJdNYKc=; b=u34Yd0J+82gvkBwPpFjhly390mf8piaWFOufTLjtjid+K05owyWbzoepB6SydA8ySGKoEW CjJohrSeRPSfpvZEjWzuXWP3mgXxF/BcLrDKbqawaK56U5mO/Ler6Lj0cJCBrQm9e65wqo t0jv4jye0lplvF4NiWLB7BVrgFQE3QHTDJeTF1ykb3E+817H1lhbiQsb3sJ9bHFMHkXUVs GlFDEoY9/StF9KG3r8uvij+HAN39w8f3VSnN6TPHwKr/QuywTn2NKHxscFEGAj78VlPr01 hU7ig0PTmVC9Zymbmn6eqoSRdLiPOaYTCdKqCle1c5GRC9s0HuM1yFxzT17lNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cc0rKOhcxbWP70VPZ2vXADyFeEIwXZbXDFd/GJdNYKc=; b=Nop5Bx6Ak3l74HdaKS222W+rOeJcGEtkFJ8VY8phaQmhz1Fh/iudg98xk0wxeRy5IEK8ub bE9yvFEkHvhDkh+ij/55dZXDILmi5izmN7XT7CPGtr4U0/uNyhIaQA7DOcwINAOVCvicXy EBJCpx2nfpqp7OZilGgoLDYEHIqzqLYxSnNxfvARnX14v6aEIPxLJWhGbMzz+NoTZKH8lL bg20H4u0P1UhfkTb7zMS8kib8osQbknpZfEwaGZ9QmOycCYmieyNgeJ4m+pBdRTaPqXwyR KJDJ5+xaFQqUnng+LYWbQu1zZi5++2UDMUYeIKn9Kr5z7KZTpgwGf6X/+GRBCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057421; a=rsa-sha256; cv=none; b=eixVfMDODBPhajlsB8CEcImX/ScEWZ69Kf18efXkHKlGQhSkfUo29DoR37eygtVsS2T3Go PG0ehuD215x1LU/boCnErQgh0R8bMaTlv0E19lpH/PpuFaxqbLC2VpHdibWoFwmF79sNf5 J3NRyddjL5EcwlCxnX0QYOy28SPXxbGnQcHTso+qfF8agaE7Wzu2PJDTfPdp1cGA4VhacR FRs5B2fO9+l0kqm3pikqRcPP+8gDHvFk9ukhPElv88k+aRYCJzaDPyQOBffyQUyIljzIWj 2egIkOsCwQUsQuBi+yniGsO3hUjw3/4s2JrNplRUtf8MvWibdkWZxrmoHAf8dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTT4KBJzhG0; Fri, 4 Oct 2024 15:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv1Qk048375; Fri, 4 Oct 2024 15:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv10p048372; Fri, 4 Oct 2024 15:57:01 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:01 GMT Message-Id: <202410041557.494Fv10p048372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8b1d908cdeb7 - stable/14 - dtrace/amd64: Fix probe argument fetching List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b1d908cdeb7fb236011ed9c42517ce0ee9c9613 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8b1d908cdeb7fb236011ed9c42517ce0ee9c9613 commit 8b1d908cdeb7fb236011ed9c42517ce0ee9c9613 Author: Mark Johnston AuthorDate: 2024-09-19 09:21:38 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 dtrace/amd64: Fix probe argument fetching dtrace_getarg() previously walked the call stack looking for a frame matching the dtrace_invop_callsite symbol, in order to look for a trapframe corresponding to an invop (i.e., FBT or kinst) probe. Commit 3ba8e9dc4a0e broke this in some cases by breaking the expected alignment of the dtrace_invop_callsite symbol. Rather than groveling around the stack to find invop probe arguments, simply use the trapframe reference saved by dtrace_invop(). This is simpler and less fragile. Reported by: avg Reviewed by: avg MFC after: 2 weeks Fixes: 3ba8e9dc4a0e ("dtrace/amd64: Implement emulation of call instructions") Differential Revision: https://reviews.freebsd.org/D46672 (cherry picked from commit 9aabab09c4e163fa8187b265d6836d822516b1c9) --- sys/cddl/dev/dtrace/amd64/dtrace_isa.c | 77 ++++++++++++++-------------------- 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c index 9db5a16190db..83d34abbd270 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c @@ -32,6 +32,8 @@ #include #include +#include + #include #include #include @@ -355,6 +357,7 @@ zero: uint64_t dtrace_getarg(int arg, int aframes) { + struct thread *td; uintptr_t val; struct amd64_frame *fp = (struct amd64_frame *)dtrace_getfp(); uintptr_t *stack; @@ -366,57 +369,39 @@ dtrace_getarg(int arg, int aframes) */ int inreg = 5; - for (i = 1; i <= aframes; i++) { - fp = fp->f_frame; - - if (roundup2(fp->f_retaddr, 16) == - (long)dtrace_invop_callsite) { - /* - * In the case of amd64, we will use the pointer to the - * regs structure that was pushed when we took the - * trap. To get this structure, we must increment - * beyond the frame structure, and then again beyond - * the calling RIP stored in dtrace_invop(). If the - * argument that we're seeking is passed on the stack, - * we'll pull the true stack pointer out of the saved - * registers and decrement our argument by the number - * of arguments passed in registers; if the argument - * we're seeking is passed in registers, we can just - * load it directly. - */ - struct trapframe *tf = (struct trapframe *)&fp[1]; - - if (arg <= inreg) { - switch (arg) { - case 0: - stack = (uintptr_t *)&tf->tf_rdi; - break; - case 1: - stack = (uintptr_t *)&tf->tf_rsi; - break; - case 2: - stack = (uintptr_t *)&tf->tf_rdx; - break; - case 3: - stack = (uintptr_t *)&tf->tf_rcx; - break; - case 4: - stack = (uintptr_t *)&tf->tf_r8; - break; - case 5: - stack = (uintptr_t *)&tf->tf_r9; - break; - } - arg = 0; - } else { - stack = (uintptr_t *)(tf->tf_rsp); - arg -= inreg; + /* + * Did we arrive here via dtrace_invop()? We can simply fetch arguments + * from the trap frame if so. + */ + td = curthread; + if (td->t_dtrace_trapframe != NULL) { + struct trapframe *tf = td->t_dtrace_trapframe; + + if (arg <= inreg) { + switch (arg) { + case 0: + return (tf->tf_rdi); + case 1: + return (tf->tf_rsi); + case 2: + return (tf->tf_rdx); + case 3: + return (tf->tf_rcx); + case 4: + return (tf->tf_r8); + case 5: + return (tf->tf_r9); } - goto load; } + arg -= inreg; + stack = (uintptr_t *)tf->tf_rsp; + goto load; } + for (i = 1; i <= aframes; i++) + fp = fp->f_frame; + /* * We know that we did not come through a trap to get into * dtrace_probe() -- the provider simply called dtrace_probe() From nobody Fri Oct 4 15:57:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTV73knz5XxWr; Fri, 04 Oct 2024 15:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTV5nV4z40tj; Fri, 4 Oct 2024 15:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PcVQFr8NBuu2BT3zk0LMukNNl/MOHP0H4iDrl+9/FdM=; b=QAXnsIgM0GoB10+Np170V2jT37l8KbhgweHOXuhIZvQBnliHd3w32EkX1WV2EmPDUYJS4t gmsZCOfxLnLgOYel/TWEyBOcfdoAYJ5HHUwAz/naH+KG5o9Xnc9jJlZa4TKlCVgUuBcisd 68qJ8ggAshtcm1dDBamDn9qlnb2xb6bGslgOcJ3k9Lw0BfjiydKYyICrdwBVuSzpwLpG3X 57zx2BbNiPwiLrdqwUvy+3WHW45t35c08W2rsQieYSfJwIN5aTGWpJx1o9GxjpZGyqHEa8 vVAITVo2nORshviXYRBUFozi9VoZ+QVvpYBuAmEgARLp6q3FtC2b1nTdxpA78A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PcVQFr8NBuu2BT3zk0LMukNNl/MOHP0H4iDrl+9/FdM=; b=bXo2A2rw7A2Mv6AxJQASO2hREdvCY+ummylTFIt/NTYMSxWWKEslnG6hFgTb22MGgHYtR1 oqkpFPwqAXEynqdAIn4/BULKzh7/xTSS/qr3OqQVBWRm2qLoHuBzcgiLV6KK5CMD5VjNFN qjeyVPj3oGKlhBFEQp2IXaxlQLyNr/KFOO2z9ZjcugxCssBkn2msdSQNOndcWIfozL1gUQ FZ/pm0NvHq4TUzlDHtqJzfd7LImiXXKMmAnf4vibbnFqlduE+Th/+HYWCNyuHerR3+oTps g5acTLJj/2x1G5JdsARQKNPq5VgrFwFqj3wthKlLmm10cHXciSO7CLTxZPr04g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057422; a=rsa-sha256; cv=none; b=d7IcwvfntWDF+ohNdjnGchAmNhCZIM9FEaeP8bhUw7TvPX9KRiqZ4RRetinkrfxY8NAlni xbkU0VbeDCkhPt3tVtf5MYDjSlM103OIoiGM2zbBonPoBUfDc/0l0ryWF77sVYathBStQ5 M7COqGeBNJ+QsK0iPfxOolUgmNZLMwQQHq7NlGXIbwoLRlGVih2Wunj39lvqASwg/TrInq TSASfkpmgeQMQakbzjNMdcyAqEwsj6N+SOgPB6DXBo+fbDT2jRMnYqTuK5+cpQs+f0tdIN S7W55eHnXNGNBWGnbZgrNPrBV53QhQarO2pYRmoJWqrZuArYV8Pu9WEqeI/trw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTV5MlQzhCV; Fri, 4 Oct 2024 15:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv2OP048424; Fri, 4 Oct 2024 15:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv2mT048421; Fri, 4 Oct 2024 15:57:02 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:02 GMT Message-Id: <202410041557.494Fv2mT048421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: af2f923ed093 - stable/14 - dtrace_test: Remove the dependency on dtraceall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af2f923ed093200529e9f68ca7436dffd7a68dd3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=af2f923ed093200529e9f68ca7436dffd7a68dd3 commit af2f923ed093200529e9f68ca7436dffd7a68dd3 Author: Mark Johnston AuthorDate: 2024-09-19 09:21:55 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 dtrace_test: Remove the dependency on dtraceall FBT refuses to create probes in modules which depend on dtrace(all), but dtrace_test is a convenient place to add functions specifically for testing dtrace. The dependency on dtraceall is not needed, so just remove it. In fact, it can be useful to test SDT probe creation by loading dtrace_test with and without dtraceall loaded. Reviewed by: avg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46673 (cherry picked from commit 5bd7b976c1214cd6357b74f491753a331f9b7c99) --- sys/cddl/dev/dtrace/dtrace_test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/cddl/dev/dtrace/dtrace_test.c b/sys/cddl/dev/dtrace/dtrace_test.c index 2a599b1f0ce5..6c4fcc8d4080 100644 --- a/sys/cddl/dev/dtrace/dtrace_test.c +++ b/sys/cddl/dev/dtrace/dtrace_test.c @@ -106,4 +106,3 @@ dtrace_test_modevent(module_t mod, int type, void *data) DEV_MODULE(dtrace_test, dtrace_test_modevent, NULL); MODULE_VERSION(dtrace_test, 1); -MODULE_DEPEND(dtrace_test, dtraceall, 1, 1, 1); From nobody Fri Oct 4 15:57:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTX0mh2z5Xy0b; Fri, 04 Oct 2024 15:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTW6rhqz417l; Fri, 4 Oct 2024 15:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqs26qWP7xFwOZL9EhJDtz0jx52BzYhKoRtImSN7H00=; b=fTkARb7LvuA3WZZSF30iERfSaD9lov2VFNbUhMo2OWTbez37WnexzxdHf9/Afx94DhNGyK Q8r+nZQKNJR/Tyacs2XiqoQ1zzLT73GmWFg+WOjinSNLuLBMtGhLOrIv4CrtYo/OS23u4O OZLhN6B/y91YblF3Twn7EheVAOXclpKbLXQPWw8BdFYkGOxLk+IBW2Ta6RoxpncbKDMieY eDMyl0CoWfdgj/t3HX0fjMi76M8dAbJMssVZh1fPtbVn3fFUXXrI8Q0tiFkRHR4UtfLfpl PaF6JIWKN6aAHThH4jvsSQOLiKL0FKR3qs27tTHobtHSfufnvmczsrmaKHSFkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqs26qWP7xFwOZL9EhJDtz0jx52BzYhKoRtImSN7H00=; b=g1T+KVKnVE9MGZcEp+3qpPHX9ANSSpf555desmWuYK06k2ravahkEVtLXBddIoARRfQsGk MEjUawq6S1C9qqdl4RnOSgxffo59HSfDw8IW2psTlPkc8/qof+vK/uNv/FnOXyJh5HYS3V KJPscx7hImO4ySqbhjH1VMU3VWHfKjd02PisyM/D3KCL3UE4ktz8TA4mAuVOSA2NxNz2Zh B6phYpKt6aKDEYhvAtysOKvNI68AgizYfigG9F+k+UrsAnJPDwmMxBv61ICp5RQ0w4jxM3 s0vgGkIrEZcfs97seAsMQ4jmdh1O02pWzIDMK8nFRp43zLSxb58EcktiLxqi2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057424; a=rsa-sha256; cv=none; b=BZqY54JWx2jbLCfmxfKBuMc2DAGnzTnXQ/bsKQ/tJIWwu0JExZYlwkyqRmZQwYNj5/Et1x RG8PIKyKVoTPJuflx28DXW3s00Nz1xGcTXKkg7gTGfFwaifuheO7S2C2hQbka278+9RDQr JRweIqg5RA/jys1jSmCYGx/emdSunZEMgjkTsLrTr3e9KVwcw3Oadm+1tKB4gvghHG/xky IaFUaGznfNixPs0dL+5xoGaYHulv1KYtLNhMu4lxLaNM/IYUVUr6V6ycQlyQCPYPkq8xLH 2lwiQ9V+5qUOF07EL8dJny9Ga0D0/fxqZcNBf/91/S83C/kuuX9rP7bxQtYaGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTW5wgjzhG1; Fri, 4 Oct 2024 15:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv3e2048487; Fri, 4 Oct 2024 15:57:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv3tl048484; Fri, 4 Oct 2024 15:57:03 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:03 GMT Message-Id: <202410041557.494Fv3tl048484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 37a29946b91b - stable/14 - dtrace tests: Add a test case which validates FBT probe arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37a29946b91b1360102ff9cc33eaf352a2f17726 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=37a29946b91b1360102ff9cc33eaf352a2f17726 commit 37a29946b91b1360102ff9cc33eaf352a2f17726 Author: Mark Johnston AuthorDate: 2024-09-19 09:22:03 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 dtrace tests: Add a test case which validates FBT probe arguments Reviewed by: avg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46674 (cherry picked from commit d439598dd0d341b0c0b77151ba904e09c42f8421) --- .../test/tst/common/fbtprovider/tst.argtest.ksh | 34 ++++++++++++++++++++++ .../tst/common/fbtprovider/tst.argtest.ksh.out | 3 ++ .../dtrace/tests/common/fbtprovider/Makefile | 2 ++ sys/cddl/dev/dtrace/dtrace_test.c | 28 ++++++++++++++++-- 4 files changed, 64 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.argtest.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.argtest.ksh new file mode 100644 index 000000000000..dc3641b01101 --- /dev/null +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.argtest.ksh @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2024 Mark Johnston +# + +dtrace=$1 + +$dtrace -q -s /dev/stdin -c "sysctl debug.dtracetest.fbttest=1" <<__EOF__ +fbt:dtrace_test:fbttest:entry +{ + printf("%d %d %d %d %d %d %d %d %d %d\n", args[0], args[1], args[2], + args[3], args[4], args[5], args[6], args[7], args[8], args[9]); +} +__EOF__ diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.argtest.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.argtest.ksh.out new file mode 100644 index 000000000000..301e154b3339 --- /dev/null +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.argtest.ksh.out @@ -0,0 +1,3 @@ +debug.dtracetest.fbttest: 0 -> 0 +1 2 3 4 5 6 7 8 9 10 + diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile index 4aaf2013d59f..14394f9681eb 100644 --- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile @@ -7,6 +7,8 @@ PACKAGE= tests ${PACKAGE}FILES= \ err.D_PDESC_ZERO.notreturn.d \ + tst.argtest.ksh \ + tst.argtest.ksh.out \ tst.basic.d \ tst.functionentry.d \ tst.functionreturnvalue.d \ diff --git a/sys/cddl/dev/dtrace/dtrace_test.c b/sys/cddl/dev/dtrace/dtrace_test.c index 6c4fcc8d4080..ee9c63034ed9 100644 --- a/sys/cddl/dev/dtrace/dtrace_test.c +++ b/sys/cddl/dev/dtrace/dtrace_test.c @@ -51,13 +51,27 @@ typedef struct vnode vnode_t; vnode_t dummy; vnode_t *rootvp = &dummy; +enum argtest { + ARGTEST_SDT, + ARGTEST_FBT, +}; + +extern void fbttest(int, int, int, int, int, int, int, int, int, int); + +void __noinline +fbttest(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j) +{ + printf("fbttest(%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", + a, b, c, d, e, f, g, h, i, j); +} + /* * Test SDT probes with more than 5 arguments. On amd64, such probes require * special handling since only the first 5 arguments will be passed to * dtrace_probe() in registers; the rest must be fetched off the stack. */ static int -dtrace_test_sdttest(SYSCTL_HANDLER_ARGS) +dtrace_test_argtest(SYSCTL_HANDLER_ARGS) { int val, error; @@ -68,7 +82,10 @@ dtrace_test_sdttest(SYSCTL_HANDLER_ARGS) else if (val == 0) return (0); - SDT_PROBE7(test, , , sdttest, 1, 2, 3, 4, 5, 6, 7); + if (arg2 == ARGTEST_SDT) + SDT_PROBE7(test, , , sdttest, 1, 2, 3, 4, 5, 6, 7); + else + fbttest(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); return (error); } @@ -78,8 +95,13 @@ static SYSCTL_NODE(_debug, OID_AUTO, dtracetest, ""); SYSCTL_PROC(_debug_dtracetest, OID_AUTO, sdttest, - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, dtrace_test_sdttest, + CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, ARGTEST_SDT, + dtrace_test_argtest, "I", "Trigger the SDT test probe"); +SYSCTL_PROC(_debug_dtracetest, OID_AUTO, fbttest, + CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, ARGTEST_FBT, + dtrace_test_argtest, + "I", "Trigger the FBT test probe"); static int dtrace_test_modevent(module_t mod, int type, void *data) From nobody Fri Oct 4 15:57:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTY12Ssz5Xy5J; Fri, 04 Oct 2024 15:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTY0CfSz41Ch; Fri, 4 Oct 2024 15:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/aQA7JrtHdYcuCS6UnSJgFy+83Yx91+Ssb3aeH+u6fo=; b=Afjym/brtTVgJIbqZ/+xiNxvpGAlaxTn79ODRFBheNm/oWfbfFgOfP/hcwBnGxib2Licoj 4qiHAq1Zh3NrxGBDvdpWGri00tIFLi3cUhmuBoMC7gp68CeygJ90xswZW5bOPdfi6ADOQA s0AbdAsOd/qOMjGEw8ErDoJH65rw3fWEgeRlp99ONPsMsd8Ool/dKLWsa5Wz6ywLQL32Lh AWiJAvTC5drSum0jNhkOFsktB17GQGBnjbBXL+OWiSLHJ9NHNqaMXfnRM7rFHUuUC00PcT C/LMDMtK4vMxUlL+dYMagfVkTp4RCDqGP+brTQ4lRMhP58YbXRoUEagAZFID5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/aQA7JrtHdYcuCS6UnSJgFy+83Yx91+Ssb3aeH+u6fo=; b=ed0w96Slt88r8w2+esMlNG9z5mgSrqe/O6rb0LnX9b3FZfvQufy21oc1841nLooicwlKcz EXLOtlDgT25BjrUwrod67NfvfCUjKqw1/wL2ptgH+85S+50BilwhDV4n18YkSvFLUyDmKb i8KgOoL/XyPx21c4yafQXMauZAILyJwjKbhSV/2RD+FJ/j23BSwbhmUjpNQKJpL3uc0q39 hutZahnfeBr9QanqpzNEjYKkkbA9Q3X+4Q9hiCOunalvWakU5kgBrr8tCqnNHTF1odr0jg REnEyYMjfNGjVnhECz+Bz8V04YzAb5lm+xKFip+cSOKo8t1FowZnYyWgNsZGeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057425; a=rsa-sha256; cv=none; b=WK9JSJh4HXYGGC98I9rS1ToP3JqOWEv/nSrDb5RPXS9vvmIHIDQ+YSt3iwXz1n/g6BDViL JvXl30qcSriBwPb2IX3wTRiHm8moVsVKZ6r0YWuwKE3iNM5I2c/c+Y+qTlmpDgTUsxNdAg Os1mRHPS+KqyPkB1y7k/py7nSpRWPx5qdgPmpPB7hUtXdqsJAVmIVoGJDCkuY54e69GQwF uEqLKz6ZbFrGF4xJGo3jiUOg+i+PquYMAvU740i1Hsh3T5GDcZTZ3PTK2O56FyW3a86bz6 O+pYK1bbYW1uRGQRRzMil9ixZWLU4HzgINpDcGeSsunfN3L/ozBl9v4pCA5uJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTX6wmLzgnm; Fri, 4 Oct 2024 15:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv4St048531; Fri, 4 Oct 2024 15:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv4lL048528; Fri, 4 Oct 2024 15:57:04 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:04 GMT Message-Id: <202410041557.494Fv4lL048528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c27106d925cd - stable/14 - dtrace/amd64: Remove the dtrace_invop_callsite symbol List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c27106d925cde6384252d9cdcd4df560375a50dd Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c27106d925cde6384252d9cdcd4df560375a50dd commit c27106d925cde6384252d9cdcd4df560375a50dd Author: Mark Johnston AuthorDate: 2024-09-19 09:22:13 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:42 +0000 dtrace/amd64: Remove the dtrace_invop_callsite symbol It is not needed after commit 7e80fd5ef397. No functional change intended. Reviewed by: avg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46675 (cherry picked from commit 06e7bc83f6a49b99f87ad1a6034e2fad54ebe7f3) --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 2 ++ sys/cddl/dev/dtrace/amd64/dtrace_asm.S | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index 98ae9eba120a..263b254b9021 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2400,8 +2400,10 @@ extern int dtrace_mach_aframes(void); #if defined(__i386) || defined(__amd64) extern int dtrace_instr_size_isa(uint8_t *, model_t, int *); +#ifdef __i386 extern void dtrace_invop_callsite(void); #endif +#endif extern void dtrace_invop_add(int (*)(uintptr_t, struct trapframe *, uintptr_t)); extern void dtrace_invop_remove(int (*)(uintptr_t, struct trapframe *, uintptr_t)); diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S index 0c8cd9a83d01..4c18fbf08220 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S @@ -56,9 +56,6 @@ swapgs; \ 1: addq $TF_RIP,%rsp; -.globl dtrace_invop_callsite -.type dtrace_invop_callsite,@function - ENTRY(dtrace_invop_start) /* @@ -78,7 +75,6 @@ movq %rsp, %rdx call dtrace_invop -dtrace_invop_callsite: addq $16, %rsp cmpl $DTRACE_INVOP_PUSHL_EBP, %eax From nobody Fri Oct 4 15:57:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTd1Xttz5Xxd3; Fri, 04 Oct 2024 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTc6RQBz41Rx; Fri, 4 Oct 2024 15:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kzo7/lrgs0wBZR5QSLdTyWdb0kGMohNlC89AjuIK0z8=; b=QChRnS4xcU5nS44Dw9cOhAa3mBPsVSDvVfTt74lzYFXX283obcwL/g/DMIGiAGnIaGdLk1 wfhwhwVi7zf/oHp/DPuMINKcGEzNKKYjnzoWygzGGmvzdmDArEdA9Pbr/v91ji8IXSiC14 QWjdmjxLUBkkSBs8hTaY5VOLcap6AAybnQ2uLuroF0qR4gbFEEnGrcIqSE9/ODW5NCKsiD qQEPrH+62vEYapyRne9akdXXo5fau4n25oaoALuPRjAWI5Bnp/hpgsLITVmggYTSX9Bp+w 2xclbYkeoNj7x2g+FrHPI9JJ8duag3mporrJGtBhWUVUh5wS+A5Tmdm+qWy9TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kzo7/lrgs0wBZR5QSLdTyWdb0kGMohNlC89AjuIK0z8=; b=mjqlfA7X5fBD1n3u8q20tzCfUFbzmzjjLzl4j6qNb4YmGY5HfOu+zDjlKVNCBiuNmNWNed xHvbwljJa4IJcFLCR80RCnvDh6GK37YYOF5d2PWt+GNm7uDNkUeERIl1oWuDjPxTnBEnqn H5u3fpoVKOnnXxa0fyU3JtKUBKs0V7zLG3JQcHBXRRP6K1SBWK5GSQCGW9cVj58sOOSbbv WoJgD2ZcNTnd+ddX5/i7KQp+B5+8W3n2KlKbz4RBS/t2NDygoQj9x8fDRCbPL4zcMAJU+O Y7b3qLC1GHkD0/vQ8Lkk6bmtJktAKJCtliHvypRBG2H5O6D1XqtBSEOZMO9wPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057428; a=rsa-sha256; cv=none; b=vSZeIhPY8EUvSZTmKJW4b0m6HhsbZhmVwqdZA3Xb0rrR281Dar/SfrgRwvFQfbT+vBfFzN XSoeZ0Pd4yPX4laR5MleZV9eXkBWfIQkQ1ceyhdMMrHo059v+3JrVby3YrVr6S1p88Y6XA SfCl3C1x07J/rzwC644I330hvb6DfgoL1kC5WWRCBzQB8RJMamsud0oUWYS9IX/Cc75ZIb BOL/Gms0TemOGHR2CFSe9nq3f/4Y7XdJGtHxDpUoIGxRf5SlrhqACx6MzpBKTNWq2iXZ3s 28YCO704XIiD/fytf4zZIY+508nQoa8TPNUOioPdSHw/ALL24pAyBzzAgwdY0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTc5xFhzgnn; Fri, 4 Oct 2024 15:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv8rq048723; Fri, 4 Oct 2024 15:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv8Zk048720; Fri, 4 Oct 2024 15:57:08 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:08 GMT Message-Id: <202410041557.494Fv8Zk048720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d9fe71828797 - main - makefs: Remove the warning printed when makefs -t zfs is used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9fe71828797508d1d28655e40780a5ae9078e66 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9fe71828797508d1d28655e40780a5ae9078e66 commit d9fe71828797508d1d28655e40780a5ae9078e66 Author: Mark Johnston AuthorDate: 2024-10-04 14:53:42 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:34 +0000 makefs: Remove the warning printed when makefs -t zfs is used We haven't seen bug reports relating to this feature for a while, so stop printing a warning. Reviewed by: cperciva MFC after: 2 weeks --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +- usr.sbin/makefs/zfs.c | 8 +------- usr.sbin/makefs/zfs/zfs.h | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 6e20ae33b354..7040cf9fd736 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -MAKEFS="makefs -t zfs -o nowarn=true" +MAKEFS="makefs -t zfs" ZFS_POOL_NAME="makefstest$$" TEST_ZFS_POOL_NAME="$TMPDIR/poolname" diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index b16a48564f04..a0c81f9654ab 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -92,7 +92,7 @@ zfs_prep_opts(fsinfo_t *fsopts) { '\0', "ashift", &zfs->ashift, OPT_INT32, MINBLOCKSHIFT, MAXBLOCKSHIFT, "ZFS pool ashift" }, { '\0', "nowarn", &zfs->nowarn, OPT_BOOL, - 0, 0, "Suppress warning about experimental ZFS support" }, + 0, 0, "Provided for backwards compatibility, ignored" }, { .name = NULL } }; @@ -779,12 +779,6 @@ zfs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) zfs_check_opts(fsopts); - if (!zfs->nowarn) { - fprintf(stderr, - "ZFS support is currently considered experimental. " - "Do not use it for anything critical.\n"); - } - dirfd = open(dir, O_DIRECTORY | O_RDONLY); if (dirfd < 0) err(1, "open(%s)", dir); diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index ff94c270bbf6..5c47b7c3156b 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -73,7 +73,7 @@ typedef struct { */ char filebuf[MAXBLOCKSIZE] __aligned(alignof(uint64_t)); - bool nowarn; + bool nowarn; /* ignored */ /* Pool parameters. */ const char *poolname; From nobody Fri Oct 4 15:57:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTf296Cz5Xy00; Fri, 04 Oct 2024 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTf0nYQz41BJ; Fri, 4 Oct 2024 15:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5lvDTxf0I3Amz6mn62d9VZ+QEeyZMt9tA4DSBc+tZ0=; b=LS6ZjXn8pWoNgHss/xy5+bvuUJl6kaCFBgokb5YJ1UQ9SRYvj4K+GroJlVKoJwRhC1Vc+q /iDf6veWnvHzivJ8fmQHT/W43z7wux4mmWKo7SR42aQb3JI/zAN9NtOO1nkbXXe0KVOb18 hxD/uGxxtMP2xZBNW4+1jsMsogqGkVXdsfYaoaBTu3q2sZ5PfYQdz1p9ZlSIk4ebws48A6 hDr0uwLGci84iy2iAipLC6PJpZEa116r3iFu2lzaahnt48fmH5SrWVtE0a8teO9w4cBT8r gXgeSFzaS1Rj4uW0MRTq1fU+hQ+gMKBTkpAFgr6i0y8fVoGR1D50PeoLL66e3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5lvDTxf0I3Amz6mn62d9VZ+QEeyZMt9tA4DSBc+tZ0=; b=u5jaQsgUObqqDNnjKIuIKTLRjCmyNs69SrvOR7OEbdWZqFow/mSFa7KTfopPgHX55qw61G ohy5WBiQqqN0e1jH9jCEbflm7+0zRyofumxRWSy7UTAYC7jsx6mHmoj8wO9hPBR6b3WfaX 4ZxAQ0vB6m1v/b33A2OTlzj27nbbyzLJpeGRHE/4JoWS/CRztiSLWf3NMXLezS5HEFpDQA cO8sgTX31oXyF4+rCrR8+3sjBy7E0PeeFAiN4GGCwBOWWz/3x14uevHNUq1abmr2SIOER2 moU6urnt04b5o4rSmuNO+ZCX76Kw98PNi8q+5fOeDxP7ajtCtTk8C1XVcS3Ngw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057430; a=rsa-sha256; cv=none; b=uTeffqFHHK+Agfu8UopvEmzGXxw5zxCFAo4NcUH4qGVrvJq392McSZ1ukkbvHX32ElJHp/ woN2kpzWCnPkccW6wAP0AYMj0YtnJlE98myleCSVkUDCWcYV2fTX4zVsxQyYq/WfcLxoOg U0/ayTOo+pPb+CKuTBf3Kx/PxWmqNrj5s1K+1Vq081vLWhodiNlqEvD/Wb/qGNCz5vVANH GLInrHxqMj+J4Jw273hapHicfujTqz7N/m6RBooWdFbR4wDpeTTAStQ1XRcVB92zpiNG1e G471rq/W1zYE3w3iXMVk/B3xCihbDQnje8Gn/0atHHtwcQ6pdpeHYECsj89jxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTd6mw2zhJG; Fri, 4 Oct 2024 15:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv9Bf048777; Fri, 4 Oct 2024 15:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv95M048774; Fri, 4 Oct 2024 15:57:09 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:09 GMT Message-Id: <202410041557.494Fv95M048774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b37b2543a23b - main - ggate: Avoid dropping the GEOM topology lock in dumpconf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b37b2543a23b44c78f6d78823dcfcedba46570db Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b37b2543a23b44c78f6d78823dcfcedba46570db commit b37b2543a23b44c78f6d78823dcfcedba46570db Author: Mark Johnston AuthorDate: 2024-10-04 14:53:57 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:34 +0000 ggate: Avoid dropping the GEOM topology lock in dumpconf In general it's not safe to drop the topology lock in these routines, as GEOM assumes that the mesh will be consistent during traversal. However, there's no reason we can't hold the topology lock across calls to g_gate_release(). (Note that g_gate_hold() can be called with the topology lock held.) PR: 238814 MFC after: 2 weeks --- sys/geom/gate/g_gate.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c index 85c21406eda0..ecdcacff6707 100644 --- a/sys/geom/gate/g_gate.c +++ b/sys/geom/gate/g_gate.c @@ -329,7 +329,6 @@ static void g_gate_release(struct g_gate_softc *sc) { - g_topology_assert_not(); mtx_lock(&g_gate_units_lock); sc->sc_ref--; KASSERT(sc->sc_ref >= 0, ("Negative sc_ref for %s.", sc->sc_name)); @@ -453,9 +452,7 @@ g_gate_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, sc->sc_queue_size); sbuf_printf(sb, "%s%u\n", indent, sc->sc_ref); sbuf_printf(sb, "%s%d\n", indent, sc->sc_unit); - g_topology_unlock(); g_gate_release(sc); - g_topology_lock(); } static int From nobody Fri Oct 4 15:57:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTg3yDCz5XxX7; Fri, 04 Oct 2024 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTg16tjz41Dr; Fri, 4 Oct 2024 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ol1+sqXsu0ObINMeHsGamq+lgA6jZFKPS90BTgjSnJU=; b=pJHWKbiFKmyWsE0ok7XhaXvC/682Qwy9N8faFz036hPyY5cLow806Z4Z8Me+gTw350yCp5 TYfyBWJZWXtGVW63Q5VPAoVsDU6M6F/bpsC5iuxGFEjYMt2OOcfeT6TRXyetAT54HZgrmS DKF+KAtOokHGhBvB6LjbLDi0PtOCuHepIt64mbsGpBlZOpaTNKQPr+taW7hj1ugD1fpXgg 95V7NPsy55hHu3cfJMYjp2pYnnn+/rSCTI/G4oF3GHye49KFZCb8SNSxlnrUcrVyqZe5mK d4hV37uKzXt6NVGsQQ8Po7dgMvZ33Ns+YinoOEHZ703NSC8q6XJjrDTPm2czKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ol1+sqXsu0ObINMeHsGamq+lgA6jZFKPS90BTgjSnJU=; b=nYMo7unh8rTqwMImKdJfPArD2h2VUvzXnPk/CnwRYyVwUXh47V3n/8q0WHojOW7X/7/in1 m2yrqS14+6oLaPna0vcJ1fJTvx++Ciiwmy/tXG2mGqzPmLcuLJRqwAxu5vCrT7qiyYAGUJ uBNdWcPg3CyPJeoqM5zaq/M3e+OsgRnPAEkKDcG7C05vIP9K5He52gqBBCqNXRTWIJwXSw xqM4MihjMv3k1gjUZzGCbLVj06eS1niRkA6zpJhLmdKJX2V/zKsrSdNYNrcATuLh3TX70k licBD9/pMU7BB/n9GSeJj0GE9M/qQqwXhLUpxGI/RjC2TZDqo0YbnGBTK0dhbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057431; a=rsa-sha256; cv=none; b=l4H9Uq/8/eD4M+r9UKGAZQqrmzQGbKzzrRTCTEJvMSFSHo5XGe7Xn5sBYTvcNqM3WnYFZ4 dpfudTAk3TNGMLgMPWw/VO+i824wUjLBUJD6YFjQF8UO3irshq/z8xprOxppnOPj8UoecX ZCmugjbo0DEoZhmIWQFLAC7vgw2dEl9Q5KU7fYGViqeYBnHo/gyNi439WqgwEXtoIz8Tr1 n9VmmFGStwHM/425Lakk0NyMzpDzfZw13TSQY93bVoNSo+HJbrwk3WdPjMrfWwJhT9NafI PZxZ2fZMONQyA1MMbPFZm96SeWbQlLbk5Y/gUhYbA0baJOuvPATpX913eQtTYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTg0jjWzhCW; Fri, 4 Oct 2024 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494FvB5H048825; Fri, 4 Oct 2024 15:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494FvBGg048822; Fri, 4 Oct 2024 15:57:11 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:11 GMT Message-Id: <202410041557.494FvBGg048822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 33c2c58f0a3d - main - shm: Respect PROT_MAX when creating private mappings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33c2c58f0a3db0a6d3996fa14ac7967274678771 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=33c2c58f0a3db0a6d3996fa14ac7967274678771 commit 33c2c58f0a3db0a6d3996fa14ac7967274678771 Author: Mark Johnston AuthorDate: 2024-10-04 14:54:44 +0000 Commit: Mark Johnston CommitDate: 2024-10-04 15:56:34 +0000 shm: Respect PROT_MAX when creating private mappings We were previously unconditionally adding PROT_WRITE to the maxprot of private mapping (because a private mapping can be written even if the fd is read-only), but this might violate the user's PROT_MAX request. While here, rename cap_maxprot to max_maxprot. This is the intersection of the maximum protections imposed by capsicum rights on the fd (not really relevant for private mappings) and the user-required maximum protections (which were not being obeyed). In particular, cap_maxprot is a misnomer after the introduction of PROT_MAX. Add some regression test cases. mmap__maxprot_shm fails without this patch. Note: Capsicum's CAP_MMAP_W is a bit ambiguous. Should it be required in order to create writeable private mappings? Currently it is, even though such mappings don't permit writes to the object referenced by the fd. Reported by: brooks Reviewed by: brooks MFC after: 1 month Fixes: c7841c6b8e41 ("Relax restrictions on private mappings of POSIX shm objects.") Differential Revision: https://reviews.freebsd.org/D46741 --- sys/kern/uipc_shm.c | 8 ++--- tests/sys/posixshm/posixshm_test.c | 29 +++++++++++++++- tests/sys/vm/mmap_test.c | 70 +++++++++++++++++++++++++++++++++++++- 3 files changed, 101 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 49b5b56dee17..a5b2e62c568e 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1658,7 +1658,7 @@ fail: static int shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, - vm_prot_t prot, vm_prot_t cap_maxprot, int flags, + vm_prot_t prot, vm_prot_t max_maxprot, int flags, vm_ooffset_t foff, struct thread *td) { struct shmfd *shmfd; @@ -1681,8 +1681,8 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, * writeable. */ if ((flags & MAP_SHARED) == 0) { - cap_maxprot |= VM_PROT_WRITE; - maxprot |= VM_PROT_WRITE; + if ((max_maxprot & VM_PROT_WRITE) != 0) + maxprot |= VM_PROT_WRITE; writecnt = false; } else { if ((fp->f_flag & FWRITE) != 0 && @@ -1702,7 +1702,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, goto out; } } - maxprot &= cap_maxprot; + maxprot &= max_maxprot; /* See comment in vn_mmap(). */ if ( diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index ade07a118707..55514a5f4bde 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1190,6 +1190,33 @@ ATF_TC_BODY(accounting, tc) ATF_REQUIRE(close(fd) == 0); } +ATF_TC_WITHOUT_HEAD(mmap_prot); +ATF_TC_BODY(mmap_prot, tc) +{ + void *p; + int fd, pagesize; + + ATF_REQUIRE((pagesize = getpagesize()) > 0); + + gen_test_path(); + fd = shm_open(test_path, O_RDONLY | O_CREAT, 0644); + ATF_REQUIRE(fd >= 0); + + p = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + ATF_REQUIRE(munmap(p, pagesize) == 0); + p = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + ATF_REQUIRE_ERRNO(EACCES, p == MAP_FAILED); + p = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + ATF_REQUIRE(munmap(p, pagesize) == 0); + + ATF_REQUIRE_MSG(shm_unlink(test_path) == 0, + "shm_unlink failed; errno=%d", errno); + ATF_REQUIRE_MSG(close(fd) == 0, + "close failed; errno=%d", errno); +} + static int shm_open_large(int psind, int policy, size_t sz) { @@ -1920,7 +1947,6 @@ ATF_TC_BODY(largepage_reopen, tc) ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, remap_object); ATF_TP_ADD_TC(tp, rename_from_anon); ATF_TP_ADD_TC(tp, rename_bad_path_pointer); @@ -1954,6 +1980,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, fallocate); ATF_TP_ADD_TC(tp, fspacectl); ATF_TP_ADD_TC(tp, accounting); + ATF_TP_ADD_TC(tp, mmap_prot); ATF_TP_ADD_TC(tp, largepage_basic); ATF_TP_ADD_TC(tp, largepage_config); ATF_TP_ADD_TC(tp, largepage_mmap); diff --git a/tests/sys/vm/mmap_test.c b/tests/sys/vm/mmap_test.c index e5f4a81a7858..6bc30f73ca95 100644 --- a/tests/sys/vm/mmap_test.c +++ b/tests/sys/vm/mmap_test.c @@ -295,14 +295,82 @@ ATF_TC_BODY(mmap__write_only, tc) munmap(p, pagesize); } -ATF_TP_ADD_TCS(tp) +ATF_TC_WITHOUT_HEAD(mmap__maxprot_basic); +ATF_TC_BODY(mmap__maxprot_basic, tc) +{ + void *p; + int error, pagesize; + + ATF_REQUIRE((pagesize = getpagesize()) > 0); + + p = mmap(NULL, pagesize, PROT_READ | PROT_MAX(PROT_READ), + MAP_ANON, -1, 0); + ATF_REQUIRE(p != MAP_FAILED); + + error = mprotect(p, pagesize, PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_EXEC); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + + ATF_REQUIRE(munmap(p, pagesize) == 0); +} + +/* Make sure that PROT_MAX applies as expected to mappings of shm objects */ +ATF_TC_WITHOUT_HEAD(mmap__maxprot_shm); +ATF_TC_BODY(mmap__maxprot_shm, tc) { + void *p; + int error, fd, pagesize; + + ATF_REQUIRE((pagesize = getpagesize()) > 0); + fd = shm_open(SHM_ANON, O_RDWR, 0644); + ATF_REQUIRE(fd >= 0); + + error = ftruncate(fd, pagesize); + ATF_REQUIRE(error == 0); + + p = mmap(NULL, pagesize, PROT_READ | PROT_MAX(PROT_READ), + MAP_PRIVATE, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + + error = mprotect(p, pagesize, PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_EXEC); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + + ATF_REQUIRE(munmap(p, pagesize) == 0); + + /* Again, this time with a shared mapping. */ + p = mmap(NULL, pagesize, PROT_READ | PROT_MAX(PROT_READ), + MAP_SHARED, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + + error = mprotect(p, pagesize, PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_EXEC); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + + ATF_REQUIRE(munmap(p, pagesize) == 0); + + ATF_REQUIRE(close(fd) == 0); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, mmap__map_at_zero); ATF_TP_ADD_TC(tp, mmap__bad_arguments); ATF_TP_ADD_TC(tp, mmap__dev_zero_private); ATF_TP_ADD_TC(tp, mmap__dev_zero_shared); ATF_TP_ADD_TC(tp, mmap__write_only); + ATF_TP_ADD_TC(tp, mmap__maxprot_basic); + ATF_TP_ADD_TC(tp, mmap__maxprot_shm); return (atf_no_error()); } From nobody Fri Oct 4 18:41:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKy722zvNz5YB3d; Fri, 04 Oct 2024 18:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKy72074Kz4JZw; Fri, 4 Oct 2024 18:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728067278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kNg/mWVB58YCTcjAicMZMS6Vk5z7hmsdCsEpcSCco88=; b=iAIRrwfACth+fagLL2PV0Edu21q898o6+du33PbNxDj1vJHL4RGkVEkFJdfjUqHHckQlFJ QHl1dnU1aibV2J0dGUV4ek55Km4DGTg8E3VcymzXhQwLlQHlVR9ezbilsA0mbe/DYcnsXu Yv4sDSYCCl7qjrn1SRFV4LpbgogUOktJwxWt5t+AOGfkPRAX8NVzOI20kljDFKvPfmUzbd 65p5lKC8MXurn1oGJp7p1yVqIyJTyCuMb5CRKA14+Xfcb5HRkC6Z/AGnbu47nenUO7s7mL Awj6xJSzUfZLkUKpzFdHPmeBTKP5BGv2Lb3LqJp5iSX07ESSBAxh4wiVVy9iEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728067278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kNg/mWVB58YCTcjAicMZMS6Vk5z7hmsdCsEpcSCco88=; b=Tkf2rowzzNHS1OR51V6mKtbAhdmIhgIHDannb3QBq10FMhPTS+YrHkOnY7ZsgpySdmnNDQ 2yJhyD6xLNiVS4TvQY+FM9EWLviQMZC8fzDryY0yYAzGG3EKW6YFI06d3GRXuucTTbWtaV 7I8tyA9tV9HoXwQR1bnoe/mtGv2NzeGtCsttG4BO0p6fWmpZWWU3LmCy01DR8aFLd6oMdJ GKdQQryxmZ3PjUIRTj+YJrZqx5LHlAX6FrsJd25I6icR0fs/JYFEMXxRzRTDpVaUzJphQL TzwlXd8h+Zlm8gN3ttsac/0+RD4EFEsxZMwqJkd0hl5pLhBpcMo6eYDBbqKspA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728067278; a=rsa-sha256; cv=none; b=gLqz7/djN5HFfB+hFRRFl/1jFm3MpIbPr/oxvXUDgTm48H/MJ/AB1lIzK+ULXX0/XUy+Sp FXcvdlpm1xxN5yL/JPFAmKhHAD8qQzBrXdoy6RkrwaLxlnki2kBNWj7aY2R6IYoHEKyRpU WRpid8corsrUNgsnKT9uVxm5X04oaJxvK5z+mG9+fUljrNdQTnfiNQiEtKNkaAa9wrGEWD fRbSc9mMqIz37dfL5M4Dvsqmj2QY/qltHW33YLFNqd7Q9zjDpGdp8CTIPh6DnzR9LG8ldb cyZL87wNQobyupX4dIDHDUvime9iUSwI3oh10cWMehcbr7vnmXBQfnWzVEDhkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKy716rQszlsc; Fri, 4 Oct 2024 18:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494IfHkS029112; Fri, 4 Oct 2024 18:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494IfHn4029109; Fri, 4 Oct 2024 18:41:17 GMT (envelope-from git) Date: Fri, 4 Oct 2024 18:41:17 GMT Message-Id: <202410041841.494IfHn4029109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 9e7e15b539a6 - main - snd_hdspe(4): AO4S/AI4S support. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e7e15b539a6f3ef98854a47ee346c9100875c8a Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7e15b539a6f3ef98854a47ee346c9100875c8a commit 9e7e15b539a6f3ef98854a47ee346c9100875c8a Author: Ruslan Bukin AuthorDate: 2024-10-04 18:33:36 +0000 Commit: Ruslan Bukin CommitDate: 2024-10-04 18:36:06 +0000 snd_hdspe(4): AO4S/AI4S support. Add support for RME AO4S/AI4S extension cards. They are designed as a bracket with 4 stereo TRS jacks each. https://archiv.rme-audio.de/download/ao4s192_e.pdf https://archiv.rme-audio.de/download/ai4s192_e.pdf Reviewed by: Florian Walpen Differential Revision: https://reviews.freebsd.org/D46409 --- sys/dev/sound/pci/hdspe-pcm.c | 4 ++++ sys/dev/sound/pci/hdspe.c | 1 + sys/dev/sound/pci/hdspe.h | 22 ++++++++++++---------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 79bfcbea3406..322fd69723c0 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -136,6 +136,8 @@ hdspe_channel_count(uint32_t ports, uint32_t adat_width) /* AIO ports. */ if (ports & HDSPE_CHAN_AIO_LINE) count += 2; + if (ports & HDSPE_CHAN_AIO_EXT) + count += 4; if (ports & HDSPE_CHAN_AIO_PHONE) count += 2; if (ports & HDSPE_CHAN_AIO_AES) @@ -189,6 +191,8 @@ hdspe_port_slot_offset(uint32_t port, unsigned int adat_width) /* AIO ports */ case HDSPE_CHAN_AIO_LINE: return (0); + case HDSPE_CHAN_AIO_EXT: + return (2); case HDSPE_CHAN_AIO_PHONE: return (6); case HDSPE_CHAN_AIO_AES: diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index 66f5bc5c5d7a..0e25e9599328 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -78,6 +78,7 @@ static struct hdspe_clock_source hdspe_clock_source_table_aio[] = { static struct hdspe_channel chan_map_aio[] = { { HDSPE_CHAN_AIO_LINE, "line" }, + { HDSPE_CHAN_AIO_EXT, "ext" }, { HDSPE_CHAN_AIO_PHONE, "phone" }, { HDSPE_CHAN_AIO_AES, "aes" }, { HDSPE_CHAN_AIO_SPDIF, "s/pdif" }, diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h index daffeb4ddebc..2f0bdddd930f 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -119,23 +119,25 @@ #define HDSPE_DMASEGSIZE (HDSPE_CHANBUF_SIZE * HDSPE_MAX_SLOTS) #define HDSPE_CHAN_AIO_LINE (1 << 0) -#define HDSPE_CHAN_AIO_PHONE (1 << 1) -#define HDSPE_CHAN_AIO_AES (1 << 2) -#define HDSPE_CHAN_AIO_SPDIF (1 << 3) -#define HDSPE_CHAN_AIO_ADAT (1 << 4) +#define HDSPE_CHAN_AIO_EXT (1 << 1) +#define HDSPE_CHAN_AIO_PHONE (1 << 2) +#define HDSPE_CHAN_AIO_AES (1 << 3) +#define HDSPE_CHAN_AIO_SPDIF (1 << 4) +#define HDSPE_CHAN_AIO_ADAT (1 << 5) #define HDSPE_CHAN_AIO_ALL_REC (HDSPE_CHAN_AIO_LINE | \ + HDSPE_CHAN_AIO_EXT | \ HDSPE_CHAN_AIO_AES | \ HDSPE_CHAN_AIO_SPDIF | \ HDSPE_CHAN_AIO_ADAT) #define HDSPE_CHAN_AIO_ALL (HDSPE_CHAN_AIO_ALL_REC | \ HDSPE_CHAN_AIO_PHONE) \ -#define HDSPE_CHAN_RAY_AES (1 << 5) -#define HDSPE_CHAN_RAY_SPDIF (1 << 6) -#define HDSPE_CHAN_RAY_ADAT1 (1 << 7) -#define HDSPE_CHAN_RAY_ADAT2 (1 << 8) -#define HDSPE_CHAN_RAY_ADAT3 (1 << 9) -#define HDSPE_CHAN_RAY_ADAT4 (1 << 10) +#define HDSPE_CHAN_RAY_AES (1 << 6) +#define HDSPE_CHAN_RAY_SPDIF (1 << 7) +#define HDSPE_CHAN_RAY_ADAT1 (1 << 8) +#define HDSPE_CHAN_RAY_ADAT2 (1 << 9) +#define HDSPE_CHAN_RAY_ADAT3 (1 << 10) +#define HDSPE_CHAN_RAY_ADAT4 (1 << 11) #define HDSPE_CHAN_RAY_ALL (HDSPE_CHAN_RAY_AES | \ HDSPE_CHAN_RAY_SPDIF | \ HDSPE_CHAN_RAY_ADAT1 | \ From nobody Fri Oct 4 18:49:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKyJf5vLGz5YBQp; Fri, 04 Oct 2024 18:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKyJf4WRnz4KtK; Fri, 4 Oct 2024 18:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728067778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syL4c805njtmQhDuI5f5jbsNDEwyBOrQ9hLkIy98n3Q=; b=uBAXqpTwgTFvfpxVJFhiOf1jKtO+IM5BJhiv5xWyxn2hd+lh56xBYH3RosIY0EUaMmphvX 0MSC5e1Xvqka+FJCen2qQkpPFgu25sl841oK78/i3YpEfksB3tGT2c02FJat7yr6Zu9tEv 3U7T74lF5mI6ay3sy1CVhwsjq3XSJGvsyrlXNB1eRnlmJQEaFgvzCP6GVxrRDP3h9IHMk1 D33CHeZsuSeKXogLwMhYy1gCLPIa5DzAzLhN2iGWpHsTvIRdS58Psgkz7944T9qdegu4Ic LM9JmC+H51rrcMlFmW8uodx+phmFSXYqb1hyk+kU7hJRhR6iMXvbRom+QifPBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728067778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syL4c805njtmQhDuI5f5jbsNDEwyBOrQ9hLkIy98n3Q=; b=gjeto0QKH7l/YC2kS6ekWWWuCQnsB1zqhPoV4cqxNfKYNBt+8P+gwNt0GHHB3W8b2un+B3 vWss+z2i/lu3x3WK127/3qY2ReFosNIeMInefEWjuXKM2XWh26j6mS20ayofwIl4NAQRrZ 5JpcdQCweuDPEo8wdoPlUpAq8uuScee2dY1JtEAf/WV80NdJCM6LkwtNnprDpVqvs/9u29 mhUC7EhUghi/GQKffmkLnDWXrl8LgkMVwFvSEs3xup63gCIJnh8on19nRLputo8Y63nytV acIzxVQA9Ujyb6n6mPZKCqKxTKOJPapqp0XbvyMPq9+MDcfv/w7nhedGwCCDzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728067778; a=rsa-sha256; cv=none; b=LCD6L5xmsWAXKQHuPXao2YZEfyUNPLTHwH5we66u7OFpWk6E7kdSLN5HznX6FUwl6ZjVS6 euSHLZBqSwoSFG/Ur31bbRP8blVtSWmXrSZyGAR6LsRpPBZIGc1q5Lr10ld9TXPkAdGXTF Z4FQMTGb5dW45Swcg1ZuvtjTsN3cmPyT8Meq9cz0ftHk5p11ZE54Aslq73SFEwsQA1YCln FEQ3lJMeIYwx8RW7FVvjNkVetFDrgqbC9liMbkLHCMSkuRm7TNWlETawQX3lct0n/oG3ZE 88V6HvOduJc+45a2RHVk5cSDca21w6z+DaAieYUF9L/WQQERg1AXzEhxqkaU2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKyJf3RW5zlt0; Fri, 4 Oct 2024 18:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Inccx036912; Fri, 4 Oct 2024 18:49:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Inc0k036909; Fri, 4 Oct 2024 18:49:38 GMT (envelope-from git) Date: Fri, 4 Oct 2024 18:49:38 GMT Message-Id: <202410041849.494Inc0k036909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 8fb467568877 - main - snd_hdspe(4): Addendum to AO4S-192 and AI4S-192 support. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fb4675688770783203e012fe21aa61154bb32f6 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=8fb4675688770783203e012fe21aa61154bb32f6 commit 8fb4675688770783203e012fe21aa61154bb32f6 Author: Florian Walpen AuthorDate: 2024-10-04 18:46:39 +0000 Commit: Ruslan Bukin CommitDate: 2024-10-04 18:46:39 +0000 snd_hdspe(4): Addendum to AO4S-192 and AI4S-192 support. Fix unified pcm mode after support for the AO4S-192 and AI4S-192 extension boards was added. Adjust the man page accordingly. Reviewed by: br Differential Revision: https://reviews.freebsd.org/D46946 --- share/man/man4/snd_hdspe.4 | 6 +++--- sys/dev/sound/pci/hdspe-pcm.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4 index a8c7be538dd1..ac81356fb783 100644 --- a/share/man/man4/snd_hdspe.4 +++ b/share/man/man4/snd_hdspe.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 9, 2024 +.Dd September 28, 2024 .Dt SND_HDSPE 4 .Os .Sh NAME @@ -55,7 +55,7 @@ driver supports the following audio devices: .Pp .Bl -bullet -compact .It -RME HDSPe AIO +RME HDSPe AIO (optional AO4S-192 and AI4S-192 extension boards) .It RME HDSPe RayDAT .El @@ -84,7 +84,7 @@ For resulting channel numbers consult the following table: .Bl -column "HDSPe RayDAT" "Single Speed" "Double Speed" "Quad Speed" .Sy "Sound Card" Ta Sy "Single Speed" Ta Sy "Double Speed" Ta Sy "Quad Speed" .It "" Ta "Play | Rec" Ta "Play | Rec" Ta "Play | Rec" -.It HDSPe AIO Ta " 16 | 14" Ta " 12 | 10" Ta " 10 | 8" +.It HDSPe AIO Ta " 20 | 18" Ta " 16 | 14" Ta " 14 | 12" .It HDSPe RayDAT Ta " 36 | 36" Ta " 20 | 20" Ta " 12 | 12" .El .Sh SYSCTL TUNABLES diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 322fd69723c0..1f8fbbcef078 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -114,10 +114,8 @@ hdspe_port_first_row(uint32_t ports) uint32_t ends; /* Restrict ports to one set with contiguous slots. */ - if (ports & HDSPE_CHAN_AIO_LINE) - ports = HDSPE_CHAN_AIO_LINE; /* Gap in the AIO slots here. */ - else if (ports & HDSPE_CHAN_AIO_ALL) - ports &= HDSPE_CHAN_AIO_ALL; /* Rest of the AIO slots. */ + if (ports & HDSPE_CHAN_AIO_ALL) + ports &= HDSPE_CHAN_AIO_ALL; /* All AIO slots. */ else if (ports & HDSPE_CHAN_RAY_ALL) ports &= HDSPE_CHAN_RAY_ALL; /* All RayDAT slots. */ From nobody Fri Oct 4 18:53:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKyPL2YPNz5YBxL; Fri, 04 Oct 2024 18:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKyPL1cyNz4LWm; Fri, 4 Oct 2024 18:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728068022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KwZdAcvti2J4pJQJuoG56NciUVoeg5bFFvmsZnk31OU=; b=ntTmzPL502zSrzFaZ79WYYjzbJLvKsa9iUi2yb6IylQJMaxWXqPT6Z8NCT5R55Kmt1SAzd 6TkNHMOchhlJXNqkalyYVSLyY6IhdOxqxIIwsqBMuW89WRVURjE/Xlsm0AxdbTpw4CvrcQ tYOh+VUTEx8KOR1S0MRxPOZeThUpSd7o1xB2/moKdA81Qw+tLbQI6l2SLBcDWMMVtG5sap rObahLT/7JeiX06A1zMhf+hGQEupYH3Z3ebU8HWQQy+aEXJFFJUjq5rBQdD6Oos0Ls3OHr PdrQVKp6YMxtSrfq0pUq72A9pdnk8ETzQDZ2cO5PFtm1mas8kFvVuIohkTZd/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728068022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KwZdAcvti2J4pJQJuoG56NciUVoeg5bFFvmsZnk31OU=; b=YKy2nIkt0UP2T6k0DTXtpAI1mZ1ImJoXjzqRHCEbW85u14fUGKNm4D5Jl81ba9GX2gJ3dE AJnMi4gMBneGBxq7zLxnF0lSXreuyC3E7i2wdXFHkL/zgcwxG196YecfGyTpRVBEDiZDMi bboZ4pV6wgfKaBgaVZo5PtogjvbpnAViek5vam5JeNrtJ99pmgqbJZ0ZksfGm4egdXPcjt StgH0jA9QVVt1DHQ6Sd6hKbSIu19FEwOMiUp5vL0lr1DolQuTSLRXJ+LxbgGSXNqtRV6H+ zo3hdF6VpiAYzjpkg5CWD3jX6aqA67Xfsfu1SJpRfCNYV6Ck3/9e6wP4Ih/OSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728068022; a=rsa-sha256; cv=none; b=t27IxGO3evYOAu/QRwEqbSqsDG00gnlZZ3AQTK5B86vDI4p+p3TfobebrP02Z1tF5JnlxR jWmlMG5IDcNzAH76CcV1z+0qReLxel1PNlk7GnYJfTpp9zRJcQiTQABLdgPB1yTMlDzYvE PMcNS1xBF0kqWY+chpbTQvlMrC1HhgykkZai+TwXZlxOvW0YBFOFn6F89TpfZ//+JKRGzG /advsX361SREip3S5wD/6IpmD/Jl8DFxEgFqwnbcyVI1QlTVgR9h6cUVJii2ZW9rwvPQhx jtm03r/B1y5S5pjtZtxB1dMXukP/IBxTc5KRGbvci6C2Q33/hfBrZv5cdRfhBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKyPL1C8gzlhJ; Fri, 4 Oct 2024 18:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Irgt0052498; Fri, 4 Oct 2024 18:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494IrgSW052495; Fri, 4 Oct 2024 18:53:42 GMT (envelope-from git) Date: Fri, 4 Oct 2024 18:53:42 GMT Message-Id: <202410041853.494IrgSW052495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: e0c37c160b11 - main - snd_hdsp(4): Support AO4S-192 and AI4S-192 extension boards. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c37c160b115b0bf41847ab60a5dabf0dc71300 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c37c160b115b0bf41847ab60a5dabf0dc71300 commit e0c37c160b115b0bf41847ab60a5dabf0dc71300 Author: Florian Walpen AuthorDate: 2024-10-04 18:51:38 +0000 Commit: Ruslan Bukin CommitDate: 2024-10-04 18:51:49 +0000 snd_hdsp(4): Support AO4S-192 and AI4S-192 extension boards. Create an additional 4 channel pcm device for RME HDSP 9632 sound cards, to support the optional AO4S-192 and AI4S-192 extension boards. For simplicity, the pcm device is always present, even if the extension boards are not installed. Unfortunately I cannot test this with actual hardware, but I made sure the additional channels do not affect the functionality of the HDSP 9632 as currently in src. Reviewed by: christos, br Differential Revision: https://reviews.freebsd.org/D46837 --- share/man/man4/snd_hdsp.4 | 6 +++--- sys/dev/sound/pci/hdsp-pcm.c | 2 +- sys/dev/sound/pci/hdsp.c | 1 + sys/dev/sound/pci/hdsp.h | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/share/man/man4/snd_hdsp.4 b/share/man/man4/snd_hdsp.4 index 23eb98a3ccc2..d6661c80b2ea 100644 --- a/share/man/man4/snd_hdsp.4 +++ b/share/man/man4/snd_hdsp.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 1, 2024 +.Dd September 28, 2024 .Dt SND_HDSP 4 .Os .Sh NAME @@ -56,7 +56,7 @@ driver supports the following audio devices: .Pp .Bl -bullet -compact .It -RME HDSP 9632 +RME HDSP 9632 (optional AO4S-192 and AIS-192 extension boards) .It RME HDSP 9652 .El @@ -86,7 +86,7 @@ For resulting channel numbers consult the following table: .Bl -column "Sound Card" "Single Speed" "Double Speed" "Quad Speed" .Sy "Sound Card" Ta Sy "Single Speed" Ta Sy "Double Speed" Ta Sy "Quad Speed" .It "" Ta "Play | Rec" Ta "Play | Rec" Ta "Play | Rec" -.It HDSP 9632 Ta " 12 | 12" Ta " 8 | 8" Ta " 4 | 4" +.It HDSP 9632 Ta " 16 | 16" Ta " 12 | 12" Ta " 8 | 8" .It HDSP 9652 Ta " 26 | 26" Ta " 14 | 14" Ta " - | -" .El .Sh SYSCTL TUNABLES diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index 29bd0bc70ee4..a50fc2b52fc0 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -107,7 +107,7 @@ hdsp_port_slot_map(uint32_t ports, uint32_t speed) slot_map |= (0x03 << 8); /* 2 channels SPDIF. */ if (ports & HDSP_CHAN_9632_LINE) slot_map |= (0x03 << 10); /* 2 channels line. */ - if (ports & HDSP_CHAN_9632_EXT_BOARD) + if (ports & HDSP_CHAN_9632_EXT) slot_map |= (0x0f << 12); /* 4 channels extension. */ } else if ((ports & HDSP_CHAN_9652_ALL) && (speed <= 96000)) { /* Map HDSP 9652 ports to slot bitmap, no quad speed. */ diff --git a/sys/dev/sound/pci/hdsp.c b/sys/dev/sound/pci/hdsp.c index 769615cb1f4b..cf251a5636a1 100644 --- a/sys/dev/sound/pci/hdsp.c +++ b/sys/dev/sound/pci/hdsp.c @@ -74,6 +74,7 @@ static struct hdsp_channel chan_map_9632[] = { { HDSP_CHAN_9632_ADAT, "adat" }, { HDSP_CHAN_9632_SPDIF, "s/pdif" }, { HDSP_CHAN_9632_LINE, "line" }, + { HDSP_CHAN_9632_EXT, "ext" }, { 0, NULL }, }; diff --git a/sys/dev/sound/pci/hdsp.h b/sys/dev/sound/pci/hdsp.h index 5ff622892c52..981188ad8aff 100644 --- a/sys/dev/sound/pci/hdsp.h +++ b/sys/dev/sound/pci/hdsp.h @@ -130,10 +130,11 @@ #define HDSP_CHAN_9632_ADAT (1 << 0) #define HDSP_CHAN_9632_SPDIF (1 << 1) #define HDSP_CHAN_9632_LINE (1 << 2) +#define HDSP_CHAN_9632_EXT (1 << 3) /* Extension boards */ #define HDSP_CHAN_9632_ALL (HDSP_CHAN_9632_ADAT | \ HDSP_CHAN_9632_SPDIF | \ - HDSP_CHAN_9632_LINE) -#define HDSP_CHAN_9632_EXT_BOARD (1 << 3) + HDSP_CHAN_9632_LINE | \ + HDSP_CHAN_9632_EXT) #define HDSP_CHAN_9652_ADAT1 (1 << 5) #define HDSP_CHAN_9652_ADAT2 (1 << 6) From nobody Fri Oct 4 20:35:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XL0fL31Q2z5YK9G; Fri, 04 Oct 2024 20:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XL0fL0w8pz4TL0; Fri, 4 Oct 2024 20:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728074106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukoLyTCsZDnEK52R7OapfxvcVTt63L+axrUZL4tkViE=; b=X/wq24O4Ro7tGxkgQXfU/3he+41YLtTs3cgs/6a+GprJl8HFFiAxT4lum94UzapOMW6gjP bka9/4xQ1Cj3cbSmgNzYb30+NupjyBX4bJHCMu+ioEV+X7KZ/ameH2EBKBIFD810iNO5ZU MbFzG6G2aDCjqM2m+XxNhDVLyBAlpGAtb9/k6+T0pRklFfCfP48kurQFCS1rKu1fUID+GP gZ5MahovWo/WjbMVRUsTo5bIQ0IG5QuErydxUcH6aG26nnMffNgZ6aNDhTkrt4nCIvbJhU VgpZvfZ1+wLmJlcbmavzbTk7d9e65W2mny7SxEijTfY1MpaVZpY05o3PkH2IzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728074106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukoLyTCsZDnEK52R7OapfxvcVTt63L+axrUZL4tkViE=; b=ovQXymUi0XJtYiEN1G7ROQ8/0qGVvAhFmLuVs1WvsHvaUvUkjDDa1tZUmHpdfDAehHKXtN aJ+ngFbwe0uHYwqIonuWPdQfKLf30n526zQX0V8eaiW0iFmACKBFkgLUAykMv5MHWOIC65 RN8+PU/rCZKVZWpvHGuoRH3uWRg/PRAbN0KfmahwfFMM7XUJpURZ9YzjNFAHc/Wi/Yx/Np 7+eW6YA21g1ngO61IT+jyle2qcMLeo5i/iP/KVu57fD8AbZyaoyjbwI+1JfR645stlkoTx VdQvWQtlCZPkU3BIEtPaGaOiCkXR4mWssikIEZ3m9IQhK1XSpA/8YW+y5R0X9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728074106; a=rsa-sha256; cv=none; b=URW605NuPlKOIu0Ztn7Ms2WVUWK/Q9JDDnZ+LM2MBpYc2/8Z6PmJITFKMNkCgXcbkKjMw/ 7fInt1rV9hRUq9qFmS1B8QmOiTS6Y2jxbjMYzHB7yJyQ9lF0YkBxTjWusSRF8ZUskZ03wy w3VtjkJGqO3wIQrZVXHWDeoSVkYrfWj81saNGTLFEkCliu09CvQd5sh45PVFymG+FvTnvc ooLNn8uY3oHSRV78TlmLaOnNCkZyoJzPm2/tPiWRhZQewe8bx8ueH6FsXVHxsCLGmgH9yu Nz5KUzNT6kqDmAq7qgNKqpcJ8WY/D5pDZ3qgqZdR86Loj2pCTTqmBCh1f2HWWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XL0fL0WyKzpsL; Fri, 4 Oct 2024 20:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494KZ5Pf023228; Fri, 4 Oct 2024 20:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494KZ5TL023225; Fri, 4 Oct 2024 20:35:05 GMT (envelope-from git) Date: Fri, 4 Oct 2024 20:35:05 GMT Message-Id: <202410042035.494KZ5TL023225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d0af970e3ce4 - main - sysv shm: Fix SHM_REMAP flag value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0af970e3ce4a7e2108a4bc2442c6c98f6aa4ffa Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d0af970e3ce4a7e2108a4bc2442c6c98f6aa4ffa commit d0af970e3ce4a7e2108a4bc2442c6c98f6aa4ffa Author: Brooks Davis AuthorDate: 2024-10-04 20:34:03 +0000 Commit: Brooks Davis CommitDate: 2024-10-04 20:34:03 +0000 sysv shm: Fix SHM_REMAP flag value SHM_REMAP was incorrectly defined to 030000 which collides with SHM_RDONLY and SHM_RND. Renumber to 040000 (incidentally matching Linux). This is an ABI break, but the previous ABI was unusable (SHM_REMAP would imply SHM_RDONLY and vice versa). Fortunately SHM_REMAP has very few consumers in the wild (I spotted openjdk for Linux, libfabric, MIPCH, and one other MPI thing in Debian code search) Reviewed by: kib Fixes: ea7e7006db10 Implement shmat(2) flag SHM_REMAP. Differential Revision: https://reviews.freebsd.org/D46825 --- sys/sys/shm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/shm.h b/sys/sys/shm.h index d80de811ef7d..df32230dcdc7 100644 --- a/sys/sys/shm.h +++ b/sys/sys/shm.h @@ -51,7 +51,7 @@ #define SHM_RDONLY 010000 /* Attach read-only (else read-write) */ #define SHM_RND 020000 /* Round attach address to SHMLBA */ -#define SHM_REMAP 030000 /* Unmap before mapping */ +#define SHM_REMAP 040000 /* Unmap before mapping */ #define SHMLBA PAGE_SIZE /* Segment low boundary address multiple */ /* "official" access mode definitions; somewhat braindead since you have From nobody Fri Oct 4 23:06:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XL4180PKKz5YTr5; Fri, 04 Oct 2024 23:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XL41771mVz4hbD; Fri, 4 Oct 2024 23:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728083196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kb+DZ9R3DYeEGmpy5m31rXsTdlvsK3P7SGKexHhL/Ow=; b=CIUadnRqqaEhPDCzKnyeX6RdrCryoAfm19Uurex8V0CS3viAM+AAOoW6qLaPBmzgVePtpr Q2txIJ/+cvm+Qt6m8SfKa7UTtq+tSYXSWGrAZTLVAhy8Ui2ZsPTEPSWUHFgyLApQDkY6v/ 19Z/Dm122BDu8dljA1PQ87ozqERGUj/OycRJmnvE2QQ9Lu4rFz8mBMCfgDwSWR3AX9vPwH 5dJZbjiEWDtTo9dyeCdAE9k7bxNrznZDkQF3g+sAl+bRz+unIjjD4OU6hDOv+mYB0D5yMv /qACgylAS/6qVmEJB1M6Cnqbexyurj3rgsfGrsAzwipGUzGcxb0vrMUo64NTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728083196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kb+DZ9R3DYeEGmpy5m31rXsTdlvsK3P7SGKexHhL/Ow=; b=b8ZzldPUDNLiRj8tgtgC/G427t26tkfmnaOjNUr/RL9nhDmgoX5GEWbckZbuXD/RjR/QYZ kKFJyM3Z24KK7URgjjbZFqKx3rWSzInIo5G4YZN+5FWmrXq1f79GqXz1PhSlcatdgEW7aT EGhAdKFRehodEEalI5DksA8yrxYxSHs3sciGkcwRPUyj+pL3YXNp2HboDBzAPqnCCBLEAA FUKO116zOHpcGtScN1QbjYhmVSYuEIYZs/IB6aDs5j3ibdcv1A8ZcLFn+gSisZUFOOsG9R a5l34sB0yuBUhDOot9d5XMygVnlK7o+PE0TJ+5ooniYVX/sAA4O7AYtD2j5XUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728083196; a=rsa-sha256; cv=none; b=rBKaFPGKduj7vUHdokQu2hYOchvc85PZcv4CF0ZO6GgOFmWMeXlvBesW7CyWAkQMjyQoVq IWTKyYBgSRBxpFsY5C/u0xJzxFP3/wv7Uyk+8NSArILVNq9MJbb1Ngx7UrLHhoj1i4Xb+e xpL3nMCKbrVUhwVfnUh+v6YdbAqCLAwzIt0Xmw9/AS1yOF4gxKZE4hzC64nthG4B8FDoSt pCWSrX/UplwIPo/jKPKya0tZDOMe3lkPDRXRvXsP58i0ueslzpFEOHwXI4qFvUbpmGUpF6 7HdkwLT/TBlIikDfe5L9ypvo+rWJtIbGM7EHNsG+ezNLDN2Ai7sFQEDJRcaixA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XL4176cq4ztbP; Fri, 4 Oct 2024 23:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494N6ZHT077167; Fri, 4 Oct 2024 23:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494N6Zas077164; Fri, 4 Oct 2024 23:06:35 GMT (envelope-from git) Date: Fri, 4 Oct 2024 23:06:35 GMT Message-Id: <202410042306.494N6Zas077164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 77fd02501f09 - main - src.conf.5: regen after diff3 changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77fd02501f0966ef54eb4a42e086a61a48134c42 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=77fd02501f0966ef54eb4a42e086a61a48134c42 commit 77fd02501f0966ef54eb4a42e086a61a48134c42 Author: Brooks Davis AuthorDate: 2024-10-04 22:01:03 +0000 Commit: Brooks Davis CommitDate: 2024-10-04 22:01:03 +0000 src.conf.5: regen after diff3 changes Fixes: 2201f7c49f11 Build BSD diff3 if GNU diff3 is disabled. --- share/man/man5/src.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index c259e05af807..72ca14b8eae8 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd September 26, 2024 +.Dd October 4, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -720,7 +720,10 @@ and programs instead of the enhanced versions. .It Va WITHOUT_GNU_DIFF Do not build GNU -.Xr diff3 1 . +.Xr diff3 1 ; +build BSD +.Xr diff3 1 +instead. .It Va WITHOUT_GOOGLETEST Neither build nor install .Lb libgmock , From nobody Fri Oct 4 23:06:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XL4191sHNz5YV9l; Fri, 04 Oct 2024 23:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XL4190XSqz4hGg; Fri, 4 Oct 2024 23:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728083197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tg2N/59C/8m25OBdNSDHIVK/0zWs+YICxydRHVN7In4=; b=GzBZyCaUdE0FJvDq7YpZMWpupZOmp88gLmbbDhlfPhNDi6DylBuWogc62Wag22WOS2WcVu nj+p3iwZDi7y5t5WMVkTA5soTJ5zlCM5/WVNdomA8dGzbBofE3fObJWvzCYOwzpVGzs7kD rE8rp3lw4OAf09YlGJhjfKvJofWhFG9GEM77+ujl+YPNg2WO7bbWSqLn0fWOMLgTymYKgz 6BMH9b94Zq4QfqgWHZg571ujwyB18oQgmFbjAjHD3uUP8q6Q+3odK74hBktUETMV7nj6iU s0wuVAuj+axdr6NVliVLvJYKtK080ItAMKigw74wDEM5a5ax34FQjfFAj15SoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728083197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tg2N/59C/8m25OBdNSDHIVK/0zWs+YICxydRHVN7In4=; b=Y5s/icw7WhrqVTnzKaUIShDsQvdl9CpCFE1i29deHglM+BLagFLN8WiQpmS1QJQMXE1LA9 VS12ztHxIZK8WJFqeVVa+amPiYdhqo9J0kAXGUoHmcgyOsSop3SmXIwhudAhYnTB2KFYGv f+6buBbOcTmambSojF7QreMJ+czqyV855NjHcu2mQxDPPQa9XEldveLBRzCZgCc5Pr2WEP SOGIP9fuzh9Ifb9sKw+pUQ3JhfVgMxKqKPy/B5bmAPPkb51XUtHlrpbLTSXQF0HHeoFuMA /DoEi4dF1ETWRHC0r+thzyTkQmb7/qzYUm/pxc/BiHLZmnTaLw7ERAHTMdF7eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728083197; a=rsa-sha256; cv=none; b=BRjUwk7FtTjkKLNPpo8rKN2ENNF1MTfwOX0DdHlUhhDZoiGRTkC7RbjOUi4t9kir2GjBOA Nib8j3CqPk4t37GR76+z5RGDxgHH5ZEAOyTal7wdJ9ieoxCG0t5m+cNmmarlmIM59DQ+sy kjd2KyhGqMEYDScbpbsJUPrtSIMy0TBBxEiog5zpsHYgDISV4haRybIGgANuFbpETXD0KR clFh8YZOd7lZcjpqDDMSXkDPUTzHP6eSdt+5+STmY46V1JzDoGQvD/e0eQlCuVjZVoBmXD ukH+VWVgNsEDX7lDvuP2EBCDQ/iWX7oYEMQSqSjvzg6viKXSyrXPt9OhqXO7iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XL419083VztbQ; Fri, 4 Oct 2024 23:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494N6acD077216; Fri, 4 Oct 2024 23:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494N6a3V077213; Fri, 4 Oct 2024 23:06:36 GMT (envelope-from git) Date: Fri, 4 Oct 2024 23:06:36 GMT Message-Id: <202410042306.494N6a3V077213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 74f6ec6fe3cf - main - lib{c,sys}: .note.GNU-stack in syscall stubs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74f6ec6fe3cf47cc0482cd5fb10d5c3c967bfd1f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=74f6ec6fe3cf47cc0482cd5fb10d5c3c967bfd1f commit 74f6ec6fe3cf47cc0482cd5fb10d5c3c967bfd1f Author: Brooks Davis AuthorDate: 2024-10-04 21:13:41 +0000 Commit: Brooks Davis CommitDate: 2024-10-04 22:01:45 +0000 lib{c,sys}: .note.GNU-stack in syscall stubs Explicitly disable executable stacks in the syscall stubs on all architectures. Previously, aarch64 and riscv64 didn't include the .note.GNU-stack note due it being disabled by default in those ABIs. This appears to have been harmless in practice, but better to be clear in case a different compiler/linker has different defaults. This also reduces special cases in the Makefile. Reported by: jrtc27 Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44883 --- lib/libsys/Makefile.sys | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index d18f4bc23227..7454f5a47720 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -129,12 +129,7 @@ SYM_MAPS+= ${LIBSYS_SRCTOP}/${LIBC_ARCH}/Symbol.sys.map # Generated files CLEANFILES+= ${SASM} ${SPSEUDO} -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n' -.else -NOTE_GNU_STACK='' -.endif .if ${MACHINE_CPUARCH} == "aarch64" FEATURE_NOTE='\#include \nGNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)\n' .else From nobody Sat Oct 5 07:11:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGm75MDnz5XrZ9; Sat, 05 Oct 2024 07:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGm744H8z4Mrx; Sat, 5 Oct 2024 07:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bY8BRN3zlNgtflLajxdiCklEVcO+IgcLqrV4nf3pFmM=; b=gX06AV1zASJn8ZDs+7z1929/UnjcTkDfuI0hXf/uhTJJIuJ3HHTEhFXT033Rmv/vIYLkpe vaGP1Zr9zjfgu/hgBoaHtiC5si1xKq0ijSPs7SvLiRrSclQCMzB+X84DZSV0w38o7/Ophv cA4RYzLyEYVF1kgBNVrJW/HDk/EPvdVCSthwK9RItoQBNj8KRkq19GFHJxHvYykJzEAeXY VfnMM49yqOit0nRiHcAm3cOnn1EJEEuG17GfS/re5ItfXGX7UDkExUMkP6L/N8ymD/b22M 9dyYdZBaoqNrIPr3ajG/FgTA3Xifv7YlwoDJggBwcSl4+kvfcF/W7fZmCJju0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bY8BRN3zlNgtflLajxdiCklEVcO+IgcLqrV4nf3pFmM=; b=WIGcU7d9WnB5UEcUY2DV2Q62N3YMZLk1D97mTuX/R+jeMbkGDsuLZxvSEklJOIpGeQDGqx KChl5UjMz2WTuiBFAzaBZfsdDBmmtTHbg1EfxYDEQvP4wZHyoQtN9FiAJ72wBamWMWDdu/ oMKN066BLaftSnmeeHbxfifJn2jWTe5Q2EviPjPYq/pLZAejpaLN0AjQoGzeFe7IeHR2JA HpxJP56EaBn7HZuHZb1rcBYNsNEeW1IvelxZSlph273R1uKelkU6rckW52QSuh7CcL03xA jHRvNIc+AH7+Tg3obV5VOUNCJPCx0hQVo5FHHPUIKulUfZZQjJ94iaBQj68ZJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112263; a=rsa-sha256; cv=none; b=vjyv0qjcUubP9/Qi/I0/P8cDtpmPid4tMLVIPz1oGInSAhSqI8nzM9EAMZJcHBfzHHPVHw on8k574HJKkH1Pmhke+3lmB7X/bMmxqj7A2VN4h3XFqpn+0z30FdCf612RDe097JQsaJU1 Sm8cQOXS6AhzZulCi5t1ncZ8/iwzFQorHDE8k0YyPjcIh8J0HK/ww/GiTxr5y/ZwvGOXaq 4ZodbIEL70XI4W4qBFlxmcRYFQm/78wpDbwDW20gnSTPIg//s4BZAWddMftcqjTVOmGbZ5 jk8rNXSApD0/+h8CBigOUYHlN5Rs2m0SSNilPeTvNLwayeCH5HU9M8QypSrF+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 4XLGm73gQJz18L6; Sat, 5 Oct 2024 07:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957B3aq000664; Sat, 5 Oct 2024 07:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957B3pp000661; Sat, 5 Oct 2024 07:11:03 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:03 GMT Message-Id: <202410050711.4957B3pp000661@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: 1508dce2502d - stable/14 - procfs: ensure that RLIMIT_IDENT is properly updated when a limit is added List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1508dce2502d3afd4863595c94624ff71d2883c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1508dce2502d3afd4863595c94624ff71d2883c0 commit 1508dce2502d3afd4863595c94624ff71d2883c0 Author: Konstantin Belousov AuthorDate: 2024-09-20 15:04:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:53 +0000 procfs: ensure that RLIMIT_IDENT is properly updated when a limit is added (cherry picked from commit c84d8db0ab3d02f65422e8dcdc1f911cc15a04ec) --- sys/fs/procfs/procfs_rlimit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c index 3100bb0d6966..3dccf7889a0c 100644 --- a/sys/fs/procfs/procfs_rlimit.c +++ b/sys/fs/procfs/procfs_rlimit.c @@ -59,6 +59,9 @@ #include #include +_Static_assert(nitems(rlimit_ident) == RLIM_NLIMITS, + "resource.h RLIMIT_IDENT needs update"); + int procfs_doprocrlimit(PFS_FILL_ARGS) { From nobody Sat Oct 5 07:11:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGm902mGz5XrcW; Sat, 05 Oct 2024 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGm850VHz4Ms0; Sat, 5 Oct 2024 07:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ad/Owq6o7EOvm6ScNvYD3gnyYtMdZ5dYlPYhabpZDcI=; b=ddlP/EOc0W0qHPSGgjgqTmQ1/TtCyyEs5JcOuQZ0GYSWRWaubUdnl8+yuM/8dDttWaBvZy nM1NyJMtOQ5b944gerJSV9UqCPkrzDs7oSEIfy6kf0XAFgfZWaSe327svEMPAOfSTCdx4a mY4k43MYsU1a1VepwpzqXaG/5ptxFlcUd6mt31qfrrkjm1Ma8Mo93Yu+A+i5y9KOctGZTY r4M/3VJVwd6zPBszsf00DHYJr41cEzsdFD4PDK5PjGvBzqp58fmDWbSYEK+mxYD42GMFmq ht2I/jr6SO8cMVnTnorMB9tis6BASAgIQ4K2hsfbY3aduXy6wOt+n4Ba68bmsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ad/Owq6o7EOvm6ScNvYD3gnyYtMdZ5dYlPYhabpZDcI=; b=ZRMAOCJ6s8xeOHA4FAWD40vQAY5ijmx2KsoQpbysYD1ZUs5O40cXyvyEQA16l8nv2383ga PDpm/0v61H4MEWaTIWmgJcPOCCgc7lHT8SfGCgMj2JSD2lPLwg/HzmXvebbusEy8myWpBv Y/jlXsKrjMe06se+PXX3sYnwkK/pWXQny90pqvFR7jSuFsHhaOBk2uMMVJssEEvdnkFkb4 u6ezOQ7NOkJu0r50o4QVlTp3KRYO1mw013t3222LtaExUhW9ONEpd5SxoalPLCnAY1JbV3 wFYM3q+uqCOkkbW0V0UxomGoZu8y5IJgUIIIs532+OZRLHTJPb43dmG/eiYsTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112264; a=rsa-sha256; cv=none; b=WVCnFTPSxepBrLereX4w0X6FMFsImr1BiUeenHNpHmkv4lOOS2kJFl9QUPCirP69+PGYNs OjbTwGAYazr71I306cS/HOv13Opfd3tDanijUUtI8imZ2B1c1LgvddOzopwg7Bze6CgwGK DueK1Dvq1zWYwPacT9IEYGL5m/wPKTLrzYZqo8UFDpz10uD6dzjQTrnxz+1sF3MmyC7s1y gbXMCYzZh/eAmAH2GRNioeKSZKrwbAYlAnqEAEs85rhI7+wdsStpubjf1KeWn5vOTLlfFR SIluLfluPxKU9j08DeRoLASl9LDdZT/4kb2NR8K/Ot8E4I6ipWByEUQgu+wEdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGm84brZz17r7; Sat, 5 Oct 2024 07:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957B4fM000697; Sat, 5 Oct 2024 07:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957B4pX000694; Sat, 5 Oct 2024 07:11:04 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:04 GMT Message-Id: <202410050711.4957B4pX000694@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: 81c47bfc700d - stable/14 - amd64/mp_machdep.c: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81c47bfc700dbce884e015f88d629938aefb0f6b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81c47bfc700dbce884e015f88d629938aefb0f6b commit 81c47bfc700dbce884e015f88d629938aefb0f6b Author: Konstantin Belousov AuthorDate: 2024-10-01 11:32:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:53 +0000 amd64/mp_machdep.c: style (cherry picked from commit c2fe7156e992a295756206f59c282b9e971b8c91) --- sys/amd64/amd64/mp_machdep.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 12abb8b6bf8b..00e99f9df192 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -102,16 +102,15 @@ void *bootpcpu; extern u_int mptramp_la57; extern u_int mptramp_nx; -smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = &smp_targeted_tlb_shootdown_native; +smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = + &smp_targeted_tlb_shootdown_native; + /* * Local data and functions. */ static int start_ap(int apic_id, vm_paddr_t boot_address); -void -smp_targeted_tlb_shootdown_native(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2, - smp_invl_cb_t curcpu_cb, enum invl_op_codes op); /* * Initialize the IPI handlers and start up the AP's. */ @@ -586,8 +585,8 @@ invl_scoreboard_slot(u_int cpu) * completion. */ void -smp_targeted_tlb_shootdown_native(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2, - smp_invl_cb_t curcpu_cb, enum invl_op_codes op) +smp_targeted_tlb_shootdown_native(pmap_t pmap, vm_offset_t addr1, + vm_offset_t addr2, smp_invl_cb_t curcpu_cb, enum invl_op_codes op) { cpuset_t mask; uint32_t generation, *p_cpudone; From nobody Sat Oct 5 07:11:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmB1rzJz5Xr71; Sat, 05 Oct 2024 07:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGm960dDz4N4v; Sat, 5 Oct 2024 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTkCrKykXhNV1qOJIB4+Kc2DE+7P0LJYk4BOs7BNGV4=; b=ZAP75rZpfO5lDFbfPPDF15uPMGv+JcGQ4x/b4GxT0BgUYgSeqKwhrwgOZxatIlehhSDbww hmjKYLieOR+0EtsrpcoloMmt2o5Eq/yjOmUyF4a4I6sHTjOPQQ9JO+O7Lnsp9hxaGDrIYI 3S20b9Ak4BH4NFxBkEgrC5Aw/0shFsYNHVdTg0tushrhJDVfBdkXXx0pTJxOncHStwqcTg hy/dE/5gSG4vwpJjLmKgLM6TL6EVXPaYRj1uT11EB1/3qKP3DNI5SHrguV1VcgaEtXGSkE /tqhbPrumjc7on7wPc6qAGPaKL8+hp0D5NKfxDsWilt7EOndgyzJkYm5vCRw7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTkCrKykXhNV1qOJIB4+Kc2DE+7P0LJYk4BOs7BNGV4=; b=SyIlM0diiLMuXoDGl7mSP5XUKhJw/HNPxpnmn9wx8uOGYIZtZl6yYhdDYL2e4ETwSfEb2H qHFkE/YJyFzUcjJYbB5PrFFm9SYAl8dJ/Lq/2qUivAIvuERiVukfcGpANcm7tsRcPn4CUd XQNXZ1j5DlXeCFL+CP8i5hllYf/MTnuXMGbFb1xamLYQc0GTHfkIyyI4AEHRhkYgvRF2Om A3OnODNmliQsVse1T4fVCOcAqPkuEzaAnK/OqwklzqlOyw0Y1pAb9VPk6jv2xbEgPif3XJ KeUxq6OXu3pMFUw7rLf5KVPoV5LjOHl7JrN8oVSklcNsiFlm94pEAI3jQWJ/xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112265; a=rsa-sha256; cv=none; b=EcpVE/GKQ1qxGu0eKAxk72omNhSsK682goIkIfrbiVyNlTwhCd9baPgTZolBWyxwr8R2Wl bPXMPf5z+khlmd/cW8jecgS266gkznjLT7bUkEBdl8ouYIduzs07WYNJRlGkWsSJen0qCC H65/cTNWDQa/uZSvCbp2I6KMkGnFTqk2dhoKI47ONgFJpopFf0PRrh9WNudDXc6wwlyzoV P0t4inF/C9wUyHFSg9m5fDWBdGfyRltk00t7OtdJvD63Va+s1fLD8BFmg4/FYmQf4kVnYD JFqWRKAUtgdpBzRMENERNMKJmvjDk+64RG1dVzpiokXnnerJ81DAHWvixQ5U6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGm95bCKz17r8; Sat, 5 Oct 2024 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957B53p000733; Sat, 5 Oct 2024 07:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957B5Pr000730; Sat, 5 Oct 2024 07:11:05 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:05 GMT Message-Id: <202410050711.4957B5Pr000730@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: 4cb8ec6c6f81 - stable/14 - vm_map: add vm_map_find_locked(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4cb8ec6c6f81243da158def4525f92c6dc7b964b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4cb8ec6c6f81243da158def4525f92c6dc7b964b commit 4cb8ec6c6f81243da158def4525f92c6dc7b964b Author: Konstantin Belousov AuthorDate: 2024-09-15 06:29:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 vm_map: add vm_map_find_locked(9) (cherry picked from commit 0ecbb28ce351652b3a2dae271eedf1eb3aa65400) --- sys/vm/vm_map.c | 50 +++++++++++++++++++++++++++++++++----------------- sys/vm/vm_map.h | 2 ++ 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 97b96a46e4b2..28cf309f86c3 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2113,9 +2113,24 @@ vm_map_find_aligned(vm_map_t map, vm_offset_t *addr, vm_size_t length, */ int vm_map_find(vm_map_t map, vm_object_t object, vm_ooffset_t offset, - vm_offset_t *addr, /* IN/OUT */ - vm_size_t length, vm_offset_t max_addr, int find_space, - vm_prot_t prot, vm_prot_t max, int cow) + vm_offset_t *addr, /* IN/OUT */ + vm_size_t length, vm_offset_t max_addr, int find_space, + vm_prot_t prot, vm_prot_t max, int cow) +{ + int rv; + + vm_map_lock(map); + rv = vm_map_find_locked(map, object, offset, addr, length, max_addr, + find_space, prot, max, cow); + vm_map_unlock(map); + return (rv); +} + +int +vm_map_find_locked(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t *addr, /* IN/OUT */ + vm_size_t length, vm_offset_t max_addr, int find_space, + vm_prot_t prot, vm_prot_t max, int cow) { vm_offset_t alignment, curr_min_addr, min_addr; int gap, pidx, rv, try; @@ -2123,7 +2138,7 @@ vm_map_find(vm_map_t map, vm_object_t object, vm_ooffset_t offset, KASSERT((cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) == 0 || object == NULL, - ("vm_map_find: non-NULL backing object for stack")); + ("non-NULL backing object for stack")); MPASS((cow & MAP_REMAP) == 0 || (find_space == VMFS_NO_SPACE && (cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) == 0)); if (find_space == VMFS_OPTIMAL_SPACE && (object == NULL || @@ -2146,7 +2161,6 @@ vm_map_find(vm_map_t map, vm_object_t object, vm_ooffset_t offset, (map->flags & MAP_ASLR_IGNSTART) != 0) curr_min_addr = min_addr = vm_map_min(map); try = 0; - vm_map_lock(map); if (cluster) { curr_min_addr = map->anon_loc; if (curr_min_addr == 0) @@ -2217,8 +2231,7 @@ again: MPASS(try == 1); goto again; } - rv = KERN_NO_SPACE; - goto done; + return (KERN_NO_SPACE); } } @@ -2232,16 +2245,14 @@ again: try = 0; goto again; } - goto done; + return (rv); } } else if ((cow & MAP_REMAP) != 0) { - if (!vm_map_range_valid(map, *addr, *addr + length)) { - rv = KERN_INVALID_ADDRESS; - goto done; - } + if (!vm_map_range_valid(map, *addr, *addr + length)) + return (KERN_INVALID_ADDRESS); rv = vm_map_delete(map, *addr, *addr + length); if (rv != KERN_SUCCESS) - goto done; + return (rv); } if ((cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) != 0) { rv = vm_map_stack_locked(map, *addr, length, sgrowsiz, prot, @@ -2250,10 +2261,15 @@ again: rv = vm_map_insert(map, object, offset, *addr, *addr + length, prot, max, cow); } - if (rv == KERN_SUCCESS && update_anon) - map->anon_loc = *addr + length; -done: - vm_map_unlock(map); + + /* + * Update the starting address for clustered anonymous memory mappings + * if a starting address was not previously defined or an ASLR restart + * placed an anonymous memory mapping at a lower address. + */ + if (update_anon && rv == KERN_SUCCESS && (map->anon_loc == 0 || + *addr < map->anon_loc)) + map->anon_loc = *addr; return (rv); } diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index c0b3be886505..5d41f892e83d 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -475,6 +475,8 @@ boolean_t vm_map_check_protection (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t int vm_map_delete(vm_map_t, vm_offset_t, vm_offset_t); int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t, vm_offset_t, int, vm_prot_t, vm_prot_t, int); +int vm_map_find_locked(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, + vm_size_t, vm_offset_t, int, vm_prot_t, vm_prot_t, int); int vm_map_find_min(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t, vm_offset_t, vm_offset_t, int, vm_prot_t, vm_prot_t, int); int vm_map_find_aligned(vm_map_t map, vm_offset_t *addr, vm_size_t length, From nobody Sat Oct 5 07:11:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmC15LJz5XrRR; Sat, 05 Oct 2024 07:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmB6gkwz4Mgn; Sat, 5 Oct 2024 07:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeWyt4fiK2xTbky0JOshv2gULmM3hf9wxJqHtjo76Fc=; b=OWpNtf1t4EczACI7UWfxuLyDkUJ912GSmwh7euj9hT9jiSiViMADvZsFcHUuR1Q/3gKNM0 AZhsX1g/g+nYd2vuHbpx6eFgA9sMzA+CuNn96wDrMitr13DAXgVQz/sxr7ePIPHhImppuT ae2BRfRUa7AxI5mUXJ9gKSAy6DEC6ttouGZ4RMOkKF/8LFZLwzZ4XxmbQUtxNLnfbI21+O GtfINP5HOHaJpn8CxY/ynND24Hz7HcVT8PuxdmNn68C6TzGW0oWnvfVdJtUOYUsuh+sn8T tmdpgKBEvrLJF/ckzUUmNZ1sKMdrqKrKYsWnH+oBqdgZ422bRa4Y/GioiYtgnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeWyt4fiK2xTbky0JOshv2gULmM3hf9wxJqHtjo76Fc=; b=DEnpMqtrzCv0k8ljpQrTUURlvjT93ssG8KTNFwn/HibKaszY1xd/Ib2+cCNUiYhl7FH+SF V/Vbo0uOPBBw3IEjwGuugN8LVkvpEN+acP9iAqDO90Trmi7/iHo8u0qOfUmhKsFQZY3lQV seRxoIiCriMx3p8BZ2U+lfjWDoIxmizOwBl8vlh8ft3BoFBwbIyioaYqMHiNbfseDoEBsQ ZTIXDtXGQyDdgEpISqqIYAm2jmdEzsjH/0snL4F0lqI55rU/YIfIfKVT6fn923yCoTn74z R5PpO+CjjWmI4gAVgwfULov6GaqUg/SBB4sfzL/+E9TqbkdUI1uJnAO9qQ2O3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112266; a=rsa-sha256; cv=none; b=sns+bwB6lLh3NDXcR/6VzRUBORfE1+h3wF4W+KQTmB+bbS32npOT7twZMbyKYbUgxeUK5d 7MsblQx781Y3n/Fy6THii4/BCtL1LXe0RejEpMhlU5fXqtlVemtvjMihQLgvLTqPuu3OXy BUbRkww+S2PCOxG1KxFlnmd4Jq/hY5rKRLasnL8xbWW2Kp56NtmcnYZEcIFyb/tS6eDR8K KJJGXU8bokWT40rVOZUiebufxYKXqtGBm/OkjesUOLa+CSklcoWgBbNzYNq59EOfgdZNoH ZE336qG/uOGz7JsMLX2rYwZ4Z1FRyuGjD6MGe+SBWHeyDgehmEIGU7UrCNB3KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmB6F43z17j3; Sat, 5 Oct 2024 07:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957B69R000769; Sat, 5 Oct 2024 07:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957B6Is000766; Sat, 5 Oct 2024 07:11:06 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:06 GMT Message-Id: <202410050711.4957B6Is000766@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: b7eecc86c3bd - stable/14 - kernel: add RLIMIT_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b7eecc86c3bdf124ca64e2cdc65e05a2093614a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b7eecc86c3bdf124ca64e2cdc65e05a2093614a7 commit b7eecc86c3bdf124ca64e2cdc65e05a2093614a7 Author: Konstantin Belousov AuthorDate: 2024-09-10 03:57:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 kernel: add RLIMIT_PIPEBUF (cherry picked from commit 3458bbd397783f3bb62713c54ae87f19eeb98dc0) --- sys/kern/kern_resource.c | 7 +++++++ sys/kern/sys_pipe.c | 16 ++++++++++++++++ sys/sys/pipe.h | 1 + sys/sys/resource.h | 3 ++- sys/sys/resourcevar.h | 2 ++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index ac086618b8b1..f3755d625572 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1610,3 +1610,10 @@ chgumtxcnt(struct uidinfo *uip, int diff, rlim_t max) return (chglimit(uip, &uip->ui_umtxcnt, diff, max, "umtxcnt")); } + +int +chgpipecnt(struct uidinfo *uip, int diff, rlim_t max) +{ + + return (chglimit(uip, &uip->ui_pipecnt, diff, max, "pipecnt")); +} diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 4c6f010a03f6..dc8b9ca2c9af 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -376,6 +376,7 @@ pipe_paircreate(struct thread *td, struct pipepair **p_pp) #endif rpipe = &pp->pp_rpipe; wpipe = &pp->pp_wpipe; + pp->pp_owner = crhold(td->td_ucred); knlist_init_mtx(&rpipe->pipe_sel.si_note, PIPE_MTX(rpipe)); knlist_init_mtx(&wpipe->pipe_sel.si_note, PIPE_MTX(wpipe)); @@ -409,6 +410,7 @@ pipe_paircreate(struct thread *td, struct pipepair **p_pp) fail: knlist_destroy(&rpipe->pipe_sel.si_note); knlist_destroy(&wpipe->pipe_sel.si_note); + crfree(pp->pp_owner); #ifdef MAC mac_pipe_destroy(pp); #endif @@ -575,9 +577,20 @@ retry: size = round_page(size); buffer = (caddr_t) vm_map_min(pipe_map); + if (!chgpipecnt(cpipe->pipe_pair->pp_owner->cr_ruidinfo, + size, lim_cur(curthread, RLIMIT_PIPEBUF))) { + if (cpipe->pipe_buffer.buffer == NULL && + size > SMALL_PIPE_SIZE) { + size = SMALL_PIPE_SIZE; + goto retry; + } + return (ENOMEM); + } + error = vm_map_find(pipe_map, NULL, 0, (vm_offset_t *)&buffer, size, 0, VMFS_ANY_SPACE, VM_PROT_RW, VM_PROT_RW, 0); if (error != KERN_SUCCESS) { + chgpipecnt(cpipe->pipe_pair->pp_owner->cr_ruidinfo, -size, 0); if (cpipe->pipe_buffer.buffer == NULL && size > SMALL_PIPE_SIZE) { size = SMALL_PIPE_SIZE; @@ -1646,6 +1659,8 @@ pipe_free_kmem(struct pipe *cpipe) if (cpipe->pipe_buffer.buffer != NULL) { atomic_subtract_long(&amountpipekva, cpipe->pipe_buffer.size); + chgpipecnt(cpipe->pipe_pair->pp_owner->cr_uidinfo, + -cpipe->pipe_buffer.size, 0); vm_map_remove(pipe_map, (vm_offset_t)cpipe->pipe_buffer.buffer, (vm_offset_t)cpipe->pipe_buffer.buffer + cpipe->pipe_buffer.size); @@ -1732,6 +1747,7 @@ pipeclose(struct pipe *cpipe) */ if (ppipe->pipe_present == PIPE_FINALIZED) { PIPE_UNLOCK(cpipe); + crfree(cpipe->pipe_pair->pp_owner); #ifdef MAC mac_pipe_destroy(pp); #endif diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h index 61fb57480605..0f35316432eb 100644 --- a/sys/sys/pipe.h +++ b/sys/sys/pipe.h @@ -136,6 +136,7 @@ struct pipepair { struct pipe pp_wpipe; struct mtx pp_mtx; struct label *pp_label; + struct ucred *pp_owner; /* to dec pipe usage count */ }; #define PIPE_MTX(pipe) (&(pipe)->pipe_pair->pp_mtx) diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 5100501fb2b8..3b582e83d553 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -116,8 +116,9 @@ struct __wrusage { #define RLIMIT_SWAP 12 /* swap used */ #define RLIMIT_KQUEUES 13 /* kqueues allocated */ #define RLIMIT_UMTXP 14 /* process-shared umtx */ +#define RLIMIT_PIPEBUF 15 /* pipes/fifos buffers */ -#define RLIM_NLIMITS 15 /* number of resource limits */ +#define RLIM_NLIMITS 16 /* number of resource limits */ #define RLIM_INFINITY ((rlim_t)(((__uint64_t)1 << 63) - 1)) #define RLIM_SAVED_MAX RLIM_INFINITY diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h index 49119651665e..8449201dee67 100644 --- a/sys/sys/resourcevar.h +++ b/sys/sys/resourcevar.h @@ -123,6 +123,7 @@ struct uidinfo { long ui_ptscnt; /* (b) number of pseudo-terminals */ long ui_kqcnt; /* (b) number of kqueues */ long ui_umtxcnt; /* (b) number of shared umtxs */ + long ui_pipecnt; /* (b) consumption of pipe buffers */ uid_t ui_uid; /* (a) uid */ u_int ui_ref; /* (b) reference count */ #ifdef RACCT @@ -144,6 +145,7 @@ int chgsbsize(struct uidinfo *uip, u_int *hiwat, u_int to, rlim_t maxval); int chgptscnt(struct uidinfo *uip, int diff, rlim_t maxval); int chgumtxcnt(struct uidinfo *uip, int diff, rlim_t maxval); +int chgpipecnt(struct uidinfo *uip, int diff, rlim_t max); int kern_proc_setrlimit(struct thread *td, struct proc *p, u_int which, struct rlimit *limp); struct plimit From nobody Sat Oct 5 07:11:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmD4BkRz5XrcZ; Sat, 05 Oct 2024 07:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmD0w6Zz4N6T; Sat, 5 Oct 2024 07:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Hmv+6K/IR35/2QzSuI4wHj+c9NaZNWHO7agMg0+IR0=; b=d0c+w22LJy1uTJa/eCkPdHG5N9c8NspiD5ABTjXAEUltvJHsOyTWGypeCKy/CpEw/s3EAx vmS8J4bAKWIz7901xq8+ftCz6pHIUuQWK4kMWOCGv2+n6X+uelhiGpu25g5VBET5ljpgUC LUsqjluf5B20KTOCeR6vzsy+8WAmVhJTKjC7IhfzNiqftC44oR1rUw2AIJXGYsVxqdwhSf 5hWQ2DIdrqodqftK9B5ebH1NFDaPAR/dlVCrcoWDriwyP6MqXkiyaUS+8Hu1Hf204etz1C bm9hCtymn7lzNiSVzYIgLmX1SC2N1TxvXA9tCNj0AHgOT47tgdjUn/FLZXg9Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Hmv+6K/IR35/2QzSuI4wHj+c9NaZNWHO7agMg0+IR0=; b=awsTlgYdUd6u/eO045wAFoBrPa+SJa1OpASDKQue7GAVosxJZq/KgKHbe+lVeJEQkVudES OBoz+kaqtWQOacbAOw8sPR3+p3YLIJ1nTmW9KbDy0Y6JXpwcY9VSMefpTaLzmP/q//fqff KbUMis1Au6O17IwCfb+nBHlgFB/JziusZ1LfvD1rPu0E0iaEEFKLftWQuCdmverPv+6Bj4 NbK8k6AQ7OizvU+1Se9mekDkIVrZ+u91KW5l1uGYncWMhjgRZ7/9rfKdzdU8Gg1ndvDKKE zUSvPAn3J7fn/Kxe9zpP93znMDNAKLeHmVGE4Cv1fau962tgk2bbY4YR6D0ifg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112268; a=rsa-sha256; cv=none; b=ZNdLd2h9OZocID9uQX/mWu/QqHCUhD1vhms9fFWlTI8d5LQ482+MwUCf9u1pf4Nl4L2KRa sD3BJ5kmFgijaviv5Xl/pJdYeyzo/8TFYzjsPkYL2eA+rXQyHu/sC99O1Ngvp/vIbRpeWt cpQxT5ZE3N50CU7o4aEIGxkRxDveAFOqAUo8EfFXqMDN8GD/4H9dL25xSzxYN1de5TnsTZ ob0BoLjNqDlLzE/vwSEjNUCLdqYVs/hZLlFM3NIQPxHUGkc+SDaCI4VPv6S+iC4txRH/4j +Mxai1x6GbnctBbf3S2jOLIRQCf0HIb5w9RftmAo6dvQjJWqNmfGn8jc1dmFcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmD0QnYz17pC; Sat, 5 Oct 2024 07:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957B7L0000809; Sat, 5 Oct 2024 07:11:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957B7B4000806; Sat, 5 Oct 2024 07:11:07 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:07 GMT Message-Id: <202410050711.4957B7B4000806@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: d20f0dae2f97 - stable/14 - getrlimit(2): document RLIMIT_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d20f0dae2f97185cc53bda3fd3245453a77277f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d20f0dae2f97185cc53bda3fd3245453a77277f6 commit d20f0dae2f97185cc53bda3fd3245453a77277f6 Author: Konstantin Belousov AuthorDate: 2024-09-10 04:11:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 getrlimit(2): document RLIMIT_PIPEBUF (cherry picked from commit 54a8d1fbbf65e976132809718525ba051a5525cf) --- lib/libc/sys/getrlimit.2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2 index 2e79b3000c69..dc8653076dba 100644 --- a/lib/libc/sys/getrlimit.2 +++ b/lib/libc/sys/getrlimit.2 @@ -86,6 +86,16 @@ The maximum number of open files for this process. The maximum number of simultaneous processes for this user id. .It Dv RLIMIT_NPTS The maximum number of pseudo-terminals this user id is allowed to create. +.It Dv RLIMIT_PIPEBUF +The maximum total size of in-kernel buffers for bi-directional pipes/fifos +that this user id is allowed to consume. +The buffers for kernel FIFOs created on the first open of a filesystem +object created by +.Pq Xr mkfifo 2 +are also charged to the user ID of the process opening it, +not the FIFO's filesystem owner. +Despite somewhat unexpected, this is in fact fair, since user of the fifo +is not necessary its creator. .It Dv RLIMIT_RSS When there is memory pressure and swap is available, prioritize eviction of a process' resident pages beyond this amount (in bytes). From nobody Sat Oct 5 07:11:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmF4PmJz5XrXM; Sat, 05 Oct 2024 07:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmF1v9Xz4Mml; Sat, 5 Oct 2024 07:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uXyY+je3A+E8KFC/NU+dGkuCVDG2RceVHJj0x+6e/Kg=; b=aUQhfO0cVt4uF3892Af0779Tc+2G/nzPqwfdJUza72mLNuF7AaJXIsLE5M6okQsf2zrXyt 4SZL4yqiRWJQVmbOdeBenjbSkLP4DSwfYhxU2EBgQfEgoF64cPHaGFPpTfY0u1tnQjUq4z n5731h4SUHRCb80iw0eIwzLNAgKEY5gZRUWUg31T+Nby5xNkV7bxev0Jq96lq7fSUYSlKJ hbex83m+WQv9uBo8Sihz8kkcdXuGrxRrygegwsPyi0ZEvoJsB1Acx1BVrxW9MX/ThoMAL4 AS9N1owVA7apWRTCzJjcpvSvv6v7oavyhj6lfYMn7Ndb6Ym4Ap1oJCLgh30seg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uXyY+je3A+E8KFC/NU+dGkuCVDG2RceVHJj0x+6e/Kg=; b=X6CUFiMFIaNCiYRKX8dLQs/zFRb0MQLUb9eVtgPtyoKKcUwY9HDktWhSMdnMPl0uqQH5M8 Kmf1uqefvtL12xVk82migYeGhJmHYfhBkE/otVNh0IngmKjpF/HIO5E+mwBhe5tI1BaMw8 hC3k+o18ckguQ/2/DyJ//rkK6LT4550LDURHAfqMPqbTZ1rVMyCLl0lJG9nM6A257qxBZj afOiOreZz2kPZ1oSR+Q7+ZYtCFuQAWZk2KHIwCWx1p1evvgvx8VLRluSVpS1N4YhXSvRC/ 6klIr8AM5slzg+ukP+3+R/FlaZqfUF8H4uS1UTS0XLi1AaCUOh2aVyPxds2NuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112269; a=rsa-sha256; cv=none; b=QQ7PEhm5ZUSkisyOoLTgwWW93MMgGf6w14+1SIlxzv12PwOG2HrAZgg5co8aNV2X3q8vWH VOn8nHz/BQqdzMha9kAYb8Ugx44Zs6RJd5uu588fmcGFuKx8G8swZrQNrr134uo6e+TWdL 41oGIqlavg7dIhP/vHUptJK9KtndzPDy1rTij4sHn78sl10UAXaFFs8D0pDTgDU+X7kEb1 Mh2qyddOWzKKX/djikya5kyi/wFrMQUGCEtNrKdU9Ier3F4uA3BjVWZKCABbDEpIHMZ4sv Yr5JMe1juWq7eV/WJfpN7n6ldfnqtKVXeFS3oR9VogLdYwX/7I2cpvIlIytq9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmF17Jsz183Y; Sat, 5 Oct 2024 07:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957B91m000847; Sat, 5 Oct 2024 07:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957B97G000844; Sat, 5 Oct 2024 07:11:09 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:09 GMT Message-Id: <202410050711.4957B97G000844@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: a03f7c040ce7 - stable/14 - libutil: support RLIMIT_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a03f7c040ce7b836b7e0dedfca76b28d2b8a5464 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a03f7c040ce7b836b7e0dedfca76b28d2b8a5464 commit a03f7c040ce7b836b7e0dedfca76b28d2b8a5464 Author: Konstantin Belousov AuthorDate: 2024-09-10 04:13:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 libutil: support RLIMIT_PIPEBUF (cherry picked from commit a4c04958f526a0dba353b54641dc5d2806984d02) --- lib/libutil/login.conf.5 | 1 + lib/libutil/login_class.3 | 1 + lib/libutil/login_class.c | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index a749fe5519ab..b1e7211e4c18 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -204,6 +204,7 @@ login environment. .It "pseudoterminals number Maximum number of pseudo-terminals." .It "swapuse size Maximum swap space size limit." .It "umtxp number Maximum number of process-shared pthread locks." +.It "pipebuf" size Maximum size of pipe buffers." .El .Pp These resource limit entries actually specify both the maximum diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3 index b67301f5a5a6..46e6a70f8ca8 100644 --- a/lib/libutil/login_class.3 +++ b/lib/libutil/login_class.3 @@ -118,6 +118,7 @@ pseudoterminals RLIMIT_NPTS swapuse RLIMIT_SWAP kqueues RLIMIT_KQUEUES umtxp RLIMIT_UMTXP +pipebuf RLIMIT_PIPEBUF .Ed .It LOGIN_SETPRIORITY Set the scheduling priority for the current process based on the diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index eb16ad501881..172da78aaf17 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -66,6 +66,7 @@ static struct login_res { { "swapuse", login_getcapsize, RLIMIT_SWAP }, { "kqueues", login_getcapsize, RLIMIT_KQUEUES }, { "umtxp", login_getcapnum, RLIMIT_UMTXP }, + { "pipebuf", login_getcapnum, RLIMIT_PIPEBUF }, { NULL, 0, 0 } }; From nobody Sat Oct 5 07:11:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmG6CNfz5Xrck; Sat, 05 Oct 2024 07:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmG2bfpz4Mqp; Sat, 5 Oct 2024 07:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvP7lZEOce2d9nfPYZk+6zor0KiDPi+9S0JwgK3OFAE=; b=IRZpQIlvtjDNRfYMnnxPE8MlFMKLnzGFBYwuHUKyynurG1U/kP3DNsuo2Jf6UaWeX3dgTk EpH2q2HEfcmyEJ8/y0yUKHOUBh/7F0hJJwbAeNbVPycnVhxcC0gysdrXJe6oCvmoBVdTDc lMVmBES3fmKCjKWP01oM72Fd60tIe4FJLO0iokkV+iX4KP84IALkltXo6arO5i7M6S9COp MTS8swmeIXcRYbl2NGF2fsgqE6LGP51XumzEOjdzmAKimXVJXjwVL5e3rm9sFtJ8/czhnk WoQ146yptq5rQBqWg+kauXqSQlJLtPzdv6s+jNRNVFejDIe2TpwMIrC8qCooBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvP7lZEOce2d9nfPYZk+6zor0KiDPi+9S0JwgK3OFAE=; b=C8EIDt0ZjYpuzQchpAlxsYFu0fnV/ppdwwEjEv3H5C6btT29HEJkvFowkk3eekFppv5pCF azAk+QNtn4AVNRosfEpk5+2mo5vLK8FI3DpcG8Hc8HA8M+W4PBkX7/mP1LgPjBSh55o4/6 W7s5q0D+CCIT9+85bBDaTKddoMsDpdBwklko0Ibr/QNmrl4PpGjCOaORS0Pl61pnPhZ7dY 5bnqOimTVuQ7kYXQOUS/FkSY3JqmZmvlhQx1NmIBqSH/bx8/74Lh9oYGE0nZa9L9PHufCG Bm3aIz30lXOIYsL4q7r/TRL7pdVbN1V1iIr/WUjVUkbElSTLFGGhWaXFAYndOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112270; a=rsa-sha256; cv=none; b=V0u0pDYEo3xdDbq4FKkIGdx8hHP0ynDC8MXlA34f0dQJRLTGsoCGJLQoYmEGn9J7kGYrc3 myovzgfr+uFCp0RVi5iiFVQpAQddUA/TcPICOwxbxqqZii9PaIvboAKCxl6aCIIBKQGqGR bO5tAHLzG4M63WAD6iRkiMJ3HbAwm/lCpQKOzBAIfpxxAUjR9E+jcrmPlSX1mxA2aOBI3o Oa1c/wvsbXfDIOnlkz6BLdEh/owgw5gUyumTSlWVlEuo2hYBfye1Xl66D9jYVFz36fcnB9 AVdVOGBm5f9RCeu7hTRRqff0Cs9mdCKgo+woIzSaCO1hvzgNpQxbMfMM0AQdgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmG2Cwzz183Z; Sat, 5 Oct 2024 07:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BAHk000883; Sat, 5 Oct 2024 07:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BApl000880; Sat, 5 Oct 2024 07:11:10 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:10 GMT Message-Id: <202410050711.4957BApl000880@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: d5ed8778bf3b - stable/14 - bin/sh: support RLIMIT_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5ed8778bf3b808d637c7913da66dc31b892e5f7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ed8778bf3b808d637c7913da66dc31b892e5f7 commit d5ed8778bf3b808d637c7913da66dc31b892e5f7 Author: Konstantin Belousov AuthorDate: 2024-09-10 04:12:27 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 bin/sh: support RLIMIT_PIPEBUF (cherry picked from commit 5d92f20c7d316aca521d4db4c1dab0f2d0e92c36) --- bin/sh/miscbltin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 5d5c137a7d11..39b3effb99df 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -489,6 +489,9 @@ static const struct limits limits[] = { #endif #ifdef RLIMIT_UMTXP { "umtx shared locks", (char *)0, RLIMIT_UMTXP, 1, 'o' }, +#endif +#ifdef RLIMIT_PIPEBUF + { "pipebuf", (char *)0, RLIMIT_PIPEBUF, 1024, 'y' }, #endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -525,7 +528,7 @@ ulimitcmd(int argc __unused, char **argv __unused) struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpwko")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwkoy")) != '\0') switch (optc) { case 'H': how = HARD; From nobody Sat Oct 5 07:11:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmK1HVNz5Xrcs; Sat, 05 Oct 2024 07:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmJ4qb0z4MtR; Sat, 5 Oct 2024 07:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0krlek7twBAhzrPaABqGKakp3+sV+Y6/MlqN2u8Vd8Y=; b=vSpwrWeBontqWuVLeE2VzefBHKxwEpvCXkzp08ZWoqymT2LZpALHoW7mS9uHy6s66NfbYk Zc6JQZQ4LlEzmO9zoC4JTFpMbCl0SdMeSE65l20t2ieFyTFdmOydUP0wOToJxGUUUTN42c laU+UB/lpHIiEg9Ftsd4b1TXSyKezbW+chnOr0mDsUPqv35OiS3akmIkA5xYCHk/Hjwlmk GKgZF/iTBDONlvlpD5N+fFouz2pfQiao4uFTEUBfhbaKcntkcz+BZmwDTrgVz6NitKeRK6 CRo/EXUyynP+jIs0IFupM/C70r2eD+8EJCsnWkzkff/2CLTuXBH7PKhI3uUyuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0krlek7twBAhzrPaABqGKakp3+sV+Y6/MlqN2u8Vd8Y=; b=hkT74KJLRs+S+24vgu98CUyILvJGiTSyCEctx4F7DrdpZ9Fe/7QqpU0R9XmL9NCxzyt47T h5DFQDE4iZCAM5QtCnCrdlLdLw+DAcpne0OUHcKGj8pmXe1jY0voBFS3Z8BR35vgVh7kM8 lqRyX3gec1AAuxBoyA+nXjnckHxWzo4+XndW7KN5OPfsNUcQT13z0ik9/7lVSEWYDhgEgC rZ7jxIZ1/h9G/GMoGnRsLq8OcCrvJxcgQJJ2QvN4OgEqJ1fPuIEETP321DMs8WEFkcjidH c1oCLlPUJAz3u1nGJtOb8ZGWLzcpzr17jgTlTmV/TshtHCMbA6m8+dRsjvifsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112272; a=rsa-sha256; cv=none; b=kfni6xC3TN/nmj9nrV/2vqysrtlyw223efxt9db5KCw/Bi0Ck73VG5lkJQphJpJNqsZyYB +0ninYgHw57Q9TGw5ZQvCrXByXYY6zon0uxL7TXXsAkRUcwkg/XdMkDzt/ZDL/uX6ogURs htrBZeUM8quQAAWYVGHB8cbqTsgos+xgXfuNsfcefxZPUo179lZm6LaW/hx4wCQOIcqLIq /pCbMQcqOBczGUd9khiN/iR198gqDNxD1rA06iXVdHQp4D54gpvTYiugXZpaIKOotxQKS7 tqUuNtLVHYBF8Wk9bOyGvV/QpybFiA/6v9ZDfMTUfD1kOrdnjfmClJdgq8BUiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmJ4P6Mz17pD; Sat, 5 Oct 2024 07:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BCfI000971; Sat, 5 Oct 2024 07:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BCUt000968; Sat, 5 Oct 2024 07:11:12 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:12 GMT Message-Id: <202410050711.4957BCUt000968@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: 524b9810de6a - stable/14 - login.conf: add a placeholder for the pipebuf limit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 524b9810de6a7cb60cfad94217e0e7f79e227669 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=524b9810de6a7cb60cfad94217e0e7f79e227669 commit 524b9810de6a7cb60cfad94217e0e7f79e227669 Author: Konstantin Belousov AuthorDate: 2024-09-11 14:48:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 login.conf: add a placeholder for the pipebuf limit (cherry picked from commit b029e29e0d8b928de2da50014d81799dfb5c9047) --- usr.bin/login/login.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/login/login.conf b/usr.bin/login/login.conf index 50a2ba9ffb5e..1069da17b4db 100644 --- a/usr.bin/login/login.conf +++ b/usr.bin/login/login.conf @@ -44,6 +44,7 @@ default:\ :pseudoterminals=unlimited:\ :kqueues=unlimited:\ :umtxp=unlimited:\ + :pipebuf=unlimited:\ :priority=0:\ :ignoretime@:\ :umask=022:\ From nobody Sat Oct 5 07:11:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmJ0sW9z5XrZL; Sat, 05 Oct 2024 07:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmH3jRzz4N79; Sat, 5 Oct 2024 07:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=efF7fKsnrHKtwCAWtdGO0Sv0pKpmgyoYgKEBP0HnnTY=; b=LhnmMUNuTJQO8iCsPHJS51NS8/Reuh6SYAFmr9J8ZjhWhYwGqf2ZYL5uzWFketjXs/iK66 TfDrv8kGep1+8ScFiKPbHn3EthJGdHpZtFYyamYJfzp20Tp7LXc+ZJcoBVwEbGa0qJxP6b 3zeOXZZ9mxI5ObrLeebMvQfrcbHxLmn8/4xbJT6AHVi06xtKMgQ3SsbhQoOxovahBTi8Dz swGmwnn1Qfnv8QkSE4NE+P0p7tbD7taQeCubyQ6eymFBRXeXCfzmkuBsF7j8vTAopJxl09 krNoz6WGpvM4UGyAs8VwKObVTHVn6YAM7N1+UEw/SrzdOzJRcOkUCF17VNf7Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=efF7fKsnrHKtwCAWtdGO0Sv0pKpmgyoYgKEBP0HnnTY=; b=kZxscyi/CRZ8fEBYYGmTg1wwknJEodpDOT0Ix9lET8bl0kPg/cD5JqnGAHzheNTdusVpNI Qm+W7OCeCNan3CEDDG0LGT1jwkTaLe8ZOc8wyu15ClxEH6prvAzha3S4NJdJufw1jYQSl6 9r9z60Q/sRXhBJ1aO7hnjSRLh0O1+KCeUp5qVW77W/aRWQvScK9XKcQII9iGHl2HUTBPXV HUAu/7mawd7Wiq35SHAbeFS2J4hpQJKHLQoY/qyKfnJ/yeF0RjOs/o25MFpxed8KWNMu6K rZzu4J0dDArWxY9CPGFQ8qXjqemAUQGSzgHNnirPNUlk5+Ot5YHZkmZAdaU6kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112271; a=rsa-sha256; cv=none; b=yxpD3Xhxkfb+PZaOHPASC3j2IqQwryEdP2xNtV1+dSYPf2djaem3kVwNOFFTjvWoRroJYC vQXG/nLzypt/i9H2erUaQegUGE76lY15hApbELYdhzGlMFZua3K/OWvHtqAoVHOtGwhknG vceo2hqcmWN8MXNKC0Y7SvmP4iV83vHZ5h7aphwrnoo8QNJNegYJR1ojhLomqDgBCcAloS tf2FO4IlK1aJJoCMg1N74MY/5uy5vEkmnG9duvhOkJSETHJA5d8pF24KITVTSDpX5ZkfF4 dSWsNVXBHDf9F/qKq8tXUFADToOMNGysJB7x8b7oAAqfx1yT96Ewh8nDR3ccLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmH3FQCz17j5; Sat, 5 Oct 2024 07:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BBfJ000920; Sat, 5 Oct 2024 07:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BBJQ000917; Sat, 5 Oct 2024 07:11:11 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:11 GMT Message-Id: <202410050711.4957BBJQ000917@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: 25902860b270 - stable/14 - usr.bin/limits: support RLIMIT_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 25902860b2707ab840543eadb3d4e6bcdd8fee01 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=25902860b2707ab840543eadb3d4e6bcdd8fee01 commit 25902860b2707ab840543eadb3d4e6bcdd8fee01 Author: Konstantin Belousov AuthorDate: 2024-09-10 04:13:46 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 usr.bin/limits: support RLIMIT_PIPEBUF (cherry picked from commit f54f41403d149e867b896ae753a0e7e2b0c738b0) --- usr.bin/limits/limits.1 | 6 +++++- usr.bin/limits/limits.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1 index 86df08b41058..0e374acd991b 100644 --- a/usr.bin/limits/limits.1 +++ b/usr.bin/limits/limits.1 @@ -32,7 +32,7 @@ .Nm .Op Fl C Ar class | Fl U Ar user .Op Fl SHB -.Op Fl bcdfklmnopstuvw Op Ar val +.Op Fl bcdfklmnopstuvwy Op Ar val .Op Fl E .Oo .Op Ar name Ns = Ns Ar value ... @@ -280,6 +280,10 @@ space. Select or set the .Va swapuse resource limit. +.It Fl y Op Ar val +Select or set the +.Va pipebuf +resource limit. .El .Pp Valid values for diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 68b1853651b9..c53066b52a9f 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -91,6 +91,7 @@ static struct { { " swapuse%-4s %8s", " kB\n", 1024 }, { " kqueues%-4s %8s", "\n", 1 }, { " umtxp%-4s %8s", "\n", 1 }, + { " pipebuf%-4s %8s", " kB\n", 1024 }, } }, { "sh", "unlimited", "", " -H", " -S", "", @@ -110,6 +111,7 @@ static struct { { "ulimit%s -w %s", ";\n", 1024 }, { "ulimit%s -k %s", ";\n", 1 }, { "ulimit%s -o %s", ";\n", 1 }, + { "ulimit%s -y %s", ";\n", 1024 }, } }, { "csh", "unlimited", "", " -h", "", NULL, @@ -242,6 +244,7 @@ static struct { { "swapuse", login_getcapsize }, { "kqueues", login_getcapnum }, { "umtxp", login_getcapnum }, + { "pipebuf", login_getcapnum }, }; /* @@ -252,7 +255,7 @@ static struct { * to be modified accordingly! */ -#define RCS_STRING "tfdscmlunbvpwko" +#define RCS_STRING "tfdscmlunbvpwkoy" static rlim_t resource_num(int which, int ch, const char *str); static void usage(void) __dead2; @@ -292,7 +295,7 @@ main(int argc, char *argv[]) pid = -1; optarg = NULL; while ((ch = getopt(argc, argv, - ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:o:")) != -1) { + ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:o:y:")) != -1) { switch(ch) { case 'a': doall = 1; @@ -623,6 +626,7 @@ resource_num(int which, int ch, const char *str) case RLIMIT_SBSIZE: case RLIMIT_VMEM: case RLIMIT_SWAP: + case RLIMIT_PIPEBUF: errno = 0; res = 0; while (*s) { From nobody Sat Oct 5 07:11:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmL1YNlz5Xr1w; Sat, 05 Oct 2024 07:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmK6C89z4NCF; Sat, 5 Oct 2024 07:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q38ZK69lAkwG2hIZGhMv76MmFiu/PDBf4Sb0vYl2/Js=; b=oq1dXaLfwn26YFzHlr8Pucj9YL1RQC/lMZXV0j5IU0qPQ946uDr9QTMf3sa71JGiiisYmO fP8e0FnhlIRUV6dSMex+kfDgW41DAYfguZ+ArlQFQ4keCmrBaLULIvBlc8MQj8SRYzEYV+ J+LPap21GJS5MdhiS8CtBhv5k7HQebx9CPy1l0JbgWXzGZDW7Lm0GlmTd79IKjzjIcbmcc xXgYX/MmpINBEGRVqnLsM3k/CwNeiBPm/iamIVyL62gmqPOipWCpGBjFYjzv3q/7YUyp4k t9IeQHRZ+R3GGsFd4mH75qyuE19+mH+WricJ1RafvjP6JgNixCFNcA/FtaBJ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q38ZK69lAkwG2hIZGhMv76MmFiu/PDBf4Sb0vYl2/Js=; b=mIOuYUveI0JuAUlqR3irrAvqxVx9nQeuDsjlfUUY4VQO2/n5/xWyj86U/PTfllFipvb39B lNQeMg8H0C1tN/vnDl7VTL4jugqydytXb4ZsE6TmgIKhShej1p5FI+Gzx1R8kJlKV2xSj9 GYQyql1uhDbgoTlZpk87fQcJXNq8Z5wbZpjN4tOVV1KebKto9b03hRtu9DcyS1aH9gsDe3 jQDPDve0EN3eg60Vy6wtGemkWJigfZZtvnvsnGrn3Ihs7AiMQ9Bgy5rEKUU4tfUGjwCd9E HVXeebXZn/waHKbqFfBSbdp0ubJsa8yAMrrMLDflaEC6XuaJMLQyCuJR51fdlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112273; a=rsa-sha256; cv=none; b=K4P/Wwg60E/ZbrSQ0P69hcs0VXT/BoFXrvoVxl/LQhfpkHbiqUgDJ74Lj7uD75OC5moIBU JqjCekznrYGbTsDIhnNThrt36QeGPXJg26vpqnXKz2PB/1uulIPWM7xDGW0TPG7TtxwvVr 6MUFIFru6B0vkpBEIl5VRYFRunuHVDwu8wZfozchcVBSDyIlAhoOu+DKFaivRaXJBcdhsb bgWutqPT3N6A2y5MMVTQUy9l78/sCuXc5IeM3a88z3Gtwppy+RBK7WlC43pyitbQAc12nr HFnMyeWnT2gyHM6q64q9MEpt0F8bJwSn0K0eQgICJSLm7QxHbplV1+IZrmYRwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmK5Yykz17m3; Sat, 5 Oct 2024 07:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BDXP001007; Sat, 5 Oct 2024 07:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BDwP001004; Sat, 5 Oct 2024 07:11:13 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:13 GMT Message-Id: <202410050711.4957BDwP001004@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: 6600090e678e - stable/14 - procstat: support RLIMIT_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6600090e678ef46264383b70222cd3886c0dbbc7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6600090e678ef46264383b70222cd3886c0dbbc7 commit 6600090e678ef46264383b70222cd3886c0dbbc7 Author: Konstantin Belousov AuthorDate: 2024-09-14 13:13:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 procstat: support RLIMIT_PIPEBUF (cherry picked from commit 80133d678ecbddb382174a4d48305a7b8cb932e5) --- usr.bin/procstat/procstat_rlimit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c index f930d5b0aee0..ee94213b5e74 100644 --- a/usr.bin/procstat/procstat_rlimit.c +++ b/usr.bin/procstat/procstat_rlimit.c @@ -64,6 +64,7 @@ static struct { {"swapuse", "B "}, {"kqueues", " "}, {"umtxp", " "}, + {"pipebuf", "B "}, }; _Static_assert(nitems(rlimit_param) == RLIM_NLIMITS, From nobody Sat Oct 5 07:11:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmM3zNhz5Xrcx; Sat, 05 Oct 2024 07:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmM1g33z4NCk; Sat, 5 Oct 2024 07:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hz74zFawtXNPGO0a4t+AgnasFAm+h/cC4wwLTQCm78U=; b=NKfMiE8pXtSrJED9wjpwcRwaZEFvvQ0+nPiWPYhNg0xIwXYIMEjBZ8P+iXPB0McAZgv/gr zdtgP1IAnuUdU4JDS5V84dsdMLs00Rhrt923igXXtSzWM9H8Nfz2JrLE6rBvTcxiOrexke TbrfIpemLv5xTksE0VzRo8yQwd7VfjxGEjrAg5+dL1p9uOd6c+CwqOcrV4StyHcwjuclnV 0NmTyvScIlhMEZERd8rj9Rv1htuwT+Al1VtkfBoiQqP1TLuT7H8MxtuaMvOci0PxWco7eD IuRt7Z1iOR1/XQZNrRTm0k6r2hYwgBCZZujKXbWtg+FBnGlJGTOTF249AsdZ/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hz74zFawtXNPGO0a4t+AgnasFAm+h/cC4wwLTQCm78U=; b=ItG9qQjh69D1fWGwM50ESWcPUq/zGu9liVeXR7X8If9+gPXZ4mvfvFEI/lk2dPN48W7IDu 7AUfya0cfwjJH/z4s3ma9uK6++GHSAhCJDms2xsd2O8s5NwOp4dBMERPMUzIv6GWlPTb2N aDsqfaV/fmSm9DnCxaIxEeiO5ap+0U2wsfUddz7jnXaU0Xz951MQCPoLR6OtMdscVIo+2m v8NPbBctbJxM2gD8XSmsiCVZkjh4n2/CQNEe0Qivpsw+nJrtHNxqBnkS7xNzPcJ5fQbRho motUekbhAjIZQEpc+TDqBFL3/cwkhVyTqUYm0vS3aYFPQQeN90/A5UhBRNtSsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112275; a=rsa-sha256; cv=none; b=CFlEfG8pVNKBx8yiDY4KN9dVBSB1+OpQCu7gug4clGwWaa+0Is7U6j1aXo/V4OKfCDD8++ hoGNlUsUZgPhpKPKf4v5Rs4c1ycCAkvqOekJDx6YqA1mhSwzecQhSOfkQXjQWOR4BAPsgm rMFKhw04hIyJc3iYlvrQ3x5E8jYlkWgFIbQszsPGVqHKy52mBJsmn0cMvasliTzaGztcnB 2AeR7pSrGYjiJ9SaGUifCVifFcVhNAc8nql5E5f7eibbTqyXyd7Ezpd/yA6pC+/vLU8WhB yIbnvvssxWWzrIRFhznuxoMNe3RH0T2gUI5ia+bc/HeO3Hq5wT34vIX9T9EXaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmL6jRhz17rB; Sat, 5 Oct 2024 07:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BEYg001043; Sat, 5 Oct 2024 07:11:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BECm001040; Sat, 5 Oct 2024 07:11:14 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:14 GMT Message-Id: <202410050711.4957BECm001040@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: fd9babb1b85f - stable/14 - privs: add PRIV_PIPEBUF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fd9babb1b85f097d70d3c345b973b9b35a3b3c69 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd9babb1b85f097d70d3c345b973b9b35a3b3c69 commit fd9babb1b85f097d70d3c345b973b9b35a3b3c69 Author: Konstantin Belousov AuthorDate: 2024-09-15 06:38:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:54 +0000 privs: add PRIV_PIPEBUF (cherry picked from commit 8ae779832c6fee0588274af3c48cc643022787e6) --- sys/sys/priv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/sys/priv.h b/sys/sys/priv.h index a61de8d32fe0..fd0f7dd213ff 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -426,11 +426,13 @@ */ #define PRIV_VM86_INTCALL 550 /* Allow invoking vm86 int handlers. */ +#define PRIV_PIPEBUF 560 /* Allow to allocate reserved pipebuf + space */ + /* * Set of reserved privilege values, which will be allocated to code as * needed, in order to avoid renumbering later privileges due to insertion. */ -#define _PRIV_RESERVED0 560 #define _PRIV_RESERVED1 561 #define _PRIV_RESERVED2 562 #define _PRIV_RESERVED3 563 From nobody Sat Oct 5 07:11:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmN3Gdvz5Xrd0; Sat, 05 Oct 2024 07:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmN14Qkz4Mf0; Sat, 5 Oct 2024 07:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iau3Lmk/wrzWdhOd7q1yop8AyFIm29YpRN+d4jC8DuM=; b=a6y6Laartk07Z6mDT+4gvn9gv5X7laBgLa9pl8dkk+yn1/00qHWT6V70eMCRsaJRVgmzA0 zDHce7nqF+U0d+R5taVzT2PiyEWWSHSI5M/+wlNRbx/jGuUH30zL/S8r0w+xxPJktMLiFn 4oKzpWz7dek1I8mmmXUanJBBu4D2+MttUREmVlETPnxHmJXvE7kPXft/UvAVrPo0czfLHI hFQ3hOvlgANZEJmKj8GJdzXRCbTXlXEy3/a0j9o2mMIBKOSHQiLa8K1gWNaAzJKV82+pS6 DN6Dt702hAFbnc+OZlMoqVwR8NhmURNU68I8CMXyVk2DnOjtGGTRmCOJCB7x4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iau3Lmk/wrzWdhOd7q1yop8AyFIm29YpRN+d4jC8DuM=; b=pYBe3K+U9jKD9f0s4wHnrpPAGBVICP22a4AtmJa+Q06T32nu3jcBwCCTLrHBCgaHYsvnzt p77G0ZecdCjKWc9GhJxN3/tyU/gun807clRZ7wbWxol/DXWxyHgDKFwUTBVQbuXcoWwj2J ugnCNSVmTSsEbDhxYadXisQ1kvR0PXbAZ/agOOeneDiie9DF1TpeGJjCsFeUUbVJvoh6GS 1XF/GiOFyrYVGprpFi9C0IKCFeFNR45YXJ0Eeb8S0BQJdzvm28yvicI6xpftXHKSE1BBTf WgAGkawI8YpnXoYK/0+SFeEV9SKCNQEnwmp7av7jTmmD8gCIQ8kRyMX2jbd3TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112276; a=rsa-sha256; cv=none; b=Fdmbxe3OMugWlUAdcTMklQUG49+6/7c4ghFyL25KY9cvj8mdEUK2QrboEarfzvR3L4V/FD PVONNt2LQAxtR3h14AmI42NFoaXmPqkw2jRqEtPIreE9ndf9KD/sMTbjjmaliz1hUdX+OJ pjzt+YEyNlUGmJRyi1voUp+brFAe41rBDrVriipvVBgTAFZ+b2xOXbKP3Uw195W7WQCT+1 uVs+kvjowYp/+rcSK/dcxfK19QYHvxLemhhsYJJRKYgS4C69V7XOK7AiRaOw6foofmJHJs Jo1h/jlFZScMk/nynZp02VEmgpOaViGgzOSPn+e2H35+vw93HH9/gbDJMvK4Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmN0bcPz185v; Sat, 5 Oct 2024 07:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BGr5001097; Sat, 5 Oct 2024 07:11:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BGaU001094; Sat, 5 Oct 2024 07:11:16 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:16 GMT Message-Id: <202410050711.4957BGaU001094@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: d532d9926ee7 - stable/14 - pipes: reserve configured percentage of buffers zone to superuser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d532d9926ee74a05b03db9064196b3831c082bee Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d532d9926ee74a05b03db9064196b3831c082bee commit d532d9926ee74a05b03db9064196b3831c082bee Author: Konstantin Belousov AuthorDate: 2024-09-15 06:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 pipes: reserve configured percentage of buffers zone to superuser (cherry picked from commit 7672cbef2c1e1267e42bb3aad6a6da9380f4347f) --- sys/kern/sys_pipe.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index dc8b9ca2c9af..2e5eafee9fa6 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -104,6 +104,7 @@ #include #include #include +#include #include #include #include @@ -207,6 +208,7 @@ static int pipeallocfail; static int piperesizefail; static int piperesizeallowed = 1; static long pipe_mindirect = PIPE_MINDIRECT; +static int pipebuf_reserv = 2; SYSCTL_LONG(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &maxpipekva, 0, "Pipe KVA limit"); @@ -220,6 +222,9 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, piperesizefail, CTLFLAG_RD, &piperesizefail, 0, "Pipe resize failures"); SYSCTL_INT(_kern_ipc, OID_AUTO, piperesizeallowed, CTLFLAG_RW, &piperesizeallowed, 0, "Pipe resizing allowed"); +SYSCTL_INT(_kern_ipc, OID_AUTO, pipebuf_reserv, CTLFLAG_RW, + &pipebuf_reserv, 0, + "Superuser-reserved percentage of the pipe buffers space"); static void pipeinit(void *dummy __unused); static void pipeclose(struct pipe *cpipe); @@ -587,8 +592,22 @@ retry: return (ENOMEM); } - error = vm_map_find(pipe_map, NULL, 0, (vm_offset_t *)&buffer, size, 0, - VMFS_ANY_SPACE, VM_PROT_RW, VM_PROT_RW, 0); + vm_map_lock(pipe_map); + if (priv_check(curthread, PRIV_PIPEBUF) != 0 && + (vm_map_max(pipe_map) - vm_map_min(pipe_map)) * + (100 - pipebuf_reserv) / 100 < pipe_map->size + size) { + vm_map_unlock(pipe_map); + if (cpipe->pipe_buffer.buffer == NULL && + size > SMALL_PIPE_SIZE) { + size = SMALL_PIPE_SIZE; + pipefragretry++; + goto retry; + } + return (ENOMEM); + } + error = vm_map_find_locked(pipe_map, NULL, 0, (vm_offset_t *)&buffer, + size, 0, VMFS_ANY_SPACE, VM_PROT_RW, VM_PROT_RW, 0); + vm_map_unlock(pipe_map); if (error != KERN_SUCCESS) { chgpipecnt(cpipe->pipe_pair->pp_owner->cr_ruidinfo, -size, 0); if (cpipe->pipe_buffer.buffer == NULL && From nobody Sat Oct 5 07:11:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmT19cQz5XrZW; Sat, 05 Oct 2024 07:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmR4sYrz4NJd; Sat, 5 Oct 2024 07:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/rxdc/H1fwUOgmtZgw3jHPllFFc+Ivfhc8WKmtjh9E=; b=bn6Xfigi6I6SYFXMO8dCXA2rozEclfZvfnY0gN1ouy697fxH0hHrFr015gGzGM/4jxZQYp saBfBEWFkr9IMK+FbUFrqdiyNNEMc4sfzSI0NPmMd7CPujleRUahmDNaJSl1spjp23KdRN zq6kCxzwUaXaoUYiE7ESR13spMIHYjKdLwW7I6mt3aYKwpZN3qSxAcSEO2Ymr+gAhJKTDh 81EZfMvIzNQ+L8nmQBuEp5is7yNh2qm/Z/mOpUu2+3uItj70ZONiUkEymhbRoeKAQcdQ13 uX8ggE3S9u9gbPMSyPh17wJuqG3psD/qCkU6gFf7mJ1VV2VUHZmN1YP6vRnf/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/rxdc/H1fwUOgmtZgw3jHPllFFc+Ivfhc8WKmtjh9E=; b=RuG07tPxPQrKljk9onWBDGB6CTtUvUhiQRuWOR9a99CkIUxoAOmkAceao7RxLbm88mMhQ2 OK92mdvFekaQSI9s8X+kc+Rinw2tbilFiuulPY97WAD1QianSIZug/uKoNlngBVLnfq6Vj b8WW4i/852KLwvgNZHDSQjUTcfrfJq2zeUPFONsmDt9ag7016E1CywPzwMcyJJuhv1GraQ wY/xu0cDQBBp6OrRkKFLtYg1zUry+xY8nvkwPSAoCDrWn1GCn6NMckt3f0H0MGues0Bh7d ddWfW2YMAdckX7pM/JDWWKnyNr4nLudDCtZ8z1bEDtPURGruWAA4okyUeIS/vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112279; a=rsa-sha256; cv=none; b=rqFG9h6d5zaIF857NJMr+6OdRbmSzMEMzEBor4oOEsfaGZk2TznLh+Vu3BNt1LF1axYao8 cnvn9XORmiYKa/cHZY9gz0JLzCF73Qc9sFpid8OKSq4cm3fqWuaRQYrecyDPz93ypFA39i zqbNbLNhRgAjNlv0DLJSCmOuF0v1GjzPSzfs3xpp7Tz4GB72YMPw8lMVPZ9R0AyA5YaL3E CdCWhZWti/XdykkQvmYNKFYvqst7423iZVibMpK5+ZPpz0xiSFjJIeK54Nvsn/sfgCLuMf 8SKqtFsTX7fifQpGi0lDTX++zTPrN+cHCZCNpaUHuOO7YjlGijAEVAmu+GoA4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmR4FTSz1860; Sat, 5 Oct 2024 07:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BJM6001259; Sat, 5 Oct 2024 07:11:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BJsm001256; Sat, 5 Oct 2024 07:11:19 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:19 GMT Message-Id: <202410050711.4957BJsm001256@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: c15b2e046e8c - stable/14 - sys_pipe: consistently use cr_ruidinfo for accounting of pipebuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c15b2e046e8cb84c5bdae98ee742b477dab7ff24 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c15b2e046e8cb84c5bdae98ee742b477dab7ff24 commit c15b2e046e8cb84c5bdae98ee742b477dab7ff24 Author: Konstantin Belousov AuthorDate: 2024-09-20 18:48:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 sys_pipe: consistently use cr_ruidinfo for accounting of pipebuf (cherry picked from commit a52b30ff98cdab82af140285fa7fcdf1036fef27) --- sys/kern/sys_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 20bedd665ca5..c34c7b24a269 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1678,7 +1678,7 @@ pipe_free_kmem(struct pipe *cpipe) if (cpipe->pipe_buffer.buffer != NULL) { atomic_subtract_long(&amountpipekva, cpipe->pipe_buffer.size); - chgpipecnt(cpipe->pipe_pair->pp_owner->cr_uidinfo, + chgpipecnt(cpipe->pipe_pair->pp_owner->cr_ruidinfo, -cpipe->pipe_buffer.size, 0); vm_map_remove(pipe_map, (vm_offset_t)cpipe->pipe_buffer.buffer, From nobody Sat Oct 5 07:11:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmR5gLsz5Xrgk; Sat, 05 Oct 2024 07:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmR0dcQz4N8t; Sat, 5 Oct 2024 07:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXr/fOgA0PhnLygP0HDAZvQu6w+sWveGdM2r7VzBubs=; b=KKl69zoaf8RtkeL8O2GyX9LD5ss7zCxwlsCAVr756A72bpvmPdZbZTI/RqPm+aeW260dW6 f77ANpusA+OzBF6qU1fvaCYbKIR3fGOBd7xjN5iMR6Fia1cGzMnetgEGys3G3LdUzhlneV siAwaTxPUtN5IIV6vw0S2jvfLjAvUspK3Mjl/kPAk1J7v291RDaKUwljKITg8OyWYgy0i7 +bAv+WQ7krVjqF68hcFeI22pPwRbrvfXJmYpzwA0Jhe1yIXKm+0SxyNf798zVZHXoSZtfe aYMqIr1HLWbfRyZ4lr76EyfnGjW9cWzudyTzmUSgPaRH1HKvoGGxWybpbDiRQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXr/fOgA0PhnLygP0HDAZvQu6w+sWveGdM2r7VzBubs=; b=S9tYoqgZwjyDiO6+6rSubPuJzQI5hM3BLZE+WCRt1BwlbYWKMNrVFB2u+zVJUX7l8MlHr7 fbailMUwvTUjI5G7RhTI1cw8m+4HweTKqNRD8INJlcgRVUIV8CnmhG8THhbqxjbj+ijtcN CBHYzbosTQp7kBSQpTChOiT0n+MVrA+WeUtjwcewUiaa8IJWNX0L/YgB8fXaRaxCpL5D7h 0EpoXC5adzSxwt7CBMiimQih5ZYmOIPeHVSNdAmZVBtwG8zdkTcGHL4AFcS5iI0l63dHJw PnQwmXAKNn8Ff9e7ONhz4PBY6sa2j2q1NZrlrc5Aa5Fo/bsBN6s+F2NyGV81/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112279; a=rsa-sha256; cv=none; b=gMXEpTJAckcHkaZAEANoOKIZl2PPzKcQPChJLFLmg40amCgnyJYfu0G64z22HhmmJw6BIJ cYqLDsnSUhhh7uAtpuaUPxbBcAg/u9aORBlsSwTNaxP3N5KSrmA/viiycmh3HuPbjllKWZ ZEcVTAiSO/c4GM1vAwue8m1qFEwRoC62vmiUgPdvsBtZXg+9PKCPjiMwfviPz1DKpdsXV1 ySiNeSiBYHlJqDwqv8oZ3LEcOUiY+whKKkbB4VcfAZ4VqMuiKfzGleE9OrpuWwvvZ3JQy+ LZ/Onts/oOZalCtEliMbmRi/7yhj95PnQfurC3OrVquCOeFY2+Mh4LvbncZeag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmQ32v8z17m5; Sat, 5 Oct 2024 07:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BIMb001208; Sat, 5 Oct 2024 07:11:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BIYB001205; Sat, 5 Oct 2024 07:11:18 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:18 GMT Message-Id: <202410050711.4957BIYB001205@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: a8c663bb4261 - stable/14 - pipespace_new(): decrease uidinfo pipebuf usage if reservation check failed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a8c663bb42612afb58965c091846ee026bc702fc Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c663bb42612afb58965c091846ee026bc702fc commit a8c663bb42612afb58965c091846ee026bc702fc Author: Konstantin Belousov AuthorDate: 2024-09-20 12:58:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 pipespace_new(): decrease uidinfo pipebuf usage if reservation check failed (cherry picked from commit 40769168a5ee227b96ea91768555eef332a0dc26) --- sys/kern/sys_pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 380bc165cef5..20bedd665ca5 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -596,6 +596,7 @@ retry: if (priv_check(curthread, PRIV_PIPEBUF) != 0 && maxpipekva / 100 * (100 - pipebuf_reserv) < amountpipekva + size) { vm_map_unlock(pipe_map); + chgpipecnt(cpipe->pipe_pair->pp_owner->cr_ruidinfo, -size, 0); if (cpipe->pipe_buffer.buffer == NULL && size > SMALL_PIPE_SIZE) { size = SMALL_PIPE_SIZE; From nobody Sat Oct 5 07:11:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmT1ZpCz5XrPk; Sat, 05 Oct 2024 07:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmS60QCz4NPG; Sat, 5 Oct 2024 07:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3ii8knhvh4rRMANC3hS1X44xhMSSeEQ9ztiPjpPBT0=; b=JhwcGqu2CJZ3m3eCAtC4ZZDTa5Zl6tKvzSGEJ4xxfCBqUTocP6FUztD91q2RLVW/djYCmJ qisrKrdxpSkC9hLrwdr8/W9GWPsQqlvrcK1nIjyH7qASS/E1VgIaEVu+9QcuWJarnvcpFa iNfDVdncxBhylV8Go96uk4Ng1CNhOv084YMJYryN5ddmaukC8YKUqoUoSC0O5H33+GbG7D EHcYAPMq7bfDuvWPFiwQdIlLDMpjq4b+771cKp6/aN+hZKv0GBxhyjHQz1wLulHhi3jZll 0WRS9JnFHdT0X6kLh9CT3RFaU89Va6dgNT6W9oQ+DQVNGw/otyDaOUpLpB9OoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3ii8knhvh4rRMANC3hS1X44xhMSSeEQ9ztiPjpPBT0=; b=n0htbbnuCMDjiVf8i2352AKS/6m/y4YJgiOH90ra0z0URRvS4q9uCo7CLgxk0EA49I3aYk tc2mroOIKJI9nbjbZhHmSlhhEsZWJe8F7WpgGD4lgLPTYEpIYO9TcGkXMiONWAPIozuPIP Z34zCx28aFVfpF7V0jyZmIAkI2BYdA2cBMJ3nN2TTaWtjSPLKalndNhIBANsyLFvZnfcqG ltDHX/D+I3cfwDs4+vO3JqbzuCm/csxhNLm4vSHJrBvCk95Loa7ENT8kjjW+RG4jLX5c4f vs5oxGNJL7/iDbchNwJKBCxqGWD5L4rD7V6evLTV3dLCgHuHki40K6QCAuGQvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112280; a=rsa-sha256; cv=none; b=XzTi3zy0TIO680gc6lYcVdmwtqvDKByt9OZCtBY42jXpcUbUk1xv1bv4c36G1E13CMypJm lE1T6iGYyzSYsj/p0ycL3L4lh59ty41yqGVVrB+AKyURDq8orV7syCRwc8UkB4LMPoh7vF OFOapMvUQKo52uy1fWEAUQQwe258BdAwEt+OsKJrye+tjHZ5FE4wJCYHobuEiz8azAOoeD waBC+TacvRM/HIzinknIOVqsbYY1H++sVhxkAKiXSd3ehd9z9tQeErhVvxdbBdjSlkS/3r MCWtvMsAwHS3HzbaPkSM4tg9XOZd3ZsdWTHH/KcYMkzYmad7YyZhy+tkoyu2zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmS5TjFz1861; Sat, 5 Oct 2024 07:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BKtU001310; Sat, 5 Oct 2024 07:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BKfa001307; Sat, 5 Oct 2024 07:11:20 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:20 GMT Message-Id: <202410050711.4957BKfa001307@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: 4a337ee7ef4c - stable/14 - uifree(9): report non-zero values for all shared resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a337ee7ef4cdf1492dd5d79e80434d8e68e233a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4a337ee7ef4cdf1492dd5d79e80434d8e68e233a commit 4a337ee7ef4cdf1492dd5d79e80434d8e68e233a Author: Konstantin Belousov AuthorDate: 2024-09-20 18:48:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 uifree(9): report non-zero values for all shared resources (cherry picked from commit af96ccc6a5083ae9ed62dbb1d72674ca75948707) --- sys/kern/kern_resource.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index f3755d625572..6b9930962859 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1513,6 +1513,18 @@ uifree(struct uidinfo *uip) if (uip->ui_vmsize != 0) printf("freeing uidinfo: uid = %d, swapuse = %lld\n", uip->ui_uid, (unsigned long long)uip->ui_vmsize); + if (uip->ui_ptscnt != 0) + printf("freeing uidinfo: uid = %d, ptscnt = %ld\n", + uip->ui_uid, uip->ui_ptscnt); + if (uip->ui_kqcnt != 0) + printf("freeing uidinfo: uid = %d, kqcnt = %ld\n", + uip->ui_uid, uip->ui_kqcnt); + if (uip->ui_umtxcnt != 0) + printf("freeing uidinfo: uid = %d, umtxcnt = %ld\n", + uip->ui_uid, uip->ui_umtxcnt); + if (uip->ui_pipecnt != 0) + printf("freeing uidinfo: uid = %d, pipecnt = %ld\n", + uip->ui_uid, uip->ui_pipecnt); free(uip, M_UIDINFO); } From nobody Sat Oct 5 07:11:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmR0Ysxz5XrRh; Sat, 05 Oct 2024 07:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmP2Qg3z4NNv; Sat, 5 Oct 2024 07:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CF9xFNOUrJJlLg2uEOkJ0Rl2ZjPjWPse0JCHC+ielwg=; b=mBqzuk2XWzj6SY8YYjkSXzXUsBU45Do9bbapRyGzh4tORnfrX2YHDF0ymLZTUY11mZxXm3 7XhgpMVoLK2PZdDLPYFjyBWISMQNFW4g7xiUFB8DlzbOAm6S4wtrHN5jXDGx41HhMdQm5x ouByBJFRDsngqpHS2DgTeNnpGzF9mOz0XrweQevNcp0rVeB33HmCrFDDyZB3+LSfgHf5SO TQESQzWrtKzVx/wBNJAYnQ8rWcM3vkGzQBWgTUkZCP3z4xfxl1RFaQ7DH+eRgjEhpskFXI 7rPbESGetPPLsZXbDVTAd5QCQ0EpU0EzmgAKI1v3SSh3GCIul08ZniIKMG9kwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CF9xFNOUrJJlLg2uEOkJ0Rl2ZjPjWPse0JCHC+ielwg=; b=AIhSQA8BUem6bJngOj95nTzuczm73PyHuSv2HWobO8VJDK4g4jAGOD8fBgNQWt1V42jqiV b+n4b2TGwIY6iQRmuygbRCgJHWs3gvXZp2hpgbm3ZYEbdh8N18ChWp+s+gwL8gPdd+5sC/ UDIyp0j+MUFb+aqUzNgwwKjfdejjBb8ODDFXAXFL0Zaa6omJarKcTq5rZOsZy73ya+nkUk pVdx/ts5N3RtiOO/t0RFpvdin5Mi13qqf+tEV90tPT/r0ciTJuWChNE3C4PZO/SpcIEyEW znTJ79TzoGOFFODMHBUe0/bXu5Tpzw9lpxzPW40tmwpUmTWBUt0xIHAClzLywA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112277; a=rsa-sha256; cv=none; b=JvWISdFZeo+LnLcyKG1jqAo3PAqJ0L3ML2HyDFW1Q/AXDM7KltrLef2/o/bL6NnVbvvwcc XoYFTSVOZ49RgFrUgiA+WSe2fWzhviHjOVNRSGQsgAMBr3kdZ6Ytn7Vh3oeRSSyjhCZbUC InvtKpM1L+R19lz/Yd6QHxtAKgCiM/waVl0oENn3tfdSGG0OGAyOMiXxs83ZJTkjX36l5U rUEGQh1mcGZmL6oCLdp6X5Q42ii/meZaBmmWGewGZFcbSBIaENe0pk0/jDWpOjgkHT2yD2 gLBoaaQIcncWUh2//EJ2QUB3wHBFOLk4JvSmvyMR3BgyPXyz09at3vls6lEzwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmP1sHsz17pH; Sat, 5 Oct 2024 07:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BHQB001154; Sat, 5 Oct 2024 07:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BH2v001151; Sat, 5 Oct 2024 07:11:17 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:17 GMT Message-Id: <202410050711.4957BH2v001151@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: 6536b979b856 - stable/14 - pipe: use pipe subsystem KVA counter instead of pipe_map size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6536b979b856096809d46e92039a7a51e0b646d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6536b979b856096809d46e92039a7a51e0b646d9 commit 6536b979b856096809d46e92039a7a51e0b646d9 Author: Konstantin Belousov AuthorDate: 2024-09-20 11:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 pipe: use pipe subsystem KVA counter instead of pipe_map size (cherry picked from commit d6074f73af5c813524022cf6ee7dab9c4cbe44be) --- sys/kern/sys_pipe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 2e5eafee9fa6..380bc165cef5 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -593,9 +593,8 @@ retry: } vm_map_lock(pipe_map); - if (priv_check(curthread, PRIV_PIPEBUF) != 0 && - (vm_map_max(pipe_map) - vm_map_min(pipe_map)) * - (100 - pipebuf_reserv) / 100 < pipe_map->size + size) { + if (priv_check(curthread, PRIV_PIPEBUF) != 0 && maxpipekva / 100 * + (100 - pipebuf_reserv) < amountpipekva + size) { vm_map_unlock(pipe_map); if (cpipe->pipe_buffer.buffer == NULL && size > SMALL_PIPE_SIZE) { From nobody Sat Oct 5 07:11:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmW2DDsz5XrPt; Sat, 05 Oct 2024 07:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmW0dR9z4NF1; Sat, 5 Oct 2024 07:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Cl5rPdnxEXBVYzR8PY8Y4iKKW8JiCyfjmNgRHYC9HA=; b=evb896bM6/34NBtfMu7SHq5Q18yTC6GBX7gbGBroyDuq2O/8Hp3lMRm2Shbbpn1Z0Gh4TE SBEQNb0oJo/caeFxYZTd89Vx3+aiMDTtbeVIb/0OdgnT6ehm1Hcv1r6v1aGVh5HLqI51Ju QNMu76djdqeLVgKd3rLswDfPTMKVMXh0q6HEv9BOynT7MhpZmJHS5tDeaZOQp6uNKN/o3W y4BEV+eHNqbrTvW/G7SqjY3LcIEoIs1186aYgObrEbSW7gq5sx/bctLY5DuYOJJ3L+U/Wn zWd3hg+0Br1ikb9Id+MjNqnkvPpllKAAiRCID55YaHX1eYypikgr+vqp0WIEag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Cl5rPdnxEXBVYzR8PY8Y4iKKW8JiCyfjmNgRHYC9HA=; b=wuKoW81SkcPNSudF/38BV9JUCvn8LpDMMFCo9NO6RwPnZH5wpDafj1RkwBz5sBA3sxtV9p QXIzYQO3xWnpYH+uBvie8INxV7XLQNA6KqTFlMo2AKYpSRpEBQS2ayAK4zcxWdYyWbicuc jtpZy6mDukBWSolCfhLm2ucb6Bu8p5OVOtx3aQKPVuZOe/2R3APnkq4bLq6VcnNtYzEthK 29Sn22mH3IlsPJJDt0zGIalqe9OyY/krXyAr+oQ0ShsbvJJuyyN6YdwTDMH06K0oD0uNLr rq7iOL1iRLCuP4p0sAfWR4ENJOF0liGCcjqihVPdKkuegjqrelwzRy0594BJng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112283; a=rsa-sha256; cv=none; b=PWJDoKfdLAORIX86YCBi0kRIn9rP8zTRPBgk1COS8XKYAsbtwNLK8rdzTn0NZWlbBcthE1 Twan6TPe8RumqcRiBuTbs1dx0UP8afTjF8QsDz4fGjj6FV16B/K3rBF1tpEkcveUMcjnXe 5ZfECLHZDiScHOx1epeG669nGDLFu/Mb9G8hj+YPvXEkrgB4R9SL83VvM3B/rRPWBizQZU p4ssjCHU/J66pgnS2JSE+BmGUp00+fvrtUs5QZO63uOHeaR6YOCrqJjO1OIMv2sOrZBZZJ +lAWp2RFDFsGcWLmehcxVfmOjQi4toE+TTs54eaoX7WSOH22asWevMm6EHqmXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmW0Fz8z1862; Sat, 5 Oct 2024 07:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BMZ6001399; Sat, 5 Oct 2024 07:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BM2p001396; Sat, 5 Oct 2024 07:11:22 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:22 GMT Message-Id: <202410050711.4957BM2p001396@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: e05087ee1c7b - stable/14 - Add proc_nfiles(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e05087ee1c7b850a331b8a326c9b21b05cfefa5e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e05087ee1c7b850a331b8a326c9b21b05cfefa5e commit e05087ee1c7b850a331b8a326c9b21b05cfefa5e Author: Konstantin Belousov AuthorDate: 2024-09-20 16:28:23 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 Add proc_nfiles(9) (cherry picked from commit 9c3e516ad08145ad47248633b54fd1b7fc0ef981) --- sys/kern/kern_descrip.c | 44 +++++++++++++++++++++++++++++++++----------- sys/sys/filedesc.h | 2 ++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 35e9afea4625..9036e3a25ab8 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4331,21 +4331,13 @@ filedesc_to_leader_share(struct filedesc_to_leader *fdtol, struct filedesc *fdp) } static int -sysctl_kern_proc_nfds(SYSCTL_HANDLER_ARGS) +filedesc_nfiles(struct filedesc *fdp) { NDSLOTTYPE *map; - struct filedesc *fdp; - u_int namelen; int count, off, minoff; - namelen = arg2; - if (namelen != 1) - return (EINVAL); - - if (*(int *)arg1 != 0) - return (EINVAL); - - fdp = curproc->p_fd; + if (fdp == NULL) + return (0); count = 0; FILEDESC_SLOCK(fdp); map = fdp->fd_map; @@ -4353,7 +4345,37 @@ sysctl_kern_proc_nfds(SYSCTL_HANDLER_ARGS) for (minoff = NDSLOT(0); off >= minoff; --off) count += bitcountl(map[off]); FILEDESC_SUNLOCK(fdp); + return (count); +} + +int +proc_nfiles(struct proc *p) +{ + struct filedesc *fdp; + int res; + + PROC_LOCK(p); + fdp = fdhold(p); + PROC_UNLOCK(p); + res = filedesc_nfiles(fdp); + fddrop(fdp); + return (res); +} + +static int +sysctl_kern_proc_nfds(SYSCTL_HANDLER_ARGS) +{ + u_int namelen; + int count; + + namelen = arg2; + if (namelen != 1) + return (EINVAL); + + if (*(int *)arg1 != 0) + return (EINVAL); + count = filedesc_nfiles(curproc->p_fd); return (SYSCTL_OUT(req, &count, sizeof(count))); } diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 06e086fba152..c0fb4e3834e1 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -337,6 +337,8 @@ fd_modified(struct filedesc *fdp, int fd, seqc_t seqc) } #endif +int proc_nfiles(struct proc *p); + /* cdir/rdir/jdir manipulation functions. */ struct pwddesc *pdcopy(struct pwddesc *pdp); void pdescfree(struct thread *td); From nobody Sat Oct 5 07:11:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmV5ysQz5XrYC; Sat, 05 Oct 2024 07:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmV1nGnz4NK0; Sat, 5 Oct 2024 07:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp+HnmCbfJyjg2EWEPy5kw0l/ZOWDj7MvhxcoYtN2w0=; b=WYGW5pfnMZiU88DXIIT/wG/y4wMWSD8mlv1CqK/xnFsNBcbV36fv3LKmjSTbkHg01J4+nG 4kt+Jlr1AAqqQZfvV85drMdhoJlsT0eUiBMN44jbQdUii1bOUIvbefW2uNvBalO9D8IzyN WkVAqrBQ7g3zys0G7Y3CBpmnGVt5ULPN5UNlMSoUUNOncS27A8Tu6GxiaaxkS0sVpihGvM DmhbMFvX8HLUAqQUrW7sX9kDAmgWrbnJphtgWBoEaV60ZuwM7VuKvp911T28UBOsliu3WZ KHz89x3Gui0eaflyXZGF/I5jEYv+GftZXWXwHkjjWlo3JxY4pax88l/cOBbCjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp+HnmCbfJyjg2EWEPy5kw0l/ZOWDj7MvhxcoYtN2w0=; b=Z/QsGb97miPtF+7MYp8lTo2E11UNBeMfhCnlBayeVJqdTrKhRdhYpeFjhJLa4QL1eImkqF ZE6dyIaj6FXQT4AVMMHKQEEdh5X4F8YvOuH4CDFuC6ZjxqP50hzi7NWwr57/kEr6H7mKNg +AQO99ur0S1ekg7b/J5sut2jkoEU9AIYr89PoCC8Qp/vICFmy1FMh4WaSO6rcU9v0L8+O0 bt11ZpX50n6vpU3rGYx08QPoidSh5xr24f8MUqp706TyW3Eab+zIsnHyQz/W7UzHJg9TvG CzZ9CCYrWOWYnGzfwJvIFttjPeFWTuHKhDbo+Vn87vm2wSG2zEcNIOWJzwzb5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112282; a=rsa-sha256; cv=none; b=IC5v+7L/sLWLC4wgd8Ky10yj9sw+LHE9YYrV8qn+/m28YcnHcHzkrbMhGYVo4DY/Ylg/FG MODmdYYDmHpBOD+0hA/qTPJUu7s6OhtZYpq/aukFY9tKj116vAyqw/A7xMOAAFlbm8h+7i s0n/Rkt5Ejlb66QQ2wIZ8N6ocQsJaHG6ZLl5nBcnXuj3PbO8Wkb3gYeYjVy/EjwEBhCd/E ER4Fz3YTAdB5YOGzMWdgwm2H0HqSQLsSiCG6uht/EUSrfkhn+ctkRdgFGE0HjJ4tsKVpk6 fYcTRN4iSS0MmFGvKDAywoELpB2u5yOPC1mRJjXunQY6qcWhela1GzCKIHEkUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmT6RQqz17pM; Sat, 5 Oct 2024 07:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BLJm001357; Sat, 5 Oct 2024 07:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BLgN001354; Sat, 5 Oct 2024 07:11:21 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:21 GMT Message-Id: <202410050711.4957BLgN001354@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: fc9070bf1d16 - stable/14 - procfs rlimit: handle pipebuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc9070bf1d16916de11f69dfc1011284d975040e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fc9070bf1d16916de11f69dfc1011284d975040e commit fc9070bf1d16916de11f69dfc1011284d975040e Author: Konstantin Belousov AuthorDate: 2024-09-20 15:04:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 procfs rlimit: handle pipebuf (cherry picked from commit 2c1963d46335576d29fe21a4e7b424c47b711ef4) --- sys/sys/resource.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 3b582e83d553..0c6b34f7ca0f 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -129,7 +129,7 @@ struct __wrusage { */ #ifdef _RLIMIT_IDENT -static const char *rlimit_ident[RLIM_NLIMITS] = { +static const char *rlimit_ident[] = { "cpu", "fsize", "data", @@ -145,6 +145,7 @@ static const char *rlimit_ident[RLIM_NLIMITS] = { "swap", "kqueues", "umtx", + "pipebuf", }; #endif From nobody Sat Oct 5 07:11:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmY074Mz5XrQ3; Sat, 05 Oct 2024 07:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmX1W5xz4NVb; Sat, 5 Oct 2024 07:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oic9JqzOrVEb0IAkdeSvIRgRXWLe+FegaWq7hSov1kc=; b=xtQs1kIcJY76f5Aj0USD9fRRWN0HK2WOiThRieERaQa74HgT0aHg/3C4fl6+E9+Tw6Ljg7 mTkl5iuVa4lOSd7/CVTFKoXQdII5Mfe6A9PX8d0ZjYInWLDeRBoRMoi5NzxidUeCzSeZJN Pe3NxGho/RhEwn7U3LU8NnsGV6FQPngWaCD+xludaGjj9JDAATBzGW2vhko5WxpqE1PlxZ R4nAZpL1v0aEYuo+/oSHd+aT6g83o6szJh4J5GLojW7ExvmFhbKED7VgFud8HbMzbQwLtL CQRPDEHlYjkeRLfRiLGJECTzRS00zZsTmxjxXn8W91iJsPa3AqrIdt49U5RlIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oic9JqzOrVEb0IAkdeSvIRgRXWLe+FegaWq7hSov1kc=; b=jf7bdfSfXUi6uyd8MUBYeZAA8MbfnZv3wz+89mSLtioAxJ2Dw4iB2Bn/49b1O1LTatgMKp JJHGOxUQWlBTmsq9678cwmW3U+iaBkSBDSnDsr5wZH6+ggBc3My9aW0Xr1GtvuuN7Ho8L6 bLV28GgttjnKlIv/IVel4Rmw+WSEehyyQiRNEVz+imJT2L61+RVkuRrU0DQDHbeSXYMWOt x/YQxFMORcKswrkgPjl18xnFtDbHQJ3m/bT1PRkc13tFFR7Cs/pDwkwvaqDjKbI7CjC3UL 7fwwA4x71aUfTB4iJpPQpa5zSiFaKVdb9WQazL1N+g1DhDq86WAGB/Jom1QLZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112284; a=rsa-sha256; cv=none; b=J3zndI6lfxYVIGYTaD7ayDGxrzlY7qyPmvoGkWuKu//c3aLkLVMnawrgFmCVOh0flBCeuZ 0IR3CgDEpwQ2g+Sox5x9ZFNzxhM1LoifM8rEFaI3sOkRBOidMJa4yjrVCLP8d59fv9RDlM lgxnp4ze+P8d3BqPtHCi9Oh6+g7EOYTMUR55gdvIXcm3qz79bFRVD5txReHCJ0HwcYcXz4 f/5cEUaE+hKw9FynkS2mz6LYTnfIF8P8uq7qjF0GC+o6SnYbXyyQ40Ya4ezgDM1Wuf6v2A sZzNuqKQlCwEEww9ul82w/7G+tGvxJZhB5Xv3I96yKpL1Eyx6nYAQFVdBEAvwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmX15xfz17j8; Sat, 5 Oct 2024 07:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BO9Q001432; Sat, 5 Oct 2024 07:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BO82001429; Sat, 5 Oct 2024 07:11:24 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:24 GMT Message-Id: <202410050711.4957BO82001429@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: 7c41d08320a1 - stable/14 - Add getrlimitusage(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c41d08320a18634a32bba727dc5f9f78086e746 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c41d08320a18634a32bba727dc5f9f78086e746 commit 7c41d08320a18634a32bba727dc5f9f78086e746 Author: Konstantin Belousov AuthorDate: 2024-09-20 15:18:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 Add getrlimitusage(2) (cherry picked from commit f028f44ef3cb10aafadf8b9f29954ed58bd88c70) --- sys/kern/kern_resource.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 7 +++ sys/sys/resource.h | 3 ++ 3 files changed, 125 insertions(+) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 6b9930962859..b4548b38f633 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +64,7 @@ #include #include #include +#include static MALLOC_DEFINE(M_PLIMIT, "plimit", "plimit structures"); static MALLOC_DEFINE(M_UIDINFO, "uidinfo", "uidinfo structures"); @@ -807,6 +809,119 @@ sys_getrlimit(struct thread *td, struct getrlimit_args *uap) return (error); } +static int +getrlimitusage_one(struct proc *p, u_int which, int flags, rlim_t *res) +{ + struct thread *td; + struct uidinfo *ui; + struct vmspace *vm; + uid_t uid; + int error; + + error = 0; + PROC_LOCK(p); + uid = (flags & GETRLIMITUSAGE_EUID) == 0 ? p->p_ucred->cr_ruid : + p->p_ucred->cr_uid; + PROC_UNLOCK(p); + + ui = uifind(uid); + vm = vmspace_acquire_ref(p); + + switch (which) { + case RLIMIT_CPU: + PROC_LOCK(p); + PROC_STATLOCK(p); + FOREACH_THREAD_IN_PROC(p, td) + ruxagg(p, td); + *res = p->p_rux.rux_runtime; + PROC_STATUNLOCK(p); + PROC_UNLOCK(p); + *res /= cpu_tickrate(); + break; + case RLIMIT_FSIZE: + error = ENXIO; + break; + case RLIMIT_DATA: + if (vm == NULL) + error = ENXIO; + else + *res = vm->vm_dsize * PAGE_SIZE; + break; + case RLIMIT_STACK: + if (vm == NULL) + error = ENXIO; + else + *res = vm->vm_ssize * PAGE_SIZE; + break; + case RLIMIT_CORE: + error = ENXIO; + break; + case RLIMIT_RSS: + if (vm == NULL) + error = ENXIO; + else + *res = vmspace_resident_count(vm) * PAGE_SIZE; + break; + case RLIMIT_MEMLOCK: + if (vm == NULL) + error = ENXIO; + else + *res = pmap_wired_count(vmspace_pmap(vm)) * PAGE_SIZE; + break; + case RLIMIT_NPROC: + *res = ui->ui_proccnt; + break; + case RLIMIT_NOFILE: + *res = proc_nfiles(p); + break; + case RLIMIT_SBSIZE: + *res = ui->ui_sbsize; + break; + case RLIMIT_VMEM: + if (vm == NULL) + error = ENXIO; + else + *res = vm->vm_map.size; + break; + case RLIMIT_NPTS: + *res = ui->ui_ptscnt; + break; + case RLIMIT_SWAP: + *res = ui->ui_vmsize; + break; + case RLIMIT_KQUEUES: + *res = ui->ui_kqcnt; + break; + case RLIMIT_UMTXP: + *res = ui->ui_umtxcnt; + break; + case RLIMIT_PIPEBUF: + *res = ui->ui_pipecnt; + break; + default: + error = EINVAL; + break; + } + + vmspace_free(vm); + uifree(ui); + return (error); +} + +int +sys_getrlimitusage(struct thread *td, struct getrlimitusage_args *uap) +{ + rlim_t res; + int error; + + if ((uap->flags & ~(GETRLIMITUSAGE_EUID)) != 0) + return (EINVAL); + error = getrlimitusage_one(curproc, uap->which, uap->flags, &res); + if (error == 0) + error = copyout(&res, uap->res, sizeof(res)); + return (error); +} + /* * Transform the running time and tick information for children of proc p * into user and system time usage. diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 47b67e4dbaa7..825ab1a4536c 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3347,5 +3347,12 @@ uintptr_t idx2 ); } +589 AUE_NULL STD|CAPENABLED { + int getrlimitusage( + u_int which, + int flags, + _Out_ rlim_t *res + ); + } ; vim: syntax=off diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 0c6b34f7ca0f..77119a1e5302 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -173,6 +173,9 @@ struct loadavg { #define CP_IDLE 4 #define CPUSTATES 5 +/* getrlimitusage flags */ +#define GETRLIMITUSAGE_EUID 0x0001 + #endif /* __BSD_VISIBLE */ #ifdef _KERNEL From nobody Sat Oct 5 07:11:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmY64ycz5XrdN; Sat, 05 Oct 2024 07:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmY3TLdz4NVv; Sat, 5 Oct 2024 07:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3zj1mUZyM7EGdCkntHqWPeFZd74/KbFjh9xVvuaqjM=; b=Z3J1tHUdbpfa9eungijSUHRwY4sUE9nX0/wymb07KNCfPBKRfBjVfXdgnBGE/hIOdJkOOd a6Bhw6/47vm2YT/2mFVOWaabM6ojYxkDrrRsUj7vfgUr0mpXFGV+Y0vJiW2kqRgnR3F0bv R5iIpECTqg/+kw37Agdyu4N2NGfifcN+M6Ls9H9YHgwbnKzwkr6tgZMTtdR4a6V+XxsuWF LoVDsu33UTEmiqirqnN3cQaIqku4rzWz9RyhUwziTxHKE5es+SVRWfovSxn8i/Hi564+XH 9f/exsYi9m//wgblTARiG/JzdzECqNX1K0/j2uJMO46MiCp4cfR0WMGFBdCF+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3zj1mUZyM7EGdCkntHqWPeFZd74/KbFjh9xVvuaqjM=; b=G1wjepOwR1IXaILYa8NB7s3tsPHXP4l2Jggvvuw8qKLcfFzV8WR4slva0LDsW2ItdEEOay 2+oqMJe4E+2q6/I+SrCKjxdaWH7BbvaKT42DCVASUySJUVg4WUgPMn7E6ziUs0bU6i8V06 xE6CIgynspGjEccp5Eo1CoADGuhzgvvBOVJDdknZZSIed14t164OcErd8fRXHahmgiWFPH wigLgTm90/YQDBcSnkI2IxA1wdRe/SmvgCpxNfYAhB+tiuPRcL5OIsLAuSQc9CJLVzQ2Ij HltpMsw0sMQT9A4kE+YMWrdeH3x6A3yB6chbt6Tg1b6pzHdi8AYyt25NpKgIdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112285; a=rsa-sha256; cv=none; b=enrWDpSoCRGRsdmlzCqJQSPRDGsFg/ST85iKfu/ZwOIZpSTfc5XPRKgmbkdkD3ew9FJKUV jn5TGA2ZgyJu0HhmUsm589ziMBv35VrjPWNbGNsVfUfLfHbp+Laf1NmVi7eYWupGnNsxai l0QOtCC6gYVigAtDD9ynhnJh1hB3rYo5hopW+bYBZggSQ5xM0H3UqNp+Z867UIvDeBMVFC wN4U1YEnASaNq1GzeJ2ozWemGSi9VHvlDAfiFJXUWa+/m4WdpaSaLxbLTk7Jxup/huMLFu Mf960RsTdqHpxwvbvvWphocqXq78N9vZqeWyNRdo/Hj6DgbDN9n1xi8iWADT7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmY2Lnsz18Hb; Sat, 5 Oct 2024 07:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BPYA001472; Sat, 5 Oct 2024 07:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BPZt001469; Sat, 5 Oct 2024 07:11:25 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:25 GMT Message-Id: <202410050711.4957BPZt001469@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: dac3b7e394fd - stable/14 - Userspace enablement for getrlimitusage(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dac3b7e394fdf98fdea05608e80f2b24f5ba8e9e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dac3b7e394fdf98fdea05608e80f2b24f5ba8e9e commit dac3b7e394fdf98fdea05608e80f2b24f5ba8e9e Author: Konstantin Belousov AuthorDate: 2024-09-20 15:22:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:55 +0000 Userspace enablement for getrlimitusage(2) (cherry picked from commit 9b29fc89ae20a22516f54e146bfdfa0cfcd60b8b) --- lib/libc/sys/Symbol.map | 3 ++- sys/sys/resource.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 6c79f89016d1..d6126fd952fd 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -425,7 +425,8 @@ FBSD_1.7 { }; FBSD_1.8 { - kcmp; + getrlimitusage; + kcmp; }; FBSDprivate_1.0 { diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 77119a1e5302..cb36c505beca 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -192,6 +192,9 @@ int getrlimit(int, struct rlimit *); int getrusage(int, struct rusage *); int setpriority(int, int, int); int setrlimit(int, const struct rlimit *); +#if __BSD_VISIBLE +int getrlimitusage(unsigned which, int flags, rlim_t *res); +#endif __END_DECLS #endif /* _KERNEL */ From nobody Sat Oct 5 07:11:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmb6Dxpz5XrVB; Sat, 05 Oct 2024 07:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmb4R6qz4NQp; Sat, 5 Oct 2024 07:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ciE7+qpZ40fYjwJAkNgfOt1SCq+jOEA1x/G965FyEsk=; b=E718+EVaextippSd+xWNcP8N5b9Xl0tKYQbKoSYXHxFQkRC+gs+89Gsk2OXwWyrHfbXZ9V CHnC1vvmgy4cTxZsxQgMnmXdyiGT5g/a7/YByhVtkoRtHxrpLQ3A/+zqIRv2KgnX7QjKe1 oDUaFY5dEBfFTGCoRI2QBstpA+ZwiOEaG/9xZ+5XgWjieR5n1u4uiDYHARC6kJ+r7ta1KR S/COadMQBL8FMJZUesRiszQV/ipvo0gOfnh8uTlIxawbJI/EHTlqIkgJ4lFI7oYv8dvKZY V73IjKlRj7dmJeLC3NHEmeIKzcxlnC4FBqkiAzq9jbgsesx+sr+0Pg60Kuw7/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ciE7+qpZ40fYjwJAkNgfOt1SCq+jOEA1x/G965FyEsk=; b=lvr/0R+L4NnApM33h1qAa8fIlzGeIkW7qs52sfDGfP8W/nP3h30o3/SsMG+8lZhMsJGKp7 3p3dnu/C74KYmxNyonDJXYYlG/CTQGHyw4zXdwYJMD5tq2teqJFIpJA/sn5GcZPPkageL7 /Bti9NMnmmLr2WSnRN6K2vBdBbLx7SSoNTyapE47MYUiKTRrzcvbbmJ6Uvml129ONMMU/o oZOtWetNPgD2P1GgveDvl+ZNnQesWGqkCjCoFElpOWM9oSUYrTkEtHh84vE4eypoemPpJg x4yL2uqKuOV+7enzZrDXuSK3oyN1bunxx/nn+QMQ+9TaLmf1KJ9SjPYGHnH15g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112287; a=rsa-sha256; cv=none; b=MgolJv/w3TMPm83u92uGSKiXnAw/ZY7kEGYeJwA8m0++arz5wSKw0WjmB6KkRJgvjtshWk FW6IhBi8B9sarMW0KNSlqghNxyxyMhSNzIDBj5gWMb1MJHTJZYI0fXnlUKCuTjKF5bA/pC sm1FqhKIiFtpEi1xt+2ikMjGFk9S4jmK6dtOV2EH/1hsm2y8pJTY4ZfLoMOvAA3Xh5DIhW UfMw6rXcdcizQdQkMtIz0OWz0MgKJ7GpMOuiMdqYD5D0QRH6aeRN2UNTZG51yPyuhy66gD etJS4iwotzHG4On+jhWa9YPFbEcRTFIneeembFpTjwbNFcAK2XXoIc+fwsZm0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmb42vyz17mC; Sat, 5 Oct 2024 07:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BRwg001546; Sat, 5 Oct 2024 07:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BRMN001543; Sat, 5 Oct 2024 07:11:27 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:27 GMT Message-Id: <202410050711.4957BRMN001543@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: d9aa256201b8 - stable/14 - sysctl: add KERN_PROC_RLIMIT_USAGE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9aa256201b8d149907d490029d5a3ea123a3d89 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d9aa256201b8d149907d490029d5a3ea123a3d89 commit d9aa256201b8d149907d490029d5a3ea123a3d89 Author: Konstantin Belousov AuthorDate: 2024-09-22 17:01:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 sysctl: add KERN_PROC_RLIMIT_USAGE (cherry picked from commit c85d3064c454bde9f1c0cfbb6f42c0ac9fa229e9) --- sys/kern/kern_resource.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/sysctl.h | 1 + 2 files changed, 51 insertions(+) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index b4548b38f633..9729bf987aa6 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1744,3 +1744,53 @@ chgpipecnt(struct uidinfo *uip, int diff, rlim_t max) return (chglimit(uip, &uip->ui_pipecnt, diff, max, "pipecnt")); } + +static int +sysctl_kern_proc_rlimit_usage(SYSCTL_HANDLER_ARGS) +{ + rlim_t resval[RLIM_NLIMITS]; + struct proc *p; + size_t len; + int error, *name, i; + + name = (int *)arg1; + if ((u_int)arg2 != 1 && (u_int)arg2 != 2) + return (EINVAL); + if (req->newptr != NULL) + return (EINVAL); + + error = pget((pid_t)name[0], PGET_WANTREAD, &p); + if (error != 0) + return (error); + + if ((u_int)arg2 == 1) { + len = sizeof(resval); + memset(resval, 0, sizeof(resval)); + for (i = 0; i < RLIM_NLIMITS; i++) { + error = getrlimitusage_one(p, (unsigned)i, 0, + &resval[i]); + if (error == ENXIO) { + resval[i] = -1; + error = 0; + } else if (error != 0) { + break; + } + } + } else { + len = sizeof(resval[0]); + error = getrlimitusage_one(p, (unsigned)name[1], 0, + &resval[0]); + if (error == ENXIO) { + resval[0] = -1; + error = 0; + } + } + if (error == 0) + error = SYSCTL_OUT(req, resval, len); + PRELE(p); + return (error); +} +static SYSCTL_NODE(_kern_proc, KERN_PROC_RLIMIT_USAGE, rlimit_usage, + CTLFLAG_RD | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, + sysctl_kern_proc_rlimit_usage, + "Process limited resources usage info"); diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 0cfa2a7bd245..a446d6701cfa 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1042,6 +1042,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); #define KERN_PROC_NFDS 43 /* number of open file descriptors */ #define KERN_PROC_SIGFASTBLK 44 /* address of fastsigblk magic word */ #define KERN_PROC_VM_LAYOUT 45 /* virtual address space layout info */ +#define KERN_PROC_RLIMIT_USAGE 46 /* array of rlim_t */ /* * KERN_IPC identifiers From nobody Sat Oct 5 07:11:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmZ73Nzz5XrjS; Sat, 05 Oct 2024 07:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmZ3nC5z4NS9; Sat, 5 Oct 2024 07:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOSsNA5zMhu5sYrDRpwa50zep3kdLV7YM0zWuR6n5jI=; b=HJsMEww+AePu9+11p2ZfjhdDL2HpeAGFBMLbu3GaiOmSA4AaOvq/y8JSGvADhCl9fUt5Jd AjdpZgUVeOts17ReL7IZNn2NW+Fddjho/3o7Bdy5NZCCqB2JfiMu/+rQRikJL4g6Sx8Q2u up/8HGfJW/Kwu+d54f/DMi2NTBllF9mWpBdUgrG+eSxznCTU9arTHDDHN4RWx6fQx/MI2C gPg667xJhtpKgmAnQjgMmHEr+LmrZUwhh1aFCMCzch5J/XexfG+pjm8aVFRlNk9Ju4mXBq qzyGhClw6kvsh3Rz3Kw0cpmwTmbfG8WFDZs4PKlkfi/wJSP/YeVVRVRo75M33w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOSsNA5zMhu5sYrDRpwa50zep3kdLV7YM0zWuR6n5jI=; b=KT36adeCUdMnxaH9t5xcdQbZBC0J8+dun+Rm5JymJ3XJSsy+sD0AHAzpAknapf7zCBCMbS 2ewz5OLD89YAlwyQkc8NV23L+AUz4DfTbwk1rCPQGTNQn67aX+maZKhmh+t545Mn1X7XTg UJkPMAaNnvLq69IBDRSgCfXjZUP7CRzL1OSsrLzlv8SYvjhAKeyTJWtuu0DSagKAj2p4Xs dh9v/Q2NpY1RNQp/p9vj9tLap0nnxknbtPmuejbbr/XHbnIfHgy59JCgIyh2GXGBI8V6Mt 4FWWoYhkTNHjUcMFB2rkeG1AKo0k72wryePDL3+3g9EtIdiCpQ7n5l2CZR/fig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112286; a=rsa-sha256; cv=none; b=MGnF7OwWPVsrRVyCdvY5N1V4pxP5Jbc3Sf9MnAp1PWOjwLjlvsqcSCboFQrvzUpKUBdOO/ JycwUvaPcb1X+qodfEKQlubs69yqnCb9gFKnN4oeYZCFSuncQ6GfOYV09NFLpf6IDznLaZ RzYzq5T/B0YKBHwBsNN93TbbWt1qw0BkGXI47lZXD1qctgUbdQo+Nh42FM4XbHS1DdmIbF Ax3s5MB2Y7H9byQAAh4yBiMaNBoUM8P70LmafDIrsBRmb/8GKEQz7cUrUzL5+VMAmeuezj zGFOuIIk2Cgb/3IheqTAhrzFzlCKWYlg0njmoNx5DfGPKLXvWqFjNFZiqZxN3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmZ3NdRz17pN; Sat, 5 Oct 2024 07:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BQIo001502; Sat, 5 Oct 2024 07:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BQEk001499; Sat, 5 Oct 2024 07:11:26 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:26 GMT Message-Id: <202410050711.4957BQEk001499@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: a23e9b154d67 - stable/14 - Regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a23e9b154d677c20515d5d640d5c8e6dd8628a74 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a23e9b154d677c20515d5d640d5c8e6dd8628a74 commit a23e9b154d677c20515d5d640d5c8e6dd8628a74 Author: Konstantin Belousov AuthorDate: 2024-09-27 15:06:33 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 Regen --- sys/compat/freebsd32/freebsd32_syscall.h | 3 ++- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 30 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 30 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 7 ++++++ 10 files changed, 77 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 26b47e766d4a..01c1a5c515d8 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -507,4 +507,5 @@ #define FREEBSD32_SYS_freebsd32_timerfd_gettime 586 #define FREEBSD32_SYS_freebsd32_timerfd_settime 587 #define FREEBSD32_SYS_kcmp 588 -#define FREEBSD32_SYS_MAXSYSCALL 589 +#define FREEBSD32_SYS_getrlimitusage 589 +#define FREEBSD32_SYS_MAXSYSCALL 590 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 8511d56552e6..6d50f7c03626 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -594,4 +594,5 @@ const char *freebsd32_syscallnames[] = { "freebsd32_timerfd_gettime", /* 586 = freebsd32_timerfd_gettime */ "freebsd32_timerfd_settime", /* 587 = freebsd32_timerfd_settime */ "kcmp", /* 588 = kcmp */ + "getrlimitusage", /* 589 = getrlimitusage */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index df4ec684ccb1..3d4916427475 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -650,4 +650,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(freebsd32_timerfd_gettime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = freebsd32_timerfd_gettime */ { .sy_narg = AS(freebsd32_timerfd_settime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = freebsd32_timerfd_settime */ { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */ + { .sy_narg = AS(getrlimitusage_args), .sy_call = (sy_call_t *)sys_getrlimitusage, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 589 = getrlimitusage */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 8bf3c29ecdbd..8f7d9edadfee 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3382,6 +3382,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 5; break; } + /* getrlimitusage */ + case 589: { + struct getrlimitusage_args *p = params; + uarg[a++] = p->which; /* u_int */ + iarg[a++] = p->flags; /* int */ + uarg[a++] = (intptr_t)p->res; /* rlim_t * */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9134,6 +9143,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* getrlimitusage */ + case 589: + switch (ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "userland rlim_t *"; + break; + default: + break; + }; + break; default: break; }; @@ -11027,6 +11052,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* getrlimitusage */ + case 589: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 319ced33efbd..e740d6ef1b72 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -649,4 +649,5 @@ struct sysent sysent[] = { { .sy_narg = AS(timerfd_gettime_args), .sy_call = (sy_call_t *)sys_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = timerfd_gettime */ { .sy_narg = AS(timerfd_settime_args), .sy_call = (sy_call_t *)sys_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = timerfd_settime */ { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */ + { .sy_narg = AS(getrlimitusage_args), .sy_call = (sy_call_t *)sys_getrlimitusage, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 589 = getrlimitusage */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 552d94f0d439..f21cdd66b3cf 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -594,4 +594,5 @@ const char *syscallnames[] = { "timerfd_gettime", /* 586 = timerfd_gettime */ "timerfd_settime", /* 587 = timerfd_settime */ "kcmp", /* 588 = kcmp */ + "getrlimitusage", /* 589 = getrlimitusage */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 33b723ae0c36..dd2f7a43ee78 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3469,6 +3469,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 5; break; } + /* getrlimitusage */ + case 589: { + struct getrlimitusage_args *p = params; + uarg[a++] = p->which; /* u_int */ + iarg[a++] = p->flags; /* int */ + uarg[a++] = (intptr_t)p->res; /* rlim_t * */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9279,6 +9288,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* getrlimitusage */ + case 589: + switch (ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "userland rlim_t *"; + break; + default: + break; + }; + break; default: break; }; @@ -11262,6 +11287,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* getrlimitusage */ + case 589: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 3cff10924501..2283d5bf9998 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -525,4 +525,5 @@ #define SYS_timerfd_gettime 586 #define SYS_timerfd_settime 587 #define SYS_kcmp 588 -#define SYS_MAXSYSCALL 589 +#define SYS_getrlimitusage 589 +#define SYS_MAXSYSCALL 590 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 98aa9e370d0a..901f81384561 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -430,4 +430,5 @@ MIASM = \ timerfd_create.o \ timerfd_gettime.o \ timerfd_settime.o \ - kcmp.o + kcmp.o \ + getrlimitusage.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index d96acfc47f91..f96d541aa030 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1883,6 +1883,11 @@ struct kcmp_args { char idx1_l_[PADL_(uintptr_t)]; uintptr_t idx1; char idx1_r_[PADR_(uintptr_t)]; char idx2_l_[PADL_(uintptr_t)]; uintptr_t idx2; char idx2_r_[PADR_(uintptr_t)]; }; +struct getrlimitusage_args { + char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char res_l_[PADL_(rlim_t *)]; rlim_t * res; char res_r_[PADR_(rlim_t *)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2284,6 +2289,7 @@ int sys_timerfd_create(struct thread *, struct timerfd_create_args *); int sys_timerfd_gettime(struct thread *, struct timerfd_gettime_args *); int sys_timerfd_settime(struct thread *, struct timerfd_settime_args *); int sys_kcmp(struct thread *, struct kcmp_args *); +int sys_getrlimitusage(struct thread *, struct getrlimitusage_args *); #ifdef COMPAT_43 @@ -3259,6 +3265,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_timerfd_gettime AUE_TIMERFD #define SYS_AUE_timerfd_settime AUE_TIMERFD #define SYS_AUE_kcmp AUE_NULL +#define SYS_AUE_getrlimitusage AUE_NULL #undef PAD_ #undef PADL_ From nobody Sat Oct 5 07:11:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmd1f8Lz5XrpK; Sat, 05 Oct 2024 07:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmc5ZkRz4NYR; Sat, 5 Oct 2024 07:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lg8e5jfV/JmsrSgp5JUTDRib2RNNazs0ak7qMolin4E=; b=LCmcAniaNTU6c0Nsvm0ihd6TvtWQh9yFmtCrfYbz9gsEE5astvgPDthV+jxOR607EWkFMK BYwQIGiUPleBD4mcOhexyxGaWdnsxoUuyM+05ofMWofmRdEC+6okeD+LhHDwLn5a+R9EX6 e0RkZs/52w5YQZIZZiRaVNj/OHFe8YR9QoIGDPS4JN1++ySCfCqFcGKX+0AoEtln9EtE2r qpelm9iQ937rq7ynsVtBp4YBxu59jmte3gGPS+PWu3MiIaYlrxZ2nmuhJRU8ri0LJ2r8Be dMdOjd7ljybMGndVdP/8iQlKHWhWivYficQ5hzk/6LSqtXDBjjtPWEoB7eFWww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lg8e5jfV/JmsrSgp5JUTDRib2RNNazs0ak7qMolin4E=; b=ih2hVohF6nSmsmTmrFJPecr4AAZmYD/HqKzbuPx51MUWnhq4vp/RrGXYoT8EgxTuNr2AN2 kQz8G2hie+iEPBRe61jRXU9Dlgc1SHOVli9vRn5ScONvNCdkNwKu1dUV4ZdukciBdvGSFB GbaU07dZnKnPpEnXKsZsH5TTJXrAxeXQ4eHOgd7zZwvkXiLsrawOhjVmIV1eBdvtUN0mTA wmu/zay32YrHEfKoaPIgxqpbudn04sHIuT5U/HcX91iUtRstb03yEmX/KD2SqqNyhG7Ntf rotjA8VfPuyHhXlRCHf0SLURZWtKhc20GKN7xft7tDdb02Z5N46WMg64UiWIVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112288; a=rsa-sha256; cv=none; b=cT9Mxewoyf6xFIgSmnz+fzhJLzxwGD22ZHAWEQfKpPacqQVlaWfEZoHeJLR0aAfmwOGlKn 6vWjoaPt7BjSmfYBA6CU0aY+ccR6c4azEd5Fjg02FpTM2CXvh6PahXRD0IThsIctHM85oH p/VJ5GJPt3Mtzso6m0ywg/hM0l1BUtOMrM7NIVM8bNddMdBX363LfH57PDNXXChZKcf9z8 t2PF23K/cu8WV8EkJ2KIPDjKPJAJI+ypfp9q4GHlBD8yyBUHQmbtPiK1GY9Sb9uoMdbz4g eBf2I/IrEeBmCNROkHXLo/vStS2cNQn9o6EVW5+pA8/mW6Q+tEqVbn3F5W8fLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmc54lLz17jB; Sat, 5 Oct 2024 07:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BSjr001592; Sat, 5 Oct 2024 07:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BSfr001589; Sat, 5 Oct 2024 07:11:28 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:28 GMT Message-Id: <202410050711.4957BSfr001589@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: 1611738d4c4c - stable/14 - libprocstat: add procstat_getrlimitusage() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1611738d4c4c375ea79a5cc25dd4fa29670ad88c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1611738d4c4c375ea79a5cc25dd4fa29670ad88c commit 1611738d4c4c375ea79a5cc25dd4fa29670ad88c Author: Konstantin Belousov AuthorDate: 2024-09-22 17:19:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 libprocstat: add procstat_getrlimitusage() (cherry picked from commit 6126f4ea646a3c19647c3efdcf672641cff6954b) --- lib/libprocstat/Symbol.map | 5 ++++ lib/libprocstat/libprocstat.c | 53 +++++++++++++++++++++++++++++++++++++++++++ lib/libprocstat/libprocstat.h | 3 +++ 3 files changed, 61 insertions(+) diff --git a/lib/libprocstat/Symbol.map b/lib/libprocstat/Symbol.map index 4c8a0c7edefb..c2ea7e95312c 100644 --- a/lib/libprocstat/Symbol.map +++ b/lib/libprocstat/Symbol.map @@ -47,4 +47,9 @@ FBSD_1.6 { FBSD_1.7 { procstat_getadvlock; procstat_freeadvlock; +}; + +FBSD_1.8 { + procstat_getrlimitusage; + procstat_freerlimitusage; }; \ No newline at end of file diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index c6a225a021a7..fd9578e9f115 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2785,3 +2785,56 @@ procstat_freeadvlock(struct procstat *procstat __unused, free(lst); } +static rlim_t * +procstat_getrlimitusage_sysctl(pid_t pid, unsigned *cntp) +{ + int error, name[4]; + rlim_t *val; + size_t len; + + name[0] = CTL_KERN; + name[1] = KERN_PROC; + name[2] = KERN_PROC_RLIMIT_USAGE; + name[3] = pid; + + len = 0; + error = sysctl(name, nitems(name), NULL, &len, NULL, 0); + if (error == -1) + return (NULL); + val = malloc(len); + if (val == NULL) + return (NULL); + + error = sysctl(name, nitems(name), val, &len, NULL, 0); + if (error == -1) { + free(val); + return (NULL); + } + *cntp = len / sizeof(rlim_t); + return (val); +} + +rlim_t * +procstat_getrlimitusage(struct procstat *procstat, struct kinfo_proc *kp, + unsigned int *cntp) +{ + switch (procstat->type) { + case PROCSTAT_KVM: + warnx("kvm method is not supported"); + return (NULL); + case PROCSTAT_SYSCTL: + return (procstat_getrlimitusage_sysctl(kp->ki_pid, cntp)); + case PROCSTAT_CORE: + warnx("core method is not supported"); + return (NULL); + default: + warnx("unknown access method: %d", procstat->type); + return (NULL); + } +} + +void +procstat_freerlimitusage(struct procstat *procstat __unused, rlim_t *resusage) +{ + free(resusage); +} diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 3d30b4db4018..99c005ff24a7 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -212,6 +212,7 @@ void procstat_freefiles(struct procstat *procstat, struct filestat_list *head); void procstat_freeptlwpinfo(struct procstat *procstat, struct ptrace_lwpinfo *pl); +void procstat_freerlimitusage(struct procstat *procstat, rlim_t *resusage); void procstat_freevmmap(struct procstat *procstat, struct kinfo_vmentry *vmmap); struct advlock_list *procstat_getadvlock(struct procstat *procstat); @@ -251,6 +252,8 @@ int procstat_getpathname(struct procstat *procstat, struct kinfo_proc *kp, char *pathname, size_t maxlen); int procstat_getrlimit(struct procstat *procstat, struct kinfo_proc *kp, int which, struct rlimit* rlimit); +rlim_t *procstat_getrlimitusage(struct procstat *procstat, + struct kinfo_proc *kp, unsigned int *cntp); int procstat_getumask(struct procstat *procstat, struct kinfo_proc *kp, unsigned short* umask); struct kinfo_vmentry *procstat_getvmmap(struct procstat *procstat, From nobody Sat Oct 5 07:11:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmg2PRRz5Xrjj; Sat, 05 Oct 2024 07:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmg03F3z4NKn; Sat, 5 Oct 2024 07:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxPJgxPAXjvzHebxk0olVyNopZ2UZcKmf1mMGC1/mVk=; b=Xspcq4sYkyG2WPxR3xYoGUeUixnb1IORClR46gQwYHwlZllGnXq1hDqr5zjYWcQjErMzW5 yaGctnGi1QH21JITNR1lezZX+slxs6/8CGtAC+sUAKKyi4Us2keJZntnJ0VbRpmdz2yOf1 Q1wLa+06vkkI71foTzByu6t0j69sKBAPk+JBkVUvefdRcESh8iM974z/YA02W5FevmNUDl dZq1uqA2SuymdMGKFv3EZgZb7n/jYDNPeQDeEthv8zQ1AN9bEJTheFtSKiIf+Ir8X0KK8k OFgugZBfYU8WQNVWCJhjoG2WAlbWutu9YaZQFYyVHjfMKQPsfJFWlQDNrR73vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxPJgxPAXjvzHebxk0olVyNopZ2UZcKmf1mMGC1/mVk=; b=GDe/XHmTJoiNdkuEqX4pR1Z0FSsnidGJS5IqsQfkraeKDJQ63Pg0j/5PAjr7o7d5luZi9g rfF3W2H0Xirq3E4SP0Pfcy9kvhyyIx3SCIA3gmoT1Iu9ka0iuhiFmvQ+J9JMuVZUXIAxPO 7v15skuqBCZ/hVSRC7ZPx0afolkiLK3Xwvdd+aM0VXfUM/oiUogrRMvfdkIqfok/qALgnk v0EZmR+8YlvA77Gua62ay1F99Dn9tFR6jzuyWzDNP53d0CguvgOS8h+ES30BANpgn1a9ig oPMcam3aUG6yA+IA+TuvIe0vQJjCRo4y8w6wL/p7qe4HHRr3wRWwtKpnhD1msA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112291; a=rsa-sha256; cv=none; b=Jimz9CXgGcSSm/eA5rYLq96JStIcD0miVM6F4z0KPR2BPIen+PWM6NmeAXAB+vgOMxlomK yW5oyPBgKWj2Esk37O6WnhDMBut6BwIs1tN29KXkQ4XZ9ObERZY/bRAviGO9OfzYLDoWCW MiNeNBIVsdl1pNiXdqGBoZgrF9Yem+d4VE/IQGgf1JtndHXiFQxmytW4VLSTMvnSxZAuX2 7MYRXicQvE9BMBqk7KUuz4u3nhaYYiR4kbFICmxYVa6rGs1tp/uM+PwZ3WocMMy24sQNgg UGlpcAjZatuWZ9cvux/r3DWm0+HzaApjDJNOswWDe01UMjvrnPRW2TU79ZZNtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmf6Xmkz17jC; Sat, 5 Oct 2024 07:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BUVg001689; Sat, 5 Oct 2024 07:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BUuf001687; Sat, 5 Oct 2024 07:11:30 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:30 GMT Message-Id: <202410050711.4957BUuf001687@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: b0f2d76837dd - stable/14 - intel_idpgtbl.c: rename domain_* functions to dmar_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0f2d76837dd2a161721e9141885bca258e604ac Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0f2d76837dd2a161721e9141885bca258e604ac commit b0f2d76837dd2a161721e9141885bca258e604ac Author: Konstantin Belousov AuthorDate: 2024-09-25 01:38:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 intel_idpgtbl.c: rename domain_* functions to dmar_* (cherry picked from commit 10ebd230f4d9ed5c6406037972776666a2241107) --- sys/x86/iommu/intel_ctx.c | 6 ++-- sys/x86/iommu/intel_dmar.h | 6 ++-- sys/x86/iommu/intel_idpgtbl.c | 66 +++++++++++++++++++++---------------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 9d2d607d11a6..ade3f61328d7 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -400,7 +400,7 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped) if (id_mapped) { if ((dmar->hw_ecap & DMAR_ECAP_PT) == 0) { - domain->pgtbl_obj = domain_get_idmap_pgtbl(domain, + domain->pgtbl_obj = dmar_get_idmap_pgtbl(domain, domain->iodom.end); } domain->iodom.flags |= IOMMU_DOMAIN_IDMAP; @@ -865,7 +865,7 @@ dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free, iommu_domain_free_entry(entry, false); } } else { - domain_flush_iotlb_sync(domain, entry->start, entry->end - + dmar_flush_iotlb_sync(domain, entry->start, entry->end - entry->start); iommu_domain_free_entry(entry, free); } @@ -900,7 +900,7 @@ dmar_domain_unload(struct iommu_domain *iodom, entry->start, cansleep ? IOMMU_PGF_WAITOK : 0); KASSERT(error == 0, ("unmap %p error %d", domain, error)); if (!unit->qi_enabled) { - domain_flush_iotlb_sync(domain, entry->start, + dmar_flush_iotlb_sync(domain, entry->start, entry->end - entry->start); TAILQ_REMOVE(entries, entry, dmamap_link); iommu_domain_free_entry(entry, true); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 188e40dec36c..fcdc915abcfd 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -219,10 +219,10 @@ void dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit); void dmar_qi_invalidate_iec_glob(struct dmar_unit *unit); void dmar_qi_invalidate_iec(struct dmar_unit *unit, u_int start, u_int cnt); -vm_object_t domain_get_idmap_pgtbl(struct dmar_domain *domain, +vm_object_t dmar_get_idmap_pgtbl(struct dmar_domain *domain, iommu_gaddr_t maxaddr); -void put_idmap_pgtbl(vm_object_t obj); -void domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, +void dmar_put_idmap_pgtbl(vm_object_t obj); +void dmar_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size); int dmar_domain_alloc_pgtbl(struct dmar_domain *domain); void dmar_domain_free_pgtbl(struct dmar_domain *domain); diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 21b717f54f34..538d09649377 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -68,7 +68,7 @@ #include #include -static int domain_unmap_buf_locked(struct dmar_domain *domain, +static int dmar_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, int flags); /* @@ -107,7 +107,7 @@ static MALLOC_DEFINE(M_DMAR_IDPGTBL, "dmar_idpgtbl", * mapped by the page table page. */ static void -domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, +dmar_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, iommu_gaddr_t addr) { vm_page_t m1; @@ -126,7 +126,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, pg_sz = pglvl_page_size(tbl->pglvl, lvl); if (lvl != tbl->leaf) { for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) - domain_idmap_nextlvl(tbl, lvl + 1, base + i, f); + dmar_idmap_nextlvl(tbl, lvl + 1, base + i, f); } VM_OBJECT_WUNLOCK(tbl->pgtbl_obj); pte = iommu_map_pgtbl(tbl->pgtbl_obj, idx, IOMMU_PGF_WAITOK, &sf); @@ -148,7 +148,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, VM_PAGE_TO_PHYS(m1)) | DMAR_PTE_R | DMAR_PTE_W; } } - /* domain_get_idmap_pgtbl flushes CPU cache if needed. */ + /* dmar_get_idmap_pgtbl flushes CPU cache if needed. */ iommu_unmap_pgtbl(sf); VM_OBJECT_WLOCK(tbl->pgtbl_obj); } @@ -162,7 +162,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, * maxaddr is typically mapped. */ vm_object_t -domain_get_idmap_pgtbl(struct dmar_domain *domain, iommu_gaddr_t maxaddr) +dmar_get_idmap_pgtbl(struct dmar_domain *domain, iommu_gaddr_t maxaddr) { struct dmar_unit *unit; struct idpgtbl *tbl; @@ -232,7 +232,7 @@ domain_get_idmap_pgtbl(struct dmar_domain *domain, iommu_gaddr_t maxaddr) tbl->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(pglvl_max_pages(tbl->pglvl)), 0, 0, NULL); VM_OBJECT_WLOCK(tbl->pgtbl_obj); - domain_idmap_nextlvl(tbl, 0, 0, 0); + dmar_idmap_nextlvl(tbl, 0, 0, 0); VM_OBJECT_WUNLOCK(tbl->pgtbl_obj); LIST_INSERT_HEAD(&idpgtbls, tbl, link); res = tbl->pgtbl_obj; @@ -274,7 +274,7 @@ end: * Return a reference to the identity mapping page table to the cache. */ void -put_idmap_pgtbl(vm_object_t obj) +dmar_put_idmap_pgtbl(vm_object_t obj) { struct idpgtbl *tbl, *tbl1; vm_object_t rmobj; @@ -318,7 +318,7 @@ put_idmap_pgtbl(vm_object_t obj) */ static iommu_pte_t * -domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, +dmar_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags, vm_pindex_t *idxp, struct sf_buf **sf) { vm_page_t m; @@ -361,7 +361,7 @@ retry: vm_page_wire(m); sfp = NULL; - ptep = domain_pgtbl_map_pte(domain, base, lvl - 1, + ptep = dmar_pgtbl_map_pte(domain, base, lvl - 1, flags, &idx1, &sfp); if (ptep == NULL) { KASSERT(m->pindex != 0, @@ -386,7 +386,7 @@ retry: } static int -domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, +dmar_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags) { iommu_pte_t *pte; @@ -440,13 +440,13 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, ("mapping loop overflow %p %jx %jx %jx", domain, (uintmax_t)base, (uintmax_t)size, (uintmax_t)pg_sz)); KASSERT(pg_sz > 0, ("pg_sz 0 lvl %d", lvl)); - pte = domain_pgtbl_map_pte(domain, base, lvl, flags, &idx, &sf); + pte = dmar_pgtbl_map_pte(domain, base, lvl, flags, &idx, &sf); if (pte == NULL) { KASSERT((flags & IOMMU_PGF_WAITOK) == 0, ("failed waitable pte alloc %p", domain)); if (sf != NULL) iommu_unmap_pgtbl(sf); - domain_unmap_buf_locked(domain, base1, base - base1, + dmar_unmap_buf_locked(domain, base1, base - base1, flags); TD_PINNED_ASSERT; return (ENOMEM); @@ -463,7 +463,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, } static int -domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, +dmar_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, iommu_gaddr_t size, vm_page_t *ma, uint64_t eflags, int flags) { struct dmar_domain *domain; @@ -514,13 +514,13 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, KASSERT((flags & ~IOMMU_PGF_WAITOK) == 0, ("invalid flags %x", flags)); DMAR_DOMAIN_PGLOCK(domain); - error = domain_map_buf_locked(domain, base, size, ma, pflags, flags); + error = dmar_map_buf_locked(domain, base, size, ma, pflags, flags); DMAR_DOMAIN_PGUNLOCK(domain); if (error != 0) return (error); if ((unit->hw_cap & DMAR_CAP_CM) != 0) - domain_flush_iotlb_sync(domain, base, size); + dmar_flush_iotlb_sync(domain, base, size); else if ((unit->hw_cap & DMAR_CAP_RWBF) != 0) { /* See 11.1 Write Buffer Flushing. */ DMAR_LOCK(unit); @@ -530,12 +530,12 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, return (0); } -static void domain_unmap_clear_pte(struct dmar_domain *domain, +static void dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_fs); static void -domain_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, +dmar_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags) { struct sf_buf *sf; @@ -543,12 +543,12 @@ domain_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, vm_pindex_t idx; sf = NULL; - pde = domain_pgtbl_map_pte(domain, base, lvl, flags, &idx, &sf); - domain_unmap_clear_pte(domain, base, lvl, flags, pde, &sf, true); + pde = dmar_pgtbl_map_pte(domain, base, lvl, flags, &idx, &sf); + dmar_unmap_clear_pte(domain, base, lvl, flags, pde, &sf, true); } static void -domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, +dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_sf) { vm_page_t m; @@ -569,14 +569,14 @@ domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, ("lost reference (idx) on root pg domain %p base %jx lvl %d", domain, (uintmax_t)base, lvl)); iommu_pgfree(domain->pgtbl_obj, m->pindex, flags); - domain_free_pgtbl_pde(domain, base, lvl - 1, flags); + dmar_free_pgtbl_pde(domain, base, lvl - 1, flags); } /* * Assumes that the unmap is never partial. */ static int -domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, +dmar_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, int flags) { iommu_pte_t *pte; @@ -620,14 +620,14 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, pg_sz = domain_page_size(domain, lvl); if (pg_sz > size) continue; - pte = domain_pgtbl_map_pte(domain, base, lvl, flags, + pte = dmar_pgtbl_map_pte(domain, base, lvl, flags, &idx, &sf); KASSERT(pte != NULL, ("sleeping or page missed %p %jx %d 0x%x", domain, (uintmax_t)base, lvl, flags)); if ((pte->pte & DMAR_PTE_SP) != 0 || lvl == domain->pglvl - 1) { - domain_unmap_clear_pte(domain, base, lvl, + dmar_unmap_clear_pte(domain, base, lvl, flags, pte, &sf, false); break; } @@ -648,7 +648,7 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, } static int -domain_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, +dmar_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, iommu_gaddr_t size, int flags) { struct dmar_domain *domain; @@ -657,7 +657,7 @@ domain_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, domain = IODOM2DOM(iodom); DMAR_DOMAIN_PGLOCK(domain); - error = domain_unmap_buf_locked(domain, base, size, flags); + error = dmar_unmap_buf_locked(domain, base, size, flags); DMAR_DOMAIN_PGUNLOCK(domain); return (error); } @@ -701,7 +701,7 @@ dmar_domain_free_pgtbl(struct dmar_domain *domain) domain->pgtbl_obj = NULL; if ((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) != 0) { - put_idmap_pgtbl(obj); + dmar_put_idmap_pgtbl(obj); domain->iodom.flags &= ~IOMMU_DOMAIN_IDMAP; return; } @@ -717,7 +717,7 @@ dmar_domain_free_pgtbl(struct dmar_domain *domain) } static inline uint64_t -domain_wait_iotlb_flush(struct dmar_unit *unit, uint64_t wt, int iro) +dmar_wait_iotlb_flush(struct dmar_unit *unit, uint64_t wt, int iro) { uint64_t iotlbr; @@ -733,7 +733,7 @@ domain_wait_iotlb_flush(struct dmar_unit *unit, uint64_t wt, int iro) } void -domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, +dmar_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size) { struct dmar_unit *unit; @@ -747,7 +747,7 @@ domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, iro = DMAR_ECAP_IRO(unit->hw_ecap) * 16; DMAR_LOCK(unit); if ((unit->hw_cap & DMAR_CAP_PSI) == 0 || size > 2 * 1024 * 1024) { - iotlbr = domain_wait_iotlb_flush(unit, DMAR_IOTLB_IIRG_DOM | + iotlbr = dmar_wait_iotlb_flush(unit, DMAR_IOTLB_IIRG_DOM | DMAR_IOTLB_DID(domain->domain), iro); KASSERT((iotlbr & DMAR_IOTLB_IAIG_MASK) != DMAR_IOTLB_IAIG_INVLD, @@ -757,7 +757,7 @@ domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, for (; size > 0; base += isize, size -= isize) { am = calc_am(unit, base, size, &isize); dmar_write8(unit, iro, base | am); - iotlbr = domain_wait_iotlb_flush(unit, + iotlbr = dmar_wait_iotlb_flush(unit, DMAR_IOTLB_IIRG_PAGE | DMAR_IOTLB_DID(domain->domain), iro); KASSERT((iotlbr & DMAR_IOTLB_IAIG_MASK) != @@ -779,6 +779,6 @@ domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, } const struct iommu_domain_map_ops dmar_domain_map_ops = { - .map = domain_map_buf, - .unmap = domain_unmap_buf, + .map = dmar_map_buf, + .unmap = dmar_unmap_buf, }; From nobody Sat Oct 5 07:11:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmh4FgVz5Xrmc; Sat, 05 Oct 2024 07:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmh1KFtz4Nc0; Sat, 5 Oct 2024 07:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yfwAle2T8qzdPiA5g8VKAIkWHrGSWbS5dSKClPLI0mw=; b=yY94mnmQm2cZQ4oAmfIPZWqHxzfxXeDm5l1uJZ74JYpam3KDIcPqg5mqj8KQLpfMNcDiCg uDvEeLHhsDiFOZwg3ygDNs02P1ErJ2LjMRUAGHnJ45dSGZsBHvIclOBDaTJ21kePmBmvxl eWCCnFh+XWJLtdJbKEvhGTnmiuCQQ0ZHzaVSsRkFADX3Z5mtm3p6Rh4fXYKTzi1tS3jlMb yEDerMwIGL1W8JbHarPLsrF8kxUoInbuSOuFdVLHqX06H46ySch4QWH5E2jpFqCRF49nxr MZmmDI0ku5vc+CuTIPO2xhGtePkoRn6KxWQtU0BSDiltVHwfLG8x2+eLi90HMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yfwAle2T8qzdPiA5g8VKAIkWHrGSWbS5dSKClPLI0mw=; b=fvIaCwiyRYDMw6m3uNGIpe1ullxY3nhlYQJ1KC+BwL1/swbhLp62b2P9u827idNh0YzaJt yqpa8cmtOAYwc2egJCB7Gzf9lau6R7cWtutsuTMbi0frW23aA0nBy4be+mdU8xYRyuQl/s 6ilFgI8G/6PkjRQY2T6p7L5hgkT6su/LW7ETi4SBWVSKOkmUdOVPqZTU9z+r9nM5cQmyCM UFyqCzoq86NEsr7r13BDbXFJdtXiJHMYybbR2jCMNpyhMy0oCoY/r3Zpz15u0bm4GB9qjc 1IGkTplmLhXuVM8xmOKQiIdLmXJCe4VBOOV9cxx3q3qMxrvGVr9wI7iQ/y1vTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112292; a=rsa-sha256; cv=none; b=eXjJ13X87xIu5U4ZbCdC6BBtpykutjOylHQOrxXOhpkmhQWxFZtYQna9PNv0sV2OHQJmzb KH7uCP4OZ61eX8Jgilur8T3/c2/fdNTHJm0WFpO6W/xXi9sQ6oQwLMzGy46v7xyGq+QG2B xP5O7UVNNMFALvVS4UHgTUxB0fUEwRPWU2Zd6xNgn6O/RD3L2HX14Hd/wbN2b6TNr4QoCn cO6SaYnGmm8k2WXg/iZIAP5rtrNRp0YaeBnnyRXrMkHV4FSXF8VA6jqLwLrV8m6kdfJtXn uEbHL4HPWtcHpJgS8jEIMU8WDrwC4387CE8aQUo2rAfW4cs6PMeMpoBVpSLiWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmh0Y8lz17mF; Sat, 5 Oct 2024 07:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BV4s001752; Sat, 5 Oct 2024 07:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BVVH001749; Sat, 5 Oct 2024 07:11:31 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:31 GMT Message-Id: <202410050711.4957BVVH001749@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: 5e70f9aa9eec - stable/14 - iommu: add per-unit sysctls reporting the state of DMA and interrupt remapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e70f9aa9eecc1f7ad177575720281af8b8747d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e70f9aa9eecc1f7ad177575720281af8b8747d6 commit 5e70f9aa9eecc1f7ad177575720281af8b8747d6 Author: Konstantin Belousov AuthorDate: 2024-09-27 01:17:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 iommu: add per-unit sysctls reporting the state of DMA and interrupt remapping (cherry picked from commit d50403a6919a641abfb0da4d60eb58ce42302de5) --- sys/arm64/iommu/iommu.c | 2 ++ sys/dev/iommu/busdma_iommu.c | 4 ++++ sys/dev/iommu/iommu.h | 1 + sys/x86/iommu/intel_drv.c | 2 ++ sys/x86/iommu/intel_intrmap.c | 5 ++++- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c index d876d443ffa0..cdff7cdf4ae2 100644 --- a/sys/arm64/iommu/iommu.c +++ b/sys/arm64/iommu/iommu.c @@ -456,6 +456,7 @@ iommu_register(struct iommu_unit *iommu) LIST_INSERT_HEAD(&iommu_list, entry, next); IOMMU_LIST_UNLOCK(); + sysctl_ctx_init(&iommu->sysctl_ctx); iommu_init_busdma(iommu); return (0); @@ -476,6 +477,7 @@ iommu_unregister(struct iommu_unit *iommu) IOMMU_LIST_UNLOCK(); iommu_fini_busdma(iommu); + sysctl_ctx_free(&iommu->sysctl_ctx); mtx_destroy(&iommu->lock); diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 0d86ff0d4468..f3b58306d6af 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -974,6 +974,10 @@ iommu_init_busdma(struct iommu_unit *unit) error = TUNABLE_INT_FETCH("hw.iommu.dma", &unit->dma_enabled); if (error == 0) /* compatibility */ TUNABLE_INT_FETCH("hw.dmar.dma", &unit->dma_enabled); + SYSCTL_ADD_INT(&unit->sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(unit->dev)), + OID_AUTO, "dma", CTLFLAG_RD, &unit->dma_enabled, 0, + "DMA ops enabled"); TAILQ_INIT(&unit->delayed_maps); TASK_INIT(&unit->dmamap_load_task, 0, iommu_bus_task_dmamap, unit); unit->delayed_taskqueue = taskqueue_create("iommu", M_WAITOK, diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h index 9845b09e8732..957d4e14e8e2 100644 --- a/sys/dev/iommu/iommu.h +++ b/sys/dev/iommu/iommu.h @@ -67,6 +67,7 @@ struct iommu_unit { struct mtx lock; device_t dev; int unit; + struct sysctl_ctx_list sysctl_ctx; int dma_enabled; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 05fb49538add..cc16759ebe34 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -256,6 +256,7 @@ dmar_release_resources(device_t dev, struct dmar_unit *unit) vm_object_deallocate(unit->ctx_obj); unit->ctx_obj = NULL; } + sysctl_ctx_free(&unit->iommu.sysctl_ctx); } #ifdef DEV_APIC @@ -337,6 +338,7 @@ dmar_attach(device_t dev) unit = device_get_softc(dev); unit->iommu.unit = device_get_unit(dev); unit->iommu.dev = dev; + sysctl_ctx_init(&unit->iommu.sysctl_ctx); dmaru = dmar_find_by_index(unit->iommu.unit); if (dmaru == NULL) return (EINVAL); diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c index d2f8f8df4691..122b92827b77 100644 --- a/sys/x86/iommu/intel_intrmap.c +++ b/sys/x86/iommu/intel_intrmap.c @@ -326,7 +326,10 @@ clp2(u_int v) int dmar_init_irt(struct dmar_unit *unit) { - + SYSCTL_ADD_INT(&unit->iommu.sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(unit->iommu.dev)), + OID_AUTO, "ir", CTLFLAG_RD, &unit->ir_enabled, 0, + "Interrupt remapping ops enabled"); if ((unit->hw_ecap & DMAR_ECAP_IR) == 0) return (0); unit->ir_enabled = 1; From nobody Sat Oct 5 07:11:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmj48Yhz5Xrjp; Sat, 05 Oct 2024 07:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmj2Xgwz4NWn; Sat, 5 Oct 2024 07:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QzFgqae46VxOIBJpNV3k3xycuEuj3rbfubgFIIlRk3k=; b=mnks2xRWlZ08jI26O5pXbomsI+fgiM6WPz3icrC4DAvny50JsFRU1Dh2KmhKe9v+5Xb8qa L2VbAFvdJFH5PLsDNRTO/yv8QhE5U+ojodu6E4gx5M8NC7fKLGNVJZJKClr3Lsauvcn+ye K1ch89ZyT8VPJ2Pfo/aULna0rZ5EifPaHNep78Mxg753XgvrZa/FpNNOXZbskHb5CyVXN1 b9bNUlSmqrvcRes32jdgRkm/3MN8gQwt4osZQTlQAUpGNxOLHkcLoXuzMOXiFilFDQTVSF u0XKcT40EbOkwn9VNm1Gh5YILmzoXXe3921rV6W1hZtJl3NlvY6jOKSzbYfl4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QzFgqae46VxOIBJpNV3k3xycuEuj3rbfubgFIIlRk3k=; b=vUvTJic8HQCwMhvJA+DffMc7sizLgbIXuegLWEodtNaLgxk0tTwQhqmIjItxImfNBC6hAb TfxzUEq3X2nAyeQADHvlxSE8upj25388oJHotTmiVGmvKBRbKgQC7U1omGIB0F5U2ob1Cc 5+UNWgPMDwBiXte3tn/Kpyxg7jFpq0KYV7GftJQiTnMjK50WEmmQg5mvNXf27UlJ4lrOHS vrYb0RwTqcBbyFzLk88f8LWuIzMcRtue6VBfrjcFMVHo5TJ1YhJa646eod0JRfX8ohMMen g728rT66CVjOPk6/6PN0B5wkP96UcbvSfQ8uICZAd8IRACJjBg5h113jF0ySIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112293; a=rsa-sha256; cv=none; b=lIbLrw+YO87XjjGXrhLShFemYkVHDYYsENLhtN91IEl9qOsAvdCAmwWjtHwQVx2Kdv4f2z rO6hgxTgvu2uduGmw0JaZCoDbFxYeJFm+iou0yPX3RaTHZN/EqtpxK8bibz1Nvy8wKxlwl 5WHtOgKWstnULsNyZFy6QpC6/k+gF2VATW9xkrTzrkbr7BzXJCVtGb1tycFwoj65pw/E9d LTtxpvafKk+/qefd3kz/qJpAqXnsEgx4UDJ5kZuoot6I0rPWWZd8DbR8gQEs1Q6RpTPNPd Rw3hDD599W7H0lhQTO7JIIsPhqt4WwE1i/AyMYIfBlwbEJ9+Z6EH2IUPcVdKAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmj1Twcz183p; Sat, 5 Oct 2024 07:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BX5S001804; Sat, 5 Oct 2024 07:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BXDP001801; Sat, 5 Oct 2024 07:11:33 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:33 GMT Message-Id: <202410050711.4957BXDP001801@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: a5943b6e503d - stable/14 - iommu: change iommu_domain_map_ops to take iommu_map_entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5943b6e503df1b75436f85ca7efa7e94c631a24 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a5943b6e503df1b75436f85ca7efa7e94c631a24 commit a5943b6e503df1b75436f85ca7efa7e94c631a24 Author: Konstantin Belousov AuthorDate: 2024-09-25 01:47:54 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 iommu: change iommu_domain_map_ops to take iommu_map_entry (cherry picked from commit bdd5eb33cacdbf174980b999c77847d0903fc12e) --- sys/arm64/iommu/iommu.c | 25 +++++++++++-------------- sys/dev/iommu/iommu.h | 8 ++++---- sys/dev/iommu/iommu_gas.c | 12 +++++------- sys/x86/iommu/intel_ctx.c | 4 ++-- sys/x86/iommu/intel_idpgtbl.c | 15 ++++++++++----- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c index cdff7cdf4ae2..eb682a4a623f 100644 --- a/sys/arm64/iommu/iommu.c +++ b/sys/arm64/iommu/iommu.c @@ -81,22 +81,21 @@ struct iommu_entry { static LIST_HEAD(, iommu_entry) iommu_list = LIST_HEAD_INITIALIZER(iommu_list); static int -iommu_domain_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, - iommu_gaddr_t size, int flags) +iommu_domain_unmap_buf(struct iommu_domain *iodom, + struct iommu_map_entry *entry, int flags) { struct iommu_unit *iommu; int error; iommu = iodom->iommu; - - error = IOMMU_UNMAP(iommu->dev, iodom, base, size); - + error = IOMMU_UNMAP(iommu->dev, iodom, entry->start, entry->end - + entry->start); return (error); } static int -iommu_domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, - iommu_gaddr_t size, vm_page_t *ma, uint64_t eflags, int flags) +iommu_domain_map_buf(struct iommu_domain *iodom, struct iommu_map_entry *entry, + vm_page_t *ma, uint64_t eflags, int flags) { struct iommu_unit *iommu; vm_prot_t prot; @@ -111,12 +110,10 @@ iommu_domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, if (eflags & IOMMU_MAP_ENTRY_WRITE) prot |= VM_PROT_WRITE; - va = base; - + va = entry->start; iommu = iodom->iommu; - - error = IOMMU_MAP(iommu->dev, iodom, va, ma, size, prot); - + error = IOMMU_MAP(iommu->dev, iodom, va, ma, entry->end - + entry->start, prot); return (error); } @@ -429,8 +426,8 @@ iommu_domain_unload(struct iommu_domain *iodom, TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { KASSERT((entry->flags & IOMMU_MAP_ENTRY_MAP) != 0, ("not mapped entry %p %p", iodom, entry)); - error = iodom->ops->unmap(iodom, entry->start, entry->end - - entry->start, cansleep ? IOMMU_PGF_WAITOK : 0); + error = iodom->ops->unmap(iodom, entry, + cansleep ? IOMMU_PGF_WAITOK : 0); KASSERT(error == 0, ("unmap %p error %d", iodom, error)); TAILQ_REMOVE(entries, entry, dmamap_link); iommu_domain_free_entry(entry, true); diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h index 957d4e14e8e2..84d8c3680b71 100644 --- a/sys/dev/iommu/iommu.h +++ b/sys/dev/iommu/iommu.h @@ -86,10 +86,10 @@ struct iommu_unit { }; struct iommu_domain_map_ops { - int (*map)(struct iommu_domain *domain, iommu_gaddr_t base, - iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags); - int (*unmap)(struct iommu_domain *domain, iommu_gaddr_t base, - iommu_gaddr_t size, int flags); + int (*map)(struct iommu_domain *domain, struct iommu_map_entry *entry, + vm_page_t *ma, uint64_t pflags, int flags); + int (*unmap)(struct iommu_domain *domain, struct iommu_map_entry *entry, + int flags); }; /* diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 4b6141b981da..26ac38da3c4f 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -826,8 +826,7 @@ iommu_gas_map(struct iommu_domain *domain, entry->flags |= eflags; IOMMU_DOMAIN_UNLOCK(domain); - error = domain->ops->map(domain, entry->start, - entry->end - entry->start, ma, eflags, + error = domain->ops->map(domain, entry, ma, eflags, ((flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0)); if (error == ENOMEM) { iommu_domain_unload_entry(entry, true, @@ -868,9 +867,9 @@ iommu_gas_map_region(struct iommu_domain *domain, struct iommu_map_entry *entry, if (entry->end == entry->start) return (0); - error = domain->ops->map(domain, entry->start, - entry->end - entry->start, ma + OFF_TO_IDX(start - entry->start), - eflags, ((flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0)); + error = domain->ops->map(domain, entry, + ma + OFF_TO_IDX(start - entry->start), eflags, + ((flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0)); if (error == ENOMEM) { iommu_domain_unload_entry(entry, false, (flags & IOMMU_MF_CANWAIT) != 0); @@ -979,8 +978,7 @@ iommu_unmap_msi(struct iommu_ctx *ctx) if (entry == NULL) return; - domain->ops->unmap(domain, entry->start, entry->end - - entry->start, IOMMU_PGF_WAITOK); + domain->ops->unmap(domain, entry, IOMMU_PGF_WAITOK); iommu_gas_free_space(entry); diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index ade3f61328d7..bdb5f8740bf2 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -896,8 +896,8 @@ dmar_domain_unload(struct iommu_domain *iodom, TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { KASSERT((entry->flags & IOMMU_MAP_ENTRY_MAP) != 0, ("not mapped entry %p %p", domain, entry)); - error = iodom->ops->unmap(iodom, entry->start, entry->end - - entry->start, cansleep ? IOMMU_PGF_WAITOK : 0); + error = iodom->ops->unmap(iodom, entry, + cansleep ? IOMMU_PGF_WAITOK : 0); KASSERT(error == 0, ("unmap %p error %d", domain, error)); if (!unit->qi_enabled) { dmar_flush_iotlb_sync(domain, entry->start, diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 538d09649377..a949e38cc9b1 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -463,14 +463,18 @@ dmar_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, } static int -dmar_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, - iommu_gaddr_t size, vm_page_t *ma, uint64_t eflags, int flags) +dmar_map_buf(struct iommu_domain *iodom, struct iommu_map_entry *entry, + vm_page_t *ma, uint64_t eflags, int flags) { struct dmar_domain *domain; struct dmar_unit *unit; + iommu_gaddr_t base, size; uint64_t pflags; int error; + base = entry->start; + size = entry->end - entry->start; + pflags = ((eflags & IOMMU_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) | ((eflags & IOMMU_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) | ((eflags & IOMMU_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 0) | @@ -648,8 +652,8 @@ dmar_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, } static int -dmar_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, - iommu_gaddr_t size, int flags) +dmar_unmap_buf(struct iommu_domain *iodom, struct iommu_map_entry *entry, + int flags) { struct dmar_domain *domain; int error; @@ -657,7 +661,8 @@ dmar_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, domain = IODOM2DOM(iodom); DMAR_DOMAIN_PGLOCK(domain); - error = dmar_unmap_buf_locked(domain, base, size, flags); + error = dmar_unmap_buf_locked(domain, entry->start, entry->end - + entry->start, flags); DMAR_DOMAIN_PGUNLOCK(domain); return (error); } From nobody Sat Oct 5 07:11:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmk6Cg5z5XrVW; Sat, 05 Oct 2024 07:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmk2Wyzz4NL1; Sat, 5 Oct 2024 07:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18UpfiN+NBaCD0m2v0f+T1cHlCcQVdKsT7As8DT4Vc=; b=d5HgT/M18m42tXCZXEEDBsK9ZySUtD/GRloey/mYYg+aMsiVaYVv3dYyWW31UK+Cn++y3j 5i4Bii4epO85jCAsaDsxhncd3acnsT2GznwcA4yOlP83R4j4BWBamGgVBmwGnzy83KDxjV T+rp5Jdr9aRD4o0BZrn2YDZrEK0qlDDlqZdKvsNqPEzlWiCeRYDdra0q1beUgIUW10F1Cs rk48cCPgmHYVALqgxFdm83ybfroAVlcSb3PoGOMn8aHOJQrTsbU/N4IkmLQ6EyTSblC93h 3AyN0F7CAU1HG/w7IcSVXDBlnJgTa0FERSWLf5ysJEQRTgM3zGIqQPfFu3PBDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18UpfiN+NBaCD0m2v0f+T1cHlCcQVdKsT7As8DT4Vc=; b=iaQh3uHeqs5TWdYsa0xAPV8mDpDIOOQIWPjcsgveRUs5mOnDTPNVt9yXLDkpGS3yt56dq6 Wd25zeKB4F6XjBuCCTU1+vis+ovQ9KtAsf6TgFKEb3cOjO+u8A1dnN2FZYo0aGWpiuSPML 4D17EPJYJKtGKvoJgSjxHV4H0biyW50/Hppb45VC5n+4/ouA7ZlrDRS5UTSkumIJf7MVLQ yZcEmrL9VXciDSuhCKm6w9Gh6oB2/nhNivpCkahzz7UkP9wkH2vpxRb+SPdonMHDZ7v+gK Sg9B0EV9qarFSXtcnkcN+gSspWdiQlD+G723jekWTHT6gvDDrSS1Rfu7tKbXKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112294; a=rsa-sha256; cv=none; b=LnKod52/8HyulSVkQmwdcxC/bxf1fx2HWvyw8eGjo6P9uFzWQpZfFRlR4nijKLqy7QvrM1 7aCQrxbvopvtEG/jnFMYPeCVau4FK6dgqQ7U8zB74dEiwjU9s1yZWjHu+Hw3oYuRIex3XV UbsUTM49quoMfN63hJY0FZriZrZuYEk7JcVd0owVkp3X01fujqgOa+d03tqMaKv5Uw3yjw EDoRGrP9aRTXe01GQJenJA9PoChOTxoal86LZTID8jb1dyTLoHLwFbFaC4R3UsZ7vug/kr naN9/EdA+W9yLAHR8jpkSCnwsbMHL7CgJwUfKBLzGqiX+7/7NrUt/UalBlQcuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmk28HSz183q; Sat, 5 Oct 2024 07:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BYFG001853; Sat, 5 Oct 2024 07:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BYT1001849; Sat, 5 Oct 2024 07:11:34 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:34 GMT Message-Id: <202410050711.4957BYT1001849@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: b0e45fea61a5 - stable/14 - vm_page_free_pages_toq(): return the count of freed pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0e45fea61a53bf7831e9a8de356cfda055e1d44 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0e45fea61a53bf7831e9a8de356cfda055e1d44 commit b0e45fea61a53bf7831e9a8de356cfda055e1d44 Author: Konstantin Belousov AuthorDate: 2024-09-27 16:20:31 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 vm_page_free_pages_toq(): return the count of freed pages (cherry picked from commit 1784fb44498da8007fb8cd8ee5060894eb5fe1e6) --- sys/vm/vm_page.c | 5 +++-- sys/vm/vm_page.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8496a39154de..fe104e1e87af 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -3993,14 +3993,14 @@ vm_page_free_toq(vm_page_t m) * from any VM object. In other words, this is equivalent to * calling vm_page_free_toq() for each page of a list of VM objects. */ -void +int vm_page_free_pages_toq(struct spglist *free, bool update_wire_count) { vm_page_t m; int count; if (SLIST_EMPTY(free)) - return; + return (0); count = 0; while ((m = SLIST_FIRST(free)) != NULL) { @@ -4011,6 +4011,7 @@ vm_page_free_pages_toq(struct spglist *free, bool update_wire_count) if (update_wire_count) vm_wire_sub(count); + return (count); } /* diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index a1df6f736aee..68f68d62d2be 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -706,7 +706,7 @@ int vm_page_is_valid(vm_page_t, int, int); void vm_page_test_dirty(vm_page_t); vm_page_bits_t vm_page_bits(int base, int size); void vm_page_zero_invalid(vm_page_t m, boolean_t setvalid); -void vm_page_free_pages_toq(struct spglist *free, bool update_wire_count); +int vm_page_free_pages_toq(struct spglist *free, bool update_wire_count); void vm_page_dirty_KBI(vm_page_t m); void vm_page_lock_KBI(vm_page_t m, const char *file, int line); From nobody Sat Oct 5 07:11:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGml6kDzz5XrVX; Sat, 05 Oct 2024 07:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGml38BQz4NZd; Sat, 5 Oct 2024 07:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I4M26U1c4xyYVcwBUCu9OyaJMiW0X6nmQRTdnXmoL/c=; b=IK0E56271XO7vx+VY0wSNQmZWUbPeXVIRJGB/dwaIxO2z2gMJa6ogGmIAbC8sD2kZWM2q5 HOaB6VIOA1/nkR0TrPNPoBTFRt/y+v6/iynnRM39KNAl7d0tJt4kJZbSUdWC5gJw/6nuWU +VDG+AzwT0+rKLTEeNgCM1Zb3EA1EJ7v7wEz2R5ca5QO+ThTOvItZJlXH24sUIjqC4btZy q5vQp9M0PhVskbIluV726d7YnLgfum74fEuDrc7insOmilnyxY+BD2wnvU/KYVOyj/LOMC /TfR9dPAUUp/PGeLDCr64QhFFThr5+kHNHP+2QdtXB1CtGEbSqz5mmzxZZE8mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I4M26U1c4xyYVcwBUCu9OyaJMiW0X6nmQRTdnXmoL/c=; b=C+WReJTcsm6zso0jvFw+8lUwCNVeK12XW6ofUE/6idbfNBhjBXSpxlv90yIX20MIl2KXEh ZNkTwLBQC6kR0zLkRa3hDi5MdiFg9RHqgHoxehN+OlcU7t3dODP4y4mrPE+B0dOaNBJIHK hn53JW5SZNXXcxJaDargKqPaaYqHsvzOuGWWaV1lsqD+ctu1Craa5IiCfu1RFF2hqsKUbN nVujcRtbl2a0WJ+MDnNGMPFP70EpMObzOhj3Q+w2A1CqIm1nhXlu8pIl/ZfR6alJnbE9aW gs7dGlvjg7LKz0QUttzx6ovph4D5Igg/aW9rLXnPkBNKWwQqTrYtaDHxpRoNGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112295; a=rsa-sha256; cv=none; b=UtgU9SPKfnHKTLpjTAimq+/v5ImDyF/hW0j0A6WJAEDpmOAi0VEFsJi/ywv/pD8YUNNdcH eOkeVK7A25YrlaSuROOOd5HTcdMmu2dgWQqWoc5PuwHF5gT0XRvcbcZbVfzPbftLU6lXOt 03qWcfs0QdGQ+T77Xkex7Qi3vB7kyFLEmgXhoDh1HirvMbAe3ZVQiHd5kXO41TbmodbSG2 Fk8k7rlspcJjVI1iqwJWYr4GHCsDYjHwzCLSMeAFqEWaa9Ai7tH0tjYHIs1ODmCZDrwdTB 1PriHyH7qvWApXCzd86q9E9i1Oko6LtMIrUOvfF2SljnLw/wc/vz1OFhIpnM5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGml2mXsz17pP; Sat, 5 Oct 2024 07:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BZxm001929; Sat, 5 Oct 2024 07:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BZah001926; Sat, 5 Oct 2024 07:11:35 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:35 GMT Message-Id: <202410050711.4957BZah001926@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: 0c7e13cfe204 - stable/14 - iommu: extend iommu_map_entry to store the list of associated freed page table pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c7e13cfe2045fb17a0583d0a2a1f685225bf7d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c7e13cfe2045fb17a0583d0a2a1f685225bf7d5 commit 0c7e13cfe2045fb17a0583d0a2a1f685225bf7d5 Author: Konstantin Belousov AuthorDate: 2024-09-25 01:50:34 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 iommu: extend iommu_map_entry to store the list of associated freed page table pages (cherry picked from commit f713ed6694d949ec37365533afbb47c04f919572) --- sys/dev/iommu/iommu.h | 3 +++ sys/dev/iommu/iommu_gas.c | 14 +++++++++++--- sys/x86/iommu/intel_idpgtbl.c | 4 ++-- sys/x86/iommu/iommu_utils.c | 15 +++++++++++---- sys/x86/iommu/x86_iommu.h | 3 ++- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h index 84d8c3680b71..73d0a6f1279b 100644 --- a/sys/dev/iommu/iommu.h +++ b/sys/dev/iommu/iommu.h @@ -31,6 +31,8 @@ #ifndef _DEV_IOMMU_IOMMU_H_ #define _DEV_IOMMU_IOMMU_H_ +#include +#include #include struct bus_dma_tag_common; @@ -61,6 +63,7 @@ struct iommu_map_entry { RB_ENTRY(iommu_map_entry) rb_entry; /* Links for domain entries */ struct iommu_domain *domain; struct iommu_qi_genseq gseq; + struct spglist pgtbl_free; }; struct iommu_unit { diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 26ac38da3c4f..d97bdee47b28 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -96,9 +96,12 @@ iommu_gas_alloc_entry(struct iommu_domain *domain, u_int flags) res = uma_zalloc(iommu_map_entry_zone, ((flags & IOMMU_PGF_WAITOK) != 0 ? M_WAITOK : M_NOWAIT) | M_ZERO); - if (res != NULL && domain != NULL) { - res->domain = domain; - atomic_add_int(&domain->entries_cnt, 1); + if (res != NULL) { + SLIST_INIT(&res->pgtbl_free); + if (domain != NULL) { + res->domain = domain; + atomic_add_int(&domain->entries_cnt, 1); + } } return (res); } @@ -107,7 +110,12 @@ void iommu_gas_free_entry(struct iommu_map_entry *entry) { struct iommu_domain *domain; + int n __unused; + n = vm_page_free_pages_toq(&entry->pgtbl_free, false); +#if defined(__i386__) || defined(__amd64__) + atomic_subtract_int(&iommu_tbl_pagecnt, n); +#endif domain = entry->domain; if (domain != NULL) atomic_subtract_int(&domain->entries_cnt, 1); diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index a949e38cc9b1..9dc7a2d58b3f 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -368,7 +368,7 @@ retry: ("loosing root page %p", domain)); vm_page_unwire_noq(m); iommu_pgfree(domain->pgtbl_obj, m->pindex, - flags); + flags, NULL); return (NULL); } dmar_pte_store(&ptep->pte, DMAR_PTE_R | DMAR_PTE_W | @@ -572,7 +572,7 @@ dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, KASSERT(m->pindex != 0, ("lost reference (idx) on root pg domain %p base %jx lvl %d", domain, (uintmax_t)base, lvl)); - iommu_pgfree(domain->pgtbl_obj, m->pindex, flags); + iommu_pgfree(domain->pgtbl_obj, m->pindex, flags, NULL); dmar_free_pgtbl_pde(domain, base, lvl - 1, flags); } diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c index 2011c632f770..8ff15cc86cb8 100644 --- a/sys/x86/iommu/iommu_utils.c +++ b/sys/x86/iommu/iommu_utils.c @@ -109,7 +109,8 @@ iommu_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags) } void -iommu_pgfree(vm_object_t obj, vm_pindex_t idx, int flags) +iommu_pgfree(vm_object_t obj, vm_pindex_t idx, int flags, + struct iommu_map_entry *entry) { vm_page_t m; @@ -117,8 +118,13 @@ iommu_pgfree(vm_object_t obj, vm_pindex_t idx, int flags) VM_OBJECT_WLOCK(obj); m = vm_page_grab(obj, idx, VM_ALLOC_NOCREAT); if (m != NULL) { - vm_page_free(m); - atomic_subtract_int(&iommu_tbl_pagecnt, 1); + if (entry == NULL) { + vm_page_free(m); + atomic_subtract_int(&iommu_tbl_pagecnt, 1); + } else { + vm_page_remove_xbusy(m); /* keep page busy */ + SLIST_INSERT_HEAD(&entry->pgtbl_free, m, plinks.s.ss); + } } if ((flags & IOMMU_PGF_OBJL) == 0) VM_OBJECT_WUNLOCK(obj); @@ -154,7 +160,8 @@ iommu_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, sched_unpin(); if (allocated) { VM_OBJECT_ASSERT_WLOCKED(obj); - iommu_pgfree(obj, m->pindex, flags | IOMMU_PGF_OBJL); + iommu_pgfree(obj, m->pindex, flags | IOMMU_PGF_OBJL, + NULL); } if ((flags & IOMMU_PGF_OBJL) == 0) VM_OBJECT_WUNLOCK(obj); diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h index a1ed5c71c513..4d0ac8351e2e 100644 --- a/sys/x86/iommu/x86_iommu.h +++ b/sys/x86/iommu/x86_iommu.h @@ -48,7 +48,8 @@ struct vm_object; struct vm_page *iommu_pgalloc(struct vm_object *obj, vm_pindex_t idx, int flags); -void iommu_pgfree(struct vm_object *obj, vm_pindex_t idx, int flags); +void iommu_pgfree(struct vm_object *obj, vm_pindex_t idx, int flags, + struct iommu_map_entry *entry); void *iommu_map_pgtbl(struct vm_object *obj, vm_pindex_t idx, int flags, struct sf_buf **sf); void iommu_unmap_pgtbl(struct sf_buf *sf); From nobody Sat Oct 5 07:11:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmn1bztz5XrS5; Sat, 05 Oct 2024 07:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmm4X4Nz4Nt3; Sat, 5 Oct 2024 07:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RRFM/B68ZU+XPKWnunKb3C27XnPyU02IK0D8fY67HI=; b=peg9ZqnuB7gwBLtNtQl4oBcS64LI5vqOGIp7FWtX2NgEP5ulzNHcVpZ2lnhAolgGOV96Jl 0juhK8tICanouQ++a5fT0WFBk4MlJKm/fqcNH905p0HVU9lJjGC+vL444Gsq0LwFvcUZ+K EjFqPqQDiUNI5Sk/Z6xyXVgI6qoTKFf10+Lc98vnzPdAPOjwWxLuWms4ocMFHaFWKLpgY8 EAwow7J80d0WuyxTb15TW0mNPxUzcsCTHu6S6Rymk9MGWyOjV2eOiVN/yab/FZKBCqBZZ6 DZSebChdgwY+ALWWgGBjX/92mDHqo+7PsIHTPrwPuUS6XDabom5n8ixD1wxaEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RRFM/B68ZU+XPKWnunKb3C27XnPyU02IK0D8fY67HI=; b=Quu9fAASF93Z23oTqrm+SJaeSqdulLKhGCeNU45pcNoXSQap+f7olv4iTojtIQ5H0kKYDt LZNgyywYcXShI9vS9JNlnbvubTbKUpNvaNHxaWauhXDf5nrxvDc5fPlWMhHSFTVNSWux+W JMCEyOvNATorKm0GdhiD/eJTUhaiSs4v1T/78H0tX2TNuPciTM4as5tLuEslrGZqyu+XaW 5xvalAEtk5cbsU3PQsay29ME5MJU1SfyUsvsZMySjtGoRuLG8Q6C56jTxYr2BPJVMO0/L1 g6WwpVkOSn37WNM5z+WvBFWAbCRamDTg/SrlP/NvUy7BCzwS5uOtFkg0mJTLGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112296; a=rsa-sha256; cv=none; b=c2t4imW6a8XdmS2M6ZMKGZZQwQ+oTkGWXRKdPaEHES3/e+wElert5pcdYd3+FgEyqwbwid Es9yttg8JGPdL1VQywvpDjHCv7pTShVg2hgtDSocnnRMiwBtkWqhc4m5LUmhgQlKXJqzz+ JY+rR5yTudw8/3jipWQERyWDZZHYrJTxEishefakPXe2wbysx63ikdktnbX1uOi3PMpCv3 AmQv57QKfOBvW1i61pGm33OkFl8xgi2j7F57mY97uibezf6SV60rC9R6D5G6JV6hr4GHGz PLxJafWU/bxLfQ43EzF7wz5JfLclW5+TNGWOmZoOe4Xib62CX80nJ93ig+bofA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmm482qz17pR; Sat, 5 Oct 2024 07:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BaEf002001; Sat, 5 Oct 2024 07:11:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BaWr001998; Sat, 5 Oct 2024 07:11:36 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:36 GMT Message-Id: <202410050711.4957BaWr001998@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: 938cac4bdf17 - stable/14 - dmar: on unmap, postpone freeing page table pages after the invalidation is done List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 938cac4bdf17188644512d5bbaba6768940fc423 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=938cac4bdf17188644512d5bbaba6768940fc423 commit 938cac4bdf17188644512d5bbaba6768940fc423 Author: Konstantin Belousov AuthorDate: 2024-09-25 03:54:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:56 +0000 dmar: on unmap, postpone freeing page table pages after the invalidation is done (cherry picked from commit 3848dc4fe6f37cbcfaea29eb94fa560a503f60ab) --- sys/x86/iommu/intel_idpgtbl.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 9dc7a2d58b3f..e1b89571971b 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -69,7 +69,8 @@ #include static int dmar_unmap_buf_locked(struct dmar_domain *domain, - iommu_gaddr_t base, iommu_gaddr_t size, int flags); + iommu_gaddr_t base, iommu_gaddr_t size, int flags, + struct iommu_map_entry *entry); /* * The cache of the identity mapping page tables for the DMARs. Using @@ -387,7 +388,8 @@ retry: static int dmar_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, - iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags) + iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags, + struct iommu_map_entry *entry) { iommu_pte_t *pte; struct sf_buf *sf; @@ -447,7 +449,7 @@ dmar_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, if (sf != NULL) iommu_unmap_pgtbl(sf); dmar_unmap_buf_locked(domain, base1, base - base1, - flags); + flags, entry); TD_PINNED_ASSERT; return (ENOMEM); } @@ -518,7 +520,8 @@ dmar_map_buf(struct iommu_domain *iodom, struct iommu_map_entry *entry, KASSERT((flags & ~IOMMU_PGF_WAITOK) == 0, ("invalid flags %x", flags)); DMAR_DOMAIN_PGLOCK(domain); - error = dmar_map_buf_locked(domain, base, size, ma, pflags, flags); + error = dmar_map_buf_locked(domain, base, size, ma, pflags, flags, + entry); DMAR_DOMAIN_PGUNLOCK(domain); if (error != 0) return (error); @@ -536,11 +539,11 @@ dmar_map_buf(struct iommu_domain *iodom, struct iommu_map_entry *entry, static void dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags, iommu_pte_t *pte, - struct sf_buf **sf, bool free_fs); + struct sf_buf **sf, struct iommu_map_entry *entry, bool free_fs); static void dmar_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, - int lvl, int flags) + int lvl, int flags, struct iommu_map_entry *entry) { struct sf_buf *sf; iommu_pte_t *pde; @@ -548,12 +551,14 @@ dmar_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, sf = NULL; pde = dmar_pgtbl_map_pte(domain, base, lvl, flags, &idx, &sf); - dmar_unmap_clear_pte(domain, base, lvl, flags, pde, &sf, true); + dmar_unmap_clear_pte(domain, base, lvl, flags, pde, &sf, + entry, true); } static void dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, - int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_sf) + int flags, iommu_pte_t *pte, struct sf_buf **sf, + struct iommu_map_entry *entry, bool free_sf) { vm_page_t m; @@ -572,8 +577,8 @@ dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, KASSERT(m->pindex != 0, ("lost reference (idx) on root pg domain %p base %jx lvl %d", domain, (uintmax_t)base, lvl)); - iommu_pgfree(domain->pgtbl_obj, m->pindex, flags, NULL); - dmar_free_pgtbl_pde(domain, base, lvl - 1, flags); + iommu_pgfree(domain->pgtbl_obj, m->pindex, flags, entry); + dmar_free_pgtbl_pde(domain, base, lvl - 1, flags, entry); } /* @@ -581,7 +586,7 @@ dmar_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, */ static int dmar_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, - iommu_gaddr_t size, int flags) + iommu_gaddr_t size, int flags, struct iommu_map_entry *entry) { iommu_pte_t *pte; struct sf_buf *sf; @@ -632,7 +637,7 @@ dmar_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, if ((pte->pte & DMAR_PTE_SP) != 0 || lvl == domain->pglvl - 1) { dmar_unmap_clear_pte(domain, base, lvl, - flags, pte, &sf, false); + flags, pte, &sf, entry, false); break; } } @@ -662,7 +667,7 @@ dmar_unmap_buf(struct iommu_domain *iodom, struct iommu_map_entry *entry, DMAR_DOMAIN_PGLOCK(domain); error = dmar_unmap_buf_locked(domain, entry->start, entry->end - - entry->start, flags); + entry->start, flags, entry); DMAR_DOMAIN_PGUNLOCK(domain); return (error); } From nobody Sat Oct 5 07:11:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLGmn6lGNz5XrS8; Sat, 05 Oct 2024 07:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLGmn5WrTz4NnR; Sat, 5 Oct 2024 07:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kB57xkWRR6CS+HkK3bEdaXXs+mfLgzCo962Ne9uELMw=; b=ZKdaDvK5fr3sudjQLJI+wHIBEq/UWw//WqRrBR1aDeF7Cxri6fkV5SiE/xPuoWD7ksKMhz Y5RJj3HyU34Xz7bV++nQO2sFPwqZO5yKNxIWFwDHWBDs8V1p0YZBwWdsNiva5p7azvvQnb Poxg6V+GxgKlsorFtJtyhMh3AeosLPtTGyA+2AsfcM9sWme0TaL+MH3agBnmCzjFSWnWem GJS04k6ws9r8nO5AR3oqqvwkP5+2g0XMmbsh/8KZyh+ZS94AojO0pgcjkExYQBx7h803X0 nQvy7tZoBIpo4dxW6ZMeWo19PfO0eL9nbnxJ8zVPKKAj8cCIFJ7eSpmu4+S02A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728112297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kB57xkWRR6CS+HkK3bEdaXXs+mfLgzCo962Ne9uELMw=; b=HUSBZ1UrHv26XT39nOngmuCgF3wEg+sJwQNYALSc0QKb6CR57VioZ9anai4yW5FQoiRwGj N/UMbotbAa3bqK78O82+ipxekhVNb3Tdzz6dpeH5hYyKE/zo6sh1DThKhuIkyZVHmqip4i S8bEPIrp/OH84kCHBdZ1tQOgOAIHkLg0lmXYz4HF7Ut1WwuKJ5oUMZwZ0Dz7Ie40cnadHe Po7a+Y4N4qgyH6/6EXT0ee30EK2pdyx2IERj+on6Rgzql8Nmbcba/1s3KX8J9b841dwp+f atqWDOMPQGMxY4UpaueAkLjDoUlWpLmwzMk5L4H2BGE411kMz/54fUH1VAK1EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728112297; a=rsa-sha256; cv=none; b=pLnDTYeoXI1e0IhHt+QAhWccL5AZlkQLfS4lZ/GST/bmvBZc0LrEviCsXUynBOEa8UsMa8 6HeNcKlSRxojMShe8cwMdtiyalp34/doT8Xw1Pa6OFi+DPjjG62BXrZFvTNo2t7xqLaVuE aFIqugzop2X/MMeMguUCLSjKNXq56IYJDiGK+Dz/Gtbn5lq+wesubXCleskMNnicg8JD6C 2cverBaCEzEJDzw2VophWjQlB2aKjzFXehOGXF9CTkA2G4r1b4Pex/5p4HVwJNOwjNEFST wcOcfp/iKYVzsWbowtRUEw64IWhP29JKWKlqISF6lVq+g2S6Po7fUehr1qf+Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLGmn581Sz1869; Sat, 5 Oct 2024 07:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4957BbQh002043; Sat, 5 Oct 2024 07:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4957BbVE002040; Sat, 5 Oct 2024 07:11:37 GMT (envelope-from git) Date: Sat, 5 Oct 2024 07:11:37 GMT Message-Id: <202410050711.4957BbVE002040@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: a67cc4b031ab - stable/14 - hyperv: call smp_targeted_tlb_shootdown_native() with pin List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a67cc4b031ab01a2defcfb6f3d23cc0363f0c2ac Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a67cc4b031ab01a2defcfb6f3d23cc0363f0c2ac commit a67cc4b031ab01a2defcfb6f3d23cc0363f0c2ac Author: Konstantin Belousov AuthorDate: 2024-10-01 11:45:23 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-05 07:08:57 +0000 hyperv: call smp_targeted_tlb_shootdown_native() with pin (cherry picked from commit 6dcffb980fa3026092f79107ee7668918c9f5490) --- sys/dev/hyperv/vmbus/hyperv_mmu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/hyperv/vmbus/hyperv_mmu.c b/sys/dev/hyperv/vmbus/hyperv_mmu.c index 7c29fe294093..8e982974161c 100644 --- a/sys/dev/hyperv/vmbus/hyperv_mmu.c +++ b/sys/dev/hyperv/vmbus/hyperv_mmu.c @@ -241,7 +241,6 @@ do_ex_hypercall: critical_exit(); return; native: - sched_unpin(); critical_exit(); return smp_targeted_tlb_shootdown_native(pmap, addr1, addr2, curcpu_cb, op); From nobody Sat Oct 5 09:51:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLLKh0J83z5Y4G9; Sat, 05 Oct 2024 09:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLLKg6Nrfz4kNL; Sat, 5 Oct 2024 09:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728121911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWBFHBQFt/CLN5TYEB3OqT1OTPeQyJVOMI8dFJeGRi4=; b=SfGv546e6b1cLxPHM8RmhmzSA9WJQZkSLcZRxeGOK158316ODQv7WjOY/kqbjf+tD7PHLO NvmJZos2R/S8gtTdiEWk7OyFa/uFBvvqNGch1jP4j3eutlINE36+T5nrGTmPAztnj0hWP7 xBqwU9QF4WqWphq2UnPmDenpVYDN81HuFMUtdBP8pYw7cEXXikpCfZGIRaMhWiJFQlGDIH HRJTHxUGkqi+Og7lkGjTY5dJ0Ie67JesBC9SS6QsdE0o4PqRx7IsEZHXaDL0PfNhAyCq41 xHEL/1PXne8q+q11qHhHh8sOK5Zh3Upf6nYRqnczCeulT7CmI4miWkt+B3K3SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728121911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWBFHBQFt/CLN5TYEB3OqT1OTPeQyJVOMI8dFJeGRi4=; b=cZLFhrZzGR5x5ETyIHVY+K4A4kzjKOpEh7H3RDXud8Am0R3dYP3Ygjb6DTf6aBS0Jl2PZ6 +NNo9CZCTiu+I6nMRaVG+NTGCcumtcCdFJNcriGKhTK+HLJiJHBN8qbXQSApu9COEpvFB0 yMaOK5KC4Tw4hyFGrvKergkNK8amyYBKYtZXw7u4NQKzKCqjDMXuZs5h2oGj005LytHsf7 hTpl+5vxW31xvBP2AoCzlwXMUr2G2th34F+iR2zNl1bulunzXhER/wVMJgBod3qyjG07Vy hoYzDTEY/sYrZ+8RJ4mltLIFdWg4VdI2MDAsgV01NWKj9O/Wzj36el8GtCYFoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728121911; a=rsa-sha256; cv=none; b=MwFDzfTRt8oLR5HRDHs7EjNF/fP8K041V7j0eTEdcdaHO69SwxYmtkCa/MRww6SOQoi8e2 4IuC31RFheAK1Ck2ddY7o/Iftl0OCwKJPGuUzS9JjEmJCyPid21M454Fm+syuc+6MkAnRW aj8uZIGnZpq8Oa8fu1HHHf+fg/IfVVx292Mki8ATrog5nYc8cY0xFOfYWWJWSl/SBVLU7g zrET2XipFx/UfuoZj5gRBue01CGxiTdaOPq27LDvwdwq6b+gldiMvDQQBvDy6rrw10gU1J 8tDjo5cDWhxRXfEbpX7u9SwixYOq1m7vruj1L0gALwX304o/IluHkeUAH0Xjkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLLKg5hKKz1Cqy; Sat, 5 Oct 2024 09:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4959ppcI076883; Sat, 5 Oct 2024 09:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4959ppFH076880; Sat, 5 Oct 2024 09:51:51 GMT (envelope-from git) Date: Sat, 5 Oct 2024 09:51:51 GMT Message-Id: <202410050951.4959ppFH076880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 9f146a81d2b3 - main - dummymbuf: Validate syntax upon write to net.dummymbuf.rules sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f146a81d2b33cfed0d5a494e798100c4e4f2a72 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=9f146a81d2b33cfed0d5a494e798100c4e4f2a72 commit 9f146a81d2b33cfed0d5a494e798100c4e4f2a72 Author: Igor Ostapenko AuthorDate: 2024-10-05 08:04:08 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-05 08:04:08 +0000 dummymbuf: Validate syntax upon write to net.dummymbuf.rules sysctl For now, opargs are not validated due to their runtime nature. Reviewed by: kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D46496 --- sys/net/dummymbuf.c | 61 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/sys/net/dummymbuf.c b/sys/net/dummymbuf.c index d4ba00b13235..99b6e6944752 100644 --- a/sys/net/dummymbuf.c +++ b/sys/net/dummymbuf.c @@ -40,6 +40,8 @@ #include #include +static int validate_rules(const char *); + /* * Separate sysctl sub-tree */ @@ -65,6 +67,7 @@ VNET_DEFINE_STATIC(struct sx, dmb_rules_lock); #define DMB_RULES_SUNLOCK() sx_sunlock(&V_dmb_rules_lock) #define DMB_RULES_XLOCK() sx_xlock(&V_dmb_rules_lock) #define DMB_RULES_XUNLOCK() sx_xunlock(&V_dmb_rules_lock) +#define DMB_RULES_LOCK_ASSERT() sx_assert(&V_dmb_rules_lock, SA_LOCKED) static int dmb_sysctl_handle_rules(SYSCTL_HANDLER_ARGS) @@ -86,12 +89,14 @@ dmb_sysctl_handle_rules(SYSCTL_HANDLER_ARGS) } else { /* read and write */ DMB_RULES_XLOCK(); - if (*rulesp == NULL) { - *rulesp = malloc(arg2, M_DUMMYMBUF_RULES, - M_WAITOK | M_ZERO); - } - arg1 = *rulesp; + arg1 = malloc(arg2, M_DUMMYMBUF_RULES, M_WAITOK | M_ZERO); error = sysctl_handle_string(oidp, arg1, arg2, req); + if (error == 0 && (error = validate_rules(arg1)) == 0) { + free(*rulesp, M_DUMMYMBUF_RULES); + *rulesp = arg1; + arg1 = NULL; + } + free(arg1, M_DUMMYMBUF_RULES); DMB_RULES_XUNLOCK(); } @@ -135,7 +140,13 @@ VNET_DEFINE_STATIC(pfil_hook_t, dmb_pfil_ethernet_hook); * Logging */ -#define FEEDBACK(pfil_type, pfil_flags, ifp, rule, msg) \ +#define FEEDBACK_RULE(rule, msg) \ + printf("dummymbuf: %s: %.*s\n", \ + (msg), \ + (rule).syntax_len, (rule).syntax_begin \ + ) + +#define FEEDBACK_PFIL(pfil_type, pfil_flags, ifp, rule, msg) \ printf("dummymbuf: %s %b %s: %s: %.*s\n", \ (pfil_type == PFIL_TYPE_IP4 ? "PFIL_TYPE_IP4" : \ pfil_type == PFIL_TYPE_IP6 ? "PFIL_TYPE_IP6" : \ @@ -198,7 +209,7 @@ bad: } static bool -read_rule(const char **cur, struct rule *rule) +read_rule(const char **cur, struct rule *rule, bool *eof) { // {inet | inet6 | ethernet} {in | out} [ ]; @@ -276,11 +287,37 @@ read_rule(const char **cur, struct rule *rule) return (false); rule->opargs = *cur; + // the next rule & eof *cur = delim + 1; + while (**cur == ' ') + (*cur)++; + *eof = strlen(*cur) == 0; return (true); } +static int +validate_rules(const char *rules) +{ + const char *cursor = rules; + bool parsed; + struct rule rule; + bool eof = false; + + DMB_RULES_LOCK_ASSERT(); + + while (!eof && (parsed = read_rule(&cursor, &rule, &eof))) { + /* noop */ + } + + if (!parsed) { + FEEDBACK_RULE(rule, "rule parsing failed"); + return (EINVAL); + } + + return (0); +} + static pfil_return_t dmb_pfil_mbuf_chk(int pfil_type, struct mbuf **mp, struct ifnet *ifp, int flags, void *ruleset, void *unused) @@ -289,26 +326,26 @@ dmb_pfil_mbuf_chk(int pfil_type, struct mbuf **mp, struct ifnet *ifp, const char *cursor; bool parsed; struct rule rule; + bool eof = false; DMB_RULES_SLOCK(); cursor = V_dmb_rules; - while ((parsed = read_rule(&cursor, &rule))) { + while (!eof && (parsed = read_rule(&cursor, &rule, &eof))) { if (rule.pfil_type == pfil_type && rule.pfil_dir == (flags & rule.pfil_dir) && strcmp(rule.ifname, ifp->if_xname) == 0) { m = rule.op(m, &rule); if (m == NULL) { - FEEDBACK(pfil_type, flags, ifp, rule, + FEEDBACK_PFIL(pfil_type, flags, ifp, rule, "mbuf operation failed"); break; } counter_u64_add(V_dmb_hits, 1); } - if (strlen(cursor) == 0) - break; } if (!parsed) { - FEEDBACK(pfil_type, flags, ifp, rule, "rule parsing failed"); + FEEDBACK_PFIL(pfil_type, flags, ifp, rule, + "rule parsing failed"); m_freem(m); m = NULL; } From nobody Sat Oct 5 11:34:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLNc93lcXz5YBQR; Sat, 05 Oct 2024 11:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLNc93MTtz4rqg; Sat, 5 Oct 2024 11:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728128073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fPQ4VOsjfThRmeG4fAFt/7SNWnq5DmFJctDEpN8cEvg=; b=nnK5jE0Anu7LOiyKtD1NkhVGgO4W/fnHy83zEtirXIvSh7mJVTWmf/+psA/M7vLQliUJe6 xfNqK0LKi1kjDVu48hmZb86l6Tu0uoRNL3NUhZwaICG6UrUPY1OKkzLB3zYLv0aI8dlM9Y psWYbM/tWSQaI/COFkcb0NS7lG93uWBAfyaSJXfgnWS+Sdvbq2uffslDiUOLUWvWEJ+kLq m2BVVHx+vR0Fey4JUELEakooryyIYnKwak01Y5L0fCHpGx4usX7TYTsx9v8pICD+NMtzxQ vTe2ywOfSvMw9Eii5ehfkucG2pF11PiYWOIZp4nXgh3lC7HCJFmaBlndv6e0vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728128073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fPQ4VOsjfThRmeG4fAFt/7SNWnq5DmFJctDEpN8cEvg=; b=UpRaZKOAsPgnnQPlqKT6KTX6Oq10AoJn338fDE9w0/GCUPzQ9GfFJWwwP8KQVOrMYVZvgN dH2rdnWOt1YBYv4OWy5ypDX/GaqiW/M4AmfvJ6jyD7cFjY8SmFuv8dY6FvhjoQ0pk6bUjZ RtWGpBMVXwu74m74mhskOWHCtSOEWAzwIRIPAbC274Llb4aEd5hVqnPp8bfipfO/iS7Z3P bsNc0VBp4hiqxcEE6riqUaOIwO7CwqKl4Y7GttIisCymXDISBosZ2LxIpS4qpj45vRplbF Mn78qDj8YkGqjKA9FOLjV9H5YxRiEj9uAgiHB3B1FUal70P/IaDgZMAtwAmRAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728128073; a=rsa-sha256; cv=none; b=gKHFrSEZ5/QmcFQVMAdoM2r4YyxagXTLcOheaXgRZ7e4RbbQL68OFJ7E5q5nAZoITwx3Im HQKPlvy8LPCneElMHqL+WL2r5kPHraJpx+qH5jKoubDOZdTvm4f/zMkRrSFXJZMigp2bck WHG0aFcJsTycfrKEir9PN6pj46eN0e9Aqv2so/YRnVs6KQSn8PRUeMzjUn3B1yCMXhuw6j ktPaAKDFhhA+BNrpOoL6PfgILkogdH3auglV1L2D76QD2lm90WQ/zB8SIx5su3/KPOhuYz pTe48M9W4WZzRqGykaAwv7vvYnvL+lTuOxGZ+iHm9FwgpiOVH5nxK+dhbXMaLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLNc92qkjzH5F; Sat, 5 Oct 2024 11:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 495BYXY7047818; Sat, 5 Oct 2024 11:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 495BYXar047815; Sat, 5 Oct 2024 11:34:33 GMT (envelope-from git) Date: Sat, 5 Oct 2024 11:34:33 GMT Message-Id: <202410051134.495BYXar047815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 99689201a1eb - main - kyua: Do not count skipped as passed in test cmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99689201a1eb7bcd503987c5220b79330dc058b7 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=99689201a1eb7bcd503987c5220b79330dc058b7 commit 99689201a1eb7bcd503987c5220b79330dc058b7 Author: Igor Ostapenko AuthorDate: 2024-10-05 10:19:31 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-05 10:22:22 +0000 kyua: Do not count skipped as passed in test cmd It changes output of 'kyua test' CLI command only. Hence, other outputs like junit are kept intact for CI and other use cases. It's meant to improve UX of attended use cases. The issue is that the following can be tricky to interpret: 222/222 passed (0 failed) It can be read as all tests are passed, but it might be a summary line of all tests skipped due to some requirement is not met. It's reworked to easily distinguish such cases: 222/222 passed (0 broken, 0 failed, 0 skipped) 0/222 passed (0 broken, 0 failed, 222 skipped) The overall formula is: / (
) Suggested by: kp Reviewed by: ngie, markj Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D46653 --- contrib/kyua/cli/cmd_test.cpp | 50 +++++++++++++++++++++---------- contrib/kyua/integration/cmd_test_test.sh | 42 +++++++++++++------------- contrib/kyua/model/test_result.cpp | 48 ++++++++++++++++++++++------- contrib/kyua/model/test_result.hpp | 15 ++++++++++ 4 files changed, 107 insertions(+), 48 deletions(-) diff --git a/contrib/kyua/cli/cmd_test.cpp b/contrib/kyua/cli/cmd_test.cpp index cfaeec9b74cc..b7afa6d11547 100644 --- a/contrib/kyua/cli/cmd_test.cpp +++ b/contrib/kyua/cli/cmd_test.cpp @@ -64,11 +64,8 @@ class print_hooks : public drivers::run_tests::base_hooks { bool _parallel; public: - /// The amount of positive test results found so far. - unsigned long good_count; - - /// The amount of negative test results found so far. - unsigned long bad_count; + /// The amount of test results per type. + std::map type_count; /// Constructor for the hooks. /// @@ -76,10 +73,10 @@ public: /// \param parallel_ True if we are executing more than one test at once. print_hooks(cmdline::ui* ui_, const bool parallel_) : _ui(ui_), - _parallel(parallel_), - good_count(0), - bad_count(0) + _parallel(parallel_) { + for (const auto& pair : model::test_result_types) + type_count[pair.first] = 0; } /// Called when the processing of a test case begins. @@ -116,10 +113,8 @@ public: } _ui->out(F("%s [%s]") % cli::format_result(result) % cli::format_delta(duration)); - if (result.good()) - good_count++; - else - bad_count++; + + type_count[result.type()]++; } }; @@ -159,8 +154,21 @@ cmd_test::run(cmdline::ui* ui, const cmdline::parsed_cmdline& cmdline, kyuafile_path(cmdline), build_root_path(cmdline), results.second, parse_filters(cmdline.arguments()), user_config, hooks); + unsigned long total = 0; + unsigned long good = 0; + unsigned long bad = 0; + for (const auto& pair : model::test_result_types) { + const auto& type = pair.second; + const auto count = hooks.type_count[type.id]; + total += count; + if (type.is_run && type.is_good) + good += count; + if (!type.is_good) + bad += count; + } + int exit_code; - if (hooks.good_count > 0 || hooks.bad_count > 0) { + if (total > 0) { ui->out(""); if (!results.first.empty()) { ui->out(F("Results file id is %s") % results.first); @@ -168,10 +176,20 @@ cmd_test::run(cmdline::ui* ui, const cmdline::parsed_cmdline& cmdline, ui->out(F("Results saved to %s") % results.second); ui->out(""); - ui->out(F("%s/%s passed (%s failed)") % hooks.good_count % - (hooks.good_count + hooks.bad_count) % hooks.bad_count); + ui->out(F("%s/%s passed (") % good % total, false); + const auto& types = model::test_result_types; + for (auto it = types.begin(); it != types.end(); it++) { + const auto& type = it->second; + if (!type.is_run || !type.is_good) { + if (it != types.begin()) + ui->out(", ", false); + ui->out(F("%s %s") % hooks.type_count[type.id] % type.name, + false); + } + } + ui->out(")"); - exit_code = (hooks.bad_count == 0 ? EXIT_SUCCESS : EXIT_FAILURE); + exit_code = (bad == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } else { // TODO(jmmv): Delete created empty file; it's useless! if (!results.first.empty()) { diff --git a/contrib/kyua/integration/cmd_test_test.sh b/contrib/kyua/integration/cmd_test_test.sh index bc8c62daf223..f0862cf29582 100644 --- a/contrib/kyua/integration/cmd_test_test.sh +++ b/contrib/kyua/integration/cmd_test_test.sh @@ -44,7 +44,7 @@ simple_all_pass:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/2 passed (0 failed) +1/2 passed (0 broken, 0 failed, 1 skipped) EOF utils_cp_helper simple_all_pass . @@ -69,7 +69,7 @@ simple_some_fail:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -1/2 passed (1 failed) +1/2 passed (0 broken, 1 failed, 0 skipped) EOF utils_cp_helper simple_some_fail . @@ -102,7 +102,7 @@ third:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -7/7 passed (0 failed) +3/7 passed (0 broken, 0 failed, 4 skipped) EOF utils_cp_helper simple_all_pass first @@ -138,7 +138,7 @@ third:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -4/7 passed (3 failed) +3/7 passed (0 broken, 3 failed, 1 skipped) EOF utils_cp_helper simple_some_fail first @@ -172,7 +172,7 @@ expect_all_pass:timeout -> expected_failure: This times out [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -5/5 passed (0 failed) +5/5 passed (0 broken, 0 failed, 0 skipped) EOF # CHECK_STYLE_ENABLE @@ -203,7 +203,7 @@ expect_some_fail:timeout -> failed: Test case was expected to hang but it cont Results file id is $(utils_results_id) Results saved to $(utils_results_file) -1/6 passed (5 failed) +1/6 passed (0 broken, 5 failed, 0 skipped) EOF # CHECK_STYLE_ENABLE @@ -231,7 +231,7 @@ bogus_test_cases:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -1/3 passed (2 failed) +1/3 passed (2 broken, 0 failed, 0 skipped) EOF # CHECK_STYLE_ENABLE @@ -270,7 +270,7 @@ subdir/simple_some_fail:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -3/4 passed (1 failed) +2/4 passed (0 broken, 1 failed, 1 skipped) EOF atf_check -s exit:1 -o file:expout -e empty kyua test } @@ -302,7 +302,7 @@ subdir/simple_all_pass:skip -> skipped: The reason for skipping is this [S.UU Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/2 passed (0 failed) +1/2 passed (0 broken, 0 failed, 1 skipped) EOF # CHECK_STYLE_ENABLE atf_check -s exit:0 -o file:expout -e empty kyua test subdir @@ -328,7 +328,7 @@ first:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -1/1 passed (0 failed) +0/1 passed (0 broken, 0 failed, 1 skipped) EOF atf_check -s exit:0 -o file:expout -e empty kyua test first:skip } @@ -354,7 +354,7 @@ second:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -1/2 passed (1 failed) +1/2 passed (0 broken, 1 failed, 0 skipped) EOF atf_check -s exit:1 -o file:expout -e empty kyua test second } @@ -402,7 +402,7 @@ subdir/second:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/3 passed (1 failed) +2/3 passed (0 broken, 1 failed, 0 skipped) EOF atf_check -s exit:1 -o file:expout -e empty kyua test subdir first:pass } @@ -470,7 +470,7 @@ third:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -3/4 passed (1 failed) +2/4 passed (0 broken, 1 failed, 1 skipped) EOF cat >experr < failed: This fails on purpose [S.UUUs] Results file id is $(utils_results_id root) Results saved to $(utils_results_file root) -2/3 passed (1 failed) +1/3 passed (0 broken, 1 failed, 1 skipped) EOF atf_check -s exit:1 -o file:expout -e empty kyua test \ -k "$(pwd)/root/Kyuafile" first subdir/fourth:fail @@ -542,7 +542,7 @@ first:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/2 passed (0 failed) +1/2 passed (0 broken, 0 failed, 1 skipped) EOF CREATE_COOKIE="$(pwd)/cookie"; export CREATE_COOKIE atf_check -s exit:0 -o file:expout -e empty kyua test first @@ -612,7 +612,7 @@ some-program:pass -> passed [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -1/2 passed (1 failed) +1/2 passed (0 broken, 1 failed, 0 skipped) EOF atf_check -s exit:1 -o file:expout -e empty kyua test @@ -710,7 +710,7 @@ subdir/third:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -6/6 passed (0 failed) +3/6 passed (0 broken, 0 failed, 3 skipped) EOF mkdir build @@ -745,7 +745,7 @@ sometest:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/2 passed (0 failed) +1/2 passed (0 broken, 0 failed, 1 skipped) EOF atf_check -s exit:0 -o file:expout -e empty kyua test -k myfile atf_check -s exit:0 -o file:expout -e empty kyua test --kyuafile=myfile @@ -774,7 +774,7 @@ sometest:skip -> skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/2 passed (0 failed) +1/2 passed (0 broken, 0 failed, 1 skipped) EOF atf_check -s exit:0 -o file:expout -e empty kyua test -k myfile sometest cat >expout < skipped: The reason for skipping is this [S.UUUs] Results file id is $(utils_results_id) Results saved to $(utils_results_file) -2/2 passed (0 failed) +1/2 passed (0 broken, 0 failed, 1 skipped) EOF atf_check -s exit:0 -o file:expout -e empty kyua test --kyuafile=myfile \ sometest @@ -987,7 +987,7 @@ non_executable:__test_cases_list__ -> broken: Permission denied to run test pr Results file id is $(utils_results_id) Results saved to $(utils_results_file) -0/2 passed (2 failed) +0/2 passed (2 broken, 0 failed, 0 skipped) EOF # CHECK_STYLE_ENABLE atf_check -s exit:1 -o file:expout -e empty kyua test diff --git a/contrib/kyua/model/test_result.cpp b/contrib/kyua/model/test_result.cpp index 7392e77f5561..f3e1b66f260b 100644 --- a/contrib/kyua/model/test_result.cpp +++ b/contrib/kyua/model/test_result.cpp @@ -35,6 +35,42 @@ namespace text = utils::text; +const std::map + model::test_result_types = +{ + { test_result_broken, + { .id = test_result_broken, + .name = "broken", + .is_run = true, + .is_good = false, } }, + + { test_result_expected_failure, + { .id = test_result_expected_failure, + .name = "xfail", + .is_run = true, + .is_good = true, } }, + + { test_result_failed, + { .id = test_result_failed, + .name = "failed", + .is_run = true, + .is_good = false, } }, + + { test_result_passed, + { .id = test_result_passed, + .name = "passed", + .is_run = true, + .is_good = true, } }, + + { test_result_skipped, + { .id = test_result_skipped, + .name = "skipped", + .is_run = false, + .is_good = true, } }, +}; + + /// Constructs a base result. /// /// \param type_ The type of the result. @@ -74,17 +110,7 @@ model::test_result::reason(void) const bool model::test_result::good(void) const { - switch (_type) { - case test_result_expected_failure: - case test_result_passed: - case test_result_skipped: - return true; - - case test_result_broken: - case test_result_failed: - return false; - } - UNREACHABLE; + return test_result_types.at(_type).is_good; } diff --git a/contrib/kyua/model/test_result.hpp b/contrib/kyua/model/test_result.hpp index b9c439ce789a..33c76124550f 100644 --- a/contrib/kyua/model/test_result.hpp +++ b/contrib/kyua/model/test_result.hpp @@ -34,12 +34,27 @@ #include "model/test_result_fwd.hpp" +#include #include #include namespace model { +/// Test result type metadata. +struct test_result_type_desc { + enum test_result_type id; + std::string name; + bool is_run; + bool is_good; +}; + + +/// Description of each test result type. +extern const std::map test_result_types; + + /// Representation of a single test result. /// /// A test result is a simple pair of (type, reason). The type indicates the From nobody Sat Oct 5 15:08:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLTM53ZV8z5YSMw; Sat, 05 Oct 2024 15:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLTM533s1z4CVD; Sat, 5 Oct 2024 15:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728140913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7ewSU1NqJ13ELxjL+c2D50DEl8u6If4oxuHytb7aNE=; b=hy9CEHhU0aBzBTP283YXoI1E+C5dhsIGtNBw13gGm5pF4BN5w15rTfDte0WsloPYinne0G uIxbDtEyxIqyoCT1WBoKjkC2O6CbZ+y7pdyp6qtn18/pAnThvXqUZXEwFson29xnGCQzQ/ YjQA15pov028p4CFKP5ymj50uKrp24vO8WdlQUWPWSlN10XhBuC1+SATIqJ+EhjiTNi4A8 YD9EQf1/O8hyBBbXrrp8VFPBl2G/bHNsB55BhNDP0ESFxHtDMHRb11X62DqFFKmnK6Izo8 Mg5jBzx+3KOhOv34GsCs+90LsPHv88VnfFqpTOLP2rADTs1S/6EcwHvPVtuT9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728140913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7ewSU1NqJ13ELxjL+c2D50DEl8u6If4oxuHytb7aNE=; b=gaL4WyUiCGybL45phNPZYG1SfbMkWzgL+o+HaxsRG/qK3dm697VGpG2A70tBMuJC68keAq ZMORLnQJvKq4+qBKneNgo6W1vZ/SbgsvcHyPnENjApWoFgKf57y16D9UvTE9PHxbxcQwhi +VYo8GezvVrP/fkSApbK8s3Rf0cZPNsZsiZPZJ7SdCYyo80dlDrLdmmrYKj2C29nhcsuyZ ZcC30yTphNgyVxCeQWWS9u+ARvn4GkCfolegmmOxOg8kUq3T+ykUts+MmEyo1B1cYE6qAu 07q8ykN75YhyDAJTwxKe5WnSFsP3ecM9S+RoMVDBleIErzVE8lPtBipkpXskyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728140913; a=rsa-sha256; cv=none; b=NOmhdUeMcQfFg/bQ9DUxY1UuL5c21tNW/EHN/xYZ703DsF7mbfw6dp99NXWT8ydQyrIOZ8 AG7f+gNSq1AWgHUGtPgmO2f39sN7Xw2oFsAXJ0xCiZus4N9KaRBuPxBVC31nh4UP+RRNrh WxyPxDDeEtOw6N7ILK1WKW73qOptzJXL/uV3NovCVubhQ8S5y0+fWD4uP3zY98kpv3HJHA D2p70525T8Ib6t64OhC8AIxe8ymPr9QKlgRD893yOm6856djA44iwQ2+tEDYYONoX47GdJ TgYxZHnDNdW9jyBihoiduxhmtrCEot9pUEOv9F3757XjcnCUyJ+3whEwIwOnIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLTM52gkczN3N; Sat, 5 Oct 2024 15:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 495F8XMo004396; Sat, 5 Oct 2024 15:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 495F8XMC004393; Sat, 5 Oct 2024 15:08:33 GMT (envelope-from git) Date: Sat, 5 Oct 2024 15:08:33 GMT Message-Id: <202410051508.495F8XMC004393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 149e1af6ae49 - main - vm_kern: Use VM_ALLOC_NOFREE when allocating 'zero_region' page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 149e1af6ae4936fac0a907d4c62d745c179b4dc5 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=149e1af6ae4936fac0a907d4c62d745c179b4dc5 commit 149e1af6ae4936fac0a907d4c62d745c179b4dc5 Author: Bojan Novković AuthorDate: 2024-10-05 15:05:40 +0000 Commit: Bojan Novković CommitDate: 2024-10-05 15:05:40 +0000 vm_kern: Use VM_ALLOC_NOFREE when allocating 'zero_region' page Allocate the 'zero_region' page using VM_ALLOC_NOFREE since it never gets released. Differential Revision: https://reviews.freebsd.org/D46885 Reviewed by: alc, markj, kib --- sys/vm/vm_kern.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index fb7c80b767ed..22776e2196b0 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -762,7 +762,8 @@ kmem_init_zero_region(void) * zeros, while not using much more physical resources. */ addr = kva_alloc(ZERO_REGION_SIZE); - m = vm_page_alloc_noobj(VM_ALLOC_WIRED | VM_ALLOC_ZERO); + m = vm_page_alloc_noobj(VM_ALLOC_WIRED | VM_ALLOC_ZERO | + VM_ALLOC_NOFREE); for (i = 0; i < ZERO_REGION_SIZE; i += PAGE_SIZE) pmap_qenter(addr + i, &m, 1); pmap_protect(kernel_pmap, addr, addr + ZERO_REGION_SIZE, VM_PROT_READ); From nobody Sun Oct 6 03:49:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLpF01FBhz5YCGX; Sun, 06 Oct 2024 03:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLpF00Vmqz4FT2; Sun, 6 Oct 2024 03:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCwTavNGVBdwcH1lPCCkxsKs8Li089NvR/FJKY07JRU=; b=cv0bsBaez2kT7TF4KG2S7KkvufOh0iuo0uQObQGXtOMvHRQUX6FydPQcvlsH719i0X4CoD WU46dyykdQEQ6BkhRZKL+hlJW08J7ddUxpd3h9+dKkihU85XueqvlqfeddausMMpEdpvMw eYORvy8IBBhXDMq698nOx9wSY16LygiHoynqUp6TA58Za9bJ7nN5rAy35Tw71MIxE0e98S 2Go+NyyM9nHy6KYrS8jNGwBQGF+OnVsSt8Pp+mKgeuYuMvEZ6qBCJAZxSIprCrmHO1cHyp AG9NXZKbhXwqUj5lA431yDdCrKl41p5zhMa6awMPgyk6GRn6acB+UjVg7z/Olw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCwTavNGVBdwcH1lPCCkxsKs8Li089NvR/FJKY07JRU=; b=suCAF5thfQP8BSIk9LBkryC5nOMwnalK3QA17OfSpAshMhjpNtiDOfArsQOpZ1i3FGsAOG YQEmc3ojK6qSHn7I1mFr55B3VlJsw6qFFZXd1IHUS4ndzFw8vuH9vyvo1dXoYHTcOLBrFg Wixzm+V+CWuyCTchFyd3cBmpd0ZNZucEhM2vSfqFmHN226GaFCLKO1v+F1QUBcf2McyxLo Tjnnln9PUblQ4bXcAjkD/6C5V1pbYTZVQSOSl7yszpCInGmZrKLY1EUgBpM56aMyXfQ4tN AaN5SwU3sHEjl+YslvoQFtMuDAZLNiWNwvDFwsZZ1hDBBsIg40Rez3JkraFOLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728186564; a=rsa-sha256; cv=none; b=duCw1RUyxQR2eZ7HFWMB/874B3r7QJrAMNlh5up8JwDwdRHKwtkEPhba901LNWcW8fixxz IrB/IJjmIvaZmj6dsWBVKN1OUi7TdAsUE4UtdZTdToVHUUUNhZipVITQmyR9CqJAHBMRda BdjObdYpl9Dxif83UrCoyiMW0XgOW+hc6zpdeoTELtaH74DmLVOYJoSgUwTtV3yB1ZGxBY eWkNwlPD0yD28TYU2BtTC1dXFE1j0TFC3uSQDha/QSo+Ac5ntOWrQdJPkBc5Qkm2pcOozo 07hvc+jeEp+xbqlMiAM8FS6OqbEzTMT7UsVHDRUG5aHHNBut/8NHhTA/IvQlhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLpF005xkzmMl; Sun, 6 Oct 2024 03:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4963nNTu091853; Sun, 6 Oct 2024 03:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4963nNcE091850; Sun, 6 Oct 2024 03:49:23 GMT (envelope-from git) Date: Sun, 6 Oct 2024 03:49:23 GMT Message-Id: <202410060349.4963nNcE091850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 941833b9bb8a - stable/14 - ixgbe: Switch if_sriov read/write back to ixgbe_mbx APIs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 941833b9bb8a3ab063189e02eed6860bfabd5f73 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=941833b9bb8a3ab063189e02eed6860bfabd5f73 commit 941833b9bb8a3ab063189e02eed6860bfabd5f73 Author: Kevin Bowling AuthorDate: 2024-09-29 04:15:53 +0000 Commit: Kevin Bowling CommitDate: 2024-10-06 03:48:42 +0000 ixgbe: Switch if_sriov read/write back to ixgbe_mbx APIs These are more succinct than jumping through the function pointers directly and add some additional error handling. (cherry picked from commit 1e3b1870ad2a426de6e3f5445211b698f20f7f1f) --- sys/dev/ixgbe/if_sriov.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 6a2dad4bca42..0916ae1ac7cc 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -100,7 +100,7 @@ ixgbe_send_vf_msg(struct ixgbe_hw *hw, struct ixgbe_vf *vf, u32 msg) if (vf->flags & IXGBE_VF_CTS) msg |= IXGBE_VT_MSGTYPE_CTS; - hw->mbx.ops[vf->pool].write(hw, &msg, 1, vf->pool); + ixgbe_write_mbx(hw, &msg, 1, vf->pool); } static inline void @@ -595,8 +595,7 @@ ixgbe_process_vf_msg(if_ctx_t ctx, struct ixgbe_vf *vf) hw = &sc->hw; - error = hw->mbx.ops[vf->pool].read(hw, msg, IXGBE_VFMAILBOX_SIZE, - vf->pool); + error = ixgbe_read_mbx(hw, msg, IXGBE_VFMAILBOX_SIZE, vf->pool); if (error != 0) return; From nobody Sun Oct 6 03:49:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLpF1261Zz5YCPk; Sun, 06 Oct 2024 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLpF11Z9Bz4FVc; Sun, 6 Oct 2024 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v610Wb5j2mtlREzhUvSoWHTplQIGtsovQ/g4QYGg36M=; b=C3/D1QAAJokNsSqyOZDj3MPO5lXxQXU2f1VTKAJwdnTl7Bw7ZoFWIant4g2zpHdmGEroFJ atFDvrZLID96ufAIwNcnPYutMav3FiUkQIQBYFIY+iA5Z1T2O8DFUfcCCIwblkoe2P8tFZ kE7kcPipWz41Q+5I3wifSL5ogDCm1SALFUpXrnyUJtlgQtxDNs22J+FODZfwi6aU409Pib a3JqnYNd2lGrSd0vqlgjp4kdXujuYlTK9UHTGjYUzq7Rsu2g3KlY+uTZ3w2mOaZSuvRGks cGXv8Heip5NyzDMHhWb8/bsKVjdp2MwRtrHlumb2WIFBofNOKydgMg0XiqaK+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v610Wb5j2mtlREzhUvSoWHTplQIGtsovQ/g4QYGg36M=; b=Wbz79zOX0FkbgkwQNrFSCOn63yGJAi4jTA3VySBYfyjKND46opq1yDY3EHO1/miBNuJy49 qNZ5tCDptW4B0VynB2dnDMgwHncm6qc+kCmcJcnPg1rg0xkkn5E/ehTdJ12ZoH2P9CVSVq 3+7no2Tuv6sSRP8j1lVGe5m7YOOafQR8nAGgmsBzy48wCHkJh9Ara+LnSFuKg2zcuI7qXa zGSK74oFR/SV/SlsPTyevCjg9oHey7JFskdbyoCBCxSRUZhL/35rkgrbwp1w2X65X7A8mQ dofc/gKIKybLVyo5EY5DwMoBAEGdrZf9BfYyUvunmv5gDaHnSeagen+tTBbSuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728186565; a=rsa-sha256; cv=none; b=HBGfk9TtF4ulz5wO5tlU6c5VV1GweFALHaJWe9+IW1KBYBg2GO6GmewpXfyV/FI5JWM4gN uAdi4Zn+x9C+8iKbUiy5DOdjSk5YJmGoWB6H5+L/IUAQ3vF+bvEAFj5s+CDWCAL9sSMAcE F9jZ88k78AN0uY+6P42RwBTG0CFxMxq2KPt5rBiSI4zl++sZhEmdR+BLTMd3wUdqrArbJ8 KBxnTIihyePAOLAMibl9j5MIbX33YPx0u95D66C2B0HVPQLMdVh4PcZ+LMfQUgKt68q/3g Aowhm9Ek7lrqBe75zt1fQRHcZ3yMVRHCEsRV/qZov50gODXYdYV6Jj2JY1MDKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLpF117WZzm7j; Sun, 6 Oct 2024 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4963nP5V091905; Sun, 6 Oct 2024 03:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4963nPmN091902; Sun, 6 Oct 2024 03:49:25 GMT (envelope-from git) Date: Sun, 6 Oct 2024 03:49:25 GMT Message-Id: <202410060349.4963nPmN091902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: f75c75d94841 - stable/14 - igc: Remove non-existent legacy absolute and packet timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f75c75d94841ebd410ccecf7b0bf8c8faf602193 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f75c75d94841ebd410ccecf7b0bf8c8faf602193 commit f75c75d94841ebd410ccecf7b0bf8c8faf602193 Author: Kevin Bowling AuthorDate: 2024-09-29 04:32:49 +0000 Commit: Kevin Bowling CommitDate: 2024-10-06 03:48:55 +0000 igc: Remove non-existent legacy absolute and packet timers igc, derived from igb, does not use these registers. All interrupt timing is governed by EITR or LLI and driven by write-back. Sponsored by: BBOX.io (cherry picked from commit a40ecb6f740530fb7e6a95e702113aa3fe24d975) --- sys/dev/igc/if_igc.c | 109 ------------------------------------------------- sys/dev/igc/if_igc.h | 59 -------------------------- sys/dev/igc/igc_regs.h | 5 --- 3 files changed, 173 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index bfa33c82f7ba..c78edab5e38a 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -121,9 +121,6 @@ static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int igc_get_rs(SYSCTL_HANDLER_ARGS); static void igc_print_debug_info(struct igc_adapter *); static int igc_is_valid_ether_addr(u8 *); -static int igc_sysctl_int_delay(SYSCTL_HANDLER_ARGS); -static void igc_add_int_delay_sysctl(struct igc_adapter *, const char *, - const char *, struct igc_int_delay_info *, int, int); /* Management and WOL Support */ static void igc_get_hw_control(struct igc_adapter *); static void igc_release_hw_control(struct igc_adapter *); @@ -211,12 +208,6 @@ static driver_t igc_if_driver = { * Tunable default values. *********************************************************************/ -#define IGC_TICKS_TO_USECS(ticks) ((1024 * (ticks) + 500) / 1000) -#define IGC_USECS_TO_TICKS(usecs) ((1000 * (usecs) + 512) / 1024) - -#define MAX_INTS_PER_SEC 8000 -#define DEFAULT_ITR (1000000000/(MAX_INTS_PER_SEC * 256)) - /* Allow common code without TSO */ #ifndef CSUM_TSO #define CSUM_TSO 0 @@ -229,22 +220,6 @@ static int igc_disable_crc_stripping = 0; SYSCTL_INT(_hw_igc, OID_AUTO, disable_crc_stripping, CTLFLAG_RDTUN, &igc_disable_crc_stripping, 0, "Disable CRC Stripping"); -static int igc_tx_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_TIDV_VAL); -static int igc_rx_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_RDTR_VAL); -SYSCTL_INT(_hw_igc, OID_AUTO, tx_int_delay, CTLFLAG_RDTUN, &igc_tx_int_delay_dflt, - 0, "Default transmit interrupt delay in usecs"); -SYSCTL_INT(_hw_igc, OID_AUTO, rx_int_delay, CTLFLAG_RDTUN, &igc_rx_int_delay_dflt, - 0, "Default receive interrupt delay in usecs"); - -static int igc_tx_abs_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_TADV_VAL); -static int igc_rx_abs_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_RADV_VAL); -SYSCTL_INT(_hw_igc, OID_AUTO, tx_abs_int_delay, CTLFLAG_RDTUN, - &igc_tx_abs_int_delay_dflt, 0, - "Default transmit interrupt delay limit in usecs"); -SYSCTL_INT(_hw_igc, OID_AUTO, rx_abs_int_delay, CTLFLAG_RDTUN, - &igc_rx_abs_int_delay_dflt, 0, - "Default receive interrupt delay limit in usecs"); - static int igc_smart_pwr_down = false; SYSCTL_INT(_hw_igc, OID_AUTO, smart_pwr_down, CTLFLAG_RDTUN, &igc_smart_pwr_down, 0, "Set to true to leave smart power down enabled on newer adapters"); @@ -536,29 +511,6 @@ igc_if_attach_pre(if_ctx_t ctx) igc_setup_msix(ctx); igc_get_bus_info(hw); - /* Set up some sysctls for the tunable interrupt delays */ - igc_add_int_delay_sysctl(adapter, "rx_int_delay", - "receive interrupt delay in usecs", &adapter->rx_int_delay, - IGC_REGISTER(hw, IGC_RDTR), igc_rx_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "tx_int_delay", - "transmit interrupt delay in usecs", &adapter->tx_int_delay, - IGC_REGISTER(hw, IGC_TIDV), igc_tx_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "rx_abs_int_delay", - "receive interrupt delay limit in usecs", - &adapter->rx_abs_int_delay, - IGC_REGISTER(hw, IGC_RADV), - igc_rx_abs_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "tx_abs_int_delay", - "transmit interrupt delay limit in usecs", - &adapter->tx_abs_int_delay, - IGC_REGISTER(hw, IGC_TADV), - igc_tx_abs_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "itr", - "interrupt delay limit in usecs/4", - &adapter->tx_itr, - IGC_REGISTER(hw, IGC_ITR), - DEFAULT_ITR); - hw->mac.autoneg = DO_AUTO_NEG; hw->phy.autoneg_wait_to_complete = false; hw->phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; @@ -2015,12 +1967,6 @@ igc_initialize_receive_unit(if_ctx_t ctx) if (!igc_disable_crc_stripping) rctl |= IGC_RCTL_SECRC; - /* - * Set the interrupt throttling rate. Value is calculated - * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) - */ - IGC_WRITE_REG(hw, IGC_ITR, DEFAULT_ITR); - rxcsum = IGC_READ_REG(hw, IGC_RXCSUM); if (if_getcapenable(ifp) & IFCAP_RXCSUM) { rxcsum |= IGC_RXCSUM_CRCOFL; @@ -2717,61 +2663,6 @@ igc_print_nvm_info(struct igc_adapter *adapter) printf("\n"); } -static int -igc_sysctl_int_delay(SYSCTL_HANDLER_ARGS) -{ - struct igc_int_delay_info *info; - struct igc_adapter *adapter; - u32 regval; - int error, usecs, ticks; - - info = (struct igc_int_delay_info *) arg1; - usecs = info->value; - error = sysctl_handle_int(oidp, &usecs, 0, req); - if (error != 0 || req->newptr == NULL) - return (error); - if (usecs < 0 || usecs > IGC_TICKS_TO_USECS(65535)) - return (EINVAL); - info->value = usecs; - ticks = IGC_USECS_TO_TICKS(usecs); - if (info->offset == IGC_ITR) /* units are 256ns here */ - ticks *= 4; - - adapter = info->adapter; - - regval = IGC_READ_OFFSET(&adapter->hw, info->offset); - regval = (regval & ~0xffff) | (ticks & 0xffff); - /* Handle a few special cases. */ - switch (info->offset) { - case IGC_RDTR: - break; - case IGC_TIDV: - if (ticks == 0) { - adapter->txd_cmd &= ~IGC_TXD_CMD_IDE; - /* Don't write 0 into the TIDV register. */ - regval++; - } else - adapter->txd_cmd |= IGC_TXD_CMD_IDE; - break; - } - IGC_WRITE_OFFSET(&adapter->hw, info->offset, regval); - return (0); -} - -static void -igc_add_int_delay_sysctl(struct igc_adapter *adapter, const char *name, - const char *description, struct igc_int_delay_info *info, - int offset, int value) -{ - info->adapter = adapter; - info->offset = offset; - info->value = value; - SYSCTL_ADD_PROC(device_get_sysctl_ctx(adapter->dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)), - OID_AUTO, name, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - info, 0, igc_sysctl_int_delay, "I", description); -} - /* * Set flow control using sysctl: * Flow control values: diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index 0c22ce9f76f4..92865b5b9eb1 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -131,65 +131,6 @@ #define IGC_DEFAULT_MULTI_RXD 4096 #define IGC_MAX_RXD 4096 -/* - * IGC_TIDV_VAL - Transmit Interrupt Delay Value - * Valid Range: 0-65535 (0=off) - * Default Value: 64 - * This value delays the generation of transmit interrupts in units of - * 1.024 microseconds. Transmit interrupt reduction can improve CPU - * efficiency if properly tuned for specific network traffic. If the - * system is reporting dropped transmits, this value may be set too high - * causing the driver to run out of available transmit descriptors. - */ -#define IGC_TIDV_VAL 64 - -/* - * IGC_TADV_VAL - Transmit Absolute Interrupt Delay Value - * Valid Range: 0-65535 (0=off) - * Default Value: 64 - * This value, in units of 1.024 microseconds, limits the delay in which a - * transmit interrupt is generated. Useful only if IGC_TIDV is non-zero, - * this value ensures that an interrupt is generated after the initial - * packet is sent on the wire within the set amount of time. Proper tuning, - * along with IGC_TIDV_VAL, may improve traffic throughput in specific - * network conditions. - */ -#define IGC_TADV_VAL 64 - -/* - * IGC_RDTR_VAL - Receive Interrupt Delay Timer (Packet Timer) - * Valid Range: 0-65535 (0=off) - * Default Value: 0 - * This value delays the generation of receive interrupts in units of 1.024 - * microseconds. Receive interrupt reduction can improve CPU efficiency if - * properly tuned for specific network traffic. Increasing this value adds - * extra latency to frame reception and can end up decreasing the throughput - * of TCP traffic. If the system is reporting dropped receives, this value - * may be set too high, causing the driver to run out of available receive - * descriptors. - * - * CAUTION: When setting IGC_RDTR to a value other than 0, adapters - * may hang (stop transmitting) under certain network conditions. - * If this occurs a WATCHDOG message is logged in the system - * event log. In addition, the controller is automatically reset, - * restoring the network connection. To eliminate the potential - * for the hang ensure that IGC_RDTR is set to 0. - */ -#define IGC_RDTR_VAL 0 - -/* - * Receive Interrupt Absolute Delay Timer - * Valid Range: 0-65535 (0=off) - * Default Value: 64 - * This value, in units of 1.024 microseconds, limits the delay in which a - * receive interrupt is generated. Useful only if IGC_RDTR is non-zero, - * this value ensures that an interrupt is generated after the initial - * packet is received within the set amount of time. Proper tuning, - * along with IGC_RDTR, may improve traffic throughput in specific network - * conditions. - */ -#define IGC_RADV_VAL 64 - /* * This parameter controls whether or not autonegotation is enabled. * 0 - Disable autonegotiation diff --git a/sys/dev/igc/igc_regs.h b/sys/dev/igc/igc_regs.h index f4ded07ce6ab..26614dc33df6 100644 --- a/sys/dev/igc/igc_regs.h +++ b/sys/dev/igc/igc_regs.h @@ -27,7 +27,6 @@ #define IGC_CONNSW 0x00034 /* Copper/Fiber switch control - RW */ #define IGC_VET 0x00038 /* VLAN Ether Type - RW */ #define IGC_ICR 0x01500 /* Intr Cause Read - RC/W1C */ -#define IGC_ITR 0x000C4 /* Interrupt Throttling Rate - RW */ #define IGC_ICS 0x01504 /* Intr Cause Set - WO */ #define IGC_IMS 0x01508 /* Intr Mask Set/Read - RW */ #define IGC_IMC 0x0150C /* Intr Mask Clear - WO */ @@ -78,8 +77,6 @@ #define IGC_FCRTV 0x02460 /* Flow Control Refresh Timer Value - RW */ /* Split and Replication Rx Control - RW */ #define IGC_RXPBS 0x02404 /* Rx Packet Buffer Size - RW */ -#define IGC_RDTR 0x02820 /* Rx Delay Timer - RW */ -#define IGC_RADV 0x0282C /* Rx Interrupt Absolute Delay Timer - RW */ /* Shadow Ram Write Register - RW */ #define IGC_SRWR 0x12018 #define IGC_EEC_REG 0x12010 @@ -148,8 +145,6 @@ #define IGC_FFVT_REG(_i) (0x09800 + ((_i) * 8)) #define IGC_FFLT_REG(_i) (0x05F00 + ((_i) * 8)) #define IGC_TXPBS 0x03404 /* Tx Packet Buffer Size - RW */ -#define IGC_TIDV 0x03820 /* Tx Interrupt Delay Value - RW */ -#define IGC_TADV 0x0382C /* Tx Interrupt Absolute Delay Val - RW */ /* Statistics Register Descriptions */ #define IGC_CRCERRS 0x04000 /* CRC Error Count - R/clr */ #define IGC_ALGNERRC 0x04004 /* Alignment Error Count - R/clr */ From nobody Sun Oct 6 03:49:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLpF23tSyz5YCGf; Sun, 06 Oct 2024 03:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLpF22b7Fz4FPD; Sun, 6 Oct 2024 03:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QfnFFmgOBzzxphAkUhnNruB38/S4KWEaJ1JB3STr6N8=; b=U0kWXJxrCdXePZBv2Xf6FFEgGNJaSownF6ckw5CtrHm5c5ccDZHnsa2PWyIfvDRgRw/xUQ BkPvLO0actNh1+/oD4YyN+cjHe0WY2+GB4hpEFg9bS8oA4nnDkLJ5jTMm4/ErSi4I3NeFz y08dRkOhJ7lCL+oSGo1BzKVGS0vL/+FiFiQ7/4aqr1aHURE7S2X+MVXFDcB1hZsAjp/e0l i4faWkwvGt3TEbc+LAfcgIDlqxJ+xvExSAYAQohrr5VuvB3HGL3o8JjAkqmxt44v/TsQhK 5oRgN7M4OcE9KuEADoFK3nI/yGjRozQvVjmS7evcRMVcJydvHrect5ryOx1p5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QfnFFmgOBzzxphAkUhnNruB38/S4KWEaJ1JB3STr6N8=; b=bp+IjmPGnsaiWTCSpHV7/li24P0qyBt5pAToG8HYd2HvzK2EPGph/KI32nV+v2XdigkBIi DA9xizivzRwewIPIh1IWYwEOmgVoQWEjC4UwUvS06iHe/hwbmM3fCHBvEB/2fR/waIe5d3 6RAV95FTtaooHlu9sPjTylEIf80bFmCJGPgiAFziuagp5r5mUcaxntfTQDv7oBXXryMTcz iySsn77I+745OkiOwNZ8Uc5KVF1PIxa/Bn4roL8ykx0bDoY14HqhwbH5g/LfM+VdAEGBQm UXCYHydVx3Qc1o/0V/60gda75fPmAbz63mevrY5UIqZcWK3QlCS6yU9iDQxSPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728186566; a=rsa-sha256; cv=none; b=R9azZQKQ11Sazw96xXk5CvpZIsr0stxzoVqklF5dvGiWwURHi1vopVKq+VwHrtQMztECBM 8ysiuI7R7IFZ5JtJUGM0xBOFJKUDndUc2rIpUL0r71WrJSSW5Iif1gMYLP64EXgRM4ac/Z iUEFO9f3K7QG3nTWvgHeYXeJn+ZGuhvDU/k9wCWY84QNdWm8GrthSx8h1Ig2cjPtjGeY+M K6Iydt7OSVZkxhuKWP7kS+kYpKzVMX4LcCvOj/B8jUTMLyEcJNL38NnFLYkYuHlYzI8jGU yDEVppp3NvaywB2YF+8xkHjT36KKWqftSdjZYtC9NPfYKxGy0WUYyhf4kmIcpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLpF228c1zmmN; Sun, 6 Oct 2024 03:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4963nQ1f091950; Sun, 6 Oct 2024 03:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4963nQIh091947; Sun, 6 Oct 2024 03:49:26 GMT (envelope-from git) Date: Sun, 6 Oct 2024 03:49:26 GMT Message-Id: <202410060349.4963nQIh091947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 013d817b5393 - stable/14 - igc: Add NVM/firmware prints and sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 013d817b539325017e00ede97d58c8adc16dbee3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=013d817b539325017e00ede97d58c8adc16dbee3 commit 013d817b539325017e00ede97d58c8adc16dbee3 Author: Kevin Bowling AuthorDate: 2024-09-29 09:23:38 +0000 Commit: Kevin Bowling CommitDate: 2024-10-06 03:49:08 +0000 igc: Add NVM/firmware prints and sysctl This chipset suffered an (un)usual number of bugs and iterations. Let's add our NVM/firmware code from e1000 and the similar igc_nvm function from DPDK to keep track of issues. Sponsored by: BBOX.io (cherry picked from commit 33ed9bdca307bedb3d66a50ed7d4d7b4bf4acf39) --- sys/dev/igc/if_igc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/igc/if_igc.h | 2 + sys/dev/igc/igc_defines.h | 28 +++++++++++-- sys/dev/igc/igc_nvm.c | 81 ++++++++++++++++++++++++++++++++++++ sys/dev/igc/igc_nvm.h | 18 ++++++++ 5 files changed, 229 insertions(+), 4 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index c78edab5e38a..006fecdab7b0 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -115,6 +115,10 @@ static void igc_update_stats_counters(struct igc_adapter *); static void igc_add_hw_stats(struct igc_adapter *adapter); static int igc_if_set_promisc(if_ctx_t ctx, int flags); static void igc_setup_vlan_hw_support(if_ctx_t ctx); +static void igc_fw_version(struct igc_adapter *); +static void igc_sbuf_fw_version(struct igc_fw_version *, struct sbuf *); +static void igc_print_fw_version(struct igc_adapter *); +static int igc_sysctl_print_fw_version(SYSCTL_HANDLER_ARGS); static int igc_sysctl_nvm_info(SYSCTL_HANDLER_ARGS); static void igc_print_nvm_info(struct igc_adapter *); static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); @@ -440,6 +444,12 @@ igc_if_attach_pre(if_ctx_t ctx) OID_AUTO, "nvm", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, igc_sysctl_nvm_info, "I", "NVM Information"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "fw_version", CTLTYPE_STRING | CTLFLAG_RD, + adapter, 0, igc_sysctl_print_fw_version, "A", + "Prints FW/NVM Versions"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, @@ -586,6 +596,11 @@ igc_if_attach_pre(if_ctx_t ctx) goto err_late; } + /* Save the EEPROM/NVM versions */ + igc_fw_version(adapter); + + igc_print_fw_version(adapter); + /* * Get Wake-on-Lan and Management info for later use */ @@ -2612,6 +2627,95 @@ igc_add_hw_stats(struct igc_adapter *adapter) "Rx Desc Min Thresh Count"); } +static void +igc_fw_version(struct igc_adapter *sc) +{ + struct igc_hw *hw = &sc->hw; + struct igc_fw_version *fw_ver = &sc->fw_ver; + + *fw_ver = (struct igc_fw_version){0}; + + igc_get_fw_version(hw, fw_ver); +} + +static void +igc_sbuf_fw_version(struct igc_fw_version *fw_ver, struct sbuf *buf) +{ + const char *space = ""; + + if (fw_ver->eep_major || fw_ver->eep_minor || fw_ver->eep_build) { + sbuf_printf(buf, "EEPROM V%d.%d-%d", fw_ver->eep_major, + fw_ver->eep_minor, fw_ver->eep_build); + space = " "; + } + + if (fw_ver->invm_major || fw_ver->invm_minor || fw_ver->invm_img_type) { + sbuf_printf(buf, "%sNVM V%d.%d imgtype%d", + space, fw_ver->invm_major, fw_ver->invm_minor, + fw_ver->invm_img_type); + space = " "; + } + + if (fw_ver->or_valid) { + sbuf_printf(buf, "%sOption ROM V%d-b%d-p%d", + space, fw_ver->or_major, fw_ver->or_build, + fw_ver->or_patch); + space = " "; + } + + if (fw_ver->etrack_id) + sbuf_printf(buf, "%seTrack 0x%08x", space, fw_ver->etrack_id); +} + +static void +igc_print_fw_version(struct igc_adapter *sc ) +{ + device_t dev = sc->dev; + struct sbuf *buf; + int error = 0; + + buf = sbuf_new_auto(); + if (!buf) { + device_printf(dev, "Could not allocate sbuf for output.\n"); + return; + } + + igc_sbuf_fw_version(&sc->fw_ver, buf); + + error = sbuf_finish(buf); + if (error) + device_printf(dev, "Error finishing sbuf: %d\n", error); + else if (sbuf_len(buf)) + device_printf(dev, "%s\n", sbuf_data(buf)); + + sbuf_delete(buf); +} + +static int +igc_sysctl_print_fw_version(SYSCTL_HANDLER_ARGS) +{ + struct igc_adapter *sc = (struct igc_adapter *)arg1; + device_t dev = sc->dev; + struct sbuf *buf; + int error = 0; + + buf = sbuf_new_for_sysctl(NULL, NULL, 128, req); + if (!buf) { + device_printf(dev, "Could not allocate sbuf for output.\n"); + return (ENOMEM); + } + + igc_sbuf_fw_version(&sc->fw_ver, buf); + + error = sbuf_finish(buf); + if (error) + device_printf(dev, "Error finishing sbuf: %d\n", error); + + sbuf_delete(buf); + + return (0); +} + /********************************************************************** * * This routine provides a way to dump out the adapter eeprom, diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index 92865b5b9eb1..727699baee5f 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -332,6 +332,8 @@ struct igc_adapter { u64 que_mask; + struct igc_fw_version fw_ver; + struct igc_int_delay_info tx_int_delay; struct igc_int_delay_info tx_abs_int_delay; struct igc_int_delay_info rx_int_delay; diff --git a/sys/dev/igc/igc_defines.h b/sys/dev/igc/igc_defines.h index 1701918c3a9c..e9ebd23c41c3 100644 --- a/sys/dev/igc/igc_defines.h +++ b/sys/dev/igc/igc_defines.h @@ -967,11 +967,31 @@ #define IGC_FLASH_UPDATES 2000 /* NVM Word Offsets */ -#define NVM_COMPAT 0x0003 -#define NVM_ID_LED_SETTINGS 0x0004 -#define NVM_FUTURE_INIT_WORD1 0x0019 -#define NVM_COMPAT_VALID_CSUM 0x0001 +#define NVM_COMPAT 0x0003 +#define NVM_ID_LED_SETTINGS 0x0004 +#define NVM_VERSION 0x0005 +#define NVM_FUTURE_INIT_WORD1 0x0019 +#define NVM_COMPAT_VALID_CSUM 0x0001 #define NVM_FUTURE_INIT_WORD1_VALID_CSUM 0x0040 +#define NVM_ETRACK_WORD 0x0042 +#define NVM_ETRACK_HIWORD 0x0043 +#define NVM_COMB_VER_OFF 0x0083 +#define NVM_COMB_VER_PTR 0x003d + +/* NVM version defines */ +#define NVM_MAJOR_MASK 0xF000 +#define NVM_MINOR_MASK 0x0FF0 +#define NVM_IMAGE_ID_MASK 0x000F +#define NVM_COMB_VER_MASK 0x00FF +#define NVM_MAJOR_SHIFT 12 +#define NVM_MINOR_SHIFT 4 +#define NVM_COMB_VER_SHFT 8 +#define NVM_VER_INVALID 0xFFFF +#define NVM_ETRACK_SHIFT 16 +#define NVM_ETRACK_VALID 0x8000 +#define NVM_NEW_DEC_MASK 0x0F00 +#define NVM_HEX_CONV 16 +#define NVM_HEX_TENS 10 #define NVM_INIT_CONTROL2_REG 0x000F #define NVM_INIT_CONTROL3_PORT_B 0x0014 diff --git a/sys/dev/igc/igc_nvm.c b/sys/dev/igc/igc_nvm.c index d86e04ffa0dc..b476a5fdbeac 100644 --- a/sys/dev/igc/igc_nvm.c +++ b/sys/dev/igc/igc_nvm.c @@ -716,4 +716,85 @@ static void igc_reload_nvm_generic(struct igc_hw *hw) IGC_WRITE_FLUSH(hw); } +/** + * igc_get_fw_version - Get firmware version information + * @hw: pointer to the HW structure + * @fw_vers: pointer to output version structure + * + * unsupported/not present features return 0 in version structure + **/ +void igc_get_fw_version(struct igc_hw *hw, struct igc_fw_version *fw_vers) +{ + u16 eeprom_verh, eeprom_verl, etrack_test, fw_version; + u8 q, hval, rem, result; + u16 comb_verh, comb_verl, comb_offset; + + memset(fw_vers, 0, sizeof(struct igc_fw_version)); + /* + * basic eeprom version numbers, bits used vary by part and by tool + * used to create the nvm images. Check which data format we have. + */ + switch (hw->mac.type) { + case igc_i225: + hw->nvm.ops.read(hw, NVM_ETRACK_HIWORD, 1, &etrack_test); + /* find combo image version */ + hw->nvm.ops.read(hw, NVM_COMB_VER_PTR, 1, &comb_offset); + if (comb_offset && comb_offset != NVM_VER_INVALID) { + hw->nvm.ops.read(hw, NVM_COMB_VER_OFF + comb_offset + 1, + 1, &comb_verh); + hw->nvm.ops.read(hw, NVM_COMB_VER_OFF + comb_offset, + 1, &comb_verl); + + /* get Option Rom version if it exists and is valid */ + if (comb_verh && comb_verl && + comb_verh != NVM_VER_INVALID && + comb_verl != NVM_VER_INVALID) { + fw_vers->or_valid = true; + fw_vers->or_major = comb_verl >> + NVM_COMB_VER_SHFT; + fw_vers->or_build = (comb_verl << + NVM_COMB_VER_SHFT) | + (comb_verh >> + NVM_COMB_VER_SHFT); + fw_vers->or_patch = comb_verh & + NVM_COMB_VER_MASK; + } + } + break; + default: + hw->nvm.ops.read(hw, NVM_ETRACK_HIWORD, 1, &etrack_test); + return; + } + hw->nvm.ops.read(hw, NVM_VERSION, 1, &fw_version); + fw_vers->eep_major = (fw_version & NVM_MAJOR_MASK) + >> NVM_MAJOR_SHIFT; + + /* check for old style version format in newer images*/ + if ((fw_version & NVM_NEW_DEC_MASK) == 0x0) { + eeprom_verl = (fw_version & NVM_COMB_VER_MASK); + } else { + eeprom_verl = (fw_version & NVM_MINOR_MASK) + >> NVM_MINOR_SHIFT; + } + /* Convert minor value to hex before assigning to output struct + * Val to be converted will not be higher than 99, per tool output + */ + q = eeprom_verl / NVM_HEX_CONV; + hval = q * NVM_HEX_TENS; + rem = eeprom_verl % NVM_HEX_CONV; + result = hval + rem; + fw_vers->eep_minor = result; + + if ((etrack_test & NVM_MAJOR_MASK) == NVM_ETRACK_VALID) { + hw->nvm.ops.read(hw, NVM_ETRACK_WORD, 1, &eeprom_verl); + hw->nvm.ops.read(hw, (NVM_ETRACK_WORD + 1), 1, &eeprom_verh); + fw_vers->etrack_id = (eeprom_verh << NVM_ETRACK_SHIFT) + | eeprom_verl; + } else if ((etrack_test & NVM_ETRACK_VALID) == 0) { + hw->nvm.ops.read(hw, NVM_ETRACK_WORD, 1, &eeprom_verh); + hw->nvm.ops.read(hw, (NVM_ETRACK_WORD + 1), 1, &eeprom_verl); + fw_vers->etrack_id = (eeprom_verh << NVM_ETRACK_SHIFT) | + eeprom_verl; + } +} diff --git a/sys/dev/igc/igc_nvm.h b/sys/dev/igc/igc_nvm.h index eae0db4b484b..b4b602af6595 100644 --- a/sys/dev/igc/igc_nvm.h +++ b/sys/dev/igc/igc_nvm.h @@ -7,6 +7,22 @@ #ifndef _IGC_NVM_H_ #define _IGC_NVM_H_ +struct igc_fw_version { + u32 etrack_id; + u16 eep_major; + u16 eep_minor; + u16 eep_build; + + u8 invm_major; + u8 invm_minor; + u8 invm_img_type; + + bool or_valid; + u16 or_major; + u16 or_build; + u16 or_patch; +}; + void igc_init_nvm_ops_generic(struct igc_hw *hw); s32 igc_null_read_nvm(struct igc_hw *hw, u16 a, u16 b, u16 *c); void igc_null_nvm_generic(struct igc_hw *hw); @@ -26,5 +42,7 @@ s32 igc_write_nvm_spi(struct igc_hw *hw, u16 offset, u16 words, u16 *data); s32 igc_update_nvm_checksum_generic(struct igc_hw *hw); void igc_release_nvm_generic(struct igc_hw *hw); +void igc_get_fw_version(struct igc_hw *hw, + struct igc_fw_version *fw_vers); #endif From nobody Sun Oct 6 03:50:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLpGq24gwz5YCWw; Sun, 06 Oct 2024 03:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLpGp652Kz4GFy; Sun, 6 Oct 2024 03:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/F+yvI+ir6c9Waqq5BAiL/ODklf9zpyXB4Mtq2wKjI=; b=EZSXawwOUonHlx9x8ANEvOVl0Jxczz7seHspoxbGKfS7i75ISXprMbcO9NYZ2Kw3Eq/ln7 pTq8bHvFbbOu35nSyajGJjR+D8DWoC+eN6lsFTufCuBOXlU5/l38KqdMn/hXFziBgjbyq3 lhxCxkK465jnM6fLHz0kZmAgeL2L6EBe7sqpdriTyddyfvaGMRRpP6npaU3JNDlw/2rpDh sNSY9fXkPjnAIsoYFqF5r2NIFlR2Idtax7vCNh2TCRsHc1HhgFAHQTkngvnqcioovJ3ytU A34e6RZ/aHV+mwUK8B0By/Tmr5oHxkZCCnGDWQEMUNsHs5m8pFYRJhMQc6vYUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/F+yvI+ir6c9Waqq5BAiL/ODklf9zpyXB4Mtq2wKjI=; b=hy5zrkZVsqvXAf6jDl3kxfw224hZQBQBwOxsvHTe72moFGyf53pHhLCCa4PyJTZNZV6Ynq jt1WXU6p4t5yeJIYe3SrX3Qc8NJJj0oBmI/95SikvEHT3Wpd8bZOjenl+K56k76sx9YxwQ BnGlgLNqMf8wGfbJV9RQvHTVMmsjmjToc7ZlNm4L5bKVlvt+ucMHPKT0wk5p2vOKRXcyiX qrMis1Tott6FTbx1vROciH1JVjeXsPHVF7mM7roah/X1YtwVMGW8UHMZAtM095YQe7FpAK 5grfI6M8nPnLDWJ3J6cb50xE5Xow/TuhWX3j/p8ONN3bMKRVYnwkFVq2DaG6hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728186658; a=rsa-sha256; cv=none; b=N33osjO2AyO4m+WzF9zmLpZrbcWwRM8ap7N4M3WqnA0hSwmMQ5DngIOT6lwKOArYB4SQoX WZgrxh65H6aYZqnXXK5dDRlF2loVE6FFAbd8k64VxYi+tLN4SPEUG+ELcV2RQSCKtIE8Za O84VGdKnKl60ySoQrMw2htYnfzDgBKnLdGzkN6CurCw7UI72XOvauXsqEfTLTAB+Gu7J8b 3NELZ8Ne1tquz1JZy8wNY/ZyaGQTcXRSKi8pS084AAb+zeQBdX2REdU21ga0c/Gu8Eabu4 lhJc57A6GVgqEw5ddzeYXob0aI7Vb32hw8gXC5YHxEqxtnfdBtsOwMJQLSx6bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLpGp5gN2zmKH; Sun, 6 Oct 2024 03:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4963owbN003105; Sun, 6 Oct 2024 03:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4963ow4O003102; Sun, 6 Oct 2024 03:50:58 GMT (envelope-from git) Date: Sun, 6 Oct 2024 03:50:58 GMT Message-Id: <202410060350.4963ow4O003102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: d92efc05a796 - stable/13 - ixgbe: Switch if_sriov read/write back to ixgbe_mbx APIs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d92efc05a79678ef60e1cbccf2afeab57871fcb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d92efc05a79678ef60e1cbccf2afeab57871fcb0 commit d92efc05a79678ef60e1cbccf2afeab57871fcb0 Author: Kevin Bowling AuthorDate: 2024-09-29 04:15:53 +0000 Commit: Kevin Bowling CommitDate: 2024-10-06 03:49:50 +0000 ixgbe: Switch if_sriov read/write back to ixgbe_mbx APIs These are more succinct than jumping through the function pointers directly and add some additional error handling. (cherry picked from commit 1e3b1870ad2a426de6e3f5445211b698f20f7f1f) --- sys/dev/ixgbe/if_sriov.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 4ee0784ba74a..b186f4decdf8 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -100,7 +100,7 @@ ixgbe_send_vf_msg(struct ixgbe_hw *hw, struct ixgbe_vf *vf, u32 msg) if (vf->flags & IXGBE_VF_CTS) msg |= IXGBE_VT_MSGTYPE_CTS; - hw->mbx.ops[vf->pool].write(hw, &msg, 1, vf->pool); + ixgbe_write_mbx(hw, &msg, 1, vf->pool); } static inline void @@ -595,8 +595,7 @@ ixgbe_process_vf_msg(if_ctx_t ctx, struct ixgbe_vf *vf) hw = &sc->hw; - error = hw->mbx.ops[vf->pool].read(hw, msg, IXGBE_VFMAILBOX_SIZE, - vf->pool); + error = ixgbe_read_mbx(hw, msg, IXGBE_VFMAILBOX_SIZE, vf->pool); if (error != 0) return; From nobody Sun Oct 6 03:50:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLpGr1hbmz5YCMZ; Sun, 06 Oct 2024 03:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLpGq6whtz4GNV; Sun, 6 Oct 2024 03:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7Z4uQmadT7Qtuwh3mQ1Z+Plb36+nOc2bQx4Xlmb4Ok=; b=WTW17bYpsnYUF7QSjxbyX9jYPGow7TOoTERbBSiFZ4M2Bt/ydm7ZtIE8+6GYnW7rqnoDkv IyfRo3uXoBM7dAOQw9ekffpoZSJLkU0xnL4d7wRKv/WHgW6TyPA2FFmOnKTgjDEHTjJ9k+ biSED4dJ8N7QXWk+MtyZLyG2RzkAcbI6ISBC/GHE2mBTjj+5NjLg8yyQX4NL8O8d3RfCUj vFgW/Ps6jjCKtdQbMW1um/eSx5WSW5KqwyAFE102rHc12MNBHnI5BTkemoqc3+K8ZZHJNW DSZw7DsJ6ikh/gibv6wiSfvXaZhpa/maCqSkpMTarFHN9GcpAF90llRpl1JQdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7Z4uQmadT7Qtuwh3mQ1Z+Plb36+nOc2bQx4Xlmb4Ok=; b=hCGHQSgN3WsFGnuqSGGQmwqeQ3t6nPkD+Q7l/7zTPgQEhfQ2tGckoJ2yI9jld8cUCiZcu9 vypeyXyLe21uUBm6Q3UJ4pqP1YkDLX5rWZkSPY1GXLmex85H4uKPUZe7zTXmMzxz0MPw2D lXKwd4H5Tt02xqvYR94h0bcYcFy7FzEXNNfJpZxbjOG6IdA5KT7MG28DvBcxiDOmeOLFwB aiZjzedHQ9nEDmpnQtO7Li2vU0SjQNq+4CARZ+DcRuW/u2axG2RAwuwGhOKOPREglBAPii cS2pK0W6+wkKT0Q6O4tGP4MCPPccMvoOMjscI2Ozs7NsX/Eb7Ddhms5ZqfVjIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728186660; a=rsa-sha256; cv=none; b=BYtVP34AdBq5d0AsFDs3BPuaJfeHK6+2RhtUXlEhWeUZDXY66yvFfGGGisuomnf0nJq6IF TKDId4xx1VjcL6DblAHVFkS01qSC1lZ64cMfwkrjTn4hq8AJFM3fRMpDd3wV4jqtX1tP2K SnKj0qoQ/NeFoj5ESCWQ6aJKkNs8F0kSpQhuJIJ7bUhczRBhoh7+yZDojyCDNGjtvreblt vQPwmubk0mtpiK7DUNcWgiHfGU9p8f48rDHkHxXl2ybwd5za3RLOUS19JRag980gs4/hab A9wq/7FkMWWNydX60Ffcvm1FV86FI1VkRy4BeHt2BamOcDlG3T30kxATQj9X4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLpGq6PmXzmMy; Sun, 6 Oct 2024 03:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4963oxj1003164; Sun, 6 Oct 2024 03:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4963ox3g003161; Sun, 6 Oct 2024 03:50:59 GMT (envelope-from git) Date: Sun, 6 Oct 2024 03:50:59 GMT Message-Id: <202410060350.4963ox3g003161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 98e48cd46046 - stable/13 - igc: Remove non-existent legacy absolute and packet timers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 98e48cd460465b12c39434430c3c35a6f907acb6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=98e48cd460465b12c39434430c3c35a6f907acb6 commit 98e48cd460465b12c39434430c3c35a6f907acb6 Author: Kevin Bowling AuthorDate: 2024-09-29 04:32:49 +0000 Commit: Kevin Bowling CommitDate: 2024-10-06 03:50:02 +0000 igc: Remove non-existent legacy absolute and packet timers igc, derived from igb, does not use these registers. All interrupt timing is governed by EITR or LLI and driven by write-back. Sponsored by: BBOX.io (cherry picked from commit a40ecb6f740530fb7e6a95e702113aa3fe24d975) --- sys/dev/igc/if_igc.c | 109 ------------------------------------------------- sys/dev/igc/if_igc.h | 59 -------------------------- sys/dev/igc/igc_regs.h | 5 --- 3 files changed, 173 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 8de044169269..19bedd52a1bc 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -121,9 +121,6 @@ static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int igc_get_rs(SYSCTL_HANDLER_ARGS); static void igc_print_debug_info(struct igc_adapter *); static int igc_is_valid_ether_addr(u8 *); -static int igc_sysctl_int_delay(SYSCTL_HANDLER_ARGS); -static void igc_add_int_delay_sysctl(struct igc_adapter *, const char *, - const char *, struct igc_int_delay_info *, int, int); /* Management and WOL Support */ static void igc_get_hw_control(struct igc_adapter *); static void igc_release_hw_control(struct igc_adapter *); @@ -212,12 +209,6 @@ static driver_t igc_if_driver = { * Tunable default values. *********************************************************************/ -#define IGC_TICKS_TO_USECS(ticks) ((1024 * (ticks) + 500) / 1000) -#define IGC_USECS_TO_TICKS(usecs) ((1000 * (usecs) + 512) / 1024) - -#define MAX_INTS_PER_SEC 8000 -#define DEFAULT_ITR (1000000000/(MAX_INTS_PER_SEC * 256)) - /* Allow common code without TSO */ #ifndef CSUM_TSO #define CSUM_TSO 0 @@ -230,22 +221,6 @@ static int igc_disable_crc_stripping = 0; SYSCTL_INT(_hw_igc, OID_AUTO, disable_crc_stripping, CTLFLAG_RDTUN, &igc_disable_crc_stripping, 0, "Disable CRC Stripping"); -static int igc_tx_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_TIDV_VAL); -static int igc_rx_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_RDTR_VAL); -SYSCTL_INT(_hw_igc, OID_AUTO, tx_int_delay, CTLFLAG_RDTUN, &igc_tx_int_delay_dflt, - 0, "Default transmit interrupt delay in usecs"); -SYSCTL_INT(_hw_igc, OID_AUTO, rx_int_delay, CTLFLAG_RDTUN, &igc_rx_int_delay_dflt, - 0, "Default receive interrupt delay in usecs"); - -static int igc_tx_abs_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_TADV_VAL); -static int igc_rx_abs_int_delay_dflt = IGC_TICKS_TO_USECS(IGC_RADV_VAL); -SYSCTL_INT(_hw_igc, OID_AUTO, tx_abs_int_delay, CTLFLAG_RDTUN, - &igc_tx_abs_int_delay_dflt, 0, - "Default transmit interrupt delay limit in usecs"); -SYSCTL_INT(_hw_igc, OID_AUTO, rx_abs_int_delay, CTLFLAG_RDTUN, - &igc_rx_abs_int_delay_dflt, 0, - "Default receive interrupt delay limit in usecs"); - static int igc_smart_pwr_down = false; SYSCTL_INT(_hw_igc, OID_AUTO, smart_pwr_down, CTLFLAG_RDTUN, &igc_smart_pwr_down, 0, "Set to true to leave smart power down enabled on newer adapters"); @@ -537,29 +512,6 @@ igc_if_attach_pre(if_ctx_t ctx) igc_setup_msix(ctx); igc_get_bus_info(hw); - /* Set up some sysctls for the tunable interrupt delays */ - igc_add_int_delay_sysctl(adapter, "rx_int_delay", - "receive interrupt delay in usecs", &adapter->rx_int_delay, - IGC_REGISTER(hw, IGC_RDTR), igc_rx_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "tx_int_delay", - "transmit interrupt delay in usecs", &adapter->tx_int_delay, - IGC_REGISTER(hw, IGC_TIDV), igc_tx_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "rx_abs_int_delay", - "receive interrupt delay limit in usecs", - &adapter->rx_abs_int_delay, - IGC_REGISTER(hw, IGC_RADV), - igc_rx_abs_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "tx_abs_int_delay", - "transmit interrupt delay limit in usecs", - &adapter->tx_abs_int_delay, - IGC_REGISTER(hw, IGC_TADV), - igc_tx_abs_int_delay_dflt); - igc_add_int_delay_sysctl(adapter, "itr", - "interrupt delay limit in usecs/4", - &adapter->tx_itr, - IGC_REGISTER(hw, IGC_ITR), - DEFAULT_ITR); - hw->mac.autoneg = DO_AUTO_NEG; hw->phy.autoneg_wait_to_complete = false; hw->phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; @@ -2016,12 +1968,6 @@ igc_initialize_receive_unit(if_ctx_t ctx) if (!igc_disable_crc_stripping) rctl |= IGC_RCTL_SECRC; - /* - * Set the interrupt throttling rate. Value is calculated - * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) - */ - IGC_WRITE_REG(hw, IGC_ITR, DEFAULT_ITR); - rxcsum = IGC_READ_REG(hw, IGC_RXCSUM); if (if_getcapenable(ifp) & IFCAP_RXCSUM) { rxcsum |= IGC_RXCSUM_CRCOFL; @@ -2718,61 +2664,6 @@ igc_print_nvm_info(struct igc_adapter *adapter) printf("\n"); } -static int -igc_sysctl_int_delay(SYSCTL_HANDLER_ARGS) -{ - struct igc_int_delay_info *info; - struct igc_adapter *adapter; - u32 regval; - int error, usecs, ticks; - - info = (struct igc_int_delay_info *) arg1; - usecs = info->value; - error = sysctl_handle_int(oidp, &usecs, 0, req); - if (error != 0 || req->newptr == NULL) - return (error); - if (usecs < 0 || usecs > IGC_TICKS_TO_USECS(65535)) - return (EINVAL); - info->value = usecs; - ticks = IGC_USECS_TO_TICKS(usecs); - if (info->offset == IGC_ITR) /* units are 256ns here */ - ticks *= 4; - - adapter = info->adapter; - - regval = IGC_READ_OFFSET(&adapter->hw, info->offset); - regval = (regval & ~0xffff) | (ticks & 0xffff); - /* Handle a few special cases. */ - switch (info->offset) { - case IGC_RDTR: - break; - case IGC_TIDV: - if (ticks == 0) { - adapter->txd_cmd &= ~IGC_TXD_CMD_IDE; - /* Don't write 0 into the TIDV register. */ - regval++; - } else - adapter->txd_cmd |= IGC_TXD_CMD_IDE; - break; - } - IGC_WRITE_OFFSET(&adapter->hw, info->offset, regval); - return (0); -} - -static void -igc_add_int_delay_sysctl(struct igc_adapter *adapter, const char *name, - const char *description, struct igc_int_delay_info *info, - int offset, int value) -{ - info->adapter = adapter; - info->offset = offset; - info->value = value; - SYSCTL_ADD_PROC(device_get_sysctl_ctx(adapter->dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)), - OID_AUTO, name, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - info, 0, igc_sysctl_int_delay, "I", description); -} - /* * Set flow control using sysctl: * Flow control values: diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index fde9429b5360..a34aa53581ba 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -131,65 +131,6 @@ #define IGC_DEFAULT_MULTI_RXD 4096 #define IGC_MAX_RXD 4096 -/* - * IGC_TIDV_VAL - Transmit Interrupt Delay Value - * Valid Range: 0-65535 (0=off) - * Default Value: 64 - * This value delays the generation of transmit interrupts in units of - * 1.024 microseconds. Transmit interrupt reduction can improve CPU - * efficiency if properly tuned for specific network traffic. If the - * system is reporting dropped transmits, this value may be set too high - * causing the driver to run out of available transmit descriptors. - */ -#define IGC_TIDV_VAL 64 - -/* - * IGC_TADV_VAL - Transmit Absolute Interrupt Delay Value - * Valid Range: 0-65535 (0=off) - * Default Value: 64 - * This value, in units of 1.024 microseconds, limits the delay in which a - * transmit interrupt is generated. Useful only if IGC_TIDV is non-zero, - * this value ensures that an interrupt is generated after the initial - * packet is sent on the wire within the set amount of time. Proper tuning, - * along with IGC_TIDV_VAL, may improve traffic throughput in specific - * network conditions. - */ -#define IGC_TADV_VAL 64 - -/* - * IGC_RDTR_VAL - Receive Interrupt Delay Timer (Packet Timer) - * Valid Range: 0-65535 (0=off) - * Default Value: 0 - * This value delays the generation of receive interrupts in units of 1.024 - * microseconds. Receive interrupt reduction can improve CPU efficiency if - * properly tuned for specific network traffic. Increasing this value adds - * extra latency to frame reception and can end up decreasing the throughput - * of TCP traffic. If the system is reporting dropped receives, this value - * may be set too high, causing the driver to run out of available receive - * descriptors. - * - * CAUTION: When setting IGC_RDTR to a value other than 0, adapters - * may hang (stop transmitting) under certain network conditions. - * If this occurs a WATCHDOG message is logged in the system - * event log. In addition, the controller is automatically reset, - * restoring the network connection. To eliminate the potential - * for the hang ensure that IGC_RDTR is set to 0. - */ -#define IGC_RDTR_VAL 0 - -/* - * Receive Interrupt Absolute Delay Timer - * Valid Range: 0-65535 (0=off) - * Default Value: 64 - * This value, in units of 1.024 microseconds, limits the delay in which a - * receive interrupt is generated. Useful only if IGC_RDTR is non-zero, - * this value ensures that an interrupt is generated after the initial - * packet is received within the set amount of time. Proper tuning, - * along with IGC_RDTR, may improve traffic throughput in specific network - * conditions. - */ -#define IGC_RADV_VAL 64 - /* * This parameter controls whether or not autonegotation is enabled. * 0 - Disable autonegotiation diff --git a/sys/dev/igc/igc_regs.h b/sys/dev/igc/igc_regs.h index f4ded07ce6ab..26614dc33df6 100644 --- a/sys/dev/igc/igc_regs.h +++ b/sys/dev/igc/igc_regs.h @@ -27,7 +27,6 @@ #define IGC_CONNSW 0x00034 /* Copper/Fiber switch control - RW */ #define IGC_VET 0x00038 /* VLAN Ether Type - RW */ #define IGC_ICR 0x01500 /* Intr Cause Read - RC/W1C */ -#define IGC_ITR 0x000C4 /* Interrupt Throttling Rate - RW */ #define IGC_ICS 0x01504 /* Intr Cause Set - WO */ #define IGC_IMS 0x01508 /* Intr Mask Set/Read - RW */ #define IGC_IMC 0x0150C /* Intr Mask Clear - WO */ @@ -78,8 +77,6 @@ #define IGC_FCRTV 0x02460 /* Flow Control Refresh Timer Value - RW */ /* Split and Replication Rx Control - RW */ #define IGC_RXPBS 0x02404 /* Rx Packet Buffer Size - RW */ -#define IGC_RDTR 0x02820 /* Rx Delay Timer - RW */ -#define IGC_RADV 0x0282C /* Rx Interrupt Absolute Delay Timer - RW */ /* Shadow Ram Write Register - RW */ #define IGC_SRWR 0x12018 #define IGC_EEC_REG 0x12010 @@ -148,8 +145,6 @@ #define IGC_FFVT_REG(_i) (0x09800 + ((_i) * 8)) #define IGC_FFLT_REG(_i) (0x05F00 + ((_i) * 8)) #define IGC_TXPBS 0x03404 /* Tx Packet Buffer Size - RW */ -#define IGC_TIDV 0x03820 /* Tx Interrupt Delay Value - RW */ -#define IGC_TADV 0x0382C /* Tx Interrupt Absolute Delay Val - RW */ /* Statistics Register Descriptions */ #define IGC_CRCERRS 0x04000 /* CRC Error Count - R/clr */ #define IGC_ALGNERRC 0x04004 /* Alignment Error Count - R/clr */ From nobody Sun Oct 6 03:51:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLpGs3my2z5YCWx; Sun, 06 Oct 2024 03:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLpGs122xz4G7N; Sun, 6 Oct 2024 03:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M+ZMwRZGsBvT1TipRb5x1LIu/hqVmq3EiauOlSx5KoM=; b=KXM29xDUp47quqozdOO2aDJZGSnbCKf3JxB/UlqWwd5sKIKYFzc7akBAUXBCYKGrHdMFGX qDRBNLfGez4ypXtUGEXJ+5bGq6jKBSGkX5uVxD0X4H5yLM1l0vWmuQWC87AckaBptHdAJ8 Vw6FaBSO7a6QCkRSx/NYOn4yEoDiif34+4i5DV8yXGyhQhKnNfNGaJuZttInbl6GDDaGbX Drt5glCv0zrXIMjzQaHM40EM2TNoQZ9Tcb3n/X8TFX4oq90YUkF4uOqgqXXMHLewG3UIj2 lGD8HM5xbYWU8VtHid1LvHQsxnNwITJdORzDgDEXtKVY1MJ6cC7fjRieBDzf1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728186661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M+ZMwRZGsBvT1TipRb5x1LIu/hqVmq3EiauOlSx5KoM=; b=pVRcHBj/3NpUOL4U9ZDvgFHtPkWeXqy+peCxRwNvYh5y9oLjwC+MS0bTwNvWDaFMNKZyPH e8bC9TNVpbUD5nSjiP4DKlR+NPxTFvGnQRSSl/XbktgqSTxLyO4aZd97DyvflPPkwCSi9Y 8j/+8hDO/tbaVnJy5/MGjfeu27IuU6tYoPv1hofDKQOhs1w8NG8331bf33OAkbhWJwCmvr +7/7KMj0GYk1wDbovTLWCzofK4H2Q3jiZVC5Vt4y9AvHxBq+FQMfRX00YoQkRX6Kgt/pt6 nRsDSnsmoZ0xr9MCjNbqk4mRljMoZ138JvEgCksSLdl+qeoC6//a3lVf97/4fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728186661; a=rsa-sha256; cv=none; b=GjaqxjFBIew7Pq24ID8IymQ91A+tw01buFr25nqYNfWlTAuo7ERrRJrPosESGHaqDjZlBa OT94HXA3wvpeR+3GHAb8TzeSoysdMcUmhGSXXNBg9IWByG/1nwPFMno7HqyQYnV/TdKQHD rccNf4JLWl7PLvwAbP2ljoM4e7gRZRTAj6BhtdtH1BuXm9KTdDBW23udcL//Y76Ld1OwNx vVWsSGJeR9ZW9YHSLPM+vYXLxPopzc7kupii3jk+v+jQ9eJTHwH/QN5ufwMtlVgZwZ8+hi i3S1VUHvNr9yr+qyoNAjy3iyjN2lLUHqFoiyKC2BeYbnRSfFVSy9qjLm3Lfcag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLpGs0df9zmmW; Sun, 6 Oct 2024 03:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4963p0bk003215; Sun, 6 Oct 2024 03:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4963p0v2003212; Sun, 6 Oct 2024 03:51:00 GMT (envelope-from git) Date: Sun, 6 Oct 2024 03:51:00 GMT Message-Id: <202410060351.4963p0v2003212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: b887b25317cb - stable/13 - igc: Add NVM/firmware prints and sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b887b25317cbc99cdfca232054fe76bbf0d06679 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b887b25317cbc99cdfca232054fe76bbf0d06679 commit b887b25317cbc99cdfca232054fe76bbf0d06679 Author: Kevin Bowling AuthorDate: 2024-09-29 09:23:38 +0000 Commit: Kevin Bowling CommitDate: 2024-10-06 03:50:14 +0000 igc: Add NVM/firmware prints and sysctl This chipset suffered an (un)usual number of bugs and iterations. Let's add our NVM/firmware code from e1000 and the similar igc_nvm function from DPDK to keep track of issues. Sponsored by: BBOX.io (cherry picked from commit 33ed9bdca307bedb3d66a50ed7d4d7b4bf4acf39) --- sys/dev/igc/if_igc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/igc/if_igc.h | 2 + sys/dev/igc/igc_defines.h | 28 +++++++++++-- sys/dev/igc/igc_nvm.c | 81 ++++++++++++++++++++++++++++++++++++ sys/dev/igc/igc_nvm.h | 18 ++++++++ 5 files changed, 229 insertions(+), 4 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 19bedd52a1bc..1f06baee02e4 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -115,6 +115,10 @@ static void igc_update_stats_counters(struct igc_adapter *); static void igc_add_hw_stats(struct igc_adapter *adapter); static int igc_if_set_promisc(if_ctx_t ctx, int flags); static void igc_setup_vlan_hw_support(if_ctx_t ctx); +static void igc_fw_version(struct igc_adapter *); +static void igc_sbuf_fw_version(struct igc_fw_version *, struct sbuf *); +static void igc_print_fw_version(struct igc_adapter *); +static int igc_sysctl_print_fw_version(SYSCTL_HANDLER_ARGS); static int igc_sysctl_nvm_info(SYSCTL_HANDLER_ARGS); static void igc_print_nvm_info(struct igc_adapter *); static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); @@ -441,6 +445,12 @@ igc_if_attach_pre(if_ctx_t ctx) OID_AUTO, "nvm", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, igc_sysctl_nvm_info, "I", "NVM Information"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "fw_version", CTLTYPE_STRING | CTLFLAG_RD, + adapter, 0, igc_sysctl_print_fw_version, "A", + "Prints FW/NVM Versions"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, @@ -587,6 +597,11 @@ igc_if_attach_pre(if_ctx_t ctx) goto err_late; } + /* Save the EEPROM/NVM versions */ + igc_fw_version(adapter); + + igc_print_fw_version(adapter); + /* * Get Wake-on-Lan and Management info for later use */ @@ -2613,6 +2628,95 @@ igc_add_hw_stats(struct igc_adapter *adapter) "Rx Desc Min Thresh Count"); } +static void +igc_fw_version(struct igc_adapter *sc) +{ + struct igc_hw *hw = &sc->hw; + struct igc_fw_version *fw_ver = &sc->fw_ver; + + *fw_ver = (struct igc_fw_version){0}; + + igc_get_fw_version(hw, fw_ver); +} + +static void +igc_sbuf_fw_version(struct igc_fw_version *fw_ver, struct sbuf *buf) +{ + const char *space = ""; + + if (fw_ver->eep_major || fw_ver->eep_minor || fw_ver->eep_build) { + sbuf_printf(buf, "EEPROM V%d.%d-%d", fw_ver->eep_major, + fw_ver->eep_minor, fw_ver->eep_build); + space = " "; + } + + if (fw_ver->invm_major || fw_ver->invm_minor || fw_ver->invm_img_type) { + sbuf_printf(buf, "%sNVM V%d.%d imgtype%d", + space, fw_ver->invm_major, fw_ver->invm_minor, + fw_ver->invm_img_type); + space = " "; + } + + if (fw_ver->or_valid) { + sbuf_printf(buf, "%sOption ROM V%d-b%d-p%d", + space, fw_ver->or_major, fw_ver->or_build, + fw_ver->or_patch); + space = " "; + } + + if (fw_ver->etrack_id) + sbuf_printf(buf, "%seTrack 0x%08x", space, fw_ver->etrack_id); +} + +static void +igc_print_fw_version(struct igc_adapter *sc ) +{ + device_t dev = sc->dev; + struct sbuf *buf; + int error = 0; + + buf = sbuf_new_auto(); + if (!buf) { + device_printf(dev, "Could not allocate sbuf for output.\n"); + return; + } + + igc_sbuf_fw_version(&sc->fw_ver, buf); + + error = sbuf_finish(buf); + if (error) + device_printf(dev, "Error finishing sbuf: %d\n", error); + else if (sbuf_len(buf)) + device_printf(dev, "%s\n", sbuf_data(buf)); + + sbuf_delete(buf); +} + +static int +igc_sysctl_print_fw_version(SYSCTL_HANDLER_ARGS) +{ + struct igc_adapter *sc = (struct igc_adapter *)arg1; + device_t dev = sc->dev; + struct sbuf *buf; + int error = 0; + + buf = sbuf_new_for_sysctl(NULL, NULL, 128, req); + if (!buf) { + device_printf(dev, "Could not allocate sbuf for output.\n"); + return (ENOMEM); + } + + igc_sbuf_fw_version(&sc->fw_ver, buf); + + error = sbuf_finish(buf); + if (error) + device_printf(dev, "Error finishing sbuf: %d\n", error); + + sbuf_delete(buf); + + return (0); +} + /********************************************************************** * * This routine provides a way to dump out the adapter eeprom, diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index a34aa53581ba..ccebe04ff185 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -332,6 +332,8 @@ struct igc_adapter { u64 que_mask; + struct igc_fw_version fw_ver; + struct igc_int_delay_info tx_int_delay; struct igc_int_delay_info tx_abs_int_delay; struct igc_int_delay_info rx_int_delay; diff --git a/sys/dev/igc/igc_defines.h b/sys/dev/igc/igc_defines.h index 1701918c3a9c..e9ebd23c41c3 100644 --- a/sys/dev/igc/igc_defines.h +++ b/sys/dev/igc/igc_defines.h @@ -967,11 +967,31 @@ #define IGC_FLASH_UPDATES 2000 /* NVM Word Offsets */ -#define NVM_COMPAT 0x0003 -#define NVM_ID_LED_SETTINGS 0x0004 -#define NVM_FUTURE_INIT_WORD1 0x0019 -#define NVM_COMPAT_VALID_CSUM 0x0001 +#define NVM_COMPAT 0x0003 +#define NVM_ID_LED_SETTINGS 0x0004 +#define NVM_VERSION 0x0005 +#define NVM_FUTURE_INIT_WORD1 0x0019 +#define NVM_COMPAT_VALID_CSUM 0x0001 #define NVM_FUTURE_INIT_WORD1_VALID_CSUM 0x0040 +#define NVM_ETRACK_WORD 0x0042 +#define NVM_ETRACK_HIWORD 0x0043 +#define NVM_COMB_VER_OFF 0x0083 +#define NVM_COMB_VER_PTR 0x003d + +/* NVM version defines */ +#define NVM_MAJOR_MASK 0xF000 +#define NVM_MINOR_MASK 0x0FF0 +#define NVM_IMAGE_ID_MASK 0x000F +#define NVM_COMB_VER_MASK 0x00FF +#define NVM_MAJOR_SHIFT 12 +#define NVM_MINOR_SHIFT 4 +#define NVM_COMB_VER_SHFT 8 +#define NVM_VER_INVALID 0xFFFF +#define NVM_ETRACK_SHIFT 16 +#define NVM_ETRACK_VALID 0x8000 +#define NVM_NEW_DEC_MASK 0x0F00 +#define NVM_HEX_CONV 16 +#define NVM_HEX_TENS 10 #define NVM_INIT_CONTROL2_REG 0x000F #define NVM_INIT_CONTROL3_PORT_B 0x0014 diff --git a/sys/dev/igc/igc_nvm.c b/sys/dev/igc/igc_nvm.c index d86e04ffa0dc..b476a5fdbeac 100644 --- a/sys/dev/igc/igc_nvm.c +++ b/sys/dev/igc/igc_nvm.c @@ -716,4 +716,85 @@ static void igc_reload_nvm_generic(struct igc_hw *hw) IGC_WRITE_FLUSH(hw); } +/** + * igc_get_fw_version - Get firmware version information + * @hw: pointer to the HW structure + * @fw_vers: pointer to output version structure + * + * unsupported/not present features return 0 in version structure + **/ +void igc_get_fw_version(struct igc_hw *hw, struct igc_fw_version *fw_vers) +{ + u16 eeprom_verh, eeprom_verl, etrack_test, fw_version; + u8 q, hval, rem, result; + u16 comb_verh, comb_verl, comb_offset; + + memset(fw_vers, 0, sizeof(struct igc_fw_version)); + /* + * basic eeprom version numbers, bits used vary by part and by tool + * used to create the nvm images. Check which data format we have. + */ + switch (hw->mac.type) { + case igc_i225: + hw->nvm.ops.read(hw, NVM_ETRACK_HIWORD, 1, &etrack_test); + /* find combo image version */ + hw->nvm.ops.read(hw, NVM_COMB_VER_PTR, 1, &comb_offset); + if (comb_offset && comb_offset != NVM_VER_INVALID) { + hw->nvm.ops.read(hw, NVM_COMB_VER_OFF + comb_offset + 1, + 1, &comb_verh); + hw->nvm.ops.read(hw, NVM_COMB_VER_OFF + comb_offset, + 1, &comb_verl); + + /* get Option Rom version if it exists and is valid */ + if (comb_verh && comb_verl && + comb_verh != NVM_VER_INVALID && + comb_verl != NVM_VER_INVALID) { + fw_vers->or_valid = true; + fw_vers->or_major = comb_verl >> + NVM_COMB_VER_SHFT; + fw_vers->or_build = (comb_verl << + NVM_COMB_VER_SHFT) | + (comb_verh >> + NVM_COMB_VER_SHFT); + fw_vers->or_patch = comb_verh & + NVM_COMB_VER_MASK; + } + } + break; + default: + hw->nvm.ops.read(hw, NVM_ETRACK_HIWORD, 1, &etrack_test); + return; + } + hw->nvm.ops.read(hw, NVM_VERSION, 1, &fw_version); + fw_vers->eep_major = (fw_version & NVM_MAJOR_MASK) + >> NVM_MAJOR_SHIFT; + + /* check for old style version format in newer images*/ + if ((fw_version & NVM_NEW_DEC_MASK) == 0x0) { + eeprom_verl = (fw_version & NVM_COMB_VER_MASK); + } else { + eeprom_verl = (fw_version & NVM_MINOR_MASK) + >> NVM_MINOR_SHIFT; + } + /* Convert minor value to hex before assigning to output struct + * Val to be converted will not be higher than 99, per tool output + */ + q = eeprom_verl / NVM_HEX_CONV; + hval = q * NVM_HEX_TENS; + rem = eeprom_verl % NVM_HEX_CONV; + result = hval + rem; + fw_vers->eep_minor = result; + + if ((etrack_test & NVM_MAJOR_MASK) == NVM_ETRACK_VALID) { + hw->nvm.ops.read(hw, NVM_ETRACK_WORD, 1, &eeprom_verl); + hw->nvm.ops.read(hw, (NVM_ETRACK_WORD + 1), 1, &eeprom_verh); + fw_vers->etrack_id = (eeprom_verh << NVM_ETRACK_SHIFT) + | eeprom_verl; + } else if ((etrack_test & NVM_ETRACK_VALID) == 0) { + hw->nvm.ops.read(hw, NVM_ETRACK_WORD, 1, &eeprom_verh); + hw->nvm.ops.read(hw, (NVM_ETRACK_WORD + 1), 1, &eeprom_verl); + fw_vers->etrack_id = (eeprom_verh << NVM_ETRACK_SHIFT) | + eeprom_verl; + } +} diff --git a/sys/dev/igc/igc_nvm.h b/sys/dev/igc/igc_nvm.h index eae0db4b484b..b4b602af6595 100644 --- a/sys/dev/igc/igc_nvm.h +++ b/sys/dev/igc/igc_nvm.h @@ -7,6 +7,22 @@ #ifndef _IGC_NVM_H_ #define _IGC_NVM_H_ +struct igc_fw_version { + u32 etrack_id; + u16 eep_major; + u16 eep_minor; + u16 eep_build; + + u8 invm_major; + u8 invm_minor; + u8 invm_img_type; + + bool or_valid; + u16 or_major; + u16 or_build; + u16 or_patch; +}; + void igc_init_nvm_ops_generic(struct igc_hw *hw); s32 igc_null_read_nvm(struct igc_hw *hw, u16 a, u16 b, u16 *c); void igc_null_nvm_generic(struct igc_hw *hw); @@ -26,5 +42,7 @@ s32 igc_write_nvm_spi(struct igc_hw *hw, u16 offset, u16 words, u16 *data); s32 igc_update_nvm_checksum_generic(struct igc_hw *hw); void igc_release_nvm_generic(struct igc_hw *hw); +void igc_get_fw_version(struct igc_hw *hw, + struct igc_fw_version *fw_vers); #endif From nobody Sun Oct 6 07:48:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLvYH1lzYz5YRmT for ; Sun, 06 Oct 2024 07:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLvYH1JDlz4XP3; Sun, 6 Oct 2024 07:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728200931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wdgkNuEXvEy/IS/j5N19Ta+yUqLESMI/ElMkJE5tHi4=; b=He4wSON9AOOQpCcdap5/71KjnZ0MTG8TkZ/ebSU9+29nXVDOpVsSlRK/WZW26xRBKzX76Z 7wolzLavlLDQLbdeqPZMQUmw214axr0VaOWKaWZZmr9LI7LFjfaZybWKeIbp1tfbFPZEjF I59sxZi/D9MQ5qkO34wvUJvvYTwRoCR3ip78qobHDv3oCjcTpn9oZQ3SaBYwKSPHm1G7UD T3lWVg1iTtqsWkSMk0F1aX5JucU9fvhCUNBozIJqRt7rXjTub1sEzNw5VRgnfwv1LzC8V9 uNn/WpX9T7zvXgt2qzhADgzMwppO3FpSa7OI2NYfouV2lyL7RocjTHVnmzzGZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728200931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wdgkNuEXvEy/IS/j5N19Ta+yUqLESMI/ElMkJE5tHi4=; b=WfsvZxLy/YlAyAk08TAQWIHE27hKv9K2Cr893FGY+8tEs9e73fzY6fWNb1bGMPBbMXe44E GTTrWwa4ZEKR1mR7DauVILZMeUgDWZ15l6mnZF7oulWuV95w3igpzac474u6ew1MSl7Wov 1TO+8k9FKXXUj9XmlhpUAMATpQv+7n2aDZcodk+SnWalTuARDeDvVa+vhstU8680rux/9K nccIruDYCDcRyRY5Yn31KNm0WmutvtkHKNWaRTAiwgbiZ1dOG1dVH/kTXcGJH5FWyyPhZu XR074QP03R0HRRCfLAMm1ZY5QvdZQ3bFZir2eTYFyjzyniTdlVp/N9xYWXXQqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728200931; a=rsa-sha256; cv=none; b=vaGRjC38eNB/qwIIW8YosiGko1NEDxFXMzLbTT+RR/VOYr3in764NnLP3nuoMRWtk6Ie2J WGyGtem6eZUfMHMv8o79J1yFFfOqooEyZqmytzR8RSyF18Xb2rxAYnLoidGARi7SSqBZTU bs4uLV83X2HCDPbx4qIpwkNiPdxEE0AEL2PyQih3zeqlW/DzDxVTbDcfKqeuxse9HRXVnx JGLwMFm1xzGna75qCsLyrVcW6m/X/TgMjN8qcjMIB6neJv2z8MeYzoRIy2C9WU6s4cHm04 KNZM33GOMX9uIkTQeGMBl0oKOt2sOStR20AB8f3LfTbRpwChGt0E/KjZE9/iaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLvYH0vz4ztH9; Sun, 6 Oct 2024 07:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4967mp5B098157; Sun, 6 Oct 2024 07:48:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4967mpu0098156; Sun, 6 Oct 2024 07:48:51 GMT (envelope-from git) Date: Sun, 6 Oct 2024 07:48:51 GMT Message-Id: <202410060748.4967mpu0098156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: b109925820fb..3a9fca901b44 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 3a9fca901b4463760001644b83da60bf14f7b554 X-Git-Oldrev: b109925820fb79db3e37670c159977f03edd950f X-Git-Newrev: 3a9fca901b4463760001644b83da60bf14f7b554 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=b109925820fb..3a9fca901b44 5c67820265c1 libzstd: also build with LIBZPOOL_CPPFLAGS 8be2f4c3d2c4 zio_resume: log when unsuspending the pool (#16485) 88433e640ddb sys/types32.h: Remove struct timeval32 from libspl's header (#16491) 63253dbf4f86 zts-report: don't crash on non-UTF-8 chars in the log (#16497) 308f7c2f14de Fix an uninitialized data access (#16511) 1713aa7b4d20 Remove set but not used variable in ddt.c (#16522) a10e552b9992 Adding Direct IO Support 4999f4951321 ZTS: fix zpool_status_008_pos test on qemu vm's 5cb3e2861e07 ZTS: fix raidz_expand_001_pos and raidz_expand_002_pos c4d1a19b3374 ZTS: increase timeout of mmap_sync_001_pos bca9b64e7b5a ZTS: Use QEMU for tests on Linux and FreeBSD ac04407ffec5 Remove extra newline from spa_set_allocator(). 90af1e83e8ab Linux 6.10 compat: Fix tracepoints definitions ec0209418fa6 sa_impl: fix SA header bitfield docs 29c9e6c3241f Fix handling of DNS names with '-' in them for sharenfs 2b069768aba1 META: set Linux minimum version to 4.18 02f4b63db996 config: remove checks with unused defines 233bed67a864 config: remove HAVE_1ARG_BIO_END_IO_T 609559e5b92a config: remove HAVE_BIO_BVEC_ITER 147c82bd5e1a config: remove HAVE_CLEAR_INODE and HAVE_EVICT_INODE efc293e37183 config: remove HAVE_DENTRY_D_U_ALIASES 92f7ec607581 config: remove HAVE_DIRTY_INODE_WITH_FLAGS dc6af4a4b5e9 config: remove HAVE_D_MAKE_ROOT 8e002ee26e3e config: remove HAVE_D_PRUNE_ALIASES f70ffacdfcdd config: remove HAVE_ENCODE_FH_WITH_INODE 525f06b5f6a8 config: remove HAVE_FALLOC_FL_ZERO_RANGE 257e40f9d967 config: remove HAVE_FILE_DENTRY 6a1d8a9cf016 config: remove HAVE_FILE_INODE 7af642af4dc1 config: remove HAVE_FSYNC_RANGE cf006e349647 config: remove HAVE_GENERIC_WRITE_CHECKS_KIOCB 714d7666e55a config: remove HAVE_INODE_SET_FLAGS d4bbe2ff38e8 config: remove HAVE_IO_SCHEDULE_TIMEOUT eb230c789a47 config: remove HAVE_KERNEL_STRSCPY 1b522c4583ea config: remove HAVE_KERNEL_TIMER_LIST_FLAGS f07485c46eb5 config: remove HAVE_LINUX_BLK_CGROUP_HEADER 583e2e25b91d config: remove HAVE_PERCPU_COUNTER_INIT_WITH_GFP 67b0c883dff1 config: remove HAVE___POSIX_ACL_CHMOD 3d37b1d6d49d config: remove HAVE_POSIX_ACL_RELEASE and HAVE_POSIX_ACL_RELEASE_GPL_ONLY 6840e3b18bc0 config: remove HAVE_SET_ACL d60d4ad809eb config: remove HAVE_SET_CACHED_ACL_USABLE b545b07b2fa0 config: remove HAVE_SPLIT_SHRINKER_CALLBACK and HAVE_SINGLE_SHRINKER_CALLBACK f3d30f1ce0d4 config: remove HAVE_USER_NS_COMMON_INUM 72be1f4062ae config: remove HAVE_VFS_RW_ITERATE 1a64c06ec02d config: remove SHRINK_CONTROL_HAS_NID 9f5c9af77c7f config: remove HAVE_VFS_DIRECT_IO_IOVEC 6a28491f8e37 config: remove HAVE_3ARGS_BDI_SETUP_AND_REGISTER ec6ba977b7d1 config: remove HAVE_3ARGS_VFS_GETATTR ed048fdc5b12 config: remove HAVE_D_REVALIDATE_NAMEIDATA 99c143a5a1f1 config: remove HAVE_FOLLOW_LINK_NAMEIDATA 2bba4202454e config: remove HAVE_LSEEK_EXECUTE c9e8d0e0b53b config: remove HAVE_PUT_LINK_NAMEIDATA a987057c67ac config: remove HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET eb73000dbb2f config: remove HAVE_WAIT_ON_BIT_ACTION 733317966fa9 config: remove HAVE_XATTR_(GET|SET|LIST)_DENTRY 9914684d361e config: remove HAVE_NEW_SYNC_READ 230bc538cb56 config: remove HAVE_VFS_FILE_OPERATIONS_EXTEND 9a1c7240ba2e config: remove HAVE_RENAME2_OPERATIONS_WRAPPER 96b0785f521a config: remove HAVE_GET_LINK_COOKIE afcc0fb0fab8 config: remove HAVE_1ARG_SUBMIT_BIO 43bf9a712b7d config: remove HAVE_BIO_BI_OPF ddf5122a2964 config: remove HAVE_BLK_QUEUE_WRITE_CACHE/HAVE_BLK_QUEUE_FLUSH bbc52ed50151 config: remove HAVE_CPU_HOTPLUG 6a17061213c1 config: remove HAVE_CURRENT_TIME 9b6f93a72f79 config: remove HAVE_GROUP_INFO_GID 6374171bb49e config: remove HAVE_IN_COMPAT_SYSCALL d1a07741f8ad config: remove HAVE_INODE_LOCK_SHARED a1832d1ecb01 config: remove HAVE_KERNEL_GET_ACL_HANDLE_CACHE 7cc89f83ff49 config: remove HAVE_POSIX_ACL_VALID_WITH_NS 95d85f032fc1 config: remove HAVE_(GET|PUT)_LINK_DELAYED 846b59851924 config: remove HAVE_REQ_OP_* and HAVE_REQ_* 432f6e9eec98 config: remove HAVE_SUPER_USER_NS df35eab0bfcf config: remove HAVE_VFS_COPY_FILE_RANGE 72d3fa215f28 config: remove HAVE_VFS_ITERATE/HAVE_VFS_ITERATE_SHARED 79c307def906 config: remove HAVE_XATTR_HANDLER_NAME e6713cfd542d config: remove HAVE_XATTR_(GET|SET|LIST)_HANDLER e055f0e0532e config: remove HAVE_XATTR_LIST_SIMPLE 1af510b55039 config: remove HAVE_XATTR_GET_DENTRY_INODE cde79fe11afa config: remove ZFS_GLOBAL_NODE_PAGE_STATE 0f158529811c config: remove HAVE_FILE_AIO_FSYNC 6a00b013856c config: remove HAVE_GENERIC_SETXATTR 30a2907ce9b9 config: remove HAVE_RENAME2 *** 116 LINES SKIPPED *** From nobody Sun Oct 6 11:07:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyL6KHyz5XgLc; Sun, 06 Oct 2024 11:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyL5nkGz4sFk; Sun, 6 Oct 2024 11:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nt7aWhBdPRwBwaOmaRwKPcEjRqQcVRLaeUb9JiWWmC8=; b=ITHx8azr+m7nu7OPScztlk6cW31kjI21kx7lQEtY14+58RlUexcWO0CXA/il30zPdE3z+F MwgYIGu0NsTch4KBL27HNtTKNwAKK2nwH9m1Q/pYio7r169TNLi5pFEBwer8AkLwPejhEX Tk4wOLXZ73ZXEXr+5FriXH8olqYhB75ehqw3ySYYQqXLSfHUcNRYfO1CWA8jk4t/dp3pa5 bd2VMrT3Vpo5CsskqFxNttpGyxgrS7kGPdoJwqY0rBlKI3xFtZyDe45nY2XnKgdUamSSGI MbReR+9e4LC68n7e8g5BvO47hs1Nt0+n2t4rQqAx8jKnzdxJYDqln7nVX5oHSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nt7aWhBdPRwBwaOmaRwKPcEjRqQcVRLaeUb9JiWWmC8=; b=kC+dNfbD46wMnAzUjoLZ3/DNC6EzLiTHBmmiL4U3r0B65R/5hmr+pUs8TOS4gZUZ5f+QyR tU1Kr9dNvjHzn7KdFWY0fbUvacg9+NNMYD1+IQY0pnYoBAjubGgc/6DdJyh4IHvX0PVlkR iaGyP2zkiWK3+inQ44j/ORjI2hIE/5FcmeoEPOMl04IDdp6g1PXFdqbENcLRlvMhvjKJ8/ KmkjI4C21WFJnabiyrQeMy9+8DTLlAKRbg8FFiITfAfAP7aPfejq2Mv8KGyFSV+bliVW5b oyEsxQy1J8E3ErN7giSODiD2JRjwIF+ZGS7uXm0FB0XnZpqWGO2WUAkh1+xMlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212842; a=rsa-sha256; cv=none; b=sDbeM6W0J2pANAga4BHCPR+e43D1dZdoYvx+i06PKC/eEo5nfAdklDtVsg+RhqP5waTku8 S081DGFxnUcYwHq1GUU6QmNOmprQ4qIzeGm9VpHASZ+mlDN9Gu/xfQIvp5KYvRbCjd3wEF +TdLIbJrIPJ5xrVwwit9lJ1eNMUE58tvZtQMcd3QE+YxWCooWTtXWSq1MiWrI1bdbBwvyU roHDtq6U9Y5bsGrKFAda8r3K+hQ+2WXe+xxd1+PA+/Ypvtz/8iBUnEc9HPDPG5iXDJs6aI FpP41DlKvwkfocZJ8w73JIx4/hbRqOB2WVM33poIddyXHbHz73KleL3TchKyqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyL5KlSz101R; Sun, 6 Oct 2024 11:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7MuC039054; Sun, 6 Oct 2024 11:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7MKC039051; Sun, 6 Oct 2024 11:07:22 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:22 GMT Message-Id: <202410061107.496B7MKC039051@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: 8d65747f7c6f - stable/14 - locate.updatedb: Explicitly exit from trap code. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d65747f7c6f61a0ee9304aaffcfdee9f885b9d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8d65747f7c6f61a0ee9304aaffcfdee9f885b9d5 commit 8d65747f7c6f61a0ee9304aaffcfdee9f885b9d5 Author: Dag-Erling Smørgrav AuthorDate: 2024-08-29 15:05:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:11:56 +0000 locate.updatedb: Explicitly exit from trap code. When a signal is trapped, the script continues after the trap code has run, unless the trap code explicitly exits. In the particular case of locate.updatedb, this is mostly harmless, except that the trap code is executed twice (once for the signal and once when we reach the end of the script), but it's still worth fixing. Furthermore, install the trap as soon as we've created the temporary directory, to minimize the window during which we can fail to clean up after ourselves if interrupted. While here, simplify the empty check at the end and make some minor style tweaks. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46475 (cherry picked from commit f62c1f3f8e91c78d402e1db4e518e4899a4ba2b9) locate.updatedb: Revert to using cat to copy the db. This script is usually run unprivileged, so install fails to create a temporary file while copying the finished database. Revert to using cat, which can overwrite the existing file as it is usually owned by the same user which is running the script. Fixes: f62c1f3f8e91 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46872 (cherry picked from commit 26bd374e72681860af4bf9d639308ad245949460) --- usr.bin/locate/locate/updatedb.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh index ff7ec7f6c18e..7d42cbb2260d 100644 --- a/usr.bin/locate/locate/updatedb.sh +++ b/usr.bin/locate/locate/updatedb.sh @@ -42,13 +42,14 @@ fi # The directory containing locate subprograms : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR : ${TMPDIR:=/tmp}; export TMPDIR -if ! TMPDIR=`mktemp -d $TMPDIR/locateXXXXXXXXXX`; then +if ! TMPDIR=$(mktemp -d $TMPDIR/locateXXXXXXXXXX); then exit 1 fi +tmp=$TMPDIR/_updatedb$$ +trap 'rc=$?; rm -f $tmp; rmdir $TMPDIR; trap - 0; exit $rc' 0 1 2 3 5 10 15 PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH - : ${mklocatedb:=locate.mklocatedb} # make locate database program : ${FCODES:=/var/db/locate.database} # the database : ${SEARCHPATHS="/"} # directories to be put in the database @@ -87,17 +88,13 @@ if [ -n "$PRUNEDIRS" ]; then done fi -tmp=$TMPDIR/_updatedb$$ -trap 'rm -f $tmp; rmdir $TMPDIR' 0 1 2 3 5 10 15 - # search locally if $find -s $SEARCHPATHS $excludes -or -print 2>/dev/null | $mklocatedb -presort > $tmp then - if [ -n "$($find $tmp -size -257c -print)" ]; then + if ! grep -aq / $tmp; then echo "updatedb: locate database $tmp is empty" >&2 exit 1 - else - cat $tmp > $FCODES # should be cp? fi + cat $tmp >$FCODES fi From nobody Sun Oct 6 11:07:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyM6f2Mz5XgCl; Sun, 06 Oct 2024 11:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyM6370z4sJF; Sun, 6 Oct 2024 11:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SydC2Byda/uCnA3+G2nHWK0oxHWc6KU1A8NzNT39msg=; b=XqxlufCx9heNBWgREoj6BCU+pgXv+a3aXrBQUGxxyKep87DdckzjNriOero60hgpVMgcfC 7yDn8p20ntR0AtRhwN+KzRQ05I07YsScZwtBiEn6b1XrAt65IE6VjDxkfP9VBYhzwLdqw+ XWL0dIUB+5YcFFaYn7+6DMQ6wgHSI/5GOGE0nL9O1v6VfYYL6//t01LoVHtKhs1LaywRn8 ZE2oz94mEk8B1U4mH+zNmhYQDOMfBMaG+cGZpPoM9spVJQGSTKMULOXwh7PSuECtT3kvkX 86mRas6FGJc0nTdTIiCkOg7+keI8f/iI3P7bWMPtvKrNtiu3chdZM0lGhon+/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SydC2Byda/uCnA3+G2nHWK0oxHWc6KU1A8NzNT39msg=; b=WF4rv2bBeXfPLsAF/YxLywWZGWPfyEqcHMteqBcKMFTJGGKHS3wEolQ96c0BjbXU33ZkDt xLzGTI0YKsHlG81fUvdQ03CWQU0FfGj4w0fiRdKR1A/I9KKYS2G3+FzoTmBZ1ZbXV6d6EA HpZSkhMQkG8aX0p4xEI4tj9oyr6CbZckxxQecaOlnlf7wqUlSj0yCUDRr3wmRr7CWMzbWG e8iFDYsg1mHDDvoOw3RTOX98gEdrShvbQB5vxnVaAMZwfjrBUorBzvcqlqn/L6mU5kZE0S wCMxG0t4wzG3BJpnJWyDkzp+ZiWF106JCBvEerhtpMt9dt0QRqsxccdJIXpWeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212843; a=rsa-sha256; cv=none; b=idwBF6CoIRdMtTn5+Zv7YnoQgAgZmTljw9jGTUn3HrdPgi6qTuvx+re4TSJbV9L9WqZfhm e85jAtTDslMLxvygGk52/A+VG1HIW2JwuSKV59UCZxFcMmgh7z27OMv2oLx2eb5c4uvrOq xcjke2IB9Goe9U9cSjZTH9+1g9XVr5xEif+UWZr0JhQuigtKDUSeUOb5QuwY74biEKwNe/ IVJu5EXxTXq18yQuR4NGrCSW0bZjjlJyxZiH+Gn2+HqaRCs5JgiSJlc2czwZGtDBBNX/X4 xR2qK6PhOjP/8Jrc+Tc5B+7hspTfDAzhghNmaWgDJEkET3UcM/prtosbogYDpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyM5dCkz10d5; Sun, 6 Oct 2024 11:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7N4K039110; Sun, 6 Oct 2024 11:07:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7NGX039107; Sun, 6 Oct 2024 11:07:23 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:23 GMT Message-Id: <202410061107.496B7NGX039107@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: d2c02cfae55a - stable/14 - date: Fix a few nits. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d2c02cfae55a1ffb179b55f45a89606845e1acfb Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c02cfae55a1ffb179b55f45a89606845e1acfb commit d2c02cfae55a1ffb179b55f45a89606845e1acfb Author: Dag-Erling Smørgrav AuthorDate: 2024-09-04 17:32:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:12:24 +0000 date: Fix a few nits. * Don't use `asprintf()` when `strdup()` can do the job just as well. * Fix a couple of typos in a comment. Fixes: eeb04a736cb9 MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46533 (cherry picked from commit a8ddd1926a34fc20970d9ceaad71b31fc414b1c5) date: Documentation nits. * Fix spurious capitalization. * Fix inconsistent quoting. * Use `Dq` rather than ASCII double quotes. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D46622 (cherry picked from commit 355ebf80b1ed98cf7ca9c51ce7e3e6dcb376853d) --- bin/date/date.1 | 9 ++++++--- bin/date/date.c | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 29cde37ca904..62d28a7df0a0 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 2, 2024 +.Dd September 10, 2024 .Dt DATE 1 .Os .Sh NAME @@ -538,8 +538,11 @@ Finally the command .Pp .Dl "TZ=America/Los_Angeles date -z Europe/Paris -j 0900" .Pp -will print the time in the "Europe/Paris" timezone when it is 9:00 in The -America/Los_Angeles timezone. +will print the time in the +.Dq Europe/Paris +timezone when it is 9:00 in the +.Dq America/Los_Angeles +timezone. .Sh DIAGNOSTICS It is invalid to combine the .Fl I diff --git a/bin/date/date.c b/bin/date/date.c index 6b6e1f69cabc..d32993dc1eda 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -395,8 +395,8 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, bool seen_percent; seen_percent = false; - if (asprintf(&newformat, "%s", format) < 0) - err(1, "asprintf"); + if ((newformat = strdup(format)) == NULL) + err(1, "strdup"); tok = newformat; for (tok = newformat; *tok != '\0'; tok++) { switch (*tok) { @@ -418,9 +418,9 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, suffix = tok + 1; /* * Construct a new format string from the - * prefix (i.e., the part of the old fromat + * prefix (i.e., the part of the old format * from its beginning to the currently handled - * "%N" conversion specification, the + * "%N" conversion specification), the * nanoseconds, and the suffix (i.e., the part * of the old format from the next token to the * end). From nobody Sun Oct 6 11:07:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyP1KtQz5XgYw; Sun, 06 Oct 2024 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyP02gTz4rw3; Sun, 6 Oct 2024 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaGLmGyk+ICDZ62Tp70F+I997k3URiHdrDpJ88a/qPY=; b=bkKoacUzRjVQt/dnKXtkr4OijNuyksiHXxDYv7tIITGeboVSrAAB61Y0gkm3SGXQ8JC3// JR0i06F+YXoTOh7UecEXKgWXXWZtJlZVt4XKQPl8RO64mpXczZfqXxuQGxM1aZII+tvE/r VWyA6BPAkj+LL8o44JR2O8M5ZBWj0AwQ1d1Zb086zWEh3yO1jJxHTSyiyTK/U3qOJzFEcc CbG3h4tDbxYE8XCo+RxCVa+HRNBhMay5JEj0bNP0dZjZbLW24zkFjrC4TYLQ6X9mWuoq/m AmR6VUevd3QnTm/A8TePvzhYZm0J0YlrufyGt1jWs54hTAXOz//SkptrJPWCNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaGLmGyk+ICDZ62Tp70F+I997k3URiHdrDpJ88a/qPY=; b=jf8fXoIhie8KHt/ei54CGlEbIHvv+5ntD1ShoevxSjPu0pCPW9k/sxY91Xig3r8+eaTl2G iPk2ibnxvb7yYyTW7L5cstTEqiOIX2RG0YbSSTjzgWBvVWHEjXmfWDXfWJIRxenyXGvaPR QTpXQPFjBi6kNK8/eV6wM1HoUuB9J4N9EAWfXfrtKc44UeudaIS9Sh0xODvsSrVsotW8f+ 8n7n1xShlXg8NYGCIRPXyLVfseQxqbHM7ENn9EmtZEXYbBKVqfZxUV18yBoREHmkgY4aWE ekiYMFolMd7YYN+1LIeAF6WJKplcrLJDe+SPtnhse9bxvyGyZJ5cMWsD8TAiXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212845; a=rsa-sha256; cv=none; b=JqF3woHyRp4wQDP2gJ55OzgettPNxGQKF1QqVXpXNoNjaveh+g1/gpczKtVrKLkYkRoh/P rBRFBf8y+Qfzz4u6CtO6gi4sY3Cud9lNYJ4GIorIAymaua3h07nMLV71pRbnN0xiuqbBJd 6zMPfrwK2prBzD2LbDWlmclNuvD5+Ew2PXRPJd/nhx2yyWkfo+5xBMUzY11cB688X4wGJJ ATu4TMabFM5aldFb1n8hIsCCFVjzqggv9NhhKafHcroUwQywI3pgaUi8/KRahi6HJhSU2l a8oaVkKYsW8JrbqmqcNOsjEwbB/f1PXrSgR2htNOEwQl89wz6qqCbNs2udUsJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyN6WcLz10Sn; Sun, 6 Oct 2024 11:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7Ow7039171; Sun, 6 Oct 2024 11:07:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7OL7039165; Sun, 6 Oct 2024 11:07:24 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:24 GMT Message-Id: <202410061107.496B7OL7039165@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: 113e746686db - stable/14 - Update tzcode to 2024b. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 113e746686dbd57c2700a1ece970d262ea57092f Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=113e746686dbd57c2700a1ece970d262ea57092f commit 113e746686dbd57c2700a1ece970d262ea57092f Author: Dag-Erling Smørgrav AuthorDate: 2024-09-07 13:46:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:12:49 +0000 Update tzcode to 2024b. MFC after: 3 weeks Sponsored by: Klara, Inc. Reviewed by: philip Differential Revision: https://reviews.freebsd.org/D46565 (cherry picked from commit a979394afeb5c20fc58c5f5b005d51eb8f92f666) --- contrib/tzcode/CONTRIBUTING | 18 +- contrib/tzcode/Makefile | 412 +++++++++++++++++++++++-------------------- contrib/tzcode/NEWS | 124 ++++++++++++- contrib/tzcode/asctime.c | 19 +- contrib/tzcode/localtime.c | 87 ++------- contrib/tzcode/newctime.3 | 102 ++++++----- contrib/tzcode/newstrftime.3 | 30 ++-- contrib/tzcode/newtzset.3 | 66 +++++-- contrib/tzcode/private.h | 114 +++++++----- contrib/tzcode/theory.html | 214 ++++++++++++++-------- contrib/tzcode/tz-art.html | 5 + contrib/tzcode/tz-link.html | 113 +++++++----- contrib/tzcode/tzfile.5 | 38 ++-- contrib/tzcode/tzfile.h | 8 +- contrib/tzcode/tzselect.ksh | 125 ++++++------- contrib/tzcode/version | 2 +- contrib/tzcode/workman.sh | 3 +- contrib/tzcode/zdump.c | 10 +- contrib/tzcode/zic.8 | 52 +++--- contrib/tzcode/zic.c | 31 ++-- 20 files changed, 926 insertions(+), 647 deletions(-) diff --git a/contrib/tzcode/CONTRIBUTING b/contrib/tzcode/CONTRIBUTING index 6d800e4c03a3..f6edbd3be7d3 100644 --- a/contrib/tzcode/CONTRIBUTING +++ b/contrib/tzcode/CONTRIBUTING @@ -23,10 +23,10 @@ such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" . It is also good to browse the mailing list archives - for examples of patches that tend -to work well. Additions to data should contain commentary citing -reliable sources as justification. Citations should use "https:" URLs -if available. + +for examples of patches that tend to work well. +Changes should contain commentary citing reliable sources. +Citations should use "https:" URLs if available. For changes that fix sensitive security-related bugs, please see the distribution's 'SECURITY' file. @@ -63,12 +63,16 @@ If you use Git the following workflow may be helpful: * Edit source files. Include commentary that justifies the changes by citing reliable sources. - * Debug the changes, e.g.: + * Debug the changes locally, e.g.: - make check - make install + make TOPDIR=$PWD/tz clean check install ./zdump -v America/Los_Angeles + Although builds assume only basic POSIX, they use extra features + if available. 'make check' accesses validator.w3.org unless you + lack 'curl' or use 'make CURL=:'. If you have the latest GCC, + "make CFLAGS='$(GCC_DEBUG_FLAGS)'" does extra checking. + * For each separable change, commit it in the new branch, e.g.: git add northamerica diff --git a/contrib/tzcode/Makefile b/contrib/tzcode/Makefile index d48354c72df4..0087b4596515 100644 --- a/contrib/tzcode/Makefile +++ b/contrib/tzcode/Makefile @@ -3,17 +3,17 @@ # 2009-05-17 by Arthur David Olson. # Request POSIX conformance; this must be the first non-comment line. .POSIX: -# On older platforms you may need to scrounge for a POSIX-conforming 'make'. -# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or -# /usr/xpg4/bin/make, not /usr/ccs/bin/make. +# On older platforms you may need to scrounge for POSIX conformance. +# For example, on Solaris 10 (2005) with Sun Studio 12 aka Sun C 5.9 (2007), +# use 'PATH=/usr/xpg4/bin:$PATH make CC=c99'. # To affect how this Makefile works, you can run a shell script like this: # # #!/bin/sh -# make CC='gcc -std=gnu11' "$@" +# make CC='gcc -std=gnu23' "$@" # -# This example script is appropriate for a pre-2017 GNU/Linux system -# where a non-default setting is needed to support this package's use of C99. +# This example script is appropriate for a circa 2024 GNU/Linux system +# where a non-default setting enables this package's optional use of C23. # # Alternatively, you can simply edit this Makefile to tailor the following # macro definitions. @@ -53,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ +# The POSIXRULES macro controls interpretation of POSIX-like TZ # settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. # Any other value for POSIXRULES is obsolete and should not be relied on, as: @@ -132,8 +132,9 @@ LIBDIR = $(TOPDIR)/$(USRDIR)/lib # Types to try, as an alternative to time_t. TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL) -TIME_T_ALTERNATIVES_HEAD = int_least64_t -TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t +TIME_T_ALTERNATIVES_HEAD = int_least64_t.ck +TIME_T_ALTERNATIVES_TAIL = int_least32_t.ck uint_least32_t.ck \ + uint_least64_t.ck # What kind of TZif data files to generate. (TZif is the binary time # zone data format that zic generates; see Internet RFC 8536.) @@ -219,6 +220,7 @@ LDLIBS= # than what POSIX specifies, assuming local time is UT. # For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# on POSIX platforms predating POSIX.1-2024 # -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DECL_TIMEGM=0 if does not declare timegm # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) @@ -229,7 +231,7 @@ LDLIBS= # where LDLIBS also needs to contain -lintl on some hosts; # -DHAVE_GETTEXT=0 to avoid using gettext # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares -# ctime_r and asctime_r incompatibly with the POSIX standard +# ctime_r and asctime_r incompatibly with POSIX.1-2017 and earlier # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). # -DHAVE_INTTYPES_H=0 if does not work*+ # -DHAVE_LINK=0 if your system lacks a link function @@ -261,8 +263,11 @@ LDLIBS= # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t -# -DSUPPORT_C89 if the tzcode library should support C89 callers+ -# However, this might trigger latent bugs in C99-or-later callers. +# -DSUPPORT_C89=0 if the tzcode library should not support C89 callers +# Although -DSUPPORT_C89=0 might work around latent bugs in callers, +# it does not conform to POSIX. +# -DSUPPORT_POSIX2008 if the library should support older POSIX callers+ +# However, this might cause problems in POSIX.1-2024-or-later callers. # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -274,7 +279,7 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions for POSIX.1-2017-style TZ strings lacking them, +# DST transitions for proleptic format TZ strings lacking them, # in the usual case where POSIXRULES is '-'. If not specified, # TZDEFRULESTRING defaults to US rules for future DST transitions. # This mishandles some past timestamps, as US DST rules have changed. @@ -302,23 +307,25 @@ LDLIBS= # # * Options marked "*" can be omitted if your compiler is C23 compatible. # * Options marked "+" are obsolescent and are planned to be removed -# once the code assumes C99 or later, say in the year 2029. +# once the code assumes C99 or later (say in the year 2029) +# and POSIX.1-2024 or later (say in the year 2034). # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ -fsanitize=undefined -fsanitize-address-use-after-scope \ -fsanitize-undefined-trap-on-error -fstack-protector # Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow. -GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 \ $(GCC_INSTRUMENT) \ -Wall -Wextra \ -Walloc-size-larger-than=100000 -Warray-bounds=2 \ -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \ -Wdeclaration-after-statement -Wdouble-promotion \ - -Wduplicated-branches -Wduplicated-cond \ + -Wduplicated-branches -Wduplicated-cond -Wflex-array-member-not-at-end \ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \ - -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wmissing-declarations -Wmissing-prototypes \ + -Wmissing-variable-declarations -Wnested-externs \ -Wnull-dereference \ -Wold-style-definition -Woverlength-strings -Wpointer-arith \ -Wshadow -Wshift-overflow=2 -Wstrict-overflow \ @@ -327,10 +334,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ -Wsuggest-attribute=const -Wsuggest-attribute=format \ -Wsuggest-attribute=malloc \ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ - -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \ + -Wtrampolines -Wundef -Wunused-macros -Wuse-after-free=3 \ -Wvariadic-macros -Wvla -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits + -Wno-format-nonliteral -Wno-sign-compare # # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), @@ -341,9 +347,8 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone # and define NO_TM_ZONE to suppress any guessing. -# Although these two fields are not required by POSIX.1-2017, -# POSIX 202x/D4 requires them and they are widely available -# on GNU/Linux and BSD systems. +# Although POSIX.1-2024 requires these fields and they are widely available +# on GNU/Linux and BSD systems, some older systems lack them. # # The next batch of options control support for external variables # exported by tzcode. In practice these variables are less useful @@ -353,7 +358,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DHAVE_TZNAME=0 # do not support "tzname" # # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library # # -DHAVE_TZNAME=2 # support and define "tzname" -# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. +# # to the "CFLAGS=" line. Although "tzname" is required by POSIX.1-1988 +# # and later, its contents are unspecified if you use a geographical TZ +# # and the variable is planned to be removed in a future POSIX edition. # # If not defined, the code attempts to guess HAVE_TZNAME from other macros. # # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause # # crashes when combined with some platforms' standard libraries, @@ -364,7 +371,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DUSG_COMPAT=1 # support, and variables are defined by system library # # -DUSG_COMPAT=2 # support and define variables # # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix -# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). +# # Systems Group code and are required by POSIX.1-2008 and later (with XSI), +# # although their contents are unspecified if you use a geographical TZ +# # and the variables are planned to be removed in a future edition of POSIX. # # If not defined, the code attempts to guess USG_COMPAT from other macros. # # # # To support the external variable "altzone", add @@ -428,18 +437,13 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # The name of a POSIX-like library archiver, its flags, C compiler, # linker flags, and 'make' utility. Ordinarily the defaults suffice. -# The commented-out values are the defaults specified by POSIX.1-202x/D4. +# The commented-out values are the defaults specified by POSIX.1-2024. #AR = ar #ARFLAGS = -rv #CC = c17 #LDFLAGS = #MAKE = make -# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in -# submake command lines. The default is no leap seconds. - -LEAPSECONDS= - # Where to fetch leap-seconds.list from. leaplist_URI = \ https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list @@ -461,7 +465,7 @@ ZFLAGS= # How to use zic to install TZif files. -ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' # The name of a POSIX-compliant 'awk' on your system. # mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. @@ -480,6 +484,7 @@ KSHELL= /bin/bash # Name of curl , used for HTML validation # and to fetch leap-seconds.list from upstream. +# Set CURL=: to disable use of the Internet. CURL= curl # Name of GNU Privacy Guard , used to sign distributions. @@ -533,21 +538,28 @@ OK_LINE= '^'$(OK_CHAR)'*$$' # Flags to give 'tar' when making a distribution. # Try to use flags appropriate for GNU tar. -GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \ +GNUTARFLAGS= --format=pax --pax-option=delete=atime,delete=ctime \ --numeric-owner --owner=0 --group=0 \ --mode=go+u,go-w --sort=name -TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \ - then echo $(GNUTARFLAGS); \ - else :; \ - fi` +SETUP_TAR= \ + export LC_ALL=C && \ + if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; then \ + TAR='tar $(GNUTARFLAGS)'; \ + else \ + TAR=tar; \ + fi # Flags to give 'gzip' when making a distribution. GZIPFLAGS= -9n # When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported. # This makes it easier to see which Zone has been affected. -DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \ - || echo ' -F^TZ=') +SETUP_DIFF_TZS = \ + if diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1; then \ + DIFF_TZS='diff -u -F^TZ='; \ + else \ + DIFF_TZS='diff -u'; \ + fi # ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. RANLIB= : @@ -561,8 +573,8 @@ RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o strftime.o -DATEOBJS= date.o localtime.o strftime.o asctime.o +TZDOBJS= zdump.o localtime.o strftime.o +DATEOBJS= date.o localtime.o strftime.o LIBSRCS= localtime.c asctime.c difftime.c strftime.c LIBOBJS= localtime.o asctime.o difftime.o strftime.o HEADERS= tzfile.h private.h @@ -579,8 +591,7 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \ COMMON= calendars CONTRIBUTING LICENSE Makefile \ NEWS README SECURITY theory.html version WEB_PAGES= tz-art.html tz-how-to.html tz-link.html -CHECK_WEB_PAGES=check_theory.html check_tz-art.html \ - check_tz-how-to.html check_tz-link.html +CHECK_WEB_PAGES=theory.ck tz-art.ck tz-how-to.ck tz-link.ck DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica @@ -641,8 +652,7 @@ install: all $(DATA) $(REDO) $(MANS) '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ '$(DESTDIR)$(MANDIR)/man8' $(ZIC_INSTALL) -l $(LOCALTIME) \ - `case '$(POSIXRULES)' in ?*) echo '-p';; esac \ - ` $(POSIXRULES) \ + -p $(POSIXRULES) \ -t '$(DESTDIR)$(TZDEFAULT)' cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' cp tzselect '$(DESTDIR)$(BINDIR)/.' @@ -665,10 +675,10 @@ INSTALL: ALL install date.1 # and append "-dirty" if the contents do not already end in "-dirty". version: $(VERSION_DEPS) { (type git) >/dev/null 2>&1 && \ - V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty` || \ - if test '$(VERSION)' = unknown && V=`cat $@`; then \ - case $$V in *-dirty);; *) V=$$V-dirty;; esac; \ + V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty) || \ + if test '$(VERSION)' = unknown && read -r V <$@; then \ + V=$${V%-dirty}-dirty; \ else \ V='$(VERSION)'; \ fi; } && \ @@ -678,7 +688,7 @@ version: $(VERSION_DEPS) # These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST. vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) $(AWK) \ - -v DATAFORM=`expr $@ : '\(.*\).zi'` \ + -v DATAFORM=$(@:.zi=) \ -v PACKRATDATA='$(PACKRATDATA)' \ -v PACKRATLIST='$(PACKRATLIST)' \ -f ziguard.awk \ @@ -687,7 +697,7 @@ vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) # This file has a version comment that attempts to capture any tailoring # via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO. tzdata.zi: $(DATAFORM).zi version zishrink.awk - version=`sed 1q version` && \ + read -r version $@ + ./zdump -i $(TZS_CUTOFF_FLAG) "$$PWD/$(@:.zd=)" >$@ TZS_NEW_DEPS = tzdata.zi zdump zic $(TZS_NEW): $(TZS_NEW_DEPS) @@ -812,20 +815,19 @@ $(TZS_NEW): $(TZS_NEW_DEPS) $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ tzdata.zi | LC_ALL=C sort >$@.out - wd=`pwd` && \ - x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ + x=$$($(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ tzdata.zi \ - | LC_ALL=C sort -t . -k 2,2` && \ + | LC_ALL=C sort -t . -k 2,2) && \ set x $$x && \ shift && \ ZDS=$$* && \ - $(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ + $(MAKE) TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ ZDS="$$ZDS" $$ZDS && \ sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out rm -fr tzs$(TZS_YEAR).dir mv $@.out $@ -# If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the +# If $(TZS) exists but 'make tzs.ck' fails, a maintainer should inspect the # failed output and fix the inconsistency, perhaps by running 'make force_tzs'. $(TZS): touch $@ @@ -842,7 +844,7 @@ date: $(DATEOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS) tzselect: tzselect.ksh version - VERSION=`cat version` && sed \ + read -r VERSION /dev/null 2>&1 \ - || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; } + || { export LC_ALL='$(UTF8_LOCALE)'; false; }; } -check_character_set: $(ENCHILADA) +character-set.ck: $(ENCHILADA) $(UTF8_LOCALE_MISSING) || { \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ @@ -882,48 +884,55 @@ check_character_set: $(ENCHILADA) } touch $@ -check_white_space: $(ENCHILADA) +white-space.ck: $(ENCHILADA) $(UTF8_LOCALE_MISSING) || { \ - patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ + enchilada='$(ENCHILADA)' && \ + patfmt=' \t|[\f\r\v]' && pat=$$(printf "$$patfmt\\n") && \ ! grep -En "$$pat|[$s]\$$" \ - $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list); \ + $${enchilada%leap-seconds.list*} \ + $${enchilada#*leap-seconds.list}; \ } touch $@ PRECEDES_FILE_NAME = ^(Zone|Link[$s]+[^$s]+)[$s]+ FILE_NAME_COMPONENT_TOO_LONG = $(PRECEDES_FILE_NAME)[^$s]*[^/$s]{15} -check_name_lengths: $(TDATA_TO_CHECK) backzone - ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \ +name-lengths.ck: $(TDATA_TO_CHECK) backzone + :;! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \ $(TDATA_TO_CHECK) backzone touch $@ +mainguard.ck: main.zi + test '$(PACKRATLIST)' || \ + cat $(TDATA) $(PACKRATDATA) | diff -u - main.zi + touch $@ + PRECEDES_STDOFF = ^(Zone[$s]+[^$s]+)?[$s]+ STDOFF = [-+]?[0-9:.]+ RULELESS_SAVE = (-|$(STDOFF)[sd]?) RULELESS_SLASHED_ABBRS = \ $(PRECEDES_STDOFF)$(STDOFF)[$s]+$(RULELESS_SAVE)[$s]+[^$s]*/ -check_slashed_abbrs: $(TDATA_TO_CHECK) - ! grep -En '$(RULELESS_SLASHED_ABBRS)' $(TDATA_TO_CHECK) +slashed-abbrs.ck: $(TDATA_TO_CHECK) + :;! grep -En '$(RULELESS_SLASHED_ABBRS)' $(TDATA_TO_CHECK) touch $@ CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } -check_sorted: backward backzone +sorted.ck: backward backzone $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ backward | LC_ALL=C sort -cu - $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu + $(AWK) '/^Zone.*\// {print $$2}' backzone | LC_ALL=C sort -cu touch $@ -check_back: checklinks.awk $(TDATA_TO_CHECK) +back.ck: checklinks.awk $(TDATA_TO_CHECK) $(AWK) \ -v DATAFORM=$(DATAFORM) \ -v backcheck=backward \ -f checklinks.awk $(TDATA_TO_CHECK) touch $@ -check_links: checklinks.awk tzdata.zi +links.ck: checklinks.awk tzdata.zi $(AWK) \ -v DATAFORM=$(DATAFORM) \ -f checklinks.awk tzdata.zi @@ -932,26 +941,36 @@ check_links: checklinks.awk tzdata.zi # Check timestamps from now through 28 years from now, to make sure # that zonenow.tab contains all sequences of planned timestamps, # without any duplicate sequences. In theory this might require -# 2800 years but that would take a long time to check. -CHECK_NOW_TIMESTAMP = `./date +%s` +# 2800+ years but that would take a long time to check. +CHECK_NOW_TIMESTAMP = $$(./date +%s) CHECK_NOW_FUTURE_YEARS = 28 -CHECK_NOW_FUTURE_SECS = $(CHECK_NOW_FUTURE_YEARS) '*' 366 '*' 24 '*' 60 '*' 60 -check_now: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab - rm -fr $@.dir - mkdir $@.dir - ./zic -d $@.dir tzdata.zi +CHECK_NOW_FUTURE_SECS = $(CHECK_NOW_FUTURE_YEARS) * 366 * 24 * 60 * 60 +now.ck: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab + rm -fr $@d + mkdir $@d + ./zic -d $@d tzdata.zi now=$(CHECK_NOW_TIMESTAMP) && \ - future=`expr $(CHECK_NOW_FUTURE_SECS) + $$now` && \ + future=$$(($(CHECK_NOW_FUTURE_SECS) + $$now)) && \ ./zdump -i -t $$now,$$future \ - $$(find $$PWD/$@.dir/????*/ -type f) \ - >$@.dir/zdump.tab + $$(find "$$PWD/$@d"/????*/ -type f) \ + >$@d/zdump-now.tab && \ + ./zdump -i -t 0,$$future \ + $$(find "$$PWD/$@d" -name Etc -prune \ + -o -type f ! -name '*.tab' -print) \ + >$@d/zdump-1970.tab $(AWK) \ - -v zdump_table=$@.dir/zdump.tab \ + -v zdump_table=$@d/zdump-now.tab \ -f checknow.awk zonenow.tab - rm -fr $@.dir + $(AWK) \ + 'BEGIN {print "-\t-\tUTC"} /^Zone/ {print "-\t-\t" $$2}' \ + $(PRIMARY_YDATA) backward factory | \ + $(AWK) \ + -v zdump_table=$@d/zdump-1970.tab \ + -f checknow.awk + rm -fr $@d touch $@ -check_tables: checktab.awk $(YDATA) backward zone.tab zone1970.tab +tables.ck: checktab.awk $(YDATA) backward zone.tab zone1970.tab for tab in $(ZONETABLES); do \ test "$$tab" = zone.tab && links='$(BACKWARD)' || links=''; \ $(AWK) -f checktab.awk -v zone_table=$$tab $(YDATA) $$links \ @@ -959,26 +978,24 @@ check_tables: checktab.awk $(YDATA) backward zone.tab zone1970.tab done touch $@ -check_tzs: $(TZS) $(TZS_NEW) +tzs.ck: $(TZS) $(TZS_NEW) if test -s $(TZS); then \ - $(DIFF_TZS) $(TZS) $(TZS_NEW); \ + $(SETUP_DIFF_TZS) && $$DIFF_TZS $(TZS) $(TZS_NEW); \ else \ cp $(TZS_NEW) $(TZS); \ fi touch $@ check_web: $(CHECK_WEB_PAGES) -check_theory.html: theory.html -check_tz-art.html: tz-art.html -check_tz-how-to.html: tz-how-to.html -check_tz-link.html: tz-link.html -check_theory.html check_tz-art.html check_tz-how-to.html check_tz-link.html: - $(CURL) -sS --url https://validator.w3.org/nu/ -F out=gnu \ - -F file=@$$(expr $@ : 'check_\(.*\)') -o $@.out && \ +.SUFFIXES: .ck .html +.html.ck: + { ! ($(CURL) --version) >/dev/null 2>&1 || \ + $(CURL) -sS --url https://validator.w3.org/nu/ -F out=gnu \ + -F file=@$<; } >$@.out && \ test ! -s $@.out || { cat $@.out; exit 1; } mv $@.out $@ -check_ziguard: rearguard.zi vanguard.zi ziguard.awk +ziguard.ck: rearguard.zi vanguard.zi ziguard.awk $(AWK) -v DATAFORM=rearguard -f ziguard.awk vanguard.zi | \ diff -u rearguard.zi - $(AWK) -v DATAFORM=vanguard -f ziguard.awk rearguard.zi | \ @@ -987,36 +1004,35 @@ check_ziguard: rearguard.zi vanguard.zi ziguard.awk # Check that zishrink.awk does not alter the data, and that ziguard.awk # preserves main-format data. -check_zishrink: check_zishrink_posix check_zishrink_right -check_zishrink_posix check_zishrink_right: \ +check_zishrink: zishrink-posix.ck zishrink-right.ck +zishrink-posix.ck zishrink-right.ck: \ zic leapseconds $(PACKRATDATA) $(PACKRATLIST) \ $(TDATA) $(DATAFORM).zi tzdata.zi - rm -fr $@.dir $@-t.dir $@-shrunk.dir - mkdir $@.dir $@-t.dir $@-shrunk.dir + rm -fr $@d t-$@d shrunk-$@d + mkdir $@d t-$@d shrunk-$@d case $@ in \ - *_right) leap='-L leapseconds';; \ + *right*) leap='-L leapseconds';; \ *) leap=;; \ esac && \ - $(ZIC) $$leap -d $@.dir $(DATAFORM).zi && \ - $(ZIC) $$leap -d $@-shrunk.dir tzdata.zi && \ + $(ZIC) $$leap -d $@d $(DATAFORM).zi && \ + $(ZIC) $$leap -d shrunk-$@d tzdata.zi && \ case $(DATAFORM),$(PACKRATLIST) in \ main,) \ - $(ZIC) $$leap -d $@-t.dir $(TDATA) && \ + $(ZIC) $$leap -d t-$@d $(TDATA) && \ $(AWK) '/^Rule/' $(TDATA) | \ - $(ZIC) $$leap -d $@-t.dir - $(PACKRATDATA) && \ - diff -r $@.dir $@-t.dir;; \ + $(ZIC) $$leap -d t-$@d - $(PACKRATDATA) && \ + diff -r $@d t-$@d;; \ esac - diff -r $@.dir $@-shrunk.dir - rm -fr $@.dir $@-t.dir $@-shrunk.dir + diff -r $@d shrunk-$@d + rm -fr $@d t-$@d shrunk-$@d touch $@ clean_misc: - rm -fr check_*.dir typecheck_*.dir - rm -f *.o *.out $(TIME_T_ALTERNATIVES) \ - check_* core typecheck_* \ + rm -fr *.ckd *.dir + rm -f *.ck *.core *.o *.out core core.* \ date tzdir.h tzselect version.h zdump zic libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ + rm -fr tzdb-*/ rm -f *.zi $(TZS_NEW) maintainer-clean: clean @@ -1027,7 +1043,7 @@ maintainer-clean: clean names: @echo $(ENCHILADA) -public: check check_public $(CHECK_TIME_T_ALTERNATIVES) \ +public: check public.ck $(CHECK_TIME_T_ALTERNATIVES) \ tarballs signatures date.1.txt: date.1 @@ -1041,7 +1057,7 @@ zdump.8.txt: zdump.8 zic.8.txt: zic.8 $(MANTXTS): workman.sh - LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out + LC_ALL=C sh workman.sh $(@:.txt=) >$@.out mv $@.out $@ # Set file timestamps deterministically if possible, @@ -1054,13 +1070,13 @@ SET_TIMESTAMP_N = sh -c '\ n=$$0 dest=$$1; shift; \ <"$$dest" && \ if test $$n != 0 && \ - lsout=`ls -nt --time-style="+%s" "$$@" 2>/dev/null`; then \ + lsout=$$(ls -nt --time-style="+%s" "$$@" 2>/dev/null); then \ set x $$lsout && \ - timestamp=`expr $$7 + $$n` && \ + timestamp=$$(($$7 + $$n)) && \ echo "+ touch -md @$$timestamp $$dest" && \ touch -md @$$timestamp "$$dest"; \ else \ - newest=`ls -t "$$@" | sed 1q` && \ + newest=$$(ls -t "$$@" | sed 1q) && \ echo "+ touch -mr $$newest $$dest" && \ touch -mr "$$newest" "$$dest"; \ fi' @@ -1083,15 +1099,15 @@ SET_TIMESTAMP_DEP = $(SET_TIMESTAMP_N) 1 set-timestamps.out: $(EIGHT_YARDS) rm -f $@ if (type git) >/dev/null 2>&1 && \ - files=`git ls-files $(EIGHT_YARDS)` && \ + files=$$(git ls-files $(EIGHT_YARDS)) && \ touch -md @1 test.out; then \ rm -f test.out && \ for file in $$files; do \ if git diff --quiet $$file; then \ - time=`TZ=UTC0 git log -1 \ + time=$$(TZ=UTC0 git log -1 \ --format='tformat:%cd' \ --date='format:%Y-%m-%dT%H:%M:%SZ' \ - $$file` && \ + $$file) && \ echo "+ touch -md $$time $$file" && \ touch -md $$time $$file; \ else \ @@ -1100,8 +1116,8 @@ set-timestamps.out: $(EIGHT_YARDS) done; \ fi $(SET_TIMESTAMP_DEP) leapseconds $(LEAP_DEPS) - for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \ - $(SET_TIMESTAMP_DEP) $$file.txt $$file workman.sh || \ + for file in $(MANTXTS); do \ + $(SET_TIMESTAMP_DEP) $$file $${file%.txt} workman.sh || \ exit; \ done $(SET_TIMESTAMP_DEP) version $(VERSION_DEPS) @@ -1114,30 +1130,29 @@ set-tzs-timestamp.out: $(TZS) # The zics below ensure that each data file can stand on its own. # We also do an all-files run to catch links to links. -check_public: $(VERSION_DEPS) - rm -fr public.dir - mkdir public.dir - ln $(VERSION_DEPS) public.dir - cd public.dir \ +public.ck: $(VERSION_DEPS) + rm -fr $@d + mkdir $@d + ln $(VERSION_DEPS) $@d + cd $@d \ && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' TZDIR='$(TZDIR)' ALL - for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \ - public.dir/vanguard.zi public.dir/main.zi \ - public.dir/rearguard.zi; \ + for i in $(TDATA_TO_CHECK) \ + tzdata.zi vanguard.zi main.zi rearguard.zi; \ do \ - public.dir/zic -v -d public.dir/zoneinfo $$i 2>&1 || exit; \ + $@d/zic -v -d $@d/zoneinfo $@d/$$i || exit; \ done - public.dir/zic -v -d public.dir/zoneinfo-all $(TDATA_TO_CHECK) + $@d/zic -v -d $@d/zoneinfo-all $(TDATA_TO_CHECK) : : Also check 'backzone' syntax. - rm public.dir/main.zi - cd public.dir && $(MAKE) PACKRATDATA=backzone main.zi - public.dir/zic -d public.dir/zoneinfo main.zi - rm public.dir/main.zi - cd public.dir && \ + rm $@d/main.zi + cd $@d && $(MAKE) PACKRATDATA=backzone main.zi + $@d/zic -d $@d/zoneinfo main.zi + rm $@d/main.zi + cd $@d && \ $(MAKE) PACKRATDATA=backzone PACKRATLIST=zone.tab main.zi - public.dir/zic -d public.dir/zoneinfo main.zi + $@d/zic -d $@d/zoneinfo main.zi : - rm -fr public.dir + rm -fr $@d touch $@ # Check that the code works under various alternative @@ -1145,46 +1160,47 @@ check_public: $(VERSION_DEPS) check_time_t_alternatives: $(TIME_T_ALTERNATIVES) $(TIME_T_ALTERNATIVES_TAIL): $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES): $(VERSION_DEPS) - rm -fr $@.dir - mkdir $@.dir - ln $(VERSION_DEPS) $@.dir + rm -fr $@d + mkdir $@d + ln $(VERSION_DEPS) $@d case $@ in \ - int*32_t) range=-2147483648,2147483648;; \ + *32_t*) range=-2147483648,2147483648;; \ u*) range=0,4294967296;; \ *) range=-4294967296,4294967296;; \ esac && \ - wd=`pwd` && \ - zones=`$(AWK) '/^[^#]/ { print $$3 }' /dev/null; then \ quiet_option='-q'; \ else \ quiet_option=''; \ fi && \ - diff $$quiet_option -r $(TIME_T_ALTERNATIVES_HEAD).dir/etc \ - $@.dir/etc && \ + diff $$quiet_option -r $(TIME_T_ALTERNATIVES_HEAD)d/etc \ + $@d/etc && \ diff $$quiet_option -r \ - $(TIME_T_ALTERNATIVES_HEAD).dir/usr/share \ - $@.dir/usr/share; \ + $(TIME_T_ALTERNATIVES_HEAD)d/usr/share \ + $@d/usr/share; \ } touch $@ @@ -1199,7 +1215,7 @@ ALL_ASC = $(TRADITIONAL_ASC) $(REARGUARD_ASC) \ tarballs rearguard_tarballs tailored_tarballs traditional_tarballs \ signatures rearguard_signatures traditional_signatures: \ version set-timestamps.out rearguard.zi vanguard.zi - VERSION=`cat version` && \ + read -r VERSION $@.out mv $@.out $@ tzdata$(VERSION).tar.gz: set-timestamps.out - LC_ALL=C && export LC_ALL && \ - tar $(TARFLAGS) -cf - $(TZDATA_DIST) | \ + $(SETUP_TAR) && \ + $$TAR -cf - $(TZDATA_DIST) | \ gzip $(GZIPFLAGS) >$@.out mv $@.out $@ @@ -1251,9 +1267,9 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. $(CREATE_EMPTY) $@.dir/pacificnew touch -mr version $@.dir/version - LC_ALL=C && export LC_ALL && \ + $(SETUP_TAR) && \ (cd $@.dir && \ - tar $(TARFLAGS) -cf - \ + $$TAR -cf - \ $(TZDATA_DIST) pacificnew | \ gzip $(GZIPFLAGS)) >$@.out mv $@.out $@ @@ -1269,9 +1285,14 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out rm -fr $@.dir mkdir $@.dir : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. + if test $(DATAFORM) = vanguard; then \ + pacificnew=; \ + else \ + pacificnew=pacificnew; \ + fi && \ cd $@.dir && \ $(CREATE_EMPTY) $(PRIMARY_YDATA) $(NDATA) backward \ - `test $(DATAFORM) = vanguard || echo pacificnew` + $$pacificnew (grep '^#' tzdata.zi && echo && cat $(DATAFORM).zi) \ >$@.dir/etcetera touch -mr tzdata.zi $@.dir/etcetera @@ -1291,9 +1312,9 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out test -f $@.dir/$$file || links="$$links $$file"; \ done && \ ln $$links $@.dir - LC_ALL=C && export LC_ALL && \ + $(SETUP_TAR) && \ (cd $@.dir && \ - tar $(TARFLAGS) -cf - * | gzip $(GZIPFLAGS)) >$@.out + $$TAR -cf - * | gzip $(GZIPFLAGS)) >$@.out mv $@.out $@ tzdb-$(VERSION).tar.lz: set-timestamps.out set-tzs-timestamp.out @@ -1301,8 +1322,8 @@ tzdb-$(VERSION).tar.lz: set-timestamps.out set-tzs-timestamp.out mkdir tzdb-$(VERSION) ln $(ENCHILADA) tzdb-$(VERSION) $(SET_TIMESTAMP) tzdb-$(VERSION) tzdb-$(VERSION)/* - LC_ALL=C && export LC_ALL && \ - tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out + $(SETUP_TAR) && \ + $$TAR -cf - tzdb-$(VERSION) | lzip -9 >$@.out mv $@.out $@ tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz @@ -1313,22 +1334,21 @@ $(ALL_ASC): $(GPG) --armor --detach-sign $? TYPECHECK_CFLAGS = $(CFLAGS) -DTYPECHECK -D__time_t_defined -D_TIME_T -typecheck: typecheck_long_long typecheck_unsigned -typecheck_long_long typecheck_unsigned: $(VERSION_DEPS) - rm -fr $@.dir - mkdir $@.dir - ln $(VERSION_DEPS) $@.dir - cd $@.dir && \ +typecheck: long-long.ck unsigned.ck +long-long.ck unsigned.ck: $(VERSION_DEPS) + rm -fr $@d + mkdir $@d + ln $(VERSION_DEPS) $@d + cd $@d && \ case $@ in \ - *_long_long) i="long long";; \ - *_unsigned ) i="unsigned" ;; \ + long-long.*) i="long long";; \ + unsigned.* ) i="unsigned" ;; \ esac && \ - typecheck_cflags='' && \ $(MAKE) \ CFLAGS="$(TYPECHECK_CFLAGS) \"-Dtime_t=$$i\"" \ - TOPDIR="`pwd`" \ *** 2471 LINES SKIPPED *** From nobody Sun Oct 6 11:07:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyP2m34z5XffS; Sun, 06 Oct 2024 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyP1p0Zz4rw9; Sun, 6 Oct 2024 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vq6UAL2YTyPpn+m7DdrKOrIFtWu4gQppr1+4aAMKQTQ=; b=WU1yC1H+DrBOQ8qnC2JD+8H9PH2u8GFYiRQpFmWrCgBOkqLYKu2CjsF9aA9cYGvRxdLJYn 4AFij/yJO2jlTg17UoKaDB5oWzqqRbPi0wWItBWrBIDs8B1dmZBD7OLdW+qeljYeHcrKfi GdmSBhcQxVdcq20AHei/maDbAVmdoecN8B7NXMh1KsIgpkUtaQ8QLIchK8PZRcfUiFBixF ipc2Uh7zLkyoNWR10P5iCIheSNa1aIi3em+e9O/x/9kTd4MUgc9ue64T77QjNlA5Jz6Gwv FlywHRqzM/1AtfTUKiM2sNwWwa9K/ukjCq8vPnPuwfZFqEZLMhIZPSx12xCdaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vq6UAL2YTyPpn+m7DdrKOrIFtWu4gQppr1+4aAMKQTQ=; b=sI2SB7ugW8dHgDDV5msNn+wx7SIUfKsx9j85EKR7MRfnlh2lcCdOIk4KbqwfVIl9y0bFCc 4xasfu8+6l+DOvDEUtWTCR+U8BFN8oc9dFshMpjkVA5RsbVxpzV+JuGJXKsgKtYzlateJW IGIWcPIWwz+lq9XATmSzQN1daGAPapr1rm+8BjKhs1QHh9+tY1a8DAEQz7BZmoOw77fVIi AYDDBH3DOuYy8PL+MF0PWrjPwmRoqMKZ9rdFJHdVLLAkS+a3GdD1rbRs06rBIPbCGp18Am QHZi/ve1VLXJDaeI4gMILxUdtoUHlalg36/v7fxCen423x541ZwBRnNUp67jkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212845; a=rsa-sha256; cv=none; b=irpbMDI5bTif4duU7ccEesxSsR7HqYHCaoHIKUIARJ+xeM4r3CWe0Ez/hkCrlQOwMgwrAz N2hkn9eCcrWtjYoc/Dq3i3sk/pi0TleRkD6Ua1EESQzgJ57ug7zmyVXdLDQFtvHEfRyEsL uGj0Q8sChlxyLmaSfior5z/GBcnOoxF5jTdCgftQRo7+u7IFONIGEIFUv39rb93bEP9dwk QKVC5RhbqX4LWoz/J6URA+fZIzEviHaS0cTKF6xPMiKiUzrF1QfuUsrQT6HdJa60V5dK33 XGZi7Agh/9UCYBbOeAK9MdHPaLrJ/n3s8iEc3+ijmzb0Hi83W03jG7AEDmh3eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyP0qs6z10d6; Sun, 6 Oct 2024 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7Pls039272; Sun, 6 Oct 2024 11:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7PIv039268; Sun, 6 Oct 2024 11:07:25 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:25 GMT Message-Id: <202410061107.496B7PIv039268@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: eefeb6ca68bf - stable/13 - locate.updatedb: Explicitly exit from trap code. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eefeb6ca68bf8ef42d4f98fc386288de5b2012c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eefeb6ca68bf8ef42d4f98fc386288de5b2012c5 commit eefeb6ca68bf8ef42d4f98fc386288de5b2012c5 Author: Dag-Erling Smørgrav AuthorDate: 2024-08-29 15:05:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:16:34 +0000 locate.updatedb: Explicitly exit from trap code. When a signal is trapped, the script continues after the trap code has run, unless the trap code explicitly exits. In the particular case of locate.updatedb, this is mostly harmless, except that the trap code is executed twice (once for the signal and once when we reach the end of the script), but it's still worth fixing. Furthermore, install the trap as soon as we've created the temporary directory, to minimize the window during which we can fail to clean up after ourselves if interrupted. While here, simplify the empty check at the end and make some minor style tweaks. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46475 (cherry picked from commit f62c1f3f8e91c78d402e1db4e518e4899a4ba2b9) --- usr.bin/locate/locate/updatedb.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh index e874700afdb8..846fd6dc0d7b 100644 --- a/usr.bin/locate/locate/updatedb.sh +++ b/usr.bin/locate/locate/updatedb.sh @@ -42,13 +42,14 @@ fi # The directory containing locate subprograms : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR : ${TMPDIR:=/tmp}; export TMPDIR -if ! TMPDIR=`mktemp -d $TMPDIR/locateXXXXXXXXXX`; then +if ! TMPDIR=$(mktemp -d $TMPDIR/locateXXXXXXXXXX); then exit 1 fi +tmp=$TMPDIR/_updatedb$$ +trap 'rc=$?; rm -f $tmp; rmdir $TMPDIR; trap - 0; exit $rc' 0 1 2 3 5 10 15 PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH - : ${mklocatedb:=locate.mklocatedb} # make locate database program : ${FCODES:=/var/db/locate.database} # the database : ${SEARCHPATHS="/"} # directories to be put in the database @@ -87,17 +88,13 @@ if [ -n "$PRUNEDIRS" ]; then done fi -tmp=$TMPDIR/_updatedb$$ -trap 'rm -f $tmp; rmdir $TMPDIR' 0 1 2 3 5 10 15 - # search locally if $find -s $SEARCHPATHS $excludes -or -print 2>/dev/null | $mklocatedb -presort > $tmp then - if [ -n "$($find $tmp -size -257c -print)" ]; then + if ! grep -aq / $tmp; then echo "updatedb: locate database $tmp is empty" >&2 exit 1 - else - cat $tmp > $FCODES # should be cp? fi + install $tmp $FCODES fi From nobody Sun Oct 6 11:07:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyQ5Dxrz5XgCs; Sun, 06 Oct 2024 11:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyQ2JxBz4sGB; Sun, 6 Oct 2024 11:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPYY4ZPbQEdwNJEmggVkawOQWMFvIp4G/vris0K7PcQ=; b=UaYgYnXMfEJMFbC3Z7m18FLtmEJsvknpCyjHyA/qjlNgevxmKEa+ZcHqJvdHCkxDqPnJRv PVykqWejSP0fM1ZdPNxbm9k3Paj2TUEItDDyj6PbYX9JEKwRtApu0ALibV1HqLFzkJZ09P 2W/HLcqzTBgIKwBCHk0qwWict259sqGfKvfUKa2nqLUKlElR+GCzYsYCQzxiPhbFWeRe6q gaizqpdL59nVcO0n3Lmw4AkkB+6f9LQqpMc48oj24VBuW1PLZ4WZBcZqvLRzWZjuRrAd40 GMPVX0QBWOO7IskQkUlRsafJoMvUwygD/V/CmaPhhVu7TwfKfLdpJ+LaITekjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPYY4ZPbQEdwNJEmggVkawOQWMFvIp4G/vris0K7PcQ=; b=aa54OtQQOV0eTu63E6wVRTXnw/imQduWlBGPbUlZ6r5R0z5ubjbrqXCWYCfnZxmXMHEr2u XstUxeWQ3u5FArbo/BcwpAwWnjIINMEngFell4ne+es3EGynNVvXFgRxUeaFAzcJiph302 3d4RBGDr/uMCJEvOHtnkTBA8W29AgBsa6wkJF4ynQddmadSMnBJ9b19q1Pgm+oz2DfB0HY /ESWwYURDLzz/IDmKaDRsHvDBqMcbMqStl9yQLgH8zukQz4wQMKfi48F79Pdx0qBt8GEKY CGyc6UF0oIMUI1wCmcMZ4UJzR+Ewk0wZnssTfDs6rIDNkgJTY/XhXN1PD8M3/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212846; a=rsa-sha256; cv=none; b=H0FJfqO2u8J5ww/9afNR9ZBAn9un5WLxVhVnfYPH+5PUzn4PT/7qKu5DhmbkZEva0girVB 7mRCo7Xh9AjdTUeDb5DIOClxFiv2jBIx6IIyCYH+mHTTizhtkeKldbasZ8NASlZCLa19EC FajonJgagC+CwjhVbuNoBD/6WtsxviF/nJQNRGBnOquBBYQtUUpGj1hg0Ngv8lktvJbwCI wNTM0jY1rs3fVFbXnOtLCBro6TDz/BeIUHGzN4fbOgSQd+EWzj4fuPsiAO38pM/EldS4V3 FTeDgQEzFzocC3HWKZIAPvb0c4LgOSOLQOJBNqaS1XADX0UeX5zQmfq3l50aqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyQ1t13z10PB; Sun, 6 Oct 2024 11:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7QER039374; Sun, 6 Oct 2024 11:07:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7QvW039371; Sun, 6 Oct 2024 11:07:26 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:26 GMT Message-Id: <202410061107.496B7QvW039371@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: 46d52461bf36 - stable/13 - locate.updatedb: Revert to using cat to copy the db. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46d52461bf36d941b817e52a637845142a90946a Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=46d52461bf36d941b817e52a637845142a90946a commit 46d52461bf36d941b817e52a637845142a90946a Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 15:54:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:16:34 +0000 locate.updatedb: Revert to using cat to copy the db. This script is usually run unprivileged, so install fails to create a temporary file while copying the finished database. Revert to using cat, which can overwrite the existing file as it is usually owned by the same user which is running the script. Fixes: f62c1f3f8e91 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46872 (cherry picked from commit 26bd374e72681860af4bf9d639308ad245949460) --- usr.bin/locate/locate/updatedb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh index 846fd6dc0d7b..01d993918e92 100644 --- a/usr.bin/locate/locate/updatedb.sh +++ b/usr.bin/locate/locate/updatedb.sh @@ -96,5 +96,5 @@ then echo "updatedb: locate database $tmp is empty" >&2 exit 1 fi - install $tmp $FCODES + cat $tmp >$FCODES fi From nobody Sun Oct 6 11:07:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyQ1Nw2z5XgCr; Sun, 06 Oct 2024 11:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyQ0nQLz4sP5; Sun, 6 Oct 2024 11:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yc2tfFgzpSsDzECEr68gT56Xv1Vu/dPPwaiYaU2QBPs=; b=fXOdxeziUyyhke9PY1FdRazrPKBJF/svUDI71yh9MoyTbWPlfHaIBRy0VxmD3qxOp7JN49 jFQWzgE/7HA4jjhaAYEgSFLINZlqsJBBq/hSMLVEeI67z/cWqI/dxgcQrOQKqFECON8elR VI/RQIZx1EAAxiCdL5bJPEpUgCEA+Hguam/CIKSzdHJV4x8OKDZSsElHnvjMivw+7GGEfD M3Ds4ngEo5CGbHmZ4evos6hLBm5bMbveIlUhNgH9tgvRnXaEmYXCAj/RAei+rK9yPiQa5u c2pdufuWHp0+A8z75uXvJBmXvdYpwdoTYzFBdAgvsmE6EftRYD5y+15AW0GQnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yc2tfFgzpSsDzECEr68gT56Xv1Vu/dPPwaiYaU2QBPs=; b=fChvxncHE3FAQMiwYuL6loLDayKeotpfPWc6UWjH7rk9t1BeNUJ5lNczQZqekzmudfvIOv NmtRvYiviLO7fJtBeWxD03qi59KbwPum9gT/HyF9NQQ16o4baiTM3aOQ5jXLYyriis+vMH UVZ7u3o9yln61p4YqULyQLSjHM/X7jsMDUeh09F3qF4IaL9qSu2Q+W6w8Nn9qYovCiBlgd FaUB4zq3rq0UMvcsX9vIv/z41GPluCGAAh/zDsuWdDtX3SAtMR8zXGcOuSQAyWU2kO9CSy 2ogBCnTZiVPBcWZWff4TtaSBe/WSjA8JzPvECWV0vE69n+MpZD8Q7vKEP/z5QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212846; a=rsa-sha256; cv=none; b=ifnyj65UWjEsIefjavuLbMsUffDZS+P+i78Ueq32dw9l6lA6EK914XLFrB1trbWgSLd29X 3YGz2aRCQTc930wDdeYSiPZ83B9YmvUpnw7eso5gFHAFSqhCpexvyHv2mSVjNf5elSl0w0 gUbD9NkDl/HiDJDkZg+iRFKXILK4lIpGS6wPzWhGGeczlLoCtOf+kNIiFEnUIe2imiaIEi TkHKa4Zev183qFSBcHsKDT3l1oNanrMMUlu99H1b5NM+us8QWW0MmYT+aZdsFMshAtPXMa J9aUFFX5BfE805EuoMh4GbmnIfRiOrn1O52gMfVD7Lr39Vc/U2b+/INEsbKEVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyQ0Nxcz10P9; Sun, 6 Oct 2024 11:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7PPY039317; Sun, 6 Oct 2024 11:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7PeK039314; Sun, 6 Oct 2024 11:07:25 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:25 GMT Message-Id: <202410061107.496B7PeK039314@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: 2403e6d5aa9e - stable/14 - printf(): Save errno earlier. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2403e6d5aa9e8ad71c472639af7e903f16ce3b27 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2403e6d5aa9e8ad71c472639af7e903f16ce3b27 commit 2403e6d5aa9e8ad71c472639af7e903f16ce3b27 Author: Dag-Erling Smørgrav AuthorDate: 2024-09-20 16:30:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:12:49 +0000 printf(): Save errno earlier. The manual page says %m is replaced with “the string representation of the error code stored in the errno variable at the beginning of the call”. However, we don't actually save `errno` until fairly late in `__vfprintf()`. Make sure it is saved before we do anything that might perturb `errno`. MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46718 (cherry picked from commit 74f1007fcc838501c74a633792c3f01833bf65e1) --- lib/libc/stdio/local.h | 2 +- lib/libc/stdio/snprintf.c | 14 ++++++++------ lib/libc/stdio/vasprintf.c | 5 +++-- lib/libc/stdio/vdprintf.c | 3 ++- lib/libc/stdio/vfprintf.c | 20 ++++++++++---------- lib/libc/stdio/vsnprintf.c | 7 ++++--- lib/libc/stdio/vsprintf.c | 10 ++++++---- 7 files changed, 34 insertions(+), 27 deletions(-) diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index a5c465bcdcba..cbc0d29ff823 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -80,7 +80,7 @@ extern int __swsetup(FILE *); extern int __sflags(const char *, int *); extern int __ungetc(int, FILE *); extern wint_t __ungetwc(wint_t, FILE *, locale_t); -extern int __vfprintf(FILE *, locale_t, const char *, __va_list); +extern int __vfprintf(FILE *, locale_t, int, const char *, __va_list); extern int __vfscanf(FILE *, const char *, __va_list); extern int __vfwprintf(FILE *, locale_t, const wchar_t *, __va_list); extern int __vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict, diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index 270219ac61f9..60602efaf5e9 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -51,10 +51,11 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; int snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...) { + FILE f = FAKE_FILE; + va_list ap; size_t on; + int serrno = errno; int ret; - va_list ap; - FILE f = FAKE_FILE; on = n; if (n != 0) @@ -68,7 +69,7 @@ snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - ret = __vfprintf(&f, __get_locale(), fmt, ap); + ret = __vfprintf(&f, __get_locale(), serrno, fmt, ap); if (on > 0) *f._p = '\0'; va_end(ap); @@ -78,10 +79,11 @@ int snprintf_l(char * __restrict str, size_t n, locale_t locale, char const * __restrict fmt, ...) { + FILE f = FAKE_FILE; + va_list ap; size_t on; + int serrno = errno; int ret; - va_list ap; - FILE f = FAKE_FILE; FIX_LOCALE(locale); on = n; @@ -96,7 +98,7 @@ snprintf_l(char * __restrict str, size_t n, locale_t locale, f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); if (on > 0) *f._p = '\0'; va_end(ap); diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c index c2c6170a2382..62d8f09fc954 100644 --- a/lib/libc/stdio/vasprintf.c +++ b/lib/libc/stdio/vasprintf.c @@ -34,9 +34,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include #include "xlocale_private.h" #include "local.h" @@ -44,6 +44,7 @@ int vasprintf_l(char **str, locale_t locale, const char *fmt, __va_list ap) { FILE f = FAKE_FILE; + int serrno = errno; int ret; FIX_LOCALE(locale); @@ -55,7 +56,7 @@ vasprintf_l(char **str, locale_t locale, const char *fmt, __va_list ap) return (-1); } f._bf._size = f._w = 127; /* Leave room for the NUL */ - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); if (ret < 0) { free(f._bf._base); *str = NULL; diff --git a/lib/libc/stdio/vdprintf.c b/lib/libc/stdio/vdprintf.c index 3cff85aa9dc5..39fb55420953 100644 --- a/lib/libc/stdio/vdprintf.c +++ b/lib/libc/stdio/vdprintf.c @@ -46,6 +46,7 @@ vdprintf(int fd, const char * __restrict fmt, va_list ap) { FILE f = FAKE_FILE; unsigned char buf[BUFSIZ]; + int serrno = errno; int ret; if (fd > SHRT_MAX) { @@ -62,7 +63,7 @@ vdprintf(int fd, const char * __restrict fmt, va_list ap) f._bf._base = buf; f._bf._size = sizeof(buf); - if ((ret = __vfprintf(&f, __get_locale(), fmt, ap)) < 0) + if ((ret = __vfprintf(&f, __get_locale(), serrno, fmt, ap)) < 0) return (ret); return (__fflush(&f) ? EOF : ret); diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 0ce9d6f37569..72178c31aa94 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -71,7 +71,8 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #include "printflocal.h" static int __sprint(FILE *, struct __suio *, locale_t); -static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0) +static int __sbprintf(FILE *, locale_t, int, const char *, va_list) + __printflike(4, 0) __noinline; static char *__wcsconv(wchar_t *, int); @@ -172,7 +173,7 @@ __sprint(FILE *fp, struct __suio *uio, locale_t locale) * worries about ungetc buffers and so forth. */ static int -__sbprintf(FILE *fp, locale_t locale, const char *fmt, va_list ap) +__sbprintf(FILE *fp, locale_t locale, int serrno, const char *fmt, va_list ap) { int ret; FILE fake = FAKE_FILE; @@ -196,7 +197,7 @@ __sbprintf(FILE *fp, locale_t locale, const char *fmt, va_list ap) fake._lbfsize = 0; /* not actually used, but Just In Case */ /* do the work, then copy any error status */ - ret = __vfprintf(&fake, locale, fmt, ap); + ret = __vfprintf(&fake, locale, serrno, fmt, ap); if (ret >= 0 && __fflush(&fake)) ret = EOF; if (fake._flags & __SERR) @@ -268,8 +269,9 @@ __wcsconv(wchar_t *wcsarg, int prec) */ int vfprintf_l(FILE * __restrict fp, locale_t locale, const char * __restrict fmt0, - va_list ap) + va_list ap) { + int serrno = errno; int ret; FIX_LOCALE(locale); @@ -277,9 +279,9 @@ vfprintf_l(FILE * __restrict fp, locale_t locale, const char * __restrict fmt0, /* optimise fprintf(stderr) (and other unbuffered Unix files) */ if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) && fp->_file >= 0) - ret = __sbprintf(fp, locale, fmt0, ap); + ret = __sbprintf(fp, locale, serrno, fmt0, ap); else - ret = __vfprintf(fp, locale, fmt0, ap); + ret = __vfprintf(fp, locale, serrno, fmt0, ap); FUNLOCKFILE_CANCELSAFE(); return (ret); } @@ -304,7 +306,7 @@ vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap) * Non-MT-safe version */ int -__vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) +__vfprintf(FILE *fp, locale_t locale, int serrno, const char *fmt0, va_list ap) { char *fmt; /* format string */ int ch; /* character from fmt */ @@ -314,7 +316,6 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) int ret; /* return value accumulator */ int width; /* width from format (%8d), or 0 */ int prec; /* precision from format; <0 for N/A */ - int saved_errno; int error; char errnomsg[NL_TEXTMAX]; char sign; /* sign prefix (' ', '+', '-', or \0) */ @@ -466,7 +467,6 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) savserr = fp->_flags & __SERR; fp->_flags &= ~__SERR; - saved_errno = errno; convbuf = NULL; fmt = (char *)fmt0; argtable = NULL; @@ -834,7 +834,7 @@ fp_common: break; #endif /* !NO_FLOATING_POINT */ case 'm': - error = __strerror_rl(saved_errno, errnomsg, + error = __strerror_rl(serrno, errnomsg, sizeof(errnomsg), locale); cp = error == 0 ? errnomsg : ""; size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index c80f70924a2a..d851feb4207e 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -48,12 +48,13 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; int vsnprintf_l(char * __restrict str, size_t n, locale_t locale, - const char * __restrict fmt, __va_list ap) + const char * __restrict fmt, __va_list ap) { + FILE f = FAKE_FILE; size_t on; + int serrno = errno; int ret; char dummy[2]; - FILE f = FAKE_FILE; FIX_LOCALE(locale); on = n; @@ -74,7 +75,7 @@ vsnprintf_l(char * __restrict str, size_t n, locale_t locale, f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); if (on > 0) *f._p = '\0'; return (ret); diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c index f23821360b47..b39865a40e82 100644 --- a/lib/libc/stdio/vsprintf.c +++ b/lib/libc/stdio/vsprintf.c @@ -40,23 +40,25 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include +#include #include +#include #include "local.h" #include "xlocale_private.h" int vsprintf_l(char * __restrict str, locale_t locale, - const char * __restrict fmt, __va_list ap) + const char * __restrict fmt, __va_list ap) { - int ret; FILE f = FAKE_FILE; + int serrno = errno; + int ret; FIX_LOCALE(locale); f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); *f._p = 0; return (ret); } From nobody Sun Oct 6 11:07:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyR40yrz5XgHx; Sun, 06 Oct 2024 11:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyR2zF7z4s2h; Sun, 6 Oct 2024 11:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4XtunCGJZFv53baIS39V6kdiSrpXuDhWQt+qb7SWYY=; b=DbuSoGVEeNe/9LrvxkNwH7wzIgSqdKJtG8TFKXF0+8KkWLwmUuEwUOb1cbxfsnn8Ppmo+G VHPKKkKqmzXp6FjRGamTxxr34BQJ14msV30pl920Y18vavpoz3Jwokpf4Y5h+S3c78IuOB VZyk0EXlnLJiuszfw/6/hNES/aE4onDc06rDoG3ooH9SeWBkKWeA2wRW04+EOZd+Uv+JqW uV+zeumqHuYlrioQhKRBlAOosAFBIOi+uXzA9yZKqlPLTfUQ7zmLplfVijYenz6+La0CWs J1nO9xeFHywXjEDiFEwg105DVwBRpCK5C4gRBwsWopw4DJZmuhPptu/jcOhcKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4XtunCGJZFv53baIS39V6kdiSrpXuDhWQt+qb7SWYY=; b=BCuorr6r4YqFtRHsHBfRtGq/cMUwx7rzjPVm1Ipz8M5t0FanfALk042UD+GylZ5rPvKeVv W+Ga9c0T4xR3Y5wpvQM2DuxGOKb/kaDBhbn3txCC5i1Pk0Ebw7ZLLIO/KLr5qWTus8b5Pk DmTx/tJhuCa4rLPqFouYqhMUInXdMqg30SALYsctHiY9t5IOps5lG3h7pK58Zl75rUoP7C QDOmbdOf65r9QrC6wO53n6EOikPmPOr8V1RY1ZaEqixkDp2vc3fjDUQ0iBgHJnEnbklm9x nv5y8L0uzGMCqSVpV81+kSF0ur4Qa69uFmkX2SFyXGzt7eZwzjoAvByR47p3yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212847; a=rsa-sha256; cv=none; b=pG4lQUuo5utCjbj+urm/eEXN/yk8RZyawCF6xGUKq8Tri17tl6/QvUncoOUZx+3eZlf9p5 VyrFfJzQsXdCCYwr/I0LxfKtr9npm5FGlt5o3+cQXOg0zNjidK+lZMSooad00oD5KJLQFs bwBoaNGZ7i7yjbBZjivg4X0r2S3lz7jLb3NvBlUEdbSyRlDKyR/7Sp6r2Jt2d9wDFyhKfM dkiL0JCWV5xt1RgoVwhDKe4XSyKry0QT8j4LFG0XsgE425wXjjqpDVWRQBYn6yuyabIZqJ l9EczivFj23hTod88hJR4xaeS0hX8MGxnfs74iAXq1OFlwAR4HiEF4mJ199vVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyR2S40z10PC; Sun, 6 Oct 2024 11:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7Rmc039455; Sun, 6 Oct 2024 11:07:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7RZb039452; Sun, 6 Oct 2024 11:07:27 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:27 GMT Message-Id: <202410061107.496B7RZb039452@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: 036ce2460cbc - stable/13 - Update tzcode to 2024b. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 036ce2460cbc734af3e8f5a65e5dc1f9039fd138 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=036ce2460cbc734af3e8f5a65e5dc1f9039fd138 commit 036ce2460cbc734af3e8f5a65e5dc1f9039fd138 Author: Dag-Erling Smørgrav AuthorDate: 2024-09-07 13:46:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:16:34 +0000 Update tzcode to 2024b. MFC after: 3 weeks Sponsored by: Klara, Inc. Reviewed by: philip Differential Revision: https://reviews.freebsd.org/D46565 (cherry picked from commit a979394afeb5c20fc58c5f5b005d51eb8f92f666) --- contrib/tzcode/CONTRIBUTING | 18 +- contrib/tzcode/Makefile | 412 +++++++++++++++++++++++-------------------- contrib/tzcode/NEWS | 124 ++++++++++++- contrib/tzcode/asctime.c | 19 +- contrib/tzcode/localtime.c | 87 ++------- contrib/tzcode/newctime.3 | 102 ++++++----- contrib/tzcode/newstrftime.3 | 30 ++-- contrib/tzcode/newtzset.3 | 66 +++++-- contrib/tzcode/private.h | 114 +++++++----- contrib/tzcode/theory.html | 214 ++++++++++++++-------- contrib/tzcode/tz-art.html | 5 + contrib/tzcode/tz-link.html | 113 +++++++----- contrib/tzcode/tzfile.5 | 38 ++-- contrib/tzcode/tzfile.h | 8 +- contrib/tzcode/tzselect.ksh | 125 ++++++------- contrib/tzcode/version | 2 +- contrib/tzcode/workman.sh | 3 +- contrib/tzcode/zdump.c | 10 +- contrib/tzcode/zic.8 | 52 +++--- contrib/tzcode/zic.c | 31 ++-- 20 files changed, 926 insertions(+), 647 deletions(-) diff --git a/contrib/tzcode/CONTRIBUTING b/contrib/tzcode/CONTRIBUTING index 6d800e4c03a3..f6edbd3be7d3 100644 --- a/contrib/tzcode/CONTRIBUTING +++ b/contrib/tzcode/CONTRIBUTING @@ -23,10 +23,10 @@ such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" . It is also good to browse the mailing list archives - for examples of patches that tend -to work well. Additions to data should contain commentary citing -reliable sources as justification. Citations should use "https:" URLs -if available. + +for examples of patches that tend to work well. +Changes should contain commentary citing reliable sources. +Citations should use "https:" URLs if available. For changes that fix sensitive security-related bugs, please see the distribution's 'SECURITY' file. @@ -63,12 +63,16 @@ If you use Git the following workflow may be helpful: * Edit source files. Include commentary that justifies the changes by citing reliable sources. - * Debug the changes, e.g.: + * Debug the changes locally, e.g.: - make check - make install + make TOPDIR=$PWD/tz clean check install ./zdump -v America/Los_Angeles + Although builds assume only basic POSIX, they use extra features + if available. 'make check' accesses validator.w3.org unless you + lack 'curl' or use 'make CURL=:'. If you have the latest GCC, + "make CFLAGS='$(GCC_DEBUG_FLAGS)'" does extra checking. + * For each separable change, commit it in the new branch, e.g.: git add northamerica diff --git a/contrib/tzcode/Makefile b/contrib/tzcode/Makefile index d48354c72df4..0087b4596515 100644 --- a/contrib/tzcode/Makefile +++ b/contrib/tzcode/Makefile @@ -3,17 +3,17 @@ # 2009-05-17 by Arthur David Olson. # Request POSIX conformance; this must be the first non-comment line. .POSIX: -# On older platforms you may need to scrounge for a POSIX-conforming 'make'. -# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or -# /usr/xpg4/bin/make, not /usr/ccs/bin/make. +# On older platforms you may need to scrounge for POSIX conformance. +# For example, on Solaris 10 (2005) with Sun Studio 12 aka Sun C 5.9 (2007), +# use 'PATH=/usr/xpg4/bin:$PATH make CC=c99'. # To affect how this Makefile works, you can run a shell script like this: # # #!/bin/sh -# make CC='gcc -std=gnu11' "$@" +# make CC='gcc -std=gnu23' "$@" # -# This example script is appropriate for a pre-2017 GNU/Linux system -# where a non-default setting is needed to support this package's use of C99. +# This example script is appropriate for a circa 2024 GNU/Linux system +# where a non-default setting enables this package's optional use of C23. # # Alternatively, you can simply edit this Makefile to tailor the following # macro definitions. @@ -53,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ +# The POSIXRULES macro controls interpretation of POSIX-like TZ # settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. # Any other value for POSIXRULES is obsolete and should not be relied on, as: @@ -132,8 +132,9 @@ LIBDIR = $(TOPDIR)/$(USRDIR)/lib # Types to try, as an alternative to time_t. TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL) -TIME_T_ALTERNATIVES_HEAD = int_least64_t -TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t +TIME_T_ALTERNATIVES_HEAD = int_least64_t.ck +TIME_T_ALTERNATIVES_TAIL = int_least32_t.ck uint_least32_t.ck \ + uint_least64_t.ck # What kind of TZif data files to generate. (TZif is the binary time # zone data format that zic generates; see Internet RFC 8536.) @@ -219,6 +220,7 @@ LDLIBS= # than what POSIX specifies, assuming local time is UT. # For example, N is 252460800 on AmigaOS. # -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# on POSIX platforms predating POSIX.1-2024 # -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DECL_TIMEGM=0 if does not declare timegm # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) @@ -229,7 +231,7 @@ LDLIBS= # where LDLIBS also needs to contain -lintl on some hosts; # -DHAVE_GETTEXT=0 to avoid using gettext # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares -# ctime_r and asctime_r incompatibly with the POSIX standard +# ctime_r and asctime_r incompatibly with POSIX.1-2017 and earlier # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). # -DHAVE_INTTYPES_H=0 if does not work*+ # -DHAVE_LINK=0 if your system lacks a link function @@ -261,8 +263,11 @@ LDLIBS= # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t -# -DSUPPORT_C89 if the tzcode library should support C89 callers+ -# However, this might trigger latent bugs in C99-or-later callers. +# -DSUPPORT_C89=0 if the tzcode library should not support C89 callers +# Although -DSUPPORT_C89=0 might work around latent bugs in callers, +# it does not conform to POSIX. +# -DSUPPORT_POSIX2008 if the library should support older POSIX callers+ +# However, this might cause problems in POSIX.1-2024-or-later callers. # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -274,7 +279,7 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions for POSIX.1-2017-style TZ strings lacking them, +# DST transitions for proleptic format TZ strings lacking them, # in the usual case where POSIXRULES is '-'. If not specified, # TZDEFRULESTRING defaults to US rules for future DST transitions. # This mishandles some past timestamps, as US DST rules have changed. @@ -302,23 +307,25 @@ LDLIBS= # # * Options marked "*" can be omitted if your compiler is C23 compatible. # * Options marked "+" are obsolescent and are planned to be removed -# once the code assumes C99 or later, say in the year 2029. +# once the code assumes C99 or later (say in the year 2029) +# and POSIX.1-2024 or later (say in the year 2034). # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ -fsanitize=undefined -fsanitize-address-use-after-scope \ -fsanitize-undefined-trap-on-error -fstack-protector # Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow. -GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 \ $(GCC_INSTRUMENT) \ -Wall -Wextra \ -Walloc-size-larger-than=100000 -Warray-bounds=2 \ -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \ -Wdeclaration-after-statement -Wdouble-promotion \ - -Wduplicated-branches -Wduplicated-cond \ + -Wduplicated-branches -Wduplicated-cond -Wflex-array-member-not-at-end \ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \ - -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wmissing-declarations -Wmissing-prototypes \ + -Wmissing-variable-declarations -Wnested-externs \ -Wnull-dereference \ -Wold-style-definition -Woverlength-strings -Wpointer-arith \ -Wshadow -Wshift-overflow=2 -Wstrict-overflow \ @@ -327,10 +334,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ -Wsuggest-attribute=const -Wsuggest-attribute=format \ -Wsuggest-attribute=malloc \ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ - -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \ + -Wtrampolines -Wundef -Wunused-macros -Wuse-after-free=3 \ -Wvariadic-macros -Wvla -Wwrite-strings \ - -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ - -Wno-type-limits + -Wno-format-nonliteral -Wno-sign-compare # # If your system has a "GMT offset" field in its "struct tm"s # (or if you decide to add such a field in your system's "time.h" file), @@ -341,9 +347,8 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone # and define NO_TM_ZONE to suppress any guessing. -# Although these two fields are not required by POSIX.1-2017, -# POSIX 202x/D4 requires them and they are widely available -# on GNU/Linux and BSD systems. +# Although POSIX.1-2024 requires these fields and they are widely available +# on GNU/Linux and BSD systems, some older systems lack them. # # The next batch of options control support for external variables # exported by tzcode. In practice these variables are less useful @@ -353,7 +358,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DHAVE_TZNAME=0 # do not support "tzname" # # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library # # -DHAVE_TZNAME=2 # support and define "tzname" -# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. +# # to the "CFLAGS=" line. Although "tzname" is required by POSIX.1-1988 +# # and later, its contents are unspecified if you use a geographical TZ +# # and the variable is planned to be removed in a future POSIX edition. # # If not defined, the code attempts to guess HAVE_TZNAME from other macros. # # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause # # crashes when combined with some platforms' standard libraries, @@ -364,7 +371,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DUSG_COMPAT=1 # support, and variables are defined by system library # # -DUSG_COMPAT=2 # support and define variables # # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix -# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). +# # Systems Group code and are required by POSIX.1-2008 and later (with XSI), +# # although their contents are unspecified if you use a geographical TZ +# # and the variables are planned to be removed in a future edition of POSIX. # # If not defined, the code attempts to guess USG_COMPAT from other macros. # # # # To support the external variable "altzone", add @@ -428,18 +437,13 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # The name of a POSIX-like library archiver, its flags, C compiler, # linker flags, and 'make' utility. Ordinarily the defaults suffice. -# The commented-out values are the defaults specified by POSIX.1-202x/D4. +# The commented-out values are the defaults specified by POSIX.1-2024. #AR = ar #ARFLAGS = -rv #CC = c17 #LDFLAGS = #MAKE = make -# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in -# submake command lines. The default is no leap seconds. - -LEAPSECONDS= - # Where to fetch leap-seconds.list from. leaplist_URI = \ https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list @@ -461,7 +465,7 @@ ZFLAGS= # How to use zic to install TZif files. -ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) +ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' # The name of a POSIX-compliant 'awk' on your system. # mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. @@ -480,6 +484,7 @@ KSHELL= /bin/bash # Name of curl , used for HTML validation # and to fetch leap-seconds.list from upstream. +# Set CURL=: to disable use of the Internet. CURL= curl # Name of GNU Privacy Guard , used to sign distributions. @@ -533,21 +538,28 @@ OK_LINE= '^'$(OK_CHAR)'*$$' # Flags to give 'tar' when making a distribution. # Try to use flags appropriate for GNU tar. -GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \ +GNUTARFLAGS= --format=pax --pax-option=delete=atime,delete=ctime \ --numeric-owner --owner=0 --group=0 \ --mode=go+u,go-w --sort=name -TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \ - then echo $(GNUTARFLAGS); \ - else :; \ - fi` +SETUP_TAR= \ + export LC_ALL=C && \ + if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; then \ + TAR='tar $(GNUTARFLAGS)'; \ + else \ + TAR=tar; \ + fi # Flags to give 'gzip' when making a distribution. GZIPFLAGS= -9n # When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported. # This makes it easier to see which Zone has been affected. -DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \ - || echo ' -F^TZ=') +SETUP_DIFF_TZS = \ + if diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1; then \ + DIFF_TZS='diff -u -F^TZ='; \ + else \ + DIFF_TZS='diff -u'; \ + fi # ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. RANLIB= : @@ -561,8 +573,8 @@ RANLIB= : TZCOBJS= zic.o -TZDOBJS= zdump.o localtime.o asctime.o strftime.o -DATEOBJS= date.o localtime.o strftime.o asctime.o +TZDOBJS= zdump.o localtime.o strftime.o +DATEOBJS= date.o localtime.o strftime.o LIBSRCS= localtime.c asctime.c difftime.c strftime.c LIBOBJS= localtime.o asctime.o difftime.o strftime.o HEADERS= tzfile.h private.h @@ -579,8 +591,7 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \ COMMON= calendars CONTRIBUTING LICENSE Makefile \ NEWS README SECURITY theory.html version WEB_PAGES= tz-art.html tz-how-to.html tz-link.html -CHECK_WEB_PAGES=check_theory.html check_tz-art.html \ - check_tz-how-to.html check_tz-link.html +CHECK_WEB_PAGES=theory.ck tz-art.ck tz-how-to.ck tz-link.ck DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica @@ -641,8 +652,7 @@ install: all $(DATA) $(REDO) $(MANS) '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ '$(DESTDIR)$(MANDIR)/man8' $(ZIC_INSTALL) -l $(LOCALTIME) \ - `case '$(POSIXRULES)' in ?*) echo '-p';; esac \ - ` $(POSIXRULES) \ + -p $(POSIXRULES) \ -t '$(DESTDIR)$(TZDEFAULT)' cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' cp tzselect '$(DESTDIR)$(BINDIR)/.' @@ -665,10 +675,10 @@ INSTALL: ALL install date.1 # and append "-dirty" if the contents do not already end in "-dirty". version: $(VERSION_DEPS) { (type git) >/dev/null 2>&1 && \ - V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty` || \ - if test '$(VERSION)' = unknown && V=`cat $@`; then \ - case $$V in *-dirty);; *) V=$$V-dirty;; esac; \ + V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty) || \ + if test '$(VERSION)' = unknown && read -r V <$@; then \ + V=$${V%-dirty}-dirty; \ else \ V='$(VERSION)'; \ fi; } && \ @@ -678,7 +688,7 @@ version: $(VERSION_DEPS) # These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST. vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) $(AWK) \ - -v DATAFORM=`expr $@ : '\(.*\).zi'` \ + -v DATAFORM=$(@:.zi=) \ -v PACKRATDATA='$(PACKRATDATA)' \ -v PACKRATLIST='$(PACKRATLIST)' \ -f ziguard.awk \ @@ -687,7 +697,7 @@ vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) # This file has a version comment that attempts to capture any tailoring # via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO. tzdata.zi: $(DATAFORM).zi version zishrink.awk - version=`sed 1q version` && \ + read -r version $@ + ./zdump -i $(TZS_CUTOFF_FLAG) "$$PWD/$(@:.zd=)" >$@ TZS_NEW_DEPS = tzdata.zi zdump zic $(TZS_NEW): $(TZS_NEW_DEPS) @@ -812,20 +815,19 @@ $(TZS_NEW): $(TZS_NEW_DEPS) $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ tzdata.zi | LC_ALL=C sort >$@.out - wd=`pwd` && \ - x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ + x=$$($(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ tzdata.zi \ - | LC_ALL=C sort -t . -k 2,2` && \ + | LC_ALL=C sort -t . -k 2,2) && \ set x $$x && \ shift && \ ZDS=$$* && \ - $(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ + $(MAKE) TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ ZDS="$$ZDS" $$ZDS && \ sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out rm -fr tzs$(TZS_YEAR).dir mv $@.out $@ -# If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the +# If $(TZS) exists but 'make tzs.ck' fails, a maintainer should inspect the # failed output and fix the inconsistency, perhaps by running 'make force_tzs'. $(TZS): touch $@ @@ -842,7 +844,7 @@ date: $(DATEOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS) tzselect: tzselect.ksh version - VERSION=`cat version` && sed \ + read -r VERSION /dev/null 2>&1 \ - || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; } + || { export LC_ALL='$(UTF8_LOCALE)'; false; }; } -check_character_set: $(ENCHILADA) +character-set.ck: $(ENCHILADA) $(UTF8_LOCALE_MISSING) || { \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ @@ -882,48 +884,55 @@ check_character_set: $(ENCHILADA) } touch $@ -check_white_space: $(ENCHILADA) +white-space.ck: $(ENCHILADA) $(UTF8_LOCALE_MISSING) || { \ - patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ + enchilada='$(ENCHILADA)' && \ + patfmt=' \t|[\f\r\v]' && pat=$$(printf "$$patfmt\\n") && \ ! grep -En "$$pat|[$s]\$$" \ - $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list); \ + $${enchilada%leap-seconds.list*} \ + $${enchilada#*leap-seconds.list}; \ } touch $@ PRECEDES_FILE_NAME = ^(Zone|Link[$s]+[^$s]+)[$s]+ FILE_NAME_COMPONENT_TOO_LONG = $(PRECEDES_FILE_NAME)[^$s]*[^/$s]{15} -check_name_lengths: $(TDATA_TO_CHECK) backzone - ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \ +name-lengths.ck: $(TDATA_TO_CHECK) backzone + :;! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \ $(TDATA_TO_CHECK) backzone touch $@ +mainguard.ck: main.zi + test '$(PACKRATLIST)' || \ + cat $(TDATA) $(PACKRATDATA) | diff -u - main.zi + touch $@ + PRECEDES_STDOFF = ^(Zone[$s]+[^$s]+)?[$s]+ STDOFF = [-+]?[0-9:.]+ RULELESS_SAVE = (-|$(STDOFF)[sd]?) RULELESS_SLASHED_ABBRS = \ $(PRECEDES_STDOFF)$(STDOFF)[$s]+$(RULELESS_SAVE)[$s]+[^$s]*/ -check_slashed_abbrs: $(TDATA_TO_CHECK) - ! grep -En '$(RULELESS_SLASHED_ABBRS)' $(TDATA_TO_CHECK) +slashed-abbrs.ck: $(TDATA_TO_CHECK) + :;! grep -En '$(RULELESS_SLASHED_ABBRS)' $(TDATA_TO_CHECK) touch $@ CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } -check_sorted: backward backzone +sorted.ck: backward backzone $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ backward | LC_ALL=C sort -cu - $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu + $(AWK) '/^Zone.*\// {print $$2}' backzone | LC_ALL=C sort -cu touch $@ -check_back: checklinks.awk $(TDATA_TO_CHECK) +back.ck: checklinks.awk $(TDATA_TO_CHECK) $(AWK) \ -v DATAFORM=$(DATAFORM) \ -v backcheck=backward \ -f checklinks.awk $(TDATA_TO_CHECK) touch $@ -check_links: checklinks.awk tzdata.zi +links.ck: checklinks.awk tzdata.zi $(AWK) \ -v DATAFORM=$(DATAFORM) \ -f checklinks.awk tzdata.zi @@ -932,26 +941,36 @@ check_links: checklinks.awk tzdata.zi # Check timestamps from now through 28 years from now, to make sure # that zonenow.tab contains all sequences of planned timestamps, # without any duplicate sequences. In theory this might require -# 2800 years but that would take a long time to check. -CHECK_NOW_TIMESTAMP = `./date +%s` +# 2800+ years but that would take a long time to check. +CHECK_NOW_TIMESTAMP = $$(./date +%s) CHECK_NOW_FUTURE_YEARS = 28 -CHECK_NOW_FUTURE_SECS = $(CHECK_NOW_FUTURE_YEARS) '*' 366 '*' 24 '*' 60 '*' 60 -check_now: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab - rm -fr $@.dir - mkdir $@.dir - ./zic -d $@.dir tzdata.zi +CHECK_NOW_FUTURE_SECS = $(CHECK_NOW_FUTURE_YEARS) * 366 * 24 * 60 * 60 +now.ck: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab + rm -fr $@d + mkdir $@d + ./zic -d $@d tzdata.zi now=$(CHECK_NOW_TIMESTAMP) && \ - future=`expr $(CHECK_NOW_FUTURE_SECS) + $$now` && \ + future=$$(($(CHECK_NOW_FUTURE_SECS) + $$now)) && \ ./zdump -i -t $$now,$$future \ - $$(find $$PWD/$@.dir/????*/ -type f) \ - >$@.dir/zdump.tab + $$(find "$$PWD/$@d"/????*/ -type f) \ + >$@d/zdump-now.tab && \ + ./zdump -i -t 0,$$future \ + $$(find "$$PWD/$@d" -name Etc -prune \ + -o -type f ! -name '*.tab' -print) \ + >$@d/zdump-1970.tab $(AWK) \ - -v zdump_table=$@.dir/zdump.tab \ + -v zdump_table=$@d/zdump-now.tab \ -f checknow.awk zonenow.tab - rm -fr $@.dir + $(AWK) \ + 'BEGIN {print "-\t-\tUTC"} /^Zone/ {print "-\t-\t" $$2}' \ + $(PRIMARY_YDATA) backward factory | \ + $(AWK) \ + -v zdump_table=$@d/zdump-1970.tab \ + -f checknow.awk + rm -fr $@d touch $@ -check_tables: checktab.awk $(YDATA) backward zone.tab zone1970.tab +tables.ck: checktab.awk $(YDATA) backward zone.tab zone1970.tab for tab in $(ZONETABLES); do \ test "$$tab" = zone.tab && links='$(BACKWARD)' || links=''; \ $(AWK) -f checktab.awk -v zone_table=$$tab $(YDATA) $$links \ @@ -959,26 +978,24 @@ check_tables: checktab.awk $(YDATA) backward zone.tab zone1970.tab done touch $@ -check_tzs: $(TZS) $(TZS_NEW) +tzs.ck: $(TZS) $(TZS_NEW) if test -s $(TZS); then \ - $(DIFF_TZS) $(TZS) $(TZS_NEW); \ + $(SETUP_DIFF_TZS) && $$DIFF_TZS $(TZS) $(TZS_NEW); \ else \ cp $(TZS_NEW) $(TZS); \ fi touch $@ check_web: $(CHECK_WEB_PAGES) -check_theory.html: theory.html -check_tz-art.html: tz-art.html -check_tz-how-to.html: tz-how-to.html -check_tz-link.html: tz-link.html -check_theory.html check_tz-art.html check_tz-how-to.html check_tz-link.html: - $(CURL) -sS --url https://validator.w3.org/nu/ -F out=gnu \ - -F file=@$$(expr $@ : 'check_\(.*\)') -o $@.out && \ +.SUFFIXES: .ck .html +.html.ck: + { ! ($(CURL) --version) >/dev/null 2>&1 || \ + $(CURL) -sS --url https://validator.w3.org/nu/ -F out=gnu \ + -F file=@$<; } >$@.out && \ test ! -s $@.out || { cat $@.out; exit 1; } mv $@.out $@ -check_ziguard: rearguard.zi vanguard.zi ziguard.awk +ziguard.ck: rearguard.zi vanguard.zi ziguard.awk $(AWK) -v DATAFORM=rearguard -f ziguard.awk vanguard.zi | \ diff -u rearguard.zi - $(AWK) -v DATAFORM=vanguard -f ziguard.awk rearguard.zi | \ @@ -987,36 +1004,35 @@ check_ziguard: rearguard.zi vanguard.zi ziguard.awk # Check that zishrink.awk does not alter the data, and that ziguard.awk # preserves main-format data. -check_zishrink: check_zishrink_posix check_zishrink_right -check_zishrink_posix check_zishrink_right: \ +check_zishrink: zishrink-posix.ck zishrink-right.ck +zishrink-posix.ck zishrink-right.ck: \ zic leapseconds $(PACKRATDATA) $(PACKRATLIST) \ $(TDATA) $(DATAFORM).zi tzdata.zi - rm -fr $@.dir $@-t.dir $@-shrunk.dir - mkdir $@.dir $@-t.dir $@-shrunk.dir + rm -fr $@d t-$@d shrunk-$@d + mkdir $@d t-$@d shrunk-$@d case $@ in \ - *_right) leap='-L leapseconds';; \ + *right*) leap='-L leapseconds';; \ *) leap=;; \ esac && \ - $(ZIC) $$leap -d $@.dir $(DATAFORM).zi && \ - $(ZIC) $$leap -d $@-shrunk.dir tzdata.zi && \ + $(ZIC) $$leap -d $@d $(DATAFORM).zi && \ + $(ZIC) $$leap -d shrunk-$@d tzdata.zi && \ case $(DATAFORM),$(PACKRATLIST) in \ main,) \ - $(ZIC) $$leap -d $@-t.dir $(TDATA) && \ + $(ZIC) $$leap -d t-$@d $(TDATA) && \ $(AWK) '/^Rule/' $(TDATA) | \ - $(ZIC) $$leap -d $@-t.dir - $(PACKRATDATA) && \ - diff -r $@.dir $@-t.dir;; \ + $(ZIC) $$leap -d t-$@d - $(PACKRATDATA) && \ + diff -r $@d t-$@d;; \ esac - diff -r $@.dir $@-shrunk.dir - rm -fr $@.dir $@-t.dir $@-shrunk.dir + diff -r $@d shrunk-$@d + rm -fr $@d t-$@d shrunk-$@d touch $@ clean_misc: - rm -fr check_*.dir typecheck_*.dir - rm -f *.o *.out $(TIME_T_ALTERNATIVES) \ - check_* core typecheck_* \ + rm -fr *.ckd *.dir + rm -f *.ck *.core *.o *.out core core.* \ date tzdir.h tzselect version.h zdump zic libtz.a clean: clean_misc - rm -fr *.dir tzdb-*/ + rm -fr tzdb-*/ rm -f *.zi $(TZS_NEW) maintainer-clean: clean @@ -1027,7 +1043,7 @@ maintainer-clean: clean names: @echo $(ENCHILADA) -public: check check_public $(CHECK_TIME_T_ALTERNATIVES) \ +public: check public.ck $(CHECK_TIME_T_ALTERNATIVES) \ tarballs signatures date.1.txt: date.1 @@ -1041,7 +1057,7 @@ zdump.8.txt: zdump.8 zic.8.txt: zic.8 $(MANTXTS): workman.sh - LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out + LC_ALL=C sh workman.sh $(@:.txt=) >$@.out mv $@.out $@ # Set file timestamps deterministically if possible, @@ -1054,13 +1070,13 @@ SET_TIMESTAMP_N = sh -c '\ n=$$0 dest=$$1; shift; \ <"$$dest" && \ if test $$n != 0 && \ - lsout=`ls -nt --time-style="+%s" "$$@" 2>/dev/null`; then \ + lsout=$$(ls -nt --time-style="+%s" "$$@" 2>/dev/null); then \ set x $$lsout && \ - timestamp=`expr $$7 + $$n` && \ + timestamp=$$(($$7 + $$n)) && \ echo "+ touch -md @$$timestamp $$dest" && \ touch -md @$$timestamp "$$dest"; \ else \ - newest=`ls -t "$$@" | sed 1q` && \ + newest=$$(ls -t "$$@" | sed 1q) && \ echo "+ touch -mr $$newest $$dest" && \ touch -mr "$$newest" "$$dest"; \ fi' @@ -1083,15 +1099,15 @@ SET_TIMESTAMP_DEP = $(SET_TIMESTAMP_N) 1 set-timestamps.out: $(EIGHT_YARDS) rm -f $@ if (type git) >/dev/null 2>&1 && \ - files=`git ls-files $(EIGHT_YARDS)` && \ + files=$$(git ls-files $(EIGHT_YARDS)) && \ touch -md @1 test.out; then \ rm -f test.out && \ for file in $$files; do \ if git diff --quiet $$file; then \ - time=`TZ=UTC0 git log -1 \ + time=$$(TZ=UTC0 git log -1 \ --format='tformat:%cd' \ --date='format:%Y-%m-%dT%H:%M:%SZ' \ - $$file` && \ + $$file) && \ echo "+ touch -md $$time $$file" && \ touch -md $$time $$file; \ else \ @@ -1100,8 +1116,8 @@ set-timestamps.out: $(EIGHT_YARDS) done; \ fi $(SET_TIMESTAMP_DEP) leapseconds $(LEAP_DEPS) - for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \ - $(SET_TIMESTAMP_DEP) $$file.txt $$file workman.sh || \ + for file in $(MANTXTS); do \ + $(SET_TIMESTAMP_DEP) $$file $${file%.txt} workman.sh || \ exit; \ done $(SET_TIMESTAMP_DEP) version $(VERSION_DEPS) @@ -1114,30 +1130,29 @@ set-tzs-timestamp.out: $(TZS) # The zics below ensure that each data file can stand on its own. # We also do an all-files run to catch links to links. -check_public: $(VERSION_DEPS) - rm -fr public.dir - mkdir public.dir - ln $(VERSION_DEPS) public.dir - cd public.dir \ +public.ck: $(VERSION_DEPS) + rm -fr $@d + mkdir $@d + ln $(VERSION_DEPS) $@d + cd $@d \ && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' TZDIR='$(TZDIR)' ALL - for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \ - public.dir/vanguard.zi public.dir/main.zi \ - public.dir/rearguard.zi; \ + for i in $(TDATA_TO_CHECK) \ + tzdata.zi vanguard.zi main.zi rearguard.zi; \ do \ - public.dir/zic -v -d public.dir/zoneinfo $$i 2>&1 || exit; \ + $@d/zic -v -d $@d/zoneinfo $@d/$$i || exit; \ done - public.dir/zic -v -d public.dir/zoneinfo-all $(TDATA_TO_CHECK) + $@d/zic -v -d $@d/zoneinfo-all $(TDATA_TO_CHECK) : : Also check 'backzone' syntax. - rm public.dir/main.zi - cd public.dir && $(MAKE) PACKRATDATA=backzone main.zi - public.dir/zic -d public.dir/zoneinfo main.zi - rm public.dir/main.zi - cd public.dir && \ + rm $@d/main.zi + cd $@d && $(MAKE) PACKRATDATA=backzone main.zi + $@d/zic -d $@d/zoneinfo main.zi + rm $@d/main.zi + cd $@d && \ $(MAKE) PACKRATDATA=backzone PACKRATLIST=zone.tab main.zi - public.dir/zic -d public.dir/zoneinfo main.zi + $@d/zic -d $@d/zoneinfo main.zi : - rm -fr public.dir + rm -fr $@d touch $@ # Check that the code works under various alternative @@ -1145,46 +1160,47 @@ check_public: $(VERSION_DEPS) check_time_t_alternatives: $(TIME_T_ALTERNATIVES) $(TIME_T_ALTERNATIVES_TAIL): $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES): $(VERSION_DEPS) - rm -fr $@.dir - mkdir $@.dir - ln $(VERSION_DEPS) $@.dir + rm -fr $@d + mkdir $@d + ln $(VERSION_DEPS) $@d case $@ in \ - int*32_t) range=-2147483648,2147483648;; \ + *32_t*) range=-2147483648,2147483648;; \ u*) range=0,4294967296;; \ *) range=-4294967296,4294967296;; \ esac && \ - wd=`pwd` && \ - zones=`$(AWK) '/^[^#]/ { print $$3 }' /dev/null; then \ quiet_option='-q'; \ else \ quiet_option=''; \ fi && \ - diff $$quiet_option -r $(TIME_T_ALTERNATIVES_HEAD).dir/etc \ - $@.dir/etc && \ + diff $$quiet_option -r $(TIME_T_ALTERNATIVES_HEAD)d/etc \ + $@d/etc && \ diff $$quiet_option -r \ - $(TIME_T_ALTERNATIVES_HEAD).dir/usr/share \ - $@.dir/usr/share; \ + $(TIME_T_ALTERNATIVES_HEAD)d/usr/share \ + $@d/usr/share; \ } touch $@ @@ -1199,7 +1215,7 @@ ALL_ASC = $(TRADITIONAL_ASC) $(REARGUARD_ASC) \ tarballs rearguard_tarballs tailored_tarballs traditional_tarballs \ signatures rearguard_signatures traditional_signatures: \ version set-timestamps.out rearguard.zi vanguard.zi - VERSION=`cat version` && \ + read -r VERSION $@.out mv $@.out $@ tzdata$(VERSION).tar.gz: set-timestamps.out - LC_ALL=C && export LC_ALL && \ - tar $(TARFLAGS) -cf - $(TZDATA_DIST) | \ + $(SETUP_TAR) && \ + $$TAR -cf - $(TZDATA_DIST) | \ gzip $(GZIPFLAGS) >$@.out mv $@.out $@ @@ -1251,9 +1267,9 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. $(CREATE_EMPTY) $@.dir/pacificnew touch -mr version $@.dir/version - LC_ALL=C && export LC_ALL && \ + $(SETUP_TAR) && \ (cd $@.dir && \ - tar $(TARFLAGS) -cf - \ + $$TAR -cf - \ $(TZDATA_DIST) pacificnew | \ gzip $(GZIPFLAGS)) >$@.out mv $@.out $@ @@ -1269,9 +1285,14 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out rm -fr $@.dir mkdir $@.dir : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. + if test $(DATAFORM) = vanguard; then \ + pacificnew=; \ + else \ + pacificnew=pacificnew; \ + fi && \ cd $@.dir && \ $(CREATE_EMPTY) $(PRIMARY_YDATA) $(NDATA) backward \ - `test $(DATAFORM) = vanguard || echo pacificnew` + $$pacificnew (grep '^#' tzdata.zi && echo && cat $(DATAFORM).zi) \ >$@.dir/etcetera touch -mr tzdata.zi $@.dir/etcetera @@ -1291,9 +1312,9 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out test -f $@.dir/$$file || links="$$links $$file"; \ done && \ ln $$links $@.dir - LC_ALL=C && export LC_ALL && \ + $(SETUP_TAR) && \ (cd $@.dir && \ - tar $(TARFLAGS) -cf - * | gzip $(GZIPFLAGS)) >$@.out + $$TAR -cf - * | gzip $(GZIPFLAGS)) >$@.out mv $@.out $@ tzdb-$(VERSION).tar.lz: set-timestamps.out set-tzs-timestamp.out @@ -1301,8 +1322,8 @@ tzdb-$(VERSION).tar.lz: set-timestamps.out set-tzs-timestamp.out mkdir tzdb-$(VERSION) ln $(ENCHILADA) tzdb-$(VERSION) $(SET_TIMESTAMP) tzdb-$(VERSION) tzdb-$(VERSION)/* - LC_ALL=C && export LC_ALL && \ - tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out + $(SETUP_TAR) && \ + $$TAR -cf - tzdb-$(VERSION) | lzip -9 >$@.out mv $@.out $@ tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz @@ -1313,22 +1334,21 @@ $(ALL_ASC): $(GPG) --armor --detach-sign $? TYPECHECK_CFLAGS = $(CFLAGS) -DTYPECHECK -D__time_t_defined -D_TIME_T -typecheck: typecheck_long_long typecheck_unsigned -typecheck_long_long typecheck_unsigned: $(VERSION_DEPS) - rm -fr $@.dir - mkdir $@.dir - ln $(VERSION_DEPS) $@.dir - cd $@.dir && \ +typecheck: long-long.ck unsigned.ck +long-long.ck unsigned.ck: $(VERSION_DEPS) + rm -fr $@d + mkdir $@d + ln $(VERSION_DEPS) $@d + cd $@d && \ case $@ in \ - *_long_long) i="long long";; \ - *_unsigned ) i="unsigned" ;; \ + long-long.*) i="long long";; \ + unsigned.* ) i="unsigned" ;; \ esac && \ - typecheck_cflags='' && \ $(MAKE) \ CFLAGS="$(TYPECHECK_CFLAGS) \"-Dtime_t=$$i\"" \ - TOPDIR="`pwd`" \ *** 2471 LINES SKIPPED *** From nobody Sun Oct 6 11:07:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XLzyS6R5tz5XgZ4; Sun, 06 Oct 2024 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLzyS47TVz4s31; Sun, 6 Oct 2024 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RsFLR+LQ+LTxZ/HHAL7MR5KT8SGzL1zvo1VjMeufg1Q=; b=QqIr10whxUnQPD3vTQ7IT+O+/vkv/Vt+AI2hi4rmQeyah9QksFY0DyMmvEpjiycIrcYjOf 5blTOD1ipNL2CEO0PMYLmtGLl0Byhw/eEZXnyDyg5f0hi/abRyNtxOuu5xN4AB88szcQkW cm/BCiFVUx+7v47nwsiBFubgY8MuNNldVyPTmznkmyqDwVspVr7AoT029qWfzwrmTgqMI7 o2n5kLWsFWn2t18ykWPfWLCE5fbKiF1R4BHHFz9vT1Uy5wog8JNKTJm1xwaTGVlrvyGEpP hZgLeZhaPwv2oRUjALZk8MXy5gl4Z1Uy4VrKXhVBkUToi+CEAXbp2gUGKJUSzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728212848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RsFLR+LQ+LTxZ/HHAL7MR5KT8SGzL1zvo1VjMeufg1Q=; b=bu0z8TLXYMxRsJLSBAeSnksXvaFnaJV86UU+/jyNST0KET5qmgrO35PlmtKeFj0f8f/Zzk asXd8ELDli0QpH/omIhaIAYApJK2iDnakeT3fsa+QPINOvN0xvR5q1kjQP8uaKWJUHaCCU x0h0yG+EyTE4LSdMzFfT/XOI6NHIVULpQSyWc4zIik7+LfQrHMMVxvnMhgs/H7Kpc5zgMQ LXvmA5NT18wt7+JneaZ5jRLzCAQa0bgZLOHTC/TnzEQLrqTpA0Yfern+nIh8KM4XGiToSy ZQ92J8g7/OUIB+Pf5ggAd1/PDtndnBO2KsmEAD0rlLfeluhNyOM9z2pcin8C0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728212848; a=rsa-sha256; cv=none; b=nHGUoiU7Fcv5JM6//EBANB9Ve+bNftdWnHcVX6pv8LZQTX7bvg4+pbLjmdJvzYG3QTD6eN ZbomofeGLqGAlt4D00M4/fwlXlCo0PBQMKLzjq6ZZXIdBz5cEZs98ON3bpELKFvGtgjhEv bIzAuOMIP0F69K923AHwVMqvhBZpPNpTyjIrToaFed63dm2317BsQPw3E0dkePWKK/rYHL IVVMA6L3iuq8vhdTkyLBXunF9wbn4jHnn2VvH1V+xvUb/B78dGVhkYqsTyQDAerDRwOpWv 18+5ZzsIHK8it3vJQltpp6CZktay6XU/Fk1qmvgQCMfYGGGexT8sFkEoOAC3Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XLzyS3l1Tz10j0; Sun, 6 Oct 2024 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496B7ScI039497; Sun, 6 Oct 2024 11:07:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496B7S96039494; Sun, 6 Oct 2024 11:07:28 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:07:28 GMT Message-Id: <202410061107.496B7S96039494@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: 3053d32194fa - stable/13 - printf(): Save errno earlier. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3053d32194fa74809235b71c0889b11a6a5f316c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3053d32194fa74809235b71c0889b11a6a5f316c commit 3053d32194fa74809235b71c0889b11a6a5f316c Author: Dag-Erling Smørgrav AuthorDate: 2024-09-20 16:30:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-06 09:17:14 +0000 printf(): Save errno earlier. The manual page says %m is replaced with “the string representation of the error code stored in the errno variable at the beginning of the call”. However, we don't actually save `errno` until fairly late in `__vfprintf()`. Make sure it is saved before we do anything that might perturb `errno`. MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46718 (cherry picked from commit 74f1007fcc838501c74a633792c3f01833bf65e1) --- lib/libc/stdio/local.h | 2 +- lib/libc/stdio/snprintf.c | 14 ++++++++------ lib/libc/stdio/vasprintf.c | 5 +++-- lib/libc/stdio/vdprintf.c | 3 ++- lib/libc/stdio/vfprintf.c | 20 ++++++++++---------- lib/libc/stdio/vsnprintf.c | 7 ++++--- lib/libc/stdio/vsprintf.c | 10 ++++++---- 7 files changed, 34 insertions(+), 27 deletions(-) diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index a5c465bcdcba..cbc0d29ff823 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -80,7 +80,7 @@ extern int __swsetup(FILE *); extern int __sflags(const char *, int *); extern int __ungetc(int, FILE *); extern wint_t __ungetwc(wint_t, FILE *, locale_t); -extern int __vfprintf(FILE *, locale_t, const char *, __va_list); +extern int __vfprintf(FILE *, locale_t, int, const char *, __va_list); extern int __vfscanf(FILE *, const char *, __va_list); extern int __vfwprintf(FILE *, locale_t, const wchar_t *, __va_list); extern int __vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict, diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index 45a9e3d7d622..10889715e111 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -52,10 +52,11 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; int snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...) { + FILE f = FAKE_FILE; + va_list ap; size_t on; + int serrno = errno; int ret; - va_list ap; - FILE f = FAKE_FILE; on = n; if (n != 0) @@ -69,7 +70,7 @@ snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - ret = __vfprintf(&f, __get_locale(), fmt, ap); + ret = __vfprintf(&f, __get_locale(), serrno, fmt, ap); if (on > 0) *f._p = '\0'; va_end(ap); @@ -79,10 +80,11 @@ int snprintf_l(char * __restrict str, size_t n, locale_t locale, char const * __restrict fmt, ...) { + FILE f = FAKE_FILE; + va_list ap; size_t on; + int serrno = errno; int ret; - va_list ap; - FILE f = FAKE_FILE; FIX_LOCALE(locale); on = n; @@ -97,7 +99,7 @@ snprintf_l(char * __restrict str, size_t n, locale_t locale, f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); if (on > 0) *f._p = '\0'; va_end(ap); diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c index 2e5f8dd4107a..91748861829d 100644 --- a/lib/libc/stdio/vasprintf.c +++ b/lib/libc/stdio/vasprintf.c @@ -35,9 +35,9 @@ */ #include +#include #include #include -#include #include "xlocale_private.h" #include "local.h" @@ -45,6 +45,7 @@ int vasprintf_l(char **str, locale_t locale, const char *fmt, __va_list ap) { FILE f = FAKE_FILE; + int serrno = errno; int ret; FIX_LOCALE(locale); @@ -56,7 +57,7 @@ vasprintf_l(char **str, locale_t locale, const char *fmt, __va_list ap) return (-1); } f._bf._size = f._w = 127; /* Leave room for the NUL */ - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); if (ret < 0) { free(f._bf._base); *str = NULL; diff --git a/lib/libc/stdio/vdprintf.c b/lib/libc/stdio/vdprintf.c index a84efaa14b4d..3d0598613b82 100644 --- a/lib/libc/stdio/vdprintf.c +++ b/lib/libc/stdio/vdprintf.c @@ -47,6 +47,7 @@ vdprintf(int fd, const char * __restrict fmt, va_list ap) { FILE f = FAKE_FILE; unsigned char buf[BUFSIZ]; + int serrno = errno; int ret; if (fd > SHRT_MAX) { @@ -63,7 +64,7 @@ vdprintf(int fd, const char * __restrict fmt, va_list ap) f._bf._base = buf; f._bf._size = sizeof(buf); - if ((ret = __vfprintf(&f, __get_locale(), fmt, ap)) < 0) + if ((ret = __vfprintf(&f, __get_locale(), serrno, fmt, ap)) < 0) return (ret); return (__fflush(&f) ? EOF : ret); diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index e656a2707d3a..8cc4001a93cd 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -72,7 +72,8 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #include "printflocal.h" static int __sprint(FILE *, struct __suio *, locale_t); -static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0) +static int __sbprintf(FILE *, locale_t, int, const char *, va_list) + __printflike(4, 0) __noinline; static char *__wcsconv(wchar_t *, int); @@ -173,7 +174,7 @@ __sprint(FILE *fp, struct __suio *uio, locale_t locale) * worries about ungetc buffers and so forth. */ static int -__sbprintf(FILE *fp, locale_t locale, const char *fmt, va_list ap) +__sbprintf(FILE *fp, locale_t locale, int serrno, const char *fmt, va_list ap) { int ret; FILE fake = FAKE_FILE; @@ -197,7 +198,7 @@ __sbprintf(FILE *fp, locale_t locale, const char *fmt, va_list ap) fake._lbfsize = 0; /* not actually used, but Just In Case */ /* do the work, then copy any error status */ - ret = __vfprintf(&fake, locale, fmt, ap); + ret = __vfprintf(&fake, locale, serrno, fmt, ap); if (ret >= 0 && __fflush(&fake)) ret = EOF; if (fake._flags & __SERR) @@ -269,8 +270,9 @@ __wcsconv(wchar_t *wcsarg, int prec) */ int vfprintf_l(FILE * __restrict fp, locale_t locale, const char * __restrict fmt0, - va_list ap) + va_list ap) { + int serrno = errno; int ret; FIX_LOCALE(locale); @@ -278,9 +280,9 @@ vfprintf_l(FILE * __restrict fp, locale_t locale, const char * __restrict fmt0, /* optimise fprintf(stderr) (and other unbuffered Unix files) */ if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) && fp->_file >= 0) - ret = __sbprintf(fp, locale, fmt0, ap); + ret = __sbprintf(fp, locale, serrno, fmt0, ap); else - ret = __vfprintf(fp, locale, fmt0, ap); + ret = __vfprintf(fp, locale, serrno, fmt0, ap); FUNLOCKFILE_CANCELSAFE(); return (ret); } @@ -305,7 +307,7 @@ vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap) * Non-MT-safe version */ int -__vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) +__vfprintf(FILE *fp, locale_t locale, int serrno, const char *fmt0, va_list ap) { char *fmt; /* format string */ int ch; /* character from fmt */ @@ -315,7 +317,6 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) int ret; /* return value accumulator */ int width; /* width from format (%8d), or 0 */ int prec; /* precision from format; <0 for N/A */ - int saved_errno; int error; char errnomsg[NL_TEXTMAX]; char sign; /* sign prefix (' ', '+', '-', or \0) */ @@ -467,7 +468,6 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) savserr = fp->_flags & __SERR; fp->_flags &= ~__SERR; - saved_errno = errno; convbuf = NULL; fmt = (char *)fmt0; argtable = NULL; @@ -779,7 +779,7 @@ fp_common: break; #endif /* !NO_FLOATING_POINT */ case 'm': - error = __strerror_rl(saved_errno, errnomsg, + error = __strerror_rl(serrno, errnomsg, sizeof(errnomsg), locale); cp = error == 0 ? errnomsg : ""; size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index 8fc7f9fdf725..1b00e9916506 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -49,12 +49,13 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; int vsnprintf_l(char * __restrict str, size_t n, locale_t locale, - const char * __restrict fmt, __va_list ap) + const char * __restrict fmt, __va_list ap) { + FILE f = FAKE_FILE; size_t on; + int serrno = errno; int ret; char dummy[2]; - FILE f = FAKE_FILE; FIX_LOCALE(locale); on = n; @@ -75,7 +76,7 @@ vsnprintf_l(char * __restrict str, size_t n, locale_t locale, f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); if (on > 0) *f._p = '\0'; return (ret); diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c index 68a2f70469f4..4035fc12125a 100644 --- a/lib/libc/stdio/vsprintf.c +++ b/lib/libc/stdio/vsprintf.c @@ -41,23 +41,25 @@ static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -#include +#include #include +#include #include "local.h" #include "xlocale_private.h" int vsprintf_l(char * __restrict str, locale_t locale, - const char * __restrict fmt, __va_list ap) + const char * __restrict fmt, __va_list ap) { - int ret; FILE f = FAKE_FILE; + int serrno = errno; + int ret; FIX_LOCALE(locale); f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; - ret = __vfprintf(&f, locale, fmt, ap); + ret = __vfprintf(&f, locale, serrno, fmt, ap); *f._p = 0; return (ret); } From nobody Sun Oct 6 11:38:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM0dm6h4lz5XjDd; Sun, 06 Oct 2024 11:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM0dm5yYlz4xgH; Sun, 6 Oct 2024 11:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728214684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Vhur1vhExO/zCJvR0PMdRXrccenZ8RmzlNnlZz8EO0=; b=YhD4RhJFLUY1hP73CjlkKUbHHrwrmUvguwxToDvYmWQZ3AegADUMIoVJoDHi1etOSqtEyD a+KX+K1CUHnVBdz6EWwkELZe6EoYiLT01vHHxH+JgYv7Vp8el+swm9rm3f3Wot6qMCIOxR rYOSdklfKNUZKGqvCCAeQhDEnlED8WMBsIZPuLFzT3C1UDH9y+pfIFFD1QuZ0cDOY5PMBb JsX0RdanZddVZKgY8knlGX3vaIvyDkxsFG3Bzdvd5vuBx3MIA/50+06BQ9aA88yLF6BW/7 ShrNhHHRMmZ1ty9wz/HLFsRqsQbY4EOWEguDv6fFmwXg46bgMghWGxFAMyxW5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728214684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Vhur1vhExO/zCJvR0PMdRXrccenZ8RmzlNnlZz8EO0=; b=lnH5jVBNGLhOucopOm/nKSOHQopmZDUl20fyVaLqLaSXaU3CfhvwB0VDSqB7RtGCLwHaM3 GL2Bt9Ia3PYFxt3nu9T4S4zgLevrzczoknGLPHHTgJYdgI1REcu5JEQAqUk5YQa8XXZKSg 44CVt/PxvUmNpc+0CT3LgoGrpBzykrQI0aNd6wijv5ypgZqv0o/SzvmuwMrZ48d6mohs9D hUO2ZNTVf9rDk/LTh16fbZy5oRtd4S2D5TjUgRYI12lNE8K/iBYvNcQIzmbSgGSnxLzagW fezJeYtnmWYb/g6r2iKnxZ5pkWVsYPAgNUqMK0GcCA7C4fgzINWknY8bCjYHZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728214684; a=rsa-sha256; cv=none; b=wah8wNGQSTJzDmaRwEEu72WHgBDNMEfrdqJiatV+5PBesl43zog7Ps7JUCHBtft6PVY5gw zk3k2NJcNH1OFew8zSmr6T31egcWhdShU8/w/0qTBD7mXAonVLUpUsnZXzzsegrbON3+G1 dkt7bGbVXWH2FGG8AhEn278MujV6JUFGGpggZnPHU2DIq6qZdIsjE7cdJUet4wfthIVPzk lhPeU4LBzNXz4+1O/7rIr7y6hMHemfT3m4/KvUJL53FKmnwUuTM+1Elc/YA7t18kJ3rkQy /NEdZqhWYJtvgJFMLAwutor9dXqWUu/CvpirSqewX4IEl5O9v3GlcoBD7zcXdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM0dm5Rbhz11RR; Sun, 6 Oct 2024 11:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496Bc4cu090977; Sun, 6 Oct 2024 11:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496Bc42F090974; Sun, 6 Oct 2024 11:38:04 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:38:04 GMT Message-Id: <202410061138.496Bc42F090974@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 6bd8d85579a1 - main - dummymbuf: Fix code style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd8d85579a18cf69a9b02d5852f994cb1d5a1e9 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd8d85579a18cf69a9b02d5852f994cb1d5a1e9 commit 6bd8d85579a18cf69a9b02d5852f994cb1d5a1e9 Author: Igor Ostapenko AuthorDate: 2024-10-06 11:34:28 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-06 11:34:28 +0000 dummymbuf: Fix code style No functional change intended. Reviewed by: kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D46958 --- sys/net/dummymbuf.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/net/dummymbuf.c b/sys/net/dummymbuf.c index 99b6e6944752..b90fc55f458b 100644 --- a/sys/net/dummymbuf.c +++ b/sys/net/dummymbuf.c @@ -106,7 +106,7 @@ dmb_sysctl_handle_rules(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_net_dummymbuf, OID_AUTO, rules, CTLTYPE_STRING | CTLFLAG_MPSAFE | CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(dmb_rules), RULES_MAXLEN, dmb_sysctl_handle_rules, "A", - "{inet | inet6 | ethernet} {in | out} []; ...;"); + "{inet|inet6|ethernet} {in|out} [ ]; ...;"); /* * Statistics @@ -148,10 +148,10 @@ VNET_DEFINE_STATIC(pfil_hook_t, dmb_pfil_ethernet_hook); #define FEEDBACK_PFIL(pfil_type, pfil_flags, ifp, rule, msg) \ printf("dummymbuf: %s %b %s: %s: %.*s\n", \ - (pfil_type == PFIL_TYPE_IP4 ? "PFIL_TYPE_IP4" : \ - pfil_type == PFIL_TYPE_IP6 ? "PFIL_TYPE_IP6" : \ - pfil_type == PFIL_TYPE_ETHERNET ? "PFIL_TYPE_ETHERNET" : \ - "PFIL_TYPE_UNKNOWN"), \ + ((pfil_type) == PFIL_TYPE_IP4 ? "PFIL_TYPE_IP4" : \ + (pfil_type) == PFIL_TYPE_IP6 ? "PFIL_TYPE_IP6" : \ + (pfil_type) == PFIL_TYPE_ETHERNET ? "PFIL_TYPE_ETHERNET" : \ + "PFIL_TYPE_UNKNOWN"), \ (pfil_flags), "\20\21PFIL_IN\22PFIL_OUT", \ (ifp)->if_xname, \ (msg), \ @@ -211,7 +211,7 @@ bad: static bool read_rule(const char **cur, struct rule *rule, bool *eof) { - // {inet | inet6 | ethernet} {in | out} [ ]; + /* {inet|inet6|ethernet} {in|out} [ ]; */ rule->syntax_begin = NULL; rule->syntax_len = 0; @@ -219,18 +219,18 @@ read_rule(const char **cur, struct rule *rule, bool *eof) if (*cur == NULL) return (false); - // syntax_begin + /* syntax_begin */ while (**cur == ' ') (*cur)++; rule->syntax_begin = *cur; - // syntax_len + /* syntax_len */ char *delim = strchr(*cur, ';'); if (delim == NULL) return (false); rule->syntax_len = (int)(delim - *cur + 1); - // pfil_type + /* pfil_type */ if (strstr(*cur, "inet6") == *cur) { rule->pfil_type = PFIL_TYPE_IP6; *cur += strlen("inet6"); @@ -246,7 +246,7 @@ read_rule(const char **cur, struct rule *rule, bool *eof) while (**cur == ' ') (*cur)++; - // pfil_dir + /* pfil_dir */ if (strstr(*cur, "in") == *cur) { rule->pfil_dir = PFIL_IN; *cur += strlen("in"); @@ -259,7 +259,7 @@ read_rule(const char **cur, struct rule *rule, bool *eof) while (**cur == ' ') (*cur)++; - // ifname + /* ifname */ char *sp = strchr(*cur, ' '); if (sp == NULL || sp > delim) return (false); @@ -272,7 +272,7 @@ read_rule(const char **cur, struct rule *rule, bool *eof) while (**cur == ' ') (*cur)++; - // opname + /* opname */ if (strstr(*cur, "pull-head") == *cur) { rule->op = dmb_m_pull_head; *cur += strlen("pull-head"); @@ -282,12 +282,12 @@ read_rule(const char **cur, struct rule *rule, bool *eof) while (**cur == ' ') (*cur)++; - // opargs + /* opargs */ if (*cur > delim) return (false); rule->opargs = *cur; - // the next rule & eof + /* the next rule & eof */ *cur = delim + 1; while (**cur == ' ') (*cur)++; From nobody Sun Oct 6 13:13:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM2mJ4wRsz5Y4dV; Sun, 06 Oct 2024 13:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM2mJ41FYz56xy; Sun, 6 Oct 2024 13:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728220432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCvrI4t15f3qaGATw2cZbIE/9MuARtah/stB7U4AWlc=; b=Bouhlov9oKRSXXrKIjWRyi8kUI0/LyxdwIBBetBullHZi2IW0WneNmD8PjWFGvOiewI5Ph iMWfBAN64hxzu6CaB87Mjvw3kSUGM+ItgxSTjZMewO/+fPv4cgiO6KeDooIG7kZMJ6Qv4o In+9BFRLp8vFH4U7ZI74bw3vTTcJSKikV3c0dCihK28VBjmh12PorMDoS3b+pn8kZbaxLr McDAfzV31TyT7IYT2mLKfWgGTne3irGnaCt/zmFZSjv4XqTjKA8xs+cSk3pZi7Fno5JAk/ pM7jot5EiZsZzb/oAn9ZSxEvs6O4KT/PVGamUKonFNYnn2hHbAnHW01SruVqoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728220432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCvrI4t15f3qaGATw2cZbIE/9MuARtah/stB7U4AWlc=; b=i7ucaQ1bL/mLFkah9gWXdpOSMK5qKwkrmSCaGMfONZRB26smm7z7tPwKoqRSp827xOzPlj ZGNgGyPisRCYI2+AfYs7sl1+b3d0+x8BAP4eWBSqpv8+1YK1AnA3r2gPqlX7tQNTppoOil ECLYMgk+l2izcOZ11COAXQOJ1xmX2i+TYb5lTT6xDJ2PLfvr8rAlJhzasnp+ImrWGcpOX8 tMnBMfraEQINhMJPDkaAKXfJ0LtyFJxjB5FHwj5lqMtIz6/eegAkExj/ctBkdwt2PaO0zY DGxqu55Ldd0xveUfY+dhFhgbzIcLcf+Ge1M2J3osdyvkFhBY7GX5eCQHm1fPkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728220432; a=rsa-sha256; cv=none; b=FwIw/UcC5YghCunZHqGkzwnkET57b1hrHjwUbLnsbV5RFPEcgm7hrq9jsbHW2oF3/yjUPU WIlY+k4qlOs9gRA9k8/Stw3nRYc1r6Xg731DESlq5V7APDOgrkqovKd9Z8p2M0oTHcU+zS VjzSlc2OH8zmhUPzpKn6mwPEN+gDQrMpLQ77zK8dOjnsVcs8eANOobxE2nd+gbhAysxVHb AIn3Xbnke5omqjUOBeCPPjYdhVwKvH1BRbRoRjZF3MDQwBOAncDwQPbQ6QaQd6QTWLo7sC kA7trXbPD2/f3d/egYOBorRxHRpmXXSfVTHWs77Y1LcMKYpNpQLz19nR8JYdQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM2mJ3dBZz13pH; Sun, 6 Oct 2024 13:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496DDqJR060972; Sun, 6 Oct 2024 13:13:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496DDqn2060969; Sun, 6 Oct 2024 13:13:52 GMT (envelope-from git) Date: Sun, 6 Oct 2024 13:13:52 GMT Message-Id: <202410061313.496DDqn2060969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9d52823bf1df - main - vm_object: Widen the flags field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d52823bf1dfac237e58b5208299aaa5e2df42e9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d52823bf1dfac237e58b5208299aaa5e2df42e9 commit 9d52823bf1dfac237e58b5208299aaa5e2df42e9 Author: Mark Johnston AuthorDate: 2024-10-06 13:07:31 +0000 Commit: Mark Johnston CommitDate: 2024-10-06 13:13:30 +0000 vm_object: Widen the flags field Take advantage of a nearby 2-byte hole to avoid growing the struct. This way, only the offsets of "flags" and "pg_color" change. Bump __FreeBSD_version since some out-of-tree kernel modules may access these fields, though I haven't found any examples so far. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35905 --- sys/sys/param.h | 2 +- sys/vm/vm_object.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 3d772d551ffe..8af2f9594bc1 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500024 +#define __FreeBSD_version 1500025 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 9155d9cd6d6d..3274f59f958f 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -108,8 +108,8 @@ struct vm_object { int shadow_count; /* how many objects that this is a shadow for */ vm_memattr_t memattr; /* default memory attribute for pages */ objtype_t type; /* type of pager */ - u_short flags; /* see below */ u_short pg_color; /* (c) color of first page in obj */ + u_int flags; /* see below */ blockcount_t paging_in_progress; /* (a) Paging (in or out) so don't collapse or destroy */ blockcount_t busy; /* (a) object is busy, disallow page busy. */ int resident_page_count; /* number of resident pages */ From nobody Sun Oct 6 13:23:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM2zs2LGfz5Y5BX; Sun, 06 Oct 2024 13:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM2zs1JBFz57Ms; Sun, 6 Oct 2024 13:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728221033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=laDEUbwD5QVbhw97+qXB+kUqYm+PI3rX6o8mBHh0R8c=; b=RW2liSy5E8ANIEy0IfwFzGOl2bQHovB0cOHg0+MikKVfhKV1FKAk81iPx4pmOhRn8DkyqO PGGku+j71l+DOsCPEwHiFEsdMOHwZ7BhK3XvturopZBLKoJ13d5D646N8OaZJQHqZ6fnzQ 6ghV92lrDNN5wWrwwFnB19hagEickROgDZ9caQ8MVpVsZgPBdLX9PYHyKgVlWPRnmD/msv XTS8PrSLQswqyyfBQduj2y7yZldqNzVFAWtEbocD9I1DZ9ogwxl2IYGX+9mWmmfXBJPV7n zZ7fHcTITs5YR52d+t8s6XiEhRvrpEhuQKpM9LZpp0JLPKenGqeoSG6MJIc3Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728221033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=laDEUbwD5QVbhw97+qXB+kUqYm+PI3rX6o8mBHh0R8c=; b=SlrD8nbuxuGoPOmfdlVGRxzS0zV0r/6MAlll7XM0mPECCEr21TgA9KF08v+oDw04pPHU3V OfyI3e5KHCxrFkYx8j0n3KI4Hq5d3UK10uoO/QEfX1mMlEUQmjQEmT9Lakh+piG5gUhSvq 6QHBbwmej1AHyHJxp6aoAAWbuKLbsEFvoblK8ljTLBAFIMupKvV0mImqSWczgerLCfvLCo FK5y7kQYA8jd9CdAH1W4PyEOF7hpxw3OGecGZLShBK9Rx6jET3Kfh135/0uxPveoZN+Z1w /6j28Pq/AJx7JlPtcwwxxl2Lt8PspFfT0d27p35DNDp5T5FuGi1sb7XDtpwcuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728221033; a=rsa-sha256; cv=none; b=Ag7qdlEFEPo91rTNwVBontod1zgd36W7iYL1IBVQuMNj/JC+MFXsAc1LBcyJHDdLHATyk6 nDR02mbIDDlIVBCstqDm4BWM2KeeItNmosMPBAXk4V7wtsRS1mqCqfdRWJ66lkx9/ND56N yxasy6+Wp81vhrw8jaHPzAjJxAV65FPUojdWLU9pzOFepyeKltQeWgGER0Gx2z9e/DPVu+ IeABMo7c8gclcISJIJT+bSI1zI0Bd9AnheVSn/QQq9CMq51uryIs85jnn3MMdXrLf8T996 DYyh1q+pmaY3thcFzsbX5l9/16aNM38K/g0RodC7AE/SKNaaVAYfpNkXtR5e2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM2zs0qQLz13km; Sun, 6 Oct 2024 13:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496DNr2R078110; Sun, 6 Oct 2024 13:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496DNqQ8078107; Sun, 6 Oct 2024 13:23:52 GMT (envelope-from git) Date: Sun, 6 Oct 2024 13:23:52 GMT Message-Id: <202410061323.496DNqQ8078107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7d893fce0d11 - main - sesutil: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d893fce0d1126959733efec7105b56d0de7a3cb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d893fce0d1126959733efec7105b56d0de7a3cb commit 7d893fce0d1126959733efec7105b56d0de7a3cb Author: Jeremy Faulkner AuthorDate: 2024-10-06 13:22:33 +0000 Commit: Mark Johnston CommitDate: 2024-10-06 13:22:33 +0000 sesutil: Fix a typo in an error message PR: 281658 MFC after: 1 week --- usr.sbin/sesutil/sesutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index b6cdd2cf3314..24ac52bd9b5c 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -316,7 +316,7 @@ sesled(int argc, char **argv, bool setfault) } globfree(&g); if (ndisks == 0 && all == false) { - xo_errx(EXIT_FAILURE, "Count not find the SES id of device '%s'", + xo_errx(EXIT_FAILURE, "Could not find the SES id of device '%s'", disk); } From nobody Sun Oct 6 14:02:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM3rw3H9Dz5Y7JJ; Sun, 06 Oct 2024 14:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM3rw2cvdz424h; Sun, 6 Oct 2024 14:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728223376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTN8ONIZjJV/eT2VngR9PSAdWO+9pzJEDraFiDWRRb8=; b=AbwecJJ9Lx61AyO3S+8rMM3V177wBwjIZVJCXgXHNFlRbcdugN8+3oao73qICMEHHkl5Q3 4IO4Wtfhfq89pql7o6H1edKnu1N9N09GtywyVqeUvIZcYf1G76c+jbeUc62aQD0BcBO/Zm kQaL8yMm6yd9XTjN9ySz5u2wsOcvjqdlIA4hoAwUJ7SVZVJ/rw2t7Kxp9HAw9A19UAcHlM 0vXc2Ps3WjBnj2QZzys0+Lk57Ssn4+Q0hKprr1iD3WIJHcrCLjwoXOhd1lM68O4o5u+gOE hyvJmD7LBV4zOJu+pC/O0OZT3YV34ecc+2miktjw89YNf2gFaJNz6Jrfh5kMpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728223376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTN8ONIZjJV/eT2VngR9PSAdWO+9pzJEDraFiDWRRb8=; b=EX/myCTIqubHndntXGAwhTbkFaR0z3fczw4eW9KPO2gdRQmfGgUUdIA9cbPgIllH7BtSyY MZ+Z5iO+AeNX3gPFhVPsY2YrgrFSv0/gS86qfHYCKURQMOqBdPm6e2Uyf8hpha+4XR7MJ9 syS7ahzZzC0ftDPJf3KJ6lI1/P195nOWgZYn+Pe9BrVjPctskQ40edvgWYAm/LRLEU1Sd5 740xAgWLMu1lEutM1ObBIYrzoVrQC6FAbl8yv/o+9/mNuZozKeYHVaCg1DfSXDbpf9np02 v4pu0uv4rc1lz1jAMcSTmo6M7xvvxYMzxIm19K2EfxCyv8fSVc4O9grmSHMVLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728223376; a=rsa-sha256; cv=none; b=DAUZtvuNmmsNniatfehfbAGZIZWZiXs4MqDreWpr0VjEOvmpT+LFOgNqJkX7sIVQf5fj8d h8OIkgy7ytEjALObls0RLOHxX5KRL9VXtjaOXIv30iLlxVEduWCkEdvOD2Z1mV6wRFYsFN 3bkjmB2elpUxS8AaX4OYXjuaMAAuZoqqQICV1heaH4SqhdykIiWkcU1NVtK0uQBE9IEsfA RvYnl6IRXSswnB1vDhvMZCGzfWlu2k3Bp/930Q02h7sNiYacguiES8IOLxFl+5CGdpdkOM 6Yh2Jy9XLTj8+de/uD+AVqt2ZJM1Xu5xBBqtvqZGo9UTNqzngvsI5PRTwJKMHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM3rw253Zz14HW; Sun, 6 Oct 2024 14:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496E2ucH046156; Sun, 6 Oct 2024 14:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496E2uYg046153; Sun, 6 Oct 2024 14:02:56 GMT (envelope-from git) Date: Sun, 6 Oct 2024 14:02:56 GMT Message-Id: <202410061402.496E2uYg046153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: b0a24be007d8 - main - bhyve/nvme: Fix out-of-bounds read in NVMe log page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0a24be007d83f7929de5b3fc320a29e6868067d Auto-Submitted: auto-generated The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=b0a24be007d83f7929de5b3fc320a29e6868067d commit b0a24be007d83f7929de5b3fc320a29e6868067d Author: Chuck Tuffli AuthorDate: 2024-09-19 15:11:30 +0000 Commit: Chuck Tuffli CommitDate: 2024-10-06 13:50:28 +0000 bhyve/nvme: Fix out-of-bounds read in NVMe log page The function nvme_opc_get_log_page in the file usr.sbin/bhyve/pci_nvme.c is vulnerable to buffer over-read. The value logoff is user controlled but never checked against the value of logsize. Thus the difference: logsize - logoff can underflow. Due to the sc structure layout, an attacker can dump internals fields of sc and the content of next heap allocation. Reported by: Synacktiv Reviewed by: emaste, jhb Security: HYP-07 Sponsored by: Alpha-Omega Project, The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46021 --- usr.sbin/bhyve/pci_nvme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 45ab1b11fda4..b8eb24d91b49 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1398,7 +1398,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, logsize *= sizeof(uint32_t); logoff = ((uint64_t)(command->cdw13) << 32) | command->cdw12; - DPRINTF("%s log page %u len %u", __func__, logpage, logsize); + DPRINTF("%s log page %u offset %lu len %u", __func__, logpage, logoff, logsize); switch (logpage) { case NVME_LOG_ERROR: @@ -1410,7 +1410,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->err_log + logoff, - MIN(logsize - logoff, sizeof(sc->err_log)), + MIN(logsize, sizeof(sc->err_log) - logoff), NVME_COPY_TO_PRP); break; case NVME_LOG_HEALTH_INFORMATION: @@ -1433,7 +1433,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->health_log + logoff, - MIN(logsize - logoff, sizeof(sc->health_log)), + MIN(logsize, sizeof(sc->health_log) - logoff), NVME_COPY_TO_PRP); break; case NVME_LOG_FIRMWARE_SLOT: @@ -1445,7 +1445,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->fw_log + logoff, - MIN(logsize - logoff, sizeof(sc->fw_log)), + MIN(logsize, sizeof(sc->fw_log) - logoff), NVME_COPY_TO_PRP); break; case NVME_LOG_CHANGED_NAMESPACE: @@ -1457,7 +1457,7 @@ nvme_opc_get_log_page(struct pci_nvme_softc* sc, struct nvme_command* command, nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->ns_log + logoff, - MIN(logsize - logoff, sizeof(sc->ns_log)), + MIN(logsize, sizeof(sc->ns_log) - logoff), NVME_COPY_TO_PRP); memset(&sc->ns_log, 0, sizeof(sc->ns_log)); break; From nobody Sun Oct 6 15:01:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM58p0dpgz5YB6W; Sun, 06 Oct 2024 15:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM58n6B8Gz485Z; Sun, 6 Oct 2024 15:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728226905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymX9h/KemfA6h7KKE7S0Zlb3iDvUacH0iDDOJNB0yd8=; b=x8Ce6iOsoVq5NurDIDha4WwbtZC8pHCmBu9oXE5imobwHk3oM9eFqja5ghykr3YSgw0UZs sL6pb2tlzI6KkhSFSIxHOTGMmUcfF38BMpUEz9cLr8ecY9otJuWEzJ7eaYBnrJ8IT7fCPy TdMGJWUtnqhqh+zIsA2q80vnrU9ZJrnr+5SdFLLJiapHLESLgnTKraXh/kLkTj8+decCyH /kHwOBCs540CYRxq/yBqwiL+HnmGXqqW7Mstp204krB95upTs9nvbKoz+npkLfDE280+X3 wMYvuYODcVtFgGFOl/Hp1onkjDPE7CLQMeyvCeEpTuQCpNdyvUJRUY129tbJrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728226905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymX9h/KemfA6h7KKE7S0Zlb3iDvUacH0iDDOJNB0yd8=; b=QAx4qjsPVe7YKbPMW9KroJ3Qez+Hj2G7tOXyoK9WufuPFvyVuFlnG+36O1saqDjDfJrD8O ZRhwwfhOfpIcUc8LcLDgAvxySS/OKg7siO99jYgowmkmdSHGU5rlw9nn/UGu61EBD/PsoG CZgwH4eS6n9FQG6O0QqzGub6lCQLfNt6XpmJtlH+S075Vmj2opJqVATlzm5QekS9azLf1h fOMS2yM3KZsCrN9UlGaV8NSKogNFWHXdjqNDxCB1LVmlGsPFir45CCGSAQwZHEHi+OhHYv p1aPRNKLBDNVsRHDblVv9FvWs3H3QVUbutCZjK6Fo+0Yw5bRRpG1InFT76sNRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728226905; a=rsa-sha256; cv=none; b=kJV7oAc5+E1XCB9Jyerk2YE71b8vHg4j+VEG0bBMswU2uZhYSuFgrHqdw6ahcCUJa91K3i 59MAVSguMq7x3goov5v+Jo3CZcvhb2M6dCWmf0septqOLvADyNv/i3SGsTQPBY2PaZdSUD 2ogEDtmZ8mU/F6jEMNpgJ/EF5Czg+WtMeir54xAhjiyOxQWH0SwaVPdjpPnRWC0kXpBFZq HUYcAgGhDe2Ww0YaA5vH6Hz4VJcQCRxIs9Awk+NIUJ2hTiSksLvC/dUVfkpQIkBUzCcFFH IjM7TqfZ3+VbtZtxSXec7ky+JmvdoBVSL+mszo8UopNMWTNB87n/66y80Ouwgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM58n5g5nz15pk; Sun, 6 Oct 2024 15:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496F1jDS046879; Sun, 6 Oct 2024 15:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496F1j5j046876; Sun, 6 Oct 2024 15:01:45 GMT (envelope-from git) Date: Sun, 6 Oct 2024 15:01:45 GMT Message-Id: <202410061501.496F1j5j046876@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: 2dea4de8e0f0 - stable/14 - vmm: Properly handle writes spanning across two pages in vm_handle_db List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2dea4de8e0f0ee886cf46a5ceddabd4192843445 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2dea4de8e0f0ee886cf46a5ceddabd4192843445 commit 2dea4de8e0f0ee886cf46a5ceddabd4192843445 Author: Bojan Novković AuthorDate: 2024-09-29 11:10:10 +0000 Commit: Ed Maste CommitDate: 2024-10-06 15:01:24 +0000 vmm: Properly handle writes spanning across two pages in vm_handle_db The vm_handle_db function is responsible for writing correct status register values into memory when a guest VM is being single-stepped using the RFLAGS.TF mechanism. However, it currently does not properly handle an edge case where the resulting write spans across two pages. This commit fixes this by making vm_handle_db use two vm_copy_info structs. Security: HYP-09 Reviewed by: markj (cherry picked from commit 51fda658baa3f80c9778f3a9873fbf67df87119b) --- sys/amd64/vmm/vmm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index f399f876717d..ef4c7a9af2ea 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1771,7 +1771,7 @@ vm_handle_db(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) int error, fault; uint64_t rsp; uint64_t rflags; - struct vm_copyinfo copyinfo; + struct vm_copyinfo copyinfo[2]; *retu = true; if (!vme->u.dbg.pushf_intercept || vme->u.dbg.tf_shadow_val != 0) { @@ -1780,21 +1780,21 @@ vm_handle_db(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) vm_get_register(vcpu, VM_REG_GUEST_RSP, &rsp); error = vm_copy_setup(vcpu, &vme->u.dbg.paging, rsp, sizeof(uint64_t), - VM_PROT_RW, ©info, 1, &fault); + VM_PROT_RW, copyinfo, nitems(copyinfo), &fault); if (error != 0 || fault != 0) { *retu = false; return (EINVAL); } /* Read pushed rflags value from top of stack. */ - vm_copyin(©info, &rflags, sizeof(uint64_t)); + vm_copyin(copyinfo, &rflags, sizeof(uint64_t)); /* Clear TF bit. */ rflags &= ~(PSL_T); /* Write updated value back to memory. */ - vm_copyout(&rflags, ©info, sizeof(uint64_t)); - vm_copy_teardown(©info, 1); + vm_copyout(&rflags, copyinfo, sizeof(uint64_t)); + vm_copy_teardown(copyinfo, nitems(copyinfo)); return (0); } From nobody Sun Oct 6 15:01:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM58q11rzz5YBFh; Sun, 06 Oct 2024 15:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM58p74Gpz487v; Sun, 6 Oct 2024 15:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728226907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jU5eNg8LDnGs7hfLS3P+FdmmyP9qxf+fY0chGH0iCjk=; b=Nd6CZUWw4h7k1z1stYV+6rkjfXBRGO6zvRBjl5BRM0UNNbzjzSiS6Fqxv1n3/UNHAqJsMQ M+vt1YDLr5EWv8Q6FhJWEdyhJQ+QHF/RfDC5pCIjfidBogqpQwajWYDzefDBTSmJH/kX4M a2fht/DdQQ8XwfhDrd0fIJBdh34np6xXJRUHhdhl2J6kQc4hnt2348uKXFQ92R69LC1fZz LfnqMDctw+HfByROs7j6c1GrRy4nGWNEX5GP2pqsFg7zLLyGgTHn1n1lCYOVkIYAFLxNKt CYS/VrC574PLcFgGLz0zdb2jPKlP6pyCjnW08TZ9Q872uS6tpA8fD4w4r+NQxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728226907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jU5eNg8LDnGs7hfLS3P+FdmmyP9qxf+fY0chGH0iCjk=; b=VW68SNDwyzxB9lXddMtYRE44sytuZXMDA5QEO5HF6eoNTJDFUeIFoC4IcNSl8y5nb9pPMS mI5hahT2GFXTOq5O/N6NQRUU5UBguVUgElOIWkld4RYFULfHsDEKysA1+AVJs1EWnAqyMs 7+nY7h8EF+szo8zvwxWBExFJiQC0CQLpLfWVbske2bQ6WtCi6HVnzlgS4B6ZeXlxjFy26P WvbVv089mU7YA7vTSSE0l6AYCg1LDQVD5eKExUIBvUQjwz4o+A2ic4uMFOBVBq6AJUq0NB GRJ3kB9J5XpecuFE+ipVtImtBpzVdpEBFK5SCLpyx64Nym2TdDleoOFHJ0vG/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728226907; a=rsa-sha256; cv=none; b=sWsoC5kyft8AZgfY4FAdxFt42hX8KDvJkSLO0t7Rn97yPWNqyLJEidcozpEb3M7IgrN7hc XPCpZUxpo6X5m6JMSg7pZ5nCrQoOixqUYukSk8aHWcGMy4F56L+6wbPB+BW6fnrVZSShpQ dy+jnPpybaqRc92hRFzdQLNt086sFSgcxXI+E2w6q10YeFuV/WvhsPl93UUh196kK9SZ5V zFsQenq4cypOIMaigu8fvsFZydTdyHdJrFpAmpOy7cv6C7Nhz1ZFaY/I3jSMlstEjdbFB7 43I/RAff5dF+GaPaZhklTbAKQDQR1nKu5ct3ymudbFqWCCd7sNUqG8qLqDXuvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM58p6hNLz16JZ; Sun, 6 Oct 2024 15:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496F1k8J046930; Sun, 6 Oct 2024 15:01:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496F1k0Q046927; Sun, 6 Oct 2024 15:01:46 GMT (envelope-from git) Date: Sun, 6 Oct 2024 15:01:46 GMT Message-Id: <202410061501.496F1k0Q046927@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: f8db6fb90e73 - stable/14 - vmm: avoid potential KASSERT kernel panic in vm_handle_db List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f8db6fb90e739293d6d72310fa554ede072f8232 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f8db6fb90e739293d6d72310fa554ede072f8232 commit f8db6fb90e739293d6d72310fa554ede072f8232 Author: Pierre Pronchery AuthorDate: 2024-07-25 14:40:35 +0000 Commit: Ed Maste CommitDate: 2024-10-06 15:01:24 +0000 vmm: avoid potential KASSERT kernel panic in vm_handle_db If the guest VM emits the exit code VM_EXITCODE_DB the kernel will execute the function named vm_handle_db. If the value of rsp is not page aligned and if rsp+sizeof(uint64_t) spans across two pages, the function vm_copy_setup will need two structs vm_copyinfo to prepare the copy operation. For instance is rsp value is 0xFFC, two vm_copyinfo objects are needed: * address=0xFFC, len=4 * address=0x1000, len=4 The vulnerability was addressed by commit 51fda658baa ("vmm: Properly handle writes spanning across two pages in vm_handle_db"). Still, replace the KASSERT with an error return as a more defensive approach. Reported by: Synacktiv Reviewed by markj, emaste Security: HYP-09 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46133 (cherry picked from commit d19fa9c1b72bc52e51524abcc59ad844012ec365) --- sys/amd64/vmm/vmm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index ef4c7a9af2ea..677dcd05b9b2 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -2786,7 +2786,8 @@ vm_copy_setup(struct vcpu *vcpu, struct vm_guest_paging *paging, nused = 0; remaining = len; while (remaining > 0) { - KASSERT(nused < num_copyinfo, ("insufficient vm_copyinfo")); + if (nused >= num_copyinfo) + return (EFAULT); error = vm_gla2gpa(vcpu, paging, gla, prot, &gpa, fault); if (error || *fault) return (error); From nobody Sun Oct 6 15:03:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM5BH4xptz5YBJG; Sun, 06 Oct 2024 15:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM5BH4C81z49CV; Sun, 6 Oct 2024 15:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728226983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQ5fCNWx0/WH5N3vCgugXCP5a9I4MnhFgx1+yX6cbV0=; b=RyCC5kvhywrz0hrszt5TcPgsWxE55B2tH8yWKeZwmYvYMk42GqyKId8vyZA8bwwmIinqS0 LKn5ZftNhR3iGBF3ZMfj9gzE9/BKWgphOVwGFiRkGAcIY1vSUl8bxgqHo2//zJvKXm5BeC ClFzf7V5NKJ/LUEi3vKJTflJ1F3y5wSxMeBgcB7QFplnKYDHQP7AcSl8m0+D6JOfcLmRFf ru06rULiolIC3jOGIbm/nvd4cG9M6scBmqqc8zwe6U3PdzJ2sxFHWlOeubKOehNEOWiPWo a+L9NCTEptD+/NIKI4X3I/GXN3Y6JrSa5OuGu6TQZF4oy9tO/geQ7Wze32h7wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728226983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQ5fCNWx0/WH5N3vCgugXCP5a9I4MnhFgx1+yX6cbV0=; b=ZGglryaK47VKrworBMxczOqcia3cvSfC2ue0GYndSmz7iJLJeQCq/Rhez+JRPdtiKqi2zP ASVFElgSy9eOkN5kpGe37+5s6OrC5V7vNOirQDRs0crLXQFeNqRTzFz1+icBWDAGtW1QaN yD+ATOqjbD+HWTjiOFoFW3I7W10Sx36qFiaYEjpj1gbmRw9V7toZs6EminAlA5ydY2Cmw2 5QSDn6ZA41UCzj+I9RpZnAjy9GLsYL7nIfxgO0IUoTRRyl64XZsZ5DWFV0P75awM//MqDn H94M4h8WxfyjslXhl8PilbPnQylH8vpiurRfHbpbqto+i9Y+5ZKj90Oqix+boA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728226983; a=rsa-sha256; cv=none; b=TcbNJ/gBkhmYHX2AryWblflz+pEw3WJo3LTNaZNrmpp8xVN9eGtEpPyhHS6OmtsSgfwxIx d/UMa+MfNFN0RTKBonCBs4nnFoAtutFRza3eW3+UpJZRaBDSpDvuZCBYLHPUnd3n0dl5Ub 9HtMLYNNizk0ExhsGQ67rOYohqwjhZ83AnDKVQhiwRt7nfYwR8EXEkb/yTbu4h1Fln5c9b 80Z8fK9SfQWLk3mcFnwjGfsee/6PrwpFKCVv0F1SqqxW/Pw/0mfEGNsFjirWxwB8BHK8pd YzkcazCQo79IVvQxarHgj8ldtsXIPQlxatiZbsis6ucwG7e3pUcPnK4I8FybAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM5BH3hTlz16fb; Sun, 6 Oct 2024 15:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496F33Qw048264; Sun, 6 Oct 2024 15:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496F337v048261; Sun, 6 Oct 2024 15:03:03 GMT (envelope-from git) Date: Sun, 6 Oct 2024 15:03:03 GMT Message-Id: <202410061503.496F337v048261@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: ca3d8480ec0c - stable/13 - vmm: avoid potential KASSERT kernel panic in vm_handle_db List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca3d8480ec0c06fc74ea95fbf074b975802ecf30 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ca3d8480ec0c06fc74ea95fbf074b975802ecf30 commit ca3d8480ec0c06fc74ea95fbf074b975802ecf30 Author: Pierre Pronchery AuthorDate: 2024-07-25 14:40:35 +0000 Commit: Ed Maste CommitDate: 2024-10-06 15:02:51 +0000 vmm: avoid potential KASSERT kernel panic in vm_handle_db If the guest VM emits the exit code VM_EXITCODE_DB the kernel will execute the function named vm_handle_db. If the value of rsp is not page aligned and if rsp+sizeof(uint64_t) spans across two pages, the function vm_copy_setup will need two structs vm_copyinfo to prepare the copy operation. For instance is rsp value is 0xFFC, two vm_copyinfo objects are needed: * address=0xFFC, len=4 * address=0x1000, len=4 The vulnerability was addressed by commit 51fda658baa ("vmm: Properly handle writes spanning across two pages in vm_handle_db"). Still, replace the KASSERT with an error return as a more defensive approach. Reported by: Synacktiv Reviewed by markj, emaste Security: HYP-09 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46133 (cherry picked from commit d19fa9c1b72bc52e51524abcc59ad844012ec365) (cherry picked from commit f8db6fb90e739293d6d72310fa554ede072f8232) --- sys/amd64/vmm/vmm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index ac2dd4142dd0..1bf2077ef2a1 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -2728,7 +2728,8 @@ vm_copy_setup(struct vcpu *vcpu, struct vm_guest_paging *paging, nused = 0; remaining = len; while (remaining > 0) { - KASSERT(nused < num_copyinfo, ("insufficient vm_copyinfo")); + if (nused >= num_copyinfo) + return (EFAULT); error = vm_gla2gpa(vcpu, paging, gla, prot, &gpa, fault); if (error || *fault) return (error); From nobody Sun Oct 6 15:04:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM5DF10ZFz5YB4D; Sun, 06 Oct 2024 15:04:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM5DF05Thz4B1K; Sun, 6 Oct 2024 15:04:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728227085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20spB0Xmg39lijxycCqO2YSsOL2kZpq/S9Lgl2OVEOo=; b=wjKIuOFcdw0gUpAcX6HysL1TRP/GtejXCAwXv+b1Fue4mNM9pPPZE0LdaUs1cuCB3VJl++ JkKuLc1J9TGRbJOBX+eeYuN3ptDWZ9W/h6c7fvVU3PMV7d4mcD3sgvxjCtYtVxzHOGOOrH 67iqR4iq4vQBlxeK31QFMHOz4oMWsVXo+10zPVL5KEXOSyT1pHe0GD598b91iu358UdtgM IxB7+71AzkQ+6iV/8YO/04WzpSSTku9/62YXV6beJqGmkkZ9XqIyo8BxIOT4Az6kJ8xbIT /GZRjsYex4NV7BIXvnK6JnYYGY27PWrhjwgmhJ8muHoyWVvpKU7u3/WauDO3og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728227085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20spB0Xmg39lijxycCqO2YSsOL2kZpq/S9Lgl2OVEOo=; b=NbtOINW5L9023M01yRa7czyLd4h1/pWPrOCY5j2cyyAVYJf5GOOpJPn4Rs5staFmvnMNf6 6Zl1Prn2Bn3kYIswV1CtqAoaYpeV+Jzh8Ne2uzHxpgB7Lu0K7W0azY1iYsS6KBS8UPywTC qRg6+Bx8xkWdHFj1AVp+koD+vdh1nengozZXMnhLk/tMC2+SL5T7sJ+EuuGVYzPEAMBJo/ oDmbMXFRY2d8YGnkuz938pg4v7WBriUaEtxoVZ4MQyz5NWVJIW3qcVY4Zw/XeSKJC3dRq3 gaEiux2s5rRlyPa13PFv25MMncTasV/4qww1lnDPXDqnvBc+3KyUOxih4Fd6fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728227085; a=rsa-sha256; cv=none; b=QjKkbe0XSUi+xsOnbcRsr4sl/AhNr1yZHSdxi2pBbcANXD9BwZX0t+H716e0X0KiD5cO4m ArntSExhbsQyP1+PiFQ610pmUIXSlGvOajJomkaW+Sn6w6obyT43F2K73HyoB+0mzKwm86 eGdIM0yF3fJ7ijbqKVqBY5GxkWyE7ArSOb7S33uuICbpc4RwyYEmWsJvwxsm/eqyvQu5xm yvA+V5XzpVeIGNtbFyUPHZ1I3vq5ixtYDTF4O15zpEw3hhl6jaTSWzfugMFsrn4ymKkV7R gqEWsGij/mvDrJ4GVyF1i69XAlHJl+kpx7119FamRD3pwzqNVPkty97Rh9hY8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM5DD6pc0z16Jt; Sun, 6 Oct 2024 15:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496F4iaZ048599; Sun, 6 Oct 2024 15:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496F4iDJ048596; Sun, 6 Oct 2024 15:04:44 GMT (envelope-from git) Date: Sun, 6 Oct 2024 15:04:44 GMT Message-Id: <202410061504.496F4iDJ048596@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: 757bbf484c0b - stable/14 - bhyve: improve bounds checks in hda_codec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 757bbf484c0bab2c4c7b504017079cceb833f7ae Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=757bbf484c0bab2c4c7b504017079cceb833f7ae commit 757bbf484c0bab2c4c7b504017079cceb833f7ae Author: Pierre Pronchery AuthorDate: 2024-07-24 14:56:54 +0000 Commit: Ed Maste CommitDate: 2024-10-06 15:04:29 +0000 bhyve: improve bounds checks in hda_codec The function hda_codec_command is vulnerable to buffer over-read, the payload value is extracted from the command and used as an array index without any validation. Fortunately, the payload value is capped at 255, so the information disclosure is limited and only a small part of .rodata of bhyve binary can be disclosed. The risk is low because the leaked information is not sensitive. An attacker may be able to validate the version of the bhyve binary using this information disclosure (layout of .rodata information, ex: jmp_tables) before executing an exploit. Reported by: Synacktiv Reviewed by: christos, emaste Security: HYP-13 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46098 (cherry picked from commit e94a1d6a7f2eb932850e1db418bf34d5c6991ce8) --- usr.sbin/bhyve/hda_codec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c index 1866149c020a..b7d6ec043675 100644 --- a/usr.sbin/bhyve/hda_codec.c +++ b/usr.sbin/bhyve/hda_codec.c @@ -521,7 +521,6 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) payload = cmd_data & 0xffff; } - assert(cad == hci->cad); assert(hci); hops = hci->hops; @@ -530,7 +529,10 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) sc = (struct hda_codec_softc *)hci->priv; assert(sc); - assert(nid < sc->no_nodes); + if (cad != hci->cad || nid >= sc->no_nodes) { + DPRINTF("Invalid command data"); + return (-1); + } if (!hops->response) { DPRINTF("The controller ops does not implement \ @@ -540,7 +542,8 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) switch (verb) { case HDA_CMD_VERB_GET_PARAMETER: - res = sc->get_parameters[nid][payload]; + if (payload < HDA_CODEC_PARAMS_COUNT) + res = sc->get_parameters[nid][payload]; break; case HDA_CMD_VERB_GET_CONN_LIST_ENTRY: res = sc->conn_list[nid][0]; From nobody Sun Oct 6 15:06:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM5Gc5rB6z5Y9x4; Sun, 06 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM5Gc3mvdz4BpG; Sun, 6 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728227208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4NTgafyVM5mYp15AcTV3u5pr2cdLaZn8aBb1OuIBkZ8=; b=kSdrbdDhePJVp5ptsuH052p8Txg4EDAJW4bBwnDx26StuVwppX0DG92tpRXZ5EC7ilPvSS 583Fl5BRdJeecMN4xryZpCpupDmEdSTVKHd0quX4xiisdtiM5KPhITjcofarsju4kA61Gk FSCfvUacMczHctuNR30fTf+nDZXtgdBDWgxxcqUsTUcVR1yAsUG9mcXp0ENlF1QdKxGKxQ wvBEbt9mwb+CQwseVaIPZez7nTcaPBbU8rVkMnc5Uu7okkd4+HMJsifuHn9jVXomLuHZe1 fdJVoh2XHZGdZfYXdDbFBOB+UicbJxy2T9JPZ2myWt2GSAJyDgT9mj772QUkBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728227208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4NTgafyVM5mYp15AcTV3u5pr2cdLaZn8aBb1OuIBkZ8=; b=VzaP1JsX8/AcP9i6wMeqOeh1EYbGMDh4nYDfJOs0BGiBlgAkhMfVa+VmWjcT6NRbwSXb7D GuRWtcvSomo4kPDwMhXIF0vPx+pIbI92E1jsd2MO2iXajrBBiookk2sKg+V4qbLJukkzpZ CpWnXO0yZazovqLc2NuCdRErgxM9YAc0hBewueZDWdaKaikvdduq2fyBXAKmyle42ZV2Ne 087sd+G1Ot8qHQW4pyD+RQkf9/VNuQlm7f/F5RmT8/rjhBe4p1Ehab248xwiWhBfJA3hhM oK2i+DbLM+v5TFqrPtJUYXevOoYiFWSghPLP6dO0rKA+gb/XQN517+yxmK/DKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728227208; a=rsa-sha256; cv=none; b=A5iq8fGFts91TaWl8FF+J2AT3xS1qNPHIWrVYu5bgKgiCwnrjUg/YMd/cHQqUxMbn6QpzH N3k+r7/6qKDp4ZziwMx1J/PgYPXtdPT8DPJbeZejkvY2/mW9Puv73QR5jdvVwZL5uFE6dl 8AfgTgOKJTfafjf4djuKT0IKrT8Jaj7dagXpSIhCd8ZgjqrP8BowQPuJmZ+pDmKumhL/vp CoARCDZgHJEQzmcrqgUTTR0fSo5wCrvXri/uzHRWCdEn6jbhQV/j8/eCYaZHA1y1JRRDbh 7bwLPnzfc+ubzWBQsgHH3dhFfRAJoT9ofgmocGrM95M0OyGTnFghsiZAC31tTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM5Gc3KQZz15Yp; Sun, 6 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496F6mgX049074; Sun, 6 Oct 2024 15:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496F6mh6049071; Sun, 6 Oct 2024 15:06:48 GMT (envelope-from git) Date: Sun, 6 Oct 2024 15:06:48 GMT Message-Id: <202410061506.496F6mh6049071@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: 6cb1995a66ae - stable/13 - bhyve: improve bounds checks in hda_codec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cb1995a66aec98261256bc4da3eedfe840e1ab9 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb1995a66aec98261256bc4da3eedfe840e1ab9 commit 6cb1995a66aec98261256bc4da3eedfe840e1ab9 Author: Pierre Pronchery AuthorDate: 2024-07-24 14:56:54 +0000 Commit: Ed Maste CommitDate: 2024-10-06 15:05:09 +0000 bhyve: improve bounds checks in hda_codec The function hda_codec_command is vulnerable to buffer over-read, the payload value is extracted from the command and used as an array index without any validation. Fortunately, the payload value is capped at 255, so the information disclosure is limited and only a small part of .rodata of bhyve binary can be disclosed. The risk is low because the leaked information is not sensitive. An attacker may be able to validate the version of the bhyve binary using this information disclosure (layout of .rodata information, ex: jmp_tables) before executing an exploit. Reported by: Synacktiv Reviewed by: christos, emaste Security: HYP-13 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46098 (cherry picked from commit e94a1d6a7f2eb932850e1db418bf34d5c6991ce8) (cherry picked from commit 757bbf484c0bab2c4c7b504017079cceb833f7ae) --- usr.sbin/bhyve/hda_codec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c index 1866149c020a..b7d6ec043675 100644 --- a/usr.sbin/bhyve/hda_codec.c +++ b/usr.sbin/bhyve/hda_codec.c @@ -521,7 +521,6 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) payload = cmd_data & 0xffff; } - assert(cad == hci->cad); assert(hci); hops = hci->hops; @@ -530,7 +529,10 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) sc = (struct hda_codec_softc *)hci->priv; assert(sc); - assert(nid < sc->no_nodes); + if (cad != hci->cad || nid >= sc->no_nodes) { + DPRINTF("Invalid command data"); + return (-1); + } if (!hops->response) { DPRINTF("The controller ops does not implement \ @@ -540,7 +542,8 @@ hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) switch (verb) { case HDA_CMD_VERB_GET_PARAMETER: - res = sc->get_parameters[nid][payload]; + if (payload < HDA_CODEC_PARAMS_COUNT) + res = sc->get_parameters[nid][payload]; break; case HDA_CMD_VERB_GET_CONN_LIST_ENTRY: res = sc->conn_list[nid][0]; From nobody Sun Oct 6 17:22:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM8HL0mnwz5YKYC; Sun, 06 Oct 2024 17:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM8HL0F5Nz4MRJ; Sun, 6 Oct 2024 17:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728235358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2X+YcptTpXI2jMB6Oie+WTmUw5FdZf2NotWlIFntv2I=; b=SLT5Cq0B05UssBQ9ZsdLZnjiGe929Zu/mEuUyLTM2NI4TzOSXDsvfXXk0/NQQWYwJUANVV 0TE3sXN6lRul+Ao9Hnpg753AnTq7yagCUed6llZOr3NkI/ZAmkVWH2LyrSCDpf/tC1S/Nd UBXBePm07YPFd+JUl7BzWr5uUKKXG8jEh59Z2I20VXh4kYoPAl6hIgS1f+ng1gvEGuAolR BVM1Lrj6ACKAITR519YxB/JQ4XDoVMakujexr4WCxxN6COGNKC8Zftz58U0XPRqMKFf+2c F1ufvozQ8wpqYJRpycN6XbJ8BXBAE0L3qlUnUvv8x+HWeIsY6PtWRahSr3YUhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728235358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2X+YcptTpXI2jMB6Oie+WTmUw5FdZf2NotWlIFntv2I=; b=VaODJIG4YxVICQYs8FFYAKMNtIaddKVnBDA+BQa+l/iotcOuW2ZFx9f0ebedDAH84dMS/o 2BNBnOjGbXFBstZn3ZwGDmhrXNNzLZ7DjB9mi6Xn79jOjMau5u87W5DNZ6+6oS5tP34KOq QqlGLaHfk/VPWov3w9DIXAnVu5T+vXt2NvPVYArDm07pr1MlUeqeruxA/2moYxI+bZyF/s luOxyDz1j0v0AyIJJhpIwyFCf3Cs3LuPejQ9EozuyLUjD/joE74v8EJ0LmMOuUabIGGACP pVq3lBGLmkysJe3vyoaycU9iraXUOxmLTcxeICTKh9T4NWgAD5R6idgsmAgfDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728235358; a=rsa-sha256; cv=none; b=k6T6YAQdX0zPK9K4HTtP0ZA4lI8NiPPth0CCnvDQySOst97/ImoWXe8tHz6Z6ChRmr5l5R r47Rujk8W4W4HxVT+XZfN1fSGfzjLqaYmN3dGT+eyCj4CJP3lbAzI1FtuYBk1UdNY+bbLZ oclBNmS+n1Lq6l4rqBikYXbEYhXOTMIf9guuD82HY5f/VsHzPaC1TxtM/BY0Q4cIE9XWsR 1vqFSTpUYTFslSHNfoj+h8/3RbZd28TmhqOjziOFGDeNU5TVmU+W2f48FMYyG0f6HQyvSM sLr0xGBGG+FiGezDyjnVM1Ao9kjibTkzqK6vTS7Z9g28oJoVc9G2nM2cY7MPWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM8HK6qC0z19yx; Sun, 6 Oct 2024 17:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496HMbLm085989; Sun, 6 Oct 2024 17:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496HMbeC085986; Sun, 6 Oct 2024 17:22:37 GMT (envelope-from git) Date: Sun, 6 Oct 2024 17:22:37 GMT Message-Id: <202410061722.496HMbeC085986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 357185a966c1 - main - membarrier.h: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 357185a966c10397c971ef23525943ebc47d58d9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=357185a966c10397c971ef23525943ebc47d58d9 commit 357185a966c10397c971ef23525943ebc47d58d9 Author: Ed Maste AuthorDate: 2024-10-06 17:21:49 +0000 Commit: Ed Maste CommitDate: 2024-10-06 17:22:21 +0000 membarrier.h: fix typo Sponsored by: The FreeBSD Foundation --- sys/sys/membarrier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/membarrier.h b/sys/sys/membarrier.h index 958b769da23e..31a605634ddb 100644 --- a/sys/sys/membarrier.h +++ b/sys/sys/membarrier.h @@ -50,7 +50,7 @@ enum membarrier_cmd { /* * RSEQ constants are defined for source compatibility but are - * not yes supported, MEMBARRIER_CMD_QUERY does not return + * not yet supported, MEMBARRIER_CMD_QUERY does not return * them in the mask. */ MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 0x00000080, From nobody Sun Oct 6 20:11:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMD2D1GFTz5YTmn; Sun, 06 Oct 2024 20:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMD2D0kTQz4hST; Sun, 6 Oct 2024 20:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728245492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pv1yQrEVMWVB+d7idEQQRmw1eRvzAof3YQmZoC9K6Rs=; b=M5bUvg/FW+smL7S6JeFzKoiY0+nXtNAMgZzao9KIjw/5p8OzJsPIi6cufwkb0UgAMRZNld nJ9XeuglD+0FDgUbuZc84nbUv5E/9B55wH6WBy/v70fOtOfRymZsLOnFerXMjjcwkJkybw U50bi5D2wDidWy9wlp9RS17XIRyqnfQCBVBVmZZxW7CVDqtS3KkCGCAvH7UWzpWpPsxFw0 3As9QKgEJ1m/p8AOw9YXm8lxOMAby7Y56arbT9eayl7TUB+pQ3rYk/GvEzpp5tQxyJcxXV RZuJlGjfjNHrN17rD5DT+/PjUT7ihpLcFM1HUDKjUe98B4FnjeJBvKlkZ0bdzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728245492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pv1yQrEVMWVB+d7idEQQRmw1eRvzAof3YQmZoC9K6Rs=; b=L3aOiD8D0aK0RSRScuruYzl1AXJ0ztnL1thG1Yk5nDXZcpIA3Le/9efpD7lWwNlgShEnQT SuVK3pn17P981ni8bOoYGDiozglFyCdbwZSnJvaxHuQYnYNJbxV3tMCyRmW2CuG9loRWB9 gdJvPjZKstNPWTjnlIPsq14Rokhdz4kXWlH4wGpJe9XA0kclb5z3ll8MoxeAbuBz0Me0ig m4RC3w3TmMu4LS8R8cHK87nF/98JwuABkYFJGh41uzzISDz1YSvtPiN2uostXxPCiJeXCX M1fCw1nIJZY6bIWDxceL0C7SZTn2PzxEEM5Xsrc8pMmV5Oqiv0vqyszvizTSKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728245492; a=rsa-sha256; cv=none; b=nUupTgNblW8e5Ih7elrOBANlXiAM2K6kbID0Ago7uk8XyybE4L24o/MiIj7Wk103wwwp2Z gSFdxfC613ITGMl2AYDaFgrdNq9wN0BXTMn2LtkzP7bFlMoqG4Thpondo+x/09/c8oDlEX N0o46s5upuDdaWwoT6YXKOd8GTQuZ/OIhBswk2DM2NywlScvTSBU1huEnr2P0zRAxkbMe2 UPG6D6gqVM8WQY6Vk6yXIytEuE84nKPGLDKf7b+1oQqIGanC/q1aTKof3RO4cFrQk4M8ai eUifz7b0GqySH93PG/dZs1xPlDdHKcCQIHrAG5eVgbKj+QpElUhSbEwloHhOFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XMD2D0L1lzGlf; Sun, 6 Oct 2024 20:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496KBVRt068884; Sun, 6 Oct 2024 20:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496KBVFq068881; Sun, 6 Oct 2024 20:11:31 GMT (envelope-from git) Date: Sun, 6 Oct 2024 20:11:31 GMT Message-Id: <202410062011.496KBVFq068881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 9147a0c93bc0 - main - pctrie: don't assign to root List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9147a0c93bc0b93d2d9d11e0a5a4a7358d04137a Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=9147a0c93bc0b93d2d9d11e0a5a4a7358d04137a commit 9147a0c93bc0b93d2d9d11e0a5a4a7358d04137a Author: Doug Moore AuthorDate: 2024-10-06 20:10:10 +0000 Commit: Doug Moore CommitDate: 2024-10-06 20:10:10 +0000 pctrie: don't assign to root User pctrie_root_store(*, PCTRIE_LOCKED) to change the root value of a pctrie, to ensure proper synchronization when smr is in use. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D46968 --- sys/kern/subr_pctrie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index b461ffa3c5be..a7b487166054 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -304,7 +304,8 @@ pctrie_insert_lookup_compound(struct pctrie *ptree, uint64_t *val, if (pctrie_isleaf(node)) { if (node == PCTRIE_NULL) { if (parent == NULL) - ptree->pt_root = pctrie_toleaf(val); + pctrie_root_store(ptree, + pctrie_toleaf(val), PCTRIE_LOCKED); else pctrie_addnode(parent, index, pctrie_toleaf(val), PCTRIE_LOCKED); @@ -1242,7 +1243,8 @@ pctrie_replace(struct pctrie *ptree, uint64_t *newval) if (pctrie_isleaf(node)) { if ((m = pctrie_toval(node)) != NULL && *m == index) { if (parent == NULL) - ptree->pt_root = leaf; + pctrie_root_store(ptree, + leaf, PCTRIE_LOCKED); else pctrie_node_store( &parent->pn_child[slot], leaf, From nobody Sun Oct 6 22:55:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMHgW1j2Kz5Yfqn; Sun, 06 Oct 2024 22:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMHgW1BpXz49N6; Sun, 6 Oct 2024 22:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728255335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vs8dH7SdlPJfryqQSg6hpUZ5ijPutfJu8DfNRf5XMX4=; b=xPQOtXCCJ9XCr2QUoa7YWp4WpjMmRc3sEoqfNP4UAv3JLZggNiv6vRJnOfmNTbkfLdPHM9 eXrNgP1aUjQbCSqa2PNBr8hshZCywQ5CZwkMERVj+WpvVWC3Uzz1RBlscGjheyp5X01otu x91M5aB9kreYGADVijz4NiGZZ0NHvyj8Mq/M0ozp4PEa0m+UaX91i5YQ3UwYj1Vbjlvu+Y OLPQn5BswYAb47KB9PR3BCMx15jgGEQKpA/l9SYx1EToViLuRSx9I7EzQopv8AqmzVyu1+ Nex3fHJ3kTNIpSQvj9Ca/TrWgm0RySmOO0iOig+hhfYIyGccbSDQygH8aR5mkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728255335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vs8dH7SdlPJfryqQSg6hpUZ5ijPutfJu8DfNRf5XMX4=; b=AgeD3vDkOnlhUy6VU4fqqIUxhMMcdc2AoQJ7YMjXXu2dnB4tLyejkQflIC5qmWsnuxcuql jIm/aJHvV7U834SQZhSDelDXFI3vf16YN5Nik+K+AWc5cgyrkHNs2tGjxC3TVmz99o+zQg JO/7+kuqvGvD76lniGVdfyioyRW/KDar0E2Rn2FuhZitczHv33iXvXrLa1KuwDwBly9nMA 3D/PUE4gLhfKATX0fF8spZc3GqygGYc6jyQzx452DtH50zpS14EJPEUcCcBRelVMCI+rzR vDKNE0SaqGK+aUEo4ksjHySdogYY5KHS0hD6BWRjspMQrer04U0vN1RpbOan/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728255335; a=rsa-sha256; cv=none; b=Zfn9Yo69l+hpr1f6eWkVB8eRndRe2IuBHvmBPxqaZhIw9xpqfWxB+mmzLYL/rLTHdcNtq8 mt8npRXsmCv/P7uNwIXL01sxWnThaVY6cbt5E8ZaObP5hUg8L5u5gX6Yr25ZBstgZmtYtH t/CgPR+nESnqpESiQkZPG54oOxHlQ15DQB2tsKnOAVISKAQrijVggIUQ3wk4sAYc5ihbAV 4RkuLXxynfZOXmTmzwUHA9Ay11yiLSnNtR5v1zxZKpuuuV+LpM8Otig84ocgjQ98wvpZaM CG+IX/u/yqAaevo07jggA8l6K7ig5BUAm0/aIrCCiD4zHUO+B/fAshBbfQld0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XMHgW0Nj7zLj9; Sun, 6 Oct 2024 22:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496MtY6Y044441; Sun, 6 Oct 2024 22:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496MtY36044438; Sun, 6 Oct 2024 22:55:34 GMT (envelope-from git) Date: Sun, 6 Oct 2024 22:55:34 GMT Message-Id: <202410062255.496MtY36044438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7f1dfd6c33db - main - vm_object: Fix the argument type to vm_object_set_flag() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f1dfd6c33dbbb6c1136e987de554c5c5a7d014d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7f1dfd6c33dbbb6c1136e987de554c5c5a7d014d commit 7f1dfd6c33dbbb6c1136e987de554c5c5a7d014d Author: Mark Johnston AuthorDate: 2024-10-06 22:54:13 +0000 Commit: Mark Johnston CommitDate: 2024-10-06 22:55:02 +0000 vm_object: Fix the argument type to vm_object_set_flag() Reported by: kib Fixes: 9d52823bf1df ("vm_object: Widen the flags field") --- sys/vm/vm_object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 3274f59f958f..71a1c33c7f26 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -283,7 +283,7 @@ struct vnode; * The object must be locked or thread private. */ static __inline void -vm_object_set_flag(vm_object_t object, u_short bits) +vm_object_set_flag(vm_object_t object, u_int bits) { object->flags |= bits; From nobody Sun Oct 6 23:45:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMJnG5hDMz5YjBd; Sun, 06 Oct 2024 23:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMJnG4sYwz4GCN; Sun, 6 Oct 2024 23:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728258338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37eXbDnR9+q7xAZEu7JdwlJRWrSySbNB2qMWl2ZcToA=; b=y4iUssPiiY5IZrwgEC7tWqqbPrP/jbS3tWXZ15ZUPj7SOz9OJ8/ijvvb7uh4N+jHom87fW AD86k8kSqQgCQEX8BBL+Wqc5EdDTlTQXnxePl5F93N80atkgnQytRp6HXHKTzfJhcI8/3m oGaF7dmlNe03Vir239pKGQJ7oblVGek6oVBU0VMzJ70JCWykpRfsWR3nWnWhwMoGpSjXxc UXKBSN1Sy5hH/caxYyE3y1kFxCiHVdcQFt6a+6sg8mHQNK6ndjMPLeXl4afS8C8Q9CZk/T VOj3M/7u6nKcuerLJVOhsEkoK1HKj0nu2MZ5eICOtInfg8vPQMJWbYrwOkWavg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728258338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37eXbDnR9+q7xAZEu7JdwlJRWrSySbNB2qMWl2ZcToA=; b=CHLm+2UUIVO31Xsq4aYkXLs6+m939QGJCth3tJKx2argo0a1TlVu1T9alViyvOQbI4BN8M 7Uwq1i41yD7hjHdSJ4oCbP9iC3xvbOGzAjOFtxVEzrjwWwJd7Jnb3q0Ju+WnCo/1pPXug1 rq0M6zTNleqsplDtPh1GUOyHDPhLeciONk4f1XXlhd0nz6/1PiPCEy0jLYiQb8gkeHRbcE hNVxECWkbgCdZgmM7y176PzFUXxxHLEIjrr0/01L+gIJOJwsozHy4NxKR6uMqI9qTofM9N bVfrgXYUKkjn5enaVV9WJB3LDlIhptf7AHCFxqfvaxkPW/+UU1DvqkWgyD+tDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728258338; a=rsa-sha256; cv=none; b=qwTKXu0ClmzRocXfW9rxkzG/xWTF6jHJUuPjQ2lhdV9Hjjj3XLpIHDBu1mjAXLt2M6pjzA g3WNqxujm3uvZKbMcSu6fcLo6zQHSCbf7yhqMsE9xafgtq2cbWHlhiXy/KId8R2rwsNaoK xqwu8lvY+AuuD6YMYWOPOWrp6LfaaO01aPDPrOCXtMeDPHrYfbgAtXW7g/F/YSjQ7R8Rej FodRmidottH38kNYATPVesdeVQnmkK1zcxd6N+NxLFOsiSJv0EHw19bqV1zczW7PdZ1qY0 lyyGGREnQOTsLAUb5nZyK/dFdkAPWKC1+qF1+K0sb6mkcrm/+QeJP8QgSBF5lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XMJnG3n48zNZm; Sun, 6 Oct 2024 23:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496NjcOI028950; Sun, 6 Oct 2024 23:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496NjcK4028947; Sun, 6 Oct 2024 23:45:38 GMT (envelope-from git) Date: Sun, 6 Oct 2024 23:45:38 GMT Message-Id: <202410062345.496NjcK4028947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1fc766e3b41d - main - membarrier: Add manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fc766e3b41d0cdbd166ef95258434069a90ca52 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1fc766e3b41d0cdbd166ef95258434069a90ca52 commit 1fc766e3b41d0cdbd166ef95258434069a90ca52 Author: Ed Maste AuthorDate: 2024-10-06 17:47:34 +0000 Commit: Ed Maste CommitDate: 2024-10-06 23:41:57 +0000 membarrier: Add manual page Add a minimal membarrier man page that documents the available cmd values and errors that can be returned. We can add more information and iterate on it in the tree. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46967 --- lib/libsys/membarrier.2 | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/lib/libsys/membarrier.2 b/lib/libsys/membarrier.2 new file mode 100644 index 000000000000..fe2e6ff763d5 --- /dev/null +++ b/lib/libsys/membarrier.2 @@ -0,0 +1,150 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" This documentation was written by Ed Maste +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd October 6, 2024 +.Dt MEMBARRIER 2 +.Os +.Sh NAME +.Nm membarrier +.Nd memory barrier +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/membarrier.h +.Ft int +.Fn membarrier "int cmd" "unsigned flags" "int cpu_id" +.Sh DESCRIPTION +The +.Nm +system call provides a memory barrier, ensuring ordering between memory +accesses performed by different threads or processes within the same address +space. +.Pp +The following values for +.Fa cmd +may be specified: +.Bl -tag -width Dv +.It Dv MEMBARRIER_CMD_QUERY +Query supported commands. +A bitmask of commands supported by the kernel is returned. +.It Dv MEMBARRIER_CMD_GLOBAL +Issue a memory barrier for all threads from all processes. +.It Dv MEMBARRIER_CMD_SHARED +This is an alias for +.Dv MEMBARRIER_CMD_GLOBAL . +.It Dv MEMBARRIER_CMD_GLOBAL_EXPEDITED +Execute a memory barrier on all running threads of all processes registered +with +.Dv MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED +.It Dv MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED +Register the process to receive +.Dv MEMBARRIER_CMD_GLOBAL_EXPEDITED +memory barriers. +.It Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED +Execute a memory barrier on each running thread belonging to the same process +as the thread calling +.Nm . +.It Dv MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED +Register the process to receive +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED +memory barriers. +.It Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +In addition to the guarantees provided by +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED +it also executes machine-specific serialization instructions, which +ensures that all possible speculative and out-of-order activities on the target +CPU are fenced. +.It Dv MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE +Register the process to receive +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +memory barriers. +.El +.Pp +The following +.Fa cmd +values are defined for source compatibility but are not yet supported: +.Pp +.Bl -tag -width Dv -compact +.It Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ +.It Dv MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ +.El +.Pp +The +.Fa flags +argument must be 0. +The +.Fa cpu_id +argument is ignored. +.Sh RETURN VALUES +If the +.Dv cmd +is MEMBARRIER_CMD_QUERY +a bitmask of supported commands is returned. +Otherwise, on success, +.Nm +returns 0. +On error, -1 is returned and +.Va errno +is set to indicate the error. +.Sh ERRORS +.Nm +may fail with the following errors: +.Bl -tag -width Er +.It Bq Er EINVAL +.Fa cmd +does not specify a valid command. +.It Bq Er EINVAL +.Fa flags +is not 0. +.It Bq Er EPERM +An attempt was made to use +.Dv MEMBARRIER_CMD_GLOBAL_EXPEDITED , +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED , +or +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +by a process that did not previously register use with the corresponding +.Dv MEMBARRIER_CMD_REGISTER_* +.Fa cmd . +.El +.\" .Sh SEE ALSO +.Sh STANDARDS +The +.Nm +system call originated in Linux. +This implementation aims to be source-compatible with the Linux implementation. +Certain +.Fa cmd +and +.Fa flags +values are currently not supported by +.Fx . +.Sh HISTORY +The +.Nm +function was introduced in +.Fx 14.1 .