From nobody Sat Dec 23 23:59:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyLjy0bVSz55BHr; Sat, 23 Dec 2023 23:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyLjy03jbz3Fxd; Sat, 23 Dec 2023 23:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703375958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uYvArKtdx6eRogCkDIEkV0ybyVF6Ga1Q9xXwwQhRyhU=; b=lB5YEsYnmd6hgu4BGVD4eGz72AWaiyciuWSJL/MaCrE7I8qrxqm4ElrzdqJkG6QrHQCqE7 /W2f1G60cPYvsY/D3EIaQmRKRJHBHHDwpYFqUb/Aq1DRwnzQQxKDzIEG6vdKedPxJ/gkiu q0CBTvvW6QEUOUSzLLrmXks1UCZAGLysgi2+v/+8WV623Fx/uMKiYVTFQbiplU0NhVypNV 0IwRmZMdeE89YOUsN2NYq6BLpOrnWJa34s4IgyKKI0zASIto7YGYmRvbpXUoB+2UZNRTsU ziASwYGLbn16lAehWLgUP6oxeRnAwjDZrwolUy9coG5gClQ7yfniYDKuKCDYYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703375958; a=rsa-sha256; cv=none; b=ayguaXE9QTTATZC+Q5S1/g1EWW+y5TcI9xDuI0sa4dDRR+cDk0nRStsNF0e3RnVhH42sNR oeDos/nseKkue2eSk/BsZojUdKkN9jJlHSYNgznPFOMsPEW6uNpUzLSlcs1ftObBaPsM7s 0QFXaodz7I2Rc4D7H2cwh84JdAjh4eJ5/tfQhz3I6SBz9vg0xR0TLvckTb3fZPD19lnc/K j/ujFwvEIcdI7+7MCiNTYRj1sk75Rwar45iddvwuBUMK3r47v4DSydRHm8pPiwygPN1Bm9 G8Sb6bxqLsR4LBWddIDFeHxZbz96S5yfOfH6CRer4RgqE3ZES7EbpLT6wx0YWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703375958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uYvArKtdx6eRogCkDIEkV0ybyVF6Ga1Q9xXwwQhRyhU=; b=lB58qX4knyenGxA4B5Vuc0mll/W9QFuKYOf1XYSDm10hs1eDztTii10md+MpxSwckzFiEw iLkmUPz5qAAFekib7Vi5N/i5X6APLhsqzSUbAAJmEJTK2MVE9tdp1w/05l1eUvZUCnEPHM KQkrDf02YKUu+RqllOH89pxqAIqY3sOpkRn3d5o1VDihsm8TYR5XLQRSwrUFhLZxV1jGxd rrw9rwCJdkNwtPIFRwDvIUM9UyTqp2zM6W3bYoEtRil5gtbl5GsVQRwk6R5+8y84J7+U6s h5Q49PBTUP8tFSXMebMBu+xgtiEwtwq6NuXajsLKHpSEdlsyoZbDnw8VtVAGBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyLjx6DyZz1JyM; Sat, 23 Dec 2023 23:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BNNxHAt032197; Sat, 23 Dec 2023 23:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BNNxHvg032194; Sat, 23 Dec 2023 23:59:17 GMT (envelope-from git) Date: Sat, 23 Dec 2023 23:59:17 GMT Message-Id: <202312232359.3BNNxHvg032194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a74df3f96e3e - main - iicbb: Fix pause_sbt() arguments order List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a74df3f96e3ea4cc632088be870d9b0b0198859c Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a74df3f96e3ea4cc632088be870d9b0b0198859c commit a74df3f96e3ea4cc632088be870d9b0b0198859c Author: Alexander Motin AuthorDate: 2023-12-23 23:52:17 +0000 Commit: Alexander Motin CommitDate: 2023-12-23 23:58:51 +0000 iicbb: Fix pause_sbt() arguments order It should make pause interval less strict. While there, add cpu_spinwait() into a tight spin wait loop to burn less power and let other SMT thread work more. MFC after: 1 month --- sys/dev/iicbus/iicbb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c index 3948d5d5a9f6..5d6ac48d4543 100644 --- a/sys/dev/iicbus/iicbb.c +++ b/sys/dev/iicbus/iicbb.c @@ -52,6 +52,7 @@ #include #include #include +#include #ifdef FDT #include @@ -254,11 +255,12 @@ iicbb_waitforscl(device_t dev) do { if (I2C_GETSCL(dev)) return (0); + cpu_spinwait(); now = sbinuptime(); } while (now < fast_timeout); do { I2C_DEBUG(printf(".")); - pause_sbt("iicbb-scl-low", SBT_1MS, C_PREL(8), 0); + pause_sbt("iicbb-scl-low", SBT_1MS, 0, C_PREL(2)); if (I2C_GETSCL(dev)) return (0); now = sbinuptime(); From nobody Sun Dec 24 00:10:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyLyY3Dv5z55CDM; Sun, 24 Dec 2023 00:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyLyY2kLBz3JvB; Sun, 24 Dec 2023 00:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703376613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHFBEkTjVlkgQ2XSbMe/ep6bDACkyAtxpV0ZM82mGYA=; b=GdBO3n7MZsOv4C4zwQF9AV1NB5CtN6a1JjOnopWkZKpZZiifgJw1DigyOHXitQB3OQS3zg tHw3GYaYhcJZOS+SB7MkqOKQeXne5qnaqwdCEvVzhMdgxtJRAamuM5dmWsTXq4o4MqmyKu 6z9wUfU5I3R8HyVmt6GcKRcJ0cL+py9qSA5Aqe8aaQehceRcE5M9RioPMQa/nFDxXH6IeV HgYXx1o9z6copi7gTgHVgvYNlxeOkSfKTi7Gxq9z3ebsHWrittrQiBHvDGLMtSHMjOdSlN vRQ2W46OuJJ8nZqgeYVES7n2uZsE2lDiHbdrvTRiQiqRZIZBHvOXRYgn1Z2Yeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703376613; a=rsa-sha256; cv=none; b=yDPCBg0vukLZQ6ACcp5i65yos06C4xnsZUkdfShVzU0LogljoD6atFJtap4LBlOpy/WEaX dynI4sjlajri6xyhG9+ojF4Ei7g2rSgSD8QzKEd7BMbHGZKIsJHUQX3Gn8TxZbvr7UzEkz pYmWkIZXFApQkkAf+ilcdj+EFXM2kweACKRiS2Nx8v6cuHHoOLw5fLqy8PC5gGoszwVSlK ETJc7shL2c9DuYdzF6kwyEWSLOO0G3LRNG8ktpUJBdXNbe2eIi9u8Szfudf5R7xOyolxmh v4kgzoiVTGCmgzVyri4jrqpDd4W2PeqR2iE5qjEa7GZzAbbQ6DES/KQMaq70nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703376613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHFBEkTjVlkgQ2XSbMe/ep6bDACkyAtxpV0ZM82mGYA=; b=FaHEmpmzJ0YL628AE8OdTXrHed2dThaYya3xj1Z4pVSAvCBo3+9+ys+bZlzSOtr2O4+DKL T8zPHBUKA+2MyfmPyyH34yyoJBFhBUlwMtNLV3NcvDjImcMBqRBXQVw5jtj2/umzTTJ2Fx qCLaaLd0A7rcKkMLkSnQSkXG7BDO1G0djSYhOPTbAAa2qEq9idG8BzwJnm2QyHjZLMozq2 7TBU+WRGZ8Xv0J5cGJrpcJiqSwDVcM+nbinKSjeMMsezizYlj5GRIg1KEeITmJ486lHixm B5p/68b6HkJ+zIQFEpXzIqS/Q9KZjMX/3X5XEAAKCGMYR9rlXFB/Zr5/RjQEQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyLyY1nLsz1KhZ; Sun, 24 Dec 2023 00:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO0ADtD055909; Sun, 24 Dec 2023 00:10:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO0ADU0055900; Sun, 24 Dec 2023 00:10:13 GMT (envelope-from git) Date: Sun, 24 Dec 2023 00:10:13 GMT Message-Id: <202312240010.3BO0ADU0055900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 9c9d7fdd9f00 - main - ig4: Fix FIFO depths detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c9d7fdd9f0041783955c5f540ac55a900877c0c Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=9c9d7fdd9f0041783955c5f540ac55a900877c0c commit 9c9d7fdd9f0041783955c5f540ac55a900877c0c Author: Alexander Motin AuthorDate: 2023-12-24 00:02:49 +0000 Commit: Alexander Motin CommitDate: 2023-12-24 00:02:49 +0000 ig4: Fix FIFO depths detection At least on my Tiger Lake-LP queue depth detection failed before the ig4iic_set_config() call, resulting in no FIFO use. Moving it after solves the problem, getting proper 64 bytes size. On my Dell XPS 13 9310 with iichid(4) touchscreen and touchpad this by few times reduces context switch rate in the driver, and probably also improves the I2C bus utilization. MFC after: 1 month --- sys/dev/ichiic/ig4_iic.c | 50 ++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index 3dc72c458b24..4ab36ef660ed 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -850,23 +850,6 @@ ig4iic_get_config(ig4iic_softc_t *sc) sc->cfg.txfifo_depth = IG4_PARAM1_TXFIFO_DEPTH(v); if (IG4_PARAM1_RXFIFO_DEPTH(v) != 0) sc->cfg.rxfifo_depth = IG4_PARAM1_RXFIFO_DEPTH(v); - } else { - /* - * Hardware does not allow FIFO Threshold Levels value to be - * set larger than the depth of the buffer. If an attempt is - * made to do that, the actual value set will be the maximum - * depth of the buffer. - */ - v = reg_read(sc, IG4_REG_TX_TL); - reg_write(sc, IG4_REG_TX_TL, v | IG4_FIFO_MASK); - sc->cfg.txfifo_depth = - (reg_read(sc, IG4_REG_TX_TL) & IG4_FIFO_MASK) + 1; - reg_write(sc, IG4_REG_TX_TL, v); - v = reg_read(sc, IG4_REG_RX_TL); - reg_write(sc, IG4_REG_RX_TL, v | IG4_FIFO_MASK); - sc->cfg.rxfifo_depth = - (reg_read(sc, IG4_REG_RX_TL) & IG4_FIFO_MASK) + 1; - reg_write(sc, IG4_REG_RX_TL, v); } /* Override hardware config with IC_clock-based counter values */ @@ -918,8 +901,6 @@ ig4iic_get_config(ig4iic_softc_t *sc) printf(" Fast: 0x%04hx:0x%04hx:0x%04hx\n", sc->cfg.fs_scl_hcnt, sc->cfg.fs_scl_lcnt, sc->cfg.fs_sda_hold); - printf(" FIFO: RX:0x%04x: TX:0x%04x\n", - sc->cfg.rxfifo_depth, sc->cfg.txfifo_depth); } } @@ -1015,6 +996,36 @@ ig4iic_set_config(ig4iic_softc_t *sc, bool reset) return (0); } +static void +ig4iic_get_fifo(ig4iic_softc_t *sc) +{ + uint32_t v; + + /* + * Hardware does not allow FIFO Threshold Levels value to be set larger + * than the depth of the buffer. If an attempt is made to do that, the + * actual value set will be the maximum depth of the buffer. + */ + if (sc->cfg.txfifo_depth == 0) { + v = reg_read(sc, IG4_REG_TX_TL); + reg_write(sc, IG4_REG_TX_TL, v | IG4_FIFO_MASK); + sc->cfg.txfifo_depth = + (reg_read(sc, IG4_REG_TX_TL) & IG4_FIFO_MASK) + 1; + reg_write(sc, IG4_REG_TX_TL, v); + } + if (sc->cfg.rxfifo_depth == 0) { + v = reg_read(sc, IG4_REG_RX_TL); + reg_write(sc, IG4_REG_RX_TL, v | IG4_FIFO_MASK); + sc->cfg.rxfifo_depth = + (reg_read(sc, IG4_REG_RX_TL) & IG4_FIFO_MASK) + 1; + reg_write(sc, IG4_REG_RX_TL, v); + } + if (bootverbose) { + printf(" FIFO: RX:0x%04x: TX:0x%04x\n", + sc->cfg.rxfifo_depth, sc->cfg.txfifo_depth); + } +} + /* * Called from ig4iic_pci_attach/detach() */ @@ -1031,6 +1042,7 @@ ig4iic_attach(ig4iic_softc_t *sc) error = ig4iic_set_config(sc, IG4_HAS_ADDREGS(sc->version)); if (error) goto done; + ig4iic_get_fifo(sc); sc->iicbus = device_add_child(sc->dev, "iicbus", -1); if (sc->iicbus == NULL) { From nobody Sun Dec 24 00:16:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyM5H4cjZz55CQM; Sun, 24 Dec 2023 00:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyM5H2rFRz3Klh; Sun, 24 Dec 2023 00:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703376963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=04qvWm6ikM/VlHtAfnPheKQZcJtkNMP6s+e71WKMBwo=; b=nz+XhO6aZ6Ly/jqrePEz5CIyVrzgtBq+BRcbpkx9Ao/fK2kh1K3NcEDE7fUcqI6+AvVnNb 0L7+T6Vic40cb9KRSmNFNvxgiwLx/bIZxWxNubvq78c3pTgpbB8hkcCcGlY0/cpGBKeNQ0 b/CiAHWXFRg0wkl59+zXfTU6u4CUjNDQ9lE6+0eJP92u8mEoPT+qhlBqYqWXfBxHLqqvco YKCx5eDu1u+w8cEwAss4McO9UKTpzZ3SoFvLUzG2SEw7RW+TsYGy52myO0Gjy1HIvRKLfH gulEiVl793rNZLHtaHniT2jbUxorganCBu5DvdejSbAwKHr/95pa4z1UYogG0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703376963; a=rsa-sha256; cv=none; b=rmyUBeyihKT459nbrJbNlAXJDV+QdncpTC2j3lg+3s/RsIeoJZzLNw087lI6i6cX4rd0Ff E7t8JVnF0gv8wJtFJ6lCiwRgJ8nmb60r/jdQ1BHhn1aLAOo0jSOHuq4bKujfmCEGeSMZ3N e7FbYrYlqimwdyJBkFsL6YH+mKr6EQbdk0ujUCVietHg/s5CuELkjTgNZvQfGidLAebHRT zvz8+0uSniekaS/ZG1v7O08gNoyGg1CI2RrSaQQKKKMbRkCMzijtV+5wPW0EG25e95AcAj 4TK53WI4x6meXEVqC5brO0HSTp4rbM3dgOnmsFqhKmu/R0hnMOugLktCHZQ2SQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703376963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=04qvWm6ikM/VlHtAfnPheKQZcJtkNMP6s+e71WKMBwo=; b=otvo0FDNUW2NwmfkLiWuUAyAgee0tcUjQ1/u5VTU4eKWOcO1LSkxbj6BAY8d6qMXYkCJJL otxkKbyVCAsHwOQ/He152RzzXkefnTM8fCx37Vu+tFJdzUN2pAKl5BvGyRA1U4ZheQFReO cPVX/NozHp7OJgN2yJtJpPE5FqT9Rvdwxk85TIZKYGWrUK1FLgtxDAS8T0L4CyYzYesieS RfklwmnnkzfH/l5vs44jo+5X97u6CFMmJt0WWD8Rp5PvbPbLkoSuY6sbBhwlELw1htLD6Q 6JH4eY8aIVLwIxKkWP+AwSItoFAvmpxwCa4PpnVBbTfRrka/d80J97CmOAP59g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyM5H1pR1z1KtH; Sun, 24 Dec 2023 00:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO0G3Nl065785; Sun, 24 Dec 2023 00:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO0G3Ir065782; Sun, 24 Dec 2023 00:16:03 GMT (envelope-from git) Date: Sun, 24 Dec 2023 00:16:03 GMT Message-Id: <202312240016.3BO0G3Ir065782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 68e457df0268 - main - iichid(4): Restore/increase sampling rate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68e457df0268113646264883515412af4c8808cb Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=68e457df0268113646264883515412af4c8808cb commit 68e457df0268113646264883515412af4c8808cb Author: Alexander Motin AuthorDate: 2023-12-24 00:10:49 +0000 Commit: Alexander Motin CommitDate: 2023-12-24 00:10:49 +0000 iichid(4): Restore/increase sampling rate My previous commit by reducing precision reduced the sampling rate from 60Hz to 40Hz on idle system. Return it back to 60-80Hz range, that should be good for mouse smoothness on 60Hz displays. MFC after: 1 months --- sys/dev/iicbus/iichid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 1035088c11b5..84f624f9bb09 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -106,9 +106,9 @@ enum { * sampling_rate_fast value too high as it may result in periodical lags of * cursor motion. */ -#define IICHID_SAMPLING_RATE_FAST 60 +#define IICHID_SAMPLING_RATE_FAST 80 #define IICHID_SAMPLING_RATE_SLOW 10 -#define IICHID_SAMPLING_HYSTERESIS 12 /* ~ 2x fast / slow */ +#define IICHID_SAMPLING_HYSTERESIS 16 /* ~ 2x fast / slow */ /* 5.1.1 - HID Descriptor Format */ struct i2c_hid_desc { @@ -567,7 +567,7 @@ rearm: else rate = sc->sampling_rate_fast; taskqueue_enqueue_timeout_sbt(sc->taskqueue, &sc->periodic_task, - SBT_1S / MAX(rate, 1), 0, C_PREL(1)); + SBT_1S / MAX(rate, 1), 0, C_PREL(2)); } out: if (bus_requested) From nobody Sun Dec 24 02:38:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyQFB6LPYz53ch7; Sun, 24 Dec 2023 02:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyQFB5qN1z3YHc; Sun, 24 Dec 2023 02:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703385486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HJavWXc0UdOnlgu+tUmNNo7+iJv9RmbB7KquckfV0iE=; b=wupQBaiFDHbgtd+YsYjhCHl05zwX1VN5HpkcSm5z59GcH6sBeQZpc9fLo2ApEgv8wxB2M+ Gh0xRWzck587+M57o9cdDKrQT/NfC5//iWOdleJxTZS4xyYk21+3kSqeFjXSDwODbN1HDy vOrpMiuizPI1I0GL3WmL8/tb/rpuya9GiRKPZUmVZ1rNMshbPjFl8yEkSjNDKHf3ZYmAGm OekPfpC7/wqdI9zwtn66TO/GN/qpSNnXuoEZIw4GhbimWNJqL1bzIHmMsBrDC2CucKZq0J RORKa7Cy2X55MGbCKxKqipUIvbAwFSW7Noac/G0sjVENeb6+meaFFlemKYpyjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703385486; a=rsa-sha256; cv=none; b=Wk4fUD4slnX87kOGrjJWgnIRW4GZ/227/q3lMFMWkOrMxWcaeLq7rIvzL6QEtB+JBCVcqq dP861lEDL2qLja3TXzd7N3Ay9U2nrQuOGsE8DtJJ7JrWSse1FsT4QduVniTzm+nYahPbBK A6PIw+526EPBWDExnE6tuKBDaSYGGWuYDPMHowDbNatueVoMTOdQynXZnljdNBa4UmOf4P UcVZNnc9cM6aQSXpcJJBGi+qjCX9Uj0dqR9NItOGu9XxMxt2xcUhgz+eOpkVGSSB2qqLRI MwdmU4qk6MdqqF91WV4FqHJAsBUhFAihRpeGMDDVh4JoXo6Bjd9b7RQDVhA+EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703385486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HJavWXc0UdOnlgu+tUmNNo7+iJv9RmbB7KquckfV0iE=; b=PeNML2SSCrTIfU53e1B3YijybQK5Dns3wyZ17IQIl4CcpDTaKoRfsNPJSSDow7GenN7kMJ Hfbp/fysN8/+ZogGwmEtPlZpSV6On4snOHEP2zHXnUAyP7pxm+eWijFh74pky17wNuT3be 3ubhrmSUh7WD5YS1LO6WadMIzQZ/kQ6LQbCSZoSl1mPVhcoVvsSq7TNOedK3ahZk79H24K 7uyJ/kW/we5Q5+IL39tNR8S/SLCd6O1Upl7+KQjPevRfY7tqajRHJIxuc5gLZrCzd9DPo1 nmnmJ/wk0CuxK6WlkgeJr6XPDV006Zc897UBHO7tmIEn7/xPsUo+p5aIZbCvQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyQFB4SBgz1PBs; Sun, 24 Dec 2023 02:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO2c6Ul000407; Sun, 24 Dec 2023 02:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO2c6a5000404; Sun, 24 Dec 2023 02:38:06 GMT (envelope-from git) Date: Sun, 24 Dec 2023 02:38:06 GMT Message-Id: <202312240238.3BO2c6a5000404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 1a3ee6002f3e - main - acpi_lid: Remove duplicate events List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a3ee6002f3e008e0bc29d04c976285434503e19 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=1a3ee6002f3e008e0bc29d04c976285434503e19 commit 1a3ee6002f3e008e0bc29d04c976285434503e19 Author: Alexander Motin AuthorDate: 2023-12-24 02:33:51 +0000 Commit: Alexander Motin CommitDate: 2023-12-24 02:33:51 +0000 acpi_lid: Remove duplicate events Remove extra acpi_UserNotify() call per event. Filter duplicate notifications received from ACPI without actual status change. Without this on my Dell XPS 13 9310 I saw 4 devd events for either open or close, now only one. MFC after: 1 month --- sys/dev/acpica/acpi_lid.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index 44730879c31e..142791f7282a 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -91,7 +91,7 @@ static driver_t acpi_lid_driver = { DRIVER_MODULE(acpi_lid, acpi, acpi_lid_driver, 0, 0); MODULE_DEPEND(acpi_lid, acpi, 1, 1, 1); -static void +static int acpi_lid_status_update(struct acpi_lid_softc *sc) { ACPI_STATUS status; @@ -107,9 +107,12 @@ acpi_lid_status_update(struct acpi_lid_softc *sc) status = acpi_GetInteger(sc->lid_handle, "_LID", &lid_status); if (ACPI_FAILURE(status)) lid_status = 1; /* assume lid is opened */ + else + lid_status = (lid_status != 0); /* range check value */ - /* range check value */ - sc->lid_status = lid_status ? 1 : 0; + if (sc->lid_status == lid_status) + return (EALREADY); + sc->lid_status = lid_status; /* Send notification via devd */ acpi_UserNotify("Lid", sc->lid_handle, sc->lid_status); @@ -119,6 +122,7 @@ acpi_lid_status_update(struct acpi_lid_softc *sc) evdev_push_sw(sc->lid_evdev, SW_LID, lid_status ? 0 : 1); evdev_sync(sc->lid_evdev); #endif + return (0); } static int @@ -146,6 +150,7 @@ acpi_lid_attach(device_t dev) sc = device_get_softc(dev); sc->lid_dev = dev; acpi_lid_handle = sc->lid_handle = acpi_get_handle(dev); + sc->lid_status = -1; #ifdef EVDEV_SUPPORT /* Register evdev device before initial status update */ @@ -219,7 +224,8 @@ acpi_lid_notify_status_changed(void *arg) ACPI_SERIAL_BEGIN(lid); /* Update lid status, if any */ - acpi_lid_status_update(sc); + if (acpi_lid_status_update(sc) != 0) + goto out; acpi_sc = acpi_device_get_parent_softc(sc->lid_dev); if (acpi_sc == NULL) @@ -228,8 +234,6 @@ acpi_lid_notify_status_changed(void *arg) ACPI_VPRINT(sc->lid_dev, acpi_sc, "Lid %s\n", sc->lid_status ? "opened" : "closed"); - acpi_UserNotify("Lid", sc->lid_handle, sc->lid_status); - if (sc->lid_status == 0) EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_sx); else From nobody Sun Dec 24 05:39:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyVGc6Nyjz53r9s; Sun, 24 Dec 2023 05:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyVGc68rJz4LJL; Sun, 24 Dec 2023 05:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703396376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TYm18rZRkmr9xamlCTloQhGWOehlAhMgPhrqPTckS2g=; b=a0J2kknlgy/XpwEBvs6KP/4d+wGdy7BB45pZnq2MQq63oxp8GVvebZbayfDHYONWY0mDkY kuWiFZj+B4PScT/D+XFBFT95I9fxaEe6vhtnPHSU7VQJt2A/oNr6t/+Gvd+4Ppn2gfAHi9 RmK0p3yx8qMmd/ZUVIUCxCSvNo6Vtz7jlGXqcZ5wCAaZftXnf06ccMwlfogyLGikAigrcR A1pD9C7yIgzttTcffRlJ4hvTJIYK3G1hhEvSOUzTh5OZyZkksjcKV7MwIyh3j+BEF7Bdqc +5xsXgKZp6aaHeVxXIlloq/9NghaNDsYoa6b7BTS4T0Sr0HN3l1nK1zTWdXZpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703396376; a=rsa-sha256; cv=none; b=acB9/hKlUX1YuF8IAGoQMxV/SuQpWv5JYSupsySxf4Tyv5eqb2ExBdDmRJbIa7eJTOWqJk +3s3BXI9+7/vU6iUbkNQIskpTCTiYzRGkuoTc0+G7p+Be5ZbMj9u9MpLjAe8hY5wjnx6sU 6wO4sW/WwVNo6wAhHJ4WRlYpMDUNESr8SRY5hdwFmbbuyMzh2VGKiuuBbMuyguEky0mAkI 62LPZX8qVRyehp9m7MTwOGJ0E+vO8FEEOZJlU8iYhpUMSyqGTdXgoR3eEIQpvyh6FfDExr fGQHu3wRsmhFHHlZpVp7n6bVsISPH/yal85ovgsdr1NmylQB7RvsmMWTfxZ4Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703396376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TYm18rZRkmr9xamlCTloQhGWOehlAhMgPhrqPTckS2g=; b=ZMSJZQsdjU4t6enDNva/74YkrPoUq5PPVEQ0QpIMiGEBb+sDHXYGhN/qCbaBPAsgCpKW/g qais431WwRy06yt0x5RUfK3eiXSSpteG8Dhy3cpt5qL3v2RAuCMj0E9RdQyec550enM+mI mGg6vedlX8B1eQvU65cRNegFNaJHyY4TPs1wS/H4gELhPIj5/etePnVjPvHbATmsQqOBZ+ BI8bSA7AnCBzLMwbRvWFxDjhnR5nbwX6sMAjNlNhQd860FmCQ2uu4CZmHsk2oido7FKmLG oo+TYy5mbged894c1mdwmwHWb6hWwarM+tJXChRzK+IxI8j8kH3JFdmMqqBKsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyVGc5Bshz1Qk; Sun, 24 Dec 2023 05:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO5da6I003495; Sun, 24 Dec 2023 05:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO5dail003492; Sun, 24 Dec 2023 05:39:36 GMT (envelope-from git) Date: Sun, 24 Dec 2023 05:39:36 GMT Message-Id: <202312240539.3BO5dail003492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 2619c5ccfe1f - main - Avoid waiting on physical allocations that can't possibly be satisfied List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2619c5ccfe1f7889f0241916bd17d06340142b05 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=2619c5ccfe1f7889f0241916bd17d06340142b05 commit 2619c5ccfe1f7889f0241916bd17d06340142b05 Author: Jason A. Harmening AuthorDate: 2023-11-20 23:23:58 +0000 Commit: Jason A. Harmening CommitDate: 2023-12-24 05:01:40 +0000 Avoid waiting on physical allocations that can't possibly be satisfied - Change vm_page_reclaim_contig[_domain] to return an errno instead of a boolean. 0 indicates a successful reclaim, ENOMEM indicates lack of available memory to reclaim, with any other error (currently only ERANGE) indicating that reclamation is impossible for the specified address range. Change all callers to only follow up with vm_page_wait* in the ENOMEM case. - Introduce vm_domainset_iter_ignore(), which marks the specified domain as unavailable for further use by the iterator. Use this function to ignore domains that can't possibly satisfy a physical allocation request. Since WAITOK allocations run the iterators repeatedly, this avoids the possibility of infinitely spinning in domain iteration if no available domain can satisfy the allocation request. PR: 274252 Reported by: kevans Tested by: kevans Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42706 --- sys/arm/nvidia/drm2/tegra_bo.c | 9 +++-- sys/compat/linuxkpi/common/src/linux_page.c | 8 ++-- sys/dev/drm2/ttm/ttm_bo.c | 4 +- sys/dev/drm2/ttm/ttm_page_alloc.c | 9 +++-- sys/kern/uipc_ktls.c | 5 ++- sys/kern/uipc_shm.c | 5 ++- sys/vm/vm_domainset.c | 32 +++++++++++++--- sys/vm/vm_domainset.h | 2 + sys/vm/vm_kern.c | 24 +++++++++++- sys/vm/vm_page.c | 58 ++++++++++++++++++++++------- sys/vm/vm_page.h | 6 +-- 11 files changed, 123 insertions(+), 39 deletions(-) diff --git a/sys/arm/nvidia/drm2/tegra_bo.c b/sys/arm/nvidia/drm2/tegra_bo.c index 5b9eb8588f4e..1ffd65de9d36 100644 --- a/sys/arm/nvidia/drm2/tegra_bo.c +++ b/sys/arm/nvidia/drm2/tegra_bo.c @@ -94,7 +94,7 @@ tegra_bo_alloc_contig(size_t npages, u_long alignment, vm_memattr_t memattr, vm_page_t **ret_page) { vm_page_t m; - int tries, i; + int err, i, tries; vm_paddr_t low, high, boundary; low = 0; @@ -106,9 +106,12 @@ retry: low, high, alignment, boundary, memattr); if (m == NULL) { if (tries < 3) { - if (!vm_page_reclaim_contig(0, npages, low, high, - alignment, boundary)) + err = vm_page_reclaim_contig(0, npages, low, high, + alignment, boundary); + if (err == ENOMEM) vm_wait(NULL); + else if (err != 0) + return (ENOMEM); tries++; goto retry; } diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index eb050b7250be..8b78a3739f25 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -118,10 +118,12 @@ linux_alloc_pages(gfp_t flags, unsigned int order) PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); if (page == NULL) { if (flags & M_WAITOK) { - if (!vm_page_reclaim_contig(req, - npages, 0, pmax, PAGE_SIZE, 0)) { + int err = vm_page_reclaim_contig(req, + npages, 0, pmax, PAGE_SIZE, 0); + if (err == ENOMEM) vm_wait(NULL); - } + else if (err != 0) + return (NULL); flags &= ~M_WAITOK; goto retry; } diff --git a/sys/dev/drm2/ttm/ttm_bo.c b/sys/dev/drm2/ttm/ttm_bo.c index f60cb4f37535..b57d961338f4 100644 --- a/sys/dev/drm2/ttm/ttm_bo.c +++ b/sys/dev/drm2/ttm/ttm_bo.c @@ -1498,8 +1498,8 @@ retry: VM_MAX_ADDRESS, PAGE_SIZE, 0, VM_MEMATTR_UNCACHEABLE); if (unlikely(glob->dummy_read_page == NULL)) { - if (tries < 1 && vm_page_reclaim_contig(0, 1, 0, - VM_MAX_ADDRESS, PAGE_SIZE, 0)) { + if (tries < 1 && (vm_page_reclaim_contig(0, 1, 0, + VM_MAX_ADDRESS, PAGE_SIZE, 0) == 0)) { tries++; goto retry; } diff --git a/sys/dev/drm2/ttm/ttm_page_alloc.c b/sys/dev/drm2/ttm/ttm_page_alloc.c index 67c484218cc2..7518ecb4dfd1 100644 --- a/sys/dev/drm2/ttm/ttm_page_alloc.c +++ b/sys/dev/drm2/ttm/ttm_page_alloc.c @@ -158,16 +158,19 @@ static vm_page_t ttm_vm_page_alloc_dma32(int req, vm_memattr_t memattr) { vm_page_t p; - int tries; + int err, tries; for (tries = 0; ; tries++) { p = vm_page_alloc_noobj_contig(req, 1, 0, 0xffffffff, PAGE_SIZE, 0, memattr); if (p != NULL || tries > 2) return (p); - if (!vm_page_reclaim_contig(req, 1, 0, 0xffffffff, - PAGE_SIZE, 0)) + err = vm_page_reclaim_contig(req, 1, 0, 0xffffffff, + PAGE_SIZE, 0); + if (err == ENOMEM) vm_wait(NULL); + else if (err != 0) + return (NULL); } } diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index c996157dbc41..b69d16446b47 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -3160,8 +3160,9 @@ ktls_reclaim_thread(void *ctx) * backlogs of buffers to be encrypted, leading to * surges of traffic and potential NIC output drops. */ - if (!vm_page_reclaim_contig_domain_ext(domain, VM_ALLOC_NORMAL, - atop(ktls_maxlen), 0, ~0ul, PAGE_SIZE, 0, ktls_max_reclaim)) { + if (vm_page_reclaim_contig_domain_ext(domain, VM_ALLOC_NORMAL, + atop(ktls_maxlen), 0, ~0ul, PAGE_SIZE, 0, + ktls_max_reclaim) != 0) { vm_wait_domain(domain); } else { sc->reclaims += ktls_max_reclaim; diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index a8e2502808a0..f5803d1d72de 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -877,8 +877,9 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie) } error = vm_page_reclaim_contig(aflags, pagesizes[psind] / PAGE_SIZE, 0, ~0, - pagesizes[psind], 0) ? 0 : - vm_wait_intr(object); + pagesizes[psind], 0); + if (error == ENOMEM) + error = vm_wait_intr(object); if (error != 0) { VM_OBJECT_WLOCK(object); return (error); diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c index 9bc0df865154..b881466bffe5 100644 --- a/sys/vm/vm_domainset.c +++ b/sys/vm/vm_domainset.c @@ -68,6 +68,7 @@ vm_domainset_iter_init(struct vm_domainset_iter *di, struct domainset *ds, di->di_domain = ds; di->di_iter = iter; di->di_policy = ds->ds_policy; + DOMAINSET_COPY(&ds->ds_mask, &di->di_valid_mask); if (di->di_policy == DOMAINSET_POLICY_INTERLEAVE) { #if VM_NRESERVLEVEL > 0 if (vm_object_reserv(obj)) { @@ -158,7 +159,7 @@ vm_domainset_iter_first(struct vm_domainset_iter *di, int *domain) switch (di->di_policy) { case DOMAINSET_POLICY_FIRSTTOUCH: *domain = PCPU_GET(domain); - if (DOMAINSET_ISSET(*domain, &di->di_domain->ds_mask)) { + if (DOMAINSET_ISSET(*domain, &di->di_valid_mask)) { /* * Add an extra iteration because we will visit the * current domain a second time in the rr iterator. @@ -221,11 +222,14 @@ int vm_domainset_iter_page(struct vm_domainset_iter *di, struct vm_object *obj, int *domain) { + if (__predict_false(DOMAINSET_EMPTY(&di->di_valid_mask))) + return (ENOMEM); /* If there are more domains to visit we run the iterator. */ while (--di->di_n != 0) { vm_domainset_iter_next(di, domain); - if (!di->di_minskip || !vm_page_count_min_domain(*domain)) + if (DOMAINSET_ISSET(*domain, &di->di_valid_mask) && + (!di->di_minskip || !vm_page_count_min_domain(*domain))) return (0); } @@ -243,7 +247,7 @@ vm_domainset_iter_page(struct vm_domainset_iter *di, struct vm_object *obj, /* Wait for one of the domains to accumulate some free pages. */ if (obj != NULL) VM_OBJECT_WUNLOCK(obj); - vm_wait_doms(&di->di_domain->ds_mask, 0); + vm_wait_doms(&di->di_valid_mask, 0); if (obj != NULL) VM_OBJECT_WLOCK(obj); if ((di->di_flags & VM_ALLOC_WAITFAIL) != 0) @@ -288,11 +292,14 @@ vm_domainset_iter_policy_ref_init(struct vm_domainset_iter *di, int vm_domainset_iter_policy(struct vm_domainset_iter *di, int *domain) { + if (DOMAINSET_EMPTY(&di->di_valid_mask)) + return (ENOMEM); /* If there are more domains to visit we run the iterator. */ while (--di->di_n != 0) { vm_domainset_iter_next(di, domain); - if (!di->di_minskip || !vm_page_count_min_domain(*domain)) + if (DOMAINSET_ISSET(*domain, &di->di_valid_mask) && + (!di->di_minskip || !vm_page_count_min_domain(*domain))) return (0); } @@ -308,7 +315,7 @@ vm_domainset_iter_policy(struct vm_domainset_iter *di, int *domain) return (ENOMEM); /* Wait for one of the domains to accumulate some free pages. */ - vm_wait_doms(&di->di_domain->ds_mask, 0); + vm_wait_doms(&di->di_valid_mask, 0); /* Restart the search. */ vm_domainset_iter_first(di, domain); @@ -316,6 +323,15 @@ vm_domainset_iter_policy(struct vm_domainset_iter *di, int *domain) return (0); } +void +vm_domainset_iter_ignore(struct vm_domainset_iter *di, int domain) +{ + KASSERT(DOMAINSET_ISSET(domain, &di->di_valid_mask), + ("%s: domain %d not present in di_valid_mask for di %p", + __func__, domain, di)); + DOMAINSET_CLR(domain, &di->di_valid_mask); +} + #else /* !NUMA */ int @@ -357,4 +373,10 @@ vm_domainset_iter_policy_ref_init(struct vm_domainset_iter *di, *domain = 0; } +void +vm_domainset_iter_ignore(struct vm_domainset_iter *di __unused, + int domain __unused) +{ +} + #endif /* NUMA */ diff --git a/sys/vm/vm_domainset.h b/sys/vm/vm_domainset.h index 4ce619069dd0..d2cfe362ae78 100644 --- a/sys/vm/vm_domainset.h +++ b/sys/vm/vm_domainset.h @@ -31,6 +31,7 @@ struct vm_domainset_iter { struct domainset *di_domain; unsigned int *di_iter; + domainset_t di_valid_mask; vm_pindex_t di_offset; int di_flags; uint16_t di_policy; @@ -47,6 +48,7 @@ void vm_domainset_iter_policy_init(struct vm_domainset_iter *, struct domainset *, int *, int *); void vm_domainset_iter_policy_ref_init(struct vm_domainset_iter *, struct domainset_ref *, int *, int *); +void vm_domainset_iter_ignore(struct vm_domainset_iter *, int); int vm_wait_doms(const domainset_t *, int mflags); diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index b17b857bd902..1ef3154845b3 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -232,8 +232,8 @@ kmem_alloc_contig_pages(vm_object_t object, vm_pindex_t pindex, int domain, break; VM_OBJECT_WUNLOCK(object); - if (!vm_page_reclaim_contig_domain(domain, pflags, npages, - low, high, alignment, boundary) && wait) + if (vm_page_reclaim_contig_domain(domain, pflags, npages, + low, high, alignment, boundary) == ENOMEM && wait) vm_wait_domain(domain); VM_OBJECT_WLOCK(object); } @@ -306,8 +306,12 @@ kmem_alloc_attr_domainset(struct domainset *ds, vm_size_t size, int flags, vm_paddr_t low, vm_paddr_t high, vm_memattr_t memattr) { struct vm_domainset_iter di; + vm_page_t bounds[2]; void *addr; int domain; + int start_segind; + + start_segind = -1; vm_domainset_iter_policy_init(&di, ds, &domain, &flags); do { @@ -315,6 +319,12 @@ kmem_alloc_attr_domainset(struct domainset *ds, vm_size_t size, int flags, memattr); if (addr != NULL) break; + if (start_segind == -1) + start_segind = vm_phys_lookup_segind(low); + if (vm_phys_find_range(bounds, start_segind, domain, + atop(round_page(size)), low, high) == -1) { + vm_domainset_iter_ignore(&di, domain); + } } while (vm_domainset_iter_policy(&di, &domain) == 0); return (addr); @@ -390,8 +400,12 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_size_t size, int flags, vm_memattr_t memattr) { struct vm_domainset_iter di; + vm_page_t bounds[2]; void *addr; int domain; + int start_segind; + + start_segind = -1; vm_domainset_iter_policy_init(&di, ds, &domain, &flags); do { @@ -399,6 +413,12 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_size_t size, int flags, alignment, boundary, memattr); if (addr != NULL) break; + if (start_segind == -1) + start_segind = vm_phys_lookup_segind(low); + if (vm_phys_find_range(bounds, start_segind, domain, + atop(round_page(size)), low, high) == -1) { + vm_domainset_iter_ignore(&di, domain); + } } while (vm_domainset_iter_policy(&di, &domain) == 0); return (addr); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 745b689a3591..72057f2fc9f5 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2170,8 +2170,12 @@ vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req, vm_paddr_t boundary, vm_memattr_t memattr) { struct vm_domainset_iter di; + vm_page_t bounds[2]; vm_page_t m; int domain; + int start_segind; + + start_segind = -1; vm_domainset_iter_page_init(&di, object, pindex, &domain, &req); do { @@ -2179,6 +2183,12 @@ vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req, npages, low, high, alignment, boundary, memattr); if (m != NULL) break; + if (start_segind == -1) + start_segind = vm_phys_lookup_segind(low); + if (vm_phys_find_range(bounds, start_segind, domain, + npages, low, high) == -1) { + vm_domainset_iter_ignore(&di, domain); + } } while (vm_domainset_iter_page(&di, object, &domain) == 0); return (m); @@ -3022,7 +3032,7 @@ unlock: * "npages" must be greater than zero. Both "alignment" and "boundary" * must be a power of two. */ -bool +int vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, int desired_runs) @@ -3030,14 +3040,15 @@ vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, struct vm_domain *vmd; vm_page_t bounds[2], m_run, _m_runs[NRUNS], *m_runs; u_long count, minalign, reclaimed; - int error, i, min_reclaim, nruns, options, req_class, segind; - bool ret; + int error, i, min_reclaim, nruns, options, req_class; + int segind, start_segind; + int ret; KASSERT(npages > 0, ("npages is 0")); KASSERT(powerof2(alignment), ("alignment is not a power of 2")); KASSERT(powerof2(boundary), ("boundary is not a power of 2")); - ret = false; + ret = ENOMEM; /* * If the caller wants to reclaim multiple runs, try to allocate @@ -3077,6 +3088,8 @@ vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) req_class = VM_ALLOC_SYSTEM; + start_segind = vm_phys_lookup_segind(low); + /* * Return if the number of free pages cannot satisfy the requested * allocation. @@ -3093,14 +3106,17 @@ vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, * the reclamation of reservations and superpages each time. */ for (options = VPSC_NORESERV;;) { + bool phys_range_exists = false; + /* * Find the highest runs that satisfy the given constraints * and restrictions, and record them in "m_runs". */ count = 0; - segind = vm_phys_lookup_segind(low); + segind = start_segind; while ((segind = vm_phys_find_range(bounds, segind, domain, npages, low, high)) != -1) { + phys_range_exists = true; while ((m_run = vm_page_scan_contig(npages, bounds[0], bounds[1], alignment, boundary, options))) { bounds[0] = m_run + npages; @@ -3110,6 +3126,11 @@ vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, segind++; } + if (!phys_range_exists) { + ret = ERANGE; + goto done; + } + /* * Reclaim the highest runs in LIFO (descending) order until * the number of reclaimed pages, "reclaimed", is at least @@ -3126,7 +3147,7 @@ vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, if (error == 0) { reclaimed += npages; if (reclaimed >= min_reclaim) { - ret = true; + ret = 0; goto done; } } @@ -3141,7 +3162,8 @@ vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, else if (options == VPSC_NOSUPER) options = VPSC_ANY; else if (options == VPSC_ANY) { - ret = reclaimed != 0; + if (reclaimed != 0) + ret = 0; goto done; } } @@ -3151,7 +3173,7 @@ done: return (ret); } -bool +int vm_page_reclaim_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary) { @@ -3159,20 +3181,28 @@ vm_page_reclaim_contig_domain(int domain, int req, u_long npages, alignment, boundary, 1)); } -bool +int vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary) { struct vm_domainset_iter di; - int domain; - bool ret; + int domain, ret, status; + + ret = ERANGE; vm_domainset_iter_page_init(&di, NULL, 0, &domain, &req); do { - ret = vm_page_reclaim_contig_domain(domain, req, npages, low, + status = vm_page_reclaim_contig_domain(domain, req, npages, low, high, alignment, boundary); - if (ret) - break; + if (status == 0) + return (0); + else if (status == ERANGE) + vm_domainset_iter_ignore(&di, domain); + else { + KASSERT(status == ENOMEM, ("Unrecognized error %d " + "from vm_page_reclaim_contig_domain()", status)); + ret = ENOMEM; + } } while (vm_domainset_iter_page(&di, NULL, &domain) == 0); return (ret); diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 735c358320ff..e6bff3334d39 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -660,11 +660,11 @@ vm_page_t vm_page_prev(vm_page_t m); bool vm_page_ps_test(vm_page_t m, int flags, vm_page_t skip_m); void vm_page_putfake(vm_page_t m); void vm_page_readahead_finish(vm_page_t m); -bool vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, +int vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary); -bool vm_page_reclaim_contig_domain(int domain, int req, u_long npages, +int vm_page_reclaim_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary); -bool vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, +int vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, int desired_runs); void vm_page_reference(vm_page_t m); From nobody Sun Dec 24 05:39:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyVGf0wrnz53rFb; Sun, 24 Dec 2023 05:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyVGd73Kqz4LWZ; Sun, 24 Dec 2023 05:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703396378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drnBjKLI0gxrzQD5sNBkyTHHJD/PXeUqmDws7toePx0=; b=P8Am5Xv/Il0J0hlGZ8jPKH6n6lYQN25Rb+7IDr68q/pIxaucYv6qAhTGXLvX7GFuQHZzDp VzkLKAuzbeotdcSFpI6oR5M0fj7f3q7I7Pc8uqdWqySduHu3yROZ3EosCbTR4FGnFDpIxL GLTPem4dbqAvPmLFo9ikfs31gceYolelPYYysFTwZp3sED0Ep7pOHPaD8zuwpPP0XDibhx 79j4uaDBj9PG6eeibhNzrjiPrLJoFsMmC6lnPhTIPs0xNKbnCqLrcdf+QZZJR0/BZpCqSi kgjNiTVvQ7n3TEcSS2HZempZCKBz9EfELrrOiUTt++bf1q6v7aTVMWfzsDCgWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703396378; a=rsa-sha256; cv=none; b=gOdCtzCG6zM4IHlrD+mDJ+cwEpN0zb1wpkXt9XhQY7490cx6OoVJFGuNRtN4NqySIKsWZ8 ywoWW61eouc46QyLSAdaM0uGo87IuAQYMiWCl6xU+z7IQRfG+vfOm0GQoXoT8v7z7cyW+l VDsL4C6eRDQ/6GjcVafWNxxgCX6/gecACLkoWyT4Ewdvrp7rHGfsflhb6MuRltYaH6rvQL OpSg0T7YCL5eHAFID+F9od0zrY1mz3Zfo0wXUM5ZncRqY1CVAa3PwPFca2PcbXFZ+7a0oU VzLKRN/9xDaafI9nF64vpKC2R3PaMzVz4mHcV/gd/XvpzU3c5Mk0lS//ex/UlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703396378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drnBjKLI0gxrzQD5sNBkyTHHJD/PXeUqmDws7toePx0=; b=IICOvlR5O9bBnSPeCS/663NXRddwzUsSRjkyZGaXSNKWsZ8LOqAsrkJFsBSfnXTIeV5Rlr B2aaZcFxSyNwqDCrRBB/5QDwIOe5EKIcG+5gFcxJOp7oAnTtmCewM1jaMBDyRX77Rm/ndd aaeNMnkU9LIPsc8B+UZlSYfPe5LdKCFO0LykCg3BmwqARD+gmzFWKmYpoh9uMxKQuJfrpJ kVhdff09zaY8KglSVHW54DDaPXXDEtIyQp1rpd+jkgJF55AZb1hxTntxJGXY0XU0ryieBV BlFgdRinSZCIv1FkYD2fULR49/MHJ1zO/tYfkChOZSnNR66yeMovV/Sub0YQVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyVGd60FSz1Lv; Sun, 24 Dec 2023 05:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO5dbPQ003540; Sun, 24 Dec 2023 05:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO5dbOd003537; Sun, 24 Dec 2023 05:39:37 GMT (envelope-from git) Date: Sun, 24 Dec 2023 05:39:37 GMT Message-Id: <202312240539.3BO5dbOd003537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 0ee1cd6da960 - main - vm_page.h: tweak page-busied assertion macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ee1cd6da960a7a3fedbba82b37d9c67494d2394 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee1cd6da960a7a3fedbba82b37d9c67494d2394 commit 0ee1cd6da960a7a3fedbba82b37d9c67494d2394 Author: Jason A. Harmening AuthorDate: 2023-12-24 05:20:13 +0000 Commit: Jason A. Harmening CommitDate: 2023-12-24 05:20:13 +0000 vm_page.h: tweak page-busied assertion macros Fix incorrect macro name and include the value of curthread in the panic message where relevant. --- sys/vm/vm_page.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index e6bff3334d39..37cb1374b9f6 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -730,9 +730,9 @@ void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line); #define vm_page_assert_unbusied(m) \ KASSERT((vm_page_busy_fetch(m) & ~VPB_BIT_WAITERS) != \ VPB_CURTHREAD_EXCLUSIVE, \ - ("vm_page_assert_xbusied: page %p busy_lock %#x owned" \ - " by me @ %s:%d", \ - (m), (m)->busy_lock, __FILE__, __LINE__)); \ + ("vm_page_assert_unbusied: page %p busy_lock %#x owned" \ + " by me (%p) @ %s:%d", \ + (m), (m)->busy_lock, curthread, __FILE__, __LINE__)); \ #define vm_page_assert_xbusied_unchecked(m) do { \ KASSERT(vm_page_xbusied(m), \ @@ -744,8 +744,8 @@ void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line); KASSERT((vm_page_busy_fetch(m) & ~VPB_BIT_WAITERS) == \ VPB_CURTHREAD_EXCLUSIVE, \ ("vm_page_assert_xbusied: page %p busy_lock %#x not owned" \ - " by me @ %s:%d", \ - (m), (m)->busy_lock, __FILE__, __LINE__)); \ + " by me (%p) @ %s:%d", \ + (m), (m)->busy_lock, curthread, __FILE__, __LINE__)); \ } while (0) #define vm_page_busied(m) \ From nobody Sun Dec 24 08:22:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv12hjGz54H4w; Sun, 24 Dec 2023 08:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv12K7Dz4X8X; Sun, 24 Dec 2023 08:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxu4QRQrcofLXo6gjqLr2B0hATpAyoFSDR5zC/yFfPk=; b=IoftsBIQXm6/M20huasD0OfL7vabLPCO7olvEqGjb+R7fV0WH3WLJlCpbguBc0kv/NUD8q Nl89lU41LEQTEWPk7IUP7X+p/IYuE7PinPy56qzkP0yBfHRjvxZUUv1ELJmv0H4ONGco/x ZXZcKDJxhaOY9XCC/tB1lWI8Gy3mwgR+9sUP1V2Cx+HzeapqBTL6jqXFaf4Sokj8g4mDD+ KU0OMExm0aPfguARJXNIyaA3ZoNcroEw/j4YWx9gFkqmaQLMktp6WnMdCJTlfv+JWlTAuN SgV5b4EMTCmtwMl2iDg3h/iYrOYDApTZOLzaYi1JMXFKInq1T6NIM3GEGm8bVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406173; a=rsa-sha256; cv=none; b=TXCXc7aZ5GzvL1FXMv/6QQAA6DHz4Kaeema7lOZqCpO2x6DYpQMhdKoxHqkkAfccq4g75G J6vfahAz2VUmTb7Ot95uf1aUpQdYNoBB9hxJAVzmdGpin0RrNN64+CTSO2DHPRNj40UINt u8y1lbvaMcUZVh0QIhTJSp6MMrzsRcDViLtm2gKfmz/BC0cUQ8pEzokp5DejJskzLPSwJ9 9Kg/JyBN0+4Ms6dxh3224ujBVDSL5kDrV8QRXL3W8e2D3X2KGhmWEk0A/RDwtfUD7xDjdf nU/96Xk65CtXnbJyOtVKoXXVTXp/V7nZ7bI3Vmo9RodvWBw4ynKKVvMn3a5p3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxu4QRQrcofLXo6gjqLr2B0hATpAyoFSDR5zC/yFfPk=; b=pECkUXrkdt4nBISeZqrXoOqHZlAJIPo3whPZTfFRn0EIQ0ptYamDQe4zKFQ41xQbCxXjqL fHKXMjcoAStgmvbtbRQfwergA7sIHnrHdHWRP+J1XCyATerUezEmMg7vPtMjPuE6UYurlP 2/zS6ErXrM+2pCj94xOIHXwPv+XVhm5zX8kzzbaAXMYZzaOhz24hzD4zUq9tqp2HoVrElk NBFvtmPtI4v+HOPXPCEyqGCY5XkhrRyGTlfzvqEfFfhSFaVlseaDJYdscZ1Puoou+WWhGx U/wTuBveP1grIs1vy100T58oM62uZ4K6uAWMay+bY5QBWtonbBVbam9pCkygAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv11Kpgz5sr; Sun, 24 Dec 2023 08:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8Mrpm086423; Sun, 24 Dec 2023 08:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8MrN6086420; Sun, 24 Dec 2023 08:22:53 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:53 GMT Message-Id: <202312240822.3BO8MrN6086420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 96ab16ebab63 - main - LinuxKPI: Remove sys/rman.h include from LKPI headers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96ab16ebab6319dce9b3041961b0ab6e20a4fecc Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=96ab16ebab6319dce9b3041961b0ab6e20a4fecc commit 96ab16ebab6319dce9b3041961b0ab6e20a4fecc Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:57 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:57 +0000 LinuxKPI: Remove sys/rman.h include from LKPI headers. sys/rman.h defines `resource` structure which conflicts with the Linux structure of the same name. To fix that remove reference to sys/rman.h from linux/pci.h and move resource management code to linux_pci.c. Update consumers which were depending on linux/pci.h pollution. No functional changes intended. Sponsored by: Serenity Cyber Security, LLC MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42792 --- .../linuxkpi/common/include/linux/interrupt.h | 2 +- sys/compat/linuxkpi/common/include/linux/pci.h | 361 ++---------------- sys/compat/linuxkpi/common/src/linux_interrupt.c | 19 +- sys/compat/linuxkpi/common/src/linux_pci.c | 411 ++++++++++++++++++--- sys/contrib/dev/iwlwifi/pcie/trans.c | 1 + sys/contrib/dev/rtw88/pci.c | 1 + sys/dev/irdma/irdma_main.h | 1 + 7 files changed, 413 insertions(+), 383 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h index 1ae9f48c7ddd..d5f9a0ae7a47 100644 --- a/sys/compat/linuxkpi/common/include/linux/interrupt.h +++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h @@ -40,7 +40,7 @@ typedef irqreturn_t (*irq_handler_t)(int, void *); -#define IRQF_SHARED RF_SHAREABLE +#define IRQF_SHARED 0x0004 /* Historically */ #define IRQF_NOBALANCING 0 #define IRQ_DISABLE_UNLAZY 0 diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 4406e47d3d63..aa99b050ffd9 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -306,10 +305,16 @@ struct msi_desc { struct pci_msi_desc pci; }; +struct msix_entry { + int entry; + int vector; +}; + /* * If we find drivers accessing this from multiple KPIs we may have to * refcount objects of this structure. */ +struct resource; struct pci_mmio_region { TAILQ_ENTRY(pci_mmio_region) next; struct resource *res; @@ -346,32 +351,30 @@ struct pci_dev { TAILQ_HEAD(, pci_mmio_region) mmio; }; -/* We need some meta-struct to keep track of these for devres. */ -struct pci_devres { - bool enable_io; - /* PCIR_MAX_BAR_0 + 1 = 6 => BIT(0..5). */ - uint8_t region_mask; - struct resource *region_table[PCIR_MAX_BAR_0 + 1]; /* Not needed. */ -}; -struct pcim_iomap_devres { - void *mmio_table[PCIR_MAX_BAR_0 + 1]; - struct resource *res_table[PCIR_MAX_BAR_0 + 1]; -}; - int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name); int pci_alloc_irq_vectors(struct pci_dev *pdev, int minv, int maxv, unsigned int flags); bool pci_device_is_present(struct pci_dev *pdev); +int linuxkpi_pcim_enable_device(struct pci_dev *pdev); +void __iomem **linuxkpi_pcim_iomap_table(struct pci_dev *pdev); +void *linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size); +void linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res); +int linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, + const char *name); +int linuxkpi_pci_request_regions(struct pci_dev *pdev, const char *res_name); +void linuxkpi_pci_release_region(struct pci_dev *pdev, int bar); +void linuxkpi_pci_release_regions(struct pci_dev *pdev); +int linuxkpi_pci_enable_msix(struct pci_dev *pdev, struct msix_entry *entries, + int nreq); + /* Internal helper function(s). */ struct pci_dev *lkpinew_pci_dev(device_t); -struct pci_devres *lkpi_pci_devres_get_alloc(struct pci_dev *pdev); void lkpi_pci_devres_release(struct device *, void *); -struct resource *_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size); -struct pcim_iomap_devres *lkpi_pcim_iomap_devres_find(struct pci_dev *pdev); -void lkpi_pcim_iomap_table_release(struct device *, void *); struct pci_dev *lkpi_pci_get_device(uint16_t, uint16_t, struct pci_dev *); struct msi_desc *lkpi_pci_msi_desc_alloc(int); +struct device *lkpi_pci_find_irq_dev(unsigned int irq); +int _lkpi_pci_enable_msi_range(struct pci_dev *pdev, int minvec, int maxvec); static inline bool dev_is_pci(struct device *dev) @@ -395,56 +398,6 @@ pci_resource_type(struct pci_dev *pdev, int bar) return (SYS_RES_MEMORY); } -struct resource_list_entry *linux_pci_reserve_bar(struct pci_dev *pdev, - struct resource_list *rl, int type, int rid); - -static inline struct resource_list_entry * -linux_pci_get_rle(struct pci_dev *pdev, int type, int rid, bool reserve_bar) -{ - struct pci_devinfo *dinfo; - struct resource_list *rl; - struct resource_list_entry *rle; - - dinfo = device_get_ivars(pdev->dev.bsddev); - rl = &dinfo->resources; - rle = resource_list_find(rl, type, rid); - /* Reserve resources for this BAR if needed. */ - if (rle == NULL && reserve_bar) - rle = linux_pci_reserve_bar(pdev, rl, type, rid); - return (rle); -} - -static inline struct resource_list_entry * -linux_pci_get_bar(struct pci_dev *pdev, int bar, bool reserve) -{ - int type; - - type = pci_resource_type(pdev, bar); - if (type < 0) - return (NULL); - bar = PCIR_BAR(bar); - return (linux_pci_get_rle(pdev, type, bar, reserve)); -} - -static inline struct device * -linux_pci_find_irq_dev(unsigned int irq) -{ - struct pci_dev *pdev; - struct device *found; - - found = NULL; - spin_lock(&pci_lock); - list_for_each_entry(pdev, &pci_devices, links) { - if (irq == pdev->dev.irq || - (irq >= pdev->dev.irq_start && irq < pdev->dev.irq_end)) { - found = &pdev->dev; - break; - } - } - spin_unlock(&pci_lock); - return (found); -} - /* * All drivers just seem to want to inspect the type not flags. */ @@ -578,73 +531,10 @@ done: return (pdev->bus->self); } -static inline struct pci_devres * -lkpi_pci_devres_find(struct pci_dev *pdev) -{ - - if (!pdev->managed) - return (NULL); - - return (lkpi_pci_devres_get_alloc(pdev)); -} - -static inline void -pci_release_region(struct pci_dev *pdev, int bar) -{ - struct resource_list_entry *rle; - struct pci_devres *dr; - struct pci_mmio_region *mmio, *p; - - if ((rle = linux_pci_get_bar(pdev, bar, false)) == NULL) - return; - - /* - * As we implicitly track the requests we also need to clear them on - * release. Do clear before resource release. - */ - dr = lkpi_pci_devres_find(pdev); - if (dr != NULL) { - KASSERT(dr->region_table[bar] == rle->res, ("%s: pdev %p bar %d" - " region_table res %p != rel->res %p\n", __func__, pdev, - bar, dr->region_table[bar], rle->res)); - dr->region_table[bar] = NULL; - dr->region_mask &= ~(1 << bar); - } - - TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { - if (rle->res != (void *)rman_get_bushandle(mmio->res)) - continue; - TAILQ_REMOVE(&pdev->mmio, mmio, next); - free(mmio, M_DEVBUF); - } - - bus_release_resource(pdev->dev.bsddev, rle->type, rle->rid, rle->res); -} - -static inline void -pci_release_regions(struct pci_dev *pdev) -{ - int i; - - for (i = 0; i <= PCIR_MAX_BAR_0; i++) - pci_release_region(pdev, i); -} - -static inline int -pci_request_regions(struct pci_dev *pdev, const char *res_name) -{ - int error; - int i; - - for (i = 0; i <= PCIR_MAX_BAR_0; i++) { - error = pci_request_region(pdev, i, res_name); - if (error && error != -ENODEV) { - pci_release_regions(pdev); - return (error); - } - } - return (0); -} +#define pci_release_region(pdev, bar) linuxkpi_pci_release_region(pdev, bar) +#define pci_release_regions(pdev) linuxkpi_pci_release_regions(pdev) +#define pci_request_regions(pdev, res_name) \ + linuxkpi_pci_request_regions(pdev, res_name) static inline void lkpi_pci_disable_msix(struct pci_dev *pdev) @@ -655,7 +545,7 @@ lkpi_pci_disable_msix(struct pci_dev *pdev) /* * The MSIX IRQ numbers associated with this PCI device are no * longer valid and might be re-assigned. Make sure - * linux_pci_find_irq_dev() does no longer see them by + * lkpi_pci_find_irq_dev() does no longer see them by * resetting their references to zero: */ pdev->dev.irq_start = 0; @@ -813,11 +703,6 @@ void linux_pci_unregister_drm_driver(struct pci_driver *pdrv); #define pci_register_driver(pdrv) linux_pci_register_driver(pdrv) #define pci_unregister_driver(pdrv) linux_pci_unregister_driver(pdrv) -struct msix_entry { - int entry; - int vector; -}; - /* * Enable msix, positive errors indicate actual number of available * vectors. Negative errors are failures. @@ -825,42 +710,7 @@ struct msix_entry { * NB: define added to prevent this definition of pci_enable_msix from * clashing with the native FreeBSD version. */ -#define pci_enable_msix(...) \ - linux_pci_enable_msix(__VA_ARGS__) - -static inline int -pci_enable_msix(struct pci_dev *pdev, struct msix_entry *entries, int nreq) -{ - struct resource_list_entry *rle; - int error; - int avail; - int i; - - avail = pci_msix_count(pdev->dev.bsddev); - if (avail < nreq) { - if (avail == 0) - return -EINVAL; - return avail; - } - avail = nreq; - if ((error = -pci_alloc_msix(pdev->dev.bsddev, &avail)) != 0) - return error; - /* - * Handle case where "pci_alloc_msix()" may allocate less - * interrupts than available and return with no error: - */ - if (avail < nreq) { - pci_release_msi(pdev->dev.bsddev); - return avail; - } - rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 1, false); - pdev->dev.irq_start = rle->start; - pdev->dev.irq_end = rle->start + avail; - for (i = 0; i < nreq; i++) - entries[i].vector = pdev->dev.irq_start + i; - pdev->msix_enabled = true; - return (0); -} +#define pci_enable_msix(...) linuxkpi_pci_enable_msix(__VA_ARGS__) #define pci_enable_msix_range(...) \ linux_pci_enable_msix_range(__VA_ARGS__) @@ -891,38 +741,6 @@ pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, #define pci_enable_msi(pdev) \ linux_pci_enable_msi(pdev) -static inline int -_lkpi_pci_enable_msi_range(struct pci_dev *pdev, int minvec, int maxvec) -{ - struct resource_list_entry *rle; - int error; - int nvec; - - if (maxvec < minvec) - return (-EINVAL); - - nvec = pci_msi_count(pdev->dev.bsddev); - if (nvec < 1 || nvec < minvec) - return (-ENOSPC); - - nvec = min(nvec, maxvec); - if ((error = -pci_alloc_msi(pdev->dev.bsddev, &nvec)) != 0) - return error; - - /* Native PCI might only ever ask for 32 vectors. */ - if (nvec < minvec) { - pci_release_msi(pdev->dev.bsddev); - return (-ENOSPC); - } - - rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 1, false); - pdev->dev.irq_start = rle->start; - pdev->dev.irq_end = rle->start + nvec; - pdev->irq = rle->start; - pdev->msi_enabled = true; - return (0); -} - static inline int pci_enable_msi(struct pci_dev *pdev) { @@ -946,35 +764,9 @@ static inline void pci_disable_sriov(struct pci_dev *dev) { } -static inline void * -pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size) -{ - struct resource *res; - - res = _lkpi_pci_iomap(pdev, mmio_bar, mmio_size); - if (res == NULL) - return (NULL); - /* This is a FreeBSD extension so we can use bus_*(). */ - if (pdev->want_iomap_res) - return (res); - return ((void *)rman_get_bushandle(res)); -} - -static inline void -pci_iounmap(struct pci_dev *pdev, void *res) -{ - struct pci_mmio_region *mmio, *p; - - TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { - if (res != (void *)rman_get_bushandle(mmio->res)) - continue; - bus_release_resource(pdev->dev.bsddev, - mmio->type, mmio->rid, mmio->res); - TAILQ_REMOVE(&pdev->mmio, mmio, next); - free(mmio, M_DEVBUF); - return; - } -} +#define pci_iomap(pdev, mmio_bar, mmio_size) \ + linuxkpi_pci_iomap(pdev, mmio_bar, mmio_size) +#define pci_iounmap(pdev, res) linuxkpi_pci_iounmap(pdev, res) static inline void lkpi_pci_save_state(struct pci_dev *pdev) @@ -1534,97 +1326,10 @@ struct pci_dev *lkpi_pci_get_class(unsigned int class, struct pci_dev *from); /* -------------------------------------------------------------------------- */ -static inline int -pcim_enable_device(struct pci_dev *pdev) -{ - struct pci_devres *dr; - int error; - - /* Here we cannot run through the pdev->managed check. */ - dr = lkpi_pci_devres_get_alloc(pdev); - if (dr == NULL) - return (-ENOMEM); - - /* If resources were enabled before do not do it again. */ - if (dr->enable_io) - return (0); - - error = pci_enable_device(pdev); - if (error == 0) - dr->enable_io = true; - - /* This device is not managed. */ - pdev->managed = true; - - return (error); -} - -static inline void __iomem ** -pcim_iomap_table(struct pci_dev *pdev) -{ - struct pcim_iomap_devres *dr; - - dr = lkpi_pcim_iomap_devres_find(pdev); - if (dr == NULL) - return (NULL); - - /* - * If the driver has manually set a flag to be able to request the - * resource to use bus_read/write_, return the shadow table. - */ - if (pdev->want_iomap_res) - return ((void **)dr->res_table); - - /* This is the Linux default. */ - return (dr->mmio_table); -} - -static inline int -pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, const char *name) -{ - struct pcim_iomap_devres *dr; - void *res; - uint32_t mappings; - int bar; - - dr = lkpi_pcim_iomap_devres_find(pdev); - if (dr == NULL) - return (-ENOMEM); - - /* Now iomap all the requested (by "mask") ones. */ - for (bar = mappings = 0; mappings != mask; bar++) { - if ((mask & (1 << bar)) == 0) - continue; - - /* Request double is not allowed. */ - if (dr->mmio_table[bar] != NULL) { - device_printf(pdev->dev.bsddev, "%s: bar %d %p\n", - __func__, bar, dr->mmio_table[bar]); - goto err; - } - - res = _lkpi_pci_iomap(pdev, bar, 0); - if (res == NULL) - goto err; - dr->mmio_table[bar] = (void *)rman_get_bushandle(res); - dr->res_table[bar] = res; - - mappings |= (1 << bar); - } - - return (0); -err: - for (bar = PCIR_MAX_BAR_0; bar >= 0; bar--) { - if ((mappings & (1 << bar)) != 0) { - res = dr->mmio_table[bar]; - if (res == NULL) - continue; - pci_iounmap(pdev, res); - } - } - - return (-EINVAL); -} +#define pcim_enable_device(pdev) linuxkpi_pcim_enable_device(pdev) +#define pcim_iomap_table(pdev) linuxkpi_pcim_iomap_table(pdev) +#define pcim_iomap_regions(pdev, mask, name) \ + linuxkpi_pcim_iomap_regions(pdev, mask, name) static inline int pcim_iomap_regions_request_all(struct pci_dev *pdev, uint32_t mask, char *name) diff --git a/sys/compat/linuxkpi/common/src/linux_interrupt.c b/sys/compat/linuxkpi/common/src/linux_interrupt.c index 5602b09c8fb8..378088246f21 100644 --- a/sys/compat/linuxkpi/common/src/linux_interrupt.c +++ b/sys/compat/linuxkpi/common/src/linux_interrupt.c @@ -117,17 +117,20 @@ lkpi_request_irq(struct device *xdev, unsigned int irq, struct resource *res; struct irq_ent *irqe; struct device *dev; + unsigned resflags; int error; int rid; - dev = linux_pci_find_irq_dev(irq); + dev = lkpi_pci_find_irq_dev(irq); if (dev == NULL) return -ENXIO; if (xdev != NULL && xdev != dev) return -ENXIO; rid = lkpi_irq_rid(dev, irq); - res = bus_alloc_resource_any(dev->bsddev, SYS_RES_IRQ, &rid, - flags | RF_ACTIVE); + resflags = RF_ACTIVE; + if ((flags & IRQF_SHARED) != 0) + resflags |= RF_SHAREABLE; + res = bus_alloc_resource_any(dev->bsddev, SYS_RES_IRQ, &rid, resflags); if (res == NULL) return (-ENXIO); if (xdev != NULL) @@ -167,7 +170,7 @@ lkpi_enable_irq(unsigned int irq) struct irq_ent *irqe; struct device *dev; - dev = linux_pci_find_irq_dev(irq); + dev = lkpi_pci_find_irq_dev(irq); if (dev == NULL) return -EINVAL; irqe = lkpi_irq_ent(dev, irq); @@ -183,7 +186,7 @@ lkpi_disable_irq(unsigned int irq) struct irq_ent *irqe; struct device *dev; - dev = linux_pci_find_irq_dev(irq); + dev = lkpi_pci_find_irq_dev(irq); if (dev == NULL) return; irqe = lkpi_irq_ent(dev, irq); @@ -200,7 +203,7 @@ lkpi_bind_irq_to_cpu(unsigned int irq, int cpu_id) struct irq_ent *irqe; struct device *dev; - dev = linux_pci_find_irq_dev(irq); + dev = lkpi_pci_find_irq_dev(irq); if (dev == NULL) return (-ENOENT); @@ -217,7 +220,7 @@ lkpi_free_irq(unsigned int irq, void *device __unused) struct irq_ent *irqe; struct device *dev; - dev = linux_pci_find_irq_dev(irq); + dev = lkpi_pci_find_irq_dev(irq); if (dev == NULL) return; irqe = lkpi_irq_ent(dev, irq); @@ -233,7 +236,7 @@ lkpi_devm_free_irq(struct device *xdev, unsigned int irq, void *p __unused) struct device *dev; struct irq_ent *irqe; - dev = linux_pci_find_irq_dev(irq); + dev = lkpi_pci_find_irq_dev(irq); if (dev == NULL) return; if (xdev != dev) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 852cec9cdc94..4cd28fac15d3 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -41,11 +41,14 @@ #include #include #include +#include #include #include #include +#include +#include #include #include @@ -95,6 +98,7 @@ static pci_iov_add_vf_t linux_pci_iov_add_vf; static int linux_backlight_get_status(device_t dev, struct backlight_props *props); static int linux_backlight_update_status(device_t dev, struct backlight_props *props); static int linux_backlight_get_info(device_t dev, struct backlight_info *info); +static void lkpi_pcim_iomap_table_release(struct device *, void *); static device_method_t pci_methods[] = { DEVMETHOD(device_probe, linux_pci_probe), @@ -118,6 +122,18 @@ const char *pci_power_names[] = { "UNKNOWN", "D0", "D1", "D2", "D3hot", "D3cold" }; +/* We need some meta-struct to keep track of these for devres. */ +struct pci_devres { + bool enable_io; + /* PCIR_MAX_BAR_0 + 1 = 6 => BIT(0..5). */ + uint8_t region_mask; + struct resource *region_table[PCIR_MAX_BAR_0 + 1]; /* Not needed. */ +}; +struct pcim_iomap_devres { + void *mmio_table[PCIR_MAX_BAR_0 + 1]; + struct resource *res_table[PCIR_MAX_BAR_0 + 1]; +}; + struct linux_dma_priv { uint64_t dma_mask; bus_dma_tag_t dmat; @@ -434,6 +450,41 @@ linux_pci_attach(device_t dev) return (linux_pci_attach_device(dev, pdrv, id, pdev)); } +static struct resource_list_entry * +linux_pci_reserve_bar(struct pci_dev *pdev, struct resource_list *rl, + int type, int rid) +{ + device_t dev; + struct resource *res; + + KASSERT(type == SYS_RES_IOPORT || type == SYS_RES_MEMORY, + ("trying to reserve non-BAR type %d", type)); + + dev = pdev->pdrv != NULL && pdev->pdrv->isdrm ? + device_get_parent(pdev->dev.bsddev) : pdev->dev.bsddev; + res = pci_reserve_map(device_get_parent(dev), dev, type, &rid, 0, ~0, + 1, 1, 0); + if (res == NULL) + return (NULL); + return (resource_list_find(rl, type, rid)); +} + +static struct resource_list_entry * +linux_pci_get_rle(struct pci_dev *pdev, int type, int rid, bool reserve_bar) +{ + struct pci_devinfo *dinfo; + struct resource_list *rl; + struct resource_list_entry *rle; + + dinfo = device_get_ivars(pdev->dev.bsddev); + rl = &dinfo->resources; + rle = resource_list_find(rl, type, rid); + /* Reserve resources for this BAR if needed. */ + if (rle == NULL && reserve_bar) + rle = linux_pci_reserve_bar(pdev, rl, type, rid); + return (rle); +} + int linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, const struct pci_device_id *id, struct pci_dev *pdev) @@ -542,7 +593,7 @@ lkpi_pci_disable_dev(struct device *dev) return (0); } -struct pci_devres * +static struct pci_devres * lkpi_pci_devres_get_alloc(struct pci_dev *pdev) { struct pci_devres *dr; @@ -558,6 +609,15 @@ lkpi_pci_devres_get_alloc(struct pci_dev *pdev) return (dr); } +static struct pci_devres * +lkpi_pci_devres_find(struct pci_dev *pdev) +{ + if (!pdev->managed) + return (NULL); + + return (lkpi_pci_devres_get_alloc(pdev)); +} + void lkpi_pci_devres_release(struct device *dev, void *p) { @@ -586,7 +646,32 @@ lkpi_pci_devres_release(struct device *dev, void *p) } } -struct pcim_iomap_devres * +int +linuxkpi_pcim_enable_device(struct pci_dev *pdev) +{ + struct pci_devres *dr; + int error; + + /* Here we cannot run through the pdev->managed check. */ + dr = lkpi_pci_devres_get_alloc(pdev); + if (dr == NULL) + return (-ENOMEM); + + /* If resources were enabled before do not do it again. */ + if (dr->enable_io) + return (0); + + error = pci_enable_device(pdev); + if (error == 0) + dr->enable_io = true; + + /* This device is not managed. */ + pdev->managed = true; + + return (error); +} + +static struct pcim_iomap_devres * lkpi_pcim_iomap_devres_find(struct pci_dev *pdev) { struct pcim_iomap_devres *dr; @@ -606,7 +691,144 @@ lkpi_pcim_iomap_devres_find(struct pci_dev *pdev) return (dr); } +void __iomem ** +linuxkpi_pcim_iomap_table(struct pci_dev *pdev) +{ + struct pcim_iomap_devres *dr; + + dr = lkpi_pcim_iomap_devres_find(pdev); + if (dr == NULL) + return (NULL); + + /* + * If the driver has manually set a flag to be able to request the + * resource to use bus_read/write_, return the shadow table. + */ + if (pdev->want_iomap_res) + return ((void **)dr->res_table); + + /* This is the Linux default. */ + return (dr->mmio_table); +} + +static struct resource * +_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size __unused) +{ + struct pci_mmio_region *mmio, *p; + int type; + + type = pci_resource_type(pdev, bar); + if (type < 0) { + device_printf(pdev->dev.bsddev, "%s: bar %d type %d\n", + __func__, bar, type); + return (NULL); + } + + /* + * Check for duplicate mappings. + * This can happen if a driver calls pci_request_region() first. + */ + TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { + if (mmio->type == type && mmio->rid == PCIR_BAR(bar)) { + return (mmio->res); + } + } + + mmio = malloc(sizeof(*mmio), M_DEVBUF, M_WAITOK | M_ZERO); + mmio->rid = PCIR_BAR(bar); + mmio->type = type; + mmio->res = bus_alloc_resource_any(pdev->dev.bsddev, mmio->type, + &mmio->rid, RF_ACTIVE|RF_SHAREABLE); + if (mmio->res == NULL) { + device_printf(pdev->dev.bsddev, "%s: failed to alloc " + "bar %d type %d rid %d\n", + __func__, bar, type, PCIR_BAR(bar)); + free(mmio, M_DEVBUF); + return (NULL); + } + TAILQ_INSERT_TAIL(&pdev->mmio, mmio, next); + + return (mmio->res); +} + +void * +linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size) +{ + struct resource *res; + + res = _lkpi_pci_iomap(pdev, mmio_bar, mmio_size); + if (res == NULL) + return (NULL); + /* This is a FreeBSD extension so we can use bus_*(). */ + if (pdev->want_iomap_res) + return (res); + return ((void *)rman_get_bushandle(res)); +} + void +linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res) +{ + struct pci_mmio_region *mmio, *p; + + TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { + if (res != (void *)rman_get_bushandle(mmio->res)) + continue; + bus_release_resource(pdev->dev.bsddev, + mmio->type, mmio->rid, mmio->res); + TAILQ_REMOVE(&pdev->mmio, mmio, next); + free(mmio, M_DEVBUF); + return; + } +} + +int +linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, const char *name) +{ + struct pcim_iomap_devres *dr; + void *res; + uint32_t mappings; + int bar; + + dr = lkpi_pcim_iomap_devres_find(pdev); + if (dr == NULL) + return (-ENOMEM); + + /* Now iomap all the requested (by "mask") ones. */ + for (bar = mappings = 0; mappings != mask; bar++) { + if ((mask & (1 << bar)) == 0) + continue; + + /* Request double is not allowed. */ + if (dr->mmio_table[bar] != NULL) { + device_printf(pdev->dev.bsddev, "%s: bar %d %p\n", + __func__, bar, dr->mmio_table[bar]); + goto err; + } + + res = _lkpi_pci_iomap(pdev, bar, 0); + if (res == NULL) + goto err; + dr->mmio_table[bar] = (void *)rman_get_bushandle(res); + dr->res_table[bar] = res; + + mappings |= (1 << bar); + } + + return (0); +err: + for (bar = PCIR_MAX_BAR_0; bar >= 0; bar--) { + if ((mappings & (1 << bar)) != 0) { + res = dr->mmio_table[bar]; + if (res == NULL) + continue; + pci_iounmap(pdev, res); + } + } + + return (-EINVAL); +} + +static void lkpi_pcim_iomap_table_release(struct device *dev, void *p) { struct pcim_iomap_devres *dr; @@ -758,23 +980,35 @@ linux_pci_register_driver(struct pci_driver *pdrv) return (_linux_pci_register_driver(pdrv, dc)); } -struct resource_list_entry * -linux_pci_reserve_bar(struct pci_dev *pdev, struct resource_list *rl, - int type, int rid) +static struct resource_list_entry * +lkpi_pci_get_bar(struct pci_dev *pdev, int bar, bool reserve) { - device_t dev; - struct resource *res; - - KASSERT(type == SYS_RES_IOPORT || type == SYS_RES_MEMORY, - ("trying to reserve non-BAR type %d", type)); + int type; - dev = pdev->pdrv != NULL && pdev->pdrv->isdrm ? - device_get_parent(pdev->dev.bsddev) : pdev->dev.bsddev; - res = pci_reserve_map(device_get_parent(dev), dev, type, &rid, 0, ~0, - 1, 1, 0); - if (res == NULL) + type = pci_resource_type(pdev, bar); + if (type < 0) return (NULL); - return (resource_list_find(rl, type, rid)); + bar = PCIR_BAR(bar); + return (linux_pci_get_rle(pdev, type, bar, reserve)); +} + +struct device * +lkpi_pci_find_irq_dev(unsigned int irq) +{ + struct pci_dev *pdev; + struct device *found; + + found = NULL; + spin_lock(&pci_lock); + list_for_each_entry(pdev, &pci_devices, links) { + if (irq == pdev->dev.irq || + (irq >= pdev->dev.irq_start && irq < pdev->dev.irq_end)) { + found = &pdev->dev; + break; + } + } + spin_unlock(&pci_lock); + return (found); } unsigned long @@ -785,7 +1019,7 @@ pci_resource_start(struct pci_dev *pdev, int bar) device_t dev; int error; - if ((rle = linux_pci_get_bar(pdev, bar, true)) == NULL) + if ((rle = lkpi_pci_get_bar(pdev, bar, true)) == NULL) return (0); dev = pdev->pdrv != NULL && pdev->pdrv->isdrm ? device_get_parent(pdev->dev.bsddev) : pdev->dev.bsddev; @@ -804,7 +1038,7 @@ pci_resource_len(struct pci_dev *pdev, int bar) { struct resource_list_entry *rle; - if ((rle = linux_pci_get_bar(pdev, bar, true)) == NULL) + if ((rle = lkpi_pci_get_bar(pdev, bar, true)) == NULL) return (0); return (rle->count); } @@ -853,44 +1087,62 @@ pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) return (0); } -struct resource * -_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size __unused) +int +linuxkpi_pci_request_regions(struct pci_dev *pdev, const char *res_name) { - struct pci_mmio_region *mmio, *p; - int type; + int error; + int i; - type = pci_resource_type(pdev, bar); - if (type < 0) { - device_printf(pdev->dev.bsddev, "%s: bar %d type %d\n", - __func__, bar, type); - return (NULL); + for (i = 0; i <= PCIR_MAX_BAR_0; i++) { + error = pci_request_region(pdev, i, res_name); + if (error && error != -ENODEV) { + pci_release_regions(pdev); + return (error); + } } + return (0); +} + +void +linuxkpi_pci_release_region(struct pci_dev *pdev, int bar) +{ + struct resource_list_entry *rle; + struct pci_devres *dr; + struct pci_mmio_region *mmio, *p; + + if ((rle = lkpi_pci_get_bar(pdev, bar, false)) == NULL) + return; /* - * Check for duplicate mappings. - * This can happen if a driver calls pci_request_region() first. + * As we implicitly track the requests we also need to clear them on + * release. Do clear before resource release. */ - TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { - if (mmio->type == type && mmio->rid == PCIR_BAR(bar)) { - return (mmio->res); - } + dr = lkpi_pci_devres_find(pdev); + if (dr != NULL) { + KASSERT(dr->region_table[bar] == rle->res, ("%s: pdev %p bar %d" *** 157 LINES SKIPPED *** From nobody Sun Dec 24 08:22:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv23qJhz54HTl; Sun, 24 Dec 2023 08:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv23H4lz4XC8; Sun, 24 Dec 2023 08:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nprsGDrfreOSZ10srTv0hIUlYw5AEylbDrn1jP0KJ1k=; b=Rt2GtnfZrrj0j2E9WhU8z5r6lUwfFenYo9Y3WkgMVXnZa+la/YRHBxFOFnP5RIKMsDfj6N MFLevVzXJzjdLviyQC8b77s1wilVGXyD5RIe3CYNT7d4/7P+87jeV0zTor2gSxibjpDBAk sKnogAaNF1ylXAIt9HMkCceMm4VO1KpwkdLQ9u7t9NqMNYBr+RHtz2v37DNZZuaE0prL9g S0zW7YttQL67omlR942JbnWOsXVFTG/MEMpD0t362zQ9OX3NMzXINz9Y5bVlen7V6WWcEQ H3STCgL0n56F0rjZH2iiUzwhsTSnRKL70oih68lmUew/3Dx9xrqllNGb9ILWbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406174; a=rsa-sha256; cv=none; b=IIXI6j65XUP+Glc/KHIsBQ22zwD3IscxmEuxJTRY+NfKtIdkhASOIROHCl0vqTvBBjGiSu +LzTwTKlN+7+TezHw/QdOrEFaJYJWuPOzvt2w5XIzrRpQT4U3EwBAxVWPviQ+adz0LsENy iWO42CNVPJZXTPZjztIaSbKUOSd2toPu0PELTaf6Grrq3c3oeulSr0P5PqPGvJJP2+8gww YHxfVatg+qllQT1QCUr+YdAJ2Q7F9OV73APYiiTAOvs/0Pmw4s/mqw4/O37joLtkQbdrux OEHkZjvFy9+ckC6UBmhwdBWbdAYu22WngmPaohWCDADbBkHJdSOSzC5XT3FBFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nprsGDrfreOSZ10srTv0hIUlYw5AEylbDrn1jP0KJ1k=; b=riO1M5p+MLbtcKDfWlxvBbmWZHjSQRgN0YliPu/3mO+jv428+auFFh0GocyPSfnw6CLJEP p/pd6QynudrC0YoKiAXTGUXxUC7MkXpXG/5v4ErYrMxd3jaMQLOVM+hM1CzscGyohy9J0I PMKZtDp4482qWtLcdACKTyDjJixgTaFZ73qf49j/nyRC/duTMLtiRz/auG/8u6DH7kn+I1 y3B3wBEsGipuG08bU7xTuqBXzIeWHq/gPzWUAhbF/axOiXN+zv5IACfr/ic/1b4ZUSUdTI /DsSkKh++ZBfoWygd2UM9xE+rRWBm0GRs9VB8fBKAgfVcwUhS2rHYW/Q/weyqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv22LLpz5sk; Sun, 24 Dec 2023 08:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8Ms0L086462; Sun, 24 Dec 2023 08:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8MsEM086459; Sun, 24 Dec 2023 08:22:54 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:54 GMT Message-Id: <202312240822.3BO8MsEM086459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5e6bddfc4330 - main - LinuxKPI: Add video/vga.h header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e6bddfc43300f344d44afdc80f1bb7a37bd84fc Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5e6bddfc43300f344d44afdc80f1bb7a37bd84fc commit 5e6bddfc43300f344d44afdc80f1bb7a37bd84fc Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Add video/vga.h header Sponsored by: Serenity Cyber Security, LLC Obtained from: OpenBSD Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42793 --- sys/compat/linuxkpi/common/include/video/vga.h | 16 ++++++++++++++++ sys/compat/linuxkpi/dummy/include/video/vga.h | 0 2 files changed, 16 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/video/vga.h b/sys/compat/linuxkpi/common/include/video/vga.h new file mode 100644 index 000000000000..e327246cc457 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/video/vga.h @@ -0,0 +1,16 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_VIDEO_VGA_H +#define _LINUXKPI_VIDEO_VGA_H + +#define VGA_MIS_W 0x3c2 +#define VGA_SEQ_I 0x3c4 +#define VGA_SEQ_D 0x3c5 +#define VGA_MIS_R 0x3cc + +#define VGA_SR01_SCREEN_OFF (1 << 5) + +#define VGA_FB_PHYS_BASE 0xA0000 +#define VGA_FB_PHYS_SIZE 65536 + +#endif diff --git a/sys/compat/linuxkpi/dummy/include/video/vga.h b/sys/compat/linuxkpi/dummy/include/video/vga.h deleted file mode 100644 index e69de29bb2d1..000000000000 From nobody Sun Dec 24 08:22:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv40421z54H7K; Sun, 24 Dec 2023 08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv34P7wz4Xc0; Sun, 24 Dec 2023 08:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wxoVsb3a/7GiFmnfvwgxLPHMpkMKM67/X3JUpbxjVI=; b=par4/0oLHWlpV5R3wjM7Lrx3w+7DmKfsckHkRlLhrO14RlJkFRkBVTLWoqiAI0RSDlxc/L iJN6JUmUOH+kooPUhmMcuEM8W/mWnS+/NGerDm1CQ3fpITO8ZmHBFhnpG8DNjitcbAW97u T/6CqHf6LIu6yNfqsftu0thMiVPqcfNHmOOAnsS5gqlNZCCwYH7E3mU9Qxw/HWBTk3SB6L jwBaQeICdcHJ3RLgDKsF4M+RVYD9EE5gZ66tyClQOebXeJEM8upvcAKfV116L/AXX6K9kO IxxetrcQox9+WGpoiXm5sbiMAw08+elfhKTxVvOcPMz3ec25W6eBnpRzz4Z2mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406175; a=rsa-sha256; cv=none; b=wU84qmitB9zyLkFp51sCLNfOofZYENTNB/wAQSp7nb2P+RHPKsdL2Cs2bdSZRCUK42fIAx oR1DDowx+QMt+kolnQXFAJtXT0mXXqmbqdUGkUQnqKK/trPVsLDkiiSR+2MnV6aJrYQHo+ r4c5Xi8K/mRHOCW+qhLLtDDoNTCfENuy2b5LiGEUdEWi+5TPuWTOdmcyBaxBkDLMW8lUZg +vFi6u6be2O3IReLifXo291vd9YEn1lz+5F5vOsSRNn+WF//XpJtiMr0KUMAKn1MO4QO+S Q4/GND440Y9e5dZGEz/SBBBsTeqNDNOrPY/wFch7kiDxYlAteAg+Yl/Rtqb5dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wxoVsb3a/7GiFmnfvwgxLPHMpkMKM67/X3JUpbxjVI=; b=DfEmYfuvPSiZ7FNOj1KdViMQATUpYHHJQRPT4B6pqyCcuO6+NnqFgDf8SFOnzSOlUwwEAu d4zQGybCnxPPNkkBf/MSuVheOH/uf9QhfNcQWoIJ5aRP0BvJf2LJMARJ17tf6K1RFyW1Os hUcGC1zGqfpurDKQOiN5/7fd37wHd5HwDOj8xSJJbSIt9nq003dOEzUEGRscldYn56nwDW pzI+eiyLhazodflWn/lE5NoAJsFDgZFQeCn0L1hzkjqPmslpUJS3PdW1JhiwWNDspglCm4 pPrAJNbPjlJLGmu1aM1XYDRsseyVJE9TRbP7IJnBWxUmDYbAy+D4Sk0NkrsI+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 4SyYv33NDTz5Qw; Sun, 24 Dec 2023 08:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8Mt2s086518; Sun, 24 Dec 2023 08:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8MtbS086516; Sun, 24 Dec 2023 08:22:55 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:55 GMT Message-Id: <202312240822.3BO8MtbS086516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: ae1084ff01bf - main - LinuxKPI: Add str_on_off and other helpers to linux/string_helpers.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae1084ff01bf9d9a9a2c56caf6c7095f3e96f579 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=ae1084ff01bf9d9a9a2c56caf6c7095f3e96f579 commit ae1084ff01bf9d9a9a2c56caf6c7095f3e96f579 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Add str_on_off and other helpers to linux/string_helpers.h Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz, imp (previous version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42794 --- .../linuxkpi/common/include/linux/string_helpers.h | 29 +++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/string_helpers.h b/sys/compat/linuxkpi/common/include/linux/string_helpers.h index faa097c97a87..1bdff2730361 100644 --- a/sys/compat/linuxkpi/common/include/linux/string_helpers.h +++ b/sys/compat/linuxkpi/common/include/linux/string_helpers.h @@ -39,4 +39,31 @@ str_yes_no(bool value) return "no"; } -#endif /* _LINUXKPI_LINUX_STRING_HELPERS_H_ */ +static inline const char * +str_on_off(bool value) +{ + if (value) + return "on"; + else + return "off"; +} + +static inline const char * +str_enabled_disabled(bool value) +{ + if (value) + return "enabled"; + else + return "disabled"; +} + +static inline const char * +str_enable_disable(bool value) +{ + if (value) + return "enable"; + else + return "disable"; +} + +#endif From nobody Sun Dec 24 08:22:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv51Yhpz54HPk; Sun, 24 Dec 2023 08:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv45J4Qz4XfN; Sun, 24 Dec 2023 08: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=1703406176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TlX+hLNM0VjzyHHnwjDOthJnQMAonECM5LRk3Nme7xM=; b=pqmMVvO+kOIFO79p7KaAmOWCuuLps8mM6vJiGOQ7WdcV+XKRIgAoo9mLQChm4dE/GpTgP6 OdFcLdRZJiHyBtlQZN5asCzzn/aE5hWsrZkMgneiLKJs2eDWxjw14STxOwl40cWk9H6H3e 0gybEfAVWvnrxVUWTJKp3skDBkH13qjDle7aXF1JKMisXy9HTDVU7Quwceor1hkyB2ROuu wTnylGoY2hKPjRDesfLTwehtQFGTG4XENC6Qm3vJloxTwg3bDuH1MOQP39OpDYE6A2Oocz UC4CkTZ0bi/O23Jf7IVzYs7U62HaRkVnM5MM5YEluCma0svFuL0xpbeEBLn7qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406176; a=rsa-sha256; cv=none; b=L3E3s0EFhjWsMuYAKVvGb4Bu3jOnjr2Gh3EY9Sr/fEfEuE9NdgL/yuTRSvooFk/8UP1MCN MPKtw60LKOFJq3wdAfxjBR9Ghun/QUWpdQUNIf6yokUxZwoMka7P1SEGmpXAIEY9OQr1IA VjCaz4N3DMFRSo4fh0YFgB7VVThLOEznBsaONdVmr1r/aXnmVf6ZzRi2y3TCb//TK2t32o MHO6oV6UCLbtkDsNFO4adnoN4iCtmAzX4ZXrSHZhuIx3CdKtZ7NXI+mjl69p6Qx+XQnD6D +FuN6+9ou9gubR6fXe0MMLCvCR9X6fSQ5kTKEbBlJGa9qiIfz+VUKah30Wq8Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TlX+hLNM0VjzyHHnwjDOthJnQMAonECM5LRk3Nme7xM=; b=wCEyQsWQezoIywJ7WI/mx98c/ynAt82pWu+pNBPGZGHwwB7de7j0mW5b6M4MfSoYNZWgqz z4sZi6MAKzL+byJez+ibHQGDIKoQZKzWkuKpdFFfovpu8pwMVtUFtPmzzgJcxRSx5WpHkB +efoQviJh+XtMX7Qj9FfU4y3L2CWV8phQBlYJRmpF4GLtrUiJNWFyYUhgZ21/Bwcyupqe1 SfhvO1pOdsULCYH9rITITJuYnwmVzvlKGjuMo3PmO6tfziMjTxDBaXHD0M5YNhsNUOzKMe eqM89gyKA0KGeaCG1g1KbuhFYctCHnkbIJXO3OHMJUXhhHD6HvvetrLcJNfB2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv44PTRz5tG; Sun, 24 Dec 2023 08:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8Mu90086567; Sun, 24 Dec 2023 08:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8MuRC086564; Sun, 24 Dec 2023 08:22:56 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:56 GMT Message-Id: <202312240822.3BO8MuRC086564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: a01259965319 - main - LinuxKPI: Implement dev_dbg_once() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a01259965319897b836019f1d4dcf1b5a5a6ea1a Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=a01259965319897b836019f1d4dcf1b5a5a6ea1a commit a01259965319897b836019f1d4dcf1b5a5a6ea1a Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Implement dev_dbg_once() macro Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42795 --- sys/compat/linuxkpi/common/include/linux/device.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 7a5d813063a9..142003c5ca8c 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -236,6 +236,14 @@ show_class_attr_string(struct class *class, } \ } while (0) +#define dev_dbg_once(dev, ...) do { \ + static bool __dev_dbg_once; \ + if (!__dev_dbg_once) { \ + __dev_dbg_once = 1; \ + dev_dbg(dev, __VA_ARGS__); \ + } \ +} while (0) + #define dev_err_ratelimited(dev, ...) do { \ static linux_ratelimit_t __ratelimited; \ if (linux_ratelimited(&__ratelimited)) \ From nobody Sun Dec 24 08:22:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv610D6z54HJr; Sun, 24 Dec 2023 08:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv56J7Wz4XJY; Sun, 24 Dec 2023 08:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HyvCZAWm9Pla2d4AwV4sj5Ku24EN3BBilh53R21bm9A=; b=KGWhAbqDPCPnaPJJCVfNUepT4K+f3DaSo+vFKnqVOAzwFLhx/Clx381y9a61anq3nRBPzc GPU/aalD930UhsR1QkIKnC07wAtzmcnN6JI75X9YB8Y0jylnMB6u2zTgFzvazwPqmkS0I1 kstyvUrfJSfCkLL1gzZVjmjej/4H3nmsmqXSJVb8gxiGDe9+T6BMy+wapEMZm6DpEqu44Y w0F9VhM27SHg3jWxZlx7VbbVwgg8LCtw4PWDJA2Kn1Tjua+suxxP6UmH9+zi8r9rZcypxt dgeL021M2qwoIi78eOdxAvEL6H3eQ6imVLPfzoI+UEIBAC7DDo7z2gM0Q09BZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406178; a=rsa-sha256; cv=none; b=Gi7V1x3aL1REZ1PP8XTSOcDL12OaSSpHbVFQ6GazkSc7bn06t2MWsMDhzq3JJFgE+DZKMh 0k8oHQqoYak2xrV6NQAYH4nl+MUKD36TAVoJvpKwHNBHmYprr5JcHTm296amzwMFyCn+Ie jnJPFiz6Goi4U7/z+pUvQ4FxRsphi79RKkJ2zOMsx4iWB2QI7nz9fcb/VCN23aX/gCQ0Sx 2DHKFSKCx4Hd55BIYYaEZraFA1STFWqmCQlcaxJniOEssxpIQWXdxb6VWHHKP43k8w0CJB SXrYX8j266Vn0COxJKbdx6aXFYHobr0ljDcBxF6wU4uOpaU+nIs2NA/ORDZ9ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HyvCZAWm9Pla2d4AwV4sj5Ku24EN3BBilh53R21bm9A=; b=Tl4JsOASIb3KRWluacXps9MTSulfFXIGJGVuOsZllZSFgQE56mlkjHgIRc3mE4AEw87/52 nRxTQByP4jol3crl9twiJIjeYBrm8rWVUXm4jC8OxtMc/0XGpDB0R4rC7BQwednRVCztqJ lnwQvKCUKTTx+YVf5WzSpBRQVW11TcuwhZGkyd2Lhd0TlpU+QQJzLzYC22noPFZB2U8wsU 9nSc8uCxb9B3newG2dGYyng8RxWf9dQuPqybYI+uuHGT4ggpN+Yz49QODj+PY3nSaJ7xwa IMhaQqqE5TlPNJUa6CirpQ1XqrLVC6hDb5ZUiwNMr6VlIiqZz9MnKG9yt3KIxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv55Nzdz5Tb; Sun, 24 Dec 2023 08:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8MvUM086606; Sun, 24 Dec 2023 08:22:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8Mv0g086603; Sun, 24 Dec 2023 08:22:57 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:57 GMT Message-Id: <202312240822.3BO8Mv0g086603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 31ef29091b0f - main - LinuxKPI: Add static_assert() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31ef29091b0fbadefb4ccfb21e4b30ca7ddca3ed Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=31ef29091b0fbadefb4ccfb21e4b30ca7ddca3ed commit 31ef29091b0fbadefb4ccfb21e4b30ca7ddca3ed Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Add static_assert() macro And move it along BUILD_BUG family in to linux/build_bug.h to match Linux. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42800 --- .../linuxkpi/common/include/linux/build_bug.h | 65 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/kernel.h | 23 +------- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/build_bug.h b/sys/compat/linuxkpi/common/include/linux/build_bug.h new file mode 100644 index 000000000000..59d1fc228afc --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/build_bug.h @@ -0,0 +1,65 @@ +/*- + * Copyright (c) 2017 Mark Johnston + * Copyright (c) 2018 Johannes Lundberg + * Copyright (c) 2021 The FreeBSD Foundation + * Copyright (c) 2021 Vladimir Kondratyev + * Copyright (c) 2023 Serenity Cyber Security, LLC + * + * Portions of this software were developed by Bjoern A. Zeeb + * 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 unmodified, 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 ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_BUILD_BUG_H_ +#define _LINUXKPI_LINUX_BUILD_BUG_H_ + +#include + +#include + +/* + * BUILD_BUG_ON() can happen inside functions where _Static_assert() does not + * seem to work. Use old-schoold-ish CTASSERT from before commit + * a3085588a88fa58eb5b1eaae471999e1995a29cf but also make sure we do not + * end up with an unused typedef or variable. The compiler should optimise + * it away entirely. + */ +#define _O_CTASSERT(x) _O__CTASSERT(x, __LINE__) +#define _O__CTASSERT(x, y) _O___CTASSERT(x, y) +#define _O___CTASSERT(x, y) while (0) { \ + typedef char __assert_line_ ## y[(x) ? 1 : -1]; \ + __assert_line_ ## y _x; \ + _x[0] = '\0'; \ +} + +#define BUILD_BUG() do { CTASSERT(0); } while (0) +#define BUILD_BUG_ON(x) do { _O_CTASSERT(!(x)) } while (0) +#define BUILD_BUG_ON_MSG(x, msg) BUILD_BUG_ON(x) +#define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) +#define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); } +#define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) + +#define static_assert(x, ...) __static_assert(x, ##__VA_ARGS__, #x) +#define __static_assert(x, msg, ...) _Static_assert(x, msg) + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 73418c849544..097e22e5d8ea 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -90,28 +91,6 @@ #define S64_C(x) x ## LL #define U64_C(x) x ## ULL -/* - * BUILD_BUG_ON() can happen inside functions where _Static_assert() does not - * seem to work. Use old-schoold-ish CTASSERT from before commit - * a3085588a88fa58eb5b1eaae471999e1995a29cf but also make sure we do not - * end up with an unused typedef or variable. The compiler should optimise - * it away entirely. - */ -#define _O_CTASSERT(x) _O__CTASSERT(x, __LINE__) -#define _O__CTASSERT(x, y) _O___CTASSERT(x, y) -#define _O___CTASSERT(x, y) while (0) { \ - typedef char __unused __assert_line_ ## y[(x) ? 1 : -1]; \ - __assert_line_ ## y _x; \ - _x[0] = '\0'; \ -} - -#define BUILD_BUG() do { CTASSERT(0); } while (0) -#define BUILD_BUG_ON(x) do { _O_CTASSERT(!(x)) } while (0) -#define BUILD_BUG_ON_MSG(x, msg) BUILD_BUG_ON(x) -#define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) -#define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); } -#define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) - #define BUG() panic("BUG at %s:%d", __FILE__, __LINE__) #define BUG_ON(cond) do { \ if (cond) { \ From nobody Sun Dec 24 08:22:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv73LSlz54H7Z; Sun, 24 Dec 2023 08:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv70S4hz4Xfm; Sun, 24 Dec 2023 08:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzJ6gfRL9wSbZ3Y7Y+riVTnuZrfcPrGzeQ87Z9ax+vY=; b=pmKPsKhaUr/U10rmMCI4uQUkdRh3KZaworhCIsavLu70eeGGa1SybBMFDZoGwlMdxPF/Gz 1UBiqCLVyx/m3FEEvOhn/ZJPXv1j3Nx5lUKoFeaZicwWzdXWxh3bV0xMrVZkl4mI7o662s bLshGdyQ3vptygYPn4l6SfOfMzRSU5rA4BzNTl9pw0lGAOjCFTfYxRW0FCzD0/4JYyJCLB nXTIdhgyKs/GLdBTQIxAQFBw6XIUFe6E/WrgC4QiTOp1oEyKCsvUbjcU1/0r4LKMahW/97 olMRYpjYSm2PN9O67fWv91TFCC4kElpTf/UXvTkSCSDXET/PJMhTTxbJ4XTL0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406179; a=rsa-sha256; cv=none; b=Owsns82aj18KjYrmzdepesTDucnvH4GmQyce0IH/nK1zX/lWU0COkKi22wIL1qW8WrfmIP WztAsRSSRQF3RjU2YxKob2UzvCl4F2TbXWrO5tFBoIk+JkPOddHtuRXAEAgi8Lho9rh2tY 8wwVGeGwllzx2obrzSIx1pNfWf/e4VQ7Pplv6/+oR3EmhjCDD3+ETP3R8FAb3QE34CDXLx nu4GDIP4ZT9B5l9BN54cmggle2LRu2otmVrUBoNhtThPsfX9sKz4WVZztvkVr25u4VKjL5 Gk8sioGzegNK9c0yhf13YpQS8ZPwOITPJ+wMxi9qV0aeFK0wA/lAuc+mkSs5oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzJ6gfRL9wSbZ3Y7Y+riVTnuZrfcPrGzeQ87Z9ax+vY=; b=onRFRQpgkD/PjwJM13rfSLGtrtBAbUy6PjKCVSWf3Z1hJhtFPi8vZsUjEkdzQRFgge2Xhn 0skUgYlfXbpJ/DaYGtkcZV7Vlb70Qf3NPaokmHPA+7I5e3zy2AdMhqyR2YQ9cDnMaHPXXT sQFChtYNESXSSVtRrZI8jKAQqK3hLOtcRrgk1MNIjGnSv9+GctksiSvpRVISATOmaAFr1Y MLSfsDJGrEcpUcDzNPi7rG7HwNclTiyA2FafwLiwmL39o4UwNUbgeHKU/RCMF26YIPGgQo DYfX2uMU87bpm22JkdNxvu/wjs3D0R05JQ37/HHbj1ahk/kVlGhtVb+m2Snedw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv66Lnhz5tH; Sun, 24 Dec 2023 08:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8MwcF086652; Sun, 24 Dec 2023 08:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8Mwgn086649; Sun, 24 Dec 2023 08:22:58 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:58 GMT Message-Id: <202312240822.3BO8Mwgn086649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: fa862482fb0a - main - LinuxKPI: Split linux/container_of.h off from linux/kernel.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa862482fb0a8759984437d71221b17377625491 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=fa862482fb0a8759984437d71221b17377625491 commit fa862482fb0a8759984437d71221b17377625491 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Split linux/container_of.h off from linux/kernel.h Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42796 --- .../linuxkpi/common/include/linux/container_of.h | 46 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/kernel.h | 9 +---- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/container_of.h b/sys/compat/linuxkpi/common/include/linux/container_of.h new file mode 100644 index 000000000000..449507fcf9c1 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/container_of.h @@ -0,0 +1,46 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2017 Matt Macy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, 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 ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_CONTAINER_OF_H +#define _LINUXKPI_LINUX_CONTAINER_OF_H + +#include + +#include +#include + +#define container_of(ptr, type, member) \ +({ \ + const __typeof(((type *)0)->member) *__p = (ptr); \ + (type *)((uintptr_t)__p - offsetof(type, member)); \ +}) + +#define typeof_member(type, member) __typeof(((type *)0)->member) + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 097e22e5d8ea..99ba19e9e25c 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -273,12 +274,6 @@ extern int linuxkpi_debug; }) #endif -#define container_of(ptr, type, member) \ -({ \ - const __typeof(((type *)0)->member) *__p = (ptr); \ - (type *)((uintptr_t)__p - offsetof(type, member)); \ -}) - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define u64_to_user_ptr(val) ((void *)(uintptr_t)(val)) @@ -551,8 +546,6 @@ kstrtou8_from_user(const char __user *s, size_t count, unsigned int base, #define offsetofend(t, m) \ (offsetof(t, m) + sizeof((((t *)0)->m))) -#define typeof_member(s, e) typeof(((s *)0)->e) - #define clamp_t(type, _x, min, max) min_t(type, max_t(type, _x, min), max) #define clamp(x, lo, hi) min( max(x,lo), hi) #define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi) From nobody Sun Dec 24 08:22:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv82czjz54H0F; Sun, 24 Dec 2023 08:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv81295z4XZt; Sun, 24 Dec 2023 08:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j/c1+ngXrDfc52jYsC3cjQj3Kxy7hTvU0WdV9Zu/0ug=; b=Zxa1XPMQrFQmo2njrebZNroR15BF9LSr3Ro+AIacGDByLW3FZlVPAk+1/jq+05ruXbrzBz Q4R+sIYrM7jYH4jxLnxTTA3ES9bl4j47VbARphgeSskvAPU4+ht+27Aa+N6aa++4m+MWt9 831jWqDhVS8VFAGlPn3BGDvtAlgr+y96STLrNKl2vMvS+9QvIDzDZx/4pZKmhOC+SAKrpW K6+g0dWOmebYxtzIgn75TFs9r/tkHzocMNFLRNsFqv0CgBYHlDaMg2glxQffxpps0+xT24 7p8VxALo4mtH9YmrXhGee3bHnIJz7tFFAyu6oABXjEnxpK5RhvmJLYjVVY8pOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406180; a=rsa-sha256; cv=none; b=GXnVe4UBcVK61mlK0NugFdGF9xgwGPO1cHiBUiGFZ2EBLbed9Dtf/eLFQh8fcbNESu2EnS /JTmrTnt17MKvr3U57SaXwhhSIw+qQNjFnxRSePbkwX8dfnTXR/XQww9HgJdowL+zzAik2 5uaup160hTViXixh6DdVCHm2gQTqJT20gkBfks0YyDinrsx0HcqFjw7GvWpy0MtsK7oYrA pe1JgJhBgIEoVIbIzI0yOINfTDi5gvDDLKaBbmdWNfI9OdQ+xpnmwcImKt5jTy5tIBee// sj09bT48Q1rtrsKWXJik+lcm5rQ3sz9DvFLE32SvK5U8o84lhC9QgM9K1fVTDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j/c1+ngXrDfc52jYsC3cjQj3Kxy7hTvU0WdV9Zu/0ug=; b=AFg1eBY+1tbLvqDGAqOsj0bz65rdWYokzuCmzTsJGCXpn0Y0Wy39SLks9Dd9MsvxL7xOti Yrcc3/2F9a1bkVEdnifGWzwvDzOk5dNi+uOGvH9m0xUv2pfTawEq7a7jzKd27b/RkEpZG+ Xy2hK6bI709hMOf53drIqK9DHBS/82biSeG56xGHGC8OrANMKwkfq9pW+bOsPWO0swmxlU lMHhIWciWfKK805SPDqM2BPzad3JD+2egZ8+CpYQsHwo9q3UWNpcwMy5pXp47NxUI5aoJE q8GC83CjJ/yKrZ3weSaphIZR0u59BJdx4gkSaGm/oGAGV+dCZWCAJdUKN6sIJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv770jMz5Vp; Sun, 24 Dec 2023 08:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8Mx2c086692; Sun, 24 Dec 2023 08:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8MxWb086689; Sun, 24 Dec 2023 08:22:59 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:22:59 GMT Message-Id: <202312240822.3BO8MxWb086689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: c612e3c262db - main - LinuxKPI: Add xen/xen.h header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c612e3c262db6c8256159c4ed39018788017c7e2 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c612e3c262db6c8256159c4ed39018788017c7e2 commit c612e3c262db6c8256159c4ed39018788017c7e2 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Add xen/xen.h header It contains proxy-implementation of xen_initial_domain() and xen_pv_domain() required by latest drm-kmod. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42797 --- sys/compat/linuxkpi/common/include/xen/xen.h | 37 +++++++++++++++++++++++++++ sys/compat/linuxkpi/common/src/linux_compat.c | 30 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/xen/xen.h b/sys/compat/linuxkpi/common/include/xen/xen.h new file mode 100644 index 000000000000..16e77724111d --- /dev/null +++ b/sys/compat/linuxkpi/common/include/xen/xen.h @@ -0,0 +1,37 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Serenity Cyber Security, LLC. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_XEN_XEN_H_ +#define _LINUXKPI_XEN_XEN_H_ + +#define xen_initial_domain() lkpi_xen_initial_domain() +#define xen_pv_domain() lkpi_xen_pv_domain() + +bool lkpi_xen_initial_domain(void); +bool lkpi_xen_pv_domain(void); + +#endif /* _LINUXKPI_XEN_XEN_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 36eac309094f..664ba220e721 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -28,6 +28,7 @@ */ #include +#include "opt_global.h" #include "opt_stack.h" #include @@ -99,6 +100,15 @@ #include #endif +#include +#ifdef XENHVM +#undef xen_pv_domain +#undef xen_initial_domain +/* xen/xen-os.h redefines __must_check */ +#undef __must_check +#include +#endif + SYSCTL_NODE(_compat, OID_AUTO, linuxkpi, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "LinuxKPI parameters"); @@ -2585,6 +2595,26 @@ lkpi_get_static_single_cpu_mask(int cpuid) return (static_single_cpu_mask[cpuid]); } +bool +lkpi_xen_initial_domain(void) +{ +#ifdef XENHVM + return (xen_initial_domain()); +#else + return (false); +#endif +} + +bool +lkpi_xen_pv_domain(void) +{ +#ifdef XENHVM + return (xen_pv_domain()); +#else + return (false); +#endif +} + static void linux_compat_init(void *arg) { From nobody Sun Dec 24 08:23:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYv94mPJz54H0J; Sun, 24 Dec 2023 08:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYv91pv4z4XlW; Sun, 24 Dec 2023 08:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sDU5HJhCwMoZgXrMHYMEGUM+eXgIGULmZGAk6uMwsYw=; b=ktQu54q0Y66DZvS5g30CKQMtZNjlx70MuriiyNxps1ZnaNbKC0hcoTc0mqXQNbtyToG1VH 9DvUreLbCPBFzrK36FCIMHGfvAJbQEFw9ODbAkUUVZPI22b0pGjvMUZzjjpgGyVnxXK+ii Hz4TF/xAerEi8Hi2qUgefCdWCuR67x1a6aZdKNdwaB/i+fGYAl1vUEJMNhBImHL46CV5jz qILQPcw1nFV0b3L/bfjOYcuhJ+hQuOAK3Ia0NBmxpJPhQ9WHQc4OZTuM9veqv2iWugDCuQ 4f5ZKTDQeHShxj1xwQdecxn/6Er+eZejhcqjIoNFMqkQR83XjCHO1Zm6+Ht73Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406181; a=rsa-sha256; cv=none; b=STydIZdfQTaE8ayB042QSPs784sOeYIh+iat27fLnbfPgCNAlQkWegaE5DzIK2rDi2T0fw qk+doEVmLgIliZUD9Ft652WOZd2JUICADzUruhDN1XDnbuDlQWs6XPLpt6/fSdZxuiskcj TNUQ7e6cXi8CtH7W9VoePzkgkY/ER/YdNBbOMhIthXDDTd4w9BYJO4973j3vZmm3iVNT74 iK6h5DpoOpxaVLStBrwOQBkzVsOmetQpf0m6hO9HWbwQp+ue0pPwerHwwaLXl5EYmvkx5d AJhoGUpkncZnNk1vP23KQQYQFTdiR+6hylu8iTeb/i2fqkAw9NzJ+GY+v7yYWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sDU5HJhCwMoZgXrMHYMEGUM+eXgIGULmZGAk6uMwsYw=; b=PQlvacfDcMKH7Pzk7R1Vfi8tvhidqPWLqPfnMNPjMJ5zGihK6KZxGPy0SqUkWT3WDUsrdK v1JsDs4ZhNB9hXnW+Qz8q9qu8UrphMQRxF5PsfOFqpxIemWTr7U1RuAfJMZRFHc5xqXsvh BCg0W/HbX2KDmQpHeA8heb89o4rHDkSEids1OzJQ8xy4mcHCGtCFgYrJMKnfmuC6qi/8JW 6fIRk3ZsSkHhkZYBFRWlT7ouqYaLk+ioGu0CJwTU+FdClNrwZXTWTCAeuM9FD8HiNw1OO6 uHTKo249lJhJTeE1G0yyl54lbQQQV80Tc90WwLqN3leGO6Um/LRXSxKJPILH4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYv90r1Mz5tJ; Sun, 24 Dec 2023 08:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N1wH086751; Sun, 24 Dec 2023 08:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N1YE086747; Sun, 24 Dec 2023 08:23:01 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:01 GMT Message-Id: <202312240823.3BO8N1YE086747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1bce29bcf121 - main - LinuxKPI: Add some header pollution and dummy headers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bce29bcf121c1e16205fabb100f798d88f757c1 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1bce29bcf121c1e16205fabb100f798d88f757c1 commit 1bce29bcf121c1e16205fabb100f798d88f757c1 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Add some header pollution and dummy headers required by recent drm-kmod to be succesfully compiled. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz Obtained from: OpenBSD (partially) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42798 --- .../linuxkpi/common/include/linux/irqdomain.h | 10 +++++++ sys/compat/linuxkpi/common/include/linux/kobject.h | 2 ++ sys/compat/linuxkpi/common/include/linux/of.h | 33 ++++++++++++++++++++++ .../linuxkpi/common/include/linux/shmem_fs.h | 3 ++ .../include/{linux/irqdomain.h => asm/neon.h} | 0 .../linuxkpi/dummy/include/linux/dev_printk.h | 0 .../linuxkpi/dummy/include/linux/device/bus.h | 0 sys/compat/linuxkpi/dummy/include/linux/mei_aux.h | 0 sys/compat/linuxkpi/dummy/include/linux/prandom.h | 0 sys/compat/linuxkpi/dummy/include/linux/sysfb.h | 0 .../linuxkpi/dummy/include/video/nomodeset.h | 0 11 files changed, 48 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/irqdomain.h b/sys/compat/linuxkpi/common/include/linux/irqdomain.h new file mode 100644 index 000000000000..c7788e51cc89 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/irqdomain.h @@ -0,0 +1,10 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_LINUX_IRQDOMAIN_H +#define _LINUXKPI_LINUX_IRQDOMAIN_H + +#include +#include +#include + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h index dadf3b3b0849..512f47f9e4b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/kobject.h +++ b/sys/compat/linuxkpi/common/include/linux/kobject.h @@ -36,6 +36,8 @@ #include #include #include +#include +#include struct kobject; struct kset; diff --git a/sys/compat/linuxkpi/common/include/linux/of.h b/sys/compat/linuxkpi/common/include/linux/of.h new file mode 100644 index 000000000000..fb4554a8ddbc --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/of.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Serenity Cyber Security, LLC. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_OF_H +#define _LINUXKPI_LINUX_OF_H + +#include + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h index d373cfa1d611..efa2c855fe7d 100644 --- a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h +++ b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h @@ -29,7 +29,10 @@ #ifndef _LINUXKPI_LINUX_SHMEM_FS_H_ #define _LINUXKPI_LINUX_SHMEM_FS_H_ +#include +#include #include +#include /* Shared memory support */ struct page *linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, diff --git a/sys/compat/linuxkpi/dummy/include/linux/irqdomain.h b/sys/compat/linuxkpi/dummy/include/asm/neon.h similarity index 100% rename from sys/compat/linuxkpi/dummy/include/linux/irqdomain.h rename to sys/compat/linuxkpi/dummy/include/asm/neon.h diff --git a/sys/compat/linuxkpi/dummy/include/linux/dev_printk.h b/sys/compat/linuxkpi/dummy/include/linux/dev_printk.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/device/bus.h b/sys/compat/linuxkpi/dummy/include/linux/device/bus.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/mei_aux.h b/sys/compat/linuxkpi/dummy/include/linux/mei_aux.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/prandom.h b/sys/compat/linuxkpi/dummy/include/linux/prandom.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/sysfb.h b/sys/compat/linuxkpi/dummy/include/linux/sysfb.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/video/nomodeset.h b/sys/compat/linuxkpi/dummy/include/video/nomodeset.h new file mode 100644 index 000000000000..e69de29bb2d1 From nobody Sun Dec 24 08:23:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvB5Gghz54H0N; Sun, 24 Dec 2023 08:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvB2xbcz4Xlc; Sun, 24 Dec 2023 08:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBR59bF9730sAT1qonu1PGxUXZPHJhhYFj6JvXB9EFM=; b=r3ADPPlAHRRoLeqB4RuECKpJ2hYAWARr0PvN2TPtpvl7J+rZYZbWycSVGFlzgr5l+IV9Is nx946KeU0Pwjg6AzBgbqidOU7qrUzJBq2b+om/P5Cy30pLi0PPUVZStfi5gXl+FqptYNlq LBl4gNESG4onNF5u6UVfN4fLFpDqAIYZmpnl6b2n+hVTxvP/JBcoF3mVf/RYkNB3M7NZRO j3KX1GFVSs6d4w0xrCrlcOwh/3fSvK6NtyaabIG7E7s08VnU202nzWMuyrMnaBavpwTXP2 n8A2oc0bF4um3YS4bzSa0x98ze53Ma5oeZMoqFe+E/O6ZSne4qdedxvlVW7Gcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406182; a=rsa-sha256; cv=none; b=NEig001v2wEKfq0rf3U+CYdFG4YvRi6BET2lUxFnADsjxuRj7erNaNOSM2ZUXf8RoD64/u gfU9KiLQpBFICf5FxFw7+A6xuouiFbQ1jVuG6FckoR7Y3wCWFp9C69GNOL70cFlgHWuXLd +MiQMjQCl/HNDPmDL2ZJbM6E6yk6u1+n7i2VgAk2Mj0flgib0uNqlRtzkEvsPjdco6r2/f 68Dei3IiSmYfEDv5xYGfQs6O5pntcPj1fsNqxlKnW1dsDVVy0hZbhf7fmpF9jlFy6NTlAF lmHh3iDfl07WSN+3F+wfUtx1U36mKU72YEqD3BeA21K2MnHMKZ6Z7n+IUQgGjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBR59bF9730sAT1qonu1PGxUXZPHJhhYFj6JvXB9EFM=; b=RQ+P5fXECLmKDjN8cSNzQBNXMDSrdvo/DdH2PqBCZfuK/ro111wuk71aRyknuoHl4FK/aM X6kCMKvST3TuXyNhkmbc2aYeCqIJIayPshSJVsIOgI6svmhQBiY7aWDxegKKTujSLkBKHD QwYkv7wNi2Gy3r/mSYeMRFythxES/aKMNpds2gK9Se7ofAeK/i0nn1NNnDuINu2c7fiSHZ 7iA7egrxXyJJSEm1z+g8J8xF75wVDcdwOeGOcX/4g5g/M7mC28ySUjqFSjpTWZtMkTwVg0 8s9yRGSQ19QAeROp7W6dApCgLDjJy8dQ9dtWzyJNw7vi78Pj7gfpY61bU1s94g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvB22lwz5Qy; Sun, 24 Dec 2023 08:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N2Du086893; Sun, 24 Dec 2023 08:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N2F3086890; Sun, 24 Dec 2023 08:23:02 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:02 GMT Message-Id: <202312240823.3BO8N2F3086890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: f8ab2f5bae1d - main - LinuxKPI: Add linux/iosys-map.h header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8ab2f5bae1d4e4e13f95f4738c9bb49fcda6261 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f8ab2f5bae1d4e4e13f95f4738c9bb49fcda6261 commit f8ab2f5bae1d4e4e13f95f4738c9bb49fcda6261 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Add linux/iosys-map.h header Sponsored by: Serenity Cyber Security, LLC Obtained from: OpenBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42799 --- .../linuxkpi/common/include/linux/iosys-map.h | 161 +++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/iosys-map.h b/sys/compat/linuxkpi/common/include/linux/iosys-map.h new file mode 100644 index 000000000000..66c442b8668f --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/iosys-map.h @@ -0,0 +1,161 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_LINUX_IOSYS_MAP_H +#define _LINUXKPI_LINUX_IOSYS_MAP_H + +#include +#include + +struct iosys_map { + union { + void *vaddr_iomem; + void *vaddr; + }; + bool is_iomem; +#ifdef __OpenBSD__ + bus_space_handle_t bsh; + bus_size_t size; +#endif +}; + +#define IOSYS_MAP_INIT_OFFSET(_ism_src_p, _off) ({ \ + struct iosys_map ism_dst = *(_ism_src_p); \ + iosys_map_incr(&ism_dst, _off); \ + ism_dst; \ +}) + +static inline void +iosys_map_incr(struct iosys_map *ism, size_t n) +{ + if (ism->is_iomem) + ism->vaddr_iomem += n; + else + ism->vaddr += n; +} + +static inline void +iosys_map_memcpy_to(struct iosys_map *ism, size_t off, const void *src, + size_t len) +{ + if (ism->is_iomem) + memcpy_toio(ism->vaddr_iomem + off, src, len); + else + memcpy(ism->vaddr + off, src, len); +} + +static inline bool +iosys_map_is_null(const struct iosys_map *ism) +{ + if (ism->is_iomem) + return (ism->vaddr_iomem == NULL); + else + return (ism->vaddr == NULL); +} + +static inline bool +iosys_map_is_set(const struct iosys_map *ism) +{ + if (ism->is_iomem) + return (ism->vaddr_iomem != NULL); + else + return (ism->vaddr != NULL); +} + +static inline bool +iosys_map_is_equal(const struct iosys_map *ism_a, + const struct iosys_map *ism_b) +{ + if (ism_a->is_iomem != ism_b->is_iomem) + return (false); + + if (ism_a->is_iomem) + return (ism_a->vaddr_iomem == ism_b->vaddr_iomem); + else + return (ism_a->vaddr == ism_b->vaddr); +} + +static inline void +iosys_map_clear(struct iosys_map *ism) +{ + if (ism->is_iomem) { + ism->vaddr_iomem = NULL; + ism->is_iomem = false; + } else { + ism->vaddr = NULL; + } +} + +static inline void +iosys_map_set_vaddr_iomem(struct iosys_map *ism, void *addr) +{ + ism->vaddr_iomem = addr; + ism->is_iomem = true; +} + +static inline void +iosys_map_set_vaddr(struct iosys_map *ism, void *addr) +{ + ism->vaddr = addr; + ism->is_iomem = false; +} + +static inline void +iosys_map_memset(struct iosys_map *ism, size_t off, int value, size_t len) +{ + if (ism->is_iomem) + memset_io(ism->vaddr_iomem + off, value, len); + else + memset(ism->vaddr + off, value, len); +} + +#ifdef __LP64__ +#define _iosys_map_readq(_addr) readq(_addr) +#define _iosys_map_writeq(_val, _addr) writeq(_val, _addr) +#else +#define _iosys_map_readq(_addr) ({ \ + uint64_t val; \ + memcpy_fromio(&val, _addr, sizeof(uint64_t)); \ + val; \ +}) +#define _iosys_map_writeq(_val, _addr) \ + memcpy_toio(_addr, &(_val), sizeof(uint64_t)) +#endif + +#define iosys_map_rd(_ism, _off, _type) ({ \ + _type val; \ + if ((_ism)->is_iomem) { \ + void *addr = (_ism)->vaddr_iomem + (_off); \ + val = _Generic(val, \ + uint8_t : readb(addr), \ + uint16_t: readw(addr), \ + uint32_t: readl(addr), \ + uint64_t: _iosys_map_readq(addr)); \ + } else \ + val = READ_ONCE(*(_type *)((_ism)->vaddr + (_off))); \ + val; \ +}) +#define iosys_map_wr(_ism, _off, _type, _val) ({ \ + _type val = (_val); \ + if ((_ism)->is_iomem) { \ + void *addr = (_ism)->vaddr_iomem + (_off); \ + _Generic(val, \ + uint8_t : writeb(val, addr), \ + uint16_t: writew(val, addr), \ + uint32_t: writel(val, addr), \ + uint64_t: _iosys_map_writeq(val, addr)); \ + } else \ + WRITE_ONCE(*(_type *)((_ism)->vaddr + (_off)), val); \ +}) + +#define iosys_map_rd_field(_ism, _off, _type, _field) ({ \ + _type *s; \ + iosys_map_rd(_ism, (_off) + offsetof(_type, _field), \ + __typeof(s->_field)); \ +}) +#define iosys_map_wr_field(_ism, _off, _type, _field, _val) ({ \ + _type *s; \ + iosys_map_wr(_ism, (_off) + offsetof(_type, _field), \ + __typeof(s->_field), _val); \ +}) + +#endif From nobody Sun Dec 24 08:23:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvD04cJz54HK6; Sun, 24 Dec 2023 08:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvC3vF8z4XjQ; Sun, 24 Dec 2023 08:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMOvoVS0H6iQKVCB5onBCrfaz/2xf8DwrbNa93AUlqI=; b=O4DDw8tMaeWz+AoHbE2ACi34T/RfSSHLbBTEjuSFLeg5D+NAP1QMpY6h6lfksVqEJGK5L3 uvIf9qm2maoyXgRJMXqZUk7YNaw/U+OhITb2/iCKpV13+7dJ5R1yiqKRcvWcsNNVwK8CHt mGUTDe7gBXoqp7Tw8IKr7enqqeq+RikQs+xytkaV6lKlr7voAislF4iuWl1PtRUaS0IPNZ Y3XqsLqRfFuoG8zkl1oLQp/y27879xgEtI9YO4/RpUk4o0ZbYJAS7gGuw3DmQS9nVTesOl C+wRhPvfNEFviTPp32qiklbrrcl6WaPYm2UlaH/el1E9gKplB4VsDti1KZi6xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406183; a=rsa-sha256; cv=none; b=YkCLOsQQui7Cqm2tzWwVeHAe1w/HRsG36MM/YE9JSe70xL1p6caDqHFoN5FKxuKXD//1Z9 VqmL+gOUsySvcjcqu0ytrgMHVFUQ6+LX7qbUMl7Oc65gUkNGY3yZM5NWivcQbefcsXzrAM 8AJByQCrmSO+0F47s+FixMPTcLhWT1Ry9vw9dnga0PHmrFCKtwNvGRe7YINLyNGaP/SKNL RJPvBV8AOB3zdGd9ZCCvkw0ZYQ6jcgEWSEQjVlQuwtuniAL4Vv3gq/7kfwu+j950sYB6g6 8DdSImIdefDt3aRlSHl6yCblJZW3eUHR9DYhde/waWfTMbyKTcEC4trgjrxY+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMOvoVS0H6iQKVCB5onBCrfaz/2xf8DwrbNa93AUlqI=; b=LE3b5hHgNQT0/hVI5Rd6GK9JOTrTIe574MmHvzbCFsWYzFIWR9Z1ac8+gv9mmgrYZYxeq6 gZzxaTlBfDstuFC/JkkbT6pFMwjbCogq1HimdeExrV0E2ZCC1lIVhUFhVprE1lfygrhNpr FFxLjW026/1y+exvCeGwk7cObDPAmyQYR+TSc7EGE/xpTAMM4nUQ/0V+4n42qZTYfCaqC1 QnOYfdK9WN2m678X/e6AdV/ngK90s4G4v1K2cycpGk8NIiOgpMeduxbXQ1yYf3C+g9Ymv5 e/Z9o8JT8PUVyn0SgCcBvTlsjj36oAk6dOc+zYlipD56gqIwyeP0uNrOkfA/ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvC31Bcz5Tc; Sun, 24 Dec 2023 08:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N3sF086955; Sun, 24 Dec 2023 08:23:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N3dW086952; Sun, 24 Dec 2023 08:23:03 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:03 GMT Message-Id: <202312240823.3BO8N3dW086952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: dcfc983373c3 - main - LinuxKPI: Implement ioread64() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcfc983373c3e3dcd7025e5f65832ab696832261 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=dcfc983373c3e3dcd7025e5f65832ab696832261 commit dcfc983373c3e3dcd7025e5f65832ab696832261 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:58 +0000 LinuxKPI: Implement ioread64() Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42801 --- sys/compat/linuxkpi/common/include/linux/io.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index 2345967898e6..b0a4109f3afb 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -349,6 +349,14 @@ ioread32be(const volatile void *addr) } #define ioread32be(addr) ioread32be(addr) +#undef ioread64 +static inline uint64_t +ioread64(const volatile void *addr) +{ + return (readq(addr)); +} +#define ioread64(addr) ioread64(addr) + #undef iowrite8 static inline void iowrite8(uint8_t v, volatile void *addr) From nobody Sun Dec 24 08:23:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvF1Myzz54HVF; Sun, 24 Dec 2023 08:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvD4xCvz4Xd9; Sun, 24 Dec 2023 08:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oeVMpQx4g1DRMor5GGIn/eSmnq2kb+idp4HEaxBed4=; b=RNI5GxT6OmKzwpxlFov5cMji7DkErDJU7lQ8L2e1n83V3RpCF2eBbhBqy32zGpa8FgpoKv MFZV6W4+Gel8D0HC4iO7llUZqImBOH/OxwUknw98HpMsnjfmBR0yp5j0y/zkIzPz4q21dY 89QhfutVP3/WvKJfJhXNchHCij0/B3w/6NP+NmyCQoQB/2FWxkHCyzi5OOnlbdmjeD8ZGn WFdfMsg1LOmLqxsKiVCa95dbGZl1cnUgw6yhDEUjwFQaSrQeoQ7XscSeziFMxGgycU+BOc ZWoJZAxQRK2oLUdhgAaebyf6rp7I14PG3sGlbHn66pkO9h/tjKvGI9gDttR/CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406184; a=rsa-sha256; cv=none; b=Oh4xP5cpM1fdsRrF3HE7JMIPXw1d6cW7Jp2xmGEYAvVSVRvGIz9D7CR/PnEbfvd0Sk87BV ocueSkVzAl0XloCny04yZKjOjjApelWxQgfwREdowqkFd6juCkHiy7wAp7UiwMkP5P108b iWVzyRf0dh2x7FW4tgKtefg4QeCQ62sRiYwOgxgDGebRH4bdAXDuDRTst7nvmesJ3lPbo+ uH115vZrBRp6ae8L8reGFeIuh51nav/v7iYHNa0UzomwAHUH3KQd1QLPY1KjgupPoLmpgx WaQlLiECgGP9pfBUaNYGEVL/IqTzqHkWf1GOshQxeXOogpRwG6NjjOojValvVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oeVMpQx4g1DRMor5GGIn/eSmnq2kb+idp4HEaxBed4=; b=vEfihqvycUvMypGDSp2RdKLWP+yp8fxw2PxKN2JcCCWfB+oNO0F72pvQnYyldYTLnOpyRS wFqN+mew/sE36HQaoYnyiaNgt0Im9Qa15x8HQf6xK84wNfDSPthP0xo5luBuh3Mi5tlvw0 rZBGD1y6RWZ2ln4M6lEKDEsQmPA+glznE0FTdT4JMVlhUnE7R9ZIy8K058p775nhNNhmcQ W8nuHXHnYQntCKuu0fOr7QjMmzkpKPaQY+6dBtrJGCxZ+WFdXFbPD4TlbB6Wmb78YMU918 deYssu7hyxQwyN+G/FsCPWIFYAGNW5wx7EkFP24HVuza2Uo2W6xoAuUrvBpBoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvD41g6z4lB; Sun, 24 Dec 2023 08:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N4N9087002; Sun, 24 Dec 2023 08:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N4AO086999; Sun, 24 Dec 2023 08:23:04 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:04 GMT Message-Id: <202312240823.3BO8N4AO086999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 206e9fea7502 - main - LinuxKPI: Add asm/hypervisor.h header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 206e9fea7502dccd126a721c30a1675bdef48633 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=206e9fea7502dccd126a721c30a1675bdef48633 commit 206e9fea7502dccd126a721c30a1675bdef48633 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add asm/hypervisor.h header Sponsored by: Serenity Cyber Security, LLC Obtained from: OpenBSD Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42802 --- sys/compat/linuxkpi/common/include/asm/hypervisor.h | 19 +++++++++++++++++++ sys/compat/linuxkpi/dummy/include/asm/hypervisor.h | 0 2 files changed, 19 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/hypervisor.h b/sys/compat/linuxkpi/common/include/asm/hypervisor.h new file mode 100644 index 000000000000..f344a2929359 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/asm/hypervisor.h @@ -0,0 +1,19 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_ASM_HYPERVISOR_H +#define _LINUXKPI_ASM_HYPERVISOR_H + +#if defined(__i386__) || defined(__amd64__) + +#define X86_HYPER_NATIVE 1 +#define X86_HYPER_MS_HYPERV 2 + +static inline bool +hypervisor_is_type(int type) +{ + return (type == X86_HYPER_NATIVE); +} + +#endif + +#endif diff --git a/sys/compat/linuxkpi/dummy/include/asm/hypervisor.h b/sys/compat/linuxkpi/dummy/include/asm/hypervisor.h deleted file mode 100644 index e69de29bb2d1..000000000000 From nobody Sun Dec 24 08:23:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvF74dGz54H7r; Sun, 24 Dec 2023 08:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvF6KzXz4Xrb; Sun, 24 Dec 2023 08:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0h8cli/dHJrNn/Ve5j74Tr1eO/QUZOC5464N5dZ2dOM=; b=iI556YLYqDiRbK9ZLmDCMU0nJNVly1zeqpzOn36bbpP7TI0oxZR0L97oDl1zV2pD8J8dn/ m53+juALPTN2Zq0Hcy8eAnw08reCNw3EPYYpb79Yon/tvoaE0I9RJKoBQTkFf1ziEGX4J0 25hgiowhvKXtKQJRTauEV8pa+Bbtvg5+tNYC0jRC440HaX74ecJOr1aEjD6jOIt8qWTuRt +vHcLhR1tZMTyQTJbCKFR8/eoFxnhzy+wg13KQdtOTCvkrpvO2tF5vJq05SK8GKJuOiVu+ gG2aum6ZAsGvklrD8w1pHJMOhsQPCVe7CyG1xETOzPv4UKHfArWpg3yWR/MT/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406185; a=rsa-sha256; cv=none; b=LeepJgOY/cQNtlHgY9QGS6MNitDwT2P8r5AOen//lLZyJf+8N7n1oLv5a5uPBHWa2NjWQh pr3u4SN56T9PzZig/yi3bsKBhNYjCAV8FYIJHcfvPSzrWTLB3tDkRb7phcYLQ3Nx9LTxVP zl9gR5vxK23518fvzDwbQJyPQJrTcX+i0DKxd82sRrDMvMYVNbobZA1zqJV0xJvCuweC4T Gyv8kZo7ZxuXTH114pB7MXooO/afq/is/HJmeltBciMytt3Mc7eqSWEJ1XeGh+yVXZxvSI oVQVeWGIevo8dYIUP0iVqa3sV+cfEL86YU/d8oJ4UTyOU6WGACnPMYwywiNmCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0h8cli/dHJrNn/Ve5j74Tr1eO/QUZOC5464N5dZ2dOM=; b=fs/UYmhelcBN/iU1ufwxVl7yuw/DzntU2wXPf+ud0JKCK6NbnnkgxQQP4xXQ38/9RrcEEI QQEiF5lKZDLyDCuJXXER/PLcL0yP2cKsnx7yYGVX2suEq61oGUpdKc/B4W9Ve3INif9ECd bTd5fmpWuu9ROp+A7Q5noB/fk/l+PfaHQBtHAXE76zQO8u5sdj6bIx5kL3gKV/ML8ffBIK QbBxKptDMy+aJK1/g+Tc4y4nKBpIMfuzD6+IB/axq05EH8/rlADq23TmfmYPDjXNKFVYfM aU44SP7SiCsHp8ATdmBhXvfLrXXcXqML4Ka1R6i1npZZomscBFHPcuOndppoYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvF4bQfz5R0; Sun, 24 Dec 2023 08:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N50W087044; Sun, 24 Dec 2023 08:23:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N5Jg087041; Sun, 24 Dec 2023 08:23:05 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:05 GMT Message-Id: <202312240823.3BO8N5Jg087041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 66f9a98335dc - main - LinuxKPI: Add xa_(un)lock_irq to linux/xarray.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66f9a98335dcc2a3c1eead0d80ccc9fee12bbb31 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=66f9a98335dcc2a3c1eead0d80ccc9fee12bbb31 commit 66f9a98335dcc2a3c1eead0d80ccc9fee12bbb31 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add xa_(un)lock_irq to linux/xarray.h On FreeBSD they are equal to non-irq version. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42803 --- sys/compat/linuxkpi/common/include/linux/xarray.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/xarray.h b/sys/compat/linuxkpi/common/include/linux/xarray.h index e0a97a5b7871..d293a8f7c2a3 100644 --- a/sys/compat/linuxkpi/common/include/linux/xarray.h +++ b/sys/compat/linuxkpi/common/include/linux/xarray.h @@ -95,6 +95,9 @@ void *__xa_next(struct xarray *, unsigned long *, bool); #define xa_erase_irq(xa, index) \ xa_erase((xa), (index)) +#define xa_lock_irq(xa) xa_lock(xa) +#define xa_unlock_irq(xa) xa_unlock(xa) + #define xa_lock_irqsave(xa, flags) \ do { \ xa_lock((xa)); \ From nobody Sun Dec 24 08:23:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvH1ycvz54HPy; Sun, 24 Dec 2023 08:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvG6VPqz4Xrm; Sun, 24 Dec 2023 08:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JprcfZLoP4KayGQvE8Q+rfX4VQTvHOwe1yUK+A9+oEA=; b=i7X4tIq4I97wVTnogazRe1FCcd4pVKnQcBnkn/PTtMGQV+vWOY+XY5/gOOjmsi1vT1B4JK aPZ3+G9bMAkkpcB/yQbIx/JEPakSUgtSBFOs//paNJCUqJEqoaqm8/vLFoseZo6HOkXDQM 1H8Cyy/qX6WEJ/MeqTp7Am8m9q90nPsGRWixJrj2leNlDS/8Qqc6RbRa8gF9CV82MS1tj6 A4BNIChptkSk6OC7x7aaB4sHXMXZSu6yOEgs0XzrVOONIRrE39SlqlcH5/mhLWtuw5B/kQ tSgpFBuHtn8jpKVM/GW8g0HgBF5CekU+QGk3sSthBhddAy99gdzrznV96BiRUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406186; a=rsa-sha256; cv=none; b=MpvqtE2vm74KIKjHCXM+ZsijxT3bvDgUvzm+ard1N5pcl8Na3eHcZjLS+hBSc8utHG2KrF qBfpnX6apKy4OHozXyU1QrPkUqHjwlC/zxw3y7Fg7L9uv1jhY4GQQOQBoRxqUo2ESWYCMv DyaCbpYZVZzji1C7WZD3VCFN5IwSauRpVlMEryUshB9oo9CwQhJHgYORFz9gL2CETJ4jL8 iBu2VZ2u/3UpDGB/2MMusBnVETMYFGelcTTVndFrnCGzugwiWcqjBUMJMXz3sOLHhduQaD SaGLFf7OWatjyY+W3VbhBEcbgzWme0c5Y8h1Zupfce/KQoox0n4Plveete/ZoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JprcfZLoP4KayGQvE8Q+rfX4VQTvHOwe1yUK+A9+oEA=; b=KgZjkFlkyHmjHHiVldxgJo0j+tFK7u/QwaJ1wOlZvKAV7UXeDprqFjD9Oc6hlTBnJ+l9qe u9Nwzqz568sdg7Fdktm1Rf0AeW1FTYDwIS/j48FhHAz5xS1lwVnfv6Smyjr3fkvXzD53Lx Q4lN367wKrrvcnmcFw7fcHpvvqq76O4RG2OTPqGQiZhqhS24zNsvLeGuyfy47G5PKCem2f EJ+kAlIh7Ct+/V99hnVWKC8vpLR6gr0rhmmduJx9XyPCQyyqEhB+/KbNWS/Gk98LR8fQk+ qnXPIiV8d8kfX9JO8cz99M6lduLMryomd5USLlOY0s1mw+f5MFxAz1g1uQfbXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvG5bs1z5tK; Sun, 24 Dec 2023 08:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N6OY087086; Sun, 24 Dec 2023 08:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N65N087083; Sun, 24 Dec 2023 08:23:06 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:06 GMT Message-Id: <202312240823.3BO8N65N087083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: e964da141523 - main - LinuxKPI: Add ktime_get_raw_fast_ns() to linux/ktime.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e964da141523e1eec2322082936cdb20ba0cf4a7 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=e964da141523e1eec2322082936cdb20ba0cf4a7 commit e964da141523e1eec2322082936cdb20ba0cf4a7 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add ktime_get_raw_fast_ns() to linux/ktime.h It is implemented like ktime_get_raw_ns() function but uses less precise getnanouptime() call. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42804 --- sys/compat/linuxkpi/common/include/linux/ktime.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ktime.h b/sys/compat/linuxkpi/common/include/linux/ktime.h index ae270d2ebd06..b13c7182bc61 100644 --- a/sys/compat/linuxkpi/common/include/linux/ktime.h +++ b/sys/compat/linuxkpi/common/include/linux/ktime.h @@ -262,4 +262,13 @@ ktime_get_raw_ns(void) return (ktime_to_ns(timespec_to_ktime(ts))); } +static inline uint64_t +ktime_get_raw_fast_ns(void) +{ + struct timespec ts; + + getnanouptime(&ts); + return (ktime_to_ns(timespec_to_ktime(ts))); +} + #endif /* _LINUXKPI_LINUX_KTIME_H */ From nobody Sun Dec 24 08:23:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvJ3LKpz54HXP; Sun, 24 Dec 2023 08:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvJ0zsPz4Xf0; Sun, 24 Dec 2023 08:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WnVeIWS8bAYWbWO5jwdfIM9GAQM/DsMoZ4hgKWXDHhs=; b=AmjSEZlthwy7WA9YL+D0xe+i5NDzUZBS5Rqb19B3HT+IIJSBdVnwdvUDAwPlg+2/JxH20D mHrMlZchabcGPm24CzJgIKU2JyRQBTMUhe2p57dWQNJG2c0G8N2pAZ0B7JvhaFgIA/MsBF LVJpjgx9FqQItliUpbdbiPu9mSRTJ7h7PiITqWToQkcGwxPMHMSVkOMNZH7KIF7YYqwYFE pgG03V4Jn0C21F3FwH+H1VYhcmEG6p4c8xZ+ralOnXqtkZse1oaMN+PQRZ85vd2PPqHxhv CnzgjBF4w8LAqpVBt4ih3NrSLY9UOKrPtcFnQQkpFWHbi/WGX3bf4iNsMiW7Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406188; a=rsa-sha256; cv=none; b=fNAi5vEwKeQz63q5lBitFI73rDK3k9TMqzhxy/lAyoUloXPVaYycRIgTkI1Zl0zSa5pdP7 pSY8QTxdGbNGjDi7+PvjE/5tifCXs821b9/UnbRFDzXfTLS/EWvTu+BrS3zO+4LnU76zqX ef9miMZ1iwYpAhfXZtj3TcL5P/Dy12BegTXgKzX0p95Wp2vOa630gLTOA3Cfd76vZ9y/e1 pn9Hk/UnT11mna8F1+COhnnbl2f8gf3xedtgm+OB4YnllOmB3tBWlLDjnm2IFXihXrM3b3 Nm8K85RmY5UEaBjhtZZwZlgLHRM2qIhYDQvicrBX0ld3rTz+0RERA+KtRtPlBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WnVeIWS8bAYWbWO5jwdfIM9GAQM/DsMoZ4hgKWXDHhs=; b=nzhsrgX8wjcoKRT0CQl4Ml94kR7DjTyvSlr50ikDe/K9eXCSR4uYm6ibTQgkkSO2nWFt8R w0uTGifGUAZ2xlyt556RJHxX/ztoBYMm3rag81CfjNjJk00xWzQKiydiw/aNVqOU5itdCF j92Gz1qBTGg6afwEfguyvEc/FmOLc0Nhid5BqHLYlzVaUDdO4oVQJMeJAytUecnX2DqpWr E8ZJPJoOXQygTROL0MFoeHrNJ0FCJfcSI0q6pFcaLzi/BONVYyBWxS86an31TSCiN9MH7l 1hlVHq7VBqv0y4R5eymTAG1GtBOijMx/Ot/r0tKMSfh5C4CZlVCMOTVIH7TCoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvH6PqXz5ss; Sun, 24 Dec 2023 08:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N7Tu087128; Sun, 24 Dec 2023 08:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N7Va087125; Sun, 24 Dec 2023 08:23:07 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:07 GMT Message-Id: <202312240823.3BO8N7Va087125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: af787b8e8b80 - main - LinuxKPI: Add IOMEM_ERR_PTR() to linux/io.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af787b8e8b803dbb2c6bd06629974ba39bd0fb70 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=af787b8e8b803dbb2c6bd06629974ba39bd0fb70 commit af787b8e8b803dbb2c6bd06629974ba39bd0fb70 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add IOMEM_ERR_PTR() to linux/io.h The function creates an error pointer. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42805 --- sys/compat/linuxkpi/common/include/linux/io.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index b0a4109f3afb..d70cda77400e 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -35,6 +35,7 @@ #include #include +#include #include #if !defined(__arm__) #include @@ -528,6 +529,8 @@ memunmap(void *addr) iounmap(addr); } +#define IOMEM_ERR_PTR(err) (void __iomem *)ERR_PTR(err) + #define __MTRR_ID_BASE 1 int lkpi_arch_phys_wc_add(unsigned long, unsigned long); void lkpi_arch_phys_wc_del(int); From nobody Sun Dec 24 08:23:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvK31Dqz54HQ4; Sun, 24 Dec 2023 08:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvK1HPtz4XsW; Sun, 24 Dec 2023 08:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fo5Tuw0tMuSYxKCqjvDUMKWFrvqtCtPOV2N3fhQUfUk=; b=ID49PFKsdHwWxGKOi9VIu4AjWY1R/kMPgj2mJ3DlKuLd2UPIQ2SzzGmvaaOK+jOixiBcUz GNNiTXnEI9DslYqhjMVFGgeY4kD+JHWVy+JxL5AMUAOSWbx4ZDKwyfMh+Fbq+cI+A61SrF HYXSzFWFoqxXWGBdnAe1kmxXK/2qpPo9ECUXSeAB57kShYOGRmxqA7m/YrRkulu5s2TgAx kUPtUS74+ab2YTqD8vXrNXJsDmtooLEZbGLj2z+3f4u+kjJvuXMMb2crMOU46NLCx7WHss mjndL/4VhFzxFsOzfhTzMv8cljEknMxSjUe3FTOqcVQl3R5wARNnhd4px7UlQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406189; a=rsa-sha256; cv=none; b=PRCi1RX80wu6agf3D+lsGYghIW52K+5FO7avsXKjQ7yH87H+kUpQ2AAJ0X5XhE2HrGzD4Y kOTPAdIRlvxwuVIgaxoru81pe1J4dm1RTTvru3Q+hczU19kgxdcponDXu1egcjFkRzhGm6 1cfLkKqmkgaiuFEQ/3oSNHs7BDSLmCj4KlYryPLRnCR261swdTH4LEfcFWAbIVl1RcQqTg bnA/zI9VAT6mkatf/uI1VUV2oGXiUNnSRQ41EyNhaF4gA5F1e+KN2p9g5xTNMRwhArVxVq fB/AMKX9zNVeg+UN/PMxhCEeHlIxQZBZGQyxuQ/YB2Rm27WEunDP+Rz8kvF2yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fo5Tuw0tMuSYxKCqjvDUMKWFrvqtCtPOV2N3fhQUfUk=; b=ABijYs0kSrlPlvK8efo/F/ZIEcf8lWFoWN5NSWv3Hjvx0ENybdjdb/UfD/TtZllDfKFIka s4WShSPMFkuvtbuS6n3KYCjWHpivJO9gmP3dHx5rPXTCnYqzQTgnB1E+wlDFg8dqvpoO8w A8ARMeWPHI3KNxGphrZKZYWS8skEp90bwIqPUtqA17KyfPqXkBsl6G346gd5x0MwYuZOaV z063Wu3ljA3beMBfkfOrVTKxyEqoseT9PPr5CzrBfnehUxhtwHFj6W5cEN6nJAZ4sJvdNq QqZ45ujzE2VWNfWHncf2CJLACtd4u7qaA1DufHIpezmyc4c9p77dX/FnNAQxgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvK0P0yz5sl; Sun, 24 Dec 2023 08:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8N8Mw087164; Sun, 24 Dec 2023 08:23:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N8fO087161; Sun, 24 Dec 2023 08:23:08 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:08 GMT Message-Id: <202312240823.3BO8N8fO087161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: c7312643b7e5 - main - LinuxKPI: Add ida_alloc_min() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7312643b7e5f01adc2a3094c5139f5dcab5f0a4 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c7312643b7e5f01adc2a3094c5139f5dcab5f0a4 commit c7312643b7e5f01adc2a3094c5139f5dcab5f0a4 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add ida_alloc_min() ida_alloc_min() allocates an unused ID. between min and INT_MAX. While here allow end parameter of ida_simple_get() be larger than INT_MAX. Linux caps the value to INT_MAX. Sponsored by: Serenity Cyber Security, LLC Reviewers: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42806 --- sys/compat/linuxkpi/common/include/linux/idr.h | 7 +++++++ sys/compat/linuxkpi/common/src/linux_idr.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/idr.h b/sys/compat/linuxkpi/common/include/linux/idr.h index 2fb2e1734878..ca3f8171ff44 100644 --- a/sys/compat/linuxkpi/common/include/linux/idr.h +++ b/sys/compat/linuxkpi/common/include/linux/idr.h @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -131,6 +132,12 @@ ida_get_new(struct ida *ida, int *p_id) return (ida_get_new_above(ida, 0, p_id)); } +static inline int +ida_alloc_min(struct ida *ida, unsigned int min, gfp_t gfp) +{ + return (ida_simple_get(ida, min, UINT_MAX, gfp)); +} + static inline int ida_alloc_max(struct ida *ida, unsigned int max, gfp_t gfp) { diff --git a/sys/compat/linuxkpi/common/src/linux_idr.c b/sys/compat/linuxkpi/common/src/linux_idr.c index 3be106150513..dc64da0d7cf5 100644 --- a/sys/compat/linuxkpi/common/src/linux_idr.c +++ b/sys/compat/linuxkpi/common/src/linux_idr.c @@ -754,10 +754,9 @@ ida_simple_get(struct ida *ida, unsigned int start, unsigned int end, unsigned int max; MPASS((int)start >= 0); - MPASS((int)end >= 0); - if (end == 0) - max = 0x80000000; + if ((int)end <= 0) + max = INT_MAX; else { MPASS(end > start); max = end - 1; From nobody Sun Dec 24 08:23:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvL4ngcz54H5L; Sun, 24 Dec 2023 08:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvL2MNCz4XyW; Sun, 24 Dec 2023 08:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4oMkfUPgviCsNguP+e79q/oVi2bG/PRThBeMS488bDo=; b=lFYN7zhyda1iIz86SnPWv470sViGX7zeTe5uVAKRx5gQ7gAczHEFqkSaPKnoa2yWq/G6pP m3yMnJj2PjritbicH828KY+7B8Jfm5d9EaKMkVLZ0iAyf887ojsbngzmK/1ouPXHiw3I1R aVeqXjL48E54Ej3For7tjbpsd0MUBr7KFJ7ujqRjPP0crbgunlthLiB7fdACx3pCT7B/As OUFcke8kFiqoFRum+CQgLqfQxW5F8CxHXU7Cc/wolJB38rs+LCs4sQq4h13TgwOaKKGf6t /88LuJFG9R4mN6V2mat8UzlbpZzSSVWB+KlKzLGSocftAu6huNn/jHmg2ep+JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406190; a=rsa-sha256; cv=none; b=OTsA1r5vEOi9D9+HotQE/YX3fxZVt3sn3qANuaQW5opZNXpJmDARwS6XMwKTpW3AZd7NJk 8osnEWK8w0iTQarLsFZ2gqrWciAEIB31Fp2V2moNXvRPC4aWynJy8+JqVia+ymw58P/Idb dx6IilqUyG+M7qc664bFuTs/+yyeVbUUWpmfynWOyV5tKxVAAl8uZdNJI+TTzCk/DXgCap kX3GBx13n1ylf8MBW/6I5ND3RDcpHJGUe7Zi7FRpZJ6Gt4YrYF53XYc6hmu3aZprmw7foD Ge/E4k9vZO+x8aty/HdfgsiEJVNhwlQJk7iPIlZ9cRMHqT9qmKwg3xGzb2igyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4oMkfUPgviCsNguP+e79q/oVi2bG/PRThBeMS488bDo=; b=HsTLOs+rlYAX0mLMu9kRwsjgTJ/4/M166JWALjjSyao4PmtuRqM14aF/DpN71IFlrfFcvc N5yQQ5p6QOXN+FDzHC3K5K4EStP99dgiEyg8pyZ+XeQ09tN/kNCFLljXDPIdKcfgbRYoh6 LgnZN6wpDiy5noZ/HpyYfx9cg3gkdRxw8B3u3OfbEmcFuMFzzxeYCvFXbHe3KKPXyPnRrR 5aEnts+aPV2pC/F4O3WJB0YjMeQP1enZa9zgkNmHZF7okqKroaKrn4UC3S6ORVjMhksVg7 4DWqv5VBZI+c0a68Fb8nvXyMhBqiKfDckXZtwv4eIfCEqyZFesBF2gwbx/JyvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvL1RSTz5sm; Sun, 24 Dec 2023 08:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NAEi087221; Sun, 24 Dec 2023 08:23:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NAIU087218; Sun, 24 Dec 2023 08:23:10 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:10 GMT Message-Id: <202312240823.3BO8NAIU087218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: a39ed121eab1 - main - LinuxKPI: Chase for new "name" argument of register_shrinker() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a39ed121eab16bd2579422f71df7ef29b55965d1 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=a39ed121eab16bd2579422f71df7ef29b55965d1 commit a39ed121eab16bd2579422f71df7ef29b55965d1 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Chase for new "name" argument of register_shrinker() Linux uses it only if SHRINKER_DEBUG config option is enabled. Ignore it. Sponsored by: Serenity Cyber Security, LLC Reviewers: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42809 --- sys/compat/linuxkpi/common/include/linux/shrinker.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/shrinker.h b/sys/compat/linuxkpi/common/include/linux/shrinker.h index eb3093f4fb19..a865241cc7cb 100644 --- a/sys/compat/linuxkpi/common/include/linux/shrinker.h +++ b/sys/compat/linuxkpi/common/include/linux/shrinker.h @@ -51,7 +51,11 @@ int linuxkpi_register_shrinker(struct shrinker *s); void linuxkpi_unregister_shrinker(struct shrinker *s); void linuxkpi_synchronize_shrinkers(void); +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60000 +#define register_shrinker(s, ...) linuxkpi_register_shrinker(s) +#else #define register_shrinker(s) linuxkpi_register_shrinker(s) +#endif #define unregister_shrinker(s) linuxkpi_unregister_shrinker(s) #define synchronize_shrinkers() linuxkpi_synchronize_shrinkers() From nobody Sun Dec 24 08:23:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvM4GCcz54HXW; Sun, 24 Dec 2023 08:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvM2y79z4XnH; Sun, 24 Dec 2023 08:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxwdaRpXZOrFRC5wer3ZW8II8qJowJQgW/Vb4p7hnG4=; b=HweFUZHu3+qWnZPyJAotj4fRpmsb3i4fyzB8P6LxUXHfVu8vUZp/891cHr/0Ai4uyxRQbo 1h4R+TUh0CGI59HzEBFnirmfcvvIb5dSPiWfFDptphK8O+y2V8LR6Emq4xTWJTot/hpElP c4XQAW8SmVHG/4USv6kqK2CsIDxnBbVJ0kx440tladJ2uU86tsi+C+s+sjt4IHJc9Ng9m6 u7k6chBDW3D2+LJIQOtAim9a9z07NPSjJXzWJbPwnRg707PUOplThGxkV3G0epxw+6t0eQ pMB78/rITXMqLK3penN5jqRrMy4xaUZ09GcdDqttvkUoiozgXzQBhRrJnfRkRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406191; a=rsa-sha256; cv=none; b=XHMHMwLVgC+3aYzyhMyoJ8k3Oc8hOM8JvQjCVlL0udR6yJFS3UjYkrzMQHYE0z1RhwTO5d 1HWSr/APrv4owuTAqE7zUt0tDkTmSx7Mbuvj/VlQEKO6yHJhNX3pyH9OhI34GvUnIA+03M ZVxEHD4QWFFvOFpgV5j25QNYaCmKae3FasCgYdQBVoi+up3efC17ilWWShd8azBqWTEkQ+ fD41VrzeMV6gd17rJrmxwVNfck/kDL8bM98hCMXoAgUdD/c8Vu8G2s7whXb3WVun5kwN9b RpthnUYR+YzELEhHw4Sqf1VwFGq/RLBFKxBbaZ2059+HxFUyP6TcA0tO0zY/3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxwdaRpXZOrFRC5wer3ZW8II8qJowJQgW/Vb4p7hnG4=; b=jWWpiyA2NMaQbo/ouyeD8b9kV5a23VVjawpVjuZdgAaJ2IklJdyZjqZ6xyBIpnYCMpXZRK OEVQn4IcsVstqN0Fs9flpePx9Mcm2aA3jfZWVp2eUQvjM90L9/ih815/g9095Neg0rfuaq rDfMQyQNHq4hstey4LdsdS07lrdOTpT2OUHfyXb8H/4EQ7VxMXE26m8+9GKDm+x4MDZa4j jTXJzQJZSCmI2TBJjI+TyI1Z7SSDfOoxvo877Y6L1GJ6+Bs1bU6uMVCSZV1/uesFxbC25k pVwRtECjCt7hjjpQVBTYe35bikII/xArx5thq6cwKCp/LNmL4UccvetpNU8opg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvM23G5z5Td; Sun, 24 Dec 2023 08:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NBFT087263; Sun, 24 Dec 2023 08:23:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NBq9087260; Sun, 24 Dec 2023 08:23:11 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:11 GMT Message-Id: <202312240823.3BO8NBq9087260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 64e30cba3f04 - main - LinuxKPI: Add write_seqcount_invalidate() and seqprop_sequence() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64e30cba3f0432fa684728b67850b6254d3713ea Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=64e30cba3f0432fa684728b67850b6254d3713ea commit 64e30cba3f0432fa684728b67850b6254d3713ea Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add write_seqcount_invalidate() and seqprop_sequence() functions to linux/seqlock.h Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42810 --- sys/compat/linuxkpi/common/include/linux/seqlock.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/seqlock.h b/sys/compat/linuxkpi/common/include/linux/seqlock.h index a7b9dd12e493..48e42efc10fe 100644 --- a/sys/compat/linuxkpi/common/include/linux/seqlock.h +++ b/sys/compat/linuxkpi/common/include/linux/seqlock.h @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -84,9 +85,24 @@ seqcount_mutex_init(struct seqcount_mutex *seqcount, void *mutex __unused) struct seqcount_mutex: seqc_write_end \ )(&(s)->seqc) +static inline void +lkpi_write_seqcount_invalidate(seqc_t *seqcp) +{ + atomic_thread_fence_rel(); + *seqcp += SEQC_MOD * 2; +} +#define write_seqcount_invalidate(s) lkpi_write_seqcount_invalidate(&(s)->seqc) + #define read_seqcount_begin(s) seqc_read(&(s)->seqc) #define raw_read_seqcount(s) seqc_read_any(&(s)->seqc) +static inline seqc_t +lkpi_seqprop_sequence(const seqc_t *seqcp) +{ + return (atomic_load_int(__DECONST(seqc_t *, seqcp))); +} +#define seqprop_sequence(s) lkpi_seqprop_sequence(&(s)->seqc) + /* * XXX: Are predicts from inline functions still not honored by clang? */ From nobody Sun Dec 24 08:23:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvN5XB0z54Hd7; Sun, 24 Dec 2023 08:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvN3j2jz4Y1X; Sun, 24 Dec 2023 08:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voljrSDs4tbNTS4nTBL0xbXA7myuebMbj7IJfgSCBLY=; b=fVwh0zE8qJgwOTAlR4m6vmlOfhPn519TWIdBqw7eM9DyrP5KNhBSatorEz+J3NYzKRGNDp oTSsmg6Xj49G4TksJvdkeSOJyf5kOFOHyohQwWy6GCKnNCa8goUIm+azwgFLxBW7588SCY WRwVw52o/t0SqjDZOfotexl+6cfbB2VuWB9wS/BYz0h+aZMBn++Kxz/r07UCphxAHp4EHU OKY8MQbcHtDoeG/CNhpWwpMwuMPHm3UzLE8xBaWjxmr2IrptNkuqtrKiQVJ2qO/kmLctNv K3l92YLpP/5al1mNmfbQLIOeu0J/41ZHfvoW/mYakFjUupMDNXL6NyrjFaDyvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406192; a=rsa-sha256; cv=none; b=GWsf2zBVRWJgRLLlQ4Pu+wksVGjkaHVIMv2Mhl8y9n+0n4WJSZQqq7kWlkmTCYL9plN7bz zLK9UHPeqe16MVN8IwmsrJtPZemVNM8JMwcu6CxRsI3upNrTXW4PfmbOLeZ1NLzs6zfjZ7 YOGrESu78M+pwuk9MFWAIaeQp8OeLwDmmwpDeJbVlzMMQkc6h0fn75CzVfjvJajD0z5vBN HZiI78CZPv+ASZsydV4ph7ju9Ke+eQWXBmcOI5sQ7Q+kdKj3ckslVXD56f3Yq09S74gXWB pCrbMnGuuAOue94Qw5SKPSFLq4x96iPWnwN56f652KfR7oov99esV9B34fAG/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voljrSDs4tbNTS4nTBL0xbXA7myuebMbj7IJfgSCBLY=; b=VssMGeAZ41wJytSqRbFTei2UnZ8Nd0rI1SzbHR7JZFGbVSSf8nEGfzKzapwKureWdTaJwB 42dGHyavArsgJCSaHSdmxuvg75h1mGMUDW5tfVLMD2S/0IlX5+BHuYtznhT82AgBrogyab UN+NpRCXoc5RKfqeT+qoV0Z5soetCGL6N3Qfq5M02ExqRwmfRbwVct9jd/6MjEC8eSeCUZ MIShihbDIWcJ752JUuxau/F6TPRatywptHAOaJZe+gFtT5l4mMOUqifMUtw3UMJ3WGEwZA wYlSDpRtV+TyRY88zAyeLBTtK8LJD5fJddrLscvkkOouLZnbvwvGz7hFaWnKJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvN2pHBz5tL; Sun, 24 Dec 2023 08:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NCE4087303; Sun, 24 Dec 2023 08:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NCld087300; Sun, 24 Dec 2023 08:23:12 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:12 GMT Message-Id: <202312240823.3BO8NCld087300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1b2f43a7427e - main - LinuxKPI: Add cancel_work() function. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b2f43a7427ebf51561867f6c497833268014512 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1b2f43a7427ebf51561867f6c497833268014512 commit 1b2f43a7427ebf51561867f6c497833268014512 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add cancel_work() function. Cancel a work not waiting for it to finish. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42811 --- .../linuxkpi/common/include/linux/workqueue.h | 4 +++ sys/compat/linuxkpi/common/src/linux_work.c | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h index 226c2d1f4f0c..1c9df9fcb74d 100644 --- a/sys/compat/linuxkpi/common/include/linux/workqueue.h +++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h @@ -188,6 +188,9 @@ do { \ #define delayed_work_pending(dwork) \ linux_work_pending(&(dwork)->work) +#define cancel_work(work) \ + linux_cancel_work(work) + #define cancel_delayed_work(dwork) \ linux_cancel_delayed_work(dwork) @@ -243,6 +246,7 @@ extern void linux_destroy_workqueue(struct workqueue_struct *); extern bool linux_queue_work_on(int cpu, struct workqueue_struct *, struct work_struct *); extern bool linux_queue_delayed_work_on(int cpu, struct workqueue_struct *, struct delayed_work *, unsigned delay); +extern bool linux_cancel_work(struct work_struct *); extern bool linux_cancel_delayed_work(struct delayed_work *); extern bool linux_cancel_work_sync(struct work_struct *); extern bool linux_cancel_delayed_work_sync(struct delayed_work *); diff --git a/sys/compat/linuxkpi/common/src/linux_work.c b/sys/compat/linuxkpi/common/src/linux_work.c index c62302ad2346..939bdbbc1434 100644 --- a/sys/compat/linuxkpi/common/src/linux_work.c +++ b/sys/compat/linuxkpi/common/src/linux_work.c @@ -360,6 +360,38 @@ linux_delayed_work_timer_fn(void *arg) } } +/* + * This function cancels the given work structure in a + * non-blocking fashion. It returns non-zero if the work was + * successfully cancelled. Else the work may still be busy or already + * cancelled. + */ +bool +linux_cancel_work(struct work_struct *work) +{ + static const uint8_t states[WORK_ST_MAX] __aligned(8) = { + [WORK_ST_IDLE] = WORK_ST_IDLE, /* NOP */ + [WORK_ST_TIMER] = WORK_ST_TIMER, /* can't happen */ + [WORK_ST_TASK] = WORK_ST_IDLE, /* cancel */ + [WORK_ST_EXEC] = WORK_ST_EXEC, /* NOP */ + [WORK_ST_CANCEL] = WORK_ST_IDLE, /* can't happen */ + }; + struct taskqueue *tq; + + MPASS(atomic_read(&work->state) != WORK_ST_TIMER); + MPASS(atomic_read(&work->state) != WORK_ST_CANCEL); + + switch (linux_update_state(&work->state, states)) { + case WORK_ST_TASK: + tq = work->work_queue->taskqueue; + if (taskqueue_cancel(tq, &work->work_task, NULL) == 0) + return (true); + /* FALLTHROUGH */ + default: + return (false); + } +} + /* * This function cancels the given work structure in a synchronous * fashion. It returns non-zero if the work was successfully From nobody Sun Dec 24 08:23:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvP6Zxhz54HB0; Sun, 24 Dec 2023 08:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvP51bmz4XlK; Sun, 24 Dec 2023 08:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=el3TbGpsAQaHdR0JfT3U+2et+BS1ogEnQMbmG/mxa9A=; b=WO0/IqB+QPDzG/ojMAo8vzOdFWl66e3Y0xV+D2pXEdKYKnMbnxkE6PqM+TQHIbipQWQMWP VVDF3enRL/bYc/f7sQ0AGZKqnsmzxzfrsdABrT4zqogfMxUapU3IN0FkG43pq93gLhqxVr pyvG0rNqsZ6w2VxhorRtLLho9eUhtZKJuoS1NHZEH6OTQp9/MW9YvAPgwU0j/hKGUGs0Bm zth0JWpj3w1xsqtMaqwUxNYIEN7WSAfISXvJkAnzVXI24r2vMEminci/pSHVmAS/yQv4dg A9K4le99yPGjehT6zkhgnSfDUZTNfteUW0A1n4/7ZbGgaiNBdaT6ShuqMsim6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406193; a=rsa-sha256; cv=none; b=hOIjGNH8nRUlOCYlp4PKLbqmsYPnYvTEjsL6Mn0cDJ05XLl+OLlc//G8+P2Sq/akpRc3t9 Zviam/zF2b8uPuAr0MoxoexdN+AgvQZnkQgVRg4RGNCg276Jn42XFPHkg8tDXuuIkKGjwJ RSv8SAKn8EZrq7edGuiGIFifAnFd4ePRhvmnIuOI1F1TqFWXOwCo5gakvGiDNVFSMwjCrd WqEnXv0QBfLC9hrbwiyMmPaoPPb8/Kri1E3Pwf1GyWdXqJ3s705fCAf0W9HihaaCuzo3i3 cNrnwZJQpmktXYCFL5eEKdUtSR808qh9bM6ukGl9f1w+06/4uAfH0hz9qs0AlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=el3TbGpsAQaHdR0JfT3U+2et+BS1ogEnQMbmG/mxa9A=; b=rkRFSWECmKtzcPRKkTznF5Dfxe/OCzEgRkkIERYOL7ncxfsJhrMuxZGm5u50dE1DsAydfM 6J83mJ2BISJnexpHjbtJNIiVC35dXV8U5mwAZIqqVpIUh6bJ0M+YVsGRSXWyavj0xeq9g9 tA/I0TPLemFc8PGHm4piCe62MBtrzAJYqtNa/kZX/9aZWII+NpqcUZe59EW5X+s8syNJ1r CJtcVfWvUslGSfc48W2EtkNKeV4YB7Bls0jmDFUVtZXOwGzgOAiIiqjJxOi6epeqk2cspD DOTsK/B/y7oOtiQenGcXzM2rjsm2RydeY8lTWd4/FYejFocr11m9hIGRvYS/Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvP43nMz5Tf; Sun, 24 Dec 2023 08:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NDLY087344; Sun, 24 Dec 2023 08:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NDYV087341; Sun, 24 Dec 2023 08:23:13 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:13 GMT Message-Id: <202312240823.3BO8NDYV087341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5ae2e6f913fa - main - LinuxKPI: Add bitmap_intersects(), bitmap_from_arr32() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ae2e6f913fa1df5f3262255558b76af05409a09 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae2e6f913fa1df5f3262255558b76af05409a09 commit 5ae2e6f913fa1df5f3262255558b76af05409a09 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Add bitmap_intersects(), bitmap_from_arr32() and bitmap_shift_right() functions to linux/bitmap.h They perform calculation of two bitmaps intersection, copying the contents of u32 array of bits to bitmap and logical right shifting of the bits in a bitmap. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42812 --- sys/compat/linuxkpi/common/include/linux/bitmap.h | 78 +++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/bitmap.h b/sys/compat/linuxkpi/common/include/linux/bitmap.h index 85cef18ec14a..84e0ba9c88ca 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitmap.h +++ b/sys/compat/linuxkpi/common/include/linux/bitmap.h @@ -264,6 +264,27 @@ bitmap_subset(const unsigned long *pa, return (1); } +static inline bool +bitmap_intersects(const unsigned long *pa, const unsigned long *pb, + unsigned size) +{ + const unsigned end = BIT_WORD(size); + const unsigned tail = size & (BITS_PER_LONG - 1); + unsigned i; + + for (i = 0; i != end; i++) + if (pa[i] & pb[i]) + return (true); + + if (tail) { + const unsigned long mask = BITMAP_LAST_WORD_MASK(tail); + + if (pa[end] & pb[end] & mask) + return (true); + } + return (false); +} + static inline void bitmap_complement(unsigned long *dst, const unsigned long *src, const unsigned int size) @@ -306,6 +327,29 @@ bitmap_to_arr32(uint32_t *dst, const unsigned long *src, unsigned int size) dst[end - 1] &= (uint32_t)(UINT_MAX >> (32 - (size % 32))); } +static inline void +bitmap_from_arr32(unsigned long *dst, const uint32_t *src, + unsigned int size) +{ + const unsigned int end = BIT_WORD(size); + const unsigned int tail = size & (BITS_PER_LONG - 1); + +#ifdef __LP64__ + const unsigned int end32 = howmany(size, 32); + unsigned int i = 0; + + while (i < end32) { + dst[i++/2] = (unsigned long) *(src++); + if (i < end32) + dst[i++/2] |= ((unsigned long) *(src++)) << 32; + } +#else + bitmap_copy(dst, (unsigned long *)src, size); +#endif + if ((size % BITS_PER_LONG) != 0) + dst[end] &= BITMAP_LAST_WORD_MASK(tail); +} + static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, const unsigned int size) @@ -350,6 +394,40 @@ bitmap_xor(unsigned long *dst, const unsigned long *src1, dst[i] = src1[i] ^ src2[i]; } +static inline void +bitmap_shift_right(unsigned long *dst, const unsigned long *src, + unsigned int shift, unsigned int size) +{ + const unsigned int end = BITS_TO_LONGS(size); + const unsigned int tail = size & (BITS_PER_LONG - 1); + const unsigned long mask = BITMAP_LAST_WORD_MASK(tail); + const unsigned int off = BIT_WORD(shift); + const unsigned int rem = shift & (BITS_PER_LONG - 1); + unsigned long left, right; + unsigned int i, srcpos; + + for (i = 0, srcpos = off; srcpos < end; i++, srcpos++) { + right = src[srcpos]; + left = 0; + + if (srcpos == end - 1) + right &= mask; + + if (rem != 0) { + right >>= rem; + if (srcpos + 1 < end) { + left = src[srcpos + 1]; + if (srcpos + 1 == end - 1) + left &= mask; + left <<= (BITS_PER_LONG - rem); + } + } + dst[i] = left | right; + } + if (off != 0) + memset(dst + end - off, 0, off * sizeof(unsigned long)); +} + static inline unsigned long * bitmap_alloc(unsigned int size, gfp_t flags) { From nobody Sun Dec 24 08:23:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvR1K0dz54HSm; Sun, 24 Dec 2023 08:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvQ5xmFz4Y3q; Sun, 24 Dec 2023 08:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXAIec9e0Kvg23szPBg2u7SRJsFHXmsTYCM+T7tmNNQ=; b=gXvkGjDIBx9QVprYz9CgXWjUk84vIkLQnARQWWWgSJsZNSt8f1Tkp+hJU9rWQO7iW/Y/Hk DQHfuXcPZPQ1X2HTpGZDZCAKSFhwteLb2O4VqN7CCaIYQwSAtpY4FwFDN+3xr2VJ6VxkIN HEgEe7mID9Va2BB0GJDB2ayii3vOGRL7GPndFV4sOkxdKL4gFsyFKXVprMAJwuMSm8k46u AmEhQbn10WkfiLJ8+l5yKg7b7u1nfZxuYv9+V1JDSJLRczohVY2/e75h2JRwSYv4bU2bub 8LiZw/Jd24nB8gRSKwpPTMjNKy9iwFDJ5Pe7ID9497FVi1Y/rD1lIJKMALQobw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406194; a=rsa-sha256; cv=none; b=fL+lxCHaQcEUk2ZOFbWzIoOBUrcwu5hD8mYltx+Rr2nTL801FGCZYa3NxW5MWu44oIXjBi fo5gZUs+217pUAGyM6CwwEy6OTS30uDi0Q689HYeGkPyA5Yc1SsFoy3iBtBDExJo2JETU0 k0rzcJmIbUMJQngsgRftIeTgj9D6H4BYEO1rEouxoGYrULDaTbBsIAFc8nQ3JcKsmZkNf9 sbQzoeD3Awe5MVIWdNKc/84QT5yPrysHxAHAGzgJeZc2EtM+fsPhSqNXu3e08oxFrq8oqn 9JpZuO5yTNKTt1JxPoI8xy5eRnM+6tVQnfYi+GOVNW8P9Iepmw05zkmRwgud2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXAIec9e0Kvg23szPBg2u7SRJsFHXmsTYCM+T7tmNNQ=; b=BX1rNMKYSU3fqq3erAVplAv9cWfWjLpWl6G3GSNn8e9Cdbpfy3edEVZNpKJGyp23DkR0Si bLH9W7HOX8TFGCunHMY83k9Av5gqHvjIlSTeRuYd7jNA95pP3DWeRm2KLcP8ZcGA5JWOr+ GyxGcXXdTZ2ebQ3u6qVAJB9/WDoV/SR/lS7KJ9Ioua8nzbjt6lWOlyzSU6RcESSenJl92g UwkcJuLq1fBAB/CHAQEEVPzqQVCyWy7zZ0CHaizPPxa0LHZN8B0LpUd+6Y1gu8NYAXeFms HAEt6M0MmipT9EwbMtss7l5LQNYsH4L0cX7iyFPnwsrsCM5+9r67R+kgPfH9bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvQ534Wz5kN; Sun, 24 Dec 2023 08:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NEZw087380; Sun, 24 Dec 2023 08:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NEiv087377; Sun, 24 Dec 2023 08:23:14 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:14 GMT Message-Id: <202312240823.3BO8NEiv087377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 745067c58514 - main - LinuxKPI: Add acpi_video_backlight_use_native() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 745067c58514c4323dc16697e19f59dd08a8e963 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=745067c58514c4323dc16697e19f59dd08a8e963 commit 745067c58514c4323dc16697e19f59dd08a8e963 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add acpi_video_backlight_use_native() We assume that backlight (in Linux term) is always "native". Also stub acpi_video_register_backlight() Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42814 --- sys/compat/linuxkpi/common/include/acpi/video.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/acpi/video.h b/sys/compat/linuxkpi/common/include/acpi/video.h index 0682e4c5518e..fd2ffd6764d0 100644 --- a/sys/compat/linuxkpi/common/include/acpi/video.h +++ b/sys/compat/linuxkpi/common/include/acpi/video.h @@ -29,6 +29,7 @@ #ifndef _LINUXKPI_ACPI_VIDEO_H_ #define _LINUXKPI_ACPI_VIDEO_H_ +#include #include #define ACPI_VIDEO_CLASS "video" @@ -47,4 +48,15 @@ acpi_video_unregister(void) { } +static inline void +acpi_video_register_backlight(void) +{ +} + +static inline bool +acpi_video_backlight_use_native(void) +{ + return (true); +} + #endif /* _LINUXKPI_ACPI_VIDEO_H_ */ From nobody Sun Dec 24 08:23:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvS1Mb7z54HXf; Sun, 24 Dec 2023 08:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvR6yZwz4Xx4; Sun, 24 Dec 2023 08:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E34L3YgcW7c4+Qx5D2DOeezwriQqsTlNvILuQkmYtAg=; b=ubGM/TtB1M0hRE1DIvNy3/2cJRpnwXlGI1fdLcB7dmjkrCVtJ76PYSKUq5AlGuhGjtWos1 Z9ycSUyqsn5ECXQS0zwwgKvsl1zFQRUhUipylQvefPzFz9dHSw3z1YXeQx8Rb5WPl8CSsF sqLImBGZuxv2CD4YQu9fEWsWIXSoG3oWwxLsuLyQ0P3VS9diBTnS/aIJTYPzOomPGKKSBu 5mWx4bmwQFx+BmxreqeycAu/Vb/QA8vOTcwTFELspsH6JgpHZ3O7M+yjtJsej1tUb2W/n5 oWbmlpjbgU8XyD7ylAwiZ6y+wbxkN1ceczcznK+UazaiM6oaEFljh8GOPIxmkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406196; a=rsa-sha256; cv=none; b=PM1X0vew45csjNs4g50NvFghRrW34+wvuJS2pKWJKCDqZURVzAtrctIgs3ROyY7RbgiIlO jNhjY9TS2vLTxbPuOyVAyeNOANrWvsmrpamTdr42mZizmUhStCyfYppMrqhXM4aZ6Drlu0 R9+/blHM+iEelgEkczENX6czj+RJMv7lw2c1WMyaJ2mISO9WUuG00PStuYBl0nrZC1DM9Z /UnuweAdawspCyPItABHpSRwyH8eOUYtGyLZmxachLOsLoJ8PG1WsxlWAffgqj5Cx5pHC+ z+AhkM0gMrA89eJRsXpercQyJMWElVwqfAU8MxvwZOAxMcRYlTMkXuoHTHculQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E34L3YgcW7c4+Qx5D2DOeezwriQqsTlNvILuQkmYtAg=; b=XMnUS25SLVP+Nhg/tDjCWdwoFtJrnrMrbS969FDnYVuQ3vcjdLpRuWV3aMiuGi/XFeOow7 NU9aZgBLbZX7HrsOZchw8b37XCvXaL1JYsJl/ALPeuLG8+iGvyOK/JKcqrhTEz0j9M/gXd tFFUmdGv7PcGtZtU8w64OJN7Uw7XMsI2cByr58KfOgcdwN+8fJgzfqumvfA7g6wWm7+FAq l8g/OQhFbN72cIamcDXGEXNVK+tiGOWYtpiMzsFZ200cPIg1C/jGhCd/ceXhHCgzwqPsGs L1+EoUAwR3UYpE+3rllUBk823pDwvqLSpHjr2mG4m7KFyLhp6IFdPp+BWmlLWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvR63q3z4lC; Sun, 24 Dec 2023 08:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NFQ8087433; Sun, 24 Dec 2023 08:23:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NFju087430; Sun, 24 Dec 2023 08:23:15 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:15 GMT Message-Id: <202312240823.3BO8NFju087430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 2b037743a77d - main - LinuxKPI: Add linux/dynamic_debug.h header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b037743a77dcf31095fe1fedd21870b3aa6494b Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=2b037743a77dcf31095fe1fedd21870b3aa6494b commit 2b037743a77dcf31095fe1fedd21870b3aa6494b Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add linux/dynamic_debug.h header Sponsored by: Serenity Cyber Security, LLC Obtained from: OpenBSD Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42815 --- sys/compat/linuxkpi/common/include/linux/dynamic_debug.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/dynamic_debug.h b/sys/compat/linuxkpi/common/include/linux/dynamic_debug.h new file mode 100644 index 000000000000..12915eec3b68 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/dynamic_debug.h @@ -0,0 +1,8 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_LINUX_DYNAMIC_DEBUG_H +#define _LINUXKPI_LINUX_DYNAMIC_DEBUG_H + +#define DECLARE_DYNDBG_CLASSMAP(a, b, c, ...) + +#endif From nobody Sun Dec 24 08:23:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvT328dz54HB6; Sun, 24 Dec 2023 08:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvT13FLz4YFt; Sun, 24 Dec 2023 08:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QS8m4ZgCueUrQVksfZqrcYHxrH2LANe4nrZaQ6BPKo=; b=st/rD6DhFGClTPF7VUKaxkFGHjt0E9d/7oGx9oCpiP4emQ7sGt5xBcA7IjyzXhVjt19awV 0pS9r24l//PWhEZNWSZZUc+GsO8vJRZ0tZhVzMGJ1/czc3q/MkqI2cRxTEaOgXa1LVTCZA LR8O3iJ4qY4y4VKCGxfbhI1b5Q3igjKGBW6SENY6XWVdF6Yx/pCxeYSKWxm2CnUxH9bucG BrVnT16q/3MhQw6LKo+qMSbfQT0wvGID4O3GPLtYizOTaeOZ8fBkv8b77IlUVbYNh8Vt3o tXdWO3M/O9+RlR9EsZz3GuUvD9Zu5XFwwiIOWsI+D2y7IQWUkKE2fwXIOZV+sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406197; a=rsa-sha256; cv=none; b=iAY0YBEeZHzfWuvND36z9SdRqBohS9tyRZRB43ClXHjAkhOQlnw90GW9COnOGrxu2owuuh p9+5cBKbZSS2ZSHi6RiN3zFsOuHHd6gWb/Iq2njaAX7+JrUGs1OO1YiRwy/6T2O56Au80G nCPGWpZnC9bQ6dFJPMilQ5Gf7+RuFFt9vQYSaYp/4j/k7JEMLD5qiIYXJ2/NS1/3l6/gu6 EzWPuKFGdwwaj9fH8uchg7ALzldMPdUM8v2/9ZTC26DCAsz0oWR+tWVJiFWRXSOSC/6sUe nBG3hPmzlmQKySREGFyLp+PYHxzOJ4LDU0EmUf2jmhmTnlRP2bUr+Y/sxLsOnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QS8m4ZgCueUrQVksfZqrcYHxrH2LANe4nrZaQ6BPKo=; b=IzGgJKfuO/vsvywOy0HDnXZ0l8v9ZrkmBVTfP5Ae1BjxObL9BJitF0Sr09bV2SjkDQCKNR MbkFRLJ5Hni9T4wVsKFsjyw1N74NFmR32JuGeA1Vcp5xGRNmZnH1lZAgpBQ8bZxgOF3euT WNR8fMXiYWyOKv8g8OeEqjlj25iBtUay0TuBfmJkdwLPV/PiOey5F8QfcARjGT/0DAipvm 6D4mNgDSDBAdQwFRtOmf3UBeNcXQ4rc+dROlWvllcQJbfDNhQ4796XooFaC1CbR/j6aYQz SSWn3glYktvuBfPNL9t31LaQxuhs6yIKcntpneyiQVY4fUKd+76gtHdDxBnQHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvS6cjzz5Tg; Sun, 24 Dec 2023 08:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NG4G087472; Sun, 24 Dec 2023 08:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NGLn087469; Sun, 24 Dec 2023 08:23:16 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:16 GMT Message-Id: <202312240823.3BO8NGLn087469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 7f88d742e578 - main - LinuxKPI: Add get_random_u64() function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f88d742e578c4cef4e26ce10b9a936e58237964 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=7f88d742e578c4cef4e26ce10b9a936e58237964 commit 7f88d742e578c4cef4e26ce10b9a936e58237964 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add get_random_u64() function Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42816 --- sys/compat/linuxkpi/common/include/linux/random.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/random.h b/sys/compat/linuxkpi/common/include/linux/random.h index 5335cca8251c..e87d4412ea4e 100644 --- a/sys/compat/linuxkpi/common/include/linux/random.h +++ b/sys/compat/linuxkpi/common/include/linux/random.h @@ -87,6 +87,15 @@ get_random_long(void) return (val); } +static inline uint64_t +get_random_u64(void) +{ + uint64_t val; + + get_random_bytes(&val, sizeof(val)); + return (val); +} + static __inline uint32_t prandom_u32(void) { From nobody Sun Dec 24 08:23:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvV4KYKz54HXy; Sun, 24 Dec 2023 08:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvV1Zfmz4Y2p; Sun, 24 Dec 2023 08:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3q5zm0/88o6kxDwFIOn8ceob/+Cj3XXm3WWHCZXZ48=; b=QYpQCklKkDDpNWzRgR3DaP+bG1SfwRCAyOz9mmYrr2b89JBi8qa5Ov/NrgMv/XCxGPnwSW yXX2qXAX/4adfeww6PbsSMpA8pXex+MSfSipEOY2Cg4V0vuepVjQHxkKKuhD6cN91vbCEu dev/F3Hu2MMEBN6iW2/18Lwfh7HJl3Fe9kcxNT0cSpZm2+0hvciuycOKvh6f2a9IWdomWD 4YBYDjrcFrUJBC0ju+W+WI7TDCI8pMFA+zkK++grzXM0BasIV/5lqZCRmP4hdAZkuJiC/H GLervU/EzPbZJ4+q/X9QTKkJQn12JlhoH4+b+JglCbzKSFvby2I7GYJ7K0722g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406198; a=rsa-sha256; cv=none; b=sqr+/OZc6QFblSTu/pxyb3G0qpuhFEG0ATkQGYLVq2utuRCKopQlDR9i4y1pJoxDaxO0kl fzGT0HA+Rpdrq8lfxIXdKUzX1FXgBW48qZJB2XlyveFNMqp8FxrPP3mEzS7fUjSzu/y4cP ccxRD5j7ByO/NtL4r/g2V5X8pOK6utHXoQXk95UXL5IVhEuclfcxJ7/9+A6crBommFOUCw E9I1FUgj+HJmSn6JNfdpJV/3QbrgYF/2fEC6klOtCR1ilGu2VqNZs9xvzXgoVAWY4eru6g pPcKeKqZF8InfOgf7iRdtB4p/5SkHPORg4WPozlCO1E78cIQtrr79v/qPAKJcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3q5zm0/88o6kxDwFIOn8ceob/+Cj3XXm3WWHCZXZ48=; b=XTzd2ME+Nfud958ANyZmkdmbWVilJTWsS57OaKr1gB+laCN3TXwGEVdgs6g4QpecdZt8uU 4YzI4kNSi2X+sdvwBBjb2aDJjv/vFVNEm/miFBMmeUAacLsFjKMZuX2bS3n66BDeK5gtYT k4yViyNmevvSbZigo9EK0fbVOfHQKwY4eh3A7e8MXxA87y+zj4JuLLupavnFNo5A1dKNJp RND4rUuNKi471CjnjvuhO+nbYsduTT5lWSYDdgp5UhpBkrLemcKe3/cx0OEJMjswvTSwC8 KhAMLPCV+k1UP54rOxbPtxxFrRU5EwyQKS4db7Ek2n1yFK5lLQLt/F0dz/em4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvV0HyHz5Th; Sun, 24 Dec 2023 08:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NHQb087517; Sun, 24 Dec 2023 08:23:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NHSS087514; Sun, 24 Dec 2023 08:23:17 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:17 GMT Message-Id: <202312240823.3BO8NHSS087514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 9903d83d67ea - main - LinuxKPI: Add linux/ioport.h header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9903d83d67ea5eed7c36fbe8b4afe6c4dd148d0e Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=9903d83d67ea5eed7c36fbe8b4afe6c4dd148d0e commit 9903d83d67ea5eed7c36fbe8b4afe6c4dd148d0e Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add linux/ioport.h header Sponsored by: Serenity Cyber Security, LLC MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42817 --- sys/compat/linuxkpi/common/include/linux/ioport.h | 57 +++++++++++++++++++++++ sys/compat/linuxkpi/dummy/include/linux/ioport.h | 0 2 files changed, 57 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ioport.h b/sys/compat/linuxkpi/common/include/linux/ioport.h new file mode 100644 index 000000000000..444f3ad94602 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/ioport.h @@ -0,0 +1,57 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Serenity Cyber Security, LLC. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_IOPORT_H +#define _LINUXKPI_LINUX_IOPORT_H + +#include +#include + +#define DEFINE_RES_MEM(_start, _size) \ + (struct resource) { \ + .start = (_start), \ + .end = (_start) + (_size) - 1, \ + } + +struct resource { + resource_size_t start; + resource_size_t end; +}; + +static inline resource_size_t +resource_size(const struct resource *r) +{ + return (r->end - r->start + 1); +} + +static inline bool +resource_contains(struct resource *a, struct resource *b) +{ + return (a->start <= b->start && a->end >= b->end); +} + +#endif diff --git a/sys/compat/linuxkpi/dummy/include/linux/ioport.h b/sys/compat/linuxkpi/dummy/include/linux/ioport.h deleted file mode 100644 index e69de29bb2d1..000000000000 From nobody Sun Dec 24 08:23:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvW3p49z54HQN; Sun, 24 Dec 2023 08:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvW2XCgz4Y9k; Sun, 24 Dec 2023 08:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIVg8O/UrmMToN38/dhngGeW/Zm1tnnH81T++PwQckY=; b=iSOjAEmc4YVy94W3Mcqn3v/m6+bWN8SYQ9MOJ+76hxvG3MOUecwE3nNSgZf1qQcqkVlyRy doo/hRszYkEFa4yTFJjV2BzMMNL0ODmyYQtW1IRjUpFYdtEdKUQodNZxEZ8FBRBlXSxjRs ggmGQikGKApRoOUtslypJQT4fBbMBtQpFIqmowb5iJRmi6pK5MLxDth8ivqnuncY/WMx7Q kTlS5bp0p+MqKGSRD71KEYL55ATmGy8sETwaO2y9vct0C5+m254HBent2aPaHFSv/VNKcr WUckVAEefeYfmJ8NWYucRaHjQlOplOR1a4+tATCbtwPNgRMDUZx7O0Yevrz2nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406199; a=rsa-sha256; cv=none; b=AJpd+EIXvNfUwrdENKd3VDmrA+0g5AlJMmfGkjiagSjMLZBO9g8kJfNJ10A9QOiERJjJyh UPgeoIx8Mi0y7B+yUY4w803bT8XJNNWj52eIJv4wpNDq8NZtiXH96s3diSiP1RewWk/eDi LnMrbTdWwYLTPt4sKeIA0XWpztI/kll831oEM2pt3fCiqWaHstrpdJId1UAnDdPAWUKo/v gu4hh7pBbW9JDpkXTTtHve3sGnH2sJun997EFkGmtWRsp8DYyBYEk+fCleMJVjU7fCsEEd virnYXSiHV7X9Sm38pTRe5rMP2IYys62g9lICcrqFPxX573FZEDGfmUPCG0Nwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIVg8O/UrmMToN38/dhngGeW/Zm1tnnH81T++PwQckY=; b=afV3J1Y1X2uyHXLmVXCY1kwbZWSCqkUVkJzMGhsNAAgUsYy0WkzJZstfZjIGz1NxbpoiA/ QO6yPXu4gCsmkdGk8myOBqloset7uWaF26IRPStgE4xOY8qii+I0CLjLNTEwgkfkdSiTes qr5iRxjBAyJxOab1yz1oG7F+k4iKaWt0Fy3iLWPq6Z+Tv7Jkeg1RwKImqjhYIEeJ681AIf d0XG02f4E6FkIdXB8I3AyMZFvXEmPOUmJKC02w7X2IVZs478ID7Siy+DQdBoS3dF8RtpEZ 3egE3BSf+ITcGJOmc1BbokjDQQr84hXi3EZnCBnY5PRFjKlFyftcFwuE0P4SFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvW1XdVz5R2; Sun, 24 Dec 2023 08:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NJG5087565; Sun, 24 Dec 2023 08:23:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NJXb087562; Sun, 24 Dec 2023 08:23:19 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:19 GMT Message-Id: <202312240823.3BO8NJXb087562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: c58ddc254626 - main - LinuxKPI: Rename linux_list_add to __list_add() in linux/list.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c58ddc25462699c0d13bf703adbed661bb102cac Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c58ddc25462699c0d13bf703adbed661bb102cac commit c58ddc25462699c0d13bf703adbed661bb102cac Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Rename linux_list_add to __list_add() in linux/list.h to match Linux Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42818 --- sys/compat/linuxkpi/common/include/linux/list.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index ca103a670109..eecb517d780e 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -144,7 +144,7 @@ list_replace_init(struct list_head *old, struct list_head *new) } static inline void -linux_list_add(struct list_head *new, struct list_head *prev, +__list_add(struct list_head *new, struct list_head *prev, struct list_head *next) { @@ -238,14 +238,14 @@ static inline void list_add(struct list_head *new, struct list_head *head) { - linux_list_add(new, head, head->next); + __list_add(new, head, head->next); } static inline void list_add_tail(struct list_head *new, struct list_head *head) { - linux_list_add(new, head->prev, head); + __list_add(new, head->prev, head); } static inline void From nobody Sun Dec 24 08:23:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvX6JHcz54HYD; Sun, 24 Dec 2023 08:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvX3Tjfz4YGf; Sun, 24 Dec 2023 08:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8S34JAnE3aaZI/Sna/GXorCTKZh6Fmx/IQWNUJwkTwo=; b=QLf3AWFAhDQSJZGXter/rzWEf9LuKwp06C1s0hbE5e3x6tB+Bx3yohf1AQqb7e1nvYugB0 94J+zp10m/DcGrByHt0FhFVQKC06AabojHECOR3SesbvVqftd89CzZWtod4VEbmCckLBc5 EiA4aroRcyc+TzXjtjHP6ABZM3+YR6V0U/XB9bDnEJ0PArkly7LUroQ52hXiH9PWNzw+D3 L7onAAl5cxo4UL/Pedp1j4HoXinPILyjEdwSCXkcBitfqlNIflJv4wZDvoBfLHWJUJ4q8a E2zfwzS8RcWlkEQY0NSCRa7i4ZEQ0jpRLmU+JsxVDFKbGcrBAFiS15Qkc0O7cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406200; a=rsa-sha256; cv=none; b=oMl6NcnISTdD1JAeAMF6QcRGzNCAXiUSvxdf67EBrikd0cZKkatmGzu27Lgg5zJQ6Yegg+ Mx3bm22TL7qaDpOwJXEoX967t+24g5IgLfIjK/RLqHA67rnB7hU1Dj/n4rY4x6M/JOnZ3v mKowY3z3yUHSMBfz9tnTCqH+RMYMX4Ch3507B6eHxgRJLFTAb63BlZG3Gfi80KW/a5Ls75 jN21vDpDmmHL+7SbbZpc0ZDVcwaJpVhVPObGGnOUgoSV/wVRwYN8jROUXkXMyXopto+4FU 3ujjsjziOoBvmc2svy27vBiVIc41Q85TCId4Jr0SY9S4PmPSQ8Wnat+s3MpuvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8S34JAnE3aaZI/Sna/GXorCTKZh6Fmx/IQWNUJwkTwo=; b=LilSidBR6rIWG2m3mzmvjY3Rb1uzb6hBEs6WLrF9Htojc4d8hSAE0sUWNnc6bVHY8Szn1Q 3PnhX2F8CAb9porLV9zIi1p7CC59uAEl2r6B9AM0fRIpf8FZaA4YiHrX9vfEmyJOeQC1Xi X39e1UWaw7gnV4mXuXaEh7oyggN7EOMqcVIRh60O53CGNwDVjpMLmJXVh3eJFPGILTGEdQ QJ/bnp0LXtIMtVXzy3ZPMBhYeKGJ/Wq+hWFoOH8wxclzk1bpiav+wFFpl4h8Kf6CUEodD9 vfpDxlkEhg9NtHFphzixA+4iusR4RT/VCCFAghLnioyMqJ63QPtTnyyrMj8Mlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvX2X6vz5Tj; Sun, 24 Dec 2023 08:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NKIL087601; Sun, 24 Dec 2023 08:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NKll087598; Sun, 24 Dec 2023 08:23:20 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:20 GMT Message-Id: <202312240823.3BO8NKll087598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 730387b64e10 - main - LinuxKPI: Add linux/apple-gmux.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 730387b64e10b617f6f0b6f3a64501dc35dd7861 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=730387b64e10b617f6f0b6f3a64501dc35dd7861 commit 730387b64e10b617f6f0b6f3a64501dc35dd7861 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add linux/apple-gmux.h Sponsored by: Serenity Cyber Security, LLC Obtained from: OpenBSD Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42819 --- sys/compat/linuxkpi/common/include/linux/apple-gmux.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/apple-gmux.h b/sys/compat/linuxkpi/common/include/linux/apple-gmux.h new file mode 100644 index 000000000000..812a782c57d4 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/apple-gmux.h @@ -0,0 +1,12 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_LINUX_APPLE_GMUX_H +#define _LINUXKPI_LINUX_APPLE_GMUX_H + +static inline bool +apple_gmux_detect(void *a, void *b) +{ + return false; +} + +#endif From nobody Sun Dec 24 08:23:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvZ13KKz54HQc; Sun, 24 Dec 2023 08:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvY4B6Wz4Y7f; Sun, 24 Dec 2023 08:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CBznooTkox0uYzeB/It04dkmicYZ8PJFKqVfkNc/vbY=; b=ZcbbaayOQgyzhHrIYyb/pZvJChh6Rcuc24kcuUy9qb12GyZVuzuxSBKw94q/L+BtI1Vw0b A8Ylf/Sfin9QgspTre1cNck+JNvFoptGEElEduoc0SP/qcpUbO6NinyUQ3bbPS/5eMf+Nz +pwd0GvJ8owJxPFuirm2016HTLluKi/xhTzrndEydaGoOt1gy6OWVTFB5gkHPL5NIucxYd Ax6wNiAXDyFUvlpOpja7m7XMzw02un+NhfRJmNA8XOvQ461Kd1SdlNJ48of5UL2q6/4+sf g7cBvbr2IJwON5p8+aAFrJN4DwPhUdd6h5NKiUyU+XWuiqXEkr+hO6s4yxnQWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406201; a=rsa-sha256; cv=none; b=mi9A0Xa2TYQyZ4muR/i+7I9DTJGABSsJbn1rr3YcvEWXi47UZYqUtJzJ3qxIbuesVBxlbb P9uRMKDckTBfPBGXM7EuYYxmiocfCT9u6uyQooU2GSRok0/5cADF/sgn7lcawzd5cuJTII ZFrCUt3f4XqhL4BrbUGKBC7rG3gx34HPVk4+aovI8CCynjW19jXsHNSBrLBUsV1maXguH3 DZEOaIOV2lHFnYKxT267oR3hrHd7DJ6GLbHyQ3Yj3fnpUeWu57KxHJBWCUh43ogA5lFMYj dNYsD3AbdttqxtgNtaWCaT4OIcZSP0ZLoXFCcP4R0g1Bv08PXG/O4c9NHAAViA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CBznooTkox0uYzeB/It04dkmicYZ8PJFKqVfkNc/vbY=; b=tqQCzoxQVIqioG6wGAqb7d7fp8h9mJ4qCGLtZ00RspAk5rIEaMIRxlnT4kGxd9tjA/893R Y5iL/5SAdfs8K7153Larou+iWna9UzoP5tz6z3bG/axcz6LdZWNEF72T4Pf+OfAVqOETPP dfM5Svd27QA/9A8tT/5If82lYbljUxze11h9BMp7kh0tj3vDmF3bs9HJeB0NmtGDTj23ts JF9k66IKORZZSExou2WqBhHJBHtgO726BO6Sw+3bDT9VFNgAchVYkJIcvKnO8i0qRz4u5u D54ehl6f06IcX027yX2G7OJvCJsdE6manlLrfjiMOBLF9rvSQD8gCwBeRd3TDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvY3Hvrz5R3; Sun, 24 Dec 2023 08:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NLuC087655; Sun, 24 Dec 2023 08:23:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NLWg087652; Sun, 24 Dec 2023 08:23:21 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:21 GMT Message-Id: <202312240823.3BO8NLWg087652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: b8c88a617501 - main - LinuxKPI: Add x86_vendor field to struct cpuinfo_x86 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8c88a61750174f62db45784d6b4dc98de4073b1 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c88a61750174f62db45784d6b4dc98de4073b1 commit b8c88a61750174f62db45784d6b4dc98de4073b1 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add x86_vendor field to struct cpuinfo_x86 and initialize it at linuxkpi module load. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42820 --- sys/compat/linuxkpi/common/include/asm/processor.h | 13 +++++++++++++ sys/compat/linuxkpi/common/src/linux_compat.c | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h index c55238d33505..2bc4b6532544 100644 --- a/sys/compat/linuxkpi/common/include/asm/processor.h +++ b/sys/compat/linuxkpi/common/include/asm/processor.h @@ -33,11 +33,24 @@ #include #if defined(__i386__) || defined(__amd64__) +#define X86_VENDOR_INTEL 0 +#define X86_VENDOR_CYRIX 1 +#define X86_VENDOR_AMD 2 +#define X86_VENDOR_UMC 3 +#define X86_VENDOR_CENTAUR 5 +#define X86_VENDOR_TRANSMETA 7 +#define X86_VENDOR_NSC 8 +#define X86_VENDOR_HYGON 9 +#define X86_VENDOR_NUM 12 + +#define X86_VENDOR_UNKNOWN 0xff + struct cpuinfo_x86 { uint8_t x86; uint8_t x86_model; uint16_t x86_clflush_size; uint16_t x86_max_cores; + uint8_t x86_vendor; }; extern struct cpuinfo_x86 boot_cpu_data; diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 664ba220e721..4a998a557514 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -63,6 +63,7 @@ #include #if defined(__i386__) || defined(__amd64__) +#include #include #endif @@ -2622,11 +2623,30 @@ linux_compat_init(void *arg) int i; #if defined(__i386__) || defined(__amd64__) + static const uint32_t x86_vendors[X86_VENDOR_NUM] = { + [X86_VENDOR_INTEL] = CPU_VENDOR_INTEL, + [X86_VENDOR_CYRIX] = CPU_VENDOR_CYRIX, + [X86_VENDOR_AMD] = CPU_VENDOR_AMD, + [X86_VENDOR_UMC] = CPU_VENDOR_UMC, + [X86_VENDOR_CENTAUR] = CPU_VENDOR_CENTAUR, + [X86_VENDOR_TRANSMETA] = CPU_VENDOR_TRANSMETA, + [X86_VENDOR_NSC] = CPU_VENDOR_NSC, + [X86_VENDOR_HYGON] = CPU_VENDOR_HYGON, + }; + uint8_t x86_vendor = X86_VENDOR_UNKNOWN; + + for (i = 0; i < X86_VENDOR_NUM; i++) { + if (cpu_vendor_id != 0 && cpu_vendor_id == x86_vendors[i]) { + x86_vendor = i; + break; + } + } linux_cpu_has_clflush = (cpu_feature & CPUID_CLFSH); boot_cpu_data.x86_clflush_size = cpu_clflush_line_size; boot_cpu_data.x86_max_cores = mp_ncpus; boot_cpu_data.x86 = CPUID_TO_FAMILY(cpu_id); boot_cpu_data.x86_model = CPUID_TO_MODEL(cpu_id); + boot_cpu_data.x86_vendor = x86_vendor; __cpu_data = mallocarray(mp_maxid + 1, sizeof(*__cpu_data), M_KMALLOC, M_WAITOK | M_ZERO); @@ -2635,6 +2655,7 @@ linux_compat_init(void *arg) __cpu_data[i].x86_max_cores = mp_ncpus; __cpu_data[i].x86 = CPUID_TO_FAMILY(cpu_id); __cpu_data[i].x86_model = CPUID_TO_MODEL(cpu_id); + __cpu_data[i].x86_vendor = x86_vendor; } #endif rw_init(&linux_vma_lock, "lkpi-vma-lock"); From nobody Sun Dec 24 08:23:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvb1PR2z54HYs; Sun, 24 Dec 2023 08:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvZ5Tn0z4YH9; Sun, 24 Dec 2023 08:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FrwrgeGsdPR15mzzuFnvqsmYLzk7HDFfLEGP0JzV59I=; b=ZOEC2GQTjeIPmnuNLToqojrFmR3FbsQBxdhg4O32J8kM9gJEdpGlaRd0q1YoWA5B5Z8At3 bFUISCbFhPQj0lieeM2fzs6weXxsg4OsYEExACol7j8rJzBSjQtbZ0+DDcMfK+nZwKF2Zh ESbpwgUhqFVqBhfuukfiqT8X3b6ow2CT2MNHBp4n+FD0QrBGiYMYxQgq9+IxKDz5kufvzO 4Jbo87L/cmxUN64GVMOGaBvd5EMWSjDAiLOIndxTeeCx8TLDbLdKvrKYx51XPglWsN+Kig IPN3JfFobvWloY6GtQKfsp43864Gixlv750irHzUzFFagSJhAgGTHSVgzY8eWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406202; a=rsa-sha256; cv=none; b=dUxlFmSDu0EWYX5mBUz1iYlZcZIvp2OfGdFEPWaxg+ZTIpfXvgCPs2UjYWWnl6qonRbVj1 jkBI5K1ylIhVIeWNpie3Brk25FIr9XV9HjLnt4CLyIxIU5EOvEkervGd5c4CevQhSG7MeD ohwKExvqXW0386PXUTclmEJInbQBOUzW5U1195hbv4TAflJOjPhh3Im6f70RlFiV8NGmNM wFK7HXOYNArdUsuYu3eV24nPG4zXV8nI0zYTdLBszl2QltQImrh7YR5GOdAU7UmGp8McFI Fnoyzvzp7xF8mUU/MpIa+Qp8YiJve/dGsWh/LFyZ1njr9XTpMJm7afLFc/erlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FrwrgeGsdPR15mzzuFnvqsmYLzk7HDFfLEGP0JzV59I=; b=w0yYSHCsGaW266yCY6VPfMBNX+GuEGAsdpNMRgqIxfF5X0pCRJhT3hxzCfTE+adJgNepJe vxhJ/oCmIno5apDUrY4CCg/YxiyfeohaqfFAkgGXIdG3WLjCiVicFFt13bk3t9L9oRdqq3 l39gxuz8LZJ5A5bu/9SQ0UWo1DUJZySHHuUOaxk5gOhRqKGSYfRNbnbeCK8U68MNCHtYMl YLdQCEQtAbeBqPGW6fZtDXZxR07QIMl1f2yTpRBb+IveOW0NNfOuUZU4gKBc+eyEkkyVVM Z3Xc532nUAieinLh/NeQsbdlm/B8Ca0yf1dRqZz7pBAxf+0M2Jzmj/7s1PPOjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvZ4bNWz5kl; Sun, 24 Dec 2023 08:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NM4S087694; Sun, 24 Dec 2023 08:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NMs8087691; Sun, 24 Dec 2023 08:23:22 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:22 GMT Message-Id: <202312240823.3BO8NMs8087691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 808ae4e29b6b - main - LinuxKPI: Add pcie_capability_clear_and_set_word() function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 808ae4e29b6b9c9acc7eab013c5045370df8182a Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=808ae4e29b6b9c9acc7eab013c5045370df8182a commit 808ae4e29b6b9c9acc7eab013c5045370df8182a Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add pcie_capability_clear_and_set_word() function It does a Read-Modify-Write operation using clear and set bitmasks on PCI Express Capability Register at pos. As certain PCI Express Capability Registers are accessed concurrently in RMW fashion, hence require locking which is handled transparently to the caller. Sponsored by: Serenity CyberSecurity, LLC Reviewed by: manu, bz MFC after: 1 week MFC TODO: Move pcie_cap_lock to bottom to preserve KBI compatibility Differential Revision: https://reviews.freebsd.org/D42821 --- sys/compat/linuxkpi/common/include/linux/pci.h | 36 ++++++++++++++------------ sys/compat/linuxkpi/common/src/linux_pci.c | 3 +++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index aa99b050ffd9..9c7e39bf4a42 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -347,6 +347,7 @@ struct pci_dev { size_t romlen; struct msi_desc **msi_desc; char *path_name; + spinlock_t pcie_cap_lock; TAILQ_HEAD(, pci_mmio_region) mmio; }; @@ -1012,35 +1013,38 @@ pcie_capability_write_word(struct pci_dev *dev, int pos, u16 val) } static inline int -pcie_capability_set_word(struct pci_dev *dev, int pos, uint16_t val) +pcie_capability_clear_and_set_word(struct pci_dev *dev, int pos, + uint16_t clear, uint16_t set) { int error; uint16_t v; + if (pos == PCI_EXP_LNKCTL || pos == PCI_EXP_RTCTL) + spin_lock(&dev->pcie_cap_lock); + error = pcie_capability_read_word(dev, pos, &v); - if (error != 0) - return (error); + if (error == 0) { + v &= ~clear; + v |= set; + error = pcie_capability_write_word(dev, pos, v); + } - v |= val; + if (pos == PCI_EXP_LNKCTL || pos == PCI_EXP_RTCTL) + spin_unlock(&dev->pcie_cap_lock); - error = pcie_capability_write_word(dev, pos, v); return (error); } static inline int -pcie_capability_clear_word(struct pci_dev *dev, int pos, uint16_t val) +pcie_capability_set_word(struct pci_dev *dev, int pos, uint16_t val) { - int error; - uint16_t v; - - error = pcie_capability_read_word(dev, pos, &v); - if (error != 0) - return (error); - - v &= ~val; + return (pcie_capability_clear_and_set_word(dev, pos, 0, val)); +} - error = pcie_capability_write_word(dev, pos, v); - return (error); +static inline int +pcie_capability_clear_word(struct pci_dev *dev, int pos, uint16_t val) +{ + return (pcie_capability_clear_and_set_word(dev, pos, val, 0)); } static inline int pcie_get_minimum_link(struct pci_dev *dev, diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 4cd28fac15d3..825ebe319b1a 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -525,6 +525,7 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, goto out_dma_init; TAILQ_INIT(&pdev->mmio); + spin_lock_init(&pdev->pcie_cap_lock); spin_lock(&pci_lock); list_add(&pdev->links, &pci_devices); @@ -539,6 +540,7 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, out_probe: free(pdev->bus, M_DEVBUF); + spin_lock_destroy(&pdev->pcie_cap_lock); linux_pdev_dma_uninit(pdev); out_dma_init: spin_lock(&pci_lock); @@ -579,6 +581,7 @@ linux_pci_detach_device(struct pci_dev *pdev) spin_lock(&pci_lock); list_del(&pdev->links); spin_unlock(&pci_lock); + spin_lock_destroy(&pdev->pcie_cap_lock); put_device(&pdev->dev); return (0); From nobody Sun Dec 24 08:23:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvc1sRkz54HBG; Sun, 24 Dec 2023 08:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvb6j3Wz4YPQ; Sun, 24 Dec 2023 08:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXXOFDH0dKt1RqKo478CL73qdk7BROxhhC+ayHr0WoM=; b=qwKdRC85zLl62w4fU27NFyIjZhxWn96wjn7wI8m/jaO6qva4dvIP1cgn2e5TXO3TBYMo6E l6gWXGXSYvH3XkniI3IjWFZP61ALZjJSKrYiXgyMq+LlxacQF/wCRXfc4VGbGD+VcB/V4Q KtGJfjuQfoRAGT/6heQNFGWhDUf6FB5Gkg1J1JgHSTpR1lXFGYaEdFyGWbLXZpeXcFsdfU wgpF0zffiprvGdNSqILOLWm49SaGH7HdsEejKl0dQCy2CjCQyXqDf6I3rk6+KPBGMamxvz wlR7GWi3Pzd6k1BgPZpca7innHAS5u28lHXq7/6bn8mjLW3r6Jc1CkU+irU1OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406203; a=rsa-sha256; cv=none; b=EIClUaJdToTWWvQuFu/0Rvw/iy5sgtOtolUS23YsauzHf3mkfkuyzPBq05wptXGSlPLk/9 6rskr7BDVafNdL8h1ypAx+OOskghIZGLXprUYSId4Q8Do5Brl0DlLpsUf6Yxn6jlfduYgF pLksrDJGcxPI3xBF8wNxHZjUFL+YB389HjE7AbMuPHgMraXUrgaz9L9Ir8VyUAZAJ7vKME lIts+yRUxZdlmxW7C4WL9r6MCm4NK9SmO5+lRTQRx2zJUHVjrkVp1F8pObXu05cx6642WK 6O+hSNSBem2AGJIMm/56+0yNQiQLY4/lYfDO0nqpwdbbCZAoy3Pk/sYTdtPGUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXXOFDH0dKt1RqKo478CL73qdk7BROxhhC+ayHr0WoM=; b=kPyHLsejpQ1rQM9JBXvOUNJ/H96OdlOBS+Y5cuaqSQl4qXovHLj7WdKjruYa8mq5sMFcAo zSelgoF3k0A+czDpmQRoOGNPnR4TTxXWWjU2vatPFXI75nnWlxflQMhnj/fIkRxV3LwCAW 2i09jNGU+G4NqvnnnG+zIZt9/cxxkvdJXRQQfAw6SGEiZFE4alHNXZA0skwwBwXehaUpp+ mlgKUoz/ockX1gg2E0s7ODYUARVrtvL6Hh1zu58FH7xGqkRcVT33TrAxWj1FqWbrL1kr50 aEdStQ/Iu1eyKhCsv/+iVuqiMs9/bEs1v12XIecHjUE5AdJGvNvTORonXgF/Nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvb5gvTz5sn; Sun, 24 Dec 2023 08:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NN71087733; Sun, 24 Dec 2023 08:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NNhI087730; Sun, 24 Dec 2023 08:23:23 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:23 GMT Message-Id: <202312240823.3BO8NNhI087730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 04952a9456e2 - main - LinuxKPI: Add acpi_dev_present() function. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04952a9456e226460d1d95c42ea53861b1133b1a Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=04952a9456e226460d1d95c42ea53861b1133b1a commit 04952a9456e226460d1d95c42ea53861b1133b1a Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:00 +0000 LinuxKPI: Add acpi_dev_present() function. acpi_dev_present detects that a given ACPI device is present based on Hardware ID, Unique ID and Hardware Revision of the device. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42823 --- sys/compat/linuxkpi/common/include/acpi/acpi_bus.h | 4 ++ sys/compat/linuxkpi/common/src/linux_acpi.c | 79 ++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h index 3db8e7df58f4..f107902a26ad 100644 --- a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h +++ b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h @@ -37,6 +37,8 @@ struct acpi_bus_event { uint32_t data; }; +#define acpi_dev_present(...) lkpi_acpi_dev_present(__VA_ARGS__) + ACPI_HANDLE bsd_acpi_get_handle(device_t bsddev); bool acpi_check_dsm(ACPI_HANDLE handle, const char *uuid, int rev, uint64_t funcs); @@ -46,5 +48,7 @@ ACPI_OBJECT * acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const char *uuid, int register_acpi_notifier(struct notifier_block *nb); int unregister_acpi_notifier(struct notifier_block *nb); uint32_t acpi_target_system_state(void); +bool lkpi_acpi_dev_present(const char *hid, const char *uid, + int64_t hrv); #endif /* _LINUXKPI_ACPI_ACPI_BUS_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 6e342c8e2caa..e7b6854ecf13 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -174,6 +174,79 @@ acpi_target_system_state(void) return (linux_acpi_target_sleep_state); } +struct acpi_dev_present_ctx { + const char *hid; + const char *uid; + int64_t hrv; +}; + +static ACPI_STATUS +acpi_dev_present_cb(ACPI_HANDLE handle, UINT32 level, void *context, + void **result) +{ + ACPI_DEVICE_INFO *devinfo; + struct acpi_dev_present_ctx *match = context; + bool present = false; + UINT32 sta, hrv; + int i; + + if (handle == NULL) + return (AE_OK); + + if (!ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) && + !ACPI_DEVICE_PRESENT(sta)) + return (AE_OK); + + if (ACPI_FAILURE(AcpiGetObjectInfo(handle, &devinfo))) + return (AE_OK); + + if ((devinfo->Valid & ACPI_VALID_HID) != 0 && + strcmp(match->hid, devinfo->HardwareId.String) == 0) { + present = true; + } else if ((devinfo->Valid & ACPI_VALID_CID) != 0) { + for (i = 0; i < devinfo->CompatibleIdList.Count; i++) { + if (strcmp(match->hid, + devinfo->CompatibleIdList.Ids[i].String) == 0) { + present = true; + break; + } + } + } + if (present && match->uid != NULL && + ((devinfo->Valid & ACPI_VALID_UID) == 0 || + strcmp(match->uid, devinfo->UniqueId.String) != 0)) + present = false; + + AcpiOsFree(devinfo); + if (!present) + return (AE_OK); + + if (match->hrv != -1) { + if (ACPI_FAILURE(acpi_GetInteger(handle, "_HRV", &hrv))) + return (AE_OK); + if (hrv != match->hrv) + return (AE_OK); + } + + return (AE_ERROR); +} + +bool +lkpi_acpi_dev_present(const char *hid, const char *uid, int64_t hrv) +{ + struct acpi_dev_present_ctx match; + int rv; + + match.hid = hid; + match.uid = uid; + match.hrv = hrv; + + rv = AcpiWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, + ACPI_UINT32_MAX, acpi_dev_present_cb, NULL, &match, NULL); + + return (rv == AE_ERROR); +} + static void linux_register_acpi_event_handlers(void *arg __unused) { @@ -241,4 +314,10 @@ acpi_target_system_state(void) return (ACPI_STATE_S0); } +bool +lkpi_acpi_dev_present(const char *hid, const char *uid, int64_t hrv) +{ + return (false); +} + #endif /* !DEV_ACPI */ From nobody Sun Dec 24 08:23:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvd2slKz54HdZ; Sun, 24 Dec 2023 08:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvd1d7Nz4YKG; Sun, 24 Dec 2023 08:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oudxeeXtLqU+pgKplx4hih+uOQbT7DfwwEtZu/yzQ9U=; b=PLPeAUJh/oFIk8LNc6HK1JPboUG2NIY6GHCWh2/bk9Lut5ucqbE/C8UY8fOj4u85Z3VFvg Upn51YEIsQ2VIHb2J2BKdfiMffZypxYQqxkvh1SZrbR/xT1Qww4eHTXSJBc5WZt+kXP6J6 tcZ0abEUXPVMvcskU8okHI7FEHNnYd2GRx9/jmXuzNFBqfyhYnF7amc1jvv5e9YZzknxy7 EB0bZ8oPQ/ZNn3ffpxJuPwoCH+XT1wtSEvFY3MsjEtfdZ+MgNDLhD6oaHf/ECRpDvw9ecx f4sjXXkby2vNs+ZXTHlBnHzhM2QulF7Y+ZgvRU/eiWNmpI2LVXHyTPkA0A7KFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406205; a=rsa-sha256; cv=none; b=jFe4EmhwwpYoRQN8+fLGd3Y9CvooKga47T1AtsBV1l5cgVl2onRG6ofhz1KE9dyTvDMyyN McsJWtsIlg250vhfpWm93z8unt+x9e93AWSWte/608D6k0PNf+A9CoAu62i7006B+AGL2t z2Nhc/Xzt3hjcwf1dSQQXmnE3P87j3PZoKO2qn3BVA+ufzNwkeFFG4SOQ8o0637pknknY2 o+pREN4/qOhh7JBgxpQcsdJjxfOgaJ1A4x3ydXr+MR3XUcegg0FaG0yqmxFtYZRq5+59/w oQQQ9SwWA/iws9XZz9mlLTure1GM2IwTEQo7L1E+/inp+xe6INQiU+beCdWh8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oudxeeXtLqU+pgKplx4hih+uOQbT7DfwwEtZu/yzQ9U=; b=ojcRsPvbC85RkIP4jSBMtbR/qV4hFF3xbSTQtyBlhZ5Wqgx7MruT/0DDeRwdQ0/RriYLhS 8FHkxN/gQf2sorAoSY5vBOMUVGZdvxuhjhlRCDpwgGj9meyFUMr6tHX3CM1rPv2VvrcJDC TpJvJHBWuCexkY5o5kvikJvw5By2J2qK5c2bENj3w3IMgYO3Pg5hdiSH0erBKu9z8Ztpgt HyeqUdskY87WWzulTc+jFsUqTU3PTcDzrDKVTHVR5kchfRpg6ki//CtcCZjsY/ve6M5vcM /Ka/1pnNbKR2+a4OXgoLiYl7evfvqK9wwF3zDMGRXVY7opHxDX+0LGZdjML5mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvc6lBpz5Tn; Sun, 24 Dec 2023 08:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NOfT087784; Sun, 24 Dec 2023 08:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NODF087781; Sun, 24 Dec 2023 08:23:24 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:24 GMT Message-Id: <202312240823.3BO8NODF087781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5a3bd281672b - main - LinuxKPI: Add explicit software context to FPU sections List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a3bd281672bd6bd8e18081c3928dfe76d330a5f Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5a3bd281672bd6bd8e18081c3928dfe76d330a5f commit 5a3bd281672bd6bd8e18081c3928dfe76d330a5f Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:01 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:01 +0000 LinuxKPI: Add explicit software context to FPU sections Amdgpu driver does a lot of memory allocations in FPU-protected sections of code for certain display cores, e.g. for DCN30. This does not work currently on FreeBSD as its malloc function can not be run within a critical section. Allocate memory for FPU context to overcome such restriction. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu (previous version), markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42822 --- sys/compat/linuxkpi/common/include/linux/compat.h | 6 ++++++ sys/compat/linuxkpi/common/include/linux/sched.h | 2 ++ sys/compat/linuxkpi/common/src/linux_current.c | 18 ++++++++++++++++++ sys/compat/linuxkpi/common/src/linux_fpu.c | 14 ++++++++++---- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/compat.h b/sys/compat/linuxkpi/common/include/linux/compat.h index d1a02f612f42..7922e884beb1 100644 --- a/sys/compat/linuxkpi/common/include/linux/compat.h +++ b/sys/compat/linuxkpi/common/include/linux/compat.h @@ -33,6 +33,11 @@ #include #include +#if defined(__aarch64__) || defined(__arm__) || defined(__amd64__) || \ + defined(__i386__) || defined(__powerpc64__) +#define LKPI_HAVE_FPU_CTX +#endif + struct domainset; struct thread; struct task_struct; @@ -40,6 +45,7 @@ struct task_struct; extern int linux_alloc_current(struct thread *, int flags); extern void linux_free_current(struct task_struct *); extern struct domainset *linux_get_vm_domain_set(int node); +extern int linux_set_fpu_ctx(struct task_struct *); static inline void linux_set_current(struct thread *td) diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index 8cb6b12100d5..77c4f6d3f80f 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -64,6 +64,7 @@ #define TASK_COMM_LEN (MAXCOMLEN + 1) struct seq_file; +struct fpu_kern_ctx; struct work_struct; struct task_struct { @@ -89,6 +90,7 @@ struct task_struct { struct task_struct *group_leader; unsigned rcu_section[TS_RCU_TYPE_MAX]; unsigned int fpu_ctx_level; + struct fpu_kern_ctx *fpu_ctx; }; #define current ({ \ diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c index bec53384361f..668185094cbe 100644 --- a/sys/compat/linuxkpi/common/src/linux_current.c +++ b/sys/compat/linuxkpi/common/src/linux_current.c @@ -43,6 +43,10 @@ #include #include +#ifdef LKPI_HAVE_FPU_CTX +#include +#endif + #ifdef DEV_APIC extern u_int first_msi_irq, num_msi_irqs; #endif @@ -153,6 +157,16 @@ linux_alloc_current(struct thread *td, int flags) return (0); } +int +linux_set_fpu_ctx(struct task_struct *task) +{ +#ifdef LKPI_HAVE_FPU_CTX + if (task->fpu_ctx == NULL && curthread->td_critnest == 0) + task->fpu_ctx = fpu_kern_alloc_ctx(FPU_KERN_NOWAIT); +#endif + return (task->fpu_ctx != NULL ? 0 : ENOMEM); +} + struct mm_struct * linux_get_task_mm(struct task_struct *task) { @@ -176,6 +190,10 @@ void linux_free_current(struct task_struct *ts) { mmput(ts->mm); +#ifdef LKPI_HAVE_FPU_CTX + if (ts->fpu_ctx != NULL) + fpu_kern_free_ctx(ts->fpu_ctx); +#endif uma_zfree(linux_current_zone, ts); } diff --git a/sys/compat/linuxkpi/common/src/linux_fpu.c b/sys/compat/linuxkpi/common/src/linux_fpu.c index b26dce98774b..d510bc208b88 100644 --- a/sys/compat/linuxkpi/common/src/linux_fpu.c +++ b/sys/compat/linuxkpi/common/src/linux_fpu.c @@ -30,11 +30,12 @@ #include #include +#include #include #include -#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) +#ifdef LKPI_HAVE_FPU_CTX #include @@ -47,15 +48,20 @@ void lkpi_kernel_fpu_begin(void) { - if ((current->fpu_ctx_level)++ == 0) - fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX); + int err; + + if ((current->fpu_ctx_level)++ == 0) { + err = linux_set_fpu_ctx(current); + fpu_kern_enter(curthread, current->fpu_ctx, + err == 0 ? FPU_KERN_KTHR : FPU_KERN_NOCTX); + } } void lkpi_kernel_fpu_end(void) { if (--(current->fpu_ctx_level) == 0) - fpu_kern_leave(curthread, NULL); + fpu_kern_leave(curthread, current->fpu_ctx); } #else From nobody Sun Dec 24 08:23:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyYvf433Zz54HZM; Sun, 24 Dec 2023 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvf1Mz8z4YVH; Sun, 24 Dec 2023 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3QK8C9aWzMrs4SdWfw7iOTeLL1vLDCYUycM4RBTHyQ=; b=WqGsXwNXVRAtOvZ5zFuYGa7CV2OYNleQoFspLE+etZkjXHkoFJiLpViy6F4VQEE7iLqRwe an1h17TxnH9JnKEj2M03apXdweTLt01r7tpOqAgMUBHV6/wIODlq620UeYAGgOF+I94oHt onTJpm3aVzu+JtL0ISNh0CVNsO8t5L8emFnVc/fL2wklu5XpgmPawfRTrYrsQCM2sv1e5s 5qGo4IWimRHVCqztUELFGoN3pi4g0qkkpmCCKumylR/w2w+oU1lNhBu04Wvv/LCHCuNDFD 8zHpsie2bVy3Ck8qy3pp8NAhahjGZm/yGjmsSH3GvEl1Ruenonvj1n8XWVz5tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406206; a=rsa-sha256; cv=none; b=e89BmBW4fYgnsGYdSikqK+kcspbj2IS+xnjeLKKrToFJm/5dhJVCI0Dm9mwWLqHQnFxyxl xc4lSbI5BE4VFNcpkvo9Rq7tH39lwESvwsk+hs+9MrpfufVx35vo8uNrPg6t7zUpi6LIEw 3VrZOjwCoBvmivEASPcFPSMPYjV03nYTeKlOXJFaLUd3t/AxVA4z8e6yX/cVUWZr8FWD4e BRsQs4kSh3PZCKW3GJTHfZTszWuW8KQhJcxjB/Ai/L8J9ACuWGVtPj7sl4TAV3CVbARQmf MJ40XnjdTHpo/ziklmDxZWy8jMnth6241jIgEqzRwVg//6rbR99Z6W9tX/6poQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3QK8C9aWzMrs4SdWfw7iOTeLL1vLDCYUycM4RBTHyQ=; b=bKNdtCvSYIQkkBEq+1euC00HrW+MC6vZVNTBFXyHkkYEaBP542gGfx9/gsBFb0ZWz5Ooe+ 4gZhMb6ZN5Fhwxq4L864ZHZY4GkXEvwo/N0VR0ixZ7Scw7zf5wYSXX/8tei43zfDFmu+sM 9wZKAfdLBUQ0t0Xh7clpcKxeUMNP+t4o3s6uBPj4e/2oAwudBRR/N5TOnst1abxwGFRkFl TAJ3yhCs11Xtggn21ulCQMwqACPsT6wIZUbl++jVURT0pVvqsoyyVQM5cCc30/hYh63At3 JDBQWEVa4VowzzKP6quFji2mMQzN75mdzHWgA608FSpJ/qkh19YGPBURqE8C3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyYvf0S0Kz5sy; Sun, 24 Dec 2023 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NPEu087826; Sun, 24 Dec 2023 08:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NPbM087823; Sun, 24 Dec 2023 08:23:25 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:25 GMT Message-Id: <202312240823.3BO8NPbM087823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 9bf957fc9b37 - main - Bump __FreeBSD_version after LinuxKPI changes. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bf957fc9b378e0f9e65eb97e84c2166b450fccc Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=9bf957fc9b378e0f9e65eb97e84c2166b450fccc commit 9bf957fc9b378e0f9e65eb97e84c2166b450fccc Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:20:01 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:20:01 +0000 Bump __FreeBSD_version after LinuxKPI changes. Sponsored by: Serenity Cyber Security, LLC --- 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 20f0af949110..de6b56dd748a 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 1500007 +#define __FreeBSD_version 1500008 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Dec 24 13:20:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyhTt2fqFz54cCw; Sun, 24 Dec 2023 13:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyhTt295hz3cFR; Sun, 24 Dec 2023 13:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fIYfL2C4nnjYh2teOgFmrqjOOWRnViaBZbZa8G6L4dw=; b=rUeovFKRHc/xHV2xxaCojCHjf8WkYn6GBsvPrCHAIPMQ8fwJq2vvikz5NsViaouGnjdi4/ 7ocK+R3P3TgfWEZ0NjP5Jx49ZvJtFxF8FsQLuBtoI3lwwobrKqiCQZV5mrRdE+birqg57E Y15e5mIno3qcbxjb2JxI45Y3mq6K0/TC7RR/v58zp5MEaYLGFELTem2c9+U0VEEs4PgNwr IEsTlo9eWJ5ewEXikZowfhXcw+TyAwhCOGN4NCb6B6/tg7dbEBisKn2ff1W0RdzmCvq8+5 hdyvA1k4+fKc5ZN8oHPrsJA9RRpBwVMtYq53WRT2rCqTJc/AzMFwanmwQrI2/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703424002; a=rsa-sha256; cv=none; b=wHQhvyEMtQ7CKbxhHZcwnalnnAXqOd8BKBbFZ6wNMh1hdB1RD9EdB7c3nlscreHrcjUcOO HbhQetx1ATmI0gxLl7smBZK4Nu6QviCuRk3xDk1YyDln+MaxlUyEvp5ArCHZC8VxqN7WaV F2JSh27Y+LPo/Nsve2K1URmyq72DXhQtwSiuvVx5gj6TSCU0VAQAIKhYAemApND+7AR87W rnBunXTRYDKwGXr09qjYEy0YZsei5udKG79Ak3XDuNlacjIaFoJNTmSaRjOzrM9DI5USFd bQIJWfU4L3ErC/BJ2gsUGMruWgAI7syrVIJWKavpaBhSv4Tike/e4b0sU+K8Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fIYfL2C4nnjYh2teOgFmrqjOOWRnViaBZbZa8G6L4dw=; b=k8DmrhKsC4NmmVlPzJawhuGNozsyTdJpNiZIdinBeZhe51cOHlRCj4GFIyAU9sTygNjiv0 ZuIEKEdA9OWFcVN8JQ8eQRG2CLOgaFHEdqs55fpVXA6+oVX56vGiNg7u2cKuJYnnFHEWPh uPNAfilpjdQl4EOM+UoIKYhEMHM+HCecP0BTJgU7BHZRE4F11RNFlt/1k9o0LLKRtQd4h0 iCJ7Cu/iJPPkWXWpbvu88g8mMjBLTHrD+JeJcUE24K5e9ySOMnZULOgm9jBGQpWfJvntVc 3O5wvxqzjDdZd3OH4R+lnEl7ZC1ZreDkeS1fo/peKOE01MLd34v/XTjq8RRj8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyhTt0ycTzVC0; Sun, 24 Dec 2023 13:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BODK2CO076073; Sun, 24 Dec 2023 13:20:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BODK2DA076069; Sun, 24 Dec 2023 13:20:02 GMT (envelope-from git) Date: Sun, 24 Dec 2023 13:20:02 GMT Message-Id: <202312241320.3BODK2DA076069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: b4efc6277634 - main - LinuxKPI: Do not use explicit context in FPU sections on powerpc64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4efc62776344a9aaada5a0866e453e528a0e977 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b4efc62776344a9aaada5a0866e453e528a0e977 commit b4efc62776344a9aaada5a0866e453e528a0e977 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 12:48:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 12:48:06 +0000 LinuxKPI: Do not use explicit context in FPU sections on powerpc64 It is not supported yet. Sponsored by: Serenity Cyber Security, LLC Fixes: 5a3bd281672b ("LinuxKPI: Add explicit software context to FPU sections") MFC after: 1 week --- sys/compat/linuxkpi/common/include/linux/compat.h | 5 ----- sys/compat/linuxkpi/common/src/linux_current.c | 9 ++++++--- sys/compat/linuxkpi/common/src/linux_fpu.c | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/compat.h b/sys/compat/linuxkpi/common/include/linux/compat.h index 7922e884beb1..d357abce732b 100644 --- a/sys/compat/linuxkpi/common/include/linux/compat.h +++ b/sys/compat/linuxkpi/common/include/linux/compat.h @@ -33,11 +33,6 @@ #include #include -#if defined(__aarch64__) || defined(__arm__) || defined(__amd64__) || \ - defined(__i386__) || defined(__powerpc64__) -#define LKPI_HAVE_FPU_CTX -#endif - struct domainset; struct thread; struct task_struct; diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c index 668185094cbe..04ad4e30aa54 100644 --- a/sys/compat/linuxkpi/common/src/linux_current.c +++ b/sys/compat/linuxkpi/common/src/linux_current.c @@ -43,7 +43,8 @@ #include #include -#ifdef LKPI_HAVE_FPU_CTX +#if defined(__aarch64__) || defined(__arm__) || defined(__amd64__) || \ + defined(__i386__) #include #endif @@ -160,7 +161,8 @@ linux_alloc_current(struct thread *td, int flags) int linux_set_fpu_ctx(struct task_struct *task) { -#ifdef LKPI_HAVE_FPU_CTX +#if defined(__aarch64__) || defined(__arm__) || defined(__amd64__) || \ + defined(__i386__) if (task->fpu_ctx == NULL && curthread->td_critnest == 0) task->fpu_ctx = fpu_kern_alloc_ctx(FPU_KERN_NOWAIT); #endif @@ -190,7 +192,8 @@ void linux_free_current(struct task_struct *ts) { mmput(ts->mm); -#ifdef LKPI_HAVE_FPU_CTX +#if defined(__aarch64__) || defined(__arm__) || defined(__amd64__) || \ + defined(__i386__) if (ts->fpu_ctx != NULL) fpu_kern_free_ctx(ts->fpu_ctx); #endif diff --git a/sys/compat/linuxkpi/common/src/linux_fpu.c b/sys/compat/linuxkpi/common/src/linux_fpu.c index d510bc208b88..ef7f252cdd9e 100644 --- a/sys/compat/linuxkpi/common/src/linux_fpu.c +++ b/sys/compat/linuxkpi/common/src/linux_fpu.c @@ -35,7 +35,8 @@ #include -#ifdef LKPI_HAVE_FPU_CTX +#if defined(__aarch64__) || defined(__arm__) || defined(__amd64__) || \ + defined(__i386__) || defined(__powerpc64__) #include From nobody Sun Dec 24 13:20:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyhTv30ssz54c9R; Sun, 24 Dec 2023 13:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyhTv2Sd8z3cMl; Sun, 24 Dec 2023 13:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/B9deU0ke51aAbrBkDgyXRFPje43UTwrdYrcJ+5JyFQ=; b=NAR6JmJebMn/LxqqsEur12zLkx0XW2UE7Wu+JB+txNGhgGuCF+krtQFo6D0m20jpl2b7oW YypnhDqe6SdoUmPnYqBFthxaU8MDKYrWnLfVHHh1DOdN4WZUk3LmaAMPVHA4I+gfhA3aKh qdrO3KSz/Rid0aZ6VmSb7lT3p3+8H8GSEH1xqeBN3SUhHXOp62A1nSW3By/GwULK76SUZ2 5kzM8YLdrOdCY2DInVMvPzfT/5brIW1F//44BvUcwAjYpXd9JpuWli3OLxvDeUagc5M8rc b6y3mn4jayS9tFm7tJLw+8BXVLta/DqhXAx0eX5fHNfKEf017MZtTe04A46Kbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703424003; a=rsa-sha256; cv=none; b=TdkCoWkopL4puHru1Lz827+50O666fUZbqEmmKO8OXFEBEIwVu2GsO+aPx3UcAxilx5Oid p3+wdCVCYvvjG3se3XAJbM0RMWL7JFNVWjZlIIHOQkMB+S1RP2gQb2wejQERTMTX1poAT9 P+t/7mRWTBteyxGMq0YAw5Vs/I4h5rdMhE81dStkNGWj9wOx7Wgevpa7UA7CAUw6uMflk2 Fiw84YkVgJjpGxKmlgaWvV3HbkQmPchHWpB9aHe2vxHf+B1jNvsAkuEkAaGKEt1lujVOaz wQRMflUlSQJUZInOiZgqoqoS2xDIrRrdw9tHT6mdYbCdQz6hbZlbDzDGBsbO0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/B9deU0ke51aAbrBkDgyXRFPje43UTwrdYrcJ+5JyFQ=; b=b4swIrAVpo4XB1935c8tzmGE2EGKUlNZmIElwqlo3meue1VVVYMoVd2qSN1epEpWXg7Avu 0W9DbCrVBF/4rhJEO2bp6COCNCRDT78HizRNvaqDXvnFhLWKIjIT125O6ju5xoxaEIZ8ZH wbuItpWiCEqK6NSGtQv/ID5iN0keVZI1OZsEQCgtWYQ5izwFqbH2h0cdvFvsG/UgogtxPN bfjZ+K0LIzxGiH6xW01bW80rnPosVu0VWGMoePDK04cwFGdf96HeM9r/M6Q5r9ErpOuPRr RdA/O/E26qvuPeXBMy5PrK0sfDn65ZNNVyWezRVnGCYvbjK/tCkPpvJT9oWHug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyhTv1YGDzV0h; Sun, 24 Dec 2023 13:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BODK3c0076366; Sun, 24 Dec 2023 13:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BODK37O076361; Sun, 24 Dec 2023 13:20:03 GMT (envelope-from git) Date: Sun, 24 Dec 2023 13:20:03 GMT Message-Id: <202312241320.3BODK37O076361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 73ccd188c43a - main - LinuxKPI: Define ioread64() in linux/io.h only on 64 bit archs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73ccd188c43a6cd52a12ac33411896220b2d2e54 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=73ccd188c43a6cd52a12ac33411896220b2d2e54 commit 73ccd188c43a6cd52a12ac33411896220b2d2e54 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 12:48:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 12:48:06 +0000 LinuxKPI: Define ioread64() in linux/io.h only on 64 bit archs. 32 bit archs includes nonatomic version from linux/io-64-nonatomic-*.h Sponsored by: Serenity Cyber Security, LLC Fixes: dcfc983373c3 ("LinuxKPI: Implement ioread64()") MFC after: 1 week --- sys/compat/linuxkpi/common/include/linux/io.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index d70cda77400e..bce70ed0cb8d 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -350,6 +350,7 @@ ioread32be(const volatile void *addr) } #define ioread32be(addr) ioread32be(addr) +#ifdef __LP64__ #undef ioread64 static inline uint64_t ioread64(const volatile void *addr) @@ -357,6 +358,7 @@ ioread64(const volatile void *addr) return (readq(addr)); } #define ioread64(addr) ioread64(addr) +#endif #undef iowrite8 static inline void From nobody Sun Dec 24 13:20:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyhTw57Cbz54c0w; Sun, 24 Dec 2023 13:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyhTw3K49z3c41; Sun, 24 Dec 2023 13:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFbKIPvQNesHDb43F4/YkERGZhzT7EctRUGFujPUkiw=; b=BcXWeLskbiO3O3RJGhn9DjW6ONwaU00a565ph6T9pQDVnCt/krsRN1CDoCKVilhuVaZ6BF mXZnpYtXF3o3b/WhKxSbetYsUiJZJ9lrPxuQq1YZ1ZFIvVbqzSfaDsL1YvhzpjLtx9QCmP 3mEIfLMTC/KP2Bn8JIQyFbKUu+4ED2Ml9laalFlcj9UEBFVRbqOjLXlRnuiT+GiKce/5S9 zRli2YJ4M1TBbKxgDROCUSLPWnwYEpoxXGbqt5Pzh+PoGt0ZNIgyYGeF2gs6MCMWhgWsRt VD4ljDiWd8g5AUFT30XX32W7Vl+IlXZfvNYbPe+t2tfJ8wM0pXe6GBxGAKOTQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703424004; a=rsa-sha256; cv=none; b=grqxiO/TIPDPBC94AsKquDv86DiDYVPdZ3hVPOKPvyaz5Yz0RXCgBQx5sL5CrM69C+PVzm EHvvVUqdORBYso/0fWNbF+5j+xjtgdrQQ71LL+mRfbl1IL0Q2k3ykk2qtbMdTfJpG3Oktj ewqrHg7k34iq1ZzN14LvwgJ8s1RiRUXgU0yewO2wbsYmYV58RrSW4/xbrHwSbI69JlsGGB OBMoN8Qkz5Jh4fYEq965YPQgTdGGfQX2mXfHgkTuxfrIOrCC7RgHVABsaaPme7vVXSkaT4 X6rhyEmPshHYjxLLl0+QgkwMvuYi3ej07NPPpb3b7RyF1nGAmiUWKBdSVihuqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFbKIPvQNesHDb43F4/YkERGZhzT7EctRUGFujPUkiw=; b=rPLld+v17ZrcxMVZoaHrG9IJ7natl35234Q1PhlUe3j++Abesa7v6wSt+70/OlnRCf0WBa ydO6Ke8PITVwbLU8Jn9rPPZs/R5Ked+a5ByrpKl8FcayF5AC6A+j/0/gQBd28X4RJLT33S TwxpTmGvVRlIZBkHfhoDuPlcbA7els0jmELgU3WMIu2FpQ3kqtW1BsVBRexJbAbstFIOIy dXN00HrnoNaJua8edDJMn8yfMVVadcqQBZPLlPd3n5KuNO8IXXbxNEyi2lqTaUs6vvZQ10 mcveBLF7HkJsHlY36qTUeL7tSZwzLmBiOdaj6pGXUaK16+pvQ6HBBoZXv1XQAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyhTw268WzVCG; Sun, 24 Dec 2023 13:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BODK4a5076649; Sun, 24 Dec 2023 13:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BODK4aa076644; Sun, 24 Dec 2023 13:20:04 GMT (envelope-from git) Date: Sun, 24 Dec 2023 13:20:04 GMT Message-Id: <202312241320.3BODK4aa076644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: dbca44241419 - main - LinuxKPI: Constify src parameter of bitmap_copy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbca442414191a43f334435b7910b63cb2777d53 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=dbca442414191a43f334435b7910b63cb2777d53 commit dbca442414191a43f334435b7910b63cb2777d53 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 12:48:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 12:48:06 +0000 LinuxKPI: Constify src parameter of bitmap_copy in bitmap_from_arr32() to fix build on 32 bit archs. Sponsored by: Serenity Cyber Security, LLC Fixes: 5ae2e6f913fa ("LinuxKPI: Add bitmap_intersects(), bitmap_from_arr32()") MFC after: 1 week --- sys/compat/linuxkpi/common/include/linux/bitmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitmap.h b/sys/compat/linuxkpi/common/include/linux/bitmap.h index 84e0ba9c88ca..f26a0f99dc03 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitmap.h +++ b/sys/compat/linuxkpi/common/include/linux/bitmap.h @@ -344,7 +344,7 @@ bitmap_from_arr32(unsigned long *dst, const uint32_t *src, dst[i++/2] |= ((unsigned long) *(src++)) << 32; } #else - bitmap_copy(dst, (unsigned long *)src, size); + bitmap_copy(dst, (const unsigned long *)src, size); #endif if ((size % BITS_PER_LONG) != 0) dst[end] &= BITMAP_LAST_WORD_MASK(tail); From nobody Sun Dec 24 18:11:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sypyj2c81z550Bs; Sun, 24 Dec 2023 18:11:57 +0000 (UTC) (envelope-from jrm@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sypyj29Zdz4l4B; Sun, 24 Dec 2023 18:11:57 +0000 (UTC) (envelope-from jrm@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703441517; 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=6fHxm2bXAT5hglfCmEWayTEU8y8UAXWOL4n6uPv4XxY=; b=aAJqhuhWcJ/rq0aBZPMD/ba7ofxt+kXXqundDWgZEQXSAXCPB5QxXsv9o7IpR+s+j8wc7v P2HKmE3KZZOaqvjouMxH60+kmoI7i6/UOe9CoUf/1FioqRVp2AI7xrlhZLTXZ5R5F3xvt1 /sDvF6Y+WC/J9uWsb9Qyh0LL/dP3ThgAPhbFPiSWc0vYoADQ3otd6IASh+HqqaIvwTQ4XH HJiIOQBdLZrvTth7YcjFxTEyoozyMoQVSXZGrMmbTVDaa/ROcNvDOVPzfIeGqcSS9EkD94 m+JGIFTf8jUKPLN+ULIv1wUc91SUatACxOLnRHQ9zitsU0dT4kQw9DHaXenBEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703441517; a=rsa-sha256; cv=none; b=enyjO4SUOvrgNYH3BzS3JDXd1TxTbqUMFKBoj8UOmw4nSFXv/Jpj7YAvh5YhyZTMIXkde5 6tst+PWs5pd0CZwIWIEOJXCvgHRmVLZsTZvHKEH11O+VPIaNRIvHY6XZRYlmY1oZsAzWw8 DKr0sxFDqU9QIeOwRFijG1jgrBqmY/raH7jXH0bQCHpjIGTf+4m6jmdZDcBymHUnJ/KiHg Uw37yTFaXFQNnnNo6lVqb4CxrYQ+mCJeoHhafyeG0x5m9pS1nU1/pmu/bDhyvKKF+7MsOZ f8hDlWJCugeAIrH+Qev9s6ZqolRR2FuTNobg4iVFBt1AwPKsdQCJWM+o8tYJiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703441517; 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=6fHxm2bXAT5hglfCmEWayTEU8y8UAXWOL4n6uPv4XxY=; b=XQHefoz8lktFoTJZVqSUvFKoMvc0yKE+7+5XMU5JiKEG6wAYswFCUPW2+z+6FDKhnLyyYi UFgpphrIK89Thl4AQ6n5h0dTDU0U9hSIxntdtp/Bo1RWTVTZSDHMbAHINHjWM3V6RCg8Cz RqaH4eowTtQosZulu+gzqwNHzt6/MT8k0fI2nMBN9xYRFT7heeQketmHywvl1zB6rjAeN+ dP1azn7nDY0iLwZCAytp93e/Rt8wCVjpouZ0KWzsJo+YFr+LAyM5iR8Ax1bSMVCEeqC3it xcALH3Fy9zvYir2JDfI7ZtGihzQpSGWQ3d9ZJviGXNkq00vmT+IXxnAL4JDBXA== Received: from phe.ftfl.ca.ftfl.ca (drmons0544w-156-57-164-95.dhcp-dynamic.fibreop.ns.bellaliant.net [156.57.164.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: jrm/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sypyh6Lbvz9G6; Sun, 24 Dec 2023 18:11:56 +0000 (UTC) (envelope-from jrm@freebsd.org) From: Joseph Mingrone To: Kristof Provost Cc: Brooks Davis , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8ccd0b876e67 - main - libc: expose execvpe for Linux compat In-Reply-To: (Kristof Provost's message of "Sat, 23 Dec 2023 20:30:55 +0100") References: <202312111927.3BBJRWon091352@gitrepo.freebsd.org> Date: Sun, 24 Dec 2023 14:11:55 -0400 Message-ID: <864jg7bhck.fsf@phe.ftfl.ca> User-Agent: Gnus/5.13 (Gnus v5.13) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Sat, 2023-12-23 at 20:30, Kristof Provost wrote: > Hi Brooks, Joseph, > On 11 Dec 2023, at 20:27, Brooks Davis wrote: >> The branch main has been updated by brooks: >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D8ccd0b876e67fda6249f294ff= 484798cc1e1569f >> commit 8ccd0b876e67fda6249f294ff484798cc1e1569f >> Author: Brooks Davis >> AuthorDate: 2023-12-11 19:24:53 +0000 >> Commit: Brooks Davis >> CommitDate: 2023-12-11 19:24:53 +0000 >> libc: expose execvpe for Linux compat >> We already implemented execvpe internally with an _ prefix in libc so >> go ahead and expose it for compatibility with Linux. >> This reverts c605eea952146348e5e1ad5cab6c127d7a1bd164. >> Bump __FreeBSD_version for the addition and add definitions to supre= ss >> compat shims in libzfs (zfs changes were merged from upstream). >> PR: 275370 (request and exp-run (thanks antoine!)) >> Reviewed by: kevans >> Differential Revision: https://reviews.freebsd.org/D42846 > I don=E2=80=99t understand why, but this breaks devel/bear (=E2=80=9CTool= that generates a compilation database for clang tooling=E2=80=9D). > Rather than generate a list of commands it seems to recursively spawn end= less =E2=80=9Cwrapper=E2=80=9D processes: > ``` > 82661 0 I+ 0:00.18 | | `-- bear -- ls > 82662 0 I+ 0:06.90 | | `-- /usr/local/bin/bear intercept --= library /usr/local/lib/bear/libexec.so --wrapper /usr/local/lib/bear/wrappe= r --wrapper-dir /usr/local/lib/bear/wr > 82663 0 I+ 0:00.13 | | `-- /usr/local/lib/bear/wrapper --= destination dns:///localhost:30309 --execute /bin/ls -- ls > 82664 0 I+ 0:00.09 | | `-- /usr/local/lib/bear/wrapper = --destination dns:///localhost:30309 --execute /bin/ls -- ls > 82665 0 I+ 0:00.06 | | `-- /usr/local/lib/bear/wrappe= r --destination dns:///localhost:30309 --execute /bin/ls -- ls > 82666 0 I+ 0:00.06 | | `-- /usr/local/lib/bear/wrap= per --destination dns:///localhost:30309 --execute /bin/ls -- ls > ``` > It=E2=80=99s trivially reproducible at least. Without this patch `bear --= ls` returns immediately and generates a compile_commands.json file (empty,= but that=E2=80=99s fine here). With it it=E2=80=99ll spin endlessly. > Best regards, > Kristof Hi Kristof, Brooks, I'm updating my CURRENT system to after that commit. I'll try to understan= d the problem after the holidays. If I don't come up with anything helpful= , I'll report the issue upstream. Joe --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKkBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAmWIdGtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvnl1YD/9nvpz4BkgwTiS3YhW8l5iJTGMn/JaCNQuy fhiLR6FwaORccnatP9A63SsFYAopkrqGI0M3War6cEEANFVGPb3ocFuHmL4U0e0g yixr2BjL7mhqq6DuTanbmkj2gWO0njoYUKyfVVf2bj2qxsmkuGsB2hoGhmpUDDLu s/7iP2LdRcBVIdrGVv7swBOikkERjyEc0F06hztdJBOcu0bdjHKswFmnOFKr3tUg IEcJlp66E0/7DiEVD7gf+Rxr4UXoCFSybqiCLIGnHrtQrC/GdwAqpeX4gNLkSqXE eMa+S/unpGGoQYHcVwzLcaRxUkq7oljlEdqzW/6GYmP3dYeqoxOPvFJZ0EZV6WSf rf7N7UVrFrY7fpUMsC8dY0Fag/rOwOnHNCASEVB1LiXc2Bj6t2ldJZtwrXP1hwJI pKij+2/LTeSoPMu3xauCG1hrFzRfhw2Lzmjrt1BWubclveIwTfkeaplSvIKgsS2/ mG8ajZ0Ztyc6J1WMhQ0E7T64qucFKlSsvEcPiFcHA1cMt1pswUsYKseL2EeWtrC4 APQ/BTkyCrKhpkAykNFTUo3duiQ2u/kb3dkftwAvbI64fZtmqt5gv25UW7SKTBZV Ven2ecWLjLqpamUdUE2XKwxfjWYDGYomJVhSdQ9D76NbyNypeqAIJY0XrDV+POwL 9vxynLXPxQ== =wt7L -----END PGP SIGNATURE----- --=-=-=-- From nobody Sun Dec 24 23:39:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyyF51hYGz54nrV; Sun, 24 Dec 2023 23:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyyF46vvfz3fls; Sun, 24 Dec 2023 23:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703461193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15o+z0nsClNVPpmicILYB9KXLuIdzMzf9UKS3zcuLRg=; b=lFUO+7tXE7TNtOLfITmBO3UBYZRqZU/CW7/R9YaIpAi+r3YwQoe8TANER62AIdesLUWR31 yq1/bgc96R//uKaPOMCrfI2E3WibMsiprsZWUXo6TeS10kC03bS8agvr53nrvUFl5F2Duo lbAkDuameooaIuwZAsj3ehyYE5+w5vz7o1ME1xh9sRtOz0599uLtiFoC/eXd/dUb0oWrZ7 nX62w9ql4Q9ynw0gW/pahD6YGboiQyQg3e7QAW5vSso3v3WGMBgqSTUD3Zg+4cWNRDR2ud HvVdK9R1h8T3t1I0dy/vuxd9BXmENxaDsJBEGDext2NKoI1XiHONKryIX3JAcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703461193; a=rsa-sha256; cv=none; b=QcwOx1Jio+iHISM6o6ZojCifl8vPP0rQ1WwfIbCz8BipM7aog1mCpUyjeMZ1d0gRnVs4uu gMkq91HpRCu7Mq8WlpK4Ld6Vh713tuf+TwTpMUsWxe4UTbbiX76NCxLPOCPN+qpGNP2oIx 08joM8ZHdlUyW5fzCOSeA8tGh7fdt9W0bh7RVj14I60U9ixL4OtHQqiXOG9jYkyJ0l8Aou seHIP9XiAlvxtu87Tdrb2P9FUrnrCJrvKyYnEBnwj3wVzuMwiVN4jO//ZlNPhItkCPsZ1i lEL45Tc3pM1gw9PCBss2FOxlcG4m44ZN8AXrHDdW745IjfMyuU/TOq8V07Szyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703461193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15o+z0nsClNVPpmicILYB9KXLuIdzMzf9UKS3zcuLRg=; b=qe/JTqK97T6Z3HIQvCv01+9JlGoP59FV9MDt9lXrJYeVRvzjDmRjlCNT0w0n1a1+DQvUxO rMWUcaylu3ruuUaIXtKe0VIA8EJxFnDSu3vPS5wPeGAnIzxKNfIdOKecrhKCrdMxqMkCba qN0AQkMOAF++qAhhb1t3ZEexTxbQQbrPyf1ZTygpy3zAlM12OBplKf3TcH7BUcs4XIuip5 EkDXT8XXoz+8WB6HS5nwL/q/Y+GFSl23M1ZzKNJGrAOO0BbgqLiKCzqcoRQIyHTlUbh7oa FON1X+RfRpJNdbZlnOFxA+gSc2K7q4N2Y4t1QzZlMTd0vTOSQoHD+Bt0kK23JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyyF45pfMznXC; Sun, 24 Dec 2023 23:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BONdq1q012529; Sun, 24 Dec 2023 23:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BONdqCV012526; Sun, 24 Dec 2023 23:39:52 GMT (envelope-from git) Date: Sun, 24 Dec 2023 23:39:52 GMT Message-Id: <202312242339.3BONdqCV012526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 13037eaabede - main - ig4: Actively use FIFO thresholds List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13037eaabede7fb7fbc25f4e84b549c73f9acb3c Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=13037eaabede7fb7fbc25f4e84b549c73f9acb3c commit 13037eaabede7fb7fbc25f4e84b549c73f9acb3c Author: Alexander Motin AuthorDate: 2023-12-24 23:18:11 +0000 Commit: Alexander Motin CommitDate: 2023-12-24 23:18:11 +0000 ig4: Actively use FIFO thresholds Before every wait for FIFO interrupt set how much data/space do we want to see there. Previous code was not using it for receive, as result aggregating interrupts only within processing latency. The new code needs only one interrupt per transfer per FIFO length. On my Dell XPS 13 9310 with iichid(4) touchscreen and touchpad this reduces the interrupt rate per device down to 2 per sample or 16-20 per second when idle and 120-160 per second when actively touched. MFC after: 1 month --- sys/dev/ichiic/ig4_iic.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index 4ab36ef660ed..98c160ec9fd2 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -350,6 +350,7 @@ set_slave_addr(ig4iic_softc_t *sc, uint8_t slave) /* * Wait for TXFIFO to drain before disabling the controller. */ + reg_write(sc, IG4_REG_TX_TL, 0); wait_intr(sc, IG4_INTR_TX_EMPTY); set_controller(sc, 0); @@ -437,16 +438,20 @@ ig4iic_read(ig4iic_softc_t *sc, uint8_t *buf, uint16_t len, return (0); while (received < len) { + /* Ensure we have some free space in TXFIFO */ burst = sc->cfg.txfifo_depth - (reg_read(sc, IG4_REG_TXFLR) & IG4_FIFOLVL_MASK); if (burst <= 0) { + reg_write(sc, IG4_REG_TX_TL, IG4_FIFO_LOWAT); error = wait_intr(sc, IG4_INTR_TX_EMPTY); if (error) break; - burst = sc->cfg.txfifo_depth; + burst = sc->cfg.txfifo_depth - + (reg_read(sc, IG4_REG_TXFLR) & IG4_FIFOLVL_MASK); } /* Ensure we have enough free space in RXFIFO */ - burst = MIN(burst, sc->cfg.rxfifo_depth - lowat); + burst = MIN(burst, sc->cfg.rxfifo_depth - + (requested - received)); target = MIN(requested + burst, (int)len); while (requested < target) { cmd = IG4_DATA_COMMAND_RD; @@ -463,13 +468,15 @@ ig4iic_read(ig4iic_softc_t *sc, uint8_t *buf, uint16_t len, lowat = IG4_FIFO_LOWAT; /* After TXFLR fills up, clear it by reading available data */ while (received < requested - lowat) { - burst = MIN((int)len - received, + burst = MIN(requested - received, reg_read(sc, IG4_REG_RXFLR) & IG4_FIFOLVL_MASK); if (burst > 0) { while (burst--) buf[received++] = 0xFF & reg_read(sc, IG4_REG_DATA_CMD); } else { + reg_write(sc, IG4_REG_RX_TL, + requested - received - lowat - 1); error = wait_intr(sc, IG4_INTR_RX_FULL); if (error) goto out; @@ -487,8 +494,7 @@ ig4iic_write(ig4iic_softc_t *sc, uint8_t *buf, uint16_t len, uint32_t cmd; int sent = 0; int burst, target; - int error; - bool lowat_set = false; + int error, lowat; if (len == 0) return (0); @@ -497,12 +503,7 @@ ig4iic_write(ig4iic_softc_t *sc, uint8_t *buf, uint16_t len, burst = sc->cfg.txfifo_depth - (reg_read(sc, IG4_REG_TXFLR) & IG4_FIFOLVL_MASK); target = MIN(sent + burst, (int)len); - /* Leave some data queued to maintain the hardware pipeline */ - if (!lowat_set && target != len) { - lowat_set = true; - reg_write(sc, IG4_REG_TX_TL, IG4_FIFO_LOWAT); - } - while(sent < target) { + while (sent < target) { cmd = buf[sent]; if (repeated_start && sent == 0) cmd |= IG4_DATA_RESTART; @@ -512,13 +513,16 @@ ig4iic_write(ig4iic_softc_t *sc, uint8_t *buf, uint16_t len, sent++; } if (sent < len) { + if (len - sent <= sc->cfg.txfifo_depth) + lowat = sc->cfg.txfifo_depth - (len - sent); + else + lowat = IG4_FIFO_LOWAT; + reg_write(sc, IG4_REG_TX_TL, lowat); error = wait_intr(sc, IG4_INTR_TX_EMPTY); if (error) break; } } - if (lowat_set) - reg_write(sc, IG4_REG_TX_TL, 0); return (error); } @@ -974,13 +978,6 @@ ig4iic_set_config(ig4iic_softc_t *sc, bool reset) (sc->cfg.bus_speed & IG4_CTL_SPEED_MASK) == IG4_CTL_SPEED_STD ? sc->cfg.ss_sda_hold : sc->cfg.fs_sda_hold); - /* - * Use a threshold of 1 so we get interrupted on each character, - * allowing us to use mtx_sleep() in our poll code. Not perfect - * but this is better than using DELAY() for receiving data. - * - * See ig4_var.h for details on interrupt handler synchronization. - */ reg_write(sc, IG4_REG_RX_TL, 0); reg_write(sc, IG4_REG_TX_TL, 0); From nobody Mon Dec 25 14:25:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKv30V8nz54nBF; Mon, 25 Dec 2023 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv264Rmz3MHb; Mon, 25 Dec 2023 14:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdvboRsmanj71SzbgKxLFG1gh79Z97ZScHlvjext4zE=; b=NBafoBf0eI14PS3Xbfbk2GPmFvV8z1EhcaC4K8uwNcLpu0KtS3Kv0pvhE7NynB9ekD3bR/ 9dBSn2ZsJ5tkNaCr7eEz9T70fhczF9zlhk6mtvHa5GwHc71WK2Ym+HJ2FWNB6vmD8Gqhym 2bUI8KmXpKzueo8WunuPmT7umWSNFrnyfgenYMHloEJ/17qDX2kHK43RcrdawYUmedku5W jyB0KaiNnKQQA8wyYOnxaa0Fht1wArRxjS29+CyXwuiixC/JTRBuN6LbA06vjvOjlBY/Vf 3Jz1yaGw7q5WbsVIYHFNXkv89PwsAclJUuwnhaiA8FWBVmeJt8zlWS80y43dcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514334; a=rsa-sha256; cv=none; b=OX3m9U8pLmIWXC5as7Php05pIF3cKUHk/h0lcXXoNUfJk12mO5yCF7JKoPiWF3Fv06vZw1 p3uu1jvKWBZ+tJmLLF6J0PMwwV+av2aT7xj5xX4ztFnp1NOMqV/Rga1dqTWd3q9262AmOi f3sR9+E00IIBkfFdSaRf+75A2zPWmOZcEvO7xvTTZDEMXJ32Yce/pHau6Ob00ol234PSd3 R9KqbyhL+VEGOBPjg/z1iRZLXANMQ4d2Fl2U9sOInx2PMU+xdLXH2nK0mMww5I/Oy0ldjJ 5+JKsCmlCCSn3ZdgrN14uUPz5NN3un3IJH6PNHDhPOaA9HUpXK4p2FqwMQFhGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdvboRsmanj71SzbgKxLFG1gh79Z97ZScHlvjext4zE=; b=Lf9YE2nrIk9EXBcK/vM5dnmWMS/s9LGRhYW9vJc5Yw8xnei7yw7A95UEFNAGLJueiJ4o73 usAq2x3O7JC6IBVzLlpII5WaYLE/6/lP2vAKvhfaJf3+B0bWT9xm3lRdySXAaBW49daLjP MRUSorzezd/9XXlnPuyXkPcGnYwNzwMKCztwWCSmQCh0IVK+i9ZJasGGx5cIf/ahTPsRaB j6kgt8Pr/gD4C4WsTpgsrUlqYEY7AYdXHQ+wagvYrv3rHNZEQm100aMjY//Zgb+QHJPg6f MN7jO1nfEWzHefw/oIpoLyfeAD1CaL5FHvR9nnJvamq/NENJGVhR1uoT1/jxWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv256hYzmK; Mon, 25 Dec 2023 14:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPYNV022702; Mon, 25 Dec 2023 14:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPYLj022699; Mon, 25 Dec 2023 14:25:34 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:34 GMT Message-Id: <202312251425.3BPEPYLj022699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: bca25680b91b - main - lib/libc/amd64/string/strcmp.S: add baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bca25680b91b3bea7faef615765806a04634eb23 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=bca25680b91b3bea7faef615765806a04634eb23 commit bca25680b91b3bea7faef615765806a04634eb23 Author: Robert Clausecker AuthorDate: 2023-09-16 05:29:39 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:54:33 +0000 lib/libc/amd64/string/strcmp.S: add baseline implementation This is the most complicated one so far. The basic idea is to process the bulk of the string in aligned blocks of 16 bytes such that one string runs ahead and the other runs behind. The string that runs ahead is checked for NUL bytes, the one that runs behind is compared with the corresponding chunk of the string that runs ahead. This trades an extra load per iteration for the very complicated block-reassembly needed in the other implementations (bionic, glibc). On the flip side, we need two code paths depending on the relative alignment of the two buffers. The initial part of the string is compared directly if it is known not to cross a page boundary. Otherwise, a complex slow path to avoid crossing into unmapped memory commences. Performance-wise we beat bionic for misaligned strings (i.e. the strings do not share an alignment offset) and reach comparable performance for aligned strings. glibc is a bit better as it has a special kernel for AVX-512, where this stuff is a bit easier to do. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41971 --- lib/libc/amd64/string/strcmp.S | 299 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 292 insertions(+), 7 deletions(-) diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S index 437db7eca43a..eb354bd2af82 100644 --- a/lib/libc/amd64/string/strcmp.S +++ b/lib/libc/amd64/string/strcmp.S @@ -1,14 +1,33 @@ -/* - * Written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcmp.S + * written by J.T. Conklin that was originally + * dedicated to the public domain. */ #include +#include + #if 0 RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $") #endif -ENTRY(strcmp) +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(strcmp) + ARCHFUNC(strcmp, scalar) + ARCHFUNC(strcmp, baseline) +ENDARCHFUNCS(strcmp) + +ARCHENTRY(strcmp, scalar) /* * Align s1 to word boundary. * Consider unrolling loop? @@ -39,7 +58,7 @@ ENTRY(strcmp) movabsq $0x8080808080808080,%r9 subq $8,%rsi - .align 4 + ALIGN_TEXT .Lword_loop: movq 8(%rdi),%rax addq $8,%rdi @@ -53,7 +72,7 @@ ENTRY(strcmp) testq %r9,%rdx je .Lword_loop - .align 4 + ALIGN_TEXT .Lbyte_loop: movb (%rdi),%al incq %rdi @@ -69,6 +88,272 @@ ENTRY(strcmp) movzbq %dl,%rdx subq %rdx,%rax ret -END(strcmp) +ARCHEND(strcmp, scalar) + +ARCHENTRY(strcmp, baseline) + /* check if either string crosses a page in the head */ + lea 15(%rdi), %r8d # end of head + lea 15(%rsi), %r9d + mov %edi, %eax + mov %esi, %edx + xor %edi, %r8d # bits that changed between first and last byte + xor %esi, %r9d + and $~0xf, %rdi # align heads to 16 bytes + and $~0xf, %rsi + or %r8d, %r9d # in either RSI or RDI + and $0xf, %eax # offset from alignment + and $0xf, %edx + pxor %xmm1, %xmm1 + test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + /* heads may cross page boundary, avoid unmapped loads */ + movdqa (%rdi), %xmm0 # load aligned heads + movdqa (%rsi), %xmm2 + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %edx, %ecx + shl %cl, %r9d # string head in XMM2 + movdqa %xmm0, -40(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -24(%rsp) + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + test %r8d, %r10d # NUL byte present in first string? + lea -40(%rsp), %r8 + cmovz %rdi, %r8 + test %r9d, %r11d # NUL byte present in second string? + lea -24(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rdx, 1), %xmm4 + jmp 1f + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rdx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + xor $0xffff, %r9d # mismatch or NUL byte? + jnz .Lhead_mismatch + + /* load head and second chunk */ + movdqa 16(%rdi), %xmm2 # load second chunks + movdqa 16(%rsi), %xmm3 + sub %rdx, %rax # is a&0xf >= b&0xf? + jb .Lswapped # if not, proceed with swapped operands + + neg %rax + movdqu 16(%rsi, %rax, 1), %xmm0 + sub %rdi, %rsi # express RSI as distance from RDI + lea (%rsi, %rax, 1), %rdx # point RDX to offset in second string + neg %rax + pcmpeqb %xmm3, %xmm1 # ... corresponding to RDI + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $16, %rdi + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d + jnz .Lmismatch + add $16, %rdi # advance aligned pointers + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rdi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb 16(%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rdi + test %r8d, %r8d + jnz .Lnul_found2 + xor $0xffff, %r9d # any mismatches? + jz 0b + + sub $16, %rdi # roll back second increment + + /* a mismatch has been found between RDX and RSI */ +.Lmismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rdi, %rdx # turn RDX from offset to pointer + movzbl (%rdx, %r9, 1), %ecx + movzbl (%rdi, %r9, 1), %eax + sub %ecx, %eax # difference of the mismatching chars + ret + + /* mismatch in true heads */ +.Lhead_mismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rax, %rdi # return to true heads + add %rdx, %rsi + movzbl (%rdi, %r9, 1), %eax # mismatching characters + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + ret + +.Lnul_found2: + sub $16, %rdi # roll back second increment + + /* a NUL has been found in RSI */ +.Lnul_found: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8w # adjust NUL mask to positions in RDI/RDX + xor $0xffff, %r9d # mask of mismatches + or %r8d, %r9d # NUL bytes also count as mismatches + jnz .Lmismatch + + /* + * (RDI) == (RSI) and NUL is past the string. + * Compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rdi, %rax, 1), %xmm0 + pcmpeqb (%rdi, %rsi, 1), %xmm0 + add %rdi, %rsi # restore RSI pointer + add %rax, %rdi # point RDI to chunk corresponding to (RSI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + ret + + /* + * If (a&0xf) < (b&0xf), we do the same thing but with swapped + * operands. I found that this performs slightly better than + * using conditional moves to do the swap branchless. + */ +.Lswapped: + movdqu 16(%rdi, %rax, 1), %xmm0 + sub %rsi, %rdi # express RDI as distance from RSI + lea (%rdi, %rax, 1), %rdx # point RDX to offset in RDI corresponding to RSI + neg %rax # make difference positive + pcmpeqb %xmm2, %xmm1 + pcmpeqb %xmm3, %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $16, %rsi # advance aligned pointers + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d + jnz .Lmismatchs + add $16, %rsi + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rsi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 # end of string in RSI? + pcmpeqb 16(%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rsi + test %r8d, %r8d + jnz .Lnul_found2s + xor $0xffff, %r9d # any mismatches? + jz 0b + + sub $16, %rsi # roll back second increment + + /* a mismatch has been found between RDX and RDI */ +.Lmismatchs: + tzcnt %r9d, %r9d # where is the mismatch? + add %rsi, %rdx # turn RDX from offset to pointer + movzbl (%rdx, %r9, 1), %eax + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax # difference of the mismatching chars + ret + +.Lnul_found2s: + sub $16, %rsi # roll back second increment + + /* a NUL has been found in RSI */ +.Lnul_founds: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8w # adjust NUL mask to positions in RDI/RDX + xor $0xffff, %r9d # mask of mismatches + or %r8d, %r9d # NUL bytes also count as mismatches + jnz .Lmismatchs + + /* + * (RDI) == (RSI) and NUL is past the string. + * Compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rsi, %rax, 1), %xmm0 + pcmpeqb (%rsi, %rdi, 1), %xmm0 + add %rsi, %rdi # restore RDI pointer + add %rax, %rsi # point RSI to chunk corresponding to (RDI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + ret +ARCHEND(strcmp, baseline) .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:25:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKv40pM0z54mgN; Mon, 25 Dec 2023 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv371PWz3Ly8; Mon, 25 Dec 2023 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0+cKE0WhnAxKeUEpiX6XxgpluBX/+4lj20FJfJc/l4=; b=nSMM0UWiKdFBmtJ/f7BLqoSWf7B/GS3KDA7g8v8pT/l6B8U7xeToIzioWMVGZA4VDOoY0L Z1gdEe0wZYfow8d1gFsKbcH73iW589Fr0+T77+bQBo0EczH314cn6p8qdZrFkArVMhDkC4 NAh7b8lE6wNC6cBftIhchHkSjgMucx4oVQRKqFlntKFiOcMmdoWmbnMNpE5fUdZB/WtgNl MUWQaILIqJFw533O2qKWgWUVlgP/YoArWRoXvwWWIz+0PRyWWBig3jESW8RlavKyp1q5Bd Ml12Jfe/46GkI4CekM/hmEu6HPOAaknQcu5+Sr8h2+sgKCK/j5eJS3d/Y4RivQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514336; a=rsa-sha256; cv=none; b=P9xKodFdOT8QAmI/IrTVhok9swshQw3e64aIAVjcZ5t+EoXaeQ40K4xPS0EpILh+fOQZvF 1zMHCekGM4zxk3/L5G3pjn4vwmakPX+3Oj+r+sSZGFLkGkw9+uoo3Rfxpk+pCr3JP/R5ib fYKBiHkpuMInCjEWcx+52sMIIp/qiYoBehprevfEREgYjkZuvlNHv6JsgNVbBWjbK1R65N ZkuGs7vomogI9UHaP8Jtso4c4nW00X/v/YpcuZclv4lZ+wenQ2jWI3mlX8vxlNhqwKhd6a XNl39KAP1CLC1NtHkVJHpb3SS5Q43+0whmKO6n7lNPZJo5sFtFez1YbwnXTxXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0+cKE0WhnAxKeUEpiX6XxgpluBX/+4lj20FJfJc/l4=; b=qFrgM/6kLFvLU0jhCw3dtydR8K/OtdIXzrmY3NDiywHNHYgXQJ0IFTbpigWel4M8gY0KLz NPAUrGN/ivaXNUF7iHIl9cr7A9GmSa75L+Kizmunm6HVVO2kg+8456WUYloiIBYVMaSdqB S1ksWkeTlLT1pTOyIHAyJ9RMqpy3VyOWM2argRdMTCw7wR6lFffAqX645kLCiDIL10YRX+ 9B5EzA6IeyhABR5lAK75Ahw+uHaqojPKfq5ltRSqFtt+b6h+wJTvUazgvmWSYIFMBUAOO7 FKSNB9QfdBn0Mbmx5+GzU0GfXlzZHng2GEOUbNXE9tOqHfFL8c2gWDfJLtPINw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv366mwz4h; Mon, 25 Dec 2023 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPZWs022752; Mon, 25 Dec 2023 14:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPZIH022749; Mon, 25 Dec 2023 14:25:35 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:35 GMT Message-Id: <202312251425.3BPEPZIH022749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 47adb1e01264 - main - share/man/man7/simd.7: document new amd64 baseline strcmp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47adb1e012643b8f32f6cf8c84cd50eb58f0f17a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=47adb1e012643b8f32f6cf8c84cd50eb58f0f17a commit 47adb1e012643b8f32f6cf8c84cd50eb58f0f17a Author: Robert Clausecker AuthorDate: 2023-09-25 06:18:06 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:54:50 +0000 share/man/man7/simd.7: document new amd64 baseline strcmp() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41971 --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 3fd8890c4f53..fc91ded85698 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd September 2, 2023 +.Dd September 25, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -68,7 +68,7 @@ Enhanced functions are present in the following architectures: .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S Ta S +.It strcmp Ta Ta S Ta S1 Ta S .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 From nobody Mon Dec 25 14:25:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKv51cbBz54nDZ; Mon, 25 Dec 2023 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv50jZpz3M1f; Mon, 25 Dec 2023 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3NlY4C7ddOgxnp/VPANc+xqqU4nttC5Fi/Ungnyups=; b=rtmiPMP/CeFE9RY/heVJBTCvMvsT6vY/5Ylw8O3e3z9FBcBeSiwGrRAG9Gx8O8KzrjGHAB kN8U6tbaIXBi7R3RCT6rMRwUqC6C//2E8n8/xdfHiwkYZU698hg6kyesbRe2b+lrU8actR s+QESs/tcnPBs1a/tDLdjJ49nvxoJSTEcZC2oZIQDKQQNlW/gtCquAU66c7tpOXZQ0emr1 015rvOV5/+YFRUb7b/fK7NcCDYAEofbCnp/mzM+agyVM0sDlJNNS/bGICvr6+ou3mSP8pO lQ9xV0owPhEHGldmTruZnEtiIBvWiQ4vcS6lRG1KwkSjaBF7q/XhcnQmaaLB9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514337; a=rsa-sha256; cv=none; b=gYFwpiebqmp6BaLSccdHLB1rKU7VObfD1i0A3x850MHDssQ1oFGoWDnWk47M1o+f16hj2L q84qablM3fdmeV9KDporEuskiUup08on6tKDqhiX+vduzoEPJZm+4ExB+T3FzE3gkwQEeU PFjP6E2IAT9E6z2GVVpT6jYGdrLHYjodQSuc8N0bD9hlUCyiCXj3RORJQBFBLPeZrYieUJ rS4FgoMhOUVCQOsqRlnVjF/aUwO0u4SEix2azGJUI56aR2xuthFmw5gIlY+n2I0kVUt29M 5jO9LwEuPC3XjPwGLQ92yhOVHrCetOvx3wy+5jKRCvh1vFCC/fxblZ9zQl7waA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3NlY4C7ddOgxnp/VPANc+xqqU4nttC5Fi/Ungnyups=; b=JJi16m0MVX08GKY7M3PuLFj4ywqj6xuJOKTlPBRvNcBFcoi8I/y/eommtY2ocyH9HkVhee spgmDoJgvJPzvujDBk11MUFCC6oyOR6jL+gv7NEfyIJaTA1oJX00KFeyNvkUvukRuQuGrd m1RaQJ6gCXOroRL9jv4eQaoKZexhzmlIMNt8XVOJBp29KJYuSZd26vUoe6Odqum49kLHdX z0tV1/KJ5yrpb7e0IG8iCHsrtaKxIfX36mJ4ZUJsYZPdtGkKlV1ZmK7caTQbS/Qi6y1mCX jqIHJkB51AF7cCRRjPpSNVN9mITyXFRIdJPBDmajUAXOaMg5uCVFbA1xohGeIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv46t1Sz4k; Mon, 25 Dec 2023 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPa6E022794; Mon, 25 Dec 2023 14:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPaJ5022791; Mon, 25 Dec 2023 14:25:36 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:36 GMT Message-Id: <202312251425.3BPEPaJ5022791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: f4fc317c364f - main - lib/libc/amd64/string: implement strpbrk() through strcspn() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4fc317c364f2c81ad3d36763d8e5a60393ddbd1 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f4fc317c364f2c81ad3d36763d8e5a60393ddbd1 commit f4fc317c364f2c81ad3d36763d8e5a60393ddbd1 Author: Robert Clausecker AuthorDate: 2023-09-25 21:43:12 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:54:58 +0000 lib/libc/amd64/string: implement strpbrk() through strcspn() This lets us use our optimised strcspn() routine for strpbrk() calls. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41980 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strcspn.S | 18 +++++++++------- lib/libc/amd64/string/strpbrk.c | 43 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 09bf7c8f251e..50c70007e99b 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -14,6 +14,7 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strnlen.c \ + strpbrk.c \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strcspn.S b/lib/libc/amd64/string/strcspn.S index 648635529e5b..7ebd7a847d67 100644 --- a/lib/libc/amd64/string/strcspn.S +++ b/lib/libc/amd64/string/strcspn.S @@ -33,13 +33,15 @@ #define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ -ARCHFUNCS(strcspn) - ARCHFUNC(strcspn, scalar) + .weak strcspn + .set strcspn, __strcspn +ARCHFUNCS(__strcspn) + ARCHFUNC(__strcspn, scalar) NOARCHFUNC - ARCHFUNC(strcspn, x86_64_v2) -ENDARCHFUNCS(strcspn) + ARCHFUNC(__strcspn, x86_64_v2) +ENDARCHFUNCS(__strcspn) -ARCHENTRY(strcspn, scalar) +ARCHENTRY(__strcspn, scalar) push %rbp # align stack to enable function call mov %rsp, %rbp sub $256, %rsp # allocate space for lookup table @@ -122,7 +124,7 @@ ARCHENTRY(strcspn, scalar) sub (%rsp), %rax # length of prefix before match leave ret -ARCHEND(strcspn, scalar) +ARCHEND(__strcspn, scalar) /* * This kernel uses pcmpistri to do the heavy lifting. @@ -134,7 +136,7 @@ ARCHEND(strcspn, scalar) * 17--32: two pcmpistri per 16 bytes of input * >=33: fall back to look up table */ -ARCHENTRY(strcspn, x86_64_v2) +ARCHENTRY(__strcspn, x86_64_v2) push %rbp mov %rsp, %rbp sub $256, %rsp @@ -389,6 +391,6 @@ ARCHENTRY(strcspn, x86_64_v2) 2: sub %rdi, %rax # number of characters preceding match leave ret -ARCHEND(strcspn, x86_64_v2) +ARCHEND(__strcspn, x86_64_v2) .section .note.GNU-stack,"",%progbits diff --git a/lib/libc/amd64/string/strpbrk.c b/lib/libc/amd64/string/strpbrk.c new file mode 100644 index 000000000000..87f587789991 --- /dev/null +++ b/lib/libc/amd64/string/strpbrk.c @@ -0,0 +1,43 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 + +size_t __strcspn(const char *, const char *); + +char * +strpbrk(const char *s, const char *charset) +{ + size_t loc; + + loc = __strcspn(s, charset); + + return (s[loc] == '\0' ? NULL : (char *)&s[loc]); +} From nobody Mon Dec 25 14:25:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKv64jJBz54mtr; Mon, 25 Dec 2023 14:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv61wtcz3MLS; Mon, 25 Dec 2023 14:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bFSiYwxnkosUwjWYCwboKXcZJs5c3lp2U4ZksmCrzLc=; b=d0NSP1vFg+WH/mDK2ZMvX/NAQiBu4V9KioVW1D+zF50V3T0EoFO0+RiSZiExJj6rzo94Ob 096kDdeLTmvCLaF76oLGstvdEo2dNk9KFiaRVO0iSpoPeL56zpgS1O9mStmjn3IsyhMjCk L7DZCe81ODZYdAqnXfVe2HIH+3YFQHQJ676Lyt5mes2p+5b/I35TWnhWbtQQSxi9RwaCRY I8a/WRIjq+VQVzhtb3MSVRHTXav6YtlV76d6yUpdwj9TVZV4z2qrLJYcnzSYKm1JQicCE2 D9Sgz/KsliZpT9cXLiWo9iUxHG+5RuKCpOAJMRj0MTGR/Yrezq7rUkIA0Mvlwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514338; a=rsa-sha256; cv=none; b=KihGsiTkCp6xtml4X6VuY4o1gMV8jz+U5mXluTY0KcdgXEEEt+Nr/zNmy4tsm/WUQUWsAx k08cDKnC7F7qxbEewPck6UVXhjlJcRDisWWq5bUt9ROpA7ekc3l+u/FtvMhCX035jyE7QS AY3H1u6d+PV4WxL3lW0Vr4nf6tLJTSbEFVcNCkwAaPx5I9vChMGz/hDrly0o9wRYIRqgv2 X0gXcUnoM2Fsi3gFV4bW3l+bQtfbP363E6ov8SepUGGHHgNt9WfELyKGm5wh73TAZd+PMJ mbEwbKPEgBJHbxc+4GxC6E0NUZu3Ho5GbuI9Aho3mVce6kRTqVXZBZnUm8QdHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bFSiYwxnkosUwjWYCwboKXcZJs5c3lp2U4ZksmCrzLc=; b=bBg2T7pJmWMgi3IyGu7b/o8UkcJKOsGEOIVaK+otKJpb/3+HTy3LYvgUJL620B5xpR/aGP sAGWbBiEEjI/V5T3BCwC19kbUfDfIQ4D3FtHTtQ3WbAXGwTJDZCezWDy8deUth/Pm1tsrP WQt/B5pC9fe8MKqFbwx5JqYEeAgXY3XgH5CEUO/yD0IYaRBrhpLGS1Lwxs5n96nmEWh+rG Rh5ZhmxMGle2jsisSuSj23YWci2msyehIqNGSlfpGOxP82sx+aZzoS39TaK8ZNeKYL15da y6kBMIxhbylV95jNb0pOVoO0IeymQ35qW/LdXQ6vSsN2dB6wGJwhNwYbmXuTbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv613BMzYJ; Mon, 25 Dec 2023 14:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPcCi022842; Mon, 25 Dec 2023 14:25:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPcbq022839; Mon, 25 Dec 2023 14:25:38 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:38 GMT Message-Id: <202312251425.3BPEPcbq022839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 8b60e1fdbefa - main - share/man/man7/simd.7: document amd64 SIMD use for strpbrk() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b60e1fdbefab1ffbc1b4222ae0a67e1d455fb45 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=8b60e1fdbefab1ffbc1b4222ae0a67e1d455fb45 commit 8b60e1fdbefab1ffbc1b4222ae0a67e1d455fb45 Author: Robert Clausecker AuthorDate: 2023-09-25 21:45:26 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:04 +0000 share/man/man7/simd.7: document amd64 SIMD use for strpbrk() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41980 --- share/man/man7/simd.7 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index fc91ded85698..cab48a01ead1 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -76,6 +76,7 @@ Enhanced functions are present in the following architectures: .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S +.It strpbrk Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 From nobody Mon Dec 25 14:25:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKv7491Yz54nDd; Mon, 25 Dec 2023 14:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv72ZGLz3M4d; Mon, 25 Dec 2023 14:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zx8mIFwMpCPfhsbAuwsctmUVkR7OL1B8p1Aebeai8m0=; b=hNWTXqCiCc5H4Ev3dZvryzFCqAFJBk+Pakohnq6prpxp4JyBv01O/iU97BYKf5u7yc7wFD 3+kbYjCUK1THeCClF1iDPgDKLhXecEpq+epH1/Kj7c5l6tKGRLhvqNWMk82/cQEd4m//5S 9ZlJhsY4ujxbuXKkRaj2SWrSr3iU8ZBkRRNMMWfoFNvh3Aj0w2g3hTn+24OZU+18JnZjj+ x5IBsJTyIE9WXcIWMHo12rgZkYXfpDceU0zu24E8EW12D0d+2kKXxgSeKliKZd8HACtdJ/ psLFqFU6UxD/FMHAlKtWGF/M8dPD3tXIx7ghSIQaX8upuU0SIJjJ+PbcJ+c/4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514339; a=rsa-sha256; cv=none; b=Wd0zzdVE9EE3gijlGoRrbU557iCKH1xU4g0355QkxXAeC+O+Gvf9zI77ECIyBqUv6cfgeU juff72m5MXVrFaUP+7HoFTWO7mPHXiBOyVHF+vW+EjVgLIZacmo+AFiIdpkBlYldWyUY1P E/FfP5YXVldI5nYgKJJ72NacKqu66yl/tkdzeeMEjvCCTdSKsmVlKnsUAgOu+X+owbeDie piI9+Gw6Z0fQ8tgaox+8RS4Zv0ih6azGS++7FiBGBbBbWzyyREuNxSS7ZIDGaZknKBkhRT wj7sya/o/0+mOa2ZjWedKB8Lz2y8Q+ipH/eQfOtF2SplQmaHLDEcxGWD9F6mHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zx8mIFwMpCPfhsbAuwsctmUVkR7OL1B8p1Aebeai8m0=; b=Af8cYl8lh3W1BuIPceOVUA4bLvdfTY+E1a0FcNFhCgplcDeGnIkHft53MMQd2kArAbeqfj G0R9ADUKVgVb90ROLziVSQC51rAvayQNjZW7T7J9C65MMz2B0zoCtZkG2UMf6DG1QAeWni qErbvRvmm5nfvrTUCAKVdQbmKHX2y+x1G844kAJ84YGdbBjcNRlRm0aui7YUHHARuSVs/f 6ePhDdNkZG6W94Jmb/Rh052ZY6SJGUHuRdBpUa6iIgFRyTWVj89Vu+tlGaDxgtJeicxsIy P/ObYttO6gJTWlXSZZUQPp2h2G3kzzC1snz9tQxMtMqkfPJ+TlCZ7+CVbNUk6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv71hFZzJw; Mon, 25 Dec 2023 14:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPdUF022890; Mon, 25 Dec 2023 14:25:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPdBW022887; Mon, 25 Dec 2023 14:25:39 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:39 GMT Message-Id: <202312251425.3BPEPdBW022887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 459ddefcc9dc - main - lib/libc/tests/string: add unit tests for strncmp(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 459ddefcc9dcc010f6f7445285e61e2b6780379c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=459ddefcc9dcc010f6f7445285e61e2b6780379c commit 459ddefcc9dcc010f6f7445285e61e2b6780379c Author: Robert Clausecker AuthorDate: 2023-09-28 20:40:20 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:08 +0000 lib/libc/tests/string: add unit tests for strncmp(3) These are patterned after the previously added (D41970) strcmp tests, but are extended to check for various length conditions. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/strncmp_test.c | 165 +++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a090e1bd3463..5874f7b6b873 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= memset_s_test +ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test diff --git a/lib/libc/tests/string/strncmp_test.c b/lib/libc/tests/string/strncmp_test.c new file mode 100644 index 000000000000..989c58bcfedf --- /dev/null +++ b/lib/libc/tests/string/strncmp_test.c @@ -0,0 +1,165 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 + +int (*volatile strncmp_fn)(const char *, const char *, size_t); + +static void +alignment_testcase(char *a, char *b, int want, size_t len) +{ + int res; + + res = strncmp_fn(a, b, len); + ATF_CHECK_MSG(want == (res > 0) - (res < 0), + "strcmp(%p \"%s\", %p \"%s\", %zu) = %d != %d", + (void *)a, a, (void *)b, b, len, res, want); +} + +static void +check_strncmp_alignments(char a[], char b[], + size_t a_off, size_t b_off, size_t len, size_t pos) +{ + char *a_str, *b_str, a_orig, b_orig; + + a[a_off] = '\0'; + b[b_off] = '\0'; + + a_str = a + a_off + 1; + b_str = b + b_off + 1; + + a_str[len] = '\0'; + b_str[len] = '\0'; + a_str[len+1] = 'A'; + b_str[len+1] = 'B'; + + a_orig = a_str[pos]; + b_orig = b_str[pos]; + + alignment_testcase(a_str, b_str, 0, len + 16); + alignment_testcase(a_str, b_str, 0, len + 1); + alignment_testcase(a_str, b_str, 0, len); + + if (pos < len) { + a_str[pos] = '\0'; + alignment_testcase(a_str, b_str, -1, len + 16); + alignment_testcase(a_str, b_str, -1, len + 1); + alignment_testcase(a_str, b_str, -1, len); + alignment_testcase(a_str, b_str, -1, pos + 1); + alignment_testcase(a_str, b_str, 0, pos); + a_str[pos] = a_orig; + + b_str[pos] = '\0'; + alignment_testcase(a_str, b_str, 1, len + 16); + alignment_testcase(a_str, b_str, 1, len + 1); + alignment_testcase(a_str, b_str, 1, len); + alignment_testcase(a_str, b_str, 1, pos + 1); + alignment_testcase(a_str, b_str, 0, pos); + b_str[pos] = b_orig; + } + + a_str[pos] = 'X'; + alignment_testcase(a_str, b_str, 1, len + 16); + alignment_testcase(a_str, b_str, 0, pos); + alignment_testcase(a_str, b_str, 1, pos + 1); + if (pos < len) { + alignment_testcase(a_str, b_str, 1, len); + alignment_testcase(a_str, b_str, 1, len + 1); + } + a_str[pos] = a_orig; + + b_str[pos] = 'X'; + alignment_testcase(a_str, b_str, -1, len + 16); + alignment_testcase(a_str, b_str, 0, pos); + alignment_testcase(a_str, b_str, -1, pos + 1); + if (pos < len) { + alignment_testcase(a_str, b_str, -1, len); + alignment_testcase(a_str, b_str, -1, len + 1); + } + b_str[pos] = b_orig; + + a[a_off] = '-'; + b[b_off] = '-'; + a_str[len] = '-'; + b_str[len] = '-'; + a_str[len+1] = '-'; + b_str[len+1] = '-'; +} + +ATF_TC(strncmp_alignments); +ATF_TC_HEAD(strncmp_alignments, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strncmp(3) with various alignments"); +} + +ATF_TC_BODY(strncmp_alignments, tc) +{ + size_t a_off, b_off, len, pos; + char a[64+16+16+3], b[64+16+16+3]; + + memset(a, '-', sizeof(a)); + memset(b, '-', sizeof(b)); + a[sizeof(a) - 1] = '\0'; + b[sizeof(b) - 1] = '\0'; + + for (a_off = 0; a_off < 16; a_off++) + for (b_off = 0; b_off < 16; b_off++) + for (len = 1; len <= 64; len++) + for (pos = 0; pos <= len; pos++) + check_strncmp_alignments(a, b, a_off, b_off, len, pos); +} + +ATF_TC(strncmp_null); +ATF_TC_HEAD(strncmp_null, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strncmp(3) with null pointers"); +} + +ATF_TC_BODY(strncmp_null, tc) +{ + alignment_testcase(NULL, NULL, 0, 0); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strncmp_fn = dlsym(dl_handle, "test_strncmp"); + if (strncmp_fn == NULL) + strncmp_fn = strncmp; + + ATF_TP_ADD_TC(tp, strncmp_alignments); + ATF_TP_ADD_TC(tp, strncmp_null); + + return atf_no_error(); +} From nobody Mon Dec 25 14:25:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKv852clz54n5k; Mon, 25 Dec 2023 14:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv83LMKz3MLs; Mon, 25 Dec 2023 14:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yj4GPSbOKSdY70Mn29LihQfAdho+BffltmT7KbYz+yw=; b=lOrrR9JexnK565XoTB/BmttUMydm3f5u3xY52nxV2Yy+s2GoAATt6Lei/KnU1JZuvSTDxI G9jYB9fr5jNGKlLwV3OUWtVL9PCZ+NYVxXin1RQrmJ43U7a6qOPBEXF6RSzMHToYcQLGan kHrMr5nOmjsw7hiSVI5ENEd5zppipLriZXRQ5OqTsw13Y2dbNEkALwh9GRwNwiESE2jzrR gfTb4GfRGs1CJMwnIw/z70aY9H+8z6/3wtdXfoEiprCS5OHIEQDkR8nd5du+1WrJxwyKn0 uJCNjyAE4bEWpkgsnI0Qg+EQOddLj0xyaRYu+z7rWy32DgNAJIwZvag00uyiWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514340; a=rsa-sha256; cv=none; b=RZBek1olL91b4LKK/MJkTN3k62d9YAUktl8k+ndrdwtLIovsqmEqOWP3NNsd6MYeCvjfZ4 q6cns5Bc+/15NBZmxs4P39y5eabFXcQFcyISZi+9U6nAykpZz2itF3VQrb/alP9ybeZqfF dws8e58g8GJw6cUBBrutYVq85ksnCGAYwBGbS1DU9wHqJbAvyBZBkqwbZXq9eGRex97Ryx AD60qR4//E0xjdiznuBYZo/LC+IlrOdXLa0pqrJ4eIeSPOCZjo8igC70YReq5K3URSIELx 6kAYJ1zHsYYEnIa43DJhxfTRUIpccz4sKjmY+1OeDv6G/MsNFy+Jo6JEJset9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yj4GPSbOKSdY70Mn29LihQfAdho+BffltmT7KbYz+yw=; b=C7FfMNsSoMyM02N9d4+2q1roTqgjwqN8Srpq8PgxqBuu/42br13l1JOTgDnBOCP68gvpSF j9tW35cc599rHSB1cu8VA5GGth9NGGKVzuLtaBD1nQm+1RpmXWgjZBt4nySiJ/X4RC/ya6 hC8KG4qTeLfij46BHRz3oxi3d6DN7zo7HBP1VIw9GcEPT+3jJS+mQ0zqhbbBIEt351Yd1B wFhqB2nHldrrVHg2FsPm3LAz01gVjRpHSFnXSDoAMjMCDHdvjoNauQF/pBvIj88A2HGUms K0O6FQ7xIcX4SA2l+3wJ5vNmDVnRutd9RVye51jv1jq+2oYBk31kcYQoylE34A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv82Pxxz4m; Mon, 25 Dec 2023 14:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPeaB022943; Mon, 25 Dec 2023 14:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPe65022939; Mon, 25 Dec 2023 14:25:40 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:40 GMT Message-Id: <202312251425.3BPEPe65022939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 14289e973f5c - main - lib/libc/amd64/string: add strncmp scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14289e973f5c941e4502cc2b11265e4b3072839a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=14289e973f5c941e4502cc2b11265e4b3072839a commit 14289e973f5c941e4502cc2b11265e4b3072839a Author: Robert Clausecker AuthorDate: 2023-09-27 22:46:04 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:13 +0000 lib/libc/amd64/string: add strncmp scalar, baseline implementation The scalar implementation is fairly straightforward and merely unrolled four times. The baseline implementation closely follows D41971 with appropriate extensions and extra code paths to pay attention to string length. Performance is quite good. We beat both glibc (except for very long strings, but they likely use AVX which we don't) and Bionic (except for medium-sized aligned strings, where we are still in the same ballpark). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncmp.S | 488 +++++++++++++++++++++++++++++++++++++ 2 files changed, 489 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 50c70007e99b..51645ba3b8af 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcpy.c \ strcspn.S \ strlen.S \ + strncmp.S \ strnlen.c \ strpbrk.c \ strspn.S \ diff --git a/lib/libc/amd64/string/strncmp.S b/lib/libc/amd64/string/strncmp.S new file mode 100644 index 000000000000..932cf078bdfc --- /dev/null +++ b/lib/libc/amd64/string/strncmp.S @@ -0,0 +1,488 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(strncmp) + ARCHFUNC(strncmp, scalar) + ARCHFUNC(strncmp, baseline) +ENDARCHFUNCS(strncmp) + +/* + * This is just the scalar loop unrolled a bunch of times. + */ +ARCHENTRY(strncmp, scalar) + xor %eax, %eax + sub $4, %rdx # 4 chars left to compare? + jbe 1f + + ALIGN_TEXT +0: movzbl (%rdi), %ecx + test %ecx, %ecx # NUL char in first string? + jz .L0 + cmpb (%rsi), %cl # mismatch between strings? + jnz .L0 + + movzbl 1(%rdi), %ecx + test %ecx, %ecx + jz .L1 + cmpb 1(%rsi), %cl + jnz .L1 + + movzbl 2(%rdi), %ecx + test %ecx, %ecx + jz .L2 + cmpb 2(%rsi), %cl + jnz .L2 + + movzbl 3(%rdi), %ecx + test %ecx, %ecx + jz .L3 + cmpb 3(%rsi), %cl + jnz .L3 + + add $4, %rdi # advance to next iteration + add $4, %rsi + sub $4, %rdx + ja 0b + + /* end of string within the next 4 characters */ +1: cmp $-4, %edx # end of string reached immediately? + jz .Leq + movzbl (%rdi), %ecx + test %ecx, %ecx + jz .L0 + cmpb (%rsi), %cl + jnz .L0 + + cmp $-3, %edx # end of string reached after 1 char? + jz .Leq + movzbl 1(%rdi), %ecx + test %ecx, %ecx + jz .L1 + cmpb 1(%rsi), %cl + jnz .L1 + + cmp $-2, %edx + jz .Leq + movzbl 2(%rdi), %ecx + test %ecx, %ecx + jz .L2 + cmpb 2(%rsi), %cl + jnz .L2 + + cmp $-1, %edx # either end of string after 3 chars, + jz .Leq # or it boils down to the last char + +.L3: inc %eax +.L2: inc %eax +.L1: inc %eax +.L0: movzbl (%rsi, %rax, 1), %ecx + movzbl (%rdi, %rax, 1), %eax + sub %ecx, %eax +.Leq: ret +ARCHEND(strncmp, scalar) + +ARCHENTRY(strncmp, baseline) + push %rbx + sub $1, %rdx # RDX--, so RDX points to the last byte to compare + jb .Lempty # where there any bytes to compare at all? + + lea 15(%rdi), %r8d # end of head + lea 15(%rsi), %r9d + mov %edi, %eax + mov %esi, %ebx + xor %edi, %r8d # bits that changed between first and last byte + xor %esi, %r9d + and $~0xf, %rdi # align heads to 16 bytes + and $~0xf, %rsi + or %r8d, %r9d + and $0xf, %eax # offset from alignment + and $0xf, %ebx + movdqa (%rdi), %xmm0 # load aligned heads + movdqa (%rsi), %xmm2 + pxor %xmm1, %xmm1 + cmp $16, %rdx # end of buffer within the first 32 bytes? + jb .Llt16 + + test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + + /* heads may cross page boundary, avoid unmapped loads */ + movdqa %xmm0, -32(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -16(%rsp) + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %ebx, %ecx + shl %cl, %r9d # string head in XMM2 + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + test %r8d, %r10d # NUL byte present in first string? + lea -32(%rsp), %r8 + cmovz %rdi, %r8 + test %r9d, %r11d # NUL byte present in second string? + lea -16(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rbx, 1), %xmm4 + jmp 1f + + /* rdx == 0 */ +.Lempty: + xor %eax, %eax # zero-length buffers compare equal + pop %rbx + ret + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rbx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + xor $0xffff, %r9d # mismatch or NUL byte? + jnz .Lhead_mismatch + + /* load head and second chunk */ + movdqa 16(%rdi), %xmm2 # load second chunks + movdqa 16(%rsi), %xmm3 + lea -16(%rdx, %rbx, 1), %rdx # account for length of RSI chunk + sub %rbx, %rax # is a&0xf >= b&0xf? + jb .Lswapped # if not, proceed with swapped operands + jmp .Lnormal + + /* buffer ends within the first 16 bytes */ +.Llt16: test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + /* heads may cross page boundary */ + movdqa %xmm0, -32(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -16(%rsp) + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %ebx, %ecx + shl %cl, %r9d # string head in XMM2 + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + lea (%rdx, %rax, 1), %ecx # location of last buffer byte in xmm0 + bts %ecx, %r10d # treat as if NUL byte present + lea (%rdx, %rbx, 1), %ecx + bts %ecx, %r11d + test %r8w, %r10w # NUL byte present in first string head? + lea -32(%rsp), %r8 + cmovz %rdi, %r8 + test %r9w, %r11w # NUL byte present in second string head? + lea -16(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rbx, 1), %xmm4 + jmp 1f + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rbx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + btr %edx, %r9d # induce mismatch in last byte of buffer + not %r9d # mismatch or NUL byte? + + /* mismatch in true heads */ + ALIGN_TEXT +.Lhead_mismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rax, %rdi # return to true heads + add %rbx, %rsi + movzbl (%rdi, %r9, 1), %eax # mismatching characters + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + + /* rax >= 0 */ + ALIGN_TEXT +.Lnormal: + neg %rax + movdqu 16(%rsi, %rax, 1), %xmm0 + sub %rdi, %rsi # express RSI as distance from RDI + lea (%rsi, %rax, 1), %rbx # point RBX to offset in second string + neg %rax # ... corresponding to RDI + pcmpeqb %xmm3, %xmm1 # NUL present? + pcmpeqb %xmm2, %xmm0 # Mismatch between chunks? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + mov $16, %ecx + cmp %rcx, %rdx # does the buffer end within (RDI,RSI,1)? + cmovb %edx, %ecx # ECX = min(16, RDX) + add $32, %rdi # advance to next iteration + bts %ecx, %r8d # mark end-of-buffer as if there was a NUL byte + test %r8w, %r8w # NUL or end of buffer found? + jnz .Lnul_found2 + xor $0xffff, %r9d + jnz .Lmismatch2 + sub $48, %rdx # end of buffer within first main loop iteration? + jb .Ltail # if yes, process tail + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rdi, %rbx, 1), %xmm0 # chunk of 2nd string corresponding to RDI + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rdi + test %r8d, %r8d + jnz .Lnul_found2 + xor $0xffff, %r9d + jnz .Lmismatch2 + sub $32, %rdx # end of buffer within next iteration? + jae 0b + + /* end of buffer will occur in next 32 bytes */ +.Ltail: movdqu (%rdi, %rbx, 1), %xmm0 # chunk of 2nd string corresponding to RDI + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + bts %edx, %r8d # indicate NUL byte at last byte in buffer + test %r8w, %r8w # NUL byte in first chunk? + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + sub $16, %edx # take first half into account + bts %edx, %r8d # indicate NUL byte at last byte in buffer + add $32, %rdi + +.Lnul_found2: + sub $16, %rdi + +.Lnul_found: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8d # adjust NUL mask to positions in RDI/RBX + not %r9d # mask of mismatches + or %r8w, %r9w # NUL bytes als count as mismatches + jnz .Lmismatch + + /* + * (RDI) == (RSI) and NUL is past the string. + * compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rdi, %rax, 1), %xmm0 + pcmpeqb (%rdi, %rsi, 1), %xmm0 + add %rdi, %rsi # restore RSI pointer + add %rax, %rdi # point RDI to chunk corresponding to (RSI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + +.Lmismatch2: + sub $16, %rdi + + /* a mismatch has been found between RBX and RSI */ +.Lmismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rdi, %rbx # turn RBX from offset into pointer + movzbl (%rbx, %r9, 1), %ecx + movzbl (%rdi, %r9, 1), %eax + sub %ecx, %eax + pop %rbx + ret + + /* rax < 0 */ + ALIGN_TEXT +.Lswapped: + movdqu 16(%rdi, %rax, 1), %xmm0 + sub %rsi, %rdi # express RDI as distance from RDI + lea (%rdi, %rax, 1), %rbx # point RBX to offset in first string + pcmpeqb %xmm2, %xmm1 # NUL present? + pcmpeqb %xmm3, %xmm0 # mismatch between chunks? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add %rax, %rdx # RDX points to buffer end in RSI + neg %rax # ... corresponding to RSI + mov $16, %ecx + cmp %rcx, %rdx # does the buffer end within (RSI,RDI,1)? + cmovb %edx, %ecx # ECX = min(16, RDX) + add $32, %rsi + bts %ecx, %r8d # mark end-of-buffer as if there was a NUL byte + test %r8w, %r8w # NUL or end of buffer found? + jnz .Lnul_found2s + xor $0xffff, %r9d + jnz .Lmismatch2s + sub $48, %rdx # end of buffer within first main loop iteration? + jb .Ltails # if yes, process tail + + ALIGN_TEXT +0: movdqu (%rsi, %rbx, 1), %xmm0 # chunk of 1st string corresponding to RSI + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RDI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rsi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rsi + test %r8d, %r8d + jnz .Lnul_found2s + xor $0xffff, %r9d + jnz .Lmismatch2s + sub $32, %rdx # end of buffer within next iteration? + jae 0b + + /* end of buffer will occur in next 32 bytes */ +.Ltails: + movdqu (%rsi, %rbx, 1), %xmm0 # chunk of 1st string corresponding to RSI + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RDI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + bts %edx, %r8d # indicate NUL byte at laste byte in buffer + test %r8w, %r8w # NUL byte in first chunk? + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rsi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + sub $16, %edx # take first half into account + bts %edx, %r8d # indicate NUL byte at laste byte in buffer + add $32, %rsi + +.Lnul_found2s: + sub $16, %rsi + +.Lnul_founds: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8d # adjust NUL mask to positions in RSI/RBX + not %r9d # mask of mismatches + or %r8w, %r9w # NUL bytes also count as mismatches + jnz .Lmismatchs + + movdqu (%rsi, %rax, 1), %xmm0 + pcmpeqb (%rsi, %rdi, 1), %xmm0 + add %rsi, %rdi # restore RDI pointer + add %rax, %rsi # point RSI to chunk corresponding to (RDI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + +.Lmismatch2s: + sub $16, %rsi + +.Lmismatchs: + tzcnt %r9d, %r9d # where is the mismatch? + add %rsi, %rbx # turn RBX from offset into pointer + movzbl (%rbx, %r9, 1), %eax + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + pop %rbx + ret +ARCHEND(strncmp, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:25:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvB22M7z54n32; Mon, 25 Dec 2023 14:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKv93lYtz3MJx; Mon, 25 Dec 2023 14:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hsG9xjrrsrs5xhBmIyM8tC4xo4YBuq2ZK76RrPpp7Dc=; b=UdY3MY3DhLu7QgLpkIfwsd1v/NbbXCDyHTQ+Pba4xIbf1o3hVBEzyjlYIsVfYHMaQjbRfc BljUi8zTsEJYpyrFWrgJAEXGNGasdeYeFJeoe4tkoeD10dVdldkZonopImLCZbSexbXtPX VSvloE356CxcbMgU9evRqEa27F3D+vbwOAGQbUeu6PhaNUM9GPmcAtRxbFBsp62xuc4bKK wuERAuBnxepH66BMJ67p7/3HpWUp4u6KYG3Utmq6FTORdC4yHQYjCGbf2hvmdADgutqD9A xro3g9Xen3utEjr1fphQxqoAmanE0Thq6s0AbQEChRLNKcp9hDOzd2WoDOxfag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514341; a=rsa-sha256; cv=none; b=KY2RMPZay5CcviHV5mWpRQ0pLabyGepBU2dxS2bGPV85t1bBd1YrcdrGunzxOyF9DCIKXz /hbNypTuGv+FSE8O44HyFlThPww0bBc6jDtzeZpXqFAR7w8i5vdHMALNEwt2o5YRajDeKm usBnhc74vzn2nAlfPykcGamw2Cxo7nuqt9NPGaR9D1OBz1jv6aEVMOH3AH37t/a9EIQba7 z8Y3uajpUTCGLx5RI4kXOt7IknAh39N/5GWaFqvDeAmzR9xD86w6MTpF99vCNA8XB4Tq8J mOu1toUpRsDaT0I5s5vd0h2vhFvDJcpvdg+LU09s6rwQ5ZkZh96swINtB3zSww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hsG9xjrrsrs5xhBmIyM8tC4xo4YBuq2ZK76RrPpp7Dc=; b=uoHtibRT7XJ4kQSVbtItnvT8vs5xV6+lu6ONCNV/+txyNdzTZrceF7ial5yQ04e7dHHGzf ef0XV/PP45r0ifAd11p/L72InBHWxmtIsebG3XsS+sT3W6oTB7yqDh2Eozvr1GZIBylq7T /eO5/5HXNlY5IKISsDZVGAtadi7koqaNHp5Po3ixjn/h6iRUXiwrnlYeP3MxV1uWjheKvO 92A7TQUEOeC8807nmpZd2NewR7RcrxxHa733DnyBwkhpO9R92S0R4MkVgBZXqdIe+wKlqw LgzKTJsHDic7bzwSdDzYlaY0/hDUEjr//XCyblCzU4jvshKLjDrQD43V9eBYlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKv92nprzmL; Mon, 25 Dec 2023 14:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPfG7022995; Mon, 25 Dec 2023 14:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPfxX022992; Mon, 25 Dec 2023 14:25:41 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:41 GMT Message-Id: <202312251425.3BPEPfxX022992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: f5edd8450e53 - main - share/man/man7/simd.7: document strncmp amd64 scalar, baseline implementations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5edd8450e5328c5b88977b4d00e780cdd744dea Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f5edd8450e5328c5b88977b4d00e780cdd744dea commit f5edd8450e5328c5b88977b4d00e780cdd744dea Author: Robert Clausecker AuthorDate: 2023-10-08 02:46:36 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:18 +0000 share/man/man7/simd.7: document strncmp amd64 scalar, baseline implementations Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index cab48a01ead1..39642429c1c4 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd September 25, 2023 +.Dd October 7, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -72,7 +72,7 @@ Enhanced functions are present in the following architectures: .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta Ta S +.It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S From nobody Mon Dec 25 14:25:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvC0Y4Bz54mgV; Mon, 25 Dec 2023 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvB4y69z3MMN; Mon, 25 Dec 2023 14:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9qttUOWE3f7KtzBdKkQg8oK1wo+wu3pzPRZm3mccGo=; b=ZJG1WZlEB0rD35YY1x2ZfkJeec+jCORoqzcnw32DRU614+aBgZ4kSVwXvBCE1ArtB4jTv2 b+wQOBAqMHCrgW8Y81N8hb5QNKi7h9xkbOKTEadL2ZnbZ4lTKotw8mskp1wPdGacLiCE2k Uwcrrstmuiw9IyaKCzG6wGXk20xbF74ysPeHEXkzh9FvMxdY2lJ4OUmz90xEU76/TBNsbO q1woiPQk5PYuh8VhxZResCaGYtkb7o55rcI8nGxamIeQ1GukFGae9FkuLlEhclyD6VH51W EP23rYjTdnOvFrq3woKEgdXUMUh7Gle4V+BFmDaQBP4f+ZPhFUFk5rrbi4RpYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514342; a=rsa-sha256; cv=none; b=w8ZA/SUDUmEafYUroUPwWKYzJtR0kbaDmDRgcJeVXBLK0SF8i3NQ1XBaiteshG+Cya+Gff 332HwDesTJRJQARhoX2i0OUw2w3aFaQadS0FrSlohwG9dQFbhvgEw8nSgQrOv3/cnZSbCT 7sdZ94Wtd2cdw5mmdP2pRCNxdqPoohQ/jvmAF15D7xK/Aay/4MFMMxycWf5pjzRs/soutr CqGtepY6WJoGUTK/8AWVTKs3CY6OcTNgFNUyf08GsE4U4XHJr64m87yarc8VTzxNrQOj+D C4HunEI8zpfEtV2tfZxGx6P7IjCV4Q479wTqTZMggtySAcOigeyLox68/TweiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9qttUOWE3f7KtzBdKkQg8oK1wo+wu3pzPRZm3mccGo=; b=DmJ4Xzw00/tj9WWyV3I46XRZS29M5+N3Nv6AtfdxqOXrmzTXwyUeCQSEJNFkFlRQ8+TVMS KN2P2VZ29UjxpAFUcGiPzlkPNQ0LNIPTocsuKRW8fal9kl9L9R1SBDANDpDzp0vREMTusc PGe8C99n63v6Fu5vZMrjGSP2brlTTDLOEY8zgwvGgBP+9y8SVIApFj7NkAzez+7mjsz++4 ednFDpO18o8B8IMgkqBmK0EVjBI5PNgW5SQBhaC3b2mwAlr5p8TwdfduEn1B9AYA+hP/l1 PsLpJhBWbpqdKknyLz7reYAMVoRlGXnN218xOfFRYh7hjqBU19JHbzKKSD6brA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvB44BLzSJ; Mon, 25 Dec 2023 14:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPgGh023040; Mon, 25 Dec 2023 14:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPgxD023037; Mon, 25 Dec 2023 14:25:42 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:42 GMT Message-Id: <202312251425.3BPEPgxD023037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 2ed514a220ed - main - lib/libc/amd64/string: add strrchr scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ed514a220edbac6ca5ec9f40a3e0b3f2804796d Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2ed514a220edbac6ca5ec9f40a3e0b3f2804796d commit 2ed514a220edbac6ca5ec9f40a3e0b3f2804796d Author: Robert Clausecker AuthorDate: 2023-10-12 05:37:41 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:22 +0000 lib/libc/amd64/string: add strrchr scalar, baseline implementation The baseline implementation is very straightforward, while the scalar implementation suffers from register pressure and the need to use SWAR techniques similar to those used for strchr(). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42217 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strrchr.S | 209 +++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 51645ba3b8af..2baa631fb3fa 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -16,6 +16,7 @@ MDSRCS+= \ strncmp.S \ strnlen.c \ strpbrk.c \ + strrchr.S \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strrchr.S b/lib/libc/amd64/string/strrchr.S new file mode 100644 index 000000000000..e397bbcd3478 --- /dev/null +++ b/lib/libc/amd64/string/strrchr.S @@ -0,0 +1,209 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 # 16-byte alignment, nop-filled + + .weak rindex + .set rindex, strrchr + +ARCHFUNCS(strrchr) + ARCHFUNC(strrchr, scalar) + ARCHFUNC(strrchr, baseline) +ENDARCHFUNCS(strrchr) + +ARCHENTRY(strrchr, scalar) + mov %edi, %ecx + and $~7, %rdi # align to 8 byte + movzbl %sil, %esi # clear stray high bits + movabs $0x0101010101010101, %r8 + mov (%rdi), %rax # load first word + imul %r8, %rsi # replicate char 8 times + + /* + * Unaligned input: align to 8 bytes. Then proceed the same + * way as with aligned input, but prevent matches before the + * beginning of the string. This is achieved by oring 0x01 + * into each byte of the buffer before the string + */ + shl $3, %ecx + mov %r8, %r10 + shl %cl, %r10 # 0x01 where the string is + xor %r8, %r10 # 0x01 where it is not + neg %r8 # negate 01..01 so we can use lea + movabs $0x8080808080808080, %r9 + + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + or %r10, %rax # ensure str != 0 before string + or %r10, %rcx # ensure str^c != 0 before string + bswap %rcx # in reverse order, to find last match + mov %rdi, %r10 # location of initial mismatch (if any) + xor %r11, %r11 # initial mismatch (none) + add $8, %rdi # advance to next iteration + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jnz 1f # end of string? + + lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + mov %rcx, %r11 # remember mismatch in head + jmp 0f + + /* main loop unrolled twice */ + ALIGN_TEXT +3: lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + lea -8(%rdi), %rdx + cmovnz %rdx, %r10 # remember location of current mismatch + cmovnz %rcx, %r11 + +0: mov (%rdi), %rax # str + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + bswap %rcx # in reverse order, to find last match + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jnz 2f # end of string? + + lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + cmovnz %rdi, %r10 # remember location of current mismatch + cmovnz %rcx, %r11 + + mov 8(%rdi), %rax # str + add $16, %rdi + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + bswap %rcx + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jz 3b # end of string? + + /* NUL found */ +1: sub $8, %rdi # undo advance past buffer +2: lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + lea -1(%rax), %rdx + xor %rdx, %rax # mask of bytes in the string + bswap %rdx # in reverse order + and %rdx, %rcx # c found in the tail? + cmovnz %rdi, %r10 + cmovnz %rcx, %r11 + bswap %r11 # unreverse byte order + bsr %r11, %rcx # last location of c in (R10) + shr $3, %rcx # as byte offset + lea (%r10, %rcx, 1), %rax # pointer to match + test %r11, %r11 # was there actually a match? + cmovz %r11, %rax # if not, return null pointer + ret +ARCHEND(strrchr, scalar) + +ARCHENTRY(strrchr, baseline) + mov %edi, %ecx + and $~0xf, %rdi # align to 16 bytes + movdqa (%rdi), %xmm1 + movd %esi, %xmm0 + and $0xf, %ecx # offset from alignment + pxor %xmm2, %xmm2 + mov $-1, %edx + punpcklbw %xmm0, %xmm0 # c -> cc + shl %cl, %edx # bits corresponding to bytes in the string + punpcklwd %xmm0, %xmm0 # cc -> cccc + xor %r8, %r8 # address of latest match + mov $1, %esi # bit mask of latest match + mov %rdi, %r9 # candidate location for next match + add $16, %rdi # advance to next chunk + + /* check for match in head */ + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pshufd $0, %xmm0, %xmm0 # cccc -> cccccccccccccccc + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + and %edx, %ecx # c present in the string? + and %edx, %eax # NUL present in the string? + jnz .Lend2 + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rdi), %xmm1 + test %ecx, %ecx # was there a match in the last iter.? + cmovnz %r9, %r8 # remember match if any + cmovnz %ecx, %esi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + test %eax, %eax # end of string in first half? + jnz .Lend + + movdqa 16(%rdi), %xmm1 + test %ecx, %ecx # was there a match in the last iter.? + cmovnz %rdi, %r8 # remember match if any + cmovnz %ecx, %esi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + lea 16(%rdi), %r9 + add $32, %rdi + test %eax, %eax # end of string in second half? + jz 0b + + ALIGN_TEXT +.Lend2: sub $16, %rdi +.Lend: lea -1(%rax), %edx + xor %edx, %eax # mask of bytes in the string + and %eax, %ecx # c found in the tail? + cmovnz %rdi, %r8 + cmovnz %ecx, %esi + bsr %esi, %esi # last location of c in (R8) + lea (%r8, %rsi, 1), %rax # pointer to match + ret +ARCHEND(strrchr, baseline) + .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:25:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvD1mCMz54n35; Mon, 25 Dec 2023 14:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvC5x4wz3MZd; Mon, 25 Dec 2023 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V0a7lFjCb3riJ+hrwZbftISoYWFAWFMEWoPBZA5438=; b=pswDZ3xh0vn8kijPpb0L9yd69RrB5uT3pUq+OImc3y66PY2o+GSV+ZojOIO5U2UP5HTYAx CNK9xpxtL5AE25J3CXBwC+0GZdsLFG2HRrhoTWrkBLKc7s+ZKqWHs7Bcw5TKT/h2ChEWOv OlVhYsrZT7D3EjT4X48tckhgNwpRSlsCtwkj7Omy7CjiidhR1oWrNPkg76udQogxuwOp19 XvaKXJPK8OlTIUqkEeSkGi/sM1EdQJy7OQkSUq1SEVunTzS8diIwYAzcxTbpxg8x/P3PHU Fo8iVhC6XB1LqQwybnMV2lEZWImtVV15SgexaDrBQd73n+QEVuVdpYyyENsGEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514343; a=rsa-sha256; cv=none; b=idUBIYRGMRlMnMCSnBuxF7IBPsbH6sFOB5GdDs7RpeZuEZ7o38zocKvOPDFLBVGw40S+Xg l1dJVYO/r2isXbcTClj9nzEuvbaJRLTTuMyzAaWRMBNceIGw4r6lBQ/Ivsp6RAHu4ov2/C isN9UpZdzIMOJ5uHL1KfVGc9M4zbs2N36lC8iaD5NE342LPB/0t+X0z6/bJAJxKnYSSXUk HFKnX/Y7S4WvpvCHLRAuSpofaTEQEQa0qMO/FDV+Ja0pl2MID3cMwSVIb1YnqsqZgTp/Mw Enjn4QfuSJQYHyJxC7OGma9RuANWKOPmPB/UJ34w+lJCBrtQ2LcNPCfAs7df9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V0a7lFjCb3riJ+hrwZbftISoYWFAWFMEWoPBZA5438=; b=rlRbDYHRYe4QErvBVcD4IDre5+KhTX7dqKKrquwAgxfxI/qNOZZxx0D4+FynOnVPtU9AnE e1V4TAbZC3u2NNm0iGsLrfMJoiHdSThcAc00mTRCi6YHjq1/F6WxcTQs2jHuWCWy7gPl1K YbJL+uVL0Jslw9Y2/Ncsg2JpQydOQ5J6JW/VmOKsY6Q6DolgbRbu1XSHnA/iAhq7UnUQOr nJ4eYL5Nw+bMxQH0bn42fhVJ48HREMrW8eTL8EkaHSCPHP/dyJ1X3b+P5IPABl19+P7xE+ OGZRSWTfFVoxGa1nJTsl7zskDBt95nZlQLn5f08q2ab41yovpZs/rGu6mODSAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvC53MKzmM; Mon, 25 Dec 2023 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPhFn023086; Mon, 25 Dec 2023 14:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPhg1023083; Mon, 25 Dec 2023 14:25:43 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:43 GMT Message-Id: <202312251425.3BPEPhg1023083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: dd1c2e887c1f - main - share/man/man7/simd.7: document strrchr scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd1c2e887c1fa087bf15cbf7f0bdc35b7875bdd6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=dd1c2e887c1fa087bf15cbf7f0bdc35b7875bdd6 commit dd1c2e887c1fa087bf15cbf7f0bdc35b7875bdd6 Author: Robert Clausecker AuthorDate: 2023-10-12 22:31:55 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:26 +0000 share/man/man7/simd.7: document strrchr scalar, baseline implementation Also mention missing rindex() entry, which is provided through strrchr(). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42217 --- share/man/man7/simd.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 39642429c1c4..4e5c078a6e95 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 7, 2023 +.Dd October 12, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,7 +63,7 @@ Enhanced functions are present in the following architectures: .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV .It memset Ta Ta S Ta S Ta S -.It rindex Ta S +.It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S @@ -75,7 +75,7 @@ Enhanced functions are present in the following architectures: .It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 -.It strrchr Ta S Ta Ta Ta S +.It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S From nobody Mon Dec 25 14:25:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvF2l71z54nKJ; Mon, 25 Dec 2023 14:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvF0g4rz3MZr; Mon, 25 Dec 2023 14:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cgXLKwTk53PkK9lqGMUxofa50jD8Ziqk/e+wZybA5I=; b=aKEpFo7nGtDDXc7AZ8qjBALz62UYvOOX6Db89McOAaKUdNNA7imXcKQrmfyVIe+YDIxPsz WYcQ+jZ+ptwQg8f33BASTuKZ3AHNPhFA3J1N9NfHAIUltoZyfgKsR/+Y9JT382DK3GcquZ r0uFp5ayB2XieyawiNTsW3SdlAN8OfkS+PKg8lmAw8VpyL8C6AKVwkoFc/goCr/KYinO6i +wcQcDXsRuZN5N1v9HDH7J3x/ZpDx7c5Cl9Eso6PzwqE4DYf4hpM9+FuBzSpCFf3WcJ+CU S8ogimV1uA7VVYncsvTjSKEHpIWfxhIYupbAP6Rv+31VxVHkxWjwobyjljRmvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514345; a=rsa-sha256; cv=none; b=LiwRyB01H6RIKMP6vAvr6sQHfBnwlOcrbHJQz0NO7X5IdOZKj/oBaHc/tKrRHJnwHWPJ5+ lF90eD2MS1WoW+bUUrGeAxyJ2xtS5tJVxY0aPM0iOk6FWT6AOGaTbxl8V7HkpLZ16Jwred y4yshmvzhRb1L7nmnpXoi8f29XJIwbEWBDnBZO0LaS4gaGD1gAZ+MgXGue9rFD/umksYxd qa3iEOdCzaj26A38q0Y8TgTzcUT6H6HV8Nyk1bNFAap9b2apNzI/w0VkEyxGEK/4OVKAEL 2DDaZuFMU1xMgctn70BbkIvYdnk6MUvxYsiHlLpdBxyx/OVfxkAzwsg69t743Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cgXLKwTk53PkK9lqGMUxofa50jD8Ziqk/e+wZybA5I=; b=Ls8sbn8WvEtgqyImtJ/q0W56rKiQX0BoxckOyR1I8NAvrq7bJop3ThDcJcmY1M235zQ7H5 lVdPeSKRvfAXH0fGsIzEmpa0izrfeyWknmhyADi9lBOSwK86oNfRa9BvOcXPZQbyuaRnUo jqQfix5veURGVKxSPoDDGN2SLGwsnVmjFtTeXwBFWanfyk4L7idnlNd0Bp+kDdJyOeaCC2 6h6t7RJ6jrklIEnj+ymm9RQUsy4+Fn+kgY3z+qTfa4BaZmFs/zXb8JaN+vAmzqUChdlY/M ykQ48ynOBANGunRJbfo5eJoB0bJ3rJxOdvW4c4aGXBez8JegbsXzUcQmOhu8og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvD5kykzSK; Mon, 25 Dec 2023 14:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPiAE023128; Mon, 25 Dec 2023 14:25:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPi00023125; Mon, 25 Dec 2023 14:25:44 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:44 GMT Message-Id: <202312251425.3BPEPi00023125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: fd2ecd91aeee - main - lib/libc/amd64/string: implement strsep() through strcspn() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd2ecd91aeeeab579c769c9a39f90b4bd4a493a9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fd2ecd91aeeeab579c769c9a39f90b4bd4a493a9 commit fd2ecd91aeeeab579c769c9a39f90b4bd4a493a9 Author: Robert Clausecker AuthorDate: 2023-10-24 03:52:01 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:30 +0000 lib/libc/amd64/string: implement strsep() through strcspn() The strsep() function is basically strcspn() with extra steps. On amd64, we now have an optimised implementation of strcspn(), so instead of implementing the inner loop manually, just call into the optimised routine. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42346 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strsep.c | 57 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 2baa631fb3fa..ee396f98eccc 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -17,6 +17,7 @@ MDSRCS+= \ strnlen.c \ strpbrk.c \ strrchr.S \ + strsep.c \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strsep.c b/lib/libc/amd64/string/strsep.c new file mode 100644 index 000000000000..9fda56d7e135 --- /dev/null +++ b/lib/libc/amd64/string/strsep.c @@ -0,0 +1,57 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 + +size_t __strcspn(const char *, const char *); + +/* + * We have a fast strcspn() on amd64. Use it over a direct + * implementation of strsep for better performance. + */ +char * +strsep(char **stringp, const char *delim) +{ + size_t n; + char *s; + + s = *stringp; + if (s == NULL) + return (NULL); + + n = __strcspn(s, delim); + if (s[n] == '\0') + *stringp = NULL; + else { + s[n] = '\0'; + *stringp = s + n + 1; + } + + return (s); +} From nobody Mon Dec 25 14:25:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvG31v0z54nKQ; Mon, 25 Dec 2023 14:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvG0Wjcz3Md4; Mon, 25 Dec 2023 14:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qMv63E/ah85t5ap2MMpweFOnPRGZ3RBeavaUB3D2wA=; b=AzW5GFE0RNJQ+A3/z28CXXYbgFA2DAtISw60Wme6eK8Meg7f6GIDz6icHQhs/swvsdHP+u SzcHnHnmBisNekGwDr8a9pbvX27PCMm2udo4OVdkEiQrOd7GRim4gJCQ4ygh+Aci6B0JSY a7/iOB5hHzknrDo1ETDYun+uqJuOEY27fEhJU7qUasPk43bXn5RNUQeb55IUxorC4m64Nj cluMdcljK1kbNk/d3fkqQiyyjpfY04EVPcoCtfYZWwJxZwP/eqEgZ/N4G5ACG7V2+j6NwX LNh0R3zhpxd/uzMugPA+349x1dZyfKxcwTjHHNamoKVOgnsobvyO5vcchN9M3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514346; a=rsa-sha256; cv=none; b=EhCvmHCmVaFMfYgh5ij1W21ga3gAwCmjNo3S4iuNJFYI11YdR1U7Lmk6LCWniBf/uAQJWQ 3D29q2q90BaWiDsX++KsmItLATl1XE3uG5MfubNzlQ+1kVbOCJIMiNFdBlEMJLlQ46QDVJ swmUp1+nNki/KdMSKO75PZ2NFRes5uMegg3ii1uQGD5HBqewFmUPOHtxY7/FrOD9Ri8NBS n7e9ZtPTnQ6lH2kYMfBrMyR793BuzctJyg+NFiEkHecKbbeVtt2gb78Ky2/C+VGUJgOVGm IIs1hihYsrH7E/huegGJ8OQsHW8WdhgMLjxYT0ccDeOSNQKo3+/tULY+3yIYkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qMv63E/ah85t5ap2MMpweFOnPRGZ3RBeavaUB3D2wA=; b=l8VJyiH+NLlMduPxz25c5op6OP4mNIUsDAuPBxLwc8MiuhhdecfMWxZz6Y+BI1TgaTYa1E VUUcIFhNKBMAFVwZ/RrzvJGOU3k8LTDX6WAcuJZWALcqT49m9vchgGkO9gxXAlKekbs3Pq fhbR3QMgbo7bAG9tnXEsb+HxT6iy8iF7cfuOMGjSP+V1lk8gWjdPLKXYGuXPHz796g/ssf uRMs2fGxgoFQes59T1otV3l2wZOE2ZXczL4JQeOUoJVEuya3TX7u93Rs2TpV3xEQYfMxyi 53UG6LaPSI/DbESRsN6j/HrYSjSm3qqwp6WQD7A9Da5qX6TD5X+7eiAQRqJLMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvF6kjSzYK; Mon, 25 Dec 2023 14:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPjcf023183; Mon, 25 Dec 2023 14:25:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPjIA023180; Mon, 25 Dec 2023 14:25:45 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:45 GMT Message-Id: <202312251425.3BPEPjIA023180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 75cb202698a6 - main - share/man/man7/simd.7: document amd64 SIMD use for strsep() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75cb202698a65cb809eb2fea194a73e79c509d9c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=75cb202698a65cb809eb2fea194a73e79c509d9c commit 75cb202698a65cb809eb2fea194a73e79c509d9c Author: Robert Clausecker AuthorDate: 2023-10-24 03:57:56 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:34 +0000 share/man/man7/simd.7: document amd64 SIMD use for strsep() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42346 --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 4e5c078a6e95..4437d025394f 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 12, 2023 +.Dd October 23, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -77,6 +77,7 @@ Enhanced functions are present in the following architectures: .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 +.It strsep Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 From nobody Mon Dec 25 14:25:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvH45zsz54mvf; Mon, 25 Dec 2023 14:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvH184yz3Mpg; Mon, 25 Dec 2023 14:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUaNz7au34G+L7QdsvH+6LxMuTsrf6PaxIfwu3i8IMA=; b=jb/x9Ndltb+fckWBWktfE8OIiZRvJ9Q98qeDe8IdRCySypjVV7SRGV3rjEB+RpnXNVo1Rt MgUQg2OUOO0NWsxCmXkXt4nmHcuIQevscaDrPPrVd9+bWCx8lwgFHRSLTdyb1jWij53iWp 6JOlPtDv8W9hCMuZpPd4lc2C9ltOFkHFFAivdvRnIIsQfJO+aOdgiPgEXIkgLc3gkT9rOI GBkbDyJITYrULOPJeCEFtksT0UqHAhljwcXLBjIBsWU8CR+Li6nqAmX+kv6CWzizLJWWWF L6M0OKGqbgxF13lr4qUvX8hDvii21Ow7JIgmJAshu+r4NoqizeoH8vzf/jE8Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514347; a=rsa-sha256; cv=none; b=npyHyu6cQD8yDISxOCVIkWua3DxygMD85W5kiYZdpw+J7qY1JlzsJzDeLB6XEjG7scawKP 6c+xnpcBomJcRram9EorG9pMpZg4C0zp4TGCOJu8Z8fApcOxSTzoCjfG4P4C4v5daBB7fA IxBqE6J+bHyhTkx7pWBntHn9uJeTzP5AQaivWKH8maWCvfRDFKyifeboy4M6BTz+O+gl/e h3PgJnOcd4U3RlzAoSodVE7Dp7W0Fa76KWEZAfCfiyuECp+ZwOMWyhcnCOgD4alYNrwgGa XWv9/7aMmJhxoaqoduMHBVRCEw+k3y5TfDaLAHiN52/HjJ7Oqd4qa6yeFcCfmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUaNz7au34G+L7QdsvH+6LxMuTsrf6PaxIfwu3i8IMA=; b=WA51KATq0Jv5bEJ+KCwXDxzdfnWfyzOMPnIz15ukB2Ma44sUWMmpBx/QHE5oRrIFtdQhxc myJMGg8od5P2udcGxfXac3tm/Sz9zELPc4rr0fkBQ+rCBfLUohYieuZpAKqQlWg1vcrxW8 7AMb6lbe8Pi5qIDDhqD1kv37DhhvoDRtbC4+Ik70I2EK7Hu9cX2xyA55aRLCKCz91WSjiJ uQh5UieAnzV1KXgjqOhCTA3gew9raPEcE4WFC2qQWSwXML5gDAIJKPPxIFWhEG8L+my9y/ BZ4Wr7SbK47fkEb3q6yHu7qUgYLED5ffAl8QCXUymg+WIPrIilvwMN47G1J1aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvH0C8lzJx; Mon, 25 Dec 2023 14:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPktI023228; Mon, 25 Dec 2023 14:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPkgB023225; Mon, 25 Dec 2023 14:25:46 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:46 GMT Message-Id: <202312251425.3BPEPkgB023225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 6fa9e7d87375 - main - lib/libc/tests/string/stpncpy_test.c: extend for upcoming SSE implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fa9e7d8737548ef93c573387ce62402c368d486 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=6fa9e7d8737548ef93c573387ce62402c368d486 commit 6fa9e7d8737548ef93c573387ce62402c368d486 Author: Robert Clausecker AuthorDate: 2023-11-05 04:02:00 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:37 +0000 lib/libc/tests/string/stpncpy_test.c: extend for upcoming SSE implementation This adds additional unit tests validating the function for All possible alignment offsets of source and destination. Also extend the test to allow testing of an external stpncpy implementation, which greatly simplifies the development of custom implementations. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 --- lib/libc/tests/string/stpncpy_test.c | 99 +++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 14 deletions(-) diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c index 8154237eb8c2..8574b2d591be 100644 --- a/lib/libc/tests/string/stpncpy_test.c +++ b/lib/libc/tests/string/stpncpy_test.c @@ -1,7 +1,11 @@ /*- * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by Robert Clausecker + * 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: @@ -27,12 +31,15 @@ #include #include #include +#include #include #include #include #include +static char *(*stpncpy_fn)(char *restrict, const char *restrict, size_t); + static char * makebuf(size_t len, int guard_at_end) { @@ -69,7 +76,7 @@ test_stpncpy(const char *s) dst = makebuf(bufsize, j); memset(dst, 'X', bufsize); len = (bufsize < size) ? bufsize : size - 1; - assert(stpncpy(dst, src, bufsize) == dst+len); + assert(stpncpy_fn(dst, src, bufsize) == dst+len); assert(memcmp(src, dst, len) == 0); for (x = len; x < bufsize; x++) assert(dst[x] == '\0'); @@ -78,33 +85,97 @@ test_stpncpy(const char *s) } } -ATF_TC_WITHOUT_HEAD(nul); -ATF_TC_BODY(nul, tc) +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) { + size_t i; + const char *res, *wantres; + const char *fail = NULL; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + src[srclen] = '\0'; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen+1] = ')'; + + memset(dest, 0xee, destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + wantres = dest + (srclen > destlen ? destlen : srclen); + res = stpncpy_fn(dest, src, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (strncmp(src, dest, destlen) != 0) + fail = "string not copied correctly"; + else if (res != wantres) + fail = "incorrect return value"; + else for (i = srclen; i < destlen; i++) + if (dest[i] != '\0') { + fail = "incomplete NUL padding"; + break; + } - test_stpncpy(""); + if (fail) + atf_tc_fail_nonfatal("%s\n" + "stpncpy(%p \"%s\", %p \"%s\", %zu) = %p (want %p)\n", + fail, dest, dest, src, src, destlen, res, wantres); } -ATF_TC_WITHOUT_HEAD(foo); -ATF_TC_BODY(foo, tc) +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) { - - test_stpncpy("foo"); + ATF_CHECK_EQ(stpncpy_fn(NULL, NULL, 0), NULL); } -ATF_TC_WITHOUT_HEAD(glorp); -ATF_TC_BODY(glorp, tc) +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) { + size_t i; + char buf[64+1]; - test_stpncpy("glorp"); + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + buf[i+1] = '\0'; + test_stpncpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+3+64]; /* 15 offsets + 64 max length + NUL + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 0; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); } ATF_TP_ADD_TCS(tp) { + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + stpncpy_fn = dlsym(dl_handle, "test_stpncpy"); + if (stpncpy_fn == NULL) + stpncpy_fn = stpncpy; - ATF_TP_ADD_TC(tp, nul); - ATF_TP_ADD_TC(tp, foo); - ATF_TP_ADD_TC(tp, glorp); + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); return (atf_no_error()); } From nobody Mon Dec 25 14:25:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvJ4FJCz54mvj; Mon, 25 Dec 2023 14:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvJ2QSHz3Mh5; Mon, 25 Dec 2023 14:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z6DRkrDKL9FzWCkvbmK8N2ZuwK9KulPVY8dtlaZMArk=; b=usViTRSoKlpCEeSJJUM6dp6U66GE4RZizJ29/pwbkk7uhjHuItmnqfPWm7NKQf3XfnJsVO JAbdZuE02iGBaEBEvtFMCoY0Sn3cMKAPBdoOYWhiRCQQD25h09JqrlJLDqloCPpablqWZ2 r9N4e+CM7w/LKVkANKwlwCUFdhQsxS/7b6m82+rUhIDjXTXQJmESJxJmfY0zWoOBOEtGkg J+I5PwRxxOzSqLHP4ZTJq58CgUhIzablB0EFgzjgOgA7IYvVLw4QnvG4bpzgNOKbwXDY3t oeFeQBNYcyzpAfIa09pbBrOC0GDd2Szp8lEAUnu58lXLwfNabYMZ0n8di1mSsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514348; a=rsa-sha256; cv=none; b=O63rPVcujbEPg0fLZvLNadcjlXYnU6CpMaUJUH4hOXSuImkHjpM/rqjHIgWyvAa4JP63sQ cMhhOJAZSzILpP6V6HcXxulIbaxpusCpfmNavby7f2l10PkY1OLSClqjzac89qgiFoXgFv lbiaafsyeuvLYrwxPC9+9KruqJsIQAdiLQ8JIvYZAxHU6Tot3OishMqNzHwPy5VB+fFjRY yb/dQft8jISbRQxXtQmeyks8btbOE6XRV4W6b6CCBCG2gPPr3EmEGsDlYAAiiRRcLB19wN h6hZownZT/OTLTN5eVE/hcvTPmsdZqbJpgQTYvJZelJsFFtv7EQJcQrVD/LV6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z6DRkrDKL9FzWCkvbmK8N2ZuwK9KulPVY8dtlaZMArk=; b=Re0PSPKUCXgPYemGFygSC0HRuXeR/XIPizbbYDLHBf5boapDDjX2acbNW/TqfzuZS6s0aD qK8njuWbarYDAqmvVvoDWLVCv/fv1ZAvxThNV1jkzYTEbZ29+xCFAVmC297vNtTyDh+JA4 ltle2YHnzFMUIuIEHKMBtLD9548BL/JOduG9q3/rcJgHVevoZR253AYKe7zFD05ee7fQS2 1/ND1rG1Xxl3I6MIkMiR/6OnHht9NPVCu81E+ucGqVXXbs7goL/U98fq7C7N/ZvMb1YCwA V+N4503JoSslMon0I1fhjTYMBYA4ASHh3AD4iibsimFpKcFYg7CQ8UOuzmCX7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvJ1DPbzbc; Mon, 25 Dec 2023 14:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPmXc023277; Mon, 25 Dec 2023 14:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPmeo023274; Mon, 25 Dec 2023 14:25:48 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:48 GMT Message-Id: <202312251425.3BPEPmeo023274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 90253d49db09 - main - lib/libc/amd64/string: add stpncpy scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90253d49db09a9b1490c448d05314f3e4bbfa468 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=90253d49db09a9b1490c448d05314f3e4bbfa468 commit 90253d49db09a9b1490c448d05314f3e4bbfa468 Author: Robert Clausecker AuthorDate: 2023-10-30 03:15:46 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:42 +0000 lib/libc/amd64/string: add stpncpy scalar, baseline implementation This was surprisingly annoying to get right, despite being such a simple function. A scalar implementation is also provided, it just calls into our optimised memchr(), memcpy(), and memset() routines to carry out its job. I'm quite happy with the performance. glibc only beats us for very long strings, likely due to the use of AVX-512. The scalar implementation just calls into our optimised memchr(), memcpy(), and memset() routines, so it has a high overhead to begin with but then performs ok for the amount of effort that went into it. Still beats the old C code, except for very short strings. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/stpncpy.S | 283 +++++++++++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index ee396f98eccc..cc8b0e825e3e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -7,6 +7,7 @@ MDSRCS+= \ memmove.S \ memset.S \ stpcpy.S \ + stpncpy.S \ strcat.S \ strchrnul.S \ strcmp.S \ diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S new file mode 100644 index 000000000000..5ce0dd093a9e --- /dev/null +++ b/lib/libc/amd64/string/stpncpy.S @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak stpncpy + .set stpncpy, __stpncpy +ARCHFUNCS(__stpncpy) + ARCHFUNC(__stpncpy, scalar) + ARCHFUNC(__stpncpy, baseline) +ENDARCHFUNCS(__stpncpy) + +ARCHENTRY(__stpncpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + + push %rdx + push %rdi + push %rsi + push %rax # dummy push for alignment + + mov %rsi, %rdi + xor %esi, %esi + call CNAME(__memchr) # memchr(src, '\0', len) + pop %rcx # dummy pop + pop %rsi + mov -16(%rbp), %rdi + + test %rax, %rax # NUL found? + jz .Lfullcopy + + mov %rax, %rdx + sub %rsi, %rdx # copy until the NUL byte + add %rdx, -16(%rbp) # advance destination by string length + sub %rdx, -8(%rbp) # and shorten buffer size by string length + call CNAME(memcpy) + + pop %rdi + pop %rdx + xor %esi, %esi + pop %rbp + jmp CNAME(memset) # clear remaining buffer + +.Lfullcopy: + mov -8(%rbp), %rdx + call CNAME(memcpy) # copy whole string + add -8(%rbp), %rax # point to dest[n] + leave + ret +ARCHEND(__stpncpy, scalar) + + /* + * this mask allows us to generate masks of 16-n 0xff bytes + * followed by n 0x00 bytes by loading from .Lmask+n. + */ + .section .rodata +.Lmask: .quad 0xffffffffffffffff + .quad 0xffffffffffffffff + .quad 0x0000000000000000 + .quad 0x0000000000000000 + +/* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ +ARCHENTRY(__stpncpy, baseline) +#define bounce (-3*16-8) /* location of on-stack bounce buffer */ + + test %rdx, %rdx # no bytes to copy? + jz .L0 + + mov %esi, %ecx + and $~0xf, %rsi # align source to 16 bytes + movdqa (%rsi), %xmm0 # load head + and $0xf, %ecx # offset from alignment + mov $-1, %r9d + lea -32(%rcx), %rax # set up overflow-proof comparison rdx+rcx<=32 + shl %cl, %r9d # mask of bytes belonging to the string + sub %rcx, %rdi # adjust RDI to correspond to RSI + pxor %xmm1, %xmm1 + movdqa %xmm0, bounce(%rsp) # stash copy of head on the stack + pcmpeqb %xmm1, %xmm0 + pmovmskb %xmm0, %r8d + + lea (%rdx, %rcx, 1), %r10 # buffer length from alignment boundary + add %rdx, %rax # less than 2 chunks (32 bytes) to play with? + jnc .Lrunt # if yes, use special runt processing + + movdqu %xmm1, -16(%rdi, %r10, 1) # clear final bytes of destination + and %r9d, %r8d # end of string within head? + jnz .Lheadnul + + movdqu (%rsi, %rcx, 1), %xmm2 # load head from source buffer + movdqu %xmm2, (%rdi, %rcx, 1) # an deposit + + add $16, %rsi + add $16, %rdi + sub $32, %r10 + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rsi), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %r8d + test %r8d, %r8d + jnz 3f + + movdqu %xmm0, (%rdi) + cmp $16, %r10 # more than a full chunk left? + jbe 1f + + movdqa 16(%rsi), %xmm0 + add $32, %rdi # advance pointers to next chunk + add $32, %rsi + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %r8d + test %r8d, %r8d + jnz 2f + + movdqu %xmm0, -16(%rdi) + sub $32, %r10 # more than another full chunk left? + ja 0b + + sub $16, %rdi # undo second advancement + sub $16, %rsi + add $16, %r10d # restore number of remaining bytes + + /* 1--16 bytes left but string has not ended yet */ +1: pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi), %xmm1 # NUL byte in source tail? + pmovmskb %xmm1, %r8d + bts %r10d, %r8d # treat end of buffer as NUL + tzcnt %r8d, %r8d # where is the NUL byte? + movdqu (%rsi, %r8, 1), %xmm0 # load source tail before NUL + lea 16(%rdi, %r8, 1), %rax # point return value to NUL byte + # or end of buffer + movdqu %xmm0, (%rdi, %r8, 1) # store tail into the buffer + ret + +2: sub $16, %rdi # undo second advancement + sub $16, %rsi + sub $16, %r10 + + /* string has ended and buffer has not */ +3: tzcnt %r8d, %r8d # where did the string end? + lea .Lmask+16(%rip), %rcx + lea (%rdi, %r8, 1), %rax # where the NUL byte will be + neg %r8 + movdqu (%rcx, %r8, 1), %xmm1 # mask with FF where the string is, + # 00 where it is not + pand %xmm1, %xmm0 # mask out bytes after the string + movdqu %xmm0, (%rdi) # store masked current chunk + pxor %xmm1, %xmm1 + sub $16, %r10 # another full chunk left? + jbe 1f + + /* clear remaining destination buffer (tail has been cleared earlier) */ + ALIGN_TEXT +0: movdqu %xmm1, 16(%rdi) + cmp $16, %r10 + jbe 1f + + movdqu %xmm1, 32(%rdi) + add $32, %rdi + sub $32, %r10 + ja 0b + +1: ret + + /* at least two chunks to play with and NUL while processing head */ +.Lheadnul: + movdqu bounce(%rsp, %rcx, 1), %xmm0 # load start of source from stack + tzcnt %r8d, %r8d # find location of NUL byte + movdqu %xmm0, (%rdi, %rcx, 1) # deposit head in the destination + movdqu %xmm1, (%rdi, %r8, 1) # clear out following bytes + movdqu %xmm1, 16(%rdi) # clear out second chunk + lea (%rdi, %r8, 1), %rax # make RAX point to the NUL byte + + add $32, %rdi # advance past first two chunks + sub $32+16, %r10 # advance past first three chunks + jbe 1f # did we pass the end of the buffer? + + /* clear remaining destination buffer (tail has been cleared earlier) */ + ALIGN_TEXT +0: movdqu %xmm1, (%rdi) # clear out buffer chunk + cmp $16, %r10 + jbe 1f + + movdqu %xmm1, 16(%rdi) + add $32, %rdi + sub $32, %r10 + ja 0b + +1: ret + + /* 1--32 bytes to copy, bounce through the stack */ +.Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy + bts %r10d, %r8d # treat end of buffer as end of string + and %r9w, %r8w # end of string within first buffer? + jnz 0f # if yes, do not inspect second buffer + + movdqa 16(%rsi), %xmm0 # load second chunk of input + movdqa %xmm0, bounce+16(%rsp) # stash copy on stack + pcmpeqb %xmm1, %xmm0 # NUL in second chunk? + pmovmskb %xmm0, %r9d + shl $16, %r9d + or %r9d, %r8d # merge found NUL bytes into NUL mask + + /* end of string after one buffer */ +0: tzcnt %r8d, %r8d # location of last char in string + movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string + lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack + lea (%rdi, %r8, 1), %rax # return pointer to NUL byte + + cmp $16, %edx # at least 16 bytes to transfer? + jae .L1631 + + mov (%rsi), %r8 # load string head + cmp $8, %edx # at least 8 bytes to transfer? + jae .L0815 + + cmp $4, %edx # at least 4 bytes to transfer? + jae .L0407 + + movzwl -2(%rsi, %rdx, 1), %esi # load last two bytes of string + mov %r8b, (%rdi, %rcx, 1) # store first byte + + cmp $2, %edx # at least 2 bytes to transfer? + jb .L1 + + mov %si, -2(%rdi, %r10, 1) # store last two bytes of string +.L1: ret + +.L1631: movdqu (%rsi), %xmm0 # load first 16 bytes of string + movdqu -16(%rsi, %rdx, 1), %xmm1 # load last 16 bytes of string + movdqu %xmm0, (%rdi, %rcx, 1) + movdqu %xmm1, -16(%rdi, %r10, 1) + ret + +.L0815: mov -8(%rsi, %rdx, 1), %rdx # load last 8 bytes of string + mov %r8, (%rdi, %rcx, 1) + mov %rdx, -8(%rdi, %r10, 1) + ret + +.L0407: mov -4(%rsi, %rdx, 1), %edx # load last four bytes of string + mov %r8d, (%rdi, %rcx, 1) + mov %edx, -4(%rdi, %r10, 1) + ret + + /* length 0 buffer: just return dest */ +.L0: mov %rdi, %rax + ret +ARCHEND(__stpncpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:25:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvK657vz54nDn; Mon, 25 Dec 2023 14:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvK3G45z3Mdd; Mon, 25 Dec 2023 14:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlEqNwtPUZ0+/QErIYOGghZ1ryw0UTpwwZiwHGQCmV0=; b=M4RbupMpjj1sDAFt//8c2jZzBWpZuk1pGLmQGFtUkzA9xnSm2NLovv4ZFK34EA/J7F32Oj 3FvDfOCzH/0knm+xUV4RClDCv2UwXLBC5RHM41J5kTlBpKFOvFl06LnvjnfJwZZ3c1T477 QzTQyjUui/9iBZwNLIiZptKjkxFHswN54E07LGrqaIgW1giwkO/DlsbWgEHNXPebTUEB4d R75+Lo/PhNmNPBUvoUloa1CjIoAr+xZSMG9nLU+LZS3VxKjpgSMU4fFimflH9g2cl6X2A1 bhFTC8cgWwOS/PIgJao6Z3RzNTNb3T7Rf98M+gK2MVvioRKM37cyOPQyoplR+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514349; a=rsa-sha256; cv=none; b=v24CG5RZPnx0J00CmR4nhlY8u72uKMQyEHg0qdgket7LyXB4KmW9svsV60znWXEx143a10 PNmaR0qk8GNdw+B4YNRS93b8OTIwwp8MokzW0x4UT3rrRh+xPu3STbQlWtmtJHqIdBDVbA ep4LTuqLvnP8AUfiLIT+jIUobfttdvlZsiofBlMfGzs8YcSywLDUPta7J5zSoiMr/kpjZB ATH+4uMHWHjD7iizrm+6I2ScAbj95BZ0EfDZNu+vauE0hjqujafodsx0/fScNx82+35at6 cpBM9fVxPoJthiqnhZoyJuP+oV1sqX0gc2LpppnNWYiV9fS1m1ptuiavcNYMzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlEqNwtPUZ0+/QErIYOGghZ1ryw0UTpwwZiwHGQCmV0=; b=BYv/vpGhYwiDiIsNYax6RGU+0hY6A6qaWQJuBuK2CD/xFZnRpwlPFdFPZaTB/khVNZVqAQ yL2bZwS655uAbu4v0Urnu3FUPxJXlbRceiXNp3FcMeIHTcwCUgUas9agN2w2UCHkYkFSZk x3DJK0yjfANS2IMGHni2HnosikEoNAEiZK8y4KNKB5Wqfy2cbAmzYr3k7QEo4Uj4JXUlBq qf/ZrFFTaPSIDkJcA/YtrKctYGWc4LyHPrKMbFTlFQ2sSgQ/FDixXiv2abk+4bnRlfo04Z rn9UlLxkyTQNIE+TrSXXhfDqk5rOzH1tbS6C+wKxUGiEUcTvEar/hbtU3i1AaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvK1vzDzbd; Mon, 25 Dec 2023 14:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPnXn023329; Mon, 25 Dec 2023 14:25:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPnKm023326; Mon, 25 Dec 2023 14:25:49 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:49 GMT Message-Id: <202312251425.3BPEPnKm023326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: e19d46c80826 - main - lib/libc/amd64/string: implement strncpy() by calling stpncpy() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e19d46c808267f53455e96a28ff7654211523d2c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e19d46c808267f53455e96a28ff7654211523d2c commit e19d46c808267f53455e96a28ff7654211523d2c Author: Robert Clausecker AuthorDate: 2023-11-09 04:25:55 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:48 +0000 lib/libc/amd64/string: implement strncpy() by calling stpncpy() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncpy.c | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index cc8b0e825e3e..d982061e080b 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -15,6 +15,7 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strncmp.S \ + strncpy.c \ strnlen.c \ strpbrk.c \ strrchr.S \ diff --git a/lib/libc/amd64/string/strncpy.c b/lib/libc/amd64/string/strncpy.c new file mode 100644 index 000000000000..b3d868787fbe --- /dev/null +++ b/lib/libc/amd64/string/strncpy.c @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 + +char *__stpncpy(char *restrict, const char *restrict, size_t); + +char * +strncpy(char *restrict dst, const char *restrict src, size_t len) +{ + + __stpncpy(dst, src, len); + + return (dst); +} From nobody Mon Dec 25 14:25:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvM0Nyrz54n3V; Mon, 25 Dec 2023 14:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvL3cbPz3McC; Mon, 25 Dec 2023 14:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0dk8pwwfuy8rbiXgEMM5L+GmnvZ0UoesjcLMB/EHks=; b=FpjkkQeogxuOXW1krzT5NOxeDCxkxTq0f0wza7+lqIzER0ANzvNlgfMQdphvq3ideTp8ZT GA9oIIBitfyTCA73BjLjSEDHe/5gMKGk/PTfZrA6KXKGWwkBPiDKdCxhr++ooL0lHOFQWy YN5dGEV0ySsNvjSMM5icopeWx3ZddxV08hygbNDwVy86KMyKyusscj7LRNisG5XSEcSXnw v2YU94PSze+yxfB/HizWaHIQD8RGRN+MMs1dyl6ZvrZG86RRQYA/rqhihM08B+wowJW1qP fSR3iIIMiRT7BPbN5mjI7WNOPVvRrjrETn2kuCdqC3U2tfBhfMoIrdSvuGyrlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514350; a=rsa-sha256; cv=none; b=XHPYCzed1RpRpIQYtYrQtXNFHrgyuEeH2t93w2lmwLppGo2llBmXmxCNTFpzgN78GesAIZ C++x52zgv83JykKfGxNIL2dLG/+zPv+C8QmnqGkGOsQ6TtgplDXElN7VQrXT42jK83KL7t MmCCu0prg0dT7M6mi+N1uY4Z+BIL12DOBBVDIlLPynehg9+j2Wf91DB/48QXHwQV2/OY7e MAIx1JfIj6knT1f/Naeq2vGhYPSmzcNyhmHT6axD+VhtxuGvK0GomMWSD8kCVzUDnz/uv5 fsDn1gCpTFoDI78Ur0gm/krWbC2BvTN9rlQ1RqbRKYj3HV3iZO1cGpBJLKDO/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0dk8pwwfuy8rbiXgEMM5L+GmnvZ0UoesjcLMB/EHks=; b=L0wY90WLyufn1A9NwfYY4TOPAx3etN04zLX/YjcrinirJhAQWf9KrGn7s59w5bb3ICED3D oLuY0PpCHx2ott0oXS3/OclCo+cg5lAc7IjNPF/+uZMQau+KceLlq8M79j3q9sU0tkrQEZ 0kh0Qs+C9ZawU7Y1eFSvZV0tnKjf3pg2tezJgMW+CVqb7Rpi4JaUllNCTnqH1rTZG9mBwp ecJEtn2TiGWIUBYH7UaKZlobMra3gP/idZgqgrFTaIhuDp3qLkIqAhdIaRSdMVBbIfMqwo pXEU9SxDtUo/ABXcx+VawAUemrPmaKXh0ZlZn0gMWhSI9qo5cK6tM9six+zYQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvL2fVfzbf; Mon, 25 Dec 2023 14:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPotC023371; Mon, 25 Dec 2023 14:25:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPoYi023368; Mon, 25 Dec 2023 14:25:50 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:50 GMT Message-Id: <202312251425.3BPEPoYi023368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 75a9e2250656 - main - share/man/man7/simd.7: document simd-enhanced strncpy, stpncpy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75a9e2250656ff78ec1b0a124f282b925138ff51 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=75a9e2250656ff78ec1b0a124f282b925138ff51 commit 75a9e2250656ff78ec1b0a124f282b925138ff51 Author: Robert Clausecker AuthorDate: 2023-11-09 04:39:11 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:50 +0000 share/man/man7/simd.7: document simd-enhanced strncpy, stpncpy Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 --- share/man/man7/simd.7 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 4437d025394f..f3818c530af5 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 23, 2023 +.Dd November 8, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -65,6 +65,7 @@ Enhanced functions are present in the following architectures: .It memset Ta Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 +.It stpncpy Ta Ta Ta S1 .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 @@ -73,7 +74,7 @@ Enhanced functions are present in the following architectures: .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta S1 Ta S -.It strncpy Ta Ta Ta Ta Ta S2 +.It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 @@ -209,7 +210,7 @@ SIMD-enhanced functions were first added with for .Cm powerpc64 and with -.Fx 14.0 +.Fx 14.1 for .Cm amd64 . .Pp From nobody Mon Dec 25 14:25:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvM5vDcz54nKf; Mon, 25 Dec 2023 14:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvM4pLPz3Mhk; Mon, 25 Dec 2023 14:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X10wquK/qdCNt6cD8Em2YCJCNm0ysgA7DTtCnvkoje4=; b=ZD5Yi0i6/APqlo9l9jbwygEt8qwHO7+e6BZ4cTjknQAXHl0U1gU6/tRvTjMr1aOW1h8hDf ISbGmCF7WzJfHfgleGrjeL/SeTyh7BIeUO6Yht+ku4xuqU6Ige19oK4LeCPj64rgo+miFp Aa92X/NaJRHUR+JCeu2f9ZEIQVdiO6LOnoI+FKZmhY+gllfqLXjcWzh7YuxYU9Do6qjXWP RdpqUDwLObcBRsuWe0kwIWlUCntY4B9ZHVdy8+cn8tDKn+k8Z6nN/3eEpq4fOAjjshq3Lx C5z/yx7rEr+LjYrFGhzI1DF+OnnV1VQLxeiu+Kf+/MB1grTZzxsAlt1wv2iKew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514351; a=rsa-sha256; cv=none; b=Fbl7WjpNBmGB4lLZfnXyXgPAfofj1B7tW+16aq/khbHqN7b2EAVoAFEMUr1Toxq02d/N/+ 5okN7RizxVbKdaNplF2pUuElZ/ZTG/IuBI742P5RiQTskVDdHTkoJF275zFLYxC/YcTdud QteLXIjf44h0PdCj1jScN0IfailiLGhuSPAeFWVDEq4AFtJuDo1kK5ZhNVu9ORDOfjA1AZ CYdv/ziiDdi6bK7ynxRnFJgs0a4mrwacwQgqAzziL1t3Umvkaows1PwALlZA1NUU9M9YH7 KGBKZoRq0pgyF1436Eew3NxGwp5xRN5hBo4sNU79LrTBjmOQU/xN23jDr6Exug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X10wquK/qdCNt6cD8Em2YCJCNm0ysgA7DTtCnvkoje4=; b=YvgTDW10tD/2X9PQowbRCSLs3EnR8XEgGKL2brewis9jDWWYYT57BcPL7GsQcdIlRCKY/+ 0bkx3FQcwETqMGTCfkhUwxbjPhy0wVwtOc87Qvf+jMgR9NdGZruWMENgU0BCu/jnrijfAa r5Af53OxudKdH4oF/3lLZzWk+6dcW1oNGG1X9FldA4ohI51pvj+FgDuTtimy9g3u0rQaZ4 qND3JRommt4umgHTQm0IaqcAxgcS1WGApKwH0hsfsv92KrwOuX1GJHcKcVhXG0L93HgZ0v zty4ov7EqqnL8EX95R6PSTsn5lV6uMotVROL9tL11GxnJnOk6NCdaV6neyLHxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvM3t96zJy; Mon, 25 Dec 2023 14:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPpSj023419; Mon, 25 Dec 2023 14:25:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPpkY023416; Mon, 25 Dec 2023 14:25:51 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:51 GMT Message-Id: <202312251425.3BPEPpkY023416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: aff9143a242c - main - lib/libc/amd64/string/strcat.S: enable use of SIMD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aff9143a242c0012b0195b3666e03fa3b7cd33e8 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=aff9143a242c0012b0195b3666e03fa3b7cd33e8 commit aff9143a242c0012b0195b3666e03fa3b7cd33e8 Author: Robert Clausecker AuthorDate: 2023-11-14 18:09:08 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:53 +0000 lib/libc/amd64/string/strcat.S: enable use of SIMD strcat has a bespoke scalar assembly implementation we inherited from NetBSD. While it performs well, it is better to call into our SIMD implementations if any SIMD features are available at all. So do that and implement strcat() by calling into strlen() and strcpy() if these are available. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Reviison: https://reviews.freebsd.org/D42600 --- lib/libc/amd64/string/strcat.S | 47 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S index 0834408acfb7..081e98840cee 100644 --- a/lib/libc/amd64/string/strcat.S +++ b/lib/libc/amd64/string/strcat.S @@ -1,6 +1,14 @@ -/* - * Written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcat.S + * written by J.T. Conklin + * that was originally dedicated to the public domain */ #include @@ -8,7 +16,14 @@ RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $") #endif -ENTRY(strcat) +#include "amd64_archlevel.h" + +ARCHFUNCS(strcat) + ARCHFUNC(strcat, scalar) + ARCHFUNC(strcat, baseline) +ENDARCHFUNCS(strcat) + +ARCHENTRY(strcat, scalar) movq %rdi,%rax movabsq $0x0101010101010101,%r8 movabsq $0x8080808080808080,%r9 @@ -161,6 +176,28 @@ ENTRY(strcat) .Ldone: ret -END(strcat) +ARCHEND(strcat, scalar) + +/* + * Call into strlen + strcpy if we have any SIMD at all. + * The scalar implementation above is better for the scalar + * case as it avoids the function call overhead, but pessimal + * if we could call SIMD routines instead. + */ +ARCHENTRY(strcat, baseline) + push %rbp + mov %rsp, %rbp + push %rsi + push %rbx + mov %rdi, %rbx # remember destination for later + call CNAME(strlen) # strlen(dest) + mov -8(%rbp), %rsi + lea (%rbx, %rax, 1), %rdi # dest + strlen(dest) + call CNAME(__stpcpy) # stpcpy(dest + strlen(dest), src) + mov %rbx, %rax # return dest + pop %rbx + leave + ret +ARCHEND(strcat, baseline) .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:25:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvP1dJgz54n8B; Mon, 25 Dec 2023 14:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvN5qxCz3MnL; Mon, 25 Dec 2023 14:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpsv3Lr3cAylXG2TAGvO1JuPH3Dl9hPv+Wj7hzA9qAk=; b=R579DpvV+5Eiv0sKSOuKC7mg8+ZvnnFGIb+iFr7Ibwm8Qv+rUDIwSwDnQTWLwFcLMr1yWe 4xKmuwFZatldtv/y7ir+cGA4Ic7SKGfHjKX2CFBPEQvCdBSYvIdBeA+bN4OGTc5NzqMYGM 6DhmYPCsdzYMICKscOxeEPxZFetJib4Vx5AJw02rXPNQ30s1ursNDx0ykNBikQLs/Wcye0 h6kyDm+yHFwtVzf5/zTDGu/KL14qYPAxRyI0ZKkaSnN5Crugur3xyh7u5i4xoDDoMoCZ+T Mzkp+eajYtxuj+w3vL0kAid0+KsrtS2WMpwqTdENbv3vBn6hx1OorfjSB2kNEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514352; a=rsa-sha256; cv=none; b=dHIvcuitMfHDm/rh3HasxdkCQpzes2PN8kIsuGNkxdagGkxZ0EvKxRL2FzYgysnirvBjzQ XFE/aQ36Fom7Pk1KXnXWoVbvbpitwiscz0oe9j5FVdx77JVpiToCn81Lqmu1rZvHF1W401 av2GSRGSnmPfe0TVtyauxjxDHYMz9W9IytYkqKmiQphbPZuyKZyZUmyrt+vo2bob/RAQa7 e3n8+GXIgIhJtHOelCaRQxQnGH6R/QQuRfSuLuYPD3zvVFyvRBY2tbQysOFLaHMCDUlt4R IFczy14USYiB1ShNE0JPX19M4iqDzDO67ozCdjXrk97W6NaltMYCTtPVXyy/CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpsv3Lr3cAylXG2TAGvO1JuPH3Dl9hPv+Wj7hzA9qAk=; b=EaE0+TIEcgxHaZeWKcvWPOe4WPwKuyiDbJhFaV5i61zLHunR6zoU4lgEtCHntuko5jjbZf FS3jLXlbdNJ5KvwinxyPBrWzya0DWN1BCYUK72FZQ+oyqIYXiII/ZQrxH1IObPAiDQ4qpC FmnlWHwP5wsbHTZttsYZjQ61sXuxtUN3IPLjPbBarz0uU9xXyIonq0V8GzGffWMwp4kU4O NywebXnydLkaBj/lJj9M8wA9dANQfkjwqq29jHdzB8I3uO870r7oOASaE5S1a3Vnzq8v+H f9wUibnPU9MoAnzBevqHw/ZxnTsn3PCY0A1xEJcMT8n1pcjN8NzsZ1ZWmcgs9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvN4x68z4r; Mon, 25 Dec 2023 14:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPq5W023461; Mon, 25 Dec 2023 14:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPqqL023458; Mon, 25 Dec 2023 14:25:52 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:52 GMT Message-Id: <202312251425.3BPEPqqL023458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: c983825a77f2 - main - share/man/man7/simd.7: document SIMD-enhanced strcat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c983825a77f276ab71a34baee0250d55a84f59fd Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c983825a77f276ab71a34baee0250d55a84f59fd commit c983825a77f276ab71a34baee0250d55a84f59fd Author: Robert Clausecker AuthorDate: 2023-11-14 18:26:21 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:55:59 +0000 share/man/man7/simd.7: document SIMD-enhanced strcat Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42600 --- share/man/man7/simd.7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index f3818c530af5..6ddf769b6d38 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 8, 2023 +.Dd November 14, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -48,7 +48,7 @@ the environment variable .Ev ARCHLEVEL can be used to override this mechanism. .Pp -Enhanced functions are present in the following architectures: +Enhanced functions are present for the following architectures: .Bl -column FUNCTION_________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent .It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 .It bcmp Ta Ta Ta S1 Ta S @@ -66,7 +66,7 @@ Enhanced functions are present in the following architectures: .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 .It stpncpy Ta Ta Ta S1 -.It strcat Ta Ta Ta S Ta S +.It strcat Ta Ta Ta S1 Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 .It strcmp Ta Ta S Ta S1 Ta S @@ -217,7 +217,7 @@ for A .Nm manual page appeared in -.Fx 14.0 . +.Fx 14.1 . . .Sh AUTHOR .An Robert Clausecker Aq Mt fuz@FreeBSD.org From nobody Mon Dec 25 14:25:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvQ0TCJz54nC8; Mon, 25 Dec 2023 14:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvP6hJsz3Mnb; Mon, 25 Dec 2023 14:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fxTmqvbZ15r3Ys/HNvDpJgXAw1Z1hATR/2hWwbjVCzU=; b=KUak2XsAB0KVRYkJaxemlDsjv84nhPNNE5vt7VJLWAzWyOsM4kRmc8ITfgv8nF/LC4QtqC VR3zkFfla5zXRUIiXuVXafMALblo6ru5hx3rrq+aHLJeapRvdSImxOtBE5wxRzHazg2ElK Z8qn77varoh1i2Z597sOvIpWUofk7g4KbDHYLApIK89oyg59ahYGXC7YW05SncvI+C4nq4 y4iebBSFpxPKjrc/8gyNtTVdRKaJ7PPGSBYVeXmtqGOUvwwV4eysGYLpoMHkGxsI6OQ15D y6KAq2TSgcqM/jikaRsdIpN2iu2H0gqJrrht9Hl6hFmYR7AFfQzq3pguPO/GMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514353; a=rsa-sha256; cv=none; b=gbK5jOwNdkJN77N6eOV0l7+Qlpn3prPBp0R72JQBqTH7u3btIUHF2tMq06+gLb4V6z0Pp6 ouVU51ivwr7j76CRTRraJxKTk8OyMoQp+MUrB4hqi9yl7YFvmpEKzEJ9X7fHeRDgfyurP2 la5iXPwrHzldNc3w6qlIF762qrnHgEdGilng5G+RivjmlcblLwVPJI+WvsMmofi03QV2+l MGuMlJLdcD79HZRA7wTVZ4s0dHmv0KTuBIltX3Io50Hw8LtdjmGFLGMU7hyBwRWZkE4wGk m+xoybFl/kFCtE+QXAyDWnPtFtfjptfYDUlgQbUsVSZRnP/zIxvgSWzHn29Ktg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fxTmqvbZ15r3Ys/HNvDpJgXAw1Z1hATR/2hWwbjVCzU=; b=XxfQH79riid5pJzLAkI2vv5SxHJ5qmmXzA5LP0t8K5Hh0AOMqt3itSNesEP3plILJVe9Oc mRyhZws3LVR9I2gIh3xdEFIi02t+fBuya6x/0Z6WvBSqyipkETP7XdlfAGyeRQzJjgzj+X C2a+YeiZ9ma0L+V7dXB/YqefGU3YEWlTRFBOt89M6G9qruM2V/uaW2DCWrjR5sV1YOEpZH CLAsHSTiF3CRxLhnNgvE06mTFFgqNYEFLP3mD9zEUi6p5k6/5du9RjRj+DrCp5xR/ZExAA evnCgFXlk+iK4c/GsXg1GuxZesYq/hdspzS+ZVcCL4MQJHU5ylEfiJ8TaytlSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvP5pP1zm4; Mon, 25 Dec 2023 14:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPrJ2023507; Mon, 25 Dec 2023 14:25:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPrq1023504; Mon, 25 Dec 2023 14:25:53 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:53 GMT Message-Id: <202312251425.3BPEPrq1023504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: f7098b865992 - main - lib/libc/tests/string: add unit test for strlcpy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7098b8659923873a7c60b64cb68182e470786f9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f7098b8659923873a7c60b64cb68182e470786f9 commit f7098b8659923873a7c60b64cb68182e470786f9 Author: Robert Clausecker AuthorDate: 2023-11-09 18:08:23 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:56:02 +0000 lib/libc/tests/string: add unit test for strlcpy A straightforward derivation from the stpncpy unit test. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/strlcpy_test.c | 183 +++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 5874f7b6b873..81e59ee65155 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -16,6 +16,7 @@ ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test +ATF_TESTS_C+= strlcpy_test ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test diff --git a/lib/libc/tests/string/strlcpy_test.c b/lib/libc/tests/string/strlcpy_test.c new file mode 100644 index 000000000000..646bef42683e --- /dev/null +++ b/lib/libc/tests/string/strlcpy_test.c @@ -0,0 +1,183 @@ +/*- + * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by Robert Clausecker + * 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 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 + +size_t (*strlcpy_fn)(char *restrict, const char *restrict, size_t); + +static char * +makebuf(size_t len, int guard_at_end) +{ + char *buf; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + assert(buf); + if (guard_at_end) { + assert(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); + } else { + assert(munmap(buf, page_size) == 0); + return (buf + page_size); + } +} + +static void +test_strlcpy(const char *s) +{ + char *src, *dst; + size_t size, bufsize, x; + int i, j; + + size = strlen(s) + 1; + for (i = 0; i <= 1; i++) { + for (j = 0; j <= 1; j++) { + for (bufsize = 0; bufsize <= size + 10; bufsize++) { + src = makebuf(size, i); + memcpy(src, s, size); + dst = makebuf(bufsize, j); + memset(dst, 'X', bufsize); + assert(strlcpy_fn(dst, src, bufsize) == size-1); + assert(bufsize == 0 || strncmp(src, dst, bufsize - 1) == 0); + for (x = size; x < bufsize; x++) + assert(dst[x] == 'X'); + } + } + } +} + +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) +{ + size_t i; + size_t res, wantres; + const char *fail = NULL; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + src[srclen] = '\0'; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen+1] = ')'; + + memset(dest, '\xee', destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + wantres = srclen; + res = strlcpy_fn(dest, src, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (res != wantres) + fail = "incorrect return value"; + else if (destlen > 0 && strncmp(src, dest, destlen - 1) != 0) + fail = "string not copied correctly"; + else if (destlen > 0 && srclen >= destlen - 1 && dest[destlen-1] != '\0') + fail = "string not NUL terminated"; + else for (i = srclen + 1; i < destlen; i++) + if (dest[i] != '\xee') { + fail = "buffer mutilated behind string"; + break; + } + + if (fail) + atf_tc_fail_nonfatal("%s\n" + "strlcpy(%p \"%s\", %p \"%s\", %zu) = %zu (want %zu)\n", + fail, dest, dest, src, src, destlen, res, wantres); +} + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(strlcpy_fn(NULL, "foo", 0), 3); +} + +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) +{ + size_t i; + char buf[64+1]; + + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + buf[i+1] = '\0'; + test_strlcpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+3+64]; /* 15 offsets + 64 max length + NUL + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 0; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strlcpy_fn = dlsym(dl_handle, "test_strlcpy"); + if (strlcpy_fn == NULL) + strlcpy_fn = strlcpy; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); + + return (atf_no_error()); +} From nobody Mon Dec 25 14:25:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvR3T1rz54nHb; Mon, 25 Dec 2023 14:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvR0mHyz3MrZ; Mon, 25 Dec 2023 14:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJDDfdLLqG5l6iX6QPbO2oDqg6JBJo0ZEDlCuj7a3io=; b=IQOU7nbUwgiEIOaYVcpm3Yzb8KsgDT49L2PHbLnM5uQp20u1IBpSsfVcDGsMRwTeqe1Daw kqutv6hoL7PFvAIKLeSvSRxvn0TlEFubr7XqEak/kcN0xqBVyniHb2R439AEYsSmVWXTIn mk+2iYmFYvij3O5JsCP7gww1z2PXSvwaGJ1vOuwfsKwpZrEU5VTDNu2FTPkKYCUxxkBBn5 zNl6TkAoA938wj2Bo4HSHQhTZ+7+0nyYeZuf6gI/I6I1RANslk4qaXhf3xJyVXG7lRB8Gy SWg3sI0SEuMfaHuLkofbY8qtJgbZFzM1mbqa0TIa/SZ8j/xOKUrQkt5HnsmxqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514355; a=rsa-sha256; cv=none; b=hEKiNBg9cIEA1RL88hZVhc18P9eFrYcX8YdKV/mnKNmhtbaQHWdZ5CnoPelR2CJHzAVOBY oLYCH52J6+nFcAkEPmoIX4LW89N6W0GxGwyqhl8qMEu9+Y2PF1rLQoIDdkxOMGvnBXS6Tn ERCSVM59fGpvoPJmh5DN973lNR9kRrZBn+VVg7R8FaBevJfK+R7avQcK+4FORTh6fMw+Eb lGFy8xbc6gFgpSturqZIA58rcH0LdSdZs7oMNnOSWGT0p9i0JAs7Hg04W7XrNwz4josXv6 vxC1rjnqR3p4vsL0zUrt8DMXzZOzQb10S74VQSrkRAt+5kdBdYLCBmuLivGfzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJDDfdLLqG5l6iX6QPbO2oDqg6JBJo0ZEDlCuj7a3io=; b=bOJgB5Kx8FidkVp7QelBvCYO6d6cpj07S3+xahIdAMKEJIe8hqFKneBb6uOri/23F9+pQ/ WePZBSB8pykqcA8qRo2pe3qaUS9MN474jtySFdxSWuAgMGBdCDD8ce/qqAud1VoUU+nIir 6w2XyxpuzhQTI249SP7sMpfaMD3MlYog8dqCycITUJhF1uceVxOioh/mDtTkUGe4/NmyCY s06nbFhNMt3G4MAWLUW60R2JMWmk8LRt7kzTR9CL97WLW0ZRqvEJJL41cDwJ8lRTLriHd4 tOXJpE9gsoCcMiEUZcH2IYBR8CBFb+/qPQqFs8yQKyUKPjBc0VoynJHNHQsLQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvQ6yXnz4s; Mon, 25 Dec 2023 14:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPsTl023552; Mon, 25 Dec 2023 14:25:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPsTF023549; Mon, 25 Dec 2023 14:25:54 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:54 GMT Message-Id: <202312251425.3BPEPsTF023549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 74d6cfad54d6 - main - lib/libc/amd64/string: add strlcpy scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74d6cfad54d676299ee5e4695139461876dfd757 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=74d6cfad54d676299ee5e4695139461876dfd757 commit 74d6cfad54d676299ee5e4695139461876dfd757 Author: Robert Clausecker AuthorDate: 2023-11-12 22:47:06 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:56:05 +0000 lib/libc/amd64/string: add strlcpy scalar, baseline implementation Somewhat similar to stpncpy, but different in that we need to compute the full source length even if the buffer is shorter than the source. strlcat is implemented as a simple wrapper around strlcpy. The scalar implementation of strlcpy just calls into strlen() and memcpy() to do the job. Perf-wise we're very close to stpncpy. The code is slightly slower as it needs to carry on with finding the source string length even if the buffer ends before the string. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcpy.S | 281 +++++++++++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index d982061e080b..03bca498e116 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcpy.S \ strlen.S \ strncmp.S \ strncpy.c \ diff --git a/lib/libc/amd64/string/strlcpy.S b/lib/libc/amd64/string/strlcpy.S new file mode 100644 index 000000000000..2b32c6c78047 --- /dev/null +++ b/lib/libc/amd64/string/strlcpy.S @@ -0,0 +1,281 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak strlcpy + .set strlcpy, __strlcpy +ARCHFUNCS(__strlcpy) + ARCHFUNC(__strlcpy, scalar) + ARCHFUNC(__strlcpy, baseline) +ENDARCHFUNCS(__strlcpy) + +ARCHENTRY(__strlcpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + push %rsi + push %rbx + push %rdi + push %rdx + mov %rsi, %rdi + call CNAME(strlen) # strlen(src) + pop %rdx + pop %rdi + mov -8(%rbp), %rsi + mov %rax, %rbx # remember string length for return value + sub $1, %rdx # do not copy into the final byte of the buffer + jc 0f # skip copying altogether if buffer was empty + cmp %rax, %rdx # is the buffer longer than the input? + cmova %rax, %rdx # if yes, only copy the part that fits + movb $0, (%rdi, %rdx, 1) # NUL-terminate output buffer + call CNAME(memcpy) # copy string to output +0: mov %rbx, %rax # restore return value + pop %rbx + leave + ret +ARCHEND(__strlcpy, scalar) + +ARCHENTRY(__strlcpy, baseline) + sub $1, %rdx # do not count NUL byte in buffer length + jb .L0 # go to special code path if len was 0 + + mov %esi, %ecx + pxor %xmm1, %xmm1 + mov %rsi, %r9 # stash a copy of the source pointer for later + and $~0xf, %rsi + pcmpeqb (%rsi), %xmm1 # NUL found in head? + mov $-1, %r8d + and $0xf, %ecx + shl %cl, %r8d # mask of bytes in the string + pmovmskb %xmm1, %eax + and %r8d, %eax + jnz .Lhead_nul + + movdqa 16(%rsi), %xmm3 # load second string chunk + movdqu (%r9), %xmm2 # load unaligned string head + mov $32, %r8d + sub %ecx, %r8d # head length + length of second chunk + pxor %xmm1, %xmm1 + pcmpeqb %xmm3, %xmm1 # NUL found in second chunk? + + sub %r8, %rdx # enough space left for the second chunk? + jbe .Lhead_buf_end + + /* process second chunk */ + pmovmskb %xmm1, %eax + test %eax, %eax + jnz .Lsecond_nul + + /* string didn't end in second chunk and neither did buffer -- not a runt! */ + movdqa 32(%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + movdqu %xmm2, (%rdi) # deposit head into buffer + sub %rcx, %rdi # adjust RDI to correspond to RSI + movdqu %xmm3, 16(%rdi) # deposit second chunk + sub %rsi, %rdi # express RDI as distance from RSI + add $32, %rsi # advance RSI past first two chunks + sub $16, %rdx # enough left for another round? + jbe 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 3f + + movdqu %xmm0, (%rsi, %rdi) + movdqa 16(%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + cmp $16, %rdx # more than a full chunk left? + jbe 2f + + add $32, %rsi # advance pointers to next chunk + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 4f + + movdqu %xmm0, -16(%rsi, %rdi) + movdqa (%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + sub $32, %rdx + ja 0b + +1: sub $16, %rsi # undo second advancement + add $16, %edx + + /* 1--16 bytes left in the buffer but string has not ended yet */ +2: pcmpeqb %xmm1, %xmm0 # NUL byte encountered? + pmovmskb %xmm0, %r8d + mov %r8d, %eax + bts %edx, %r8d # treat end of buffer as end of string + tzcnt %r8d, %r8d # find tail length + add %rsi, %rdi # restore RDI + movdqu (%rsi, %r8, 1), %xmm0 # load string tail + movdqu %xmm0, (%rdi, %r8, 1) # store string tail + movb $0, 16(%rdi, %r8, 1) # NUL terminate + + /* continue to find the end of the string */ + test %eax, %eax # end of string already reached? + jnz 1f + + ALIGN_TEXT +0: pcmpeqb 32(%rsi), %xmm1 + pmovmskb %xmm1, %eax + pxor %xmm1, %xmm1 + test %eax, %eax + jnz 2f + + pcmpeqb 48(%rsi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rsi + pxor %xmm1, %xmm1 + test %eax, %eax + jz 0b + +1: sub $16, %rsi # undo second advancement +2: tzcnt %eax, %eax # where is the NUL byte? + sub %r9, %rsi + lea 32(%rsi, %rax, 1), %rax # return string length + ret + +4: sub $16, %rsi # undo second advancement + add $16, %rdx # restore number of remaining bytes + + /* string has ended but buffer has not */ +3: tzcnt %eax, %eax # find length of string tail + movdqu -15(%rsi, %rax, 1), %xmm0 # load string tail (incl. NUL) + add %rsi, %rdi # restore destination pointer + movdqu %xmm0, -15(%rdi, %rax, 1) # store string tail (incl. NUL) + sub %r9, %rsi # string length to current chunk + add %rsi, %rax # plus length of current chunk + ret + +.Lhead_buf_end: + pmovmskb %xmm1, %r8d + add $32, %edx # restore edx to (len-1) + ecx + mov %r8d, %eax + shl $16, %r8d # place 2nd chunk NUL mask into bits 16--31 + bts %rdx, %r8 # treat end of buffer as end of string + tzcnt %r8, %rdx # find string/bufer len from alignment boundary + sub %ecx, %edx # find actual string/buffer len + movb $0, (%rdi, %rdx, 1) # write NUL terminator + + /* continue to find the end of the string */ + test %eax, %eax # end of string already reached? + jnz 1f + + ALIGN_TEXT +0: pcmpeqb 32(%rsi), %xmm1 + pmovmskb %xmm1, %eax + pxor %xmm1, %xmm1 + test %eax, %eax + jnz 2f + + pcmpeqb 48(%rsi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rsi + pxor %xmm1, %xmm1 + test %eax, %eax + jz 0b + +1: sub $16, %rsi +2: tzcnt %eax, %eax + sub %r9, %rsi + lea 32(%rsi, %rax, 1), %rax # return string length + jmp .L0031 + +.Lsecond_nul: + add %r8, %rdx # restore buffer length + tzcnt %eax, %eax # where is the NUL byte? + lea -16(%rcx), %r8d + sub %r8d, %eax # string length + cmp %rax, %rdx # is the string shorter than the buffer? + cmova %rax, %rdx # copy only min(buflen, srclen) bytes + movb $0, (%rdi, %rdx, 1) # write NUL terminator +.L0031: cmp $16, %rdx # at least 16 bytes to copy (not incl NUL)? + jb .L0015 + + /* copy 16--31 bytes */ + movdqu (%r9), %xmm0 # load first 16 bytes + movdqu -16(%r9, %rdx, 1), %xmm1 # load last 16 bytes + movdqu %xmm0, (%rdi) + movdqu %xmm1, -16(%rdi, %rdx, 1) + ret + +.Lhead_nul: + tzcnt %eax, %eax # where is the NUL byte? + sub %ecx, %eax # ... from the beginning of the string? + cmp %rax, %rdx # is the string shorter than the buffer? + cmova %rax, %rdx # copy only min(buflen, srclen) bytes + movb $0, (%rdi, %rdx, 1) # write NUL terminator + + /* process strings of 0--15 bytes (rdx: min(buflen, srclen), rax: srclen) */ +.L0015: cmp $8, %rdx # at least 8 bytes to copy? + jae .L0815 + + cmp $4, %rdx # at least 4 bytes to copy? + jae .L0407 + + cmp $2, %rdx # at least 2 bytes to copy? + jae .L0203 + + movzbl (%r9), %ecx # load first byte from src + mov %cl, (%rdi) # deposit into destination + movb $0, (%rdi, %rdx, 1) # add NUL terminator (again) + ret + +.L0203: movzwl (%r9), %ecx + movzwl -2(%r9, %rdx, 1), %esi + mov %cx, (%rdi) + mov %si, -2(%rdi, %rdx, 1) + ret + +.L0407: mov (%r9), %ecx + mov -4(%r9, %rdx, 1), %esi + mov %ecx, (%rdi) + mov %esi, -4(%rdi, %rdx, 1) + ret + +.L0815: mov (%r9), %rcx + mov -8(%r9, %rdx, 1), %rsi + mov %rcx, (%rdi) + mov %rsi, -8(%rdi, %rdx, 1) + ret + + /* length zero destination: just return the string length */ +.L0: mov %rsi, %rdi + jmp CNAME(strlen) +ARCHEND(__strlcpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:25:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvS4hWmz54nMk; Mon, 25 Dec 2023 14:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvS1sChz3Mtx; Mon, 25 Dec 2023 14:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dPu7Rn9BVezsMXQgZUrPis6xcon40Gx0SBBM3FAQ5Nc=; b=QgwwtChllhCW7gplwINVSfHGRg7JG+WqUBsn298vXTjTbRtwzwDQmF43Tnu7yZsj54wZ7L 3F4cillpp5I2fokrTvUDz0h2kusCQwD5vYq1C1yY1B6xoBV65NZT+CN7bULwaB36R/RKzv HuaugP2mPJELwgigyg0UvrszFL5PlhXH2LYcqTi4j3ITyplw7mD9go3/A9CxYUhBFxV4jI IVIx7y8v5vmYU5Fh4IUMsqORH7arrz1jGHeZn5QX/9pldSskeQtuxOcuq18jTAM+u9L353 hMkrw0T2M74g+zhjnNMaSbGyoWA98N2oDlyuUt3UeMAhpTedP5e8V35jNOHkVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514356; a=rsa-sha256; cv=none; b=T0/vrw300M+S39GK3wnaUf3kvzb+ZllOHmclimW7alQGUsCbQ5xrFpSP262R/F4pNEBl8S L1Sa7SkKnznltG4cyRYK3Lpk6LjLyc1zGoCfetBEffXmDRnroznNxSXIw7h9SuXjTTzDbs JO/o4ovMlzqgAVrefg1n2eEhckqGQ8aQ1OaqCu1wPrQGM3l8SBakQZimkkZwWttk7vpb+b C+JbK9YjK1wkPyvbPaIvtynWSXWSMT9g2yhWOy8tlidv615okxu0PdaOswrwUVBEbv2bNH M5wUCHENYuvT5NX+a5DJjdLa6keCdRz04mQr6MiqbrE/p11vLpLUAK07VwOITQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dPu7Rn9BVezsMXQgZUrPis6xcon40Gx0SBBM3FAQ5Nc=; b=bZRDEiLVZm+b1do3Wjm6AcOhCP50NqHUP1dtuc0rf9+h2UNnaPvA5FFU6ghbm9YX9lQ+Dh 7W506nTL452mucYkrijJ3vsbhSERLXSnve6742sKyqi8+W2OeG46lbb0VH2PLHb22y+3Zl hnnihFIUM0rxf2KzD99xjaKuNElhWJYhanxncqfkqYSJAOrCWfeuftrA4pzwjj+JragpoV ZYEkk6S9aAVVs157gq9pBzNYWwj7CLbj0l5PjvJRpPFCseyYWCLxY7OEozjUl5pc7C2LTN O087fK4sQPYsA0g2rfj64hhI+p1Vz3/967YA4xQbBXnckk4n5Pl8VhTrObo6ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvS0ytGzm5; Mon, 25 Dec 2023 14:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPu0Z023594; Mon, 25 Dec 2023 14:25:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPuRi023591; Mon, 25 Dec 2023 14:25:56 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:56 GMT Message-Id: <202312251425.3BPEPuRi023591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 2b7b03b7ae17 - main - lib/libc/amd64/string: implement strlcat() through strlcpy() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b7b03b7ae179db465c1ef19a5007f729874916a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2b7b03b7ae179db465c1ef19a5007f729874916a commit 2b7b03b7ae179db465c1ef19a5007f729874916a Author: Robert Clausecker AuthorDate: 2023-11-29 02:32:28 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:31 +0000 lib/libc/amd64/string: implement strlcat() through strlcpy() This should pick up our optimised memchr(), strlen(), and strlcpy() when strlcat() is called. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcat.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 03bca498e116..2b1e276cb3da 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcat.c \ strlcpy.S \ strlen.S \ strncmp.S \ diff --git a/lib/libc/amd64/string/strlcat.c b/lib/libc/amd64/string/strlcat.c new file mode 100644 index 000000000000..0c1e1c5d05f7 --- /dev/null +++ b/lib/libc/amd64/string/strlcat.c @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memchr(const void *, int, size_t); +size_t __strlcpy(char *restrict, const char *restrict, size_t); + +size_t +strlcat(char *restrict dst, const char *restrict src, size_t dstsize) +{ + char *loc = __memchr(dst, '\0', dstsize); + + if (loc != NULL) { + size_t dstlen = (size_t)(loc - dst); + + return (dstlen + __strlcpy(loc, src, dstsize - dstlen)); + } else + return (dstsize + strlen(src)); +} From nobody Mon Dec 25 14:25:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvT3kWJz54nHc; Mon, 25 Dec 2023 14:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvT2lvSz3Mv8; Mon, 25 Dec 2023 14:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37up28oKCa+0QLEZu1C0OgtZ7nBVUD45yqeTfOWu5Eg=; b=v/PBvXJwndCxgX9Z+jPirizsFLVHad5kG5fxO6YFa62aTT+OAzmWoCzn7+Dk692nyrgF3o yD0dW+hw+FTGA/pl9eYqU+OtSloAYzTXpfjUXUAlZpz3ST3un19Ck0JZd+i59NVhkf7DFH zPU3UsybJtuTzKTPT+JMsfFppyxqAF965Df9i7VlQb27sUB6s53vLXJWDW5+0uhddLixpH fqKPBWamAdNvfFLJRtcsPgBsGUtYcnOLFUr3ZSLmdGpzicwBbKL0L08cHFkRIpOl5aMfll sHvwKzlGtJt6Suby0sC+jhNMp4jedV+HWpYMCY63aYWybMrjNxY/v2jRAJZXOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514357; a=rsa-sha256; cv=none; b=NV2lU1i4j6Q/v1lGEUgZganaDxBN4nL92JcdNc2FWExZZFI6VtNPtboL21wA233oy7thX4 gWvlrOLuXoSM7YWs7EI0oqbJ1C85QyuDzBDxOvB4QEEA8gXu3SMqdD/8MZxFE5+8ot6v8s UgyuScn7mutARKji0o97pDJXrlsRx0jQJKm/sFK1Pyst/4VaONo6ngTNGEceff7cWy31HA NpWT5Z9u+/gxsm20aLheuxy5LyYAxPYd1pjYXvUZbISoC0AtU5GvtRVpY2bgpb4dw990dm TTCjJjYVGjTYT1Fb72pwEfS6BOA3m1bIVXMblHV0I8Yc9OpUgy0Pgs+5usf08A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=37up28oKCa+0QLEZu1C0OgtZ7nBVUD45yqeTfOWu5Eg=; b=lwT6HntnH9P7ft3AtqXFVhZvnIFfA7JeI13GElmVaMmilY1U/y6cMdtp8Pixa8VbWuA/yY oJLCwdYXwFBWCvA80lgNYAUrUx6BNzbuvc1W2tdHxDbHmDixfNBo9ypOiqF4jgW9cKbku0 YTK/ov7t3NIzl7JBcJmV+gqpafXgWl/KR1oFOMJ8Jj/k1NxZ483PkW3qOxJlWfbf0s2yxV zc28IuC4O+NmRjARAf97LuWWKZZVjZhq3i70agWwlOEabpkmYLMUIi76lv7XwiySyp/PzT MZEM+JwWo3XSMsNd0RHWx2beP1H2Iiuev1CmO76oIG+VCDXAe2k/hAXAhjm78w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvT1sRVzSL; Mon, 25 Dec 2023 14:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPvnt023644; Mon, 25 Dec 2023 14:25:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPv9O023640; Mon, 25 Dec 2023 14:25:57 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:57 GMT Message-Id: <202312251425.3BPEPv9O023640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d4a5605d9fed - main - share/man/man7/simd.7: document scalar/baseline strlcpy, strlcat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4a5605d9fedcff34227707133a8d6694ccbfc36 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d4a5605d9fedcff34227707133a8d6694ccbfc36 commit d4a5605d9fedcff34227707133a8d6694ccbfc36 Author: Robert Clausecker AuthorDate: 2023-11-29 02:35:45 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:35 +0000 share/man/man7/simd.7: document scalar/baseline strlcpy, strlcat Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 6ddf769b6d38..e025d3ac9f12 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 14, 2023 +.Dd November 28, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -72,6 +72,8 @@ Enhanced functions are present for the following architectures: .It strcmp Ta Ta S Ta S1 Ta S .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 +.It strlcat Ta Ta Ta S1 +.It strlcpy Ta Ta Ta S1 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 From nobody Mon Dec 25 14:25:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvV6RHGz54n3r; Mon, 25 Dec 2023 14:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvV4Hl3z3N72; Mon, 25 Dec 2023 14:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lruBEKnFChBFqse2uA1s2R4DrDWpPKCefYmRzBDPSc=; b=YP7pUnxIqzfTc7vQCOV86p/UPPFCEjeYuXofG/wBbqZYbdRA4CqCnn9kTkBE9xA0JaYsU4 sfQXab/ieA2FxLJ9NR7zWmoa4bFUaPljJE6i2/LBSH2QemMaqcJi/ch7KCU2Lfn9/FURiF 84E4wP8Qn2SOsWpYqo849/4tWxgkWNnP1KCWpgX7LZdx2o1vfctA++gMM7xUq4nus520WS 78NWe1/TkjZxwBMXlFL55zsof2qs/zdO8PAa7y/nyNNpBqnx6g17oBtO3yW5f4ICzOa1BU JEy2DQyn3X9xTZRxmBcsiunt8/qtrtl01MgmcgByvAwCOirlilTcfKTt/IdoyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514358; a=rsa-sha256; cv=none; b=b/v1w1uR06pdCG0X9PC3hOxoGBZfo5ZZHczUQHEHONrKc6fMhUjh6J5abmjM5BMD9PJ+lX jkQtNrsgXP11/yDx8Xu73IrcdPQ77yaeF54FNKRwDDljFVdRz0s9JPKFsuikg3gslJZLkc XfVoRTtnTBnIbh05Y91AU2Xs7C1bosIMEDT6VsYRh2fZRayzn/ibu3B48sCHHzekuAh+TR g4Z+UPaNVKnn5f4QYMCGR1t5x3HxzcXS1cVSdvEFkgmEDY3eWZz1Xt+uo/uU7pISSARJg3 CinRDPA+UXCUKDquq/q8+OyCCdovqxIYrWEPdoIDAc7bxJcCAxB3Ta+SShRb9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lruBEKnFChBFqse2uA1s2R4DrDWpPKCefYmRzBDPSc=; b=vGOlsHLUwCq6e7ioQCih7aB5u4AXbp2gM4CD2b+7IsbkBGuwQ9oLD2DPSO9+wehFO1y6lA YBmYk6M9VPmd1J9V2DkZ/cMVaPErlDGc1AZC1vMo+hE413TBULIunrJ6L5czgo4rC0dpF1 iCXYnqv2fsYJ4xmxbcUmQIwUXOEBD4D4htE4ohD5QBvEqutNOnU5g/RZKAfaYzonQS++Mc h/ZxbFZ9OwdtZYt1YsQ3hELd44uWcjzG15czJ+bZmNmFIMkrQUmOb/yCJs7/bB9P4hMiPy OcqWNb0WrG9hq67RRmUqrBz8u5THQAGLJdm9NZdA3JAmeaq/rscU/svlqw0PKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvV3P30zSM; Mon, 25 Dec 2023 14:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPwT9023689; Mon, 25 Dec 2023 14:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPwwd023686; Mon, 25 Dec 2023 14:25:58 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:58 GMT Message-Id: <202312251425.3BPEPwwd023686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 6fdcb85b1c10 - main - share/man/man7/simd.7: add forgotten aarch64 string functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fdcb85b1c10fb7a7f61323e52ee251cc48fd60e Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=6fdcb85b1c10fb7a7f61323e52ee251cc48fd60e commit 6fdcb85b1c10fb7a7f61323e52ee251cc48fd60e Author: Robert Clausecker AuthorDate: 2023-11-29 03:33:18 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:37 +0000 share/man/man7/simd.7: add forgotten aarch64 string functions I previously forgot to mention these as they are set up through contrib/arm-optimized/routines/string. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 --- share/man/man7/simd.7 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index e025d3ac9f12..39eafc0e8c5a 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -58,26 +58,26 @@ Enhanced functions are present for the following architectures: .It index Ta S Ta Ta S1 .It ldiv Ta Ta Ta S Ta S .It lldiv Ta Ta Ta S -.It memchr Ta Ta Ta S1 -.It memcmp Ta Ta S Ta S1 Ta S +.It memchr Ta S Ta Ta S1 +.It memcmp Ta S Ta S Ta S1 Ta S .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV -.It memset Ta Ta S Ta S Ta S +.It memset Ta S Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S -.It stpcpy Ta Ta Ta S1 +.It stpcpy Ta S Ta Ta S1 .It stpncpy Ta Ta Ta S1 .It strcat Ta Ta Ta S1 Ta S .It strchr Ta S Ta Ta S1 Ta S -.It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S1 Ta S -.It strcpy Ta Ta Ta S1 Ta S Ta S2 +.It strchrnul Ta S Ta Ta S1 +.It strcmp Ta S Ta S Ta S1 Ta S +.It strcpy Ta S Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlcat Ta Ta Ta S1 .It strlcpy Ta Ta Ta S1 -.It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta S1 Ta S +.It strlen Ta S Ta S Ta S1 +.It strncmp Ta S Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 -.It strnlen Ta Ta Ta S1 +.It strnlen Ta S Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 .It strsep Ta Ta Ta S2 From nobody Mon Dec 25 14:25:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvW69NWz54nHs; Mon, 25 Dec 2023 14:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvW5Pnqz3N9g; Mon, 25 Dec 2023 14:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0x00Dg/JJEWLjsnBELXS+XvSbVIz9vICNYk9mjzRJsc=; b=n3OmOGx7IHTAKkP6AbICH6sIfdLncTi1im9uGQiq88URIU28ou47BgI5M5yKjGNcpKYABN 2zN6Joomvqm7pQfj1tpA2Rz2PgVqNgIcTUp2fZWDMSzmYpis1iqWoU2Q34lS2kfKyiacjz jMR/I9hT3gv28NfJmaItqPFUo8ztmwRDgV1s6svBUzi2maIU3xlhwyoP3JweiEQWIaKDNu bt3y5mYbD8RwsCLpIEaTJ+xzyMf+6HfD0zD1obyMz4+v/wQiX0Cs7Xztnqh1YaFB+0Nsni Tp5swLN6+ARZWdU/m1Ui7/gfv3A7fd6+5DMZQzy2VMa1fN327zC/LCe9Zy2F9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514359; a=rsa-sha256; cv=none; b=ELzM8Q5ZMsujGGgwvuWvCDD/7o5PtoeiZWAwwmH1Y0RdFPyTAeDBFiO1i78C62EYG/7w3T aUCHruXEzMS77kzY35/M3URv1GJWmlna8rEW9RAn2eE/gR7kmp6l04w5ISKXzcCd3l7MCu WTdqnV9tge7B6Q0USwR8o6QTzh/4udZdBquRweZgyKxz/f99j1bW970lVZu6dDsqqhNENS YUbZWY2nDFabplIyI+s6oqB2yDtBiPYvz113Ty+fBj+N3MN5udd9SM5M0H1xRN4Xkw+znp KPkowkJaziGqtLaTGsK7uvtybLlMgfXpyJVemmRPTdK+tjfmBmne1eLifVm7iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0x00Dg/JJEWLjsnBELXS+XvSbVIz9vICNYk9mjzRJsc=; b=IS/Ewv7HC14lEQcikTttkbbmGIIqHnXC30mGU718sRBjyDzq7OSkhoo5kM5Kr6mTIugz0n OJcNwdbXhkxrypKmOOhKD5AINVk81pewQyAGZThhWybdmJpMa7wlMJTk1KWgrGxaLx9Bv9 CqYe5Vs11ncqHzrAm6VqzueOTLxt/9gN0A5+cpN04MUAiAVleiFCElq1MMQ2i1AOjrs0f7 2/p2pUjmSm75oVAv2J6YwIRN4FQpfZuh4L4ik+qhmRvrgAwZmc2fY3Ka3/mX3f9EISKAVS afItiq3vUhPAOH/QHVyo3DH8QsFMK70oFkUfTE8gq8k3SgIygD9wMjALGpQFEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvW4M3Lzbg; Mon, 25 Dec 2023 14:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEPxfT023740; Mon, 25 Dec 2023 14:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPx1s023737; Mon, 25 Dec 2023 14:25:59 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:59 GMT Message-Id: <202312251425.3BPEPx1s023737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: e4b7b0bcbc74 - main - lib/libc/tests/string: add unit tests for memccpy() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4b7b0bcbc741f0998640c2ba55ec00ba613bb75 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e4b7b0bcbc741f0998640c2ba55ec00ba613bb75 commit e4b7b0bcbc741f0998640c2ba55ec00ba613bb75 Author: Robert Clausecker AuthorDate: 2023-12-03 11:42:17 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:40 +0000 lib/libc/tests/string: add unit tests for memccpy() Adapted from the strlcpy() unit tests. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/memccpy_test.c | 205 +++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 81e59ee65155..a6e8eb18075a 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -9,6 +9,7 @@ ATF_TESTS_C+= ffsll_test ATF_TESTS_C+= fls_test ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test +ATF_TESTS_C+= memccpy_test ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= strncmp_test diff --git a/lib/libc/tests/string/memccpy_test.c b/lib/libc/tests/string/memccpy_test.c new file mode 100644 index 000000000000..82f4ef34af54 --- /dev/null +++ b/lib/libc/tests/string/memccpy_test.c @@ -0,0 +1,205 @@ +/*- + * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by Robert Clausecker + * 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 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 + +void *(*memccpy_fn)(void *restrict, const void *restrict, int, size_t); + +static char * +makebuf(size_t len, int guard_at_end) +{ + char *buf; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + assert(buf); + if (guard_at_end) { + assert(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); + } else { + assert(munmap(buf, page_size) == 0); + return (buf + page_size); + } +} + +static void +test_memccpy(const char *s) +{ + char *src, *dst, *expected; + size_t size, bufsize, x; + int i, j; + + size = strlen(s) + 1; + for (i = 0; i <= 1; i++) { + for (j = 0; j <= 1; j++) { + for (bufsize = 0; bufsize <= size + 10; bufsize++) { + src = makebuf(size, i); + memcpy(src, s, size); + dst = makebuf(bufsize, j); + memset(dst, 'X', bufsize); + expected = bufsize >= size ? dst + size : NULL; + assert(memccpy_fn(dst, src, src[size-1], bufsize) == expected); + assert(bufsize == 0 || strncmp(src, dst, bufsize - 1) == 0); + for (x = size; x < bufsize; x++) + assert(dst[x] == 'X'); + } + } + } +} + +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) +{ + size_t i, effective_len; + void *res, *wantres; + const char *fail = NULL; + char terminator; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen] = ')'; + + memset(dest, '\xee', destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + effective_len = srclen < destlen ? srclen : destlen; + wantres = srclen <= destlen ? dest + srclen : NULL; + terminator = src[srclen-1]; + res = memccpy_fn(dest, src, terminator, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (res != wantres) + fail = "incorrect return value"; + else if (destlen > 0 && memcmp(src, dest, effective_len) != 0) + fail = "string not copied correctly"; + else for (i = srclen; i < destlen; i++) + if (dest[i] != '\xee') { + fail = "buffer mutilated behind string"; + break; + } + + if (fail) + atf_tc_fail_nonfatal("%s\n" + "memccpy(%p \"%s\", %p \"%s\", %u '%c', %zu) = %p (want %p)\n", + fail, dest, dest, src, src, terminator, terminator, destlen, res, wantres); +} + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(memccpy_fn(NULL, "foo", 42, 0), NULL); +} + +ATF_TC(zero_extension); +ATF_TC_HEAD(zero_extension, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Ensure the upper bits of the terminator are ignored"); +} +ATF_TC_BODY(zero_extension, tc) +{ + int mask = -1 & ~UCHAR_MAX; + char buf[16]; + + memset(buf, 0xcc, sizeof(buf)); + ATF_CHECK_EQ(memccpy(buf, "foobar", 'r', sizeof(buf)), buf + sizeof("foobar") - 1); + ATF_CHECK_EQ(memcmp(buf, "foobar", sizeof("foobar") - 1), 0); + + memset(buf, 0xcc, sizeof(buf)); + ATF_CHECK_EQ(memccpy(buf, "foobar", mask | 'r', sizeof(buf)), buf + sizeof("foobar") - 1); + ATF_CHECK_EQ(memcmp(buf, "foobar", sizeof("foobar") - 1), 0); +} + +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) +{ + size_t i; + char buf[64]; + + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + test_memccpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 1; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + memccpy_fn = dlsym(dl_handle, "test_memccpy"); + if (memccpy_fn == NULL) + memccpy_fn = memccpy; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, zero_extension); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); + + return (atf_no_error()); +} From nobody Mon Dec 25 14:26:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvY1GhQz54n40; Mon, 25 Dec 2023 14:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvX6F5zz3N7j; Mon, 25 Dec 2023 14:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wBLkyjzlCsvToJYFGe6QPN2qBI9pBjhAzAB+f/Gctsk=; b=eC+Q9WfpHJ0LsqOztFfjzo8Jd8choXAH6qQuP8SSohXQmGhoxYC16UpaFUp/9UJswyMFx8 iGXNa6unZb1kMioJmUboJnn7wh1hmV2DG9NL5sA0n1zTS/Fj9ulNN1G8S2N8D5t5oMSC+Y 9K84KYVdZpuw4zBCYwU8WdQMUl0IF4CDKsJqbOhLH82slIQ9/PUxJdozLO9wr29RxVFPj4 EaNyCuSfrGWR6cIZ/Bnz4UxKI9135fHRsT7RCkj0j+b2gIeV1i4WtzO/9oQMfLPb7dPp54 /agzHRLUDqmH/eGMd4pssAhQ9TjcMJNpnjN5wSxlIkGTbJwNoCY3/wrwiOQbZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514360; a=rsa-sha256; cv=none; b=PseaP0DQlho5sOfqZRwRHiSL7sO2KUhfWG03lLopnittnl/p0CMsvkgpWtT9D1EO8m9Lwh tDCDzM+iDsYFZBUwfha8l7PmyYEEjd1dG6lhiYltfJwdO1VrNMfnjAOxcIjDK55MHS8hpM EZWy2t8SJzH+aF7gCBXD2Gugxjuy+U5TCfcAp2/4EchIAquJam0hJx4CozUAOaXVQIGmUi qCWk923wGIO4qtI/6T8IdpTAr/C+k6GA2t6keCfRHqC5WWHtcQ6wew+3d7Jp5aNMLnNolj xhK/dTvtVX7I7UQ0yUEqT7GY1if4/QHvdkXedvn3tkYZXdvErvgMm7zMmcVHVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wBLkyjzlCsvToJYFGe6QPN2qBI9pBjhAzAB+f/Gctsk=; b=mjOrXK3CbiEw+nN3bQemaLgXCIuUtl0WTp2AVwMkC6RxLejfJ/EMgB0qn8bhydxpqNKf0F dZYTHXpL0WqTuMs1xQWCGCNBiMGULufhZlLhl4xWsY+/Ja/1BFnmK6vZ5LZK2G3o5gMZcX qrT1g9G0tHOg3velIj4KrlQnmbtathUGitbslI5s3JsauTi4SPRBQcGXf4U3UpFpLS5xiM kdQkNpxbOz7MGS1q14IjVOfEuq0s4U10qDFx4z7CX+50FwDfx3svmkbAt9zEAplqc9SdB5 2XRZCyFVlbahvqe3WTwGGyVGC0kPIn84YoMvRnbhXz96KegMvqNwNUm5G+GA5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvX5MGQzmP; Mon, 25 Dec 2023 14:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ0Du023795; Mon, 25 Dec 2023 14:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ0jH023792; Mon, 25 Dec 2023 14:26:00 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:00 GMT Message-Id: <202312251426.3BPEQ0jH023792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: fc0e38a7a67a - main - lib/libc/amd64/string: add memccpy scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc0e38a7a67a6d43095efb00cf19ee5f95dcf710 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fc0e38a7a67a6d43095efb00cf19ee5f95dcf710 commit fc0e38a7a67a6d43095efb00cf19ee5f95dcf710 Author: Robert Clausecker AuthorDate: 2023-12-02 12:28:05 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:42 +0000 lib/libc/amd64/string: add memccpy scalar, baseline implementation Based on the strlcpy code from D42863, this patch adds a SIMD-enhanced implementation of memccpy for amd64. A scalar implementation calling into memchr and memcpy to do the job is provided, too. Please note that this code does not behave exactly the same as the C implementation of memccpy for overlapping inputs. However, overlapping inputs are not allowed for this function by ISO/IEC 9899:1999 and neither has the C implementation any code to deal with the possibility. It just proceeds byte-by-byte, which may or may not do the expected thing for some overlaps. We do not document whether overlapping inputs are supported in memccpy(3). Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42902 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memccpy.S | 259 +++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 2b1e276cb3da..b569d2cb8be8 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -3,6 +3,7 @@ MDSRCS+= \ bcmp.S \ memchr.S \ memcmp.S \ + memccpy.S \ memcpy.S \ memmove.S \ memset.S \ diff --git a/lib/libc/amd64/string/memccpy.S b/lib/libc/amd64/string/memccpy.S new file mode 100644 index 000000000000..a2d9e33b3d36 --- /dev/null +++ b/lib/libc/amd64/string/memccpy.S @@ -0,0 +1,259 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * 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 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 "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak memccpy + .set memccpy, __memccpy +ARCHFUNCS(__memccpy) + ARCHFUNC(__memccpy, scalar) + ARCHFUNC(__memccpy, baseline) +ENDARCHFUNCS(__memccpy) + +ARCHENTRY(__memccpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + push %rax # dummy push for alignment + push %rbx + push %rdi + push %rsi + + mov %rsi, %rdi + mov %edx, %esi + mov %rcx, %rdx + mov %rcx, %rbx + call CNAME(__memchr) # ptr = memchr(src, c, len) + + pop %rsi + pop %rdi + lea 1(%rax), %rdx + sub %rsi, %rdx # size = ptr - src + 1 + mov %rbx, %rcx + lea (%rdi, %rdx, 1), %rbx # res = dest + size + test %rax, %rax # if (ptr == NULL) + cmovz %rcx, %rdx # size = len + cmovz %rax, %rbx # res = NULL + call CNAME(memcpy) + + mov %rbx, %rax # return (res) + pop %rbx + leave + ret +ARCHEND(__memccpy, scalar) + +ARCHENTRY(__memccpy, baseline) + sub $1, %rcx # RCX refers to last character in buffer + jb .L0 # go to special code path if len was 0 + + movd %edx, %xmm4 + mov %rcx, %rdx + punpcklbw %xmm4, %xmm4 # c -> cc + mov %esi, %ecx + punpcklwd %xmm4, %xmm4 # cc -> cccc + mov %rsi, %r9 # stash a copy of the source pointer for later + pshufd $0, %xmm4, %xmm4 # cccc -> cccccccccccccccc + and $~0xf, %rsi + movdqa %xmm4, %xmm1 + pcmpeqb (%rsi), %xmm1 # NUL found in head? + mov $-1, %r8d + and $0xf, %ecx + shl %cl, %r8d # mask of bytes in the string + pmovmskb %xmm1, %eax + and %r8d, %eax + jnz .Lhead_nul + + movdqa 16(%rsi), %xmm3 # load second string chunk + movdqu (%r9), %xmm2 # load unaligned string head + mov $32, %r8d + sub %ecx, %r8d # head length + length of second chunk + movdqa %xmm4, %xmm1 + pcmpeqb %xmm3, %xmm1 # NUL found in second chunk? + + sub %r8, %rdx # enough space left for the second chunk? + jb .Lhead_buf_end + + /* process second chunk */ + pmovmskb %xmm1, %eax + test %eax, %eax + jnz .Lsecond_nul + + /* string didn't end in second chunk and neither did buffer -- not a runt! */ + movdqa 32(%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + movdqu %xmm2, (%rdi) # deposit head into buffer + sub %rcx, %rdi # adjust RDI to correspond to RSI + movdqu %xmm3, 16(%rdi) # deposit second chunk + sub %rsi, %rdi # express RDI as distance from RSI + add $32, %rsi # advance RSI past first two chunks + sub $16, %rdx # enough left for another round? + jb 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 3f + + movdqu %xmm0, (%rsi, %rdi) + movdqa 16(%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + cmp $16, %rdx # more than a full chunk left? + jb 2f + + add $32, %rsi # advance pointers to next chunk + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 4f + + movdqu %xmm0, -16(%rsi, %rdi) + movdqa (%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + sub $32, %rdx + jae 0b + +1: sub $16, %rsi # undo second advancement + add $16, %edx + + /* 1--16 bytes left in the buffer but string has not ended yet */ +2: pcmpeqb %xmm1, %xmm0 # NUL byte encountered? + pmovmskb %xmm0, %r8d + mov %r8d, %ecx + bts %edx, %r8d # treat end of buffer as end of string + or $0x10000, %eax # ensure TZCNT finds a set bit + tzcnt %r8d, %r8d # find tail length + add %rsi, %rdi # restore RDI + movdqu 1(%rsi, %r8, 1), %xmm0 # load string tail + movdqu %xmm0, 1(%rdi, %r8, 1) # store string tail + lea 17(%rdi, %r8, 1), %rsi # return value if terminator encountered + xor %eax, %eax # return value if no terminator encountered + bt %r8d, %ecx # terminator encountered inside buffer? + cmovc %rsi, %rax # if yes, return pointer, else NULL + ret + +4: sub $16, %rsi # undo second advancement + add $16, %rdx # restore number of remaining bytes + + /* string has ended but buffer has not */ +3: tzcnt %eax, %eax # find length of string tail + movdqu -15(%rsi, %rax, 1), %xmm0 # load string tail (incl. NUL) + add %rsi, %rdi # restore destination pointer + movdqu %xmm0, -15(%rdi, %rax, 1) # store string tail (incl. NUL) + lea 1(%rdi, %rax, 1), %rax # compute return value + ret + +.Lhead_buf_end: + pmovmskb %xmm1, %r8d + add $32, %edx # restore edx to (len-1) + ecx + shl $16, %r8d # place 2nd chunk NUL mask into bits 16--31 + mov %r8d, %r10d + bts %rdx, %r8 # treat end of buffer as if terminator present + xor %eax, %eax # return value if terminator not found + tzcnt %r8, %rdx # find string/buffer len from alignment boundary + lea 1(%rdi, %rdx, 1), %r8 # return value if terminator found + rcx + sub %rcx, %r8 # subtract rcx + bt %rdx, %r10 # was the terminator present? + cmovc %r8, %rax # if yes, return pointer, else NULL + sub %ecx, %edx # find actual string/buffer len + jmp .L0132 + +.Lsecond_nul: + add %r8, %rdx # restore buffer length + tzcnt %eax, %r8d # where is the NUL byte? + lea -16(%rcx), %eax + sub %eax, %r8d # string length + lea 1(%rdi, %r8, 1), %rax # return value if NUL before end of buffer + xor %ecx, %ecx # return value if not + cmp %r8, %rdx # is the string shorter than the buffer? + cmova %r8, %rdx # copy only min(buflen, srclen) bytes + cmovb %rcx, %rax # return NUL if buffer ended before string +.L0132: cmp $16, %rdx # at least 17 bytes to copy (not incl NUL)? + jb .L0116 + + /* copy 17--32 bytes */ + movdqu (%r9), %xmm0 # load first 16 bytes + movdqu -15(%r9, %rdx, 1), %xmm1 # load last 16 bytes + movdqu %xmm0, (%rdi) + movdqu %xmm1, -15(%rdi, %rdx, 1) + ret + +.Lhead_nul: + tzcnt %eax, %r8d # where is the NUL byte? + sub %ecx, %r8d # ... from the beginning of the string? + lea 1(%rdi, %r8, 1), %rax # return value if NUL before end of buffer + xor %ecx, %ecx # return value if not + cmp %r8, %rdx # is the string shorter than the buffer? + cmova %r8, %rdx # copy only min(buflen, srclen) bytes + cmovb %rcx, %rax # return NUL if buffer ended before string + + /* process strings of 1--16 bytes (rdx: min(buflen, srclen), rax: srclen) */ +.L0116: cmp $8, %rdx # at least 9 bytes to copy? + jae .L0916 + + cmp $4, %rdx # at least 5 bytes to copy? + jae .L0508 + + cmp $2, %rdx # at least 3 bytes to copy? + jae .L0304 + + /* copy one or two bytes */ + movzbl (%r9), %ecx # load first byte from src + movzbl (%r9, %rdx, 1), %esi # load last byte from src + mov %cl, (%rdi) # deposit into destination + mov %sil, (%rdi, %rdx, 1) + ret + +.L0304: movzwl (%r9), %ecx + movzwl -1(%r9, %rdx, 1), %esi + mov %cx, (%rdi) + mov %si, -1(%rdi, %rdx, 1) + ret + +.L0508: mov (%r9), %ecx + mov -3(%r9, %rdx, 1), %esi + mov %ecx, (%rdi) + mov %esi, -3(%rdi, %rdx, 1) + ret + +.L0916: mov (%r9), %rcx + mov -7(%r9, %rdx, 1), %rsi + mov %rcx, (%rdi) + mov %rsi, -7(%rdi, %rdx, 1) + ret + + /* length zero destination: return null pointer */ +.L0: xor %eax, %eax + ret +ARCHEND(__memccpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Mon Dec 25 14:26:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvZ45jdz54nCQ; Mon, 25 Dec 2023 14:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvZ09Gdz3N5H; Mon, 25 Dec 2023 14:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5jfdn132dzhIBKCPSCYBu711JrrJr+jc2vTwltp2B4=; b=peo8pnzRLnyUuxEKC+CF8r5zjXaip7pDdQQ9BHGAq4CqWsJc4yVwOHYD+X7PdXwNe3GwPS s6s1YydO8UngYW72uALRLOg8K2WC0xwdWHOTCDYh47ulZaR6IbxtwEoyJUu7HQcPgptyZq 2jwl1SjbNGA8o93qVW0BzeGbz0ePwHNQvQZJdXLfGjOhDJ3IyCI2etsbwhDWo9Jgapx4fR p/s157UpI6QiawZtye9TfM+gJJCGg7ByfYBFnxgxpcbI1ONI/IaFyZUJ3rPMhep1vymfkq h5Ewhl22joJ9v0MXSTCsSAWU8OS0fM7fwWDhG9nal8kznjc60JGudL7IFqt9SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514362; a=rsa-sha256; cv=none; b=CQJzA4gs8EHlJ/CDylpTJXCKVA3HY1dVbsfagR/ERS1YJvWquhgwiLyge797Pk/rkWbyZB 8o8sTV3OuI7dR/So9Ml0k+2ufdKF1SorS4ek95crItMnhe10q/X9rkKWg1k2/EpcCOyrTu Y/6G/jeWp+60GtF40uiF3ypyA08ikt/yY1aDkYm+cpzAmuhXxbyAC6dhpKZ0wYOYGeRNa9 yTGOV+47s4oYE2J01C9/gesWYK+7aEUMZq4+kkU7KI8pHwMIvav27mJgHBFOFobY5oMPSd JwQO+QeGFPKShBZ2c2WyhzfD80FpxYyHfVpULsBiSb8vfiWKcC/I91mfF9cIIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5jfdn132dzhIBKCPSCYBu711JrrJr+jc2vTwltp2B4=; b=ZqAiZNza4xBEaFf2ZW4lv6EEhzYG4B4fF01ZT+ETDLerzQbnAJOAkvIZXPPISu4oFWA2Ku ARd0VraFLCQREd1qaq8qOkf+gVhIF1makmG2RAos6llufvAx6c2ZP6IV6uS4fja3IZmZVK Qv+Od2YYoa526110tgWux9GCdJREmL58xAMPP19vCvqZx8c+aEYExsSi9PPVGLcGMMTF+9 Wmebz0N6S0NXy6XGCHIOU++nVEnBp/ce2ckZHJFlVUomvq5+9Ev/3tPQfpZJkVGhGOaRAS lPRlpcUZEDgN2MNbVc7JY6mdmpfK2mD9YacUCLAI+tDtCY1na3fYrbfF9psa9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvY6NGdzbh; Mon, 25 Dec 2023 14:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ1nc023837; Mon, 25 Dec 2023 14:26:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ1xh023834; Mon, 25 Dec 2023 14:26:01 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:01 GMT Message-Id: <202312251426.3BPEQ1xh023834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5fa0fbf40b11 - main - share/man/man7/simd.7: document simd-enhanced memccpy, strncat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fa0fbf40b110e4699032b97a9f540db80997812 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa0fbf40b110e4699032b97a9f540db80997812 commit 5fa0fbf40b110e4699032b97a9f540db80997812 Author: Robert Clausecker AuthorDate: 2023-12-04 17:16:50 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:46 +0000 share/man/man7/simd.7: document simd-enhanced memccpy, strncat Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: HTTPS://reviews.freebsd.org/D42902 --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 39eafc0e8c5a..281898839c24 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 28, 2023 +.Dd December 4, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -60,6 +60,7 @@ Enhanced functions are present for the following architectures: .It lldiv Ta Ta Ta S .It memchr Ta S Ta Ta S1 .It memcmp Ta S Ta S Ta S1 Ta S +.It memccpy Ta Ta Ta S1 .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV .It memset Ta S Ta S Ta S Ta S @@ -75,6 +76,7 @@ Enhanced functions are present for the following architectures: .It strlcat Ta Ta Ta S1 .It strlcpy Ta Ta Ta S1 .It strlen Ta S Ta S Ta S1 +.It strncat Ta Ta Ta S1 .It strncmp Ta S Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta S Ta Ta S1 From nobody Mon Dec 25 14:26:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvb35WKz54n8W; Mon, 25 Dec 2023 14:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvb17Wlz3NDp; Mon, 25 Dec 2023 14:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=td4trl1KOrL/DQ7us4uHW5h8bcX+8W5uwzWpWL2hPoA=; b=K9UsxF+GlMoqQClJHmVSePbUN7JRpUEsoVgvZCF3UBrXmPiwOVoMSFNKd7CjGo1ibd5d5l zteyHxgxXXKCqgHa/dd9WsujrWf/TpgTZoNuFJGtP7KG6NoEeqR3ObI6Un1g8bDaQZlMTi 0DKJkHlfbI13y5RwhM3ytRqSt2R4Yd2fDBlOEko/34JglOPs5EZ/J0oToZ7Yunk20L7L7M pf3ad4lG0psoLOVnD4vc821TWsqRescQmTLxZEjTVNAV1fL6Y9MgABUOA+6vtnv4fc/q2d 4sFBA2LubjNjwg7wxy0Sjp+JtbdxKUYg4CuQgGO6bK25vjkwMvQwvAev57DSBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514363; a=rsa-sha256; cv=none; b=yvN4/fngpXBPBT2w+G4DQD6HLi47gEDd/HWoRyHN+aElk0qtWcu/aqd4oOaJ8GB02TClLW kLjmf91p2cwDGJCG4N0K43Tr8br1uTosP99a8gwS6jooGd0DfcE5//r5ctO5xcCqpw1Odi H8Q0l8B8BOqAdNYajHUjiuk04d40yNpgD9ety/kYPTdRSt5ItHDZaquD359XMLpBKI2USn MdUKW2Haj/1tT4PWTY+pQrvWDqv+HUUlQoPnA9mz76G92R2XNGVpgviJycQatbQjzv2EuE TCeJJcPJ57VkEXM4jOjKh7t2pfnfJA+S0q7kVueDs7DnOjHDGYaQTUoDxjeamw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=td4trl1KOrL/DQ7us4uHW5h8bcX+8W5uwzWpWL2hPoA=; b=gm8At6GKaHa3nMDhMu2Osf3VblXJsQOwTTcYGBlHJ3wtUoDuUBt5eWUXEozCG4FnOpMsG3 Zd+b+5j9uSEhXb+ENHIBB7X8UtLGZY1NU9vvIJWsJfEkOJ9yo0pPgj0vOS7NKeS7mROhdX uoYE4/bswG4WMNlblnySlDZ+UiLSdEkjxNY4078WIac2LioH2IarKqabZGbo6eJs6K9CxA MI78x5z54v8BcQnoszMWh6EMxfdQlVd/ovFQ2d11JHo17Cm5KyFYVuNBmw1aVifjjdkbHW AOzzfP5KAwEf6vaG00ADXZzzi54bq+SSnlJWuUUgGWuxNdDfPcTCfK231qUT0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvb0FNdzm6; Mon, 25 Dec 2023 14:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ27d023891; Mon, 25 Dec 2023 14:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ2QU023888; Mon, 25 Dec 2023 14:26:02 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:02 GMT Message-Id: <202312251426.3BPEQ2QU023888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: ea7b13771cc9 - main - lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990 commit ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990 Author: Robert Clausecker AuthorDate: 2023-12-04 17:32:49 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:48 +0000 lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() This picks up the accelerated implementation of memccpy(). Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42902 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncat.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index b569d2cb8be8..a14e8a768f01 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -17,6 +17,7 @@ MDSRCS+= \ strlcat.c \ strlcpy.S \ strlen.S \ + strncat.c \ strncmp.S \ strncpy.c \ strnlen.c \ diff --git a/lib/libc/amd64/string/strncat.c b/lib/libc/amd64/string/strncat.c new file mode 100644 index 000000000000..33b278ac5e04 --- /dev/null +++ b/lib/libc/amd64/string/strncat.c @@ -0,0 +1,29 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memccpy(void *restrict, const void *restrict, int, size_t); + +char * +strncat(char *dest, const char *src, size_t n) +{ + size_t len; + char *endptr; + + len = strlen(dest); + endptr = __memccpy(dest + len, src, '\0', n); + + /* avoid an extra branch */ + if (endptr == NULL) + endptr = dest + len + n + 1; + + endptr[-1] = '\0'; + + return (dest); +} From nobody Mon Dec 25 14:26:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvc3dwSz54nJ9; Mon, 25 Dec 2023 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvc283Nz3NF4; Mon, 25 Dec 2023 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgy1vWvJyfeTJNcyS7M3ZMcgHnWNcG1wBtan1hmrSDs=; b=ZHWUwtFDGzsJUwEVCNSrsQ5IoQZomf3cU9EP85XWBD35zK4NF+Lexogtmn9DV9hlnEgjx7 QBYq04hUPbeG07JuFfOqQHyNZz6V+nygy2TGI1bkG/+TAG8qFCracx+A7QThpouZgqD+VH weJdnUNYr08+e5+80nJT8E4aKhGNC/qSVPCjPS006zS7oB4q3PYVYxegHMwUMzxqHlcy44 r6Kt0AWNg9zKUmIpyRWR1Tzk+fyKuPwewhPMih30Zo7VQ+VYUL8wEWRGJEB3cpLCNSkZ6L TnZrK5dwMHD7/7XiTbXkeju6+nStfOth44PnRhN6Sp72/fFbYw0qybNFNWRy+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514364; a=rsa-sha256; cv=none; b=maGCDeGubDeEPKpRE03tHeUe6eXXrqNJ82tl+nUfDpy0NnXFSzOzl18twXjP5Ixc+WtVbz oqd1OS7WYnsiTSADg3n5RJeCybLvHfbe6WktWIP/QBwRymgGoS42uAAgqplPx4D6R7/ek/ hQ9AdNLE3g4BAITy8/YU9wjFWem9mKh8b6mdN3BtSnxKMh1tQenWYtZZnCcq1qofD6Kv4p 2s9JVm9fQJ2Bd0+WMhZm7rJamrpnvGncn5bAkL2nkpqlulcsiH7FGnGvADUJGOGBbp/MTw gtbidMxSgLAFCR+6Dsd+PXXypPIW34vUpEOzO86H+7OgPEAaYJk7Mc+3ovGffg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgy1vWvJyfeTJNcyS7M3ZMcgHnWNcG1wBtan1hmrSDs=; b=eIYc5QWp4uLhDz99gT9LkTEfIfuEZy1d4GxVtG2ugXOBmyo0x73t77JHbH6I7kac57O/Ot jJbqzWAz9NjATzdGLJNQUMCA4ISRkrMzovHiz3bun0VxTKRhY7m3El0UoHFBhRQsx+TaM3 78MmjXIHDr6Adg6pOB8VqkX9nwD1W7zRVJyu5+rD2zFNo0gQFtSMnJRaud3CPkzShVziCD jkGciBChcGJ30c5Z8yK2QLtCZmaLvYbd8Pmj8+FWK+NG9CHVcLPMMsvLaE7ZaCMCV6vqqm gwx/aAxgedY51+17ejMuQeOr5HW1wCxrorpP6z1uZTwI2p7GTUBaBONVmbuNtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvc1GCrz4t; Mon, 25 Dec 2023 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ4WC023943; Mon, 25 Dec 2023 14:26:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ4bM023940; Mon, 25 Dec 2023 14:26:04 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:04 GMT Message-Id: <202312251426.3BPEQ4bM023940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: e0d4f419ac41 - main - lib/libc/string: document restrict qualification of memccpy() arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0d4f419ac41aa91b862f3ceadc32a86abf08572 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e0d4f419ac41aa91b862f3ceadc32a86abf08572 commit e0d4f419ac41aa91b862f3ceadc32a86abf08572 Author: Robert Clausecker AuthorDate: 2023-12-05 14:03:28 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:50 +0000 lib/libc/string: document restrict qualification of memccpy() arguments POSIX.1-2004 and the upcoming C23 agree that memccpy()'s arguments are restrict qualified and must not overlap. In 2002, restrict qualifiers were added to 's declaration of the function. Make things official and document that the arguments must not overlap. See also: 61b60edfd3fff20f884419f8097870c7045315c9 Approved by: kib MFC after: 1 month MFC to: stable/14 --- lib/libc/string/bstring.3 | 10 ++++++++-- lib/libc/string/memccpy.3 | 33 ++++++++++++++++++++++++++++++--- lib/libc/string/memccpy.c | 2 +- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3 index fd976c7676b7..91603fe6dbac 100644 --- a/lib/libc/string/bstring.3 +++ b/lib/libc/string/bstring.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 4, 1993 +.Dd December 5, 2023 .Dt BSTRING 3 .Os .Sh NAME @@ -56,7 +56,12 @@ .Ft int .Fn memcmp "const void *b1" "const void *b2" "size_t len" .Ft void * -.Fn memccpy "void *dst" "const void *src" "int c" "size_t len" +.Fo memccpy +.Fa "void * restrict dst" +.Fa "const void * restrict src" +.Fa "int c" +.Fa "size_t len" +.Fc .Ft void * .Fn memcpy "void *dst" "const void *src" "size_t len" .Ft void * @@ -78,6 +83,7 @@ See the specific manual pages for more information. .Xr memccpy 3 , .Xr memchr 3 , .Xr memcmp 3 , +.Xr memccpy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr memset 3 diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3 index ce8d5f65ac93..3bdae24354c1 100644 --- a/lib/libc/string/memccpy.3 +++ b/lib/libc/string/memccpy.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 9, 1993 +.Dd December 5, 2023 .Dt MEMCCPY 3 .Os .Sh NAME @@ -36,7 +36,12 @@ .Sh SYNOPSIS .In string.h .Ft void * -.Fn memccpy "void *dst" "const void *src" "int c" "size_t len" +.Fo memccpy +.Fa "void * restrict dst" +.Fa "const void * restrict src" +.Fa "int c" +.Fa "size_t len" +.Fc .Sh DESCRIPTION The .Fn memccpy @@ -59,13 +64,35 @@ is returned. Otherwise, .Fa len bytes are copied, and a NULL pointer is returned. +If +.Fa src +and +.Fa dst +overlap, behavior is undefined. .Sh SEE ALSO .Xr bcopy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr strcpy 3 +.Sh STANDARDS +The +.Fn memccpy +function conforms to +.St -p1003.1-2004 +and +.\" St -isoC-2024 . +ISO/IEC 9899:2024 (\(lqISO\~C23\(rq). .Sh HISTORY The .Fn memccpy function first appeared in -.Bx 4.4 . +.Bx 4.4 +and was first specified in the +.\" St -svid1 . +System\~V Interface Definition, First Edition (\(lqSVID1\(rq). +The +.Ft restrict +keyword was added to the prototype in +.Fx 5.0.0 +in accordance with the updated specification of +.St -p1003.1-2004 . diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index 174824ba2393..d6a446503eb6 100644 --- a/lib/libc/string/memccpy.c +++ b/lib/libc/string/memccpy.c @@ -32,7 +32,7 @@ #include void * -memccpy(void *t, const void *f, int c, size_t n) +memccpy(void * restrict t, const void * restrict f, int c, size_t n) { if (n) { From nobody Mon Dec 25 14:26:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvd3GnJz54nMw; Mon, 25 Dec 2023 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvd2WdCz3NMf; Mon, 25 Dec 2023 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HfVZf10DIUtAceeFrT5r0YYBPLdrihggRBCz1nf99kM=; b=CcAG4tGVduJDInj96gJiNgSzbKKFMPgpEAw67+nYLMKr3A6YLOs/H8bByGdQvAkbCQ8Esr bf7OGr446tkviZtfHn+0wZ9Bp7Xl21J7OHHUXhdgKciLhpXQO0Nug2L+zAqpy4913OG1qK 27UF3T2gQ9RFQfYwrPtfTPnzrZ3yN7NwSkKcln1hUiv6+HQF/jKmje1ydv6DgMZg0dcDmc vcch/jFwpq5fmfsKbjTORo99EehYUTAjCG24o3w7tJX8dD8WpafyFk4OHjrSr4RY6GTZkg wRiLmmKYg4P4BFHuaGEE05Xfjjl+1/8pgCKHctkn/i+RE4Z6ag+HVDhnuTc/9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514365; a=rsa-sha256; cv=none; b=bG46vtl2gZzCjXoVaJSW06EqJA/88ekXkNmrQdiVuHYPPix/mvY59Er1ZieEBi+XWxBqT0 q1KmarhflpD5BGlweV6dBg8YZ09gQrleIhx/CWjeknpVA9a2oljIQIr4+1942z11+UlJlL WiDhNzOGJ+sB6236D3frf0rm9cPAhnWq97F5NU4+ppzaZupquXfETRlZIkl+I9roCA4KED Lx8CphI7uFw7a1qkfxJEzEY+uRWkePSJmaC5iExsOwOVI8bgNaj2JfNKr4iKS24mIwGBbF iRMsGn7lnO544OguKTHpmK0IdAYc0yUyxATENReN6sRu32HwB2rKhDTjIYz6Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HfVZf10DIUtAceeFrT5r0YYBPLdrihggRBCz1nf99kM=; b=VvTbCqjp5SH/kF3325bI/Iv9/Sqy9ftdq54OItN2CDJJ6RlJZjpl9Greq9dUCgvyKZKYCF S06AVug3FqF/mBHCg/sEb3gSRoZRLBoIK/DRFA2cpdVSHJYWhmj6h5i8gNrU7bMQB2sZmL ItFExQVjy5CTLbJ2i5WVmeWAXRPNCOy90HiEXMbWcwyfraH9tk4O2TYpm9nUrUnycvMuMC WBS8jSXpcGwj1+oJsuPoRUpiG0BTYhw/8SNZygAyqcAsjfGoXQm5eMeqCC7sdzLMRPU4jn hq7rY/YcRWK4hcglRd6esD2xnoEXoTXl03RF/HHN5y7rGYbgAqI9CVXmyW7gUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvd1dJYz4v; Mon, 25 Dec 2023 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ5iH023985; Mon, 25 Dec 2023 14:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ5Sn023982; Mon, 25 Dec 2023 14:26:05 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:05 GMT Message-Id: <202312251426.3BPEQ5Sn023982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 691ff1832e09 - main - lib/libc/tests/string: add memrchr unit tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6 commit 691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6 Author: Robert Clausecker AuthorDate: 2023-12-06 09:11:40 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:58 +0000 lib/libc/tests/string: add memrchr unit tests The "values" test case is specifically crafted to detect the off-by-one error previous discovered in the scalar strchrnul implementation. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/memrchr_test.c | 116 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a6e8eb18075a..4fce79685c0e 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memccpy_test ATF_TESTS_C+= memcmp_test +ATF_TESTS_C+= memrchr_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test diff --git a/lib/libc/tests/string/memrchr_test.c b/lib/libc/tests/string/memrchr_test.c new file mode 100644 index 000000000000..12f696c9dc1e --- /dev/null +++ b/lib/libc/tests/string/memrchr_test.c @@ -0,0 +1,116 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include +#include +#include + +#include + +static void *(*memrchr_fn)(const void *, int, size_t); + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(memrchr_fn(NULL, 42, 0), NULL); +} + +ATF_TC_WITHOUT_HEAD(not_found); +ATF_TC_BODY(not_found, tc) +{ + size_t i, j; + char buf[1+15+64+1]; /* offset [0..15] + 64 buffer bytes + sentinels */ + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) { + buf[i + j + 1] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf + i + 1, 'X', j), NULL); + buf[i + j + 1] = '-'; + } +} + +static void +do_found_test(char buf[], size_t len, size_t first, size_t second) +{ + /* invariant: first <= second */ + + buf[first] = 'X'; + buf[second] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf, 'X', len), buf + second); + buf[first] = '-'; + buf[second] = '-'; +} + +ATF_TC_WITHOUT_HEAD(found); +ATF_TC_BODY(found, tc) +{ + size_t i, j, k, l; + char buf[1+15+64+1]; + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k < j; k++) + for (l = 0; l <= k; l++) { + buf[i + j + 1] = 'X'; + do_found_test(buf + i + 1, j, l, k); + buf[i + j + 1] = '-'; + } +} + +/* check that the right character is found */ +static void +do_values_test(unsigned char buf[], size_t len, size_t i, int c) +{ + /* sentinels */ + buf[-1] = c; + buf[len] = c; + memset(buf, c + 1, len); + + if (i < len) { + buf[i] = c; + ATF_CHECK_EQ(memrchr_fn(buf, c, len), buf + i); + } else + ATF_CHECK_EQ(memrchr_fn(buf, c, len), NULL); +} + +ATF_TC_WITHOUT_HEAD(values); +ATF_TC_BODY(values, tc) +{ + size_t i, j, k; + int c; + unsigned char buf[1+15+64+1]; + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k <= j; k++) + for (c = 0; c <= UCHAR_MAX; c++) + do_values_test(buf + i + 1, j, k, c); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + memrchr_fn = dlsym(dl_handle, "test_memrchr"); + if (memrchr_fn == NULL) + memrchr_fn = memrchr; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, not_found); + ATF_TP_ADD_TC(tp, found); + ATF_TP_ADD_TC(tp, values); + + return (atf_no_error()); +} From nobody Mon Dec 25 14:26:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvf5DNnz54n8c; Mon, 25 Dec 2023 14:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvf3nttz3NN1; Mon, 25 Dec 2023 14:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkFn0SK5lo3QzRMk+xeUpB1rJRutEHsGceWs2maGZqM=; b=Z3RCMJqs4WS8q3oNScWiu4AeO6Et1vtY9k+oZOMhsE+/AsXUDdpPNKU/Z17Q7YXefq+JyK OER8aoJ5NPRUP4pFkvL5jmz2km95kq4z72FYQzXlvh2eJll5omlFeHo6oSNbWzrfaThJNu yiRa45Gu7FWjcSJ9FIOJ21ufDlAxedFoadfbDWFk9YA/OJljWZUQvOueR8sGKgcC6JDB/G fUhlFRm+8fAv9Eyw0/snLv8G+WaXSwceEy4YD6r/V//o6IuXV08fRVkbcUpu/o32rwVRLX 8yoIe/qPFxue0iuOsCbI6DK0fojq03nebWRVfsN/IVg31Cn/DJ3NsFHpIcNiMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514366; a=rsa-sha256; cv=none; b=AkqXVBLHH5dwvCTuJ49EaHhzJqW8FJAcnINS5X0ENuDvlo5ouMwYi//Mhn+TrgBQoD3ne7 pdTHw8XwuOvNfj0Mf2JfpdI+2HTtJ9e0aU85vcPLKRNhlLcanE8gmWNxTPosKKv97JVf4l jtbVxO4+VIIR8EEQPOvQDkD5m69K/RGNYkssTH4LZGPC6F6hUek5HL1kdyWG3CA5iJlL4h a+phKjkEv/VJDuaV3pV8aJzHKu/w2x1L1AXd+eHXkF1upfnX/LcKvsshY10nJTMwU7X2yi Vg0FDv2CsEuONa7uselaDUXJ5jDk05lrFfKwyfsVDr6t4tq6mX3vwB3vvlg6VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkFn0SK5lo3QzRMk+xeUpB1rJRutEHsGceWs2maGZqM=; b=XwTFhWrKgFW7nFjkRIiaKyApz+YiJmFC09QzDlDxkfW7Yw531/he0zDVxzJFJ5am/5JQ2G YjOu+gqmheCORA701wzmGGGG7913Uu14HKYhLxxX2MbeHCdqmEvSKR7DjUJaV4wCxa9XkK dtF9jmbk00ecGVMO8u247rDMg+wwAvInj+XQXbIsCjrwn6JHRlTD1ZIvAo4jhHyaxZLkTC ZKaQY36WLBK16W7AXc6OeK9XmNJiyJEJvQmfsyK9hm4kdx29U4HHy+l/rlb0a45M43kzym lOMa79P2yGg/c2kNyXb+KlTyb7mcGr6xvnqLwj7GZSDPxPDaSd8trJA4tTnssA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvf2v7szSP; Mon, 25 Dec 2023 14:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ6Ei024030; Mon, 25 Dec 2023 14:26:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ6g5024027; Mon, 25 Dec 2023 14:26:06 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:06 GMT Message-Id: <202312251426.3BPEQ6g5024027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: fb197a4f7751 - main - lib/libc/amd64/string: add memrchr() scalar, baseline implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb197a4f7751bb4e116989e57ba7fb12a981895f Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb197a4f7751bb4e116989e57ba7fb12a981895f commit fb197a4f7751bb4e116989e57ba7fb12a981895f Author: Robert Clausecker AuthorDate: 2023-12-06 10:05:47 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 14:00:05 +0000 lib/libc/amd64/string: add memrchr() scalar, baseline implementation The scalar implementation is fairly simplistic and only performs slightly better than the generic C implementation. It could be improved by using the same algorithm as for memchr, but it would have been a lot more complicated. The baseline implementation is similar to timingsafe_memcmp. It's slightly slower than memchr() due to the more complicated main loop, but I don't think that can be significantly improved. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memrchr.S | 166 +++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index a14e8a768f01..b1369841bc74 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -6,6 +6,7 @@ MDSRCS+= \ memccpy.S \ memcpy.S \ memmove.S \ + memrchr.S \ memset.S \ stpcpy.S \ stpncpy.S \ diff --git a/lib/libc/amd64/string/memrchr.S b/lib/libc/amd64/string/memrchr.S new file mode 100644 index 000000000000..4f6c5a238daa --- /dev/null +++ b/lib/libc/amd64/string/memrchr.S @@ -0,0 +1,166 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(memrchr) + ARCHFUNC(memrchr, scalar) + ARCHFUNC(memrchr, baseline) +ENDARCHFUNCS(memrchr) + +ARCHENTRY(memrchr, scalar) + xor %eax, %eax # prospective return value + sub $4, %rdx # 4 bytes left to process? + jb 1f + + ALIGN_TEXT +0: xor %r8, %r8 + lea 2(%rdi), %r10 + cmp %sil, 2(%rdi) + cmovne %r8, %r10 # point to null if no match + + cmp %sil, (%rdi) + cmove %rdi, %r8 # point to first char if match + + lea 1(%rdi), %r9 + cmp %sil, 1(%rdi) + cmovne %r8, %r9 # point to first result if no match in second + + lea 3(%rdi), %r11 + cmp %sil, 3(%rdi) + cmovne %r10, %r11 + + test %r11, %r11 + cmovz %r9, %r11 # take first pair match if none in second + + test %r11, %r11 + cmovnz %r11, %rax # take match in current set if any + + add $4, %rdi + sub $4, %rdx + jae 0b + +1: cmp $-3, %edx # a least one character left to process? + jb 2f + + cmp %sil, (%rdi) + cmove %rdi, %rax + + lea 1(%rdi), %rcx + cmp $-2, %edx # at least two characters left to process? + jb 2f + + cmp %sil, 1(%rdi) + cmove %rcx, %rax + + lea 2(%rdi), %rcx + cmp $-1, %edx # at least three character left to process? + jb 2f + + cmp %sil, 2(%rdi) + cmove %rcx, %rax + +2: ret +ARCHEND(memrchr, scalar) + +ARCHENTRY(memrchr, baseline) + movd %esi, %xmm4 + test %rdx, %rdx # empty buffer? + jz .L0 # if yes, return immediately + + punpcklbw %xmm4, %xmm4 # c -> cc + mov %edi, %ecx + punpcklwd %xmm4, %xmm4 # cc -> cccc + and $~0xf, %rdi # align source pointer + pshufd $0, %xmm4, %xmm4 # cccc -> cccccccccccccccc + and $0xf, %ecx + movdqa %xmm4, %xmm0 + mov $-1, %r8d + pcmpeqb (%rdi), %xmm0 # compare aligned head + shl %cl, %r8d # mask of bytes in the head of the buffer + pmovmskb %xmm0, %eax + + sub $16, %rcx + and %r8d, %eax # match mask + add %rcx, %rdx # advance past head + cmc + jbe .Lrunt # did the string end in the buffer? + + mov %rdi, %rsi # pointer to matching chunk + add $16, %rdi + sub $16, %rdx # enough left for another round? + jbe 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa %xmm4, %xmm0 + pcmpeqb (%rdi), %xmm0 + pmovmskb %xmm0, %r8d + + cmp $16, %rdx # enough left for second chunk? + jbe 2f + + movdqa %xmm4, %xmm0 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm0, %ecx + + lea 16(%rdi), %r9 + test %ecx, %ecx # match found in second chunk? + cmovz %r8d, %ecx # if not, use match data from first chunk + cmovz %rdi, %r9 + + test %ecx, %ecx # any match found? + cmovnz %ecx, %eax # if yes, overwrite previously found match + cmovnz %r9, %rsi + + add $32, %rdi # advance to next iteration + sub $32, %rdx # advance to next chunks + ja 0b + + /* process remaining 1--16 bytes */ +1: pcmpeqb (%rdi), %xmm4 + mov $0xffff, %r8d + xor %ecx, %ecx + sub %edx, %ecx # number of bytes to be masked out + pmovmskb %xmm4, %r9d + shr %cl, %r8d # mask of bytes to be kept in the buffer + and %r9d, %r8d + cmovnz %r8d, %eax + cmovnz %rdi, %rsi + bsr %eax, %eax + lea (%rsi, %rax, 1), %rsi # pointer to match (or junk) + cmovnz %rsi, %rax # if any match was found, return it + ret + + /* end of chunk reached within first half iteration */ +2: test %r8d, %r8d # match in previous chunk? + cmovnz %r8d, %eax # if yes, overwrite previous chunks + cmovnz %rdi, %rsi + add $16, %rdi # point to tail + sub $16, %edx + jmp 1b # handle tail the same otherwise + + /* runt: string ends within head, edx has negated amount of invalid head bytes */ +.Lrunt: mov $0xffff, %r8d + xor %ecx, %ecx + sub %edx, %ecx + shr %cl, %r8d + and %r8d, %eax + bsr %eax, %eax + lea (%rdi, %rax, 1), %rdi + cmovnz %rdi, %rax + ret + + /* empty buffer: return a null pointer */ +.L0: xor %eax, %eax + ret +ARCHEND(memrchr, baseline) + + .section .note.GNU-stack, "", %progbits From nobody Mon Dec 25 14:26:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvg6P1Qz54n4H; Mon, 25 Dec 2023 14:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvg4sHHz3NNX; Mon, 25 Dec 2023 14:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ts2TzHAJwf9DANqm3+Q2jL5lWTF1H7HSD5mBLVTn/cM=; b=Dwa4dpm/2bL2JBbGtZFnl3EhK9fphNrgJiMoiCKPMjZwbtIC2p+1RqME5cnnb8jFS6u4L7 K+uCiciDoRtU9bcpp6fk+4VvKat/n20grZTlSHsSNA5hFojGdAIN57t/A8oFL6j2OOfGUW yGsPWQA93cDrkZnEPC0GkupsiJzqGe8cMTIZEAj5sxP/7jXM8hfkwZe4uL3I28QHzoe5m/ 4e6TizoSh3reh3cHTuTlwpQenTUdF3B9qn/q9L41SaUrJ17tc6nQKNf8blKxcUVPkBdcKt ix38iTZqW+iqBiVzGa9W2fKR7fqvI7nFlmUQVeRYxPbcru4ivdEx6bypIDY23w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514367; a=rsa-sha256; cv=none; b=YDJOgqBeU+z0L6XKwrjtMby0AzW91mzzCpxFiqcYKbKLa6klkcDh/IjN9UNWkwMwCLw7Mn xSjIIjn5aPw8sdq014rO0T/y5mNBuczF5s6+N/4wv+DjAR+iTEAAsUDxRliRO/F4+EHUtQ Dlftoixabsl3cCkQhaqhenHyUOyipVrsLzdeTgSQjJgI6CW7UgTWCIh4M9du30YJ8rd0k+ ie5PL6MaGZFNNe8Cr3FnqoDsA03M9PAtzlxbur6joPkjB8UJ6CsN8ZLWLzAHnuBgHiC09i PpvltuVYI9dK/P6J1SeaWdx35vJ+8aP52VON5kQ2mdAFj7ke7peANsvl3TyNog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ts2TzHAJwf9DANqm3+Q2jL5lWTF1H7HSD5mBLVTn/cM=; b=darB0yqVv7vts/GU5VLlDQMYCanSWsBGJwhBMoW/xGo0ErSfNFZYx/Nf+06m4EJ2KQSP4B UOvS9cEznOz0rttrDdJe6mBRXP3KFeQHWJM+w5vS+j4L3T5W7Ms91wrGok6q8aM1EpOLnS rDmxRpmBEYyqvO5hdFMsQ7LbgmglqsjSesn8rm1WG/8zrnrpB6aLH/oBGLpcqJNbo70Y1l PgySgu5JXEreZ0X1238vr4U0l3QSo7T4g8L1Q1i6FH7dcRbSUnK903Q7K0v0xlTsVPItJa +Evtu+Bopc45kESxX4ZlJfWqjOYdS7wSQ2/KAWrs95RAmTe6hBLCxEgobkoxmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvg3yq0zSQ; Mon, 25 Dec 2023 14:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ7ma024072; Mon, 25 Dec 2023 14:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ7FZ024069; Mon, 25 Dec 2023 14:26:07 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:07 GMT Message-Id: <202312251426.3BPEQ7FZ024069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: fb9c25a91fcf - main - share/man/man7/simd.7: document SIMD-enhanced memrchr implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb9c25a91fcf4005141eeb81ce49f4399c425d32 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9c25a91fcf4005141eeb81ce49f4399c425d32 commit fb9c25a91fcf4005141eeb81ce49f4399c425d32 Author: Robert Clausecker AuthorDate: 2023-12-06 13:47:03 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 14:00:08 +0000 share/man/man7/simd.7: document SIMD-enhanced memrchr implementation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 281898839c24..fd9485524aef 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd December 4, 2023 +.Dd December 6, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,6 +63,7 @@ Enhanced functions are present for the following architectures: .It memccpy Ta Ta Ta S1 .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV +.It memrchr Ta Ta Ta S1 .It memset Ta S Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta S Ta Ta S1 From nobody Mon Dec 25 17:20:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzPmL6cBtz552n2; Mon, 25 Dec 2023 17:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzPmL5ffcz4VZH; Mon, 25 Dec 2023 17:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703524802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gcA1v9SPwnVsUz+QKqKe2cdGt88SlqpPyCAwpcUu+o=; b=K/gYcJepJ5SuYyqLwbsyfTTL5gI+dnmaUQiH4rZAkIed1QUW20p5LFz3fbh8bEPZQ4HDON t/85iJC2l3Y6LJV7UzI6/TZSBqpCZpavv9twDLCNCsRx9SenYbKcj++M9lZlYGCfRwxbd/ ODHye5I+SWwIVhF0xd77KzJnfdh+vsjQG2VcUR9ZMfNwXTAkNuHzeQcukajN1+JBLql9T0 s5MT8kNNeALZXtADt8rQtcMZq7aYU4BnZc/ps5b3CoWS6fkJj9df3aB+XUJTWIG7zHcJHe S3XlaIu2TDzCE2cGpMt/8g9ZlIdRIrpuRxupUH193Jp00lqk10p7uskrN+Oj7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703524802; a=rsa-sha256; cv=none; b=INxNu4Ngf4PUAKNZFcFd2rJdjSDO8dygsXDfQnNWh0K6fZCrokXT5RAEt4Q3ySy7FsRXhj NWVS3mZXDB+jSvceEYgp5pOKAD+B92cgX/v0umbineyMzGwRAB/Yr5IPPBic587762n6ve CHIvi1NUKGw7bSQcENE2m+XuPqHpZRtB1QqJa58leJOgJksT6gw3l+BH7rtcL/C14xeo1x rbNmE1VlUlKnGMf9eh9Vm/A2rmAcd5I43bWXErX8hTuHM93PZaaryI95e5WJO2w43wLwfm gXcSjNWiwnxVmEuoyhe6Wn9IPPo7kkJfRc4X2QSCg75ovII8lcCxozqLsJyjXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703524802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gcA1v9SPwnVsUz+QKqKe2cdGt88SlqpPyCAwpcUu+o=; b=bC16b8EhHUNY0/1QFVbIEdMY8W4rE/l57xhdXdoO+okWqfQy0vX+ZwPuvzwnizT2gFHaG9 0esQiGte1mOJ/SBSj+7tvfTqXT8hl3i53u2nMd5ZFk/zNRPFy/Ew+jA00q5A2nfoVtrp8I FZkBVDUzk6nOcBf58os40KBlMZEheV0k7Pgk7PDPMORI5yN9MiB4mb9qANpzK27FTV8OSI 6bGmLcrMDQ17VEt1l1TONXcWHDN93WxNxEE5UL+mavsWuhuchJZ8MHZfA4ClJwjgVnc9ac +BsQA8f+A3da/fxoMdfWhrhPV3G/8/kaiSmLcTVd0BaJ7n4cxUfj38GNlodbvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzPmL4c5hz5MQ; Mon, 25 Dec 2023 17:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPHK2ZX016855; Mon, 25 Dec 2023 17:20:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPHK2Y4016852; Mon, 25 Dec 2023 17:20:02 GMT (envelope-from git) Date: Mon, 25 Dec 2023 17:20:02 GMT Message-Id: <202312251720.3BPHK2Y4016852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1ff41cad716a - main - Minimize libc++ errno-related header diffs with upstream List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ff41cad716adeba0d408652c92c81e59e3ba316 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff41cad716adeba0d408652c92c81e59e3ba316 commit 1ff41cad716adeba0d408652c92c81e59e3ba316 Author: Dimitry Andric AuthorDate: 2023-12-25 17:18:31 +0000 Commit: Dimitry Andric CommitDate: 2023-12-25 17:19:12 +0000 Minimize libc++ errno-related header diffs with upstream In commit 88640c0e8b6f5 the new EINTEGRITY errno value was added, and this caused us to carry a patch for upstream libc++ since that time. Because it can cause merge conflicts when importing libc++ code from upstream, I have submitted an upstream pull request to get most of that patch integrated. It turns out that we do not need the errno.h part of it at all, since all supported FreeBSD versions define EOWNERDEAD and ENOTRECOVERABLE, and therefore the block that juggles with ELAST values is never used in FreeBSD. At the moment it only applies to older versions of Linux, or possibly other platforms. Therefore the only part that needs to stay is the definition of a enum errc value for EINTEGRITY, and this is made optional upon EINTEGRITY being defined, to make it suitable for upstreaming. No functional change is intended. MFC after: 1 week --- .../libcxx/include/__system_error/errc.h | 2 + contrib/llvm-project/libcxx/include/errno.h | 62 +++++----------------- 2 files changed, 16 insertions(+), 48 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__system_error/errc.h b/contrib/llvm-project/libcxx/include/__system_error/errc.h index f0c27b1c60a1..f939c99f7ed6 100644 --- a/contrib/llvm-project/libcxx/include/__system_error/errc.h +++ b/contrib/llvm-project/libcxx/include/__system_error/errc.h @@ -143,7 +143,9 @@ _LIBCPP_DECLARE_STRONG_ENUM(errc) identifier_removed = EIDRM, illegal_byte_sequence = EILSEQ, inappropriate_io_control_operation = ENOTTY, +#ifdef EINTEGRITY integrity_check_failed = EINTEGRITY, +#endif interrupted = EINTR, invalid_argument = EINVAL, invalid_seek = ESPIPE, diff --git a/contrib/llvm-project/libcxx/include/errno.h b/contrib/llvm-project/libcxx/include/errno.h index ea96c3a0f004..7b02d2b47953 100644 --- a/contrib/llvm-project/libcxx/include/errno.h +++ b/contrib/llvm-project/libcxx/include/errno.h @@ -34,79 +34,49 @@ Macros: #ifdef __cplusplus -#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) || !defined(EINTEGRITY) +#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) -#if defined(ELAST) +#ifdef ELAST static const int __elast1 = ELAST+1; static const int __elast2 = ELAST+2; -static const int __elast3 = ELAST+3; #else static const int __elast1 = 104; static const int __elast2 = 105; -static const int __elast3 = 106; #endif -#if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) -#define ENOTRECOVERABLE __elast1 -#define EOWNERDEAD __elast2 -#define EINTEGRITY __elast3 -#if defined(ELAST) -#undef ELAST -#define ELAST EINTEGRITY -#endif - -#elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) -#define ENOTRECOVERABLE __elast1 -#define EOWNERDEAD __elast2 -#if defined(ELAST) -#undef ELAST -#define ELAST EOWNERDEAD -#endif +#ifdef ENOTRECOVERABLE -#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EOWNERDEAD __elast1 -#define EINTEGRITY __elast2 -#if defined(ELAST) -#undef ELAST -#define ELAST EINTEGRITY -#endif -#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY) -#define EOWNERDEAD __elast1 -#if defined(ELAST) +#ifdef ELAST #undef ELAST #define ELAST EOWNERDEAD #endif -#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) -#define ENOTRECOVERABLE __elast1 -#define EINTEGRITY __elast2 -#if defined(ELAST) -#undef ELAST -#define ELAST EINTEGRITY -#endif +#elif defined(EOWNERDEAD) -#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 -#if defined(ELAST) +#ifdef ELAST #undef ELAST #define ELAST ENOTRECOVERABLE #endif -#elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) -#define EINTEGRITY __elast1 -#if defined(ELAST) +#else // defined(EOWNERDEAD) + +#define EOWNERDEAD __elast1 +#define ENOTRECOVERABLE __elast2 +#ifdef ELAST #undef ELAST -#define ELAST EINTEGRITY +#define ELAST ENOTRECOVERABLE #endif -#endif // !defined(OWNERDEAD) && !defined(NOTRECOVERABLE) && !defined(INTEGRITY) +#endif // defined(EOWNERDEAD) -#endif // !defined(OWNERDEAD) || !defined(NOTRECOVERABLE) || !defined(INTEGRITY) +#endif // !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) // supply errno values likely to be missing, particularly on Windows @@ -424,10 +394,6 @@ static const int __elast3 = 106; #define EMLINK 9979 #endif -#ifndef EINTEGRITY -#define EINTEGRITY 9980 -#endif - #endif // __cplusplus #endif // _LIBCPP_ERRNO_H From nobody Tue Dec 26 01:28:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccH0Fwcz55GPZ; Tue, 26 Dec 2023 01:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccG6lYSz3gD3; Tue, 26 Dec 2023 01:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36Y8M2c2tn/f70bR+rVKmTBQXwZYg+nQMLxI8IDTHtc=; b=noYM9rOAuS90QnB2OU44SqQaecRH5gzFxewLYPWDmykLgGKbbLEiYs8i/9qeBHUbcOM2Ov 9nT/owN6pPq2XhrXvdBOEejPIgPP7DWBSnrmnIvqLovCb3/dpTC9jPYVtpf6v/9fnOl31V PialK50NobZF3g/277BkPjysl0yXS+/KqZMWC8hUb9ToJyqkuUe63hqVTR3YZ8HNlWGwrS GqCts57N7+4YG90AAhd20ZbTr9xQ/HIa5Sk4ozO7MCAx2x0h9UsFHtQlQGh3mDaIGLBHzc R3d5miQWcrTnjuIS5tuJATdYXMIaEVodD7++16Xn84zwh7F6dX8r1C7lMm3kyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554126; a=rsa-sha256; cv=none; b=oCu1B45zzhXH0MTUbhVCkleD8jBrNDxVGIJjWieDnvIVIgV4S+ohUFxjN88I6mqJ0nty9n mWYYVf0Vyc/gpsDZ14QLyJwIO9sPceFGdg+Mnpd9b5w9dstEROVYvcBHSBd8JC3sihzVt5 qrQV1xqG/w69/FQz8nKXNKz3fA7bpDUt0jBQQUFY/1TmmqVVhs+Gya8GG0UbvIDjObBtfW /BRcyjxcCFCN6YE3hAonfz86f7LvGZ1Wy4Ps7iUE9TIF6Ph47vCOS5MlKKJsTPusj3VOjz vbj4P5yDJwVMfuTAmnCReIA0fusjfV81EoQf0o5SC6vC9ilq1SpziWuUf3C8Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36Y8M2c2tn/f70bR+rVKmTBQXwZYg+nQMLxI8IDTHtc=; b=KqXt2RxSdaAPi7blSONagou4E9hgPtLzqA0+3Ld7MdpBy40BVYKtdCIKmlPTDh0W9Rlpp0 fJc0VzyIN3l3HgCQhAQZCTQ8U4UDpnyl8uoAcCGavWetE0V9bm9++lgrch37N1Hk2OE2Q6 aq4RSfYHDfEfs9N8FpoVxX0vgltCVeahNg+tSYzQbUDZ85QHZvSsJjfuGW8Uryl3DOUGE9 3dU2z9zJrJROxM41AqAIVt0DkyJ/5FAGkfo3n4w8k9/L9WSM1VNda72Vp3bBKM8UFEGglW Ejp6CAcxZ6qHOUuZ8WcM/tD1TFbSy0aM1YiHM0uyBTxHK0z755W7OPTxug6IUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccG5q5CzZxZ; Tue, 26 Dec 2023 01:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1SkiV035314; Tue, 26 Dec 2023 01:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SkNw035311; Tue, 26 Dec 2023 01:28:46 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:46 GMT Message-Id: <202312260128.3BQ1SkNw035311@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: 6afa2333d2e4 - main - iommu: remove leftover sys/cdefs.h includes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6afa2333d2e42e1df67a0fab20f0ede76dff516d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6afa2333d2e42e1df67a0fab20f0ede76dff516d commit 6afa2333d2e42e1df67a0fab20f0ede76dff516d Author: Konstantin Belousov AuthorDate: 2023-12-24 14:24:05 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu: remove leftover sys/cdefs.h includes Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 1 - sys/x86/iommu/intel_drv.c | 1 - sys/x86/iommu/intel_fault.c | 1 - sys/x86/iommu/intel_qi.c | 1 - 4 files changed, 4 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 6088bee9a855..4e0bfb116116 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #define RB_AUGMENT_CHECK(entry) iommu_gas_augment_entry(entry) #include diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index aa3297fef253..0668a27554ce 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_acpi.h" #if defined(__amd64__) #define DEV_APIC diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c index d2760d6db93e..e275304c8d51 100644 --- a/sys/x86/iommu/intel_fault.c +++ b/sys/x86/iommu/intel_fault.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_acpi.h" #include diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c index 49b0039f3ac3..37e2bf211e32 100644 --- a/sys/x86/iommu/intel_qi.c +++ b/sys/x86/iommu/intel_qi.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_acpi.h" #include From nobody Tue Dec 26 01:28:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccJ19FRz55GPd; Tue, 26 Dec 2023 01:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccJ0Bxkz3fxR; Tue, 26 Dec 2023 01:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnJKZ56ewvRoMLIOZsvzC3RchkjncqmZWKF8EqZ93OY=; b=Jh4AosvvCTtI5qKyIj9+YRU/68c2N2/dy2ULAgtYzyANXVeLu9ss+ggnGgFIyUr8HDwW/f xq4BerLEKEB25ByuXz5ecssNEb0RP4CydFwyKAl+lDtmWySmMLHnnXyci4gcDI9nX0y0RL DntJvQ0VsMVQFtOScacgwOM6EnizWA801yYNu3EAlmkWub6aHKOFVM3c1IwB+0gzTIGfQo OVV1VvBs5it3UQg8b69jp3Q9N0/k4ww75pVu6O2PfDLr3Y59ZRaZd9Iqt3L/aJFFx0cV81 PiQ6/eSq8wQWiQ6/e8bUmoHMBQRsiubX79fr1I/d9vkc+yG3KpWryGD6FO3znQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554128; a=rsa-sha256; cv=none; b=IdfGkvs0jJILpZQHzBvBhXmwYL6wi75iMKoqNaW951RiGLGsKbH+2K5SDX5Sjp0+zgWFXp /yHo6ukaaVnPEfnOYa19MqgS+4I/X0aUCsnISo6rfZKUWzNBlr9SHkCxSbLkcQFxoNaLho i/zgRoVTPuozgMsJxDL1LgLq1NGoJqHvuKeslcVEF7nZZnETULiI+ezJIMDyW/EFNf+S+U ZcXa5LCeXzJxhC9GG0IUGk9fUA4Hda4Zv9jBVU0ld7YdKOf26LROV0CpnL8dY4KEVNieVa JBOLznbMComaOsrnsWnFyHharRiRHI5G7FEceNdRAe1HcCETrAJDeLG+rekzXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnJKZ56ewvRoMLIOZsvzC3RchkjncqmZWKF8EqZ93OY=; b=rCeMRU6L9veNWiiyKUPJy7azv6meJ6G66DlcuMW84iQXH+1HEGd/3PG25lVR0KTUg3RFij kk5ecRFd/YYbgPksAgVDbHP842tgunMe9WzOgIr+Pj/7ktIcUqTelHMhVgXqrkcwy8xGze Az9Z96n9pg/j8jOXF7P61n/OYm0qsZk+t+Zq09zbODyDpfyamtPns/V9mFc0FLmh2sGpZB sdBl8Q7I4QJZZDrBZ2vKWRpEE8H/nK9zcZM2Wl5KtySs5whlUU7OM/eo4AGjBmjyEBSPVH 0ZV2uXWGZjUq8zo2PwfSL7uAhAN9O4lDunb3O0S5aYrhVTNDbwmruOURJjwe+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 4SzccH6N1qzZZh; Tue, 26 Dec 2023 01:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1SlhX035353; Tue, 26 Dec 2023 01:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1Slrq035350; Tue, 26 Dec 2023 01:28:47 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:47 GMT Message-Id: <202312260128.3BQ1Slrq035350@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: 7153d5e4bc67 - main - dmar(9): style, fix indent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 7153d5e4bc67732f8258d50ffffa42a09a19b427 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7153d5e4bc67732f8258d50ffffa42a09a19b427 commit 7153d5e4bc67732f8258d50ffffa42a09a19b427 Author: Konstantin Belousov AuthorDate: 2023-12-15 11:24:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 dmar(9): style, fix indent Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/intel_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 0668a27554ce..c29508300b29 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -1018,10 +1018,10 @@ dmar_inst_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg) if (bootverbose) { printf("dmar%d no dev found for RMRR " "[%#jx, %#jx] rid %#x scope path ", - iria->dmar->iommu.unit, - (uintmax_t)resmem->BaseAddress, - (uintmax_t)resmem->EndAddress, - rid); + iria->dmar->iommu.unit, + (uintmax_t)resmem->BaseAddress, + (uintmax_t)resmem->EndAddress, + rid); dmar_print_path(devscope->Bus, dev_path_len, (const ACPI_DMAR_PCI_PATH *)(devscope + 1)); printf("\n"); From nobody Tue Dec 26 01:28:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccK36LJz55GcN; Tue, 26 Dec 2023 01:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccK1673z3g1J; Tue, 26 Dec 2023 01:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wG2lnas2ax8UZUTM6/N+p907+0kuGw6mrRT0emf+Vlw=; b=VA0yFI9VnodLazzG6CA3MUnUEkg401f+1UZLuR6Os7vh/pmqg6jVoCfQyGizfWIJJjnmeY S8oUVR6UHmy+qOREiJGEuUfa/qGn5ubMd5XN3tYVBUk/QUlmcIbjZRL8+191Ixfqs/q3K2 7hvCWSVEDItbhxdhXaPH3wixyz0FVJsinrLa9++a9+p2HDukm/TdGeBcgJuof2BOhDdDBi V/7JcUhyzO70lo1+fltjWEqDBZZuu117PP+Nm/we25r33NWZHJZNxoA3a05tqz9hLtyonY EiSxqKBFrzU+vqWauRVQ92BsSXVv7Wv3N6FJCHb7E6/txnApSqS/pbKClDOdug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554129; a=rsa-sha256; cv=none; b=D+G/ZNs6UdN25Ttiul+J548YRZmfHy33aKAlxBKuuTYFZfkSTyLzQ5gyWrCCijBOyF72Zc SibhsE7hSQPvk1HRAalVhegw8XmKl/qWzyzlZc0feLuXKTIf4tEJn4qEd16RyNR7jyYUH3 o4OL9E2Fx3AISz2st5nlfdifPceOrc62f5uvmBSB6ADnIUkzKonaIqBxX7SP3LiMSKuJO8 DoQcAutNBQhpveNXG2ZBBcZUifQP6WUZB2HdayryyE9w1BaH21pEmjsnJnI1nPARY2LxUq ogmvS740zOLX0iHpdOSvqqstAwLr+t6hIR9aLBGnXzhSKGRLNEMnJkNiGrOhXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wG2lnas2ax8UZUTM6/N+p907+0kuGw6mrRT0emf+Vlw=; b=aewv55MRYKWoY8uMoxXtLgWhGX0WTdTBRGDMbUjFOeRaYPKKsZzc/o1lAkbGRLqR27mo5X WOAObJVA7U9Z/Mdd+V29X7087uRsEaCzDyABW4lzoXF+gBYU9lchbjo1aVrXbIw3mT3Zdk dfw326aWPJUULF+CynYjZb8o5aBB/NodYjTXYJQVinAgJFfFCNruqvq8YjpP6lAvJ4i4gI RGAhW4+nveQa8jmK2qeo1fcmU2xwr36FoSGbzzjbq4R5pHpLMF9mZdb/8xIvJ+hDEttNvy aRsIAKZyQntQLKlHyzYUiyPZCdqe3TFuy8InFPtI5DiQghl18JmH5Z8C2DRtnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccK0DQRzZk7; Tue, 26 Dec 2023 01:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1SmE0035392; Tue, 26 Dec 2023 01:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SmJb035389; Tue, 26 Dec 2023 01:28:48 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:48 GMT Message-Id: <202312260128.3BQ1SmJb035389@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: a869643e184a - main - iommu_gas_match_one(): check for underflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a869643e184a73382ef7939b465fd42785e096d1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a869643e184a73382ef7939b465fd42785e096d1 commit a869643e184a73382ef7939b465fd42785e096d1 Author: Konstantin Belousov AuthorDate: 2023-12-26 00:57:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu_gas_match_one(): check for underflow Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 4e0bfb116116..cc541e748f48 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -329,6 +329,8 @@ iommu_gas_match_one(struct iommu_gas_match_args *a, iommu_gaddr_t beg, start = roundup2(beg, a->common->alignment); if (start < beg) return (false); + if (end < IOMMU_PAGE_SIZE + 1) + return (false); end = MIN(end - IOMMU_PAGE_SIZE - 1, ubound); offset = a->offset; size = a->size; From nobody Tue Dec 26 01:28:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccL3Qn0z55Gvl; Tue, 26 Dec 2023 01:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccL2BZ0z3fxp; Tue, 26 Dec 2023 01:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qP5yZSJO+jBzEusfp9SjXuMiCuxOZJNP+xS/RU+FjvE=; b=SMra+y7F+Z4+zktPNVanNJ+wy0G8GZbUvkfwo/QUjz6+q5zGFeudAPxGVmpQskA4w/a3Ys f1pM3jIaZ71SsLeZJ3jgARjnE9ug9tJw8q4XdnoxcH/jEefeQwgIWRK+dTW5nLrG+vSxhU PCsy6SkJsWhIPB6rnrDxj/le4og/pOfY4I87Vh7kZAAY9IHfsLcKVIkr4fwYRDNZlIgdIo KSAQClQTbatgsD0RBRxy45pHJuprWeLxhbnv+jog2edEMzSNYha1seTndXQxFQlUQlFaM5 asbiL0DnEMfURJcgO369JvXuQ3mAFouj+Y0yCHcvGgHU/nND+zPVVUM0Oy8PZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554130; a=rsa-sha256; cv=none; b=u6XgiUnIrCO10dTDF9/Vp/+LAYfC8SiLL51odt5uVocbZXEydUKc8CnSCOS1jYKdFwlewe 1nqhOhCSO3Yb1ci9ahrpZUFOxJygAEPJ0Zvd7WXg+WRFMYn5ShBSxAeSW2gV8IofP6mXyc uzaixJyrHc9QNUrIsyCrmA9EW/inqzdB8SMkU/AsRBfgi7MB0Gr3JTLY8Kf5SB0aVU/lAV SCKD0dNnJ5PBCb25Fo9JBusqNSx6WFwTDNKbQHQVGE5yGYemau1OR7I8Axzc368TUR9xP3 WjNKALKDTugTw1ffkAlO6llObXOm85gkImJlRV3RoP2w+DsuSGRxdV/4ZwSMyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qP5yZSJO+jBzEusfp9SjXuMiCuxOZJNP+xS/RU+FjvE=; b=qbHDPn7TdvXQ6ioZ1cQ3uxK6L73+HLLQu6Sra8lNH03ADUwGRfi++ecGdxxZE712v4PPG+ 9IdDEaNG7NSp/DKy4DaP+JUIlS6cVaaJsku2DaPgFUZZnOzFlFOJ1L1EJQFNcI6ZEe670C 15jHjg/F23THEMoZyjqXSug/+seEjYs7pVNY8IuQ7cc/XhlB2JEnM8xYDOYU/j6yDDzIMn VCtvoj5wZ6sd4q0a+//XVyRcJtNORWnVGQavjFmj02YiBWEgSImdSf5d+c/Wp11UjSyDSh T5AVol45DD3biiUyhgj+asMDd5xTunGl6eZq2ZwaT4S/RUeIPoXoxwrdXUxXPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccL1GK4zZvC; Tue, 26 Dec 2023 01:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Soff035438; Tue, 26 Dec 2023 01:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SoTx035435; Tue, 26 Dec 2023 01:28:50 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:50 GMT Message-Id: <202312260128.3BQ1SoTx035435@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: 30ce85ca1143 - main - iommu_gas: add ddb 'show iommu_domain' command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 30ce85ca11433ba05cdbab8aedceaa15a93bd97a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30ce85ca11433ba05cdbab8aedceaa15a93bd97a commit 30ce85ca11433ba05cdbab8aedceaa15a93bd97a Author: Konstantin Belousov AuthorDate: 2023-12-24 14:52:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu_gas: add ddb 'show iommu_domain' command Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index cc541e748f48..72db5ca871ec 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -1031,3 +1031,48 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, check_free, CTLFLAG_RWTUN, &iommu_check_free, 0, "Check the GPA RBtree for free_down and free_after validity"); #endif + +#include "opt_ddb.h" +#ifdef DDB + +#include + +static void +iommu_debug_dump_gas(struct iommu_domain *domain) +{ + struct iommu_map_entry *entry; + + db_printf("iommu_domain %p tree %p iommu %p fl %#x\n", domain, + &domain->rb_root, domain->iommu, domain->flags); + db_printf("iommu_domain %p tree %p\n", domain, &domain->rb_root); + RB_FOREACH(entry, iommu_gas_entries_tree, &domain->rb_root) { + db_printf( + " e %p [%#jx %#jx] fl %#x first %#jx last %#jx free_down %#jx", + entry, (uintmax_t)entry->start, (uintmax_t)entry->end, + entry->flags, + (uintmax_t)entry->first, (uintmax_t)entry->last, + (uintmax_t)entry->free_down); + if (entry == domain->start_gap) + db_printf(" start_gap"); + if (entry == domain->first_place) + db_printf(" first_place"); + if (entry == domain->last_place) + db_printf(" last_place"); + db_printf("\n"); + } +} + +DB_SHOW_COMMAND(iommu_domain, iommu_domain_show) +{ + struct iommu_domain *domain; + + if (!have_addr) { + db_printf("show iommu_domain addr\n"); + return; + } + + domain = (void *)addr; + iommu_debug_dump_gas(domain); +} + +#endif From nobody Tue Dec 26 01:28:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccM73Gbz55GPg; Tue, 26 Dec 2023 01:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccM3Kpvz3fy5; Tue, 26 Dec 2023 01:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AiMFb8PR8TBiV8pzLDsN+px2cfCKMFnRxGnpkpPxgao=; b=ZA1oqtIx29koWXQIeMd9z3nSX8ERZ/TMp72ttGt/+b3MZ4rI20BBeR0IWb7mXLAgS4J/82 fW5TQHT0oaCGDfcyQrK5kMgC551k653byUxN3MY6D5zeOMh+j/uJdS1eJ3TFPBUY3zwwar PWOOHjPhn0AxrmMuj2/HrMQzsaTxKFQaKJEV+ZiYYDBAgxJMq889p81Q8iF4DpPIBKUW4U rtWPklID57hgZremzw3GLJlexEoybes4prvX/cDYCjY96fLaLNhCHdtpFntR6ubrUKO9SU AcanhuXsPvf6NelDqCn3XgGlhYsTDR90FBTQx99tFJzkSUAelQ0gnoSTH6cP4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554131; a=rsa-sha256; cv=none; b=RxrDfhOabV8z/vbkjnCVyMTq1xGivzroGXjdUbPKzJijdk/02nKf8rMvx/7B2HQgwCwQf5 QTDgo6uPtlWQB30ync5iKfqoT7PRQ2opOP82R1hfa2skEOdUClMJj3NZZrMs2vnw9J8mok uI15+tNTTyH+XOzOck3YPwkgX5BW3YaeV3FV3jvmQh8DFJltyeA89PLMD5lDw8EukB6uWA e6EIXMKLmUpGPz+71g/ns8D+S3eGcbEaH1a9/fyL9ULyb56G7rBZBoaXyzbtpRX4XtIikr wAPqlYoNw4a2Q0d2Q94Nt3S58ucQt6GzgyS3vm0flI5ZfQNzw/DZPn2O6Fklyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AiMFb8PR8TBiV8pzLDsN+px2cfCKMFnRxGnpkpPxgao=; b=Jv1riivvsDjf/geV8ZVsat/mGg6MqLvQXvaPADmuoRK4xtCFfYCgqD/5QyZOB2XeyreCYs dBXOmNSJYblOla9eg3redXvUphQ6L+DRyySliM0otB3IV1mRuszmwpWldrPwuRCMmKeK60 KNsqhT1UMs92XvBQeww3BUiK4u2AaXHdrsomDLmb/CfKhTwDYkBHeFo1yYOJPJhTVUJP1y utcQOBMD0A01mSa4HE8iG7Gdd1I+hzX21QaXfz4xN936za3jOfnC/qYeY1fgdRMiwuloTl sUpGEpxempKzANhikafzeVjYdK4iACgrc0zosE/RYdYEsLLtCQ7H4I65bh07oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccM26xXzZxb; Tue, 26 Dec 2023 01:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1SpQn035495; Tue, 26 Dec 2023 01:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1Spbr035492; Tue, 26 Dec 2023 01:28:51 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:51 GMT Message-Id: <202312260128.3BQ1Spbr035492@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: 24e38af60a63 - main - DMAR: add knob to disable RMRR entries installation into domains List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 24e38af60a637073b5164837959098acaa3d8daa Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24e38af60a637073b5164837959098acaa3d8daa commit 24e38af60a637073b5164837959098acaa3d8daa Author: Konstantin Belousov AuthorDate: 2023-12-23 16:57:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 DMAR: add knob to disable RMRR entries installation into domains Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/intel_ctx.c | 3 +++ sys/x86/iommu/intel_dmar.h | 1 + sys/x86/iommu/intel_drv.c | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 76a53f6bbd1a..49c87cf0b39f 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -237,6 +237,9 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus, vm_pindex_t size, i; int error, error1; + if (!dmar_rmrr_enable) + return (0); + error = 0; TAILQ_INIT(&rmrr_entries); dmar_dev_parse_rmrr(domain, dev_domain, dev_busno, dev_path, diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 1c428e60d96f..e20144094c80 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -319,6 +319,7 @@ extern iommu_haddr_t dmar_high; extern int haw; extern int dmar_tbl_pagecnt; extern int dmar_batch_coalesce; +extern int dmar_rmrr_enable; static inline uint32_t dmar_read4(const struct dmar_unit *unit, int reg) diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index c29508300b29..7346162d1502 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -156,6 +156,8 @@ dmar_count_iter(ACPI_DMAR_HEADER *dmarh, void *arg) return (1); } +int dmar_rmrr_enable = 1; + static int dmar_enable = 0; static void dmar_identify(driver_t *driver, device_t parent) @@ -170,6 +172,8 @@ dmar_identify(driver_t *driver, device_t parent) TUNABLE_INT_FETCH("hw.dmar.enable", &dmar_enable); if (!dmar_enable) return; + TUNABLE_INT_FETCH("hw.dmar.rmrr_enable", &dmar_rmrr_enable); + status = AcpiGetTable(ACPI_SIG_DMAR, 1, (ACPI_TABLE_HEADER **)&dmartbl); if (ACPI_FAILURE(status)) return; @@ -905,6 +909,9 @@ dmar_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg) char *ptr, *ptrend; int match; + if (!dmar_rmrr_enable) + return (1); + if (dmarh->Type != ACPI_DMAR_TYPE_RESERVED_MEMORY) return (1); @@ -991,6 +998,9 @@ dmar_inst_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg) iria = arg; + if (!dmar_rmrr_enable) + return (1); + if (dmarh->Type != ACPI_DMAR_TYPE_RESERVED_MEMORY) return (1); From nobody Tue Dec 26 01:28:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccN6DVnz55Gvm; Tue, 26 Dec 2023 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccN4PhQz3gBT; Tue, 26 Dec 2023 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8VNQv7nknM/avuHBeXwPclLd/aoqfJgemJ3NTIkk5YM=; b=GG3wAie507zgADMOzG3YU3Baxu8VSIOFfbYPD/l3BmdwshNhW609HAWpGB3hgUYPMMM3VB lPr/0VYQqB4F505daXpTCfHE0n3dGj+zBk7GSsDJRUWKfpR5QIVSRprUxbOI39sFb7T2i4 P/XVXTH2yaS6tPyS2BlddUZNlig96rdzpSJLa/Jgzen1Re/208aFYuBL8kYm0B43LyvRCE 4nP+eHfY7wGQQwom0I8FAvQxgyokM39/9TptPLoc6a0WPQ1leHzzGdhvByo5/w/efutlUQ 05hhTiV7ZQNRwOJ5lsDj7WmGLVM6og/b5PmILNo316nQKlTNC6r6w+7ZAmY17g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554132; a=rsa-sha256; cv=none; b=dQ033gWExqj6uvI7EgshHVvQDj2e1DGkSCWWt0ofDYGborIublt8HAuU7jTk/5sH8nj8gD 53zm/nbk/fvahSbQisNgeruErxAQJW7EKE2ghFhYEtfKrDwwoo7+NrDXnFli7ucd6PqHL3 T844CG6ynJYJZtmpMSJ+nsXGvY55zkDqOupgII37XO9We8nm0yVEUAKCoD1FUEYJrJbZRK XTpcvano6FFAPFq22OT6Burwt0RyDSJZ8fuRnjt8/7kLcfctniUY0xg2HY0AXENEK4h83X aBkmmSkiu8PTRZnBTHs1QMvlJn5VcE6RsX1gfkSd73dUbF4InUe8xG/iyGQb0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8VNQv7nknM/avuHBeXwPclLd/aoqfJgemJ3NTIkk5YM=; b=srMULQr2Zb1APy0oSkLv0rgyc06QYB6FhqT2q8b6xQuLydk9A3Zjf6EQ7yC0yt2Qr92ApC l0RFLELe9WF/5VX9NxMTF9xCxPH+2/wyRpdA8ZyxPQ1hO8oD4BtLdE0sUuFga6P/JcSJQT Q9kXGURPq3RxPFnAlkuoCEWR6zsSdQtLDPLh9NY8/CLj6qLL0zDJeHyMeIJl75q4M0PbZk DnURAOffXl69Gq7YF5PKmkaQi5fmkLxfi3/K75/uf2vV+f0/S1SBKrg1dpYvC9ez7VVVJg wNRGJHZpkHNAKQTDyP6wIY2nWIbTgpw3Fsf9MQGagF/Rmfv5Jtcae0kqb+QlFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccN3NNRzZcF; Tue, 26 Dec 2023 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Sq3Y035559; Tue, 26 Dec 2023 01:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1Sqqh035556; Tue, 26 Dec 2023 01:28:52 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:52 GMT Message-Id: <202312260128.3BQ1Sqqh035556@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: 733da1eb9476 - main - iommu_gas: print entries flags and domains if an overlap detected List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 733da1eb947688210bc152656357ecafbd172bb7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=733da1eb947688210bc152656357ecafbd172bb7 commit 733da1eb947688210bc152656357ecafbd172bb7 Author: Konstantin Belousov AuthorDate: 2023-12-23 23:34:16 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu_gas: print entries flags and domains if an overlap detected Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 72db5ca871ec..25e13aad2291 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -125,9 +125,11 @@ iommu_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b) b, (uintmax_t)b->start, (uintmax_t)b->end)); KASSERT(a->end <= b->start || b->end <= a->start || a->end == a->start || b->end == b->start, - ("overlapping entries %p (%jx, %jx) %p (%jx, %jx)", - a, (uintmax_t)a->start, (uintmax_t)a->end, - b, (uintmax_t)b->start, (uintmax_t)b->end)); + ("overlapping entries %p (%jx, %jx) f %#x %p (%jx, %jx) f %#x" + " domain %p %p", + a, (uintmax_t)a->start, (uintmax_t)a->end, a->flags, + b, (uintmax_t)b->start, (uintmax_t)b->end, b->flags, + a->domain, b->domain)); if (a->end < b->end) return (-1); From nobody Tue Dec 26 01:28:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccP6g3mz55GcT; Tue, 26 Dec 2023 01:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccP5V4Xz3gFL; Tue, 26 Dec 2023 01:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DxuQDHdfMjOBZRUlInac+6JlKgcIvWHmsmLS0jKVjwE=; b=HuxHEtglPNe6/XxTZhpCbrEUgA43V0+2cNW9mn8wsfspfI/zUczf/kf3OM4PuJUM9NCBf8 U5ENceVTLWdW2PaBpj0xOBamXUGp0z2LPkSYDFPs9eWQ3UefIXnYN39bmMvvbS4NQgC/8+ 8TtFLkNb3rSIi/wrp/f2H9II9YxRSsbJ3hut2OIzdj79NcR1sSN2aY6G3vaYx7f4tuDR15 f/FjblhAgsW31G+WKnHtYX/tHPOiwl3HTIM2BVZmk/zvBti37ADDfpI9BouKnzQUtJvmlh 6Ah9G8IxO4a7GC8/vC7R9TcMEDk4NBSplotlLXQUYOHw3PSx8J/I9IC230YUNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554133; a=rsa-sha256; cv=none; b=NtZe8DHp42GBI3cZQEvOeiNXBC1isJPnkeN+50zbqnsQrNFGfkLbN9hMAUZHlIHBMaomm4 1vMm7bOPJJtj8eAbWxf3rJYW/70xAkZTikYUmHL1IJfUJMqIcRBm0NkFPCe0lpednvUI92 s4ZrCRwTaVnDXoyaNowF8TQ0mNz/HnUgRarN/oZqaVpVR2qD7jAbvf4bgN+Mt4d04tpe/5 dfYydVqvmg0bOfaPxEuncDXl5ATzUqiaytxTQAJKn5DgZumfSKuiM6gry8l3r/3z85HCBa tbRLGJ3t2gcPwMBttfEeG3g0IwpKU/R12kGt/puOPio8Sg9YluJTrjlgZuZp0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DxuQDHdfMjOBZRUlInac+6JlKgcIvWHmsmLS0jKVjwE=; b=tHoycVRO2ldn2hywEOV+3SKv26JnavFj2g/kLcErTwPvrV1uq0+GL7FEbnzWknW+0jMtm5 xs74xjUMhQz5YWJikRlWyNjthDzMRHEpLdWybocMypwiOMcFsTVeD7x8BtsddgHsIXOtvb yGDUwGQjbcsFf36TFhHTJqIZvk9EQlsLtKTwJa/UeBZMpM2Hmsd1urbUjm3bvmb1m65IJt sZmzFzaPDurtq+OWCYYEWmW5RlWim/qsHzp1l2xFbi2QPImf4BDORuo6AKAjDfYQ3Q/uYo vRkmAaolFyxWtu9oHjlSDpPtfcUIyrWduMoKoKHWKWDKixx+SQEQ3fIz4HJtPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccP4PdNzZxc; Tue, 26 Dec 2023 01:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Srfa035613; Tue, 26 Dec 2023 01:28:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SrBj035611; Tue, 26 Dec 2023 01:28:53 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:53 GMT Message-Id: <202312260128.3BQ1SrBj035611@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: cb1d664b0073 - main - iommu_gas: zero fake on-stack map entry used in iommu_gas_remove_clip_left() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: cb1d664b0073232173072231cb386f0216ee596b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1d664b0073232173072231cb386f0216ee596b commit cb1d664b0073232173072231cb386f0216ee596b Author: Konstantin Belousov AuthorDate: 2023-12-24 00:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu_gas: zero fake on-stack map entry used in iommu_gas_remove_clip_left() Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 25e13aad2291..e178acf60478 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -655,6 +655,7 @@ iommu_gas_remove_clip_left(struct iommu_domain *domain, iommu_gaddr_t start, * asserted that start is below domain end, entry should * exist. Then clip it if needed. */ + bzero(&fentry, sizeof(fentry)); fentry.start = start + 1; fentry.end = start + 1; entry = RB_NFIND(iommu_gas_entries_tree, &domain->rb_root, &fentry); From nobody Tue Dec 26 01:28:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccR0L2fz55Gyv; Tue, 26 Dec 2023 01:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccQ64Zjz3gBt; Tue, 26 Dec 2023 01:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vDnA6wHvdQG+5UjbRKkTlOZIew5ZBxtyfT/ZvEKjAnY=; b=e4K+0O3nnpYTenxIE2YPUnLkAPN1bmh3rFC5N7x0hOGeqvJpTyEokjb45nsD5O+EkXnSeJ Cq8JB1NGWx7BCbXQVLsbZOQCJvFR0pKNC+6m+V4b01qmtVwCN35B4wsT12657cX1/NdhMS mtB+0JtP8qs1pTF3mfAmpmzdpVqnLboRvk4lpskLA05pH6sFC4JPPd+5kN4DjT646ePbid 0kRvwI1dfvEFxkE8fJzPmoTyzUtsHWWZrfyyDFlYkpSJHYIhpGsmJv/76Msbl1NNPKXeCu ekL2FHTtrhj+MSu3WTTJYt5LlJEZRm74o8yfPthd4huy2sZi9mOVHiDqCWmjng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554134; a=rsa-sha256; cv=none; b=ty2HUHhHrBwf/UOUo7fbiSCxTBUYROV/HgUQ8udxcRDjGcCm9xMVhi2Pwv4y1VOCkZ0Gk0 oCoGZaq3GrsdfaF1DbzYQRPIkEa/yU9RyuJNb17IVfQvSHzA7DpfP0HsSdM/daLYsXtcHF iGs7HO5gC+PvDEQBVGp2krHn7baOxcy9OxfFNxnucUrn2Plzk1kUjhbNFjAzChH6YOy3Ft GZiFMbdE55iCF9XznFHRxC41ZOuQ9YmIIeBQVQM7fX0MboWB1qJ5w4Bz1e6vBWTQ6/yJqB 0VkMmnAroC4TjJQgeJiWhoVMx2U7NCS3MsLUIxNKVkjYTrr0vnBgWgTShky5ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vDnA6wHvdQG+5UjbRKkTlOZIew5ZBxtyfT/ZvEKjAnY=; b=pl8bsufRTw2lCpRbC0c1YqKRO5US55bKkyawNvPIKQoL9zULCIn/ulr3eROAGHqgedYFiq FyELWgqPjvMbTb/OlTnLJixMUi1AoYXBW7bxxwKiLCfw24Zfib+PttqZsGo3MKi11fGP3k MHzeoG8qGTKHTduPwM//ixF2Kk1rXxncHQi9jv1sB3YdteoV6ikiFtkEtMZiBVH+Sn4nJk ovMQbjxRGdnYf7HQbm4/v73o4doWyoTvbxWrm74KNFo8IasvQuaB6D71ug1WDYBdX5Rfyt gFpWjhAg0jjBrVCtV+kClgGR/HHOdWaAzg5bmACzTCQcG3U6V8L6SJYqpCz6DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccQ5BcbzZvD; Tue, 26 Dec 2023 01:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1SsW3035661; Tue, 26 Dec 2023 01:28:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SsPe035658; Tue, 26 Dec 2023 01:28:54 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:54 GMT Message-Id: <202312260128.3BQ1SsPe035658@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: a59c252903e8 - main - IOMMU: add GAS map entry flag IOMMU_MAP_ENTRY_FAKE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a59c252903e81f46c74903ce5b1cf0960927dbcc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a59c252903e81f46c74903ce5b1cf0960927dbcc commit a59c252903e81f46c74903ce5b1cf0960927dbcc Author: Konstantin Belousov AuthorDate: 2023-12-22 22:39:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 IOMMU: add GAS map entry flag IOMMU_MAP_ENTRY_FAKE to allow to shut down assert in iommu_gas_cmp_entries() when used against fake entry to search for specific place in the tree. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 6 +++++- sys/dev/iommu/iommu_gas.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index e178acf60478..dc850747512a 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -123,7 +123,8 @@ iommu_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b) a, (uintmax_t)a->start, (uintmax_t)a->end)); KASSERT(b->start <= b->end, ("inverted entry %p (%jx, %jx)", b, (uintmax_t)b->start, (uintmax_t)b->end)); - KASSERT(a->end <= b->start || b->end <= a->start || + KASSERT(((a->flags | b->flags) & IOMMU_MAP_ENTRY_FAKE) != 0 || + a->end <= b->start || b->end <= a->start || a->end == a->start || b->end == b->start, ("overlapping entries %p (%jx, %jx) f %#x %p (%jx, %jx) f %#x" " domain %p %p", @@ -536,11 +537,13 @@ iommu_gas_alloc_region(struct iommu_domain *domain, struct iommu_map_entry *entr if (entry->end >= domain->end) return (EINVAL); + entry->flags |= IOMMU_MAP_ENTRY_FAKE; next = RB_NFIND(iommu_gas_entries_tree, &domain->rb_root, entry); KASSERT(next != NULL, ("next must be non-null %p %jx", domain, (uintmax_t)entry->start)); prev = RB_PREV(iommu_gas_entries_tree, &domain->rb_root, next); /* prev could be NULL */ + entry->flags &= ~IOMMU_MAP_ENTRY_FAKE; /* * Adapt to broken BIOSes which specify overlapping RMRR @@ -658,6 +661,7 @@ iommu_gas_remove_clip_left(struct iommu_domain *domain, iommu_gaddr_t start, bzero(&fentry, sizeof(fentry)); fentry.start = start + 1; fentry.end = start + 1; + fentry.flags = IOMMU_MAP_ENTRY_FAKE; entry = RB_NFIND(iommu_gas_entries_tree, &domain->rb_root, &fentry); if (entry->start >= start || diff --git a/sys/dev/iommu/iommu_gas.h b/sys/dev/iommu/iommu_gas.h index 8069c5a15a34..cdc4bd22d60c 100644 --- a/sys/dev/iommu/iommu_gas.h +++ b/sys/dev/iommu/iommu_gas.h @@ -50,6 +50,7 @@ #define IOMMU_MAP_ENTRY_UNMAPPED 0x0010 /* No backing pages */ #define IOMMU_MAP_ENTRY_REMOVING 0x0020 /* In process of removal by iommu_gas_remove() */ +#define IOMMU_MAP_ENTRY_FAKE 0x0040 /* disable assert in cmp() */ #define IOMMU_MAP_ENTRY_READ 0x1000 /* Read permitted */ #define IOMMU_MAP_ENTRY_WRITE 0x2000 /* Write permitted */ #define IOMMU_MAP_ENTRY_SNOOP 0x4000 /* Snoop */ From nobody Tue Dec 26 01:28:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccS2bX7z55H02; Tue, 26 Dec 2023 01:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccS02GJz3gKx; Tue, 26 Dec 2023 01:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zurRu4gAQgy+MvS9pWW+ATYFD481vHXtXvNCJOcNDsY=; b=vlD8agzD56a8YWFR3F7zqe3uTIwwboxsnSq3vL6e/3hMaPzSywlVVrwLa6PNfyjvcf3WD6 iJgjdu5eNMEDa83nHTu05mQl9Myw95/ET6BBVbxEz1iQSM3CPEXtknP1gyH8ILsl6ffzON Onyl+RvDlDgl1edaeIxA6fYyXzyWN50JfwjSo4dsGr+fPr4PeMKhmZBtXwzV4mWu4MwqjN b0HIPNQfb66avF0DZF20A7UD3Tb7kUMHbFwfYL8R+giOZo0r+JwXiqMyIACHCvL5PRadSL D9CC+ZMPWExsg4Z0+gtxp5SNTSEGQOO5GORdDSyIZfQS8rds5sCu2GVcROKGrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554136; a=rsa-sha256; cv=none; b=cNB9l9CRSysB6MqZzjKmlKe4MpBS0n0qZgPVNpbLM2rLjfCuqBdvZuOOmr7qcykQ2LYKwc z4664q9iu1sUcPzE4hWfmr2S5mkMZKIY2BuPF+zzGAgtvlJxqh/CT8WrY2k16m1EnleIax mOpvUFz83TsGmLLUwnKG0fYpH01IVb+b8y1ysCIB16SISgq26UnzdPkrTY4BBpTgW3nsJf 28FYb6cEHb/8bUTA76A8VrzOmV5Vi0xWXOfsVnPxWYjfiT5qkeifDzZ8IHOq8zbQScFi+6 RHVznSj+EMe8+im4boZVA3hCrDndbbJOw6rEUV8nXqWbJqMeLlSMw0P9s5/NSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zurRu4gAQgy+MvS9pWW+ATYFD481vHXtXvNCJOcNDsY=; b=Wk0zgz0tFQ0oyJKcQXB2/kQdhYN2CCo7j0DI91ln/vwoYzd+fbwrdBZiLwHbhwFpp2DX4P 9pAK2NuMbNQdppTesud6It1q+d4dCoUuyOy04Xhn+oX9sVevrGWQL0xIxo5KZsvwqf6wxZ IvzlqRsrkz4ggFGIg1FhBQ70SXl+cQTNMsUF6aD7rF2JyLbIivW8D4HzYgau5ToxysW7w9 vrw8KKw8BHaILtPLqG2a/U4LeVNypr2WvPESwwdtxGdHS3tmjIic1lzhkrDVXCGptI9u7v Pip27mOXdUU3Vl3PChXvhWP3oNtGVIi4eE2D/0pF8ENRCcbPaGb/dMUotuafCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccR65rczZxd; Tue, 26 Dec 2023 01:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Stnm035697; Tue, 26 Dec 2023 01:28:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1StOf035694; Tue, 26 Dec 2023 01:28:55 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:55 GMT Message-Id: <202312260128.3BQ1StOf035694@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: 273b4de3462d - main - iommu: add iommu_gas_remove_locked() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 273b4de3462d7825ebe4ace7a1930f098311287f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=273b4de3462d7825ebe4ace7a1930f098311287f commit 273b4de3462d7825ebe4ace7a1930f098311287f Author: Konstantin Belousov AuthorDate: 2023-12-14 02:41:31 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu: add iommu_gas_remove_locked() Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 83 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 26 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index dc850747512a..9a74854f926f 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -708,28 +708,20 @@ iommu_gas_remove_unmap(struct iommu_domain *domain, TAILQ_INSERT_TAIL(gcp, entry, dmamap_link); } -/* - * Remove specified range from the GAS of the domain. Note that the - * removal is not guaranteed to occur upon the function return, it - * might be finalized some time after, when hardware reports that - * (queued) IOTLB invalidation was performed. - */ -void -iommu_gas_remove(struct iommu_domain *domain, iommu_gaddr_t start, - iommu_gaddr_t size) +static void +iommu_gas_remove_locked(struct iommu_domain *domain, + iommu_gaddr_t start, iommu_gaddr_t size, + struct iommu_map_entries_tailq *gc, + struct iommu_map_entry **r1, struct iommu_map_entry **r2) { - struct iommu_map_entry *entry, *nentry, *r1, *r2; - struct iommu_map_entries_tailq gc; + struct iommu_map_entry *entry, *nentry; iommu_gaddr_t end; - end = start + size; - r1 = iommu_gas_alloc_entry(domain, IOMMU_PGF_WAITOK); - r2 = iommu_gas_alloc_entry(domain, IOMMU_PGF_WAITOK); - TAILQ_INIT(&gc); + IOMMU_DOMAIN_ASSERT_LOCKED(domain); - IOMMU_DOMAIN_LOCK(domain); + end = start + size; - nentry = iommu_gas_remove_clip_left(domain, start, end, &r1); + nentry = iommu_gas_remove_clip_left(domain, start, end, r1); RB_FOREACH_FROM(entry, iommu_gas_entries_tree, nentry) { if (entry->start >= end) break; @@ -738,11 +730,11 @@ iommu_gas_remove(struct iommu_domain *domain, iommu_gaddr_t start, entry->start, entry->end, start)); if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0) continue; - iommu_gas_remove_unmap(domain, entry, &gc); + iommu_gas_remove_unmap(domain, entry, gc); } - if (iommu_gas_remove_clip_right(domain, end, entry, r2)) { - iommu_gas_remove_unmap(domain, r2, &gc); - r2 = NULL; + if (iommu_gas_remove_clip_right(domain, end, entry, *r2)) { + iommu_gas_remove_unmap(domain, *r2, gc); + *r2 = NULL; } #ifdef INVARIANTS @@ -755,13 +747,52 @@ iommu_gas_remove(struct iommu_domain *domain, iommu_gaddr_t start, entry->start, entry->end, start, end)); } #endif +} + +static void +iommu_gas_remove_init(struct iommu_domain *domain, + struct iommu_map_entries_tailq *gc, struct iommu_map_entry **r1, + struct iommu_map_entry **r2) +{ + TAILQ_INIT(gc); + *r1 = iommu_gas_alloc_entry(domain, IOMMU_PGF_WAITOK); + *r2 = iommu_gas_alloc_entry(domain, IOMMU_PGF_WAITOK); +} +static void +iommu_gas_remove_cleanup(struct iommu_domain *domain, + struct iommu_map_entries_tailq *gc, struct iommu_map_entry **r1, + struct iommu_map_entry **r2) +{ + if (*r1 != NULL) { + iommu_gas_free_entry(*r1); + *r1 = NULL; + } + if (*r2 != NULL) { + iommu_gas_free_entry(*r2); + *r2 = NULL; + } + iommu_domain_unload(domain, gc, true); +} + +/* + * Remove specified range from the GAS of the domain. Note that the + * removal is not guaranteed to occur upon the function return, it + * might be finalized some time after, when hardware reports that + * (queued) IOTLB invalidation was performed. + */ +void +iommu_gas_remove(struct iommu_domain *domain, iommu_gaddr_t start, + iommu_gaddr_t size) +{ + struct iommu_map_entry *r1, *r2; + struct iommu_map_entries_tailq gc; + + iommu_gas_remove_init(domain, &gc, &r1, &r2); + IOMMU_DOMAIN_LOCK(domain); + iommu_gas_remove_locked(domain, start, size, &gc, &r1, &r2); IOMMU_DOMAIN_UNLOCK(domain); - if (r1 != NULL) - iommu_gas_free_entry(r1); - if (r2 != NULL) - iommu_gas_free_entry(r2); - iommu_domain_unload(domain, &gc, true); + iommu_gas_remove_cleanup(domain, &gc, &r1, &r2); } int From nobody Tue Dec 26 01:28:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccT287Bz55H05; Tue, 26 Dec 2023 01:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccT1Dv6z3gJG; Tue, 26 Dec 2023 01:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KAfVt25O6YaCQK3zAQcvAmsiSyU5zrpIMhB5+dvoG6c=; b=lBO1nSrJvv2oDU3K76yM8PeZctSO8+Q7PW+kIQrWW4tV2Jmt6ECBNmB4x63TnOp1E8xqjB 0dje2QupHrPW1vCEDyQ3espNvLp/iurX4nvDhHhiCMzMyF3GoRqzqwp5SB/UOowqhP20JB H8Bs7T9VTkM4Z7XVfQytk6zxlYh8WiWRKd877YWLyAu3je0RX+5HMR7u861qe2HMDxQebt Biz5vZ9CvpTYLRGiyZ0Rk5HLsalnfpcH06x+ERt55Y3bVXw660qO53wShd+jZqPUzADsrM tUg8zDORDgFjxLVmsWLIwqkW8JIqNr2rHF3mUlmZ4/fhXU2z311ZvB8eOwG/Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554137; a=rsa-sha256; cv=none; b=V+FBIFnaGM/136KIoDbFhymjWaXXU6z8SenGfrK7otYfQ3BMybmWE1y14XM6eTqPTTIYSe Xu3z8E0T9SZJu5SfH/f87tVMTR+IOQmXR0aRuEwQBGeTAb88BmJ/IpxPivR1B9MNt0uYdX 40+67HFzPCRBku3j4PhWf7xm73VEN09Li6Duu4EO3bg3DhU4I4PBwKVN3qp4Um2LIThke1 TpMHBLJ4RWeiPu8GQr2+D++Js+SY9yC7v/wqLSyFPefDVDZ2xd6u92ehkuXZ4ET4eXeoC2 LBhdGbGjvdDEzcmJZHBR94EM0Tpp0p7V0uVLrDwUqOm1OEPfpKP2LuVjYaTPag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KAfVt25O6YaCQK3zAQcvAmsiSyU5zrpIMhB5+dvoG6c=; b=nIPfSPcw6C1x2lMwFM+KEZKMoAEHykgNqiCYK1BG3W1UNXZBoo9JyxTxLPXC+5VgNXTt0G 3ZR6wwaijtu6k77iBKStSO3uY0yQ/DriyYmNGXuSwMMsaSOGHfHx4I5VaFlAZJ4BezVJip Pr0rIoVQozgUkAotih9oVwZKb9ksttMIPaflPsDKH/eJa1wix2YcFYeq1+EETMim7qVL7g MnTnz3vdxhWdgUQGsXXlGbdl1Dw/yAr9cIF013lzgGDXVPjdlezxT8GlaadLtVcRvNy/VO I0JU1WQvRZi+AE/q4vmmK15Q0pwthO2jfWrO8IKupMVDZC7rsydfxvrVKQqbZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccT03YpzZcG; Tue, 26 Dec 2023 01:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Sund035761; Tue, 26 Dec 2023 01:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1Supa035758; Tue, 26 Dec 2023 01:28:56 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:56 GMT Message-Id: <202312260128.3BQ1Supa035758@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: f59128775636 - main - iommu_gas: make placeholder entry at the start of the GAS zero size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f59128775636846574e092c68e849a56f74577e6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f59128775636846574e092c68e849a56f74577e6 commit f59128775636846574e092c68e849a56f74577e6 Author: Konstantin Belousov AuthorDate: 2023-12-22 22:19:05 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu_gas: make placeholder entry at the start of the GAS zero size same as the placeholder at the end. This is required to allow GAS to start at zero, for integration with vmm. Also, in iommu_gas_remove(), accept placeholders after remove op. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 9a74854f926f..cfd375c658c3 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -118,7 +118,7 @@ static int iommu_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b) { - /* Last entry have zero size, so <= */ + /* First and last entries have zero size, so <= */ KASSERT(a->start <= a->end, ("inverted entry %p (%jx, %jx)", a, (uintmax_t)a->start, (uintmax_t)a->end)); KASSERT(b->start <= b->end, ("inverted entry %p (%jx, %jx)", @@ -244,25 +244,17 @@ iommu_gas_init_domain(struct iommu_domain *domain) KASSERT(RB_EMPTY(&domain->rb_root), ("non-empty entries %p", domain)); - /* - * The end entry must be inserted first because it has a zero-length gap - * between start and end. Initially, all augmentation data for a new - * entry is zero. Function iommu_gas_augment_entry will compute no - * change in the value of (start-end) and no change in the value of - * free_down, so it will return false to suggest that nothing changed in - * the entry. Thus, inserting the end entry second prevents - * augmentation information to be propogated to the begin entry at the - * tree root. So it is inserted first. - */ end->start = domain->end; end->end = domain->end; end->flags = IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_UNMAPPED; RB_INSERT(iommu_gas_entries_tree, &domain->rb_root, end); begin->start = 0; - begin->end = IOMMU_PAGE_SIZE; + begin->end = 0; begin->flags = IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_UNMAPPED; RB_INSERT_PREV(iommu_gas_entries_tree, &domain->rb_root, end, begin); + iommu_gas_augment_entry(end); + iommu_gas_augment_entry(begin); domain->start_gap = begin; domain->first_place = begin; @@ -739,7 +731,8 @@ iommu_gas_remove_locked(struct iommu_domain *domain, #ifdef INVARIANTS RB_FOREACH(entry, iommu_gas_entries_tree, &domain->rb_root) { - if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0) + if ((entry->flags & (IOMMU_MAP_ENTRY_RMRR | + IOMMU_MAP_ENTRY_PLACE)) != 0) continue; KASSERT(entry->end <= start || entry->start >= end, ("iommu_gas_remove leftover entry (%#jx, %#jx) range " From nobody Tue Dec 26 01:28:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccV3Stgz55GPy; Tue, 26 Dec 2023 01:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccV2FW6z3gJS; Tue, 26 Dec 2023 01:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b7abbNbeOU1m327+rtzPhzWc27cvTwX5RhGLNPDIrGE=; b=t7w+l5flIaQQXqc5E+21CZHBzxtBhT/H2SVU9B1khaveSdqvlRq2VPvSylTLNwxuqKR5e1 uL0IA3O9dbv+LcOEh7V5ynk14NY/DnRbG8oTfAnHkxaTfSPWpw138Jpp7MXU7oH4b+y2GV RsplbcQvMwWsK7CgxI1DSXglgEHwX15+7cDucBJkUrxQvR+rpPZo0uc5+LLrlnCWBkLvM6 dUsg83mKvBtPal3xFSnWD3NXlibmD3mDUq78CmWvExTKgEkurZZU1ULX3Io/kTQYjAbvNF TMtD/hESDd00bnX8ZSEsAgs4N9YQCBf2ztHsZ5/PGiqY7+XG+Ln15RzwMChr/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554138; a=rsa-sha256; cv=none; b=fBqba8bAbB3fjAwdll/1xjzYT2fUl8tVVemBxTWwIgZth5Nvbz77aPEEReMpRqCryiYkeT xTBXVxGazcjtJRwd+1U+ZdFDUbElEa02XmiTVy2PhoTbWORi+JoqyFuf1ko8wfTnB5nZZE +Xfw9OoSHEQjbzviLCQG+dabs6/OV35+PtY9QCTw9q14A8w25zQgNkALa1QCqo/l+N20xC n0CrLp/4cXn+9UAQKNxwC2s2+FkycpFoJm9nCUkWnr5qPRUpBKfKlvkFuuKBmn/g3tqeF0 JMjMwuoyp84mw/28P3LOeJcE9np1dokvZw5xXRsTfVzs5Z3i0XU7V8IuHGj6uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b7abbNbeOU1m327+rtzPhzWc27cvTwX5RhGLNPDIrGE=; b=jFZURxcnHCpIzqR6Ud1bVen5PNb0/Zb4fXfIRI98gNeuZxC3Ki1idhf/T+d0b0fF2+INkt 1n8UZWJQmxgZBL+x0iedQxhqFZQ2o+XIOZP41ewMeRJhwy0Ia8fYAnfkvojHhFw9TWmugM 7h6ttZypuePygdSeJEjEYgVvgVR3AQQztPQOZ4pn3m0H3OuDPMjvdoLlzY27hP/2yKQ4GA /y1Z0BUP+q+LVhnb+W9BYb5BQtuwshV9Ims5dZjlGvJUmx9TYiMxpSULsqS6DasoPMnScz 9jaYG6OmGbwQy+mvMY8f0EA+uYGvxxxXiwxyINZRUoq9m3sxs6NSvQSov/3oTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccV1GRPzZcH; Tue, 26 Dec 2023 01:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Sw3N035828; Tue, 26 Dec 2023 01:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SwwE035825; Tue, 26 Dec 2023 01:28:58 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:58 GMT Message-Id: <202312260128.3BQ1SwwE035825@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: c0047e7c3569 - main - iommu_gas_remove(): consolidate places where decision is made to keep the entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c0047e7c356953d138194ff71cc510ffe85425f0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c0047e7c356953d138194ff71cc510ffe85425f0 commit c0047e7c356953d138194ff71cc510ffe85425f0 Author: Konstantin Belousov AuthorDate: 2023-12-22 22:41:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:23 +0000 iommu_gas_remove(): consolidate places where decision is made to keep the entry Move all flag checks into iommu_gas_remove_unmap(). Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index cfd375c658c3..4b6141b981da 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -693,6 +693,7 @@ iommu_gas_remove_unmap(struct iommu_domain *domain, IOMMU_DOMAIN_ASSERT_LOCKED(domain); if ((entry->flags & (IOMMU_MAP_ENTRY_UNMAPPED | + IOMMU_MAP_ENTRY_RMRR | IOMMU_MAP_ENTRY_REMOVING)) != 0) return; MPASS((entry->flags & IOMMU_MAP_ENTRY_PLACE) == 0); @@ -720,8 +721,6 @@ iommu_gas_remove_locked(struct iommu_domain *domain, KASSERT(start <= entry->start, ("iommu_gas_remove entry (%#jx, %#jx) start %#jx", entry->start, entry->end, start)); - if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0) - continue; iommu_gas_remove_unmap(domain, entry, gc); } if (iommu_gas_remove_clip_right(domain, end, entry, *r2)) { From nobody Tue Dec 26 01:36:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Szcn50Fl4z55HQ4; Tue, 26 Dec 2023 01:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Szcn46cmCz4HHZ; Tue, 26 Dec 2023 01:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEFjwSITsdiFDfSRptYuommfldT4BBxZ8vR8VbWh8gg=; b=bbn4em1NGmmIZYG8ubOmVNo9HPuzyCKNnNQVHv8Z1US6HwPoge/IqBdzmWiLNDbDTYenwb WLH/L4+Uttb3GhblE8fw55wBQlqXlFog2vqDOHj6w+pFilk2aDI6vDi0WV3GgMRQe9jckQ k5ETOTeRK1ESE2580rFa46H6WwAdjjYTX7m/Xwl/AE+HryALalYJHZxLpKap4XVpZxqJiO xqFhULEVstECmNaI53JIG0P7hLW+JG/VbONx+Bfre2gQXf8xYTCC5Usf9CiGQLnGLrPmPZ ylkqr5wL+HZRW0WWpSwyPQ1/9Pmy7EmwM1YChR8xo5lPs4ynh7YjM4ZTFtf3UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554584; a=rsa-sha256; cv=none; b=V6GG9213w07fk9f09QlImP3QnaY2Vqx1+hUAnn2oNOPDQyThJuEEFqlPLYkZhCjdxkW04p yWeEDDbDEhpWb+BwHcUuyuxIXcTGVYxzlzdFJHpbeYX8Jcnq6/cyIgNnCQTN4f9y9aZQW/ +1Wo169gspykDQH9mQ1WUUI3UmyUyPxQyUvMR6n84DlWd6/f5vCtl9QGsX1oa9LGd9bhmQ RmZbMzg8NQ6YbYMH7ylD/DcdtKvt1zpFIqin2nkxHs22G/lRHr8TNsYDYlW1nphLjMxvRf biE5MjG/DX5Qj0jXR98YBPcyVTKQy4CaxtzZT6k+9GGJbhhD52L7DWXHo+TM5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEFjwSITsdiFDfSRptYuommfldT4BBxZ8vR8VbWh8gg=; b=vSNyi4LqA9mwJy5ZawPpy4h3PeuuY8waK2rh5T3SxsSkTo1ASAhvP9HMQY7H5PnS5+8pz5 Juy8BFnNT20zKNB9FR3HVWlvXMmTQflgwnhsQPV5tBGs7gNIbJimM3hRuxpHHDXfb7jVEZ kAi5bx43PCPA3SmlG1/tMLyIGDgzPDN+J4pntp2PJi+lGoAzvF2tRv9uloVrJUIBihwZeK tIf2rXnZ//sa7/UCEfWEeESLsVm/oGbsBEnq4YUG25X7tAsmXOwNes08tOJ6/W3kUUq90D jZ+CZOiOuC9EQrt+lETgLcjKlRuON8xZhKk3iCy328sbam0EAO1d4gz63fuEiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Szcn45gLmzbJ4; Tue, 26 Dec 2023 01:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1aO9J051980; Tue, 26 Dec 2023 01:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1aOxq051977; Tue, 26 Dec 2023 01:36:24 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:36:24 GMT Message-Id: <202312260136.3BQ1aOxq051977@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: 2a1d50fc12f6 - main - vfs_domount_update(): correct fsidcmp() usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2a1d50fc12f6e604da834fbaea961d412aae6e85 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2a1d50fc12f6e604da834fbaea961d412aae6e85 commit 2a1d50fc12f6e604da834fbaea961d412aae6e85 Author: Andrew Gierth AuthorDate: 2023-12-24 12:04:21 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:35:46 +0000 vfs_domount_update(): correct fsidcmp() usage MFC after: 3 days --- sys/kern/vfs_mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8e54c832e9f1..331e4887c200 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1388,7 +1388,7 @@ vfs_domount_update( error = EINVAL; goto end; } - if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) != 0) { error = ENOENT; goto end; } From nobody Tue Dec 26 02:04:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdP74hDtz55KRj; Tue, 26 Dec 2023 02:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdP749fkz4Jql; Tue, 26 Dec 2023 02:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ekjyg+ipPy8ENRIt4CMKoAIhBycmcZ88HTVrU5UM0k8=; b=B604blLgtUoRcUXTrjN8w8X2K2bBfrxdM4IhmTZbfT91Dsv/6GAJhTIh4y18TAcNwB+woS pp2AUtcR2chyAnYY4W27v8a6wHSbr+HeYrSNrKeKJkJI+rVCOh3vekVpr/ihgtcIZhM/X0 iPSi+2auB3b6SGnh/UJalI2lFYG8U4h6Um/D/vfSS3pm/kYHpe86Osw4+7jviWpaI6Lzy9 LJNzYCEM7LUa5VQy25cV+m/a3kh4IEjtW9sQOxCP4FdZHPKg6OxM6JwXy/MaYXObp3bFog j6tHU8AcIllxKv7tIZcKlpN6Sbx/Snwx5PMAG/NbIVmeykfnb9xpaq+REYE2BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556251; a=rsa-sha256; cv=none; b=a0An7LXiJI+KRrtmXsmtBW9x+afELJXg1wsjYHGtJ/Wwpv0hZNKVIxOTRk5WZKzcPwm579 m4k6u1C8Yeu0qOu3feeo4H23x9lCmEdlzFbisoGVPII7lsgHdBOfrMOLRM+3xrRGDPYlnH 4UGk+DYQ9gLQ+WTd0t+ETfLqoNsHLAjX0QZtWuHUlwXR56raMTciN0OOz11AnmmLjG0Spy JXfjh4AsGlkt2yrvgZhEfG4ltmNQfrfgFdVLh6oJl/xLUWA50h2k8mJnzIxuTg1AFWMaPA UDrSYQyfvk5Yl7ktuKWv3YAcuX0rjsEKDAcf1LC+207xhtmy6D8KkFQLT3v7UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ekjyg+ipPy8ENRIt4CMKoAIhBycmcZ88HTVrU5UM0k8=; b=ahMUsT5e7QuRaOdb0bNVdo9WcvhqQSnLcS933o4AtI5Gba5p3H35fdzsTBDnlryq+NQ/oZ JvrMYXapY+pJecJxoSloOkT8Hj7Dr6o6LRrC3ieBWjPDcrm/+wzBfiiB7OvhyE4+Kj7okf 9OKUhcQUam9E2D6nchb23N8sWqG2D0IQYBcca2/iXAwejpsx/TcfaLPsDdMKGj38Rvs+kX ymML5gJsvNh8bhrm6/u87mo6gS/ynEbTYGBQZqLDaxNjk9UI/2n5UGwk6KFYuwmzHDRXZJ 35ZQsSEIJIH4xLLKx3UxPi8LZ6G/NpMD8zPNwiB3jXyLpJhRfK2Gt3m3XeS+Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdP73DDHzbPq; Tue, 26 Dec 2023 02:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Bup002629; Tue, 26 Dec 2023 02:04:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24BEc002626; Tue, 26 Dec 2023 02:04:11 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:11 GMT Message-Id: <202312260204.3BQ24BEc002626@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: 711880597c6c - main - ath: Handle errors from copyout() in ath_rate_fetch_node_stats() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 711880597c6c4ac971eb2aba6a2dadb5933d38dd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=711880597c6c4ac971eb2aba6a2dadb5933d38dd commit 711880597c6c4ac971eb2aba6a2dadb5933d38dd Author: Mark Johnston AuthorDate: 2023-12-26 01:35:43 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 ath: Handle errors from copyout() in ath_rate_fetch_node_stats() MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43096 --- sys/dev/ath/ath_rate/sample/sample.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c index 39ca5d1e9f31..8e70699f708d 100644 --- a/sys/dev/ath/ath_rate/sample/sample.c +++ b/sys/dev/ath/ath_rate/sample/sample.c @@ -1433,11 +1433,13 @@ ath_rate_fetch_node_stats(struct ath_softc *sc, struct ath_node *an, const HAL_RATE_TABLE *rt = sc->sc_currates; struct ath_rateioctl_tlv av; struct ath_rateioctl_rt *tv; - int y; + int error, y; int o = 0; ATH_NODE_LOCK_ASSERT(an); + error = 0; + /* * Ensure there's enough space for the statistics. */ @@ -1478,9 +1480,13 @@ ath_rate_fetch_node_stats(struct ath_softc *sc, struct ath_node *an, */ av.tlv_id = ATH_RATE_TLV_RATETABLE; av.tlv_len = sizeof(struct ath_rateioctl_rt); - copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + error = copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + if (error != 0) + goto out; o += sizeof(struct ath_rateioctl_tlv); - copyout(tv, rs->buf + o, sizeof(struct ath_rateioctl_rt)); + error = copyout(tv, rs->buf + o, sizeof(struct ath_rateioctl_rt)); + if (error != 0) + goto out; o += sizeof(struct ath_rateioctl_rt); /* @@ -1488,18 +1494,22 @@ ath_rate_fetch_node_stats(struct ath_softc *sc, struct ath_node *an, */ av.tlv_id = ATH_RATE_TLV_SAMPLENODE; av.tlv_len = sizeof(struct sample_node); - copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + error = copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + if (error != 0) + goto out; o += sizeof(struct ath_rateioctl_tlv); /* * Copy the statistics over to the provided buffer. */ - copyout(sn, rs->buf + o, sizeof(struct sample_node)); + error = copyout(sn, rs->buf + o, sizeof(struct sample_node)); + if (error != 0) + goto out; o += sizeof(struct sample_node); +out: free(tv, M_TEMP); - - return (0); + return (error); } static void From nobody Tue Dec 26 02:04:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdP85hpDz55Kg4; Tue, 26 Dec 2023 02:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdP857Sdz4JnB; Tue, 26 Dec 2023 02:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iqyAU2bt7zAV1ibyhWQZ8lpUChHeOx9yRNRoS7F55Qs=; b=UFsmxO5Ajou9R3CvEEi6v+Vi7Dl/h5uZ2i/DNvyvE30Gu9aMRc/tfOgGHgebp+iijOqqlF SntSDjIt0zi5Tkwld+oOdGKdjxf8ESN5NXFtENJR07YdHiUJr5ncqK1eF6vFqEhgQLkMy9 uvyJh41KVhVVsd7q09Jknx+98pg4A+b4Mv9mtxB2Myr4abwedS6dsh4qgr3RP3I89wG5M4 UWMsx8B6iQdjMv06ozMtpzUDeylu9Hcln+CQnSRB2+gKQC6dhTpfV/0aPEO9//aF/Vjl0f XJTEu0gMZI4OtILNZfzr8AqoTZ1NEYUohmzxZKEMHE+O+NFWsBDHtRUEddRvyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556252; a=rsa-sha256; cv=none; b=YVgF8MMW8F2gLKs2INNmJqzOx3u73zDYeBSNQRI+IM3Tmlr8qFp9OM//PdLOq1UvXSw0a7 hHY1HYCPH6ZZS54gNtZTaH/WAIWZn4fgt5GFrc6pEQm1NVo+w2c4KGhiTGVBm6MxU/USy8 8+RaqMmKYDoZP/lJrRM7dGBhzJDbsZZ3it1Hy3zw7ppbbX8dzigMSQu8FRhFAwxVV9lpKh V9MhVHgMRDA1Gx6kY++YSAeVK8VR1vofgrILbE3RkACGml/bW2/V/Q5KRWVhJYkiiwuxKj 0/oulot6l+kE6Z4KdIjfivpocp0QdtbWk4kdD6S+el4xpq8FXqd8RtmVfEFeVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iqyAU2bt7zAV1ibyhWQZ8lpUChHeOx9yRNRoS7F55Qs=; b=rlntJs+vMfHdY1xxJ9Fa+S12b1fa1N7XaY8QLmVOFk4NS+t74UWVl+KXMh/3YlG7iqWxQ3 ddY7aMrlIZ+fYy4AdAgVeUWAgoNhNX2Nd1r41ngDtwUKkhv41DH0fFqkuj2cDqv+c7y4OO fRaPZXIXpDYJwd6FS/+c6AouZDd1jJfidA8lVNLD64+YnPca23r1GhWYJ3rGk5XIzpqGxi 0QM60EGrjHOZeWajue+NiQuCip7YDvOjJm8vv5y9v7kUeyESvKc9XuR7G/sAbUc8jH4P85 htL6HZiVSUv9X6gezmfzrezoFmJZ++cdANoCG6EQQzNU1kVEd9Xht6MdoGNLJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdP84F60zbh9; Tue, 26 Dec 2023 02:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24C3Q002683; Tue, 26 Dec 2023 02:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24C2V002681; Tue, 26 Dec 2023 02:04:12 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:12 GMT Message-Id: <202312260204.3BQ24C2V002681@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: 81eb7baa69e9 - main - freebsd32: Report errors when copying out oldlenp in __sysctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 81eb7baa69e983fe159d254a4ed47d9c00396801 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=81eb7baa69e983fe159d254a4ed47d9c00396801 commit 81eb7baa69e983fe159d254a4ed47d9c00396801 Author: Mark Johnston AuthorDate: 2023-12-26 01:37:32 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 freebsd32: Report errors when copying out oldlenp in __sysctl This matches the native implementation's behaviour. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43101 --- sys/compat/freebsd32/freebsd32_misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 5aafc459d60a..41f456d67e5b 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2675,9 +2675,9 @@ freebsd32___sysctl(struct thread *td, struct freebsd32___sysctl_args *uap) uap->new, uap->newlen, &j, SCTL_MASK32); if (error) return (error); - if (uap->oldlenp) - suword32(uap->oldlenp, j); - return (0); + if (uap->oldlenp != NULL && suword32(uap->oldlenp, j) != 0) + error = EFAULT; + return (error); } int From nobody Tue Dec 26 02:04:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPB0ffBz55Kg5; Tue, 26 Dec 2023 02:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdP96B5Yz4K6c; Tue, 26 Dec 2023 02:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BHEWpWycritAvUTbrXunq+0Dokcx6AiIGPcAk7gUxsA=; b=kNI6xSDid1nGYpZO2piwR0hvputa+a9wAUKalDl+Mcy1kEBreMtdmZNO2Vnv0Mz5+zpwq4 AkIPT2vrNz3yAqtcUR6CMSqCFn3n3VHbFO4zY+0N2FlwFwEpnw+6c06bIWeSX84eSYDTFA f3iozXJ4OK2ucnpWZ0zq2onvVxiLmyrbxkYFpJKW++4Au78UxUKduPzZkUhZGCB9HmlJQv DDap0hkLYlRbhiZlIf4aZkSwtzAUKQpnkQfEEu/7OIDkRz09FsCK9LWwq9mDXoXT6zrlo0 ZPeuNfVRAysMLWChhVLB97O9kJtAGeroNZWb3eTr5ttN1rCNJ3LFhHUNcAJb5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556253; a=rsa-sha256; cv=none; b=sLwqWAxayNVjrG4BYHxRWY7G1yZQpqNn97avrJfx16qm5xMTK4meJuXuqAMpHd06Kj++mH gT6R6w9Q8A35FuQtu0M0yIil8FI06JxZbB618/KCYRXi4PZHzgbhHjh31aQo7EFesNgAPt 2g6FEbMoBj41vhyMuoivVO3w+6F+3e2Y3EYyw20nDj4dOaOMXc0aeIF9nxYF6H1cgtkOY/ NNlqDZp5etBSJaJaEyAe4J3WpKSQUYp7RqZC8gG+D3ycZHiJOs8Hd2PUegSrvXcaShEqbD sVjcAqXBwbTPXMOW3cr8wOm5qTTyvCXU2CCf9gumlyvmVn9663a84CJkVxf/QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BHEWpWycritAvUTbrXunq+0Dokcx6AiIGPcAk7gUxsA=; b=kzrp0xfICPHTQJ5Ax4h3IcxN2e2TDoQ+5neZ/QGpcn6Xv8FD6J4ENKrK5avX8YoBU/Mnsm tEoWd8k8pG/E0JjC8csMBYTrpMZfL/kj0LUfkRkmSZkKv3aoKe1HHIyBOty6PVTq3Mh8Ut jOKfFZRl2nRIaW7ZHzmMGlLYN6kjS230MBPAZaWC7lJzgHd3jYHyTvrALcibbaDtmE5War wz6XoKr30J8qtwVHkWbDhsm6Svsswc9z3rsPy1gLTimB6lOccAbd9xQ6HuhJS0M+Ol2RIQ dM/K174EENTRMmhAvM7ojG37gTyf0+26n1XflLnVs9y85ZY3Ze4lhZ1Bz8nVrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdP95Gzczc76; Tue, 26 Dec 2023 02:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Dl6002734; Tue, 26 Dec 2023 02:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24D4X002731; Tue, 26 Dec 2023 02:04:13 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:13 GMT Message-Id: <202312260204.3BQ24D4X002731@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: e452fa70d507 - main - hid: Handle errors from copyin() in ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e452fa70d50761b5fe5f19c3c93c107be116728c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e452fa70d50761b5fe5f19c3c93c107be116728c commit e452fa70d50761b5fe5f19c3c93c107be116728c Author: Mark Johnston AuthorDate: 2023-12-26 01:37:49 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 hid: Handle errors from copyin() in ioctl handlers If copyin() fails, the driver will proceed blindly with a zeroed buffer, which is not what we want. In preparation for annotating copyin() with __result_use_check, start checking for errors. Reviewed by: wulf MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43102 --- sys/dev/hid/hidraw.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index fbc75aaa4e79..6a05b633cfc8 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.c @@ -674,13 +674,16 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, sc->sc_state.quiet = true; mtx_unlock(&sc->sc_mtx); if (error != 0) - return(error); + return (error); buf = HIDRAW_LOCAL_ALLOC(local_buf, hgd->hgd_maxlen); - copyin(hgd->hgd_data, buf, hgd->hgd_maxlen); - bus_topo_lock(); - error = hid_set_report_descr(sc->sc_dev, buf, hgd->hgd_maxlen); - bus_topo_unlock(); + error = copyin(hgd->hgd_data, buf, hgd->hgd_maxlen); + if (error == 0) { + bus_topo_lock(); + error = hid_set_report_descr(sc->sc_dev, buf, + hgd->hgd_maxlen); + bus_topo_unlock(); + } HIDRAW_LOCAL_FREE(local_buf, buf); /* Realloc hidraw input queue */ @@ -737,8 +740,11 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, default: return (EINVAL); } - if (id != 0) - copyin(hgd->hgd_data, &id, 1); + if (id != 0) { + error = copyin(hgd->hgd_data, &id, 1); + if (error != 0) + return (error); + } size = MIN(hgd->hgd_maxlen, size); buf = HIDRAW_LOCAL_ALLOC(local_buf, size); error = hid_get_report(sc->sc_dev, buf, size, NULL, @@ -775,11 +781,13 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, } size = MIN(hgd->hgd_maxlen, size); buf = HIDRAW_LOCAL_ALLOC(local_buf, size); - copyin(hgd->hgd_data, buf, size); - if (id != 0) - id = *(uint8_t *)buf; - error = hid_set_report(sc->sc_dev, buf, size, - hgd->hgd_report_type, id); + error = copyin(hgd->hgd_data, buf, size); + if (error == 0) { + if (id != 0) + id = *(uint8_t *)buf; + error = hid_set_report(sc->sc_dev, buf, size, + hgd->hgd_report_type, id); + } HIDRAW_LOCAL_FREE(local_buf, buf); return (error); From nobody Tue Dec 26 02:04:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPC1HXFz55KJZ; Tue, 26 Dec 2023 02:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPB6xmvz4JhM; Tue, 26 Dec 2023 02:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IaEy/PEOFYg5HT5Operw1zJKf5Ts8zCVSngNyEMK/Go=; b=uE8RNv7VduyFAfWopSsX0Barwr5aiBUPsJEhevb7O0lVLpgkblZ7QY2xGVRNgmb8kzy7aR vL2GWd15BGd0fvtIaDIZnSCbA50yl+r9Za8jE12BeACCYhAIwIjSNpIro0ZLl1Bnaf10WU OHfRIPmcvVMqibXECfh0iZmsXxaDd5fipwTZK31+j0s0DhcGH2vdV53ZWJOYGu0zPLRUkU ieWNdx/wHlhonmCAsW7Q8nJyKwmuY/lIe+sKixLVlyT1QwygU22x2diNV+72o/KpjjeFeb l9Q18WQGFuQMeXZ0JGkSbnhKzBKDGORQrghtw12152sGslv/2yqLjblaWeMApw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556255; a=rsa-sha256; cv=none; b=A/mDqMLe3UdObsPTxrVMCJukn1BTRclOiaMEphs3RKvtRvBCZQeCDuE8c5IJi+b0RSZWul nTjIi5ml6IMSH0Cb5ZfroqwGtKB72ss1oG3xdrYJS34I5HppN/Mmf+Z47wccWfXi/IsPN4 w+7CQ76R/sCRGRtp7GjzRz9Osr21nrWdkz8oREJifHYVIP30x0Z74WONXnqnhAUo9qO1eq QsrMTq73oK8Fz7R93s/YRSo1+cCZENbN5GwqIlt8wckwqpJZhTDiEmuoH9WgIisQFb/uUS kqZgR1g78tq23SAm5ZnyT/1dr2uyWZomdgobjz+8mEwcExnyikxiPmEUGCd/Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IaEy/PEOFYg5HT5Operw1zJKf5Ts8zCVSngNyEMK/Go=; b=C/gde+ZDcX9KER6sCpvBiFds0ijgMuRcrnG/hcsawciheq8KKfH7OuCcxX7A97XZWrzl9z 9IGt1oIJ3gGogakIzVPhDMnHmGFztHVGqH0mrH/nVbogQP3Y1RfQiLtpIQVCQjJvtYTcPJ 4s4Y47MUu9vmiVkVaqX2ew+9rjiDWd8J4Z3drUQndjz1UVs9mF48kN0e73JgVl/rWX4d4W xrgFVngfVV9Lthu7jqNxD3u5Haf0BpT4mrMQ76o8FCvf6RRzX2jvuwb/st3NwYmkq/qOgR eePHQYwiBKEnVL+JgfBtW5m/oqG5GaUbNF+yYCO5EQuftOmzRRrkAHUJn4eTpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPB6311zc77; Tue, 26 Dec 2023 02:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24EHe002797; Tue, 26 Dec 2023 02:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24ETu002794; Tue, 26 Dec 2023 02:04:14 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:14 GMT Message-Id: <202312260204.3BQ24ETu002794@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: b2caed2f8d69 - main - uhid: Check for errors from copyin() in ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b2caed2f8d699d6dc59ecf8810d945cdea148c44 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b2caed2f8d699d6dc59ecf8810d945cdea148c44 commit b2caed2f8d699d6dc59ecf8810d945cdea148c44 Author: Mark Johnston AuthorDate: 2023-12-26 01:38:04 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 uhid: Check for errors from copyin() in ioctl handlers This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: wulf MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43103 --- sys/dev/usb/input/uhid.c | 14 ++++++++------ sys/dev/usb/input/uhid_snes.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 2f65a07dea56..863e04f4e52b 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -634,9 +634,10 @@ uhid_ioctl(struct usb_fifo *fifo, u_long cmd, void *addr, return (EINVAL); } if (id != 0) - copyin(ugd->ugd_data, &id, 1); - error = uhid_get_report(sc, ugd->ugd_report_type, id, - NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); + error = copyin(ugd->ugd_data, &id, 1); + if (error == 0) + error = uhid_get_report(sc, ugd->ugd_report_type, id, + NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); break; case USB_SET_REPORT: @@ -661,9 +662,10 @@ uhid_ioctl(struct usb_fifo *fifo, u_long cmd, void *addr, return (EINVAL); } if (id != 0) - copyin(ugd->ugd_data, &id, 1); - error = uhid_set_report(sc, ugd->ugd_report_type, id, - NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); + error = copyin(ugd->ugd_data, &id, 1); + if (error == 0) + error = uhid_set_report(sc, ugd->ugd_report_type, id, + NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); break; case USB_GET_REPORT_ID: diff --git a/sys/dev/usb/input/uhid_snes.c b/sys/dev/usb/input/uhid_snes.c index 085881faa88b..7a16542794cc 100644 --- a/sys/dev/usb/input/uhid_snes.c +++ b/sys/dev/usb/input/uhid_snes.c @@ -359,9 +359,10 @@ uhid_snes_ioctl(struct usb_fifo *fifo, u_long cmd, void *data, int fflags) return (EINVAL); } if (id != 0) - copyin(ugd->ugd_data, &id, 1); - error = uhid_get_report(sc, ugd->ugd_report_type, id, - NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); + error = copyin(ugd->ugd_data, &id, 1); + if (error == 0) + error = uhid_get_report(sc, ugd->ugd_report_type, id, + NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); break; case USB_SET_REPORT: @@ -386,9 +387,10 @@ uhid_snes_ioctl(struct usb_fifo *fifo, u_long cmd, void *data, int fflags) return (EINVAL); } if (id != 0) - copyin(ugd->ugd_data, &id, 1); - error = uhid_set_report(sc, ugd->ugd_report_type, id, - NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); + error = copyin(ugd->ugd_data, &id, 1); + if (error == 0) + error = uhid_set_report(sc, ugd->ugd_report_type, id, + NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); break; case USB_GET_REPORT_ID: From nobody Tue Dec 26 02:04:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPD2YKBz55KPK; Tue, 26 Dec 2023 02:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPD15mKz4KCp; Tue, 26 Dec 2023 02:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKEz472WTo9qIf9iKc4wMQJN8/1Qs+vetPq4XuJ/QZk=; b=B16r3kirLCj1nkdz5p3slcy3nAILBiF8+ob2rH4q8cToBtPhU3xrCLNG05kS1mhW36vVIJ 8xqz/CE0p92BES0fmzY+XGPbVizaHaMoO7gbLTvSd+GX+PlFMcTC3xer1eO4imI2NfAIWO N/ctbZawSoozQJfOfuj6HOd0f26n/NviQSpbvnOr2RCWJDxqRYAnENp1yV66fnMIl7wfS+ 01LGOpXBJPUBGTv5cpzq4MbSdIh6cSWMI6lolZ1RfixbQFc8L3IUofhRbyas/5BS6l9P8Z +fH40+MEBs8wlRLAM26IAaPaQTA1cXL9PzTiSjZtDVJti6Fc7ZOlgaFZ7Cg3WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556256; a=rsa-sha256; cv=none; b=bA5YfdGh1rPeChCtzVjAChdil3NkVNQez033Y8uiBs/qgtbMWNMMfowofHp3PPNOgN0V+a FSxa6WcRDLHuyM41/15on3MvdXtHwXXq/UU33hvxZxzBoDac3pxfGIERWAnzDKuVojaiL1 tIQIFvJNW1/cBmjhM/TFv/ufEd96PhPi/IJTS+rICgaxfxVMMGpkpQ9e1t/DRXg01RWpUE rI+NJGsf/S9SA2GYklO8cQexQuPvv6Lw2WRcQz9b3u9k5rgWIaLahCGw69Kx4/yjUaGnBv FXoKPIZpZ5Zx2YCFUUTRfXVWBcnwcb8/JuHSAdpuU9Wm9IrPb7eD9Vxyi61Ewg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKEz472WTo9qIf9iKc4wMQJN8/1Qs+vetPq4XuJ/QZk=; b=fksNLYoqN8w0BAQFKe5D9hHUxzeTO2j8N/FIkjldjP1WgOJW0MHHfp1UP8FJCbUKbPGtZ6 jcD8IO3AOOlog+VsPiAYA6fJA47lVYKIgVV6j7g022W1SPt0daNBIdFOtYjs0byi4HXKec DImBTJpa7s+WQfjIP35jvF5lGvBch2sgsJVR1HviQiDzwCgpDZNiVg0I+fr12qEK3wpR4m wCsmXuoaqlrkj9KS4pOM4xXURFO/jbt/RofAzOWDuvwZLUYuk6ZhHEG6+Kx9xAR2qmDITy ofyI05ptdNlNV4pQuzGW++z4n22MKaOEK41A/3WbaAlp0hhcKVlZAcBJAFuU4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPD0D1mzbl9; Tue, 26 Dec 2023 02:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24FMa002845; Tue, 26 Dec 2023 02:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24FSj002842; Tue, 26 Dec 2023 02:04:15 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:15 GMT Message-Id: <202312260204.3BQ24FSj002842@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: 6bfb7306ef92 - main - mpi3mr: Check for copyin errors in mpi3mr_map_data_buffer_dma() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6bfb7306ef92aaccffae42ed00ce6d7201b76966 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6bfb7306ef92aaccffae42ed00ce6d7201b76966 commit 6bfb7306ef92aaccffae42ed00ce6d7201b76966 Author: Mark Johnston AuthorDate: 2023-12-26 01:38:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 mpi3mr: Check for copyin errors in mpi3mr_map_data_buffer_dma() A failed copyin will cause the driver to use the contents of uninitialized buffers instead, which is unlikely to be the behaviour that we want. Check for errors. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43098 --- sys/dev/mpi3mr/mpi3mr_app.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index 99a922b2bec9..7bd926269018 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -543,6 +543,7 @@ static int mpi3mr_map_data_buffer_dma(struct mpi3mr_softc *sc, { U16 i, needed_desc = (dma_buffers->kern_buf_len / MPI3MR_IOCTL_SGE_SIZE); U32 buf_len = dma_buffers->kern_buf_len, copied_len = 0; + int error; if (dma_buffers->kern_buf_len % MPI3MR_IOCTL_SGE_SIZE) needed_desc++; @@ -558,6 +559,7 @@ static int mpi3mr_map_data_buffer_dma(struct mpi3mr_softc *sc, if (!dma_buffers->dma_desc) return -1; + error = 0; for (i = 0; i < needed_desc; i++, desc_count++) { dma_buffers->dma_desc[i].addr = sc->ioctl_sge[desc_count].addr; @@ -572,12 +574,19 @@ static int mpi3mr_map_data_buffer_dma(struct mpi3mr_softc *sc, memset(dma_buffers->dma_desc[i].addr, 0, sc->ioctl_sge[desc_count].size); if (dma_buffers->data_dir == MPI3MR_APP_DDO) { - copyin(((U8 *)dma_buffers->user_buf + copied_len), + error = copyin(((U8 *)dma_buffers->user_buf + copied_len), dma_buffers->dma_desc[i].addr, dma_buffers->dma_desc[i].size); + if (error != 0) + break; copied_len += dma_buffers->dma_desc[i].size; } } + if (error != 0) { + printf("%s: DMA copyin error %d\n", __func__, error); + free(dma_buffers->dma_desc, M_MPI3MR); + return -1; + } dma_buffers->num_dma_desc = needed_desc; From nobody Tue Dec 26 02:04:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPF2q99z55KgC; Tue, 26 Dec 2023 02:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPF1V7Qz4K9g; Tue, 26 Dec 2023 02:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ggi34wTfuVCcW/MPjLRyY20/c8O80lQ2nqN4blAt7zc=; b=BA1gvCSdd15h2ipfHGhjpNriS0fzmMQ3L32DBW+Wr5dSaH0Bn93xizIwBPjE4Fn5wlmiP5 y5BCI11cyTGwu2el3J7e4FXfn4sLQvQVAwJo0FBLlua3tXyau1KPtnbxyrdrUj8suxC15C fnd+UR9VmOwJ5skj/OsKTtfiWPr13nNZj6qwvwdqc+ZIpP6k6eRvPHzpZrD92N5eV2tvMs Px0XTvNfUYwMWt7VxbMWd8CJws6UU83/OOurHH4X0Qxxxuo/x4FpBsRBXeJJgCxUEYt6db Iz2HZRKS7F6oJbllfT4rHjk4kSGrNw3RuBkbX8vqHOlh3LeHRVDcPBwkj7qIDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556257; a=rsa-sha256; cv=none; b=WzEd0HJ56aw2uCuw6Do7OlTH7GsXDQwV0r1hITgqq6qjp1atBriKAomhLK9lTryKx8aEhL eYT54WQYBirQ/p5qJyTWWFuvoItQh+dS6NtQY15aCsS9Y4mz7xK3sDg2nMsznXh3H0qWjk oN/Nb1sCmgAt6azrXIw6GvxKjAt9JgK3khz6tz1MKklOI2410zNH12ix8eNiunKhCZR8uh zOvXocLurnUOQADW3G7eR/eD6wbAOzllIjFiAQ5+/SHeX/nkJtrTuX8m4a0s6XEzSLgQuQ W1ABLf0WNMGdul6NwaKERvF2yiCDnBJnnUy2crk29tP92868FudmEeUUtLRRdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ggi34wTfuVCcW/MPjLRyY20/c8O80lQ2nqN4blAt7zc=; b=WY+hxNQNvJqfsJmf0FVwQuXznU3/pWwsiNwspOFtuwLMiIVfljikRmjmhBMobflATBB/Dm RE7ULINkj3BwYo0oIfq5srbU7RZbVUfxZpMfPHGviKtMX0jKJjMcwFr1JZ8yIo4wdgs1Yr O2JBJiNgUff+16fa6UzYW20myUULRk0sFwRPTOO2yXsfR0wQ5PhdiUiY8WSNdIymshY+mn nduRHDDuODCb3FBfwM9PSxXv/qFqbAjhnxdc32OW30rK4SCZkr2h8oqaUwHhEYmz2iEXrg bjJze1AJa+zbXsiC8n7x/eT8J2dnvPW7Gq/ba0Lfp9PF1/NqT6iJQ6rW9ctvew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPF0bXPzbv6; Tue, 26 Dec 2023 02:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24H74002905; Tue, 26 Dec 2023 02:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24HMt002902; Tue, 26 Dec 2023 02:04:17 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:17 GMT Message-Id: <202312260204.3BQ24HMt002902@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: a01ff11cb73d - main - ocs: Check for copyin errors in the ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a01ff11cb73d7a1988f6241f63d141371ff23717 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a01ff11cb73d7a1988f6241f63d141371ff23717 commit a01ff11cb73d7a1988f6241f63d141371ff23717 Author: Mark Johnston AuthorDate: 2023-12-26 01:38:57 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 ocs: Check for copyin errors in the ioctl handler If copyin() fails, the driver will blindly proceed with whatever had been in the uninitialized DMA buffer. This is not what we want. Check for copyin failures. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: ram MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43097 --- sys/dev/ocs_fc/ocs_ioctl.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 6021ddf5c0d6..71ba17d5f72a 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -86,6 +86,7 @@ static int ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbox_t *mcmd, ocs_dma_t *dma) { sli4_cmd_sli_config_t *sli_config = (sli4_cmd_sli_config_t *)mcmd->payload; + int error; if (sli_config->emb) { sli4_req_hdr_t *req = (sli4_req_hdr_t *)sli_config->payload.embed; @@ -127,7 +128,13 @@ ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbox_t *mcmd, ocs_dma_t *dma) wrobj->host_buffer_descriptor[0].u.data.buffer_address_high = ocs_addr32_hi(dma->phys); /* copy the data into the DMA buffer */ - copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes); + error = copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes); + if (error != 0) { + device_printf(ocs->dev, "%s: COMMON_WRITE_OBJECT - copyin failed: %d\n", + __func__, error); + ocs_dma_free(ocs, dma); + return error; + } } break; case SLI4_OPC_COMMON_DELETE_OBJECT: @@ -170,7 +177,13 @@ ocs_process_sli_config (ocs_t *ocs, ocs_ioctl_elxu_mbox_t *mcmd, ocs_dma_t *dma) return ENXIO; } - copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes); + error = copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes); + if (error != 0) { + device_printf(ocs->dev, "%s: non-embedded - copyin failed: %d\n", + __func__, error); + ocs_dma_free(ocs, dma); + return error; + } sli_config->payload.mem.address_low = ocs_addr32_lo(dma->phys); sli_config->payload.mem.address_high = ocs_addr32_hi(dma->phys); @@ -184,6 +197,9 @@ static int ocs_process_mbx_ioctl(ocs_t *ocs, ocs_ioctl_elxu_mbox_t *mcmd) { ocs_dma_t dma = { 0 }; + int error; + + error = 0; if ((ELXU_BSD_MAGIC != mcmd->magic) || (sizeof(ocs_ioctl_elxu_mbox_t) != mcmd->size)) { @@ -238,13 +254,13 @@ ocs_process_mbx_ioctl(ocs_t *ocs, ocs_ioctl_elxu_mbox_t *mcmd) if( SLI4_MBOX_COMMAND_SLI_CONFIG == ((sli4_mbox_command_header_t *)mcmd->payload)->command && mcmd->out_bytes && dma.virt) { - copyout(dma.virt, (void *)(uintptr_t)mcmd->out_addr, mcmd->out_bytes); + error = copyout(dma.virt, (void *)(uintptr_t)mcmd->out_addr, mcmd->out_bytes); } no_support: ocs_dma_free(ocs, &dma); - return 0; + return error; } /** From nobody Tue Dec 26 02:04:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPG3pX4z55KZt; Tue, 26 Dec 2023 02:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPG2bT3z4KGJ; Tue, 26 Dec 2023 02:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLO+nybv6Vi4U+YKoYks15XHZVlJ7bHBH/5QSH2GVGc=; b=To8DDCd8Wv2LPlau+sO0VQYAKDRslmR746LEvTC4ylQ/NNFiV6XBjGq7E7+fOZs9QW3C7L aYf4SAb1tvM2BpfLBtjFnNTCrHEYjnt66ceIdvrNPvnJfDl5GJTfjMunvt4aNWUIUNwGbI N4Rzq2F3/iIKxS6KpaCBpxR5I01I2hrP7RHcnBHTV+54iPZeCknyy+PelTjVKiKsSVXVc/ iAVlfhI7ZGqYa544FjaAQalN211kXp06V0Qy/7oNTJ6ddq+ZnUt3qI3a69WFaEoglcfBgg 2xIVL9oC+ww9AxaRffhMxVN35y4hpHbXyvplw9MA9M6DmTgN0DXg17aI4SNutQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556258; a=rsa-sha256; cv=none; b=lRr1O1i17CVdJdJ0Rwes/L2UwBm1rTcjeOxwUvqGt4ZAjRf+jIE5Pk1HPl0nozGCmJDF9r CkM/YTsUCl2MXy0fwVvfc0uhTyJhg4pulWZD2wzwnwnMWgUAhxKaEgM6APEVEN+VjbwyB3 52DDj65HO0kmSmv8leCPuE3Ic7S6udZ3jGCmPIm47NM5h1G7jnkNdBQW0WZMBCaoedxPfg juEYowyy4btAxKFWfv110YfdzpIi7i92YpSZglGD5/wnBLXb/V1ubhscFTCfwCJacMcqOk AVXz7uHElY+dTGDGEoTc+SfV4OHte5syeVAzssPgp976QQkY0/sakptCp+qPFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLO+nybv6Vi4U+YKoYks15XHZVlJ7bHBH/5QSH2GVGc=; b=CQYI4vz5zKYUJj7CHS2kDOXZdxHJ+fEr/uVlE4mBYZnbHKzGae7NGQt1ZSz6UdaEbjRSNd qilcPexxtFhm9OgJjXro+WQRjZXdJKIVyWXVpZQ667B5pAO/sOTf1AQ2D6MWoa11Ce5E+v LSICRgZof+OFGHkexZ+0Z/ZUsBFAGZOgE44d7osaZbOuGQzWTY2v240wtmmjW7G22yyW/O egN1Rno0duEFD+2yGJzzy4h0mpFpUDvFXs+NT1RRcJVYWef6f4sdIZdtGGuu67iqXGBOsg A+2PPiPuX4PfmjMiBmRfNwcOoAnVvlAWn68UateoD2XUHGEuNTOKXfghET+syw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPG1j7DzblB; Tue, 26 Dec 2023 02:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24I6N002957; Tue, 26 Dec 2023 02:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24I4Z002954; Tue, 26 Dec 2023 02:04:18 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:18 GMT Message-Id: <202312260204.3BQ24I4Z002954@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: 4f35450ce52a - main - compat_freebsd4: Check for errors from subyte() in freebsd4_uname() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4f35450ce52a7b141e7ae8d37fa257b5f8971dda Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f35450ce52a7b141e7ae8d37fa257b5f8971dda commit 4f35450ce52a7b141e7ae8d37fa257b5f8971dda Author: Mark Johnston AuthorDate: 2023-12-26 01:39:21 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 compat_freebsd4: Check for errors from subyte() in freebsd4_uname() This is in preparation for adding a __result_use_check annotation to copyin() and related functions. Reviewed by: imp, kib, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43099 --- sys/kern/kern_xxx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 540dc75b5545..e8331a5cdb1f 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -324,7 +324,9 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) 1, 0, 0, 0, 0); if (error) return (error); - subyte( uap->name->sysname + sizeof(uap->name->sysname) - 1, 0); + error = subyte(uap->name->sysname + sizeof(uap->name->sysname) - 1, 0); + if (error) + return (EFAULT); name[1] = KERN_HOSTNAME; len = sizeof uap->name->nodename; @@ -332,7 +334,9 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) 1, 0, 0, 0, 0); if (error) return (error); - subyte( uap->name->nodename + sizeof(uap->name->nodename) - 1, 0); + error = subyte(uap->name->nodename + sizeof(uap->name->nodename) - 1, 0); + if (error) + return (EFAULT); name[1] = KERN_OSRELEASE; len = sizeof uap->name->release; @@ -340,7 +344,9 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) 1, 0, 0, 0, 0); if (error) return (error); - subyte( uap->name->release + sizeof(uap->name->release) - 1, 0); + error = subyte(uap->name->release + sizeof(uap->name->release) - 1, 0); + if (error) + return (EFAULT); /* name = KERN_VERSION; @@ -373,7 +379,9 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) 1, 0, 0, 0, 0); if (error) return (error); - subyte( uap->name->machine + sizeof(uap->name->machine) - 1, 0); + error = subyte(uap->name->machine + sizeof(uap->name->machine) - 1, 0); + if (error) + return (EFAULT); return (0); } From nobody Tue Dec 26 02:04:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPH4g2tz55Kkd; Tue, 26 Dec 2023 02:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPH43tZz4KJn; Tue, 26 Dec 2023 02:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j07J5TKZ8OksfS4QD/ut2pt/7aetX3vgsSJ4gNPD/0w=; b=XJtO8YWGfYF+sh1NzP3kmFqAh4DIOhB26cuGpptNPe1IowEPtlmUiICr+fWLwFjCYZdMUE 5xRkHl0oku+nC6RkHkwk8pIbC6T2j9RRJrl0fshuau1QoPTou/NHgeCxB5OA3kzUOzXZsn TVtMKktGxgjnqQqkwfABBNCoi9nC7qN4AM+9yl0kTkw66scRtf7Ti4CPOXE0icmXRH5jqx 5Vloo2sBq6pD+K60MTX9J+0WgwY5woRscfMzD/5xp+bP3CtmKOFwsSeu7lGUj6hWNbQh1H tYrAyLl2uRerO+JC6Xy2EMF7bgmCFNbg6pDtx/8syC7CY3sxYY7yihI1hTQCdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556259; a=rsa-sha256; cv=none; b=ncfsg9oShm5EDYTmOHnH7XGm6STVFpkVfLkYHnIuubyVNtsMK9Zk8hTLp6vfQNkmEHo2UB naAv27gXiX6cenNGsb9FGvmJhbI5z/rVcVUITXxr9Uc5mvnqebP8/rbDZuxvRdJ0lso5Bc MlqOalaYKIx1BOcesb54CArfVBckAU8KiTEPtfOLZIn/agCjCVhJf5HG2ezSDNChD+sCjC OBYvr7RaE7fsCpGhBULLYD5ICfgsTlbmvs9Bl6CFPn4QxZBSdfNAYFyJRdtU9AwdIM4XyV KLsxz1wzWC58bLCn2VnE8Yo0hTFd2NbdfphXLaTZvUccIuIFWuwiejqF66d9iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j07J5TKZ8OksfS4QD/ut2pt/7aetX3vgsSJ4gNPD/0w=; b=BMw4llIviJyRjyzjNEacI1divVYV0IUtZk56qoISE3Lg3Sza9oFIuHlYBJNKjNZqeMO3EH sZ+74fX7Aocp1SR58QqZOZv2aUk3+u792SiFhLCi+1x0lIN3ZZn8yaUfRzLwdroWg66vtw +6nEHtUAo9yZXSSUDCe7ui9yEgE22Ut/L6q9PPyu4fAZRGVBs7SGciHyj/j1slWbqzkJ8S C0C+T6aDPfpR113KDotxUV2UntakwS+5uyrrjavmbiQrU5g0b/BCfCdJW2erWq23TyinjZ j7WD7mwM//S+4j4Ge6bKzj//xusJ/LAwl4Bw5ANIocTmgn7vJ6Jbe2TDGrXZrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPH37qTzbwb; Tue, 26 Dec 2023 02:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Jrk003005; Tue, 26 Dec 2023 02:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24JCU003002; Tue, 26 Dec 2023 02:04:19 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:19 GMT Message-Id: <202312260204.3BQ24JCU003002@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: 7b68fb5ab2a2 - main - thread: Add a return value to cpu_set_upcall() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 7b68fb5ab2a276ccd081cc1a43cebf0fb315e952 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b68fb5ab2a276ccd081cc1a43cebf0fb315e952 commit 7b68fb5ab2a276ccd081cc1a43cebf0fb315e952 Author: Mark Johnston AuthorDate: 2023-12-26 01:39:39 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 thread: Add a return value to cpu_set_upcall() Some implementations copy data to userspace, an operation which can in principle fail. In preparation for adding a __result_use_check annotation to copyin() and related functions, let implementations of cpu_set_upcall() return an error, and check for errors when copying data to user memory. Reviewed by: kib, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43100 --- sys/amd64/amd64/vm_machdep.c | 19 ++++++++++++------- sys/arm/arm/vm_machdep.c | 3 ++- sys/arm64/arm64/vm_machdep.c | 3 ++- sys/i386/i386/vm_machdep.c | 11 +++++++---- sys/kern/kern_thr.c | 5 ++++- sys/powerpc/powerpc/exec_machdep.c | 3 ++- sys/riscv/riscv/vm_machdep.c | 3 ++- sys/sys/proc.h | 2 +- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 6173aabd97f5..c6b78824d730 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -611,7 +611,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) * Set that machine state for performing an upcall that starts * the entry function with the given argument. */ -void +int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { @@ -637,13 +637,15 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, td->td_frame->tf_rip = (uintptr_t)entry; /* Return address sentinel value to stop stack unwinding. */ - suword32((void *)td->td_frame->tf_rsp, 0); + if (suword32((void *)td->td_frame->tf_rsp, 0) != 0) + return (EFAULT); /* Pass the argument to the entry point. */ - suword32((void *)(td->td_frame->tf_rsp + sizeof(int32_t)), - (uint32_t)(uintptr_t)arg); - - return; + if (suword32( + (void *)(td->td_frame->tf_rsp + sizeof(int32_t)), + (uint32_t)(uintptr_t)arg) != 0) + return (EFAULT); + return (0); } #endif @@ -663,10 +665,13 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, td->td_frame->tf_flags = TF_HASSEGS; /* Return address sentinel value to stop stack unwinding. */ - suword((void *)td->td_frame->tf_rsp, 0); + if (suword((void *)td->td_frame->tf_rsp, 0) != 0) + return (EFAULT); /* Pass the argument to the entry point. */ td->td_frame->tf_rdi = (register_t)arg; + + return (0); } int diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index e9822c8345a5..1dd01f6700aa 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -224,7 +224,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) * Set that machine state for performing an upcall that starts * the entry function with the given argument. */ -void +int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { @@ -236,6 +236,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, tf->tf_spsr = PSR_USR32_MODE; if ((register_t)entry & 1) tf->tf_spsr |= PSR_T; + return (0); } int diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index 9fa5406ad828..385bec00ada5 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -205,7 +205,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) * Set that machine state for performing an upcall that starts * the entry function with the given argument. */ -void +int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { @@ -224,6 +224,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, tf->tf_x[0] = (register_t)arg; tf->tf_x[29] = 0; tf->tf_lr = 0; + return (0); } int diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 778e666b9029..2c2fb9dc9821 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -486,7 +486,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) * Set that machine state for performing an upcall that starts * the entry function with the given argument. */ -void +int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { @@ -510,11 +510,14 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, td->td_frame->tf_eip = (int)entry; /* Return address sentinel value to stop stack unwinding. */ - suword((void *)td->td_frame->tf_esp, 0); + if (suword((void *)td->td_frame->tf_esp, 0) != 0) + return (EFAULT); /* Pass the argument to the entry point. */ - suword((void *)(td->td_frame->tf_esp + sizeof(void *)), - (int)arg); + if (suword((void *)(td->td_frame->tf_esp + sizeof(void *)), + (int)arg) != 0) + return (EFAULT); + return (0); } int diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index d75305ea5020..544479fc9f13 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -146,6 +146,7 @@ thr_new_initthr(struct thread *td, void *thunk) { stack_t stack; struct thr_param *param; + int error; /* * Here we copy out tid to two places, one for child and one @@ -165,7 +166,9 @@ thr_new_initthr(struct thread *td, void *thunk) stack.ss_sp = param->stack_base; stack.ss_size = param->stack_size; /* Set upcall address to user thread entry function. */ - cpu_set_upcall(td, param->start_func, param->arg, &stack); + error = cpu_set_upcall(td, param->start_func, param->arg, &stack); + if (error != 0) + return (error); /* Setup user TLS address and TLS pointer register. */ return (cpu_set_user_tls(td, param->tls_base)); } diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 0b1751a76454..0c10115c4e25 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1149,7 +1149,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) td->td_md.md_saved_msr = psl_kernset; } -void +int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { @@ -1201,6 +1201,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, td->td_retval[0] = (register_t)entry; td->td_retval[1] = 0; + return (0); } static int diff --git a/sys/riscv/riscv/vm_machdep.c b/sys/riscv/riscv/vm_machdep.c index b4a7f1c489af..f6d6f61bdc84 100644 --- a/sys/riscv/riscv/vm_machdep.c +++ b/sys/riscv/riscv/vm_machdep.c @@ -178,7 +178,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) * Set that machine state for performing an upcall that starts * the entry function with the given argument. */ -void +int cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { @@ -189,6 +189,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, tf->tf_sp = STACKALIGN((uintptr_t)stack->ss_sp + stack->ss_size); tf->tf_sepc = (register_t)entry; tf->tf_a[0] = (register_t)arg; + return (0); } int diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 3f5f76862573..e7d2a1775603 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1257,7 +1257,7 @@ void cpu_fork_kthread_handler(struct thread *, void (*)(void *), void *); int cpu_procctl(struct thread *td, int idtype, id_t id, int com, void *data); void cpu_set_syscall_retval(struct thread *, int); -void cpu_set_upcall(struct thread *, void (*)(void *), void *, +int cpu_set_upcall(struct thread *, void (*)(void *), void *, stack_t *); int cpu_set_user_tls(struct thread *, void *tls_base); void cpu_thread_alloc(struct thread *); From nobody Tue Dec 26 02:04:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPK18Q1z55KH2; Tue, 26 Dec 2023 02:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPJ5BgVz4KMK; Tue, 26 Dec 2023 02:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9qEd56wPslnMG+Ve9t0OBWatQ50HfMDQRLxBwtZ/8o=; b=gdOEuXMG3mHIruJBB/Lj85s7MTJ2itfcl8t32TY9CCWNuCctSKcT9NmC+CLDuRktuGVOCn qYI3ixLOjp/s+toswuWGivLFZ/xlTv54Qw9RejuzbAAlTAjYCnpWoEBceCBT86yGaMFrxZ w22MXXG+uzsdbqETktohsep7JPiIo6A5zVzgkWJLrpINKyakyVfSGJ9Bjc152WFstBXmFi 5RdrlfMVk5p4XLaH+vsef2bR0713LLYh4KIh7bEDEKryS/b/jqH+8HrwmUMS72Y/2a6nbx Dty0N2/kHBasi1ob1J2x0C2q2tduxkI9TCYgavGcFVO3f3NycGLjoWqKwYdHJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556260; a=rsa-sha256; cv=none; b=sxEOsknbAFFRBJ6ppEkbHJ1XAt0tkdmteEX6JqpscoclqICuxX/NETYyB2ySeCeMhY8sda fQZvnJ2f2bc1ifNjKxSlYDxa08MNKj27bOan2N8Y0gSYOS9N6nRv4Urw6IgYrM+KqSafWt uOdIlt4zi7+PSUvwj/Df5X+PeIboFtueMB10C7U/GUPMI1aH0yZOiVBA0GTAE9Mx78nTCS nOPAvTL96dkagfIiktVSW03LDI4hB9SzP/WBfpUw4jHythHA0p90e1kQzHhWFIiQTTU5Q/ wsRhzoKQLc/FEDRT1Mei+Xs8mDju7csQXgHHdUnVByV0ZZsJvzypSn5h32RAEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9qEd56wPslnMG+Ve9t0OBWatQ50HfMDQRLxBwtZ/8o=; b=iPaGqN2QFyXuu3aURXe214KgTSuSrR3UXqn07LV3NoL6u605o8BVCMQib7QyoVg09KE1h3 ZyjQ2mtZL+ONG/1GdfqU26z+uaeHvCHukKUQd0hePfkTWeCK6zGyEdcuFZN2CR1ECbrC+I to4QTKvyIpIwWf3gnCUt1ktqd6O5K6hH6Ghg6qW1i+79Wt5qUug08fPvpZ665TsWO6x1QL R+Ufi784JgPlERIDOC4rD8cHmMIh9JKQHWq1Mi4/gsz0iFrr8+njzZGVwGLOZZ//rVkR0a qvJxdYcssNygFgFLnfKLFusZF0hxcuhANBdqyu+uY84UnJkKm+qvYR+p1wuRjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPJ4Hg7zbhB; Tue, 26 Dec 2023 02:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Keh003053; Tue, 26 Dec 2023 02:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24KUu003050; Tue, 26 Dec 2023 02:04:20 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:20 GMT Message-Id: <202312260204.3BQ24KUu003050@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: 3fde275167ce - main - linux: Check for copyout errors in linux_fixup() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3fde275167ce1f1455a03586d29840546d06d97a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3fde275167ce1f1455a03586d29840546d06d97a commit 3fde275167ce1f1455a03586d29840546d06d97a Author: Mark Johnston AuthorDate: 2023-12-26 01:40:05 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 linux: Check for copyout errors in linux_fixup() This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: olce, dchagin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43104 --- sys/i386/linux/linux_sysvec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 8990b9b806ca..24f8ec2d7ea8 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -126,11 +126,14 @@ linux_fixup(uintptr_t *stack_base, struct image_params *imgp) argv = base; envp = base + (imgp->args->argc + 1); base--; - suword(base, (intptr_t)envp); + if (suword(base, (intptr_t)envp) != 0) + return (EFAULT); base--; - suword(base, (intptr_t)argv); + if (suword(base, (intptr_t)argv) != 0) + return (EFAULT); base--; - suword(base, imgp->args->argc); + if (suword(base, imgp->args->argc) != 0) + return (EFAULT); *stack_base = (uintptr_t)base; return (0); } From nobody Tue Dec 26 02:04:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPL0tGCz55KHH; Tue, 26 Dec 2023 02:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPK6Hgcz4KF3; Tue, 26 Dec 2023 02:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmpvYjPwwQhnbR5u6d/wDoCPkoepk0Qjilru+yXx73g=; b=YIantpl9HpJVmZbnLvkFY6JDo+XevCL1oJnT8Zl6r6kRuyjlvsn+MIDJZqC0gbfHVhxrde 7sQ1Sn+R6qGd3QzFo/5x/QtvCLxnGqTzolxAEya8ZmPLxwa0I4FaNtd5xpM/7xc8+zZPWp g9LzopEMZAUqRFJjk2pfhPY9UsSEOWvhBAzmslkRLFWrdyn2NvxigxQ7jfjF3vVfiaBnEa EH2N79lmks4DbmCMwh9QZ6cTEyf0XxFj9vgP+F8g94gFrxud7FqKeyNJEMFZh0RskwX8Q7 sor9vMdqsYsziTHYbzzfnF6k/ASbcLW2eLdur7k0rW+c5rpxM7cEYg7tYp75XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556261; a=rsa-sha256; cv=none; b=YGAVcTWPQsHgJXt43kxp3riPcEYI/foeIbqXwEgnQbgSDW3aYPMaV4rV7dA2Nl0yn50MCo 5WnZuGVayk1fNnAT2RSi1jznJTbC7Olqu0fvPa4w2UeZ+dthi8VjavIgIu/jCmHTxTi5Lu s7ModkOH7ojOSYQMKa/0YUxZGUc/YShhomIzYxOQJY7i2mdcbI1zm0KSdYBXj0siiYdqaZ 3gsp9LDKnU56w6k0yDMq9M/doJJ8PtCIV4K/u18WpoKCtC9mutNF4pV2oMPPOFSRhd5odn V5WK+LH2ih9jspiOo7Xnp7Eqwony4ZNO4Lg8ZNpQyrNMVJ2vlfzpylfELqPLnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmpvYjPwwQhnbR5u6d/wDoCPkoepk0Qjilru+yXx73g=; b=lOloTHKdAJfHR0B2vPbygcAbm8BnQrRpCQF49FxTx5l+CQybG6LxjhH2PsB7VuoFHEEYvs reCs4iufnmoAud7VQQvICsP/3LZVhCENHvEJ2Ug0d7pGaPAv1YRY4zv1+yxQC6sxaXiRNL t9Yjzedo3g5BT8mPRgdrkVCXaL5Wrnx4/7OEb8b4WqgiLakMu5O9xdtQGlkyrDMK8xEmX/ fe9b3uzv/hijaB3ciYgBAqZYIngT22ugmw4y3yIy/tw51PzM/CZPxXaaR08dAudoNg5QeV 2zuaa4LF4uNM6THYG9ktqVEThgZhXXWa4NkSMfVmvsyYbTTblAWgJTWQedp/jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPK5Nyyzc5X; Tue, 26 Dec 2023 02:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24LZh003098; Tue, 26 Dec 2023 02:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24Lr9003095; Tue, 26 Dec 2023 02:04:21 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:21 GMT Message-Id: <202312260204.3BQ24Lr9003095@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: bdf03b4bcc4a - main - powerpc: Avoid ignoring copyin()'s return value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: bdf03b4bcc4a9aa0be503dbc64415e6b0b845fbc Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bdf03b4bcc4a9aa0be503dbc64415e6b0b845fbc commit bdf03b4bcc4a9aa0be503dbc64415e6b0b845fbc Author: Mark Johnston AuthorDate: 2023-12-26 01:40:16 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 powerpc: Avoid ignoring copyin()'s return value A recent change made it possible for cpu_set_upcall() to return an error. Do that here instead of ignoring an error from copyin(). Reviewed by: jhibbits MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43105 --- sys/powerpc/powerpc/exec_machdep.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 0c10115c4e25..94e561ddd33a 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1155,6 +1155,9 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, { struct trapframe *tf; uintptr_t sp; + #ifdef __powerpc64__ + int error; + #endif tf = td->td_frame; /* align stack and alloc space for frame ptr and saved LR */ @@ -1182,10 +1185,12 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, tf->srr0 = (register_t)entry; /* ELFv2 ABI requires that the global entry point be in r12. */ tf->fixreg[12] = (register_t)entry; - } - else { + } else { register_t entry_desc[3]; - (void)copyin((void *)entry, entry_desc, sizeof(entry_desc)); + error = copyin((void *)entry, entry_desc, + sizeof(entry_desc)); + if (error != 0) + return (error); tf->srr0 = entry_desc[0]; tf->fixreg[2] = entry_desc[1]; tf->fixreg[11] = entry_desc[2]; From nobody Tue Dec 26 02:04:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPM44xnz55KqC; Tue, 26 Dec 2023 02:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPM0XJnz4KMp; Tue, 26 Dec 2023 02:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IVXPTmtzAIOP+oZwd/DIlY0SpdSHNwWsdr00Tkyln4Y=; b=qcN5KA2qb5+ojQYOG6KNptlOOsxqElb3JDIl+eVfXyzRdMXLRZHXYNbIRm+7CBkH0nVDo3 ZvARU5GQwgEmVPkWh4JREZlBePYnqUbsf3FGa0PbbuGdB5WT/9bFY/cnZwYCeJSIPwm9g1 yGO3M3Bp8ZMFHdF4hsWZE/YRA/MAXqrnPWIIjRsEfuXJnoBjmd1BS5+WKUXuo9FoGsHHf4 NdwL3xavG3on5GCgc5E+yc6MhMgCA6z93capMK09zg3PpRePyuHqO31Z0ybKfHvAt+xbHT cmfJ33cy+pglxXByOMwAJcnEWLO9IUHqxQaP96r9HPWzGZH/VO5fFXTR2O3Q2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556263; a=rsa-sha256; cv=none; b=AQp3BA2pTKWaTy6zvFmv3kr6UDExmNk/LxpLryv9hGVomVmhS8z2F8KzevhB7vVZFlzUkv EPub6sBu4TwqsWpL2FOLS1Dnr9Thks6P+2jKhLGnVaMpx8BWfiHtEAjue9LHlHAl3D3qsF bJM9dTT2t5tdZU/38NQ4wqQAIV0OhAdaQvrc2VOnfAeE37/g+kEeadNCC1OoyRGeJxfeE4 H9/jKHOGKKg9A2O72dTTDQ2VXkwbRjGwQrLWuTckSxWxPudOn4gPKHKlRK1JlQqux4e21v CXhKYnTL0neB6vJX5yDzBcNF0eqqg0JuHcytz3YeYGu4m2XHgQyJ/BiubDKUbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IVXPTmtzAIOP+oZwd/DIlY0SpdSHNwWsdr00Tkyln4Y=; b=wnICECRfS8MGJclqou+7ZBlyuQ7aH81yiPERMSpKei9Ilrv/LPC1Pz/vaDWmXBLtVZHNic /VDAo6ff+9qG0CwHngP/dRwnZdfDoxuLXtpGOLFH4LtOGdQBZCAGdMmZUZapeyXcRUYz+c p3r4VaHKFqFIvHzZZ4AI3iZIusdf1vFZQqteChtV4c918iqoq784T+UgcQVww8w/eLv/Uc 9jaGDMgM9++NUfhau/fvoR0GFkeKUAnLbLpePkaSscsIwbQj4hTsoG3SVqD3fX434AQoFR ldV/+izGh4eRII7oEDsCbiRawtosx2rc6nyzFQCAOM+tL/rbk3F8sdBSfyhpxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPL6X35zblC; Tue, 26 Dec 2023 02:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24MP2003146; Tue, 26 Dec 2023 02:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24MDe003143; Tue, 26 Dec 2023 02:04:22 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:22 GMT Message-Id: <202312260204.3BQ24MDe003143@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: 771501e96ffd - main - ses: Add error checking for copyout() calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 771501e96ffd7e314c338300a351ad76d28a2f69 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=771501e96ffd7e314c338300a351ad76d28a2f69 commit 771501e96ffd7e314c338300a351ad76d28a2f69 Author: Mark Johnston AuthorDate: 2023-12-26 01:40:33 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 ses: Add error checking for copyout() calls This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: mav, imp, asomers Tested by: asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43130 --- sys/cam/scsi/scsi_enc_ses.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 0a3136aa8d10..c429e820a1fd 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -2810,8 +2810,8 @@ ses_get_elm_desc(enc_softc_t *enc, encioc_elm_desc_t *elmd) } if (elmd->elm_desc_len > elmpriv->descr_len) elmd->elm_desc_len = elmpriv->descr_len; - copyout(elmpriv->descr, elmd->elm_desc_str, elmd->elm_desc_len); - return (0); + return (copyout(elmpriv->descr, elmd->elm_desc_str, + elmd->elm_desc_len)); } /** @@ -2827,7 +2827,7 @@ static int ses_get_elm_devnames(enc_softc_t *enc, encioc_elm_devnames_t *elmdn) { struct sbuf sb; - int len; + int error, len; len = elmdn->elm_names_size; if (len < 0) @@ -2839,10 +2839,13 @@ ses_get_elm_devnames(enc_softc_t *enc, encioc_elm_devnames_t *elmdn) ses_elmdevname_callback, &sb); sbuf_finish(&sb); elmdn->elm_names_len = sbuf_len(&sb); - copyout(sbuf_data(&sb), elmdn->elm_devnames, elmdn->elm_names_len + 1); + error = copyout(sbuf_data(&sb), elmdn->elm_devnames, + elmdn->elm_names_len + 1); sbuf_delete(&sb); cam_periph_lock(enc->periph); - return (elmdn->elm_names_len > 0 ? 0 : ENODEV); + if (error == 0 && elmdn->elm_names_len == 0) + error = ENODEV; + return (error); } /** @@ -2921,9 +2924,9 @@ ses_handle_string(enc_softc_t *enc, encioc_string_t *sstr, unsigned long ioc) size = rsize; if (size > sstr->bufsiz) size = sstr->bufsiz; - copyout(str, sstr->buf, size); + ret = copyout(str, sstr->buf, size); sstr->bufsiz = rsize; - return (size == rsize ? 0 : ENOMEM); + return (ret != 0 ? ret : (size == rsize ? 0 : ENOMEM)); case ENCIOC_GETENCID: if (ses_cache->ses_nsubencs < 1) return (ENODEV); @@ -2935,9 +2938,9 @@ ses_handle_string(enc_softc_t *enc, encioc_string_t *sstr, unsigned long ioc) size = rsize; if (size > sstr->bufsiz) size = sstr->bufsiz; - copyout(str, sstr->buf, size); + ret = copyout(str, sstr->buf, size); sstr->bufsiz = rsize; - return (size == rsize ? 0 : ENOMEM); + return (ret != 0 ? ret : (size == rsize ? 0 : ENOMEM)); default: return (EINVAL); } From nobody Tue Dec 26 02:04:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPP6Gz4z55Kql; Tue, 26 Dec 2023 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPP26G5z4KKn; Tue, 26 Dec 2023 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEktmtIFbvcUe9PhUTIVsM7oO6bbZ8PvkQdjUFFsb98=; b=U+0ohPrNhMTujk7734GNrc0OuTGQeaWhqeg9HF82QxCEMASwmQ1o9SYGgavdYF+pUpbyoa gg0Pe1pL+AsPq06RZ/41faYvEf9O2f2cjd1Zd4JaxNCadnMUJFmQYQSu3holBTPJpC6Tw0 XcyK4NR1lOZuaQ8oIIFqRd5905rokT+qSPkNjuBIcM/4vJQ8DnGwVbdjr8lwqIpdL7Li9m mZSsiq9MX91wI4BJqygeEsNu5IY0nPFKHhGGsGII7KedLWhZeyslb1ZxGoIbCM/pWawa78 G0CjLQLW6sVgIHAg5HAxOLWFOTz5H+Vb5GfoCSfYZUqADfiMIIhSnd9YJZHXvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556265; a=rsa-sha256; cv=none; b=HOeogfRA2cY4RzfFFiGkFSyhGe+cZDsQRzG2E7naF5FgFIJ2zcC8h6TSf0Fk8p+yYOg6Uq UNK/SmpE0ftEXKh4gHpYyTi9v/9U1E2L9FLNGEBWmB9X2xMEJgl6QdDsIEYKgUh7MJ4RnD Mn1MHKfaCT5uU/U6ps2SA6Nm1XS+IoQYO/rCpKr75/2SMcCH7sO5Lcm6Cu158d5unOkWOO hO/1UzivM5v7CdPO3U5M5pefskYBBlxggOmfGlkubJSZwT/PYDp8T5Ua+uJDtU1LrfAmrM +d/X3L5dgwa5EpBaVFAJQDktyPvvZKFD3v4uZuYgPiVwU9f4iG9tn6ZY2+QubQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEktmtIFbvcUe9PhUTIVsM7oO6bbZ8PvkQdjUFFsb98=; b=YFoiuc+Y2mKG4+npHhCThOb/GoPziGC9Wtx93j1webYtccLLMwLnOZRRs99wKapSOCV/bm GZGpHTcBMxuIZuh8jhE1mNf6hUYD7N6HHBdOX8RVViZTA9nQx2qH/KpYQxhDDjdyvUEvto Wed2Ws/kT3H2nKx5WlHUEniiknRANrygpsDlBlJxh13V5gYUYphyoUWlyEa00hXrnxzEkK ZjnXj8FA6KG3hnJFqWNmgYF1ezjK7+iaxkN/tZXLhGDnmj/mMCaNvHs484FvD6mEQUrwqH 6facNFN77WvcVqlljAHA89XPe61PwApDcRvNejDXGjQIj4Qac5V1ThbxYuKlTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPP1Cpgzbv7; Tue, 26 Dec 2023 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24PnB003254; Tue, 26 Dec 2023 02:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24Pdu003251; Tue, 26 Dec 2023 02:04:25 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:25 GMT Message-Id: <202312260204.3BQ24Pdu003251@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: abbc260f74b2 - main - jail: Ignore errors from copyout() while copying the error string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: abbc260f74b203646dd108ad4038627fcfb0ded7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=abbc260f74b203646dd108ad4038627fcfb0ded7 commit abbc260f74b203646dd108ad4038627fcfb0ded7 Author: Mark Johnston AuthorDate: 2023-12-26 01:41:54 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 jail: Ignore errors from copyout() while copying the error string Reviewed by: zlei, jamie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43142 --- sys/kern/kern_jail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index c7b07d5762fa..abecc9ac8072 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2146,7 +2146,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); else - copyout(errmsg, + (void)copyout(errmsg, optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); } @@ -2580,7 +2580,7 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); else - copyout(errmsg, + (void)copyout(errmsg, optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); } From nobody Tue Dec 26 02:04:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPN61LZz55KL3; Tue, 26 Dec 2023 02:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPN168Nz4KSP; Tue, 26 Dec 2023 02:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuvPCnDtDGgY2icH008h0AphLTN2NoELBjl1I7BWTR4=; b=G/G2P97jUvpodfzKB+d/0rTAasiumCaK7FN/G4046lGXN7q73umzh8x9tq9AZmNxBP2AbS uxGL+Jtg8EQCpLiXUkgj/SQlbH6citQWiQaM7yiUTETkU98ZZ/AWq0oxLTWuI9n6GyUD9U ZaJLKql9TFa2LA4vDVqWDx2eQ3f5kYh//UXgD4Euj/FqiUGwtw6c7qqOyOF9AqoCVv0ga8 HNZOqpO8O2JFhHN3OONOQJjtRmGPFQo00u8tjg6zYCSeYxEmhGGTv4E8+Y3R93nKHauhB0 VfHJ1Xg0jRjW8s1Z6Af8+zWR2RuxUiesv8t3TbDZRvhuytuYVCtEmYUV7jR14g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556264; a=rsa-sha256; cv=none; b=x3+P+81AlJHhHHjtPk6uNzBpUk+A+AGAHz31byBTPzof5OKN+tefcPC7CSA8W6TCB5b16C Cp1HPmqae9UPy5UVM8BNHFGZORaDr3N1usaM/AfUc9WPzbxxS1UPDbtJfzco0JRUCdo+5p eYAgZo44kOmKhVI0sadOZ9yGA5q1UnMrV6lGhabkM7bt6ZWbQL08WSJ3XbTHGyXResb+LV rBMzvUYZdzPHE+nqYfBFoEG7wcMjrDd3YGhqIP/O0k0JAjCoWB2CtsTcqRCjl5yYptPU7y GlhsO9XyA3JDhuou42vNHE61djSy4g4kmq7d3NwnjWTLq7TSTk1yRsMqBzUcBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuvPCnDtDGgY2icH008h0AphLTN2NoELBjl1I7BWTR4=; b=jBeG63Hq3dRysUg1paBittBakGHeLvKGtqMT4q8Q5ZNtjKvSdUcmMBF8kMt5bRSG1lIqK0 rA0WJagQ8g9OI5rDJOTwDiTDdtlPPuPipsLO8QGE2gozaTnrptYTsDw7mImNNaEg3W/F2q dIKsoKpDIeLTRQJ3/lfPxB6OyxSfZhH+J0CRm/fgXczvhDsssexMXGRpAwgRAu3zzr3zR3 mGujPUuGb0yMR6FsVtjVSpERYz3zOBz4Pw/KwDf0TRfArTX5kNLVIH8uxw+pZVPh9UclJz lTK8wuh1KrYppFoW5cnBLffsPMfmnM8y+tm8y9bJcj2mTof4hZ2nAPkU/9sBtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPN0CC1zc78; Tue, 26 Dec 2023 02:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24N1h003191; Tue, 26 Dec 2023 02:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24NE1003188; Tue, 26 Dec 2023 02:04:23 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:23 GMT Message-Id: <202312260204.3BQ24NE1003188@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: d0adc2f283ad - main - sendfile: Explicitly ignore errors from copyout() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d0adc2f283ad5db6b568ca533a056c9f635551cd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0adc2f283ad5db6b568ca533a056c9f635551cd commit d0adc2f283ad5db6b568ca533a056c9f635551cd Author: Mark Johnston AuthorDate: 2023-12-26 01:41:32 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 sendfile: Explicitly ignore errors from copyout() There is a documented bug in sendfile.2 which notes that sendfile(2) does not raise an error if it fails to copy out the number of bytes written. Explicitly ignore the error from copyout() calls in preparation for annotating copyout() with __result_use_check. Reviewed by: glebius, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43129 --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/kern/kern_sendfile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 41f456d67e5b..f2d66cf74b2b 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2195,7 +2195,7 @@ freebsd32_do_sendfile(struct thread *td, fdrop(fp, td); if (uap->sbytes != NULL) - copyout(&sbytes, uap->sbytes, sizeof(off_t)); + (void)copyout(&sbytes, uap->sbytes, sizeof(off_t)); out: if (hdr_uio) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index dfdf01f45e34..f6f6b57adfc7 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -1328,7 +1328,7 @@ sendfile(struct thread *td, struct sendfile_args *uap, int compat) fdrop(fp, td); if (uap->sbytes != NULL) - copyout(&sbytes, uap->sbytes, sizeof(off_t)); + (void)copyout(&sbytes, uap->sbytes, sizeof(off_t)); out: free(hdr_uio, M_IOV); From nobody Tue Dec 26 02:04:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPQ5yjdz55Kt1; Tue, 26 Dec 2023 02:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPQ3776z4KVY; Tue, 26 Dec 2023 02:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SOlMSJlpu3GrpHZ3xj09diIzp5V+A+97nVNEvM/KrtY=; b=ESP+9Rgr9/LwB26wnC23/+gSxRusnaSOE2RxvwY1g3sVnNs9Y5IRmjSX99tcz9JdHRg1SB NkkHqJtJMIDxHzGRGLpAgzYoKQWAs84AAm0MMR3u6U9uyMmqDUxOudyMQJvpjr2ra1MHOi JI917u1X38xJHkPfyQ7DCiLOXYf3le4Ivy9HvZ/XVuHzoy5B3wF8/FiIkvGYVSRdPnAdN+ 6qs+0u+xsd+iXixWajxO89leklujxDxnsIvXqMols/HCBk5H7P20Yqn64rQFkmxQOcnWkR mbylULkSH9/kfo60SzwlBtNVSieV59EqdXA28l+u1F3CXti7fDpq56SUpqq7Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556266; a=rsa-sha256; cv=none; b=j9mbs9SkemrSfyCNHJxeyzKYtU9kg7vTaDxy5HXpqZuuGJViGXK4GOYB46zzTSnAkLIRuH UTpZglWuhOW/MH0jEugHbo+hBrkQrRW7sgJlCzpmMnv2UT7VhmjAXvO622WHBHZfDXYUJN 2An3g2vTmpktMhnhMecm76ZOiubrpW+J59PGLNX9UC3LdJIF1nKBhPeBTm7yJJ74X1QPW1 zLYNXF8o+yDRM6k9UMamZD8KE7D8+fHKTHU354k/YnjiN0gkrei4itLw2IArkX6TAVTFFQ 4rXB7ECtfzh78X2MnfnxjzcOQnSDDvQ3sB6AJed2Ul/uxZcMDAr62edqbXRKmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SOlMSJlpu3GrpHZ3xj09diIzp5V+A+97nVNEvM/KrtY=; b=sfuTn3wNdMwnqCWK7+6s5Hm3LaVF6qXkPFsOFofdRKJo18Hc8ZuB+oyytR7EFDNHUNkS4w dI82zS93wmV+9PYRS27f7Hn9G80wKMyXH+mxKzjkfFpNr7SqbGVy+ju9Zw9FtVJXRx6koU JwNDf223GIpamtDC4q0UtBNC5d8H7KcPDODoR4msoYr9iuO/Bu5QUxGBmMeE+Xs3it8K0g nJxFsXYprIp14aDhqx93dl+K068f5B0IKjiUZVqaPJoZZyLnPtFulzJ6g18DcAdo0w8leb gnUKbYre/vCh6tjYKVSeOV+MMXtu/erS7S4sFKv+ZmM5g0s6hHMUrLKenOFGSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPQ2DndzblD; Tue, 26 Dec 2023 02:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Q1t003305; Tue, 26 Dec 2023 02:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24QWf003302; Tue, 26 Dec 2023 02:04:26 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:26 GMT Message-Id: <202312260204.3BQ24QWf003302@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: f450277f7a60 - main - thread: Ignore errors when copying out during thr_exit() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f450277f7a608f26624384e046c1987490c51296 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f450277f7a608f26624384e046c1987490c51296 commit f450277f7a608f26624384e046c1987490c51296 Author: Mark Johnston AuthorDate: 2023-12-26 01:42:04 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 thread: Ignore errors when copying out during thr_exit() It does not seem reasonable to return to userspace after calling umtx_thread_exit(). This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: olce, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43143 --- sys/kern/kern_thr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 544479fc9f13..e2f1b6baca4b 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -315,8 +315,8 @@ sys_thr_exit(struct thread *td, struct thr_exit_args *uap) /* Signal userland that it can free the stack. */ if ((void *)uap->state != NULL) { - suword_lwpid(uap->state, 1); - kern_umtx_wake(td, uap->state, INT_MAX, 0); + (void)suword_lwpid(uap->state, 1); + (void)kern_umtx_wake(td, uap->state, INT_MAX, 0); } return (kern_thr_exit(td)); From nobody Tue Dec 26 02:04:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPS03kSz55KmK; Tue, 26 Dec 2023 02:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPR3xcJz4KbP; Tue, 26 Dec 2023 02:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex2aBnDtlBa/svfxEdCwp72a2NEQCeWaNqNdpVfbPfE=; b=WPuo+QLwfglxbLug/8GgDyV4L4HEFoedQtFziCIQ/AfOoByo8/YeIQWNkmOTy0b8dS47uW rh6F/JEd6Enc/M9jxBfzO9cceBXkmtrHbqRrnl/0fLHyM8J9CEnEfwkvV7MJltb5Jzb4v5 4Q9LL97naaP2hxdWqbfhxvduwI/sQ4+NMATUqL68uT2XB7JHVBoJQNzV2VSO4XiNkeL5qY V5O/6ZP66rQqBOL7cOsFaTfELqiuzy3TXOofDYUHPry9RiFvt1nwFeZsD1aM1EmqCOMszq NAYKAMRRn/7fMJHkqAM0rxhKK33sEkFuMIttGuHPKezBErxc3aNk411mNpe1KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556267; a=rsa-sha256; cv=none; b=X/qeUdJCqhOUzuK7s5uSZ1pIRHuIH5PU6NA8dtUdtRQQ0lYBx5jxKBA60/b7E/kLdWXUId l0AEdSqFpKI87f885nptyJ14Z+K/cT7ryli1m7BqZ8NoKv/Hu4xbZiuxwzxZxg44Y7w0Sn xckXR5Z0uJa/5WsCuREybmt1Ep0O7+mrBhV5SFKZiGnI+ig0webO2ICQalUXoI2rAGdNev yAaflwt9WZ8YUQdhXAI838i/R23zCk2GYk3YeETtDgajuHUdpYgcRjeiO+wSameBiGlUY1 85YfhRYSqEKgSN8JmR+Wh9zgNU72K0HaTvdSf+6jx/9uwRUV8z8hSb1A9yId6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex2aBnDtlBa/svfxEdCwp72a2NEQCeWaNqNdpVfbPfE=; b=tPzg9/24639Ez/iykaNict+cQxd+CADTeDa37Np3Zh1ituxtUZXTNUmTGGgoETcSjNp55S vw7PghqtpdcBQ4YVxMaMoIAfPJU82lWE00ZCuCBZknGELV5m4Vwj76AhLYAdtTKeaJNtae z2suWy1MZ+f7H1P53pA0rYz5rGIxam8TGVq0Wffc/DcP589nHdFBskZf9tWM0LimRGIFN1 npL5atKz9JCLzxdg70uUok91f+sun7i6yQ5iVUXQR62OLeZvaKstZIgJdH5SzkPwjPDAVD GZw4tBAvfPL/zX5Eut9VNVR74XSXTvCnrQkQ+HI12HgZAcFhFPq/J+AmAAZn7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPR32xLzc5Y; Tue, 26 Dec 2023 02:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Rio003350; Tue, 26 Dec 2023 02:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24RQW003347; Tue, 26 Dec 2023 02:04:27 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:27 GMT Message-Id: <202312260204.3BQ24RQW003347@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: 3379d9b5de4c - main - umtx: Check for errors from suword32() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3379d9b5de4c4876a317d25ca008e66b1111b701 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3379d9b5de4c4876a317d25ca008e66b1111b701 commit 3379d9b5de4c4876a317d25ca008e66b1111b701 Author: Mark Johnston AuthorDate: 2023-12-26 01:42:17 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 umtx: Check for errors from suword32() This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43144 --- sys/kern/kern_umtx.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index ff9505b8e31d..57ff74f5421e 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -2960,7 +2960,14 @@ do_cv_wait(struct thread *td, struct ucond *cv, struct umutex *m, */ error = fueword32(&cv->c_has_waiters, &hasw); if (error == 0 && hasw == 0) - suword32(&cv->c_has_waiters, 1); + error = suword32(&cv->c_has_waiters, 1); + if (error != 0) { + umtxq_lock(&uq->uq_key); + umtxq_remove(uq); + umtxq_unbusy(&uq->uq_key); + error = EFAULT; + goto out; + } umtxq_unbusy_unlocked(&uq->uq_key); @@ -2990,7 +2997,9 @@ do_cv_wait(struct thread *td, struct ucond *cv, struct umutex *m, umtxq_remove(uq); if (oldlen == 1) { umtxq_unlock(&uq->uq_key); - suword32(&cv->c_has_waiters, 0); + if (suword32(&cv->c_has_waiters, 0) != 0 && + error == 0) + error = EFAULT; umtxq_lock(&uq->uq_key); } } @@ -2998,7 +3007,7 @@ do_cv_wait(struct thread *td, struct ucond *cv, struct umutex *m, if (error == ERESTART) error = EINTR; } - +out: umtxq_unlock(&uq->uq_key); umtx_key_release(&uq->uq_key); return (error); @@ -3176,12 +3185,14 @@ sleep: */ rv = fueword32(&rwlock->rw_blocked_readers, &blocked_readers); + if (rv == 0) + rv = suword32(&rwlock->rw_blocked_readers, + blocked_readers + 1); if (rv == -1) { umtxq_unbusy_unlocked(&uq->uq_key); error = EFAULT; break; } - suword32(&rwlock->rw_blocked_readers, blocked_readers+1); while (state & wrflags) { umtxq_lock(&uq->uq_key); @@ -3206,12 +3217,14 @@ sleep: /* decrease read waiter count, and may clear read contention bit */ rv = fueword32(&rwlock->rw_blocked_readers, &blocked_readers); + if (rv == 0) + rv = suword32(&rwlock->rw_blocked_readers, + blocked_readers - 1); if (rv == -1) { umtxq_unbusy_unlocked(&uq->uq_key); error = EFAULT; break; } - suword32(&rwlock->rw_blocked_readers, blocked_readers-1); if (blocked_readers == 1) { rv = fueword32(&rwlock->rw_state, &state); if (rv == -1) { @@ -3360,12 +3373,14 @@ do_rw_wrlock(struct thread *td, struct urwlock *rwlock, struct _umtx_time *timeo sleep: rv = fueword32(&rwlock->rw_blocked_writers, &blocked_writers); + if (rv == 0) + rv = suword32(&rwlock->rw_blocked_writers, + blocked_writers + 1); if (rv == -1) { umtxq_unbusy_unlocked(&uq->uq_key); error = EFAULT; break; } - suword32(&rwlock->rw_blocked_writers, blocked_writers + 1); while ((state & URWLOCK_WRITE_OWNER) || URWLOCK_READER_COUNT(state) != 0) { @@ -3390,12 +3405,14 @@ sleep: rv = fueword32(&rwlock->rw_blocked_writers, &blocked_writers); + if (rv == 0) + rv = suword32(&rwlock->rw_blocked_writers, + blocked_writers - 1); if (rv == -1) { umtxq_unbusy_unlocked(&uq->uq_key); error = EFAULT; break; } - suword32(&rwlock->rw_blocked_writers, blocked_writers-1); if (blocked_writers == 1) { rv = fueword32(&rwlock->rw_state, &state); if (rv == -1) { @@ -3574,7 +3591,7 @@ again: rv1 = fueword32(&sem->_count, &count); if (rv == -1 || rv1 == -1 || count != 0 || (rv == 1 && count1 == 0)) { if (rv == 0) - suword32(&sem->_has_waiters, 0); + rv = suword32(&sem->_has_waiters, 0); umtxq_lock(&uq->uq_key); umtxq_unbusy(&uq->uq_key); umtxq_remove(uq); From nobody Tue Dec 26 02:04:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPT2tkTz55Kcf; Tue, 26 Dec 2023 02:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPS5TtGz4Kfb; Tue, 26 Dec 2023 02:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V30Af93dkxM/tk6VkzEm5NRSgnz6V1wGl/d+ZISwXdA=; b=OShv7Y984FW5gZL2/S5ITiy+YMg3gkiNlyw/1RVt3NgyyOGhwBF2Rf7yhhcp7usIvf+V5g L2XaKnaQ+Ip2hBQFvNpV/UUj+uLLf9uYDihJsXnBHHbBoHspA5hyQgLWgCRDPW79Zv0+kD 5fwCu0+erAICXqQ3UiH7AMI2eR8g42SZZ/PSA71Y86dPanv7GMvwbViJM5dBnULIf7HIwk WforG/kzzXof8DTQu1zBqDgvI6fG5DdyKlrer6cACrC8OoEk5cWkYRtC4XU5KIMtI5O1pU uIz6Oa21RP2yHQSleECcT4rlSAZbDf7RbQ5AD5dPOT0nOlHSKBOwQ1sygODdqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556268; a=rsa-sha256; cv=none; b=marArcnbpWNfeVwVmvlTa34xsTj2/yANubOIuai1R3Eu432mJ8kgMvbpFNOC+KCXDBRrKO WXLz7uhP34H+NtP7m6IiU8NPQfdOaWVD2jSrCOGMRXMzH6ysd0WMXOYEp2JjOcEDrEa3L8 QHWZ1FesVK8UWOB4oM0AaNGkg4x97isUYinplRSxv4jsuOPy5XEcxpOgRMlTwDq4XtCdwF JsgeJWFelWmCyj1sn/FS7GXtFQpPD/keAE43yWgMYQ53PJRaLMP0lRwzu+DN+LEETeXFuS qKIvWCBclAU3trdksd1vPpvQf3u4Zt4oCt71buxtOEz81eH00pqaipvYPO2m0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V30Af93dkxM/tk6VkzEm5NRSgnz6V1wGl/d+ZISwXdA=; b=CVrbuRNtoiWgLUrP0IkD8GQS3UKa5CifDYj//21IJKPP2idH9fCHhVnFIES5SW0cAIujsH P05FPVxx4dTm2FahbSIJTPQespdAxi5JeV42+ecqsV9wLEQrUlVQ2fW5rpFTbdqDUbOGCZ A33gLZUjM9Q3tiiZNkjZwyhAoizEYsXe/RMfgMegwr2UHkdx7BrdxWZCNhK/AbYL3I+GqP iTiqkS7sFYgPSvyFYWONAGpHPbFxhCBR8Pej5kWCsX/QDsPWo8hhiUAlGmMB0XEiSZY6zh l+vKPXEe5xEer+yuHkGTTotEarHhGmZILr4HEUrwC5THkH3B7P8Z/SGAWejbWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPS4DBxzbhC; Tue, 26 Dec 2023 02:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24SJY003401; Tue, 26 Dec 2023 02:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24SqI003398; Tue, 26 Dec 2023 02:04:28 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:28 GMT Message-Id: <202312260204.3BQ24SqI003398@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: bcf4a7c7ace2 - main - mps: Handle errors from copyout() in ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: bcf4a7c7ace21a01d10003de9c7692f0887526c1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bcf4a7c7ace21a01d10003de9c7692f0887526c1 commit bcf4a7c7ace21a01d10003de9c7692f0887526c1 Author: Mark Johnston AuthorDate: 2023-12-26 01:42:33 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 mps: Handle errors from copyout() in ioctl handlers In preparation for adding a __result_use_check annotation to copyin() and related functions, start checking for errors from copyout() in the mps(4) user command handler. This should make it easier to catch bugs. Reviewed by: imp, asomers MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43176 --- sys/dev/mps/mps_user.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c index 3d1b478d81b1..01edcbed2609 100644 --- a/sys/dev/mps/mps_user.c +++ b/sys/dev/mps/mps_user.c @@ -715,9 +715,9 @@ mps_user_command(struct mps_softc *sc, struct mps_usr_command *cmd) } mps_unlock(sc); - copyout(rpl, cmd->rpl, sz); - if (buf != NULL) - copyout(buf, cmd->buf, cmd->len); + err = copyout(rpl, cmd->rpl, sz); + if (buf != NULL && err == 0) + err = copyout(buf, cmd->buf, cmd->len); mps_dprint(sc, MPS_USER, "%s: reply size %d\n", __func__, sz); RetFreeUnlocked: @@ -847,7 +847,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) /* * Copy the reply data and sense data to user space. */ - if ((cm != NULL) && (cm->cm_reply != NULL)) { + if (err == 0 && cm != NULL && cm->cm_reply != NULL) { rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; @@ -857,8 +857,11 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) __func__, data->ReplySize, sz); } mps_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), + err = copyout(cm->cm_reply, PTRIN(data->PtrReply), MIN(sz, data->ReplySize)); + if (err != 0) + mps_dprint(sc, MPS_FAULT, + "%s: copyout failed\n", __func__); mps_lock(sc); } mpssas_free_tm(sc, cm); @@ -1001,7 +1004,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) /* * Copy the reply data and sense data to user space. */ - if (cm->cm_reply != NULL) { + if (err == 0 && cm->cm_reply != NULL) { rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; @@ -1011,12 +1014,16 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) data->ReplySize, sz); } mps_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), + err = copyout(cm->cm_reply, PTRIN(data->PtrReply), MIN(sz, data->ReplySize)); mps_lock(sc); + if (err != 0) + mps_dprint(sc, MPS_FAULT, "%s: failed to copy " + "IOCTL data to user space\n", __func__); - if ((function == MPI2_FUNCTION_SCSI_IO_REQUEST) || - (function == MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { + if (err == 0 && + (function == MPI2_FUNCTION_SCSI_IO_REQUEST || + function == MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { if (((MPI2_SCSI_IO_REPLY *)rpl)->SCSIState & MPI2_SCSI_STATE_AUTOSENSE_VALID) { sense_len = @@ -1024,9 +1031,13 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) SenseCount)), sizeof(struct scsi_sense_data)); mps_unlock(sc); - copyout(cm->cm_sense, (PTRIN(data->PtrReply + + err = copyout(cm->cm_sense, (PTRIN(data->PtrReply + sizeof(MPI2_SCSI_IO_REPLY))), sense_len); mps_lock(sc); + if (err != 0) + mps_dprint(sc, MPS_FAULT, + "%s: failed to copy IOCTL data to " + "user space\n", __func__); } } } From nobody Tue Dec 26 02:04:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPT6qS5z55Kt7; Tue, 26 Dec 2023 02:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPT69nrz4KWM; Tue, 26 Dec 2023 02:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkQgLrB/0Dlkd7dlb42GM4InMrpbimLi7OW/C3ds9hE=; b=PGNhXbhRWZpt4038ro9gJmWF9rs3pWt7reoK+7hxWnp27NPds0TPrKhjtvnKCw3DKNwAGI cXEs0RTbDEnZgX/YztrUfnPX9ilwIE8OZ+YF6p4ZaomcaB/GW5RzS7urdqmdsw+uA4wqUA 9rreTZkDUE/NMQ7fdsX7ZgoDEV5TNd0fPoYlE+aTO/WLOLg3sw9O5VLexFQjqdTLPR6ObD z5RUmk83xbriXVpOHIKJNT2GYUeP8pbRk0ZItUGLqSwhPzCmwzy688utxEL+uH6nKKVycs PLnzEYaQNNMjWoAJ9dorHo/c9xPuxZfRvPsfFcXoCxShC2vTv9XM1H7E4JIusw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556269; a=rsa-sha256; cv=none; b=aG8pfn3Vn50PN/iUj+GkcpUt5b2XlOIn3FmKp1+35L0tlKwN40e6uwhu0TPjdmN8Kj00XR Ly9u4/G0555zf6mK6NpzRlSmG5aoYC1zCy+uN1uLekVgYYPGhwXFMNF9aY09CkTk2HOYJF 03yC5Cr6vQ+q44rOoH4qoLZ+H8T7Vcg9gLZUGn4aluJLvKc3H+ywrVVmSZNtER7IgTAh0p T+eHmv6LMC2MIQxdSe+TJWzG3s8EwCSf/gBEVhzRauOTfrf0p0LNRDyHgoyyG+px3iIdcG LJfa78NNwUgqhshbCoqjl4Z+99ZrSWmxf61nQ3itNErTuge6oyj/dDtK8Dap7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkQgLrB/0Dlkd7dlb42GM4InMrpbimLi7OW/C3ds9hE=; b=eGHAXR7Tu8bTu0AnZcs/PKuBA5uaKsLh2wPBwPEA91xV8xsy3xJmcb3u2aUgIvDuz0pOxk u2YedVzmqjw/F2yBDe0RhKBnAt2ZJUT40M/1OkO1HekVeFeiNIVXEhYm4dvpa2yzCxxFX/ Mu2p7I4r1TtJPZkHWNUqMhqpSGQFFzMdyk4ubWOnvBH3lxUJ8ShC8gl7vvwFu1Y3cwWheS uY+n6eX+EJ61qfKOKXaGNq6aPktQ7rrwnHaF5CbfYcYAa5MUfyEY0eTuP/D2OIRUO0W5cS PkOKPgMix2tCVSWpLSMeexn79eFSeuQmcRUpFTvFzQ68UMYcPyM9roKd5kQsVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPT59k2zbv8; Tue, 26 Dec 2023 02:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24TVK003453; Tue, 26 Dec 2023 02:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24TnI003450; Tue, 26 Dec 2023 02:04:29 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:29 GMT Message-Id: <202312260204.3BQ24TnI003450@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: 68cc77a3b73f - main - mpr: Handle errors from copyout() in ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 68cc77a3b73ffda1e8ac891b9852faca833e11b7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68cc77a3b73ffda1e8ac891b9852faca833e11b7 commit 68cc77a3b73ffda1e8ac891b9852faca833e11b7 Author: Mark Johnston AuthorDate: 2023-12-26 01:42:49 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 mpr: Handle errors from copyout() in ioctl handlers In preparation for adding a __result_use_check annotation to copyin() and related functions, start checking for errors from copyout() in the mpr(4) user command handler. This should make it easier to catch bugs. Reviewed by: imp, asomers MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43177 --- sys/dev/mpr/mpr_user.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c index f2847ae36d66..5245129ce8c1 100644 --- a/sys/dev/mpr/mpr_user.c +++ b/sys/dev/mpr/mpr_user.c @@ -714,9 +714,9 @@ mpr_user_command(struct mpr_softc *sc, struct mpr_usr_command *cmd) } mpr_unlock(sc); - copyout(rpl, cmd->rpl, sz); - if (buf != NULL) - copyout(buf, cmd->buf, cmd->len); + err = copyout(rpl, cmd->rpl, sz); + if (buf != NULL && err == 0) + err = copyout(buf, cmd->buf, cmd->len); mpr_dprint(sc, MPR_USER, "%s: reply size %d\n", __func__, sz); RetFreeUnlocked: @@ -848,7 +848,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) /* * Copy the reply data and sense data to user space. */ - if ((cm != NULL) && (cm->cm_reply != NULL)) { + if (err == 0 && cm != NULL && cm->cm_reply != NULL) { rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; @@ -858,7 +858,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) __func__, data->ReplySize, sz); } mpr_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), + err = copyout(cm->cm_reply, PTRIN(data->PtrReply), MIN(sz, data->ReplySize)); mpr_lock(sc); } @@ -1073,7 +1073,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) /* * Copy the reply data and sense data to user space. */ - if (cm->cm_reply != NULL) { + if (err == 0 && cm->cm_reply != NULL) { rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; @@ -1083,12 +1083,16 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) data->ReplySize, sz); } mpr_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), + err = copyout(cm->cm_reply, PTRIN(data->PtrReply), MIN(sz, data->ReplySize)); + if (err != 0) + mpr_dprint(sc, MPR_FAULT, "%s: failed to copy " + "IOCTL data to user space\n", __func__); mpr_lock(sc); - if ((function == MPI2_FUNCTION_SCSI_IO_REQUEST) || - (function == MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { + if (err == 0 && + (function == MPI2_FUNCTION_SCSI_IO_REQUEST || + function == MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) { if (((MPI2_SCSI_IO_REPLY *)rpl)->SCSIState & MPI2_SCSI_STATE_AUTOSENSE_VALID) { sense_len = @@ -1096,8 +1100,13 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) SenseCount)), sizeof(struct scsi_sense_data)); mpr_unlock(sc); - copyout(cm->cm_sense, (PTRIN(data->PtrReply + - sizeof(MPI2_SCSI_IO_REPLY))), sense_len); + err = copyout(cm->cm_sense, + PTRIN(data->PtrReply + + sizeof(MPI2_SCSI_IO_REPLY)), sense_len); + if (err != 0) + mpr_dprint(sc, MPR_FAULT, + "%s: failed to copy IOCTL data to " + "user space\n", __func__); mpr_lock(sc); } } @@ -1116,7 +1125,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) * the same IOCTL structure and sense buffers can be used for * NVMe. */ - if (function == MPI2_FUNCTION_NVME_ENCAPSULATED) { + if (err == 0 && function == MPI2_FUNCTION_NVME_ENCAPSULATED) { if (cm->nvme_error_response == NULL) { mpr_dprint(sc, MPR_INFO, "NVMe Error Response " "buffer is NULL. Response data will not be " @@ -1130,9 +1139,13 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) sz = MIN(le32toh(nvme_error_reply->ErrorResponseCount), NVME_ERROR_RESPONSE_SIZE); mpr_unlock(sc); - copyout(cm->cm_sense, + err = copyout(cm->cm_sense, (PTRIN(data->PtrReply + sizeof(MPI2_SCSI_IO_REPLY))), sz); + if (err != 0) + mpr_dprint(sc, MPR_FAULT, + "%s: failed to copy IOCTL data to " + "user space\n", __func__); mpr_lock(sc); } } From nobody Tue Dec 26 02:04:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPW2bXZz55Kr5; Tue, 26 Dec 2023 02:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPV74n4z4Kfx; Tue, 26 Dec 2023 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYlxlI8hJHRt+DSZWDgsEuY/pCF5MVRL6Xt0NWhfFlY=; b=WQjrD64pbDZpH7vmecBO3ob5cWlgpou8TTOTdQqfxzEuSIcrmWMMwj6sO9vOM9pE6AZPjR q3kn0gYN7KP3HIb08i6AHcTvVG1YaP7/D4hKE0YhZ53HKUbAf2k4wo1wUDHnAWyNAHzPgj owXc9eonI5jD7meAuSiQv8aO7iT/Qrh9LB1BQrZuHkqao9Dh+j36SXY9jiR8ADvFd6HWhs RIJPE2TsF2d1700E1e/upgMPywfTyaQypiqllNtldR9BYUR/JkXkauJf3Hkyc1ZJoyo+/F 4EYHRUiuitxiHYQccvqgKRuEGVJ3SwU2ZVqsauUfho0A5WKPuBVV+xJyxnde1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556271; a=rsa-sha256; cv=none; b=L87/ewWdGowfaEnWtoXlW9l2OJYX93GluK2EuBhoKooLTdnYtwpdyjOynwZjGDToh69jBs NgHD1516nIY9ToLAmJeA2J1JgpmkaSdUxVSL8MzcTJ36wYbfvsL9i7L+sKqt3t/O7Q+iVw +MfsU9m+pLJNxFSXXCtM/CiU4BoCTFNGEI6PP/ZcCR1AOFHuPNKTX4PNCSMrV3bVYHPbuI FRjac0FZK9a8MGqxgeR89GTaXAqLYfUunU3pFmnXFcqcKQyG9gp6QvzPTUtUBBbQciv9pM HV8DacEU0jLWnIQJtyGw4DgJpLCnqDOWLjJkj2k+Vc7yppr7sGil0C678y/Aug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYlxlI8hJHRt+DSZWDgsEuY/pCF5MVRL6Xt0NWhfFlY=; b=d9S2A4h7h2k+WYp6cJW5anw2lzexT0X11cpAS758c9tOF9hErXE+dMl4KCuEUoESybHZXL SeNje6lCxCc0U3f5kHYdoE+kDfi6zAgLNHpppAsUAwER/2aLGcdmBGJrw0byRPlIs0cUmf k/9k6ZIuetfDD3NLQymcXE+jXsSt0Lhpv4OrrfQlbiWCAE1ANkrnNS45/wZ9buLb8G7Y2y QI9IuSpcSbTIHJjdC+BgygN2bvG7sNuGySJ40lHhK1ViBCipX55tgrcgUT5X0QX+IRRd8O 5MErFSWQt0tE6nI410Le4Q1jxWBMxkhqOKBnQS18fYeXJF+0fZlGcIDiUFK+Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPV6Bd4zbW7; Tue, 26 Dec 2023 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Uig003506; Tue, 26 Dec 2023 02:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24Umh003503; Tue, 26 Dec 2023 02:04:30 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:30 GMT Message-Id: <202312260204.3BQ24Umh003503@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: 6cdff09c0d70 - main - gntdev: Handle errors from suword32() in gntdev_alloc_gref() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6cdff09c0d70f780a738dbd3d87deb3b13ec8446 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6cdff09c0d70f780a738dbd3d87deb3b13ec8446 commit 6cdff09c0d70f780a738dbd3d87deb3b13ec8446 Author: Mark Johnston AuthorDate: 2023-12-26 01:42:58 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 gntdev: Handle errors from suword32() in gntdev_alloc_gref() Try to copy out output values before handling errors, and check that we did so successfully. In particular, it doesn't seem sensible to ignore errors here, otherwise userspace won't have any way to refer to the allocations. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: royger MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43145 --- sys/dev/xen/gntdev/gntdev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/xen/gntdev/gntdev.c b/sys/dev/xen/gntdev/gntdev.c index a9b69ba1605e..4530feb1c76d 100644 --- a/sys/dev/xen/gntdev/gntdev.c +++ b/sys/dev/xen/gntdev/gntdev.c @@ -383,6 +383,13 @@ gntdev_alloc_gref(struct ioctl_gntdev_alloc_gref *arg) } } + /* Copy the output values. */ + arg->index = file_offset; + for (i = 0; error == 0 && i < arg->count; i++) { + if (suword32(&arg->gref_ids[i], grefs[i].gref_id) != 0) + error = EFAULT; + } + if (error != 0) { /* * If target domain maps the gref (by guessing the gref-id), @@ -401,11 +408,6 @@ gntdev_alloc_gref(struct ioctl_gntdev_alloc_gref *arg) return (error); } - /* Copy the output values. */ - arg->index = file_offset; - for (i = 0; i < arg->count; i++) - suword32(&arg->gref_ids[i], grefs[i].gref_id); - /* Modify the per user private data. */ mtx_lock(&priv_user->user_data_lock); for (i = 0; i < arg->count; i++) From nobody Tue Dec 26 02:04:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPX3F4Rz55Kcr; Tue, 26 Dec 2023 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPX10Tdz4KnM; Tue, 26 Dec 2023 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5JZIjcDngDtN1eQx4V0+3VHqodfFgtKPqecF3/JGsk=; b=p/nhzEBI57NkjvuQ8gtZlJ+uXqVAAZGgBs03OzXqRRkvAUxwkR8KZ5EIEeq26LYoijnadL m4XBfKfNs3gNONodjttIpaW9y5IMNQQbl4c5mmiIScY9NqZ+59Xfb0y+ds7G0pKmEixJEd s9qEtaaf0xu539UCJ+j4RosBzqKyfbWOfzivfC++Mup6GUEZzCYY0Dv1xdHtWQtnvv+rAp L3s4YtLJoM5bTlJRQcRlmcwJKqBB7FGfUOcQoSJ4g4a1rzjA+k5eFhtHA0dSqpqRvF6Oqy cNt9fktqDEsB7W4yvfrje0rgzO+dusTUp1NK0GIP22MZPKXuw+H+doC7yIDKOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556272; a=rsa-sha256; cv=none; b=A+nR0LQu6oyzPQI3i86poM4ryjmYtFyAuNHCIl9vuJzEnD4L7+Cqcx9tr4O0tHMWARmBTw Xjvs0iw9mEd75OlTInUzZq5d4YuF+Hans9xE3vS4PcGBPz7QHtM8V7EIrLxUSN1IXeHBrg Vq9BXG6Vjt/T2dMvFqRXBnMbBtATwAm8AxfU5Er6q1xDxP1p5UQs61PBmMedblUVYCGDi7 onC0UvqRTpu3TpOe+9lRNObgQtOU1GDhIVnwhHOSN3gMMPXVot+pDyTLgfvDi7jEiKv5lW OsSXeBXUR5woXmtlQBsIJS3dN6imOOK8xdtA9QbtTRk2VX75gmzz2Mtv32WL0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5JZIjcDngDtN1eQx4V0+3VHqodfFgtKPqecF3/JGsk=; b=gh2BRJ4xzw7jqNkiXYMGe9X5gcjEqCmIy2EMv+muIAqrLMHYiMvku+jjRbAKL8Pp/IGLG8 oT1rfekjrWgZCsJxBRcmjXj5auo5vtM9+6eKW7r6Y0PBtARTTvlcfOg7Iz8iUihtZ3Cm72 fIOmRPzh+Hpf9eIO4XjLgx1/v2go+jMKN3V05OYe4oxaEQZmOVpjBoc2J0MMVP6/SDpZAn 4h7xdLyWE5deSsPjMMnE2OkDLCqjaPUtB8r/ylzhdujKl1x8Of46+ymDKSAApk261FcqW6 ffWd1ntVvJdpYNMRMytIKyVrSP1Lq3DN3x0GU8U1IXxR61QjOpWWPOHjdg9AvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPX04RlzbW8; Tue, 26 Dec 2023 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Vl7003556; Tue, 26 Dec 2023 02:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24VXq003553; Tue, 26 Dec 2023 02:04:31 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:31 GMT Message-Id: <202312260204.3BQ24VXq003553@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: bbf221e3e822 - main - geom: Report copyout() errors in g_ctl_ioctl_ctl() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: bbf221e3e822d15dafb37bd8e200a9864f2636b4 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf221e3e822d15dafb37bd8e200a9864f2636b4 commit bbf221e3e822d15dafb37bd8e200a9864f2636b4 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:06 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 geom: Report copyout() errors in g_ctl_ioctl_ctl() Despite the name, req->serror is used in some cases to copy non-error messages to userspace. So, report errors when copying out so long as they don't clobber an earlier error. Reviewed by: mav, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43146 --- sys/geom/geom_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index ebfde5697eeb..5536bd6b7110 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -616,8 +616,10 @@ g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct th } } if (sbuf_done(req->serror)) { - copyout(sbuf_data(req->serror), req->error, + nerror = copyout(sbuf_data(req->serror), req->error, imin(req->lerror, sbuf_len(req->serror) + 1)); + if (nerror != 0 && req->nerror == 0) + req->nerror = nerror; } nerror = req->nerror; From nobody Tue Dec 26 02:04:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPZ1FgSz55Kr8; Tue, 26 Dec 2023 02:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPY3zqnz4Ksq; Tue, 26 Dec 2023 02:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTaLbpLKHBWyWeGBaHVj6GOZ7POEkV+jUe7xS7kTB4I=; b=hiDI9Ha5PuNEbhZJRvOu3qA5wTm9fYNbwgQOCf3UVNP4Fj+07gvp2on9a43EZ7bmg1SAwY 2VkE9taTNJVCxrrlitHDrpaA7uSPOrSp/UzMOSqnaBDmsq2i0p1C/co7ffXLtwO7buVRj4 MM52pFpW2gHXAFhLaQO7WDdOzDZ/fHaFjf1Luasb424+6gP2ORqrZ1Ngajv0mKaXL0f0AX cQPAakAIN5nZIMzXRvFmm7ERllt6I3RNYicZFXw/8magMKt/DjkK2V98/vsfZO1ffdvnB/ GZI7nIxaKTNqpJ3bfgzXJ4QOhlzREFsOHjYZ1dTc05Dzsd3zcUc5dXoETT5xKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556273; a=rsa-sha256; cv=none; b=KAU8JCP86fT1ujqT8nuHL7U6s1MlHNHun+aawQzklyRCERuJDkPmuWjGVC2mdozlfNPTSe ojXa7HIKrNRzEia94HRGYtUlGM/pIN+44Ie8MbmCsWNEogrVBQPnXPGECTyih+Hw9ZhOvQ 3/IOzGp/eg/N8bh2NZjFUvmDz/+olVfHRuexCgb6WLGvfxIbjg35wL5phVx2RrcgjBg1pJ eE8NRdRdlRFp3gieGVGvPDu/Gp55WXwdgphX9TbR5kEB23FVOIfQIl/J1/9WTRllVQyoLM p/B/mEq7kRIUQHkRGMgEEY5d+sItR6d/sSBdOFaChCl0bljZZOp/EWyUa7aCqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTaLbpLKHBWyWeGBaHVj6GOZ7POEkV+jUe7xS7kTB4I=; b=eBIGbxdQ7H8NYaDnlC9QzFJ1Px5RPvUDCT8BulICRFr0DbKJQTK5Xwu8koo/8THlVyscdB wG0LpmB+DmPj1IUcqcasCz8/6ppsC72OPsa4/cIUdkkQErY+HgLn8DJzfrzYeLso2KnWvg JOwh8Hv+AxMTZWROLzwqqjUSMBq3cqkM5zt9pU/Tt2m9Q/aAAW7qgf54heKFQZ4t7ZHKw0 bnrFx4eNGjBA1UlvTyGDa0oON5ZqQ1ZyzicuI2dixIH6HtL3AHY9drddHzX2zwjDOv1NsG XkS3h2RjFy7bQKbgCLsSUXDc8KhWGzyigw9I/1Iufm8yZFV5wSCFkKjfGHPV1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPY1Ft5zbv9; Tue, 26 Dec 2023 02:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24Xw9003610; Tue, 26 Dec 2023 02:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24X2g003607; Tue, 26 Dec 2023 02:04:33 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:33 GMT Message-Id: <202312260204.3BQ24X2g003607@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: 099d25c354d9 - main - nmount: Ignore errors when copying out an error string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 099d25c354d93d9cd9c9cd261428f5ab0547a194 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=099d25c354d93d9cd9c9cd261428f5ab0547a194 commit 099d25c354d93d9cd9c9cd261428f5ab0547a194 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:21 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 nmount: Ignore errors when copying out an error string In general we copy error strings as part of reporting an error from lower layers, so if the copyout() fails there's nothing to do since we'd prefer to preserve the original error. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: olce, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43147 --- sys/kern/vfs_mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 331e4887c200..347ec7f70aaf 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1024,7 +1024,7 @@ bail: fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } else { - copyout(errmsg, + (void)copyout(errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } From nobody Tue Dec 26 02:04:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPZ4hYjz55KrC; Tue, 26 Dec 2023 02:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPZ2z7gz4Klf; Tue, 26 Dec 2023 02:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CWhjB9wH/Rtp5fx1ty+Z6vnimiA7qyz7XQRENjYQlh0=; b=hluXrdRsu0aGYXsO1An6mLpUF8ojq7MB55n9Tb/ei9LtH6oVzbfz9WWzXmbED7FISkAx4P qj/QeoR/SxbBMeCdxOml8yomYUjxiO80CwN6QNEXjcR9Q70lPGgrP+LAt9RTk2gCwfRY0+ FFGj4J9QLob24/5jry3/zQNgM9rBW38X1HIRDHO8pc1ptAt8wtmK2QQQK9vyyLC1NFfehJ pX1Z+3PSv2L2ZYzrj8hJ/FXzkPVM3Z6rvYp7PmHFvZhWvpgjHkIJuX81jAeEaBPiOMLgE0 HKuZWNJ0H8QMzwTdJBvRn27a9uNUhv8td0ezBHuLb0AFzabujZT1Mwe0eLPFCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556274; a=rsa-sha256; cv=none; b=RTQyQSO+gUW/NWJh2NW0LE1ak3IFwnp4Z1y49T+FvRtk9kuGiZBRz8gkhqy5dPkLADaKAp UprGYHDSy6vRe7E5SxdYfXGxeCezqe2MKG/9Bfp2529l+lbvrlGq7e4jd1u0mR5jzFcAMT SUK9SMIcpfow2fwfrEVTWzX/DbdlfqRn3f8xutEfqaFy+ld0PxGd06lZIvfVFG65OKE+jY jOQCKur6REbHt7opWb73pX0y3pBPOJwrY0T2iyKBk1WL+U7rTxQEb1JalTKCJVjhJaW/SB 7aQ8I/4eN3cKb03VVUvpjDwk+r3O3Gfo/Evzh43ArQFVy0whDTsNiAE60/Vw5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CWhjB9wH/Rtp5fx1ty+Z6vnimiA7qyz7XQRENjYQlh0=; b=vVU825C7Ef+RFrAMfuQKyhCJJ2mjmfP9ZsM89geVSUANKAIuamqBnOgIygN/X1loxpR3Iz YrBvOLSsyZPL2+EMqvEnIZpFKdmcIu75Tcf3PUdsamUuuOVTQpsqs2yoeREFMnFaMD7wP4 f6yPh7LwW4E8ijaEvidSymvUIIOE5JyyG8oPMcqnGHK4QxHNDMT933/Xsq2ezAi6uVmmQJ 9CEJOeyId8rm/daj1b4C6KlwRegQePynl5uYNWcPaggNN5gjO5Z02VvYvAEW9ZV6Kk8fYL x24cga/n4aboAlIdUZ+nuojcPGbWKrf1UPFhpKs7LV7Bzczmh2tJf27YxVm1Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPZ24m1zbhF; Tue, 26 Dec 2023 02:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24YmG003658; Tue, 26 Dec 2023 02:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24YqR003655; Tue, 26 Dec 2023 02:04:34 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:34 GMT Message-Id: <202312260204.3BQ24YqR003655@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: 74e713804fa4 - main - iscsi: Check for copyout errors in iscsi_ioctl_daemon_receive() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 74e713804fa4767991c5f20e6b85da4235107122 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74e713804fa4767991c5f20e6b85da4235107122 commit 74e713804fa4767991c5f20e6b85da4235107122 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 iscsi: Check for copyout errors in iscsi_ioctl_daemon_receive() Reviewed by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43148 --- sys/dev/iscsi/iscsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 57292c6ff309..4ed8f086ccde 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -1896,17 +1896,17 @@ iscsi_ioctl_daemon_receive(struct iscsi_softc *sc, return (EMSGSIZE); } - copyout(ip->ip_bhs, idr->idr_bhs, sizeof(*ip->ip_bhs)); - if (ip->ip_data_len > 0) { + error = copyout(ip->ip_bhs, idr->idr_bhs, sizeof(*ip->ip_bhs)); + if (error == 0 && ip->ip_data_len > 0) { data = malloc(ip->ip_data_len, M_ISCSI, M_WAITOK); icl_pdu_get_data(ip, 0, data, ip->ip_data_len); - copyout(data, idr->idr_data_segment, ip->ip_data_len); + error = copyout(data, idr->idr_data_segment, ip->ip_data_len); free(data, M_ISCSI); } icl_pdu_free(ip); - return (0); + return (error); } #endif /* ICL_KERNEL_PROXY */ From nobody Tue Dec 26 02:04:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPb5qZ7z55Kmd; Tue, 26 Dec 2023 02:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPb4QNTz4Kr9; Tue, 26 Dec 2023 02:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u68C4XAYJg0CJEg9xsBUt9XrlVfqqcc4JEzClcGkbew=; b=SLN52+CsdayNjQnHdqnUJxAifs68nTF4i1PSVfOTf1x31UVEWz8SMAn2DKKVwjyDYGPmiM jqoeJjUwyITPGF39X9IgRsfSPeLlzKcQlMhqVsQcgwJV5udT0Fx0e7ylTqrpX1f/9AWTJw HTEzKFW9U+o3PZWaPu+5VyQPfUSO4+uLZ26RUWJ4c24lS8Wb84s7/VVV0+G7vMCFIGSPvU 9ii9FF60gpLNqDeQTUNU2UpQjCp79/QIHZTMzO4BGq0vyFi0tZNzkEHsFBetb0avbnwHQn NYW6uprB9mQ2EQ7VRwPH1oe3JtA/y7ze9xO81yXsAXvdQdI0Tka/p0NITjcKpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556275; a=rsa-sha256; cv=none; b=Wv8UWOyL1KdMBmMT1zm/hjSErkIg1oYzqLhEj7SpJtassnfyspZjwByoQzfXCaTkPtj+hw +wlrqIzKwfjf0nvOpSIvwSENI2ZU4ut0UpkT6qwuIeyDQO+LaJetIHapLA7bt61XaYHRFq heFLLPwl3DPSBzvR45jrAY+Xh/Ml0OBGnJcTx4tdcHxBkk6Gs4zemCnIEALq9RM8xJkNSW 0awWp4SQnw4PdfayB6/4d4pIuOb35no4+GM0pPzwYfhH/ngZAokCPqI0W+W4zFTowwbTMu f1+Bp/DfsCHTEtjfbe/qAdKWOM6/g3Mxrt7H9JEgAEV7sGvcKzwgGApqoqqN1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u68C4XAYJg0CJEg9xsBUt9XrlVfqqcc4JEzClcGkbew=; b=n13GZXDVJV8gCLG1GakRyaaAMBQeVkRxgKomzcz0oIuzoKOnybbI/QqY46E7Qg0ia+ZBYJ nmh50A7EWxJ0PUwnzoqI+10ux+kiFiswKqTnHWuCO0ZCwgscLVry9u+qzcv1vHiPogXAoZ wgmp73aBdIXzX6bqkC/SWb3fUE542SnQ2dA+4WwxfgfA038fbHtSgqnrI5SyMvJ4zDTolD ZN7cDl6zNHfq+byFp3RS6iuSonMc2pNLZDNS0hdxnBu4rZUkP2VcJSUCIk5dpMQfXSXH6h jiMho2L5CmAuKBgKcesjsIHmOQQV62DDK0A+ztPjDs0niYZOG9Snq5cZWg9SbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPb3XG6zbPt; Tue, 26 Dec 2023 02:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24ZSh003708; Tue, 26 Dec 2023 02:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24ZpF003705; Tue, 26 Dec 2023 02:04:35 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:35 GMT Message-Id: <202312260204.3BQ24ZpF003705@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: c38df501ce2e - main - compat_freebsd4: Fix handling of errors from subyte() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c38df501ce2ed7da128448f815ec627c39fd3bad Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c38df501ce2ed7da128448f815ec627c39fd3bad commit c38df501ce2ed7da128448f815ec627c39fd3bad Author: Mark Johnston AuthorDate: 2023-12-26 01:43:38 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 compat_freebsd4: Fix handling of errors from subyte() Upon failure, subyte() returns -1, not an errno value. MFC after: 1 week --- sys/kern/kern_xxx.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index e8331a5cdb1f..46155cf6a73e 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -364,13 +364,11 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) for(s = version; *s && *s != '#'; s++); for(us = uap->name->version; *s && *s != ':'; s++) { - error = subyte( us++, *s); - if (error) - return (error); + if (subyte(us++, *s) != 0) + return (EFAULT); } - error = subyte( us++, 0); - if (error) - return (error); + if (subyte(us++, 0) != 0) + return (EFAULT); name[0] = CTL_HW; name[1] = HW_MACHINE; From nobody Tue Dec 26 02:04:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzdPd0pKqz55Kpp; Tue, 26 Dec 2023 02:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzdPc5TzBz4KpR; Tue, 26 Dec 2023 02:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFoaJ4l35vkLex3RMYZ1LTfB7ATHSDZL50ZjfJqcLhU=; b=V9wl/klkqbtxOq5ZJzRNkdh1MoA5oGjNciXoUtOFtAp+o/y/WQJIZVg8vVTZmjPefDym07 7uUOVFCYnWzc8XOjLmuqap0HiaTxUhqy8/m8iyZsit18HwzSBF21ID3IYHK2WJ7hAtHU8S e5KyaTm/6PNBA4A98p14bhIMlVee9TkGfKthuP43Tma5R5FgoZuJWtf++K3JDc/wKWZu7o pxyBzR5wsN7+plnhvdznrrsCHzeVJUPTvTtDC4zKvWOAI6klB4gix+tJlKhNQQ5oPzu04A zUoQXgzBoadk2RxU7MTP8DMKCx8GejM2AopeEJkUyEZwNn+WD4IJefe7vs6WFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556276; a=rsa-sha256; cv=none; b=Y68wk15W1vEiwnspeey54cibG/lH4F36k+eh3oDvB7V5te3qcY1MBu2a2tWwae7fGobptL mPnqV8zA0Pf75PwPjyfkZ/ir2VYyp5tHg7hEmGOKkOBngw8KR/L48dQGdYLWgSb3MWr8Aw wIOuUNWVkoT2aGMfn5LWpqoq6llMX/WKrECdAOH79v4JXG6p/Fh5ChjxJGlRVcDq/0rNlg f7CpTOg6ZLA+kgrR90u8zUosxMiwRPnbEmeP2n/TgFWJMGHWL724hRjr+3yy0SRVRjJUw1 RFRUsTLYpIJ5qmLDSKxRKJ1b0Cg1qg+9b27qaqYY8Wjl6+I0fX3QVYru79uDEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFoaJ4l35vkLex3RMYZ1LTfB7ATHSDZL50ZjfJqcLhU=; b=tMG1qFi/cm47trw20T07O+V/iS1OE47kpnmNOz2fvFlknJihN11UqaFTR16WzLp4zCaH48 QEy1kaALlxJercob4EhHTskrXDKX1nOvXiytpl32WVvBoJ8eGqxDN9rAFtUUHyhUaFXElR lWDlKYxtkNxRTNWb/KNX9mAUa9xw6HQpVU7JHsmH0abAPjzGgRf8X8fFYeK+nPoV0fapyf eBPhpSvQks5hiDfwnnv91RgquUrhfaL/gXr6/ypXmchujZP93sMTjAMkBxJ2CZ8eepjp8r H5xRDCAbHA/Oc599syCFuq/afbsQDP4bUu+S/fKa9FUtBY+DHccFfznTd4hfiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzdPc4bR6zbvB; Tue, 26 Dec 2023 02:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ24aG4003765; Tue, 26 Dec 2023 02:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24aFH003762; Tue, 26 Dec 2023 02:04:36 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:36 GMT Message-Id: <202312260204.3BQ24aFH003762@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: 6adf554abd1c - main - vmm: Fix handling of errors from subyte() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6adf554abd1c848d2c9ab7ea8a7fb7dd20a0c186 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6adf554abd1c848d2c9ab7ea8a7fb7dd20a0c186 commit 6adf554abd1c848d2c9ab7ea8a7fb7dd20a0c186 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:51 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 vmm: Fix handling of errors from subyte() subyte() returns -1 upon an error, not an errno value. MFC after: 1 week Fixes: e17eca327633 ("vmm: Avoid embedding cpuset_t ioctl ABIs") --- sys/amd64/vmm/vmm_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index cae15d7059cb..5214cd3f1447 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -629,10 +629,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, p = (uint8_t *)vmrun->cpuset + sizeof(cpuset_t); - while (error == 0 && - p < (uint8_t *)vmrun->cpuset + + while (p < (uint8_t *)vmrun->cpuset + vmrun->cpusetsize) { - error = subyte(p++, 0); + if (subyte(p++, 0) != 0) { + error = EFAULT; + break; + } } } } From nobody Tue Dec 26 02:50:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzfQz6skkz55P1b; Tue, 26 Dec 2023 02:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzfQz6RNPz4Xb4; Tue, 26 Dec 2023 02:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703559051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mOB9mGDD2YxaySWJZFEsvFnqCosCT+xQDq5MQRqYphI=; b=L1sWqQPMvgYVvPeqYfmSXeFhR+m4j8hiJZL40IxSbXYsJoUb7Ct2w4oBQjdQAFeT+iKuoA Y+uOqKZkbz2ZY60NgnnoZaLcqMrVDnZhD5F+2xJnkLUpY2EMl4wa81EfQB1vo0ZoFpNXIl joIy568O9EwDwbEGTnbTFj49aoKKkpv4yw7OrVRm0lR37WO762OZTPsEK9qyVWO4N0w444 6tZbhU2jqp5jzxhVC/Rw62I2snVu8I/CLYD00Zi+qGp/VvvhG/Bkkl7rogGTmF/8nDS4kp SlALgBklQSn2IZjSVSrKSM9eOmOY6Xxw7R/kzhSLkF9KNPCgA8eaiShHHXR67g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703559051; a=rsa-sha256; cv=none; b=CKoFi+ekgdv5zMcd1XgCnt/B6iAfmmqbCXjq3OfZTjQjH8QKG4p581ouAVxSnDf3hbzvse k71wzsyVa9hiiaqRsbRPEFVgZHFv94RB1U5A4IsWDsrt0wj3I1j/5Uyy48YiPp7x7sPNI2 8tlAwpAXgDPzksCb9qI3rRxstqkdJ69sLbI8a5w5VxtiXca2jSNiCIDhLKH3UqDPBI6qab AY3lh2BmSSfqGILDEq0G4DekfjQ4iiha9h3AIpVfNr6mIMBMZlBzYLVskluweRIoCPNuoQ /RFt8nvZVcdLrnF18O2EoM9XOJ1nbRn8fQNHZFaFQ5YuCzVjS5fnlcFF3n0TGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703559051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mOB9mGDD2YxaySWJZFEsvFnqCosCT+xQDq5MQRqYphI=; b=ltmkwXg+aMptlHToUu6VuvdnL1RDW0cZkaEvPyQA6b2AgxudePcGB6y5lkgi0DHzlhfhV5 FU43Qvsl2ujDMtzGlkV05PUWwgRgidQoR9umOoGBorzd7XXwlDWZbnyr4pD6wnRNVhXeHf MJN/Y1QJZZuH0tl8kEBl2wRtJfVbcBkpxY82G2eci55u17EbtLWkdsX68025JdRUXBfMRG cGIesHQLNh8DO6v4lKwbyL0jXYqhlN9dVG1cOXIcqDBft3LH5PJSFm7yIajyN3qjBKZRuy rZMqOCnjEGR0xMPc4oipbAHdscbil31Dt0UQDc5tBJjB4R1p0Tvk94X5Z0LWXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzfQz5DpkzchN; Tue, 26 Dec 2023 02:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ2opm6080917; Tue, 26 Dec 2023 02:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ2ophi080914; Tue, 26 Dec 2023 02:50:51 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:50:51 GMT Message-Id: <202312260250.3BQ2ophi080914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 5bc10feacc9d - main - acpi_cpu: Reduce BUS_MASTER_RLD manipulations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bc10feacc9d81e3bba9d28734a85e996682b408 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=5bc10feacc9d81e3bba9d28734a85e996682b408 commit 5bc10feacc9d81e3bba9d28734a85e996682b408 Author: Alexander Motin AuthorDate: 2023-12-26 02:19:28 +0000 Commit: Alexander Motin CommitDate: 2023-12-26 02:43:20 +0000 acpi_cpu: Reduce BUS_MASTER_RLD manipulations Instead of setting and clearing BUS_MASTER_RLD register on every C3 state enter/exit, set it only once if the system supports C3 state and we are going to "disable" bus master arbitration while in it. This is what Linux does for the past 14 years, and for even more time this register is not implemented in a relevant hardware. Same time since this is only a single bit in a bigger register, ACPI has to do take a global lock and do read-modify-write for it, that is too expensive, saved only by C3 not entered frequently, but enough to be seen in idle system CPU profiles. MFC after: 1 month --- sys/dev/acpica/acpi_cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index 8460cd245b0d..80855cf168e9 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -512,6 +512,9 @@ static void enable_idle(struct acpi_cpu_softc *sc) { + if (sc->cpu_cx_count > sc->cpu_non_c3 + 1 && + (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1); sc->cpu_disable_idle = FALSE; } @@ -1164,14 +1167,13 @@ acpi_cpu_idle(sbintime_t sbt) } /* - * For C3, disable bus master arbitration and enable bus master wake - * if BM control is available, otherwise flush the CPU cache. + * For C3, disable bus master arbitration if BM control is available. + * CPU may have to wake up to handle it. Otherwise flush the CPU cache. */ if (cx_next->type == ACPI_STATE_C3) { - if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { + if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 1); - AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1); - } else + else ACPI_FLUSH_CPU_CACHE(); } @@ -1206,12 +1208,10 @@ acpi_cpu_idle(sbintime_t sbt) else end_ticks = cpu_ticks(); - /* Enable bus master arbitration and disable bus master wakeup. */ + /* Enable bus master arbitration. */ if (cx_next->type == ACPI_STATE_C3 && - (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { + (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 0); - AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); - } ACPI_ENABLE_IRQS(); if (cx_next->type == ACPI_STATE_C3) From nobody Tue Dec 26 03:29:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzgJ75bjwz55Rng; Tue, 26 Dec 2023 03:29:59 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzgJ752Dfz4cSL; Tue, 26 Dec 2023 03:29:59 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703561399; 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=5KafRLqrzE0vJGFti8KvzftZQSIB++e8yOjkSQv9Tl8=; b=LDSTRKoOhVFLvIntfr28sexpwzKrZw5rN22XiYZ4iVzc9UfxNodfpTN9FmJqXQraxKxBTn IDvUobl8qXK0bMs/awyoQwYPJRYl3+flv3ocgHrawIFgI/awQeetTNThveuw/xTl5rpnG4 Z2DWIgb34GOmnQ+Ca0Azbig5tLRnNduLZ1ZNcFvAUmwHx5/A/dDOaGqnKQR6gdpGQXGuvG YzzsZNgx0NK60ziPFdnBUKA+rj1VEYlN+YAyL7S+OiyxoKsNetyiK8mL6KU/vdFiiNQIQr sskcg0qOr87rdt/yRYYjdKvoNdixp8kq8xj7KQueVq1zNHDIFgm08+VFWVwg9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703561399; a=rsa-sha256; cv=none; b=YZikx+a4wP9AxULiEv9mQLdNcouIgRYg1ceeC2O/pkVBVlGq1u9niWIxY2GR/OSJA21gQ4 ujzjO6U5DmdqUVR7bGk6Xsr7LMEwbpQ+LW2uXD/M5jLSj+L7+zybD50AHS/uFzfFdMktZL +uuWYoQUuzHDTTgq4T5aQD2hNkN22oz7e1mqgDIZsrkWq1S8LcroctAn4f7nxkIq24AIc2 uWlHKzk4MgPdXPGiarZSqD0ja68vEZu2n52lmx+HHKxDahIQV72TXYssdHXU6Fekjbr8VP 3mKqYHHAVDr+Ex0HdT2ZEyAY1I/XSLJoiZyZWA4CRkUFup+2rZrOam+fgaUr2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703561399; 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=5KafRLqrzE0vJGFti8KvzftZQSIB++e8yOjkSQv9Tl8=; b=HdK9rSw03D1ahEqQWcmdviQ7DIBejtGwRVLyfa/y6e8LIL/zUe4Ac/AL4V4qEaE3/n3yhw tjejyAqlaqgFpPOMppXtlFZs/jtg1v4aCAB7oYlKGMD6KY4OFEOsnR3zxZBzABset+7QIV rTC6cPInzoaDGxW/wh9btMVKay+g/N7LX8Jl396jeCEIwnNRuNRDjXwYog3+H/06BDt+p/ RjldVQRof0EO7SS8iyOcWhM4BdW21E0YUUWflRj1P6wsp1J5X8O8sdrNrJxfwbh9hc8O1O OL41f7PDfo9pm0AskRmP/UwSKHRLk8YzioRXHxIIFbdAbS3vmEJGlxYbq2EseA== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SzgJ55DzCz1LM7; Tue, 26 Dec 2023 03:29:57 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <72190C27-0D45-4300-BB78-719F5EB510E9@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_C781C9AB-69B4-4FE2-8EA1-71AB19AA400E" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 2a1d50fc12f6 - main - vfs_domount_update(): correct fsidcmp() usage Date: Tue, 26 Dec 2023 11:29:50 +0800 In-Reply-To: <202312260136.3BQ1aOxq051977@gitrepo.freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Konstantin Belousov References: <202312260136.3BQ1aOxq051977@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_C781C9AB-69B4-4FE2-8EA1-71AB19AA400E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Dec 26, 2023, at 9:36 AM, Konstantin Belousov = wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2a1d50fc12f6e604da834fbaea961d41= 2aae6e85 >=20 > commit 2a1d50fc12f6e604da834fbaea961d412aae6e85 > Author: Andrew Gierth > AuthorDate: 2023-12-24 12:04:21 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-12-26 01:35:46 +0000 >=20 > vfs_domount_update(): correct fsidcmp() usage >=20 > MFC after: 3 days > --- > sys/kern/vfs_mount.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c > index 8e54c832e9f1..331e4887c200 100644 > --- a/sys/kern/vfs_mount.c > +++ b/sys/kern/vfs_mount.c > @@ -1388,7 +1388,7 @@ vfs_domount_update( > error =3D EINVAL; > goto end; > } > - if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) { > + if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) { > error =3D ENOENT; > goto end; > } I guess we want to ensure ` typeof(a) =3D=3D typeof(b) =3D=3D fsid_t `, = to prevent such kind of error in future. I see both gcc [1] and clang [2] have __builtin_types_compatible_p , so = probably a good definition of fsidcmp should be ``` #define TYPEASSERT(v, t) \ _Static_assert(__builtin_types_compatible_p(typeof(v), t), = "Requires type '" #t "'") #define fsidcmp(a, b) ({ \ TYPEASSERT((a), fsid_t *); \ TYPEASSERT((b), fsid_t *); \ memcmp((a), (b), sizeof(fsid_t)); \ }) ``` 1. https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html 2. https://clang.llvm.org/docs/LanguageExtensions.html Best regards, Zhenlei --Apple-Mail=_C781C9AB-69B4-4FE2-8EA1-71AB19AA400E Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Dec 26, 2023, at 9:36 AM, Konstantin Belousov <kib@FreeBSD.org> = wrote:

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D2a1d50fc12f6e604da834= fbaea961d412aae6e85

commit = 2a1d50fc12f6e604da834fbaea961d412aae6e85
Author: =     Andrew Gierth <andrew@tao146.riddles.org.uk>
AuthorDate: = 2023-12-24 12:04:21 +0000
Commit: =     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-12-26 01:35:46 +0000

   vfs_domount_update(): correct fsidcmp() = usage

   MFC after: =      3 days
---
= sys/kern/vfs_mount.c | 2 +-
1 file changed, 1 = insertion(+), 1 deletion(-)

diff --git = a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index = 8e54c832e9f1..331e4887c200 100644
--- = a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -1388,7 +1388,7 @@ vfs_domount_update(
= = = = error =3D EINVAL;
goto end;
}
- = = if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) = {
+= = if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) = {
error =3D ENOENT;
= = = = goto end;
}


I = guess we want to ensure ` typeof(a) =3D=3D typeof(b) =3D=3D fsid_t `, to prevent such kind of error in = future.

I see both gcc [1] and clang [2] = have __builtin_types_compatible_p , so probably a good definition = of fsidcmp should be

```
#define = TYPEASSERT(v, t) \
= _Static_assert(__builtin_types_compatible_p(typeof(v), t), = "Requires type '" #t "'")

#define = fsidcmp(a, b) ({ \
= TYPEASSERT((a), fsid_t *); \
= TYPEASSERT((b), fsid_t *); \
memcmp((a), (b), sizeof(fsid_t)); \
})
```

1. https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
2. https://clang.llvm.org/docs/LanguageExtensions.html

Best regards,
Zhenlei

= --Apple-Mail=_C781C9AB-69B4-4FE2-8EA1-71AB19AA400E-- From nobody Tue Dec 26 03:31:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzgLD3glDz55RxY; Tue, 26 Dec 2023 03:31:48 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzgLD3DFwz4cwp; Tue, 26 Dec 2023 03:31:48 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703561508; 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=eQ3DnaYLQHz/UvOn+ZG8Z3EhqpcD2A4p05gTTwmhJrM=; b=Fr16QL6yDlbnAsfT6vozbWwZIO9TNuLQ5F3X6Gczo11eY26/TUCiTW2kl66Chiazcq/3fO 2tEHdoQed8Ii9WWV5PolNXFDsxJHQX4K1s13BR/Z3cH8jLwwLaHreQ7U3wBkAGgbTBTej6 UDL8emWWs1n81U+ibJhfoFc3GnjdpfEFX/wEbFVmDamloC25ZXDthgRT5kn+tjKmDSynFR I5/E20hSd4z6WAxJECPk7GKscnMjRGGaeMuG+1kIdFs3dB0lGuu2x9CzknaRC4BVE5tNc7 d4Q05IwzEnSreAbtIDmUY1Dl8UMblQbUFlsGfA7vKiIKpsGaBZww9H9abHoDUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703561508; a=rsa-sha256; cv=none; b=SpadAsD4AqQjDM/p7fH1WyooLKq/aDYHmVVlr3YCQ3JV92nZs5yB9VMgGLL4b5VcIKISa7 t6lJbc/CXwAaMfeLGz8kfrNXI+F2m+1Vl5bd//TLfW4BLAja2Q5R4sk1Eb/5liWBWCnBX+ m3+7nsH+KBqhXfTzxEcZJH/4w0TfkAat3qA9rviPBsnNnjhhrvbng9nKAfKFwSFtGIemZi dDh2puGcOoSFerZS8HFd6CJx8b3zg7CssIm9vVnTc06AdFwEZmGU2GHZBLnTBW/5aEYWDJ PIXLaNv5LnWeB/h6yR7OLJrz1xKCR/hxStaAhERnZjxjlmz3w5vqFwZZWUlEbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703561508; 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=eQ3DnaYLQHz/UvOn+ZG8Z3EhqpcD2A4p05gTTwmhJrM=; b=JbbXiUY/1TNG1EIrvXa4Gb94qfTGnPXvPtnbU9LQLUcGZ0OQdGNWiWYSDQTVgVWRxn9AgH mUMOHIQfOUSuWaa2SDf4ZmY3mqK8MGQWT+Hm5zdG26CVbSKbHd4/joiRzPi8M6meBxGUVP bUUYM1086Z4qjDz4qhgWuvwQup4Ti6NNR8oM8GONDYH14KZaXcKkNiJ2lhrYuJLHutfmEM q9kK19GIkYykD3YbCdzdvXQ2GrKZMmhjPQVlqZUFWmudjXalw3NAs5qNL/e8Nirn/+eTWO aiAmH2O/4TQnKWfEmrvwA9sLKNRvko8fCRYTRH2BGel1VzvCjimernA2Y48QKA== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SzgLB3fzyz1K53; Tue, 26 Dec 2023 03:31:46 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <78061056-76D8-457C-A522-8CE62B481317@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_B4F4564D-8E62-412A-A497-93B918D5E772" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 2a1d50fc12f6 - main - vfs_domount_update(): correct fsidcmp() usage Date: Tue, 26 Dec 2023 11:31:38 +0800 In-Reply-To: <72190C27-0D45-4300-BB78-719F5EB510E9@FreeBSD.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Konstantin Belousov References: <202312260136.3BQ1aOxq051977@gitrepo.freebsd.org> <72190C27-0D45-4300-BB78-719F5EB510E9@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_B4F4564D-8E62-412A-A497-93B918D5E772 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Dec 26, 2023, at 11:29 AM, Zhenlei Huang wrote: >=20 >=20 >=20 >> On Dec 26, 2023, at 9:36 AM, Konstantin Belousov > wrote: >>=20 >> The branch main has been updated by kib: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2a1d50fc12f6e604da834fbaea961d41= 2aae6e85 = >>=20 >> commit 2a1d50fc12f6e604da834fbaea961d412aae6e85 >> Author: Andrew Gierth > >> AuthorDate: 2023-12-24 12:04:21 +0000 >> Commit: Konstantin Belousov > >> CommitDate: 2023-12-26 01:35:46 +0000 >>=20 >> vfs_domount_update(): correct fsidcmp() usage >>=20 >> MFC after: 3 days >> --- >> sys/kern/vfs_mount.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >>=20 >> diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c >> index 8e54c832e9f1..331e4887c200 100644 >> --- a/sys/kern/vfs_mount.c >> +++ b/sys/kern/vfs_mount.c >> @@ -1388,7 +1388,7 @@ vfs_domount_update( >> error =3D EINVAL; >> goto end; >> } >> - if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) { >> + if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) { >> error =3D ENOENT; >> goto end; >> } >=20 >=20 The fsidcmp is currently defined as ``` #define fsidcmp(a, b) memcmp((a), (b), sizeof(fsid_t)) ``` >=20 > I guess we want to ensure ` typeof(a) =3D=3D typeof(b) =3D=3D fsid_t = `, to prevent such kind of error in future. >=20 > I see both gcc [1] and clang [2] have __builtin_types_compatible_p , = so probably a good definition of fsidcmp should be >=20 > ``` > #define TYPEASSERT(v, t) \ > _Static_assert(__builtin_types_compatible_p(typeof(v), t), = "Requires type '" #t "'") >=20 > #define fsidcmp(a, b) ({ \ > TYPEASSERT((a), fsid_t *); \ > TYPEASSERT((b), fsid_t *); \ > memcmp((a), (b), sizeof(fsid_t)); \ > }) > ``` >=20 > 1. https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html = > 2. https://clang.llvm.org/docs/LanguageExtensions.html = > Best regards, > Zhenlei >=20 --Apple-Mail=_B4F4564D-8E62-412A-A497-93B918D5E772 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Dec 26, 2023, at 11:29 AM, Zhenlei Huang <zlei@FreeBSD.org> = wrote:



On Dec 26, 2023, at 9:36 AM, Konstantin Belousov <kib@FreeBSD.org> = wrote:

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D2a1d50fc12f6e604da834= fbaea961d412aae6e85

commit = 2a1d50fc12f6e604da834fbaea961d412aae6e85
Author: =     Andrew Gierth <andrew@tao146.riddles.org.uk>
AuthorDate: = 2023-12-24 12:04:21 +0000
Commit: =     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-12-26 01:35:46 +0000

   vfs_domount_update(): correct fsidcmp() = usage

   MFC after: =      3 days
---
= sys/kern/vfs_mount.c | 2 +-
1 file changed, 1 = insertion(+), 1 deletion(-)

diff --git = a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index = 8e54c832e9f1..331e4887c200 100644
--- = a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -1388,7 +1388,7 @@ vfs_domount_update(
= = = = error =3D EINVAL;
goto end;
}
- = = if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) = {
+= = if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) = {
error =3D ENOENT;
= = = = goto end;
}


The fsidcmp is currently defined = as
```
#define fsidcmp(a, b) memcmp((a), (b), = sizeof(fsid_t))
```


I guess = we want to ensure ` typeof(a) =3D=3D typeof(b) =3D=3D fsid_t `, to prevent = such kind of error in future.

I see both gcc [1] and = clang [2] have __builtin_types_compatible_p , so probably a good = definition of fsidcmp should be

```
#define = TYPEASSERT(v, t) \
= _Static_assert(__builtin_types_compatible_p(typeof(v), t), = "Requires type '" #t "'")

#define fsidcmp(a, b) ({ = \
= TYPEASSERT((a), fsid_t *); \
= TYPEASSERT((b), fsid_t *); \
memcmp((a), (b), sizeof(fsid_t)); \
})
```

1. https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
2. https://clang.llvm.org/docs/LanguageExtensions.html

Best regards,
Zhenlei



= --Apple-Mail=_B4F4564D-8E62-412A-A497-93B918D5E772-- From nobody Tue Dec 26 03:57:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzgwY2Trvz55TVg; Tue, 26 Dec 2023 03:58:05 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_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 4SzgwX6c8jz4fw2; Tue, 26 Dec 2023 03:58:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.17.1/8.17.1) with ESMTP id 3BQ3vsO2091646; Tue, 26 Dec 2023 05:57:57 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 3BQ3vsO2091646 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 3BQ3vsCk091645; Tue, 26 Dec 2023 05:57:54 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 26 Dec 2023 05:57:54 +0200 From: Konstantin Belousov To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 2a1d50fc12f6 - main - vfs_domount_update(): correct fsidcmp() usage Message-ID: References: <202312260136.3BQ1aOxq051977@gitrepo.freebsd.org> <72190C27-0D45-4300-BB78-719F5EB510E9@FreeBSD.org> <78061056-76D8-457C-A522-8CE62B481317@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <78061056-76D8-457C-A522-8CE62B481317@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home 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:6939, ipnet:2001:470::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4SzgwX6c8jz4fw2 On Tue, Dec 26, 2023 at 11:31:38AM +0800, Zhenlei Huang wrote: > > > > On Dec 26, 2023, at 11:29 AM, Zhenlei Huang wrote: > > > > > > > >> On Dec 26, 2023, at 9:36 AM, Konstantin Belousov > wrote: > >> > >> The branch main has been updated by kib: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=2a1d50fc12f6e604da834fbaea961d412aae6e85 > >> > >> commit 2a1d50fc12f6e604da834fbaea961d412aae6e85 > >> Author: Andrew Gierth > > >> AuthorDate: 2023-12-24 12:04:21 +0000 > >> Commit: Konstantin Belousov > > >> CommitDate: 2023-12-26 01:35:46 +0000 > >> > >> vfs_domount_update(): correct fsidcmp() usage > >> > >> MFC after: 3 days > >> --- > >> sys/kern/vfs_mount.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c > >> index 8e54c832e9f1..331e4887c200 100644 > >> --- a/sys/kern/vfs_mount.c > >> +++ b/sys/kern/vfs_mount.c > >> @@ -1388,7 +1388,7 @@ vfs_domount_update( > >> error = EINVAL; > >> goto end; > >> } > >> - if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { > >> + if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) != 0) { > >> error = ENOENT; > >> goto end; > >> } > > > > > > The fsidcmp is currently defined as > ``` > #define fsidcmp(a, b) memcmp((a), (b), sizeof(fsid_t)) > ``` Yes, and the issue should be fixed by making it (inline) function, which automatically would type-check it args. > > > > > I guess we want to ensure ` typeof(a) == typeof(b) == fsid_t `, to prevent such kind of error in future. > > > > I see both gcc [1] and clang [2] have __builtin_types_compatible_p , so probably a good definition of fsidcmp should be > > > > ``` > > #define TYPEASSERT(v, t) \ > > _Static_assert(__builtin_types_compatible_p(typeof(v), t), "Requires type '" #t "'") > > > > #define fsidcmp(a, b) ({ \ > > TYPEASSERT((a), fsid_t *); \ > > TYPEASSERT((b), fsid_t *); \ > > memcmp((a), (b), sizeof(fsid_t)); \ > > }) > > ``` > > > > 1. https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html > > 2. https://clang.llvm.org/docs/LanguageExtensions.html > > Best regards, > > Zhenlei > > > > From nobody Tue Dec 26 04:09:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzhBH0d4Kz55V8K; Tue, 26 Dec 2023 04:09:59 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzhBG73X5z4hsY; Tue, 26 Dec 2023 04:09:58 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703563799; 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=eQ2aWZLRGyS11PzYo/fb5hHKF4Bs+W5YIMsw7gUVUU8=; b=g18DZEWa8MEUK5ubTvD5HyepEuTMLtDgUYM9fU+xotVD0szRvzfRzmljs5LMpXIdBZLhh/ SqyWTmXVX2pp50Cx0T2EouVNfmEfqFNYrT56tyG38Vg4GC2cNOBs8o4A7CnKxfUMcY0Hop CQ5hQkbJWE3NqwqG3jmnG4EX1ASdfNk8Zg0Lq/tpOkH0/iRrmm0J1WbgqY9uet0mt5wAwB zZVmI1PdC7gNpbnMpkD/vC2R/uM7tnTORHPlmYwyqjz/1928lw/Ty1u8BSTU6+O/jq/SEP sPiJTD1voxLQ+1r4l4qb9CEQgH9bl0C6HqUQyqUQgp48uT8msFn4mv/TBSx7Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703563799; a=rsa-sha256; cv=none; b=xp0/3zPEdttAUNg4G1q2IPjugEV9WynDWPI4uKEsGW4RPdpeCfxV4z0t6JCUHYLnIKXZyW dgQqhUmLP9cUQPwPq0qAaJni7DtkodTkDDJal9hn53GrDDHQD+37SuxT6bDyIEBCyP7rLG +Y1kEgDTg46cW6BK3kteXOusUr4dsYOxinhrUyOZ0oylPXjLGhjqdmtM745iEzcedZBXny w8LRO5N+tlDH4N+QtLtO7F9xc+ZtUIeBIYNa9z4FOIXBILSzHsp08L9jQXNiMq6jH9RMxT bM2eJaYgoz6JhoVdietwYzsCllUTfG+22wxhAIuQp1o9FTwOUcXrgDmNKSpTdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703563799; 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=eQ2aWZLRGyS11PzYo/fb5hHKF4Bs+W5YIMsw7gUVUU8=; b=xTNyMHkpdElQuo/0RF9Dpk6XhRlgP/37W6wKrfaJ9lTffcTW5WVFYAMYN4He9UY2+FUh+6 kasCq3/XLvO9cANEur3UmAezAsRx/yCC2htog7CkpB3ilfulvAPB2ZByE09iElSq+Mah1G CzyJUkwGph29zlcRqjYp2Yc7aTrTY9cST56s8OUiTTRQy8FR//wcX6XdDSY5xQWBidZfHL mOc1F8GB29r7rtEZTXliPg25dnrubXzGZ9iPraBMaZEjUuqYnDclEMfqeRPI0bfaW86cqI zy+062LReuQjPlPIbpMo773IFto8NSWvanSwvoDqi+2d63NlouIsvYfNRMlvNw== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SzhBD5zPhz1M1b; Tue, 26 Dec 2023 04:09:56 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 2a1d50fc12f6 - main - vfs_domount_update(): correct fsidcmp() usage From: Zhenlei Huang In-Reply-To: Date: Tue, 26 Dec 2023 12:09:47 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <640284C5-ACE1-4D31-9BBB-AF181C0C7632@FreeBSD.org> References: <202312260136.3BQ1aOxq051977@gitrepo.freebsd.org> <72190C27-0D45-4300-BB78-719F5EB510E9@FreeBSD.org> <78061056-76D8-457C-A522-8CE62B481317@FreeBSD.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3696.120.41.1.4) > On Dec 26, 2023, at 11:57 AM, Konstantin Belousov = wrote: >=20 > On Tue, Dec 26, 2023 at 11:31:38AM +0800, Zhenlei Huang wrote: >>=20 >>=20 >>> On Dec 26, 2023, at 11:29 AM, Zhenlei Huang = wrote: >>>=20 >>>=20 >>>=20 >>>> On Dec 26, 2023, at 9:36 AM, Konstantin Belousov > wrote: >>>>=20 >>>> The branch main has been updated by kib: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2a1d50fc12f6e604da834fbaea961d41= 2aae6e85 = >>>>=20 >>>> commit 2a1d50fc12f6e604da834fbaea961d412aae6e85 >>>> Author: Andrew Gierth > >>>> AuthorDate: 2023-12-24 12:04:21 +0000 >>>> Commit: Konstantin Belousov > >>>> CommitDate: 2023-12-26 01:35:46 +0000 >>>>=20 >>>> vfs_domount_update(): correct fsidcmp() usage >>>>=20 >>>> MFC after: 3 days >>>> --- >>>> sys/kern/vfs_mount.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>=20 >>>> diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c >>>> index 8e54c832e9f1..331e4887c200 100644 >>>> --- a/sys/kern/vfs_mount.c >>>> +++ b/sys/kern/vfs_mount.c >>>> @@ -1388,7 +1388,7 @@ vfs_domount_update( >>>> error =3D EINVAL; >>>> goto end; >>>> } >>>> - if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) { >>>> + if (fsidcmp(fsid_up, &mp->mnt_stat.f_fsid) !=3D 0) { >>>> error =3D ENOENT; >>>> goto end; >>>> } >>>=20 >>>=20 >>=20 >> The fsidcmp is currently defined as >> ``` >> #define fsidcmp(a, b) memcmp((a), (b), sizeof(fsid_t)) >> ``` > Yes, and the issue should be fixed by making it (inline) function, = which > automatically would type-check it args. An inline function sound much better (than macro). It is also simple ;) >=20 >>=20 >>>=20 >>> I guess we want to ensure ` typeof(a) =3D=3D typeof(b) =3D=3D fsid_t = `, to prevent such kind of error in future. >>>=20 >>> I see both gcc [1] and clang [2] have __builtin_types_compatible_p , = so probably a good definition of fsidcmp should be >>>=20 >>> ``` >>> #define TYPEASSERT(v, t) \ >>> _Static_assert(__builtin_types_compatible_p(typeof(v), t), = "Requires type '" #t "'") >>>=20 >>> #define fsidcmp(a, b) ({ \ >>> TYPEASSERT((a), fsid_t *); \ >>> TYPEASSERT((b), fsid_t *); \ >>> memcmp((a), (b), sizeof(fsid_t)); \ >>> }) >>> ``` >>>=20 >>> 1. https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html = >>> 2. https://clang.llvm.org/docs/LanguageExtensions.html = >>> Best regards, >>> Zhenlei >>>=20 >>=20 >>=20 From nobody Tue Dec 26 17:48:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02LW5Fcsz55Dc6; Tue, 26 Dec 2023 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02LW4mfJz4b4l; Tue, 26 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mu/oD0SaBn1RS3Vi8R1jmEGXGxzkAjFJzdLP1cXs3OA=; b=Y/9g3N/0ENisZpvHAiMPThah4Mfnh4OBKcNdIYMRR9Bw7w8e3cCi+jx72RsxC9ALhpJqng K/NULab54EHaZgekwYhoZiQS1KyJARDv4DrQP/FI9aIoTnCvxfcijocjHMdlZqn7caAxyu kabLtNk/GoAzBXkn697EzmF0i1YwIgW63CxI/Ilv6F5D4IREKv+FKqJiveRZk1Jq/cXF8E VrUWPsSP5b3iiQOEyBP4ROaZYvsVzjAKxmYw5plGp8aJ85UkvsyQG0chrE4d8MwQ0stFr8 J2Di+x5/jqcN7288sq7+Yip72x10nSj1iAtyoa0N69ZMDqIg1pwhX9DulgmTyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612899; a=rsa-sha256; cv=none; b=HRurxnuMKac0gzROd94npW0rR3AMAe1bI2g4Mi2wn2y4Tib3Jhey44b13XCIgHriHtkQvk X97OKD5vUOeBPmzl9iJQvuJGQUOoNhp0kGbeJGDrZ/sg9fQGJ+sgQXQuLb5BXZYdltp2zG xlRguh7BuO+CHI7s+sZ3/OK3rY6s7MsbREJffRw8BNfZV96TCtVgnH1QWV+Zza37Y5Cncm 96pPrPKYAB9k5/PA11U6/Ql94lXKebaP/xApUiY7zk22s4jQwdm4PwMtCU1tHLRX9XCxA7 WomZWiTB53siVD2Pk6/bMiiGW9gcEgJsOomgC+4xH5w3Bil1pXDS2mzdkMxoeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mu/oD0SaBn1RS3Vi8R1jmEGXGxzkAjFJzdLP1cXs3OA=; b=xQKlub7SmDyNljtK3zxOaSFGILXn4A1DiZITet1eQp7uDUOr2YInknGY7OOtfRhxlCTyMa YlM/W8bzvbZwAtu5Lz5doRlA1m4IsBG98N1fcWqLgaJVbPVBsaej+4ReKr0pHwrJus1ZQ9 6pW362lA2xWHvvuJIdvP8rNo+IeqgwYoJQ6o6Y2cc9nAQTVctxVNwmFQkatc9gjCBNZPLs ErsuJkb5xfPR411rvxkywDvmZ1Qoat73R6TwnaqThiuAMw7xk8OPeqf51wYv6UOOISg3Cl HTwSvIyBWgX1ZAuS/tlHGHxgtaJGg0Am61z9L26cFnuBoox+o3qCL1qrZA2D7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02LW3rRRz13nJ; Tue, 26 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmJTZ080300; Tue, 26 Dec 2023 17:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmJ7s080297; Tue, 26 Dec 2023 17:48:19 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:19 GMT Message-Id: <202312261748.3BQHmJ7s080297@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: f8f3b16b6cb6 - main - camcontrol(8): Fix typos List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f8f3b16b6cb671649345352c16894f59679c096f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f8f3b16b6cb671649345352c16894f59679c096f commit f8f3b16b6cb671649345352c16894f59679c096f Author: Che-Yu Chang AuthorDate: 2023-12-26 16:07:26 +0000 Commit: Warner Losh CommitDate: 2023-12-26 16:12:23 +0000 camcontrol(8): Fix typos On line 748, "bigger than" is mistyped as "bigger then", and on line 765, "more than" is mistyped as "more then". Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/949 --- sbin/camcontrol/camcontrol.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 3bbd81dab033..2113c4fb2aab 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -745,7 +745,7 @@ Disable block descriptors for mode sense. Display/edit block descriptors instead of mode page. .It Fl L Use long LBA block descriptors. -Allows number of LBAs bigger then 2^^32. +Allows number of LBAs bigger than 2^^32. .It Fl b Displays mode page data in binary format. .It Fl e @@ -762,7 +762,7 @@ The editor will be invoked if detects that standard input is terminal. .It Fl l Lists all available mode pages. -If specified more then once, also lists subpages. +If specified more than once, also lists subpages. .It Fl m Ar page[,subpage] This specifies the number of the mode page and optionally subpage the user would like to view and/or edit. From nobody Tue Dec 26 17:48:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02LY06xGz55DhP; Tue, 26 Dec 2023 17:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02LX5lb0z4b2K; Tue, 26 Dec 2023 17:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+u1CKcVT2gZbxgOgttv8cxYian0BE2GalHkOQqy6Bic=; b=klJWKZ2Kb9gv1QQMMFnDaJyz5FregcFD5LTr+YM2Rv7Yn0RSyEvvJEDOxtqfnbESspIDmg Os8UT7zsaWO+ISjKse/xdQJdcnhcnnnkFjK9EvpKT+aKqGxfpPH4XvSpCo85Sf47N1Rop9 g0QgcpCNiVOochiLqA5ui5ngETKvvM9QcMFvevRskHYPZPMvTt6tCNjNjxCRvyGdF3wBFb s6ynsH4jYDgcOHoIZ+pzsCL8PLpQQS5+j/CB3+Agck8K36hpNvQjuji3U7ibrWwdF3Ga7i hTjWLhNDpK0o016pF2hxH6L7l/hoRpXCZrrpRdLb+GEqfSC5myIG5qFgv6Wrug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612900; a=rsa-sha256; cv=none; b=w5pEjQZYZRhbaUwJlALHlyI/xybmRbPrpx/UJeCTe/Q258PRoSJRf7hHFgXJtZD24Jh0hf 78h5p8wc0LeX6o4TnmcRJsIdYBcxdhf/SlZKP8gDaGRGkrmHm1cWzpLzCsB6Qfdfv9cxah fYt/UG5DZGzisoxC6oroNhmHIpLGYSc8AaPookWEWvKvPpM/iMKGGFpaqp/hyB1kHBBGIf WiLVqTLDzpAR0CJ4RB9SfxFMF9NJ02zEoQglUcWwGj+2bFPq/PrsZU8nv3yXSZqdlBLVSK /Q3hPn11QQp1T820KSB1AcFHWACZtGrkQSbNiLkYdjxfB18vYm9mnMJOzZ+tIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+u1CKcVT2gZbxgOgttv8cxYian0BE2GalHkOQqy6Bic=; b=upbgbRu8F0eRr5lLZycVBL2o7lE3RETMod3Z2J4m8YqLTGBkM1UP5YppWdDIJpW4PdEDgC hdIrnGl21v+WVuLp9LKsIRGfPY1ByCiRo0pXnCHJxXcEKRGsT5Qvb88bp9pC4fK9P1PaS1 OjTjPqekeaYs5DrxrQcUk0oL0q5xfyIABrxihH9tiGK9meYBdF/ix+pHACopgXxQSla2GY XxTRjD98RJNcTuZCl8MNk8Fxm86Y4Aiwwe4RHclaA0h4IIW9V/ct/VtjIwHgBXJf4BJGf9 17h3q0FZOeI8YZaCm2cRUIgJH1o12AcyZdVPapKjE9Tk2lg2Gfxj/zoVfwOr5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02LX4pf7z13nK; Tue, 26 Dec 2023 17:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmKS2080339; Tue, 26 Dec 2023 17:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmK8D080336; Tue, 26 Dec 2023 17:48:20 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:20 GMT Message-Id: <202312261748.3BQHmK8D080336@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: 2aa186b3b08b - main - gvinum(8): Fix a typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2aa186b3b08bcf6e49b743329b2fa00897a1235f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2aa186b3b08bcf6e49b743329b2fa00897a1235f commit 2aa186b3b08bcf6e49b743329b2fa00897a1235f Author: Che-Yu Chang AuthorDate: 2023-12-26 16:05:26 +0000 Commit: Warner Losh CommitDate: 2023-12-26 16:12:27 +0000 gvinum(8): Fix a typo On line 354, "go up from" is mistyped as "go up form". Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/951 --- sbin/gvinum/gvinum.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/gvinum/gvinum.8 b/sbin/gvinum/gvinum.8 index 8bf2fcc92b8e..ea0eb08c640a 100644 --- a/sbin/gvinum/gvinum.8 +++ b/sbin/gvinum/gvinum.8 @@ -351,7 +351,7 @@ Then, initiate the rebuild: .Pp .Dl "gvinum start myraid5vol.p0" .Pp -The plex will go up form degraded mode after the rebuild is finished. +The plex will go up from degraded mode after the rebuild is finished. The plex can still be used while the rebuild is in progress, although requests might be delayed. .Pp From nobody Tue Dec 26 17:48:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02LZ1KP9z55DxG; Tue, 26 Dec 2023 17:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02LY6jBfz4Znr; Tue, 26 Dec 2023 17:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWD4QNfV1XjdMoBVNV5JWjUYJAICha6DrTna+jPkRa8=; b=cME8JTgHDgAQQ75qYtkYQOT+Isa0CSkjAQfEft4B41tGl/ygzoVpdixvGjeJkdUD5Jr3yh ULnkSrivyJoW69nc9WrcTCzissfDztSibA9bBP2jS1t2zcKdyup5pykrtI7glsOhEkBX9U VYv9IU+v2CzdM3KX86vdt3qyfkNGcBPvS87/L792Z4xT7qQsbXG+2EqOucJk8GcXkcRa4Q KajpioPOApZ5p9/lG6fBzkOLsyTH3AxVcmRBA9hDJVhA2r0/+mMUtyp6UBqNbcxDuBjH/y nx4l7yAV1JZeoME3e4eBhU6eKm6CueLnX4Djl4s84Laybev+Wtt8Eps8fFK65A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612901; a=rsa-sha256; cv=none; b=fHNADR1KqrjKx4gWL5z3HFb+azZ30WYtFE5ym7/Tqz0RxH9uZDjMpGXrpQePwI6G2B7B4k vDTkaDtFNsQ+AwrjuywJmE+cGgRNWPxirmg0vCgiuq3NGDq2erbS87wPkvlGtofZV8ak0i g95v0f1mY2iMHmUwBBlW2KGgpFlFP7STbR29Fn6YeJnlHj+MmwDMATmGs9za25FH3FKjDl 470tWcwZmbCHITxPs5u2DMM1jRZLu2yV/iAw1DX9c9OAFnLMyWb3zPBVzccCdJRhdJjd+x ZE2GiCCYfB8hwGNCPx6voBPY1cZ2zUYG76c3KoJ4A0dlK46fiL8Et7dgDpf/Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWD4QNfV1XjdMoBVNV5JWjUYJAICha6DrTna+jPkRa8=; b=sNG0EA2q054EfAMzNMQS5mliiMjCDYpcqolrJ7n6HnvvIGpP67wXkkzd9VA7/awGx0WmoS yKyZPlXCaJ4rhTqs+cmKr3B3alz9LD7JFip3Jw6/szpbZpeubwmpH94NGJx08yiUTivmFg PLpZQr7FcXnEtTUWWR7UjxQBhumj9f7eCxVy6CZn1q0J7RsWdPcduaM8U4Pu8X/VVm5J5Y KCuKsYHPoE2kTrLGFhw02N637ZAUFgIFFlpNJ4QZoPKgruilNIGQ++hbTsEJ2MVtbXg2wQ 1v38F7kFTv2ELsU86XElyg/rjaex5aLmHESg9PdnPzh2X5r20eqTkGqlYQuokw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02LY5pz5z142V; Tue, 26 Dec 2023 17:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmLNO080387; Tue, 26 Dec 2023 17:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmLLa080384; Tue, 26 Dec 2023 17:48:21 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:21 GMT Message-Id: <202312261748.3BQHmLLa080384@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: 8f0498208db6 - main - bhyve/audio.c: avoid re-calculating the length of dev_name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8f0498208db67786d4a60982c0e9ae42e8ebd26b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0498208db67786d4a60982c0e9ae42e8ebd26b commit 8f0498208db67786d4a60982c0e9ae42e8ebd26b Author: rilysh AuthorDate: 2023-12-26 16:24:04 +0000 Commit: Warner Losh CommitDate: 2023-12-26 16:36:31 +0000 bhyve/audio.c: avoid re-calculating the length of dev_name In the function audio_init(), strlen() is being called two times, first to get the length of dev_name and second to use in memcpy(). Creating a local variable and keeping the length avoids this re-calculation. Signed-off-by: rilysh Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/945 --- usr.sbin/bhyve/audio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/audio.c b/usr.sbin/bhyve/audio.c index fc9ded37044a..4613f3583116 100644 --- a/usr.sbin/bhyve/audio.c +++ b/usr.sbin/bhyve/audio.c @@ -80,6 +80,7 @@ audio_init(const char *dev_name, uint8_t dir) #endif }; #endif + size_t nlen; assert(dev_name); @@ -87,8 +88,9 @@ audio_init(const char *dev_name, uint8_t dir) if (!aud) return NULL; - if (strlen(dev_name) < sizeof(aud->dev_name)) - memcpy(aud->dev_name, dev_name, strlen(dev_name) + 1); + nlen = strlen(dev_name); + if (nlen < sizeof(aud->dev_name)) + memcpy(aud->dev_name, dev_name, nlen + 1); else { DPRINTF("dev_name too big"); free(aud); From nobody Tue Dec 26 17:48:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lb2dmVz55DfJ; Tue, 26 Dec 2023 17:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lb0by5z4b2f; Tue, 26 Dec 2023 17:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z0GdUwgWe/5XAcNEqKX3Cfp5VatnDfeG0Ewznpd8Cpw=; b=XBpO3J5MxLtg4i2lKCe60EZpT0ejPEE9wCWVIc2LJyL+tWmRl91/gmpqWFU06fowpqRzJ1 3BxzJ+xs4VaRBRJat+HxiO6x9kVHjtL2rK77Q7L9aIroFHdswp3lvKV4q4tzk8Veg8v45x m73qYst2oEJebNPUe/DTHkH4zCKaCHAswEzN4plhX8JyrcJnZKBRAT8aF1VpTCfsmXgW2y xzEPmdErAsxPV7qe2D59pJNe6HJmrHNRAOhOd+FZleASCcPJWlA2s2K4G/Hkx0l8lTY+SU tcyb7Xx+mPQ7MJmjFFIpx9t5GWPkJ1O8HOFJ52RDrzWL74ro9PAu5+gVT7lxAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612903; a=rsa-sha256; cv=none; b=xkzQ6PwAqisJYy5eePMBjuZmmfIHFkTdEu7hb2bHCxmHSnUYor4k9MztD3l8Sgd354p0m2 YYJphfdf4QDbUtr/CiQE8NPBrfg0GZl1nTwdyhQ3S6f2LYQTq+vdnkV/GOKXMrZzR9Xhnu sDNDE6XV3rhccA/6I1OT3xISDgUg49RQAba04poYNRzO+/jIF+Aai7w28DGPYdYqxvOlC5 NnuBr3p/smyxWlG8iclEUN8ITvK9Bp3fvDTFA/xW4SKfpuJTXrtNHgK6HDakmkLrmpFHbx B1plZb3oSqjNLxyBvw7lZ/e7mWlYvl44FlV7sc3myuc9k8YpA0FixPguo6l7DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z0GdUwgWe/5XAcNEqKX3Cfp5VatnDfeG0Ewznpd8Cpw=; b=X58s1mtiCsOXGu7hFcaI2QNiW4Pxs6C8EtPH6OrfA21HeBMDQwxsnXYuhfEMiqPe3lSqPy 6g4HtRfW+Uw5DFzY6Aw1wG7TBxTq8T/yJncl1lstF9as63NEtACfzpsF0+YpzII1pSLRiH pb7JdTk2cMdD5pXCX7s7xfhvQcS6ci5VAZ5ZV+BmF040Gy3cbSpF0pY9PM1Z1ZQ0/F7ET2 AkgECIUagnWLPtmgC4v8g6tj04Ywj0oLYwE4j4vNGFDNV56y6dnJK8vg2jHg+u97O5KA3w WNdOkezTXR0dRHWXdrraz/Z6d7ME426RrUHwE8ybrBKzEPGlQY9vQEfQ7UmQvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02LZ6q0Dz13gY; Tue, 26 Dec 2023 17:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmM34080426; Tue, 26 Dec 2023 17:48:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmMMn080423; Tue, 26 Dec 2023 17:48:22 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:22 GMT Message-Id: <202312261748.3BQHmMMn080423@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: e3d3e1ff7eaf - main - df(1): fix a typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e3d3e1ff7eaf32fa1a9e2ea1529dc0ec0c2e69e5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e3d3e1ff7eaf32fa1a9e2ea1529dc0ec0c2e69e5 commit e3d3e1ff7eaf32fa1a9e2ea1529dc0ec0c2e69e5 Author: Pin-Yi Kuo AuthorDate: 2023-12-26 16:37:43 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:05:29 +0000 df(1): fix a typo On the manpage of df(1), "according" is mistyped into "acccording" Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Signed-off-by: Pin-Yi Kuo Reviewed by: imp, zlei, Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/944 --- bin/df/df.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/df/df.1 b/bin/df/df.1 index e3cd9be71dfe..d3b0b082250a 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -120,7 +120,7 @@ specification from the environment. Select locally-mounted file system for display. If used in combination with the .Fl t Ar type -option, file system types will be added or excluded acccording to the +option, file system types will be added or excluded according to the parameters of that option. .It Fl m Use 1048576 byte (1 Mebibyte) blocks rather than the default. From nobody Tue Dec 26 17:48:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lc2d47z55DfL; Tue, 26 Dec 2023 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lc1JQ7z4b0H; Tue, 26 Dec 2023 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9EBh6aS+ja2Co5okXUUwNvnYy6Gx9GwFYm4jlREhVw=; b=K5Y/mL9xQIJCrZ9kxM0Pd6uIMb315Q01NsZNonmV3iUwB8oah66wx0MjziVCEJw81GHGi+ kfrW7O1zM9cpBBeKqi+F6O7rypWun28hmehOgWzR+ov0saR9/BbTG2eSnDGRQwLtzAenTo cvAgN4/FhaJ7IJQO3gVGfZCYYloRW2eYJY7skhfJKt6X2kSvln5fgV5uMRhg/7UEYL+A2n JHRW+0qIUY3b4WRHmLCWH+BbSTPoyA0ziRGK0/O6crG+dzfgwHajfBaJFUz96vAJOMdU1r fO3NWuRFZeJolk7fWMn7LPlpsOKlhlOoFTlLPanLV4A8ILfBmKnbKTr9LabHVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612904; a=rsa-sha256; cv=none; b=KjMF16ib2jLtyDvc6YYzz8S6zhEx6XW6qM5Zu58wBYHpVg/OHugmRG1708dRTBR3NxTQP7 OvCdGN/jZNjePHOYXvL2K8pwmzE3NtKu5NwBXlejs5B3k8G4Pap480EPj9VAAJHbziMqox oOCei0gAHPf2h/K4IPMXpobIZySQfYeOrK6kwawNipnvqLlT7t4m7ZBbzKZeCbXtCM/9Vp uiXH69BHkXqD/k0DBlpY4lvGz/j8M/L0ayyQ/bBxhbrK2xPOdb7pnWIgPNAV+z5833d3ax C4sj510dfaTGDPryAVXt/+CQEWrXFfCYUZVDWx5CIh2iVaX5q/ghQwR8nucPIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9EBh6aS+ja2Co5okXUUwNvnYy6Gx9GwFYm4jlREhVw=; b=SizSXf0v5h+38FTJevp9lbb5NV8u7gaLCm5Jgz6BNWtbZEIQH0F+D542F8IXIsW/E6/tjL UYJCsB7z53yZ2Pt7BVzK9Q20yjLfoSR6Oo80ztWmqq36rxqnog1j0IiEgJcJ9mqLR4sl05 08x1/iL4Kkq6JINse+w9i6l5F6hZPhMqRxhDDLESSAeLPuiHZLxKflnPZ35/r0AdfQ+9wb chSTjAC3zlK6F2610PnD314LI7GyfBugYEOZcPpEF9WIM/Q71/ka1YCa2ZUKYMLRdRYf70 gIt1WWsBf2OaJKOgOozwdm5qbFiDQYaW63DOxZrfKNrRix+X4YNk2zj8S7+Pyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lc0QdGz13bT; Tue, 26 Dec 2023 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmOLR080472; Tue, 26 Dec 2023 17:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmNK4080469; Tue, 26 Dec 2023 17:48:23 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:23 GMT Message-Id: <202312261748.3BQHmNK4080469@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: 4185d1f76a22 - main - diff(1): fix a typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4185d1f76a2272d433ece1c0a0cf7a76491a789c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4185d1f76a2272d433ece1c0a0cf7a76491a789c commit 4185d1f76a2272d433ece1c0a0cf7a76491a789c Author: Pin-Yi Kuo AuthorDate: 2023-12-26 17:06:03 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:07:55 +0000 diff(1): fix a typo On the manpage of diff(1), "when" is mistyped to "wen". Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Signed-off-by: Pin-Yi Kuo Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/943 --- usr.bin/diff/diff.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 5c4e0cc172fe..10a349348cfd 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -440,7 +440,7 @@ lines from FILE2 .It Fl -ignore-file-name-case ignore case when comparing file names .It Fl -no-ignore-file-name-case -do not ignore case wen comparing file names (default) +do not ignore case when comparing file names (default) .It Fl -normal default diff output .It Fl -speed-large-files From nobody Tue Dec 26 17:48:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Ld3tFBz55Dtc; Tue, 26 Dec 2023 17:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Ld2ZHMz4b7N; Tue, 26 Dec 2023 17:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N3Vtj/6nf/3dWH7bhZJ/UM2GQoSXBihF8908lwP8mIw=; b=JEKaoax2Jlkr2+pNoknir+wLqSJFEtxm0qaSKUx8MeN8nbpPAVbhaFvXGn4jIeHoiVdCPx yFYkYoXUVz5r6FanRWFYZM7yWsNhoefFs7r59Odc6v3/2RNhQJDYmFRGcayhbWe16j4q0b ZKtVa5sxoe+E6MgqxFGAidMMzJZJlb8GdJHiHdgs+NOXFV5D+w2CxQdpWnVwIY+7+ozJHU zyCLYCWr/6x3TaFv80QbC+3gjQQP/D1W1/+aKra9Y+8pBMlo6olfKkPitA2yju4CsA5IvI 30QeNsLoBPg9zZE2pQkdCTEvf0uNmwvroO2QE27B2tUi/+eCh1ma8+PYIBPuxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612905; a=rsa-sha256; cv=none; b=GaYImdinbjH7vp2bpwhQTFROnm0HWhItXEB98l014GK0n+Rsd7FMCfKySgA9FMvbnNQHsH A/fm1YbmtnoAPk5zGzhJTXnnGtF+lCqICPk2QVu85eCBvCIW4ARjVUT0bPzNSNP8hbe/TC ktnE8AexLAzbhbmLvec7R8D5Ng3qaT+xpBIg7bkjli9r4XR1im4QgY4uc+Tehj8vtpKIkP ssOs0wphzPl6CTruzqgQ5ZyVK4BNu+UwweAW5uzDKp4JjvLOkFVRBF3l2MQAF2Ut0xjz21 4VXzChFrQ42V3aP5FmNJcFous49HYRjWd0l9eFFHQcX0tc9bgfcOaMlh2KZC7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N3Vtj/6nf/3dWH7bhZJ/UM2GQoSXBihF8908lwP8mIw=; b=RTaix4wN4rpEnR/OX4P6I/X4KzQXHifd2VdDnJ4U2W7O1GpCsLh5oQkdDF97eE2nRiwQAh pSPFYAV1LSCrwCH4GGhokQTJGrMQ42M7usy53UuVsBLa247YFC03TNahbFl4slfbmjs2Qc zHH5hjLQEuLlpjarFQbWALYHvFM9NKGtohb25Tjk+T15KJ9PR+/ooTNa5p9lLt3yBoL1V5 6sSOXXWRVLtOfzAMP1vYMHKdAO4JyCahK8zbbrbWofBRG+7suhVfmYqC3g0sZds3T2sgta mZhV3Ypr0zVuIPzvwuqA8uCvlz4dwjgCE5YtAG0pjaUvNGFlybDDGEoYFlz66w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Ld1fz9z13gZ; Tue, 26 Dec 2023 17:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmPwn080515; Tue, 26 Dec 2023 17:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmPpN080512; Tue, 26 Dec 2023 17:48:25 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:25 GMT Message-Id: <202312261748.3BQHmPpN080512@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: c327288e8e44 - main - bluetooth: fix comment in bluetooth.device.conf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c327288e8e44300f66f3f89c6fe40da28e84198c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c327288e8e44300f66f3f89c6fe40da28e84198c commit c327288e8e44300f66f3f89c6fe40da28e84198c Author: lherschi AuthorDate: 2023-12-26 17:18:54 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:24:19 +0000 bluetooth: fix comment in bluetooth.device.conf The default for discoverable is 'NO' not 'YES'. This now matches the man page. Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/939 --- usr.sbin/bluetooth/hccontrol/bluetooth.device.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf b/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf index 95b769bae9f3..c400a3bf2e50 100644 --- a/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf +++ b/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf @@ -61,8 +61,8 @@ # # Possible values: # -# NO or 0 do not scan for inquiry requests; -# YES or 1 scan for inquiry requests (default). +# NO or 0 do not scan for inquiry requests (default); +# YES or 1 scan for inquiry requests. # discoverable="NO" From nobody Tue Dec 26 17:48:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lf57Bfz55F4h; Tue, 26 Dec 2023 17:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lf3fHWz4b12; Tue, 26 Dec 2023 17:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+beQaKnFExMmcXMMk4GwubJUjb28F37GDFrreZFn1O0=; b=KRIFk+rsg1YWb/xlgtQC7kUZLcgcQK/WTwzFUQWUwXKph0bmvZhgZfOt2yDwyYEPthFVUK Lq3lZB6Q9cubBrbbaRYPjOP5eMMZDgePnx9YGSXnngJbxs5Kfqa93jVkyhEBrncMDl5aF2 xkqRezaEjAJCPzdG6O/qu6TvGvYmpWups4CziCvgbn5XftSQiPZKsxqK1pGCLKXTcf1VnN s6VSQDnP9U/PI1S6kzRkunykZ7hhThoRTk+uApXqu6kLcTOqfBknfUVebousiK2sYxUk0p 1vbOqcruJIjtYCUOCcqfDUoAMdt/GwpBLm8Cx7W2zxa58uiDMFTFeOp1y9Kvxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612906; a=rsa-sha256; cv=none; b=xTkpCWc2bxC+GXYyl4mMckL5UAMzQWPCwW/78MOxeZwhCWSZ2RNUJ9RcIM9xNfG87wTRue xAhVfSliVnbjDdZxo7336Q1T0IdRiLis30TiNJPQbHxj8BTVctGQtMUCOQyJWl9adfIRwC 40uZCgbd0A4sPtPVNlVxItDJ2dD2W5ct2aqA3gtJHZbYLRqKkzLhkiY0kzMzObix897wx9 Os3OzKLYLGou7zfYO/zvtqeSY8ujLR0eaQ9b/6gQN+okRdI7SRavNhn8UO0+Q/6rVJANB2 fVZdNH/XU+BwQrLs/jOetQ7KWc1s9W7T23KaWacF2kxSFUj+Av3WIAlqUpwBtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+beQaKnFExMmcXMMk4GwubJUjb28F37GDFrreZFn1O0=; b=qOFyPRe4PiMZbmZTHyKj+zBxZa1S87sQLGmh3t37kCCfjfZfPOa/faolqNn208OE+2auqv itBIJjXu0+QPS6OVyK61Nt6addOo+naaQ2FW28oGj4HSOoXsfO6DekIIi2btxAtte2J+D9 jnKinUVMAIRrK96AUVg2XupKit1YZ4LfpNCi9ktc83uA1YwKSziuEFmcZbUnFLX7eOs6AO X+4esXkMDQAxL5OWGQc8IXl4qLiiCHw7k9ofJTSizmvaApcvAw4IOXmu4IN1BTkHabwlLh DQm0S9c5nVAao90FlOwqV0ovJ7cpPU0RvmKXlYyBJm8wSn2gpAPL4X+cqIclIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lf2gyHz13bV; Tue, 26 Dec 2023 17:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmQlf080551; Tue, 26 Dec 2023 17:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmQg2080549; Tue, 26 Dec 2023 17:48:26 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:26 GMT Message-Id: <202312261748.3BQHmQg2080549@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: ebb1fe400615 - main - mv: Improve comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ebb1fe40061500ccbdae3c804bf6bd2b9ea0a9c8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ebb1fe40061500ccbdae3c804bf6bd2b9ea0a9c8 commit ebb1fe40061500ccbdae3c804bf6bd2b9ea0a9c8 Author: Zhan-Wei AuthorDate: 2023-12-26 17:15:46 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:24:22 +0000 mv: Improve comment Fix typo/grammar error: Use the singlar verb ending on exists. Event: Advanced UNIX Programming Course (Fall23) at NTHU. Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/940 --- bin/mv/mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 1dee9348cc3b..7a1ecba7e076 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -172,7 +172,7 @@ do_move(const char *from, const char *to) */ if (!fflg && !access(to, F_OK)) { - /* prompt only if source exist */ + /* prompt only if source exists */ if (lstat(from, &sb) == -1) { warn("%s", from); return (1); From nobody Tue Dec 26 17:48:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lg59vfz55F2c; Tue, 26 Dec 2023 17:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lg4ZFhz4Zxt; Tue, 26 Dec 2023 17:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuFLbifnOUp2Tq3/ffqwrMzZsBjbv9Pb82ZrpSXhIG8=; b=abglfWXvVQwIMmKOXS1WvUY8z2RrdTzDKz1vzVNt65vck4BjaeVjg9TroMmHfiWSU3cCJZ ENAcxmjyJbtEmtWg5m25WVBth87iyNK1HZ0N4KM0wCwZiIoZU4nKUthfAmFaYkYxQqv1Ax 2dqizIgPoS+I3f03VSXiz+418tpYLxBnIKtIX7tEiKj0lwl/tGVMNzJ9HhZpmIBLgmVMrK uQn9VyT9b3N4syCBbJbAAWreH9KwRhHlF2o7WUDAbFBYCaZ5G7wWo3zn6HIxliTtVbikba jqKWCuyngjz1rikflv49kas+ef+8baeUkW2D0uuxEgkTfq01NBkKsaVkIOjAxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612907; a=rsa-sha256; cv=none; b=Ik7n2WMu5qd6LmTsC4HtWowKy7+Y8E4TRwwts/Sx1wjdaNp61J/H066yl/f2GYiKTr0Oze 1lYqA54sXtOOmUuQvK1LlkMwRE9BYV8Wu6NBBV4iqUks8SUV9Zw2i1181mLi88O/WUREc5 kTlDiYBK9EQZe6SSS1HKHk2aWtoJefYZ1NxA70fSADFnl6oSuMjMq5w6r5rnIEv9Ps40tC wRPMY7byXJGOw7MHikkfSnDv8YuKdnyZajyhpt0jeeLVt22x654pAN/UQghAVyjmQLlD68 OcRv/RZO+qcDqp33Wp3za9uegcFsWRWXUP8WTCJHx4WOR+nAC5fF4Ril0DbW4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuFLbifnOUp2Tq3/ffqwrMzZsBjbv9Pb82ZrpSXhIG8=; b=gKbLX4tH1zR++FTroTrKRZSJTAZUgPBcNnfKZpCN07NovcJzZOmT4QhmThtlbzUh3EVvTT yJi2jq6o6E8YI7niCt5NoXSt1H8WBNOEsaUvBgZA5cbLq6O65pzQ2ZRQVlViEjDfZ4Vc/z WPvk0BmZDSadcGAn5cIQO2abDQt+vjqkopOcuOG2JGi/tGcXusYubOnp/inOLj69UcxfUe f85CABMuTqHSAWQIRTfxLci7u7je131nEuBrAK9VzCgPQcaxBnIc2hqlTwWkXRRTW3Vgei yeAIW3nVfdxIu7Pa6EfjfQf0OjIr6WD25ntYpCgDsY1mpWNY1RweNM7a0ydUFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lg3hHwz14Dn; Tue, 26 Dec 2023 17:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmRds080596; Tue, 26 Dec 2023 17:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmR6b080593; Tue, 26 Dec 2023 17:48:27 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:27 GMT Message-Id: <202312261748.3BQHmR6b080593@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: f0d6447c0b77 - main - pax: Add missing 'for' in comment. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f0d6447c0b771cec9a8b47b1f829ec78f7e58ee4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0d6447c0b771cec9a8b47b1f829ec78f7e58ee4 commit f0d6447c0b771cec9a8b47b1f829ec78f7e58ee4 Author: Zhan-Wei AuthorDate: 2023-12-26 17:08:58 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:24:24 +0000 pax: Add missing 'for' in comment. Event: Advanced UNIX Programming Course (Fall23) at NTHU. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/941 --- bin/pax/pax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 70611e54be95..e8e758f16650 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -69,7 +69,7 @@ int nflag; /* select first archive member match */ int tflag; /* restore access time after read */ int uflag; /* ignore older modification time files */ int vflag; /* produce verbose output */ -int Dflag; /* same as uflag except inode change time */ +int Dflag; /* same as uflag except for inode change time */ int Hflag; /* follow command line symlinks (write only) */ int Lflag; /* follow symlinks when writing */ int Oflag; /* limit to single volume */ From nobody Tue Dec 26 17:48:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lh6W4tz55F6V; Tue, 26 Dec 2023 17:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lh5QlLz4b6V; Tue, 26 Dec 2023 17:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOEIIOwbfL54mprkaxUnROog1+hB/vL9WZiH+NkBkVA=; b=IckhmckZJrf7r92Blmtj44DvdsDBHHRh2NcIOc88v4SOqlmQv0SOTTc5JQq5ziuPBAtT8t HalSE4NxLY2SKQk4URGys5QF1++3bYraRxPYbSq5YbweLRlz39p85hALOvlwPDcOHhUbEz 8IamRp+iOWEOe3p0gvHGnr1Tn3vXzsTbGnLPyRel41QSqHhvzJkjTz3eV+O3HUxp35R0VW Qo0AY986xto09WO5WEJaxcceAR2QLU9nd6wetqYiyFQsNhWBvMT89gC8K7zbRNzXCUfd0U W6XLD5duNrGlWPFOifu6lN10VlnSjmoPVJVSxSLNcdVcNSbpS4s25peaWFtGVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612908; a=rsa-sha256; cv=none; b=ODfa9/0Cot+PuO5vfASzuZy5LXMlk2wuBHbahl3T+UHaFe8IeYChXbogRWh0lntNOBTxzJ CrC7KI6SnH3pa4F3mbpSo1q5xP7XvMkRleNhwB7vumobrzCq7KtPi9YA7tRJNQ7ioJmxTa Yk8QZaxiH8oTUxTc5OCzAe5/Bq6C6Cvx9FUpcaehLkBXIiNmJJeSqQwLvPPqs8HM6tfgng j3nR27+DEUHBlPB5HqRIPTHPSvpjCx+SSOax9CVSaLqZWcrTK1in3C6rQbOZyf9QnQ0oOt y1mLvCByvnkhe6+8jjZgGCJbqo1fhkAZb/sbGCwHRU3zQkvDO3e1vQwuy41U5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOEIIOwbfL54mprkaxUnROog1+hB/vL9WZiH+NkBkVA=; b=Aj6A5ej0oF/K5LsTx7bE+C3GotKAxck+utpxF2+i5lc2Bo5fsBx3dbdCHHDQDW9XTBujjA N3yzisBi4MAxnzQ0YiQMLSHz1eJL9Nz6COaWEtGmQN+m0bCAchwYP0VtlczGGfdwsoBbp4 Yes+/+xN0FEvN5wpQxJHrcWU5kCyGMeievS0CljbLBsvaB0jbN9EIjgUZA0pTANEyNkjl4 4UNkl5wuaSgul/IwmxrAifojg+YRCBCuGK/aOk6twVgrl6afn1nhQIy8QwNGjINA/Jtf1W wAM65duFNjg5e+y1rKQuBaq8SQvWIgmI8v2mE835l2JNmEQLXI0bCddjTTecqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lh4XFXz14Dp; Tue, 26 Dec 2023 17:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmS8Y080637; Tue, 26 Dec 2023 17:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmSZp080634; Tue, 26 Dec 2023 17:48:28 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:28 GMT Message-Id: <202312261748.3BQHmSZp080634@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: 08ae26534e0c - main - Update LOCKS for Git List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 08ae26534e0ccf379a2b2849d0e2a92da609d3ad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=08ae26534e0ccf379a2b2849d0e2a92da609d3ad commit 08ae26534e0ccf379a2b2849d0e2a92da609d3ad Author: Minsoo Choo AuthorDate: 2023-12-26 17:26:16 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:28:25 +0000 Update LOCKS for Git Signed-off-by: Minsoo Choo Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/937 --- LOCKS | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/LOCKS b/LOCKS index ceebb8e131df..74dd0c13b824 100644 --- a/LOCKS +++ b/LOCKS @@ -6,8 +6,6 @@ subsystem login expires notes -------------------------------------- Special cases: -releng/* Requires Security Officer approval. -head/sys/dev/random Requires Security Officer approval. -head/sys/libkern/arc4random.c Requires Security Officer approval. -stable/*/sys/dev/random Requires Security Officer approval. -stable/*/sys/libkern/arc4random.c Requires Security Officer approval. +releng/* branches Requires Security Officer approval. +/sys/dev/random Requires Security Officer approval. +/sys/libkern/arc4random.c Requires Security Officer approval. From nobody Tue Dec 26 17:48:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lk0Wmfz55F0Q; Tue, 26 Dec 2023 17:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lj6NXvz4bDb; Tue, 26 Dec 2023 17:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L+Cpfne8ge3cr7K7v6Kxrrx2x40tJYYeoCKb8vw11YY=; b=UvbUlteH6AyeA1FqQv86mbh9x65AonC+3NxaO+pSSgNx/bd63wrA6F+4y/AQhLk6N6+LgF RQK/veeCm+sXuY8ryhh3Jc5290SVOgLJ2FnGY9Sa1UjYyQHogDMAFNTrpSHKywvoSDSslg Ucdbxr6UMZl7VLVwV7LVFLf1884LdDUa08SHTuKgkQrHjQN1NBpTk33CbwBN9S7SM38q+2 9i5umuCU0Xibicrsp6oQ+GGGoV3mzJgT8DdfBCa2XccE4Tius2sf0vM6XfIYC/us88GTVi KloS2uPhlYDp2ent2TZFn9H1avSW1EQEfo+mcJGhKX1XMJ6rU0FZutv0sr5UFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612909; a=rsa-sha256; cv=none; b=My/sR2OUJWvdrWILDAWD/aJE+aVKVscWr5FYnMcep28vDGPtZNE7ZUruE4WnsOs/UBIgE2 xJy9n9Xw2m+2L6k01cq6H9HEoHSRNGcVCZaMNg92WyyH++sOUOEfXgUZB2d4rvieH3VOr1 UCXp4y+r+dJNkB7K2jcCAIwTx0ABR9t4SefVwViWZ+D5sP20/AUdzm4pglNgIiOKmfFRgn 270MUpwXWLD2rgdrBtZzrrZsyDhpqqi2vT63+JEsSTWX3CnHSB0XrG+Yvui8YWuenNSuDO E4QuHy/iykFBoP9zGga9I0V6yQ0bhpmxqyTmttry/K1MbBhjelX9JCNq8gWCnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L+Cpfne8ge3cr7K7v6Kxrrx2x40tJYYeoCKb8vw11YY=; b=g+TdsZ7JOy2bq4N1mGSu8obtmnY2MdiTu7TS97nCnXGmR3WkIKDu67QPENm5IYh5/LkHOL nTe+/j/LDGiigIdO0PvNnshxRkFezj7u91XDDQoqfVLsHiFEekMvG66grx0+wTwcyUFFBP pvFLXt+bUcBfFvAS9vGVMRUwIjzn1SbzQARm3tU4/4SeeoYQYAr2dRS/7E4YZhWl9i8LVp RMyZ/LYOb+AjBMjteI2orYPLRy2gXV8GBGWmNQxZYz9Xzpb9ECZf6aXLDfF9qjdHUCcNYr bGerIY2LcMQ60G4bNoLqu3v0g+FqYEyPdROuv64gSl4dBu5M3vJwph7gMk7LbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lj5V4Zz14Dq; Tue, 26 Dec 2023 17:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmT1v080684; Tue, 26 Dec 2023 17:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmTJa080681; Tue, 26 Dec 2023 17:48:29 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:29 GMT Message-Id: <202312261748.3BQHmTJa080681@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: d2a736db136e - main - Update MAINTAINERS for Git List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d2a736db136e9c5210e016f01e43e08f6b5cee70 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2a736db136e9c5210e016f01e43e08f6b5cee70 commit d2a736db136e9c5210e016f01e43e08f6b5cee70 Author: Minsoo Choo AuthorDate: 2023-12-26 17:26:16 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:28:25 +0000 Update MAINTAINERS for Git Signed-off-by: Minsoo Choo Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/937 --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 50d5bf28639b..8d7100136d38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,8 +1,8 @@ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements -are granted by core. These are documented in head/LOCKS and enforced -by svnadmin/conf/approvers. +are granted by core. These are documented in LOCKS and enforced +by gitadm@. The source tree is a community effort. However, some folks go to the trouble of looking after particular areas of the tree. In return for From nobody Tue Dec 26 17:48:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Ll16Ztz55DfX; Tue, 26 Dec 2023 17:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Ll00Wbz4bMW; Tue, 26 Dec 2023 17:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2Lu9Y5I96lDHubzNCrroMc1mBS31zuu8ss6SIwchRU=; b=LNRSxYHqqQ7Db9Db50aVRoY5EH5KAC7nk3UhDvhZm9AHdiTtqq4KwNHbROzW2CvExZjb40 quPYQpaZkHK2a9NgVIgAvn3HcquEOITafYhVQ3LCH7OeEqgd7L0Uj9SWsRvWXZFfaT8W4v rYQLQ+rkzXMbRZAzBTUhK4JvD114ZLZdZ+7bGOAu2f1EsgE0fKDZiEoN8gd64F6JOlnMVB lP4jT0LPdLxcB0b7nmfXta8oVgbH0xfwAtU4UbPX6ZfNtkN9QlpOcfTSZHfuWJaE4BPzle yD059sNH2X4+ctzH1XwFh58qBoKgJH8yjrFKaHvOSKa5ivL4cI8kuouNAPlG1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612911; a=rsa-sha256; cv=none; b=LuPFklak/HqqgeTjfCuevOd/hwSJeeFXy7mPYOg2z1v5vv2A4OiwTYcE6Kn536q5laM4ji KqHV/qUDB0+u7L6WHdo6mQxr1ls5dByW3TSwclxfQYszeMVFLfFi5TPOGHVaZqrLZezbSS 6aP/jXmevRGoP4GyRTjxlSCdgFaKPqA2xzB4w3mFYvb6kRsLI9tuBmdqKygZVFavcvGcVA eTSPfZ5x4IL5qCkbo0nsmhcM/5mcWHVYsQk/ng+aS8IA87hDE+B4f29vgrl7jk/mCs2zN8 j9HSqDbrIzwlzxzGlIiexlM6dpDsXKbhrYPAiBsmvZMuUiwzWoDn1Y/rc9w3YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2Lu9Y5I96lDHubzNCrroMc1mBS31zuu8ss6SIwchRU=; b=A7gUbpD1uBEjvxbx4p655mN9M9vryYVAki3GPtTvDQ7ukhkAg1ubpJSGssKJHx6pHtJfEI /hg3zETNzJAvj97V5Q14ARiEX3MLs458FALVJR/pTz6VeStyiGr5Z1/Xe5dd3MFkaGWwiB 4Y4vnDlFWBkOJNXAximfvyA0sv+6ReuRiFTDvKX2YV5C7mItgLvheqJ1dTtV5/8+R1Vb7x HAavys4B3GcB8vOWCzm/tKtltFCX7TSvYud6kg2ZgQU8IsvxxNwnZbYzxBzZC0puiq+z2u BRKrSG/Za37hw7E/KdDJnMgaJ2ao1ux0Ag6bGCcEwqx0mS3kt7OfFJXN+lcT0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lk6D58z140L; Tue, 26 Dec 2023 17:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmU7v080732; Tue, 26 Dec 2023 17:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmUoX080729; Tue, 26 Dec 2023 17:48:30 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:30 GMT Message-Id: <202312261748.3BQHmUoX080729@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: 896fd0d3f5bd - main - Remove SVN related Git attributes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 896fd0d3f5bd0a783a0a9831d5f572398ad92539 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=896fd0d3f5bd0a783a0a9831d5f572398ad92539 commit 896fd0d3f5bd0a783a0a9831d5f572398ad92539 Author: Minsoo Choo AuthorDate: 2023-12-26 17:24:59 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:28:28 +0000 Remove SVN related Git attributes Signed-off-by: Minsoo Choo Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/938 --- .gitattributes | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 11fec084166f..d3452fd3cef7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,5 +3,3 @@ *.cpp diff=cpp *.hpp diff=cpp *.py diff=python -. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS -.clang-format svn-properties=svn:keywords=FreeBSD=%H From nobody Tue Dec 26 17:48:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lm3142z55F0T; Tue, 26 Dec 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lm1Dmrz4bBR; Tue, 26 Dec 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYNdAs35bxwFde24B1NwvCa2lmeEQsLeJKdFC/NFF+A=; b=KEhTsZXqH6SWLV3vm0JkokVRoZKrz9raqjqjLslTKM9nxxmyjwBkSaunj6Gu8QoD6pCn3U yGODdBQfnGokMpwr/4jO/87WvrHXjb3W+iC4dZ4f6KUO4cCwstnnTJ4aDLu6btX24DKqWg ZISLkmQIkdewkasB3uZZqu6w04yxEZape4UgGVa7ESNhgjXthcwNKRYF0s8D4hXdMRFu9Z XzKExrzWTTJl/oK0e4Wbi7R+YvkOxBTdhFycZmmL45xe1JaWM2od1X9n+zg3MWdRM41l9e 1eTAjaD2ymXotXRzFZ/o9OygbnmXjU4xG5h0UcoIT4PlMT/xHiJFVW9bOLD/OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612912; a=rsa-sha256; cv=none; b=NdzAtj+cXagRs2njtasLQd5IF21K40Cy4VeJy2amQ6Bt+gQfyD8L7IdIYrCP5b2OKCKSvo lx1jIjSS2QWZEXqQCzWPu3zrRPCuS+q4tZnQcoXR35Sp6MnGrO5DWmTIA6Ox0QQko6v3Uq tG9r/tImOoQzZxreaHvnkEyAKOyTHLcZyQY5wMXh5J4Qby7umYWrqAfrd09frF3ylIdYeM 7nURImr1Vo9f6NTDzVe02cAIcIQI1zQjCP/lyE98ySCxGWYgZ0vYfalIefYmY58jN07Pta xUNEEwFgplU6e1HszVFU/goJZfNs/Tad04l/F8mCmlmzOpM1o5eQX4RsJySDLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYNdAs35bxwFde24B1NwvCa2lmeEQsLeJKdFC/NFF+A=; b=ODP7CeyuahTds1B3CPERWDg3ByzQJsmRD22zJc5ujifAe6I6qSosX2qOfaTKFT8o1gHHRJ a7wTx+OPagXAlnOUIkbl3MhPbWdjxS8quCeuEFXTS6g8S9iNrlFZ4kaZlwbxWZcpckTIeH tUntgYqN1WjbhCo8AOnQuoD9GpWTy/G1ZeDZeOBAgvl2iY4TxyPmAY0sS1ydTARk17zPhW aFH1U8nENk7X6cAOK7Cn3O+jqAMWS+2foWT7C09x96zdzBqSB+bDxXmzCFAB83YtKfR5TT 2Zsi4JkK60jsxd9UU0LT4Kbmopg+gQCPN9SeAUivcK+K+U7x1p75MvFuvBC3Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lm0Krwz140M; Tue, 26 Dec 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmVTf080768; Tue, 26 Dec 2023 17:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmVKN080765; Tue, 26 Dec 2023 17:48:31 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:31 GMT Message-Id: <202312261748.3BQHmVKN080765@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: 878bf23d3758 - main - sh(1): Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 878bf23d3758244171f12e06d956c021b30a2aad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=878bf23d3758244171f12e06d956c021b30a2aad commit 878bf23d3758244171f12e06d956c021b30a2aad Author: WEININGCHIU AuthorDate: 2023-12-26 17:30:20 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:33:14 +0000 sh(1): Fix typo nozero -> non-zero Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Reviewed by: imp, Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/936 --- bin/sh/mail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/mail.c b/bin/sh/mail.c index 97ea41d8da67..be5e76c221f8 100644 --- a/bin/sh/mail.c +++ b/bin/sh/mail.c @@ -55,7 +55,7 @@ static time_t mailtime[MAXMBOXES]; /* times of mailboxes */ /* * Print appropriate message(s) if mail has arrived. If the argument is - * nozero, then the value of MAIL has changed, so we just update the + * non-zero, then the value of MAIL has changed, so we just update the * values. */ From nobody Tue Dec 26 17:48:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Ln3NFFz55F4t; Tue, 26 Dec 2023 17:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Ln2BL1z4b92; Tue, 26 Dec 2023 17:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pcts9cftRgNrio9LG9rSxauxgoim5yxW4ZjDGAfSKAo=; b=fu9EyW6g1wR0Fv+dYy0dKFwZQnRFLwctDaS0nll/jKy0u7AEL8eIHYhmdkJmfcqKbCBTxd ZYQB3hbolY9T3XX0ldx4yV6Vt9dhLJdlfvNida12/DTKKi5BcK28LFqwCfSIpAftvetKtH Npb1CDsiQD/SVRHWF28pEaL7lHhxdJtzvLNnAwmt+5ClW7qgSGHLQ4na2FB0crpYcVud/R 5iqWhsIWicteRaHLXUUlpBtj1IY/xOLP5Xv8k/KYtlhzr+HSm3Azy2cnxxdyVYryMTZXTl iGUABXRQN8G7sahVDeXLKIx+KjR0+gMoCT+ZJgNOOFdynoD6ainNKU5WpfGydA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612913; a=rsa-sha256; cv=none; b=oijqrebdYzq7BsXh1fUeWdJGmKptfpTfeItXFdvXxuNgRsqANL/ftazSuOC2nW+Zvbk8ED wGWl9qak4kaAKIJtGWA0OW9/dQcVn3Deka/JPHE8TgdykgpRgqWZursbM9U54kJ4GTcsXp yRe9oOeHYP21b6ugWJSDS1xgAI0IbXs51+PMmEGu1puG/0QB8yZxoNDZSchUygaCp9Cn1w gOffsg4JoXJlbNOa5nq6HSOw5RADLeucAtw3ngQeoszLxLtW0csivCDWrJ8c9jD+GxTb8p zZLKOLckvUZqzzKQuh8TKXnpFiXpy/1bl48TgTh6PMr8ZstiCccNY3JOazaLXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pcts9cftRgNrio9LG9rSxauxgoim5yxW4ZjDGAfSKAo=; b=dwmfqMJtdaZpTeB5GXuVW3GVsxUQA+stBVtkAjHbtXSdkCICQK6rftiP1KSXnFCOsozP48 ZFufagJhRJEvQ+uhxPbbXicNtH4CycTBhXatYk1VODEDrA3/9yQWFh0Lemk9zK1JhGp2o1 vj6eyfORpfBOTFUODwnfb3ypIvK+pYgch08a9KVpgVWjgKX88kkhxWjuu5CECdoepxSuHb Wrx6ToJCuF4PDCsEr3cWWOpE8esBmCPm3THPAAn8HUCRS5RYzOkBYZZhg6FcntF8dcAzq/ wTu4QDuujM0RfifEdYJTYfh1l1h1mRs6IvYPzVqcDPNfTAIe/yJ/+dELuOVBKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Ln1J8Zz140N; Tue, 26 Dec 2023 17:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmX8x080810; Tue, 26 Dec 2023 17:48:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmXSG080807; Tue, 26 Dec 2023 17:48:33 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:33 GMT Message-Id: <202312261748.3BQHmXSG080807@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: b6ae2ec7b032 - main - sh(1): Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b6ae2ec7b03250cc22cd9bf64044d113ec64d9f1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b6ae2ec7b03250cc22cd9bf64044d113ec64d9f1 commit b6ae2ec7b03250cc22cd9bf64044d113ec64d9f1 Author: Kai-Yang Chen AuthorDate: 2023-12-26 17:33:20 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:44:33 +0000 sh(1): Fix typo Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Reviewed by: imp, @rilysh on github Pull Request: https://github.com/freebsd/freebsd-src/pull/935 --- bin/sh/memalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c index 7850bb147b01..9c50156e8e00 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -283,7 +283,7 @@ growstackblock(int min) /* - * The following routines are somewhat easier to use that the above. + * The following routines are somewhat easier to use than the above. * The user declares a variable of type STACKSTR, which may be declared * to be a register. The macro STARTSTACKSTR initializes things. Then * the user uses the macro STPUTC to add characters to the string. In From nobody Tue Dec 26 17:48:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lp3h2Dz55F4x; Tue, 26 Dec 2023 17:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lp2l7cz4b9G; Tue, 26 Dec 2023 17:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewyJ8dvlKnB73d01aWxdG7EhyaZ4QmsSLrcusyJ6XJw=; b=m/ftcswDU6mZJdkhfG9rU4nbmRU6ZtRJ1guVcXV+T6nFdBXRSavU9t6iuRG6v9T5+CL2vv bBZw43mqub+NDkdHZxANUHn8bUtoszn4y+1mllJoG6gGna91SDTEK56POP9gQ4MXlntYjb AwPrQgNjlXjdzx36sWwh7t7WL/omEGf0nn5LGVoAU5Gj/CC3RWnSQg2LxBveahOqSNHDAz V0CPgbRbbEj3vG+dlbXIql5fjt4hURkSVFOOWG1eCRWchKIg/5twPpTIZ4c+zVztvCEjcM k6lk191V/DnLw+KA6K8XmfLhk3Cu23nN+alA3ZmxV0weRxof+T4Qregu61flYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612914; a=rsa-sha256; cv=none; b=eKNPgRlc2E2r9h4155rSI3kOh+J3QL+qP7jlxjDr+DbXu0KhUEFc/KRz92fg0/6dxvhpvi t7V+DlW1BqKMBHEGo/5/xC6RUSEl7gn7On8qBNcGupARdvZV/VuVuomwTppLWqcBfh5nHG t1dAbG4UuKra+m0macNORbpNytcuY62CwVHOoJ3R+GttH8hFBLpFxN5Ou2pvAqgwkqfiVU t9fMR5NuSzL7Gaz73THjReF7jMdguVw228+rH8HET4g2ETeDIBCJHoXMX76HSiNg2yOvHh sGI4JruPeWRNiFzpoJKCkd+75fXY8wwUnUtKWr0mrzZ/mkK8Nnf2bQI2jmMuTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewyJ8dvlKnB73d01aWxdG7EhyaZ4QmsSLrcusyJ6XJw=; b=mLk+S3m7vcebXp6TCoTC72GSppbJAhjjvuILpqT+ABKxurKEBS/1T//sddt4lhSPoSuRx0 YVao7TBghKO4J4S5tB6UViF2PrcHy+WcTjrUqLRpYO17bEVW+mYW8Ua1AP0WKkFN85ZfqO mfUOws4kAJekTeMtaJCTD87/FZcWVU3/KMiH7xp7P+tEt1osmG3ZYvBKOh+tb2LGg8Y9IP QOeadpuRrOjlmGTXO1DHxSsmTXtDa3QIAlQnmPPMq7famshtnzUl7mikSQYWHeQLoq4Mzd 3lYVwD0JzQEMO4bMD/aKXMSf6AojS8zR+whKlHWIdNREHaIPh125/cA6lqdZxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lp1rJKz142W; Tue, 26 Dec 2023 17:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmYT4080855; Tue, 26 Dec 2023 17:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmYcb080852; Tue, 26 Dec 2023 17:48:34 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:34 GMT Message-Id: <202312261748.3BQHmYcb080852@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: c38fe1d28225 - main - sh(1): Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c38fe1d282258915a388832f0315e813a08888b9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c38fe1d282258915a388832f0315e813a08888b9 commit c38fe1d282258915a388832f0315e813a08888b9 Author: Pei-Ju Chien AuthorDate: 2023-12-26 17:39:10 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:44:35 +0000 sh(1): Fix typo Remove extra 'ing' from 'bookinging.' Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Reviewed by: imp, Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/934 --- bin/sh/eval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 7caf1972a39d..fdc7a2560694 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -899,7 +899,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) * so we just delete the hash before and after * the command runs. Partly deleting like * changepatch() does doesn't seem worth the - * bookinging effort, since most such runs add + * booking effort, since most such runs add * directories in front of the new PATH. */ clearcmdentry(); From nobody Tue Dec 26 17:48:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T02Lq5CP4z55F30; Tue, 26 Dec 2023 17:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02Lq3jxzz4bC5; Tue, 26 Dec 2023 17:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=USSrOTPRc12AQXhetNYS7bcZDMPOQq2lKvO235eFozY=; b=mLixq3tHT4+8y0uFaZ2RAVW6c46tPOjHLKTgMh7Mtm/fLTs3vZZOGvD/SZ/K42qhzgLWRq zn0BT/MTONHnvAY55RXh3ap/6AB1BH3U9nAI+Hp/kaCq9Zd/iZ6N2CM8MJEXTfTWfWTNlC is9Kj08f+jRhDBYPy/tmZianTSkFWQtLo8pGZMGF0UJP2GLUFTvJ2KCff4Gpg1BUivTI66 bFz2kVYJmBC/tcs7/VqPxIUD8wDiU+P871TzA0yzbWUdvja7TQFFZB8LBKbrB4K65KN38b IsfjC5khaRDQiNxlt12g3NSfo0bn5XIb6iDtWtpSXpfbQHr8sbdJ8iOVbON5xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612915; a=rsa-sha256; cv=none; b=mDpmE5+zCM/IRAhIuHybol6vKYB0NtlSba9i1dDWEGZTXU0aTfMITheW0W4ttkDfgBnruL qXuj7EGo20cbhvaj5d7OpVl/627c3lmM5cDj5wV0Md05pTa0stDvP5hNAr/8WyCfpwZjML /sSmcFkk8a3YLICow63WZX/tSJGISJa6GIj61fv7Ql23RqzueiXBhdhfwaAHncLYEAZL2d JWrO7cd7RvUvTon2phM4FYbek0TRL0gcA2ac5NlhDG3LhP1R7zFWWYGiQCnxBIkB4IDVMP L6Xp//2yFarwqfctft11S8gOrQXVnYf4UgxH/L4s+y40W04QkHocR6+thyg5wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=USSrOTPRc12AQXhetNYS7bcZDMPOQq2lKvO235eFozY=; b=adQRs9EOq7BTQydrrpfaIMY8F1GpMZjDA1IgWR6OxvfebDad7cuRTrhmDaw1inOUxodVk2 Vj7y6l8Tbo7E3vjSYowYl6McrUujecYqh2k6I51z021FqT4D0eOIw2TrlOWdFTiz/Yldw2 W9+TNdjd3lMdLTOgyQOXSVi1qTsueqNgt18zplzGIbBNJXLGz/Szlx+NrI3m5dWnoZ1gfQ Ym+v2vfg4svBa74AJa4yZZivy7ImvW3S8B7dUJZJKxXjrTNDuHAec7hjRNXMyLZ80POIGV filTzNfQwLn4Se/S7itH6tM7yk/ZC/3s/7/lYhwI411xuU2/WSBXBZB27e0hiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T02Lq2nm0z142X; Tue, 26 Dec 2023 17:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmZjd080894; Tue, 26 Dec 2023 17:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmZgi080891; Tue, 26 Dec 2023 17:48:35 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:35 GMT Message-Id: <202312261748.3BQHmZgi080891@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: c1b12377a6b8 - main - cat(1): Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c1b12377a6b87e4869e860ba481f618de3ee8514 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b12377a6b87e4869e860ba481f618de3ee8514 commit c1b12377a6b87e4869e860ba481f618de3ee8514 Author: Kai-Yang Chen AuthorDate: 2023-12-26 17:42:38 +0000 Commit: Warner Losh CommitDate: 2023-12-26 17:44:38 +0000 cat(1): Fix typo Fix type: rebiuld -> rebuild in Makefile Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Reviewed by: imp, Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/933 --- bin/cat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/Makefile b/bin/cat/Makefile index 46c7fd5e4ec6..97b19e701e4f 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -20,7 +20,7 @@ SUBDIR.${MK_TESTS}+= tests #LIBADD+= cap_net #CFLAGS+=-DWITH_CASPER #.endif -# Depend on Makefile to rebiuld when WITH_CASPER changes +# Depend on Makefile to rebuild when WITH_CASPER changes cat.o: Makefile .include From nobody Tue Dec 26 19:22:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T04Qy1FR3z55Nqh; Tue, 26 Dec 2023 19:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T04Qy0r4Lz3MBT; Tue, 26 Dec 2023 19:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703618538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyt9dhBHchZl/NTM0tSwO9/F6c6g/ur9wZUMGfCITbg=; b=Ni63rS+iHwtVuiEpjOskFLB5+a6H9fYNINsYF8EXr0ugbrIVK4wmGU/ARVHcKNZ68bK7pl wft5kLJJzqvp4lt3qw01qdEwnl16mNYm/xTLBryngfZHDfWWE92ij75a7moGu1eXLlzMQx 2LqRY8UUjYiHe/iSoVn7f8YPi4d7RenF/ltJhi4BJEicFfK8wE/o1W2BDtKtfsdeUM8mO2 ohysSw+ma0X7wmVJTWu1gxs621CwFIGOdSwHRBCwVKfI3qsjF2Be8qDgjF0IsVz1FFRLgr Nt+KxuBmi8stUlfZii1GpfKyoIM4iq8sYYvZx0+ERLlfLrLm7e0hzFkT35DgEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703618538; a=rsa-sha256; cv=none; b=kXn4gimVGxDyySP3pzyuy1ErupKR/mWDW0rp+dZ5LAxYJDDyYfPbHXF63bLQKuXN/WyWxx 3aebbym1wtAT4c4HikBMqzurVCLiNpXCBm/ybyunok+XfBk3cD+i0U1vXu6xQythWD/KGJ +Ki9ffe+F6Q5QLj7nePgWtD20FfJdhPjJ/whV57gh+KMZUmXRrVAaM/oHHYgGFPNNwZaKi fb1xqWPGm9NwsmMu31WIkv9Y95Fhi04+NrLEpk2yhZaFYHzILbmyCi2NEKWVriSCjpP/Qj lRn8RUyvsQadTLMZNPk7LU5GgwBLYUkCbgGSDECVZeFjPubd75YJZiuOWKMBiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703618538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyt9dhBHchZl/NTM0tSwO9/F6c6g/ur9wZUMGfCITbg=; b=olIDsifosmJebOwiKg+48I5jADw7Hni8J11QoPMk4hqz/6jDFWrKcmAEnJFnImOVjwMnJ4 +DWH1+3velMOSKrnYbWLrg4VUyl26UIJtKIOzc8vi8ma9st8uLV7ms65A+vDX9sJYpycxn b7g4Y51ZxEUCIX3Q/SXt+z2Dye7RKEPgU5YPWVhUwGT0wuJ/KkFuOUAlQI48j0gmNlnikI fr7UDpZE5ODPzEcdilGvmeCMuG+fl71/MyQchB2vcUuJYLr9atxNgV1GwaKZF5i7wA4S65 RM5gfrsVXVMFsQd8uDGLDn2crF8kEk7slyVWV/Wv1dUoOFhzsj33Ba93IDHhXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T04Qx7134z16gM; Tue, 26 Dec 2023 19:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQJMHPS046201; Tue, 26 Dec 2023 19:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQJMHaW046198; Tue, 26 Dec 2023 19:22:17 GMT (envelope-from git) Date: Tue, 26 Dec 2023 19:22:17 GMT Message-Id: <202312261922.3BQJMHaW046198@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: bf7830d79dd0 - main - ofed: use ANSI C functions definitions in opensm/sm.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: bf7830d79dd02a84225c93130c2dce68e0a541d6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf7830d79dd02a84225c93130c2dce68e0a541d6 commit bf7830d79dd02a84225c93130c2dce68e0a541d6 Author: Konstantin Belousov AuthorDate: 2023-12-26 19:16:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 19:22:01 +0000 ofed: use ANSI C functions definitions in opensm/sm.c Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/opensm/opensm/st.c | 71 ++++++++++++----------------------------- 1 file changed, 21 insertions(+), 50 deletions(-) diff --git a/contrib/ofed/opensm/opensm/st.c b/contrib/ofed/opensm/opensm/st.c index c2ee01474c23..7dba30644d61 100644 --- a/contrib/ofed/opensm/opensm/st.c +++ b/contrib/ofed/opensm/opensm/st.c @@ -174,7 +174,7 @@ static int new_size(int size) static int collision = 0; static int init_st = 0; -static void stat_col() +static void stat_col(void) { FILE *f = fopen("/var/log/osm_st_col", "w"); fprintf(f, "collision: %d\n", collision); @@ -182,9 +182,7 @@ static void stat_col() } #endif -st_table *st_init_table_with_size(type, size) -struct st_hash_type *type; -size_t size; +st_table *st_init_table_with_size(struct st_hash_type *type, size_t size) { st_table *tbl; @@ -208,8 +206,7 @@ size_t size; return tbl; } -st_table *st_init_table(type) -struct st_hash_type *type; +st_table *st_init_table(struct st_hash_type *type) { return st_init_table_with_size(type, 0); } @@ -219,8 +216,7 @@ st_table *st_init_numtable(void) return st_init_table(&type_numhash); } -st_table *st_init_numtable_with_size(size) -size_t size; +st_table *st_init_numtable_with_size(size_t size) { return st_init_table_with_size(&type_numhash, size); } @@ -230,14 +226,12 @@ st_table *st_init_strtable(void) return st_init_table(&type_strhash); } -st_table *st_init_strtable_with_size(size) -size_t size; +st_table *st_init_strtable_with_size(size_t size) { return st_init_table_with_size(&type_strhash, size); } -void st_free_table(table) -st_table *table; +void st_free_table(st_table *table) { register st_table_entry *ptr, *next; int i; @@ -276,10 +270,7 @@ st_table *table; }\ } while (0) -int st_lookup(table, key, value) -st_table *table; -register st_data_t key; -st_data_t *value; +int st_lookup(st_table *table, st_data_t key, st_data_t *value) { unsigned int hash_val, bin_pos; register st_table_entry *ptr; @@ -315,10 +306,7 @@ do {\ table->num_entries++;\ } while (0); -int st_insert(table, key, value) -register st_table *table; -register st_data_t key; -st_data_t value; +int st_insert(st_table *table, st_data_t key, st_data_t value) { unsigned int hash_val, bin_pos; register st_table_entry *ptr; @@ -335,10 +323,7 @@ st_data_t value; } } -void st_add_direct(table, key, value) -st_table *table; -st_data_t key; -st_data_t value; +void st_add_direct(st_table *table, st_data_t key, st_data_t value) { unsigned int hash_val, bin_pos; @@ -347,8 +332,7 @@ st_data_t value; ADD_DIRECT(table, key, value, hash_val, bin_pos); } -static void rehash(table) -register st_table *table; +static void rehash(st_table *table) { register st_table_entry *ptr, *next, **new_bins; int i, old_num_bins = table->num_bins, new_num_bins; @@ -376,8 +360,7 @@ register st_table *table; table->bins = new_bins; } -st_table *st_copy(old_table) -st_table *old_table; +st_table *st_copy(st_table *old_table) { st_table *new_table; st_table_entry *ptr, *entry; @@ -416,10 +399,7 @@ st_table *old_table; return new_table; } -int st_delete(table, key, value) -register st_table *table; -register st_data_t *key; -st_data_t *value; +int st_delete(st_table *table, st_data_t *key, st_data_t *value) { unsigned int hash_val; st_table_entry *tmp; @@ -460,11 +440,8 @@ st_data_t *value; return 0; } -int st_delete_safe(table, key, value, never) -register st_table *table; -register st_data_t *key; -st_data_t *value; -st_data_t never; +int st_delete_safe(st_table *table, st_data_t *key, st_data_t *value, + st_data_t never) { unsigned int hash_val; register st_table_entry *ptr; @@ -499,9 +476,7 @@ static int delete_never(st_data_t key, st_data_t value, st_data_t never) return ST_CONTINUE; } -void st_cleanup_safe(table, never) -st_table *table; -st_data_t never; +void st_cleanup_safe(st_table *table, st_data_t never) { int num_entries = table->num_entries; @@ -509,10 +484,9 @@ st_data_t never; table->num_entries = num_entries; } -void st_foreach(table, func, arg) -st_table *table; -int (*func) (st_data_t key, st_data_t val, st_data_t arg); -st_data_t arg; +void st_foreach(st_table *table, + int (*func)(st_data_t key, st_data_t val, st_data_t arg), + st_data_t arg) { st_table_entry *ptr, *last, *tmp; enum st_retval retval; @@ -544,8 +518,7 @@ st_data_t arg; } } -static int strhash(string) -register const char *string; +static int strhash(const char *string) { register int c; @@ -578,14 +551,12 @@ register const char *string; #endif } -static int numcmp(x, y) -void *x, *y; +static int numcmp(void *x, void *y) { return (st_ptr_t) x != (st_ptr_t) y; } -static st_ptr_t numhash(n) -void *n; +static st_ptr_t numhash(void *n) { return (st_ptr_t) n; } From nobody Tue Dec 26 21:12:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T06sz4KLgz55XVg; Tue, 26 Dec 2023 21:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T06sz3rn1z3W1v; Tue, 26 Dec 2023 21:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703625143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aOdtJ3I7ocI/AJ9KHmkHlJgsf9qA4Ob+q7z5FCiTo4s=; b=gpxM4L4XF1m6zyhiy22q3pB72KN/Nm1kWhaLXAcqWnIJHtyuIQXg45Z0ZtyAD5ENK93jXd nWdOj9fE7mlEDFpxQKKalhntbwS5Ge/as55pceV/m6jqVWBvFGc8QaYh7jRdnLEZRL6pEv FT0uky+/3AWYN8pgT9rJlcsXywVQ8vmd6V/EPVPUsQ89pUQF7wk+ahY/J/nqIbYU8EzcEX qCJl0MHM3Qslq/qXypY+P7hAT5hspj8qXgZzp2Ebz5eTDwrZBMrl9iacfDs8qA57JFyE7e jvm6S22wAXA024j7FLsLqeaPRVmkgz+ekStrhnePY75PmEdkvdtuZ/9vdN5U1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703625143; a=rsa-sha256; cv=none; b=AFm7RgthK0x7NwsOoulkKbcFdIsGO7kCiiyEoZfAoJ9izP21IHjVq47I3VkWWH5fxySdw7 Gdmzlg2yi2mLj69VwyaSUYZlYZtk6fiZHi/Y+rSAmzovzbz9K9NFj9cJKy6Bi9Z/VB3u5/ aUr2nBWEWliwyjtZfW1DEJZkWGe+iMwNWQFtP4juaE9h/fJQJHzm/KQsGk+ZO+ZF1vaIZG xmlEQEQSARVwSdCg2dIny42BbhQkjk5UjZejU6aIcFoJVpqyd1SMrda8fY7SKKsHfF1a/y Oo2SYFOCN9MupT4NnKGaL3hLzui+vcg4/WFbX6f2MG6R+6f5ztK5dvxsAXSr4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703625143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aOdtJ3I7ocI/AJ9KHmkHlJgsf9qA4Ob+q7z5FCiTo4s=; b=Vs4EBr/7PrJoH/FNRfjKTjJI1LEzTw+Q/v9GryrSaLCVw6tBEFjcjx7N3T1CWM+Xb2/FKB STIc9yJBGr+jV6T4ndqIhVP/QVk3p7oS96Lqmgn5mBFANEfZ0XyByogaB+vLlcNYl5EGnm nDDPUrpZkHq0fPjO5DGM4Us1kTZ/ld/aUDyxleKIbkjMdGtQTcFEA7AYltEQ4tyPGhyqcJ A/BGOkyKzdzUd/wAAs6V5AGtPRMJfXjLyIY9PBJBW1ZAmnradJHl8B/tWFsyFC2HB1/KqU rcDkC3N2/jTFEg/IFfOJZNXRE0lbICYCNxNMe/2kHu8K0xikNBQkqGPSJ3cG4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T06sz2wg5z19jG; Tue, 26 Dec 2023 21:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQLCNgs030801; Tue, 26 Dec 2023 21:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQLCNAs030798; Tue, 26 Dec 2023 21:12:23 GMT (envelope-from git) Date: Tue, 26 Dec 2023 21:12:23 GMT Message-Id: <202312262112.3BQLCNAs030798@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: 08c33cd94da1 - main - hpts: avoid duplicate call to tcp_output() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 08c33cd94da18b4cae73a4837e13f677345a6c1e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=08c33cd94da18b4cae73a4837e13f677345a6c1e commit 08c33cd94da18b4cae73a4837e13f677345a6c1e Author: Gleb Smirnoff AuthorDate: 2023-12-26 21:09:09 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-26 21:09:09 +0000 hpts: avoid duplicate call to tcp_output() Obtained from: rrs --- sys/netinet/tcp_hpts.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index a6fa79a26949..73e9997c060f 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1364,18 +1364,23 @@ again: * We also only call tfb_do_queued_segments() * tcp_output(). It is expected that if segments are * queued and come in that the final input mbuf will - * cause a call to output if it is needed. + * cause a call to output if it is needed so we do + * not need a second call to tcp_output(). So we do + * one or the other but not both. */ tp->t_flags2 |= TF2_HPTS_CALLS; if ((tp->t_flags2 & TF2_SUPPORTS_MBUFQ) && !STAILQ_EMPTY(&tp->t_inqueue)) { error = (*tp->t_fb->tfb_do_queued_segments)(tp, 0); - if (error) { - /* The input killed the connection */ + /* + * A non-zero return for input queue processing + * is the lock is released and most likely the + * inp is gone. + */ + if (error) goto skip_pacing; - } - } - error = tcp_output(tp); + } else + error = tcp_output(tp); if (error < 0) goto skip_pacing; INP_WUNLOCK(inp); From nobody Tue Dec 26 22:36:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T08l80KzJz54RRy; Tue, 26 Dec 2023 22:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T08l76rPgz3dD4; Tue, 26 Dec 2023 22:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703630196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFf0Gh4yfm0gAFEyrx25CKIwSGXnR05OR44eGRy3ROQ=; b=ED2BTFQzGYO8jkMSXeUkQcFz8jcF8JU3jT0ohoaZlObPZLkuaZg69fnrET6cjKb8Plp58s NOX6++0CZX6Tq5DAHP9y8Z/JCuaYhcvJA0vWvqmPbeVpDDVJetUtCFfEu+BFgOXUtehAGF qRaBOdsz0Z1usjh4YJql/maYWFsOYh3x3RI1YYUqpkuThHrED0ZX50fuGN2cijHVVME9JF L1gpVw6aoxM9lcmwd627g0rsZAazmQKaJJOzONyP5HbuLfAwICVfwuxNhRaUWUMbUruvV4 eq3aBWVYZ1WzuBwlz2+Tnpi8LUbU48osW9e3H9g3t6Lf6x2chb57TH+tIafZZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703630196; a=rsa-sha256; cv=none; b=Yr3ZS+Z7DzgNnlvCJBO8cPQKIGivZw2fjRtUK8jeAIT07WTfe7zbPH5WTPGyTA3sXNUzo3 nW0RYpIB510iDbAYo4TDXeosqV2/IymivBrufx+B6vIQ6kv5zSgr4Jcq8G7nGW5vSCkxS7 VE4rVd2HkfRlao8CMpFXh/eeAcx/gpGqFZoBqY8D16tNrNZVIm/8RgcYN8VIjMdnQMaaSz YRy/lseExJEyRPywQEQKkxRezgFLqFptQ6gpefcbsRXL3Ltiqo6m80nMi/gzULa8cTeV02 MhmHi9ugTXIV/acUL7dFySvlR8piaUTVgBwH4lMhBCbcbTKYtw768t6EPeSL9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703630196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFf0Gh4yfm0gAFEyrx25CKIwSGXnR05OR44eGRy3ROQ=; b=BubsKzPWR7g7uthuk5FtS6CgvGnZNesqOTOvT9GT0jWU18wfDg14gKnnvYRq0Yb85Tr2f/ WeJqJwIA5TGZz1fOW+awgf7/psuPp5hs1dntG0LpJEj83/k04qBBRx9R331t/9VH1IQrwg oBMirDb4cCj0fX8DnPEZMUREoDMqun3NHVt2kUbm6reaBssMTnwB9Z2U9YnEaHJBIrs2WU cp60wNDMCm31xryWuS00Zm9tKMsTntsqey+kVRFImhWGwsmGNV4FeOPPVTwb1VFibnsc9t Fk1xD2TjgXIAEZLM6sonnbgvojFQCxSlwBh2SODiLUvh2qNphmfVNZpSirD+gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T08l75sQ0z1CPs; Tue, 26 Dec 2023 22:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQMaZ85067570; Tue, 26 Dec 2023 22:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQMaZuV067567; Tue, 26 Dec 2023 22:36:35 GMT (envelope-from git) Date: Tue, 26 Dec 2023 22:36:35 GMT Message-Id: <202312262236.3BQMaZuV067567@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: a558130881e9 - main - nfscl: Fix handling of expired Kerberos credentials (NFSv4.1/4.2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a558130881e9d574dc5f37827fe2284667d5aba8 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a558130881e9d574dc5f37827fe2284667d5aba8 commit a558130881e9d574dc5f37827fe2284667d5aba8 Author: Rick Macklem AuthorDate: 2023-12-26 22:33:39 +0000 Commit: Rick Macklem CommitDate: 2023-12-26 22:33:39 +0000 nfscl: Fix handling of expired Kerberos credentials (NFSv4.1/4.2) If the NFS server detects that the Kerberos credentials provided by a NFSv4.1/4.2 mount using sec=krb5[ip] have expired, the NFS server replies with a krpc layer error of RPC_AUTHERROR. When this happened, the client erroneously left the NFSv4.1/4.2 session slot busy, so that it could not be used by other RPCs. If this happened for all session slots, the mount point would hang. This patch fixes the problem by releasing the session slot and resetting its sequence# upon receiving a RPC_AUTHERROR reply. This bug only affects NFSv4.1/4.2 mounts using sec=krb5[ip], but has existed since NFSv4.1 client support was added to FreeBSD. So, why has the bug remained undetected for so long? I cannot be sure, but I suspect that, often, the client detected the Kerberos credential expiration before attempting the RPC. For this case, the client would not do the RPC and, as such, there would be no busy session slot. Also, no hang would occur until all session slots are busied (64 for a FreeBSD client/server), so many cases of the bug probably went undetected? Also, use of sec=krb5[ip] mounts are not that common. PR: 275905 Tested by: Lexi MFC after: 1 week --- sys/fs/nfs/nfs_commonkrpc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 7ca150d4f54c..e5c658ce76d2 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1047,6 +1047,22 @@ tryagain: NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = ENXIO; } + } else if (stat == RPC_AUTHERROR) { + /* Check for a session slot that needs to be free'd. */ + if ((nd->nd_flag & (ND_NFSV41 | ND_HASSLOTID)) == + (ND_NFSV41 | ND_HASSLOTID) && nmp != NULL && + nd->nd_procnum != NFSPROC_NULL) { + /* + * This can occur when a Kerberos/RPCSEC_GSS session + * expires, due to TGT expiration. + * Free the slot, resetting the slot's sequence#. + */ + if (sep == NULL) + sep = nfsmnt_mdssession(nmp); + nfsv4_freeslot(sep, nd->nd_slotid, true); + } + NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); + error = EACCES; } else { NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = EACCES; From nobody Tue Dec 26 23:03:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T09L22hWkz54Ts4; Tue, 26 Dec 2023 23:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T09L21pVRz3gW6; Tue, 26 Dec 2023 23:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703631802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0bIzIDJrrg+oY0bjKyqEeFxwBeHnzl/T1HSeiRTpWU=; b=UODsdCZPfoILgiyCXnvEvysLOQ09CfXm0N5VOLs7jPe3XnM1d/RUZ8oFCrnXKdJRxTCFve SP9fprcKg19QDlPDZsHWkZcXsGBK8xv975iqfHvLumNHBs9u0OGPMQm8IZraIJ+1FSNvNp a+30hNBYd04kq777hExOluiVVEt1ySd+CUVdcOLF0XsGFcOFNZ1IIYWmrF9piIsWyao5I5 YTE1pKhA0bpbo7PBBO4DBDyIOcl+P0SFIcw8e0HbBHB7YRYHyt+iKpQ96fKUg27bpn5nBm Jpz4fgqVJxIrlmNyovyFBOtONbyYf1SNit7Se9xoXaSp+SD5gUt411ApZf/0ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703631802; a=rsa-sha256; cv=none; b=jwoc+6w8sXFWai9jBj4U/f7az0A/VATFt2itgGVbCuU2Gh4+5WfSWqrQT5jNXEsr/KM03m XCakc/d3g7hnwap0LmO7bIpeOrkW5ao8D27y3EymlmNTO1KYHLptTakgwbgfWtC8z2jVR2 eiVJpfbBs9SRyDBbAk5PAJJE2tqpnHMscKsEJhuGRbpstVSJK3JlnRMYlupcR/4L14x8ue I5qK/3qyIpG3dZjLRfy87W+r7HAuYVnGnaG2nZS6VJJiLOP6Oj8oht+gyEjtXlR5vsZbMc oxtKLVcXVvmlqmcNTADUfKdPmFZTLrQ6XKCWptz9G19QGZbdjzRZtjICTPDbKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703631802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0bIzIDJrrg+oY0bjKyqEeFxwBeHnzl/T1HSeiRTpWU=; b=ar23hoz0YlyeLvF40+P2RJX/Gft/UtRwalH51G3COmIsOUNmpk35Ryrh9tn9EL/VY3Iznx u+HkksbWJyQmLgAW31ewiJOpiCorQuFz3MtsKVvZxCsEj25sjnuyqcMJJu1+ZE7NaYESva LovKpGX4DeceFfoc8BsJJLUlwJKPmbKlm1rJ6/w9E662nJzYIaq9nXO0V3zDiiX0PZe8Rj iqowdHwgBeK/y+iurEHNJoGj2I9v4YzOMhz0kOb3e1aaCZpqWZ8Ru4pVcXsTERDkxKCKLp uyC7iUMjx4W3Eil4A/rY8lgmZ80Y9QLC/SOHY3sloLo8SO18WmSk40BNnQlW6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T09L20t0hz6m; Tue, 26 Dec 2023 23:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQN3MKI018287; Tue, 26 Dec 2023 23:03:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQN3M6c018284; Tue, 26 Dec 2023 23:03:22 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:03:22 GMT Message-Id: <202312262303.3BQN3M6c018284@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: 208f089d459d - main - RELNOTES: Add an entry for commit 1a878807006c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 208f089d459d506f0ff4809e62cfcbe8805e4b4e Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=208f089d459d506f0ff4809e62cfcbe8805e4b4e commit 208f089d459d506f0ff4809e62cfcbe8805e4b4e Author: Rick Macklem AuthorDate: 2023-12-26 23:01:42 +0000 Commit: Rick Macklem CommitDate: 2023-12-26 23:01:42 +0000 RELNOTES: Add an entry for commit 1a878807006c --- RELNOTES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELNOTES b/RELNOTES index de7359b87185..509cf36c070e 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +1a878807006c: + This commit added some statistics collection to the NFS-over-TLS + code in the NFS server so that sysadmins can moditor usage. + The statistics are available via the kern.rpc.tls.* sysctls. + 7c5146da1286: Mountd has been modified to use strunvis(3) to decode directory names in exports(5) file(s). This allows special characters, From nobody Tue Dec 26 23:55:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BVM2MzSz54Znf; Tue, 26 Dec 2023 23:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BVM1jvfz4Gdh; Tue, 26 Dec 2023 23:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/aliSAUNP7kFZIsUG8O+/ANGFLzTdN92jmgmFrQJWQ=; b=FIGvdFjL0ZHrFtL3GaZaelp+dFNP08iKyZpyUtAVBp2UGAXEpV52/crdMTBRbRCTnpfDZp XNIkERTx9m7+E+nMzPxd6WKV1yRPRExt7JHG5yvEaSzGhPTO94PukQcf/bDKVIhL+MTr3Q BwdnehECoVwbfevua5K9ZHpRMFNH5w86Fnq5L2boLbqGLwIJN9D20pFyFDKHB0FZ0OUhTt Kqv3gtGBIysTnM3VpI+1fHpQ1iZ7IJyClOB+fY1IDmheJkfblj4iwI8aKUNL4J0bRjl/wp gm6lWZeD7BEYXDkEFprALF1FKT1VbFYuOVOl5to8eDYTkFVNXUjzYcq6htfrJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703634939; a=rsa-sha256; cv=none; b=irhzN63YLxXHQvlv+td3smUipR5Sze019i4MpfM5Xe5Nx6iWNaV1UH/Oo0TBHjCt7Xy44M ZQW9J/9AUQRYzM1lssJR83f//XwykjK12KKwJeu0E7ER2twR9uo3HnDZD8mcTzdPWG9FnZ y+HlBMsuGAZ0vhyLnEUYwWJCij43tNZyF7DApaFd1SC1e/LoxD36ZEFw/C5nDcgukLDZmA DVjyUBmclJICef3p6YB4qkKAOlfZ1cfrpdi8PCAOORf7NKRrVO4B2GItllT7qVl5wbI5+t d4yX+MBnPdQ/PhKuzH8o7JPj92rHPLTGIHrJe5sm6qrTox5BJqVqcTIkaVRXvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/aliSAUNP7kFZIsUG8O+/ANGFLzTdN92jmgmFrQJWQ=; b=TUnaQcQHRRNwX2Od+SYvvSAbPyt6e8LApf3FsrHf8VnaerK+x9KYsf3eke4vG3B4X4Ay1d reXwtjrIfabxng2C4CVCQqWpdQNqiUjyni4wSpfEPpgZ/jQiLdHiuUZ3u2OII5GbKoqLSH uyyMPD4l/gkRoNl4jBuiCkCctzNJwc2LsrwxvdumPgLYQjy3UMVfuCuR0LutaRmYgnjBRO uzphjEzb09G7RR2yqYPPNwgOGjJsKtVKpcleY/OLF887n4C/ElKhJSORKV+H5mD7ESDzO/ S//BdU0keuqtyDwRGuc14agrYwrJuZqVmYzPGFeT+uzX8w5haRfsUBBFzvhYJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BVM0mvNz1FX; Tue, 26 Dec 2023 23:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQNtd3Y000830; Tue, 26 Dec 2023 23:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQNtdaO000827; Tue, 26 Dec 2023 23:55:39 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:55:39 GMT Message-Id: <202312262355.3BQNtdaO000827@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: d4d14d965fb9 - main - atf-sh: fix comment typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d4d14d965fb92d2bceb744be41310dc47f27ab80 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d4d14d965fb92d2bceb744be41310dc47f27ab80 commit d4d14d965fb92d2bceb744be41310dc47f27ab80 Author: Igor Ostapenko AuthorDate: 2023-12-26 23:21:54 +0000 Commit: Warner Losh CommitDate: 2023-12-26 23:24:42 +0000 atf-sh: fix comment typo Signed-off-by: Igor Ostapenko Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/895 --- contrib/atf/atf-sh/libatf-sh.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/atf/atf-sh/libatf-sh.subr b/contrib/atf/atf-sh/libatf-sh.subr index a2478b6a9be1..af2b75e5fe34 100644 --- a/contrib/atf/atf-sh/libatf-sh.subr +++ b/contrib/atf/atf-sh/libatf-sh.subr @@ -358,7 +358,7 @@ atf_require_prog() # # Sets the test case's variable 'varname' to the specified values # which are concatenated using a single blank space. This function -# is supposed to be called form the test case's head only. +# is supposed to be called from the test case's head only. # atf_set() { From nobody Tue Dec 26 23:55:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BVN3FB7z54ZkT; Tue, 26 Dec 2023 23:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BVN2NHWz4GjV; Tue, 26 Dec 2023 23:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTc6e56b6eZQ1QiLAeOnxJ+JDB0dl12f96SQAi2AWF0=; b=YTR4mrsQJK25Ys83C2417qbd+yZ5GG+TMfdQcTHqtpZgc0Mt303crErbLraMoIikK47Btk cihBvqmSWQLiFF2pZo3IE5kZ6Se6lcaCuRWdIllpeTZz7pSuEk+TOLCpPBLbJ4jyu56EdR k4997gbe16nHDA3zxuoXqc7D60zAH1OQHBehPSkyxyBR3/pRfRT1+331GOaBmdSk+hVPOJ 46a9SJPjDMasu/iFbqdD2Dcx+OIZm6iEZRX9vNhtSKN1FuVVZ+X9rEYhH6m3dDKHSsZd76 3Wy4DXUPey5gRIHcr2L2wMNknlkA8fiQl9acPm0XA4iC7KLUqUes080VsCvGMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703634940; a=rsa-sha256; cv=none; b=HMnpmk2QP+MNOWx0GMg9r/7RrC5mEwnV796gkUyFerMBh81a2JdEVkxQC174xbOp++zn0h zGAGhNsEOC0BN11Bf6quy/wg2pakl7dWdw5Qw2HlqnHY5G1ZiS+eTegkm66rxJMGcK3zzd C0XEjpQM9/kYlTrwEMlMdTpbz2eBXRoNC7KblwK4pNJD4fh95IRULzChmAn4hAKAB3sguW I/spVzgsuVVNMuGwoBGfgggbPR8lLvDL7ybJguONNKl37x/3qG8hmTV6HOw4vq6cKt+xfZ IP5+WTOQVku6fqETqAh0hu/+fQcAqUi9WJ0x0MOJTECWyH6WMbFUCgLGRtMEeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTc6e56b6eZQ1QiLAeOnxJ+JDB0dl12f96SQAi2AWF0=; b=SfZfY3gtuOkVYwjHXopIOMPwSz9d142SeajKl4z9a//IVGddbMoZNCwLpgtL0Karv0ZRbe lo/a23zPNXbCYkn7g7kul8hocV6FdklL/uNQ1sJdytAAG/ZusjfXk9a5rdm+ereAJ+xfeu 55kgnQfc/Tvs7w8TGbJ3Ptshk/WXE3hDelZmeC0fXXcHyKv46+IK5Q+aEJFHuZdhR6hboH zsUAxVu2YxmvygRUP536tazqWPJUE5nofjfQUrQKUxvGc55gAsHx1btCrqrTH60ruU7q+a oarZ3Ty6xS1JIGuJEeQW1Bz+uaX7w9vvBvptlfBocyEBjChUOdsiZSpygiE8mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BVN1RK6z1RK; Tue, 26 Dec 2023 23:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQNteqS000869; Tue, 26 Dec 2023 23:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQNtebK000866; Tue, 26 Dec 2023 23:55:40 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:55:40 GMT Message-Id: <202312262355.3BQNtebK000866@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: c6ae97c44d4d - main - sys: ${CFLAGS:N-flto} -> ${CFLAGS:N-flto*} List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c6ae97c44d4dc0d90d20bec3235a6484912767a1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ae97c44d4dc0d90d20bec3235a6484912767a1 commit c6ae97c44d4dc0d90d20bec3235a6484912767a1 Author: Alex Xu (Hello71) AuthorDate: 2023-12-26 23:24:53 +0000 Commit: Warner Losh CommitDate: 2023-12-26 23:31:51 +0000 sys: ${CFLAGS:N-flto} -> ${CFLAGS:N-flto*} For the same reason as the original https://reviews.freebsd.org/D9659: -flto=, -flto=full, and -flto=thin also produce the GIMPLE/bitcode which is not supported by genassym, so filter those out as well. Signed-off-by: Alex Xu (Hello71) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/898 --- sys/conf/files.amd64 | 2 +- sys/conf/kern.post.mk | 6 +++--- sys/conf/kmod.mk | 4 ++-- sys/modules/linux/Makefile | 2 +- sys/modules/linux64/Makefile | 2 +- sys/modules/vmm/Makefile | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index dfbe278f0c46..de509e362b6d 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -25,7 +25,7 @@ elf-vdso32.so.o optional compat_freebsd32 \ # ia32_genassym.o standard \ dependency "$S/compat/ia32/ia32_genassym.c offset.inc" \ - compile-with "${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \ + compile-with "${CC} ${CFLAGS:N-flto*:N-fno-common} -fcommon -c ${.IMPSRC}" \ no-obj no-implicit-rule \ clean "ia32_genassym.o" # diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index d2968b42f5ef..34877a01b7dd 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -245,20 +245,20 @@ offset.inc: $S/kern/genoffset.sh genoffset.o NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genoffset.sh genoffset.o > ${.TARGET} genoffset.o: $S/kern/genoffset.c - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon $S/kern/genoffset.c + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon $S/kern/genoffset.c # genoffset_test.o is not actually used for anything - the point of compiling it # is to exercise the CTASSERT that checks that the offsets in the offset.inc # _lite struct(s) match those in the original(s). genoffset_test.o: $S/kern/genoffset.c offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon -DOFFSET_TEST \ + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon -DOFFSET_TEST \ $S/kern/genoffset.c -o ${.TARGET} assym.inc: $S/kern/genassym.sh genassym.o genoffset_test.o NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: $S/$M/$M/genassym.c offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon $S/$M/$M/genassym.c + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon $S/$M/$M/genassym.c OBJS_DEPEND_GUESS+= opt_global.h genoffset.o genassym.o vers.o: opt_global.h diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 5d4dcd4371bc..3dc83ce4c423 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -524,13 +524,13 @@ assym.inc: ${SYSDIR}/kern/genassym.sh sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c offset.inc genassym.o: ${SRCS:Mopt_*.h} - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon \ + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon \ ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c offset.inc: ${SYSDIR}/kern/genoffset.sh genoffset.o sh ${SYSDIR}/kern/genoffset.sh genoffset.o > ${.TARGET} genoffset.o: ${SYSDIR}/kern/genoffset.c genoffset.o: ${SRCS:Mopt_*.h} - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon \ + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon \ ${SYSDIR}/kern/genoffset.c CLEANDEPENDFILES+= ${_ILINKS} diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index d1035445ccfb..88b3b8f5e123 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -135,7 +135,7 @@ linux${SFX}_support.o: linux${SFX}_support.S linux${SFX}_assym.h assym.inc .endif linux${SFX}_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 05fe76ba6a51..9ac1944ad1a9 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -101,7 +101,7 @@ linux_support.o: linux_support.S assym.inc linux_assym.h ${.ALLSRC:M*.S:u} -o ${.TARGET} linux_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6bb78d055580..46909dad6c71 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -82,9 +82,9 @@ svm_support.o: ${.IMPSRC} -o ${.TARGET} vmx_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} svm_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} .include From nobody Tue Dec 26 23:55:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BVQ01KRz54Zcq; Tue, 26 Dec 2023 23:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BVP5tYnz4Gjj; Tue, 26 Dec 2023 23:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrhcKl0M47FNttYun29S4zpOgMPr14kiQmRa875XA3c=; b=M9z2WKT7vlxf4SSfEqcBvBN1ErYFqELZspwh8Kypz0VUUKiR5fChMyVYTvWDg8Bn+6HZgh VoEThx0IeEad7BjOeGTB6D2sOVU84tV4WSMYtVMzewXM71oitr+6WcUgbgFjr4Vf0PprG/ m+Tvo+MhSKeT1DDGKMXOTFx3FfcZ3Jny7qXnz4kn7UG19mlZNNDhTq2I9jx4RC9qOZXvry 90eFFQqSR0XU0zQbrq9drA+oA2DWEoTnNDVnqGy5W/7ds54kxUBfqq1TkLUnr25O7hcJQm aaIKZ18jWxMgdOycyPpban4blG/VO2AQOOTPJ4P7e3a86BqWh7HFy1krIi1s3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703634941; a=rsa-sha256; cv=none; b=pDtevbrIOvqcs5tzyOpJL0Aj5sDhqPr7Y5dqGez4dE6Ai+zdaI80j3iJM0isLOWM7V2VZM vQb5kScsFhB7LwYEKlv2bUUJxKfXWR+MalbvcZ/BrytvK34IU5yJkd818K1eKOVdvkPCwk wUwtI8a9kYazUJHydIXsZxg+nHl0wxlnaGQ/7x3a2WIkGjqTgepUvq8JMUDKAA4xow6goW 4x0RNj5J41CQIvbjuX+lFHadcP2hpEgBH+KEpTFEk1OFlaUqAvPLyA/oSyLmaQdJic6c9B 61l9DUwF1Dg/NrqAuvOOuHHpade2TTCj7ogG682ZG8OL2G/Mg4Ya6LDBGex+Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrhcKl0M47FNttYun29S4zpOgMPr14kiQmRa875XA3c=; b=n8deZL2RkuzcOk/hoPajR6wx/K+0Pp59IloYKtu/NWHclG5740TyQ4GqjOEXx5DdGC/Qvj mPCXCukhUOdk19W0VpPGM1pZU5D//Rqj9grfSXzRk1WZltxsCj4OxlfFsRCK2R/3Xgk8Oj WMlHlB3CycpyZUfGv6BPViFxTXsvMKbokqyguJpvAkjLZ2h3uwmKY2xu/adOVRbomvUHtr Iz8ijNWp1AsuTCZXji0uYK2v5hj4Sm8os76WECZHE58DZDDSrYnOEVDSOW8a/5d2vxYEsN evMsrK4bVJ8jHMAzyiIoMJidg9rH3RzWvdyvFjRiZbst5cHSSFbCqS6kDxFc9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BVP20B1z1y1; Tue, 26 Dec 2023 23:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQNtfh0000905; Tue, 26 Dec 2023 23:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQNtfmv000902; Tue, 26 Dec 2023 23:55:41 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:55:41 GMT Message-Id: <202312262355.3BQNtfmv000902@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: fd4fafa87322 - main - timeout_test.sh: Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: fd4fafa8732203a3e20f5404a65de83d37687e3a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd4fafa8732203a3e20f5404a65de83d37687e3a commit fd4fafa8732203a3e20f5404a65de83d37687e3a Author: Elyes Haouas AuthorDate: 2023-12-26 23:39:25 +0000 Commit: Warner Losh CommitDate: 2023-12-26 23:41:15 +0000 timeout_test.sh: Fix typo Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/906 --- bin/timeout/tests/timeout_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh index df497d4f3350..2a8e0112b97c 100644 --- a/bin/timeout/tests/timeout_test.sh +++ b/bin/timeout/tests/timeout_test.sh @@ -82,7 +82,7 @@ exit_numbers_body() -s exit:124 \ timeout .1 sleep 1 - # With preserv status exit should be 128 + TERM aka 143 + # With preserve status exit should be 128 + TERM aka 143 atf_check \ -o empty \ -e empty \ From nobody Tue Dec 26 23:55:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BVR048Nz54ZWv; Tue, 26 Dec 2023 23:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BVQ4BLzz4Gq1; Tue, 26 Dec 2023 23:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5L+/LW1rW9QqZolrYf4YvorbyW7lCE2wfaQJenpqErk=; b=Do0/gQVn/yYErMBH/B7MKuOCZyldTxbLr0R9duunVPpRGa1eQliTJSnv7BzcEuDM1veSNe GGuEwG/7sEkWxVw8dKm5b7N2w0BXKpRfQNpCmr4v5CWut+iqKUTjjpvOESVThiw1ngYrsL SxcvcyFLGZ6ED7Ixy4vUIJ/bHZj4a1mJdwiYFmVsltQUXsMyFqeRY17bjvPr1fJnEzgcvN krLeaQs7lQSyHZRytP2uR7vq6fpuAw0uItOD+/NC6GM5bsZRZMzH6QlCGewYLff7fUFvf0 i+dFVZ2oCxENhdbfdRjv5LzTz9KIPQUFdIMF/VsTKuCwYUJETfGTjJgy7rNctQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703634942; a=rsa-sha256; cv=none; b=RGh6dR2YPAZiCd42zkFVf2h+SgFt+U48nI1y0LkmBD3d+ffgPQlwTeYwdzvL1rfhsHi0mc 4ZSu/eM8SgdaRHo1vKAcNptygDaB4LFj29wfiNyBBhPyO5/QpemY6QPj7kBq2T1OzcKRDe 8KmAb0QmDioVFPLzifYpV2TBbI8GLaU+h/uvtQQqiBKaO+x1me2GudUQhcsVumWtQEEDjI RSSxinbTDNkvnk5SgmaeSsRLTfgJINrgvqqWKCHUYDfE4ohn7y1h07pOaNH8BrV/Uk/AfU 2mpjeRdIgVt8N9JtGB3iUOyQFYq0n6sgiPV2U96zAK+aOc1FOHsI5PmmOpjqeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5L+/LW1rW9QqZolrYf4YvorbyW7lCE2wfaQJenpqErk=; b=OgHcFd5DhO6RY5RciIgOYMRZYKh588XzZ4sk05RUvGknOAWrLh0UYCsaC6a40rAVvxzdZN k1Dtu3j4jFKdq2i5xX+irNXBZqbLkhVdnIQTqcWG6Oq0l7QF2HE+dgPaURqFAkfrnN9zpT ukp/fJ14B318OZ6m5mQaUsCqJnnPBYltpnIXZiDes0V6XgmMUWJfC61lzEd6TuxO7JWTqw XMoZol8Y0d3eKMxNsttaa/3K9rom1b4vY8b7JrNaXux0MGgxDyITuTUPCPlM+YJlcNphY3 9Zmg28kzNVRj2G5GEa2ivhJSxxNuTQ/PhIQ4CxPAaNawsjX6s/aAMSObZu7Grw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BVQ3GzJz1m4; Tue, 26 Dec 2023 23:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQNtg9t000965; Tue, 26 Dec 2023 23:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQNtgeT000962; Tue, 26 Dec 2023 23:55:42 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:55:42 GMT Message-Id: <202312262355.3BQNtgeT000962@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: b3ab6b502910 - main - ncal(1): print the correct option name when -B is specified twice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b3ab6b5029104c04697df40015add32f219671fa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b3ab6b5029104c04697df40015add32f219671fa commit b3ab6b5029104c04697df40015add32f219671fa Author: Daniel Tameling AuthorDate: 2023-12-26 23:44:47 +0000 Commit: Warner Losh CommitDate: 2023-12-26 23:45:26 +0000 ncal(1): print the correct option name when -B is specified twice Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/911 --- usr.bin/ncal/ncal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index 20d14b3a4bde..6f5e1e89bf93 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -271,7 +271,7 @@ main(int argc, char *argv[]) break; case 'B': if (flag_before > 0) - errx(EX_USAGE, "Double -A specified"); + errx(EX_USAGE, "Double -B specified"); flag_before = strtol(optarg, NULL, 10); if (flag_before <= 0) errx(EX_USAGE, From nobody Tue Dec 26 23:55:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BVR66NYz54Zgw; Tue, 26 Dec 2023 23:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BVR4k96z4GfD; Tue, 26 Dec 2023 23:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWH5klx+ua1YzMUKy7617jT/sYvD0qFeLPpdqSSdwMg=; b=wpqLOQ3VerFh7wpPn6N/Ab+Um7q4LsA4gu39UsIy99ReathnUbGHoR2mUiHbxCyMoKwF8g nRkeQDr6xvizpED9zfmUcDC6+G8LOqan/Dv9ZKEvAT/TYWn9pXY/zj7xMB39Qnhd8fnfKb 4qtlK/EdgeynA+0lwkaOSmodqzB5tOoosS7f9sYK4y0Rhb62euI4oYAZzopkWFs4hTfOJ6 0yDZ4+jyrWIYlb/27oiz+kPwKCIT0A4ZOlnHAmj35yjVcaPzU2NYUpv9wZJi1XajczGiOT bWTUueT/fHDf7toyDyHQFUaL/oPa/+S3DwiuWhGuuv7HZFqzS27+uk95al6CtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703634943; a=rsa-sha256; cv=none; b=Ehm/K8PXzfa6fHn8E/Kl5vQHaqc9/+obzAjbP+RSZ87goMf5v5V0X8jZkmlWuQxNF4arXk qlUxmXWbkyZGBqBwTlKbp3q8rozmOsDOO2+iTTKiStGsOAjvsZgL3Wl5h7oD1M7d81MQeG ifaC+9Xu8a8s0VqT91gi+u2G8C2Y43KsJcAZNSTG2N1g19qiwHtKFdTFpZ79OpJJyUl4Gs FGfRMzcHcIBX1L4LqKjeHuhkpKcLsmzmnYlYLkU39084PomTGmE/WD4Yo2VIDDNJSfO0Tl ZCvTfs/rr0DQy9CxCFw28wdLk+qspTjG5p/OQKuGPWZ6JxmLdEN5KyMsYJz6VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWH5klx+ua1YzMUKy7617jT/sYvD0qFeLPpdqSSdwMg=; b=iy8ELaMmLIXe6ERz18mFY+LL/3PjLHnWpI8X1U0tLDsjJAFIAmWI8Yl9ZpKBDAZ0pKPRNi dpFnbawlQtbXAeczRx1AcG9n4qMxzf8xpLbQ7OxD9wW099qDNlXX6oM7tetHuwpXsxwXgf y5I87Hb00vTT2BXnzH3wM7W5x5rTvHbRKaFP4+lvhpNyLi94T3O51S5nYm9JNqc41nnjud Aw3oTKibYDA5Y9JLKrEhFC8hfrZ1+kq+SQExtfe1HpQN4aar3+euSa50VfTMyhxOKk8dcH qK8kmM3mWwxEmmKhUve4uzVBR8YyS8OOZUOtf49rJwIbm5x9Ub+GGn9hA7RgHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BVR3qyVz1FY; Tue, 26 Dec 2023 23:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQNthsG001005; Tue, 26 Dec 2023 23:55:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQNthUu001002; Tue, 26 Dec 2023 23:55:43 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:55:43 GMT Message-Id: <202312262355.3BQNthUu001002@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: 10b84b88f08a - main - cat: Use present tense List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 10b84b88f08afed6850a21c1ccffeed9f9fc607b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=10b84b88f08afed6850a21c1ccffeed9f9fc607b commit 10b84b88f08afed6850a21c1ccffeed9f9fc607b Author: Zhan-Wei AuthorDate: 2023-12-26 23:52:22 +0000 Commit: Warner Losh CommitDate: 2023-12-26 23:53:40 +0000 cat: Use present tense Event: Advanced UNIX Programming Course (Fall23) at NTHU. Reviewed by: imp, lwhsu Pull Request: https://github.com/freebsd/freebsd-src/pull/923 --- bin/cat/cat.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.1 b/bin/cat/cat.1 index b34c6fbf842b..59e0dff80ed0 100644 --- a/bin/cat/cat.1 +++ b/bin/cat/cat.1 @@ -152,7 +152,7 @@ character, print the contents of read and output contents of the standard input again, then finally output the contents of .Pa file3 . -Note that if the standard input referred to a file, the second dash +Note that if the standard input refers to a file, the second dash on the command-line would have no effect, since the entire contents of the file would have already been read and printed by .Nm From nobody Wed Dec 27 00:06:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BkZ1mgsz54bgl; Wed, 27 Dec 2023 00:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BkZ14dsz4Jdk; Wed, 27 Dec 2023 00:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zj0R474D2+H9D08LHyPe1CQsoMPrJNckkpCk92fxJBA=; b=m8EWsyS9zRyrJ117XH2GbUGoGIgKv8TOX91jeWoQ2kExLtSwcN6jbaw6JqXh0UrY3omepM FZlEvdFhfAbOoP2BnMq+Re2e0SjKVM58LmjkBLjxNWYOH+y4Jc8HhRAY4wqCf5t4hecgQ8 LCF1rLxqPoDAEwVnsZnlC+I/nfOx6I0FUfMuLj62XuizW1I599ZHpCUh91IkJv/VLZdO7p HPuRIoPgLeG79WiKLqI6ldYlmNfq/uA7Un5mxH8G0GI+tSDLE0BCU2Y6ljq5ILeQzctGyB id2NJtkaKQO6f2VS02dJs3wUyMV96S4WSZacwqVBpglN4v0Tkpr1odDbXo8Jlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703635574; a=rsa-sha256; cv=none; b=x06KWtfRrUs22LVHEeWr8zDEtkPv2dZ5M9tl8CzFyasnXLpOlRTWWSHAJS611w5Znqk+Nd KUa2rfFD1crvIxKKb7H/staBodxahlPAM4nvUdqjRNckZ4Q2GP2xPDryPyTOA2EQ6ZLfoV FCkaJ12DZtUGB3Rxx6QecT5q/BWVWOhcNiUYrKo7n4yOqjKdLMHb0PTr9ctZY8y5Bm8CI5 391ci8BRcDNBEdF/aSYcJRT1QRXErQuTPrbpzVFPzzjPeV/mmRJRFTL+JcFetRqOFV+FcV mk1we3X952no96iYgogev16gpn0zXGdku1o/t9rwPiSd2ThVqmobxZ6ZehcvNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zj0R474D2+H9D08LHyPe1CQsoMPrJNckkpCk92fxJBA=; b=QxOnRO7mZSWWglVCQLtWOZtHENPtQfZ/xz22hSUXKsVsq5nWvphJ9ks7GmcG3B3sR867gJ A0N0dXgp0i7uFUx1qDw/3AC+O4yA0tvMXiw3308LBcg1OmzcCSFtwMDdtuL1lkL9801uCM shQrIu6bRxKbhR8bqCMgNQ1LGkwYznlPCIQtqq1GjLPZ2VfedMWHIrEbyxjXNv+K2r9pEG E8CkoXcOa6CU6au4F5fRMC1XnaBX4vCIrwWhq6rHAogYcV4w8vOCg42QXOdGgw4M1Q9Kpb kjTOpb1f1Dv6JrQncJOK2GzWJJawdfbwiwdIwMuiKnlq+k18Nsz/l4UYL5sUFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BkZ03Gpz1yf; Wed, 27 Dec 2023 00:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR06Dcf018747; Wed, 27 Dec 2023 00:06:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR06Dc4018744; Wed, 27 Dec 2023 00:06:13 GMT (envelope-from git) Date: Wed, 27 Dec 2023 00:06:13 GMT Message-Id: <202312270006.3BR06Dc4018744@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: 916273680b6d - main - ti: Handle errors from copyin() and copyout() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 916273680b6d6439a117d6cf8c2d7423234bc1c0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=916273680b6d6439a117d6cf8c2d7423234bc1c0 commit 916273680b6d6439a117d6cf8c2d7423234bc1c0 Author: Mark Johnston AuthorDate: 2023-12-26 23:58:24 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 23:58:24 +0000 ti: Handle errors from copyin() and copyout() This is in preparation for annotating copyin() and related functions with __result_use_check. MFC after: 1 week --- sys/dev/ti/if_ti.c | 56 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index 4d7f43f080cb..6f88862d8009 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -502,11 +502,13 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, int segptr, segsize, cnt; caddr_t ptr; uint32_t origwin; - int resid, segresid; + int error, resid, segresid; int first_pass; TI_LOCK_ASSERT(sc); + error = 0; + /* * At the moment, we don't handle non-aligned cases, we just bail. * If this proves to be a problem, it will be fixed. @@ -548,7 +550,7 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, */ origwin = CSR_READ_4(sc, TI_WINBASE); - while (cnt) { + while (cnt != 0 && error == 0) { bus_size_t ti_offset; if (cnt < TI_WINLEN) @@ -573,11 +575,13 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, TI_UNLOCK(sc); if (first_pass) { - copyout(&sc->ti_membuf2[segresid], ptr, + error = copyout( + &sc->ti_membuf2[segresid], ptr, segsize - segresid); first_pass = 0; } else - copyout(sc->ti_membuf2, ptr, segsize); + error = copyout(sc->ti_membuf2, ptr, + segsize); TI_LOCK(sc); } else { if (first_pass) { @@ -597,7 +601,7 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, } else { if (useraddr) { TI_UNLOCK(sc); - copyin(ptr, sc->ti_membuf2, segsize); + error = copyin(ptr, sc->ti_membuf2, segsize); TI_LOCK(sc); ti_bcopy_swap(sc->ti_membuf2, sc->ti_membuf, segsize, TI_SWAP_HTON); @@ -605,8 +609,11 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, ti_bcopy_swap(ptr, sc->ti_membuf, segsize, TI_SWAP_HTON); - bus_space_write_region_4(sc->ti_btag, sc->ti_bhandle, - ti_offset, (uint32_t *)sc->ti_membuf, segsize >> 2); + if (error == 0) { + bus_space_write_region_4(sc->ti_btag, + sc->ti_bhandle, ti_offset, + (uint32_t *)sc->ti_membuf, segsize >> 2); + } } segptr += segsize; ptr += segsize; @@ -616,7 +623,7 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, /* * Handle leftover, non-word-aligned bytes. */ - if (resid != 0) { + if (resid != 0 && error == 0) { uint32_t tmpval, tmpval2; bus_size_t ti_offset; @@ -649,7 +656,7 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, */ if (useraddr) { TI_UNLOCK(sc); - copyout(&tmpval2, ptr, resid); + error = copyout(&tmpval2, ptr, resid); TI_LOCK(sc); } else bcopy(&tmpval2, ptr, resid); @@ -667,21 +674,22 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, */ if (useraddr) { TI_UNLOCK(sc); - copyin(ptr, &tmpval2, resid); + error = copyin(ptr, &tmpval2, resid); TI_LOCK(sc); } else bcopy(ptr, &tmpval2, resid); - tmpval = htonl(tmpval2); - - bus_space_write_region_4(sc->ti_btag, sc->ti_bhandle, - ti_offset, &tmpval, 1); + if (error == 0) { + tmpval = htonl(tmpval2); + bus_space_write_region_4(sc->ti_btag, + sc->ti_bhandle, ti_offset, &tmpval, 1); + } } } CSR_WRITE_4(sc, TI_WINBASE, origwin); - return (0); + return (error); } static int @@ -689,7 +697,7 @@ ti_copy_scratch(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, caddr_t buf, int useraddr, int readdata, int cpu) { uint32_t segptr; - int cnt; + int cnt, error; uint32_t tmpval, tmpval2; caddr_t ptr; @@ -715,7 +723,7 @@ ti_copy_scratch(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, cnt = len; ptr = buf; - while (cnt) { + while (cnt && error == 0) { CSR_WRITE_4(sc, CPU_REG(TI_SRAM_ADDR, cpu), segptr); if (readdata) { @@ -756,18 +764,20 @@ ti_copy_scratch(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, "%#x (tmpval)\n", segptr); if (useraddr) - copyout(&tmpval, ptr, 4); + error = copyout(&tmpval, ptr, 4); else bcopy(&tmpval, ptr, 4); } else { if (useraddr) - copyin(ptr, &tmpval2, 4); + error = copyin(ptr, &tmpval2, 4); else bcopy(ptr, &tmpval2, 4); - tmpval = htonl(tmpval2); - - CSR_WRITE_4(sc, CPU_REG(TI_SRAM_DATA, cpu), tmpval); + if (error == 0) { + tmpval = htonl(tmpval2); + CSR_WRITE_4(sc, CPU_REG(TI_SRAM_DATA, cpu), + tmpval); + } } cnt -= 4; @@ -775,7 +785,7 @@ ti_copy_scratch(struct ti_softc *sc, uint32_t tigon_addr, uint32_t len, ptr += 4; } - return (0); + return (error); } static int From nobody Wed Dec 27 00:06:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Bkb2Syzz54bkJ; Wed, 27 Dec 2023 00:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Bkb1nRsz4K0Z; Wed, 27 Dec 2023 00:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu0Yh02Fm+CJpZoPn2iL+2IxVelgCRGQjki1yHtPJ9I=; b=B4io0GJDQ5QcHKAF9hynOhJQS1llxsRHJS2irc2lq/CHMdxyTnkt+ouNNthTAJ/WqUXh7+ 5zc4SttI13ZumM8M8D+CvNBHAOvAA6NQdgB5B6H+LaKPqzK9jO2Cfb63XLu3Q4OOJVmgbg FH7Xcbd36NnRgVHvRcsgI5PxRglQOdin9cyccxLJR4QCHlNgmk/AZjlZERhmzo8unWX8vW 4KGznkFg9N+9j3MhNI6Nrv3j4CZtBeRYMK3RQMyQllsFb4D4hEM+Su34sfOCpezm3JG9J8 DwRbEMqsO90INYP/hT1LiA9p8NsKqCfDdwUTWgI0Pua5Bojxh6Krn4eyK+NPuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703635575; a=rsa-sha256; cv=none; b=HKP/lhfHF5LG9LnbeMt9TUD4ZIa4W7yPGEDA46hBd60NUVhz2/h0DLI1PzqYf4z+j5rbTY ynUyGgcqXw7zGm7mg6UCKqwta7bnbCYcKHGtK6ZrTvOoEKguYQ6odRhSuvq/5cXQDTZrz4 39a2NIibP163J+wA9zu0sXAKBS/3A8z0fO+l3xU51kwuRN9xo/xSJCgfsrUt4HqxUVM2eV oZYXbSAHWSpa3AfRIcdwt5UVddY5lkMv30DtWUNXf58m4kMMpB6dYtIIFs/CKwCahjMfLT qbY0QP8sMBD6cFPFB/zJCTObi8Aspnv8kmImRKW0kbcJILisl0yB48jOPZvdaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu0Yh02Fm+CJpZoPn2iL+2IxVelgCRGQjki1yHtPJ9I=; b=WovPIjAjIaDSlUGN2HiW1SiRnRjTzHPAT5f5xaVU2YPUhJ+TzepU2pHQGnlMS/n1DQUjyM n+YyH6FT0j/a7KMnMDryhIaovzTD/3jVsmb61JdEVh42uFN+midUvIXsz07SYOWrJTCHzZ CXrN0RChh7n03z6CaHgco4mHyDozqrkhQ04C9CVmiVwj+QKEzhRdaWPBZsNOLUTSETgBZv Hbaj33/OXFwGmixenRq1iD44nJjkdDE4S1mOZx4NY0ErqvioFOm8TKjP95FoN4Fe/jqjKb BzQXhKyWCop740c5bC/IKnq/1Ziw+MsaOCnwe+i/ZB1AUWgFtlj+POXjS39Wkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Bkb0sg0z1Y6; Wed, 27 Dec 2023 00:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR06Fcw018795; Wed, 27 Dec 2023 00:06:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR06FFp018792; Wed, 27 Dec 2023 00:06:15 GMT (envelope-from git) Date: Wed, 27 Dec 2023 00:06:15 GMT Message-Id: <202312270006.3BR06FFp018792@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: 2873d841f81c - main - tdfx: Handle errors from copyin() and copyout() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2873d841f81cdc205135370875d3d71a3402e90a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2873d841f81cdc205135370875d3d71a3402e90a commit 2873d841f81cdc205135370875d3d71a3402e90a Author: Mark Johnston AuthorDate: 2023-12-26 23:59:21 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 00:00:53 +0000 tdfx: Handle errors from copyin() and copyout() This is in preparation for annotating copyin() and related functions with __result_use_check. MFC after: 1 week --- sys/dev/tdfx/tdfx_linux.c | 5 +++-- sys/dev/tdfx/tdfx_pci.c | 48 +++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c index 3a2b1b3e3922..f3410106bad2 100644 --- a/sys/dev/tdfx/tdfx_linux.c +++ b/sys/dev/tdfx/tdfx_linux.c @@ -58,8 +58,9 @@ linux_ioctl_tdfx(struct thread *td, struct linux_ioctl_args* args) if (error != 0) return (error); /* We simply copy the data and send it right to ioctl */ - copyin((caddr_t)args->arg, &d_pio, sizeof(d_pio)); - error = fo_ioctl(fp, cmd, (caddr_t)&d_pio, td->td_ucred, td); + error = copyin((caddr_t)args->arg, &d_pio, sizeof(d_pio)); + if (error == 0) + error = fo_ioctl(fp, cmd, (caddr_t)&d_pio, td->td_ucred, td); fdrop(fp, td); return error; } diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index 5aa0d9785e27..d73ec841f333 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -511,20 +511,16 @@ tdfx_query_fetch(u_int cmd, struct tdfx_pio_data *piod) switch(piod->port) { case PCI_VENDOR_ID_FREEBSD: if(piod->size != 2) return -EINVAL; - copyout(&tdfx_info->vendor, piod->value, piod->size); - return 0; + return -copyout(&tdfx_info->vendor, piod->value, piod->size); case PCI_DEVICE_ID_FREEBSD: if(piod->size != 2) return -EINVAL; - copyout(&tdfx_info->type, piod->value, piod->size); - return 0; + return -copyout(&tdfx_info->type, piod->value, piod->size); case PCI_BASE_ADDRESS_0_FREEBSD: if(piod->size != 4) return -EINVAL; - copyout(&tdfx_info->addr0, piod->value, piod->size); - return 0; + return -copyout(&tdfx_info->addr0, piod->value, piod->size); case PCI_BASE_ADDRESS_1_FREEBSD: if(piod->size != 4) return -EINVAL; - copyout(&tdfx_info->addr1, piod->value, piod->size); - return 0; + return -copyout(&tdfx_info->addr1, piod->value, piod->size); case PCI_PRIBUS_FREEBSD: if(piod->size != 1) return -EINVAL; break; @@ -552,22 +548,18 @@ tdfx_query_fetch(u_int cmd, struct tdfx_pio_data *piod) case 1: ret_byte = pci_read_config(tdfx_info[piod->device].dev, piod->port, 1); - copyout(&ret_byte, piod->value, 1); - break; + return -copyout(&ret_byte, piod->value, 1); case 2: ret_word = pci_read_config(tdfx_info[piod->device].dev, piod->port, 2); - copyout(&ret_word, piod->value, 2); - break; + return -copyout(&ret_word, piod->value, 2); case 4: ret_dword = pci_read_config(tdfx_info[piod->device].dev, piod->port, 4); - copyout(&ret_dword, piod->value, 4); - break; + return -copyout(&ret_dword, piod->value, 4); default: return -EINVAL; } - return 0; } static int @@ -578,6 +570,7 @@ tdfx_query_update(u_int cmd, struct tdfx_pio_data *piod) u_int8_t ret_byte; u_int16_t ret_word; u_int32_t ret_dword; + int error; /* Port vals, mask */ u_int32_t retval, preval, mask; @@ -627,17 +620,23 @@ tdfx_query_update(u_int cmd, struct tdfx_pio_data *piod) * at once to the ports */ switch (piod->size) { case 1: - copyin(piod->value, &ret_byte, 1); + error = copyin(piod->value, &ret_byte, 1); + if (error != 0) + return -error; preval = ret_byte << (8 * (piod->port & 0x3)); mask = 0xff << (8 * (piod->port & 0x3)); break; case 2: - copyin(piod->value, &ret_word, 2); + error = copyin(piod->value, &ret_word, 2); + if (error != 0) + return -error; preval = ret_word << (8 * (piod->port & 0x3)); mask = 0xffff << (8 * (piod->port & 0x3)); break; case 4: - copyin(piod->value, &ret_dword, 4); + error = copyin(piod->value, &ret_dword, 4); + if (error != 0) + return -error; preval = ret_dword; mask = ~0; break; @@ -678,8 +677,7 @@ tdfx_do_pio_rd(struct tdfx_pio_data *piod) /* Write the data to the intended port */ workport = piod->port; ret_byte = inb(workport); - copyout(&ret_byte, piod->value, sizeof(u_int8_t)); - return 0; + return copyout(&ret_byte, piod->value, sizeof(u_int8_t)); } static int @@ -703,10 +701,12 @@ tdfx_do_pio_wt(struct tdfx_pio_data *piod) } /* Write the data to the intended port */ - copyin(piod->value, &ret_byte, sizeof(u_int8_t)); - workport = piod->port; - outb(workport, ret_byte); - return 0; + int error = -copyin(piod->value, &ret_byte, sizeof(u_int8_t)); + if (error == 0) { + workport = piod->port; + outb(workport, ret_byte); + } + return error; } static int From nobody Wed Dec 27 00:06:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Bkc4Kbtz54bgw; Wed, 27 Dec 2023 00:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Bkc2qjJz4K5f; Wed, 27 Dec 2023 00:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+PmXaOc/7fCyN93iAI3xdWNc2w3Mn42jQsJrUhT73s=; b=XNdGQaKOhK/a3/SvZrLXVsN9S6bdLJxSB/R7SWFZFxcIMlXSNaV6G9BM6QgcDTeDTEDyW7 H5Da0P7nIhsUvMTL0+SZPZ4On09TP2rsNXWzXFsi8HhAgsK+Td7RXRDSIeIXRUaJ2tF1H3 xiwkypC/GJKLPrZCSJKmGaYIeMqS6sGvRtlIAMxVItBe27f5QIfGD48pUPzwcjhzSHooPn gCt/qyvKt67idj21nplOih3kzh3/bmOLhnssHdikp1jUsNs+kNlVn3xf4sysMD01ZeXnbh 33eEj8B4KGUOZ2S4sj1LZdIcA8/pxn433+EtoRhmnn+p66c9F4yeYqWtlE/HIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703635576; a=rsa-sha256; cv=none; b=IVdqt+FOSyCdKs4OIdL4hU3syPuQHeDMgRmuxRDToc4U5YqCMjHboF1kIZKUERf1sQeX2D 0LZvLBw57cAhmZ95/hShXBny0w5oH0FRF1WlIG3KAEwutMaIJfR8B6FzyUgE7dN7GGm9ll +m0IAGoK39as+U2OZIXWhT8FwqO3sEcOvTEA1USXvIVBFW2xIYWaEb+qH3DhVw8JDbXCyx HheYdiTJLWqwHEPz05UGaDTJK4dfRUabDsBUkImV7qbrnQ0NWhWeArTBoOmMjscVH3gIJ+ 7Rb2ne/umNoua/R4Wisp1fZ1KqqyvYLXWATytFS2guEjI4HwcMoWRdVvDd7fNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+PmXaOc/7fCyN93iAI3xdWNc2w3Mn42jQsJrUhT73s=; b=Ilj+e3iRFgwFkhEADUp8H41/ZQr/wQlH7tBc/HEXMKFEBGk38wmoVdeCzvcLqn+OEPOAz4 Jtwjl7SE0gEP89lFJA4Ge1Y03xYDJ4QmM5b75byA5mC8194q9zjS63zDm23C5KqFSVlu9g CDtNTPv7n8CgRYECBIXWMevjML4CQvjj6OxX8RXB+shYusM6WILVd8TMQjx6HBCAOFZ2WJ FgGnIdlWEi+AXQiKLjfTeDgG7LOeVefUCYa7pb81Qtp2z6cA+6zp3r1VqvQQCC03BD/V9A d3Bnp1PqqFfUTVYM0CnNO5PO0aKVvlCvwgdDErxnkEbwhvQZCl+bGPvoFdlMgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Bkc1dj0z22q; Wed, 27 Dec 2023 00:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR06Gks018850; Wed, 27 Dec 2023 00:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR06GFF018847; Wed, 27 Dec 2023 00:06:16 GMT (envelope-from git) Date: Wed, 27 Dec 2023 00:06:16 GMT Message-Id: <202312270006.3BR06GFF018847@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: b4a9e6d81447 - main - hptmv: Handle errors from copyout() in hpt_set_info() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b4a9e6d81447c46c7bae56dc798097d9d3a4c495 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4a9e6d81447c46c7bae56dc798097d9d3a4c495 commit b4a9e6d81447c46c7bae56dc798097d9d3a4c495 Author: Mark Johnston AuthorDate: 2023-12-27 00:00:01 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 00:01:26 +0000 hptmv: Handle errors from copyout() in hpt_set_info() This is in preparation for annotating copyin() and related functions with __result_use_check. MFC after: 1 week --- sys/dev/hptmv/hptproc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c index 136b9c59a02a..8f9fffdc5af1 100644 --- a/sys/dev/hptmv/hptproc.c +++ b/sys/dev/hptmv/hptproc.c @@ -338,13 +338,13 @@ hpt_set_info(int length) if (err==0) { if (piop->nOutBufferSize) - copyout(ke_area + piop->nInBufferSize, (void*)(ULONG_PTR)piop->lpOutBuffer, piop->nOutBufferSize); + err = -copyout(ke_area + piop->nInBufferSize, (void*)(ULONG_PTR)piop->lpOutBuffer, piop->nOutBufferSize); - if (piop->lpBytesReturned) - copyout(&dwRet, (void*)(ULONG_PTR)piop->lpBytesReturned, sizeof(DWORD)); + if (err == 0 && piop->lpBytesReturned) + err = -copyout(&dwRet, (void*)(ULONG_PTR)piop->lpBytesReturned, sizeof(DWORD)); free(ke_area, M_DEVBUF); - return length; + return err == 0 ? length : err; } else KdPrintW(("Kernel_ioctl(): return %d\n", err)); From nobody Wed Dec 27 00:06:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Bkf0RSrz54bkK; Wed, 27 Dec 2023 00:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Bkd447Mz4JqQ; Wed, 27 Dec 2023 00:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajRBlBwTE6F+/RhyMpNS7mA0S+qJkmYkOUM4mHwI6G4=; b=eQNERyd6xPYvuRqravG6lnWqRi8DFxOPBx5LVGkcZYejqWLFVkNR2wR55YQiBd+ovJauao 5CKoANuUUUmrd/a7jSNIr5a+xCLCtGhdyiaD82nkjnDWrjb+nyLKyqn1+ZLjKLhHeJHqkR XNrSjkClfPXzX4TF0KRzybTJ6GVYPndCK1xOC9rCtECARHAvwwuMug5mL24PHvnI1K6sQR hLvXp1T7Gp/Rjof9YhE+XVYj2Rkr75f0Sk+bffv50n414xvcEeVQ4taNiiL6KeVcS7Mx5X 3urJn1DuPeISRU1co6CKJogz50KsedQdykrhS4HptWEHpcPiWv1DPzY0vPJ1+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703635577; a=rsa-sha256; cv=none; b=TDArtjO8aycivlgFpEy9J5kzWVM6LrqZaIpYg8ZKLOXd587pUurCNwBvvuOyMhR9ImC3X1 CBOt+Yt7d5WFrdWq8XmdJAfWEp/9p9z+VyEui05osDic1bKLIuUyXmWgxJ/BMiFcpcUZBr PMesbRZGylRYo8r5hyD5pR8KVaeT4dxhPZrMBNsXSMyRhKz+ZNWvlv0arNmCoMAQxUVXZP 4oE6cKtJGgSDzq0gymoxM1s4HoM9sGfgZ2qOmY2SHKt6OzYCH/xGuaztcAy+OpMZcCmo2H IN7AvEQ9aSEUuUG2FhrmicGTraS9MMU3kt7lmNmffuDG09ukN1HobWpYB0dEjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703635577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajRBlBwTE6F+/RhyMpNS7mA0S+qJkmYkOUM4mHwI6G4=; b=Hw0jFFVn0GrdWTOyPNHgQB2fEtESisu3RVcQ20daQeT+YFCqxkxwZbbwu2X2BbBV5xAMac kBUEYTTLRPThT8wUM0ZsAXJ3mSyWBoz/4DNOYCvSXI0n0w1OcTsKSQLpNbqb5xoC4JO2to RfKnUJu+IV46z9mWMMfcU1pauSZLiMh69B4/mYQsLciwn0jHKWTokqUkBJlPm6Z2kjuiaW FMSzLx063TvZNmbwf+Wm4ts3OnejcspALOy1HdtEe9aoTidlvJpNKXbe5jsHQw3yK8FBKu dHmVaaV1IXgdnHbVB2OIKFbnr7r0ONJdGosoAvvgA3GOEF2R/ysXA0UeoC3j7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Bkd2vB0z22r; Wed, 27 Dec 2023 00:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR06Hud018918; Wed, 27 Dec 2023 00:06:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR06H51018915; Wed, 27 Dec 2023 00:06:17 GMT (envelope-from git) Date: Wed, 27 Dec 2023 00:06:17 GMT Message-Id: <202312270006.3BR06H51018915@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: ddc8576d2979 - main - fb: Explicitly handle errors when getting or setting a colour palette List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ddc8576d297937a1395f47550a8f5b1fac79afc2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ddc8576d297937a1395f47550a8f5b1fac79afc2 commit ddc8576d297937a1395f47550a8f5b1fac79afc2 Author: Mark Johnston AuthorDate: 2023-12-27 00:00:14 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 00:01:26 +0000 fb: Explicitly handle errors when getting or setting a colour palette In the VESA driver, simply ignore errors. It is not clear to me how to return them to userspace. This is in preparation for annotating copyin() and related functions with __result_use_check. MFC after: 1 week --- sys/dev/fb/vesa.c | 16 ++++++++-------- sys/dev/fb/vga.c | 24 ++++++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c index ee3409dfa755..e1cca3a70725 100644 --- a/sys/dev/fb/vesa.c +++ b/sys/dev/fb/vesa.c @@ -1698,12 +1698,12 @@ get_palette(video_adapter_t *adp, int base, int count, b = g + count; error = vesa_bios_save_palette2(base, count, r, g, b, bits); if (error == 0) { - copyout(r, red, count); - copyout(g, green, count); - copyout(b, blue, count); + (void)copyout(r, red, count); + (void)copyout(g, green, count); + (void)copyout(b, blue, count); if (trans != NULL) { bzero(r, count); - copyout(r, trans, count); + (void)copyout(r, trans, count); } } free(r, M_DEVBUF); @@ -1729,12 +1729,12 @@ set_palette(video_adapter_t *adp, int base, int count, return (1); bits = (adp->va_flags & V_ADP_DAC8) != 0 ? 8 : 6; - r = malloc(count * 3, M_DEVBUF, M_WAITOK); + r = malloc(count * 3, M_DEVBUF, M_WAITOK | M_ZERO); g = r + count; b = g + count; - copyin(red, r, count); - copyin(green, g, count); - copyin(blue, b, count); + (void)copyin(red, r, count); + (void)copyin(green, g, count); + (void)copyin(blue, b, count); error = vesa_bios_load_palette2(base, count, r, g, b, bits); free(r, M_DEVBUF); diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index eb081ae533d7..9851838aa8f3 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -2854,6 +2854,7 @@ get_palette(video_adapter_t *adp, int base, int count, u_char *r; u_char *g; u_char *b; + int error; if (count < 0 || base < 0 || count > 256 || base > 256 || base + count > 256) @@ -2863,19 +2864,26 @@ get_palette(video_adapter_t *adp, int base, int count, g = r + count; b = g + count; if (vga_save_palette2(adp, base, count, r, g, b)) { - free(r, M_DEVBUF); - return ENODEV; - } - copyout(r, red, count); - copyout(g, green, count); - copyout(b, blue, count); + error = ENODEV; + goto out; + } + error = copyout(r, red, count); + if (error != 0) + goto out; + error = copyout(g, green, count); + if (error != 0) + goto out; + error = copyout(b, blue, count); + if (error != 0) + goto out; if (trans != NULL) { bzero(r, count); - copyout(r, trans, count); + error = copyout(r, trans, count); } +out: free(r, M_DEVBUF); - return 0; + return error; } static int From nobody Wed Dec 27 00:45:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Cbv6N8Nz54fqm; Wed, 27 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Cbv4Bldz4Nj8; Wed, 27 Dec 2023 00:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703637931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPX+6xErmXpDncnKyZokPlOsP3Zm+y9ihVO7hY2wsWw=; b=L2wXtP78qN+ehNLCYzcDQ0sEVX6RWfOKVJ919qglqIYiXFSHrYBxIZnh5H7gw+JORPT6sE NZ3CLM9CFYZoO7tm27OR73ycLYhtUoZ69eO2fEPNJoT/zdLxdiIa+N3DxmhONt+Et1RKWI zbKZ79DPHY3KraZc9ydc/9T7uOYM5uiO1V+hJOTb0W7XS36dzf0Hy1Bcj8SH6L9Brj87Dc miPh0WgSf5i2drjK5TkCEqbXB0vxPXc9s2z8DAPwieyAdYxOnf1YhkA2jsHiRgLXO2A30x 9TxnG0by2LZyIt9OWLazQCWgZy3il2Gxbc75LqcLVvoaiRQw4Zy9of/6IUqvaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703637931; a=rsa-sha256; cv=none; b=P2mCjcmbEvW/imZdrYdNfMqGhK3n9QOkHJFrUZQ9Xr0wEjJJBB2TgcpSTsXzEquPuPorc5 rg3cP40bhdYgCVt2Z6cPBvs4nhJ527jxUvmKHBnxff4uUdWgSUBJkjdJMYngevNVN1YBgs 5CYWbRx9sHUrmbEMeLN8KhqXbj8fiHwetA2RK1RVslpJ9dhZw7YgRpThRCkfOSh1YgiNGs 9/N4wvZvpJvgF6ivi+V6a7qiCWqEVw1blOwxoDpuZM+BayiRG5EMyFgxWxJZj8QW/BR7I+ wnvZnABn3V/TMtQkigdDfZi+NKqxJUWWzQEvLxS/WQgCWPWdNV/iupwEC5gKaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703637931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPX+6xErmXpDncnKyZokPlOsP3Zm+y9ihVO7hY2wsWw=; b=jFOlioKg+Qx4PO9WbmHUe7juwxH8CZIYj55CVlZOPS5d9wbkChLxez2t2BATlf6jP/USxH vX+qjygpKju6sH6BZQGcNgavGJAU/hEwfaC5lHTooU72ybgHkcnKQuW9jL4Kqgpj9Yn86y T79QLYu+kadA+C9rhZtOl/OAsJ9LMkJmLj2BhvFdesY5skp+eAClMuh0sHnidcYb4VAAU3 ll+f+U07NtRYCG+BKytur5K0XtBy38te7QZrwxhkGO/Tb2q1Ed677xoTbWjSdyGZ4saiBc ubSOXHQQ/CJr+kjBLKQ/fE1Mllxp+KYVkxVqngnsukBfO3K46PxDHDVzf9AxzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Cbv2tkFz30V; Wed, 27 Dec 2023 00:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR0jVWh085611; Wed, 27 Dec 2023 00:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR0jVrt085608; Wed, 27 Dec 2023 00:45:31 GMT (envelope-from git) Date: Wed, 27 Dec 2023 00:45:31 GMT Message-Id: <202312270045.3BR0jVrt085608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a8f80c0c16c7 - main - iichid(4): Unify two taskqueue tasks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8f80c0c16c7fb38c46ddccd7e1b06dc46c407b1 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a8f80c0c16c7fb38c46ddccd7e1b06dc46c407b1 commit a8f80c0c16c7fb38c46ddccd7e1b06dc46c407b1 Author: Alexander Motin AuthorDate: 2023-12-27 00:28:56 +0000 Commit: Alexander Motin CommitDate: 2023-12-27 00:28:56 +0000 iichid(4): Unify two taskqueue tasks taskqueue_enqueue_timeout(0) is equivalent to taskqueue_enqueue(), so no need to create a separate periodic_task and event_task to run exactly the same handler. MFC after: 1 month --- sys/dev/iicbus/iichid.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 84f624f9bb09..0752521f3884 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -182,8 +182,7 @@ struct iichid_softc { bool callout_setup; /* iicbus lock */ uint8_t *dup_buf; struct taskqueue *taskqueue; - struct timeout_task periodic_task; /* iicbus lock */ - struct task event_task; + struct timeout_task sampling_task; /* iicbus lock */ #endif struct task suspend_task; @@ -520,7 +519,7 @@ iichid_cmd_set_report(struct iichid_softc* sc, const void *buf, #ifdef IICHID_SAMPLING static void -iichid_event_task(void *context, int pending) +iichid_sampling_task(void *context, int pending) { struct iichid_softc *sc; device_t parent; @@ -566,7 +565,7 @@ rearm: rate = sc->sampling_rate_slow; else rate = sc->sampling_rate_fast; - taskqueue_enqueue_timeout_sbt(sc->taskqueue, &sc->periodic_task, + taskqueue_enqueue_timeout_sbt(sc->taskqueue, &sc->sampling_task, SBT_1S / MAX(rate, 1), 0, C_PREL(2)); } out: @@ -742,7 +741,7 @@ iichid_reset_callout(struct iichid_softc *sc) sc->missing_samples = sc->sampling_hysteresis; sc->dup_samples = 0; sc->dup_size = 0; - taskqueue_enqueue(sc->taskqueue, &sc->event_task); + taskqueue_enqueue_timeout(sc->taskqueue, &sc->sampling_task, 0); return (0); } @@ -752,7 +751,7 @@ iichid_teardown_callout(struct iichid_softc *sc) { sc->callout_setup = false; - taskqueue_cancel_timeout(sc->taskqueue, &sc->periodic_task, NULL); + taskqueue_cancel_timeout(sc->taskqueue, &sc->sampling_task, NULL); DPRINTF(sc, "tore callout down\n"); } @@ -1135,12 +1134,10 @@ iichid_attach(device_t dev) TASK_INIT(&sc->suspend_task, 0, iichid_suspend_task, sc); #ifdef IICHID_SAMPLING - TASK_INIT(&sc->event_task, 0, iichid_event_task, sc); - /* taskqueue_create can't fail with M_WAITOK mflag passed. */ sc->taskqueue = taskqueue_create("iichid_tq", M_WAITOK | M_ZERO, taskqueue_thread_enqueue, &sc->taskqueue); - TIMEOUT_TASK_INIT(sc->taskqueue, &sc->periodic_task, 0, - iichid_event_task, sc); + TIMEOUT_TASK_INIT(sc->taskqueue, &sc->sampling_task, 0, + iichid_sampling_task, sc); sc->sampling_rate_slow = -1; sc->sampling_rate_fast = IICHID_SAMPLING_RATE_FAST; From nobody Wed Dec 27 00:45:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Cbw5TN8z54fqn; Wed, 27 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Cbw4YBVz4NkY; Wed, 27 Dec 2023 00: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=1703637932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SREZG9Mw2n5YurlI0+9A7jAQ8TbpQRpVX7hg+us6EEE=; b=nfr8Tv4S2dvXPLlfUqlv7MII0VR/2LX+glHFoJVjrQdfmsGCAzrTHaNHnqXQS34xHwd43C ywhyVHibwfJu98YrsrdaC/ZOKtEJ+0HUUQ1Rm7TDpj5IQHgC0x4cDRJKfqg1t9x76LsqN8 +dYSOxoWtWIu2NIi3pv13XtQWiappvj4kQdWdDgTweRK0LnbYj7ix4USos3PKrv+VLMV6s KDGEvZbnxOcs36f/P2r1x0N/5XzYY7n7vixRoZFi45MuEwzYpCwXXDwEcgqWIVF1zAyElk OuU9hKWI7nGDwWKMZtJn1AdcEEBg8Mko5W36I23C/HgLIFdJnU/q0kw/5yUzaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703637932; a=rsa-sha256; cv=none; b=mpmXOMTmztHyWnq5KCM9DhWPwmUKAwRoftpnszMBBxbinDySnNB9egMiywGUwok8C0nKKr zcdUbaFqJSMUKMQ+yR3Iv+jotSBLTznF95UUwtJtkr5JaLjfPiGUwBFrNCh714Rd7t5O4J aFXj4/hyh1Qi2u9Z+5ksTmmLzqkQfFLahZzwuZkx673XHFHemTt7++byWUYVZJ4BU1ECrh 6thFs4h+NfeosVKsn31Nyuxp3rIoYtKG7QgBOfggRKj3pRt6SuINKCtp9l+XZkKye+UEoH YkO5vdJpBxj/mwKs1O1SIdDy4QwqH3jeYIKUe89GVRBNQB47xnZTZO5Ae4Dwwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703637932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SREZG9Mw2n5YurlI0+9A7jAQ8TbpQRpVX7hg+us6EEE=; b=gCCIZ3x0foxLQNw4DWbF6VN67ZhxrYZtnVcpNbHSs4roPcVzR0VvllMeyQjnWJ00aeTBwj tzWCP3C5RiV005qtC6ao5a8I0IQ2G7+iXvdHxpr4WaNAVgbXdefD/JVzwfy/2huEgStDM3 BQgfCdJnJVO4zeBMZDLk2syXIeu4TqmI/sFfV/7GY40pE9OOxCBPcbtXkAHLNP9bONhRj4 Jg2IR8+3RsBa4CRxusUHFW5iS+8maU6GYxxi/Vky+ZeV/lCgTTzrKSdEAFRsRXD+P0M/R0 27g/mY3ITbhltoCMogUNheaVKWIrz1M2WapSYXlmMSjs8pjniWma75g4tXuwQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Cbw3dHSz2xK; Wed, 27 Dec 2023 00:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR0jWmg085653; Wed, 27 Dec 2023 00:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR0jWmJ085650; Wed, 27 Dec 2023 00:45:32 GMT (envelope-from git) Date: Wed, 27 Dec 2023 00:45:32 GMT Message-Id: <202312270045.3BR0jWmJ085650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 358453ce9bdd - main - iichid(4): Switch taskqueue to "fast" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 358453ce9bdd99eb69641b02f2d7e29cedecbe27 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=358453ce9bdd99eb69641b02f2d7e29cedecbe27 commit 358453ce9bdd99eb69641b02f2d7e29cedecbe27 Author: Alexander Motin AuthorDate: 2023-12-27 00:36:34 +0000 Commit: Alexander Motin CommitDate: 2023-12-27 00:36:34 +0000 iichid(4): Switch taskqueue to "fast" While "fast" taskqueue may be more expensive due to spinlock use, when used mainly for timeout tasks it allows to avoid extra context switches to and from callout thread, that is even more expensive. MFC after: 1 month --- sys/dev/iicbus/iichid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 0752521f3884..ff443afbf30a 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -1134,7 +1134,7 @@ iichid_attach(device_t dev) TASK_INIT(&sc->suspend_task, 0, iichid_suspend_task, sc); #ifdef IICHID_SAMPLING - sc->taskqueue = taskqueue_create("iichid_tq", M_WAITOK | M_ZERO, + sc->taskqueue = taskqueue_create_fast("iichid_tq", M_WAITOK | M_ZERO, taskqueue_thread_enqueue, &sc->taskqueue); TIMEOUT_TASK_INIT(sc->taskqueue, &sc->sampling_task, 0, iichid_sampling_task, sc); From nobody Wed Dec 27 01:43:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Dtf4WpDz54mHn; Wed, 27 Dec 2023 01:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Dtf3jr2z4SLG; Wed, 27 Dec 2023 01:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703641402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+VSZocMUPv3txXWpu0FxZ1K+LGHFpsA7aRvuGxLraM=; b=G16YRAS7MQXsTx64tEUyxiV5xom+l5BxR7LhqhgdfhbGYaca4DgrnTSTktJl+7ZkkMC67e rQahk5vEyeHLQlsoVmEdQ90mx9T2ohlVfJgqkSF5WSy7d81tMG360+AealJCcsuYsdPY59 E8LDpdpM0GX7yaYbdPrrk6VGsgpcN01mZ2vgAsS9cltZu4kirSxxI2rOPuk+DVVIDXlBXf dvofmxre7w3TUpYxjH3VefvRDT6IQSJmsyW3u1eyH6eP1H09SikVdOJllDdRRFAjUsIrTI bGtINMxKJPY9oQGnUNGklyl/McI6XjpYD5kIY7YNeqFXr3aHtW/RTxj4HpmkZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703641402; a=rsa-sha256; cv=none; b=ZRU8PfVaxa08Ot27dfd4LOEz6pag0vt7WdalK371OdwakoJi7l8CSqWaqBzsFz9sGRckub sOVrr4Sk0R2d6tr3P/+747Kx3l3XbKzi6mZ8uqpaoJPr99+nLE5DG7e5Tlre/R3bjVLIDZ Ct8eqUeQXDvqltoRUqrad62WL/79B79ameJppgs0Lzu+wSjza7GbHBsGc3/xwS5oxsEETn O9tp8AKVqKBccWC7I51cIcstmJE15Vsc3eZbfQhUXE2mseoIzcEbAO2A8P3rTmmKauFYus Fa9oBg/PvXkiMp/SLaQ0JJqZML5M0uXTCc96FmVYqfwO4L1olaMN9WVuZ64dEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703641402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+VSZocMUPv3txXWpu0FxZ1K+LGHFpsA7aRvuGxLraM=; b=iM3Vo1D3X1hRCuCBAr0PsfFzXaaIUEmpNFjUFokRtJsRpsGaYqlHXjmPaTuTW65wYT/qkl xWj59EPKfH3ygG2npAhsNLmlXWxc6TkGkCdpekR6Wy6v2mKv5okxq/LaaYJqnLYC2XtOyc Nz7gvWzBDV2JpowVxiSldtPdj+tvpR2ftnbIUeweTvjp1mFMNOC1A4Un72dgZY1x6Xqwia t8lt5Pa2/lLJynNfcibT/D6J5y2PaNQrKeH5fBvl1cZ+9CjSkSn4PTaYkg3CI7zpGzlT9+ YoC0BtRgDcxhasHfrJ2hV5YqLzSkya89OMBXoeEFROkXvYJpkKlTo67pHybfTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Dtf2mVrz45X; Wed, 27 Dec 2023 01:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR1hMWG085315; Wed, 27 Dec 2023 01:43:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR1hMQf085312; Wed, 27 Dec 2023 01:43:22 GMT (envelope-from git) Date: Wed, 27 Dec 2023 01:43:22 GMT Message-Id: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b70cf26030d68631200619bd1b0ad35b34b6b8 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b70cf26030d68631200619bd1b0ad35b34b6b8 commit a8b70cf26030d68631200619bd1b0ad35b34b6b8 Author: Richard Scheffenegger AuthorDate: 2023-12-25 11:26:25 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-25 12:18:01 +0000 netpfil: Use accessor functions and named constants for all tcphdr flags Update all remaining references to the struct tcphdr th_x2 field. This completes the compatibilty of various aspects with AccECN (TH_AE), after the internal ipfw "re-checksum required" was moved to use the TH_RES1 flag. No functional change. Reviewed By: tuexen, #transport, glebius Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43172 --- sys/dev/xen/netback/netback_unit_tests.c | 4 ++-- sys/netgraph/ng_nat.c | 10 +++++----- sys/netinet/tcp.h | 13 +++++++++++++ sys/netinet/tcp_var.h | 12 ------------ sys/netpfil/ipfilter/netinet/ip_compat.h | 6 ------ sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 7 +++---- sys/netpfil/pf/pf_norm.c | 11 ++++++----- 7 files changed, 29 insertions(+), 34 deletions(-) diff --git a/sys/dev/xen/netback/netback_unit_tests.c b/sys/dev/xen/netback/netback_unit_tests.c index e5a000c872d8..af88d5ced498 100644 --- a/sys/dev/xen/netback/netback_unit_tests.c +++ b/sys/dev/xen/netback/netback_unit_tests.c @@ -35,6 +35,7 @@ */ #include +#include /** * \file netback_unit_tests.c * @@ -2311,9 +2312,8 @@ xnb_fill_tcp(struct mbuf *m) tcp->th_dport = htons(2222); tcp->th_seq = htonl(0x00f72b10); tcp->th_ack = htonl(0x7f37ba6c); - tcp->th_x2 = 0; + tcp_set_flags(tcp, TH_ACK | TH_PUSH); tcp->th_off = 8; - tcp->th_flags = 0x18; tcp->th_win = htons(0x410); /* th_sum is incorrect; will be inserted by function under test */ tcp->th_sum = htons(0xbaad); diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c index ae083608a199..d7492b71e07c 100644 --- a/sys/netgraph/ng_nat.c +++ b/sys/netgraph/ng_nat.c @@ -862,9 +862,9 @@ ng_nat_rcvdata(hook_p hook, item_p item ) * doesn't have any idea about checksum offloading * in kernel. To workaround this, we do not do * checksumming in LibAlias, but only mark the - * packets in th_x2 field. If we receive a marked - * packet, we calculate correct checksum for it - * aware of offloading. + * packets with TH_RES1 in the th_x2 field. If we + * receive a marked packet, we calculate correct + * checksum for it aware of offloading. * * Why do I do such a terrible hack instead of * recalculating checksum for each packet? @@ -875,10 +875,10 @@ ng_nat_rcvdata(hook_p hook, item_p item ) * has this problem, too. */ - if (th->th_x2) { + if (tcp_get_flags(th) & TH_RES1) { uint16_t ip_len = ntohs(ip->ip_len); - th->th_x2 = 0; + tcp_set_flags(th, tcp_get_flags(th) & ~TH_RES1); th->th_sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr, htons(IPPROTO_TCP + ip_len - (ip->ip_hl << 2))); diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 44f8a67a1e64..209b89c9a427 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -79,6 +79,19 @@ struct tcphdr { u_short th_urp; /* urgent pointer */ }; +static inline uint16_t +tcp_get_flags(const struct tcphdr *th) +{ + return (((uint16_t)th->th_x2 << 8) | th->th_flags); +} + +static inline void +tcp_set_flags(struct tcphdr *th, uint16_t flags) +{ + th->th_x2 = (flags >> 8) & 0x0f; + th->th_flags = flags & 0xff; +} + #define PADTCPOLEN(len) ((((len) / 4) + !!((len) % 4)) * 4) #define TCPOPT_EOL 0 diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index af441b4fc7d7..c2b15526c15b 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1578,16 +1578,4 @@ tcp_fields_to_net(struct tcphdr *th) } #endif /* _KERNEL */ -static inline uint16_t -tcp_get_flags(const struct tcphdr *th) -{ - return (((uint16_t)th->th_x2 << 8) | th->th_flags); -} - -static inline void -tcp_set_flags(struct tcphdr *th, uint16_t flags) -{ - th->th_x2 = (flags >> 8) & 0x0f; - th->th_flags = flags & 0xff; -} #endif /* _NETINET_TCP_VAR_H_ */ diff --git a/sys/netpfil/ipfilter/netinet/ip_compat.h b/sys/netpfil/ipfilter/netinet/ip_compat.h index 08ce4b572d43..c73af315b132 100644 --- a/sys/netpfil/ipfilter/netinet/ip_compat.h +++ b/sys/netpfil/ipfilter/netinet/ip_compat.h @@ -687,12 +687,6 @@ typedef struct tcpiphdr tcpiphdr_t; #ifndef IP_HL_A # define IP_HL_A(x,y) (x)->ip_hl = ((y) & 0xf) #endif -#ifndef TCP_X2 -# define TCP_X2(x) (x)->th_x2 -#endif -#ifndef TCP_X2_A -# define TCP_X2_A(x,y) (x)->th_x2 = (y) -#endif #ifndef TCP_OFF # define TCP_OFF(x) (x)->th_off #endif diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 139aff9b1c73..1922880e90df 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -379,18 +379,17 @@ ipf_send_reset(fr_info_t *fin) tcp2->th_sport = tcp->th_dport; tcp2->th_dport = tcp->th_sport; - if (tcp->th_flags & TH_ACK) { + if (tcp_get_flags(tcp) & TH_ACK) { tcp2->th_seq = tcp->th_ack; - tcp2->th_flags = TH_RST; + tcp_set_flags(tcp2, TH_RST); tcp2->th_ack = 0; } else { tcp2->th_seq = 0; tcp2->th_ack = ntohl(tcp->th_seq); tcp2->th_ack += tlen; tcp2->th_ack = htonl(tcp2->th_ack); - tcp2->th_flags = TH_RST|TH_ACK; + tcp_set_flags(tcp2, TH_RST|TH_ACK); } - TCP_X2_A(tcp2, 0); TCP_OFF_A(tcp2, sizeof(*tcp2) >> 2); tcp2->th_win = tcp->th_win; tcp2->th_sum = 0; diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index a92462c53f15..a119d85f806e 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1376,7 +1376,7 @@ pf_normalize_tcp(struct pfi_kkif *kif, struct mbuf *m, int ipoff, struct tcphdr *th = &pd->hdr.tcp; int rewrite = 0; u_short reason; - u_int8_t flags; + u_int16_t flags; sa_family_t af = pd->af; int srs; @@ -1434,7 +1434,7 @@ pf_normalize_tcp(struct pfi_kkif *kif, struct mbuf *m, int ipoff, if (rm && rm->rule_flag & PFRULE_REASSEMBLE_TCP) pd->flags |= PFDESC_TCP_NORM; - flags = th->th_flags; + flags = tcp_get_flags(th); if (flags & TH_SYN) { /* Illegal packet */ if (flags & TH_RST) @@ -1459,12 +1459,13 @@ pf_normalize_tcp(struct pfi_kkif *kif, struct mbuf *m, int ipoff, goto tcp_drop; /* If flags changed, or reserved data set, then adjust */ - if (flags != th->th_flags || th->th_x2 != 0) { + if (flags != tcp_get_flags(th) || + (tcp_get_flags(th) & (TH_RES1|TH_RES2|TH_RES2)) != 0) { u_int16_t ov, nv; ov = *(u_int16_t *)(&th->th_ack + 1); - th->th_flags = flags; - th->th_x2 = 0; + flags &= ~(TH_RES1 | TH_RES2 | TH_RES3); + tcp_set_flags(th, flags); nv = *(u_int16_t *)(&th->th_ack + 1); th->th_sum = pf_proto_cksum_fixup(m, th->th_sum, ov, nv, 0); From nobody Wed Dec 27 03:55:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0HqP1WzCz5507D; Wed, 27 Dec 2023 03:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0HqP109Kz4c9T; Wed, 27 Dec 2023 03:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703649345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOWsQfKw7h/T9IhLkJ4Ad1wkUgtGg3mR+afEw7JRQis=; b=LnSVzR56UIwJ1MeyxE3beaGJDd8JSqk4v3VjjAHfo8a5P0Zi4Xrkmnso07jHajQ4bZpqbZ XIG4UMPWvlK7RgX0H5IG+yJzFK8KKaWFyc7dB3Jdg1ojKmv/xnKvGN4tVnwxuoQT0PsxJE 0VoW/D3NSEWkmIn6Cp9/Petgqil00N52AwUBUU2wyMgXo+2I3mldlzL9IPF1VpUwv2zteT Nbjro2E+s0RcLX+AGl2M6NhfscPccW5SUQ6REoc4k2TsQqwAnECiIwjf+sVPCS8and1PKo tyEx+36zgjj7JPCui4q2HxUMSa+ifGOg5Bn/7aygd/QgPmiB4wzxLiDHccIChw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703649345; a=rsa-sha256; cv=none; b=Be4xhjhSWJnkq9XoGIPHf7M65DrzXjP27xI6xyvstFxBgwEUOVPRLvcm4H/kk7qw+5tM5e 2sXuP+UTnNcmjrnxrLbJZ/YjeY0y7gd6e3gdGVqJdMFXSktYPWiOlAu9ql+SqXyWCru7fi xZzEI2WjCNpfyzSQ8qTkG9LnmB3ur/jzxASw1+CWSklXon2Pmg0qt+ZEfN8jI5suc0n9Pa +VMlezsT03/TPKi9ioLcqrzIwshnE+5J3nS46KJGdrr4DIc8tHaPGggZDHeHQrGZLhCJbb 2l4e4ynhaHXruXe0hJUK+h9j/Ysi8r//GvgdF5af0n7kQmK49sltVPOpeaFDuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703649345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOWsQfKw7h/T9IhLkJ4Ad1wkUgtGg3mR+afEw7JRQis=; b=DIVGBbLl9dWaEGqcMxBeAzMbnF2ibdLMP6nw6jj85XizSJ3sfl94X4201RDdWqcGmIzU8E GX2w5Rwyuszgguy8Vvm8ohgyca9vVAhq2t4duwdWnF159rRbnxqWttdidLhJWaHGswji+h JERRY55nbd2yRsaDxBNyo6uSk3NHMfuTHwlNppzAEbu9Zi3oZ5b+SFWOKv55xuEwZ8dosu 9WUIfbCVHl+9ob2f19O6qLA/y606qt205XIXEz/bDo1/I6SNPOLhTWitz12jsIc4HxVffw qt1bRH6t/ibRjHJkEFkXc3c8wt9cQJFGspi4UUxVc19y7k7mH7Cw8k4FFRVuFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0HqP038yz7tf; Wed, 27 Dec 2023 03:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR3tiKO006074; Wed, 27 Dec 2023 03:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR3tip8006071; Wed, 27 Dec 2023 03:55:44 GMT (envelope-from git) Date: Wed, 27 Dec 2023 03:55:44 GMT Message-Id: <202312270355.3BR3tip8006071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 7bbac6419d17 - main - Schedule fast taskqueue callouts on right CPU. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bbac6419d174c98cc6ea969b68fcfe0f9a9bab8 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=7bbac6419d174c98cc6ea969b68fcfe0f9a9bab8 commit 7bbac6419d174c98cc6ea969b68fcfe0f9a9bab8 Author: Alexander Motin AuthorDate: 2023-12-27 03:30:56 +0000 Commit: Alexander Motin CommitDate: 2023-12-27 03:55:24 +0000 Schedule fast taskqueue callouts on right CPU. With fast taskqueues using direct callouts we can reduce number of CPU wakeups by scheduling callout on current CPU if taskqueue calls taskqueue_enqueue_timeout() on itself. The trick won't work for regular taskqueues, since the callout thread will occupy the CPU. It also may not work in case of multiple threads since we do not know which thread will pick the task, and we do not want excessive callout migrations. So we optimize only the other cases we can. In practice this allows iichid(4) taskqueue to stay on CPU where underlying ig4(4) interrupts are routed and to not kick CPU 0 with timer interrupts on each sampling period (every 2nd/3rd sleep). MFC after: 1 month --- sys/kern/subr_taskqueue.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index 5650f9d57a01..c4146922edc5 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -363,8 +363,14 @@ taskqueue_enqueue_timeout_sbt(struct taskqueue *queue, if (sbt > 0) { if (queue->tq_spin) flags |= C_DIRECT_EXEC; - callout_reset_sbt(&timeout_task->c, sbt, pr, - taskqueue_timeout_func, timeout_task, flags); + if (queue->tq_spin && queue->tq_tcount == 1 && + queue->tq_threads[0] == curthread) { + callout_reset_sbt_curcpu(&timeout_task->c, sbt, pr, + taskqueue_timeout_func, timeout_task, flags); + } else { + callout_reset_sbt(&timeout_task->c, sbt, pr, + taskqueue_timeout_func, timeout_task, flags); + } } TQ_UNLOCK(queue); } From nobody Wed Dec 27 04:24:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0JT04VkKz552sq; Wed, 27 Dec 2023 04:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0JT03xcZz4fhP; Wed, 27 Dec 2023 04:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kxmcj25IX95Jtu4eRINanVKtx9BtjOBhWkxIpVZVg1I=; b=NuI3qosSR/L4FWa4tvKsL20yn+pk4Ks3aj13bM9+ZMmoLdeInv8LsGzfUQPjze79COpC4i rYuiiHPSSH58/CMkv1quBurfBPrnm/iGifWMv1crs65LJKq5BQtUDiS4Dp1DqN1vaYgbge kzxNZqWDIPQs2v5C9NgGhuNc/azpNQVT64Q8OGQFVnDNCnkZZUl9LuHwsp44U/pyS/wNGF BTphsvgYh/8lFMWkWYmUjuLynp4xDUGTcyxpYos7eV408sl/qnq4U7unosaqXD/UAMwXnW qNwei3gx+NOmjseJ14QQXn6BnJhGnCpT81rHmtxzrj3KCl0GRtlwV2vf3uDkvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703651092; a=rsa-sha256; cv=none; b=pUE73tkl2D7GFXB5BbGd217JGZxPHG1/5JLH06htRbxC5AdccnCzaOqX9YshuPly5nCiy6 fEGahX/RLI5Wu8DHaa67g/ZOQK3YH170H10H/lvsAFVTtSQ5oWNcwVvKqJXe83dqLbvAt3 T/0zvzPsMJrU5LdjENB+Yk/HZDr+8mPFL8ZCdyIfBfv3PxPxYHgLjIR+2HUmD5/Bbn24Vr GLX+I3VMw3j15b05Ir8PaGIeYTr0v1G8a7tYxfGG9N0Vp4lNT+ruXJkD353ER0Cy030AUz iF4blu26q870lR7JPPWvo73MZbIbMWrqE0vug1q3u3uCtKlEpk9oPRMCMOg6+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kxmcj25IX95Jtu4eRINanVKtx9BtjOBhWkxIpVZVg1I=; b=c9V6y2wKH8Va+cBHe+UF0iuErEWyGBZi7GFRnaDBC6zdFCpg2ZjsA7gIPDoZhCtnYYRLWi bplwfVurINq6y8seXxzCHb8LqeCHt6ktdLhpLTaCzcjXqhXGHvnM5YJvrVWT2hiARHNIlb XLQ0SkwpUl2iLNk4yJrznL6JfYe1fb+rcwZbtMLcihmF0xMUDPEJc7NYoYyvLufFYlxLG8 NJwv7OrPnMD4BP18QKAEbXkzw3QO0kv5uaE9dodGsH/eMuFAwAKW+PIsNjy2D6ewOJgbcC b5vL02jDHGblN7yo/sFhgXtZfO0EIsuVAo9eCB6gEoH2/dpW4jh9fLdZbjlB4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0JT02vD7z8rC; Wed, 27 Dec 2023 04:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR4OqWp057033; Wed, 27 Dec 2023 04:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR4OqfE057030; Wed, 27 Dec 2023 04:24:52 GMT (envelope-from git) Date: Wed, 27 Dec 2023 04:24:52 GMT Message-Id: <202312270424.3BR4OqfE057030@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: dbc463119c8c - main - netlink: remove unused structure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: dbc463119c8c3694e8f10a7bcf702a0bbfb373a7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=dbc463119c8c3694e8f10a7bcf702a0bbfb373a7 commit dbc463119c8c3694e8f10a7bcf702a0bbfb373a7 Author: Gleb Smirnoff AuthorDate: 2023-12-27 04:21:58 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-27 04:21:58 +0000 netlink: remove unused structure --- sys/netlink/netlink_var.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h index a26d217f4023..36b7c61974c9 100644 --- a/sys/netlink/netlink_var.h +++ b/sys/netlink/netlink_var.h @@ -96,18 +96,10 @@ struct nlpcb { SYSCTL_DECL(_net_netlink); SYSCTL_DECL(_net_netlink_debug); -struct nl_io { - struct callout callout; - struct mbuf *head; - struct mbuf *last; - int64_t length; -}; - struct nl_control { CK_LIST_HEAD(nl_pid_head, nlpcb) ctl_port_head; CK_LIST_HEAD(nlpcb_head, nlpcb) ctl_pcb_head; CK_LIST_ENTRY(nl_control) ctl_next; - struct nl_io ctl_io; struct rmlock ctl_lock; }; VNET_DECLARE(struct nl_control *, nl_ctl); From nobody Wed Dec 27 04:24:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0JT1524Tz552Yf; Wed, 27 Dec 2023 04:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0JT14Wpxz4fkV; Wed, 27 Dec 2023 04:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HM3fmtIH7MvAhEDbzQOOOL3hC7EC3eIZnzzW+xODZAk=; b=Pv8kfXgqlKAOaFU5ZCGKnnH/xmN1BFc09gpb+2dWQL2Gk4D2wJyTPZui2TUxBUKw/GrIlp RjXHcMYig5LGpK10AO/+D5+SzLUTZpI7cDKAxcjHcAHWiIcHYfawj2rtp6eIq5/F6FeHwl PordIuU53yyLWa++1x8auQJsSfbOo/D7nyQ4v3alOaGiO/2Mq/obQtx+rKt+TeMgq1oQzI YohSiCLa71VZrh5DKGJD4IsxAzBxxLkSk6hGHqRwacqI5Fr2LqarpK+6PWwfjMJTN5dtC6 kmY5H+weA2BYdtgPK71qpQ38Fqy/eLK1o6X6PhzMKVqbFGqNpQ2dw2KG/baAZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703651093; a=rsa-sha256; cv=none; b=irQJMGBfdMcHiszFLR1lWhBe/wsqZ9hyJ3xogB6xrLKs+VWo2gdt3xUqCBPcYPi1L7hvyL FUxJ52CqGUl40Pprx1OFMINPA3PqTR8h6NQh5X1RVy71JcGpUvRZr0SKzAdeyOxTRshbrI /1GyzY9/TBgr8iMkOVuu5XylYCWr9REPkItZmS6552vPNVdsOi7qfbiX0v/zofJSEOoaD9 9zpS94I8te1dAsHl5q47hbAee+ymQYbqutuJA+nD7plyeTXrsFnNXRUbEzObL89EKFLiym e9K5lbxzmb+gGupzFIyDg17jVS5qPXRCcvWNUyqWFxA34k3V2cNFciPLlTwn5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HM3fmtIH7MvAhEDbzQOOOL3hC7EC3eIZnzzW+xODZAk=; b=NUMaO71gNP8o+T683t99apTSZNWPaItnQ8ydqx/QVFt6kbwbayzxMY5UsCiIh81mvzlDXN Y6QjVx1ekGH3/UWy1frouKYUnizjnuvKYqCtNeaghXVQc8F4EOEPUOCpa5Inv7f2adSEQy WyAX5/PxFeBg/HRjHjYhLXeLDp8wOaeq6TzZLjMz0oLwV944sdy4Q8zj+T36fvjYMScEWt F/yroEYjZHW5qOLXwCXQwa0e5IkXjR4TZ1mJla9bFjHtDnPDwPwsDNSWpGs3UKYFQH/CN4 7sH0SnyYqcePqCifesOEvO7UBoUeLlVzwsf2Zq8DvXgWLMLFxb+TQPG3kEXOTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0JT13ctwz8wn; Wed, 27 Dec 2023 04:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR4Orqi057077; Wed, 27 Dec 2023 04:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR4OrT3057074; Wed, 27 Dec 2023 04:24:53 GMT (envelope-from git) Date: Wed, 27 Dec 2023 04:24:53 GMT Message-Id: <202312270424.3BR4OrT3057074@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: f27aff8f7f4f - main - linux/netlink: don't override sopt level List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f27aff8f7f4f7628a652602e55409f7e858d7f56 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f27aff8f7f4f7628a652602e55409f7e858d7f56 commit f27aff8f7f4f7628a652602e55409f7e858d7f56 Author: Gleb Smirnoff AuthorDate: 2023-12-27 04:21:58 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-27 04:21:58 +0000 linux/netlink: don't override sopt level This override effectively prevents correct entering of netlink protocol specific pr_ctloutput in sosetopt(). Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D42520 --- sys/compat/linux/linux_socket.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index f474ea06440a..ae22af90d443 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2117,7 +2117,6 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) name = linux_to_bsd_tcp_sockopt(args->optname); break; case SOL_NETLINK: - level = SOL_SOCKET; name = args->optname; break; default: From nobody Wed Dec 27 04:24:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0JT30KXBz552sw; Wed, 27 Dec 2023 04:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0JT25Ycmz4fph; Wed, 27 Dec 2023 04:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tzVshUeOpVhoWUOHiuB38qZ5jUZF/XfcPPMve1NV6qs=; b=HtQJQMhO5J0IS/tKDFC5f522cIrqRanZukkgImkcwBdVJOaDq3ZGADZFvD40aMDdkxfkZL mj34LBtT7ssuyRf5vED9hNb5K+NIgl24j1Zih+Pymz8S9+AdDLVjip6e1wOyyXbMsYrvMK 9xLrhsRx5oMjhtLlI8dflTYTAnWSn+PsaAr1aO10Fsq27ICZ1BxhO4Edo6XNXFKBLYwHJS DeUuXJpvaSaMX1lfK+K3n6rqzjELhuI5DqGV8l+FlwVB0655yNizKjw8RVf0OupVDhYK/7 etKBuizzfKfkJEWgpI40zrOESsXAyV42VwQcB6a0SpUeSDzBGsbSv+OB1NxcYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703651094; a=rsa-sha256; cv=none; b=Su+ig0jqNCxbQNXqG4I44JgJ7Z2hJlLl8V4GEUH0IGUmdgMBj3k/GEEZuGuRxE+lAFVzKU HcZMYionFv5Yo/hT6RFvv23OwnFaniuE1qMRURhXENsl04hC90aAeqV6/8tgdHIzi2OYiq +1YoQ6OfmWc0JGPeOwhuzg1FYNEOQFwDz5GctHJWaCyAgztPIA3DhpIWpZCrrRNzxnHaxr MTKHYbDB7hV+pkyxWdXrzQnl6yvMtWFadBOiYtb7A+oofmvDKHtO7yt31UW9gup/1rivEV FbHwUrhBe41GgqlTRtgB44iRoFuLHByFACUtM5rwSIMGuoxJBUb7F8U4nzhaGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tzVshUeOpVhoWUOHiuB38qZ5jUZF/XfcPPMve1NV6qs=; b=NBSDlMEltj1uW1Yb6HXmmF3NGEAM1bt1lM0eaRBqzwAdNCi3wGT7OvolEnVkZGN002LHks BK+oexG3lIMm8Jujp6ZUpO7JRAHUgy0MC2PmGYFn8dHWtUiOjpaCsWmUCDCfWdquSAvVod ljutQppyQi/kb11hJ5OxQe48vM/DXeyrKd15jeXEOJTnpyQHIMP5EFae0gj1JSwIAa95f+ gHpi2kKb8d/0OnopnrZv2Glnkh9xEAJaNpnAIWyZ0KhAJbfohkuNT84Eqg1BCDZ4I5rhUF tmHoY3SJqtNaQTMBN97rmSwY5/Rj/vg99vGyoZBHmGTkL1SIIXETKsWAf0f7bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0JT24c71z8rD; Wed, 27 Dec 2023 04:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR4OsJo057120; Wed, 27 Dec 2023 04:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR4Osrc057117; Wed, 27 Dec 2023 04:24:54 GMT (envelope-from git) Date: Wed, 27 Dec 2023 04:24:54 GMT Message-Id: <202312270424.3BR4Osrc057117@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: 97958f5d5c67 - main - netlink: simplify socket destruction List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 97958f5d5c674de5d05a6b547cb1c45f8c58791b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=97958f5d5c674de5d05a6b547cb1c45f8c58791b commit 97958f5d5c674de5d05a6b547cb1c45f8c58791b Author: Gleb Smirnoff AuthorDate: 2023-12-27 04:22:12 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-27 04:22:12 +0000 netlink: simplify socket destruction Destroy the socket at the file descriptor close(2). There is no reason to linger for any longer, there are no external references. Remove pr_detach method as nothing left to do after pr_close. Remove pr_abort method as it shall never be executed for this type of socket. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D42521 --- sys/netlink/netlink_domain.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 1b48ac65cec1..38f4a2dfed94 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -360,14 +360,6 @@ nl_pru_attach(struct socket *so, int proto, struct thread *td) return (0); } -static void -nl_pru_abort(struct socket *so) -{ - NL_LOG(LOG_DEBUG3, "socket %p, PID %d", so, curproc->p_pid); - MPASS(sotonlpcb(so) != NULL); - soisdisconnected(so); -} - static int nl_pru_bind(struct socket *so, struct sockaddr *sa, struct thread *td) { @@ -494,7 +486,7 @@ destroy_nlpcb_epoch(epoch_context_t ctx) static void -nl_pru_detach(struct socket *so) +nl_close(struct socket *so) { struct nl_control *ctl = atomic_load_ptr(&V_nl_ctl); MPASS(sotonlpcb(so) != NULL); @@ -563,14 +555,6 @@ nl_sockaddr(struct socket *so, struct sockaddr *sa) return (0); } -static void -nl_pru_close(struct socket *so) -{ - NL_LOG(LOG_DEBUG3, "socket %p, PID %d", so, curproc->p_pid); - MPASS(sotonlpcb(so) != NULL); - soisdisconnected(so); -} - static int nl_pru_output(struct mbuf *m, struct socket *so, ...) { @@ -766,17 +750,15 @@ nl_setsbopt(struct socket *so, struct sockopt *sopt) .pr_flags = PR_ATOMIC | PR_ADDR | PR_WANTRCVD, \ .pr_ctloutput = nl_ctloutput, \ .pr_setsbopt = nl_setsbopt, \ - .pr_abort = nl_pru_abort, \ .pr_attach = nl_pru_attach, \ .pr_bind = nl_pru_bind, \ .pr_connect = nl_pru_connect, \ - .pr_detach = nl_pru_detach, \ .pr_disconnect = nl_pru_disconnect, \ .pr_send = nl_pru_send, \ .pr_rcvd = nl_pru_rcvd, \ .pr_shutdown = nl_pru_shutdown, \ .pr_sockaddr = nl_sockaddr, \ - .pr_close = nl_pru_close + .pr_close = nl_close static struct protosw netlink_raw_sw = { .pr_type = SOCK_RAW, From nobody Wed Dec 27 06:08:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Lm80vs4z55BTN; Wed, 27 Dec 2023 06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Lm80PS9z3Hq1; Wed, 27 Dec 2023 06:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703657288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTGTc424aJjJMP7A4WbHvZejcMu0+aIPMf97P88IZ5A=; b=SFAr85mvpgfhTrf4gGKEBTQ7Ce8/s6T6lEdz1I1ejV683+VYH1kYV3B08DyeFF3kYRFjTc rirL62P9IbrdO2ulg7lUH9PsIE+hOqqKdh8MkEHcHe0vhjbXKkVcLp8+nH9Scuc7siJYxT g5i+irN8cpswUioWKGT9009aS93Y2c7zWoW7/f36vig6bN8loprdZVJt7/uSdIFSHgmiu9 wHaEmBzQtAZYy2fWUjQxxz+5DWPDlVumvorcZyFQicInojMGJ3ponqUV543Rm688/cdGD0 lyK/YSIhOQ4fSFWiBjigbS9D6uzhmKoUKtp1Toz0HDJF50R+B1gJz7LHFPKp4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703657288; a=rsa-sha256; cv=none; b=ujFMHwKsa9LoOkCQGmXf3effE92jQqWoifz4XRof0C9yLe7yzyFT5bPjFdfCip3deplgAO gHUcnmS0rSkY4EuZY5GPBQ9pWzWmZ/oQ/l/M+dHkW/LBwHUbgcGmqCfJAcPfFfZqQTE2kQ CSz7G6e11wzPElt8biggsXILYo0SdNPC923N2kIdiRB77RV7PV0WjcHGwTtWum32HKbf46 dcIPCmgHSvM986mdQxcqCdK9MZZRGqjvjtkl51HOt/p83Tv7AxuKaJpRG5yjm5U69X3ahr 87aKc0ZT6Y57r/si/e//VdMPl3s+SpxIyTHtJvcPYmhJq3PvKu1xRpFWIiy1iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703657288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTGTc424aJjJMP7A4WbHvZejcMu0+aIPMf97P88IZ5A=; b=u6uIFnakxoYfeHu3MvaA5UTUu8yQ7dS9oKAQBWdLmaCQwKy4Pb9wBE4J1KKm0ddpk5sg5T y3dbt+gYDCC/3bgYoQd++3tRERw55R85CxSsnyshlVlBByFMyTVyYhacqVLVJpJv+bFIfA SgboAtOI4/64LzDmZcrbng6xi9qH7BQ806Abpl965a3Jat4GL8TH2S6maLLPTYfA/gTyvu xKKexc6rZt2t13i2kDbLDLllcqrhtAzouCIAuvx5wnofgEKJbvY3NQgljB0zCB8tEgbajg i0f9GHn5P5QkQD2Kyrorydnd+kzEvSRZ7OfXX9+vT+cqtnWKStqB2g4JA3cCDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Lm76ZLFzC9l; Wed, 27 Dec 2023 06:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR687gf024842; Wed, 27 Dec 2023 06:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR687UZ024839; Wed, 27 Dec 2023 06:08:07 GMT (envelope-from git) Date: Wed, 27 Dec 2023 06:08:07 GMT Message-Id: <202312270608.3BR687UZ024839@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: a6f795cc89cb - main - daemon: fix clang-tidy warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a6f795cc89cbedbf1be0ab504fa6ed863e1eec5e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a6f795cc89cbedbf1be0ab504fa6ed863e1eec5e commit a6f795cc89cbedbf1be0ab504fa6ed863e1eec5e Author: Ihor Antonov AuthorDate: 2023-12-27 06:07:25 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 06:07:25 +0000 daemon: fix clang-tidy warnings Fixed narrowing conversions: - strtol replaced with strtonum with range check - read returns ssize_t - kevent.data explicitly cast to int before passing into strerror While we we're here: - Defined and documented maximum restart delay. - Fixed typo in a comment. - Remove unused includes Reviewed by: cperciva, kevans --- usr.sbin/daemon/daemon.8 | 3 ++- usr.sbin/daemon/daemon.c | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index fce08bc90e62..4fafb8528f18 100644 --- a/usr.sbin/daemon/daemon.8 +++ b/usr.sbin/daemon/daemon.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 18, 2023 +.Dd December 27, 2023 .Dt DAEMON 8 .Os .Sh NAME @@ -151,6 +151,7 @@ option is used or not. .It Fl R , Fl -restart-delay Ar restart_delay_seconds Supervise and restart the program after the specified delay if it has been terminated. +Valid values are 1-31536000 (up to 1 year). .It Fl r , Fl -restart Supervise and restart the program after a one-second delay if it has been terminated. diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index dc488993b1af..14ea87af646d 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -30,7 +30,6 @@ * From BSDI: daemon.c,v 1.2 1996/08/15 01:11:09 jch Exp */ -#include #include #include #include @@ -49,12 +48,14 @@ #include #include #include -#include #define SYSLOG_NAMES #include #include #include +/* 1 year in seconds */ +#define MAX_RESTART_DELAY 60*60*24*365 + #define LBUF_SIZE 4096 enum daemon_mode { @@ -161,7 +162,7 @@ usage(int exitcode) int main(int argc, char *argv[]) { - char *p = NULL; + const char *e = NULL; int ch = 0; struct daemon_state state; @@ -209,9 +210,9 @@ main(int argc, char *argv[]) state.mode = MODE_SUPERVISE; break; case 'm': - state.stdmask = strtol(optarg, &p, 10); - if (p == optarg || state.stdmask < 0 || state.stdmask > 3) { - errx(6, "unrecognized listening mask"); + state.stdmask = (int)strtonum(optarg, 0, 3, &e); + if (e != NULL) { + errx(6, "unrecognized listening mask: %s", e); } break; case 'o': @@ -238,9 +239,10 @@ main(int argc, char *argv[]) break; case 'R': state.restart_enabled = true; - state.restart_delay = strtol(optarg, &p, 0); - if (p == optarg || state.restart_delay < 1) { - errx(6, "invalid restart delay"); + state.restart_delay = (int)strtonum(optarg, 1, + MAX_RESTART_DELAY, &e); + if (e != NULL) { + errx(6, "invalid restart delay: %s", e); } break; case 's': @@ -347,7 +349,7 @@ daemon_exec(struct daemon_state *state) } /* Main event loop: fork the child and watch for events. - * After SIGTERM is recieved and propagated to the child there are + * After SIGTERM is received and propagated to the child there are * several options on what to do next: * - read until EOF * - read until EOF but only for a while @@ -434,7 +436,7 @@ daemon_eventloop(struct daemon_state *state) if (event.flags & EV_ERROR) { errx(EXIT_FAILURE, "Event error: %s", - strerror(event.data)); + strerror((int)event.data)); } switch (event.filter) { @@ -588,7 +590,7 @@ listen_child(int fd, struct daemon_state *state) { static unsigned char buf[LBUF_SIZE]; static size_t bytes_read = 0; - int rv; + ssize_t rv; assert(state != NULL); assert(bytes_read < LBUF_SIZE - 1); From nobody Wed Dec 27 06:08:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Lm93BC8z55BDH; Wed, 27 Dec 2023 06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Lm92Fzjz3J9K; Wed, 27 Dec 2023 06: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=1703657289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hfqXAwq81AjzMsPDlE9JNWptBa7hwzZtX0US9vNehak=; b=jYwn8kiQobZejquJwrCI1kIWSJiSx3FXtj3ZZXrWtOaoFApTt+JLjwM9mprGhsAv4yPZ2y JtjjGsb6JWXMP+MWR5uXxnY/5nd2q62ocimD4FS0p/CKFK7tSpjdpccKF8qJDZImcNq/rA 8aOT2HIu9JAVLlKWWvm8uosqLwqIoXh++h88XQs70nT47W/q6wJ9kxVBypmc0DGRZ/giNm fcPP0lJxtcvzaNZMCwyzTJDaRtIOlrOJAMX4iyUdcYycA90YCXooWeDdxaPUXz6r1wHao7 nbpx1Ob4ximmL53aMvg+7EJk+kQ9xs/p0AxtjPpgHSIpDu/2jXQQN73s+LSeag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703657289; a=rsa-sha256; cv=none; b=bDWkEQZw/ziKQaBBeBLABoPygNlyeO7P6DBe8M8buv89KV+UeinyF5BjXRYTBb4T1RzKKa WU+N0CzPnmARSNfytVS0P7H6zGl/VJwKlaT4RR1IgmV/7kkAu6k05FLfVPEd9Z3MTCmHlT Evs1D9WlJ5o/oanAp9jXynzm63cbMdAQTGGbdWf2MjPfPJAny6KvmbC8VvEFwaFM/skgNa xwcCAht5pvDLsl+VhQFMZeL1xHAI65cMHjv7HD75IOux1Qo7wsmzPwFbD+Rd611ub2EUXq TBJBqCIdmKoLlQ+fCxEEPwUds+QW761E73nMmZyU488orLqzZNRJfgJncw1+MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703657289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hfqXAwq81AjzMsPDlE9JNWptBa7hwzZtX0US9vNehak=; b=l9QrXGNQ1qg99fhDhvPV7F7kJjFDpuIChPWNmqY59saUA/prY9Cpvb+LaBVKdHlDRfPo1N IzaP/zcW0oPmMfsxlJm+tE8JR9YmG1yPnMblWUNMCUV7o843SNIDOwa/AFDMFojbfn5Yc+ 6rb9IZlGd42+aQN+Hjz66QleCHtuxu2yYbO/juTCNytqOTz595MQgwksOcEMEDmBrDRWuV pTJBW24lxe9xX+qcTm3VcrTf/iJ5pMramFuJw9JeTBNIeHQUBiZgKTC/HSLp92MuFoMkLA tSZLxwCaNJUNTyWLp4AdBlGtWQZ7/8u6l0Da3mjuaxl5dJ293rhlBAQw8evK/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Lm90h9ZzCRy; Wed, 27 Dec 2023 06:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR689g8024891; Wed, 27 Dec 2023 06:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR688vs024888; Wed, 27 Dec 2023 06:08:08 GMT (envelope-from git) Date: Wed, 27 Dec 2023 06:08:08 GMT Message-Id: <202312270608.3BR688vs024888@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: 6ac7c9f06ae9 - main - daemon: remove redundant parameter from listen_child() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 commit 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 Author: Ihor Antonov AuthorDate: 2023-12-27 06:07:25 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 06:07:25 +0000 daemon: remove redundant parameter from listen_child() state already contains pipe fd Reviewed by: cperciva, kevans --- usr.sbin/daemon/daemon.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 14ea87af646d..ed6239b9fb93 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -93,7 +93,7 @@ struct daemon_state { static void restrict_process(const char *); static int open_log(const char *); static void reopen_log(struct daemon_state *); -static bool listen_child(int, struct daemon_state *); +static bool listen_child(struct daemon_state *); static int get_log_mapping(const char *, const CODE *); static void open_pid_files(struct daemon_state *); static void do_output(const unsigned char *, size_t, struct daemon_state *); @@ -448,9 +448,7 @@ daemon_eventloop(struct daemon_state *state) /* child is dead, read all until EOF */ state->pid = -1; state->mode = MODE_NOCHILD; - while (listen_child(state->pipe_fd[0], - state)) - ; + while (listen_child(state)); } continue; case SIGTERM: @@ -486,7 +484,7 @@ daemon_eventloop(struct daemon_state *state) */ if (event.data > 0) { - (void)listen_child(state->pipe_fd[0], state); + (void)listen_child(state); } continue; default: @@ -582,11 +580,9 @@ restrict_process(const char *user) * * Return value of false is assumed to mean EOF or error, and true indicates to * continue reading. - * - * TODO: simplify signature - state contains pipefd */ static bool -listen_child(int fd, struct daemon_state *state) +listen_child(struct daemon_state *state) { static unsigned char buf[LBUF_SIZE]; static size_t bytes_read = 0; @@ -595,7 +591,7 @@ listen_child(int fd, struct daemon_state *state) assert(state != NULL); assert(bytes_read < LBUF_SIZE - 1); - rv = read(fd, buf + bytes_read, LBUF_SIZE - bytes_read - 1); + rv = read(state->pipe_fd[0], buf + bytes_read, LBUF_SIZE - bytes_read - 1); if (rv > 0) { unsigned char *cp; From nobody Wed Dec 27 06:08:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0LmB39nMz55Bgw; Wed, 27 Dec 2023 06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0LmB2bjJz3JHS; Wed, 27 Dec 2023 06: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=1703657290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CA7k9UsblQUi/sBgIh0bg8gjF6TmX4ac9Bh2NcRK+8g=; b=qA2K+Yevtb4voB2NnLpUqudXgLI+1FrOv26jwDrsejqQAYnjipsW8vbDRZLmQLShCWagQc t3HNTgL+YYx77xSshWwoMBDa6pzae6/jowd3pmJlSalQXbzCX2kqugmkZONmxUCjzeNWd/ cmLGNsV9Nue3VGnWbME3ErftzxcRFf7AQPaBghmWNX3rk78lKPJsin3iBZ+pWIQIaJ+/z0 7CBqlEf7eFzdPYLyVIOA/59C10HX3bTdomH4XuHihqo7Db24e+8PVXucqLOmsIvpaHYbLA zem0reBed0xDOvfLKRBaPGVskT/yVmjTogE9oiLSFxFVsuja2xv3JK5BdGqz0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703657290; a=rsa-sha256; cv=none; b=q7cLhYRDD1h1cW7qjKnOXw6BPRxtbSqyX7zsW5sqV+Vg97YHh+aIm4DSaLx67pvzD0QOUj 0WGoG1nVF96WrL6/JdPO/iesvIMAudCQyFK04v1TShEXbNcbHj+SMBUSlv7bGepR9Z1UpI c+Wi/n3qKYrlwBfjoRwwM8vUVZHusU7DV9V+Lhe7NTFSGCIHLyGqOZ3cLYKFuKwhkQySRb AhrxTQXMMOqTqrkwm7BjF9Mt4KL7VPyKaahIsWvOkyEwpkei1mkmO9w+Vgdp2oivcXvjzO hJXFZrGJzGeKavcrqdQKSXftMny20/an8u+bt/2uXOVEopIaSaBFPURcN25BKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703657290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CA7k9UsblQUi/sBgIh0bg8gjF6TmX4ac9Bh2NcRK+8g=; b=u3BjhE9U/Hpt745/vMnuxvXnMdFVN2YQ5UyWvURJ5Y1Pfv4FvCOewe4yDk46xQ399QXtsJ tFYj3AFM+8TM/RYLpFVMgwWKU49iU7S++c24RRbV2VxC2QP/EdSH0WcBO67Rg5rHeSbCQR 6vAjAcoN8tqT6Afq8PQ0KnVy1Q4E5WPJFMWzzHxQsXor0mI70DHZ1AsfIosPSKa3ff8qlz VJZv3fFsni3Td9hxEfmjuN3d3dyst6Ts5fi8dzXWeGHl3jzXVEH3JHTvdGtTcNU3IJdB6L RDxcqz3KyZeAogCLubxXXU7eDwUNItRC3KCOvwNi2OjdH6DIbIn/kBITBSCYxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0LmB1jk3zC0S; Wed, 27 Dec 2023 06:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR68AUd024933; Wed, 27 Dec 2023 06:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR68AOs024930; Wed, 27 Dec 2023 06:08:10 GMT (envelope-from git) Date: Wed, 27 Dec 2023 06:08:10 GMT Message-Id: <202312270608.3BR68AOs024930@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: 24fd3e969ebe - main - daemon: move buffer into daemon_state List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 24fd3e969ebe2ed44bc04f5ccc4db21cf02184d5 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=24fd3e969ebe2ed44bc04f5ccc4db21cf02184d5 commit 24fd3e969ebe2ed44bc04f5ccc4db21cf02184d5 Author: Ihor Antonov AuthorDate: 2023-12-27 06:07:25 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 06:07:25 +0000 daemon: move buffer into daemon_state There is no reason for a buffer in listen_child() to be a static function variable. The buffer and its position are parts of the daemon state and should live together with the rest of the state variables. Reviewed by: cperciva, kevans --- usr.sbin/daemon/daemon.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index ed6239b9fb93..e9c4bf05504c 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -66,6 +66,8 @@ enum daemon_mode { }; struct daemon_state { + unsigned char buf[LBUF_SIZE]; + size_t pos; int pipe_fd[2]; char **argv; const char *child_pidfile; @@ -584,38 +586,36 @@ restrict_process(const char *user) static bool listen_child(struct daemon_state *state) { - static unsigned char buf[LBUF_SIZE]; - static size_t bytes_read = 0; ssize_t rv; assert(state != NULL); - assert(bytes_read < LBUF_SIZE - 1); + assert(state->pos < LBUF_SIZE - 1); - rv = read(state->pipe_fd[0], buf + bytes_read, LBUF_SIZE - bytes_read - 1); + rv = read(state->pipe_fd[0], state->buf + state->pos, LBUF_SIZE - state->pos - 1); if (rv > 0) { unsigned char *cp; - bytes_read += rv; - assert(bytes_read <= LBUF_SIZE - 1); + state->pos += rv; + assert(state->pos <= LBUF_SIZE - 1); /* Always NUL-terminate just in case. */ - buf[LBUF_SIZE - 1] = '\0'; + state->buf[LBUF_SIZE - 1] = '\0'; /* * Chomp line by line until we run out of buffer. * This does not take NUL characters into account. */ - while ((cp = memchr(buf, '\n', bytes_read)) != NULL) { - size_t bytes_line = cp - buf + 1; - assert(bytes_line <= bytes_read); - do_output(buf, bytes_line, state); - bytes_read -= bytes_line; - memmove(buf, cp + 1, bytes_read); + while ((cp = memchr(state->buf, '\n', state->pos)) != NULL) { + size_t bytes_line = cp - state->buf + 1; + assert(bytes_line <= state->pos); + do_output(state->buf, bytes_line, state); + state->pos -= bytes_line; + memmove(state->buf, cp + 1, state->pos); } /* Wait until the buffer is full. */ - if (bytes_read < LBUF_SIZE - 1) { + if (state->pos < LBUF_SIZE - 1) { return true; } - do_output(buf, bytes_read, state); - bytes_read = 0; + do_output(state->buf, state->pos, state); + state->pos = 0; return true; } else if (rv == -1) { /* EINTR should trigger another read. */ @@ -627,9 +627,9 @@ listen_child(struct daemon_state *state) } } /* Upon EOF, we have to flush what's left of the buffer. */ - if (bytes_read > 0) { - do_output(buf, bytes_read, state); - bytes_read = 0; + if (state->pos > 0) { + do_output(state->buf, state->pos, state); + state->pos = 0; } return false; } @@ -685,6 +685,8 @@ static void daemon_state_init(struct daemon_state *state) { *state = (struct daemon_state) { + .buf = {0}, + .pos = 0, .pipe_fd = { -1, -1 }, .argv = NULL, .parent_pidfh = NULL, From nobody Wed Dec 27 06:08:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0LmC5LWjz55Bcf; Wed, 27 Dec 2023 06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0LmC3dnSz3JMw; Wed, 27 Dec 2023 06: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=1703657291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLCr25blznBxRX5G0DfYlN+vIE5DlhGBtMQEDSpUpIo=; b=w3S0m14q43wyTiPZVJGTdfv6McZs0DoLMErKOQleIv8e1XGK6V3XH8EEBddvtoVC+Xsiyc t2GI++wD9g+PrliEu82vh9MLLAQWqg05lR5qNTXFSL3c5mijYdiSTr5Nz9vkpr94DipNj3 Js2r+j/zj253RC5MKAj2ShI6/V8MPCGqD239Ph6B6vWkYeUWhHn69cvnBIbbUwTwls627N XJnYOXkPQRfheuUF4LXOZRUY68OOJiLus7FOYLY4HUR1kWFdnYVA92oSvQU4sZJePrpdhr 3DldZm8uYweK/WiTmDrVnUBYefviqe8Niaogt8bv9U8Zvjt5tozoHY2j60dn7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703657291; a=rsa-sha256; cv=none; b=r3o3i8HKg6lyt0T/VWlNquo6MxmFHqFqCMzSMz65EOB76Xtu+xkEspjuJ69Cwsq73Bo4y2 7P5rsjodcesucYy96jt8l/2OhxYHrJNumzRYgAuU9ANWdLcGvEIjilCQnCdG81LlDJJwII taXsLRApbEteMHTE4OKoas98XSegqZzCPV7S9jjfcsOWGQduKeDyq+130c0hV8rVSE+oUi W0y2vFt86pwVcStP7vDkvJUudOgJM/CVRzAEJRn17iCZ+PH1a6rcKPWpyZSIhNzEuS1Sfp g0CkL+VohVt/mfwfzjc1fn1gNYEhHGHab6XyjVUa7jgEKL43GnboM/+vj3KP1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703657291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLCr25blznBxRX5G0DfYlN+vIE5DlhGBtMQEDSpUpIo=; b=p246YOm4572lWop1rtjyKVAvD5s5J82iQ1KCNE70ONSoyreGytjxHJpSRYbf4laR0lSlvW cAe2jt+YBIE80o6vXsh8cYiftekda4eWYwYyWMj2/XtBGZPUgofohDwKKKLM7IzkGq22mp dipm8tY3Vf3T6r5FOdtyPflIJ8UvTbPrHFhmJttLob9MVSi+2cFfYDQFvTAVDdCeaQsk1t vEOTQEUzLx/Fd8Q1aQ8A+NVeMRj2wiAqHlxl4JGTIXNwtFCRCPYX2U9RYYuOQo0hRXYWye XQMbqhCV+dvKEuXLkDCNAwDeDCIVArYGtuEO8Xv14BI4UJAajq0/xtaS0hndLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0LmC2jvhzCG0; Wed, 27 Dec 2023 06:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR68B5Y024975; Wed, 27 Dec 2023 06:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR68BED024972; Wed, 27 Dec 2023 06:08:11 GMT (envelope-from git) Date: Wed, 27 Dec 2023 06:08:11 GMT Message-Id: <202312270608.3BR68BED024972@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: 5745a5841413 - main - daemon: replace memchr with memrchr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5745a5841413da5c2e002ba65c60d7b9d594bc52 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5745a5841413da5c2e002ba65c60d7b9d594bc52 commit 5745a5841413da5c2e002ba65c60d7b9d594bc52 Author: Ihor Antonov AuthorDate: 2023-12-27 06:07:26 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 06:07:26 +0000 daemon: replace memchr with memrchr Looping over lines in the buffer is not needed. Same effect can be achieved by looking for the last new line. If found the buffer is guaranteed to have one or more complete lines. All complete lines are flushed at once with no looping. Reviewed by: cperciva, kevans --- usr.sbin/daemon/daemon.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index e9c4bf05504c..066240fc8302 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -587,23 +587,27 @@ static bool listen_child(struct daemon_state *state) { ssize_t rv; + unsigned char *cp; assert(state != NULL); assert(state->pos < LBUF_SIZE - 1); rv = read(state->pipe_fd[0], state->buf + state->pos, LBUF_SIZE - state->pos - 1); if (rv > 0) { - unsigned char *cp; - state->pos += rv; assert(state->pos <= LBUF_SIZE - 1); /* Always NUL-terminate just in case. */ state->buf[LBUF_SIZE - 1] = '\0'; + /* - * Chomp line by line until we run out of buffer. + * Find position of the last newline in the buffer. + * The buffer is guaranteed to have one or more complete lines + * if at least one newline was found when searching in reverse. + * All complete lines are flushed. * This does not take NUL characters into account. */ - while ((cp = memchr(state->buf, '\n', state->pos)) != NULL) { + cp = memrchr(state->buf, '\n', state->pos); + if (cp != NULL) { size_t bytes_line = cp - state->buf + 1; assert(bytes_line <= state->pos); do_output(state->buf, bytes_line, state); From nobody Wed Dec 27 06:08:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0LmD65c2z55Bh1; Wed, 27 Dec 2023 06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0LmD4Mq5z3J1s; Wed, 27 Dec 2023 06: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=1703657292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uwpd2F8htLIyUBTGjWt5cpAxG536egZMSUXzHDya2Pk=; b=gZM4+dGpgS3A0vocmRELmiyN8e5HAVI+87YkiT7zmRqrgzJKfR+uzGfk5XV077ZpuVlM4Q O/w+jJ1DEdCOQr395XhNLTYk9G+kMk6/bvaThnNyLN0BOHsBiRo+YcgejgVDSHMKVlZMyx qKfZfNe/TQvjaQZSFAQX+jng8hy9djfQSn+ynVv2QhnZNjz5OUIt2GUe7Y29OKGUCVd+0M xytM95JbvIRgHL9If6hegC0qLfHmWIPbsKUr4kX9JrOm66sFYjWD+X999tb9i3Tx7x1HV0 kyLG8Z5GpzkJAk7Amh52254vOWm86HOIdjoKAsQicyAFKCcaf0NE5bop5evGzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703657292; a=rsa-sha256; cv=none; b=aQGM3kz7n17W8XpF1hq+3GnoEwumXSxQC+dbtBP17w7NYYkwYZLCyEe+rIt2fV6eGykcYA aunfldcf7LvwXATKBD12Aramcfp2VJh22fq9tJr7bIbII+GrYLM8xQ4ePFPE2RrEXCd6mq rEeT4gPGbzIHVnwWm+CPPqsAlBJsnoadTWQPR3gXV90R55cGDQkv93IIRtms0NSqy32pKQ +42xyOYi4ne6RQwiasDdzNrGuwPm/Ac1KoMDSMnuJdwaefbfo6MzQW5raLZIq1JE6GWLVN f3nQFP2gZUhgNSIFO2HIcMVkv3js0Kw55aaoq5X4FpqVivz6wuGNuTcP162wgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703657292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uwpd2F8htLIyUBTGjWt5cpAxG536egZMSUXzHDya2Pk=; b=Zr75DF/7VuS1Z8vtxUyEvFMbPRUHozd5Gb1+mjrXlTw5VBExRhcnMs3a4K26a7ZzIAElbm 5sr6Ca4Nre/6Kur7FAJuB2xh7X77CUWKdTOxolGfPm1rNlHouRKTBGcsNyceCw4I21LEKh YcQVIQbKXmZCFMDFIpfk6XbB+72Z4wuCi1PR4sFrrJAQbRx0gabEnYStNwz71BkTA1Rwj3 Feahq/Spd7LPiY8K1RP6MrNCMbE6DHOeod5P0x2kI8D7OFH4oGWVrRAnj4Kp1eoHnvvlX6 Y5r8oct1B0mz2g4aKW5RdD+53BJ0xypoQet08HyA4QQXs0WQwf+fuxlecDF6vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0LmD3T74zCQg; Wed, 27 Dec 2023 06:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR68C1P025030; Wed, 27 Dec 2023 06:08:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR68CH4025027; Wed, 27 Dec 2023 06:08:12 GMT (envelope-from git) Date: Wed, 27 Dec 2023 06:08:12 GMT Message-Id: <202312270608.3BR68CH4025027@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: 407e3790c3a0 - main - daemon: separate pipe_fd[2] into pipe_rd and pipe_wr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 407e3790c3a0652beb5c97e4049a58a6e2118ce4 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=407e3790c3a0652beb5c97e4049a58a6e2118ce4 commit 407e3790c3a0652beb5c97e4049a58a6e2118ce4 Author: Ihor Antonov AuthorDate: 2023-12-27 06:07:26 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 06:07:26 +0000 daemon: separate pipe_fd[2] into pipe_rd and pipe_wr This improves code readability and prevents mixing up read and write ends of the pipe. Reviewed by: cperciva, kevans Requested by: kevans --- usr.sbin/daemon/daemon.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 066240fc8302..f349a382edd2 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -65,10 +65,10 @@ enum daemon_mode { MODE_NOCHILD, /* child is terminated, final state of the event loop */ }; + struct daemon_state { unsigned char buf[LBUF_SIZE]; size_t pos; - int pipe_fd[2]; char **argv; const char *child_pidfile; const char *parent_pidfile; @@ -80,6 +80,8 @@ struct daemon_state { struct pidfh *child_pidfh; enum daemon_mode mode; int pid; + int pipe_rd; + int pipe_wr; int keep_cur_workdir; int restart_delay; int stdmask; @@ -367,6 +369,7 @@ daemon_eventloop(struct daemon_state *state) struct kevent event; int kq; int ret; + int pipe_fd[2]; /* * Try to protect against pageout kill. Ignore the @@ -375,12 +378,14 @@ daemon_eventloop(struct daemon_state *state) */ (void)madvise(NULL, 0, MADV_PROTECT); - if (pipe(state->pipe_fd)) { + if (pipe(pipe_fd)) { err(1, "pipe"); } + state->pipe_rd = pipe_fd[0]; + state->pipe_wr = pipe_fd[1]; kq = kqueuex(KQUEUE_CLOEXEC); - EV_SET(&event, state->pipe_fd[0], EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, + EV_SET(&event, state->pipe_rd, EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, NULL); if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { err(EXIT_FAILURE, "failed to register kevent"); @@ -420,8 +425,8 @@ daemon_eventloop(struct daemon_state *state) } /* case: pid > 0; fork succeeded */ - close(state->pipe_fd[1]); - state->pipe_fd[1] = -1; + close(state->pipe_wr); + state->pipe_wr = -1; setproctitle("%s[%d]", state->title, (int)state->pid); setbuf(stdout, NULL); @@ -495,8 +500,8 @@ daemon_eventloop(struct daemon_state *state) } close(kq); - close(state->pipe_fd[0]); - state->pipe_fd[0] = -1; + close(state->pipe_rd); + state->pipe_rd = -1; } static void @@ -592,7 +597,7 @@ listen_child(struct daemon_state *state) assert(state != NULL); assert(state->pos < LBUF_SIZE - 1); - rv = read(state->pipe_fd[0], state->buf + state->pos, LBUF_SIZE - state->pos - 1); + rv = read(state->pipe_rd, state->buf + state->pos, LBUF_SIZE - state->pos - 1); if (rv > 0) { state->pos += rv; assert(state->pos <= LBUF_SIZE - 1); @@ -691,7 +696,6 @@ daemon_state_init(struct daemon_state *state) *state = (struct daemon_state) { .buf = {0}, .pos = 0, - .pipe_fd = { -1, -1 }, .argv = NULL, .parent_pidfh = NULL, .child_pidfh = NULL, @@ -702,6 +706,8 @@ daemon_state_init(struct daemon_state *state) .mode = MODE_DAEMON, .restart_enabled = false, .pid = 0, + .pipe_rd = -1, + .pipe_wr = -1, .keep_cur_workdir = 1, .restart_delay = 1, .stdmask = STDOUT_FILENO | STDERR_FILENO, @@ -724,12 +730,12 @@ daemon_terminate(struct daemon_state *state) if (state->output_fd >= 0) { close(state->output_fd); } - if (state->pipe_fd[0] >= 0) { - close(state->pipe_fd[0]); + if (state->pipe_rd >= 0) { + close(state->pipe_rd); } - if (state->pipe_fd[1] >= 0) { - close(state->pipe_fd[1]); + if (state->pipe_wr >= 0) { + close(state->pipe_wr); } if (state->syslog_enabled) { closelog(); @@ -769,20 +775,20 @@ static void daemon_set_child_pipe(struct daemon_state *state) { if (state->stdmask & STDERR_FILENO) { - if (dup2(state->pipe_fd[1], STDERR_FILENO) == -1) { + if (dup2(state->pipe_wr, STDERR_FILENO) == -1) { err(1, "dup2"); } } if (state->stdmask & STDOUT_FILENO) { - if (dup2(state->pipe_fd[1], STDOUT_FILENO) == -1) { + if (dup2(state->pipe_wr, STDOUT_FILENO) == -1) { err(1, "dup2"); } } - if (state->pipe_fd[1] != STDERR_FILENO && - state->pipe_fd[1] != STDOUT_FILENO) { - close(state->pipe_fd[1]); + if (state->pipe_wr != STDERR_FILENO && + state->pipe_wr != STDOUT_FILENO) { + close(state->pipe_wr); } /* The child gets dup'd pipes. */ - close(state->pipe_fd[0]); + close(state->pipe_rd); } From nobody Wed Dec 27 08:42:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0QBH4NVZz55Bt2; Wed, 27 Dec 2023 08:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0QBH2bYSz3XM6; Wed, 27 Dec 2023 08:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQCfhlCHFnLbCo5XZEMJfaDnTB5TpbN0KD+B0s5qWSM=; b=rAj7fuVOAw5FVP7s3fAL2I3JS6/tFaxtaqGgUXFLsUrWhXYZ7PHSoPGPVRv05x7wMF71cX 3B2WuO3v9uygHlLbY1gHKDH4fo6o+tZR2hE/a8ouEjbwHCjEo/alwlChm0yRN8KV+uzD9g b9mBXYtb3DblvXPIU3jNbZ0ELSmbvT1Bxy5Cj5Y22sn01D9D8ksG/SIOLFmV47T5VhzT/m I0YwL6xIfjKYSwzUiuPVA5CT9YoU1rzkEJjHBXXO88nO6882JL3wwrEgkh1awh/ox7p/+L HtQxG7BjYTmU4+YMP/XryUMoe8BC7NcKIalvvuJKk5oKWZSvGDGuVO6uARGGlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703666551; a=rsa-sha256; cv=none; b=t50SEqkyufoQomoOYScwAsl1Jra5zNTvtkRNL3a7D0H5twmgOotgzyLCzNzzgkzD4WJoa3 0pJZeNHp8PS1tFPICEWzrvkT67mRgAy2XoTxhP3UBe897Z1wLVXIHF2AQIP89a/phajGop wKC21AYE3jypoI4NaP4NUpT0d1ymqLR3jp9pd0DO5g+t9fpekuOBAscYJ2KGG4fZYoyhYO 81Hr9d48PRSIGoz/zc/FmnwvSbc3IiPhmJEKmZhqfWVllmarKFLs34VfuvSMkRSGkJiSW7 vEhnRtHJGJVDC+RcvnRGdBcugdUvXi0824Ap+Pf+ngpmYxOZVJS56Y516PfH8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQCfhlCHFnLbCo5XZEMJfaDnTB5TpbN0KD+B0s5qWSM=; b=rq3ikG0wcvHBO+nAmGgC7oWpU0JJVolmNnHSvStGWIqHQXBSSqxa3ij9rLRTefiXewzrvu YRC68jtWxYoFifIxs8Uf71PodbLpVS4raPFE7ks18bAismXt3yxJAvTFpZ0tKZrV+nzPR/ r/8ZNoYwm5FWkp1/1hC1YpeK644BH41gVl8M0uYBMi8PGOm68LYBPHUBLauy9uRTRGsNll 8ouYZivfYZMUlKK1wX2RYXXh6o+zQUnyvEOEA30snL7AVpI4/B6K9MF+EF/H4kd6ueVM8s dpQ4BJgpVaDZ+BFwN3+O4Je2Ab9GIIPDEvB6mssC8lf0f64tEEcblbe9jL8Hrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0QBH1gpRzXn1; Wed, 27 Dec 2023 08:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR8gVZK091972; Wed, 27 Dec 2023 08:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR8gVcQ091969; Wed, 27 Dec 2023 08:42:31 GMT (envelope-from git) Date: Wed, 27 Dec 2023 08:42:31 GMT Message-Id: <202312270842.3BR8gVcQ091969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: c58205be7a7d - main - tail(1): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c58205be7a7d4eb1c68b169bb7fdb57f1e057cc5 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c58205be7a7d4eb1c68b169bb7fdb57f1e057cc5 commit c58205be7a7d4eb1c68b169bb7fdb57f1e057cc5 Author: Gordon Bergling AuthorDate: 2023-12-27 08:35:38 +0000 Commit: Gordon Bergling CommitDate: 2023-12-27 08:35:38 +0000 tail(1): Fix a typo in a source code comment - s/recieved/received/ MFC after: 3 days --- usr.bin/tail/forward.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index 800492d2b1f3..010a36b4c793 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -404,7 +404,7 @@ follow(file_info_t *files, enum STYLE style, off_t off) /* * In the -F case we set a timeout to ensure that * we re-stat the file at least once every second. - * If we've recieved EINTR, ignore it. Both reasons + * If we've received EINTR, ignore it. Both reasons * for its generation are transient. */ do { From nobody Wed Dec 27 08:42:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0QBJ4LR8z55C3G; Wed, 27 Dec 2023 08:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0QBJ3ndxz3Wyl; Wed, 27 Dec 2023 08:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oGEbx42/lHry4abOnDtTGs3ifP88q9IQWkIoxKfaJQ=; b=KG1aH8MbFPP3Jgf1QgMkHMbyyUGmNRKQt7SD6wEAbgqZLBa6i8tAENqodJKcs/+0cUWuf6 iuIbtSUR9JX7jlHyclMEqqey7voEx4vcg655IimEUHfePaGQ/1VfqeLI8hrjf69U2Wmsda ++yFPXrfWnvwWp4WeJePXQ/cF3z40NvXhWG/k4pBBi5vwFQkH92jkFUA5XpaYAAUHaoIIX lLAE745F1snOg2bmnDkAI/EVRqTLuRUnokp5XcaX33AmldVk4sUCJe7mD8bQxsq/2ySL8i 3U+5VqJ4mrBX9aNshGjlGSzuZl6q2uus9+Eq2beKoSth2NpsVJ+FzSBs2xd65w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703666552; a=rsa-sha256; cv=none; b=mgyzVaBS4C+VOwW2xzh4QBVU8t+hB0ILjZlFYye+oWKYhRcDmpHIfJdH5GujJAUJ4pEXMA JwgLk/tXZ10hkMDZ0s6j8saf3Zyk3avbuahk0fDvWqC7Qfh0ZlR+7jF+ojdTLW1EU+rsZ/ cVt80anjT0+gsJZluM0NyAK0/QJbeYimPdSaAoeiBWULAXwwAOeW53cY8HTf5N8/9DpwSv O/GHXrdsGzrHAQsziswJN/dgE69O8ZhkZBWYjq4HkwHQzcpq8VLv5vU9fOyMMuexlCs+PV VlZL/ONxMocWvlHTmfuT/v3UA2ghOTgxX3zDVPjTgn1+4IczbROjDNtDty6aDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oGEbx42/lHry4abOnDtTGs3ifP88q9IQWkIoxKfaJQ=; b=hdAdZ2mBnnAGQeJ5mrCwpVvDxLD62Anq8NxecwT7g9Vs+pZo7IH8K+5f2mMrKVjUUNnCim U97uSio5kbDKB4wSJ08mxkCADuJ9wGxwUXyX9yAMa6x91dy2W/YJoL4qlXxAGaOxJBv0Dg yjZ0/KCmz6v+Rxsdhz1n9YummVO0NWkB/6jSgbjV5uzm6KZZlA4nUzo2U1qyLmO5dwhKei QwzZ/QnTNGmVZ+Z+HuMql2j/6ks3viNTf0sj5DQlBgwM5fQwKXOnHxUDzFt4Xcxnnks9Yu gc8VR2iIWJeq/ZezQBeosHvZohRqP0qYdKRg2YmDsf0sR82/qOkXKxBL/pxSVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0QBJ2ty6zXpw; Wed, 27 Dec 2023 08:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR8gWY2092026; Wed, 27 Dec 2023 08:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR8gWpU092023; Wed, 27 Dec 2023 08:42:32 GMT (envelope-from git) Date: Wed, 27 Dec 2023 08:42:32 GMT Message-Id: <202312270842.3BR8gWpU092023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 7b0b448ba9fd - main - tcp_stacks: Fix two typos in a source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b0b448ba9fd53fb4db81a2309dedfdc47533cfb Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7b0b448ba9fd53fb4db81a2309dedfdc47533cfb commit 7b0b448ba9fd53fb4db81a2309dedfdc47533cfb Author: Gordon Bergling AuthorDate: 2023-12-27 08:36:30 +0000 Commit: Gordon Bergling CommitDate: 2023-12-27 08:36:30 +0000 tcp_stacks: Fix two typos in a source code comments - s/recieved/received/ MFC after: 3 days --- sys/netinet/tcp_stacks/bbr.c | 2 +- sys/netinet/tcp_stacks/rack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 5f7c6125c1f0..c643f0321099 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6845,7 +6845,7 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, * Ok its a SACK block that we retransmitted. or a windows * machine without timestamps. We can tell nothing from the * time-stamp since its not there or the time the peer last - * recieved a segment that moved forward its cum-ack point. + * received a segment that moved forward its cum-ack point. * * Lets look at the last retransmit and see what we can tell * (with BBR for space we only keep 2 note we have to keep diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 229f36008a6a..8e374e28465e 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -9145,7 +9145,7 @@ rack_update_rtt(struct tcpcb *tp, struct tcp_rack *rack, * Ok its a SACK block that we retransmitted. or a windows * machine without timestamps. We can tell nothing from the * time-stamp since its not there or the time the peer last - * recieved a segment that moved forward its cum-ack point. + * received a segment that moved forward its cum-ack point. */ ts_not_found: i = rsm->r_rtr_cnt - 1; From nobody Wed Dec 27 08:42:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0QBL07Jqz55BtC; Wed, 27 Dec 2023 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0QBK4tMzz3X6p; Wed, 27 Dec 2023 08:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YFW61pQqA1sGWIwu1oWYLHpn8ERszRsMSAyPXvzqdU4=; b=njX3MTE9JkJFeirrp5ByMq+4NGWL1IeQFehPM0Y5Steg72sNZXA9Psg6mYV84v/BYT55SY 137jiSbMr2cwaVzqtmPEaYHzuLUJe/J5rmL5ihmsyPzvKTeJZRbAKrakLlCk/kJgYbnWJz 1cKEAGGbaNyNOkN8U7zHiDUmMVrhGky5U9Rb/hzgJAeuxGR7NuP8636+hlzOFGEjtN5Opm n0Qd0+Hq6TZzyykGxz9h5lT+O3ba9si7GDKkBZLoa7wYhWAi1twmu2Tp/2pH3r1jqr0iC6 KjSIuHrSV9WLeUr5PQ9IUtx75fC3vKbblXsQyCRoI+qHFauqh+eF78VPC+8txw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703666553; a=rsa-sha256; cv=none; b=qXuri5xCkiUTGI+xmn5mPXBXae5lvf9uob/M+PfbaCwJn4uk//i46mfiM6ZM80sWMWt/gW ffk8FN0qZdeGcm4o8RiiNh22bGUdvaZRHTT1DgEkLh9orwRv1feufOxko73SzIA7cfI/Hb glnjKi9a7cAEOT858JQDj55rhmKvy3yUuSVBZif7DW/7TZVyKO4EIgM4f+sLgu/+Kv6t9m wsf8LGEuY/X1Z0AIi9v6b32hdBX4m19+FfzLXqvMsy9wXM4Kbfsqgqsd6nughB2pv6mJph W4PqtiiveAMbUig4//UUh6liBCn2O82qcIGP6TGD2GS5asREqfnrT23+z2rp0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YFW61pQqA1sGWIwu1oWYLHpn8ERszRsMSAyPXvzqdU4=; b=dYZN/l2vDoxL184pGGufdhkYVDfQdAhhaUya2NKYuLwX4MzVyegsjNA2IyHgC8kQm4ENTh ChkugLY9sizC/PG4de2MQhTpktmfzm+XEeki/FxgkxlvQbjp9ys+nICQoKc/VRCAU2VuHS ZTerqH97C3sLlfbNVFbRh2Y5O5Q3gPalQK6wRIMnQmsKnEWzL+X9ZBIvZWnwlE4BiEEUJZ l61fv18YBQGcse49WkJFJotahx0RfHhIRHJell6mjmrNjLWCjsKByXsXaV7W++Fc7Hw2dT +2wBdXswFOzpbfhKKWW8EHDcByl5t2/tR6R7GOp2IeOFsL3kauFMDVW4cA5T+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 4T0QBK3xGlzXjw; Wed, 27 Dec 2023 08:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR8gXBI092084; Wed, 27 Dec 2023 08:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR8gXFX092080; Wed, 27 Dec 2023 08:42:33 GMT (envelope-from git) Date: Wed, 27 Dec 2023 08:42:33 GMT Message-Id: <202312270842.3BR8gXFX092080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6dc7bf0c5ce9 - main - hvsock: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dc7bf0c5ce9ce0b77b0f7b9293467babc685abe Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6dc7bf0c5ce9ce0b77b0f7b9293467babc685abe commit 6dc7bf0c5ce9ce0b77b0f7b9293467babc685abe Author: Gordon Bergling AuthorDate: 2023-12-27 08:37:29 +0000 Commit: Gordon Bergling CommitDate: 2023-12-27 08:37:29 +0000 hvsock: Fix a typo in a source code comment - s/recieved/received/ MFC after: 3 days --- sys/dev/hyperv/hvsock/hv_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hyperv/hvsock/hv_sock.c b/sys/dev/hyperv/hvsock/hv_sock.c index 78ec520f1bb3..df6f58f6fcb6 100644 --- a/sys/dev/hyperv/hvsock/hv_sock.c +++ b/sys/dev/hyperv/hvsock/hv_sock.c @@ -760,7 +760,7 @@ out: SOCKBUF_UNLOCK(sb); SOCK_IO_RECV_UNLOCK(so); - /* We recieved a FIN in this call */ + /* We received a FIN in this call */ if (so->so_error == ESHUTDOWN) { if (so->so_snd.sb_state & SBS_CANTSENDMORE) { /* Send has already closed */ From nobody Wed Dec 27 08:42:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0QBL6PX7z55C7y; Wed, 27 Dec 2023 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0QBL5WyVz3XCb; Wed, 27 Dec 2023 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKYY9p+76CpQ6vvOn/80SqC+fAYU7ALlk06vx7LKh2g=; b=GT12GqwZdgJFyYG0X9eB0pOt4RVxp3haUDiLBFVDJNGKyRxI3anbffijmArecUXWrnQRkM fG9ecc91W/bOzpwKh1iV9uEGQROZyGXyFK/EIjX0gNOWRUDaxbpBENdbChjwns1pUIjrZy DShWxtRkM5cmuN32/Q1iNolDz2/kJcH7YuHI4NLlw3E3XGcCyCAPVvSm+kPXHHpzYOFx7W 90vZDPIdvhEFWX5/xGJunJ2UHctUk9C7IBpbWW1aKiPT/lgbRAxAThhZ22/Uo2L3cP5ICb Li4S4SiS5legTTdPNiPRhEh2qluRxcgUOGyze5S8Bbbl/82BZ56QnHtpbTPeOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703666554; a=rsa-sha256; cv=none; b=lni4HqnLW1Sjk91sh4CaLsuMRqH/wj3999bJ2v5I45q637dpWP4qj4t7/yZrhr+OlsEOno sqrJsHcoW7sQTSm3J5wa+ADuMv5pXXkpdbTjefvWlz86a/G277Z+UqG5IbxH/KyaZBN+QN RQxg2FWPJ2Nj/2TdfFPdVaAmGZKSgqteijSoNKxAXHMHkDg2XDYvYAFWIN5x7c8sqxP+Zs f2tKFiIHTSsXHNwNzvexjjlzUy/BP5Q+4hy4dzzTmjR7w2KUAehDhDU2zC/YDRWzmwdOVD fqQCi1n7gziLW0qK9/Mg5DUqFyVYIQhN2F2jer0QR8Ij9nCm9f0eYZju0C1IgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKYY9p+76CpQ6vvOn/80SqC+fAYU7ALlk06vx7LKh2g=; b=txh/yC3Yas2Svwckynm944i92nv+9jr+iQoDgBfOCNjNER6CIjoMZdh2SArCO/sWzIVC3C L8cKOx1AxrujdZH5X3Gh/NE17OJvySYIW5JLVVCclki0OI3qJ+Qc/7e9HltW6Xk4fuLe8V WOYdxG9lMou9+DddZ8LErp1UQ+wub0qFZWOK91h6mVYFyAuBkUHeiFe0pSkWk47Eht3Do6 WLAciJkLPyVkgph4I2qwYr3JPBDVtnSPD2+hhVkb8WoGAvHRaOhKx28O0Q/Amm0PyOO0xY Yf8ymtFmwpJzC164Lij6pQk/Ikk5CEeS9WXAL4Om+N4vtPLcEYQdZxa4eb7AfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0QBL4bT8zXK8; Wed, 27 Dec 2023 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR8gYmm092143; Wed, 27 Dec 2023 08:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR8gYUN092140; Wed, 27 Dec 2023 08:42:34 GMT (envelope-from git) Date: Wed, 27 Dec 2023 08:42:34 GMT Message-Id: <202312270842.3BR8gYUN092140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: f795d5458b2a - main - ipfw(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f795d5458b2a9ce114b4e177d34705a53824edd2 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f795d5458b2a9ce114b4e177d34705a53824edd2 commit f795d5458b2a9ce114b4e177d34705a53824edd2 Author: Gordon Bergling AuthorDate: 2023-12-27 08:38:43 +0000 Commit: Gordon Bergling CommitDate: 2023-12-27 08:38:43 +0000 ipfw(4): Fix a typo in a source code comment - s/preserv/preserve/ MFC after: 3 days --- sys/netpfil/ipfw/ip_dummynet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index 74041653ebfb..b3f52322425f 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -1732,7 +1732,7 @@ config_sched(struct dn_sch *_nsch, struct dn_id *arg) int i; struct dn_link p; /* copy of oldlink */ struct dn_profile *pf = NULL; /* copy of old link profile */ - /* Used to preserv mask parameter */ + /* Used to preserve mask parameter */ struct ipfw_flow_id new_mask; int new_buckets = 0; int new_flags = 0; From nobody Wed Dec 27 08:42:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0QBN3CZmz55BtG; Wed, 27 Dec 2023 08:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0QBM6jzQz3XMk; Wed, 27 Dec 2023 08:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drYjIHOQDYDRKvWjPsvzflbWUryHn/H3KTEkk3Azex8=; b=YTKcVP/GzZczOwcruHoGl8qBrjvQKZDPdnFhTdWRgw7g/+UzERDOo7pnBOqsEE8epnRyI8 6u3fDF5/PJJEigGpoGUFW6PmpPahPGx7DtMmVGX/kCqN+vfC+jp+PB71bBCHOxUbb4c5fe 8GOudmDc1FBVZZxRq2kw7r8ukFYu467YtBgYsJaJcy8449uUwfEbB4Tkh3Jaypd62zmDaM 5WMVsp0jSKEvSfr/aLVndaXePp7luMMWMgiQctE+yr+tvd/Eo0qW6zU4u6i/G3MzExgueB 8GH+zofrccbQDu1TuwvFqqzFvF1ZNA6WRPYjE8E8gwBmF82O8+ctelVBZoWBrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703666555; a=rsa-sha256; cv=none; b=jrfUiUG72UqdB1NYA24CCzPscdJfuIu0HBxVFIUxmYhwzIOAfUsG6scpPQOGkPPQGDE3r9 P8hOjgbHsLoYbbwu24ZUgquqrUKGDcnLYsNho0NMIu4Qktku8LjuHnwAyKy+JHMedANAJb WUW8w4wrI2PlUsKQKXE+Kypr7UOX6MFo2LKUGaYnGLktv3Rj7IjcJe2Gb749WUIJGTfFQY 2EE8p+Z0zjdSUgHCw3s4sY9lIoqz+7T1FQoVe2banFoVPRslpXxSz6MHZ8he2S7FOUKtdN klLtdFv+z22vUcFgeaqiaVBjr4udTngXSxqTxb2bXwj5ip6x1SDBBYJyNTpeUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703666555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drYjIHOQDYDRKvWjPsvzflbWUryHn/H3KTEkk3Azex8=; b=letguyHo+kgYPx0iesxkt0ksxg026/okzMrRtKxF5/fw2QtwTGDfrRHoWPF8yjglkuwLsY ycwgSnxjHfxT2jEyWFGrzzeUU4jnvKhHoZjG322BSahb6GpV5mwlqiQzXnsvAXAxHChawK guOlXrPW51ihRMJE+n29IAHf1+dQwcmRhyncoWEmzN1yfAtsUhgk1vg0r1zeNXJuL9dDqp jLXBfVxGKSQLyFMyfa6isDuXHPZ8OZE9LpvL8wv3jn0CtcUH26JLa+FXj1s7QnqJpyKh4j oIN5uzLpEbfpKoRnnPLuMvQYQmW/TxUIG3VDRv7iiDGt5YwUll8QTzqAnRQSQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0QBM5qlpzXVv; Wed, 27 Dec 2023 08:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BR8gZqr092200; Wed, 27 Dec 2023 08:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR8gZpc092197; Wed, 27 Dec 2023 08:42:35 GMT (envelope-from git) Date: Wed, 27 Dec 2023 08:42:35 GMT Message-Id: <202312270842.3BR8gZpc092197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 63c928f17e08 - main - gpioevents: Fix a typo in a diagnostic output message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63c928f17e08f58fd3bd44b45c36ea5df7d15e77 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=63c928f17e08f58fd3bd44b45c36ea5df7d15e77 commit 63c928f17e08f58fd3bd44b45c36ea5df7d15e77 Author: Gordon Bergling AuthorDate: 2023-12-27 08:41:48 +0000 Commit: Gordon Bergling CommitDate: 2023-12-27 08:41:48 +0000 gpioevents: Fix a typo in a diagnostic output message - s/recieved/received/ MFC after: 3 days --- tools/test/gpioevents/gpioevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/gpioevents/gpioevents.c b/tools/test/gpioevents/gpioevents.c index f90b4e6ea3eb..f1bc8e8ee224 100644 --- a/tools/test/gpioevents/gpioevents.c +++ b/tools/test/gpioevents/gpioevents.c @@ -456,7 +456,7 @@ run_sigio(bool loop, int handle, const char *file) do { if (sigio == 1) { sigio = 0; - printf("%s: recieved SIGIO on %s\n", getprogname(), + printf("%s: received SIGIO on %s\n", getprogname(), file); run_read(false, handle, file, 0); } From nobody Wed Dec 27 10:04:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0S0z3j97z55L7N; Wed, 27 Dec 2023 10:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0S0z38Sfz4FHX; Wed, 27 Dec 2023 10:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703671475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2i/OVtvjm4hlcYB/YWWFdKoUJu7a0BbFrLlwIsAqFJg=; b=kSztO2pBrNvJh0oftLdlY8z2JxiSR6uX1evSSLe3rPE/LkCmVz/z3tKe57poTiHqXyIFnD 19f3gzfo7mcXMSF4cVO3W6v7ESX2k0kvHMsXMpsSpq659xIk+N+w/X9TNB/AmH1dq3TaxL qLPDatQhotZIpHB0317PY+/J47Tw6MNGhGDD3S0X48Grkzc4ys06gp00IedV8Vaz7kVXLS JRLlhL6bM5ac1irn5uAtWR4kYyHzIiaeewC5c8o2tNEarJVAVRqfhZ7lxSxjiKNCBlfyoB tXhRrhJWOT1QxzC5+nIhaSpk4gJkwrfvinG0ZLp2AIL3XMp9qKmitRu/+lGd6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703671475; a=rsa-sha256; cv=none; b=hF23qNUNPdbIAfJM/b6R94nCS+VoNYV6zsBHTT7v/b1WKVyfAIDg0IU03w8Weit0F9txCr uXxsbwW/P+WY/miWOLCJBZFYO8RUSxBwDgCnoE1W5tGuhzCzr/6sN/FJR8HkPzOLZ2BuBt Gi2aG1ERuk6jcTqDwg6xjrnQmGoxfGNZ4MDAU/J6kO2bj3ARkyE8N2AePMzjo8ja96BCw8 KlslDWHtPNu6Ct194j+4a8IMpdvx9FpGsKzwfQXs/wioqKl6t2ZgO//WZUvdkhf4rgHiOI 2bM1hPICHBOuekGNJw/p3SHauluKO2dCgsbo1XJuqT3NAtgMgJBKvBu9NV858g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703671475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2i/OVtvjm4hlcYB/YWWFdKoUJu7a0BbFrLlwIsAqFJg=; b=IMRMbe1dFBqtqMyIUA/mi3FUlewCrxmvrjJM3IfWL1zUytkoqZBBUNN0G2TIAWWLnov7EI bWIcyx+uFWkKzBuzX3bVc4n31tSLkDQxhpMMecxaf1skXNg4E6euKjgvVa3KiLU6Ed71ao Uh+cqyXLf1omN4IMi/uGKBnRCZoiTrZX6LBdm4TAtt0D7kEiCc2KNgHaWnsEnBKc2NAgZA R/poyCJRtWZDCfZNridWb04bdKagOAYrMimHRRhbW1sEshdjlpuoO+qhAUWNoJup6StZmS psPU0rd5r4qc0mz5pDn9/+Q0O1XuaFXgAfvzDJ2fumoT/FFw/xDZo4Gw31Xz2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0S0z2C53zYth; Wed, 27 Dec 2023 10:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRA4ZNm028126; Wed, 27 Dec 2023 10:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRA4ZoE028123; Wed, 27 Dec 2023 10:04:35 GMT (envelope-from git) Date: Wed, 27 Dec 2023 10:04:35 GMT Message-Id: <202312271004.3BRA4ZoE028123@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: 3334a537ed38 - main - Convert fsidcmp(9) from macro to inline function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3334a537ed385e487a47208dab8f36b25643bcdb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3334a537ed385e487a47208dab8f36b25643bcdb commit 3334a537ed385e487a47208dab8f36b25643bcdb Author: Konstantin Belousov AuthorDate: 2023-12-26 19:39:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-27 09:50:16 +0000 Convert fsidcmp(9) from macro to inline function This allows type checking the arguments. Explicit structure members comparisions are done to avoid introducting string.h pollution for userspace. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43205 --- sys/sys/mount.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 6cb7ea810682..dd5eaad184f6 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -50,7 +50,12 @@ typedef struct fsid { int32_t val[2]; } fsid_t; /* filesystem id type */ -#define fsidcmp(a, b) memcmp((a), (b), sizeof(fsid_t)) +/* Returns non-zero if fsids are different. */ +static inline int +fsidcmp(const fsid_t *a, const fsid_t *b) +{ + return (a->val[0] != b->val[0] || a->val[1] != b->val[1]); +} /* * File identifier. From nobody Wed Dec 27 14:49:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0ZKq01VZz55lql; Wed, 27 Dec 2023 14:49:35 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_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 4T0ZKp3V55z3G6K; Wed, 27 Dec 2023 14:49:34 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.17.1/8.17.1) with ESMTP id 3BREnKnX002613; Wed, 27 Dec 2023 16:49:23 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 3BREnKnX002613 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 3BREnKSK002612; Wed, 27 Dec 2023 16:49:20 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 27 Dec 2023 16:49:20 +0200 From: Konstantin Belousov To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6ac7c9f06ae9 - main - daemon: remove redundant parameter from listen_child() Message-ID: References: <202312270608.3BR688vs024888@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202312270608.3BR688vs024888@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home 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:6939, ipnet:2001:470::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T0ZKp3V55z3G6K On Wed, Dec 27, 2023 at 06:08:08AM +0000, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 > > commit 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 > Author: Ihor Antonov > AuthorDate: 2023-12-27 06:07:25 +0000 > Commit: Kyle Evans > CommitDate: 2023-12-27 06:07:25 +0000 > > daemon: remove redundant parameter from listen_child() > > state already contains pipe fd > > Reviewed by: cperciva, kevans > --- > usr.sbin/daemon/daemon.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c > index 14ea87af646d..ed6239b9fb93 100644 > --- a/usr.sbin/daemon/daemon.c > +++ b/usr.sbin/daemon/daemon.c > @@ -93,7 +93,7 @@ struct daemon_state { > static void restrict_process(const char *); > static int open_log(const char *); > static void reopen_log(struct daemon_state *); > -static bool listen_child(int, struct daemon_state *); > +static bool listen_child(struct daemon_state *); > static int get_log_mapping(const char *, const CODE *); > static void open_pid_files(struct daemon_state *); > static void do_output(const unsigned char *, size_t, struct daemon_state *); > @@ -448,9 +448,7 @@ daemon_eventloop(struct daemon_state *state) > /* child is dead, read all until EOF */ > state->pid = -1; > state->mode = MODE_NOCHILD; > - while (listen_child(state->pipe_fd[0], > - state)) > - ; > + while (listen_child(state)); This line is the style regression. > } > continue; > case SIGTERM: > @@ -486,7 +484,7 @@ daemon_eventloop(struct daemon_state *state) > */ > > if (event.data > 0) { > - (void)listen_child(state->pipe_fd[0], state); > + (void)listen_child(state); > } > continue; > default: > @@ -582,11 +580,9 @@ restrict_process(const char *user) > * > * Return value of false is assumed to mean EOF or error, and true indicates to > * continue reading. > - * > - * TODO: simplify signature - state contains pipefd > */ > static bool > -listen_child(int fd, struct daemon_state *state) > +listen_child(struct daemon_state *state) > { > static unsigned char buf[LBUF_SIZE]; > static size_t bytes_read = 0; > @@ -595,7 +591,7 @@ listen_child(int fd, struct daemon_state *state) > assert(state != NULL); > assert(bytes_read < LBUF_SIZE - 1); > > - rv = read(fd, buf + bytes_read, LBUF_SIZE - bytes_read - 1); > + rv = read(state->pipe_fd[0], buf + bytes_read, LBUF_SIZE - bytes_read - 1); And this one probably too. > if (rv > 0) { > unsigned char *cp; > From nobody Wed Dec 27 15:15:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0Zv96khHz55nj0; Wed, 27 Dec 2023 15:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0Zv953Wpz3JDG; Wed, 27 Dec 2023 15:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXw6Zc2YuxCVqKnuL8pRYiBpm0rvcgH1DIsxkqKDeOk=; b=LRDA/QtcA1LuhTWiZhKug8V5bPcQujq2hU/kuPfle60lAbcpvrjnevqvo4dcwr3COSTRnb 24cLqrSZ6f063P8VbKmzLDbI9apJJ4PEVQjWBR6WC9meYPoy5bUNEOkjGYp9enED22tvDb kMKdFarfFf0xbFsU1pP1oicqmO2Nk/ibi26kiC00S4nHLH/WSWdNK3pwgN5SChYVQdJhZC UKV+4NhdFyYnSrfxNxsL2zZxiYrm/hg1+dSH0hZh/CBKUn2tm7bvF1xJ8iO6s4FmBMyfsY cu0FHcxd8Ebr8rit9EVk4hbdTZcEt+SripsuFHgLDRt404IMlzfEFBZ/1wWyDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703690101; a=rsa-sha256; cv=none; b=LT3kUuiz6l6wFRFGs4+wxOrSVHvNyJSuRiEPz7c/0IOn91CENsT1RCuWlo/9KsS5DprYUv Hv9vNH/E8VzV6Z51qh5GLmWCuEanDynplnhB9MqQBuSbdR2W+LP3c+LueM7iwnGuEKerNp yZxt92j4f2NAMgss/78SNCD1O1iZ/Y4s+IYzGwBKTu3UVA2QN2PZUTmMaSWsC2k2ZQW1ZN X0cwSsoFm4IR+mDllH27WdDnn77SFjpdxI2cRvYkyMM2Bo7fqEX9Jrvz4DA9SSmzIsWPD/ 24JHmKSTw4rD7o/4ZKZ/GopDE6X1EcPq5wGtjoZtR2NFCHbEgpcHEa2nM0SirA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXw6Zc2YuxCVqKnuL8pRYiBpm0rvcgH1DIsxkqKDeOk=; b=Vq2oh4IiexvOZB0Gnz7mpUSBFFFFlfoWSdEK7915texmTB79twsRVYyctVPkcK6rsIhs55 huxb9jhIewomcQ+KQKBMj+gspDZn2lrbZb2YdIloXQYJU66oVxuPOb64+HkL16PhKYBtrX fQlgH7qPTn3E0L8UaQCzWzt9q//Z8DNhRp7j9zR/i7vMGn1Hyy2qT0cJaVVtu8vckyUUNT A4B3MWSTNmPFgT4XX/kwkgjDnFP5ekld4fPBvSTUBh2HGFnulMAmEpaKKY3pfKZpOnLlSM HHOBuaKoqKAR3umC1S2gdskPf3QeDeD3ae5cpHDDEtNiD7mw2pSLaFlmrvL/kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0Zv946YYzkF4; Wed, 27 Dec 2023 15:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRFF1R3047609; Wed, 27 Dec 2023 15:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRFF1AQ047606; Wed, 27 Dec 2023 15:15:01 GMT (envelope-from git) Date: Wed, 27 Dec 2023 15:15:01 GMT Message-Id: <202312271515.3BRFF1AQ047606@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: 344a04ad2c5e - main - linuxkpi: Annotate an unused variable as such List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 344a04ad2c5e62b2905bc2f8b6f992ae590403fd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=344a04ad2c5e62b2905bc2f8b6f992ae590403fd commit 344a04ad2c5e62b2905bc2f8b6f992ae590403fd Author: Mark Johnston AuthorDate: 2023-12-27 15:11:33 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 15:11:33 +0000 linuxkpi: Annotate an unused variable as such This addresses a -Wunused-but-set-variable warning in the gcc builds. No functional change intended. Reported by: Jenkins --- sys/compat/linuxkpi/common/include/linux/build_bug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/build_bug.h b/sys/compat/linuxkpi/common/include/linux/build_bug.h index 59d1fc228afc..6a026376cfc8 100644 --- a/sys/compat/linuxkpi/common/include/linux/build_bug.h +++ b/sys/compat/linuxkpi/common/include/linux/build_bug.h @@ -48,7 +48,7 @@ #define _O__CTASSERT(x, y) _O___CTASSERT(x, y) #define _O___CTASSERT(x, y) while (0) { \ typedef char __assert_line_ ## y[(x) ? 1 : -1]; \ - __assert_line_ ## y _x; \ + __assert_line_ ## y _x __unused; \ _x[0] = '\0'; \ } From nobody Wed Dec 27 15:15:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0ZvB6xy0z55nlj; Wed, 27 Dec 2023 15:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0ZvB6HHTz3J8C; Wed, 27 Dec 2023 15:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVEyC/Low9VHZrHWzRfII5P2Pmt8Y7c3+1L0jHDQjPo=; b=VDBDhhOo+iNPoh6ntdwg5v1cOzE+qSKvrXZL3UrR0DKiJ/YjPGAHUjZLTQwBEAvar7bh1Z KJD8hhCTU9Zxd3038HcLbvRmOH+gTZQtV3Dj7TBO6sQSKHuZXXlh6vGeuojI603ywN6Zpv ItKHaUlV91N6QiZAIacoB6D+OOYq0rdTaHG7W+/BbR3r76jwD/gM0DUfjn+cUlWG6a1Wrf 2pPTmIYiGoz3D5HqbotvUHa+G3R0cb6uTdbAN4vDlkFBSDuz9ibYafocmtVrlPVhDRaDFg jS7mP4qTlzLzYHHiaVhkHSFC1muFfBe7VUlQzw9NLGrIakTb0qEANHiCVORxkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703690102; a=rsa-sha256; cv=none; b=RjAV3zQ0E1wgrl6j1QS+am9aSztvdwaIW7EfJAmuhrYbTLYmks2+nuG1wgi5dMK6Wx3sfD QiABDMEG0/TSUZdNDWtG1i76h8YkKcWfO5xNGbt+Hy8FEOgLpe81pttcKqLMRbvk25Ztej YzWMZ3p8jzE+W/XRf0oArYNmps1nXd7DWRkR1bYTYmrarYSjuLBlXK3zIbxth1JaKnKy/H MwtIuCsCywz/Ap3bcF9nCIi43HlB2C9CA00sF2fvcve92uSvPl5claTgHfQiqR3jcoFvvR +Q37tOFVAhzO9bubzuYReGmt1peqhJsf3lxWf2fv6m+XNzBjKvMYr9E5/23Xeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVEyC/Low9VHZrHWzRfII5P2Pmt8Y7c3+1L0jHDQjPo=; b=cqQc0vSdvzeZEQckN6KsbJoWgKdMWqPNJeiPmWhTkibVAu39oqxmJpCo3lFp/NXNQVeBTZ QiKNcGsXN32bShVpNNfXFe5Hdmo9fXuXPYWUjK76+e7PbtI1aWIbnB31ERa5D3kprlQGda 4vZjqmGTlmgULBm5Z9M/YyXKqINQl2qj3nBOh67yI/w8ZhTOqVhAdxrt1JrHMRjJtO6y9C zvjaTsqBRKy5+7XL5pOTZv6PCGC8AOZb+PdHwep+PfuvQtD+8aSb3gntBuautoa9PDE4/u JA6cYQrPqpbcqRHboREWhBgcTIadk+HRYdnO6+9s2zaOmMt8VD4/KhZwKcbejg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0ZvB5NkLzjm0; Wed, 27 Dec 2023 15:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRFF2bG047663; Wed, 27 Dec 2023 15:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRFF2Lr047660; Wed, 27 Dec 2023 15:15:02 GMT (envelope-from git) Date: Wed, 27 Dec 2023 15:15:02 GMT Message-Id: <202312271515.3BRFF2Lr047660@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: b9924c202fc3 - main - linux: Check for copyout errors in ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b9924c202fc34004d4164cdc50f88d8fcef26279 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9924c202fc34004d4164cdc50f88d8fcef26279 commit b9924c202fc34004d4164cdc50f88d8fcef26279 Author: Mark Johnston AuthorDate: 2023-12-27 15:13:15 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 15:13:15 +0000 linux: Check for copyout errors in ioctl handlers In preparation for annotating copyin() and friends with __result_use_check. Reviewed by: dchagin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43199 --- sys/compat/linux/linux_ioctl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index d0bc8708ebf0..41c43f1ef8e6 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -1449,7 +1449,7 @@ linux_ioctl_cdrom(struct thread *td, struct linux_ioctl_args *args) if (!error) { lth.cdth_trk0 = th.starting_track; lth.cdth_trk1 = th.ending_track; - copyout(<h, (void *)args->arg, sizeof(lth)); + error = copyout(<h, (void *)args->arg, sizeof(lth)); } break; } @@ -1611,7 +1611,8 @@ linux_ioctl_cdrom(struct thread *td, struct linux_ioctl_args *args) if (error) { if (lda.type == LINUX_DVD_HOST_SEND_KEY2) { lda.type = LINUX_DVD_AUTH_FAILURE; - copyout(&lda, (void *)args->arg, sizeof(lda)); + (void)copyout(&lda, (void *)args->arg, + sizeof(lda)); } break; } @@ -1771,9 +1772,10 @@ linux_ioctl_sound(struct thread *td, struct linux_ioctl_args *args) struct linux_old_mixer_info info; bzero(&info, sizeof(info)); strncpy(info.id, "OSS", sizeof(info.id) - 1); - strncpy(info.name, "FreeBSD OSS Mixer", sizeof(info.name) - 1); - copyout(&info, (void *)args->arg, sizeof(info)); - return (0); + strncpy(info.name, "FreeBSD OSS Mixer", + sizeof(info.name) - 1); + return (copyout(&info, (void *)args->arg, + sizeof(info))); } default: return (ENOIOCTL); @@ -3214,7 +3216,9 @@ linux_ioctl_v4l2(struct thread *td, struct linux_ioctl_args *args) error = fo_ioctl(fp, VIDIOC_TRY_FMT, &vformat, td->td_ucred, td); bsd_to_linux_v4l2_format(&vformat, &l_vformat); - copyout(&l_vformat, (void *)args->arg, sizeof(l_vformat)); + if (error == 0) + error = copyout(&l_vformat, (void *)args->arg, + sizeof(l_vformat)); fdrop(fp, td); return (error); @@ -3283,7 +3287,9 @@ linux_ioctl_v4l2(struct thread *td, struct linux_ioctl_args *args) error = fo_ioctl(fp, VIDIOC_DQBUF, &vbuf, td->td_ucred, td); bsd_to_linux_v4l2_buffer(&vbuf, &l_vbuf); - copyout(&l_vbuf, (void *)args->arg, sizeof(l_vbuf)); + if (error == 0) + error = copyout(&l_vbuf, (void *)args->arg, + sizeof(l_vbuf)); fdrop(fp, td); return (error); From nobody Wed Dec 27 15:15:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0ZvD2W1Kz55nlk; Wed, 27 Dec 2023 15:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0ZvD08KMz3J67; Wed, 27 Dec 2023 15:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZhirxTEaDNBA7yIaLyVwpgfTddHZzA7zGdq2vOyiGZY=; b=UWit+uOZ+2uQW2LJt5NI8NB+TK5wRXXlzBdkj5YZRG+W8BN8rODMiUYVZ+b824xt5XztyZ ju2C3lKABQsn42WuDlhtnitQHiB4itAD2QFGt0M2bo73iC6GIG5BZpSNmT1rxdOFFqPBn/ JBnoLS/PKb28QOscuxaLTkNFYGRi1JxLMx5x8E6LyEwkCfWLrDpLLAIvhl/Oi2anUHZVFW 2w8SG2bUPFBa8qptE1+PeH4NeY7Q+sU9YLVXayGOwVqY1qvvgWxYDPayYsN+Dec/xECWOp WUfAoUeoae7OrI/0BT2L7vyp6LBr3+QBBcbgdJMykymaOoOWycIU+63IqmTBsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703690104; a=rsa-sha256; cv=none; b=wnaOBOxy6c0+cbGc3DRAGoxOaPCTCFKDiXFnOoCwXfD1pHJzVYd1enoYf46lzwP41QcxAM 6HDwgVEnJkJdOahZ556pjATQ6ynZKodyIWf+0qv6Nd49pbuupN9gWnBZj7YGInLfcRVLGg jr3C7lETyVVMugFhQLzdsFXi9JonHWpzbfXfdV7KaTjW6cdefYUxCXrvUCPtC36CzbsvZQ UHZKQ8RrLvabev4hk2XjXhU3SDrVOxadqSN7kZctzV4KvisnGdaGZOmpVAfCHXxMForSIC T3qyxC+XZXKMHU3inT3BIUoju9zSLVctSx1aw/ctgQziO9l3kpv+8AI8qyyQZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZhirxTEaDNBA7yIaLyVwpgfTddHZzA7zGdq2vOyiGZY=; b=xx3NL9BS12saS2T7m4Tna5tHgZ6nYKSmFuZ2GA8vM5qT3Hi9GIHZugNIULISpWSxtSwppf NkaZHioKts4+qAOnFkmvgpGguEIjvkTTqmz5p9UJnLcFK3Ta0RxCe7Crzw/Q6jkTeDh0Zr m4ONiU9EQgzMGoVHMt0S5xMPt6HfoP3bc+PSa8W/2XEPp63pK8ObPdkHG+AZsdGntFAwsL bTctHx4yk3KXY/3yNIVWtU0CUVkDudJunuDUU9CzzeL2egsFKvN/i9675uJx783cVntGTz ejCLFZAcu0CbzIZKt2ZBpwXerOUoBN86g4UtpdKSgaYEfXkfbSTixsjC3KG1Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0ZvC6M6Jzk8K; Wed, 27 Dec 2023 15:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRFF3ii047707; Wed, 27 Dec 2023 15:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRFF3ZE047704; Wed, 27 Dec 2023 15:15:03 GMT (envelope-from git) Date: Wed, 27 Dec 2023 15:15:03 GMT Message-Id: <202312271515.3BRFF3ZE047704@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: 99efa2c88d93 - main - netmap: Ignore errors in CSB_WRITE() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 99efa2c88d93c6272a8f54b18d18d0fd9d60f137 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=99efa2c88d93c6272a8f54b18d18d0fd9d60f137 commit 99efa2c88d93c6272a8f54b18d18d0fd9d60f137 Author: Mark Johnston AuthorDate: 2023-12-27 15:13:29 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 15:13:29 +0000 netmap: Ignore errors in CSB_WRITE() The CSB_WRITE() and _READ() macros respectively write to and read from userspace memory and so can in principle fault. However, we do not check for errors and will proceed blindly if they fail. Add assertions to verify that they do not. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: vmaffione MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43200 --- sys/dev/netmap/netmap_kern.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 24f741084a8d..8618aaf82299 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -2450,8 +2450,19 @@ void netmap_uninit_bridges(void); #define CSB_READ(csb, field, r) (get_user(r, &csb->field)) #define CSB_WRITE(csb, field, v) (put_user(v, &csb->field)) #else /* ! linux */ -#define CSB_READ(csb, field, r) (r = fuword32(&csb->field)) -#define CSB_WRITE(csb, field, v) (suword32(&csb->field, v)) +#define CSB_READ(csb, field, r) do { \ + int32_t v __diagused; \ + \ + v = fuword32(&csb->field); \ + KASSERT(v != -1, ("%s: fuword32 failed", __func__)); \ + r = v; \ +} while (0) +#define CSB_WRITE(csb, field, v) do { \ + int error __diagused; \ + \ + error = suword32(&csb->field, v); \ + KASSERT(error == 0, ("%s: suword32 failed", __func__)); \ +} while (0) #endif /* ! linux */ /* some macros that may not be defined */ From nobody Wed Dec 27 15:31:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0bGP4Lv4z55pmK; Wed, 27 Dec 2023 15:31:41 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0bGP3mdWz3LCX; Wed, 27 Dec 2023 15:31:41 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703691101; 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=ZrJPeDcIoNb216oUNVcpOUhT4lIm181y5d+mmY4vOxc=; b=XsZU1aY6Tos4jg6pD3P8HXSpN7CcRabkClxdv+0mexI2PfJLNPosExIEa/Oj3NrtGDEsI/ QaaBBC0LD0XyjeUp335Fn7OHbt+IHxUt/NoC7t9xN0bgFkyGieqBFEg13kD5osQikR2Ath OWPjwLJz0g3+IO7fFGuTM2p0KHYLMwdbcsBAQ+9RqNL2tSm+cl+kUktV+aP+iTn4jCdL7N fCSzzHEKnyy+tH0eoooa4mreL17rqANuAGx6TIhu4xtaVOO5KLmEu/BGHHrsHGfo0rNCs4 wqIG0rG8WBwkaBheiX/00zDsNd1QCkIQOoyUDCPjLQqynnSpPUdTeRu8LRF+Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703691101; a=rsa-sha256; cv=none; b=qom9tmfNga/HCXJ2pO4BgMIznMa4t+wLVdlE5OVct5v8r8rUAgqwn+yRjIc2BGP5Pqc2Vi YQNP20Sy4LxHltWbR2pVwaZPPCAITZTzeDwr9X7Le/RzRA1erq7kiJWWWSRM4rYW0Q0P+q MZaugAU/d+1+9ydqDtKEPn5H7dFsUQhyasv0Aq8NGbm0zP6AdeE7xrKJ7YPiQpx6SMVMDk r4W8orWWQjdixKzsLDI1NJhwknJEOMtSYexP6kHkTBp5AHVM/sBLe8e1V31SQ2LQMiAAmT j80WNoHe0ngReBpOEr+1d0p6IX9g7Za8kY6bKQXT9DMCqAr/HVm/Kh0fHUuvTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703691101; 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=ZrJPeDcIoNb216oUNVcpOUhT4lIm181y5d+mmY4vOxc=; b=PYPDXghOTDJTMp045hDHFKS3/1aLjEbpak87Y/0gBrYg+o7auT4PlHQ37V/VVtkUgIVP1l tA8wyFmPiL5xW35j0HSP5EE0+/9RVBpRcYC5eswiJYVGIy1ia94PlJzbClOmN7otvSSIir KspUSL1WB3Y6z3/G5wVurBeXJf8vfKx3LFj8htFTUIMNlCHwhv0gcbLhQEfonn4jKr9fjv fBBiJjuQxmUVUAZTID8Zqw3uqVxm5kBPxe5nYOsTgzQic4E8DqM06Zw4QAxJdaGPpSfxp8 YMsbn17/xrmqRXzewgbLvMshmxyBgKfqmantsUW3PoM98dTNvay0XqpP1jlhhg== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 6425C1D531; Wed, 27 Dec 2023 15:31:41 +0000 (UTC) Date: Wed, 27 Dec 2023 15:31:41 +0000 From: Alexey Dokuchaev To: Konstantin Belousov Cc: Kyle Evans , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6ac7c9f06ae9 - main - daemon: remove redundant parameter from listen_child() Message-ID: References: <202312270608.3BR688vs024888@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Dec 27, 2023 at 04:49:20PM +0200, Konstantin Belousov wrote: > On Wed, Dec 27, 2023 at 06:08:08AM +0000, Kyle Evans wrote: > > commit 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 > > > > daemon: remove redundant parameter from listen_child() > > > > state already contains pipe fd > > ... > > @@ -448,9 +448,7 @@ daemon_eventloop(struct daemon_state *state) > > /* child is dead, read all until EOF */ > > state->pid = -1; > > state->mode = MODE_NOCHILD; > > - while (listen_child(state->pipe_fd[0], > > - state)) > > - ; > > + while (listen_child(state)); > > This line is the style regression. We've seen this before and I reckon these regressions would keep happening when semicolon is put on the new line by itself alone. This would be less likely to happen and makes the intention more obvious to say ``continue;''. ./danfe From nobody Wed Dec 27 15:48:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0bdn1lw1z55r5s for ; Wed, 27 Dec 2023 15:48:29 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0bdm70yCz3Mbm for ; Wed, 27 Dec 2023 15:48:28 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a2358a75b69so914474666b.1 for ; Wed, 27 Dec 2023 07:48:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1703692107; x=1704296907; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=B47247NUMYKIYNLWcezwCcPD2Y/w2a/u1iNsFFSMoMw=; b=oCuHO03zjKF8wA2Yaz/by5kaJo4o7LjtCoCXN2zh89t7pAi314+gJoXr4r1HuNJkJb eNMCoRiX9rOCtzmwTACPdxS0zoJkd349QHcMoOW4I4ixpzumSYDD/2Gj82M5uccXwxK3 qTBOANRnBL3fvvtqpSZj9EN6yTYpLiYjI1bFVRfbME5YK3QPCmrMkSIlAK0GYKBz+A3T OLWrc4Vq67J7GtlRSOFP6p0EEalX+YHJvfU4cuAkgr27O5EYoz5fTt6dql50LHwiDcWn mFuZDIqEzhowcqYEmT3W2aBSeWLLQSlECLctoGdTjxDz/OSndHoiyrLVuxZbYWa14zY5 hLEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703692107; x=1704296907; 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=B47247NUMYKIYNLWcezwCcPD2Y/w2a/u1iNsFFSMoMw=; b=nJ1dK9dAiR+qAT4wTB8Nkt/hXCV0sDJndVjb0FB0Atb1tyeGEdVYllii/+aJcuq5o0 gyrsl73zkR4rQ/OWllPxW6SZVpQg8TIWS1RJuZTXX1zQN7kpWYV3sFMQNdtGNNfnbDZq LKhvyr3lp/zGDI5C/Vorr+YtECG7a0Avl4mniRWnxg0KO7Tlrm/xTru8+TkY2kOC8Ofr u85ETLw+7PQN0VOrRiwmdLBkGmNX1/hj1ztQEM33mhK0dc01MvfBgKSBTF38r6vO8GzP Qr3vUC/XJgZxqekI1KJK+BbRIkG2QGvMvULcFl3SWJ9syNVDgIyby9nmgAK/hCADDh+R RVQQ== X-Gm-Message-State: AOJu0YyRYyPymLaBsNPoexbDmnyspoW4QdkP8sawkEuSbh5TFe0N0szf nSI60aJZNh4t8JwPAyMw2h/j+Wo0cF/JbkdbMyzDPu+FstF39Q== X-Google-Smtp-Source: AGHT+IFKjrQX/ICqtR5BgXim/b5cWAMdUly++PqmsbpuMGG7MRThYVv7hI6cH8ONc52kQUeD3mK7JvbmW2v8ePjZTqM= X-Received: by 2002:a17:907:3fa4:b0:a23:671c:2284 with SMTP id hr36-20020a1709073fa400b00a23671c2284mr12742482ejc.29.1703692107285; Wed, 27 Dec 2023 07:48:27 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312270608.3BR688vs024888@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 27 Dec 2023 08:48:16 -0700 Message-ID: Subject: Re: git: 6ac7c9f06ae9 - main - daemon: remove redundant parameter from listen_child() To: Alexey Dokuchaev Cc: Konstantin Belousov , Kyle Evans , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000dc94b3060d7fbad0" 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:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T0bdm70yCz3Mbm --000000000000dc94b3060d7fbad0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Dec 27, 2023 at 8:31=E2=80=AFAM Alexey Dokuchaev wrote: > On Wed, Dec 27, 2023 at 04:49:20PM +0200, Konstantin Belousov wrote: > > On Wed, Dec 27, 2023 at 06:08:08AM +0000, Kyle Evans wrote: > > > commit 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 > > > > > > daemon: remove redundant parameter from listen_child() > > > > > > state already contains pipe fd > > > ... > > > @@ -448,9 +448,7 @@ daemon_eventloop(struct daemon_state *state) > > > /* child is dead, read all until > EOF */ > > > state->pid =3D -1; > > > state->mode =3D MODE_NOCHILD; > > > - while > (listen_child(state->pipe_fd[0], > > > - state)) > > > - ; > > > + while (listen_child(state)); > > > > This line is the style regression. > > We've seen this before and I reckon these regressions would keep happenin= g > when semicolon is put on the new line by itself alone. This would be les= s > likely to happen and makes the intention more obvious to say ``continue;'= '. > fwiw, that was the recommendation of the 'old unix hands' on USENET in the mid 80s. It made the intention clear. I was told, but never encountered, that some linting tools will warn about the above style but not while (foo) continue; and so that's been my personal style ever since. I've debugged lots of code that used this style, and it's a bugger to sort out if the indentation is correct and the ; is intended at the end of the line, or if it was intended... Warner --000000000000dc94b3060d7fbad0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Dec 27, 2023 at 8:31=E2=80=AF= AM Alexey Dokuchaev <danfe@freebsd.= org> wrote:
On Wed, Dec 27, 2023 at 04:49:20PM +0200, Konstantin Belousov wrote:
> On Wed, Dec 27, 2023 at 06:08:08AM +0000, Kyle Evans wrote:
> > commit 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7
> >
> >=C2=A0 =C2=A0daemon: remove redundant parameter from listen_child(= )
> >
> >=C2=A0 =C2=A0state already contains pipe fd
> > ...
> > @@ -448,9 +448,7 @@ daemon_eventloop(struct daemon_state *state)<= br> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* child = is dead, read all until EOF */
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0state->= ;pid =3D -1;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0state->= ;mode =3D MODE_NOCHILD;
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0while (listen= _child(state->pipe_fd[0],
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0state))
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0while (listen= _child(state));
>
> This line is the style regression.

We've seen this before and I reckon these regressions would keep happen= ing
when semicolon is put on the new line by itself alone.=C2=A0 This would be = less
likely to happen and makes the intention more obvious to say ``continue;= 9;'.

fwiw, that was the recommendat= ion of the 'old unix hands' on USENET
in the mid 80s.=C2= =A0 It made the intention clear. I was told, but never encountered,
that some linting tools will warn about the above style but not while (f= oo) continue;
and so that's been my personal style ever since= . I've debugged lots of code that
used this style, and it'= ;s a bugger to sort out if the indentation is correct and the ;
i= s intended at the end of the line, or if it was intended...

<= /div>
Warner
--000000000000dc94b3060d7fbad0-- From nobody Wed Dec 27 16:10:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0c6w3pYhz55sjf; Wed, 27 Dec 2023 16:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0c6w3B4Zz3PY4; Wed, 27 Dec 2023 16:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703693416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vazHVQDrD91JS9AARegP43DqE3AMBMPn25K16pBlu0=; b=dzSuC73WkN/mGQRtYFwTctIFgFnuEeboHzLZky24k/eHQvOg27ShUDacyt/cuf7j8ICHy1 i/l/LbexbXJ9sf3E3LxZM3/6XgVUOZqJfmtJNaFg1AIsSOlIsYEa8QRAG2CqHkFMWOm1CN ArMpsb7cYI32Lkvhkg6sV+oOQGkAbGFqysaOd5b12VwUf0nPpRt19RKcN9qyoyn1hmLdt2 DFpnGkBToq7ZV+sqr50WPWhHxJe3xa+TOxtePa7IQ8EnHtn/TlIwSenI42tBe63lHtQza5 ZNjNFVfpxplxPDLwfDKavAICa1F8ad1sF2p7DOLGH2io9bNaljfJRpBW8bk3vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703693416; a=rsa-sha256; cv=none; b=AdLeOvfBqrEFKtK0Qn38AJjqrBXVIuxvKIC6XMTgRXiy5BlzAGsh6MVyRCsp25DLKMRz1i gmUNLOJxPkY4FOeVNWc2g6iwOFEndtS8+4SPI2euYantuhRUZVKnFwCc2vceCkQYc9GngY L9j30qYc6iExkWJiK60HQFEq5rkLxhO32WMwnkUaiC8edu9SxGv6BQVdyVGG4LhhL0heG/ 4O+Pzj7oYQ/MWMpvljOlfPTMnzMNpwomQ+lY4V/brDv6Kf58jT843/0peYTkn3rB0NCvZ6 xwCYpZEjq03QUdGIcbT9p4sADzA18L+5vTJFJbO0COrMNO5BVGFRGuxv8AK3Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703693416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vazHVQDrD91JS9AARegP43DqE3AMBMPn25K16pBlu0=; b=SdWUe5GNBg9OL0iLv0vUzJSPKw2o6mXaAQagL06zw/4ug14pJbA/avN8048L2++L9Y4Z9G CbGcRi9i+VjKFAqKU0jO0cUcmqMdPals11wJxAHaSivy/YGOIJJsPQr8GS8rOazp7Y0D3u NZJPODxD5ui15nHcvYerijWFGQ+ZyzaFUHSkqxLId/Xoz9NhEff4uufUIOBkp4A3vdtV0V CuezlsiY+pozrDQkrLrXMnkgxUndkQvsm38MGnA234mZY32Gs5FeusbUdtABawbeVUrz6M qfxxV2h5j0OXPBDV/OAfeLvI4T7L2JqaLXwJHsFRa2ROJlRwyVRG6XjIYv6ZcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0c6w2DSQzlVw; Wed, 27 Dec 2023 16:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRGAGdS040709; Wed, 27 Dec 2023 16:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRGAG7c040704; Wed, 27 Dec 2023 16:10:16 GMT (envelope-from git) Date: Wed, 27 Dec 2023 16:10:16 GMT Message-Id: <202312271610.3BRGAG7c040704@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: e064557916a9 - main - daemon: fix recent style regressions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e064557916a905d0add20c4012cf3678131c11e7 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e064557916a905d0add20c4012cf3678131c11e7 commit e064557916a905d0add20c4012cf3678131c11e7 Author: Kyle Evans AuthorDate: 2023-12-27 16:08:28 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 16:09:47 +0000 daemon: fix recent style regressions Re-wrap the read(2) line, and make the listen_child loop more explicit in intent. Reported by: kib Fixes: 6ac7c9f06ae9 ("daemon: remove redundant parameter from [...]") --- usr.sbin/daemon/daemon.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index f349a382edd2..6cde194cf16e 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -455,7 +455,9 @@ daemon_eventloop(struct daemon_state *state) /* child is dead, read all until EOF */ state->pid = -1; state->mode = MODE_NOCHILD; - while (listen_child(state)); + while (listen_child(state)) { + continue; + } } continue; case SIGTERM: @@ -597,7 +599,8 @@ listen_child(struct daemon_state *state) assert(state != NULL); assert(state->pos < LBUF_SIZE - 1); - rv = read(state->pipe_rd, state->buf + state->pos, LBUF_SIZE - state->pos - 1); + rv = read(state->pipe_rd, state->buf + state->pos, + LBUF_SIZE - state->pos - 1); if (rv > 0) { state->pos += rv; assert(state->pos <= LBUF_SIZE - 1); From nobody Wed Dec 27 16:11:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0c811z3Yz55tD6; Wed, 27 Dec 2023 16:11:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0c811SS5z3Q4s; Wed, 27 Dec 2023 16:11:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703693473; 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=S47zGm1RsV6Qz7fXZGgok5Q7FSRcXgsRqT2XoXMFPco=; b=v7i6CisWvi5Ny5eObuwquZ/VByflvQlVu6VooeP2umcc9YG1VfG00YPlhhvez6YsmJLSnS 2O/QRV18k4hb8HFUy0fmYgskhcnmkGnBvAeGX9Pv9IDxXg6VQhr/9q39169hLNeDSFMHKQ SMKLAN+II1ULdqKcl5SZTG/LpVMx3f3v28RsCFRsAQUG6tvRcFbQg4JIsdneojuggavjpo XZIQkagu6x3Sh4FKB9pFsxH0ioGRZ700GsLqJgtXib0uHaPuzJiXfUbqLHeZj2sF1Ya64h d0HUd0gH69GTWiXB5wqcGdnNHQHeBYeaEFsPAoasCqCfHyMzsToBCGJAzK0AyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703693473; a=rsa-sha256; cv=none; b=Hsx7uoFs2epr/MWLFSGy0TJWkKQ5YKMwT+V9NSiRuI6AnFFJ51iLJGAPs36tD/BL2HkY2W t76hRfODgKlXpH5tHUSox20t9GQ0K272rwD9bZgaW4GeoGbt4gXklOlNV8W2JvPbLJc6UQ miAs4qKyD3d0QLsVDobNH0N6PdfkDj/RJ+0pco1utqooVnvJ90xZ+zP/T4RfHNO3u9SFte BKgmCTnY74QcNT1QSr/VaObvnLKTX1+v3mLhUAz0ZjLhu5MU3G9yOh88VkrLHCARhPHF6C iKGvGB5HSMCZXsXCpYuQ55xP9Jgok/wDEnX2dq2x3D3rtl+uON+/HrGmFmbIZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703693473; 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=S47zGm1RsV6Qz7fXZGgok5Q7FSRcXgsRqT2XoXMFPco=; b=hRt3+vsHLoBwRjy0HWKMJkt5rdby/Rb16NrEIz4+oJ/rW96dNT2+FDBaUGK9XGwuEQJWzP sxzCS0imQxS04QJPEoTerKbQxSkFBJYtOd1PonSuTJHs4w5mwLRRbevFKvXcoVrazXj6H0 aGU4y8dk2RSvvKnp0FdI0CMkSaaz/hDC/fwt2jedaExVQjRyVEU4sQJgcUvccw+TNi9pan R3sjFA24ikN2BtgvhwXGWREVV83uVqBmelctj/2mDd5Yxp6Ak9iJ3xTjr0JdJSbu/a1g/r IAuBkDV66r8goyTi/7P1YGHPM/E8HyR75UDNYMWJxLAUC1Djbgv8/M9E1UtcOg== 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 4T0c803nSdz158x; Wed, 27 Dec 2023 16:11:12 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <6ac83dfe-bfeb-4135-9292-d7625d6da642@FreeBSD.org> Date: Wed, 27 Dec 2023 10:11:10 -0600 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 6ac7c9f06ae9 - main - daemon: remove redundant parameter from listen_child() To: Warner Losh , Konstantin Belousov Cc: Alexey Dokuchaev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202312270608.3BR688vs024888@gitrepo.freebsd.org> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 12/27/23 09:48, Warner Losh wrote: > > > On Wed, Dec 27, 2023 at 8:31 AM Alexey Dokuchaev > wrote: > > On Wed, Dec 27, 2023 at 04:49:20PM +0200, Konstantin Belousov wrote: > > On Wed, Dec 27, 2023 at 06:08:08AM +0000, Kyle Evans wrote: > > > commit 6ac7c9f06ae9b7ef070c1f8a57dcc52be4dd45b7 > > > > > >   daemon: remove redundant parameter from listen_child() > > > > > >   state already contains pipe fd > > > ... > > > @@ -448,9 +448,7 @@ daemon_eventloop(struct daemon_state *state) > > >                                     /* child is dead, read all > until EOF */ > > >                                     state->pid = -1; > > >                                     state->mode = MODE_NOCHILD; > > > -                                   while > (listen_child(state->pipe_fd[0], > > > -                                       state)) > > > -                                           ; > > > +                                   while (listen_child(state)); > > > > This line is the style regression. > > We've seen this before and I reckon these regressions would keep > happening > when semicolon is put on the new line by itself alone.  This would > be less > likely to happen and makes the intention more obvious to say > ``continue;''. > > > fwiw, that was the recommendation of the 'old unix hands' on USENET > in the mid 80s.  It made the intention clear. I was told, but never > encountered, > that some linting tools will warn about the above style but not while > (foo) continue; > and so that's been my personal style ever since. I've debugged lots of > code that > used this style, and it's a bugger to sort out if the indentation is > correct and the ; > is intended at the end of the line, or if it was intended... > > Warner Both of these fixed in e064557916a905d0add20c4012cf3678131c11e7, thanks. I also like the more explicit form here. From nobody Wed Dec 27 16:28:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0cXF3YPbz55vWG; Wed, 27 Dec 2023 16:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0cXF34TXz3RKN; Wed, 27 Dec 2023 16:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703694525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bsOGVrrXVsdNgMAMD3fHS4kncuLFSFIX9mLTdeVKoqE=; b=lGlbEHG82jeMNQYC8fEyxqfchoWf9U9zKei0CKhlLnYfVajDx75P4DorQJXpJ/NtsUIOAl UZbGimSEmPOUqYDxJG4N7qEL3UEAyWi04/NWRZGWaFvOo0soYKC6aEf4p/HKpZKf7sn2pc 8P2hq1iUAw/D6B4klWxkOpgBCNbRJXOrehC4o7A+uf2MYN4Gper4oSQmRz0xK0otoLjArA rDL79TW6LEsQDOMxojj1lKoiOBTiH1WD5+cSzvlkzoFxLfAFAX5x7lIitaUBS7DwY3V5WJ qy1VmrhOcxf7P/lBCjs5h1V5+oJDpWk/QMj2xjTt/I9EM2rV4BAI1PgElrUYEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703694525; a=rsa-sha256; cv=none; b=qqh2dUBY9NpNRlB1rgL0+qZiKz8EE6j8Cs7BY8J4nEzhxQPNt3Yx1TZXhEYkkQgG2jov+M Zup2jZz+tziFLxUzIb1Z+Xudv6BLmaMI3BbBSJ5y/1BNWOjy0jRyStTzg7ZzE32R6WLvBA 6ak/fQBNBCo2TVXBlf0JKGNYBETDFVOAwYuHPc12i7RiEilzvEjThkdThucozs6SkgdpS1 U9VYNoZ5mapdG3jKhxllwvlDFGJf6iuTdsymugrAzaOjZYzWG/U0M9tej/N/si08gfZPaU JFv5gEdKdAlsAutw2uQeetLnvFj5fUBAmXpQZimIKUnvzSU1y32BR6i3BIw2WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703694525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bsOGVrrXVsdNgMAMD3fHS4kncuLFSFIX9mLTdeVKoqE=; b=EJ7t8/m+6I6BaJxKIDs+8NG7FX/jFTfu9NbkkJ/l1cSxzi0OKo1dtOqTeZbaylnJHuQ3Qd CTJALaMkWJzTKTA/N0ro/M7lVLuwZ2Fd474FN/v8voLgNMj4t958ScCWDBTz2Sct2ltsFS 5oV+Db4k4SvZ6DB/RR7YtfD9QD7qa8flwigvUxtFBh5+guUgQ9nBpvyFHfL4U4844xtlTK u8ZVQEf1Uh9dhB/v92gUwmKoMdADJpKFtmi8yYnoZa9PsDKTxnKz886KfyIZRnDi46OdH6 Qcdfn+somHX/5q0k4znMMbJiusvCzjo7MCkEviVKqwh/LVa2nIgYW6VzVVwwEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0cXF276pzmBp; Wed, 27 Dec 2023 16:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRGSjwB065308; Wed, 27 Dec 2023 16:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRGSjad065305; Wed, 27 Dec 2023 16:28:45 GMT (envelope-from git) Date: Wed, 27 Dec 2023 16:28:45 GMT Message-Id: <202312271628.3BRGSjad065305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2b1c477d88e5 - main - fortune: update mailing list search url List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b1c477d88e579585c6b3ba5f6ded70b9a05e3c3 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2b1c477d88e579585c6b3ba5f6ded70b9a05e3c3 commit 2b1c477d88e579585c6b3ba5f6ded70b9a05e3c3 Author: Christos Margiolis AuthorDate: 2023-12-27 16:28:11 +0000 Commit: Christos Margiolis CommitDate: 2023-12-27 16:28:11 +0000 fortune: update mailing list search url Markmail no longer exists. Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43209 --- usr.bin/fortune/datfiles/freebsd-tips | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 3ee4ca3a5972..aed66f2295e2 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -388,7 +388,7 @@ You can make a log of your terminal session with script(1). You can often get answers to your questions about FreeBSD by searching in the FreeBSD mailing list archives at - http://freebsd.markmail.org + https://lists.freebsd.org/search % You can open up a new split-screen window in (n)vi with :N or :E and then use ^w to switch between the two. From nobody Wed Dec 27 16:35:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0chH0z5sz55vsp; Wed, 27 Dec 2023 16:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0chG51wzz3SKY; Wed, 27 Dec 2023 16:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703694942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTvifUZR6tEnEpzy1JG/yPLeqaGvOduw2CegyD4Ux1Y=; b=Q7xJRO3FE5sbT2bFyyxdMdYKMWNubmuR5u1Qo1+reE6C0qGBtUAO3gwYQdjU7nah1zdBs1 7bC7hWFoYBCx4cjzE5kNiZjJC43ic6Nu1fxDZ5CZ3umyuE967hUMEwevk9enEa/azF1bon f426tu1YOBw/F/VV8+jgSWZVHR2uFCDVRNVRmY/Dxhxs8XBTuU4vBiuRQoEyGS/FMIvi4l Aejfi0HGJmnGfmONr6DjpIqO0aREChUfPx5kmNgDv0CueID415BuIKw5pTeR5PVZ4PSF9l LS0Y1UUHCTndv2K2udvm+dsJNyvtTEiYh0BccrH9v8uwiXqDTaKHPeryRtJSEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703694942; a=rsa-sha256; cv=none; b=lq/PWQMfUGrp1+CVrqIWOZUoApjASbDlU/OAbSN3mqe3GVqb3r+56ttrAEY4hiHimP6Uae ET9wMC0nBod8nUrJWGP84sLAlrmQTP3YC0jD82hRwWOr+elK+YfPKcKqn5eBKzxi08JYKj H8vEGXjhHo22kee6WVQ4yrlSSrcgojR0WVVaGRMjz8Hu9MSaolAboLz+KKugWvu3Uz9A39 qIx5uojHljXSKB+RvDrpppWOmgY0Xvy6xJjlgfjh6mv5GSfRBQKydDWgG7b1X4XiW1o5NA fCM0kaZQ93aZmzvcHQ657GVqNhR5q6Sc43u9yVjrt4VZf0ibAdGfBm8MEq5tWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703694942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTvifUZR6tEnEpzy1JG/yPLeqaGvOduw2CegyD4Ux1Y=; b=lbk289uSQ9NQZCO6NF5JHsXTQHeXth6PC6QFuGZlCvg4EMPvwD5D2+Kyb/ETOcvpK5j7QU /MRj1L/NVZgwHrqoeykyQl/MJimmgUfSc9n37QFVFysJVQoPHqlj6vMUqyk1Bl6Mnk2kfD 1Ls/EC3I9E6ToA6gkhHa2WO95waN6HBhrFFEv4A2K1ydfQYIEsa+C5w6j2PI5aJfQPdhwt +wCRr7r2GO1p/e8hPwcXBzzhzy3Iet5nLjJoRAcQRTPw3sDakJb5lVSNtIyaLKjm7UI1SC 8o4t29OsHB7HQQZM8vN6QELSHmyh6HxWDvHdQUyPgJK7tIri6eNeqD58rMo/8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0chG450nzmRD; Wed, 27 Dec 2023 16:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRGZgdt081746; Wed, 27 Dec 2023 16:35:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRGZgLd081743; Wed, 27 Dec 2023 16:35:42 GMT (envelope-from git) Date: Wed, 27 Dec 2023 16:35:42 GMT Message-Id: <202312271635.3BRGZgLd081743@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: a13039e27092 - main - inpcb: reoder inpcb destruction List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a13039e2709277b1c3b159e694cc909a5e044151 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a13039e2709277b1c3b159e694cc909a5e044151 commit a13039e2709277b1c3b159e694cc909a5e044151 Author: Gleb Smirnoff AuthorDate: 2023-12-27 16:34:37 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-27 16:34:37 +0000 inpcb: reoder inpcb destruction First, merge in_pcbdetach() with in_pcbfree(). The comment for in_pcbdetach() was no longer correct. Then, make sure we remove the inpcb from the hash before we commit any destructive actions on it. There are couple functions that rely on the hash lock skipping SMR + inpcb lock to lookup an inpcb. Although there are no known functions that similarly rely on the global inpcb list lock, also do list removal before destructive actions. PR: 273890 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43122 --- sys/netinet/in_pcb.c | 39 +++++++++++++++------------------------ sys/netinet/in_pcb.h | 1 - sys/netinet/raw_ip.c | 1 - sys/netinet/tcp_syncache.c | 2 -- sys/netinet/tcp_usrreq.c | 2 -- sys/netinet/udp_usrreq.c | 1 - sys/netinet6/raw_ip6.c | 1 - sys/netinet6/udp6_usrreq.c | 1 - 8 files changed, 15 insertions(+), 33 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 0d763184f68c..63b4fc57230e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1403,26 +1403,6 @@ in_pcbdisconnect(struct inpcb *inp) } #endif /* INET */ -/* - * in_pcbdetach() is responsibe for disassociating a socket from an inpcb. - * For most protocols, this will be invoked immediately prior to calling - * in_pcbfree(). However, with TCP the inpcb may significantly outlive the - * socket, in which case in_pcbfree() is deferred. - */ -void -in_pcbdetach(struct inpcb *inp) -{ - - KASSERT(inp->inp_socket != NULL, ("%s: inp_socket == NULL", __func__)); - -#ifdef RATELIMIT - if (inp->inp_snd_tag != NULL) - in_pcbdetach_txrtlmt(inp); -#endif - inp->inp_socket->so_pcb = NULL; - inp->inp_socket = NULL; -} - /* * inpcb hash lookups are protected by SMR section. * @@ -1733,19 +1713,30 @@ in_pcbfree(struct inpcb *inp) #endif INP_WLOCK_ASSERT(inp); - KASSERT(inp->inp_socket == NULL, ("%s: inp_socket != NULL", __func__)); + KASSERT(inp->inp_socket != NULL, ("%s: inp_socket == NULL", __func__)); KASSERT((inp->inp_flags & INP_FREED) == 0, ("%s: called twice for pcb %p", __func__, inp)); - inp->inp_flags |= INP_FREED; + /* + * in_pcblookup_local() and in6_pcblookup_local() may return an inpcb + * from the hash without acquiring inpcb lock, they rely on the hash + * lock, thus in_pcbremhash() should be the first action. + */ + if (inp->inp_flags & INP_INHASHLIST) + in_pcbremhash(inp); INP_INFO_WLOCK(pcbinfo); inp->inp_gencnt = ++pcbinfo->ipi_gencnt; pcbinfo->ipi_count--; CK_LIST_REMOVE(inp, inp_list); INP_INFO_WUNLOCK(pcbinfo); - if (inp->inp_flags & INP_INHASHLIST) - in_pcbremhash(inp); +#ifdef RATELIMIT + if (inp->inp_snd_tag != NULL) + in_pcbdetach_txrtlmt(inp); +#endif + inp->inp_flags |= INP_FREED; + inp->inp_socket->so_pcb = NULL; + inp->inp_socket = NULL; RO_INVALIDATE_CACHE(&inp->inp_route); #ifdef MAC diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index adde89dde873..3d633741dc27 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -670,7 +670,6 @@ int in_pcbconnect(struct inpcb *, struct sockaddr_in *, struct ucred *, bool); int in_pcbconnect_setup(struct inpcb *, struct sockaddr_in *, in_addr_t *, u_short *, in_addr_t *, u_short *, struct ucred *); -void in_pcbdetach(struct inpcb *); void in_pcbdisconnect(struct inpcb *); void in_pcbdrop(struct inpcb *); void in_pcbfree(struct inpcb *); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 2a1e3dfb8616..4a61e685d898 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -860,7 +860,6 @@ rip_detach(struct socket *so) ip_rsvp_force_done(so); if (so == V_ip_rsvpd) ip_rsvp_done(); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 2c381ef600d6..20c77930556e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -803,7 +803,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) } inp = sotoinpcb(so); if ((tp = tcp_newtcpcb(inp)) == NULL) { - in_pcbdetach(inp); in_pcbfree(inp); sodealloc(so); goto allocfail; @@ -1051,7 +1050,6 @@ allocfail: return (NULL); abort: - in_pcbdetach(inp); in_pcbfree(inp); sodealloc(so); if ((s = tcp_log_addrs(&sc->sc_inc, NULL, NULL, NULL))) { diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index d3ba42fd9d06..dad79374c08b 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -175,7 +175,6 @@ tcp_usr_attach(struct socket *so, int proto, struct thread *td) tp = tcp_newtcpcb(inp); if (tp == NULL) { error = ENOBUFS; - in_pcbdetach(inp); in_pcbfree(inp); goto out; } @@ -213,7 +212,6 @@ tcp_usr_detach(struct socket *so) ("%s: inp %p not dropped or embryonic", __func__, inp)); tcp_discardcb(tp); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 77cbf9d98c83..f7e0f7417818 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1641,7 +1641,6 @@ udp_detach(struct socket *so) KASSERT(inp->inp_faddr.s_addr == INADDR_ANY, ("udp_detach: not disconnected")); INP_WLOCK(inp); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 266925836329..174cc29e6008 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -687,7 +687,6 @@ rip6_detach(struct socket *so) /* xxx: RSVP */ INP_WLOCK(inp); free(inp->in6p_icmp6filt, M_PCB); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 681645880368..bbd7ba9477d6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1201,7 +1201,6 @@ udp6_detach(struct socket *so) KASSERT(inp != NULL, ("udp6_detach: inp == NULL")); INP_WLOCK(inp); - in_pcbdetach(inp); in_pcbfree(inp); } From nobody Wed Dec 27 16:35:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0chJ27lKz55vvX; Wed, 27 Dec 2023 16:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0chJ025Wz3SRW; Wed, 27 Dec 2023 16:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703694944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ceIzv9MwGtQ2eR50NTdXW42k86WeBi+XjID8VhKtblg=; b=pbc2GS1XhdBR/hQuuo3BdJyZ/Gk3vO4+yiT7CuIglBMGNwiSdgXujimr9wHf30zuv7CGeh NFe7lwAUSGjOl2JAkUeabALrXofaw8vF9lp5uLGYRAq+3WfmIvPzxDkHeeAIasLJ6uVTV0 MlIGEPnPQZMsTYhkSRgVJ5vqLzTzXn5cXJLwL2EX9xmZ+3mNKCYRiTRk99ZvFaRBb9uOJt FkWEoe4mRv97LR6SAwp3FRxAIdVNlY7H7lDw+RoHt4xEdKLL4wa/SrufMHt+i3EwBYKGmH IcroQrWlY9AtS7x+6P0VFodilY53SMr0JSSndSFUP2zz3HIDFExbbEXe/MMXTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703694944; a=rsa-sha256; cv=none; b=MJoer5wFGuWIsTg3XVwMaGxRcrigeCPc7iedl1l5VOAoNml9BTOIUaF/8SS+Syz7muiVEx XkqNzJFUcyNQr8/NpUhq/c5WcSkpOgh5SpvBNq7efR1gq2nQHFpdOB8o/VwpTZmd0j076l lS+PBoaDmSMC9ZAc0asEIm5+tMHpXflacUeNAd+rZnLwsnQhOIkv1sERENqXWD88nuwOUz 7sK/7PH6wzQU/T6a88WEcgto+jmhAkWYZH8N01APbFmgSqO5Nr1DilqQx9jire0q5hP+SO MWF2tIg+OF6miwYaocyH6749wehz4jdHVkT0UHWN5xX8KDQ06/8NQYE2CwoZIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703694944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ceIzv9MwGtQ2eR50NTdXW42k86WeBi+XjID8VhKtblg=; b=j+39b0JJLWHZ48Am14LimTIV9+cUwjxqPpAQwOVJXM20rhzNYCd+vQ8rAFgRbhBtiSBs74 swTiEaenV0WQ+v1jsgfw/YOhcvmSVLhtjYNYWeLYRWwj5IeBH1knFYdPx43SxATdASM8pb Fe2Ligev1H+Xn+rT0N/wk00zjwxOLoltzIyJVH3bvZaFc6wVqMESykXw/Nv6tVFtSeWISC CrSd/vHYBfrgEfPHt52UIpROwKCQ1at+EEiBuLMJ4QjBt0QPkeikuNoJV918PlYdKetaLH 1QYsZpjgc5D1qUXkVACUphcrOGX3HP4QpTMalSioeEqcRZPeGuifF1D8IOJ4jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0chH5Cc0zmRF; Wed, 27 Dec 2023 16:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRGZhwr081794; Wed, 27 Dec 2023 16:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRGZh3F081791; Wed, 27 Dec 2023 16:35:43 GMT (envelope-from git) Date: Wed, 27 Dec 2023 16:35:43 GMT Message-Id: <202312271635.3BRGZh3F081791@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: 4a0c6403b0ec - main - inpcb: poison several inpcb pointer in in_pcbfree() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4a0c6403b0ec5c6223c2b798fab231a4fac0a6d1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4a0c6403b0ec5c6223c2b798fab231a4fac0a6d1 commit 4a0c6403b0ec5c6223c2b798fab231a4fac0a6d1 Author: Gleb Smirnoff AuthorDate: 2023-12-27 16:34:37 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-27 16:34:37 +0000 inpcb: poison several inpcb pointer in in_pcbfree() There are few subsystems that reference inpcb and allow it to outlive in_pcbfree(). There are no known bugs with them to unreference the options pointers for a freed inpcb. Enforce this so that such bugs don't appear in the future. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43134 --- sys/netinet/in_pcb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 63b4fc57230e..fa0d7309058e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1749,12 +1749,16 @@ in_pcbfree(struct inpcb *inp) #ifdef INET if (inp->inp_options) (void)m_free(inp->inp_options); + DEBUG_POISON_POINTER(inp->inp_options); imo = inp->inp_moptions; + DEBUG_POISON_POINTER(inp->inp_moptions); #endif #ifdef INET6 if (inp->inp_vflag & INP_IPV6PROTO) { ip6_freepcbopts(inp->in6p_outputopts); + DEBUG_POISON_POINTER(inp->in6p_outputopts); im6o = inp->in6p_moptions; + DEBUG_POISON_POINTER(inp->in6p_moptions); } else im6o = NULL; #endif From nobody Wed Dec 27 17:05:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0dLp0Jmcz55yLR; Wed, 27 Dec 2023 17:05:38 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0dLn69CYz3XXC; Wed, 27 Dec 2023 17:05:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703696737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0X09mQeDHCdikr6mCKHxslyYin6ssq4S9ogKuAyo5RM=; b=pyD9c/FCB3FuvEc2XXg2cf4vxd+Gt+wrRRcAI8HtJbFYGDK1s7r/C1c/gFmeVIjLtNfT2k LSSp56Ya7LepugI7ap+9ZXLT/ZLqLzgo6geaK2qWik8DLMJVYnhzyHfGHaLsM54OuVKa1K EpOT2ErJeZ1Y2E8VIP/QUNDfUSHxVLtH2MjiVsdvyNXtI0fL7CKdAlaIq3bk8cYyxXUXu4 mBd8SkJ4mgF/nvUPwGOMjBm0oNFfToTe0Ih9UI6A0l7OPyYqctzMMpGPFnunfaK6EGYIoV 2iKjQ+aGBGHp0JhD++mAB89jQKP3FuQt8ol3Y+DCIpUGD1WWA/VsQh9WRF1k+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703696737; a=rsa-sha256; cv=none; b=nXb40fHgqxF1a0fHs5hUGGE5uaZjd0pibBMMxj1QY59nK3pWQyiwNU4Qysjw4SXfQUfX6R m6S6ZNcDfDAwuL1FZ6ZVP32aC5XvZHih3xLETDhONf9dPUATVQVeQEUfBt6J/hJ+NdBM4o 42MeoKe+63fY0atvPgGwLtLm2nhasswmokwEXcAnk/DodFk12owN8WAv5BvHkTYtmo7wpI 24AV4Xq1HvfrRYz5vjwhzmjmt6Q1/3jHxaybgHDYxg71cMj5pl48f3TH7GO2ug2OTv3r/F vAoa7Gc4Y7uS0tcHs3vy4kMaTKIrmFgSVcjgrFTp01cDoINzmTEMTul0C/tn4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703696737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0X09mQeDHCdikr6mCKHxslyYin6ssq4S9ogKuAyo5RM=; b=uIXLB4lFCwqtfKj9JJOO3H3sFJo03K/rtt5NWMztSR11KXwFqQv1Q21OYoLu16S8J0isif tN6EYo3jvcgIP43MAtTyqHJoWcRTdlDwiJRRZED0AjBHtRjmT4hu3q/dKcXtKIS8yc0Vxu 37H8Efe/XJKGRA3kK5QDTPhiDrPnhC35/H/xbg5mRIfJLB/rIIrNSigN/GPjdWPfINs8V6 lcL6muH+wnRWh0hSR42DrBeNM4fgw7QG6tiKPNvQvWGhuWiuSk+M8Yfvnq5huHeWJMOs01 oK32/iAJlU095cqgvjzLfaha6vJkMjIDmFZpOvjaNVheKIFZvy51qV7P1rTXPg== Received: from [IPV6:2601:644:9381:f410:c0ae:18f0:f792:9d4d] (unknown [IPv6:2601:644:9381:f410:c0ae:18f0:f792:9d4d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4T0dLn2G0Wz15sy; Wed, 27 Dec 2023 17:05:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 27 Dec 2023 09:05:35 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: b4efc6277634 - main - LinuxKPI: Do not use explicit context in FPU sections on powerpc64 Content-Language: en-US To: Vladimir Kondratyev , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202312241320.3BODK2DA076069@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202312241320.3BODK2DA076069@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/24/23 5:20 AM, Vladimir Kondratyev wrote: > The branch main has been updated by wulf: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b4efc62776344a9aaada5a0866e453e528a0e977 > > commit b4efc62776344a9aaada5a0866e453e528a0e977 > Author: Vladimir Kondratyev > AuthorDate: 2023-12-24 12:48:06 +0000 > Commit: Vladimir Kondratyev > CommitDate: 2023-12-24 12:48:06 +0000 > > LinuxKPI: Do not use explicit context in FPU sections on powerpc64 > > It is not supported yet. > > Sponsored by: Serenity Cyber Security, LLC > Fixes: 5a3bd281672b ("LinuxKPI: Add explicit software context to FPU sections") > MFC after: 1 week > --- > sys/compat/linuxkpi/common/include/linux/compat.h | 5 ----- > sys/compat/linuxkpi/common/src/linux_current.c | 9 ++++++--- > sys/compat/linuxkpi/common/src/linux_fpu.c | 3 ++- > 3 files changed, 8 insertions(+), 9 deletions(-) Do you need explicit contexts at all? That is, can you not just use FPU_KERN_NOCTX all the time? Most code in the tree now uses FPU_KERN_NOCTX now (all the crypto drivers for example), and I've been thinking about removing support for the !FPU_KERN_NOCTX case. Is there a reason drm-kmod can't use FPU_KERN_NOCTX? Do you really need to save FPU registers in one block of code wrapped by fpu_kern_* and then use those register values in a future section wrapped by fpu_kern_*? -- John Baldwin From nobody Wed Dec 27 17:39:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0f6M4Vp8z561wc; Wed, 27 Dec 2023 17:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0f6M3zHqz3cV0; Wed, 27 Dec 2023 17:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703698795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xjrv3VxtEazMVhe0SRFLr2OfAyRti+73M2L+QwNIpNo=; b=YPOUKkMh5aCnSF2QoNV36WSZEgWvALZihktz2wsTlL0g0LBtWBTJsF+Yg84PK10mXk+b8R K9Vjai1Ahoup0VxpbC/n0doMP4ANINImMvqgErZMov8Wx93pH7VN8c+dYNBF8HlT0Cjai4 TQcz1oMy1MTtPdY68l4qSRHhzTcN21GXRCpkJ9WceFrvfs8gq/6wFyk7QpzrbnWl9FrFhn KCHCyXTpcjf72o83Lb+ZvZ4+g5TpVDGtoU5N1PQRQkYZlk4bY3zs6utRH1+/F0MSc9G+mD 4M2Qcv7foJLCoWaUjriCdv7y+SH57PZcFCR1QPTTOEKYBNOGhTdodm3UNoJFMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703698795; a=rsa-sha256; cv=none; b=X870zSYp5Anq0k8EGfVO+XBTvD8vyh2EXChACXSgAFL6UtFkBuSdYByr3R+txn0uwsvhlg zdce7UGHOdT/PM8UzJfaTuCiUQKUZyM0A5DfBZj1ot5D+S3Lck0+5aO2hQwUrstG19Jo2P JdDuksCOaT5t2j8SUgJWhDlPINhFdvc7RovUlwU5eRQy+ZQxnjiuDK4dCQmy7Y37b81jiv hhb5FibH89DybtdLJlw9GSBoOq5bA1blDi6GWCBrTPFmDnLLsqRf+kmAElZeK9Cp13qH4x tpQ0WfHU2NlWhYCfU/wqWoIvSg0sW3B5epT8/8QyKLM56Y9iJ1FfVhGva+8ZLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703698795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xjrv3VxtEazMVhe0SRFLr2OfAyRti+73M2L+QwNIpNo=; b=L3mmK9s+98ocZ8yUog8SlRLIPomtNWE0WpeO1TdrxgCvbyg2UUGnNd0Edjd/wvWKX9l8dz rN1MKXjJKOjVb2MnkdZJWWKEeCz8j60NwOIYgx5VycmRNMlxtbDtdiw81p5ZnzlH76JDz+ I5UgV5xczo13zgY+8FjavRYqv5GwUfoKWc0scX6lhIYInbRdEu0CC+cyi5+Qj+M6A8IH1G 3/kiBafu54jR+5P077pc/jr6qk56qlvt2N/rlOnv2jNGvVRdpc4ZykIpdwZidlsuiO2Ia2 ZnPPiX1mR/PMTyIiSg7TRHpoa2E1u5uuuq8d7H8YWpA9hK8L0j4tbXIFpP2+LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0f6M32ppznmH; Wed, 27 Dec 2023 17:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRHdtiC082807; Wed, 27 Dec 2023 17:39:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRHdt94082804; Wed, 27 Dec 2023 17:39:55 GMT (envelope-from git) Date: Wed, 27 Dec 2023 17:39:55 GMT Message-Id: <202312271739.3BRHdt94082804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: c4368d03e52c - main - improve handling of shell metacharacters in filenames List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4368d03e52c7c97d583ee6b81a59510d371ffbb Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=c4368d03e52c7c97d583ee6b81a59510d371ffbb commit c4368d03e52c7c97d583ee6b81a59510d371ffbb Author: Wolfram Schneider AuthorDate: 2023-12-27 17:35:08 +0000 Commit: Wolfram Schneider CommitDate: 2023-12-27 17:36:51 +0000 improve handling of shell metacharacters in filenames PR: 275967 MFC after: 1 week --- usr.bin/man/man.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index b18895a91d96..87594699b2c2 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -143,8 +143,8 @@ check_cat() { if exists "$1"; then use_cat=yes catpage=$found - setup_cattool $catpage - decho " Found catpage $catpage" + setup_cattool "$catpage" + decho " Found catpage \"$catpage\"" return 0 else return 1 @@ -169,8 +169,8 @@ check_man() { # cat page found and is newer, use that use_cat=yes catpage=$found - setup_cattool $catpage - decho " Using catpage $catpage" + setup_cattool "$catpage" + decho " Using catpage \"$catpage\"" else # no cat page or is older unset use_cat @@ -342,10 +342,10 @@ man_display_page() { ret=0 else if [ $debug -gt 0 ]; then - decho "Command: $cattool $catpage | $MANPAGER" + decho "Command: $cattool \"$catpage\" | $MANPAGER" ret=0 else - eval "$cattool $catpage | $MANPAGER" + eval "$cattool \"$catpage\" | $MANPAGER" ret=$? fi fi @@ -370,7 +370,7 @@ man_display_page() { pipeline="mandoc $mandoc_args | $MANPAGER" fi - if ! eval "$cattool $manpage | $testline" ;then + if ! eval "$cattool \"$manpage\" | $testline" ;then if which -s groff; then man_display_page_groff else @@ -383,10 +383,10 @@ man_display_page() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool $manpage | $pipeline" + decho "Command: $cattool \"$manpage\" | $pipeline" ret=0 else - eval "$cattool $manpage | $pipeline" + eval "$cattool \"$manpage\" | $pipeline" ret=$? fi } @@ -476,10 +476,10 @@ man_display_page_groff() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool $manpage | $pipeline" + decho "Command: $cattool \"$manpage\" | $pipeline" ret=0 else - eval "$cattool $manpage | $pipeline" + eval "$cattool \"$manpage\" | $pipeline" ret=$? fi } From nobody Wed Dec 27 17:49:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fKm4Gkxz562YB; Wed, 27 Dec 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fKm27Vwz3dlt; Wed, 27 Dec 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703699388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJbcFEhD97sl4p65hQDF3CvhitRns9pwxjM90goePNs=; b=iYK6aAQ1WvZbKnXpOI7QOlTJuOFNmpYRqH35kaqvyTzh5Xtf3qOHQFSHuvM3iaIZo296oz 8Qy0v66WXEdQGjwpjPZV5DoywuwLuEOfBmUozmrZnxTqGx33MHxZE5mWVXl04RIA4HvA0q GmtBgmZdI+xSXSBmxDjJDU1CugVgadMJmoWmrS7LVm4tgu4TlE+ZqMNTmazZduyGt38Hun ovWhhfkcpB/PJMIgkfuhhqjHFznkd/9qjCsXCwyPFq67DGM4vbDyjXX9xpAAu4NAWmvcHc OJm7VtRVVoomSi7OYQq2abyargG2cgqUn9BSt9SxyOePIfW/dSWOCbmmDRUhYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703699388; a=rsa-sha256; cv=none; b=bkbuGyfJT2Em4x7VJClHeI0Mqn8TWR02peF0g14cBCJxXQcRyyT3GqFoPMv2eOt3Au6EIb 2l/ul8zknVmfs+EXtjcagGNULNRoMYFYs3U4IoFCWb6ZjAqiTisLz5SFF3kJy1irEyOwZn SlqbV3QdPrgjy4TcF6/6Fa4IDVeh6/mUsN34yoXEzjDP9Wd5OpVkNXA4FC4YmLTtVLeQ3a LcfwYqesjIHt86iQbpnC+9/IodZepTB8l4OUTnKLSiUG9N0UCbFiTrFnxW8Fxq13btS80z y4sA3bKfeHXWN+0jcQoENtpjTQp6XDnsk31PbGP+2Jlqok5b0B7Iprbmr8baBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703699388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJbcFEhD97sl4p65hQDF3CvhitRns9pwxjM90goePNs=; b=o7hbQHs9rdERGNEfRd0kqTEDcUn4mkNpslOrL15Mw56xyc19A6Bqgyg8PSbuZn4tv3ar16 8VAmHH2Li5dkljEhf+gu4Y0W5fJQasj94JVbUAtRuOsctfPT0TDp7IlVmGk/kuM4YoUyei upDxaxwNTP5wHs21rbaENyE6SYvbWPym+A/aKZGMeU0aenGoMNFEdPJPNuc4TTY912n8+v y0X3L4AfWW6GULwG0nuiMf9EuQeQSVpGi+B8OtXzPh6imqBeb51qNDc2+4B82veXITZmSq mU4wcPX7tkeHLzwGe+xhFuGkpPBF/epfs6WSLIgDUTTTVltcBnkV6JKgf5FcYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fKm1CXdzpG0; Wed, 27 Dec 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRHnmEm099974; Wed, 27 Dec 2023 17:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRHnmBP099971; Wed, 27 Dec 2023 17:49:48 GMT (envelope-from git) Date: Wed, 27 Dec 2023 17:49:48 GMT Message-Id: <202312271749.3BRHnmBP099971@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: 2391e536c01c - main - Fix multiple bugs with ctld's UCL parsing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2391e536c01cb51d2a2c11a0f5820481314e9ec2 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2391e536c01cb51d2a2c11a0f5820481314e9ec2 commit 2391e536c01cb51d2a2c11a0f5820481314e9ec2 Author: Alan Somers AuthorDate: 2023-10-09 18:26:25 +0000 Commit: Alan Somers CommitDate: 2023-12-27 17:49:15 +0000 Fix multiple bugs with ctld's UCL parsing * Don't segfault when parsing a misformatted auth-group section * If the config file specifies a chap section within a target but no auth-group, create a new anonymous auth-group. That matches the behavior with non-UCL config files. * Protect some potential segfaults with assertions PR: 274380 MFC after: 1 week Sponsored by: Axcient Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D43198 --- usr.sbin/ctld/ctld.c | 1 + usr.sbin/ctld/uclparse.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index fd60c4f6a646..c31ac328c84e 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -532,6 +532,7 @@ auth_group_find(const struct conf *conf, const char *name) { struct auth_group *ag; + assert(name != NULL); TAILQ_FOREACH(ag, &conf->conf_auth_groups, ag_next) { if (ag->ag_name != NULL && strcmp(ag->ag_name, name) == 0) return (ag); diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index f3f8df81e492..8bd1ca88d166 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -60,6 +60,7 @@ uclparse_chap(struct auth_group *auth_group, const ucl_object_t *obj) const struct auth *ca; const ucl_object_t *user, *secret; + assert(auth_group != NULL); user = ucl_object_find_key(obj, "user"); if (!user || user->type != UCL_STRING) { log_warnx("chap section in auth-group \"%s\" is missing " @@ -90,6 +91,7 @@ uclparse_chap_mutual(struct auth_group *auth_group, const ucl_object_t *obj) const ucl_object_t *user, *secret, *mutual_user; const ucl_object_t *mutual_secret; + assert(auth_group != NULL); user = ucl_object_find_key(obj, "user"); if (!user || user->type != UCL_STRING) { log_warnx("chap-mutual section in auth-group \"%s\" is missing " @@ -714,6 +716,8 @@ uclparse_target(const char *name, const ucl_object_t *top) } if (!strcmp(key, "auth-group")) { + const char *ag; + if (target->t_auth_group != NULL) { if (target->t_auth_group->ag_name != NULL) log_warnx("auth-group for target \"%s\" " @@ -725,8 +729,12 @@ uclparse_target(const char *name, const ucl_object_t *top) "target \"%s\"", target->t_name); return (1); } - target->t_auth_group = auth_group_find(conf, - ucl_object_tostring(obj)); + ag = ucl_object_tostring(obj); + if (!ag) { + log_warnx("auth-group must be a string"); + return (1); + } + target->t_auth_group = auth_group_find(conf, ag); if (target->t_auth_group == NULL) { log_warnx("unknown auth-group \"%s\" for target " "\"%s\"", ucl_object_tostring(obj), @@ -759,6 +767,20 @@ uclparse_target(const char *name, const ucl_object_t *top) } if (!strcmp(key, "chap")) { + if (target->t_auth_group != NULL) { + if (target->t_auth_group->ag_name != NULL) { + log_warnx("cannot use both auth-group " + "and chap for target \"%s\"", + target->t_name); + return (1); + } + } else { + target->t_auth_group = auth_group_new(conf, NULL); + if (target->t_auth_group == NULL) { + return (1); + } + target->t_auth_group->ag_target = target; + } if (uclparse_chap(target->t_auth_group, obj) != 0) return (1); } From nobody Wed Dec 27 17:59:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fXm6TG9z563Nj; Wed, 27 Dec 2023 17:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fXm5gR1z3gVr; Wed, 27 Dec 2023 17:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703699960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAdXZrBHtNJ0SB+9Y3TiOPYOo5+EciCWrpTUJPcpxdg=; b=s+ReGBRBZAMLsfq6uIJgCBAFyata2GKKD8B+DTcEBQ8QHVXgmkqxslP3Jqvxosy81TMbgL kTh6XGM7Whc0txRNlwqKWQ+E1L83XGEzxLDF60pYiQWfX9s8vpKnfZbsidE2CF+F4p/idC cNe9AFBCcrsnWSBr+1DNEEUp4FeP0f14atMtXZS0h3M6rnz5AoJuLYqGRuVK7uGOEnkiXl eJVbA9yl50cMF23D2CfJpVhUkB1gDG8Fryr0h3v26V17V9f7zro3n6VnpiHBuFrp+O9Mbs VfS27CT4W2xhbMZDfyvozRaGzrgGIg0QvNNr20dqUC7+Q1vJAK5kpv8jK69uhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703699960; a=rsa-sha256; cv=none; b=EqG2HKM1cxnRQEgCCVOEjJQVCOPLtEnsr1h89K9rLtFVAGyXgmrIj2IYanBJL6PSUfaM2F uwphfrEvRxAMJwe2KJR7mWe7ifvQo/7FV1Qs6mreppRIzdbQoungZqIDbZVoJv1iN8mKg9 SUdQVDjaVNgH17YfRSg0JixzlFX5l8JC0fEruhcirTHsQUghAflOKt4pOyXO9TbwIrb9Yp 5iL8tVnOh3FN/ex0cidouZEnsXepl0bjIPf9p0YMp8M8sRg87Sa8O6Vv7g/ooCSidX6MzW eZfcZr7I2wNUJMH5msuZxRsUhCD8DOJFY/LMJ8YUCc0zrevmlxFVgkHbYTbaUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703699960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAdXZrBHtNJ0SB+9Y3TiOPYOo5+EciCWrpTUJPcpxdg=; b=a1uISn/KthApf31O5OpXAYO0pMd4oBSrNg6pH504hbmhtqH4LUoVYowHINQJfWkSSMwhAr zwhmLyNnVtoT3cE4ax13iDnt995ScId3mN0T+SxCnE8EGqOYMQ8JDiWq7EUztvu6Pmi/5s iYl4SLGGnK0xPI4Vf5yABeFiIYgJEFcaETkZ/sDp1DC2jrIALxFfBE7qSBqBvZ583C58ee xtX3NXs1pp5iqtyge73YC34L0IjvIHcHZBayO/UWbukioSzjU0NDltSiR54ffCm0HYCF0B 6Gch6+ean93/NHB5OK2IiGh0UO6wvz10vDYg0Nkg5hh3N4fOTbEzYRiFbiv6zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fXm4lYCznnx; Wed, 27 Dec 2023 17:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRHxKV8017183; Wed, 27 Dec 2023 17:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRHxKjY017180; Wed, 27 Dec 2023 17:59:20 GMT (envelope-from git) Date: Wed, 27 Dec 2023 17:59:20 GMT Message-Id: <202312271759.3BRHxKjY017180@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: 30ce26cacfd6 - main - nfsstat: update option strings in docs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 30ce26cacfd626552c647c9327dd510e7f421d97 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=30ce26cacfd626552c647c9327dd510e7f421d97 commit 30ce26cacfd626552c647c9327dd510e7f421d97 Author: Lexi Winter AuthorDate: 2023-12-27 17:30:31 +0000 Commit: Alan Somers CommitDate: 2023-12-27 17:57:59 +0000 nfsstat: update option strings in docs Add the missing -q option to the nfsstat(1) manpage SYNOPSIS (it is already documented in DESCRIPTION), and add the missing -E and -q options to the built-in usage output. PR: 275912 MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/958 --- usr.bin/nfsstat/nfsstat.1 | 4 ++-- usr.bin/nfsstat/nfsstat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1 index 8d4bdd2646d6..6b062866ce5a 100644 --- a/usr.bin/nfsstat/nfsstat.1 +++ b/usr.bin/nfsstat/nfsstat.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 5, 2023 +.Dd December 27, 2023 .Dt NFSSTAT 1 .Os .Sh NAME @@ -36,7 +36,7 @@ statistics .Sh SYNOPSIS .Nm .Op Fl -libxo -.Op Fl cdEemszW +.Op Fl cdEemqszW .Op Fl w Ar wait .Sh DESCRIPTION The diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index 7802754cc0c7..8c4df61b0482 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -500,7 +500,7 @@ static void usage(void) { (void)fprintf(stderr, - "usage: nfsstat [-cdemszW] [-w wait]\n"); + "usage: nfsstat [-cdEemqszW] [-w wait]\n"); exit(1); } From nobody Wed Dec 27 18:11:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fpw1hXJz5644V; Wed, 27 Dec 2023 18:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fpw13knz4F9l; Wed, 27 Dec 2023 18: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=1703700696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hbYMSuAdO+inuZjSsQuKgwdHZPrRI3tknkxqMbYUME=; b=H3UiK17cDsO5EKcolOrXfYB9lA8TTzpANBPlMiZoIrOcYre18zzdlsTenzPeceZoih5SmZ r55LPfHis9bU98SdiBcgUpwFvMo9EbLXbwGobxL5Wp65gCccFyJN9xcfXRmo4rmwEkZ+iW 17L13jRTo/xgjVAtKpO9Xvv8TWPOu7cq3cY/EBJGFnO2ZQ2PwePVYVjSjP8S076zr+6CmM 2qgDUswrO98XV8cNFSodCfZ0MXkqpeYgRIkvZE+jsD/J49s0fz+BD8IjgaNvIGDo48Qer6 Mgji3T4EGipLU+KEDCoR5o4/tLRqIT0W+wUrwbm4/QTVDllDcsOjxfYRa/Jl8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700696; a=rsa-sha256; cv=none; b=MUf2FwaXfTbg/ERHQmDLGEq2XSXXdyjFkddRSl2rJsu35MYFQIrWg7So7qkklaFGef2orb CSpEExY/Q9w+V8wT+8551uIWWyLn8ZJzwPG5TajyAARhulF+bR7Sg5LS7i2TjxQdQdTXjY qZdVp/xH9qQaugTSYrE5FnVkgnP6ZHhTpSE5aTuTVg3j+RZVc8jkO1xnyLmr+5CZTT+B2a wmklxQXRrVQSdU+Rpru5rCul/u8RoFwuca5Guy9s/sOQybXAJTH9G1nJIAb6o4SqtJmvsB 7ObDdPEI2yfcYxsvDCQ4KnW9x/iNd0YEIW9I/603WiJA1gaXHQY0wNOmIgg1nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hbYMSuAdO+inuZjSsQuKgwdHZPrRI3tknkxqMbYUME=; b=huK6vVO1QXGzgYScn9o27/wVthojVqIiTEMP3dqbv1qTFyi8+sknzNICAk5cbGEjyO4yA1 VM7dQ9lU/5GUMHSI61il53+aK8j4RHS2JLZY4r1uh6yhQ69o8aOrRNCSs5yOFGMOrDK2S4 ltgrOQXu9jWdydVy7wrXZYprs+iym7BghEd4Vb6uSTwaxz3oaHfHxS084i5KX6a/HmaXbI sMBf3kh1qB6AoZhShpChtGms+ksUfC3qlRzsHmB36eFGxGtIBL0tOeziljXUH03MRecEKF v0I1tLP45uuNg8uong5gDpK/QcDCpViTENjDPQ0iynre5VlK7xkQ6eRvOEC9Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fpw08Myzpj3; Wed, 27 Dec 2023 18:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBZVK049191; Wed, 27 Dec 2023 18:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBZbS049188; Wed, 27 Dec 2023 18:11:35 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:35 GMT Message-Id: <202312271811.3BRIBZbS049188@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: e03e77ba4d05 - main - ctl: Always return errno values from ctl_port_register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e03e77ba4d0570511fdc1be192459e1160c650a6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e03e77ba4d0570511fdc1be192459e1160c650a6 commit e03e77ba4d0570511fdc1be192459e1160c650a6 Author: John Baldwin AuthorDate: 2023-12-27 18:09:24 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:09:24 +0000 ctl: Always return errno values from ctl_port_register Return EBUSY instead of a bare 1 if a port number is already active. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42929 --- sys/cam/ctl/ctl_frontend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c index ac41a882db6b..1e4d130950c4 100644 --- a/sys/cam/ctl/ctl_frontend.c +++ b/sys/cam/ctl/ctl_frontend.c @@ -162,7 +162,7 @@ ctl_port_register(struct ctl_port *port) if ((port_num < 0) || (ctl_set_mask(softc->ctl_port_mask, port_num) < 0)) { mtx_unlock(&softc->ctl_lock); - return (1); + return (EBUSY); } softc->num_ports++; mtx_unlock(&softc->ctl_lock); From nobody Wed Dec 27 18:11:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fpx3PYsz564Fv; Wed, 27 Dec 2023 18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fpx230Cz4F9m; Wed, 27 Dec 2023 18: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=1703700697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v79qKXj4/BPWrC3T+a66kv2Nvf0p5Uhdje6vZSife/4=; b=E64GPn/HYI6VN4Zv7snh9roJSrgxy0b/NI1jJqx2tjvBbrwu0i6l2gTWs1vUklGEUBzJeX kQLuVCR+E9FXwSxlAyENXmGoa0UN1LuWpzXBN71XTEewXI2ufV4ij1ZeHusaxELJeJfaKv SuezXFlGBC6KxBSCQWtIqJUTmn8g2UvSy0qJx99vUJVMJcZyqQosCHD/2R6xBxk+norCQa 55Gdslga9VrvlE+N21k2gx0nLryPT2diZghzTkZeCT2D2NdM3WB9f04nv6WS2PQ3Qwsn27 A5b8r9zGdfQENw8XOLKGic/YZV+hAxYxoS7/VSpwo3IAkHn3XClB5MZK0aKVIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700697; a=rsa-sha256; cv=none; b=gTGScLohzXiOa4S1ZEV2u3hxxYkJvHsK0RCAhx/U0xKh8hfcnDFz7CNdj+qC+j2IvzR4P5 0+X2+/30pko+/jQG1ctl9d7Z6GyCe2SePXF2M2aYFNS5O8hu5Og1APGLyp/bNRG1jG1vBx P8IJ0AuxHEapgx9oKC71MUMa1dp1oNVbljU21jzSwfgdEqI65O8QD+5gooAOtrEeh2ztfS gagDqY+iRrqo5ZnkSwNvHK5mtX4HiC9i9ysKADDP68KAEG80d0RHesm8WZiGOSx6GDH8GR vUvETueDgsNoxVVS7VoYxLSyxUL82zDusEb5n4hmVldFMFI5XZwEDIr1WQdKNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v79qKXj4/BPWrC3T+a66kv2Nvf0p5Uhdje6vZSife/4=; b=HLfohuZejWRSa+Lba/+NkhI52M9RLI9RkAXlN1Dtjl2ueV1+3P3qVGzQx9B8PSiOYmS4Ol Obdu6QXJzzuO2NCe1EQ0nApJEi3904DKpsvtLJHwJ5JlKXhwXuoCzHqPytDkoOy29yPVnX 9LYmM3XWwvTYMVtduY8vuNwoWRI3n7SAhtYudnCePgOY3NO34WHtMoJoizzi4uMQEyNFHh D8zS9RDG553oWezQ1nqzWiDC4CoA7z32tO7pCF6/bT/klQhF2UwhjzWZUXtVEs7QHaex64 ZV/N6/nPo9YiuJ/t2DPqIDrl3mn+fKMJaLkefCSL+r8+Wm8aFo8eXwLlUpYeuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fpx17GJzpFM; Wed, 27 Dec 2023 18:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBbao049250; Wed, 27 Dec 2023 18:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBb9c049247; Wed, 27 Dec 2023 18:11:37 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:37 GMT Message-Id: <202312271811.3BRIBb9c049247@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: dfbb6f2e5991 - main - ctl_frontend.h: Note that ctl_port.frontend is set by the FETD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: dfbb6f2e5991ecc3143d75f2358ec7f12f0656b1 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dfbb6f2e5991ecc3143d75f2358ec7f12f0656b1 commit dfbb6f2e5991ecc3143d75f2358ec7f12f0656b1 Author: John Baldwin AuthorDate: 2023-12-27 18:09:40 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:09:40 +0000 ctl_frontend.h: Note that ctl_port.frontend is set by the FETD Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42931 --- sys/cam/ctl/ctl_frontend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_frontend.h b/sys/cam/ctl/ctl_frontend.h index f04e0d564888..650ece567e46 100644 --- a/sys/cam/ctl/ctl_frontend.h +++ b/sys/cam/ctl/ctl_frontend.h @@ -213,7 +213,7 @@ struct ctl_wwpn_iid { */ struct ctl_port { struct ctl_softc *ctl_softc; - struct ctl_frontend *frontend; + struct ctl_frontend *frontend; /* passed to CTL */ ctl_port_type port_type; /* passed to CTL */ int num_requested_ctl_io; /* passed to CTL */ char *port_name; /* passed to CTL */ From nobody Wed Dec 27 18:11:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fpy4Xvfz5644Y; Wed, 27 Dec 2023 18:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fpy3Bt3z4F4r; Wed, 27 Dec 2023 18:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e4VuWGBg9emNHaQpkV9g7EZ0TNv4UHR/VO2/LEvyfVY=; b=DSMU6re/dMvqHf73iyHrcEIkuvWO3qtxeSlXwfvFqI8VkvLTfJQD+UFJGpV6HNnB5ARdso Lg+kKC4D8pTwWkWQ2k86MnRw9Yynr54JRERIp9P4k6uF5lPbnEjEANhCe2TGuET3d7uEmc u3LTl39DOa/KTjB42WHMGDwOiDGLepijreFC5Az5VDPDAy1GOVSAFvl2xe354yrZ71Jml2 z8yI+SRLqJ9aLDDFZG0+IAgwx5SXpjWSroBrIQWtIqQsxz6PYCwYtz4FVnFRS1k7XqIrRf YsHYPXglUn7WbACxfD/0EbvP6yKxXK3LzXzMGtjUyi/HRg6LaxGVFpTyLB1s7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700698; a=rsa-sha256; cv=none; b=yZp2wza8WadAmNRt1T1RqtaE+lqtz7BkU3WSJjFkE/2G8ojFqfHMc50F2ezk8be+qKMJpd ZOixylL+cceTZMz1f7i1eO3Csn+XM4iSwnGx5O0sW5fc3sVMT274qNAi69JR71v/0RHYwi OxPRe/8vpHC8d/3MI6RR1WV/NFG+emr7wkGkPG6PR17va5R/SU/sCKxw3lnbealKXBXSu1 W9kj9ySwd2fEyei7v7L/Usj07L1OSdmc+njVED9+h44ga/jPSY1m5eNfKTNVpuZI7GBfhW pXYOHq/XYDb9sagP1fkXDa9CG/VJHo5NkN6lgf+ZGbgV5KpXn2SOxklmkSzpzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e4VuWGBg9emNHaQpkV9g7EZ0TNv4UHR/VO2/LEvyfVY=; b=DxmYpqgOIsldp2o4Tujb7yat8SYP/67DYJy2ABeyYz8P2p1UTvOkuJxwn+1rl/VyRIisZ/ rWeW3+1hnX08xsQQNcvoCt3b2QEQi+sqvUCygwJUELMNryfF2bm6RHr+1ppDUQWTcMGRnQ QbGbmWxyDC5r1t23llwFgnYM3/fwgGcR0L0Qz0amD80jxqgkfnUvZ+JB7JmBUy5sBlIkqk 5eYbbQKw56PNEDkrJCPzeSsHF0m2RwovuIrz656yMEoBC/YIHkwBziYdTlit4nj1+WkdKs b2pQRj0vKR6ldF8UXalYJWTXzbN/SF6TGeDFQJnbmEMovs0NlErMgvXdIC4qyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fpy28KtzpYW; Wed, 27 Dec 2023 18:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBclm049302; Wed, 27 Dec 2023 18:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBcXs049299; Wed, 27 Dec 2023 18:11:38 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:38 GMT Message-Id: <202312271811.3BRIBcXs049299@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: 105eee97b025 - main - ctl: Add missing comma after CTL_FLAG_ALREADY_DONE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 105eee97b0253fe6b66bf4c33fe3c4e17f30f05f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=105eee97b0253fe6b66bf4c33fe3c4e17f30f05f commit 105eee97b0253fe6b66bf4c33fe3c4e17f30f05f Author: John Baldwin AuthorDate: 2023-12-27 18:09:52 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:09:52 +0000 ctl: Add missing comma after CTL_FLAG_ALREADY_DONE Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42930 --- sys/cam/ctl/ctl_io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h index 115e336bd354..aa7a9c35c876 100644 --- a/sys/cam/ctl/ctl_io.h +++ b/sys/cam/ctl/ctl_io.h @@ -106,7 +106,7 @@ typedef enum { CTL_FLAG_IO_CONT = 0x00100000, /* Continue I/O instead of completing */ #if 0 - CTL_FLAG_ALREADY_DONE = 0x00200000 /* I/O already completed */ + CTL_FLAG_ALREADY_DONE = 0x00200000, /* I/O already completed */ #endif CTL_FLAG_NO_DATAMOVE = 0x00400000, CTL_FLAG_DMA_QUEUED = 0x00800000, /* DMA queued but not started*/ From nobody Wed Dec 27 18:11:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fpz5rKYz564Fw; Wed, 27 Dec 2023 18:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fpz42pBz4F0m; Wed, 27 Dec 2023 18:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SHyeex/rm8v39xk+Y7Zs03TauNvBcz1L5tqkgSSaz6c=; b=rXUWlEgJzRKROKYyqDfYGYeh9P6NnJLB/zFmBOAYFbtHbPO2YniPZ/KrPRQI0561KD4kCS mJRP285L6zVBvDcqMBlrodyNcA5EcAgCzNBllltdfBV32HOPv0GPxlY+mxFHMoRYaiu4k0 Biik3oQbFOKkpen8e3S1ROo/U/pwLfqjyrOYxau1EmOT4gm1nNVQQk+bPuT6tm6YlvM9cy uz6uOgbaGwwiY9FDds6cbtK2kJXGrJuA2MsS+Dj4RR4lGmVnA/+LauokR00uUfNgehQWxQ wE29YVHSN9AX7o2K1NmTkz+SmwWJql2ulB9zcdwteJE4QddALC9coIgA4Kuy1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700699; a=rsa-sha256; cv=none; b=nnaTr5DxzB8ew6s1WsGy5G31wnCMBjBVWnDW75CH5jc3mXz+ZYkxIoAxgYROJsWkOvxcK6 Ihpu5anL4/qn8nW95iV7n19VbP+9K2hzlpp3i7Psel58mHIX4DNsF0ZOGnlOltRxNEqG03 WGUc3pULKoyc/hlY85lrqD4OvWHuK3coRu4kFYCz/KyTCC/G2jzzVjoNFcQ+FevZgZdKMW 37xZq7O3xKT+SSOKSdIF4BdE64iQTmvb9iY0HjdPE5vJeM+d+T3A0lC6EALxfvai5pEm3B 5gcsJyyvfZqiws6Skpb71P/tpaL60a8cMGBA+GP1kR0GZTmOqLK+C5P9xh6KzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SHyeex/rm8v39xk+Y7Zs03TauNvBcz1L5tqkgSSaz6c=; b=iu6AQBrON2b4gHsyrkCBDi+6VUYpjxKlgavLq/OyxP06hQrR5EoSzVJz4pUvyV7yPuLJnP CvHK0xgubtvsrYJbtXAhV4ZW5sN+P+ml8dShjwTbgecQdJ0EagGkwrGZuTphf+GT8W25Bg jqSYdWbGDjjnvhbvqMneIszDG29/ztswqn4a9G1qcB67x6ajH166b0KJ9hyrStueh+BDqF Z+hYoOCR5JI0hBZEXUi1cuees38xdinWoQl9aa8xfehKsQhjYvIr7xkFz5rV8cbbdsx0Pq oevDgeDt/Aby881HiAh3TYCxS3bZbDbiDTxKmLOymf30dwtiv1wCDYL1S96O+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fpz38tJzpLS; Wed, 27 Dec 2023 18:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBdp8049356; Wed, 27 Dec 2023 18:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBdHw049353; Wed, 27 Dec 2023 18:11:39 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:39 GMT Message-Id: <202312271811.3BRIBdHw049353@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: f12d378f4f3f - main - cltadm.8: Correct documentation of -r arg to port command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f12d378f4f3f3b06597d6f11eaf320d26d8318b2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f12d378f4f3f3b06597d6f11eaf320d26d8318b2 commit f12d378f4f3f3b06597d6f11eaf320d26d8318b2 Author: John Baldwin AuthorDate: 2023-12-27 18:10:05 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:10:27 +0000 cltadm.8: Correct documentation of -r arg to port command -r does not take a target port argument Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42932 --- usr.sbin/ctladm/ctladm.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index 66d0271403fb..ba2712cb278c 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -35,7 +35,7 @@ .\" .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" -.Dd March 9, 2021 +.Dd December 27, 2023 .Dt CTLADM 8 .Os .Sh NAME @@ -167,7 +167,7 @@ .Op Fl W Ar wwnn .Op Fl O Ar pp|vp .Op Fl p Ar targ_port -.Op Fl r Ar targ_port +.Op Fl r .Op Fl t Ar fe_type .Nm .Ic portlist From nobody Wed Dec 27 18:11:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fq1041Mz564LW; Wed, 27 Dec 2023 18:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fq056cxz4Dtp; Wed, 27 Dec 2023 18:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YcUWj2qMan5iw9tcicwNUyUrRWMYTecgx+3CA+QJViE=; b=uei/aBgWUcPiGeNvc9utjmtBTJI3UhQ4hOknbDITs9AmDoaBpUv0Yp+JlkGyH7htGkaGkE n19mbdPhzGG7LLF1sjedPkZY1UdK9g+32n4DXK3RQzLE64BKWoqnCrZsZsQej6fDe+DRUU gEHGp7lstuVNWW/bh/SOXoe61JF5mqjqxiAEQLefwulcNeeaSeZF4OFW8hyVP38lsxhyWG rsq8pyLgT3I+sKrsJmFLKdTUWJs++SZuH8G+Cl/5bix7DVyPt+dCmJlbZSQCyIq9LME8Ic 4mTch4CDGH0QREVog7Vtus01Vh7xKjIglWWiM/yozFJHI1KN68AAemvF5pniwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700700; a=rsa-sha256; cv=none; b=HmgcY0OcLTLesaRibClAe0NS+cwilvtBvMpJhAit+suYLFZt9jyBD8X8t9fd+WpYWmJmQi fGAif7avV0Cm9aMjDNQ4wDlAcq1Q1C8dmcQakicU5nZKAomiLLkZpzuKQg6ue1KYZqgj6+ 0NxJmN9srcC/c8U0/m4XaphsZclCRHz74wvavTRu6ljJzC2KTrf9pNGyJp+6NuEaxHXK3o BIIIu2uj0Tu3jIh63ca9/RTtd9viTMV11cxdyDFm5CeQDaBX84xA4KxTcwgg3At6gjNDIb HozvqT0BqIbp9z4C/wvBTwtxPYjKu4o7ym7SJRkUAU85w/m3zaIWcUiecVckOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YcUWj2qMan5iw9tcicwNUyUrRWMYTecgx+3CA+QJViE=; b=YVhiHy1aLlmgYfDiajn7jdpB7WsT+XVNgnoBf8ZEoU11gSSThez/3QPwfjh3FpuMVntu7F O9INRlBkG2iQsY8ooTvwvmtKZojCZn0Mk45GVAA5SOyOScEepRg7La1463jZ1npdFHau9h Uku/v0cMbWLUN3hLf4+aikovS+j15udVpT4E4Acvl7H03WIMND2uVMVViORMS9ejC61Fwi OkURUqXCT59Nnt5mEqZNp1exuIEH/PvkHQDgHRC419YUVBUB8RKTuHYPRX6HZwo+r747yI eQPNcCxCJyEqUvsqS+FcoVGMwfGKKgUgsF8Y6rWHUKFEkXpPR6rNRySmg5r2pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fq04C7szpJG; Wed, 27 Dec 2023 18:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBe6s049410; Wed, 27 Dec 2023 18:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBeHP049407; Wed, 27 Dec 2023 18:11:40 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:40 GMT Message-Id: <202312271811.3BRIBeHP049407@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: e8d83548349d - main - ctladm: Fix a typo and add a FALLTHROUGH annotation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e8d83548349d8cafadd1f95667fd8b055b228931 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d83548349d8cafadd1f95667fd8b055b228931 commit e8d83548349d8cafadd1f95667fd8b055b228931 Author: John Baldwin AuthorDate: 2023-12-27 18:10:42 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:10:42 +0000 ctladm: Fix a typo and add a FALLTHROUGH annotation Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42934 --- usr.sbin/ctladm/ctladm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index fd7fd2f57981..49938be9282a 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -573,10 +573,11 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) } case CCTL_PORT_MODE_REMOVE: if (targ_port == -1) { - warnx("%s: -r require -p", __func__); + warnx("%s: -r requires -p", __func__); retval = 1; goto bailout; } + /* FALLTHROUGH */ case CCTL_PORT_MODE_CREATE: { bzero(&req, sizeof(req)); strlcpy(req.driver, driver, sizeof(req.driver)); From nobody Wed Dec 27 18:11:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0fq21HFQz564Ct; Wed, 27 Dec 2023 18:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0fq16LHnz4FPS; Wed, 27 Dec 2023 18:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZnsUSYrBAyXo4/mwjphGEhE0xIetbd9gqcGr6EDRGw=; b=nLkSTwJRBbWQ0kpkaThyZBUCT+ndpESFndUgVcsAstb8zHwfpWAWU7OunEnJiM+03+5OM0 cgqwg8BxeXe8SfG1BAO8iuXtT9Q9J5ROtWt/qEl6DlXMJh7i6QrTet6ywrcjY76s6w7kRG tlWe2H5F8a4nQeuhrbQKx0vqdQHBKjppQfofhNzPrIdJKgDMiqaa8gwa83KhhWQtM3/v/B JGRGGYNHPBKmok8sJHg3Tcr+gAzkNnCVyaXYIlPrOE8JwtcnG0S7bOFsKfTvxwRjmpYmWx T8HI9vELtyqGGNCrpveAWZHCRbjF5peXgN0MNBtdBfdDQzH3a/hMVOnANz2Wcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700701; a=rsa-sha256; cv=none; b=xcjDfjhUWTMb8fwg9YQIL1/DAZYyrQmw7d+75sPVyREiAFaBzciJXaxBTmtXne6pTekQT6 nTlE0SlDZXR3FBcYB0je2xTuDuUYakhHNvAyqCQCOIyhW6LjRAj4LdCjb+CLIS8cesWLvV fPsnFM1Xwz8UY47DPpmzL8rYVJ0iRI/IEAI8dR9bCuHcNcm8aHp/yqzRm03VORWOaNPdwH WZSaNy+2xaOvQosqA+Ad/RtJQhi7wfCTseaLwV4zvCPN1bPRZsECJQ/ms6DSFdMPfIbwsN ZvvVB1Z5n3IvUQEfBy19+8xPh4TooB4ZPq+6tN+WRn2f8etMXWXdPokYQNEYJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZnsUSYrBAyXo4/mwjphGEhE0xIetbd9gqcGr6EDRGw=; b=Q1zMM0bE10hKxLY2kHCJt3PFkIBuA0eFVvCypYWRWmVh17pwt6u0OwCuzSq2CZgYR/rUqc xEbR/HZUXu3LTv+bUYHGw67YpfRuBPwiQTW/tgqluceiybn/IxP2PrP1X0QgzRcT4g24Dz cCOanawAAlb0p3oTTH2IbJ8+zByf+HoGBa1LUW15e0wyevvd2jod8My4kq2YeHsJWrqOFH dRL9W76x8rl3ZXyb6qwECTUYdX0cUKORqsLY/a4ZDWUsR4qSyocDiwOsR1wWIKJPMwBxUy Z9wHMxH0wZbpEpJU4gglhDInNMJrnknIqOyCzfTPkF0QgkMNLiefI1hDNzqoRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0fq15DyyzpJH; Wed, 27 Dec 2023 18:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBfpn049458; Wed, 27 Dec 2023 18:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBfEB049455; Wed, 27 Dec 2023 18:11:41 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:41 GMT Message-Id: <202312271811.3BRIBfEB049455@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: 0f3210b3a7fa - main - ctladm: Only autoload cfiscsi.ko for iSCSI-specific commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0f3210b3a7fac2cb247986dae4d68040222cdb33 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f3210b3a7fac2cb247986dae4d68040222cdb33 commit 0f3210b3a7fac2cb247986dae4d68040222cdb33 Author: John Baldwin AuthorDate: 2023-12-27 18:11:19 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:11:19 +0000 ctladm: Only autoload cfiscsi.ko for iSCSI-specific commands Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42935 --- usr.sbin/ctladm/ctladm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 49938be9282a..9d2f14de28ed 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -4144,10 +4144,16 @@ main(int argc, char **argv) goto bailout; } #ifdef WANT_ISCSI - else { + switch (command) { + case CTLADM_CMD_ISLIST: + case CTLADM_CMD_ISLOGOUT: + case CTLADM_CMD_ISTERMINATE: if (modfind("cfiscsi") == -1 && kldload("cfiscsi") == -1) warn("couldn't load cfiscsi"); + break; + default: + break; } #endif } else if ((command != CTLADM_CMD_HELP) From nobody Wed Dec 27 18:52:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0gk42MVxz567LR; Wed, 27 Dec 2023 18:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0gk412m0z4Kxr; Wed, 27 Dec 2023 18:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703703148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moqFindge+wRWORPKN0bLOkbu0+899vK1xmYYKVPR8g=; b=U6Rj9JZccCUFka4sFlU3EwXM9SVBYSzLUYN/AJKvSHa5H/0FHRA+BI/zCArENxXtPO28Mc DEtpgcZTT7x2lBkaRqPPuXRKsC4Mz6XtegNtK+O1ol41tCXuzSdfrLiBODhF6kihQS+0mp fOko/kh0wP+3SQRDip5y20HH+Vg6suMT1hI/nHQALY9zIhFIEWIVvDYYgfAaEcmryMytgM BBCGnDuBduF1I4OBt8/K7Y+7cvBwu1/zDwsBqfZzee181SH4euPXC0uY45bDm/R9TI4WCa 2LMTxPiNFUd32jSzfVsNnY7GXrUj1PFEPdw15s8UsBdcEjWsIq6gxs+vEJEMpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703703148; a=rsa-sha256; cv=none; b=LyjLwrcCxMXTW6/XZ68yBVG/kEHtyDhYwhLrWYsAu00dOuJgL+rUh9l4hA0PWxfbRVnEm/ Mr+JMYlJekGjNNyO/9ALpxf5waWBggKavrkpADGWmq6JV2Jj4HFPHo9eOYsznSHSRcmJj0 tiZMr6yRR5i5U+OxQh/XXbSXguNAdlqEdnt3dMstOW0ObttMtODZy7Xi3cqVUL8cHYW2Ym NvPh+OmNq0HGXc+zJlaz7uoqkdUsrpNhoN+D3lZUX/8BfsryQ9atRzXXIZSZW2L6mr7CbU 1HFq/KOQ4xC+i5+MIs8STlo/1x0tsnYjKch4QzE4lhYoCCc/FhrcUDQ0u+wvXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703703148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moqFindge+wRWORPKN0bLOkbu0+899vK1xmYYKVPR8g=; b=TUGFFhFTIK6PNhtyeOWsSX+U21f2PXjf42LDXQ4alYr66qfsWKixldOvnkeBrfJTxwHUbA Szh1At+sMfNEe8D+K8NZpeiOHOWXj0sxWd+wgQtw4pIv4b4Lp5yKv6Fj+q89OQQhb+CLGJ fzFdmWN52acTYs3JbIWprK7PJQMNvLR4G6ZGVj8b2ixuQAnm8FAw28pSM+ZME4mbrJjnjC sKaj4JXke/BrIcPQHg8EgdniElfqwt681LTPE50ls68aB0x2+B1dHehCZJO+xOLGigLsuI b2ud4xBw8xHB4yOiyLOgrVT73ICXN+4BnDXdULIBCkAmrjYHQHs8kXo2P+SD/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 4T0gk4069zzq5B; Wed, 27 Dec 2023 18:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIqRmC016559; Wed, 27 Dec 2023 18:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIqRWT016556; Wed, 27 Dec 2023 18:52:27 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:52:27 GMT Message-Id: <202312271852.3BRIqRWT016556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: b46c7b1ed4e5 - main - nvme: Add some bits from NVMe 2.0c spec. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b46c7b1ed4e5307c689df72ea8a0b69e02456905 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b46c7b1ed4e5307c689df72ea8a0b69e02456905 commit b46c7b1ed4e5307c689df72ea8a0b69e02456905 Author: Alexander Motin AuthorDate: 2023-12-27 18:50:54 +0000 Commit: Alexander Motin CommitDate: 2023-12-27 18:50:54 +0000 nvme: Add some bits from NVMe 2.0c spec. MFC after: 1 week --- sys/dev/nvme/nvme.h | 26 +++++++++++++++++++++++++- sys/dev/nvme/nvme_ctrlr.c | 8 ++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index e9b1b32c3777..3e39803f68ab 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -91,6 +91,8 @@ #define NVME_CAP_HI_REG_CSS_NVM_MASK (0x1) #define NVME_CAP_HI_REG_BPS_SHIFT (13) #define NVME_CAP_HI_REG_BPS_MASK (0x1) +#define NVME_CAP_HI_REG_CPS_SHIFT (14) +#define NVME_CAP_HI_REG_CPS_MASK (0x3) #define NVME_CAP_HI_REG_MPSMIN_SHIFT (16) #define NVME_CAP_HI_REG_MPSMIN_MASK (0xF) #define NVME_CAP_HI_REG_MPSMAX_SHIFT (20) @@ -99,6 +101,12 @@ #define NVME_CAP_HI_REG_PMRS_MASK (0x1) #define NVME_CAP_HI_REG_CMBS_SHIFT (25) #define NVME_CAP_HI_REG_CMBS_MASK (0x1) +#define NVME_CAP_HI_REG_NSSS_SHIFT (26) +#define NVME_CAP_HI_REG_NSSS_MASK (0x1) +#define NVME_CAP_HI_REG_CRWMS_SHIFT (27) +#define NVME_CAP_HI_REG_CRWMS_MASK (0x1) +#define NVME_CAP_HI_REG_CRIMS_SHIFT (28) +#define NVME_CAP_HI_REG_CRIMS_MASK (0x1) #define NVME_CAP_HI_DSTRD(x) \ (((x) >> NVME_CAP_HI_REG_DSTRD_SHIFT) & NVME_CAP_HI_REG_DSTRD_MASK) #define NVME_CAP_HI_NSSRS(x) \ @@ -109,6 +117,8 @@ (((x) >> NVME_CAP_HI_REG_CSS_NVM_SHIFT) & NVME_CAP_HI_REG_CSS_NVM_MASK) #define NVME_CAP_HI_BPS(x) \ (((x) >> NVME_CAP_HI_REG_BPS_SHIFT) & NVME_CAP_HI_REG_BPS_MASK) +#define NVME_CAP_HI_CPS(x) \ + (((x) >> NVME_CAP_HI_REG_CPS_SHIFT) & NVME_CAP_HI_REG_CPS_MASK) #define NVME_CAP_HI_MPSMIN(x) \ (((x) >> NVME_CAP_HI_REG_MPSMIN_SHIFT) & NVME_CAP_HI_REG_MPSMIN_MASK) #define NVME_CAP_HI_MPSMAX(x) \ @@ -117,6 +127,12 @@ (((x) >> NVME_CAP_HI_REG_PMRS_SHIFT) & NVME_CAP_HI_REG_PMRS_MASK) #define NVME_CAP_HI_CMBS(x) \ (((x) >> NVME_CAP_HI_REG_CMBS_SHIFT) & NVME_CAP_HI_REG_CMBS_MASK) +#define NVME_CAP_HI_NSSS(x) \ + (((x) >> NVME_CAP_HI_REG_NSSS_SHIFT) & NVME_CAP_HI_REG_NSSS_MASK) +#define NVME_CAP_HI_CRWMS(x) \ + (((x) >> NVME_CAP_HI_REG_CRWMS_SHIFT) & NVME_CAP_HI_REG_CRWMS_MASK) +#define NVME_CAP_HI_CRIMS(x) \ + (((x) >> NVME_CAP_HI_REG_CRIMS_SHIFT) & NVME_CAP_HI_REG_CRIMS_MASK) #define NVME_CC_REG_EN_SHIFT (0) #define NVME_CC_REG_EN_MASK (0x1) @@ -132,6 +148,8 @@ #define NVME_CC_REG_IOSQES_MASK (0xF) #define NVME_CC_REG_IOCQES_SHIFT (20) #define NVME_CC_REG_IOCQES_MASK (0xF) +#define NVME_CC_REG_CRIME_SHIFT (24) +#define NVME_CC_REG_CRIME_MASK (0x1) #define NVME_CSTS_REG_RDY_SHIFT (0) #define NVME_CSTS_REG_RDY_MASK (0x1) @@ -143,6 +161,8 @@ #define NVME_CSTS_REG_NVSRO_MASK (0x1) #define NVME_CSTS_REG_PP_SHIFT (5) #define NVME_CSTS_REG_PP_MASK (0x1) +#define NVME_CSTS_REG_ST_SHIFT (6) +#define NVME_CSTS_REG_ST_MASK (0x1) #define NVME_CSTS_GET_SHST(csts) (((csts) >> NVME_CSTS_REG_SHST_SHIFT) & NVME_CSTS_REG_SHST_MASK) @@ -616,7 +636,11 @@ struct nvme_registers { uint64_t bpmbl; /* Boot Partition Memory Buffer Location */ uint64_t cmbmsc; /* Controller Memory Buffer Memory Space Control */ uint32_t cmbsts; /* Controller Memory Buffer Status */ - uint8_t reserved3[3492]; /* 5Ch - DFFh */ + uint32_t cmbebs; /* Controller Memory Buffer Elasticity Buffer Size */ + uint32_t cmbswtp;/* Controller Memory Buffer Sustained Write Throughput */ + uint32_t nssd; /* NVM Subsystem Shutdown */ + uint32_t crto; /* Controller Ready Timeouts */ + uint8_t reserved3[3476]; /* 6Ch - DFFh */ uint32_t pmrcap; /* Persistent Memory Capabilities */ uint32_t pmrctl; /* Persistent Memory Region Control */ uint32_t pmrsts; /* Persistent Memory Region Status */ diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 771e5cd1251b..845beec9f592 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1369,15 +1369,19 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) ctrlr->cap_hi = cap_hi = nvme_mmio_read_4(ctrlr, cap_hi); if (bootverbose) { device_printf(dev, "CapHi: 0x%08x: DSTRD %u%s, CSS %x%s, " - "MPSMIN %u, MPSMAX %u%s%s\n", cap_hi, + "CPS %x, MPSMIN %u, MPSMAX %u%s%s%s%s%s\n", cap_hi, NVME_CAP_HI_DSTRD(cap_hi), NVME_CAP_HI_NSSRS(cap_hi) ? ", NSSRS" : "", NVME_CAP_HI_CSS(cap_hi), NVME_CAP_HI_BPS(cap_hi) ? ", BPS" : "", + NVME_CAP_HI_CPS(cap_hi), NVME_CAP_HI_MPSMIN(cap_hi), NVME_CAP_HI_MPSMAX(cap_hi), NVME_CAP_HI_PMRS(cap_hi) ? ", PMRS" : "", - NVME_CAP_HI_CMBS(cap_hi) ? ", CMBS" : ""); + NVME_CAP_HI_CMBS(cap_hi) ? ", CMBS" : "", + NVME_CAP_HI_NSSS(cap_hi) ? ", NSSS" : "", + NVME_CAP_HI_CRWMS(cap_hi) ? ", CRWMS" : "", + NVME_CAP_HI_CRIMS(cap_hi) ? ", CRIMS" : ""); } if (bootverbose) { vs = nvme_mmio_read_4(ctrlr, vs); From nobody Wed Dec 27 21:15:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0ktg2z0Wz54MTB; Wed, 27 Dec 2023 21:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0ktg2J7Bz4bB7; Wed, 27 Dec 2023 21:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703711707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8Zo2E8/kL4/SG6V28nLyWDFYYBv9nnNlZ42MH4Qyfc=; b=RTsfBESqiTqWtBEyvICKaiKEma4/KQq7g4HsFZldptcUz2w6gk7TbIJWYldUJZ6/IWFyB+ 3nihkfDC8lpepW2517M2OoVTvjXXDKSx9gMvvbK5tigexcp9GSi2qwsA/MrlCxLwFhE9pY KAukVwl+TWTBP/tsgOaSJjIRSwakWSXhz39wOvyR7ZT1Eg0DvMKUdozeQk5+r3LOuUialu keK+7teQEz3uZOJberj8uTeQBLL1edSuld+7xlv/Uzj+OhgjrMK8T1yLQ+n4/cILIuHUlM nsmlg9QThUFSQmdjIBtOEkC4BCDy3Ujm5k/tqW484+Zr8DJyfMlTcBzGoHVL0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703711707; a=rsa-sha256; cv=none; b=kI0ZTggQgiYxzMpe+G72VAb4fxo21o1304XpI1AEQD4KMvif6JZzV0ovi20jOLQ/04mgs0 2JOOo/LXqQTV/y5NWgC2hSw6ndVFAZLXELYhsfTF/a1CT1HNzVItPvw8LGe4+Mp8Zal1ZW eIqX8M3mZvv5Ow5hWB+L9WeQUHuu7CemcT1FDO1FB1y2MaXoSQa0cTRcmEtIM67J+Omk4M PgRmIp3LMUmVdkQT6LnwgHOhzx7/ddz77HJzxxwb1iuqcau9V33pcc1QH+89ZzXf4i1xXH IeDK/HzN3L/d0o+SxNhHWtgEx5sjCKgUmwb6W02W66ZVcyaxETEaR3GpMZaJCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703711707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8Zo2E8/kL4/SG6V28nLyWDFYYBv9nnNlZ42MH4Qyfc=; b=AmMOqRD2xqNO99/dlwJkwWhou8PGboCG+5pX+XKEmyoX7jTow/S5MXbj+PWCs71AWxmVP/ 3iWHqh/zqqUfCRCXPLfE5jurfgkgzUEnTQkwaQkpr6K3Vm1cjO9NsUIoRLNrW0PaxssmaC ee5TO2pmpZUK//XRBau1PGPqz0gTRxbvQQ5PhwMeNIXWQQKefcaA0WMHS6qdS8wVPzmHlN yao2KB5ZoHUYzRJBJRfp+v7mL2Xz/mhvPSaifN3M4NFIf4g5MHbJCm7ce1YNy0yI3X+IS2 kMf8nPnCpmDzVXLaDgueNxEgTqm/rOlGf27RweBPSVMLBEnsPjXCeSwFUKsxaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0ktg1M1lzv8t; Wed, 27 Dec 2023 21:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRLF7Sq052740; Wed, 27 Dec 2023 21:15:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRLF7wB052737; Wed, 27 Dec 2023 21:15:07 GMT (envelope-from git) Date: Wed, 27 Dec 2023 21:15:07 GMT Message-Id: <202312272115.3BRLF7wB052737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 61e2161367bb - main - x86: Adjust base addr for PCI MCFG regions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61e2161367bb4e68e603f53b1107f9427f988861 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=61e2161367bb4e68e603f53b1107f9427f988861 commit 61e2161367bb4e68e603f53b1107f9427f988861 Author: Colin Percival AuthorDate: 2023-12-27 08:09:08 +0000 Commit: Colin Percival CommitDate: 2023-12-27 21:14:47 +0000 x86: Adjust base addr for PCI MCFG regions Each bus gets 1 MB of address space; the actual base address for an MCFG bus range is the address from the table plus the starting bus number times 1 MB. The PCI spec is unclear on this point, but this change matches what Linux does, which is likely enough of a de facto standard regardless of what any de jure standard might attempt to say. Fixes: f54a3890b1f4 ("x86: Support multiple PCI MCFG regions") Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D43206 --- sys/amd64/pci/pci_cfgreg.c | 2 +- sys/i386/pci/pci_cfgreg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 21e8d9c21228..90e15b15553d 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -296,7 +296,7 @@ pcie_cfgregopen(uint64_t base, uint16_t domain, uint8_t minbus, uint8_t maxbus) region = &mcfg_regions[mcfg_numregions]; /* XXX: We should make sure this really fits into the direct map. */ - region->base = pmap_mapdev_pciecfg(base, (maxbus + 1 - minbus) << 20); + region->base = pmap_mapdev_pciecfg(base + (minbus << 20), (maxbus + 1 - minbus) << 20); region->domain = domain; region->minbus = minbus; region->maxbus = maxbus; diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index b2cd23687ccc..bb6258ccf214 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -574,7 +574,7 @@ pcie_cfgregopen(uint64_t base, uint16_t domain, uint8_t minbus, uint8_t maxbus) sizeof(*mcfg_regions) * (mcfg_numregions + 1), M_DEVBUF, M_WAITOK); region = &mcfg_regions[mcfg_numregions]; - region->base = base; + region->base = base + (minbus << 20); region->domain = domain; region->minbus = minbus; region->maxbus = maxbus; From nobody Wed Dec 27 23:01:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0nFJ0ZxSz54Yhc; Wed, 27 Dec 2023 23:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0nFJ060wz4nwT; Wed, 27 Dec 2023 23:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703718084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6LJu9d7t3KYXeanv/bc4fYh4+xly7fXMXnN+n4Kbd90=; b=hZ8djU8c+fvO0Dq1+aKqjrJQ+carMcsCV8Iqkuuxgfplj1olDQHBf6hOQWSlXGCRkGA/Rq XrDUur5++LF9p3PEBXlrif6hvq7pqf3J+MkHuMdHjN996uBALoJ3ar9J7sSIaD45X11c44 md1TmDSf0Bo2g/DBShZKlELdNHt5u5vcB0kcowSvEAtT5PPbUjGqNJQtZQ5TROlUv2Oisy M6QFn7lIAob1JywAZMVQ08m1JKA8PekUvFL8bDbvwafnrBz2bIqPZAJOvkkBHKvh3c9Nd/ pXtY9CKZRWlm7h0YprHUp8d6JWHGK7YXY0K7H2FMZ/KoeYmOzAxQl6P3YzSsSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703718084; a=rsa-sha256; cv=none; b=bTrd+L/WYoklCW2jtOFzJKXWM2Nzhr8KljkRW9+tDY+iK37iiyBFyyE18bwCrZBYvKmHlJ dVVQCUDtD+wPG68v21XhkF+2bRo3StkOrMTJ/MfuJiUwFqqiK7+y5YXjT53NdvBFWyrxgp VYm8ZVH9Qq8Ap7lPFrxSM2rBWVuL/Uzrcg/SusYbHDHPtnm4FnHbmf1GuTTqtgqCFNzYFj GUEKoyYGxAUaoVOs+5MgF/gUgkK3rUM443mMRQTZ98zxPUlB+fwkn0u9Tb/LC+/puuWEn/ GQsudf3Haj1iMlNvz5f+YCQN4Uhr3iqpRtOQFQMN1NhWVIrC1osy3DbxaFD7ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703718084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6LJu9d7t3KYXeanv/bc4fYh4+xly7fXMXnN+n4Kbd90=; b=vBj5uTlWUUYgygAeDGWp1/+/72JZxOXHrsLpLvDSB4uLalqUHhCgOGgKmIhqScpW/N9O7i 4r6iHsE9rJkWfdwsTsXbbvcWfhP0OxkxCaWfIGATF2R/jYIssrynhx97JXmGJqLZuzp0N9 wuN14+5NBh8gSjEM7RztjGwkqMRU9jE/JfnEqJs2+VWOCUht9X+oKySxBvOrCKtzl5/Cxb GoIDjS6eTE7ks7d2daFD4tlgUjFr8dMhEqM0TfKJ16te9IbgyAIzN9m0ewBAeTZaSmuyRY wf+YeQ6hZZHs1HzACg1njweWat5h2+r2bZohESCCSXmVlyZLPEb9nW7flWz3hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0nFH6HCYzxQy; Wed, 27 Dec 2023 23:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRN1NL8033963; Wed, 27 Dec 2023 23:01:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRN1ND9033957; Wed, 27 Dec 2023 23:01:23 GMT (envelope-from git) Date: Wed, 27 Dec 2023 23:01:23 GMT Message-Id: <202312272301.3BRN1ND9033957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b356da806b52 - main - zfs: merge openzfs/zfs@233d34e47 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b356da806b5207833324a7cdd863adc72189fa58 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b356da806b5207833324a7cdd863adc72189fa58 commit b356da806b5207833324a7cdd863adc72189fa58 Merge: 61e2161367bb 07e95b4670dc Author: Martin Matuska AuthorDate: 2023-12-27 21:51:21 +0000 Commit: Martin Matuska CommitDate: 2023-12-27 21:51:21 +0000 zfs: merge openzfs/zfs@233d34e47 Notable upstream pull request merges: #15635 eff77a802 ZIL: Improve next log block size prediction #15675 6930ecbb7 spa: make read/write queues configurable #15677 5a4915660 Don't panic on unencrypted block in encrypted dataset #15716 07e95b467 Fix the FreeBSD userspace build Obtained from: OpenZFS OpenZFS commit: 233d34e47ef88ee9e9a1e1ad02384f2063cd039b .../openzfs/cmd/zpool/os/freebsd/zpool_vdev_os.c | 21 ++ .../openzfs/cmd/zpool/os/linux/zpool_vdev_os.c | 255 +++++++++++++++++ sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 4 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 239 ++++++++++++++-- sys/contrib/openzfs/cmd/zpool/zpool_util.h | 3 + sys/contrib/openzfs/config/kernel-current-time.m4 | 5 +- sys/contrib/openzfs/config/kernel-inode-times.m4 | 78 +++++ sys/contrib/openzfs/config/kernel-shrink.m4 | 87 +++++- sys/contrib/openzfs/include/libzfs.h | 3 + sys/contrib/openzfs/include/libzutil.h | 57 ++++ .../openzfs/include/os/freebsd/spl/sys/mod_os.h | 6 + .../openzfs/include/os/linux/spl/sys/shrinker.h | 66 ++--- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 20 ++ sys/contrib/openzfs/include/sys/zil_impl.h | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 97 +++++-- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 49 +++- .../lib/libzutil/os/freebsd/zutil_import_os.c | 8 + .../lib/libzutil/os/linux/zutil_import_os.c | 40 ++- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 98 +++++++ sys/contrib/openzfs/lib/libzutil/zutil_pool.c | 31 ++ sys/contrib/openzfs/man/man4/zfs.4 | 10 + sys/contrib/openzfs/man/man8/zpool-clear.8 | 11 + sys/contrib/openzfs/man/man8/zpool-offline.8 | 18 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 2 + sys/contrib/openzfs/man/man8/zpool.8 | 19 +- sys/contrib/openzfs/module/Kbuild.in | 1 + .../openzfs/module/os/linux/spl/spl-shrinker.c | 115 ++++++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 11 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 18 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 4 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 10 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 33 ++- .../openzfs/module/os/linux/zfs/zfs_znode.c | 45 +-- .../openzfs/module/os/linux/zfs/zpl_inode.c | 3 +- sys/contrib/openzfs/module/zfs/dbuf.c | 2 - sys/contrib/openzfs/module/zfs/dmu_send.c | 2 - sys/contrib/openzfs/module/zfs/spa.c | 297 ++++++++++++++++++- sys/contrib/openzfs/module/zfs/zil.c | 267 ++++++++++++----- sys/contrib/openzfs/tests/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/bclone.run | 46 +++ sys/contrib/openzfs/tests/runfiles/common.run | 18 ++ .../openzfs/tests/test-runner/bin/zts-report.py.in | 73 +++-- .../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 +- .../openzfs/tests/zfs-tests/cmd/clonefile.c | 80 ++++-- .../openzfs/tests/zfs-tests/include/commands.cfg | 3 +- .../openzfs/tests/zfs-tests/include/math.shlib | 13 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 21 ++ .../tests/zfs-tests/tests/functional/bclone/TODO | 4 + .../zfs-tests/tests/functional/bclone/bclone.cfg | 32 +++ .../tests/functional/bclone/bclone_common.kshlib | 280 ++++++++++++++++++ .../functional/bclone/bclone_corner_cases.kshlib | 315 +++++++++++++++++++++ .../bclone/bclone_crossfs_corner_cases.ksh | 45 +++ .../bclone/bclone_crossfs_corner_cases_limited.ksh | 45 +++ .../functional/bclone/bclone_crossfs_data.ksh | 46 +++ .../functional/bclone/bclone_crossfs_embedded.ksh | 50 ++++ .../functional/bclone/bclone_crossfs_hole.ksh | 45 +++ .../functional/bclone/bclone_diffprops_all.ksh | 86 ++++++ .../bclone/bclone_diffprops_checksum.ksh | 62 ++++ .../bclone/bclone_diffprops_compress.ksh | 59 ++++ .../functional/bclone/bclone_diffprops_copies.ksh | 59 ++++ .../bclone/bclone_diffprops_recordsize.ksh | 65 +++++ .../tests/functional/bclone/bclone_prop_sync.ksh | 66 +++++ .../bclone/bclone_samefs_corner_cases.ksh | 42 +++ .../bclone/bclone_samefs_corner_cases_limited.ksh | 42 +++ .../tests/functional/bclone/bclone_samefs_data.ksh | 44 +++ .../functional/bclone/bclone_samefs_embedded.ksh | 48 ++++ .../tests/functional/bclone/bclone_samefs_hole.ksh | 44 +++ .../zfs-tests/tests/functional/bclone/cleanup.ksh | 37 +++ .../zfs-tests/tests/functional/bclone/setup.ksh | 45 +++ .../tests/functional/redundancy/redundancy.kshlib | 22 -- 70 files changed, 3565 insertions(+), 318 deletions(-) diff --cc sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.c index 000000000000,d5c8da471cbb..d5c8da471cbb mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.c +++ b/sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.c diff --cc sys/contrib/openzfs/tests/runfiles/bclone.run index 000000000000,3d0f545d9226..3d0f545d9226 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/runfiles/bclone.run +++ b/sys/contrib/openzfs/tests/runfiles/bclone.run diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/TODO index 000000000000,7cd4ee898fc4..7cd4ee898fc4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/TODO +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/TODO diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone.cfg index 000000000000,f72d17c1beca..f72d17c1beca mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone.cfg +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone.cfg diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_common.kshlib index 000000000000,beba01c0ed26..beba01c0ed26 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_common.kshlib +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_common.kshlib diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_corner_cases.kshlib index 000000000000,ddfbfc999c4e..ddfbfc999c4e mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_corner_cases.kshlib +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_corner_cases.kshlib diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases.ksh index 000000000000,35188cddb063..35188cddb063 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases_limited.ksh index 000000000000,1fc1bbd07fd9..1fc1bbd07fd9 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases_limited.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases_limited.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_data.ksh index 000000000000,e2fe25d451dd..e2fe25d451dd mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_data.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_data.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_embedded.ksh index 000000000000,6a6fe1d309a9..6a6fe1d309a9 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_embedded.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_embedded.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_hole.ksh index 000000000000,d4c33d6da30f..d4c33d6da30f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_hole.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_crossfs_hole.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_all.ksh index 000000000000,a5e7282fe6a8..a5e7282fe6a8 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_all.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_all.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_checksum.ksh index 000000000000,7e064a0dfd73..7e064a0dfd73 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_checksum.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_checksum.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_compress.ksh index 000000000000,e1d6e5949218..e1d6e5949218 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_compress.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_compress.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_copies.ksh index 000000000000,ac823e1ec394..ac823e1ec394 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_copies.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_copies.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_recordsize.ksh index 000000000000,d833e6123106..d833e6123106 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_recordsize.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_diffprops_recordsize.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_prop_sync.ksh index 000000000000,f8aa1c875c60..f8aa1c875c60 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_prop_sync.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_prop_sync.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases.ksh index 000000000000,4aa2914da299..4aa2914da299 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases_limited.ksh index 000000000000,b4737700eb7d..b4737700eb7d mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases_limited.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases_limited.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_data.ksh index 000000000000,e964f7bbf641..e964f7bbf641 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_data.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_data.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_embedded.ksh index 000000000000,df393a878015..df393a878015 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_embedded.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_embedded.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_hole.ksh index 000000000000,3c6e345e6e64..3c6e345e6e64 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_hole.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/bclone_samefs_hole.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/cleanup.ksh index 000000000000,df6d9c08fece..df6d9c08fece mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/setup.ksh index 000000000000,c68719ee72a2..c68719ee72a2 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/bclone/setup.ksh From nobody Wed Dec 27 23:34:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0nzx4SRRz54cSs; Wed, 27 Dec 2023 23:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0nzx3dLnz4rf2; Wed, 27 Dec 2023 23:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703720093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPYyRSkvDq/QgftFR4ZNY47ZdfcqMl2rVvrxGGFyza0=; b=xZvCraKs7bU/O6N+m5adaOFj2MMOXRAj9NCcyGoUd6Hzu3wDbjqUDQXvthcOSim6EEgMQP huPDLBqc2n/iYeKEd+nx7XOR5Ty6tBlWkRfDFap7SvEjw5M+qNQrLYE4JOebymKMiwKakf scFyalGKsS7lHwoLGSgQYw4rUdD/v1vQKhv5goOHbbVN4UfC1NvnCGZX6o7ehGAz6EYkVe MblGqbaMPS9JGg8drrtXRdD13NqUxXtbBOnkFWWFuOGzXKfc14xdSkBC86kknveZgdmp5M qlKVXI9ThbKJPH+Yu8ms+cy32hdi8K4X1PrOmqZ7PGwPAEzm+c+1YesdFbsULw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703720093; a=rsa-sha256; cv=none; b=r3Ehd+x6TgUP1gyUnEYrdx39qzYIXXMESMPngvJFyRffQMlhDkgtn35C9rtC/Yk7giB7dh C6N90G2cYdKnY+ydajJBVULIRzidpihQo5swI9of9nVQvPGK2bHyfmfjw0kJuMREafV6ye 8+qlJaDSf9UosTa3Ttu41OGyMcteff3JeqByFmHwL07tpAlv+nFhX4RAGmfoQcD4N9nbmj EVjkMNWDDofWPBW7pt6kY1xdtizJGA6FevaBcj7vavHR7CBNb9ozsbZCxwXus0maVd9Y8Z gupWzZbJ5UD283CuCdPqeDUaQ9FvKt03r7x7ZfcNC62jbovxpB7S9uF/owCJ1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703720093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPYyRSkvDq/QgftFR4ZNY47ZdfcqMl2rVvrxGGFyza0=; b=Xv860md6dZqLKiC99O96HqorDhfRRh5wnenSNCJJx5cOpqBscMNgbemEpcNzm6kE0Klszt /lQIaG9IViAPde5wUOTgz5lTvGduKfsTJaSUKt2NhfV+hq/rkve9V+SoEzs4sarachYyfR DCwqH70T/YFSnhhLpmITnZOghtiEl715vGXjPKYaRwmcjU2UdvT1/rItW9myW/lt3UU9MO ldPHGh91GDgOdkwGmk1KKe/6k3vqFQoHxIUlE3pz8B3W4fBtL2qumya3OabVuA5nCETcpz xmcFHIiiaRC12NIXVYZ0hILbnDO8X/Q8Je0Ht7qZy9Hof/pxh9k1TnkPPAvJpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0nzx2bTdzy70; Wed, 27 Dec 2023 23:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRNYril088462; Wed, 27 Dec 2023 23:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRNYr3w088459; Wed, 27 Dec 2023 23:34:53 GMT (envelope-from git) Date: Wed, 27 Dec 2023 23:34:53 GMT Message-Id: <202312272334.3BRNYr3w088459@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: b9f4462063d3 - main - rc(8): angle brackets to avoid link breakage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b9f4462063d3ab35fa63ec8335de966c77362437 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f4462063d3ab35fa63ec8335de966c77362437 commit b9f4462063d3ab35fa63ec8335de966c77362437 Author: Graham Perrin AuthorDate: 2023-12-27 23:26:46 +0000 Commit: Warner Losh CommitDate: 2023-12-27 23:33:17 +0000 rc(8): angle brackets to avoid link breakage Double-quotes are not suitably effective. Instead, use angle brackets. Whilst here: - remove superfluous quotation marks from the %T title. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/811 --- share/man/man8/rc.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index dec80b089ef1..e656a4d5ebc5 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 1, 2023 +.Dd December 27,2023 .Dt RC 8 .Os .Sh NAME @@ -582,8 +582,8 @@ is unnecessary, but is often included. .Xr sysrc 8 .Pp .Rs -.%T "Practical rc.d scripting in BSD" -.%U "https://docs.freebsd.org/en/articles/rc-scripting/" +.%T Practical rc.d scripting in BSD +.%U .Re .Sh HISTORY The From nobody Wed Dec 27 23:43:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0pB50ZZmz54dQJ; Wed, 27 Dec 2023 23:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0pB45YCZz4s7P; Wed, 27 Dec 2023 23:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703720620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YlOZGktXfKd6nZe6IN4KFTiD2M6YIi1aeqsOGJYd70=; b=eSoZWT8dRWxfNMWfQr89RKCX6wuqNIBcE3DqTGJO2gJFawy947nMkzZKjQmGJbeSvtATKI pA8MAeIZz8Exa7mMPl5PdsyC2+Ef0UBajXrcn1aKildKjuWeBLoLVWQegMmiCeu7cQyVaD JRxdgwphT2c86cVEeVutpe/+F21i+/iRmFsutJ5DB8Oqqwx5/snj++lOxCikzUp78UoBcz heVUIzNFYTylHKT68DhCqui5VmQ5Qwj9EPSy9MIU/OF2pkEki6RXqesivIAFakqRqrNUvu Tnrza2FUWXxI2K9nCBgPekxLXmm3VwgZPB6icnSEa//kl0m7XkBnIF6z/+RaIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703720620; a=rsa-sha256; cv=none; b=d3mxk3eIulKvnz0C2fVclgxRtUHBMBTWAMdaF6v+S7NCC4l4bL/Y65BDqrHplD7CoPwdtT Mb6ATSvqfMsBgGJO4I96RrzxzCV4SJikeAb7cU0UdhriFcih6pCc82dkhyaXOIBvqHtIY2 0O7sQyCce67eUTOqC2//aPm5hJkBbAgReFUTEiJFhxeHcNHOrvBCpvthdOwgqe0mUysu0J /Sa/pA7Ibf3NzTyV8qk6sn+VrExSOn7JD3U9cUcnwWNKzS91yujz/Jb1QQFYGo01/wy9Ew kVB5Y3C7fJPUNOb+63P0teQKqYmo+eeTknqmLhkHcwO7cw+8SJtyLAVGdgQRZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703720620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YlOZGktXfKd6nZe6IN4KFTiD2M6YIi1aeqsOGJYd70=; b=Hdgxh0rXU9gjJljxaHvsuTOf754rgnrLOYioo5gWNKtLjntoKSPKg/z5VnxHgJNPUSc91z QLrvJ+D2XIPo/TiuUC7K4kWzfOZj7qBY8YuJf1P/79FOt6d7GFuuEuyCq6+FRFSUUbhMpB ghl/Dr6Xl2FzYvccb4xWd0Ra3Od6XrNYitcXpRb427lBWPnRNJihno3QAoM9of7/Ux4x16 cTwJqM5HFNB7ITFVfzp+j847MKtkBluR3j0JLUiCZ4OBeOvyeqStVvs3YEIKJ6TwH4AbgR AbH7z03G41xIWdmtm7P6pqx1K9o6/n+CuxGSfO1mnnvmKqJKsuS0GPVnIfmpgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0pB44clxzyw9; Wed, 27 Dec 2023 23:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRNheR1004538; Wed, 27 Dec 2023 23:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRNhe8x004535; Wed, 27 Dec 2023 23:43:40 GMT (envelope-from git) Date: Wed, 27 Dec 2023 23:43:40 GMT Message-Id: <202312272343.3BRNhe8x004535@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: 3dfb39ef1d66 - main - bsd-family-tree: QCU: ISBN and EAN numbers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3dfb39ef1d66e8370c302b158173ed8065887c2a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3dfb39ef1d66e8370c302b158173ed8065887c2a commit 3dfb39ef1d66e8370c302b158173ed8065887c2a Author: Graham Perrin AuthorDate: 2023-12-27 23:36:25 +0000 Commit: Warner Losh CommitDate: 2023-12-27 23:41:57 +0000 bsd-family-tree: QCU: ISBN and EAN numbers ISBN 0201547775 and International Article Number (EAN) 9780201547771 for 'A Quarter Century of UNIX' by Peter H. Salus. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/812 --- share/misc/bsd-family-tree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 9386229341ad..87136edc81e6 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -479,7 +479,8 @@ was the announcement in Usenet or if it was available as tape. Distribution UNIX Version 2.9, July, 1983. [NBD] NetBSD Project, The. [OBD] OpenBSD Project, The. -[QCU] Salus, Peter H. A quarter century of UNIX. +[QCU] Salus, Peter H. A quarter century of UNIX. ISBN 0201547775, + EAN 9780201547771 [SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11. [TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/. [USE] Usenet announcement. From nobody Wed Dec 27 23:43:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0pB574xwz54d5M; Wed, 27 Dec 2023 23:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0pB56G8vz4sXC; Wed, 27 Dec 2023 23:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703720621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IHwxqPoEtVYOrTnVIghGSoi5DRYu+cOEsYYEEu7p7sY=; b=HXUWvAs0mhXJk6EsCp9h+MQqm0nMJ4d6jaWhPAONpnHOGdroKZHiX0UvM7SoU4hmSEEF87 RWV3/keccw5B08CjhYjvhIVks0m6lBFhrMQ3kVbLqeO/+GuLsnK+Nh0PLY7Qzu3p1Hxw+B ynK5gicPrIrFp71F1tTtrYe6TkJ8dJAOeUccbU+SSGKVicY7n3qm/ULx3jGlsj0GV5Jr98 2vNOciolH2CXxN/UWKB6M4VZTgsP1+NKbSimaaXj1rCSigG+o+fdLokaJazh7a9uHYrzhG 1EgyPZ82JUV1XTEDDH9hkDgEo0MOrrW3l1oGLhkWnVBP29GLuuJGSynEfSZW1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703720621; a=rsa-sha256; cv=none; b=RAB2/QuU1W8otsxGGoZ16W7CYk/yit0c+Bt8J8ycEtVM8FXoxvimrhSk65npUNRUIFbemF 81c8uM+vc62P7tpxKFS611Wi/OfmnvjCLJIM5gLwIpUl4U1l+0ggONYB+SKL++39g1rdS+ qhH5V1xa2pAChiV0g+3PdryDb59fLsLlfNP9rdn5rkjQj9iwsZ2g6ygsyevN1Odvue5TrZ BVx9Tg/NLoGHAQqgrIrf5fYtobxvWuSprrOrG4WkeXUcnsGfu8+7z1YORhfYBf5T1M5GWU N4QuepIWAaJrGN+9dsfN53d7ZGh8feUvJ/zeRuyBybD+M3sbExR9URgs+V7YuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703720621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IHwxqPoEtVYOrTnVIghGSoi5DRYu+cOEsYYEEu7p7sY=; b=eIAmCmU2Sn+rIuMcAEeTvXCPbQYOY1WgBYWrmqGKK6DbyJa06Jmuab4Cj0RAXNJDaRtrJ7 UT9pA/sjEGmX6oEkxz9tnx6zZ+6HsbHfgFly3BjGcj1621MrZSXJPYr31STw8pyFOJy7rz w7YX1/yoIk1Ra30xl+nRK6RgiHwUPGbn3X988C+GRGpmhjlVFL5P7Y9ENFgY10Hdln08YQ ujqA6FxkvN5VqwTpBqfxAiY1pMyFnIH4LUxmZvNXSJHqEt7xjAdLruahFhmtgOTrnjLczS j0TWDbmkXq0pzUmD6t+EoYBcjE30mKI/wGUIBu5vJHb4Ts9CIWvhOxESNof55g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0pB55L1DzydN; Wed, 27 Dec 2023 23:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRNhfbm004580; Wed, 27 Dec 2023 23:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRNhfBN004577; Wed, 27 Dec 2023 23:43:41 GMT (envelope-from git) Date: Wed, 27 Dec 2023 23:43:41 GMT Message-Id: <202312272343.3BRNhfBN004577@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: db348fdba461 - main - bsd-family-tree: tidiness, width List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: db348fdba461519d4ea7be45f96719b1bd76485d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=db348fdba461519d4ea7be45f96719b1bd76485d commit db348fdba461519d4ea7be45f96719b1bd76485d Author: Graham Perrin AuthorDate: 2023-12-27 23:36:26 +0000 Commit: Warner Losh CommitDate: 2023-12-27 23:42:12 +0000 bsd-family-tree: tidiness, width Tidy the raggedness in the section that begins [44B]. As the line that begins [KB] was previously tidied, now tidy the section to accommodate [BSDI] and [TUHS]. Rewrap the section to fit the same number of columns. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/812 --- share/misc/bsd-family-tree | 51 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 87136edc81e6..8b04d343a71e 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -459,33 +459,32 @@ FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -curren Time ---------------- -Time tolerance +/- 6 months, depending on which book/article you read; if it -was the announcement in Usenet or if it was available as tape. +Time tolerance +/- 6 months, depending on which book/article you read; if it was +the announcement in Usenet or if it was available as tape. -[44B] McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, - and John Quarterman. The Design and Implementation of - the 4.4BSD Operating System. -[APL] Apple website [https://www.apple.com/macosx/] +[44B] McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, and John + Quarterman. The Design and Implementation of the 4.4BSD Operating System. +[APL] Apple website [https://www.apple.com/macosx/] [BSDI] Berkeley Software Design, Inc. -[DFB] DragonFlyBSD Project, The. -[DOC] README, COPYRIGHT on tape. -[FBD] FreeBSD Project, The. -[KB] Keith Bostic. BSD2.10 available from Usenix. comp.unix.sources, - Volume 11, Info 4, April, 1987. -[KKK] Mike Karels, Kirk McKusick, and Keith Bostic. tahoe announcement. +[DFB] DragonFlyBSD Project, The. +[DOC] README, COPYRIGHT on tape. +[FBD] FreeBSD Project, The. +[KB] Keith Bostic. BSD2.10 available from Usenix. comp.unix.sources, Volume 11, + Info 4, April, 1987. +[KKK] Mike Karels, Kirk McKusick, and Keith Bostic. tahoe announcement. comp.bugs.4bsd.ucb-fixes, June 15, 1988. -[KSJ] Michael J. Karels, Carl F. Smith, and William F. Jolitz. - Changes in the Kernel in 2.9BSD. Second Berkeley Software - Distribution UNIX Version 2.9, July, 1983. -[NBD] NetBSD Project, The. -[OBD] OpenBSD Project, The. -[QCU] Salus, Peter H. A quarter century of UNIX. ISBN 0201547775, - EAN 9780201547771 -[SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11. -[TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/. -[USE] Usenet announcement. -[WRS] Wind River Systems, Inc. -[dmr] Dennis Ritchie, via E-Mail +[KSJ] Michael J. Karels, Carl F. Smith, and William F. Jolitz. Changes in the + Kernel in 2.9BSD. Second Berkeley Software Distribution UNIX Version 2.9, + July, 1983. +[NBD] NetBSD Project, The. +[OBD] OpenBSD Project, The. +[QCU] Salus, Peter H. A quarter century of UNIX. ISBN 0201547775, EAN + 9780201547771 +[SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11. +[TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/. +[USE] Usenet announcement. +[WRS] Wind River Systems, Inc. +[dmr] Dennis Ritchie, via E-Mail Multics 1965 UNIX Summer 1969 @@ -919,8 +918,8 @@ Die freien BSD-Varianten von Unix. c't April 1997, page 368ff. FreeBSD Release Information URL: https://www.FreeBSD.org/releases/ -FreeBSD Manual Pages -URL: https://man.freebsd.org/cgi/man.cgi +Manual pages for FreeBSD and ports +URL: https://www.FreeBSD.org/cgi/man.cgi UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html From nobody Wed Dec 27 23:58:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0pWc41b8z54fhZ; Wed, 27 Dec 2023 23:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0pWc1rqmz4tx1; Wed, 27 Dec 2023 23:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703721532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRPqlYd83b+9NNURgA0x2itTF/ddYat120d5d+5GhGA=; b=vhPA0eYMU5FUk3gV56Exqut/wyglu8i6mX/lVoPk6v9OGi/hh5yriQVPOyCfkfFaX5J/ui LtRAKk4tV4gscAsL27mFbnON1uIQKMwuUmOT3B9hoR7NjllSL36A837lOqC8kry8srb/0S 7KQc0kYOtygMjb0qC7P/wMfFpQyn0EbIv96BofKk3EOg4R2mbv6h4RZ1S1yclj+wlFDnQc +62PDQUg8H2pwA8XU+Nr4Ccklez1TgFA0iAcBz0eeesTdHmxWE2a7BRb7dZVNV9PRXKmxN ohJTKTh8i42rkaKXPp3JDDZH2dlpwPhlerSWznnMonIb8BWwh+9GHvG3B/l/tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703721532; a=rsa-sha256; cv=none; b=wUGvBMHbnjVVtDXlHG1fs+4KX9MKBsW/B5dTyagyG73rCvQ3WQii4WjvEyoOi4lHdmrmiM nb5Ut37syCm3ChoSLnNA261b7kwfGXBCBNi1uCbABulegnr7iaXLCzUvsLreZRfWlZ1p1u 01gYSZK9rIe/989pJtByi4heLaUsaEHb8f/9IySXgikmk8QP+NhPDtC49PngkHknxvVfLR TvNbMxyNIpjWxo36IpYw9j+IoMQShODwVCmrw/a92FKC582Rdqlr69nS8m6Gy31duIQqyo PIBCxP9DTbo/twWWeOGcvyxzZ2BZvcRNUDpNgG3t2Iooct5XBFIhxvfGb+o14w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703721532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRPqlYd83b+9NNURgA0x2itTF/ddYat120d5d+5GhGA=; b=EBxU1sG2AQAqxPIIF0vK8tHvFv31j2TdhNpIoDm9cc+N/3VsElg1UJnZrQ6JNWIad1iqUJ afr8kMLiK2E7zvZCENSJ4OJtzkRqVxLkvKOVrMUuoodqdtN0I8CX4pVKO+SrVIWKDo+bBC Zkae6aOUfmk2RdJhlNAgY1zEbs1x9Rlsf0nhkYUXxG9FZCo6wkEArrWrFbO0v1t9P8Dgco +cg2Aa4oRBgJ+AWc9+mTpg34p1glN3BvZhsTshhgnFZdgNCMLa/JlkFIDZib2j2SI85vdr AewhshMno15mg56AmBSCqFF32yMzbQsRBtdhBoTnuaW43aWmj9TR8dRwn/ODkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0pWc0rFPz107C; Wed, 27 Dec 2023 23:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRNwpfs022314; Wed, 27 Dec 2023 23:58:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRNwppH022311; Wed, 27 Dec 2023 23:58:51 GMT (envelope-from git) Date: Wed, 27 Dec 2023 23:58:51 GMT Message-Id: <202312272358.3BRNwppH022311@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: fc8ac5fedf7e - main - auto_master.5: improve description, bump date List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: fc8ac5fedf7ee513efabddd26dbe65f5aa5996c3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fc8ac5fedf7ee513efabddd26dbe65f5aa5996c3 commit fc8ac5fedf7ee513efabddd26dbe65f5aa5996c3 Author: concussious <79338398+concussious@users.noreply.github.com> AuthorDate: 2023-12-27 23:56:43 +0000 Commit: Warner Losh CommitDate: 2023-12-27 23:57:20 +0000 auto_master.5: improve description, bump date Add autofs automounter to description to improve visibility. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/824 --- usr.sbin/autofs/auto_master.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/autofs/auto_master.5 b/usr.sbin/autofs/auto_master.5 index 0d4753b18f95..41d4c5d35a0d 100644 --- a/usr.sbin/autofs/auto_master.5 +++ b/usr.sbin/autofs/auto_master.5 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 28, 2018 +.Dd August 18, 2023 .Dt AUTO_MASTER 5 .Os .Sh NAME .Nm auto_master -.Nd auto_master and map file format +.Nd autofs automounter configuration and map file format .Sh DESCRIPTION The automounter configuration consists of the .Nm From nobody Thu Dec 28 00:01:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0pb546wXz54fsl; Thu, 28 Dec 2023 00:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0pb53Vhqz4vLR; Thu, 28 Dec 2023 00:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703721713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6QA8V2861YbAehlTkQpF5/9nHvLbHRGTUMXlSnXioXk=; b=sZ6bw0MAi8qLZskUSwQuREaPk9TomtxkqDAPFRBaXcmy2YMJiQ1qvkIRIhFTCjSlqaOhbF bmA7h24mstC0xBUIYLkn3bVuq8ph1H/Y/OvwPnyrqQeZENUPt4wkUDQ89RMsIip7MZW9tg 9zp5T/CysF8hXw7nH5Uo8qzuZTuqTzmR7mVlOK0WkGCXRuB2rklefQTRyULjXAErDfZyiS UJa2edlHBEk6nuyDw4oXlPPkrCAcYvlh48qEhnKcaLsolSjd4c43SliLnC9t25sRwDh1nj RX3EPRFeRdt6lexglMvlvenRRi/iXC4udTfg8b0fJA++O413g640Rs2IT2MPGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703721713; a=rsa-sha256; cv=none; b=rS9dBcBPnWOiWCamSc+aGZvnOShIxOQsLcxqQzLwojqk5ckdh3Y42eYWOHn2o8KBUTeZOM v+zXxPN/bOCoE5asPzGGtl+WCIapITrXbGP5nmHIebNnoneWjcOK/2spJbzdlEM7FcLvAy dJXE8JbG8pXodGzmbW2GNQ1ymAvBF/lU978ncmcNiggqf0h+9JZoGMJkyIhUJfizmjMyTl 1IDrCD1frB3WxW/PeePhtQJgyMBq6KjM340lGApIl7lk7QmrbY2iCB/SV23dV0fJ/TW4tq W/vRIRopfXvc/vDdOspSDXmGkmYLh5AGqpn4WIlXxEtcjmCBtZIuwJlS3f8ODg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703721713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6QA8V2861YbAehlTkQpF5/9nHvLbHRGTUMXlSnXioXk=; b=GKvYLtPwAzq1c/8PnZVogB+/YSIFR9gX6gnXqSaicFNZTJeE0hBIacYZOAm9z2V3p2QyUv O0AiwESn9GIYg0iBsq4n8lS5p3G0cLseP8YlfJe/6IXhYuGZMJXQFuaWrkspuqnYn2TKPY p0M0dpaMXExFTjrmy5JWhPQrJd3rpnyvNKjEFjJJ0Ry2/nEo/BqejLTgTASedhKsnGAIPU oG5husah4FGYU7zMgC8Yz64piNq2TbF/pv34Rn5yt7wKPExCDWYXAmFUJ2IoO2BHOlCbGJ Pby8BAvGzZPoaPhthYWAwFcA7NRmcZzetnytNX0y/f4b+F+rgis/crhdD4cjCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0pb52Z87zyrT; Thu, 28 Dec 2023 00:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS01rqW035276; Thu, 28 Dec 2023 00:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS01rvf035273; Thu, 28 Dec 2023 00:01:53 GMT (envelope-from git) Date: Thu, 28 Dec 2023 00:01:53 GMT Message-Id: <202312280001.3BS01rvf035273@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: e21ebb4d2d94 - main - auto_master.5: Fix my push List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e21ebb4d2d9484e2c7ce3cfc15b98a9c60b88050 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e21ebb4d2d9484e2c7ce3cfc15b98a9c60b88050 commit e21ebb4d2d9484e2c7ce3cfc15b98a9c60b88050 Author: Warner Losh AuthorDate: 2023-12-27 23:59:48 +0000 Commit: Warner Losh CommitDate: 2023-12-27 23:59:48 +0000 auto_master.5: Fix my push Forgot the commit --amend before the push to fix the date. My bad. Fixes: fc8ac5fedf7e --- usr.sbin/autofs/auto_master.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/autofs/auto_master.5 b/usr.sbin/autofs/auto_master.5 index 41d4c5d35a0d..e826176f9f3f 100644 --- a/usr.sbin/autofs/auto_master.5 +++ b/usr.sbin/autofs/auto_master.5 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2023 +.Dd December 27, 2023 .Dt AUTO_MASTER 5 .Os .Sh NAME From nobody Thu Dec 28 00:03:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0pcT1f4nz54ft6; Thu, 28 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0pcT14YCz3Bpl; Thu, 28 Dec 2023 00: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=1703721785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7VDuPkbshp1qylVxkgCIyMKfMwYVOF0I6QrdCggWYww=; b=IvQAgevLV3SXtQKoKAFa62kR+a3ZaNDubM2whuzJqc4hKHvt13ah26NdOxTEe9w7WT1vbb x5R/bRJWxyoecgID7xw+l1qNFHc9m43cTblNXcfWoTQcRLBYjoUpufWAJJB2Z6bL/4fHSL V1ZtiCDVaHQ6GLOUcF634wP1OT1ni3nkghEJBMXLvdfPy6WjPzQp1r5n6bhSDYUlZOIdJi SiPSuODTPkDVsvM+KQfY02sBfTEqZzXdNi0mHhG9BnfL/XQzBzatiBAXvDDhBDQdKqPfe0 MbHbE9J4Z9jobUgBHm/Ryt8CYxrycISyPuPk8zpg1xdQpzZSzuEF0XNn3hwlnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703721785; a=rsa-sha256; cv=none; b=TueKSZlEFUSgeycS/WxyYWac63p3z+aLZe54YEThedfDXnofJT+d8pz9CpwkAfSfpalwZk spCToRuPLyTxTb0Lx0pnCiwf6qLRNRrdjcQSrJrlkAMz9mybi/P7IpJRFqbptA6cxE9FFy JXtrSfJZlvj/dAWorSIPvsF1mHjdDgHaMAUJIp/zey+/grQWkbEbFYIq4eQSGbxMqNREnw 4Tr75NJaW0BW/hSMj8qXH7SSqMRfImjx9ert6QNr6LcLVvX56mTmDGL17e4yI481Y/1Ph/ Et4OZRk06m5ChabVG34Dqy8LiqclKfm87+zieRP4W6CmOpsSQAcGq+vvDnPxNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703721785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7VDuPkbshp1qylVxkgCIyMKfMwYVOF0I6QrdCggWYww=; b=THqAiGYkPe3jKM1UVfUBZoZzmj+oYhRbdzzWALZDDyLom8axJlhedIzRTgTQ6PP8Mnv6VE 1yDhGgyao1a9E6F4gh6yP9E1E/lLhoQBJAiHzfltuir5Eekd2WushHnGl2uwZNSy1hu2Bl 6gZ7Bx3qAHCgQ64mXl5l2he+7TNR2gETJsJXrWUx8OmMqncs6SA1uBSNIpNs0UYb7obQKE tvzt0N7Mc/Y9P46HuCoT0RoBU8UM6wlSGyT3z90Za99hh2x1HGVa0QisF1RB/gzd+Es7bu Fq0wB7KDWj4qi9ItGPjI5Kt1nB5ZpGL6LRgCzB7iCSlkPpUQ17nBfGHDGJ7LpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0pcT074wz107g; Thu, 28 Dec 2023 00:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS034TY039717; Thu, 28 Dec 2023 00:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS0346k039714; Thu, 28 Dec 2023 00:03:04 GMT (envelope-from git) Date: Thu, 28 Dec 2023 00:03:04 GMT Message-Id: <202312280003.3BS0346k039714@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: 4ea5e107b1e7 - main - : Allow using SRCS for common sources List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4ea5e107b1e778321f2e5e5083cf4eee3888eca8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4ea5e107b1e778321f2e5e5083cf4eee3888eca8 commit 4ea5e107b1e778321f2e5e5083cf4eee3888eca8 Author: VexedUXR AuthorDate: 2023-12-28 00:01:29 +0000 Commit: Warner Losh CommitDate: 2023-12-28 00:01:39 +0000 : Allow using SRCS for common sources Instead of having to do: PROGS= program1 program2 SRCS.program1= program1.c common.c SRCS.program2= program2.c common.c This can now be done instead: PROGS= program1 program2 SRCS= common.c SRCS.program1= program1.c SRCS.program2= program2.c This shouldn't effect any existing projects using . Reviewed by: imp, sjg Pull Request: https://github.com/freebsd/freebsd-src/pull/766 --- share/mk/bsd.progs.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index fba617b12595..1551516dd6ea 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -22,9 +22,9 @@ PROGS += ${PROGS_CXX} .if defined(PROG) # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE CSTD CXXSTD DPSRCS MAN \ - NO_SHARED MK_WERROR PROGNAME SRCS STRIP WARNS MK_ASAN MK_UBSAN -PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \ - LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} + NO_SHARED MK_WERROR PROGNAME STRIP WARNS MK_ASAN MK_UBSAN +PROG_VARS += SRCS CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD \ + LIBADD LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v}) .if defined(${v}.${PROG}) @@ -96,8 +96,8 @@ $v = # Find common sources among the PROGS to depend on them before building # anything. This allows parallelization without them each fighting over # the same objects. -_PROGS_COMMON_SRCS= ${DPSRCS} -_PROGS_ALL_SRCS= +_PROGS_COMMON_SRCS= ${DPSRCS} ${SRCS} +_PROGS_ALL_SRCS= ${SRCS} .for p in ${PROGS} .for s in ${SRCS.${p}} .if ${_PROGS_ALL_SRCS:M${s}} && !${_PROGS_COMMON_SRCS:M${s}} From nobody Thu Dec 28 00:23:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0q4V4SFGz54hXd; Thu, 28 Dec 2023 00:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0q4V3XXjz3Fvg; Thu, 28 Dec 2023 00:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703723034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4RGP2dRWguypIqdQecFY+KI5OHTWSeG9TYTW9f/2QwU=; b=DNUOfu6rrkDXOy4THb51UA9RQpt2LgtUTyUz3XckCjguBAlnXkbAiRxRXtS2qvH6i3dZCX gyLectQ3c5thHxEJyn5qhVsXWuuPjhn1SW/0Woa/JTuCD6WDmU+4zAxkG3DL+q4PFJIYGC b9nyuaY6WndQksfgBlVsaUVLyI0sVKkNwAAC7XWTFnAZ04UTdyBPoJj3qtv+mbe+ZJd3BH w7TCQdfUpxII3//vzBsTDDqAWNfKLo0Vk0KYafyt+lb7cxHN1vJ2X5uYQBAOfjjxT49wvz 25q7PWtjEdP6rHYZ/au+tnUJWZLg0U3OqSBIUazL+15SE0OgXnLOqSaFnA5kGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703723034; a=rsa-sha256; cv=none; b=nhOqyXfiu/ukLliY7c8JjbjUYtMhWaPMqjdJ5mVozO2ym0k/r/HkY1uy33YfUj5eH1lkzL zld15VgER+NsysOXNt5YmZNvFMIKOvaDyu5apcV+yDxFOY49FzyPDf0UjjZf5nxWm/w3R/ 67jPseH8TjrWBRBDH1B57lEdc63jnKH28Ybst5L0+CaYbuFlX/gTE4b0PAGsGg0tKVsMcw EwnynnbSgx3IyYNSkMFsm8M0qy/4mmGNHJFu5AubjBgfezWE5RrtIU4I3fEI51qmWDu1Lq KKysZdAzmtJuGklW63UEkI3xFxPVBhVHbcbfTjDUtkHN/mUZXG8JXEKq17QIbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703723034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4RGP2dRWguypIqdQecFY+KI5OHTWSeG9TYTW9f/2QwU=; b=KUjSLd50RQPyyfuiVcnjKF7lB1UQrl3xlf3qkHCB4ZQtLNiK+xlZhOG+NjU+3VEjdHGFAK mLl+Kxuv/CJmST+ldy42P8SkuIaStrlODZ1liQMk1CmdcxzADQs6Y5r9yZuEehU5HyLJhb JBrjg6BXM0d1rXiGYURJioXf+iul5vZW/zOHz9hYoE2wlGFYbQmASOXb9UktaqvXwveZ6/ 8ZiNirtOollEccImu/OnndZVISHJZIoSwuacRKt5XhCJxBZmZeB4m/9CzNxZtIPePXEBBE 3xbCBqwgaeJ5OymfhZT5h0UZ52y5Yg5CIf1QPqd1Aa/HJrUelG/p8g7++Da3fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0q4V2ZNvz112w; Thu, 28 Dec 2023 00:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS0NsGw073229; Thu, 28 Dec 2023 00:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS0Nsuq073226; Thu, 28 Dec 2023 00:23:54 GMT (envelope-from git) Date: Thu, 28 Dec 2023 00:23:54 GMT Message-Id: <202312280023.3BS0Nsuq073226@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: 9c1335cead4f - main - contributing: Add note about static analyzers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 9c1335cead4ff07faf257d0b9003f9e6227be150 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9c1335cead4ff07faf257d0b9003f9e6227be150 commit 9c1335cead4ff07faf257d0b9003f9e6227be150 Author: Warner Losh AuthorDate: 2023-12-28 00:16:33 +0000 Commit: Warner Losh CommitDate: 2023-12-28 00:16:33 +0000 contributing: Add note about static analyzers Please don't submit the raw results of some static analysis. Please do submit the thoughtful results, though. Please test with kyua and create test cases for any actual bugs that might be fixed. --- CONTRIBUTING.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62a11d8498c3..907c0d131a6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,10 +39,11 @@ A pull request will be considered if: * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. * Commits should include one or more `Signed-off-by:` lines with full name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). * The commits follow FreeBSD's style guide. See [Style](#Style). -* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors +* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors. * The commits do not introduce trailing white space. * If the commmit fixes a bug, please add 'PR: \' to the commit message. * If there's a code review in Phabricator, please include a link as a 'Differential Revision: ' line. +* If you have run FreeBSD's sources through a static analysis tool, please don't submit the raw results. Please also see the chunking up guidelines. Also, please make sure that kyua tests are the same before / after your change. Ideally, you'd also create a test case that shows an actual bug that's being fixed by these changes. When updating your pull request, please rebase with a forced push rather than a merge commit. @@ -75,6 +76,11 @@ submission does not meet the limited scope for pull requests accepted here. Sometimes it is easier to review a GitHub pull request than to do the review in Phabricator, so that's also allowed. +Finally, if we close a pull request because it's not ready yet, or stalled out, +please don't give up. You can resubmit them later once you have time to finish +the work, or to have them reconsidered if you think we've made an error in +closing it. + ### Author Name and Email We require that contributions are associated with a unique identity. From nobody Thu Dec 28 00:23:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0q4W5hg7z54hcg; Thu, 28 Dec 2023 00:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0q4W4hk6z3Fhm; Thu, 28 Dec 2023 00:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703723035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zLpoaOdUd0w3YWIXE6wav+caXiyJe2a/mfT1ycPluY=; b=llchYWjLcw9EqoJdvTlU9oCCXv10Qzf0QgsB+OGupkOEZwTUDuZh6sNUdSVeM+BDVIonsP 59j1AoG9wCI7e51XPDNTeuO5UXhgIw5dO3cV3R2Lgus01a4heK3KgNnfME75N5k8iYPEcp P5eI0gZ6tu8xf0s8XE08b7ZHDpXyegEOAnDnOdc4Km99aRsHt9NKIUdXCt/wY1EpMaEr1X s+xab7EvYmNxan2yOi6Koogb6TwvxkWUwHqBpSCcJ0fgMsZoZqbU+chUuFfy+X/LnoPSTG U6KuYiVd1r19PxI/ydyuISS93bKV6kWvUYtnI4Lmbipz+lKo1yp1z/JdI+4iCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703723035; a=rsa-sha256; cv=none; b=jNUu0tuHf5lbufo1b2LfUO3txjcJ7Zs2l+GenW4qEIghuUMce686Lu5AVqrmpDfRE6I56T 2RmFe+6tAHeuXwfz2e6zVUfwuTKGXPjf5TNY6AhjPb1GJzQobMYDjxSXgMq8uKY8dY/xKS 2o2uAWFbwecpJZXHgWsjX51av0grMLF1Xjp/9TlLCihB8uGfV0Pa8/selejIBR2Dl7XlXm 1PE33GtaPIyLkjs5UR+INHZoZuFjJpqZlBEBH9Q0nzRPbdQ2yfx58ivDRCdDzSFiNDIs0N kY+FYq31bzlUQ6qPwxgFxgC2jZM0HX6nZNe5kyrjnY7ebGQNKabd8LI9Kqu74g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703723035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zLpoaOdUd0w3YWIXE6wav+caXiyJe2a/mfT1ycPluY=; b=EXEVG3qOjJrtjwvFG29BvzsA/w/M6Vk+tOoQV9jGpbS5e1aCHJPfBFfdrjjv7A/bY0Yij0 +lc0YGp9fz0bG2SrB7wd7YR48kEsauOFRvWOu7t5fowVzGrC3oZ1hwvd5DnR8oVyiaEy4I GEuAbpSbt02Ywh2Xc0UTePuQWXUWlQyl1qMJb+HyCLNHW0n/5mW2CGBKwzcljIxCVlZuaL Rc/nRb0su69I6fO4WiwYaQf/PEV/uwWmbaeIEgglpw6KZLbWO+DRPsJeM95wON5vUWOCf7 ZJtWdL9qPKn4YUqLMq8uYUvLxEHO+ZZCFEfMkPNKYnfq87ndtf8ZpcTCwETVUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0q4W3dgmz10df; Thu, 28 Dec 2023 00:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS0Nt8X073265; Thu, 28 Dec 2023 00:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS0NtYK073262; Thu, 28 Dec 2023 00:23:55 GMT (envelope-from git) Date: Thu, 28 Dec 2023 00:23:55 GMT Message-Id: <202312280023.3BS0NtYK073262@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: fb03f7f8e30d - main - CONTRIBUTING: class work List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: fb03f7f8e30d21ad74ef7a3ee1b4a7e546fef852 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb03f7f8e30d21ad74ef7a3ee1b4a7e546fef852 commit fb03f7f8e30d21ad74ef7a3ee1b4a7e546fef852 Author: Warner Losh AuthorDate: 2023-12-28 00:21:58 +0000 Commit: Warner Losh CommitDate: 2023-12-28 00:21:58 +0000 CONTRIBUTING: class work Add note about contacting me for professors including this as part of their class work. --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 907c0d131a6c..9f965ed9e3ff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,3 +134,11 @@ contributors. Also, developers that are landing a pull request will use a Signed-off-by line to set the author for the commit. These lines are easy to add with `git commit -s`. + +## Submitting as part of class work + +If you are a professor or teacher that wishes to have your students submit fixes +as part of their class work, please contact imp@FreeBSD.org before the semester +to ensure we allocate the proper resources to process them quickly. We'll give +you more details when you contact us and thanks for including FreeBSD in your +class work. It also helps us keep track. From nobody Thu Dec 28 02:58:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0tVW35rGz550sr; Thu, 28 Dec 2023 02:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0tVW28G9z3XtY; Thu, 28 Dec 2023 02:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kU7XT5n5jKjFmdmH8oV7k5hsv7tQm/48yBiDA+XgPs=; b=MjqslFItURBk7xOSb1RFoBf0w+XpHutJk1ya7Hr6BpU3xftz5xadE8VnV2qN2EBBhQhww7 ckRS1u3+KQ7DkGU6VmsS4HWkjyJ+aZMV/GHULQiYXdIl43gMek/WklMX6wK1SzvO2xVC/a 0oX0vLm6vvIK7hv5qIo+RGNxw+THlTfEPvnodtDdeqVVXGJY4DEOOMMhqIp8i4Tu5ZYAlS w6eBYSyM5Ytbc+dvME86/2cpdag+aA5c1nTm57TTefYvbxoahhbYHHIZZpj2g3NJSMjK3W eX5u7dM9agkCpYizUjohPKNtJtAcLIXH65jaiPmdSjshzCHzRQj48b09ZQrAjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703732291; a=rsa-sha256; cv=none; b=r3mGBqv39Tkfj1tbiIDtgwJ8m6VkMCSAbZ1cXbm2QIs+uNv3ZiA6WSm/ZGmA9L+uiWRl8D SFS9JUR0Xq6/S2sLd+oSeiUgwW+YzbTKF2WEvE8Gt3D5riam0P9oyHDSVCTzUQ5LczreYy Xz6Gvy4p0AcR6eJyy0iCFRQuv2NnolVK+HXnUNSp2Z0MJl+sexGhkmfJJWD8xUVCfAP66x Olv5zCaePGykxsG+kc1mPuQo1OrjuY/Tv3juuQke6XTYmY0X7aEhNF2wLxZtiz1ARvGLUc XOwsborzRHZmVRPdlVnB00XR/NLvoTWQjhk2jebGfq9+KziAwVsadp2urGdJjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kU7XT5n5jKjFmdmH8oV7k5hsv7tQm/48yBiDA+XgPs=; b=HQuuC6QH9ObTBbcGrDx9mI5OAegKtLP92WzK3QqmYsde/gGllcZO3m3R20+6mFQTrPzuNy 84NuKbHz6k+1hwQWCglpq2UyKgDOxdD3FBCIlqVZJ8en0N6qFzxplkm7vpnmq8Plae0Y2M yuZOYpNQGhpTWSVMRJCuGV5/nEAsOikgh8D2DS0huh3RLF7CW+5quTUzGunwm5CkCmylJc dgPxq3KYssIalR/dMvc5BixoiKYWnp3+QOU7USTuxKq8TLDiaajlaLbot3Ao9qnqjnl4Mk ow2DxV6QSb//+OuH7jdMerOVaz+uDH7w9RCr892hZmFNaQ77cJj53REIWRTlQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0tVW1BzCz14tT; Thu, 28 Dec 2023 02:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS2wBoD024166; Thu, 28 Dec 2023 02:58:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS2wBpx024163; Thu, 28 Dec 2023 02:58:11 GMT (envelope-from git) Date: Thu, 28 Dec 2023 02:58:11 GMT Message-Id: <202312280258.3BS2wBpx024163@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: 4d3c234d8eb3 - main - sa: Check for errors from copyout() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4d3c234d8eb32f903d630b371208a0a931d3d5fe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d3c234d8eb32f903d630b371208a0a931d3d5fe commit 4d3c234d8eb32f903d630b371208a0a931d3d5fe Author: Mark Johnston AuthorDate: 2023-12-27 21:28:28 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 01:28:25 +0000 sa: Check for errors from copyout() This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: ken MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43203 --- sys/cam/scsi/scsi_sa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index aa4dc8e84c10..f84fc5bcb1ab 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -1494,8 +1494,12 @@ saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, bailout: if (need_copy != 0) { if (error != EFAULT) { + int error1; + cam_periph_unlock(periph); - copyout(params, list->params, list->param_len); + error1 = copyout(params, list->params, list->param_len); + if (error == 0) + error = error1; cam_periph_lock(periph); } free(params, M_SCSISA); From nobody Thu Dec 28 02:58:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0tVX3P91z551Cc; Thu, 28 Dec 2023 02:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0tVX2qD2z3XwF; Thu, 28 Dec 2023 02:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aYRI1bYxEXQIySX9OAX7zLMmbvulg3e728Xj7U2fyVM=; b=msO3PjsX2S4/XHs31Aai/tJRALgC+LE+o8azj6uds9fU3jlTdz/F0uPgMk6jX9oB/r+21C tWHU4i6we6azYpGEUpEZbF0/O5J5UbcrXjMVXxGI8DYnRu+o7GyC+O+LOw2nPXo4slmjKQ lNEpOWd/MoW/q4zu2xIjnIvqCRQ8IdcKSjGJWdNahgl/K/vTilzCbApvJyVEIbkRfQRjWL HSSPrCRuSXq027RCXFyDpPI7LAth7BsPVXMyEh+F1gfdRdfo0DDL3g8tKwm9+kjX/v9rIt dM403gWzYvwHopV3OsJljbfFRWYljLhhO6SNtPhl9RVJOo0u+F8IgKpnKXjEKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703732292; a=rsa-sha256; cv=none; b=sSY/RaXNY7K48Y7qgC9cAV7DPnZqm9kBy2qmPWo5jX0rVQRF8AFnBqKeHJ3G3Ye+HXGm4B bccJBmtJF9eTTxRapzquYgwO4bvoTdov0Bq8Pje4VQH5owTy0iVwk//QI7xpNeJLDbAhC1 bX2KltjMKmflHrtUW0kzdV7G8cEzJYpP4iXlpoLxR9aNklGDAKgr2BhEiF7l3Io6NW3gp1 mu+qxY8jw2w46xCbu/UN6d9BMpmmnXvNk9KT5uKnphkLKNo7I9hlwiwK24EaD3S7TiEvdY hB5wFV4IEKZufoPa5/5XSjfVfPLJU3dYWFYFOZfmHFXLaRc7/VcvlK6Rk3yYmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aYRI1bYxEXQIySX9OAX7zLMmbvulg3e728Xj7U2fyVM=; b=vZ40cntmtR0PfA5ImMiliPdJApsOnyi/THlKvYjOdVSjIAG1MihYwj5WV8YJkB4iwc0UYw i5UKzB1+gtX2LmhE6qdGqKQuZZPcbHhEEmmyiZtSn/GKbC2WUD7/MV+hr7MPBZ6LC/a93x mhucrkByc8WuSHQ0kLFsTWXoG8vjscsC5hoFdKiAgtnrWrPAcMLF0dwLLRGlDMLoEFhPNG sDl5T9IADr/XqijeYQW1FFKIBx45URxaazGAskLvrTpPtoZMQXP5eOsygAcrXprBGqsPTa dKcSPDpnOinzgnXwjEHy12X3sZQH4+sTdli2dQOOQ1zhxuMtIQzUqvUbuR7EXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0tVX1vvGz145m; Thu, 28 Dec 2023 02:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS2wC3Q024212; Thu, 28 Dec 2023 02:58:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS2wCYD024209; Thu, 28 Dec 2023 02:58:12 GMT (envelope-from git) Date: Thu, 28 Dec 2023 02:58:12 GMT Message-Id: <202312280258.3BS2wCYD024209@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: 46a6cfee1bb6 - main - sa: Make sa_param_table[] const and static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 46a6cfee1bb61145717166a3bbbd8dbad27fbf36 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=46a6cfee1bb61145717166a3bbbd8dbad27fbf36 commit 46a6cfee1bb61145717166a3bbbd8dbad27fbf36 Author: Mark Johnston AuthorDate: 2023-12-27 21:40:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 01:28:25 +0000 sa: Make sa_param_table[] const and static No functional change intended. Reviewed by: ken, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43204 --- sys/cam/scsi/scsi_sa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index f84fc5bcb1ab..cfd48c98f30e 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -632,7 +632,7 @@ static struct sa_prot_map *safindprotent(char *name, struct sa_prot_map *table, int table_ents); static int sasetprotents(struct cam_periph *periph, struct mtparamset *ps, int num_params); -static struct sa_param_ent *safindparament(struct mtparamset *ps); +static const struct sa_param_ent *safindparament(struct mtparamset *ps); static int saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, int need_copy); static int saextget(struct cdev *dev, struct cam_periph *periph, @@ -1355,7 +1355,7 @@ typedef enum { SA_PARAM_TYPE_NODE } sa_param_type; -struct sa_param_ent { +static const struct sa_param_ent { char *name; sa_param_type param_type; int (*set_func)(struct cam_periph *periph, struct mtparamset *ps, @@ -1366,7 +1366,7 @@ struct sa_param_ent { {"protection.", SA_PARAM_TYPE_NODE, sasetprotents } }; -static struct sa_param_ent * +static const struct sa_param_ent * safindparament(struct mtparamset *ps) { unsigned int i; @@ -1402,7 +1402,7 @@ saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, int i, contig_ents; int error; struct mtparamset *params, *first; - struct sa_param_ent *first_ent; + const struct sa_param_ent *first_ent; error = 0; params = NULL; @@ -1443,7 +1443,7 @@ saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, first = NULL; first_ent = NULL; for (i = 0; i < list->num_params; i++) { - struct sa_param_ent *ent; + const struct sa_param_ent *ent; ent = safindparament(¶ms[i]); if (ent == NULL) { From nobody Thu Dec 28 03:26:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6m2GjNz553l2; Thu, 28 Dec 2023 03:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6m1ZYLz3dhB; Thu, 28 Dec 2023 03:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0TmMCM9jPMfyvKB6iUeFy4USYLA/q6GrI6Od56fbEI=; b=sVvpdgf3dYz54JbDkT+ayVNXONOiIMQnZjGB5UARq1UIAtbLj4JAcYHClAhKOyuQJQL64n 5r78pFuzXBC0kL5kSNIc1Th+RKsIQLCimM3HHE6yndjFrLX6H76Uiss3Af2ycNTnHlHKlA EZxWIK5ELp8hm4QeOENZ2fd7LszmfWPwUj+Ei4X8VOIgoZ6EWhWF0mcQGk5I7EPMLEH+xq 5pVoayOytiSLVoMY7wKXa79Pa0PX6wLyYCFdBbfehHlj7et8FFzaJ6tWO2/CbSGDky4K/J HXBC8EEihFQmOmQY1p7hbpdBcXx8WtwCjrZgxS4KIafNTjojNuZvugHP93r7tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733968; a=rsa-sha256; cv=none; b=q/DdWRga5DziW5f0RWHl+LmPhjwMviNoo8DrzKLKPRgaBjucb5ZYTrLN19xQ2i8fDie5XN +JXNzvdK1W+GRA7mNQFSQ5HroPiQU1PieHBLFaxor0rSA65WTFxUOqKzaJJvbg0KzyaDIn tAk7OUbcl7xBXgZF4z+FYtDot3TP2Xr+b6lIpBMUYdXdmRk2AjJy/KBASHqBvWhBkE5bVi uwkBv+yakGdzJ5AQla/5F21PJ+7lOkDseZrBRgiIRuVqgN8lvzlq2JnbuiNxY/GcTfNCp9 3uiITJsgiZExLUcseWfMdvkQr5ZwbgCzbxQd3qoEA69t8woK8rQmIvtLmq9Q0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0TmMCM9jPMfyvKB6iUeFy4USYLA/q6GrI6Od56fbEI=; b=KQ4+7enFiebkEc3yjXnIOpkaEsY7RL39qTYhnW9iXjQrw2NPufve7UNW2CMfWbTemwVoXW 6KTaqlNiZDwwg236oGUgob+UnfNwQ0svuzmpF7eGEK2y+roLfy6OwmqitxknsnSf0mvXdP ROttMPfSYH1N999+FpFMOrRKxNi1m9IfyM9LPq0rLSnorzAbyOQRem9hEP6km8XrggRpBz v37kfIAc37H+6EX6bT4Al/7J8+DBcd8Jq19RyodQwavkC+bKrn+aCP2wzw8Yjl0gxbaWu3 IB4B8xPOtY+1tJJO/KJKqoOiReVEU7LyNZnSASwfH93I08RVDmunR4dbLWZkOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6m0d5gz15n0; Thu, 28 Dec 2023 03:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3Q7Jo077438; Thu, 28 Dec 2023 03:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3Q7EJ077435; Thu, 28 Dec 2023 03:26:07 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:07 GMT Message-Id: <202312280326.3BS3Q7EJ077435@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: b9bb04c1673d - main - libcasper: Fix typo (triple T) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b9bb04c1673d1c29dac75e30b2843b872314e983 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9bb04c1673d1c29dac75e30b2843b872314e983 commit b9bb04c1673d1c29dac75e30b2843b872314e983 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:07 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:30 +0000 libcasper: Fix typo (triple T) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/954 --- lib/libcasper/services/cap_net/tests/net_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 735e78fc51e0..e1045341fe47 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -858,7 +858,7 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts_servnames_mix, tc) ATF_REQUIRE(test_getaddrinfo(capnet, AF_INET, TEST_DOMAIN_1, "snmp") == ENOTCAPABLE); - /* Limit to HTTTP servname only. */ + /* Limit to HTTP servname only. */ limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(limit != NULL); cap_net_limit_name2addr(limit, NULL, "http"); From nobody Thu Dec 28 03:26:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6n3DJrz553bh; Thu, 28 Dec 2023 03:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6n2Gp2z3dc6; Thu, 28 Dec 2023 03:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RyJmG7CqXV6TFnozpIfwJwuwLYMrVxJmQtrTtakvqt8=; b=JgrFfNAD1igGXil1Jl4Ifl6ac/QfZhEuZVC7AfNHKovuOh+UBSJdpGhJ/ngRTTtUT7F9W7 iECrp0RIIO6GS0tZbwCsDC4k4iK0raf8/NiDtsveQUTHxNrBJvWiVyI6KRctMAC3GgdP54 pYUIICokO8aFAncNoWbPJMkoXMzKIwcMxtH6Dd2NS043mw6vKzzX8zcFaDDb7cfv3MLIpB BgaXyHKWrOnKIXufYpeT1z+zzf2E+hJZ5i82zx0OFS3H2MZtkCDLeuQHN0HI9uX8h6dYj7 otN/k7sTtSvDOKki4IwFIyJ4qlSS/jL50gwBWO/Cu7vfnS/TsPFNgigZ3XeRcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733969; a=rsa-sha256; cv=none; b=aKgt3SaL6eN/PDJJxv9hxK1bN2UBA9J/Z5l+85/P5IA7ZyKPcGdnbjToq1ZS/UwmDyRZRD +9b4ofiAvKiomtwcnXi8oZN1voSFo63524TMjstKpvJGxOfrsJA/ZSNcUyBXAZBk+Pu2El LB0cafYSYxVdTKq3BRiFVuAeBxPgntyFYmgByXz6VCXLiqYUG0haLtRhn+AMSw0Wyh8eQS nldd3UwMSm1fdwudUlmzFp3M5Yr3JgdZKQpgyvz7LDI+BKWJ5nHC8GMSDffH9siQvv/dnM 1LW+Gg/3adNW0pNuklwxfWKd8nYBP2fyLY0EJwvlimZZwJEnUcNQVs6884E57w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RyJmG7CqXV6TFnozpIfwJwuwLYMrVxJmQtrTtakvqt8=; b=V+F3IPsTdNXmcPi0Ysqw3+zCeDVV/TFlSSBH8Q0NUUXTgTpOOXWbc52fQNrITXfGb79YUj d9NevqlxMrK1KM5u8lPG3r56AXqilbmoUxC6N1pYXIQtaXazuKA6bJ6OjlqDIAYqU9TLQZ qDnNRT0fse3jlIyBwflO6aY9uVQfyFwpmQwanvsP1JHfqu7EstmPsvqsdmOI78eKZI5MP7 PwDK/NL/rtNo5mKebjOkokVoW/JcAwMVYJ0yl3O7Jo0k1FRNCvGWek8y2tfsepVSGcW3Lx sYYJNr0uppyipUZXz6RoIdSip7vYX0i/BOV31xiK1orHloY6JNKOKkKCZ0ofRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6n1NB6z15MV; Thu, 28 Dec 2023 03:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3Q9uI077487; Thu, 28 Dec 2023 03:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3Q9uj077484; Thu, 28 Dec 2023 03:26:09 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:09 GMT Message-Id: <202312280326.3BS3Q9uj077484@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: 4654e8a3bff5 - main - ciss: Fix typo (triple T) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4654e8a3bff5310801d59c7bb296a72c5fe8ec7c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4654e8a3bff5310801d59c7bb296a72c5fe8ec7c commit 4654e8a3bff5310801d59c7bb296a72c5fe8ec7c Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:07 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:30 +0000 ciss: Fix typo (triple T) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/954 --- sys/dev/ciss/cissreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h index b9dc10fbf478..9e7434b74291 100644 --- a/sys/dev/ciss/cissreg.h +++ b/sys/dev/ciss/cissreg.h @@ -684,7 +684,7 @@ struct ciss_bmic_id_table { u_int8_t percent_write_cache; /* Percent of memory allocated to write cache */ u_int16_t daughterboard_size_mb; /* Total size (MB) of cache board */ u_int8_t cache_batter_count; /* Number of cache batteries */ - u_int16_t total_controller_mem_mb; /* Total size (MB) of atttached memory */ + u_int16_t total_controller_mem_mb; /* Total size (MB) of attached memory */ u_int8_t more_controller_flags; /* Additional controller flags byte */ u_int8_t x_board_host_i2c_rev; /* 2nd byte of 3 byte autorev field */ u_int8_t battery_pic_rev; /* BBWC PIC revision */ From nobody Thu Dec 28 03:26:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6p5nYNz553l3; Thu, 28 Dec 2023 03:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6p3L0Lz3dZV; Thu, 28 Dec 2023 03:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Azjrz0ksq3zIpvGXt+2iEWEFev8IPM4z9OFp1qAGSDo=; b=nhVP4u+V+ZAOrNKN2o2xtlV4PBSv3M7lbVFRkKh2cKeU80JTRBLQfjBiZpgV13m9ahR1wL U67usxr11LfOSEeuRPyzxDdbK+mxbEAcfkEmRi/Hkb72/U+38IDP8SN2OZ55RKdPmf5tg/ h1SVdlbzuVKzLXH57ZJFaAS3UOW8gT7sGu1sq2gSY0aKnL92gAg1pm6syyEuRljsR0cSac 8EA/oVwWpKKHM2wHiiY3UizkHz/E9GIqlq3sw9ZwH8TUH9S/TYp1T5sUiOQSc0uMOcSxei T3zRzUWWdrRORsj0FY6zwseupT/KQmFQUQkjhnR59U88BdvoTCAwDdDjEnwoMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733970; a=rsa-sha256; cv=none; b=T/RgoJwuIAyUFVnVnPI/k3BSP1M8pHaPyxou0usw72mjgOuuQ3fAcbZdQ1anNBHZ8rU4VN J7kh5LosYwUhoT+6yEWBAc1dw6acwh0OsRpvzgYz2IQ8dgJ7YppWgwOM0WygeXBCEh4iz6 KnNAk26QaP19dibbzblMnxR94+6e5oyEqFww5U8o8tAhVXWQqjYbxwOUQuYNOa+LPOdXqw 1NIreQ2pvNq993rW5UW029IKtk6vz7BB6enjDCX6WvcU3Z+oLext3D/mqPhEZFbxu0XYsw zUdtv42ftKz+FBHA7R1pRGQ+73zn5ZGeHpNxNJQ8hXJyvGJvNwJ3U2Yl9Lzv4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Azjrz0ksq3zIpvGXt+2iEWEFev8IPM4z9OFp1qAGSDo=; b=YdnQNb8iEB3qzvRlTeI8uTzsEWdLLVdPb/qoj0fMeDymrIegpNkuod3xJ0LuiHhKqLqszG zAaDPANpfHnJKSMZ4YSraUXjsYpJ6+8Nr0Uz+NhUlmLyZVR7ZCjPlOBUwbZXkR3/CV29Qq TYiw/FWVihfj5ECHmYH07MnmOkl5rpdRFrNSp2cbkEkg8y2b5W8y201Q4/6BFpkMJ94owg zpXnx3QlmcjyqobaTmNHL7f371pxaD+QFmNm0BzVOFnUHFkjOJssNmik9UQfgAQ5V2v9Lq 65HomLLJqJ4akki2pu1X+Lqvn3WTaWTPY6w1CkGs8/xhcV/VnBcs3zhpwHQRKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6p2MWlz15K2; Thu, 28 Dec 2023 03:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QALZ077530; Thu, 28 Dec 2023 03:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QAYD077527; Thu, 28 Dec 2023 03:26:10 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:10 GMT Message-Id: <202312280326.3BS3QAYD077527@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: 186034134768 - main - libdevdctl: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 186034134768ffc5968a266be37fc99feb652fad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=186034134768ffc5968a266be37fc99feb652fad commit 186034134768ffc5968a266be37fc99feb652fad Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:15 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:30 +0000 libdevdctl: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- lib/libdevdctl/consumer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libdevdctl/consumer.h b/lib/libdevdctl/consumer.h index 8ff14392ceb8..d0d814cff1f9 100644 --- a/lib/libdevdctl/consumer.h +++ b/lib/libdevdctl/consumer.h @@ -98,7 +98,7 @@ public: /** * Open a connection to devd's unix domain socket. * - * \return True if the connection attempt is successsful. Otherwise + * \return True if the connection attempt is successful. Otherwise * false. */ bool ConnectToDevd(); From nobody Thu Dec 28 03:26:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6q67NVz553qf; Thu, 28 Dec 2023 03:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6q425Bz3dht; Thu, 28 Dec 2023 03:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRIgtpULAPNMdp5nfWoGewGPigkvcwSwsp/qH2OeIrg=; b=CUfjgC8AVcW95ZuBQ2Sf5z8Ix5eoxWkoUwI8aneVn2mULwQ4/4Wu9H/r+1m9REeNCpj2yC l3FqI/b+q9OJ2q8Jfn7NA9vfn5rMK9qAr9zR/qVaCNHGR3YOgpsJ99E+N/o0JEuKbFOM7o jN0QkEY/3fpQpCO+khcov8C8za1EwIYjXI+waQ5d0Z1nOvuN2yywFu0TZ22R4jm1B9ccZp 99aqO061uxk0OSIcJPbX/48Ic+LBIUVaxRDOMcRCjl+JkyMtYLAQamwBdKVZWgS2nMQXlB Hzu8sLJjSOxOGowPU/p6Lzt6/LBZ0iZ+KGakRs6YxzBvX/nUn7Tb/AECN563Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733971; a=rsa-sha256; cv=none; b=HdDZDnEsrHfD24ve0y3XP6/bYlhnFTTIHCLIzC4eLeRxjM8oYqkbsZ0Ge2Dabg22/3nydT 5u1zV422TE9jhmoWXgCYJgxlctiyWnNhGaX1prp9CYkz66BCOO56dn9MUQFWe1y2ZwMqy5 xTFw+T6W5hcRIhAVgJSu7/mHUwPglTZa9cJruD90mCATt4klIuoE0Kq7at3c+xkMsOPsk6 4S0aekeo33DOXR/AuS/dc6gCA/jiBQVfruyYeCWdnsiXXVWocq/LBm5kDI2vCpFDEy2OPk ilqWan/FpHG0+Cq+iv/1jMfhbhZGHUN8UjXvbNfEr0zsBOKTITkEf+h6JVnYcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRIgtpULAPNMdp5nfWoGewGPigkvcwSwsp/qH2OeIrg=; b=UTZsvuX41uvCZypFNtzLW/HTg4ki5OnnrKh0DA4jhrkIS/l5RlmzCO9SrlvdwC/c/sA0f3 IabLEIuRRqyF+saYRw/Ggs4e5b0hRmlt51eCmq8y/aoN72bvQjW4rGFEt09K9NVKQKEKfw 1eg7BFS5XOdNHLJvGI3HBsaejnm8ERipUHHYwRUaw1JbC+krvqm9WkQh3ecXl0P4BnA71X eQ84Esay3L2dbXcz0erJZTDj3jh0dMHmmadvd0JsBXUuOd33g4t0ngp7awu+4rWm1sq50H CavzIdd3/vQUYodAyVL4fFrgrQZp9lJeQtkiWP+3wThtMVqyH+3zMghXMHNMGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6q37Nrz15K3; Thu, 28 Dec 2023 03:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QBZG077574; Thu, 28 Dec 2023 03:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QBJS077571; Thu, 28 Dec 2023 03:26:11 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:11 GMT Message-Id: <202312280326.3BS3QBJS077571@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: 8aa5bb0ef205 - main - netgdb.4: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8aa5bb0ef2054255c7517f104c45c9435e7a208f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8aa5bb0ef2054255c7517f104c45c9435e7a208f commit 8aa5bb0ef2054255c7517f104c45c9435e7a208f Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:30 +0000 netgdb.4: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- share/man/man4/netgdb.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/netgdb.4 b/share/man/man4/netgdb.4 index 6aedc64dabc3..a86431fa129f 100644 --- a/share/man/man4/netgdb.4 +++ b/share/man/man4/netgdb.4 @@ -66,7 +66,7 @@ At this point, the server proxies traffic back and forth between and the ordinary GDB client, speaking the ordinary GDB remote protocol. The .Nm -session is identical to any other kernel GDB sesssion from the perspective +session is identical to any other kernel GDB session from the perspective of the GDB debugger. .Sh IMPLEMENTATION NOTES The UDP protocol is based on the same packet structure and a subset of the From nobody Thu Dec 28 03:26:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6r62GVz553ql; Thu, 28 Dec 2023 03:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6r51Ldz3dXM; Thu, 28 Dec 2023 03:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap1cI0GTHYePo9hon+zWTJNJPXOcLOgbcvJUHruSsN0=; b=MIZaLXcVN5K8TOFB5844jnDNN7ZgQimYg+NhRCbW10JXztXDyXJMNvagWl/9xfZiSaZ8a+ cOQMnF0wpsHvXkvLmcWeqF1xJ02u1lEAWJuBuzCihll6ZyvWiloEpdROhWkOsoOu2XvB3W D777lTAFbuXGuGXeeymZrLc2ibF0jONBcPJL3AeHEUsWcvSmgUYq+KjH5hM/6MJH/m+VEw Ltij4XxCRjTAvIcdCZNgMDQggHSb0wzsfqAjYaTtX5CWPhYwaJi3wqgNYiDd/r+5C1octh rDp9AmoJj9TmReuJ+fpIPHHpFQyQqOlJCF/QMfYL+Fsq9E3n3qksoswF3tUa3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733972; a=rsa-sha256; cv=none; b=TKE8HI27KAvcyT2iMX8wtVh8MEcaRM0fqLRYYhrieookLF5wRQLdgPtUjgvtyrtmqz4DGY YNekEsgUbMuSsuPAVaR6xGmlYROhWHWGzPnC9Zbm3IrTmZf2oCeCqkv5rOvPJS/05iOB5C FxnSSGVHss4bk1vE9zkwNnTEkOHf0GYSpuzppsmE7Iw/drDG/oQI39TgOwzQzP9GWjVBo9 otKnKPd6g/Yk3ZmLfjqAxjYNsmMKnoky0YKR29oqcYn+O/fCyQGmN1w9n7djg07w4P5GMx BN7rWxcatJjRx1Y9dTxnR1MfbNopGC17pk1sglp8GUCrjHeQqk8ozV5V3mUw2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap1cI0GTHYePo9hon+zWTJNJPXOcLOgbcvJUHruSsN0=; b=T570NWlN8F61CAs1Za8EsO/fJTi3W7B0hkzPxDJrNoE6VGXnCKhWAT+zy82O9cYeRIqAXp IzUlU4O9tnombPcyqu3OOeyYYPVBbX5DwUc5+Upf1gP96kpQaqKIel/OnFVoBKp6Y/KvTT qh5Wb8y5r7azntGdVDQmRWb41S7ZTozjL9sHxk+rZ2K6E6TgWGLLAE498iGmSYV+aKDOex J7GCJuOZr2z/24DTfA9jHTWIgXWs8HIc6IQy4Y+mkeJL5dAy5Joml1c9UPFmmB1snzRMzH vlKz0ENCxYnWqBcJPbw2BNPhpPZ8byjsbBGXpQHw/HraBPU+i1gvu00d7zq+oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6r46bsz15WS; Thu, 28 Dec 2023 03:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QC44077616; Thu, 28 Dec 2023 03:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QCgA077613; Thu, 28 Dec 2023 03:26:12 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:12 GMT Message-Id: <202312280326.3BS3QCgA077613@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: 2d3d29c29c12 - main - security.7: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2d3d29c29c123803278978a1b9dfc62be39339e1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d3d29c29c123803278978a1b9dfc62be39339e1 commit 2d3d29c29c123803278978a1b9dfc62be39339e1 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:30 +0000 security.7: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- share/man/man7/security.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index 71107b29ba11..ccbeeb4575ce 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -1050,7 +1050,7 @@ Controls mitigation of Special Register Buffer Data Sampling versus optimization of the MCU access. When set to zero, the mitigation is disabled, and the RDSEED and RDRAND instructions do not incur serialization overhead for shared buffer accesses, -and do not serialize off-core memory accessses. +and do not serialize off-core memory accesses. .It Dv kern.elf32.aslr.enable Controls system-global Address Space Layout Randomization (ASLR) for normal non-PIE (Position Independent Executable) 32-bit ELF binaries. From nobody Thu Dec 28 03:26:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6t0hDjz553Yy; Thu, 28 Dec 2023 03:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6s6FdBz3dtF; Thu, 28 Dec 2023 03:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M2Yf98hfhZEw09fnf7aBiwSE3xW4xYGZH2VwzqYLv7M=; b=O1jYG/FuROZV+IBDtjmcMdDnwwOnnSPL+pfkEXTygWaHkp3RmgF6teFHFWsdhYOehG4I3E qDUg3Hdb6V8iDhRCpWRoNAO5mr0ICRNS8Fj2QDRTItyfZhekZfDxL9bFmApfG76I5PCi9V Ss7Y282cIMHSyNXCLYwJqvDyoPMUMBbtzRTX75G49zhFjZdP5IAaq+8+EKv55c1t8yJicE CjE3Ie4Y30WYM6tGXn62JDHKTYXlFG4w7GGTqPkHZgumbai0CkC330fZPKXhtnX+XE+trZ gY1ybXeiIc2iV43/dDas4FURQMyl07PVqRuxhfBkCMs6j9EBZetkLsdJCGZDzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733973; a=rsa-sha256; cv=none; b=DjU7cQWFRuR0GLtRZ6HMskKRxK/CscAZI59zXtNTHOBzVnAdxO8deP9dl/t38YYTtvNQ7+ wj9xnWv5DPYuS2i0rmmCEiZdWo2YOQ/DVR9G5rVSyKMYBXfHeIvuA7cTgbPhYVNk6yTi+C EYCJl9wW5+dh3u/FtqsT3SykRzuCX4K/f527C8NQGRHBKSyFM7NA39TY7QH1DZV98jHXcx Ouh6v/JZSMS+Cc0GlTB0Hjc2Jo8rPdwXgxtpmIW+94TMh40/QGT582nDzp25+cLWq5UMd5 /MfWoSpYBGdN/sV4b4RMDbiISUvMDwCJUf7hwBuscg0do74Iqgo7B34SYq8QOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M2Yf98hfhZEw09fnf7aBiwSE3xW4xYGZH2VwzqYLv7M=; b=ai/O4Va84nZSiFZ6ZkuDqZqtcL+mW0I3ZUWvDc2InZOeyEKMJOb+BQbEpGMMtrmHeWuOrE UHMFca6P2EU3fRlDc/RUO5Dz0qwaU2EhdUDxgySlQ/qjJLD8mMP7YThj/onsKSapYAQYsD NOXp3P4PBd8nncej1X9eawXQqDoOi12OuZuo1Nxc3Pbvkw0vmpS4r5iRbDtEjmOzu/jvHE E/h5yvS2+iOtnPfFGmMdkjI2V3JFyASmp5pnqXMmukTcYluhH/qf1cxo5WAKaNk2pgYqkk iWNAhMLWrdJ6kMOfIKSSoJNi0P1HD6Sm8oCDO/6+mxh4WS1CfIf5lurdXhv/dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6s4zRPz15n1; Thu, 28 Dec 2023 03:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QDFJ077658; Thu, 28 Dec 2023 03:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QDqW077655; Thu, 28 Dec 2023 03:26:13 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:13 GMT Message-Id: <202312280326.3BS3QDqW077655@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: ed76a9506aaa - main - stand: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ed76a9506aaa81426ded64bb0e1f96c6509c32ea Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ed76a9506aaa81426ded64bb0e1f96c6509c32ea commit ed76a9506aaa81426ded64bb0e1f96c6509c32ea Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 stand: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- stand/efi/include/eficon.h | 2 +- stand/kboot/arch/aarch64/tramp.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/include/eficon.h b/stand/efi/include/eficon.h index 39855b8b0725..3196ef4b4bf5 100644 --- a/stand/efi/include/eficon.h +++ b/stand/efi/include/eficon.h @@ -485,7 +485,7 @@ EFI_STATUS Returns: EFI_SUCCESS - The notification function was registered successfully. - EFI_OUT_OF_RESOURCES - Unable to allocate resources for necesssary data structures. + EFI_OUT_OF_RESOURCES - Unable to allocate resources for necessary data structures. EFI_INVALID_PARAMETER - KeyData or NotifyHandle is NULL. --*/ diff --git a/stand/kboot/arch/aarch64/tramp.S b/stand/kboot/arch/aarch64/tramp.S index 9304ca325299..32616f239c50 100644 --- a/stand/kboot/arch/aarch64/tramp.S +++ b/stand/kboot/arch/aarch64/tramp.S @@ -37,7 +37,7 @@ * location with the needed alignment, etc. It does this, and then we take over. * * The linux kernel will helpfully turn off the MMU, flush the caches, disables - * them, etc. It calls the tramp with two args: FDT blob addresss in x0 and the + * them, etc. It calls the tramp with two args: FDT blob address in x0 and the * EL2 vectors in x1. Currently, we make use of neither of these parameters: we * pass whatever dtb we think we need as part of the module data and we're a bit * weak on hypervisor support at the moment. _start's requirements are all From nobody Thu Dec 28 03:26:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6v19thz553c1; Thu, 28 Dec 2023 03:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6v042mz3djY; Thu, 28 Dec 2023 03:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=40VIJFyv/YEn4+7IRhjDwgSFpKpw1NvjUEMlGj9e/U8=; b=L3qDl4fNSYxDUomRlJ8uqHtFV52yVKkPRhxP175GPTc2n0/ekPP3rNdk+VBl4hbN6RJOls drcLXWrqr47dWha9Qfcr2QpmgLRkcg3SBbvlg/N3dXyMIIpEZ4PJMwbGYjb6P9kB44HOlu 3yDPFiAmZXugVzFt72aNugMgqrgP2T5PCT1JfJVTvcYdOyzDU5TLhTdn1yPGE7viWx9XQ6 tgGPYKKi9rD8V6GSzsVDNHgiPtmpxzChg2jvcMfyN4PYGQHF6KcZmAOeiIC7+jo2WoRK0z SfKBzvdxjCzcILwmZfYXifRMl5R2xQmdqawI1n5SY0WhafEUMeIdtQwphprTEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733975; a=rsa-sha256; cv=none; b=fQqgjFp9vQbGeDbR6uBdao2TZa9BOTCBBTVUq0++tTuh4PtEKEs62a52Xhy2hrpfoJsKf9 s6yGbhUKzwQv7BivOwqU0emNjQ2pDDriecj8+geKjUgIQyFsG0vp7wlLMijvNkxU7iP4fc 37ZriDgrLzUmbf/bFRzi9LPB91CCDUiGpSr6uCm7HBeYDM9EiKhm3PNkmgHmbZK+z14b3B eUundUDXLmMOyYxkbS2R3jYBwsHpMixGL9ubnA7yMMNyH7jgPtWpgM10moVLfmQtkDkciQ piy11H0TmVw2kmfrOwszUweXBnwQ7N+YwcI8AJv37Kv9lqHmhGe9UMzHWaJddQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=40VIJFyv/YEn4+7IRhjDwgSFpKpw1NvjUEMlGj9e/U8=; b=PVfPCOgOUEfkc++yJIvy8sWO7rMhzpDZBPxe/2qmmd7O/5VX6Q4gCqcRsQr8zccleVtt68 XVs6XMsllpBcSy7BLR5UKZWdP85QSoIasOLgq5mdpjKhb0RODxxRqb0H/v9V6fMQg8e7Vy kTIk7Wza795z/O6AZnUIe/KWAncvAjn9mMPYKd0Dj1/PxrCag5BhDpC3lLRWnQfoOSArrt AvnQp5ILtfP2vjQkDxGsGhT+CSkgEwQJ3eVMny0zZtC3zQeEzBnJrwnzpxgWEy0QTFmGNd aY0qslWRJDIVMh0j7vXDpjvx8bW89fJ291MeYUPu1BwFdU/Oi3JvBqMHMl6j9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6t6H7qz15K4; Thu, 28 Dec 2023 03:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QEvg077700; Thu, 28 Dec 2023 03:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QE3X077697; Thu, 28 Dec 2023 03:26:14 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:14 GMT Message-Id: <202312280326.3BS3QE3X077697@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: 3511dbc2b1fa - main - arm: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3511dbc2b1fa396651876f427b82c474cecff1e4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3511dbc2b1fa396651876f427b82c474cecff1e4 commit 3511dbc2b1fa396651876f427b82c474cecff1e4 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 arm: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/arm/arm/pmap-v6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 47643c80d1ab..5d454f4e9e58 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -6481,7 +6481,7 @@ pmap_fault(pmap_t pmap, vm_offset_t far, uint32_t fsr, int idx, bool usermode) } #endif /* - * Accesss bits for page and section. Note that the entry + * Access bits for page and section. Note that the entry * is not in TLB yet, so TLB flush is not necessary. * * QQQ: This is hardware emulation, we do not call userret() From nobody Thu Dec 28 03:26:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6w2mPXz5546K; Thu, 28 Dec 2023 03:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6w0xn0z3drM; Thu, 28 Dec 2023 03:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1G6ELvFyDKX9kiY5FEMuAuAQIf7Fs1ma/+OY+z+Kpw8=; b=M3CITD7wZDWqyuNFbtpdbTiE+lON/uEF6XcQMJ8e9KoLeL5j4oo0VaISrJqTorKIBsPb9+ UTeKkR+Y04rwIXRAJH4ndahmO+jjnncD1onYqKrCHvDATNhyW/E7+0s0EwsPcdywKtT0si RnuUmbLn/3JHXZCs6ctS98nMgXeQZOGtjyUA1W649zjxgmm9tRzTpZAosddEkYy2GWpsLs DYxBY+KUEA5ZYNPJ+tMNyuh9OqMXlMX0Mevt1ddXcLA+Zak/sQVekU+7AUZUGq3t+83+7k EjTzoxfuVzEY0NqWRjdDQHoN4jYAqL/DXGqgJTQgSSnb4eWSOvH+tLXxZilSmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733976; a=rsa-sha256; cv=none; b=Oj0Y2amUEzWG9t5JeV2n/95we8xtE+sop1OE2kFrdrFq5uEU+GGJvck0Xnl2fwPw2fDm7U jM3DSEIY2GTkGlgfLrJtZQ9bWfNpaJAQxQaTRSV51ht+3W97C+oiPDl+mXn5qqAODEMDxQ jteEhA2TuBlaaskLmkKEqBo73bh5z6MecxVKGFIOKzBV+zMYxvsqMupmQgE+FnDH+7IWRc 2U4dPKpOubMYP1rQfEgB+vWlCLRNi26CWhb4LD5fzuny+vTMv7oFe0HLfZ6H/SBwbWJwdy g7+eNtEXSJ0yNwVFXJDqshkNo3lPYFsopGiKnkkkEsVd/k4IrrvFDLzrX6eeVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1G6ELvFyDKX9kiY5FEMuAuAQIf7Fs1ma/+OY+z+Kpw8=; b=pdyP0s5OfCUklSYMsRhn0S+fEAwNOwRHrhVnIUpGSotvAKW5BJzLoFkELqRm26pOD6NeC3 us3+qrtJn2oaG98AIl8IUt3CZyi8/HbwU+UnLUDx6C9iZFyWFHRx4YtQsnnhge8qm2GAmU SNjG8BacV17KplJNGQNjyw5TFxZTL/M4fvjqWzZ/83+MjqjoQNepBDKaiBnMx/Z3zJswis VfvfHb39oSvqESucuiKoo6KgnvHNf0slOdE6UcDrpiG/WWlpfiKoJbmQeCqY3reG0mwzqR e03S1m02eLjwKP6OgDhJmc9f3WtC6mE9q8mdaeMotUi4AjfxvX6GfbMT7HZH5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6v72xZz15MW; Thu, 28 Dec 2023 03:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QFWT077750; Thu, 28 Dec 2023 03:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QF2X077747; Thu, 28 Dec 2023 03:26:15 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:15 GMT Message-Id: <202312280326.3BS3QF2X077747@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: 4133afcdc314 - main - ddb: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4133afcdc314c6509c31dbb133a34386a59cc079 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4133afcdc314c6509c31dbb133a34386a59cc079 commit 4133afcdc314c6509c31dbb133a34386a59cc079 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 ddb: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/ddb/db_textdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ddb/db_textdump.c b/sys/ddb/db_textdump.c index 61d3b5ee6327..8103c028d52e 100644 --- a/sys/ddb/db_textdump.c +++ b/sys/ddb/db_textdump.c @@ -141,7 +141,7 @@ SYSCTL_INT(_debug_ddb_textdump, OID_AUTO, pending, CTLFLAG_RW, #define TAR_USTAR "ustar" #define TAR_CONFIG_FILENAME "config.txt" /* Kernel configuration. */ -#define TAR_MSGBUF_FILENAME "msgbuf.txt" /* Kernel messsage buffer. */ +#define TAR_MSGBUF_FILENAME "msgbuf.txt" /* Kernel message buffer. */ #define TAR_PANIC_FILENAME "panic.txt" /* Panic message. */ #define TAR_VERSION_FILENAME "version.txt" /* Kernel version. */ From nobody Thu Dec 28 03:26:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6x4BNWz553sM; Thu, 28 Dec 2023 03:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6x29TWz3dmG; Thu, 28 Dec 2023 03:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OrMuWugMAPDzX5xczHHYBRw6pq6XQDcVcAM4Q+HKLHw=; b=l0QSSUPt/U0KmaYl0q9PgMjfgf9HXRLPjT3RUhX6DViCJkbZOk7c0j4Rb4cEPL2oycA6Rw y41SaWAuYnNVhXvb7B2q5Pya8Aicq/lamnPtQOTB4dIVaebt78TtJXMJDzs9C9BtlS79i1 SKAj+ke957fobScVNSPYw8qA6N7EfQIXDjnjUdQ47OvUIA3UW7smxIm4u9dzPBv5PkYvm9 /zY2kiZD9rbs6Wi7q0wlpBCdLRZhbZnt9GCepL7VLO4pX7owJ8Lh9n45996zCMQ0vwv45h aNgYXDV0eEQZEfwaRVif8DKoXzWvvTXD/1hz2C3zscEBCBDfbPCQv6+aggegsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733977; a=rsa-sha256; cv=none; b=SeBjIY0e0VlOuSh5trDp/21t8HP1e6x8SLKLB1b1gs8IoRhp1o/NjIlCInkpJ1S5lLxWbo JYC7WNrJmklO5Ehyft1PMj3aKjo9+t5f4OadzFDqFGAFZl3jNrHtgN/HhXw+8OEt5PQQ32 94Mg+VuQ14gbe3l6pW95vnCFcD/sfuIowVK7CZumnoUglcdyiBfx1+82WZCINavbZuwNO+ FW4MrSCsrCgij0SGQnOfR93QLR/UT0xrcrDSplY+IG8iJvIbtgd7UfY8eY+6PpEiloNb/G pBz2ABSAOq7+9TBwP4azTlw7RfEZpVo4cMQjlUH6pdU3YqZpCdv2dBNXAGjcMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OrMuWugMAPDzX5xczHHYBRw6pq6XQDcVcAM4Q+HKLHw=; b=xGnGHG3g6FiXC5aoS49cn5FESJW8tPg6hIltDa8d9kHRG3WfQT+5O68bCTaoKuF1ZDYF82 XsGeFfrTKwvfwB86xCFNdTEhO1yfix79EW3lM80F7vmXcJt8LyDLDUCHS59icfejKlJa25 FYfqGlMH0EXdogB/T7dEarDWbXcTuKVKZ4RPIPqLHX2TMKEgvGMBlgk27tLDCIvjhZPFM/ RRbvcZoWGS+pj8OqN0DMXtoF0RXwTfxWa9N83XwK91Eo7Uj4s1dtSh1YZjagGSScbcVhbh o608Rakb8qmvkSSv74FDPb2CTsw/ptFe7/6nVB8cEO0aM/Cy6SsL9grVoqLxMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6x1Dn7z15WT; Thu, 28 Dec 2023 03:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QH95077792; Thu, 28 Dec 2023 03:26:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QHZV077789; Thu, 28 Dec 2023 03:26:17 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:17 GMT Message-Id: <202312280326.3BS3QHZV077789@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: a3db639a9af1 - main - netvsc: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a3db639a9af1b53ba7244caa2da09d23838be6ce Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a3db639a9af1b53ba7244caa2da09d23838be6ce commit a3db639a9af1b53ba7244caa2da09d23838be6ce Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 netvsc: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/dev/hyperv/netvsc/hn_rndis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hyperv/netvsc/hn_rndis.c b/sys/dev/hyperv/netvsc/hn_rndis.c index 790c033cd296..a5a9f54c708f 100644 --- a/sys/dev/hyperv/netvsc/hn_rndis.c +++ b/sys/dev/hyperv/netvsc/hn_rndis.c @@ -889,7 +889,7 @@ hn_rndis_init(struct hn_softc *sc) if (sc->hn_rndis_agg_align < sizeof(uint32_t)) { /* - * The RNDIS packet messsage encap assumes that the RNDIS + * The RNDIS packet message encap assumes that the RNDIS * packet message is at least 4 bytes aligned. Fix up the * alignment here, if the remote side sets the alignment * too low. From nobody Thu Dec 28 03:26:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6y4Qv4z5548v; Thu, 28 Dec 2023 03:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6y2q7Kz3drv; Thu, 28 Dec 2023 03:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zX8onccRSnbbeypOQ1jtcruxylyYWxaQ8Ak9aUnycDM=; b=HQp+v4PvavqZlwLWOar6mg9fghNyUaVIMbHD1RWt1f2icO/ZiKX6iJvAtub0Ze3puLXKNW 9+GnE4W3xnxmrVy13MGXn7Fo3JSTdZkDP1GtcXqieSKsuy5VYfz3ajTjcKIKNIceyUPhCG rzzNdW5967Hpf6wi/oWZhkPuVZRhO8v1uGixonuXtUAIJo1MpxpNtWhHBLYARR2sRVyaeK xa9tAPKZplU1hNNpRuLYYT22aETmGgbJFTXPEUU9oO2lvPyoQ/362uk3QZs7duCIdo29Ya NkpR5FsM8GKXbmvPL4ntyQUlON0fzMsYCCIeyUUTO6iD1SNe50JumplNEx6iFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733978; a=rsa-sha256; cv=none; b=Z9Aap7OSfXOoWV/t6r+9Gi6TaKC9N+ieriP7lHoRAQqPS9vUqK2FooEpJa6IEOITTEqKZg SWxyBHh5a38dAETVimTRexpgkjDzjnAjwK5cIi/HPrVp3t/m7yVIIqv9LcVTeXAcx6/McT mzLSD8ENvr9AG05TdXXYXZXuZdCj8tODrEgT9ORnzi7tAXYkRWWfE3iXXetoTY5vsjfRMr akZEblpycIJN+FKnwoF/yQtWAoJr4ycMgqL3Jvnxd9API8BOYCq+09RHvSDzmAM+WG7Nt2 XFRxlD0tUT45uwOi4WywnnODtPNfz+OMAX1jO1iO4kVLBq809BlWO1PR2xfmlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zX8onccRSnbbeypOQ1jtcruxylyYWxaQ8Ak9aUnycDM=; b=ZDJsWLQJ/GcKui93Qf3L19ls7r1HTQXv+JP1z3I61sd/RO6YxJ651mRfrzrZmkUSMR2n74 Usft0zVPjimOIFvlBGSX+HM7CqmFx9UTMuDtJ98LM9E+lVPqeTbEG4AK1KapM/L+UmvYKP oYXqyoqGhYJHbbU2VJtDE8gECJJ6oWlkaXt4InBsG46yfHJRaFi8bkbrfNCZ+eWPHgwgEO NY237FICQfhLu0T3eraYgB9tn10hPSqtqYDn/JaN4Ef5v6RcBV5yMoHVTYVJeUFw9YRvUE BRvjUT89iWnOXVwyTwHMB+thn6GfYE51U9mpvyQrC2am+6+AjnKtIy+PNR8tLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6y1x2tz1575; Thu, 28 Dec 2023 03:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QI4e077835; Thu, 28 Dec 2023 03:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QIwb077832; Thu, 28 Dec 2023 03:26:18 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:18 GMT Message-Id: <202312280326.3BS3QIwb077832@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: 00bc86a9a653 - main - isci: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 00bc86a9a653e5a731e1ac093bb56bf49745951d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=00bc86a9a653e5a731e1ac093bb56bf49745951d commit 00bc86a9a653e5a731e1ac093bb56bf49745951d Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 isci: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/dev/isci/scil/sati_test_unit_ready.c | 2 +- sys/dev/isci/scil/scif_sas_domain_state_handlers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isci/scil/sati_test_unit_ready.c b/sys/dev/isci/scil/sati_test_unit_ready.c index dd9080bccce9..cf87ffc68e2f 100644 --- a/sys/dev/isci/scil/sati_test_unit_ready.c +++ b/sys/dev/isci/scil/sati_test_unit_ready.c @@ -89,7 +89,7 @@ SATI_STATUS sati_test_unit_ready_translate_command( * SAT dictates: * - the device should be in a state to receive commands * - a stopped device should cause sense data. - * - a format unit in progresss should cause sense data. + * - a format unit in progress should cause sense data. * - a self-test in progress should cause sense data. * - a device fault occurred on previous request should cause sense data. * - handling the removable media feature set isn't supported according to diff --git a/sys/dev/isci/scil/scif_sas_domain_state_handlers.c b/sys/dev/isci/scil/scif_sas_domain_state_handlers.c index 8258afa319f5..3a4d3f0adf8e 100644 --- a/sys/dev/isci/scil/scif_sas_domain_state_handlers.c +++ b/sys/dev/isci/scil/scif_sas_domain_state_handlers.c @@ -116,7 +116,7 @@ SCI_STATUS scif_sas_domain_starting_port_ready_handler( * * @return This method returns an indication of whether the discover operation * succeeded. - * @retval SCI_SUCCESSS This value is returned when the discover operation + * @retval SCI_SUCCESS This value is returned when the discover operation * begins successfully. */ static From nobody Thu Dec 28 03:26:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v6z5KX0z553sS; Thu, 28 Dec 2023 03:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v6z3bnpz3dxs; Thu, 28 Dec 2023 03:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PeQ7CHVbJkkMaIlkoh/qvSB0TxYHpB9NJ4dd9P5QvoA=; b=ujUNTluB+3mY6XJS6inNQhuxntaJb1bE95qnaukk/bVkdrz8RXwFcsqSiLBUsi5TBOxF3g oDyifqThnFkCpmW7mDPfR5pZ3NK2FEL8nGGv87EE7pa+q+CdrK+/udOZdfxQyBXpMMg4Lm FTVZ7+NarUIdBdPfKFf+39LaVcztY0KoeF4pUVFObpAdX2htTLci58PzvcWZ7k+FrPVHHg u9Hs45D4FTMeKL1II9ZKLsBx7J0RZwl9Eo5mT0unog+T5ZM+Xhe6BEBAPCPSKqbHGlFAw6 qxYn9EVX06Bdv2Hjozmpy3zXPR059jtgZtDNj4BaCn6E9sJKy+fg4PQq6G4aLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733979; a=rsa-sha256; cv=none; b=r4Lkd6wuI1sWA40Qd2wV+xCo9f2s/OabWTGPwxhV62qBp0c9h4gbwZsz6hi0dyp+QNIUUM yg8AZv+HKrnA3ch9IvQx84PTi606YsECrpDpJJ5RNtDtlxg7DNZYyZC+pwozbRbbOG/Hld ngmFie0lbADbGGNvAF3u149+kkcL4sA5QfITs/fl9sloqPqvcU2WdxtfxB0DHK5eAFGNC+ ucY+mqrq5cZQu0fA4fnqm7F56e+h9W2hZiRTItKjkRROOZCXDYLha3me+JbYlpB2b0QsJ1 d0QfOB8xPf6dkAEHHhpsAcospn2NSTqEUdviqAcZKKIATbxOee3hKdAwcCsqOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PeQ7CHVbJkkMaIlkoh/qvSB0TxYHpB9NJ4dd9P5QvoA=; b=DRpqSSLiYRkLM7oEr0a4G/luRKo45HilQ20NLLNYzKlMwoDJbmpLcyn+T3anSUFqMjUL7G SOkl5cYV9t8yjANNjZxD+/oUkE5jGFqhJZa3V5ptMLX4YFoJ1WcH9gaqhQ2JBlT+fYi1xQ LUBWPxkvr+OAs5Tmc0eX9R0KXO2h0QOAAjl/C5+GXg1JKFjfxs3tbjpj85baUqcJsQBoR6 dfvXhW7zFwLcnEvYgQzseIZoMNw8bnirLOi9ZFm0fNxsDA4PLVauD61B3KpAy/0z33/g8Y mNtED0J5LFC/ajhJg2yHZ3p3rr/mvrx/8UB3TjgdU584YbNV06VRPt2AT+wuAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v6z2hKCz15dl; Thu, 28 Dec 2023 03:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QJJo077877; Thu, 28 Dec 2023 03:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QJGu077874; Thu, 28 Dec 2023 03:26:19 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:19 GMT Message-Id: <202312280326.3BS3QJGu077874@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: fb69997d3742 - main - pci: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: fb69997d37427c33292dabe8db992f4e84f4fae2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb69997d37427c33292dabe8db992f4e84f4fae2 commit fb69997d37427c33292dabe8db992f4e84f4fae2 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:16 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 pci: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/dev/pci/pcib_if.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/pcib_if.m b/sys/dev/pci/pcib_if.m index f4f16f466144..ce7c414978bf 100644 --- a/sys/dev/pci/pcib_if.m +++ b/sys/dev/pci/pcib_if.m @@ -110,7 +110,7 @@ METHOD int route_interrupt { } DEFAULT null_route_interrupt; # -# Allocate 'count' MSI messsages mapped onto 'count' IRQs. 'irq' points +# Allocate 'count' MSI messages mapped onto 'count' IRQs. 'irq' points # to an array of at least 'count' ints. The max number of messages this # device supports is included so that the MD code can take that into # account when assigning resources so that the proper number of low bits From nobody Thu Dec 28 03:26:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v710J8Qz554C3; Thu, 28 Dec 2023 03:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v704rF7z3dy8; Thu, 28 Dec 2023 03:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLP2nBs7ngxS8n1JF7gXiZteoeMMjT2VhyuwRv1a7Ug=; b=Z3xrDxUgU9EMbnGz8D4bJ/m3jVXQiASvBY2cEw1EIG8TOwy57wjJyrSSr/MHJAP2b1S/MQ 8qugBjtU5ED99eyrmfzvg3iKQiBt2PD68G8Ovo9ZrIYclcy8WzbPCVIEKO6TnomgcBmAnc F9FiiQOU2DJ79em5WGx1qzdF1yHfw1BL6zXgTgFyhhJT/u4XjNq//BLIy4rIqnv8lUiHjB K1LGa6zU0hqFRFGzb2SkveLgjQDiAeMFGaI+Rj3LDDnud9aK7lGydClFXD1+NmMDY3Lz2e srcvWWknFuZ/W2UH8oKVRpeCuvxulSla/n5QQp8ykMnNUJ9k7udnHbAWW0pcJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733980; a=rsa-sha256; cv=none; b=T7ui6HbiZ88CMM7kbhChbg7otMA7HpWjL7MZiuUijD2vfJzS6/ZNIDFbZECHfonbozkIIH Q6hczrEyeJrYx+hczeRoDW9kosWPtqo702qXg37KR1T9jokxFy8XqF64gUGo8IqVLx0P6y VMaHPGa6X3wSFsgnxXiy8km9mRVl56Z8Li5FvoMoykPEnlXzT0bOmRE/thG6otJKQ54ouq Lg8TJCkuYZiHFje1FlU8e3TrjzqHu/DJ6XglEKdblPl8n8poJilDw0ptQa2t0Q+ACcNPnC VGCSjvszGtKLUpbtXLbzTuL4y+/9O5z9HdB1ow6r49E4PayzChvOr8/ulXm8Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLP2nBs7ngxS8n1JF7gXiZteoeMMjT2VhyuwRv1a7Ug=; b=gN7LwiM0TpkGT9Ya2d5bXh4UyhgwI5bd0C/PZp6Vt5/k0QUtcm1iDhmY5cZSp2+giPlnmJ /yNwXTrs4eI58N60jeH9xzT7WGdkJuq09+85yuupxItoxVSMQanWdnM5QWD5LAK5V2E2Zj wQBrJa4GcQE8nGFzWGnkA93pbzYO3Cd2wQcPZrziu/PRAFPfovwucMSZl3xEbxr1X6B7cg tinqe3VKTb2S9/HgYCiuXzB2sxkdOZraQfMIcEjubraWs8IW719jHS4Hp8SToorjvvN5Ho bIXIH9Xrd6WXPDqSeUSuxJQCNkJFGIktXfxjrxC00KkKS5SbakfcQfjze2B1yA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v703xp1z14qS; Thu, 28 Dec 2023 03:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QKKm077921; Thu, 28 Dec 2023 03:26:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QKxM077918; Thu, 28 Dec 2023 03:26:20 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:20 GMT Message-Id: <202312280326.3BS3QKxM077918@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: 531a12d90d7d - main - pms: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 531a12d90d7dc547981a151e3e1fdd0c45e970c5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=531a12d90d7dc547981a151e3e1fdd0c45e970c5 commit 531a12d90d7dc547981a151e3e1fdd0c45e970c5 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 pms: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/dev/pms/freebsd/driver/common/lxosapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pms/freebsd/driver/common/lxosapi.c b/sys/dev/pms/freebsd/driver/common/lxosapi.c index 738eab0a9b9e..abc92f9307de 100644 --- a/sys/dev/pms/freebsd/driver/common/lxosapi.c +++ b/sys/dev/pms/freebsd/driver/common/lxosapi.c @@ -331,7 +331,7 @@ osGLOBAL U32 ostiFreeMemory( tiRoot_t *ptiRoot, return tiInvalidHandle; } - AGTIAPI_PRINTK( "ostiFreeMemory: debug messsage %p ### \n", + AGTIAPI_PRINTK( "ostiFreeMemory: debug message %p ### \n", (void*)pMem->dmaPhysAddr ); // mark as unused From nobody Thu Dec 28 03:26:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v7237mpz553b6; Thu, 28 Dec 2023 03:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v715rL0z3dw1; Thu, 28 Dec 2023 03:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFOQjvWvezjwhYw8rFvG2xbe2QQ2Dfe3h1vXkMU0Xas=; b=je+EX89tg2r1P7VtOqpxu36g/gPM38bNt5QR+2HewD/al72UZsA5wRRtwx3TCAweoeGCF0 xndebbRg0NGZRiAzJnH1Ts/UHJWoq3mO/PdKOhYmjMZQuZMBsMSyIWYGf9gsVN4isbERNu e7iAFt+7t2nCj9q74hhuwhOVOdBWM63Rc80npsb4R3CzIXDiL7szsvU/1gFzCowalbAIXa VMEuORgemD9DZaVPMzZ9Ws4pjVYnjj6XM+NIt8S2XCspG3VmWmQr10ZRShXKg02qHtcXEG 8jsKN9eZ151jw/bTnowGWGsEzx1HfNFl0XMm04V8wFiSBh4oQVrnLx8qU6i3ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733981; a=rsa-sha256; cv=none; b=CpifcXWLq9ZROfSIHD3nvfWb/gg+7ML8LExPuuT3+F0mhmjr/B1STjS5IIZhmDVQbaayKi agRinvshTmK3GRVx9AzMSX3JzEygNLIUVDg8KbNh7YgeG9HvPmnv3vc0Vl/6V096AtFwme pHKp5k/CTo2fj8aa00XiAHhoCCnnYtIgzKX3p+11tOB8V+bJgT2otaN/J8mjrai2QPEB6p CB91xYE80sAPlx9RPOk4uvhiJjD2fdXysMnYIqiD26UzXI8BpAn1J7P39wGJaoHjN1Phvl GTtnyKwQCJXRZSOc3FkZbtRBcEoo0vMkMBpq8/v6lLi98ctUAcVjSiN5B/G7Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFOQjvWvezjwhYw8rFvG2xbe2QQ2Dfe3h1vXkMU0Xas=; b=M2GtNHzMkI5hWQc9dDORUiNeqWjCZtKupDy0Ro+J13zVSWv3JBHRxEymLO8Cf2TRm+QUsw WfZUN7/ZMEzgTi9yrdr9jpkQdhFSSwpoMI1ZD9XPOD6MoBZYsldRd9w9i1U0mR98qT1Kok 04hlK17bdzvc/fUZBkKUC4lr8lKjCOViQyagZcMWmfYkuJGn6UEkx0WvAt7HKj2KGcdFeh uFgBiDTB4nqktc9CXbajaJVJhRdO7+8vGOqDwtDWe5hLEljYJbpK6d6Rnrg1LLvjfs+KCr BFm9Z7JtXUUj/Lo/CJZtpxrfTTkehPaPIXKTsf0OdwTeTUqQHsWDzTinQD2jRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v714xyBz15WV; Thu, 28 Dec 2023 03:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QLuQ077969; Thu, 28 Dec 2023 03:26:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QLK2077966; Thu, 28 Dec 2023 03:26:21 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:21 GMT Message-Id: <202312280326.3BS3QLK2077966@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: 6cd48617c43f - main - qat: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6cd48617c43f85372d82bc7ac90c10e0eeef3c98 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6cd48617c43f85372d82bc7ac90c10e0eeef3c98 commit 6cd48617c43f85372d82bc7ac90c10e0eeef3c98 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:31 +0000 qat: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/dev/qat/qat_api/include/dc/cpa_dc_bp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/qat/qat_api/include/dc/cpa_dc_bp.h b/sys/dev/qat/qat_api/include/dc/cpa_dc_bp.h index c9eef94e0a60..97bcf8c5613b 100644 --- a/sys/dev/qat/qat_api/include/dc/cpa_dc_bp.h +++ b/sys/dev/qat/qat_api/include/dc/cpa_dc_bp.h @@ -148,7 +148,7 @@ typedef struct _CpaDcBatchOpData { * * @pre * pSessionHandle has been setup using cpaDcInitSession() - * Session must be setup as a stateless sesssion. + * Session must be setup as a stateless session. * @note * This function passes control to the compression service for processing * From nobody Thu Dec 28 03:26:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v733cbVz553bR; Thu, 28 Dec 2023 03:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v726tkxz3dsk; Thu, 28 Dec 2023 03:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cwbyqQwGsIl3ZfjBiH9Vcj06+71m8hXwBb8zZntbEU=; b=Izcn33+hZTaTC7rSZfsZc/LJEkzSY5z/sBKBJXzwnrlKlsr5Qv9UKor73fV7J1ZV/uYm9c MWWyl626oeqUcwk1L1olJmjbM+bsY42kHipMqpsDI9vblzKU3+JXGHt37SKpBMDDesKCZv 3yu5D+NU88KnU9jK/FAC4de7CKjkmxMKHdxMR7WuJfUqE9hi2iR1IEySFDcAEX5xUn4Wv2 0OgFUdoqwRQa3dOfx82U8t2VrhY+wwQrfsMCuG1tNCeXg6LlUp8KHIp22bDxMA0oNj+VB2 fmhaJ2N05TO+J43CBEnqzK1I3Gkl1QFmfj67us8WY7ARMHvLzrsC/KJy2Lr0Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733983; a=rsa-sha256; cv=none; b=Ibw4/VwbqNbAv+Vf7cdYI73nihQzxMJigOJmPfl0jQTtUBYfZyaO/qT2OOAmDo9xiyxgDo XjTpy3yxj8SuxBghLe0xVgiWY1Jyi9U0hiNzgeieIW2mYdVM1wtOrIIq25nZbV+6DG7tER MIFPZ2sh1vkKYwXM0jE67B4WEwnC2HYaIfEda1BwFOfzl25sYkFCKnzfzo8hSTOSuGM0lk ycoy5xZ01ZWkAMlQeSdsbPtYuWCfxyY317Jpm/KWdQaeEzrMzeLHdeY1Z14tEnIgszguab MrlPNXIZc64Shhnttxj4OF2IeW1ZVMLKPlfr4LsAvgeOzIBbpr92R2V5kMOevg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cwbyqQwGsIl3ZfjBiH9Vcj06+71m8hXwBb8zZntbEU=; b=pv5vWx8xBW8EW+3+qqiIjbfWZVtWMTOhZ4i00bGnTbqcXsJknFHi97+DTyVMWVXnKSEkPZ 40fXgikFJhEhaoHnAyDeMaN5yq1MhKb2TPRleJ6fNcBYLl+U8cT2CuumgOnS5Askt5uxgv jFhHVWS6Pqna6JZ9ItrIxPIrx/BB/RQ4BgA1OgfRmjYNtqVlZelpSWMeqz50DmAQ1bFs+q 3HMwzWNfDOysrCwMa8oi1o0OhwxSKJkRebbzeK1pdNaKJfGeFr5YDVtK6aU1gf9i1pu/7J y2sES5V06+mDd5fS1EnDX+J4Qw0YX983RVS+3Oi8kHDUS6519j7PmQsAbcLFkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v725z6Bz15K5; Thu, 28 Dec 2023 03:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QMTl078012; Thu, 28 Dec 2023 03:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QMhS078009; Thu, 28 Dec 2023 03:26:22 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:22 GMT Message-Id: <202312280326.3BS3QMhS078009@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: 8b007a7435ff - main - fuse: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8b007a7435ff81829dd08799f009bf84a0bfafb7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b007a7435ff81829dd08799f009bf84a0bfafb7 commit 8b007a7435ff81829dd08799f009bf84a0bfafb7 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:32 +0000 fuse: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/fs/fuse/fuse_ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c index d86404da00fe..f1f9f801bf4d 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -608,7 +608,7 @@ fuse_ticket_fetch(struct fuse_data *data) ftick = fticket_alloc(data); if (!(data->dataflags & FSESS_INITED)) { - /* Sleep until get answer for INIT messsage */ + /* Sleep until get answer for INIT message */ FUSE_LOCK(); if (!(data->dataflags & FSESS_INITED) && data->ticketer > 2) { err = msleep(&data->ticketer, &fuse_mtx, PCATCH | PDROP, From nobody Thu Dec 28 03:26:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v742x5gz553bj; Thu, 28 Dec 2023 03:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v740j0Kz3dwM; Thu, 28 Dec 2023 03:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m37wT5bjbJR2u77d3IV016EYi0evA9S19u50YkZXt8A=; b=prEQP6W1xNBZMsNlh5sFvkcxpUOYYChY5UlE8u40LiKL22jVCB9lzHJPBn9eJQ5lMvgMYK xnUTvEEIzzzGXYjxpiqkkZLIckF/K8X8lVdJfvL25pmneAnMRRTukZNXeYESUUTJciaxGB 07S4GPvyqzSECjiUpyklItfC2QomX3gklO+uTsu+yUmaSicXR09E0qoDke5AzBLiMnOUNs KonbxZvNbcULPqs/5yZGperJl2DHH6rPEJzUeBH1pOm8Mna7xXgD8NldL2avrBRs96ycsf moLE6qIgva23lcxIXFOQZtdiOnLx7Q43hvAC9h5XmdU1v0wcdEhrOu5paj8V4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733984; a=rsa-sha256; cv=none; b=jV+5CvCk0hX1pbiZEiTAUK3b95LZEaqIXlMyGYsQZXtKO3LsnppFtPD16SZIY13RmNhKvM 37jRnnMgmvPWTD6D25mt40wSgjyVYHhFhRBBJb3yqCQFVS8djAagiOUt6byRZZWc9L9fiz A+XnvIXDYGqsW2wF1OC3h+WMZ5tkgvZTMsD8PzzrTYs7eS4RCjUztEabp/47UAZf5IPGhb NxqEAesOdTn1irsC6uhoVYxkleODBF4QwLy8iNmhFQuD6Md7HCk0EocBYUVOupp4mXlMnr cIofNinBykMfmCBGCrJWr7EzHPxkMzj9amVg1Exzo3H9MFG5ljYgzjcoTrx4Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m37wT5bjbJR2u77d3IV016EYi0evA9S19u50YkZXt8A=; b=baxqGQhxTotCwpSc1cwQEuj2gz9foHkm0D2hVVyHMMAA3V2uZJcjQX+/znGrUgJIsOQDLt r3SPaxlzourkxc0ZxNHo+gtzzr/8/q5ERMv9jfL9Bve1hD6MYM8zxSXMSwtPJ7jLQxlZZb QvvtsHsaeOHAqgBhmk2N7yGnJ6IJCBoRjGoAKVm54pG4UctJk1f7tbguld40tt5v1QxOqS AU/exxyRQvDse35vNK7Y2d/N7hmaPj9H4Q9tjm7D/j/nJHBtRcpUbYLzFHqsSW368+tefJ 6IqRBJF0aVTEMWcJWJMjiw+FEIjdHVgp+tJ4Knqj/rySPhFhAeIeLvxI9xXLKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v736p8Dz15n2; Thu, 28 Dec 2023 03:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QNxX078056; Thu, 28 Dec 2023 03:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QNxc078053; Thu, 28 Dec 2023 03:26:23 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:23 GMT Message-Id: <202312280326.3BS3QNxc078053@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: 3e8d8297473d - main - net: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3e8d8297473d3a7b51b40d83aab2c80ebf08b6d2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8d8297473d3a7b51b40d83aab2c80ebf08b6d2 commit 3e8d8297473d3a7b51b40d83aab2c80ebf08b6d2 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:32 +0000 net: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/net/rndis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/rndis.h b/sys/net/rndis.h index 4f8056e355a6..ba4bd85241b0 100644 --- a/sys/net/rndis.h +++ b/sys/net/rndis.h @@ -339,7 +339,7 @@ struct rndis_diag_info { uint32_t rm_erroffset; }; -/* Keepalive messsage. May be sent by device. */ +/* Keepalive message. May be sent by device. */ #define REMOTE_NDIS_KEEPALIVE_MSG 0x00000008 #define REMOTE_NDIS_KEEPALIVE_CMPLT 0x80000008 From nobody Thu Dec 28 03:26:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v764nS7z554GB; Thu, 28 Dec 2023 03:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v7635nwz3fKq; Thu, 28 Dec 2023 03:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCTv1OFW7XN5ByLfJxp+zb4Odg4jhBZnYtpOtISUmsI=; b=cl18K/wb4RfG7WfLvY4vyJ2nq4GqlSlVeVAwi9HZs36Kumgd//NppnOTuh0q+Ox4hoviC1 83g6wjg7gNAyqomq6v7Mu3wCRJHPgOg8un8CKJwE/qtFVZIoXR622yg94gvBqGSfv78NhB HarLMfKtZDwWc5qqBRVwVUv1ZIYL/bNmFwR2jr5Fv3vRTgnsse7/a+2z5KHQWYIxI93Xgi tsRFZ3mK8Sa0px1LLtZRePVl94/vtTJCnwjKotoZkmOzqdeBAzoy6cvy/m5W8JtJz8gii2 Gox5YwF6Y3Sfps47W4PFY6U5s5SVuk+rW+F9VBKNROnV9n1YiM9MTBHY4hucqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733986; a=rsa-sha256; cv=none; b=exgMtyPzpA5QzB2stvvdqxj5/4SZNaeeKgGq7wdYdY/0XoTxGK48WPTgZX931d6KhbbcrW otyq9VY6y9lfJqoooNmmeD8S9cdLGxGYKr0f3mvNNEDScbAkXGWFIHfDrpIR1wndQap33e /ckQb44JhADXyhOLYRE4xMrPKJnznJ0kzyxrdS5mp6KV635FvFemYo3A2j2MAGdlz7taE3 YSPYTv78vEE7W+RYZh1XLkEaBwM5xVPyRyEGFE9xCgmnBmRXYrLswwmgsKd1tiTVOJSosU XEMuGjrX1PCrXKLnpN92B+QZkuqV51tIeSjgrM9Rue0wgtq6ok0XZoSFj5oitw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCTv1OFW7XN5ByLfJxp+zb4Odg4jhBZnYtpOtISUmsI=; b=O9mzuGicxjUfm6Osn89rzR6KAwndbA2cqbEfvEd0KimllOIagl3ZlI3vNwCc3loqGq5aq+ yWEQJ6tNrY0B5Yo852xnKS12+ZfXQBNrqyKqR5ZkrTwAGroJaW3AR7+oiwaUnANhUvQIFN tzZ9nviYD+Yt8O8YK5Nf+VMK/AuuHY/pKYtqgYkaDZrri6KSFE2ERzJrq1rfsNLieUKxTk dx83DVz6PKaYm+w8wQx9s/Zo/b+ewfrRpjrDp1rsO7mNNySNHP+5Vm7bMGt5pqVBRhKCdi +I8pAb1ZkhWAn6qD2imGTkKwttHVnTtUDkH/b89KqKHEb5EjLMLnT6XdnYqdAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v761tnXz15dm; Thu, 28 Dec 2023 03:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QQsM078141; Thu, 28 Dec 2023 03:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QQda078138; Thu, 28 Dec 2023 03:26:26 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:26 GMT Message-Id: <202312280326.3BS3QQda078138@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: 9c5f4c4f9576 - main - sys: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 9c5f4c4f9576398f4a1819b72d4703e58023b85b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9c5f4c4f9576398f4a1819b72d4703e58023b85b commit 9c5f4c4f9576398f4a1819b72d4703e58023b85b Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:32 +0000 sys: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/sys/sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/sched.h b/sys/sys/sched.h index 9d37e8f0f999..fd84b987d9b1 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -213,7 +213,7 @@ SYSINIT(name, SI_SUB_LAST, SI_ORDER_MIDDLE, name ## _add_proc, NULL); SCHED_STAT_DEFINE_VAR(name, &DPCPU_NAME(name), descr) /* * Sched stats are always incremented in critical sections so no atomic - * is necesssary to increment them. + * is necessary to increment them. */ #define SCHED_STAT_INC(var) DPCPU_GET(var)++; #else From nobody Thu Dec 28 03:26:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v754WWLz554Lb; Thu, 28 Dec 2023 03:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v751s7Nz3f2F; Thu, 28 Dec 2023 03:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ELoc2SYliCh/8v5Ocr7uE0NN62u1OiZfXXq5SFYgtTU=; b=EVRKV+NmN9xgOzE9UxRO8KLmNRq2ttEMVZ6C+PbFhnZHStAboMBEWXW7wKybuwDdMyiVHy gcLZsS9CufYviQkyom/GNz2WoNtf6MSdrRmccoIMMjwYhJbbyy++8lDY9UrH0nHn/eXjBy gLEgqgGsVsA+IQ/PEdIYclztih+6vAdNdg1T04t1ODr4MhAZfSJDO6YT547llG88flGYk0 INunIeGwqs0Em4oku9HNWg0NPEhexSYfAok83h6aV2rSXV0jWSxb91Ez8ywP3aRjUi2dqB 0LEHYVOgsnfYxfsw9t6rYlHFs9UW5r85/S6Ng/Cy+vbs1H8RMP+nRdNpUMteHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733985; a=rsa-sha256; cv=none; b=kpTTXn/KinH8xzcTdjZYvxeSuOc6SdXchLU0vBJ3Isdq73pfRUdNJUWDpyKiz2GOUP6jQt alvaRnAt/013/pygV1ivpLRaNJdqgCBJG2xLPsSkOny4YDxGzJ6bXo/S12X1ilx+6Hc/od NUneOgTv6QM6QjXo49NdN9XQnINb/qp1HMo3DlLar8tSsmpvJLhZsYaiADi0K+UTeFEf9B D4JrnWCOu1f+QuXf17lRef0UKFf4uiCImj94VAeoawiqcUNcm3ViWlb3SDdKsMZen0BnUg eYvur45wjZP8VlyY52x+fj9vvx0ycxRxRlCVgM4hl3N4PR1ztd/YP37f42/x8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ELoc2SYliCh/8v5Ocr7uE0NN62u1OiZfXXq5SFYgtTU=; b=gNPTK3khFP2I+K/xqdKarcsvKjj+i6G+KEUwqbpRyecGL7y3yJvEh94AHxz7i5HZ+BGiU9 REPuTfjzB/TJN2s5/yzH1PZKlKzUqvR7ffHAQBl2w5nVwE+tiTs564euCFcsbM/atf/nsy acIMmMkJztA0MTezu1YeSTbxHqsRd/1q2x0dY6N7Emzc6xC8urAITucO5RC9ksK+ic/zOV tnBvQhhq1EvTAFy4B4TWAwiFG66NI4E4pqcQ64ACjQhSne69w0wV6F46McZtggVGP8HSrA rVngmd9DZ5zj7QsC790dDcLdk51q04h5SfkPPkRnCjjBpm3SdVLzMvZnDoecVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v750y1Hz1576; Thu, 28 Dec 2023 03:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QPBp078098; Thu, 28 Dec 2023 03:26:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QPBg078095; Thu, 28 Dec 2023 03:26:25 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:25 GMT Message-Id: <202312280326.3BS3QPBg078095@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: c43829a75786 - main - netpfil: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c43829a7578630e85a1a1772d70a03a056dc53e3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c43829a7578630e85a1a1772d70a03a056dc53e3 commit c43829a7578630e85a1a1772d70a03a056dc53e3 Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:32 +0000 netpfil: Fix typo (triple S) While here, align the comment box. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- sys/netpfil/ipfilter/netinet/fil.c | 4 ++-- sys/netpfil/ipfilter/netinet/ip_nat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index e2e688f43a1c..926c5176c15b 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -7890,14 +7890,14 @@ ipf_genericiter(ipf_main_softc_t *softc, void *data, int uid, void *ctx) /* ------------------------------------------------------------------------ */ /* Function: ipf_ipf_ioctl */ /* Returns: int - 0 = success, else error */ -/* Parameters: softc(I)- pointer to soft context main structure */ +/* Parameters: softc(I)- pointer to soft context main structure */ /* data(I) - the token type to match */ /* cmd(I) - the ioctl command number */ /* mode(I) - mode flags for the ioctl */ /* uid(I) - uid owning the token */ /* ptr(I) - context pointer for the token */ /* */ -/* This function handles all of the ioctl command that are actually isssued */ +/* This function handles all of the ioctl command that are actually issued */ /* to the /dev/ipl device. */ /* ------------------------------------------------------------------------ */ int diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c index ea92a8a05897..282a2bd82037 100644 --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -180,7 +180,7 @@ static ipftuneable_t ipf_nat_tuneables[] = { /* */ /* Inside (interface y) NAT Outside (interface x) */ /* -------------------- -+- ------------------------------------- */ -/* Packet going | out, processsed by ipf_nat_checkout() for x */ +/* Packet going | out, processed by ipf_nat_checkout() for x */ /* ------------> | ------------> */ /* src=10.1.1.1 | src=192.1.1.1 */ /* | */ From nobody Thu Dec 28 03:26:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v774vYZz554Br; Thu, 28 Dec 2023 03:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v773fqkz3fCM; Thu, 28 Dec 2023 03:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t+q1MqAnm0OvltCUP8L7b3YpGuPNxz3u9d30erPqCY8=; b=KmtWZ0Rw9a7QVeMYoduoEk8eeH6hia4rqi2wVfCdmuWWFS8N0zlW+Vnufzf4702nhl+IYX X8PdVii9aw8gAt8gyIB4VHHWcwnY1QCB9sX5UAWTyefuNNM1rDNxPfmNdpmLQoWUplVag9 tj49pKgvjhLwwbui53GVzgR+LOmUPwqaptF8e5E+yE/Lgg7uvfyHSXy2gBGHSSx6KJJ9df RZGArptB0QHpXca8DIcYe7oBtdc3pWgnm6W0D5FVrIoOAPj2erlVgW9aDaph6Tl4jYu+Rx LU6SZTEBh42g/rZgx4WoRGpfjg8hFm40duKitEhtX9HJtcxEfL6BV6T3kFsqxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733987; a=rsa-sha256; cv=none; b=TZStjPFyg0/wRNVfZN5GDpxTzPz2zj5XXFhaHxqafVJminH9ptDJv8A335HVkVCEr53GK6 YPavaK6SYu/WBePFndWn8UAufXYS7doFqHd469u+ZM6bLtUoTzX3s0WifqmJGag5yYEcQ8 biVTnMAOB+d5rvnbgQB8Q01gsIuyQKhoEVAyof/Eqb4+nZf8jkfyB5Jmg162MYfCA2tabM JIfX1lKGHQMQxei0KPkPoS8K5BPokinF6XmDh3q1jMA3L23bWMvjBcAMLEc3FzAFBtc7p0 Wiu4M8UDwivrcxisXVaV1cKcKru6GtpqJ5uqTNV0Xcxk75r00FMGoeT1ZZ9xqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t+q1MqAnm0OvltCUP8L7b3YpGuPNxz3u9d30erPqCY8=; b=TJ6S9lxSC4/1Cr+DfuYtjfiZT9q8H+CwSMRrjuQl9gj4Qqor8/BB7I352UDQBfiAM/UCFI QHNK3UM0J1yqrMilJs2XYOfgHaGvKhVDvZdp2xAANc4iaAShJ6mp5+j7lBEFvmRgS48jDz qhXIx74zCQAmKSGryAbvyPofS5+qjitPREQxBImdsgm/JiGf8jsPqTNnPjPwEhLErleHoS FREZkwyxgEqmAM9p838WKDEKf1d+mgGVWk89mDmDxBtpOHecBvAX9kkmbyJKGeJPOjtkUK Gs6mdEwrcHAFv/LXH9RfK378PxakeBlJME7L5vUsTfibMrfzakYz6b2UP3hYCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v772llRz15K6; Thu, 28 Dec 2023 03:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QR65078189; Thu, 28 Dec 2023 03:26:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QRDo078186; Thu, 28 Dec 2023 03:26:27 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:27 GMT Message-Id: <202312280326.3BS3QRDo078186@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: a6889c1d5c75 - main - bmake: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a6889c1d5c75a77a840e1d7036bd595c01eb8c0f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6889c1d5c75a77a840e1d7036bd595c01eb8c0f commit a6889c1d5c75a77a840e1d7036bd595c01eb8c0f Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:32 +0000 bmake: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- usr.bin/bmake/tests/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/bmake/tests/common.sh b/usr.bin/bmake/tests/common.sh index 985370798ed0..fa078ef84c4f 100644 --- a/usr.bin/bmake/tests/common.sh +++ b/usr.bin/bmake/tests/common.sh @@ -56,7 +56,7 @@ ensure_run() } # -# Output usage messsage. +# Output usage message. # print_usage() { From nobody Thu Dec 28 03:26:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0v791FxPz554Pd; Thu, 28 Dec 2023 03:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0v7857gJz3f9W; Thu, 28 Dec 2023 03:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkqPpl+lIuj3bm9fqzBQ0pE5p/nQN/caHI5j7mPjXfw=; b=QBMRkmdulBM6pNujg/qQwLzMsIkulVm+Ar11r1tBITMDnYgEBrO4MA+k7HHPEgB5LbPhil 3HYp/hkqW/wVM8+3jwmi2DnROdNm2tUdywUvv1wt1SLpa1fZvrS5jxExXa5LLXMlhItDEU 71XLIDfS1I0ob7dSw0g3IJWFPboZ+zhYVdzG/1o11eE0Vyw6iPcOD4hlTw1tY4joKObNIg N6GTvwB1XOvx5l53K3jXIAGCIpFuAoMRRKoNlRptr8vZdNCPplWPglYrBu7TzfKThNAsnS nvfMJWtn76OZ7xlrTlmGAxm05oFc2nElje9RZqaZjL4KKc61Ml7Rdmad8mmzgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703733988; a=rsa-sha256; cv=none; b=oEIrhJkwI6BiXnnhr7m1/fJ5CSx4ot+LBuqrzn6k0qOthPC17kJBaNxzUn1U5urBg+2YaW uatUwn6IUzesq1hAUbcwxIY3OHCom8DAqNRfr+nyc6cbqMD5JcOAn6RW+6tKKkPJhfmrij mJgdpNmBPUFOjz3DuSbSiGl5rgA055phFw20bP260oitS72qhz8aFHLDCzJlpSxDKcEXAm Td6dzFtVyLcpaI3orQlu7DV0ane/U0PL4c4uIPEO+ONedTR57XAAXJSo8NQd6u+6yYoWSo HcO8L6UqtFY6Qox6u+oO0N2LtVW0qAf3dgPpxxOptEZLc11wvr6qbKmEKhYKYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703733988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkqPpl+lIuj3bm9fqzBQ0pE5p/nQN/caHI5j7mPjXfw=; b=un9nqb6tKUYv4Y36Vyl+c10ezNf1Ztb9KhBR/uB45eMrtzkyUcu4O9IiWoofMTbRuvryZX LPFVQXDpjO5Uq7tORD32fa+Enx/S6apU7hm1qQ6sPY7QiSHZUNseAj1ZBb0guz19We8HHP MIxxvLGdQguQBkanUGdjqJEaK3iL8mCX6YtJ8obZfXV9OuwdDr+ykNYmcKXMm+1ZqD8HQ7 qqPo3iBl3XBbv8yptKao78V5/Nvdh2KRuYn/btdOkHpX+qJiprvewXiQ04rsfsZmzIu8nx 82Ev6hceR+c65qpUUnTvUnwlJ5FyED1Nw61WY4vnkut4DapxweeQ5ILg2eHifw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0v783s9yz15MX; Thu, 28 Dec 2023 03:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3QSJn078234; Thu, 28 Dec 2023 03:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3QSPx078231; Thu, 28 Dec 2023 03:26:28 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:26:28 GMT Message-Id: <202312280326.3BS3QSPx078231@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: 0fef54255be8 - main - route6d: Fix typo (triple S) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0fef54255be870c2e1f7dd78b49bc326eca0c15c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0fef54255be870c2e1f7dd78b49bc326eca0c15c commit 0fef54255be870c2e1f7dd78b49bc326eca0c15c Author: Jose Luis Duran AuthorDate: 2023-12-28 03:17:17 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:24:32 +0000 route6d: Fix typo (triple S) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/955 --- usr.sbin/route6d/route6d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 07e721ad01f6..17b985fac2c0 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1686,7 +1686,7 @@ ifremove(int ifindex) /* * Receive and process routing messages. - * Update interface information as necesssary. + * Update interface information as necessary. */ static void rtrecv(void) From nobody Thu Dec 28 03:42:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0vTn6phNz555wf; Thu, 28 Dec 2023 03:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0vTn6NDLz4JWs; Thu, 28 Dec 2023 03:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703734957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nrJ7IplH4fAZ8DH9tkjPpD9oh5+r+mYVVfULmrSowA=; b=ZKrfsA+0R1Agf804Oevtd2tEyfiGXVLy/qO/5ngY3elAy2FtukVJV7/SISQkN6ce6MaprU 6tdBjgxE6fe+PSOgKdvz1dQg02HIX7FDY/KgUDQdbsHz2L53IR+O8V44dVuG3p/WDSaNyl HeqST8bLs+u02SAZLFJvmrxyFNECd6JaNMtPTZCfWTfJtej6P9XHUrEaKNHKKxMgAEBH00 oPt6yiG1Li1xneV6f+4/i3VAo7/IL69SUqihbWHINJ5rrwdFel46Q16VjMo1nJ+wHvsrpi kRcQwDnnuSrrrAK7addGj0+ilsSVkqEzlKEODF1ui34P8gSgpihuE+rqPMVVfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703734957; a=rsa-sha256; cv=none; b=TFhQZNzRGHHzN8rRUvV2wjJ+eqmrUsjaEr7Q4t1dF5QP1h1SEsT1t1VnwDGQ5cT1XxRrhv z7/HXN7/vzo9ETKq5dlOEQFStsyty53Hj+V/G9fvU1QTIv4jylGxbA1gHodnFoaow9vVVO 0xbFHe9btAVUEXav+aVVCsscRquIcADP5/i2+XlEd3GUemdu+2unhvFZ0QKzaZMpvr7YjP rtxIbagiIygvlB5g6ZfoGYk8Vvu32w67sLVNRina+1tCystrU2rLiR/Ibx6puMHPjLkBIc wlHODeA/aXSE2Lmcwt7eAROfX+AAOgS2blzLSBiHjwNfPW125Hgbm33ZpcCTuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703734957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nrJ7IplH4fAZ8DH9tkjPpD9oh5+r+mYVVfULmrSowA=; b=eFJSikZ38ssszG6Eq1zdhdSks1THouG2raoXZOm7zwv+oZhFe0xCsLOwm6ppx5TJ9Dn+k1 +6y86YyTPiA+wOR7sx0MBDEwdGldqNorK/0QkeYSFHfDy37868W8WNXnDOjv9/mm6jmnPy awRoIwSH9yx0Cq6gW7ek0QKJx7IW4MTYjqRE+WI982A8LPDvKU5P9zyIosFecgQrEZGkGc DpyFpdgzth9MVFUXePNzDdJsrTMkJ0avte+GiivbpJMhnh3f57eo29vcW4p94TRMIYdxDK Yf6yObHo/BeyKXnukYLOYC6E/6nOceumv/lDMSdXMRBDJnJe2S+bPnGLqDLShg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0vTn5RyQz15bs; Thu, 28 Dec 2023 03:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3gbNF011455; Thu, 28 Dec 2023 03:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3gb5Z011452; Thu, 28 Dec 2023 03:42:37 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:42:37 GMT Message-Id: <202312280342.3BS3gb5Z011452@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: 05e5852d1bba - main - CONTRIBUTING.md: add note about upstreams. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 05e5852d1bbadaecae222415a3c68f17ab2d0b93 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05e5852d1bbadaecae222415a3c68f17ab2d0b93 commit 05e5852d1bbadaecae222415a3c68f17ab2d0b93 Author: Warner Losh AuthorDate: 2023-12-28 03:40:57 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:40:57 +0000 CONTRIBUTING.md: add note about upstreams. Sponsored by: Netflix --- CONTRIBUTING.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f965ed9e3ff..31ca40700b76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,3 +142,15 @@ as part of their class work, please contact imp@FreeBSD.org before the semester to ensure we allocate the proper resources to process them quickly. We'll give you more details when you contact us and thanks for including FreeBSD in your class work. It also helps us keep track. + +## FreeBSD's Upstreams + +Anything that's in the directory `contrib`, `crypto`, `sys/contrib` or +`sys/cddl` likely has an upstream we pull from. Please do a git log --merges in +any subdirectory of these you are submitting patches for to find out the last +time we merged from upstream. If it is in the last 5 years, upstream is "active" +and you should submit your patches there and let the last few people to commit +to this file (especailly merge commits) know. If it's been more than 5 years, +upstreamm is likely inactive so please submit the patch. We can sort out if it +should go into FreeBSD or upstream. + From nobody Thu Dec 28 04:10:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0w5Q5jp3z557qD; Thu, 28 Dec 2023 04:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0w5Q5DFQz4M0Q; Thu, 28 Dec 2023 04:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703736602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2nAoyV8DGPXJaF0BLMQTpSb4D+ptZ/l4yhOWrBjTm8I=; b=eKixjU/Y3f0AFFsHUY8ThP+dm8wXJcg2ceQv1c5UfuqJMD9ncBqJDgBm++UJBfq9anLueb Yr28vZe+UWw/hu81iz/IeZ1qX1lVTzwNnRANBvfr0vTLckarr4FJUbF4NsA4XZHccNbkjv KQIbY9tT9IHtoID6aWifrw/wU34tjRPdmfTfdryLQ6RoD9MsV4w6q90hOiVZwg8RJkMBDp pJrZ56vzoU5UoH52Dl1Z45Qx9QH3l+AGS4JJkvgK+rDKq0oB9IivO3DR8qbRO086m+/lek HaT6m/OMebXUkRxtLV/y++MT5YzXweJNJZ/th/urZBbN1mPM2Lv5ZIqW28L66Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703736602; a=rsa-sha256; cv=none; b=rpzss8zqGJgiz75G8/CAYFZc1eKQcIUCN9p6hSV8tcNl3w5n4cuOyiDJhngZzvTymhrZME Te0fKK2njlmCWBYgSXvA6W1xcwtgK15Z50o2gVjIZfvJAKPLhR7LZZFPyl0aq8NIn3A4mD 3jE7y8P81f7kMin+o2tnmSDVPjW8Hgs9mcC6IVMlUVuMqdHPCgW93WJ+etVMilCL2IFtN+ nTYj4s1TrR2f0ZbbLsSQhO/oThQ0B8JwHeVxTO4zQLAMxRBiNPqOEMu/buzgo9RBymTR9h RhJv7O1cnOBTdBe1wjKNsiP9dIbrHGITml//kXry7DbYqNPw96obdnzfaL1z1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703736602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2nAoyV8DGPXJaF0BLMQTpSb4D+ptZ/l4yhOWrBjTm8I=; b=hQhHZ07qjgSwXXgxz05idFlkZPshzseIE1GCXD8tw+zHqlTYJN/CZz71rGexpJ8jCHAC7U 21h96K8HuuBbh5Nkaw8JsnL7w34WG1k/EJ+xzXtN0seV/z7iMlf8W1trOygL2Sb8UZKUzj 76MAU3PNzUGKGYJv6+gJIwvhs0aAtCMc6pXJ2gnYTJSLyoMG1Fzk4S4H1Guz16p9CxGbbV MnIq6pNp5cf8TOMN0HBWd6sxIu1DQjzjZpGV+Ug6GixiDngFpP6LbAuyINaw4cC9rwXJaV 7YBvmLGQW/9jnN74O+wPbrnaYew0jBYmmZL7ouCozvdz/b5oymBh7eFqGUboKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0w5Q4Ht6z16bg; Thu, 28 Dec 2023 04:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS4A23W048642; Thu, 28 Dec 2023 04:10:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS4A2A5048639; Thu, 28 Dec 2023 04:10:02 GMT (envelope-from git) Date: Thu, 28 Dec 2023 04:10:02 GMT Message-Id: <202312280410.3BS4A2A5048639@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: 540be39b0b17 - main - tree: Use 1 semicolon at the end of a statement List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 540be39b0b17843e649f4fcc55076d6232dc03be Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=540be39b0b17843e649f4fcc55076d6232dc03be commit 540be39b0b17843e649f4fcc55076d6232dc03be Author: Elyes Haouas AuthorDate: 2023-12-28 04:02:07 +0000 Commit: Warner Losh CommitDate: 2023-12-28 04:05:47 +0000 tree: Use 1 semicolon at the end of a statement Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/889 --- sbin/ipf/ipmon/ipmon.c | 2 +- sbin/ipf/libipf/interror.c | 4 ++-- sbin/ipf/libipf/ipf_dotuning.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ipf/ipmon/ipmon.c b/sbin/ipf/ipmon/ipmon.c index d06c7bf71b0a..80d1d406529a 100644 --- a/sbin/ipf/ipmon/ipmon.c +++ b/sbin/ipf/ipmon/ipmon.c @@ -578,7 +578,7 @@ dumphex(FILE *log, int dopts, char *buf, int len) } if ((j + 1) & 0xf) - *t++ = ' ';; + *t++ = ' '; } if (j & 0xf) { diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index f59f4f633070..a4c0b1c56b8e 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -527,7 +527,7 @@ find_error(int errnum) ipf_error_entry_t *ie; int l = -1, r = IPF_NUM_ERRORS + 1, step; - step = (r - l) / 2;; + step = (r - l) / 2; while (step != 0) { ie = ipf_errors + l + step; @@ -538,7 +538,7 @@ find_error(int errnum) r = step; else l = step; - step = (r - l) / 2;; + step = (r - l) / 2; } return (NULL); diff --git a/sbin/ipf/libipf/ipf_dotuning.c b/sbin/ipf/libipf/ipf_dotuning.c index e435ce035194..74d5dd154aae 100644 --- a/sbin/ipf/libipf/ipf_dotuning.c +++ b/sbin/ipf/libipf/ipf_dotuning.c @@ -19,7 +19,7 @@ void ipf_dotuning(int fd, char *tuneargs, ioctlfunc_t iocfn) bzero((char *)&tu, sizeof(tu)); obj.ipfo_rev = IPFILTER_VERSION; - obj.ipfo_size = sizeof(tu);; + obj.ipfo_size = sizeof(tu); obj.ipfo_ptr = (void *)&tu; obj.ipfo_type = IPFOBJ_TUNEABLE; From nobody Thu Dec 28 04:10:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0w5S0P0gz557kT; Thu, 28 Dec 2023 04:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0w5R63Pxz4M2N; Thu, 28 Dec 2023 04:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703736603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ig7SsO2++H+hVC9d4xfOgSoHC8dnkgBVRmzRp0oQ6w=; b=dpWqyPVA6Ptx+HhUne7rdvm8hHSx0NWbscE+XkRZEjT1JASXhmjya7RjJPmv8U0gqjDwp6 fL6VKbm+lAKmVa3lh9Pcnp8iJXtNPLRRlB2bshoDFFhfNzXR1wnNJm94Et8QzZN/YYys+s A+XT+8KwwfLXxdZ77CouxIuAusbwGAsDsLa3xzcY9cgq4JEdwmZt3gVSYjTZoqwagscyv0 uyaoqluEcfB4Lun+3fKXUT6ew6Hxjn1e6MaNrcCC5ztcFR+2cUHyn+shH6Tnp37RkmiaWP LZPJ8T9LdPKbG3oxO0X3Pr+37tuMe7YbzImcaxXIyARCPxxTtg+IV4R5hzCV6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703736603; a=rsa-sha256; cv=none; b=Bmr/Ez3rzjRabLzojXJTcRj2naWQWUls6BY5Lk8ySfp5Hps2BfgrC35BUkNND2O9vldc0v nvxN+JYkeVfEtO602G2j86DKRX9xYPX2qVnkmAmpMUC16WxnkyE4rkyJRcjLFF39FEm7Ii JY5qUX6fCifQW6ar9rKYmr/hkAQRFmeaAJow6CAgdeaaXG2HDpXQaLonZb1bdULpSE55rs ZArIRclKPtNnik8Eqez9DPwr8N5eGT9dapfbZLqZyfI58m4fF7YNVZ1cQG0RJtGD256ifG ZbAgH6h0hcyroaJeOQEjzxazRpFiQ1ZbR5haGiZ2cm3TmOo5+RsWdVsBeufiTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703736603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ig7SsO2++H+hVC9d4xfOgSoHC8dnkgBVRmzRp0oQ6w=; b=oWr1680Q68zsoPq+pzFJkEVGHG7lGTpIQy2LaDBsKHGIp28z8Ff8hjgHCxAeO4VXExcKxu QH9jffedtYrUvtAgqYsGwEFgi4/j8OqosN3Mui7dV4gAXwRKbSt85BjyEgjEt/Vyb/VPEI mq67UYJ4aY9r5vWUdi2FcVZRkfLk7fvqABi4o1khRH5/5dVwrAI7M1P6CceGPEi6u78Wn+ LO/myIYjyqvuweKqfMO53xQB+toThAE8CssrAO9g3D1tSnFHSjpfPcipPxT6JuukdVUyar YDgj9xKZP/xPyBMCnYd0XFSg/mL66FUxtR9O7eHwIIAHBEX0cUAjzwOE3Qee+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 4T0w5R562jz16cr; Thu, 28 Dec 2023 04:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS4A3TR048943; Thu, 28 Dec 2023 04:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS4A3aP048939; Thu, 28 Dec 2023 04:10:03 GMT (envelope-from git) Date: Thu, 28 Dec 2023 04:10:03 GMT Message-Id: <202312280410.3BS4A3aP048939@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: 44cf844b16cd - main - tree: Use 1 semicolon at the end of a statement List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 44cf844b16cd575a15baded23d37adc566a73513 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=44cf844b16cd575a15baded23d37adc566a73513 commit 44cf844b16cd575a15baded23d37adc566a73513 Author: Elyes Haouas AuthorDate: 2023-12-28 04:02:07 +0000 Commit: Warner Losh CommitDate: 2023-12-28 04:05:56 +0000 tree: Use 1 semicolon at the end of a statement Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/889 --- usr.sbin/mfiutil/mfi_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mfiutil/mfi_cmd.c b/usr.sbin/mfiutil/mfi_cmd.c index 7dc761d27573..8e0a0aca32c4 100644 --- a/usr.sbin/mfiutil/mfi_cmd.c +++ b/usr.sbin/mfiutil/mfi_cmd.c @@ -220,7 +220,7 @@ mfi_reconfig_supported(const char *dev) return (1); cp += strlen(MFI_TYPE); - mfi_unit = strtol(cp, NULL, 10);; + mfi_unit = strtol(cp, NULL, 10); len = sizeof(dummy); snprintf(mibname, sizeof(mibname), From nobody Thu Dec 28 06:24:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4r0mgkz55784; Thu, 28 Dec 2023 06:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4q6s5fz4XD4; Thu, 28 Dec 2023 06:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sb4ExOwn8EZiUCBXQ54oOKpP+8J2kmC+UUSNTdTfMYo=; b=MZM4KFkJmMBnKzU/vFk5HbUtUJ65eccjwWnD4DY+yCCRMYpFvaCRtjXj4L/HZvwVbxn9Ay C4c4KuLb3UswiG28zuAov0Xw9udW4vz9qdFlXt7XAlURM3c4SuuXzd6IqSBMj5x2dLUnnL 22i40uT3LkvA+eGftAhd1LxmTPg6ftl2xyDKVeDHbtgsEABOEn8nE699uLoRmMADQrvTJp v4tvCiWMS5+C2CCuAalhXGjwaTTvk9m/4EeOEzfy8xT+xWpYrlIku4wkdzB0VR3CNP16iB 9Wy5phZHGWVsvTZe2zfcLodbk8cLzxJANLSHloEp0s0cTNeis1zEki5XETqZHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744684; a=rsa-sha256; cv=none; b=Sv/kM4QXKHEIxSpEa094aPnR3YAei9JfXRWwDKt/IMnZcC/aWE3Ld09nmJf4DyLkVQaWdo AJucHK1/Luh1FupvdlTmGrDa/vp1yxulAMOzT/lywP/BBwwZFPNZD2jf1N2QPCCHVhj9PO mIC/+ZIKa14fRKBINgWtHsPjDEC3EVtOOqgQjqMaFl6WrcL2sat2N5HebtdFMIZVPeS8pg rI2KFXIqrR55DQacu1oZWlgoLjhplJ9sek8aOChTP+X0ohPOlgFEx9ra4MIYVDezY+sAOL T5ZYKpetEWfKAp0+fns3qDkpaDalLcABxXnSG2jwCZlshYbBxAJH/5+N+Vacsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sb4ExOwn8EZiUCBXQ54oOKpP+8J2kmC+UUSNTdTfMYo=; b=pgi/7EGRNwQV/U1vYD6lTqOL44FgZP3IvZcFOylNo7bdwc+SQtF7UTFshe90TqERocW/Zj XFbWC9ROG37vVmncVJYmfJF8hMi6rxP6lCWjB8G1qqLDMBDl7UhG1fFkQnOzq/wR6r48kW P+tQeCNFM1URVVE5jvJlnU9DJxVujzVM0264uBmb1SlA7w5kltufx5u17Q4wNJ/18r1ZNx ZwpLvI+vVgN5qBK+rBZ75RsIhn4YgQTNysth4I0QOq9UJuyvI6btDBfsT+7lk7zP2+9eWn KmALncl+aXe9Iwbr8i8AsD6cWFVvR75YIZelpdLwkf2QcuQLmQbAXjNpuyq9ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4q5vLHz1B71; Thu, 28 Dec 2023 06:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6Ohmp079600; Thu, 28 Dec 2023 06:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6OhBc079597; Thu, 28 Dec 2023 06:24:43 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:43 GMT Message-Id: <202312280624.3BS6OhBc079597@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: 0a41a6681dad - main - mtree: Update mtree flags in README file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0a41a6681dade4d22760e077db029cb5209a0917 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0a41a6681dade4d22760e077db029cb5209a0917 commit 0a41a6681dade4d22760e077db029cb5209a0917 Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:26 +0000 mtree: Update mtree flags in README file - Add -b (suppress blank lines before directories). - The equivalent of `-i` in fmtree is `-j` in mtree (nmtree) (indent the output 4 spaces). - Add `-F freebsd9` compatibility flavor (print the closing `..` at the end). Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/mtree/README b/etc/mtree/README index bd813057b5bd..fe57283dc316 100644 --- a/etc/mtree/README +++ b/etc/mtree/README @@ -23,8 +23,8 @@ and keep them in good working order. mkdir /tmp/MTREE mtree -deU -f BSD.X.dist -p /tmp/MTREE - mtree -cdin -k uname,gname,mode -p /tmp/MTREE | \ - sed -e 's/ *$//' >BSD.X.new + mtree -bcdjn -F freebsd9 -k uname,gname,mode -p /tmp/MTREE | \ + sed -e 's/ *$//' >BSD.X.new diff -u BSD.X.dist BSD.X.new rm -r /tmp/MTREE From nobody Thu Dec 28 06:24:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4s1G0Yz557lK; Thu, 28 Dec 2023 06:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4s0hZLz4WnY; Thu, 28 Dec 2023 06:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6V8t5vvV5mofUaxK7SUm/eJF3QJh28zs0hXaAQGCYDk=; b=nCPnJuOMxrSuIVJAEWkftcNsjM3XrCBsJQHjKXveP+cP1wrxav5RFSuK6KWO6kSCF1qILn GFKY96UsAUe5mGXvkRt8z910YvaXNuYLj38sez71soWOIbWrU+MeozLA0REf7gUYAbvoKW +1sv++kvC65YKHN2t0fSIzFeRRVkwMTYnmfTWbSwktQZY29D6074TXY+A0LcKTi8eEj0k5 GdjbeEdRfDZsu+YUrqC/K9ho5CTc8eK3f7cPaWBpFkFNg2MgJbzOZo3dmjSRgNAdHTbd9R ue99OgYstaeigOxbxAGqUViXEUoUbIjgZZiTiy00UkWBj9KNfmHb6x5x6Y692w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744685; a=rsa-sha256; cv=none; b=Xz+aBv0VLZXxci+Goixv6QeV0WSps2oSVB/HlDuFVP1NIObR//lcWRoeIEFN7KMsm1nBoc a4C2GdNxqpYFoENmAl1uyB2j09C72t/pKxznyzUiaaxcEMkxde1dDH3EUJyYuOYGH54sj7 5b7esOP7C4NG0dqiDWFtUu/pEj7It1Hci5L2pUO8w4xz0iUeAgcr32VDR5GTz8h4Y30r5n jLSpaWJCjzCQgnFK+iAbiwALbd/K3vTmD5pYItIWTLT9UfdWvyebRuu+5SeFFnH/I/Wx6J +mew4lsbMAUdzkwJaqWh9eLli3HZBCbv3gZrEPA3coMMJ7DzfyBkgwphqTTNjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6V8t5vvV5mofUaxK7SUm/eJF3QJh28zs0hXaAQGCYDk=; b=cLrN5ErlUVRUEzieT08e8ocGZcc9g2D/ND/BfJgFiXhSGDkf+/ORiYP2qco6U8njGTaABP zdEFTWyTL79yEVra5WOi9/yyTnA/lnoiD5S2rixm0QzZonNF1aFqsJ30n4We+DCrPrxBgK buFXidcXybElv3+nJg66pxtqB2OEZRik8jkg1hwaN4kcSFbc0EDktzOx9NYpb7+VMzMsu4 x1QE5vF9RHnFzeC9e0jq6DEjnK7R6vb0GYuEJ4obzdnBL8GrCW3MjdtyCrY8pNVqb0vR7G FvUt8c1xUP8ZE06B2LPNnJSVnK+RoysNLRG+lvNY1U2BNIF7pRl5ZKjcMaBk2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4r6tZ0z1B5D; Thu, 28 Dec 2023 06:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6OiVv079642; Thu, 28 Dec 2023 06:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6OiXQ079639; Thu, 28 Dec 2023 06:24:44 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:44 GMT Message-Id: <202312280624.3BS6OiXQ079639@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: 0888bac4f623 - main - mtree: Use spaces not tabs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0888bac4f6239d21ed8403b980bc494e2b97cbe2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0888bac4f6239d21ed8403b980bc494e2b97cbe2 commit 0888bac4f6239d21ed8403b980bc494e2b97cbe2 Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:27 +0000 mtree: Use spaces not tabs The indentation generated by mtree -j uses spaces, not tabs. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/BSD.root.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index c6b73e648209..252868bb6cee 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -95,8 +95,8 @@ .. ssl .. - sysctl.kld.d - .. + sysctl.kld.d + .. syslog.d .. zfs From nobody Thu Dec 28 06:24:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4t3VsGz557cv; Thu, 28 Dec 2023 06:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4t1fGKz4XDM; Thu, 28 Dec 2023 06:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOD1lrnQouGclet6ZOJSfbIEiYu4xqHq6cp7S8VgzlA=; b=J31u9Pv8w68cd0aeLXj3Z24mqJXccybjc5GEmPUGQgIeTmg/FaBeSgZBOH9e5M9txb25yz 0Ra2T/LZN4o6sxzUaGk5UX3KJ3VC+eRGV8wMW8n7XOnS98IHj5hMqPXCdRkuuJjCdn8GaM FryvM/g/AUcpc4+/BbTGwTtD4SgUNPn+kgTc7Q4CXL59a/fxuU/CQ/bT2ytWMCz5lCQkhF KZnkomobqGtaaXm5NQJ0di8lXLpuEynHFPJ7JiYis6LjsJKv/+wcNTfBvXRJ75pkeb6ffY j0YpaYOAjBJdfXoxxfleYn6VEgOfdemO48mcVHaFJEPSYkDfqoo492U9msd0Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744686; a=rsa-sha256; cv=none; b=YW7IsPRoUAWWWe2RWMgJSlcdSqUSraLB11MR+HynRQDdJyu9U+DPURRNGa7MD+XXCxDPrx FhF6+oBWPDp9GrEyg7C9BgG4CY4V2UjFhhCoPC8l44JQqpiYCSL9TehmhXbW6/1OWr/4no Zq3lmRryWWPmU/krzlYNoxCqYOttSIWe8KNiHXb6bUBec17BUYdiV8xhFgkuNURcu7qNN9 CcHYxzCpu6+BRbpWYaAIHINFZ0mKNsB8nzdXLX7wsuvjYjJba7wF+psj4hb0b7970/L1b7 Cqi339GtMuiW9rIylblcc5bUDDIkdh//0GwgVGvxIEf6QRS5fdPBiXndIwfqJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOD1lrnQouGclet6ZOJSfbIEiYu4xqHq6cp7S8VgzlA=; b=jE0uuE6z99g75+qeLxvnPerwcxlYi+Vpi7ozqOof/KTK/K//1ynZlEiKZZdtZDej0zinKS DtJToyrTxJWrFAwQ3vmd0G3VmT/Zd5LrZKxa5/Dr57VQiPClgX1odFUX9+mvuoNdZDH5R2 XpvSz9g9Kbf6tNbQ6bP9kdjj+JYmy3UhiWPOE5YdmmuhxTrxDuX/4rRDeNSI2hDLUektj4 7QUIoutqwYIQzKya9aT/1tR7CETx9WlvG9Hraz7/ToBsH/ISgtWvMdYGn869BSeYlBrsnF WVo6LQQX/YYMhomHnPEvAGww9LkNofpPfqAw7RdSOJblo9P7EmTl+MbG9EdYdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4t0lkbz19rN; Thu, 28 Dec 2023 06:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6OkQe079681; Thu, 28 Dec 2023 06:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6Oktu079678; Thu, 28 Dec 2023 06:24:46 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:46 GMT Message-Id: <202312280624.3BS6Oktu079678@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: 20d685623f01 - main - mtree: Properly sort entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 20d685623f013977d8b44017486db5c75d4c6d67 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=20d685623f013977d8b44017486db5c75d4c6d67 commit 20d685623f013977d8b44017486db5c75d4c6d67 Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:27 +0000 mtree: Properly sort entries Reduce the diff with the output generated by mtree. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/BSD.root.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 252868bb6cee..0c0e5b2633ad 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -21,12 +21,12 @@ .. firmware .. + kernel + .. loader.conf.d tags=package=bootloader .. lua .. - kernel - .. modules .. uboot From nobody Thu Dec 28 06:24:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4v54Drz557jJ; Thu, 28 Dec 2023 06:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4v2X3Kz4Wlf; Thu, 28 Dec 2023 06:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yEY59welXSUZjXafheWCZtetLWq9TcxKnzjQdTPM0w=; b=nybH7VpAxxsFvL3cP6UBzRPWHXBEkC1bw3Ny7rdNk9eRfOXIjC9pvKKThGYKjXxqC8CWrB HWrUR2wD9YtLexL56e28ibQWY7X+AHgPNmhSBgAToV0kbtlExnit368cyvkXmywUPfmIIw ursQesaUpa58msuFOjc7ookZLhJnDLY7RIYYCbR9Ufjhtp3uJiRXUWfCdJ4uolQrqhQ269 Ctn2Yq6DHI5XYp4YTRyYtHtvr1B9O7hqB39Lyp0gOroot1Ajs3LPkLiXC1v7EcNnwhOUjc w46C8umxXvmzAdZGLcdLbZAMNnDTmyoJ2dyoxx+WwdBfzstlFlDrJaeLdaSpBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744687; a=rsa-sha256; cv=none; b=QpNEwDaWtPiSCuksKS4lZrxqPH9j2NmUtd51F/IaoshTXafMdQNDAN97ePjaWQMgle0MyX bRlZ19a/xG7vjz2IuJcFXncopMEEvbG+SZXLRWvkq5rCjSfDedjqvLUI3u29g7hE7wqvRO oKqYTlX3UHB2dpFIy25FEPr4hO9Zh63iHF/zNhvSgv2j87Fp/V0uJTvLJdsKmHeyQ6GLG1 XKdB7+gW/5U20OKoKqFFtj8yotJXV8esJoufVHrCuPmlJPPqimmj7XEiXm7n4nHSzOMv2w RkqVSe8r7ChHylNi0CsX56RWONq1qT+BNky8c7P//gfx6kVnB6r08B6asZsyFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yEY59welXSUZjXafheWCZtetLWq9TcxKnzjQdTPM0w=; b=p+2Z0GgMSgTkoHf8lvQt1UznCOlhfPNffEpSai1kSuMs0elzmlD3jtynF9MNc/kNRRVG58 UEc/a7cpKzd9J0y8PGO4BM07qBnXJwZ7gR2lSWQi+18aBA8JxW4Bv2T0ekCHpgJdu/yYxC T5lNXkj+YP+eMfw6Cnab+yRO4If90C2UHuluZXcszjZjUsCcnEnCbnlTuM9gbKSFEaqszU pwCdZ6VAWeISlqbgoY1igTchfotZuP7nceL9f5Hp5r3x4nVP/4ajtSvqnv97Yo6OnVaTnv SmxFzPCvbZefEyje/iw1u6eDdqkSFSuqSxtIQ211MCM5LIVQGqTnU6oyf6Wgvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4v1dSLz19MN; Thu, 28 Dec 2023 06:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6OlhE079729; Thu, 28 Dec 2023 06:24:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6OlNt079726; Thu, 28 Dec 2023 06:24:47 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:47 GMT Message-Id: <202312280624.3BS6OlNt079726@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: 5b7f73ce16cb - main - mtree: Add missing directories generated by certctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5b7f73ce16cbd3704b21943ebe6b489b2bc2de1f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7f73ce16cbd3704b21943ebe6b489b2bc2de1f commit 5b7f73ce16cbd3704b21943ebe6b489b2bc2de1f Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:28 +0000 mtree: Add missing directories generated by certctl PR: 255639 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/BSD.root.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 0c0e5b2633ad..222d709ff25b 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -94,6 +94,10 @@ ssh .. ssl + certs + .. + untrusted + .. .. sysctl.kld.d .. From nobody Thu Dec 28 06:24:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4w5Fgyz5578K; Thu, 28 Dec 2023 06:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4w3Xr3z4X7s; Thu, 28 Dec 2023 06:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekmScecPG71P3ygZZNDl97fWJ1AdhVxU30D2ay0Lv4Q=; b=vgCCwrRiSxWUo2fEx5jcce7VXMCnKhX7uSn1xfBbXtdkmW1O6XjM3wjb1whdbSvnref913 rJ3s1x/SsEbaVdM6dR+uN4C5564YNQVNfwFbx4UHliP/mxnvWZyfcRT/OoY3JYmlBjyPqg Zibs2t/VkGz08kMgScC5I4adHMtLyiqAx68ufKJbwyyvhUM9HGugsyWmBUEHoVxtYaEhKl vGz7hiSGuT/AwFiNYK5E3W5QtpC8O0T04cr1aJ5kHpmT8tlCml9TZ+JsCHlag0YbVhlDgC Tk/f+Vs898XOTp3wBz8/srzB2mE5X+7Kub2ZRQaSxdo7sASJBnWz6JBSfwt2fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744688; a=rsa-sha256; cv=none; b=C5bNMKBq284kpWpxdb+6fRkq0W9vIVDBRIPbcdXIoifeGorISJyToQ+tx1suDoXemxCg4Y SXcwdYED9OD2YXC/4cIcXz4ywNbJ0HBz1gMh1pwGT2eLgdU0dIzei15GyqCQyOda7dfg+l Ap1Dvvrdgp+Q4NPX6fSjnikMOVHaGZ2A39bY3JrwT2U/9VuZW2pNqVwhmERGuCV0VapWnT tzmfBxHGnyE2fT0If7kVTUbSHPK2GnIKfB68lXeFNlDLv5nNk1KaZiJg3peS9zXYU1wccz Cv0vf5d1OZNthLhBEunEz77AWcNlh+OVSc+SQupHXAd0fc6XuEAZv36zjVZVIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekmScecPG71P3ygZZNDl97fWJ1AdhVxU30D2ay0Lv4Q=; b=UwguqqE6O2N/3ujBNvFUvbUGrrLSEt8jvZ6EsHyv/GHxOZ/uivUNe4xpK3rPbKHYM6jcej qwY19K6whgWrozMFkIY+yH0N3mI2eK/5lFOcITSNOrX5erSbGtIiNxdytrvdmlg8Mq2r+D h/K5tYUUZxx+K9xDe8722xOzdmLspEoz9sEXH0WoM6+N7GPWomh61Ldzw/pcF5BWCxYejD BGc+oyE6CrZlCc+7EahEDpFz5hLB/pq/rFjwFucD1P27MKfzcbAbOtnmRT42wVJg3Yudvv SQ+HMSEftQwn2nczvPCpW8mi0BzoLo5HTHoVbLwiucTKuW5kkqhPzxZJK2FZ6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4w2fCzz1BJc; Thu, 28 Dec 2023 06:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6Omc2079780; Thu, 28 Dec 2023 06:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6OmI0079777; Thu, 28 Dec 2023 06:24:48 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:48 GMT Message-Id: <202312280624.3BS6OmI0079777@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: 1ed17d86bb30 - main - mtree: Add missing directories to BSD.root.dist List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 1ed17d86bb302950daad6376cb434fe7bacfd53f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed17d86bb302950daad6376cb434fe7bacfd53f commit 1ed17d86bb302950daad6376cb434fe7bacfd53f Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:29 +0000 mtree: Add missing directories to BSD.root.dist While here, align to the output produced by mtree. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/BSD.root.dist | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 222d709ff25b..add31410f633 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -10,20 +10,24 @@ defaults .. dtb - allwinner tags=package=runtime + allwinner tags=package=runtime .. - overlays tags=package=runtime + overlays tags=package=runtime .. - rockchip tags=package=runtime + rockchip tags=package=runtime .. .. efi .. firmware .. + fonts + .. + images + .. kernel .. - loader.conf.d tags=package=bootloader + loader.conf.d tags=package=bootloader .. lua .. @@ -57,7 +61,7 @@ .. jail.conf.d .. - kyua tags=package=tests + kyua tags=package=tests .. mail .. From nobody Thu Dec 28 06:24:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4x5Fb5z557Kt; Thu, 28 Dec 2023 06:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4x4Wyvz4X87; Thu, 28 Dec 2023 06:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Par98OtfxbqmWPcdrZzfnwVPZGUOqkp5r9h4CFFPDm4=; b=hUDDgl/vVVBAIsBwIf8nFE5RiGWimTTHaztUoq69MNdkqOHHAXE+qDy4iZZA/h1YVCufwj 0nUUQy4ALOqdHfwe7qfciBQc8WZUEYTMV9K/klLmzTRj5ZEl4H35JImG3+XBPPyIcgpYFv VTXV4NkO1k+6VdvmmhxTmUNKWB1tEwvgWS4UBfq0xXz3uZ559PwYkqZ5cpctN6Th+2WiKZ du0pE9xMAKfsan5bjk/O9ibuhk4DiEBmZDx6CJ1T0AF388z9oZMCDSiK3OjkLzh4dov3JP 7ot8C+8M+bBw6Tf8gcijDdqqHC5PgrIJyVtqUPF8SiTpEL8oPCqwtlCE1uOl1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744689; a=rsa-sha256; cv=none; b=yW67bA6Yazj6J6D3M/rmAbyKUHOBER9OAB3vgxvoBVR+9X0JURmNAgB6bmjQkLyjpD1IRR XQFkZJgvLOJNW1bk9UcBfJQBMh5WDQdZ0NRRXdqBh5oE/KH8KCsKYSTITIj7ycz/PaR+93 348mS1RJPY/m5XMMtXdkcEPJscYm+6lsg4r7j4xaiLPfNA/aAprEYQwj9AkK3Ibi4+JSbX Jg4izEDNL7FjzZsJkuoQkdQ2PVo0xzNKYydy8n1M30pub3cJMjvWW/djepufkjLqbvHG/w dSDPfXd5BglxETc1GOGtiQxJ4o3f+vpnpljeO08osVEKsplNHw/D8fD26npy8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Par98OtfxbqmWPcdrZzfnwVPZGUOqkp5r9h4CFFPDm4=; b=kJZ2ppYgVGjZg9Sy3mdS+X2Y8DvDcBg6E+wzTA5oG2+ozq5mnRdbSYPSr6EeBo7tSp+iGL IES2vTmOiRB5jVEu81DUeZtGKeF0lWNqbyPLQ5pQMtPmogv1BHWJTpC394qRmYBUx+3LON 8ItnyJvc2o82b6u1HpEjOh7g3nQtAv94+eERA6yAZk1cyOz3Umnj/uaVpWtxmJKB6EYWgG 5uaEdBRjVJEGcJFI3+kbPPrXtcZDX3yDn/oc6jXoYZwOHdWpvrQS/kAtuWK23szAX6WhXR pD5UfWdpIzeuy3QNMnrK757AKEtDlNEPAIaOJoCiiqLqLMiBpqxvlVE1L5KMfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4x3dP7z1B5F; Thu, 28 Dec 2023 06:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6OnkT079816; Thu, 28 Dec 2023 06:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6OnuE079813; Thu, 28 Dec 2023 06:24:49 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:49 GMT Message-Id: <202312280624.3BS6OnuE079813@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: b8e385d35cc1 - main - mtree: Sort BSD.tests.dist List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b8e385d35cc18af649656ba8cbc67f3c90dffab2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8e385d35cc18af649656ba8cbc67f3c90dffab2 commit b8e385d35cc18af649656ba8cbc67f3c90dffab2 Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:30 +0000 mtree: Sort BSD.tests.dist Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/BSD.tests.dist | 118 +++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 68320ec1229b..a46aaa1133a3 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -108,10 +108,10 @@ .. end .. - env - .. enum .. + env + .. error .. exit @@ -352,10 +352,10 @@ .. rpc .. - ssp - .. setjmp .. + ssp + .. stdio .. stdlib @@ -364,14 +364,14 @@ .. sys .. + termios + .. time .. tls dso .. .. - termios - .. ttyio .. .. @@ -445,10 +445,10 @@ sbin bectl .. - dhclient - .. devd .. + dhclient + .. growfs .. ifconfig @@ -537,95 +537,95 @@ clean_mirror .. cli_root - zfs_upgrade + zdb .. - zfs_promote + zfs .. zfs_clone .. - zfs_property + zfs_copies .. - zfs_destroy + zfs_create .. - zpool_create + zfs_destroy .. - zpool_history + zfs_diff .. - zpool_expand + zfs_get .. - zpool_remove + zfs_inherit .. zfs_mount .. - zfs_unshare + zfs_promote .. - zdb + zfs_property .. - zpool_online + zfs_receive .. - zpool_get + zfs_rename .. - zpool_export + zfs_reservation .. - zfs_copies + zfs_rollback .. - zfs_get + zfs_send .. - zfs + zfs_set .. - zpool_clear + zfs_share .. - zpool_import - blockfiles - .. + zfs_snapshot .. - zpool + zfs_unmount .. - zpool_offline + zfs_unshare .. - zpool_replace + zfs_upgrade .. - zfs_rollback + zpool .. - zpool_set + zpool_add .. - zfs_send + zpool_attach .. - zfs_set + zpool_clear .. - zpool_detach + zpool_create .. - zfs_diff + zpool_destroy .. - zpool_scrub + zpool_detach .. - zfs_inherit + zpool_expand .. - zfs_snapshot + zpool_export .. - zfs_share + zpool_get .. - zpool_destroy + zpool_history .. - zpool_status + zpool_import + blockfiles + .. .. - zfs_unmount + zpool_offline .. - zfs_receive + zpool_online .. - zfs_create + zpool_remove .. - zpool_upgrade - blockfiles - .. + zpool_replace .. - zpool_add + zpool_scrub .. - zfs_rename + zpool_set .. - zpool_attach + zpool_status .. - zfs_reservation + zpool_upgrade + blockfiles + .. .. .. cli_user @@ -1027,14 +1027,14 @@ .. cmp .. - compress - .. - cpio - .. col .. comm .. + compress + .. + cpio + .. csplit .. cut @@ -1051,10 +1051,10 @@ .. factor .. - file2c - .. file .. + file2c + .. find .. fold From nobody Thu Dec 28 06:24:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z4z1B7Tz557nG; Thu, 28 Dec 2023 06:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z4y5pS6z4XJy; Thu, 28 Dec 2023 06:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=senbfSKv+yRoE7jA3/KPJM2VZG3eEqeH4I0ZnUfWPcw=; b=MPvpL6qBtBytYg7B+wc/EjejKGjyo8ghforN9mckWkHw1Hpy3yW04/9VP3R4Uc8T3GOGYv QzpvAUwEbHx7f/x20i7D2nzxJYdKx1OH/z/ETAMz4uqV+T8pAvhRpgbQy/5+2IGtrEEqK/ NbMTHS2Zf043aUfjZNzaSO1OMAY1n3LNTFV3tBl6bGdi1pGKSC7B1Ebip2vr7tkzCBPeSy KYKKOmIgBkcUkpIawmPUKswlx5236lKeobhjVPx1eHrFzxGLg4fsNa/N/2byPbYJ4ZSlMg 0UbKbS9RH/SU7l6VWtCdf1n1CsJuCO4WMStyIdeI6Xpje5MuDMK2rinDoiNxnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744690; a=rsa-sha256; cv=none; b=lMKPlDo06VMQNKCBQxQzc0DEfePjg+9TCR4LJzrINRd3bdIFy6N98qSOFMw+gciN9YrhDz ivIur3aXtgj0U0xshcS+wq0viIqXptBKg6N//9Po9zFc9uCLlmnqPxw/XzdaV+hzpbEg2s 3bqR3ON8xXix2BSCUq3/j87c03Kt0OQF3AjiVuJWNs9xgzgoq0u7gaNmOZVIUaItFpu3HM FjXghIcabTh9d31xWTs1b+C2WaFLiv02kHZIgpN1aZ+ROYSDiVEgt+D7ctTAa9Sm1OA2B4 QyhMgXSeHeFnjwYH24WyjiSS12YDRGzbD6YIGYJUWpn4l6DVwEqxiuH0ionB/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=senbfSKv+yRoE7jA3/KPJM2VZG3eEqeH4I0ZnUfWPcw=; b=Ihj71xxR7OrUAIDD0ceNleFZBPdEYsOw3nCnpoaT5t+v0FXY75OxXWcxmQtnhd7jvVoCEr yF6QWgqBfXJ5j4tiwDepj77rk2pxDC2tVWwSbekJRvcoahlHFXM3H2Ji9bZ2fxfE2dcOfl qSDy7oIbHqwOiL8VZybPn+hZUAhi5sdgb0wFcX+ISLG+NktnQz0cJRu9c4DzLfSVbtEBbh 2IK4/XsCCAW2/Rg6A4Ic9Ek7240OyWYEpvpppyxjKTd3yw6Wuy8q8iOL+JMljy/l9RhC4J 3kHq/Y5owDzpRokkxB6AmsR91M4rfy3F3CSTkF/imK9YFYI1KpnIUEHH6Lb4bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z4y4d76z1B9J; Thu, 28 Dec 2023 06:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6OoYc079862; Thu, 28 Dec 2023 06:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6Ootq079859; Thu, 28 Dec 2023 06:24:50 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:24:50 GMT Message-Id: <202312280624.3BS6Ootq079859@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: b8856bd2d6ac - main - mtree: Add missing directories to BSD.tests.dist List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b8856bd2d6acb10af236b7b8cd0cf3121da8c994 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8856bd2d6acb10af236b7b8cd0cf3121da8c994 commit b8856bd2d6acb10af236b7b8cd0cf3121da8c994 Author: Jose Luis Duran AuthorDate: 2023-12-28 05:26:23 +0000 Commit: Warner Losh CommitDate: 2023-12-28 05:26:31 +0000 mtree: Add missing directories to BSD.tests.dist Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 --- etc/mtree/BSD.tests.dist | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index a46aaa1133a3..b64469efcf13 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -4,6 +4,18 @@ /set type=dir uname=root gname=wheel mode=0755 tags=package=tests . + atf_python + sys + net + .. + netlink + .. + netpfil + ipfw + .. + .. + .. + .. bin cat .. @@ -298,6 +310,8 @@ .. dynamiclib .. + dynamicpie + .. static .. .. @@ -315,6 +329,8 @@ .. libbe .. + libbsnmp + .. libc c063 .. @@ -381,8 +397,14 @@ services cap_dns .. + cap_fileargs + .. cap_grp .. + cap_net + .. + cap_netdb + .. cap_pwd .. cap_sysctl @@ -755,6 +777,8 @@ .. .. .. + common + .. compat32 .. devrandom @@ -829,6 +853,8 @@ .. net if_ovpn + ccd + .. .. routing .. @@ -836,6 +862,8 @@ netgraph .. netinet + libalias + .. .. netinet6 frag6 @@ -897,6 +925,8 @@ .. posixshm .. + ses + .. sys .. vfs @@ -1062,6 +1092,22 @@ getconf .. gh-bc + scripts + .. + tests + bc + errors + .. + scripts + .. + .. + dc + errors + .. + scripts + .. + .. + .. .. grep .. @@ -1177,6 +1223,8 @@ .. makefs .. + mixer + .. newsyslog .. nmtree From nobody Thu Dec 28 06:25:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z6F4P4Lz557gq; Thu, 28 Dec 2023 06:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z6F3W6Cz4ZRk; Thu, 28 Dec 2023 06:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u60h7ff9F6GlPoUds07zJFSVgUQTEgx8WfnDND24YBg=; b=bMFznHdYoHBJrqU8Dk8nmISKg03b1La6Co4df8nKi7GNGW8UvgNN95ThkrtvQYJPLO7HCu OQMHsjU+UmrWWylZAFx7V9JfHgXp2+uJC0Cyu1GGUNDBx5+FwOOHy+KMnusH5FBBkgdSFH tbdE3z3y6qaI/1f/f0CE76Kw+mgI55SpUQz0rCCHhfdF2izTZyhZYUNa1EQj6ZGUrLmmq5 kilkA0zD+T/U9RQIDS89d6dUpvIZL6V7+RYmRIw6YCmBSsqh5jxYZteWmvq8IqNKr1M8dp n7/jn+VEDWeQWaubwdPP5mPKJ8fyTx1Wc4zJsho00V63J8GDKCMzsdRg5v3bTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744757; a=rsa-sha256; cv=none; b=JhVm13GFuD+RtH75f67mQSd6ec10IU8e8zoPfL+GUnUTMYw739IktEOLdO88TFh4EPgEpb kT3v9UN6yx90L+aTqAnvXpePLKhR8xOtEB77IWXQ7Djon1fBWKifKC0zGuGLPiC4wlMvk4 v9vMYKAO8pnChQsHbqfA5ONz/6X/27HyM9af9FWWxCDJbqhIXEojDqgjC3SdRredGPi7/M YlhdaIbGcdgj9yhhb2DRdxPvQYNN73w27/gf7K/p1hZdo34KKVExtaB49M3CoajPQBZtwO Z1W4nc9WBu8H2kdPceDY1azphmSpyoMzM8C5SSXClGPNSIfm9nblLX6Opnw0ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u60h7ff9F6GlPoUds07zJFSVgUQTEgx8WfnDND24YBg=; b=kId7XuS/ISg+pweHxG/d9Duis9kNjyizITV9+zJ27iOfz30KbLIUSWXQSQzw2odntqX4hj BKn3AtSI5YU/01ymeuxAaP25gOhGfEjKWdy3s0++Ep4ob9tNgAhO93T7VB/jy5ZDXVhPRR blimCaDvV0qPLZ6VAqnw2LROkR4VnpmU1F55acMtMBGnwhGWJiPejxR0xUTJlwUqWCMxNM KgFSekejJgHtEmG9JK5SnwC9jabUNpZ6lAiuUi9iFWLxMPk/sZeIwBIcSXZZ4u3DymNbrC tZqMQajM3zhV2gow4fh2z+c1a1aMja9EYXoGHUiTFpLlyU4lRXncn+GTo/58Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z6F2b11z19MQ; Thu, 28 Dec 2023 06:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6Pvta080216; Thu, 28 Dec 2023 06:25:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6Pv38080213; Thu, 28 Dec 2023 06:25:57 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:25:57 GMT Message-Id: <202312280625.3BS6Pv38080213@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: e9da71cd35d4 - main - vtnet: Better adjust for ethernet alignment. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e9da71cd35d46ca13da4396d99e0af1703290e68 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e9da71cd35d46ca13da4396d99e0af1703290e68 commit e9da71cd35d46ca13da4396d99e0af1703290e68 Author: Warner Losh AuthorDate: 2023-12-21 20:36:12 +0000 Commit: Warner Losh CommitDate: 2023-12-28 06:25:53 +0000 vtnet: Better adjust for ethernet alignment. Move adjustment of the mbuf from where we allocate it to where we are about to queue it to the device. Do this only on those platforms that require it. This allows us to receive an entire jumbo frame on other platforms. It also doesn't make the adjustment on subsequent frames when we queue mulitple mbufs for LRO operations. For the normal use case on armv7, there's no difference because we only ever allocate one mbuf. However, for the LRO cases it increases what's available in LRO. It also ensure that we get enough mbufs in those cases as well (though I have no ability to test this on a LRO scenario with armv7). This has the side effect of reverting 527b62e37e68. Fixes: 527b62e37e68 Sponsored by: Netflix --- sys/dev/virtio/network/if_vtnet.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 360176e4f845..db7a1a18ebc2 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1532,8 +1532,8 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) m_freem(m_head); return (NULL); } + m->m_len = size; - m_adj(m, ETHER_ALIGN); if (m_head != NULL) { m_tail->m_next = m; m_tail = m; @@ -1587,6 +1587,15 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *rxq, struct mbuf *m0, ("%s: mbuf size %d not expected cluster size %d", __func__, m->m_len, clustersz)); +#ifdef __NO_STRICT_ALIGNMENT + /* + * Need to offset the first mbuf in this chain to align the IP + * structure because this host requires strict alignment. + */ + if (m_prev == NULL) { + m_adj(m, ETHER_ALIGN); + } +#endif m->m_len = MIN(m->m_len, len); len -= m->m_len; @@ -1655,6 +1664,13 @@ vtnet_rxq_replace_buf(struct vtnet_rxq *rxq, struct mbuf *m, int len) if (m_new == NULL) return (ENOBUFS); +#ifdef __NO_STRICT_ALIGNMENT + /* + * Need to offset the first mbuf in this chain to align the IP + * structure because this host requires strict alignment. + */ + m_adj(m_new, ETHER_ALIGN); +#endif error = vtnet_rxq_enqueue_buf(rxq, m_new); if (error) { sc->vtnet_stats.rx_enq_replacement_failed++; @@ -1722,6 +1738,13 @@ vtnet_rxq_new_buf(struct vtnet_rxq *rxq) if (m == NULL) return (ENOBUFS); +#ifdef __NO_STRICT_ALIGNMENT + /* + * Need to offset the first mbuf in this chain to align the IP + * structure because this host requires strict alignment. + */ + m_adj(m, ETHER_ALIGN); +#endif error = vtnet_rxq_enqueue_buf(rxq, m); if (error) m_freem(m); @@ -1907,8 +1930,10 @@ vtnet_rxq_discard_buf(struct vtnet_rxq *rxq, struct mbuf *m) int error __diagused; /* - * Requeue the discarded mbuf. This should always be successful - * since it was just dequeued. + * Requeue the discarded mbuf. This should always be successful since it + * was just dequeued. There's no need to adjust for ethernet alignment + * here on strict alignment hosts because we're requeueing a packet + * already adjusted. */ error = vtnet_rxq_enqueue_buf(rxq, m); KASSERT(error == 0, From nobody Thu Dec 28 06:25:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0z6G4WCJz557r1; Thu, 28 Dec 2023 06:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0z6G440vz4ZZQ; Thu, 28 Dec 2023 06:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLRZa8ZRZDIkNlZ7AImxRq9MurTg0LYRcWiqTbJvRW8=; b=vyuy9ieNrdyXVsJweB2YHoi0ilXJS0SBfaXvmZ8b67NDvoODPslmO9CF+JR1U6G7GaxeEL BII8PJD5Y1wxS8ATG5J2FgBJ686PcmjlS6/VbuY0aU06KoNVb5x8KM0YCK93vrGZKmzkK3 Zb8prpx/giLOEch5TXmdcTJv/P4TMPAi7+IehpFWwCEPYvvnyLG3Y0xw/WgERKctLzWDR8 swqf9gYM5h0v8Z6CZRSeocKJ8CvVF+U3h7PSBK1IY5QOLAGLILFNenh3ReUI6bwonZuKXP 6ed78G9qkFquUI2BMkcOsO3Snwl+HiST4BSI8R74jb9Si3ng+zUAw8nvOz42hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703744758; a=rsa-sha256; cv=none; b=TsQqPKqSTrDTqwBGABWM/RvRfFqzuRCwj6W3oVqXaYEiVRbuH5WKEX0a1HG2VFpaxT0lcb dT/XT9Cpn9eo9RiZTAVX/ZmTwaThDPi+d8vSKLoLJpQlLfsLgyPIr/ty+03Rn+OS+zeLmV H+ka6+OiZw8P0u9q4svCViOp6tIEoyRYoAWe6p1zI7a8FwP7JqTu8xMGcO8dHELQ3wjKmE YOsL4A8Z3kJEMi2pb/gUnlCJSIG5A5ui6Eq6SrEeAA9BioPm/k6g4SQtgNOgSgP8ddl7gy oWTf2u3jphE1iH6K5gqND8RUIZk6qVsBmMDYllcnCKgeG7L3nC2u/XCUlxZvJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703744758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLRZa8ZRZDIkNlZ7AImxRq9MurTg0LYRcWiqTbJvRW8=; b=wKC+FqbAbqgYgPr9o7F6PBU6orKSOtV1zU73qQcyBwqualZ0oN+eRO/tHO+lQOK+zCd+Jl zp+6a+pBvntbL7nIbL8ABfjrr1Rhug0f8M7m6g4QYUZ1ofFewDbp1f7eWONYbTpSvoNpPQ b1KBqWt7zlpdcpe5BMIflPs7EbV2IsPa2m+pVdOvW8zkW6HsFSSRAxmytAPvd9/jO+pvUX uqBjWRQE3qWLx6vZ3tlrKEfB62C/XOrz1YbfTzWxJfpjiE78b1i1I4INGkRucRcAMygaAZ cfZyzR2QxjaiDdda3CtlJgiT7f3f44OI438SisEeKSpjUeh0M6gpIlqKc1wUVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0z6G369Hz19rR; Thu, 28 Dec 2023 06:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6Pwbm080254; Thu, 28 Dec 2023 06:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6PwFJ080251; Thu, 28 Dec 2023 06:25:58 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:25:58 GMT Message-Id: <202312280625.3BS6PwFJ080251@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: 4b817fc1f02c - main - CONTRIBUTING.md: Fix typos List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4b817fc1f02c8b152474730c5c7c51c3ce585ad0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b817fc1f02c8b152474730c5c7c51c3ce585ad0 commit 4b817fc1f02c8b152474730c5c7c51c3ce585ad0 Author: Warner Losh AuthorDate: 2023-12-28 06:16:44 +0000 Commit: Warner Losh CommitDate: 2023-12-28 06:25:53 +0000 CONTRIBUTING.md: Fix typos Fix my own typoes. Noticed by: kevans, cperciva Sponsored by: Netflix --- CONTRIBUTING.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31ca40700b76..f166b6a93766 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -150,7 +150,6 @@ Anything that's in the directory `contrib`, `crypto`, `sys/contrib` or any subdirectory of these you are submitting patches for to find out the last time we merged from upstream. If it is in the last 5 years, upstream is "active" and you should submit your patches there and let the last few people to commit -to this file (especailly merge commits) know. If it's been more than 5 years, -upstreamm is likely inactive so please submit the patch. We can sort out if it +to this file (especially merge commits) know. If it's been more than 5 years, +upstream is likely inactive so please submit the patch. We can sort out if it should go into FreeBSD or upstream. - From nobody Thu Dec 28 06:43:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0zVq5cFpz55949; Thu, 28 Dec 2023 06:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0zVq57Xrz4cHL; Thu, 28 Dec 2023 06:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703745827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FhDMnARw0xqoi/0n91mW1iYVTKxTDjIJDQ2misChOo=; b=Vg4TvK/CFUlgmCbIQtdGNphK1CDglMGctF8cX9+CnETMFHGj5jG0aOlohueucyGc/8C3os ewSnASodeUCG/YG6c6OHL4qC85pszqjJ4ohbWfUj8E0AG0mEsO+SZoZKDKDuLLlwEvDn/u WojZ+y+ecHiQcq6LjZWxhOkA9L7AdhnUQG8yvsznEGaGH3ccAv8kpXT+9Gez1qJgsdszkT 1PFxV5kKjd7NINzwHEe/nlXGeeZCMDtpKY6ufGaCfxG0i2DeaPHCVCstkiv2bNF0xVedNO DC0n2AcRpZwiqfAU0YrvH6oi/oAZmhnbt2Zlemk92q1a0M25lK7HbTfNiXUWhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703745827; a=rsa-sha256; cv=none; b=JzJxbAsEqBsgHX/SCcenjJbybpAfA4UWlvSXvkuM+SbKhm11O9rt3iAQmXl03QGdFQ855V yQmLSAbPQVpj3iZ7tFrUu0JjvUqpB1YzwyI8fzuXixO+W53ZHiCF2I7FRng/GeebzBOclV Wm6lzu2/yC06YNEtPBgOVpOC9jLPA0LZ4iRIxfLn6u80jMS/SfhQUd9S8rb67v3/6DYJfW ifxGhuyPQHIk7pJ9js+TmmQREcG5XElXSSbgK5GWH85Jmq/9RD+TOIJmTm+0B0UnUY2IuW VuyUk4i8bdY1hl8/88m8Ko6mYVztsBeOnV7mBvJ8uJhMLpIaE/aEUMSpaDn/eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703745827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FhDMnARw0xqoi/0n91mW1iYVTKxTDjIJDQ2misChOo=; b=cZ4NE1dr+7im1U9AHmNqYNxerpCQ7+vodkl8mbHi5h9CHCNVzOK+J6HGXasJfpLrFoUGoy VCufVl7mnFlI5SCcqe6l7cw3K8rRQPtOtEDR4Un3fXnUqql9Y+L+fzd6r0VJRvxCg6FnDJ 5Pz7AuzMqF6O7dJ34uXkPLG4Ame4FJmfKEpJX4EVDZAXO5aiGUpVLvpl8Yfbg8+1Ny3Lon eqod9BuyVXTYwH3YiDQuFxrHB0og2kyHVjRDe+I2reed/J4jOMwK6iQJfndj+MtMzjFbT+ OBr2bWA53jRuxWDKgbmlMZuMs2NHmtjkHpWvFkED92FNBUu4Uiy0Bm14o33htw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0zVq4BnPz1BZN; Thu, 28 Dec 2023 06:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS6hlRD013451; Thu, 28 Dec 2023 06:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS6hlrv013448; Thu, 28 Dec 2023 06:43:47 GMT (envelope-from git) Date: Thu, 28 Dec 2023 06:43:47 GMT Message-Id: <202312280643.3BS6hlrv013448@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: e4183f17458d - main - geom/journal: Fix typos List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e4183f17458de178dec4b123376c0c89efb873cf Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e4183f17458de178dec4b123376c0c89efb873cf commit e4183f17458de178dec4b123376c0c89efb873cf Author: Alex AuthorDate: 2023-12-28 06:40:33 +0000 Commit: Warner Losh CommitDate: 2023-12-28 06:42:03 +0000 geom/journal: Fix typos Fixed a few typos. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/884 --- sys/geom/journal/g_journal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 11a75e541fda..92c197d98aa3 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -374,7 +374,7 @@ g_journal_check_overflow(struct g_journal_softc *sc) if (g_journal_switcher_wokenup) return; /* - * If the active journal takes more than g_journal_force_switch precent + * If the active journal takes more than g_journal_force_switch percent * of free journal space, we force journal switch. */ KASSERT(length > 0, @@ -1383,7 +1383,7 @@ g_journal_flush_send(struct g_journal_softc *sc) cp = sc->sc_jconsumer; bioq = lbp = NULL; while (sc->sc_flush_in_progress < g_journal_parallel_flushes) { - /* Send one flush requests to the active journal. */ + /* Send one flush request to the active journal. */ bp = GJQ_FIRST(sc->sc_flush_queue); if (bp != NULL) { GJQ_REMOVE(sc->sc_flush_queue, bp); @@ -1724,7 +1724,7 @@ g_journal_mark_as_dirty(struct g_journal_softc *sc) /* * Function read record header from the given journal. - * It is very simlar to g_read_data(9), but it doesn't allocate memory for bio + * It is very similar to g_read_data(9), but it doesn't allocate memory for bio * and data on every call. */ static int @@ -1837,7 +1837,7 @@ g_journal_sync(struct g_journal_softc *sc) (intmax_t)offset, error); /* * Nope, this is not journal header, which - * bascially means that journal is not + * basically means that journal is not * terminated properly. */ error = ENOENT; From nobody Thu Dec 28 07:11:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T107H2hBhz55DF2; Thu, 28 Dec 2023 07:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T107H2DGqz4fqq; Thu, 28 Dec 2023 07:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703747515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQT8lAjLDPVYfvhbqyxFDf9+TXYF+UpRT+lXlcdMCx0=; b=cdR1eR2iKTSSYjoUT+FpFkQcknVkgoMYTqb4WCWJBGvpk8oGE3sbKe1yLA9p+W8G9gNcvr VEHMNoyAFVFOvKGmyAxwmjb5083XQhPAClH0xwBU/pzEamlz1fQkHsf1kEpGd0FPXBf4ou tdPVye+ymkNlma6XMkk34kU8Btf9ka0y4oVjiqaJ/ntJPgEICHmNc1l9q1pR7oQPNRsZxX Q9Hiz2OkXLVgnZV9ZY9ImLayj7ZJEG8eFgNd17wDZelk+9RnH9AYorZGQmYKU4bAUM2BaT witV3jvl0l2y02J3VqOroYCT7NdOOcApe6jPcpId5gUtqryzNYd4j3KT68AYvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703747515; a=rsa-sha256; cv=none; b=MkrX9VJTpFDqH3VqUKvJvdcAlnKcx6WmDtTo2Rqi+sPYJ/Ss1z9Q7zxVrOD3Zh1osO78dm R2y45GQZTCTK+UglGtd9OjJIo8AFS+dwbNOhv5Mx3CMASiWepU0mMslVNrfjWM5qDvAMc0 837Eg4gSS43waHUhKIyqxXSpGJbQY4LyHhd6DiE/hv9Uu2E1aq6+1ZGl19s1Bo+e6tL65y 2WEZrEhPQpKDhvLv1yoXZtjpMvYwLMn1rHdmM92G71M1St7bBKTZA1yx5UXlCUFku+lC30 jjIv08q+DF+Qnqoq/C3MLYO1iz29DuHK/7AlTFMkKL5UVDW46zORuC4noXaCQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703747515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQT8lAjLDPVYfvhbqyxFDf9+TXYF+UpRT+lXlcdMCx0=; b=e6t8z36xoDwPxoTHdlWE58m5ykTxOpNrZ04CcAdxyZTF85IRL+vKQ+Cdle7oNgARiDxwHT HHzmDnrttp2DSpqGBpfoA3meTsCRJQdptOZHErMdS6kecIxy6In7qpBPyOqsLI2/g9T1eW e2BQs0pGXdUcPSDddemq8IkqEhFg/60rvkIybCg39JI2XdwGT2GBlyQdcF9+VpaxoHNj5W iPakkAzHgYTudIamXbML+mKofLatj7vaF84yXC0/U9N8aiWKU7katdXl+bPFLxzxFFZTXP n3Qi4VJX1XmbHIQ3PGGlCXD4sOEKZc52+JhoocX4tGFH1NYHOkEkRzZxnfsnEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T107H1JCdz1CZW; Thu, 28 Dec 2023 07:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS7BtH0062465; Thu, 28 Dec 2023 07:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS7Btt6062462; Thu, 28 Dec 2023 07:11:55 GMT (envelope-from git) Date: Thu, 28 Dec 2023 07:11:55 GMT Message-Id: <202312280711.3BS7Btt6062462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: f8952e4ee088 - main - update homepage for FreeBSD Manual Pages (again) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8952e4ee0889bcedd373e7b1b071ebfd701b8ae Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=f8952e4ee0889bcedd373e7b1b071ebfd701b8ae commit f8952e4ee0889bcedd373e7b1b071ebfd701b8ae Author: Wolfram Schneider AuthorDate: 2023-12-28 07:11:38 +0000 Commit: Wolfram Schneider CommitDate: 2023-12-28 07:11:38 +0000 update homepage for FreeBSD Manual Pages (again) --- share/misc/bsd-family-tree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 8b04d343a71e..d50d69fceffb 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -919,7 +919,7 @@ FreeBSD Release Information URL: https://www.FreeBSD.org/releases/ Manual pages for FreeBSD and ports -URL: https://www.FreeBSD.org/cgi/man.cgi +URL: https://man.FreeBSD.org/cgi/man.cgi UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html From nobody Thu Dec 28 10:48:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T14xK1pJFz55b3N; Thu, 28 Dec 2023 10:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T14xK0ypmz3b9g; Thu, 28 Dec 2023 10:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703760517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/1QtqXHMgimBK6zzeeiaP6/3ambCtTNWOiDLLI/7qg=; b=bWyaBjzRxz43DUPYv686t8qb3pQvYXIvQ8rpF78SgXCW1q2amTgcfutN8hutfK8gWTXll+ muRwMNs6tX/z8qYfrEFo+/3H5QED2j2jkUkGCCqOs5zv64+1O5B+h7DLeFVM+KEfypOvOU WaXtVmdyIvZntWyOQeqjkDA2kg7mHM43kOrZUGwMAB23KyEQZwoNmSHwIrd/le7VrLEBmS S0br48auybnNyiG11L+RJc3uVugYUcenOWpVp/R1xwnn+qqDEQpvKtaSh+A/VBjwVZTK00 ANiv39DrXrxoKOeQhp+CcQvqgTkcq91aPeZTMZhCa4kOpgoq2BU/ieZrUAtHLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703760517; a=rsa-sha256; cv=none; b=F2K5STKIazizb6jzkXXxuHZDLYGU73jXmJw18VpmS6EYNEdZM9XnqOsHW8r1sOe+EJasEb kTp6zIOyEWu1HiP8xztBJo8qHTCHG6z8ZbOunD1CyeDuGOWOggVFV5W4iZiMoytIyHHy6Y M6ORuh69EVqRvF5cu8tMerI6Aa85bjend/qrfRhipkM/AaqTgBNVYLunomNJCd/yp3h+9l azCX8frJYhojgUYQu1VwYFyF93+N33Hi9OnnPNCOidZlvKRRP/vZg8NFycd3RmmRZMf5TK y44O+IK3nijHVBxNnRD5SqawuZUFEMLfM8M5XfP8Ab6y7c2qkxiyc1fwLLAeqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703760517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/1QtqXHMgimBK6zzeeiaP6/3ambCtTNWOiDLLI/7qg=; b=vvrKvL787KXW5M4fqSotz2I3UZJ++tgsgERM5uLZ68NO6XaPapVB1GoD/ZNSpl+DLDBJmp 5+TLZhPM5lracgCORzq2M4nz1Qw6sCn2QIwpKyzXYaoyg23QC7JLiSoY5q/IKfUzJOSbIY RnuSL7V+m8S17BiUPWTZ8aTA4ZeLR2paf0xOUX01JYYMcgucZMjWHQTF0s83VXaYc/pGKx oinWcTPWzn94dPmihJCJNFt9iKq6VrafV3pVLiF86EYD30sjU11q8raCb0RWofi2Mx8TZr 5Uy+fNUOzwFgjBTsg7jczPumZq2+z1pUzdRXAJSpx8BWsAZWT3kTs25BsQyogg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T14xK02dWz4c9; Thu, 28 Dec 2023 10:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSAmaIT017419; Thu, 28 Dec 2023 10:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSAmamG017416; Thu, 28 Dec 2023 10:48:36 GMT (envelope-from git) Date: Thu, 28 Dec 2023 10:48:36 GMT Message-Id: <202312281048.3BSAmamG017416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 271887ec35ad - main - update manpage URL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 271887ec35ad6fe3372215e443309c387d3a8c27 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=271887ec35ad6fe3372215e443309c387d3a8c27 commit 271887ec35ad6fe3372215e443309c387d3a8c27 Author: Wolfram Schneider AuthorDate: 2023-12-28 10:48:04 +0000 Commit: Wolfram Schneider CommitDate: 2023-12-28 10:48:04 +0000 update manpage URL --- usr.bin/indent/tests/comments.0 | 2 +- usr.bin/indent/tests/comments.0.stdout | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/indent/tests/comments.0 b/usr.bin/indent/tests/comments.0 index 4a627b9f39ec..6e9221868a1c 100644 --- a/usr.bin/indent/tests/comments.0 +++ b/usr.bin/indent/tests/comments.0 @@ -10,7 +10,7 @@ void t(void) { /* * Old indent wrapped the URL near where this sentence ends. * - * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html + * https://man.freebsd.org/indent */ /* diff --git a/usr.bin/indent/tests/comments.0.stdout b/usr.bin/indent/tests/comments.0.stdout index 5c4fc6824a0c..2ffd3e49b6c4 100644 --- a/usr.bin/indent/tests/comments.0.stdout +++ b/usr.bin/indent/tests/comments.0.stdout @@ -12,7 +12,7 @@ t(void) /* * Old indent wrapped the URL near where this sentence ends. * - * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html + * https://man.freebsd.org/indent */ /* From nobody Thu Dec 28 10:51:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T15120Nwlz55bBY; Thu, 28 Dec 2023 10:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T151174Rzz3bmH; Thu, 28 Dec 2023 10:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703760710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7UrCoYgZ0Xonmh+5VAVWAbsoMEOIX8n9beXhzLKhIw=; b=Tfda5/2q73tM+kJ8PuY+9L7cq45zJVgyaRMU/sxSTcqS/Igm4tA6wsc5CRlAKAVqIg6dpk 1fm9humLawdatekCfTjJ7zutnFePn55k5xl9p/P8kg4Q/yMHrkPoQSlHK5LaHeMx+bfGpr IVDlIHi8JIDJmDk0BetOWIUweeoJuSJ6s4VWsyDTzoMwdHIve0S+4pQHLUartiPvWbgioc 9rHJW95I1oV1oBM+7cj8DmXwKUrv436qbN+0wgz2guLZfjPB47KBhGxLfun+Vk6eiHtUgh C4sD3g7z1zawPMGplm2TF3eo+S8u0WPdTmCDrdtAgeok2B5kWTBVl/JlfADa+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703760710; a=rsa-sha256; cv=none; b=gpbdWdakGHt2xfUyWcWLveUTtf0eQzViKdYIOSdi+c12GCDqveg8Iynn85Ke65eSMBXTH+ G2V/8HE8pFntQKnKZGOkUx4luREVo7KnUm7bUXvtNkqbXD2X6gIEOPKtfrl1HlrFe+QYOI itjPDmqfvJ2E8ywiRHQ6sVBZnC6lUhvu51cjV1Z23n8s0fm9SMIQVAAe/EA052/iC9sdng sTCsVgF+OGhir7uJVsvqL+z9mRMK7dAk1/yn5zUOOuo7J8AreGrlAMT7uvR/0xPy42e1jG UoCkadyvJZ+gY8TPbVZSdqft2qL2LPdpnfkjmdiB7tklsLc1QegeOPvdMGMFTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703760710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7UrCoYgZ0Xonmh+5VAVWAbsoMEOIX8n9beXhzLKhIw=; b=hiSW4F6MDOuAqvmMvrCI9j+z4pAK8x3UEYnudvF1yPfg9BiECtPoOD9p9pSS4LFNGORvfp lht9GKVaULf2VhwOpA2ZUrQ5Ygjtcs8HN3A//eYK1ZdSJmzD4czndQPEMB+5bciY+3oYet n0XZMlHpkApqKnbfUPSC1kIfZKjBpspj3YEb2owzgJ/a51Orn0JsEKT0jJeioP80jLFAKx A+bniS3e1WEpOBZdcUdEURUn3eLydcYYoh+hjUhz6qbT/fMQ2DoExAy/PJZB6+qMmnEfU5 psdMN997FU8iCbY1RljQo0hrqPfLH/QwuTnRNOkYGhwXmfLpbp5PHv4zyadSAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1511673Hz4Nw; Thu, 28 Dec 2023 10:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSApn5b029661; Thu, 28 Dec 2023 10:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSApnCo029658; Thu, 28 Dec 2023 10:51:49 GMT (envelope-from git) Date: Thu, 28 Dec 2023 10:51:49 GMT Message-Id: <202312281051.3BSApnCo029658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 789480702e49 - main - support spaces in filenames List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 789480702e490818244af11279868ba4f3dabe6b Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=789480702e490818244af11279868ba4f3dabe6b commit 789480702e490818244af11279868ba4f3dabe6b Author: Wolfram Schneider AuthorDate: 2023-12-28 10:50:29 +0000 Commit: Wolfram Schneider CommitDate: 2023-12-28 10:50:29 +0000 support spaces in filenames PR: 275978 MFC after: 1 week --- usr.bin/man/man.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 87594699b2c2..66af46a36243 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -158,14 +158,14 @@ check_man() { if exists "$1"; then # We have a match, check for a cat page manpage=$found - setup_cattool $manpage - decho " Found manpage $manpage" + setup_cattool "$manpage" + decho " Found manpage \"$manpage\"" if [ -n "${use_width}" ]; then # non-standard width unset use_cat decho " Skipping catpage: non-standard page width" - elif exists "$2" && is_newer $found $manpage; then + elif exists "$2" && is_newer $found "$manpage"; then # cat page found and is newer, use that use_cat=yes catpage=$found @@ -308,7 +308,7 @@ man_check_for_so() { # We need to loop to accommodate multiple .so directives. while true do - line=$($cattool $manpage | head -1) + line=$($cattool "$manpage" | head -1) case "$line" in .so*) trim "${line#.so}" decho "$manpage includes $tstr" @@ -338,7 +338,7 @@ man_display_page() { # just zcat the catpage and we are done. if [ -z "$tflag" -a -n "$use_cat" ]; then if [ -n "$wflag" ]; then - echo "$catpage (source: $manpage)" + echo "$catpage (source: \"$manpage\")" ret=0 else if [ $debug -gt 0 ]; then @@ -496,8 +496,8 @@ man_find_and_display() { decho "Found a usable page, displaying that" unset use_cat manpage="$1" - setup_cattool $manpage - if man_check_for_so $manpage $(dirname $manpage); then + setup_cattool "$manpage" + if man_check_for_so "$manpage" "$(dirname \"$manpage"")"; then found_page=yes man_display_page fi @@ -516,7 +516,7 @@ man_find_and_display() { # Check if there is a MACHINE specific manpath. if find_file $p $sect $MACHINE "$1"; then - if man_check_for_so $manpage $p; then + if man_check_for_so "$manpage" $p; then found_page=yes man_display_page if [ -n "$aflag" ]; then @@ -530,7 +530,7 @@ man_find_and_display() { # Check if there is a MACHINE_ARCH # specific manpath. if find_file $p $sect $MACHINE_ARCH "$1"; then - if man_check_for_so $manpage $p; then + if man_check_for_so "$manpage" $p; then found_page=yes man_display_page if [ -n "$aflag" ]; then @@ -543,7 +543,7 @@ man_find_and_display() { # Check plain old manpath. if find_file $p $sect '' "$1"; then - if man_check_for_so $manpage $p; then + if man_check_for_so "$manpage" $p; then found_page=yes man_display_page if [ -n "$aflag" ]; then @@ -560,7 +560,7 @@ man_find_and_display() { # Nothing? Well, we are done then. if [ -z "$found_page" ]; then - echo "No manual entry for $1" >&2 + echo "No manual entry for \"$1\"" >&2 ret=1 return fi @@ -1040,8 +1040,8 @@ do_man() { do_full_search "${REGEXP}" fi - for page in $pages; do - decho "Searching for $page" + for page in "$pages"; do + decho "Searching for \"$page\"" man_find_and_display "$page" done From nobody Thu Dec 28 12:58:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T17qJ1ZCcz55nT8; Thu, 28 Dec 2023 12:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T17qJ10XDz4QPP; Thu, 28 Dec 2023 12:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703768316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWJarHHkxSVade6TyLiGuvPDNQoFOirkdToAPgNjh9I=; b=ZHJc5R40ATLHxQdIluR+iS12KPGi7A6XoF+2O8Mu9gQ5z1lUASyidkjbxy0ef0aRwpqriY 518lqFkbWCc5xf9FFgKHM8sSOiX7WvA1iXoCbSU50EliEZEcR/TMVomzvcBU9v56H9Pr8c NtZRmjsgoxigkjMdCsyTII1DK2LYdrzLYaEZGMqV2w6OeFg0xmsji+Um8TcKgcFYXamGfb fYzEVxMrW0LeYEtdT3YnvIROisCdJRKA/L+GZoBgvnTNIz+ozH1MLUW3+ahC93xXokz1UV 8/r03i0S/5N6J0Z+5MUPVMhF9U1uxg0LrPqVnd1IFSOQPbFFw1gBKA76ah2h+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703768316; a=rsa-sha256; cv=none; b=NBvOwRHesS6ijsgUEkXLD6ah/AB3RYO62GY7sfIhxkAxS86WSgkUfuF9wFFUPE+nqDbs1W iUg588yACBNLiV5AL9CVS+Hd16ZXUQJTyP23b26jiPHMmk2M3h6nlC6GTfsp/ofG5QzkaL Xr1PgiXY9s2rukaMGtfxZjKQdkNoV72q26bvncLBThRdmM6Dy7Qhnyb+v5t7I1oeCraw9Q jfMlfCtEzI40HVKx5s7rocrWaWJMq4A/H3NWS4Z7QZKfX1Po5+s4+22Qy5u2Cy9ojPh8yY yMW0qy+T5k/2R7BcpCUr7rWgf8v6kgIqy4WOg0FcVyvBDfR34SGy1sKPmUzewA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703768316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWJarHHkxSVade6TyLiGuvPDNQoFOirkdToAPgNjh9I=; b=tvmy4uFkfWmcjyPjed1T4aTkS5zGiMwcsRm/c5n59EgkuPNJcdLS1IFf1ewwz/0C5j5o7R qSu1lgnuAS/+s7MHn/pe8buRpqQPkcTjlL5XK+gmteZ+bPPrxz0sAhg01UNsGWs4BxaVC6 R+n1uBDUjDvib6mzM5DmfUVmtQNKkp0NvIloarOz+c5kqWcvVzspO7xjyG3mvnxPpXY42S mXbISBD+qNMvGl585+1cb8xjREE4NdlVK7bU+g2LJTjkZpXPoIrfQVfVgHS8lLTCWz/Wiu GRsQ6mz7bC2PQG0m3d7haJjS5Xt+Mj8K11kdSoNbVVvrq5qK8JtDm/x2sbp7Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T17qH6z4Jz8GK; Thu, 28 Dec 2023 12:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSCwZ3q034912; Thu, 28 Dec 2023 12:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSCwZdS034909; Thu, 28 Dec 2023 12:58:35 GMT (envelope-from git) Date: Thu, 28 Dec 2023 12:58:35 GMT Message-Id: <202312281258.3BSCwZdS034909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e77a1bb27574 - main - Reorganize libclang_rt Makefile and make more lib/arch combos available List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e77a1bb2757471ab3fed0750b76eeb15d0c7b10a Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e77a1bb2757471ab3fed0750b76eeb15d0c7b10a commit e77a1bb2757471ab3fed0750b76eeb15d0c7b10a Author: Dimitry Andric AuthorDate: 2023-12-28 12:57:41 +0000 Commit: Dimitry Andric CommitDate: 2023-12-28 12:57:41 +0000 Reorganize libclang_rt Makefile and make more lib/arch combos available Upstream has made more clang runtime libraries available for more architectures, so add them. To make this easier, split up subdir lists into functional parts (asan, tsan, etc), and put each architecture into its own .if block. Effectively, this adds the following libraries for aarch64: asan, cfi, fuzzer, msan, safestack, stats, tsan, ubsan, xray. PR: 262706 MFC after: 3 days --- lib/libclang_rt/Makefile | 162 ++++++++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 71 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 40fd7dfab8fb..46f7fdf814be 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -1,75 +1,95 @@ -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -SUBDIR+= include -SUBDIR+= asan -SUBDIR+= asan-preinit -SUBDIR+= asan_cxx -SUBDIR+= asan_dynamic -SUBDIR+= asan_static -SUBDIR+= cfi -SUBDIR+= cfi_diag -SUBDIR+= safestack -SUBDIR+= stats -SUBDIR+= stats_client -SUBDIR+= ubsan_minimal -SUBDIR+= ubsan_standalone -SUBDIR+= ubsan_standalone_cxx -.endif # amd64 || i386 - -.if ${MACHINE_CPUARCH} == "amd64" -SUBDIR+= dd -SUBDIR+= fuzzer -SUBDIR+= fuzzer_interceptors -SUBDIR+= fuzzer_no_main -SUBDIR+= msan -SUBDIR+= msan_cxx -SUBDIR+= tsan -SUBDIR+= tsan_cxx -SUBDIR+= xray -SUBDIR+= xray-basic -SUBDIR+= xray-fdr -SUBDIR+= xray-profiling -.endif # amd64 - -.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le" -SUBDIR+= include -SUBDIR+= asan -SUBDIR+= asan-preinit -SUBDIR+= asan_cxx -SUBDIR+= asan_dynamic -SUBDIR+= asan_static -SUBDIR+= msan -SUBDIR+= msan_cxx -SUBDIR+= stats -SUBDIR+= stats_client -SUBDIR+= tsan -SUBDIR+= tsan_cxx -SUBDIR+= ubsan_minimal -SUBDIR+= ubsan_standalone -SUBDIR+= ubsan_standalone_cxx -.endif # powerpc64 || powerpc64le - -.if ${MACHINE_ARCH} == "powerpc64le" -SUBDIR+= xray -SUBDIR+= xray-basic -SUBDIR+= xray-fdr -SUBDIR+= xray-profiling -.endif # powerpc64le - -.if ${MACHINE_CPUARCH} == "riscv" -SUBDIR+= include -SUBDIR+= asan -SUBDIR+= asan-preinit -SUBDIR+= asan_cxx -SUBDIR+= asan_dynamic -SUBDIR+= stats -SUBDIR+= stats_client -SUBDIR+= ubsan_minimal -SUBDIR+= ubsan_standalone -SUBDIR+= ubsan_standalone_cxx -.endif # riscv - -SUBDIR+= profile +SD_ASAN+= asan +SD_ASAN+= asan-preinit +SD_ASAN+= asan_cxx +SD_ASAN+= asan_dynamic +SD_ASAN+= asan_static + +SD_CFI+= cfi +SD_CFI+= cfi_diag + +SD_DD+= dd + +SD_FUZZER+= fuzzer +SD_FUZZER+= fuzzer_interceptors +SD_FUZZER+= fuzzer_no_main + +SD_INCLUDE+= include + +SD_MSAN+= msan +SD_MSAN+= msan_cxx + +SD_PROFILE+= profile + +SD_SAFESTACK+= safestack + +SD_STATS+= stats +SD_STATS+= stats_client + +SD_TSAN+= tsan +SD_TSAN+= tsan_cxx + +SD_UBSAN+= ubsan_minimal +SD_UBSAN+= ubsan_standalone +SD_UBSAN+= ubsan_standalone_cxx + +SD_XRAY+= xray +SD_XRAY+= xray-basic +SD_XRAY+= xray-fdr +SD_XRAY+= xray-profiling + +.if ${MACHINE_CPUARCH} == "aarch64" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_CFI} +SUBDIR+= ${SD_FUZZER} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_SAFESTACK} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +SUBDIR+= ${SD_XRAY} +.elif ${MACHINE_CPUARCH} == "amd64" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_CFI} +SUBDIR+= ${SD_DD} +SUBDIR+= ${SD_FUZZER} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_SAFESTACK} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +SUBDIR+= ${SD_XRAY} +.elif ${MACHINE_CPUARCH} == "arm" +# nothing for 32-bit arm +.elif ${MACHINE_CPUARCH} == "i386" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_CFI} +SUBDIR+= ${SD_SAFESTACK} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_UBSAN} +.elif ${MACHINE_CPUARCH} == "powerpc" +# nothing for 32-bit powerpc +.elif ${MACHINE_ARCH} == "powerpc64" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +.elif ${MACHINE_ARCH} == "powerpc64le" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +SUBDIR+= ${SD_XRAY} +.elif ${MACHINE_CPUARCH} == "riscv" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_UBSAN} +.endif + +SUBDIR+= ${SD_INCLUDE} +SUBDIR+= ${SD_PROFILE} SUBDIR_PARALLEL= From nobody Thu Dec 28 13:54:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T193R0v1Dz55slD; Thu, 28 Dec 2023 13:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T193R0PKtz4WRv; Thu, 28 Dec 2023 13:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JelTrkNCYlxWt2Qoxp+jgTSYpm7LNljpsR1Y28XwgjE=; b=CAO7dOCfjT8pmWT2aHzQeQAPxkwsaoIWXl1cbka8wYm+lxPTX0u5VtuaesvDzxGbKnuGkG RQX2tYW3hEPWbtetZgqa/0Y95XNum3qMuiKjfh0cI3fKhvqeIR/VPOENbZcyxL25cAUNDQ yPQ5K8pAV+HcmMNGwtX7Agu/hcFRwQ2HsbLJEd/0/8en1vgvpCCTqoV/JrCR5WL+ouQbp5 3zyAWZIff3asZ+KEeGpvdBSLqloBzUyGdzxyR4+m9FbItOfzX6VJmZGKhxruKweRJ+vC5t 3+PrGTyNXPkiktTOQ8jkQERvQ698BAmmIutE4LZzBCYBEmLLdW5InbCAmZVjtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771651; a=rsa-sha256; cv=none; b=GQSD7jtyWW0qL3ibbgbZSuzaqVtBHtyeXcsZmrBEJyi2kDooFrKQpGDCVLyWMXwN15G+8U QYQKu/IAuP9NEPREVxEzQjwS3mWDc10sQs0maGzZDs3H6qmuKIrBfMuE8YnF1CGRU7wXRX 5VTQtTJuOTsE3WChM5lLdq1EANxrPYw4vuQEtvHT+eV7PhwoFBI/GfVlpANyPl54TQfEtl pHcVGcShqySitGDYIFOayvFlx29Nc865TdIvsAOrdE9ZrRxf4bo1BclFLeSd0l14hxOOJM tVfnu3bcTSH4epLd/hEEQb8XEms+oBnqD7l3vZhzVIy1lix9K0ZFB18MzIRXxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JelTrkNCYlxWt2Qoxp+jgTSYpm7LNljpsR1Y28XwgjE=; b=AtGuhC2aJ7iO5Y9dSb4fFQlVCgmhhs3KXq7JOPXMKAuU32sLXY6aakKNuVffJTlWSrndD5 lJ+INXOZA32jdgKh7c0GKNwn7XrUw8lPMXb4GJqsCSTRch79zb+3wnUOZPZ/hsp0KrjmQB BmIsN0TTqMmMXPspgFmsqvSPKWZsYH741ppMFz5wjGy9OpSung/wBLQPErS385AYGBuSCX CwE3M7qhVC0yIAfQ0QWzAKo3FnA1LTL0alWHpWFGvD5sW4sFDcTYqcoCOnZ2csOsNZPcKK fQRdp3jZV34pxRdQ5wGsQlaXX7o2pVlFUz+20eHrRasKnZijuMcHPvjmx8je3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T193Q6Zp8z9yt; Thu, 28 Dec 2023 13:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDsA46035366; Thu, 28 Dec 2023 13:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDsA9C035363; Thu, 28 Dec 2023 13:54:10 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:54:10 GMT Message-Id: <202312281354.3BSDsA9C035363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: adfed2d835a7 - main - ena: Upgrade ena-com to freebsd v2.7.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adfed2d835a7f9382941896d15a487dac6fe659c Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=adfed2d835a7f9382941896d15a487dac6fe659c commit adfed2d835a7f9382941896d15a487dac6fe659c Merge: e77a1bb27574 04cf7cee5ae0 Author: Arthur Kiyanovski AuthorDate: 2023-12-28 13:52:31 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:52:31 +0000 ena: Upgrade ena-com to freebsd v2.7.0 Merge commit '04cf7cee5ae0c6bb29eb21ce85bab7ca7386a95f' Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. sys/contrib/ena-com/ena_admin_defs.h | 1412 ------------------------ sys/contrib/ena-com/ena_com.c | 431 +++++++- sys/contrib/ena-com/ena_com.h | 187 +++- sys/contrib/ena-com/ena_common_defs.h | 50 - sys/contrib/ena-com/ena_defs/ena_admin_defs.h | 146 ++- sys/contrib/ena-com/ena_defs/ena_common_defs.h | 3 +- sys/contrib/ena-com/ena_defs/ena_eth_io_defs.h | 18 +- sys/contrib/ena-com/ena_defs/ena_regs_defs.h | 13 +- sys/contrib/ena-com/ena_eth_com.c | 45 +- sys/contrib/ena-com/ena_eth_com.h | 29 +- sys/contrib/ena-com/ena_eth_io_defs.h | 960 ---------------- sys/contrib/ena-com/ena_fbsd_log.h | 74 -- sys/contrib/ena-com/ena_plat.h | 52 +- sys/contrib/ena-com/ena_regs_defs.h | 137 --- 14 files changed, 807 insertions(+), 2750 deletions(-) From nobody Thu Dec 28 13:57:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T196y0vDGz55t95; Thu, 28 Dec 2023 13:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T196y0HXzz4Wwj; Thu, 28 Dec 2023 13:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkwENmkKzFOqLoHU0qFF6Iorn34OIBCeS4p8/u6Dpjk=; b=TWn5JrPOvX4A0Zjp7WpZedb32yx5pMQYjDVfY4JdjPcIrx1kTrRPt9mtTInEQPCam9WWRe D0fpJWzPUmJKXwWVJoWjgF7d4oaVZgYL75WAkT1p7x6arjUHiXW1ptfI32DDw9eNYju5QS etHC0E78XJ5tiA5AHo2VTF8nWZqhYwwzldOKfUwjpR/qYSCIaUqoWmOipvXOVxJkEb2LGS UOMNb8AfSZXdxasyrsemKj+XEORAxxnTo3U5NhLjK5lW0b4mss92agIUU9PP8TcXa7TqWK 9aqCjh56hT9x8+ghLgGzojUuMStwb9qb03BMUr+1IacIZwu7Ld3lyl1qG+rkzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771834; a=rsa-sha256; cv=none; b=Dw/pcODHSnciexKmk+EICKFWshIlkG9h02jye9Oa5DGaNYrR7smZIwX1agiEmJwqqQQ1Jg Gx1Z5V+5tpRCKvo8CdKZLQL17gtKBneSDToKDW9FEUUAXu4M4u2WVkT66l+vJDJlNWG3tr WZcvkkn7mJ3u+UjGMRcpVM7ge2HRaiCq2R9LEMDU5ksWCVHKCkNxtn+PzUWB0m4xS34jNb 7HyEHKFx5/gAxMlNZSTwL432tmvOQ3D9uLeeVzc7gCYGmJjDhlQs51ew34srYsA4VOgu6p AIbB8VA3ALDOmNUJDYdiup5U2w+647y0DcLN3DAu4cqPalR+H7TqmAgndctS8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkwENmkKzFOqLoHU0qFF6Iorn34OIBCeS4p8/u6Dpjk=; b=U8B1UkMgIRlO0XN8ALY9BAYiFTMAA1y+kyBQXZJ5FBgpA68atX4WXBD1fg7hnaCO5PLf0J XkSZJ4mB49KdkLhN+oxd+fx5SaBGNA4Rlh2/GkQxoGlzj6Pc0B2S44nmii/2TheYPTEu7+ B07K7DjXSWN5s/fYJHMK+mN2fU/ZnU1lyBoEIiWcJgLx1idvCBSWofuS7eClH7SeA9l+Xk ol/ZjQj8lpsEx37NwCo1ADJcfPx6u6F/8S/8iXQG77AwKbkfRhlKKyeSfs5WWYplszMHxk Lp0g298XHJibaR9r2soprWDNqXfcYZaq6V91RKp82NtdV1L8t4AL1RuHHuTXiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T196x6R5Gz9n9; Thu, 28 Dec 2023 13:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvDFl035970; Thu, 28 Dec 2023 13:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvDjZ035967; Thu, 28 Dec 2023 13:57:13 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:13 GMT Message-Id: <202312281357.3BSDvDjZ035967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: f9e1d9471077 - main - ena: Add sysctl support for spreading IRQs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9e1d9471077109c19fd7d6dc9c1d35432efdede Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e1d9471077109c19fd7d6dc9c1d35432efdede commit f9e1d9471077109c19fd7d6dc9c1d35432efdede Author: Osama Abboud AuthorDate: 2023-10-30 11:27:03 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:55:47 +0000 ena: Add sysctl support for spreading IRQs This commit allows spreading IO IRQs over different CPUs through sysctl. Two sysctl nodes are introduced: 1- base_cpu: servers as the first CPU to which the first IO IRQ will be bound. 2- cpu_stride: sets the distance between every two CPUs to which every two consecutive IO IRQs are bound. For example for doing the following IO IRQs / CPU binding: IRQ idx | CPU ---------------- 1 | 0 2 | 2 3 | 4 4 | 6 Run the following commands: sysctl dev.ena..irq_affinity.base_cpu=0 sysctl dev.ena..irq_affinity.cpu_stride=2 Also introduced rss_enabled field, which is intended to replace '#ifdef RSS' in multiple places, in order to prevent code duplication. We want to bind interrupts to CPUs in case of rss set OR in case the newly defined sysctl paremeter is set. This requires to remove a couple of '#ifdef RSS' as well in the structs, since we'll be using the relevant parameters in the CPU binding code. Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 126 ++++++++++++++++++++++++++++++++++------ sys/dev/ena/ena.h | 14 +++-- sys/dev/ena/ena_sysctl.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 22 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 455386a4f152..067c8a6f3a08 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -1237,6 +1237,84 @@ ena_update_io_rings(struct ena_adapter *adapter, uint32_t num) ena_init_io_rings(adapter); } +int +ena_update_base_cpu(struct ena_adapter *adapter, int new_num) +{ + int old_num; + int rc = 0; + bool dev_was_up; + + dev_was_up = ENA_FLAG_ISSET(ENA_FLAG_DEV_UP, adapter); + old_num = adapter->irq_cpu_base; + + ena_down(adapter); + + adapter->irq_cpu_base = new_num; + + if (dev_was_up) { + rc = ena_up(adapter); + if (unlikely(rc != 0)) { + ena_log(adapter->pdev, ERR, + "Failed to configure device %d IRQ base CPU. " + "Reverting to previous value: %d\n", + new_num, old_num); + + adapter->irq_cpu_base = old_num; + + rc = ena_up(adapter); + if (unlikely(rc != 0)) { + ena_log(adapter->pdev, ERR, + "Failed to revert to previous setup." + "Triggering device reset.\n"); + ENA_FLAG_SET_ATOMIC( + ENA_FLAG_DEV_UP_BEFORE_RESET, adapter); + ena_trigger_reset(adapter, + ENA_REGS_RESET_OS_TRIGGER); + } + } + } + return (rc); +} + +int +ena_update_cpu_stride(struct ena_adapter *adapter, uint32_t new_num) +{ + uint32_t old_num; + int rc = 0; + bool dev_was_up; + + dev_was_up = ENA_FLAG_ISSET(ENA_FLAG_DEV_UP, adapter); + old_num = adapter->irq_cpu_stride; + + ena_down(adapter); + + adapter->irq_cpu_stride = new_num; + + if (dev_was_up) { + rc = ena_up(adapter); + if (unlikely(rc != 0)) { + ena_log(adapter->pdev, ERR, + "Failed to configure device %d IRQ CPU stride. " + "Reverting to previous value: %d\n", + new_num, old_num); + + adapter->irq_cpu_stride = old_num; + + rc = ena_up(adapter); + if (unlikely(rc != 0)) { + ena_log(adapter->pdev, ERR, + "Failed to revert to previous setup." + "Triggering device reset.\n"); + ENA_FLAG_SET_ATOMIC( + ENA_FLAG_DEV_UP_BEFORE_RESET, adapter); + ena_trigger_reset(adapter, + ENA_REGS_RESET_OS_TRIGGER); + } + } + } + return (rc); +} + /* Caller should sanitize new_num */ int ena_update_io_queue_nb(struct ena_adapter *adapter, uint32_t new_num) @@ -1683,6 +1761,13 @@ ena_setup_io_intr(struct ena_adapter *adapter) ena_log(adapter->pdev, DBG, "ena_setup_io_intr vector: %d\n", adapter->msix_entries[irq_idx].vector); + if (adapter->irq_cpu_base > ENA_BASE_CPU_UNSPECIFIED) { + adapter->que[i].cpu = adapter->irq_tbl[irq_idx].cpu = + (unsigned)(adapter->irq_cpu_base + + i * adapter->irq_cpu_stride) % (unsigned)mp_ncpus; + CPU_SETOF(adapter->que[i].cpu, &adapter->que[i].cpu_mask); + } + #ifdef RSS adapter->que[i].cpu = adapter->irq_tbl[irq_idx].cpu = rss_getcpu(cur_bind); @@ -1790,20 +1875,19 @@ ena_request_io_irq(struct ena_adapter *adapter) } irq->requested = true; -#ifdef RSS - rc = bus_bind_intr(adapter->pdev, irq->res, irq->cpu); - if (unlikely(rc != 0)) { - ena_log(pdev, ERR, - "failed to bind interrupt handler for irq %ju to cpu %d: %d\n", - rman_get_start(irq->res), irq->cpu, rc); - goto err; - } + if (adapter->rss_enabled || adapter->irq_cpu_base > ENA_BASE_CPU_UNSPECIFIED) { + rc = bus_bind_intr(adapter->pdev, irq->res, irq->cpu); + if (unlikely(rc != 0)) { + ena_log(pdev, ERR, + "failed to bind interrupt handler for irq %ju to cpu %d: %d\n", + rman_get_start(irq->res), irq->cpu, rc); + goto err; + } - ena_log(pdev, INFO, "queue %d - cpu %d\n", - i - ENA_IO_IRQ_FIRST_IDX, irq->cpu); -#endif + ena_log(pdev, INFO, "queue %d - cpu %d\n", + i - ENA_IO_IRQ_FIRST_IDX, irq->cpu); + } } - return (rc); err: @@ -1814,13 +1898,14 @@ err: /* Once we entered err: section and irq->requested is true we free both intr and resources */ - if (irq->requested) + if (irq->requested) { rcc = bus_teardown_intr(adapter->pdev, irq->res, irq->cookie); - if (unlikely(rcc != 0)) - ena_log(pdev, ERR, - "could not release irq: %d, error: %d\n", - irq->vector, rcc); + if (unlikely(rcc != 0)) + ena_log(pdev, ERR, + "could not release irq: %d, error: %d\n", + irq->vector, rcc); + } /* If we entered err: section without irq->requested set we know it was bus_alloc_resource_any() that needs cleanup, provided @@ -3523,6 +3608,13 @@ ena_attach(device_t pdev) adapter->missing_tx_max_queues = ENA_DEFAULT_TX_MONITORED_QUEUES; adapter->missing_tx_threshold = ENA_DEFAULT_TX_CMP_THRESHOLD; + adapter->irq_cpu_base = ENA_BASE_CPU_UNSPECIFIED; + adapter->irq_cpu_stride = 0; + +#ifdef RSS + adapter->rss_enabled = 1; +#endif + if (version_printed++ == 0) ena_log(pdev, INFO, "%s\n", ena_version); diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index b6e791d6ff6a..3687e9b2522e 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -69,6 +69,7 @@ #define ENA_DEFAULT_RING_SIZE 1024 #define ENA_MIN_RING_SIZE 256 +#define ENA_BASE_CPU_UNSPECIFIED -1 /* * Refill Rx queue when number of required descriptors is above * QUEUE_SIZE / ENA_RX_REFILL_THRESH_DIVIDER or ENA_RX_REFILL_THRESH_PACKET @@ -201,9 +202,7 @@ struct ena_irq { void *cookie; unsigned int vector; bool requested; -#ifdef RSS int cpu; -#endif char name[ENA_IRQNAME_SIZE]; }; @@ -216,10 +215,8 @@ struct ena_que { struct taskqueue *cleanup_tq; uint32_t id; -#ifdef RSS int cpu; cpuset_t cpu_mask; -#endif int domain; struct sysctl_oid *oid; }; @@ -448,6 +445,12 @@ struct ena_adapter { ena_state_t flags; + /* IRQ CPU affinity */ + int irq_cpu_base; + uint32_t irq_cpu_stride; + + uint8_t rss_enabled; + /* Queue will represent one TX and one RX ring */ struct ena_que que[ENA_MAX_NUM_IO_QUEUES] __aligned(CACHE_LINE_SIZE); @@ -524,7 +527,8 @@ int ena_update_buf_ring_size(struct ena_adapter *adapter, int ena_update_queue_size(struct ena_adapter *adapter, uint32_t new_tx_size, uint32_t new_rx_size); int ena_update_io_queue_nb(struct ena_adapter *adapter, uint32_t new_num); - +int ena_update_base_cpu(struct ena_adapter *adapter, int new_num); +int ena_update_cpu_stride(struct ena_adapter *adapter, uint32_t new_num); static inline int ena_mbuf_count(struct mbuf *mbuf) { diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index 62a38c2a4b82..f3b59d047bff 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -38,6 +38,7 @@ static void ena_sysctl_add_wd(struct ena_adapter *); static void ena_sysctl_add_stats(struct ena_adapter *); static void ena_sysctl_add_eni_metrics(struct ena_adapter *); static void ena_sysctl_add_tuneables(struct ena_adapter *); +static void ena_sysctl_add_irq_affinity(struct ena_adapter *); /* Kernel option RSS prevents manipulation of key hash and indirection table. */ #ifndef RSS static void ena_sysctl_add_rss(struct ena_adapter *); @@ -45,6 +46,8 @@ static void ena_sysctl_add_rss(struct ena_adapter *); static int ena_sysctl_buf_ring_size(SYSCTL_HANDLER_ARGS); static int ena_sysctl_rx_queue_size(SYSCTL_HANDLER_ARGS); static int ena_sysctl_io_queues_nb(SYSCTL_HANDLER_ARGS); +static int ena_sysctl_irq_base_cpu(SYSCTL_HANDLER_ARGS); +static int ena_sysctl_irq_cpu_stride(SYSCTL_HANDLER_ARGS); static int ena_sysctl_eni_metrics_interval(SYSCTL_HANDLER_ARGS); #ifndef RSS static int ena_sysctl_rss_key(SYSCTL_HANDLER_ARGS); @@ -102,6 +105,7 @@ ena_sysctl_add_nodes(struct ena_adapter *adapter) ena_sysctl_add_stats(adapter); ena_sysctl_add_eni_metrics(adapter); ena_sysctl_add_tuneables(adapter); + ena_sysctl_add_irq_affinity(adapter); #ifndef RSS ena_sysctl_add_rss(adapter); #endif @@ -448,6 +452,36 @@ ena_sysctl_add_rss(struct ena_adapter *adapter) } #endif /* RSS */ +static void +ena_sysctl_add_irq_affinity(struct ena_adapter *adapter) +{ + device_t dev; + + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree; + struct sysctl_oid_list *child; + + dev = adapter->pdev; + + ctx = device_get_sysctl_ctx(dev); + tree = device_get_sysctl_tree(dev); + child = SYSCTL_CHILDREN(tree); + + tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "irq_affinity", + CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, "Decide base CPU and stride for irqs affinity."); + child = SYSCTL_CHILDREN(tree); + + /* Add base cpu leaf */ + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "base_cpu", + CTLTYPE_S32 | CTLFLAG_RW | CTLFLAG_MPSAFE, adapter, 0, + ena_sysctl_irq_base_cpu, "I", "Base cpu index for setting irq affinity."); + + /* Add cpu stride leaf */ + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "cpu_stride", + CTLTYPE_S32 | CTLFLAG_RW | CTLFLAG_MPSAFE, adapter, 0, + ena_sysctl_irq_cpu_stride, "I", "Distance between irqs when setting affinity."); +} + /* * ena_sysctl_update_queue_node_nb - Register/unregister sysctl queue nodes. @@ -707,6 +741,117 @@ unlock: return (0); } +static int +ena_sysctl_irq_base_cpu(SYSCTL_HANDLER_ARGS) +{ + struct ena_adapter *adapter = arg1; + int irq_base_cpu = 0; + int error; + + ENA_LOCK_LOCK(); + if (unlikely(!ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter))) { + error = ENODEV; + goto unlock; + } + + error = sysctl_wire_old_buffer(req, sizeof(irq_base_cpu)); + if (error == 0) { + irq_base_cpu = adapter->irq_cpu_base; + error = sysctl_handle_int(oidp, &irq_base_cpu, 0, req); + } + if (error != 0 || req->newptr == NULL) + goto unlock; + + if (irq_base_cpu <= ENA_BASE_CPU_UNSPECIFIED) { + ena_log(adapter->pdev, ERR, + "Requested base CPU is less than zero.\n"); + error = EINVAL; + goto unlock; + } + + if (irq_base_cpu > mp_ncpus) { + ena_log(adapter->pdev, INFO, + "Requested base CPU is larger than the number of available CPUs. \n"); + error = EINVAL; + goto unlock; + + } + + if (irq_base_cpu == adapter->irq_cpu_base) { + ena_log(adapter->pdev, INFO, + "Requested IRQ base CPU is equal to current value " + "(%d)\n", + adapter->irq_cpu_base); + goto unlock; + } + + ena_log(adapter->pdev, INFO, + "Requested new IRQ base CPU: %d, current value: %d\n", + irq_base_cpu, adapter->irq_cpu_base); + + error = ena_update_base_cpu(adapter, irq_base_cpu); + +unlock: + ENA_LOCK_UNLOCK(); + + return (error); +} + +static int +ena_sysctl_irq_cpu_stride(SYSCTL_HANDLER_ARGS) +{ + struct ena_adapter *adapter = arg1; + int32_t irq_cpu_stride = 0; + int error; + + ENA_LOCK_LOCK(); + if (unlikely(!ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter))) { + error = ENODEV; + goto unlock; + } + + error = sysctl_wire_old_buffer(req, sizeof(irq_cpu_stride)); + if (error == 0) { + irq_cpu_stride = adapter->irq_cpu_stride; + error = sysctl_handle_int(oidp, &irq_cpu_stride, 0, req); + } + if (error != 0 || req->newptr == NULL) + goto unlock; + + if (irq_cpu_stride < 0) { + ena_log(adapter->pdev, ERR, + "Requested IRQ stride is less than zero.\n"); + error = EINVAL; + goto unlock; + } + + if (irq_cpu_stride > mp_ncpus) { + ena_log(adapter->pdev, INFO, + "Warning: Requested IRQ stride is larger than the number of available CPUs.\n"); + } + + if (irq_cpu_stride == adapter->irq_cpu_stride) { + ena_log(adapter->pdev, INFO, + "Requested IRQ CPU stride is equal to current value " + "(%u)\n", + adapter->irq_cpu_stride); + goto unlock; + } + + ena_log(adapter->pdev, INFO, + "Requested new IRQ CPU stride: %u, current value: %u\n", + irq_cpu_stride, adapter->irq_cpu_stride); + + error = ena_update_cpu_stride(adapter, irq_cpu_stride); + if (error != 0) + goto unlock; + +unlock: + ENA_LOCK_UNLOCK(); + + return (error); +} + #ifndef RSS /* * Change the Receive Side Scaling hash key. From nobody Thu Dec 28 13:57:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T196z1lpwz55tH6; Thu, 28 Dec 2023 13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T196z1CK7z4X2F; Thu, 28 Dec 2023 13: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=1703771835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXTgeNYppGkZ77GECQe+KUrub/OE1ajOjlFdWKpZhLA=; b=JNxCRBPo7uH0nmtKInEfxiId8zUZ6FHL9j1VtzSjZeKBpQ9ncoW4Phn4XnkLQLE4guJxZF ngP9eiDr6vEIOwycl0GGrT54NtNhXKZNdWzulCb86ku+ivIjxNNWCOchqxihQwnbesvR96 gKUN4eOtZFj0A9m7txa0wpclaZoqhIo27V7mXc3wSLzVkrzsFktqbkvrmqal1lxDZL3WOM 20/b8hg/MlL/Cnx7uIiLaAhthlgo9vLocsLCMm15zpHk/RjldLjEuKmr5/GkkN0TDTcqXO 9PC1uinykQ6fxvjdj8os7aEW4YN13J7LxL7SECtMPUiu2UIDwSA7F9evry2zoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771835; a=rsa-sha256; cv=none; b=TqM/khSauEoDF+X0uGy0RWfcSYRvR57BdcGzMHlQhjTH0Cm9lX+ORvVGzcj/J9r08t1/zh 6M/e34kICiC3PiC+gi3rfl42qY4DRObWRRoEMarcSjZ62qKrBeV3A1jTU9EzC/tNnQGaaJ +TZcqDQep/qfHSW+AqulvCBVyYPBn/yuwU69k1qf6qU5bX9wvuUGh6ESaRP2ZtTdRok8mL t4PqrSQY9r8GF6CHnmYUIJlPVmbf6PGHK77m4j3vtJHlK/uJC+5sqqFBrfr6zU+vQIV7PI ZTbABh8E9O+ALU4IVzmnTb645DBr+3EbBGid424i7SaHfx4HeAYaZpi7jbSYtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXTgeNYppGkZ77GECQe+KUrub/OE1ajOjlFdWKpZhLA=; b=lJw6y2ZWNuRCksAe6JBc6O16QtLov3tu3fKf9qZEuBcX1huAZDbl7O8tJjWThONDH5SRm5 RkETSQ6Vrj5OhPEfVdlREZzlR2Du3N9NdgWP8fN9k3nOvhJSeo7aLo/68n8evXgsvb6Kgb Pn94abRn5QjBWSERTTy5ZK0fV2DTcOR1sqmhMlrdiZRe8joN7a5cW9aPEgx2AhuKsOZhNN NgTW48GlFs541I67yRyLnK29L2i8CjdvO49QQ/kDzxrT2HBUKxHd6yOee7U0ZexmUBBv6s L56JjZGbR0Vl/UZTVBNuUdkRHOWx79SmS7sAZqt5yltD5gj+3+1cfh+h78qMUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T196z04zcz9yv; Thu, 28 Dec 2023 13:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvE0t036039; Thu, 28 Dec 2023 13:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvEgR036036; Thu, 28 Dec 2023 13:57:14 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:14 GMT Message-Id: <202312281357.3BSDvEgR036036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 9272e45c04c0 - main - ena: Change measurement unit of time since last tx cleanup to ms List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9272e45c04c0d4fcb5d767e962783f3ab192f64e Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=9272e45c04c0d4fcb5d767e962783f3ab192f64e commit 9272e45c04c0d4fcb5d767e962783f3ab192f64e Author: Arthur Kiyanovski AuthorDate: 2023-06-14 10:12:16 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:55:57 +0000 ena: Change measurement unit of time since last tx cleanup to ms This commit: 1. Sets the time since last cleanup to milliseconds. 2. Fixes incorrect indentations. Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 067c8a6f3a08..ba1712093a7a 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3102,13 +3102,13 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, if (unlikely(time_offset > adapter->missing_tx_timeout)) { if (tx_buf->print_once) { - time_since_last_cleanup = TICKS_2_USEC(ticks - + time_since_last_cleanup = TICKS_2_MSEC(ticks - tx_ring->tx_last_cleanup_ticks); missing_tx_comp_to = sbttoms( adapter->missing_tx_timeout); ena_log(pdev, WARN, "Found a Tx that wasn't completed on time, qid %d, index %d. " - "%d usecs have passed since last cleanup. Missing Tx timeout value %d msecs.\n", + "%d msecs have passed since last cleanup. Missing Tx timeout value %d msecs.\n", tx_ring->qid, i, time_since_last_cleanup, missing_tx_comp_to); } From nobody Thu Dec 28 13:57:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T19703XvSz55tCZ; Thu, 28 Dec 2023 13:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T197022bCz4WtW; Thu, 28 Dec 2023 13:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m1RTD4QR60BgCdqbsiRbiXG9jiSKhFYAu24H7Lqw3OE=; b=drbiO/mRyiWTYYqgsfq+TFoeft0g1CQYkUXEq9xjI7XKR4c/QWvim2FC1WFbC+KP+IAP/s yI+i6Z2bUC10dCIrAAIGSlHzZ9TYIKXuLSM9AxtUuDrpAptbm+7Yw5sbZMgzIPcurE++xl V0DgpVXkn4F68753wpkwkBj3S8rkyDRowtYxbSr1YIT6zmRBRfefNSEz9XKJ1oG9KeMvGF 9EGKFjo6hJO4EGqFc7uIS0dL4KomTQfYvdJwNL0ShGmuRwXfwlXITQ8i7vVzbGc+rr5kVg slSS1qxZsK8uja62XEors9qoDAbO2CKYCIlP4zOsbxyX2ULRw6dLbVJb0v4LMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771836; a=rsa-sha256; cv=none; b=VrQbhhG/+dcRwmV7XhgCYO5FC9x7N4bsm6N2tBUggV8nER4e28lF5n/rc9j/4QqKiJraik ThmPpFZb7Ova2ZPiHHHZvY20KokAsJnTPvTLtvPVXpoLIE5Rtp4tUW4IMRsfHO5+bwSuKm oEL3mlWTChYiKmE0SmcSqMTWuS06y1+2VzssrR8c83Yyd2hL7AXVHUZ4BI+DF7IrhT8bQf PHTCHjH5nU/DyM4rWExhewtcXV4+XmNDFr8kF+XR74ROTZl8axHiAc9th2TncEQlz2b+Sm C1Q25J0i56SQvVdCkTHzyWIpEhOl7r9NM42DijpTy+TOMck8zpLVWHljY1BozQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m1RTD4QR60BgCdqbsiRbiXG9jiSKhFYAu24H7Lqw3OE=; b=Plxu6U3ulCa5SAaWIoog/ws2Ym0ihRh/zkE1DDQ5FKOq4bdoMogrn1R2/jMYzn9UJiGi7g kdC+KM3ZapnKqqJ0uM+vg6624ENDd8rd7JrC4UGKT56/fB1u1HV6Hs5NOL8DIW6uwfMddn Tqsh9GVy+owkkVQ7UQRwvdolVyJDtw+YYquWIUqr5SzTL5FGSEpblAO45tC4sh5D5LNzyy ztxCO4WCCVxF4SmhzKPbtMUcg7UtWj5MJDVB3y5odfT0JRB/cHfylhppR8T+jALrhtfWuf l/yHzA+mYAEje9eG2X1/9hPkdHS/IsMe2Xd98SB2IXCtgFlM6qXU4A/endwECQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19700qTKz9y9; Thu, 28 Dec 2023 13:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvGSq036083; Thu, 28 Dec 2023 13:57:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvGW5036080; Thu, 28 Dec 2023 13:57:16 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:16 GMT Message-Id: <202312281357.3BSDvGW5036080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 72e34ebdd088 - main - ena: Update ena_com_update_intr_reg API usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72e34ebdd08854dc896f267b0461e241c4040241 Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=72e34ebdd08854dc896f267b0461e241c4040241 commit 72e34ebdd08854dc896f267b0461e241c4040241 Author: Osama Abboud AuthorDate: 2023-09-11 08:38:39 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:05 +0000 ena: Update ena_com_update_intr_reg API usage This commit fixes the usage of this function to be compatible with the new API introduced by ena-com update to v2.7.0 Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 2 +- sys/dev/ena/ena_datapath.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index ba1712093a7a..aca2e0b43041 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -2026,7 +2026,7 @@ ena_unmask_all_io_irqs(struct ena_adapter *adapter) for (i = 0; i < adapter->num_io_queues; i++) { ena_qid = ENA_IO_TXQ_IDX(i); io_cq = &adapter->ena_dev->io_cq_queues[ena_qid]; - ena_com_update_intr_reg(&intr_reg, 0, 0, true); + ena_com_update_intr_reg(&intr_reg, 0, 0, true, false); tx_ring = &adapter->tx_ring[i]; counter_u64_add(tx_ring->tx_stats.unmask_interrupt_num, 1); ena_com_unmask_intr(io_cq, &intr_reg); diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 3e0a8aa2bd74..e5c424139d3c 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -104,7 +104,7 @@ ena_cleanup(void *arg, int pending) /* Signal that work is done and unmask interrupt */ ena_com_update_intr_reg(&intr_reg, ENA_RX_IRQ_INTERVAL, - ENA_TX_IRQ_INTERVAL, true); + ENA_TX_IRQ_INTERVAL, true, false); counter_u64_add(tx_ring->tx_stats.unmask_interrupt_num, 1); ena_com_unmask_intr(io_cq, &intr_reg); } From nobody Thu Dec 28 13:57:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T19714M2lz55t6g; Thu, 28 Dec 2023 13:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T19712rjTz4WxY; Thu, 28 Dec 2023 13:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0bh4V/3CzOQ+4gQto/bPDVsYIswHovrtCNsD2gKYAoQ=; b=anQDHlBWTYS7h62ZOAyRTjGTKTYk17bTThPVIPzhsPdDBjEn8L7VoW6RGLTbm+uXI2GRJB K1Mq810l9YzJR5C4ZLD1W24Nds+4AJsYCenwhaukuzrzP5vETTlIwNoB/0o/EbTBUa6O1B pFcfeRxFKtXm4Bi5w2R7V3LLesu5fyP4/2kVQm39vaZ3CctsD/d91BRRiPfIPqgUj2Sx1y VCqyD4kiztB6H+dkDbcteDfId3pj5CDU87Sx0/PQzC57JppT5HhOpq5WXmgqu1GOpxXd1Q V25Bv9anNEnIkkrXqysG/bm6Pz7EbdagGSGvB8dhD+Qkg/gJp+YU2nFbILS4HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771837; a=rsa-sha256; cv=none; b=Py8LGw12Kq2GupxMcwUPa7XiI3n0QUNpGQqqSkAxWfg4fa+KZNnumsO7XsIgZpgLAO50hT Y5Xuqhv8NVrxuGSjkQ5jsKJ08gtVXKpwWhOGrmCPQTUjzgQ2ggv+zbw5q0qFBHL1gYmYJd rEpj3iLDjwSayxQpBs7cN3Fr2cOM2oEmGzm6cxuSONhA8cKEkjk/QXx4YO7Cxb2VqjP5h3 J/sqKq7IgvxEzaIxA8l0ZVtWVcsNFYIZKfS9HsIBA2qxvetX5M9QU/y9q3V3C7uOtEzntL oB+bYoPdz4y4HdV9BAnXMGDw7xnI2wsSkiqvLWoccLxjzwyXUfXXSCleBdJGRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0bh4V/3CzOQ+4gQto/bPDVsYIswHovrtCNsD2gKYAoQ=; b=wUddhioHsl1ZqAEwsi0l5eJUuHIlPeRy0ZjzsMAtJ7EVmQZljveEBv08/YOX4NUOCkqo4x hn9osFyYqXElZvyv+r8+AkU0YSB2P/yJ6WpDaY1JJhGXJhofBRL421u0yFdF+Ur9GIcCUj RJ3SI2X4WoYB05vaSYm0ghiRlAqiPOhH0vB+Jbq9dc9mAdlbQx+OFv1/1QH1qF0n5TW/xL M+5S+NAvtbI+aoTvYvC0K6BzzIXYd5eAPwUajdUQ4Kj3a8bNc+NFLyzD+3gH5/HZiYKX4F GvjCW1+tkk1rQk3A4msSrS8Av96LlBd+iqg7qrj+usCaiWZQTGgea8Td/tvvCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19711rYKz9MN; Thu, 28 Dec 2023 13:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvHh7036131; Thu, 28 Dec 2023 13:57:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvHrb036128; Thu, 28 Dec 2023 13:57:17 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:17 GMT Message-Id: <202312281357.3BSDvHrb036128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 2835752e075f - main - ena: Remove CQ tail pointer update API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2835752e075f2fa3edcb596df8306c570ec4cae6 Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=2835752e075f2fa3edcb596df8306c570ec4cae6 commit 2835752e075f2fa3edcb596df8306c570ec4cae6 Author: Osama Abboud AuthorDate: 2023-09-11 08:43:08 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:11 +0000 ena: Remove CQ tail pointer update API This commit removes the usage of this API from the freebsd driver since the relevant functionality is not supported by the device. Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena_datapath.c | 3 --- sys/dev/ena/ena_netmap.c | 1 - 2 files changed, 4 deletions(-) diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index e5c424139d3c..177f33ea8ef3 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -298,7 +298,6 @@ ena_tx_cleanup(struct ena_ring *tx_ring) ena_com_comp_ack( &adapter->ena_dev->io_sq_queues[ena_qid], total_done); - ena_com_update_dev_comp_head(io_cq); total_done = 0; } } while (likely(--budget)); @@ -313,7 +312,6 @@ ena_tx_cleanup(struct ena_ring *tx_ring) tx_ring->next_to_clean = next_to_clean; ena_com_comp_ack(&adapter->ena_dev->io_sq_queues[ena_qid], total_done); - ena_com_update_dev_comp_head(io_cq); } /* @@ -690,7 +688,6 @@ ena_rx_cleanup(struct ena_ring *rx_ring) ENA_RX_REFILL_THRESH_PACKET); if (refill_required > refill_threshold) { - ena_com_update_dev_comp_head(rx_ring->ena_com_io_cq); ena_refill_rx_bufs(rx_ring, refill_required); } diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c index 9ef0619829f4..a8d7cad05ab5 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -814,7 +814,6 @@ ena_netmap_tx_cleanup(struct ena_netmap_ctx *ctx) /* acknowledge completion of sent packets */ ctx->ring->next_to_clean = ctx->nt; ena_com_comp_ack(ctx->ring->ena_com_io_sq, total_tx_descs); - ena_com_update_dev_comp_head(ctx->ring->ena_com_io_cq); } } From nobody Thu Dec 28 13:57:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T19725rXGz55sq0; Thu, 28 Dec 2023 13:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T197242V8z4X5D; Thu, 28 Dec 2023 13:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7owzBmxozOo1ahLeYIlu7Nq+1VqNbKgi77F6hpnqXc0=; b=LY7xvXa00WOEA2JYsbjjpOIhfn75xfQSgBHl/w1dHWAyoqJfnHmSyvgtlCZky6fYO2WKDN P+IF92Ei8w6AMD/pVarQp9K5+WB1izHg8IkElmEGi4DtY04DBx/4sXGjqjGlH0hmhAI340 9pzEhnyccJIbczT5v3YHvvkX0FMPZFQX94HQqByOpba7sgBS2dqyEvSm+bDRA6guP0jhRY NnigH/uPDlRjqVrrm5QGSAufSG9+fNdG3IzYgHMAvGbUhQNGDOWDaFYNxec7OY2julLIrg 0AUmGkqMe0qiLK6iubXGJhpw6JOeA9HZ+EaE96gSYxfdKs0SRZiDFylqy3EOGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771838; a=rsa-sha256; cv=none; b=TrVA+3Vu5u3VLmI7ADubDswQfSUgcU0Noc80le1T4nYGtwACOQqesvCXt8qG+bpraBmhO3 cyomM7+K6J7Fb9eEBfxYxJPhLVtF8ttBkQjXB4JOt+Bzz0rHrzVrBTVk+tDUnaf2Qc3pau aWfNweB18ssAPjC4137hWmD5BcM2lXczXzZkBEXAHL+d63EpOfxDXaoJRBCUxAib6px0Gr 5f9Ms0gwYUkR9gAu49nYch9CwbqkmSogwfOe7ayvoLeR1BhsLzdSNA3Sezf2a/Y/Y2XDsH ye7nW6MjAhU2X0BJpE+7U8RJum/f1d/qSt+/lZjnuMLMfY4NxKUxBvhWl2XDAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7owzBmxozOo1ahLeYIlu7Nq+1VqNbKgi77F6hpnqXc0=; b=E2+1R25LjhEETbc1jNXceYr/WS+X+LiNWhoUfXuKn8UvPEGbRmsWpJXGUfdBLRAwjy50y2 Mq/07SVMxdvRtVOIgeYppLLKQ4ojJKDCB/Sd4Bhbm6f7FyYiwRBUT056+ZsPMSmCWBlpex /uiAChk1jtS9DHKQdQwZ2LA9Vs4uPqlAYkoFUoESri0Lx1W+l4q/sK0jglIoIuh+Rv8Hgz r1BAKe6Vb40sFWcYFfTSInpBl0JdG2kLqqNrYijsBZenfMkFjTB3IZdhQsc/cTjRv/x1WI 0IqGNQ8SIMfkXTMlom9hAJtQqbJOQJMe9sqyhRHpOSzTVep03DZ0djFUnZGzLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19722w55z9yw; Thu, 28 Dec 2023 13:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvI1D036182; Thu, 28 Dec 2023 13:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvIVk036179; Thu, 28 Dec 2023 13:57:18 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:18 GMT Message-Id: <202312281357.3BSDvIVk036179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 5b925280d9a5 - main - ena: Introduce shared sample interval for all stats List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b925280d9a54eaefd85827bf6e84049aea8fa98 Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=5b925280d9a54eaefd85827bf6e84049aea8fa98 commit 5b925280d9a54eaefd85827bf6e84049aea8fa98 Author: Osama Abboud AuthorDate: 2023-09-12 10:13:48 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:18 +0000 ena: Introduce shared sample interval for all stats Rename sample_interval node to stats_sample_interval and move it up in the sysctl tree to make it clear that it's relevant for all the stats and not only ENI metrics (Currently, sample interval node is found under eni_metrics node). Path to node: dev.ena..stats_sample_interval Once this parameter is set it will set the sample interval for all the stats node including SRD/customer metrics. Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 12 ++++++------ sys/dev/ena/ena.h | 4 ++-- sys/dev/ena/ena_sysctl.c | 42 +++++++++++++++++++++--------------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index aca2e0b43041..f6357a43ea34 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3321,19 +3321,19 @@ ena_timer_service(void *data) check_for_empty_rx_ring(adapter); /* - * User controller update of the ENI metrics. + * User controller update of the ENA metrics. * If the delay was set to 0, then the stats shouldn't be updated at * all. - * Otherwise, wait 'eni_metrics_sample_interval' seconds, before + * Otherwise, wait 'metrics_sample_interval' seconds, before * updating stats. * As timer service is executed every second, it's enough to increment * appropriate counter each time the timer service is executed. */ - if ((adapter->eni_metrics_sample_interval != 0) && - (++adapter->eni_metrics_sample_interval_cnt >= - adapter->eni_metrics_sample_interval)) { + if ((adapter->metrics_sample_interval != 0) && + (++adapter->metrics_sample_interval_cnt >= + adapter->metrics_sample_interval)) { taskqueue_enqueue(adapter->metrics_tq, &adapter->metrics_task); - adapter->eni_metrics_sample_interval_cnt = 0; + adapter->metrics_sample_interval_cnt = 0; } diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 3687e9b2522e..fd0c6e3692c7 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -480,8 +480,8 @@ struct ena_adapter { uint32_t missing_tx_threshold; bool disable_meta_caching; - uint16_t eni_metrics_sample_interval; - uint16_t eni_metrics_sample_interval_cnt; + uint16_t metrics_sample_interval; + uint16_t metrics_sample_interval_cnt; /* Statistics */ struct ena_stats_dev dev_stats; diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index f3b59d047bff..572bccadca8c 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -48,14 +48,14 @@ static int ena_sysctl_rx_queue_size(SYSCTL_HANDLER_ARGS); static int ena_sysctl_io_queues_nb(SYSCTL_HANDLER_ARGS); static int ena_sysctl_irq_base_cpu(SYSCTL_HANDLER_ARGS); static int ena_sysctl_irq_cpu_stride(SYSCTL_HANDLER_ARGS); -static int ena_sysctl_eni_metrics_interval(SYSCTL_HANDLER_ARGS); +static int ena_sysctl_metrics_interval(SYSCTL_HANDLER_ARGS); #ifndef RSS static int ena_sysctl_rss_key(SYSCTL_HANDLER_ARGS); static int ena_sysctl_rss_indir_table(SYSCTL_HANDLER_ARGS); #endif -/* Limit max ENI sample rate to be an hour. */ -#define ENI_METRICS_MAX_SAMPLE_INTERVAL 3600 +/* Limit max ENA sample rate to be an hour. */ +#define ENA_METRICS_MAX_SAMPLE_INTERVAL 3600 #define ENA_HASH_KEY_MSG_SIZE (ENA_HASH_KEY_SIZE * 2 + 1) static SYSCTL_NODE(_hw, OID_AUTO, ena, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, @@ -368,16 +368,6 @@ ena_sysctl_add_eni_metrics(struct ena_adapter *adapter) SYSCTL_ADD_U64(ctx, eni_list, OID_AUTO, "linklocal_allowance_exceeded", CTLFLAG_RD, &eni_metrics->linklocal_allowance_exceeded, 0, "Linklocal packet rate allowance exceeded"); - - /* - * Tuneable, which determines how often ENI metrics will be read. - * 0 means it's turned off. Maximum allowed value is limited by: - * ENI_METRICS_MAX_SAMPLE_INTERVAL. - */ - SYSCTL_ADD_PROC(ctx, eni_list, OID_AUTO, "sample_interval", - CTLTYPE_U16 | CTLFLAG_RW | CTLFLAG_MPSAFE, adapter, 0, - ena_sysctl_eni_metrics_interval, "SU", - "Interval in seconds for updating ENI emetrics. 0 turns off the update."); } static void @@ -411,6 +401,16 @@ ena_sysctl_add_tuneables(struct ena_adapter *adapter) SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "io_queues_nb", CTLTYPE_U32 | CTLFLAG_RW | CTLFLAG_MPSAFE, adapter, 0, ena_sysctl_io_queues_nb, "I", "Number of IO queues."); + + /* + * Tuneable, which determines how often ENA metrics will be read. + * 0 means it's turned off. Maximum allowed value is limited by: + * ENA_METRICS_MAX_SAMPLE_INTERVAL. + */ + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "stats_sample_interval", + CTLTYPE_U16 | CTLFLAG_RW | CTLFLAG_MPSAFE, adapter, 0, + ena_sysctl_metrics_interval, "SU", + "Interval in seconds for updating Netword interface metrics. 0 turns off the update."); } /* Kernel option RSS prevents manipulation of key hash and indirection table. */ @@ -694,7 +694,7 @@ unlock: } static int -ena_sysctl_eni_metrics_interval(SYSCTL_HANDLER_ARGS) +ena_sysctl_metrics_interval(SYSCTL_HANDLER_ARGS) { struct ena_adapter *adapter = arg1; uint16_t interval; @@ -708,32 +708,32 @@ ena_sysctl_eni_metrics_interval(SYSCTL_HANDLER_ARGS) error = sysctl_wire_old_buffer(req, sizeof(interval)); if (error == 0) { - interval = adapter->eni_metrics_sample_interval; + interval = adapter->metrics_sample_interval; error = sysctl_handle_16(oidp, &interval, 0, req); } if (error != 0 || req->newptr == NULL) goto unlock; - if (interval > ENI_METRICS_MAX_SAMPLE_INTERVAL) { + if (interval > ENA_METRICS_MAX_SAMPLE_INTERVAL) { ena_log(adapter->pdev, ERR, - "ENI metrics update interval is out of range - maximum allowed value: %d seconds\n", - ENI_METRICS_MAX_SAMPLE_INTERVAL); + "ENA metrics update interval is out of range - maximum allowed value: %d seconds\n", + ENA_METRICS_MAX_SAMPLE_INTERVAL); error = EINVAL; goto unlock; } if (interval == 0) { ena_log(adapter->pdev, INFO, - "ENI metrics update is now turned off\n"); + "ENA metrics update is now turned off\n"); bzero(&adapter->eni_metrics, sizeof(adapter->eni_metrics)); } else { ena_log(adapter->pdev, INFO, - "ENI metrics update interval is set to: %" PRIu16 + "ENA metrics update interval is set to: %" PRIu16 " seconds\n", interval); } - adapter->eni_metrics_sample_interval = interval; + adapter->metrics_sample_interval = interval; unlock: ENA_LOCK_UNLOCK(); From nobody Thu Dec 28 13:57:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T19740FKTz55tHC; Thu, 28 Dec 2023 13:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T19735NRTz4X9p; Thu, 28 Dec 2023 13:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2AGAy6wn1MrXzqJQ0LONYURb08rigy+Gn/cVf/afTg=; b=v+v7qNgErp4mRbJcR9TxCzjM9TIfsDPAAy6nihgrvDiV0n7hQet/dNMrp3FO6mJtAsDExQ mti0z81iZ066Cac3etl7TBDV73htfiCOYk/iycyK1pLoL6MOVAqVhvhY5bIUVo64Tu54hy BfGxBZVdyIR31hJjomBM//luKRGGHLqBsH0VIk5HfGtFQxEO8xTlXV1awCtEZ9NlBKIVLr CtYQGnyqjE/DQhviDiy0eNYTKjEL1VjXmMWvllk3GD+ni4Mb1gnhTMVQ9slkzLlefpa4Sa yoxdfNxjU5cGOh1O4P7Ohacm/rVjIgXQwt6RhgaZNMeo/TMGc8dXBqVezUpM6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771839; a=rsa-sha256; cv=none; b=CNxtzxH9v4pEyi0P2IuHs2PrSV6L0oQCkwT50qKi6VWRFdwVoM7WRaw9yJInYIy9DAbAAG Qdl7iS7ISF5UiYjviLcmJQUJ/H9iO5Eo3WB8uG6jTzdkATawOhUpfmbC1QN1BuzvWSYuP/ t81+WX9+bdXVMXvXCEycH0B0zPfhVO6GHk27xSI1FuZxBWYLpBu75nXbIcN87AEIMGPHyx nHAdzwZjY/q3ZU/mJPutrsor0U5p6vTnU4PO965m1kwUjro7luhSW86qRqsZRefDH/7F5c lp/0dVIBOBEnQMGkjCFHxrf4f34TZvKO+UfZH3BvH6p+L+kwL3t5jg/zgliJcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2AGAy6wn1MrXzqJQ0LONYURb08rigy+Gn/cVf/afTg=; b=ShsOAhDQo18parwiHGo+OiMpwCKih9RmmjS5WiawOMvdSE2v7y1IeRtaZtaWCrZdZibeM5 iKLHqlWdBO09BBfz5sEFqUm9/kgPSyujO+bz6w/aUvB2G5r+xBxtD6b4jAIbOKsKWD7lJ8 ooZi5Zez9Bkjr77XF3ZI7czJzWjmX+7Vvr11DqaRgUpCfcQ1uz5oG6ysFl+ksN2NWjkm5E Eor9wrhR3hPCKLcBe+vRdDZoa+7CSN8CLA/Dz33DnYPeJXPDninLjQ7EFl27woJRtblysq 4m8OTnEabv/nQr11QwvRkQxaoYRy09/3TSSZm5gf8UH60A102X9TU9+qAPeBCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19733yFmz9yx; Thu, 28 Dec 2023 13:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvJsX036227; Thu, 28 Dec 2023 13:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvJ5D036224; Thu, 28 Dec 2023 13:57:19 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:19 GMT Message-Id: <202312281357.3BSDvJ5D036224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: f97993ad7b9c - main - ena: Support customer metric with sysctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f97993ad7b9c9e4787bd198d11f348c271af513e Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=f97993ad7b9c9e4787bd198d11f348c271af513e commit f97993ad7b9c9e4787bd198d11f348c271af513e Author: Osama Abboud AuthorDate: 2023-09-12 10:17:03 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:24 +0000 ena: Support customer metric with sysctl This commit adds sysctl support for customer metrics. Different customer metrics can be found in the following sysctl node: sysctl dev.ena..customer_metrics Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 49 +++++++++++++++++++++++++-- sys/dev/ena/ena.h | 1 + sys/dev/ena/ena_sysctl.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++- sys/dev/ena/ena_sysctl.h | 1 + 4 files changed, 135 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index f6357a43ea34..64c3d79f00db 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -166,6 +166,7 @@ static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *); static void ena_update_on_link_change(void *, struct ena_admin_aenq_entry *); static void unimplemented_aenq_handler(void *, struct ena_admin_aenq_entry *); static int ena_copy_eni_metrics(struct ena_adapter *); +static int ena_copy_customer_metrics(struct ena_adapter *); static void ena_timer_service(void *); static char ena_version[] = ENA_DEVICE_NAME ENA_DRV_MODULE_NAME @@ -3305,6 +3306,25 @@ ena_copy_eni_metrics(struct ena_adapter *adapter) return (rc); } +static int +ena_copy_customer_metrics(struct ena_adapter *adapter) +{ + struct ena_com_dev *dev; + u32 supported_metrics_count; + int rc, len; + + dev = adapter->ena_dev; + + supported_metrics_count = ena_com_get_customer_metric_count(dev); + len = supported_metrics_count * sizeof(u64); + + /* Fill the data buffer */ + rc = ena_com_get_customer_metrics(adapter->ena_dev, + (char *)(adapter->customer_metrics_array), len); + + return (rc); +} + static void ena_timer_service(void *data) { @@ -3542,7 +3562,12 @@ ena_metrics_task(void *arg, int pending) struct ena_adapter *adapter = (struct ena_adapter *)arg; ENA_LOCK_LOCK(); - (void)ena_copy_eni_metrics(adapter); + + if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_CUSTOMER_METRICS)) + (void)ena_copy_customer_metrics(adapter); + else if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENI_STATS)) + (void)ena_copy_eni_metrics(adapter); + ENA_LOCK_UNLOCK(); } @@ -3756,6 +3781,18 @@ ena_attach(device_t pdev) /* initialize rings basic information */ ena_init_io_rings(adapter); + rc = ena_com_allocate_customer_metrics_buffer(ena_dev); + if (rc) { + ena_log(pdev, ERR, "Failed to allocate customer metrics buffer.\n"); + goto err_msix_free; + } + + rc = ena_sysctl_allocate_customer_metrics_buffer(adapter); + if (unlikely(rc)){ + ena_log(pdev, ERR, "Failed to allocate sysctl customer metrics buffer.\n"); + goto err_metrics_buffer_destroy; + } + /* Initialize statistics */ ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, sizeof(struct ena_stats_dev)); @@ -3767,7 +3804,7 @@ ena_attach(device_t pdev) rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx); if (unlikely(rc != 0)) { ena_log(pdev, ERR, "Error with network interface setup\n"); - goto err_msix_free; + goto err_customer_metrics_alloc; } /* Initialize reset task queue */ @@ -3805,6 +3842,10 @@ ena_attach(device_t pdev) err_detach: ether_ifdetach(adapter->ifp); #endif /* DEV_NETMAP */ +err_customer_metrics_alloc: + free(adapter->customer_metrics_array, M_DEVBUF); +err_metrics_buffer_destroy: + ena_com_delete_customer_metrics_buffer(ena_dev); err_msix_free: ena_free_stats(adapter); ena_com_dev_reset(adapter->ena_dev, ENA_REGS_RESET_INIT_ERR); @@ -3903,6 +3944,10 @@ ena_detach(device_t pdev) ena_com_delete_host_info(ena_dev); + free(adapter->customer_metrics_array, M_DEVBUF); + + ena_com_delete_customer_metrics_buffer(ena_dev); + if_free(adapter->ifp); free(ena_dev->bus, M_DEVBUF); diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index fd0c6e3692c7..18988d719a18 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -487,6 +487,7 @@ struct ena_adapter { struct ena_stats_dev dev_stats; struct ena_hw_stats hw_stats; struct ena_admin_eni_stats eni_metrics; + uint64_t *customer_metrics_array; enum ena_regs_reset_reason_types reset_reason; }; diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index 572bccadca8c..82030a2a7539 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -37,6 +37,7 @@ static void ena_sysctl_add_wd(struct ena_adapter *); static void ena_sysctl_add_stats(struct ena_adapter *); static void ena_sysctl_add_eni_metrics(struct ena_adapter *); +static void ena_sysctl_add_customer_metrics(struct ena_adapter *); static void ena_sysctl_add_tuneables(struct ena_adapter *); static void ena_sysctl_add_irq_affinity(struct ena_adapter *); /* Kernel option RSS prevents manipulation of key hash and indirection table. */ @@ -58,6 +59,39 @@ static int ena_sysctl_rss_indir_table(SYSCTL_HANDLER_ARGS); #define ENA_METRICS_MAX_SAMPLE_INTERVAL 3600 #define ENA_HASH_KEY_MSG_SIZE (ENA_HASH_KEY_SIZE * 2 + 1) +#define SYSCTL_GSTRING_LEN 64 + +#define ENA_METRIC_ENI_ENTRY(stat, desc) { \ + .name = #stat, \ + .description = #desc, \ +} + +struct ena_hw_metrics { + char name[SYSCTL_GSTRING_LEN]; + char description[SYSCTL_GSTRING_LEN]; +}; + +static const struct ena_hw_metrics ena_hw_stats_strings[] = { + ENA_METRIC_ENI_ENTRY( + bw_in_allowance_exceeded, Inbound BW allowance exceeded), + ENA_METRIC_ENI_ENTRY( + bw_out_allowance_exceeded, Outbound BW allowance exceeded), + ENA_METRIC_ENI_ENTRY( + pps_allowance_exceeded, PPS allowance exceeded), + ENA_METRIC_ENI_ENTRY( + conntrack_allowance_exceeded, Connection tracking allowance exceeded), + ENA_METRIC_ENI_ENTRY( + linklocal_allowance_exceeded, Linklocal packet rate allowance), + ENA_METRIC_ENI_ENTRY( + conntrack_allowance_available, Number of available conntracks), +}; + +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) +#endif + +#define ENA_CUSTOMER_METRICS_ARRAY_SIZE ARRAY_SIZE(ena_hw_stats_strings) + static SYSCTL_NODE(_hw, OID_AUTO, ena, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "ENA driver parameters"); @@ -98,12 +132,29 @@ SYSCTL_BOOL(_hw_ena, OID_AUTO, force_large_llq_header, CTLFLAG_RDTUN, int ena_rss_table_size = ENA_RX_RSS_TABLE_SIZE; +int ena_sysctl_allocate_customer_metrics_buffer(struct ena_adapter *adapter) +{ + int rc = 0; + + adapter->customer_metrics_array = malloc((sizeof(u64) * ENA_CUSTOMER_METRICS_ARRAY_SIZE), + M_DEVBUF, M_NOWAIT | M_ZERO); + if (unlikely(adapter->customer_metrics_array == NULL)) + rc = ENOMEM; + + return rc; +} void ena_sysctl_add_nodes(struct ena_adapter *adapter) { + struct ena_com_dev *dev = adapter->ena_dev; + + if (ena_com_get_cap(dev, ENA_ADMIN_CUSTOMER_METRICS)) + ena_sysctl_add_customer_metrics(adapter); + else if (ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS)) + ena_sysctl_add_eni_metrics(adapter); + ena_sysctl_add_wd(adapter); ena_sysctl_add_stats(adapter); - ena_sysctl_add_eni_metrics(adapter); ena_sysctl_add_tuneables(adapter); ena_sysctl_add_irq_affinity(adapter); #ifndef RSS @@ -328,6 +379,40 @@ ena_sysctl_add_stats(struct ena_adapter *adapter) &admin_stats->no_completion, 0, "Commands not completed"); } +static void +ena_sysctl_add_customer_metrics(struct ena_adapter *adapter) +{ + device_t dev; + struct ena_com_dev *ena_dev; + + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree; + struct sysctl_oid_list *child; + + struct sysctl_oid *customer_metric; + struct sysctl_oid_list *customer_list; + + int i; + + dev = adapter->pdev; + ena_dev = adapter->ena_dev; + + ctx = device_get_sysctl_ctx(dev); + tree = device_get_sysctl_tree(dev); + child = SYSCTL_CHILDREN(tree); + customer_metric = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "customer_metrics", + CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ENA's customer metrics"); + customer_list = SYSCTL_CHILDREN(customer_metric); + + for (i = 0; i < ENA_CUSTOMER_METRICS_ARRAY_SIZE; i++) { + if (ena_com_get_customer_metric_support(ena_dev, i)) { + SYSCTL_ADD_U64(ctx, customer_list, OID_AUTO, ena_hw_stats_strings[i].name, + CTLFLAG_RD, &adapter->customer_metrics_array[i], 0, + ena_hw_stats_strings[i].description); + } + } +} + static void ena_sysctl_add_eni_metrics(struct ena_adapter *adapter) { diff --git a/sys/dev/ena/ena_sysctl.h b/sys/dev/ena/ena_sysctl.h index 188c3a61a3d2..e9b4bfaae1cb 100644 --- a/sys/dev/ena/ena_sysctl.h +++ b/sys/dev/ena/ena_sysctl.h @@ -40,6 +40,7 @@ void ena_sysctl_add_nodes(struct ena_adapter *adapter); void ena_sysctl_update_queue_node_nb(struct ena_adapter *adapter, int old, int new); +int ena_sysctl_allocate_customer_metrics_buffer(struct ena_adapter *adapter); extern int ena_enable_9k_mbufs; #define ena_mbuf_sz (ena_enable_9k_mbufs ? MJUM9BYTES : MJUMPAGESIZE) From nobody Thu Dec 28 13:57:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T197504qLz55sw1; Thu, 28 Dec 2023 13:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T19745Z6yz4XB2; Thu, 28 Dec 2023 13:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMQY/Ch4JC97ZNGD+owP3cLIqxvDfNW2Vpv03YOLguk=; b=Xs45OVLqQhhOztmuYM6FiGAAPH1B6v+4i23KzACNPHLnUrhX33qFeZ72P6gNxovLlpDBm6 5anjYiD0n6cDLClUUXf/2HiJvSrzhA4z0YYZNDjD0wasiHQo6Zrd+HJG/yQY31s3kYXEIC 99bLw2bzUk0nmxKYg7Ov9bWW4HzYwoQ2i7Dbtj5ftP/iCYygH2uamE+SXOg1A422iYY9Tn APMRq38gSyj2Bia2pIT7oQNtRzek+Xzz2Ckdm7xwXfm/rL5+IUeoebA6SlTyr5jk7VApnF PxuNyqfmhMDSo2PzEAVcqhjzw4C/mNQgiXii9xNKgHSrHLAz3o9WmH9DYy3DFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771840; a=rsa-sha256; cv=none; b=xTLt3q+othWXlmsbMmVElA37gJw+gZn52mB5pv4XLe/f/8Pf/CRMX2aajJsBYZcbOHN4o3 JzzeaD/0xXEbv/H7x5BCvciakNvZnqV2/GHcixbB8kvv5unC4/R4o2HkxNMqBAE8TEXKgU 99+c+LqA+FHbnka+/yykl4kqZo3gIvtLWb+eeQf4hi/5JECPspv0BpS87HMrEH2P/c7Dep 2UsphyiQjul8QnCb4UQOIID7LmwWQJc6mJyyxvFuRDe8lQMgRQkbg2Mq2nm/jCboys4D8R zy5wGUswrVXQTObxS/UKzFPstUc2i5w2Yp0EfQNpR+nbP897G2678OCroBeBow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMQY/Ch4JC97ZNGD+owP3cLIqxvDfNW2Vpv03YOLguk=; b=vbS79KctSheNq3nTv6qTKmDB0MEqb328vp7d9QCnJQATQD4b2wK/ibLvk/3O9HIsutqtxt hBaO/qAYmuoTy21ISeyExb+rdVcKIAiGlIwkkBLJIOiE5dZEK48h9GQBr439OQiFlOKBsJ MLWBiJYlVtfuVmG+dXmpWM3l3MLOxuVjkKb4cgRY/4fDvaGaXIEYNPMxEpblziV3KllL+9 ggOX6Nb3sKyJRmFZZrab735AtZjenWS5BmacyiKBUrieQ1Jddt5VGY2OdXz6xDL4s4xMYj YDScK8C1upWbD2KbeFdIZyR0RQ3B0u3se6LDcDhMswg5FFZLyFJyEPbAL+IzBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19744dwzzB20; Thu, 28 Dec 2023 13:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvKpi036276; Thu, 28 Dec 2023 13:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvK9Q036273; Thu, 28 Dec 2023 13:57:20 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:20 GMT Message-Id: <202312281357.3BSDvK9Q036273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 36d42c862f4a - main - ena: Support srd metrics with sysctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36d42c862f4a5643f6e2395e8d7b7e5c4580499a Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=36d42c862f4a5643f6e2395e8d7b7e5c4580499a commit 36d42c862f4a5643f6e2395e8d7b7e5c4580499a Author: Osama Abboud AuthorDate: 2023-09-12 11:17:45 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:30 +0000 ena: Support srd metrics with sysctl This commit introduces SRD metrics through sysctl. The metrics can be queried using the following sysctl node: sysctl dev.ena..ena_srd_info Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 10 +++++++ sys/dev/ena/ena.h | 1 + sys/dev/ena/ena_sysctl.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 64c3d79f00db..45bca630b4c2 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -166,6 +166,7 @@ static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *); static void ena_update_on_link_change(void *, struct ena_admin_aenq_entry *); static void unimplemented_aenq_handler(void *, struct ena_admin_aenq_entry *); static int ena_copy_eni_metrics(struct ena_adapter *); +static int ena_copy_srd_metrics(struct ena_adapter *); static int ena_copy_customer_metrics(struct ena_adapter *); static void ena_timer_service(void *); @@ -3306,6 +3307,12 @@ ena_copy_eni_metrics(struct ena_adapter *adapter) return (rc); } +static int +ena_copy_srd_metrics(struct ena_adapter *adapter) +{ + return ena_com_get_ena_srd_info(adapter->ena_dev, &adapter->ena_srd_info); +} + static int ena_copy_customer_metrics(struct ena_adapter *adapter) { @@ -3568,6 +3575,9 @@ ena_metrics_task(void *arg, int pending) else if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENI_STATS)) (void)ena_copy_eni_metrics(adapter); + if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENA_SRD_INFO)) + (void)ena_copy_srd_metrics(adapter); + ENA_LOCK_UNLOCK(); } diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 18988d719a18..5647fe973502 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -487,6 +487,7 @@ struct ena_adapter { struct ena_stats_dev dev_stats; struct ena_hw_stats hw_stats; struct ena_admin_eni_stats eni_metrics; + struct ena_admin_ena_srd_info ena_srd_info; uint64_t *customer_metrics_array; enum ena_regs_reset_reason_types reset_reason; diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index 82030a2a7539..5efad01f372e 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -38,6 +38,7 @@ static void ena_sysctl_add_wd(struct ena_adapter *); static void ena_sysctl_add_stats(struct ena_adapter *); static void ena_sysctl_add_eni_metrics(struct ena_adapter *); static void ena_sysctl_add_customer_metrics(struct ena_adapter *); +static void ena_sysctl_add_srd_info(struct ena_adapter *); static void ena_sysctl_add_tuneables(struct ena_adapter *); static void ena_sysctl_add_irq_affinity(struct ena_adapter *); /* Kernel option RSS prevents manipulation of key hash and indirection table. */ @@ -59,18 +60,46 @@ static int ena_sysctl_rss_indir_table(SYSCTL_HANDLER_ARGS); #define ENA_METRICS_MAX_SAMPLE_INTERVAL 3600 #define ENA_HASH_KEY_MSG_SIZE (ENA_HASH_KEY_SIZE * 2 + 1) -#define SYSCTL_GSTRING_LEN 64 +#define SYSCTL_GSTRING_LEN 128 #define ENA_METRIC_ENI_ENTRY(stat, desc) { \ .name = #stat, \ .description = #desc, \ } +#define ENA_STAT_ENTRY(stat, desc, stat_type) { \ + .name = #stat, \ + .description = #desc, \ + .stat_offset = offsetof(struct ena_admin_##stat_type, stat) / sizeof(u64), \ +} + +#define ENA_STAT_ENA_SRD_ENTRY(stat, desc) \ + ENA_STAT_ENTRY(stat, desc, ena_srd_stats) + struct ena_hw_metrics { char name[SYSCTL_GSTRING_LEN]; char description[SYSCTL_GSTRING_LEN]; }; +struct ena_srd_metrics { + char name[SYSCTL_GSTRING_LEN]; + char description[SYSCTL_GSTRING_LEN]; + int stat_offset; +}; + +static const struct ena_srd_metrics ena_srd_stats_strings[] = { + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_tx_pkts, Number of packets transmitted over ENA SRD), + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_eligible_tx_pkts, Number of packets transmitted or could + have been transmitted over ENA SRD), + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_rx_pkts, Number of packets received over ENA SRD), + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_resource_utilization, Percentage of the ENA SRD resources + that are in use), +}; + static const struct ena_hw_metrics ena_hw_stats_strings[] = { ENA_METRIC_ENI_ENTRY( bw_in_allowance_exceeded, Inbound BW allowance exceeded), @@ -91,6 +120,7 @@ static const struct ena_hw_metrics ena_hw_stats_strings[] = { #endif #define ENA_CUSTOMER_METRICS_ARRAY_SIZE ARRAY_SIZE(ena_hw_stats_strings) +#define ENA_SRD_METRICS_ARRAY_SIZE ARRAY_SIZE(ena_srd_stats_strings) static SYSCTL_NODE(_hw, OID_AUTO, ena, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "ENA driver parameters"); @@ -153,6 +183,9 @@ ena_sysctl_add_nodes(struct ena_adapter *adapter) else if (ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS)) ena_sysctl_add_eni_metrics(adapter); + if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENA_SRD_INFO)) + ena_sysctl_add_srd_info(adapter); + ena_sysctl_add_wd(adapter); ena_sysctl_add_stats(adapter); ena_sysctl_add_tuneables(adapter); @@ -379,6 +412,47 @@ ena_sysctl_add_stats(struct ena_adapter *adapter) &admin_stats->no_completion, 0, "Commands not completed"); } +static void +ena_sysctl_add_srd_info(struct ena_adapter *adapter) +{ + device_t dev; + + struct sysctl_oid *ena_srd_info; + struct sysctl_oid_list *srd_list; + + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree; + struct sysctl_oid_list *child; + + struct ena_admin_ena_srd_stats *srd_stats_ptr; + struct ena_srd_metrics cur_stat_strings; + + int i; + + dev = adapter->pdev; + + ctx = device_get_sysctl_ctx(dev); + tree = device_get_sysctl_tree(dev); + child = SYSCTL_CHILDREN(tree); + + ena_srd_info = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "ena_srd_info", + CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ENA's SRD information"); + srd_list = SYSCTL_CHILDREN(ena_srd_info); + + SYSCTL_ADD_U64(ctx, srd_list, OID_AUTO, "ena_srd_mode", + CTLFLAG_RD, &adapter->ena_srd_info.flags, 0, + "Describes which ENA-express features are enabled"); + + srd_stats_ptr = &adapter->ena_srd_info.ena_srd_stats; + + for (i = 0 ; i < ENA_SRD_METRICS_ARRAY_SIZE; i++) { + cur_stat_strings = ena_srd_stats_strings[i]; + SYSCTL_ADD_U64(ctx, srd_list, OID_AUTO, cur_stat_strings.name, + CTLFLAG_RD, (u64 *)srd_stats_ptr + cur_stat_strings.stat_offset, + 0, cur_stat_strings.description); + } +} + static void ena_sysctl_add_customer_metrics(struct ena_adapter *adapter) { From nobody Thu Dec 28 13:57:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T19763jg5z55ssD; Thu, 28 Dec 2023 13:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T19756pgwz4XDJ; Thu, 28 Dec 2023 13:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3H2MUcqSdOYiiVWwFaKd8tKUMzQLDqx9CzT6lOarj0M=; b=Nypnt6nMdGW8LMGYyGJZHKWXCETea4+mmxh3mGZ0p2NECjv9aCQHPvPUxJIUsmo9/umx7U B8pGi3p/zJBD0amP4/29wUFwlGO9BMm1K8zX+mDg41Z4Dau+hs8mreSymsKwjMjfsxXIHt CY2ifYC3ou0EqcLGL5SYSPQ2YSwHe3Aj2oyNj2rr5dk8+9fNajLCUOtMqw90SlzU0Qezit +K3ehORsI/Ka+seYlxOLjxCt90AO4D+B7R0AAtjjC6llqZRrHKjrnSOArczunLX3sFjDTE oxaV0BlncReGUSOEl9bxw0nL9UD9kkTFU44fJoitcONebGg3KIgqGeF3fBEOTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771842; a=rsa-sha256; cv=none; b=njmB6Chp3TMVuI5TsF2neVIkx2cMiC3/4IKILg+/6P0Rn4HEmuEN2+lGAMjMvppNduneb+ VDvdPxiPqjYkrW27pGFhX1ZG10RAxXgbHbDtvnEWIebw9iJ8Noquhjy20s526RWOBfeVqn nwgib7VoVbt2AVX5I0ZM508SFAQGl6K4nLpi7Zf/hCNatw/9CnnDaBwyS1ottm2cKYWAgP ltCDmiZMzIP+uKG9DUfXNK0RWPQQHVAqv/ttX91HC5JFUIokPbuJ1sSFwQp+AfDqlEtaNa 1DFGE1YiEKBdXk+gv971Y4qA5cpLGMujORtu7Bnnhp9byAcm/DKYRokn0t/0PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3H2MUcqSdOYiiVWwFaKd8tKUMzQLDqx9CzT6lOarj0M=; b=F05hxp1P0M7w6pCYfnz6e4wnRrxmi0kb2E+xbSojBU5wOUp3XkXBg8ShHrM+GdKvTtK2t8 UzNYv+xR9170NOmgYZrb6fFrR2kYx5bS9Ag+gowPwLJOMPaaoRpu0vR5E1osll2UVzu+6Y kpbcyTEqXLMdCMbQyKQx5MZXz8zmzVhoqVuvfhfh0Y6sx5cmR8KUlx9NlguhrBazfZ8kSk AQS+3ZXc9mY/Nukia/UxUUy8rvlY2q9+hEBCQtpZaImHxe4d/oMbXGlqyLQJeeFLaUyfPl LrAo3RbLDpIXnoxw/HLS7Svs3Far8euLDb6SqGI0jjyaobADadS7cStR85ARzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19755W58z9yB; Thu, 28 Dec 2023 13:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvL2U036334; Thu, 28 Dec 2023 13:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvLQt036331; Thu, 28 Dec 2023 13:57:21 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:21 GMT Message-Id: <202312281357.3BSDvLQt036331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 246aa273244e - main - ena: Update the license dating to 2023 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 246aa273244e91a30d70997a3be790a29f9eb29c Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=246aa273244e91a30d70997a3be790a29f9eb29c commit 246aa273244e91a30d70997a3be790a29f9eb29c Author: Osama Abboud AuthorDate: 2023-10-23 17:16:38 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:36 +0000 ena: Update the license dating to 2023 Some of the files are using outdated linceses. Update the license to be 2023. Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- share/man/man4/ena.4 | 2 +- sys/dev/ena/ena.c | 2 +- sys/dev/ena/ena.h | 2 +- sys/dev/ena/ena_datapath.c | 2 +- sys/dev/ena/ena_datapath.h | 2 +- sys/dev/ena/ena_netmap.c | 2 +- sys/dev/ena/ena_netmap.h | 2 +- sys/dev/ena/ena_rss.c | 2 +- sys/dev/ena/ena_rss.h | 2 +- sys/dev/ena/ena_sysctl.c | 2 +- sys/dev/ena/ena_sysctl.h | 2 +- sys/modules/ena/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/share/man/man4/ena.4 b/share/man/man4/ena.4 index befc2bb2ae0b..50a180871627 100644 --- a/share/man/man4/ena.4 +++ b/share/man/man4/ena.4 @@ -1,6 +1,6 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" Copyright (c) 2015-2022 Amazon.com, Inc. or its affiliates. +.\" Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 45bca630b4c2..3ff32cc9966c 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2021 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 5647fe973502..2c758d37622f 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 177f33ea8ef3..66a93bbe7a6c 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_datapath.h b/sys/dev/ena/ena_datapath.h index c6166a806c6a..43292b5abbe9 100644 --- a/sys/dev/ena/ena_datapath.h +++ b/sys/dev/ena/ena_datapath.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c index a8d7cad05ab5..d95f48f7380c 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_netmap.h b/sys/dev/ena/ena_netmap.h index aa4d0d3d815a..598fcf1f08b2 100644 --- a/sys/dev/ena/ena_netmap.h +++ b/sys/dev/ena/ena_netmap.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c index ce21a0a8950e..d90a7fbb253a 100644 --- a/sys/dev/ena/ena_rss.c +++ b/sys/dev/ena/ena_rss.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2021 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_rss.h b/sys/dev/ena/ena_rss.h index 20dc41cc64a4..1c1c89261b35 100644 --- a/sys/dev/ena/ena_rss.h +++ b/sys/dev/ena/ena_rss.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2021 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index 5efad01f372e..5eaa3c3e76c3 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2021 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ena/ena_sysctl.h b/sys/dev/ena/ena_sysctl.h index e9b4bfaae1cb..4f5834214005 100644 --- a/sys/dev/ena/ena_sysctl.h +++ b/sys/dev/ena/ena_sysctl.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2015-2021 Amazon.com, Inc. or its affiliates. + * Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/modules/ena/Makefile b/sys/modules/ena/Makefile index 95326888cc6c..f8b71588afa1 100644 --- a/sys/modules/ena/Makefile +++ b/sys/modules/ena/Makefile @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates. +# Copyright (c) 2015-2023 Amazon.com, Inc. or its affiliates. # All rights reserved. # # Redistribution and use in source and binary forms, with or without From nobody Thu Dec 28 13:57:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T19772gh6z55t6v; Thu, 28 Dec 2023 13:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T19770Mc7z4X66; Thu, 28 Dec 2023 13:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNgOuTpBeUGKXiWXhlIqbXJXqLgCwUQJfceMf1lIBgc=; b=LSPL+LaXARXOVWsHyiccgvAED07BMFl45ySbwV6rwcN0467vxnbx7d1wFg5FcEJ9zEyg/G y3mL2FYvpOmXMnjlRKmQnTzVYEEKVjnSnSPbtfi5ET4hddpruem8tV+XexRtY/xFmAPx2p p0G5P70Wcrm/SijGsR91qp08EQ3EJcNUfZ0iJegRetmGD2cIrZsm4Xsid+Ce7jI91gP7Sn sI+CxGwM75UUYZX21jvx9bCuLmJdB7L4f7JBlkiKTqXcUuXjPImOgq6yLq/pSO8JUuSwrI aBe/WslqFD1+YUaY4S2tZH67sSMtuHYvUAi83gUtR+DilrjYGMNrApVWFWLKKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771843; a=rsa-sha256; cv=none; b=C+6VHnn1Ngq6bHzBSBF3OnOJeHBB9SlpPMcC8cT5gHTPWWb+DsuiXqcdsJH0I6JB9EjlsF ajzF6pDKV65IRvp8ia9KP1Y6Cw+sC0huVLFYlIIctmuBFiQ9li5At7ztjAfjoB69uwKZvI 8zZmPJQZDTpFSSAY4WmKtv9gJxzO5mMji6nYOrmYmv5CRuVTADO16mbOHSXi/kVPak+G2x L72ApidgTAt9s/wedBkA6ZOxi0AAjA4fW7y8yFTme7e3ug1PFT7afHf2+nvqtoPioQkEwp L3DMeGAes//tAAlriWW+BBedrkI7Rnu7DXKxGXNBytfSJ/p/E+laCt2RAFBIwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNgOuTpBeUGKXiWXhlIqbXJXqLgCwUQJfceMf1lIBgc=; b=dbe2JEhWVn8LeXFArvXayNSd+lyO/Slo5rdhU3QLPBhP2AhYajCFphSyFYrxeTcRe8LCfO Oa3u5cWjRRnhr0VqaAA8whNf3Dyx7zU5whwrtzUSyuXJBj4Gn5qwi82PmUpn+dlHNApdk8 2Ht3F9vDN2eq5RLTlYqy1HyLNAHGaa9VB0hP1CzghDoiwlSogl0LAURYeb18TcVzZnavMm YxLs7DSQjoU0NG8ckOEwlbRZ9OZHsUlcQ0mb5QSGrM3KBqZMTyp5uUIJuLwVn+Sv9+6Rs5 6TBfCu2NdD/rIT0oVxA/q1xG1OSB6k8w3mAjDQ5wq18LfddXC+uOfqw20CtwLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19766b6hz9l7; Thu, 28 Dec 2023 13:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvMbW036379; Thu, 28 Dec 2023 13:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvMhW036376; Thu, 28 Dec 2023 13:57:22 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:22 GMT Message-Id: <202312281357.3BSDvMhW036376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 4e2688cc762d - main - ena: Update driver version to v2.7.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e2688cc762d94b190029f0c5efab9c4bb5521be Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=4e2688cc762d94b190029f0c5efab9c4bb5521be commit 4e2688cc762d94b190029f0c5efab9c4bb5521be Author: Osama Abboud AuthorDate: 2023-10-30 11:12:24 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:43 +0000 ena: Update driver version to v2.7.0 Features: * Introduce customer and SRD metrics through sysctl * Introduce spreading IRQs to CPUs capability using sysctl * Upgrade ena-com to v2.7.0 Bug Fixes: * Remove outdated APIs Minor Changes: * Introduce a shared stats sample interval for all stats Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 2c758d37622f..3e42568ba8a9 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -38,8 +38,8 @@ #include "ena-com/ena_eth_com.h" #define ENA_DRV_MODULE_VER_MAJOR 2 -#define ENA_DRV_MODULE_VER_MINOR 6 -#define ENA_DRV_MODULE_VER_SUBMINOR 3 +#define ENA_DRV_MODULE_VER_MINOR 7 +#define ENA_DRV_MODULE_VER_SUBMINOR 0 #define ENA_DRV_MODULE_NAME "ena" From nobody Thu Dec 28 15:01:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1BY13S3Lz55yt7; Thu, 28 Dec 2023 15:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1BY131HZz3CTw; Thu, 28 Dec 2023 15:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703775685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x14AqfvqAadNE6Xp+8bwQ0a7vCq/tbKd4YYa9WwUtck=; b=mHNweGrVVm9N4DbALrMaPtLLwYaWTC0GVxPLoQ8KnQWGCVUy8mubqNu39gS7tJn1kVSmZF nfnxNFoArQIGOPsYluhGcQ2NRrZwisOsdqf6ASVxfoKv79PxGpQicuK/pGw55G5Lfzc7IU 0tkXy1VH0q+luncdOlCJ+EYSvHd7GeevtlIFu3LCW/e7iCSjlnAzCFJy70pekJD+LMfDco s5fxY8qFnFTcDDDvI0BAq4KOozDA9kR2/J4ogSKXoQm5I9K+Y8gpE6GNkPZgENFwDcIOQ2 O+1WvIy8Kt6gj/m7DsQCUANIL+Qjnk+f7q52apvh1qqiT9CTNbHaKkVwRkMlxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703775685; a=rsa-sha256; cv=none; b=t5MVkf+T6RCq3YCVja++itEB4ZAECbdY6SzUNtzLSdBrDWie8hsvrdqeHT0zpWfEaLpW11 qEtaicY5Mj+qiTmoO0IAZqBGYZYw6C0nAWtkCx8rJa2SjX90a0Z68JOgWCw3slhcdMF0LM jro5Q1YmrTgjC4Z57KU0MKAglNYgCC8mXXNfVMQlGajrOdIAXJJ3ZVYkbRXRv7yl12dbsG v8b6JHjmqL4nMG/U157gpzGEnks+zJeP6VPFF0JKDOTtxNYMkgkM/WifxFXIp7pRvjqRJW K+bAbKPXuTHDJ8dBcMI8f4cZEcaOLk1zXUhPwKz9qxhkANoD01hP6jCZ5+/S8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703775685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x14AqfvqAadNE6Xp+8bwQ0a7vCq/tbKd4YYa9WwUtck=; b=l8xReLUDHWo2cw5fIGynDA2X1TOVJOKXbT3Ro9CX2JcgiqEiyVjvzLrOmgD9kUNdl+EDcv tDnVhRYlwJUcJaX1gyhN5K1+phhFoB2eVo4yb5w9IO8iZ5uO1HaGZu98KpPOP6NXSPjaRS /GfHnt1yynBTECg5XDf5E8klF7l+EZDmUN85KrJhwxUcSyJmUWIB+2JYtYtkstolw8iqUy mha+Hp/620ghwHcl0ujmIIrLEFPvD1x9OXJLHHRMUotyDErMy2K6BiUTowTJkLGbqTojkF db2hRaB3qlhRciiHmej0HbF3wHIRwYNLXMijVYDl1qiPbONoMFEZ+von0q8fcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1BY123xTzCPs; Thu, 28 Dec 2023 15:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSF1PSD050992; Thu, 28 Dec 2023 15:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSF1PEa050989; Thu, 28 Dec 2023 15:01:25 GMT (envelope-from git) Date: Thu, 28 Dec 2023 15:01:25 GMT Message-Id: <202312281501.3BSF1PEa050989@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: 5f71f9636efa - main - CONTRIBUTING.md: fix typo from commmit to commit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5f71f9636efa25f6de1a832202bae7c78ad013aa Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f71f9636efa25f6de1a832202bae7c78ad013aa commit 5f71f9636efa25f6de1a832202bae7c78ad013aa Author: rilysh AuthorDate: 2023-12-28 07:34:32 +0000 Commit: Ed Maste CommitDate: 2023-12-28 15:01:03 +0000 CONTRIBUTING.md: fix typo from commmit to commit Signed-off-by: rilysh Pull-request: https://github.com/freebsd/freebsd-src/pull/960 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f166b6a93766..c3028b7a764f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ A pull request will be considered if: * The commits follow FreeBSD's style guide. See [Style](#Style). * Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors. * The commits do not introduce trailing white space. -* If the commmit fixes a bug, please add 'PR: \' to the commit message. +* If the commit fixes a bug, please add 'PR: \' to the commit message. * If there's a code review in Phabricator, please include a link as a 'Differential Revision: ' line. * If you have run FreeBSD's sources through a static analysis tool, please don't submit the raw results. Please also see the chunking up guidelines. Also, please make sure that kyua tests are the same before / after your change. Ideally, you'd also create a test case that shows an actual bug that's being fixed by these changes. From nobody Thu Dec 28 15:44:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1CVt3gJBz563nP; Thu, 28 Dec 2023 15:44:38 +0000 (UTC) (envelope-from pstef@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1CVt3BCbz3NZh; Thu, 28 Dec 2023 15:44:38 +0000 (UTC) (envelope-from pstef@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703778278; 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=a7fo7pyvbWpvxBMkLkBsea178lthVxPj3/409GSUpNE=; b=sjsZKgWWlXsEAw5sSeUbvJPhz2Ex/Ia7HVFcxxUGhzD7j2JvOD1yQ7p3HhuOdjyzxBTGuA fcR+Cy4QoqOwvloxptaUBniZTwNXLFy9dnIvcMrLWPakaXKEamQKuDk+Uci1/ZGBZAhKDA up9tsLs2YQXql++78DB9jV56hF8fZkNnpmCMWF2PnyK7mREk7rN4oPxk2PqR4mMdeYyLo/ Vpj8wEWp6VHgxdSx3TOlrLvlXBiXDCGMtosqqibaYAKb/CMi/ILGuE8ea4/V1KqQbxpn6V LvHJPC+m+zEdF/0MvhmBg4WpfhLQtnnfvzOWq3NkjM/jDpGg5B3n+6QJd2AhYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703778278; a=rsa-sha256; cv=none; b=yUkuzh5rWIXMeR5w8nhQA6rNpFpLaCPhz6LbMJktw4VWw8ksKUsiUCFMZftkU79Jbid6Ea CzeGtDPp/YBhl8230auTc/HIxJH+PJZD5M9007VNZxkHzc0hRyOlXSmq8bHXxiHVgd1dSr R4qluWm3IApEUo7zY14+hziyP8iDboWgAfIMq4BnAqHi0j/M4ID5hgDVjHo/4CiJqJXuMh ZEAxLkyaieeDz63RHldYdP3f5ZIzU4ueDO9OevEo6uq5zJ58AfTSsiWM8IG4YisZVqsos8 eaEOsZn8GN7vHHU69TX/nydVSs4tLFBZphyeplrExxKTBn6pZZch0f9aM3zSMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703778278; 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=a7fo7pyvbWpvxBMkLkBsea178lthVxPj3/409GSUpNE=; b=FIOHAzYNkTNfcCzzuxzJ3O/Qgx0OqwWgpVyHdn8xnWFK6ifqCO0apjmP0NeyRSGBe/CJMZ yu+raPqXcFkC5MbdFTunuIwQTFOlE1awscIrygIlR9qxLsm4bTNe+hsuv0h7Ska4kDILJo LcW1qhtjYrDVf7voYE6p5Gkns5adgaVTxxR2UoR2lM5Um8fO4ENtw7oK1sm5iGrk05tYSX mZnVzgw9xLPQNHfic3XAYRyn15/Z6kY1hUrUBpswrtbUeeyU5idD84yjhn8TMU622jGkNm td9eD7BOt8liNStK5QB+TbujnwX7fgFlCwFJemg39CNpsuiowQwujS6nxjY9Ow== Received: by freefall.freebsd.org (Postfix, from userid 1403) id 50EAFB28; Thu, 28 Dec 2023 15:44:38 +0000 (UTC) Date: Thu, 28 Dec 2023 16:44:38 +0100 From: "Piotr P. Stefaniak" To: Wolfram Schneider Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 271887ec35ad - main - update manpage URL Message-ID: References: <202312281048.3BSAmamG017416@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <202312281048.3BSAmamG017416@gitrepo.freebsd.org> On 2023-12-28 10:48:36, Wolfram Schneider wrote: >diff --git a/usr.bin/indent/tests/comments.0 b/usr.bin/indent/tests/comments.0 >index 4a627b9f39ec..6e9221868a1c 100644 >--- a/usr.bin/indent/tests/comments.0 >+++ b/usr.bin/indent/tests/comments.0 >@@ -10,7 +10,7 @@ void t(void) { > /* > * Old indent wrapped the URL near where this sentence ends. > * >- * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html >+ * https://man.freebsd.org/indent > */ The comment makes no sense now, it was supposed to show a URL longer than the limit, so was wrapped around by indent (before I changed to keep such URLs) and test for future regressions. Piotr From nobody Thu Dec 28 15:56:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1CmJ3jNPz564VN; Thu, 28 Dec 2023 15:56:16 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1CmJ1yj0z3Ql2; Thu, 28 Dec 2023 15:56:16 +0000 (UTC) (envelope-from wschnr@googlemail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a2345aaeb05so671577666b.0; Thu, 28 Dec 2023 07:56:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703778973; x=1704383773; 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=oEbhcI+u+VSDfHoRCEXEmR7yizI2zCltWyA/PlO9pQ4=; b=XAKdOL2mYJHGyeW/PAWk2lhe1q+c11CB0As/aC6pwvCdGHKnnASQAfI+ADL+Sm41da 7SXoyU1XAAl2fHPk+fN0Zdv9oTce6O3zb89RtGeR+f7vrdoEPJNh9NVN33wpBfbgIPxH VqmJOpyRMN10aZBCBFfb5/Ilr+Wt+1FZM3S0WQ9CZVUavRN9tjZ2hPsJtGSShQ1hSgag r8yLAEw9LSlesI8HgX5NLQYdHa+hwMt/ksFORdd8EFku4PME1e2qd+Z0Bunkf7q72IKj /nPVTxv7Sy+iqSlm2U/7QFs2nykn9c0MBy0gHksj4dq6UxoHUnzVF9bAShWAC2jL2soZ VmJw== X-Gm-Message-State: AOJu0YzX6L9Fq/0ai9WAlbZj8DD1RW9/ZJsSDg750Sc/GGLXdQuhXCXK w6UacejTynQp4Id6vG4aBVx8FeL9qlw6OGcEX2XHjVcY X-Google-Smtp-Source: AGHT+IEL2tlqk6cYjAS1mMNz/GPghT4OjCX6xqyXBS6B8vOHfxwN6V/HfXH6s0euM/TB3ilUcnIJqsilAKXfYTAAjPk= X-Received: by 2002:a17:906:7696:b0:a23:6343:f4ab with SMTP id o22-20020a170906769600b00a236343f4abmr4950611ejm.145.1703778972672; Thu, 28 Dec 2023 07:56:12 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312281048.3BSAmamG017416@gitrepo.freebsd.org> In-Reply-To: From: Wolfram Schneider Date: Thu, 28 Dec 2023 16:56:01 +0100 Message-ID: Subject: Re: git: 271887ec35ad - main - update manpage URL To: "Piotr P. Stefaniak" Cc: 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-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1CmJ1yj0z3Ql2 On Thu, 28 Dec 2023 at 16:44, Piotr P. Stefaniak wrote: > > On 2023-12-28 10:48:36, Wolfram Schneider wrote: > >diff --git a/usr.bin/indent/tests/comments.0 b/usr.bin/indent/tests/comments.0 > >index 4a627b9f39ec..6e9221868a1c 100644 > >--- a/usr.bin/indent/tests/comments.0 > >+++ b/usr.bin/indent/tests/comments.0 > >@@ -10,7 +10,7 @@ void t(void) { > > /* > > * Old indent wrapped the URL near where this sentence ends. > > * > >- * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html > >+ * https://man.freebsd.org/indent > > */ > > The comment makes no sense now, it was supposed to show a URL longer > than the limit, so was wrapped around by indent (before I changed to > keep such URLs) and test for future regressions. Sorry, I mis-understood the comment. I will fix it soon. -Wolfram -- Wolfram Schneider https://wolfram.schneider.org From nobody Thu Dec 28 16:00:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1CsL3kPkz564n0; Thu, 28 Dec 2023 16:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1CsL3GRtz3RHw; Thu, 28 Dec 2023 16:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703779238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/d36DWRF5k2Hwp+tel6Q95WSMrE4gZsZ2W/xwn4D0n0=; b=l1t9M2n6sDDG13I+/JGwrsa8Qv6sBOR9CkO01g9TUlI7yJKoZKWdWxdTmX6nlyqcM0t19M PE8rI/LXQT81M2FQltnmCs4jF0cQ3GWBoSzqVQcsctknKoH9E8CZwUKAdX2irKDJO8Ff8E UirMA1PFTn7d5sSTdrnJaNottVSzJEyFRZREzzrVly3AxzEH7hxavz2qSQfQqkQcPJgD/M pDnxL/+gYUkh4pc2R+6Von8BGXlSKi57QAjjnCnEKK8uxevitH36P8D5jl+zP0m/SwXrlV JpSNuorK+E/iFweRlohjSAcL0mFx/wTGZCoTZCnTu8i+xWvg42gMmnDD7TsyKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703779238; a=rsa-sha256; cv=none; b=xusTdb9PoDVj4GnLCp7NynvnSMADzyM95T87phS5gGiGyFRcp4DPChkdONMNYbV3aLIPrQ TRZYQ4Ya5xYl9b36900pb73M2RWJpr1n0GKDOkLdeGDf163T0fT/7wfABeT0bykuPbtPd8 wA6DQwFnFULG656nlFGY2pkd1FVu0TuwTxXPcPOhy0PmL8GFEb2sxamUKoHf4GjKwHlmxE KdmIdu5yDKKYz1dIFzp9wE1IGlZUoTdMLoPJTjbJ9scOLlPRpxLPwvrWge/sgAoy1wi6Ru 3WPhY6cHcHM/UFTuybGBgs19z08a6phzrA0VdLFhG12KjINjJyUP5MyfYlhIxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703779238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/d36DWRF5k2Hwp+tel6Q95WSMrE4gZsZ2W/xwn4D0n0=; b=t68a3HAqZL3ThQAkGWdauP9VoSGhuOsgEJ4hFfbndqd/J0cZllXtb1Liz7wDEn9k/HofXu u+rYCkXoRImMOShcDhgxw/NZLzfCzhiKQtf38HDNi2Om6fe3Z6T1TNGtBRkSG06K16WdNC PJCF2dtnzQNblXtrwzuUQW0RYOZvN9H2uDte+Pr5eeEm7wcxdJHMwDgwBwbNtxy6WMm7ZH lNbeqEQOB1t6nSAVvZTTLk7oD5tw5D1qUYoEiLityv2LPiw8QLgTbN/CRpvwtuKa0PQZan 9g5kRc7klJTZ7OT3AM0M95/mCwL5Ft+VLBMTDLI+4/uz2On9JEkZCBmHbkJ1YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1CsL2JtdzTqM; Thu, 28 Dec 2023 16:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSG0cHP047362; Thu, 28 Dec 2023 16:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSG0cS6047359; Thu, 28 Dec 2023 16:00:38 GMT (envelope-from git) Date: Thu, 28 Dec 2023 16:00:38 GMT Message-Id: <202312281600.3BSG0cS6047359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: ffd76b1f308d - main - use long manpage URL (broken in last commit) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffd76b1f308da43ac5166b5dfb74a6e0f62a3638 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=ffd76b1f308da43ac5166b5dfb74a6e0f62a3638 commit ffd76b1f308da43ac5166b5dfb74a6e0f62a3638 Author: Wolfram Schneider AuthorDate: 2023-12-28 15:58:56 +0000 Commit: Wolfram Schneider CommitDate: 2023-12-28 15:58:56 +0000 use long manpage URL (broken in last commit) Reported by: pstef --- usr.bin/indent/tests/comments.0 | 2 +- usr.bin/indent/tests/comments.0.stdout | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/indent/tests/comments.0 b/usr.bin/indent/tests/comments.0 index 6e9221868a1c..08d58fca37f2 100644 --- a/usr.bin/indent/tests/comments.0 +++ b/usr.bin/indent/tests/comments.0 @@ -10,7 +10,7 @@ void t(void) { /* * Old indent wrapped the URL near where this sentence ends. * - * https://man.freebsd.org/indent + * https://man.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=freebsd-current&arch=default&format=html */ /* diff --git a/usr.bin/indent/tests/comments.0.stdout b/usr.bin/indent/tests/comments.0.stdout index 2ffd3e49b6c4..655c3e0a8950 100644 --- a/usr.bin/indent/tests/comments.0.stdout +++ b/usr.bin/indent/tests/comments.0.stdout @@ -12,7 +12,7 @@ t(void) /* * Old indent wrapped the URL near where this sentence ends. * - * https://man.freebsd.org/indent + * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=freebsd-current&arch=default&format=html */ /* From nobody Thu Dec 28 17:24:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1FkV1W09z56CpD; Thu, 28 Dec 2023 17:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1FkV0xWbz3dSh; Thu, 28 Dec 2023 17:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d5/3znyI2JeaxwDazDDkfC4DOAWP2cD5DGO6c0kR+e4=; b=Vur/0dbQFGDd2cgGZt0N1LUITHyplu2qADcOxmTlDFMdd3AdH454fojhCpR9s1bbvCdRPb v3PhHKpPLA4ntTUfA2ZzXuMROTfGj6KYWTH+DUL2LlXW4GpUFxByXL2WRChIzuqGT8QmYw 8m3umkaee2h+f1mPAF6rJXbhpai/XcnRqJLotb5M7/3Kxeu4h+vz70FKBG5sjdOa5SxeyH aCzwcN1Wf/fybTPgBarLxwnRvEAiwSjizCr8pt0rH24gc3HVkE2doQPsXYdjeFlo7rSDno KVgeeAl6GixBaHpkpZIQBWWBA0kZZeYxJDYYpcRH1i9H2ecToHkEE+Bc/Xf4Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703784290; a=rsa-sha256; cv=none; b=YGfqqpHx2ohnoMDm9ImC7wHa7h3kohSMhczoro4+sqOYEaASHcpEhSsMRdCwF7qwOIlkXW WqLG2KnfPtwwUUI0JYBBuon0r1+AXBb404IlLyP0tiQBW1ri1J3RbI542E5T1TjZVTq8+E EkE099f3CyoFboIdaDHaibvbvv+RSOLpD1U/QL2PpzTi66PnWmlihpJtE8OLCZa1hQAATo mtgAwk6jhXB5tQIHu9yT7DrufDkVIzSUWmHdBVrw48F3Ewk6vKXhcYlSOh0hbdOxrQgIZO AME5fk5P0Anm32Y1SY0L2hictMTZO8vzXGBDjJqGFwfXO1KOhUkgSucmqpatGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d5/3znyI2JeaxwDazDDkfC4DOAWP2cD5DGO6c0kR+e4=; b=QxLZwxNr04ph7qVn+HiDVGca72575hZYSeXbwCJGPcoZtVlY5Nd3k7mPPNqX/YmyQU5pB9 LZrFuKcoV9DqhjOxsUn1ehqry+WZ+z2rujz2grYXu2RBxK8Cl4xTqhGB59T0szWCwCRbQh OP/8WivOHJ1EoQumm7WGqlWbb7VfVi8wj+IpdUE426rZJKLiN0RqKF42PfTT4XF6GlbOcA BY3XSvzsyNe3rtR7jZv2wC42a9mi8A0HSOfajE8nrkxSJ5Q3TRi94PlE1imCoGgJ+qHO2G saflRY1dYKpJqvGxCWYe1lNI039XxlH/l9h9VbULuHqE/J8XO9J4POfYMrZInA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1FkT7156zXgT; Thu, 28 Dec 2023 17:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSHOnfK090601; Thu, 28 Dec 2023 17:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSHOnqk090598; Thu, 28 Dec 2023 17:24:49 GMT (envelope-from git) Date: Thu, 28 Dec 2023 17:24:49 GMT Message-Id: <202312281724.3BSHOnqk090598@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: 8ee1cc4a7f2e - main - Revert "vtnet: Better adjust for ethernet alignment." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8ee1cc4a7f2e0a3fb9cb4f9514da07f2572a7f4c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee1cc4a7f2e0a3fb9cb4f9514da07f2572a7f4c commit 8ee1cc4a7f2e0a3fb9cb4f9514da07f2572a7f4c Author: Warner Losh AuthorDate: 2023-12-28 17:20:24 +0000 Commit: Warner Losh CommitDate: 2023-12-28 17:22:14 +0000 Revert "vtnet: Better adjust for ethernet alignment." This reverts commit e9da71cd35d46ca13da4396d99e0af1703290e68. This was inadvertantly pushed and turns out ot be not quite right. Requested by: markj --- sys/dev/virtio/network/if_vtnet.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index db7a1a18ebc2..360176e4f845 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1532,8 +1532,8 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) m_freem(m_head); return (NULL); } - m->m_len = size; + m_adj(m, ETHER_ALIGN); if (m_head != NULL) { m_tail->m_next = m; m_tail = m; @@ -1587,15 +1587,6 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *rxq, struct mbuf *m0, ("%s: mbuf size %d not expected cluster size %d", __func__, m->m_len, clustersz)); -#ifdef __NO_STRICT_ALIGNMENT - /* - * Need to offset the first mbuf in this chain to align the IP - * structure because this host requires strict alignment. - */ - if (m_prev == NULL) { - m_adj(m, ETHER_ALIGN); - } -#endif m->m_len = MIN(m->m_len, len); len -= m->m_len; @@ -1664,13 +1655,6 @@ vtnet_rxq_replace_buf(struct vtnet_rxq *rxq, struct mbuf *m, int len) if (m_new == NULL) return (ENOBUFS); -#ifdef __NO_STRICT_ALIGNMENT - /* - * Need to offset the first mbuf in this chain to align the IP - * structure because this host requires strict alignment. - */ - m_adj(m_new, ETHER_ALIGN); -#endif error = vtnet_rxq_enqueue_buf(rxq, m_new); if (error) { sc->vtnet_stats.rx_enq_replacement_failed++; @@ -1738,13 +1722,6 @@ vtnet_rxq_new_buf(struct vtnet_rxq *rxq) if (m == NULL) return (ENOBUFS); -#ifdef __NO_STRICT_ALIGNMENT - /* - * Need to offset the first mbuf in this chain to align the IP - * structure because this host requires strict alignment. - */ - m_adj(m, ETHER_ALIGN); -#endif error = vtnet_rxq_enqueue_buf(rxq, m); if (error) m_freem(m); @@ -1930,10 +1907,8 @@ vtnet_rxq_discard_buf(struct vtnet_rxq *rxq, struct mbuf *m) int error __diagused; /* - * Requeue the discarded mbuf. This should always be successful since it - * was just dequeued. There's no need to adjust for ethernet alignment - * here on strict alignment hosts because we're requeueing a packet - * already adjusted. + * Requeue the discarded mbuf. This should always be successful + * since it was just dequeued. */ error = vtnet_rxq_enqueue_buf(rxq, m); KASSERT(error == 0, From nobody Thu Dec 28 17:24:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1FkW3tSCz56Crf; Thu, 28 Dec 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1FkW26Pcz3df2; Thu, 28 Dec 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbTIsXm+RvJkU0yvX5vOHzZ+eMYWcxOwgYCIX1ypZQc=; b=L0WQDXzwvaow8wl89zg7kQxbYxHHhiVvAYNk9CfmvHkn9JLZtiMBnVIgzOJdpLx3WgstSC amHssD/sitxUiTMoAr/kDpwHqNEaHC847IgeTFHWhQVhlw0HcVybxUOXNDTXZC5fZqxb7L /oJKh1qS0CRxwmi9yrpwj76X0VnnkZ+bcVosMQhuV0TbDMYIvlXss2tCiEmd+JJS7dHMIS U/oR1XI7UZcaa4hpc8Gmw+VOoQwImXZnOYjgNyKYaobGz7Z071KBhdnzi88EsOCwxeDBGy HN4liVTKvDnQ7IpF1Q+1RfITJCj6L5dFKcuuI/uWBeGBsghM3+2WcMoiUG8+7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703784291; a=rsa-sha256; cv=none; b=CtgbdZHNaI6ytOQW0wMvPkNcTpVzRXNAQ5I1AwBf0N+IUfysg8FbCk6ovkkiDKhHA3gAln yHlv0k9tK+j9gRgCVkeVoyoQWEHU39jRp7vpLVkOH3cLdJc9XEhpZvSH1Um3EbxWZFwCyc 3TpueHS7r4JoX7x2+19itKL9hEy3mfmTy4FAE6mK2+I2L3ufy4CxY+6vNCxuetWAd62F0S KJjLc+KvifUUyR6128Z8Vw81GZ6PMPnIZCgeVuEg+t+gjl9x5zL68pzhrBEpUWfDDFLbt3 bd7zQUr2DuwjoSNRBRjj978q/jKAW98vU3nkqeCqChL/oYQoyuyPp2iYaaOngQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbTIsXm+RvJkU0yvX5vOHzZ+eMYWcxOwgYCIX1ypZQc=; b=CXk3zY70ggKmpwnkT9Bq0NppDOKKWKEFupgdHAaPAazOC9oKVvl8WHAF4YQzCm1tez0N8h kq7wjmBfoWIvBgK7AAYFlOPy0UnyJTN3tf5veT8iH35TjH2WRN/oJUp7VysXxnZhFXf3GN Og90YTSkJZF8DZly2Oibp260U7+wv1rrIXB0nGyB/W48YT/TNYKyOhUbbH74L5Fl3cDsp8 t4Uf+PdZsWdE3bYIKcTh+gcoGmYl2JCp99GR52mJYSPIYctU+jFb4q0zgsAA2oyrNROdTn RmPYS6zv+vcOkaHk1+rzXDN+e8E9S9BT0FOpomU8TEtsjETUHtVYaviCbIhcrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1FkW19xBzWmY; Thu, 28 Dec 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSHOpjq090658; Thu, 28 Dec 2023 17:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSHOpas090655; Thu, 28 Dec 2023 17:24:51 GMT (envelope-from git) Date: Thu, 28 Dec 2023 17:24:51 GMT Message-Id: <202312281724.3BSHOpas090655@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: 23699ff23c36 - main - Revert "vtnet: Adjust rx buffer so IP header 32-bit aligned" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 23699ff23c36f6df1b02c1bc745d36591c712322 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=23699ff23c36f6df1b02c1bc745d36591c712322 commit 23699ff23c36f6df1b02c1bc745d36591c712322 Author: Warner Losh AuthorDate: 2023-12-28 17:20:42 +0000 Commit: Warner Losh CommitDate: 2023-12-28 17:22:23 +0000 Revert "vtnet: Adjust rx buffer so IP header 32-bit aligned" This reverts commit 9e6d11ce9a51d75ed6a94e180f2fb4e9188a2ba4. This wasn't right to start with... Requested by: markj --- sys/dev/virtio/network/if_vtnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 360176e4f845..287af7751066 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1532,8 +1532,8 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) m_freem(m_head); return (NULL); } + m->m_len = size; - m_adj(m, ETHER_ALIGN); if (m_head != NULL) { m_tail->m_next = m; m_tail = m; From nobody Thu Dec 28 17:36:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1G030RZtz56DC9; Thu, 28 Dec 2023 17:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1G026vcDz3fcS; Thu, 28 Dec 2023 17:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReVPJzmsbmuKDWAnKVzcauWL4/vyyIbuWLtzkz9ND9c=; b=mWrrC1GX+t8XQQ+tNzj3D35EyMznQsv/iZ9B662N7Tw4mLN0RgwREHFviE/+/9HOa9X2fv q5PGRBieO8P8HY6SkoAxGeMmjTTcFt6nTBMvUsWvu9dPaaJaevZMjZ5z1vsCdPG/glB4zW kMmAJdQ/goDOVKtcZvx3hUFljKkLOwLsvFIX75M0tcR7VWXtnpDnochAsoNSxnJMKwfcEy vZw85h8KltsjBYULYLhaDl3EJWrkHt5mbeoUxmKBDSKzEfyk4/FAswvBRndkUMVSSTrNC2 Ws/sRIEIcS7O+JPtlwOChRoVtHkE92PWcZaQl+w3wD1oHnEtYCIG0wQWnwqHSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703784995; a=rsa-sha256; cv=none; b=f3c3LkPC+diCCWxAgts+9qVIjjH9pxuJ0fAUzf91RWw+wgyv91cxQ1hVxdkAj+DRn+34yl 83Bw9IIRcpexTaLQotErI1XU0vbbhWeo8KkjoEsW7MkpKVGSAa7g5gRvEqotVrWoTqhoqQ Zma/TLl0/+1dwNMH7TBmxWUnsDVl9bPSNDRvi1Eu9DvEU3qOQ+WaZRiM6A4xHfYczQs1DA Frv472wQqDIVuR/vlsg0SJwqJG/O7Rujap5dW/j2KT3L25CLu9YM/QF+plWpbrchheS3ps ErQeXKxUumpK7RgHWem4K9dnBedDJadKt43kojPTxa2Wi4wqfPQ8ayo52HvImA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReVPJzmsbmuKDWAnKVzcauWL4/vyyIbuWLtzkz9ND9c=; b=q8tX8m5Z6C0xGzLE+Yat1u8rt2qufX/XVHEajzDAc/PpUMjcHjw/IngDGtwzuMRmb8rb33 +rHTMcDjQCQXFubXazY6o6d62vJlYuRd+pUCbe/S7MCme6/CeI/3OYb7xV9+Hue0QkLmIz GNneB5zAjpWdMwRHYtUlC2sE/bXCK7xL8qGjGeihYjAl/EqeZm2PI0Ef2cmQouZifpfH4P tvAMcU7Yrvu40yhph/pOLzs/wkqyIxL0tMZ1OiJXH4Y26P8LuQsrLcAoUQRWQIgUE5iPjU hGkhXdc/HJ/byttc/0WT8+FRL+m+2pua7eXzFRkpLIjgBazuqksWW2sgLanfgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1G025ydfzXr6; Thu, 28 Dec 2023 17:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSHaYsb007757; Thu, 28 Dec 2023 17:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSHaY8n007754; Thu, 28 Dec 2023 17:36:34 GMT (envelope-from git) Date: Thu, 28 Dec 2023 17:36:34 GMT Message-Id: <202312281736.3BSHaY8n007754@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: d068ea16e326 - main - cam: Let cam_periph_unmapmem() return an error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d068ea16e3264c2d62472a8acf794262cfe703dd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d068ea16e3264c2d62472a8acf794262cfe703dd commit d068ea16e3264c2d62472a8acf794262cfe703dd Author: Mark Johnston AuthorDate: 2023-12-28 17:08:04 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 17:36:15 +0000 cam: Let cam_periph_unmapmem() return an error As of commit b059686a71c8, cam_periph_unmapmem() can legitimately fail if the copyout() operation fails. However, this failure was never signaled to upper layers. In practice it is unlikely to occur since cap_periph_mapmem() would most likely fail in such circumstances anyway, but an error is nonetheless possible. However, some code reading revealed a few paths where the return value of cam_periph_mapmem() is not checked, and this is definitely a bug. Add error checking there and let cam_periph_unmapmem() return errors from copyout(). Reviewed by: dab, mav MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43201 --- sys/cam/cam_compat.c | 21 +++++++++++++-------- sys/cam/cam_periph.c | 21 +++++++++++++-------- sys/cam/cam_periph.h | 2 +- sys/cam/cam_xpt.c | 4 +--- sys/cam/nvme/nvme_da.c | 5 +++-- sys/cam/scsi/scsi_pass.c | 4 ++-- sys/cam/scsi/scsi_sg.c | 6 ++++-- sys/cam/scsi/scsi_target.c | 29 ++++++++++++++++++++--------- 8 files changed, 57 insertions(+), 35 deletions(-) diff --git a/sys/cam/cam_compat.c b/sys/cam/cam_compat.c index 1b53eaa4a2c8..fdb4ee8717ec 100644 --- a/sys/cam/cam_compat.c +++ b/sys/cam/cam_compat.c @@ -377,11 +377,13 @@ cam_compat_translate_dev_match_0x18(union ccb *ccb) struct dev_match_result *dm; struct dev_match_result_0x18 *dm18; struct cam_periph_map_info mapinfo; - int i; + int error, i; /* Remap the CCB into kernel address space */ bzero(&mapinfo, sizeof(mapinfo)); - cam_periph_mapmem(ccb, &mapinfo, maxphys); + error = cam_periph_mapmem(ccb, &mapinfo, maxphys); + if (error != 0) + return (error); dm = ccb->cdm.matches; /* Translate in-place: old fields are smaller */ @@ -429,21 +431,22 @@ cam_compat_translate_dev_match_0x18(union ccb *ccb) } } - cam_periph_unmapmem(ccb, &mapinfo); - - return (0); + return (cam_periph_unmapmem(ccb, &mapinfo)); } static int cam_compat_handle_0x19(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td, d_ioctl_t *cbfnp) { + struct cam_periph_map_info mapinfo; union ccb *ccb = (union ccb *)addr; - struct cam_periph_map_info mapinfo; + int error; if (cmd == CAMIOCOMMAND && ccb->ccb_h.func_code == XPT_DEV_MATCH) { bzero(&mapinfo, sizeof(mapinfo)); - cam_periph_mapmem(ccb, &mapinfo, maxphys); + error = cam_periph_mapmem(ccb, &mapinfo, maxphys); + if (error != 0) + return (error); for (int i = 0; i < ccb->cdm.num_patterns; i++) { struct dev_match_pattern *p = &ccb->cdm.patterns[i]; @@ -457,7 +460,9 @@ cam_compat_handle_0x19(struct cdev *dev, u_long cmd, caddr_t addr, int flag, p->pattern.periph_pattern.flags == 0x01f) p->pattern.periph_pattern.flags = PERIPH_MATCH_ANY; } - cam_periph_unmapmem(ccb, &mapinfo); + error = cam_periph_unmapmem(ccb, &mapinfo); + if (error != 0) + return (error); } return ((cbfnp)(dev, cmd, addr, flag, td)); } diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 920e5f0471c7..e957edee67f1 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1013,17 +1013,17 @@ fail: * Unmap memory segments mapped into kernel virtual address space by * cam_periph_mapmem(). */ -void +int cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo) { - int numbufs, i; + int error, numbufs, i; uint8_t **data_ptrs[CAM_PERIPH_MAXMAPS]; uint32_t lengths[CAM_PERIPH_MAXMAPS]; uint32_t dirs[CAM_PERIPH_MAXMAPS]; if (mapinfo->num_bufs_used <= 0) { /* nothing to free and the process wasn't held. */ - return; + return (0); } switch (ccb->ccb_h.func_code) { @@ -1088,12 +1088,11 @@ cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo) numbufs = 1; break; default: - /* allow ourselves to be swapped once again */ - PRELE(curproc); - return; - break; /* NOTREACHED */ + numbufs = 0; + break; } + error = 0; for (i = 0; i < numbufs; i++) { if (mapinfo->bp[i]) { /* unmap the buffer */ @@ -1103,8 +1102,12 @@ cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo) uma_zfree(pbuf_zone, mapinfo->bp[i]); } else { if (dirs[i] != CAM_DIR_OUT) { - copyout(*data_ptrs[i], mapinfo->orig[i], + int error1; + + error1 = copyout(*data_ptrs[i], mapinfo->orig[i], lengths[i]); + if (error == 0) + error = error1; } free(*data_ptrs[i], M_CAMPERIPH); } @@ -1115,6 +1118,8 @@ cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo) /* allow ourselves to be swapped once again */ PRELE(curproc); + + return (error); } int diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h index d0f04388b181..ad18ee6b204c 100644 --- a/sys/cam/cam_periph.h +++ b/sys/cam/cam_periph.h @@ -180,7 +180,7 @@ void cam_periph_invalidate(struct cam_periph *periph); int cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo, u_int maxmap); -void cam_periph_unmapmem(union ccb *ccb, +int cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo); union ccb *cam_periph_getccb(struct cam_periph *periph, uint32_t priority); diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index de3630c35374..2acb106b087c 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -563,11 +563,9 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread * /* * Map the buffers back into user space. */ - cam_periph_unmapmem(inccb, &mapinfo); + error = cam_periph_unmapmem(inccb, &mapinfo); inccb->ccb_h.path = old_path; - - error = 0; break; } default: diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 73c385b2fe1c..2dd7c6d4a70b 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -437,8 +437,9 @@ ndaioctl(struct disk *dp, u_long cmd, void *data, int fflag, * Tear down mapping and return status. */ cam_periph_unlock(periph); - cam_periph_unmapmem(ccb, &mapinfo); - error = cam_ccb_success(ccb) ? 0 : EIO; + error = cam_periph_unmapmem(ccb, &mapinfo); + if (!cam_ccb_success(ccb)) + error = EIO; out: cam_periph_lock(periph); xpt_release_ccb(ccb); diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 5c05ca84bcab..5a24f11e60e2 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -2236,14 +2236,14 @@ passsendccb(struct cam_periph *periph, union ccb *ccb, union ccb *inccb) } cam_periph_unlock(periph); - cam_periph_unmapmem(ccb, &mapinfo); + error = cam_periph_unmapmem(ccb, &mapinfo); cam_periph_lock(periph); ccb->ccb_h.cbfcnp = NULL; ccb->ccb_h.periph_priv = inccb->ccb_h.periph_priv; bcopy(ccb, inccb, sizeof(union ccb)); - return(0); + return (error); } /* diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c index 27a0b298fd31..fec3bb157b52 100644 --- a/sys/cam/scsi/scsi_sg.c +++ b/sys/cam/scsi/scsi_sg.c @@ -882,7 +882,7 @@ sgsendccb(struct cam_periph *periph, union ccb *ccb) { struct sg_softc *softc; struct cam_periph_map_info mapinfo; - int error; + int error, error1; softc = periph->softc; bzero(&mapinfo, sizeof(mapinfo)); @@ -907,7 +907,9 @@ sgsendccb(struct cam_periph *periph, union ccb *ccb) softc->device_stats); cam_periph_unlock(periph); - cam_periph_unmapmem(ccb, &mapinfo); + error1 = cam_periph_unmapmem(ccb, &mapinfo); + if (error == 0) + error = error1; cam_periph_lock(periph); return (error); diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c index 5fe123427447..f1c01cab8638 100644 --- a/sys/cam/scsi/scsi_target.c +++ b/sys/cam/scsi/scsi_target.c @@ -905,18 +905,29 @@ targreturnccb(struct targ_softc *softc, union ccb *ccb) u_ccbh = &descr->user_ccb->ccb_h; /* Copy out the central portion of the ccb_hdr */ - copyout(&ccb->ccb_h.retry_count, &u_ccbh->retry_count, - offsetof(struct ccb_hdr, periph_priv) - - offsetof(struct ccb_hdr, retry_count)); + error = copyout(&ccb->ccb_h.retry_count, &u_ccbh->retry_count, + offsetof(struct ccb_hdr, periph_priv) - + offsetof(struct ccb_hdr, retry_count)); + if (error != 0) { + xpt_print(softc->path, + "targreturnccb - CCB header copyout failed (%d)\n", error); + } /* Copy out the rest of the ccb (after the ccb_hdr) */ ccb_len = targccblen(ccb->ccb_h.func_code) - sizeof(struct ccb_hdr); - if (descr->mapinfo.num_bufs_used != 0) - cam_periph_unmapmem(ccb, &descr->mapinfo); - error = copyout(&ccb->ccb_h + 1, u_ccbh + 1, ccb_len); - if (error != 0) { - xpt_print(softc->path, - "targreturnccb - CCB copyout failed (%d)\n", error); + if (descr->mapinfo.num_bufs_used != 0) { + int error1; + + error1 = cam_periph_unmapmem(ccb, &descr->mapinfo); + if (error == 0) + error = error1; + } + if (error == 0) { + error = copyout(&ccb->ccb_h + 1, u_ccbh + 1, ccb_len); + if (error != 0) { + xpt_print(softc->path, + "targreturnccb - CCB copyout failed (%d)\n", error); + } } /* Free CCB or send back to devq. */ targfreeccb(softc, ccb); From nobody Thu Dec 28 18:35:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1HJJ5B6Zz56KVH; Thu, 28 Dec 2023 18:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1HJJ4Z1nz4Jgg; Thu, 28 Dec 2023 18:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703788544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoHMllBVngH4EbdUYizXJmIRdS34+0a42Vdt9RSo6FE=; b=MVMxymH/TNWjnXc5G1ZB81SaAqiO9ffUTOxwy7lJ4IEJnrtt3f1EME1UxWAIjvynY0rXae B1V/oe8Jj3fOKepUyoHiAcwkSnEsXzJJJKegeBIoLn4m6vKtWxbNBxyG/8YCDQjs8IIAtI 7vnmU0PltqG9AE4vvUja16/dzj7vj5RzDYmPxZl9IlPtsYjsQokrh5UGfiVBBCotCXdEUI nslX1FbWdYUoHQ6MwOZ0uMsWHDq4FChWMmjRw/yANSXtBXUCSiaI8ZvZmRNLva2vPmnJQX e2Q/ytb2W9YrPg/iWibZ7gP1oT1406sLQ+89gb/7MQeBLEiIDVE6be7OY8Sx2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703788544; a=rsa-sha256; cv=none; b=CWJtXkGlKe8wcDZNL2iCMM4ttBHEAWV/5nngDGS/YI/7BysRGnci98a0AzprIWONWTAYqe jnV9ymk39TIlNQRQ0uaiHicFxseVhQ9MpJzgJbaYyT+TGaFPIZpo2Hs1TUycMocZr4+xG8 M6lnUCiN7gTUK8v3v00Cq7Lj5WSy0bfCbTzAUia8F0fmJgD+VCOrJG8+6DhPOJZr312Qsp wuIRgP4oqt/88w0qLaW1KuAkni9SV9nC/DF3YO1GqhvgS+H/NyhXVi+e+k0xqbwdgRBQrx FmDzFYHJCv691h0wseVGAXNJ/TvOL6qMAwIbQvXVLuReM9KhzIXHan2/rLHKiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703788544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoHMllBVngH4EbdUYizXJmIRdS34+0a42Vdt9RSo6FE=; b=V8GjGWQW6iRjxXqUqRD47OvrEUkU+573bimeOAJu2qj0QGAJXiFR/ibbes2pO53qZ6rtBX HXNc8A3fELNUz86xBo8M4Gl5JtUAnSICtTdelTv3Uib7yJH4hZjrX+sFiY8i9Ix2IMyTCu MO8UP7pC1itvqyi6KwHQ6kGYJpGwP4K0burAih5os0gPX30S5KPHiYb7CskDZpChJ0RCXH Hsqkj9KuxLZNLImSjT1+JOsInZ5B39ZDkoufu7YR2+tfr27q/UEVoX+CqhHgk2SCAeucP/ Mr9mGjAE8slMM1j5S6Vh2CGBrVScZFB5FifjUMcES3hV6CxfcYWcPyh9Mt3LvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1HJJ3chmzZ4F; Thu, 28 Dec 2023 18:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSIZiiD007799; Thu, 28 Dec 2023 18:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSIZhLv007796; Thu, 28 Dec 2023 18:35:43 GMT (envelope-from git) Date: Thu, 28 Dec 2023 18:35:43 GMT Message-Id: <202312281835.3BSIZhLv007796@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: b0c6b0683635 - main - ispfw(4): Update and add firmware List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b0c6b06836351b3908ba5b2a847c89c42d1a46c3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c6b06836351b3908ba5b2a847c89c42d1a46c3 commit b0c6b06836351b3908ba5b2a847c89c42d1a46c3 Author: Joerg Pulz AuthorDate: 2023-10-27 14:02:07 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 18:31:56 +0000 ispfw(4): Update and add firmware Update 25xx firmware: version 8.8.207 Add 26xx firmware: version 8.8.231 Add 27xx firmware: version 9.12.0 Add 28xx firmware: version 9.12.1 Remove BUGS section from manpage as we now have firmware for all supported controllers. PR: 273263 MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/877 Sponsored by: Technical University of Munich --- share/man/man4/ispfw.4 | 5 +- sys/dev/ispfw/asm_2500.h | 29843 +++++++++++++------------- sys/dev/ispfw/asm_2600.h | 22384 ++++++++++++++++++++ sys/dev/ispfw/asm_2700.h | 27431 ++++++++++++++++++++++++ sys/dev/ispfw/asm_2800.h | 38311 ++++++++++++++++++++++++++++++++++ sys/dev/ispfw/ispfw.c | 45 + sys/modules/ispfw/Makefile | 3 + sys/modules/ispfw/isp_2600/Makefile | 35 + sys/modules/ispfw/isp_2700/Makefile | 35 + sys/modules/ispfw/isp_2800/Makefile | 35 + 10 files changed, 102626 insertions(+), 15501 deletions(-) diff --git a/share/man/man4/ispfw.4 b/share/man/man4/ispfw.4 index 1dedf097acfa..b2f952ce4ba1 100644 --- a/share/man/man4/ispfw.4 +++ b/share/man/man4/ispfw.4 @@ -20,7 +20,7 @@ .\" (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 April 25, 2023 +.Dd October 27, 2023 .Dt ISPFW 4 .Os .Sh NAME @@ -58,6 +58,3 @@ This driver was written by .An Matthew Jacob . Later improvement was done by .An Alexander Motin Aq Mt mav@FreeBSD.org . -.Sh BUGS -Only firmware for the 24xx and 25xx based cards is included in -.Nm . diff --git a/sys/dev/ispfw/asm_2500.h b/sys/dev/ispfw/asm_2500.h index 9ae4284e26ff..7623be0f15ea 100644 --- a/sys/dev/ispfw/asm_2500.h +++ b/sys/dev/ispfw/asm_2500.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (C) 2005-2014 by Qlogic, Inc. + * Copyright (C) 2005-2019 by Qlogic, Inc. * All rights reserved. * * Redistribution and use in source and binary forms are permitted provided @@ -31,31 +31,31 @@ * * * ******************************************************************** */ /* - * Firmware Version 8.07.00 (2017) + * Firmware Version 8.08.207 (2019) */ #ifdef ISP_2500 static const uint32_t isp_2500_risc_code[] = { - 0x0501f06b, 0x00116000, 0x00100000, 0x0000d596, - 0x00000008, 0x00000007, 0x00000000, 0x001090d5, + 0x0501f06b, 0x00115000, 0x00100000, 0x0000c8ea, + 0x00000008, 0x00000008, 0x000000cf, 0x00109095, 0x00000004, 0x00000000, 0x20434f50, 0x59524947, - 0x48542032, 0x30313720, 0x514c4f47, 0x49432043, + 0x48542032, 0x30313920, 0x514c4f47, 0x49432043, 0x4f52504f, 0x52415449, 0x4f4e2020, 0x20495350, 0x32357878, 0x20466972, 0x6d776172, 0x65202020, - 0x56657273, 0x696f6e20, 0x2020382e, 0x30372e30, - 0x30202024, 0x00000000, 0x00000000, 0x00000000, + 0x56657273, 0x696f6e20, 0x2020382e, 0x30382e32, + 0x30372020, 0x24000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00100000, - 0x0000d596, 0xffffffff, 0x00116004, 0x00020000, - 0x00001765, 0xffffffff, 0x0011776e, 0x0000c000, - 0x00000a29, 0x00ffffff, 0x00118197, 0x00008000, - 0x000006c5, 0x00ffffff, 0x0011885c, 0x0000a000, - 0x000006b3, 0x00ffffff, 0x00118f0f, 0x0000400e, + 0x0000c8ea, 0xffffffff, 0x00115004, 0x00020000, + 0x00001386, 0xffffffff, 0x0011638f, 0x0000c000, + 0x000009be, 0x00ffffff, 0x00116d4d, 0x00008000, + 0x000005e1, 0x00ffffff, 0x0011732e, 0x0000a000, + 0x00000692, 0x00ffffff, 0x001179c0, 0x0000400e, 0x00000808, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000009, 0x0000000c, - 0x0000000f, 0x00000012, 0x00000015, 0x00000000, - 0x00000000, 0x0000000f, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000006, 0x00000009, + 0x0000000c, 0x0000000f, 0x00000012, 0x00000000, + 0x00000000, 0x0000000c, 0x00000000, 0x00000000, 0x00000000, 0x00100046, 0x00100045, 0x00000000, - 0x00100046, 0x00000000, 0x00000000, 0x00100046, + 0x00000000, 0x00000000, 0x00000000, 0x00100046, 0x00100045, 0x00100042, 0x00100046, 0x00100045, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100046, 0x00000000, 0x00000000, @@ -63,332 +63,301 @@ static const uint32_t isp_2500_risc_code[] = { 0x00100046, 0x00100046, 0x00000000, 0x00100046, 0x00000000, 0x00000000, 0x00000000, 0x4203f000, 0x00021fff, 0x40000000, 0x4203e000, 0x90000100, - 0x40000000, 0x42000800, 0x00021766, 0x6002f000, + 0x40000000, 0x42000800, 0x00021387, 0x6002f000, 0x608c00e0, 0x50000000, 0x8c000500, 0x05020003, 0x42000800, 0x00020000, 0x45780800, 0x80040800, 0x82040580, 0x00022000, 0x05fe07fc, 0x4178a000, - 0x4200a800, 0x0010d596, 0x42000800, 0x00115530, - 0x40540000, 0x8004b480, 0x0569fa95, 0x0501ffd5, + 0x4200a800, 0x0010c8ea, 0x42000800, 0x00114194, + 0x40540000, 0x8004b480, 0x0561fde9, 0x0501ff57, 0x600c6020, 0x50304800, 0x8c240500, 0x0500001c, - 0x59e00016, 0x8c000504, 0x05020019, 0x0569faec, + 0x59e00016, 0x8c000504, 0x05020019, 0x0561fe40, 0x604808fa, 0x50041000, 0x82081500, 0xfffffffc, 0x90081d43, 0x90081540, 0x84244d00, 0x440c0800, 0x44080800, 0x44246000, 0x64030000, 0x4203e000, 0x70000000, 0x4203e000, 0xb0300000, 0x603ff84e, 0x59e00016, 0x8c000504, 0x05020002, 0x05fe47fd, - 0x84244d40, 0x44246000, 0x0569fad5, 0x64030000, - 0x0501fdf9, 0x4803c856, 0x0509fc18, 0x6413c020, + 0x84244d40, 0x44246000, 0x0561fe29, 0x64030000, + 0x0501fd7e, 0x4803c856, 0x0509fb82, 0x6413c020, 0x4203e000, 0x6000000f, 0x640f70e8, 0x640f78e8, 0x640da8e8, 0x59e00023, 0x8c000500, 0x0502002b, 0x42002800, 0x00100022, 0x58140800, 0x4817c857, 0x4807c857, 0x800409c0, 0x0500000a, 0x58142002, - 0x4813c857, 0x58141003, 0x4c140000, 0x0501ff94, + 0x4813c857, 0x58141003, 0x4c140000, 0x0501ff16, 0x5c002800, 0x0502003d, 0x90142c04, 0x05fdf7f3, 0x42002800, 0x00100022, 0x5814a000, 0x4817c857, 0x4853c857, 0x8050a1c0, 0x05000014, 0x4c140000, 0x5814a801, 0x4857c857, 0x40500000, 0x80540480, 0x0500000b, 0x82540480, 0x0000400e, 0x05020005, - 0x9050a404, 0x0509ffb6, 0x05020028, 0x0501f004, - 0x5814b002, 0x485bc857, 0x0569fa39, 0x5c002800, - 0x90142c04, 0x05fdf7e9, 0x050dfe35, 0x42001000, + 0x9050a404, 0x0509ff20, 0x05020028, 0x0501f004, + 0x5814b002, 0x485bc857, 0x0561fd8d, 0x5c002800, + 0x90142c04, 0x05fdf7e9, 0x050dfd9e, 0x42001000, 0x7ff481fe, 0x59e00002, 0x8c00051e, 0x05020003, 0x42001000, 0x7ff480fe, 0x50081000, 0x480b5095, 0x42002800, 0x00100022, 0x58140801, 0x4817c857, 0x4807c857, 0x800409c0, 0x05000023, 0x58142002, 0x4813c857, 0x58141003, 0x4c140000, 0x82040480, - 0x0000400e, 0x05020004, 0x0509ffc0, 0x4803c856, - 0x0501f003, 0x0501ff5a, 0x05020004, 0x5c002800, + 0x0000400e, 0x05020004, 0x0509ff2a, 0x4803c856, + 0x0501f003, 0x0501fedc, 0x05020004, 0x5c002800, 0x90142c04, 0x05fdf7ed, 0x4803c856, 0x4a03c020, 0x00004010, 0x4a03c011, 0x40100011, 0x05006000, 0x4203e000, 0x40000000, 0x59e00017, 0x60000800, - 0x8c00050a, 0x050a0e18, 0x8d0c0530, 0x050a0e0b, - 0x050a0e0d, 0x6403c017, 0x4203e000, 0x30000001, + 0x8c00050a, 0x050a0d82, 0x8d0c0530, 0x050a0d75, + 0x050a0d77, 0x6403c017, 0x4203e000, 0x30000001, 0x0501f000, 0x4803c856, 0x59e00024, 0x8c000500, - 0x050a0f5e, 0x59e00024, 0x8c00050e, 0x05000003, - 0x4a020200, 0x00003800, 0x0501ffd5, 0x4a03c014, - 0x001c001c, 0x4817c857, 0x0505f803, 0x42002000, - 0x00115530, 0x0569fa01, 0x59a800a4, 0x800001c0, + 0x050a0ec8, 0x59e00024, 0x8c00050e, 0x05000003, + 0x4a020200, 0x00003800, 0x0501ff57, 0x4a03c014, + 0x001c001c, 0x4817c857, 0x0501ff85, 0x42002000, + 0x00114194, 0x0561fd55, 0x59a800a4, 0x800001c0, 0x0500000c, 0x59a800cf, 0x8c000500, 0x05000005, 0x59a8000a, 0x82000480, 0x0013ffff, 0x05001005, - 0x59a820a4, 0x80102000, 0x59a8280a, 0x0569f9f3, - 0x0569fc18, 0x0569fc40, 0x59a8280a, 0x60800812, + 0x59a820a4, 0x80102000, 0x59a8280a, 0x0561fd47, + 0x0561ff6c, 0x0561ff94, 0x59a8280a, 0x60800812, 0x60001802, 0x4807503d, 0x480f529f, 0x900d0420, - 0x800404a0, 0x4803543e, 0x60c01000, 0x0541fadf, - 0x82040c00, 0x00115530, 0x4807500b, 0x600400de, + 0x800404a0, 0x4803543e, 0x60c01000, 0x053dfb59, + 0x82040c00, 0x00114194, 0x4807500b, 0x600400de, 0x50000000, 0x8c000502, 0x05000004, 0x59a800cf, 0x84000540, 0x480350cf, 0x4a03c810, 0x00100000, - 0x4a03c811, 0x0010d596, 0x0501ff98, 0x6447c829, + 0x4a03c811, 0x0010c8ea, 0x0501ff1a, 0x6447c829, 0x59e40001, 0x82000540, 0x0003401f, 0x4803c801, 0x4a03c802, 0x00000933, 0x59e00003, 0x82000540, 0x00240000, 0x4803c003, 0x64ffc019, 0x60701000, - 0x0501fedf, 0x4202c000, 0x00115530, 0x42017800, - 0x00115530, 0x59aab00b, 0x59aaa00b, 0x59aaa80b, + 0x0501fe61, 0x4202c000, 0x00114194, 0x42017800, + 0x00114194, 0x59aab00b, 0x59aaa00b, 0x59aaa80b, 0x59aac83d, 0x4967509e, 0x59a8000b, 0x4803500c, - 0x0505f805, 0x0549fa56, 0x0505f80e, 0x0505f89b, - 0x0509ffde, 0x59a80087, 0x8c000508, 0x05000004, - 0x050dfef8, 0x0525f96e, 0x0511f828, 0x0505f9e7, - 0x0505fff5, 0x0541fae7, 0x0501fc5a, 0x0515f873, - 0x0531fd5c, 0x052dfec9, 0x053df876, 0x050df80f, - 0x0509fe32, 0x4203e000, 0xf0000001, 0x0569fc03, - 0x6403c018, 0x4203e000, 0xa0000001, 0x59a800cf, - 0x80000540, 0x05000004, 0x4203e000, 0x20000551, - 0x0501f003, 0x4203e000, 0x20000511, 0x4203e000, - 0x50010000, 0x05006000, 0x6403c020, 0x05027019, - 0x59e00020, 0x90000582, 0x05020016, 0x4a03c020, - 0x00004000, 0x4a03c011, 0x40000010, 0x05006000, - 0x4203e000, 0x40000000, 0x4df00000, 0x4203e000, - 0x50000000, 0x59e00017, 0x60000800, 0x8c00050a, - 0x0002089a, 0x8d0c0530, 0x050a0d78, 0x000209c1, - 0x5c03e000, 0x6403c017, 0x4203e000, 0x30000001, - 0x6002d800, 0x4203e000, 0xb0600000, 0x59a800da, - 0x4003f800, 0x0001f004, 0x4df00000, 0x4203e000, - 0x50000000, 0x416c0000, 0x90000c88, 0x05021c68, - 0x0c01f803, 0x5c03e000, 0x0001f006, 0x001001bc, - 0x001001cd, 0x001002f2, 0x001001bb, 0x00100431, - 0x001001bb, 0x001001bb, 0x001005c9, 0x0501fc5c, - 0x42000800, 0x0011176f, 0x5804001e, 0x8c000500, - 0x0500000c, 0x84000500, 0x4800081e, 0x6012d800, - 0x0501fe6b, 0x49f3c857, 0x5c000800, 0x5c000000, - 0x82000540, 0x00007e20, 0x4c000000, 0x4c040000, - 0x1c01f000, 0x41780000, 0x800001c0, 0x05020039, - 0x59c4000d, 0x8c00051e, 0x0502001f, 0x59a800aa, - 0x8c000500, 0x05000012, 0x60300830, 0x050dfc45, - 0x90040560, 0x60300830, 0x4c000000, 0x050dfc46, - 0x6041d04e, 0x053dfa12, 0x5c000000, 0x8400050a, - 0x60300830, 0x050dfc40, 0x6191d000, 0x053dfa0c, - 0x59c4000d, 0x8c00051e, 0x0502000b, 0x59c40005, - 0x8c000500, 0x05020008, 0x050dffce, 0x640b50b9, - 0x64075078, 0x6012d800, 0x42000000, 0x00111f4d, - 0x0569f05c, 0x0501fe37, 0x0531f92d, 0x0500000f, - 0x0531f93d, 0x05020032, 0x5994002e, 0x82000580, - 0x0010532a, 0x05020004, 0x5994002d, 0x800001c0, - 0x0502002b, 0x59c40006, 0x82000540, 0x000000c0, - 0x48038806, 0x0501f026, 0x0531f89a, 0x916c0581, - 0x050200c5, 0x59a80042, 0x90000589, 0x050200c2, - 0x497b5040, 0x42000800, 0xffffd815, 0x0511fd51, - 0x42024800, 0x00111fa3, 0x497a4805, 0x64078893, - 0x4a038805, 0x000000f0, 0x0531f919, 0x59c41006, - 0x05020006, 0x82081540, 0x000000f1, 0x82081500, - 0xbbffffff, 0x0501f003, 0x82081540, 0x440000f1, - 0x480b8806, 0x053df9da, 0x0009f9ad, 0x0501f8ab, - 0x050000a9, 0x42000000, 0x00111e28, 0x0569f826, - 0x60c01100, 0x497b50b7, 0x0501f036, 0x0525faf3, - 0x59c400a4, 0x9000050f, 0x90000487, 0x0502109e, - 0x053df9cb, 0x59c400a3, 0x82000500, 0xffefffff, - 0x480388a3, 0x59a800c2, 0x800001c0, 0x05020003, - 0x0529f84a, 0x0501f094, 0x59a80046, 0x84000546, - 0x48035046, 0x0531f8ec, 0x59c41006, 0x05020006, - 0x82081540, 0x44000001, 0x82081500, 0xffffff0f, + 0x0501ff87, 0x0545fa7a, 0x0501ff90, 0x0505f81d, + 0x0509ff48, 0x59a80087, 0x8c000508, 0x05000004, + 0x050dfe61, 0x0521fcd1, 0x050dff91, 0x0505f965, + 0x0505ff67, 0x053dfb61, 0x0501fbde, 0x0511fed9, + 0x0531f819, 0x052df994, 0x0539f8d8, 0x0509ff79, + 0x0509fd9c, 0x4203e000, 0xf0000001, 0x0561ff57, + 0x6403c018, 0x42000000, 0x20000511, 0x4203e000, + 0xa0000001, 0x59a808cf, 0x8c040500, 0x05000002, + 0xb0000540, 0x4003e000, 0x4203e000, 0x50010000, + 0x05006000, 0x6403c020, 0x05027019, 0x59e00020, + 0x90000582, 0x05020016, 0x4a03c020, 0x00004000, + 0x4a03c011, 0x40000010, 0x05006000, 0x4203e000, + 0x40000000, 0x4df00000, 0x4203e000, 0x50000000, + 0x59e00017, 0x60000800, 0x8c00050a, 0x00020894, + 0x8d0c0530, 0x050a0ce3, 0x000209b6, 0x5c03e000, + 0x6403c017, 0x4203e000, 0x30000001, 0x6002d800, + 0x4203e000, 0xb0600000, 0x59a800d6, 0x4003f800, + 0x0001f004, 0x4df00000, 0x4203e000, 0x50000000, + 0x416c0000, 0x90000c88, 0x05021bee, 0x0c01f803, + 0x5c03e000, 0x0001f006, 0x001001bb, 0x001001cc, + 0x001002ea, 0x001001ba, 0x001003b5, 0x001001ba, + 0x001001ba, 0x0010054d, 0x0501fbe2, 0x42000800, + 0x00110a6c, 0x5804001e, 0x8c000500, 0x0500000c, + 0x84000500, 0x4800081e, 0x6012d800, 0x0501fdee, + 0x49f3c857, 0x5c000800, 0x5c000000, 0x82000540, + 0x00007e20, 0x4c000000, 0x4c040000, 0x1c01f000, + 0x41780000, 0x800001c0, 0x05020039, 0x59c4000d, + 0x8c00051e, 0x0502001f, 0x59a800aa, 0x8c000500, + 0x05000012, 0x60300830, 0x050dfbaf, 0x90040560, + 0x60300830, 0x4c000000, 0x050dfbb0, 0x6041d04e, + 0x0539fa70, 0x5c000000, 0x8400050a, 0x60300830, + 0x050dfbaa, 0x6191d000, 0x0539fa6a, 0x59c4000d, + 0x8c00051e, 0x0502000b, 0x59c40005, 0x8c000500, + 0x05020008, 0x050dff38, 0x640b50b9, 0x64075078, + 0x6012d800, 0x42000000, 0x00110f39, 0x0561f3b1, + 0x0501fdba, 0x052dfbeb, 0x0500000f, 0x052dfbfb, + 0x05020032, 0x5994002e, 0x82000580, 0x00104e7c, + 0x05020004, 0x5994002d, 0x800001c0, 0x0502002b, + 0x59c40006, 0x82000540, 0x000000c0, 0x48038806, + 0x0501f026, 0x052dfb58, 0x916c0581, 0x050200be, + 0x59a80042, 0x90000589, 0x050200bb, 0x497b5040, + 0x42000800, 0xffffd815, 0x0511fcc2, 0x42024800, + 0x00110f8f, 0x497a4805, 0x64078893, 0x4a038805, + 0x000000f0, 0x052dfbd7, 0x59c41006, 0x05020006, + 0x82081540, 0x000000f1, 0x82081500, 0xbbffffff, 0x0501f003, 0x82081540, 0x440000f1, 0x480b8806, - 0x497b9005, 0x0501f885, 0x05000083, 0x60000000, - 0x052dfe73, 0x4a038802, 0x0000ffff, 0x4a0378e4, - 0x00003000, 0x42007000, 0x00111ae4, 0x58380401, - 0x8c000508, 0x05020003, 0x4a01a8e4, 0x0000c000, - 0x42000000, 0x00111e1f, 0x0565fff3, 0x59a81040, - 0x600c0800, 0x0009f996, 0x60401100, 0x59a81809, - 0x0521fe9a, 0x59a804d1, 0x82000500, 0xffffff40, - 0x480354d1, 0x59a8024c, 0x84000518, 0x4803524c, + 0x0539fa38, 0x0005feac, 0x0501f8a4, 0x050000a2, + 0x42000000, 0x00110e14, 0x0561fb7b, 0x60c01100, + 0x497b50b7, 0x0501f036, 0x0521fe46, 0x59c400a4, + 0x9000050f, 0x90000487, 0x05021097, 0x0539fa29, + 0x59c400a3, 0x82000500, 0xffefffff, 0x480388a3, + 0x59a800c2, 0x800001c0, 0x05020003, 0x0525fb9d, + 0x0501f08d, 0x59a80046, 0x84000546, 0x48035046, + 0x052dfbaa, 0x59c41006, 0x05020006, 0x82081540, + 0x44000001, 0x82081500, 0xffffff0f, 0x0501f003, + 0x82081540, 0x440000f1, 0x480b8806, 0x497b9005, + 0x0501f87e, 0x0500007c, 0x60000000, 0x052df930, + 0x4a038802, 0x0000ffff, 0x4a0378e4, 0x00003000, + 0x42007000, 0x00110ae1, 0x58380401, 0x8c000508, + 0x05020003, 0x4a01a8e4, 0x0000c000, 0x42000000, + 0x00110e0b, 0x0561fb48, 0x59a81040, 0x600c0800, + 0x0005fe95, 0x60401100, 0x59a81809, 0x0521fa08, 0x59c40001, 0x82000500, 0x00018000, 0x82000580, 0x00018000, 0x59c400a3, 0x05020004, 0x82000540, 0x00001000, 0x0501f003, 0x82000500, 0xffffefff, 0x480388a3, 0x59c80015, 0x84000548, 0x48039015, - 0x050dfb03, 0x59a81008, 0x84081500, 0x480b5008, - 0x850e1d0a, 0x0529ff44, 0x0531f8a5, 0x05000007, + 0x050dfa74, 0x59a81008, 0x84081500, 0x480b5008, + 0x850e1d0a, 0x0529fa94, 0x052dfb6a, 0x05000007, 0x8d0c0506, 0x05000005, 0x640750b7, 0x850e1d0e, - 0x0525fbbc, 0x0501f048, 0x052df84b, 0x05000005, + 0x0521ff16, 0x0501f048, 0x0529fb9b, 0x05000005, 0x59c41002, 0x8408150c, 0x480b8802, 0x0501f017, - 0x0531f897, 0x05020005, 0x59a80049, 0x80000540, - 0x05540e81, 0x0501f011, 0x0555fe7f, 0x59a8024c, + 0x052dfb5c, 0x05020005, 0x59a80049, 0x80000540, + 0x05500d31, 0x0501f011, 0x0551fd2f, 0x59a8024c, 0x8c000506, 0x0502000d, 0x59a80049, 0x80000540, 0x05020007, 0x59a81c4c, 0x820c0580, 0x0000ffff, 0x05000006, 0x8c0c0508, 0x05000004, 0x4a03544c, - 0x0000ffff, 0x0529f8fd, 0x497b504e, 0x497b504d, - 0x497b50b8, 0x0531f87e, 0x59a8124c, 0x05020009, - 0x050df8f5, 0x80001580, 0x59a80050, 0x82000500, + 0x0000ffff, 0x0525fc57, 0x497b504e, 0x497b504d, + 0x497b50b8, 0x052dfb43, 0x59a8124c, 0x05020009, + 0x050df866, 0x80001580, 0x59a80050, 0x82000500, 0xffff0000, 0x80040d40, 0x48075050, 0x0501f005, 0x59a80050, 0x82000500, 0xffff0000, 0x48035050, 0x599c0017, 0x8c00050a, 0x05000002, 0x84081544, - 0x480b524c, 0x0531f86a, 0x05000003, 0x050df8e2, - 0x48078880, 0x60141000, 0x0009fc8e, 0x497b504e, + 0x480b524c, 0x052dfb2f, 0x05000003, 0x050df853, + 0x48078880, 0x60141000, 0x0009f98a, 0x497b504e, 0x497b5047, 0x4a035048, 0x0000ffff, 0x4a01a8e4, - 0x000000c0, 0x600ad800, 0x0531f85d, 0x05000005, + 0x000000c0, 0x600ad800, 0x052dfb22, 0x05000005, 0x59a8024c, 0x9000050c, 0x90000584, 0x05000002, - 0x0511fa80, 0x1c01f000, 0x0521ff6f, 0x05020026, + 0x0511f9ef, 0x1c01f000, 0x0521fada, 0x05020026, 0x599c0019, 0x82000500, 0x0000e000, 0x82000580, 0x00004000, 0x05020020, 0x59c40001, 0x82000d00, 0x00018000, 0x82040580, 0x00010000, 0x05000004, 0x82040580, 0x00008000, 0x05020017, 0x59a800a9, 0x90000483, 0x05001003, 0x90000541, 0x0501f012, - 0x050dfea7, 0x64075078, 0x4a035079, 0xaabbccdd, + 0x050dfe18, 0x64075078, 0x4a035079, 0xaabbccdd, 0x6413506c, 0x6403506d, 0x6012d800, 0x59a800a9, 0x80000000, 0x480350a9, 0x59a800a8, 0x82000500, - 0xfffffff8, 0x90000544, 0x480350a8, 0x0501fd40, - 0x80000580, 0x1c01f000, 0x0525f944, 0x05000051, - 0x59a8024c, 0x90000523, 0x900005a3, 0x0502004d, - 0x0525f943, 0x0500004b, 0x4a038802, 0x0000ffbf, - 0x59a804d1, 0x8c00050c, 0x05020132, 0x8c000506, - 0x0502000b, 0x8c000508, 0x0502012e, 0x84000548, - 0x480354d1, 0x0525f93b, 0x05000004, 0x417a5800, - 0x0559fd2e, 0x0501f127, 0x0501f0ee, 0x8c00050a, - 0x05020038, 0x8400054a, 0x480354d1, 0x497b504e, - 0x497b504d, 0x497b5047, 0x4a035048, 0x0000ffff, - 0x59a8024c, 0x82000500, 0xffffff7c, 0x4803524c, - 0x42024800, 0x00111fa3, 0x59240200, 0x82000500, - 0xffffff1f, 0x48024a00, 0x59a802d1, 0x5924100b, - 0x82081500, 0x00001fff, 0x80080580, 0x05000012, - 0x4d3c0000, 0x4d300000, 0x4d400000, 0x60aa8000, - 0x417a6000, 0x600a7800, 0x41780800, 0x0511fca9, - 0x5c028000, 0x5c026000, 0x5c027800, 0x59a802d1, - 0x5924080b, 0x82040d00, 0xffffe000, 0x80040540, - 0x4802480b, 0x4d300000, 0x417a6000, 0x0511fc4a, - 0x5c026000, 0x4803c856, 0x5924000c, 0x800001c0, - 0x05020006, 0x0001f81f, 0x050000f2, 0x492e480c, - 0x5924000b, 0x48025802, 0x0511fa06, 0x0501f0ed, - 0x59a80048, 0x82000580, 0x0000ffff, 0x05000003, - 0x0511fa00, 0x0501f0e7, 0x0569f837, 0x05000017, - 0x0569f83a, 0x05000008, 0x052dffd1, 0x05000006, - 0x59a8024c, 0x8c000506, 0x0500004e, 0x0529ff7a, - 0x050200dc, 0x80000580, 0x0509ff99, 0x600ed800, - 0x4a035048, 0x0000ffff, 0x4a01a8e4, 0x00000080, - 0x4a038802, 0x0000ffff, 0x850e1d02, 0x0009fbe8, - 0x0501fcb6, 0x0501f0cf, 0x59a8024c, 0x8c00050a, - 0x05020003, 0x8c000506, 0x05000037, 0x8c000500, - 0x05000035, 0x4a038802, 0x0000ffbf, 0x8c000502, - 0x05000031, 0x0525f8ce, 0x05020004, 0x599c0018, - 0x8c000516, 0x05020029, 0x59a8004d, 0x82000580, - 0x0000ffff, 0x05000020, 0x0525f8c5, 0x05000006, - 0x59a804d1, 0x8c000500, 0x05000003, 0x0511fc86, - 0x0501f008, 0x41781800, 0x0569f814, 0x05000002, - 0x60401800, 0x59a8024c, 0x8c00050a, 0x05120ade, - 0x42024800, 0x00111fa3, 0x417a4000, 0x59240200, - 0x82000500, 0x000000e0, 0x82000580, 0x000000e0, - 0x050200a4, 0x050dff77, 0x59a8024c, 0x8c000504, - 0x050200a0, 0x600c1000, 0x417a5800, 0x050dff96, - 0x0501f09c, 0x59a8024c, 0x8c00051c, 0x05020003, - 0x8c000504, 0x05fc07f8, 0x59a8004e, 0x80000540, - 0x05020094, 0x59a8024c, 0x8c000508, 0x05020017, - 0x59a80047, 0x80000540, 0x0502008e, 0x59a8024c, - 0x8c00050e, 0x0500000c, 0x8c000502, 0x0502000a, - 0x052dff77, 0x05000087, 0x82000500, 0xffffff77, - 0x4803524c, 0x4a035048, 0x0000ffff, 0x0511f999, - 0x0501f080, 0x0565ffe1, 0x0500000c, 0x0511fd27, - 0x0502007c, 0x0501f009, 0x599c1819, 0x8c0c0510, - 0x05000004, 0x8c000502, 0x05020021, 0x0501f075, - 0x8c000516, 0x05000073, 0x0529ff0f, 0x05020071, - 0x0525f87b, 0x05020004, 0x599c0018, 0x8c000516, - 0x05020003, 0x052dfb36, 0x0502006a, 0x59a80006, - 0x8c00051c, 0x05020004, 0x599c0017, 0x8c00050a, - 0x0500000f, 0x59a8b0ac, 0x417a8800, 0x0001fb0f, - 0x05020004, 0x59340200, 0x8c00051a, 0x0502005d, - 0x81468800, 0x83440580, 0x000007f0, 0x05020002, - 0x60028810, 0x8058b040, 0x05fe07f5, 0x0565ffd5, - 0x05000004, 0x4a038802, 0x0000ffbf, 0x0501f003, - 0x4a038802, 0x0000ffff, 0x42001800, 0x001117ca, - 0x0501fd75, 0x42001800, 0x001117d7, 0x0501fd72, - 0x850e1d02, 0x4a01a8e4, 0x00000080, 0x600ed800, - 0x4a035048, 0x0000ffff, 0x0501fc28, 0x80000580, - 0x0509feff, 0x497b50a9, 0x6407507b, 0x0525f848, - 0x0502000b, 0x599c0018, 0x8c000516, 0x05000008, - 0x59a804d1, 0x8c00050e, 0x05020036, 0x8400054e, - 0x480354d1, 0x0521fdc3, 0x0501f016, 0x59a81a4c, + 0xfffffff8, 0x90000544, 0x480350a8, 0x0501fcca, + 0x80000580, 0x1c01f000, 0x59a80048, 0x82000580, + 0x0000ffff, 0x05000003, 0x0511f9c1, 0x0501f0c5, + 0x0561fbe5, 0x05000017, 0x0561fbe8, 0x05000008, + 0x052dfae8, 0x05000006, 0x59a8024c, 0x8c000506, + 0x05000045, 0x0529fb1c, 0x050200ba, 0x80000580, + 0x0509ff5d, 0x600ed800, 0x4a035048, 0x0000ffff, + 0x4a01a8e4, 0x00000080, 0x4a038802, 0x0000ffff, + 0x850e1d02, 0x0009f8e4, 0x0501fc92, 0x0501f0ad, + 0x59a8024c, 0x8c00050a, 0x05020003, 0x8c000506, + 0x0500002e, 0x8c000500, 0x0500002c, 0x4a038802, + 0x0000ffbf, 0x8c000502, 0x05000028, 0x599c0018, + 0x8c000516, 0x05020022, 0x59a8004d, 0x82000580, + 0x0000ffff, 0x05000019, 0x41781800, 0x0561fbcb, + 0x05000002, 0x60401800, 0x59a8024c, 0x8c00050a, + 0x05120aa8, 0x42024800, 0x00110f8f, 0x417a4000, + 0x59240200, 0x82000500, 0x000000e0, 0x82000580, + 0x000000e0, 0x0502008b, 0x050dff43, 0x59a8024c, + 0x8c000504, 0x05020087, 0x600c1000, 0x417a5800, + 0x050dff62, 0x0501f083, 0x59a8024c, 0x8c00051c, + 0x05020003, 0x8c000504, 0x05fc07f8, 0x59a8004e, + 0x80000540, 0x0502007b, 0x59a8024c, 0x8c000508, + 0x05020017, 0x59a80047, 0x80000540, 0x05020075, + 0x59a8024c, 0x8c00050e, 0x0500000c, 0x8c000502, + 0x0502000a, 0x052dfa97, 0x0500006e, 0x82000500, + 0xffffff77, 0x4803524c, 0x4a035048, 0x0000ffff, + 0x0511f963, 0x0501f067, 0x0561fb98, 0x0500000c, + 0x0511fbf0, 0x05020063, 0x0501f009, 0x599c1819, + 0x8c0c0510, 0x05000004, 0x8c000502, 0x0502001f, + 0x0501f05c, 0x8c000516, 0x0500005a, 0x0529faba, + 0x05020058, 0x599c0018, 0x8c000516, 0x05020003, + 0x0529fee3, 0x05020053, 0x59a80006, 0x8c00051c, + 0x05020004, 0x599c0017, 0x8c00050a, 0x0500000f, + 0x59a8b0ac, 0x417a8800, 0x0001fafc, 0x05020004, + 0x59340200, 0x8c00051a, 0x05020046, 0x81468800, + 0x83440580, 0x000007f0, 0x05020002, 0x60028810, + 0x8058b040, 0x05fe07f5, 0x0561fb8e, 0x05000004, + 0x4a038802, 0x0000ffbf, 0x0501f003, 0x4a038802, + 0x0000ffff, 0x42001800, 0x00110ac7, 0x0501fd5c, + 0x42001800, 0x00110ad4, 0x0501fd59, 0x850e1d02, + 0x4a01a8e4, 0x00000080, 0x600ed800, 0x4a035048, + 0x0000ffff, 0x0501fc0f, 0x80000580, 0x0509fece, + 0x497b50a9, 0x6407507b, 0x599c0018, 0x8c000516, + 0x05000003, 0x0521f99d, 0x0501f016, 0x59a81a4c, 0x59a82044, 0x82102580, 0x0000aaaa, 0x05000004, 0x8c0c0506, 0x05020002, 0x480f544c, 0x8c0c0508, 0x05000007, 0x599c1819, 0x8c0c0510, 0x05000004, 0x61f8180f, 0x60102000, 0x0501f003, 0x61fc19ff, - 0x60182000, 0x60003000, 0x417a4000, 0x0521fd4f, - 0x052dff1d, 0x0500000a, 0x59c40006, 0x052dff08, + 0x60182000, 0x60003000, 0x417a4000, 0x0521f928, + 0x052dfa46, 0x0500000a, 0x59c40006, 0x052dfa31, 0x05000004, 0x82000500, 0xffffff0f, 0x0501f003, - 0x82000500, 0xfbffffff, 0x48038806, 0x0525f81c, - 0x0500000a, 0x59a804d1, 0x8c000500, 0x05000007, - 0x59c40801, 0x82040d40, 0x00004000, 0x48078801, - 0x64c378e4, 0x0501f006, 0x59c40801, 0x82040d00, - 0xffffbfff, 0x48078801, 0x648378e4, 0x0009fbe8, + 0x82000500, 0xfbffffff, 0x48038806, 0x0009f8e4, 0x1c01f000, 0x4c040000, 0x4c080000, 0x4c100000, - 0x59a8006d, 0x90000c84, 0x050219e1, 0x0c01f805, + 0x59a8006d, 0x90000c84, 0x050219e2, 0x0c01f805, 0x5c002000, 0x5c001000, 0x5c000800, 0x1c01f000, - 0x00100440, 0x001004da, 0x001004ff, 0x001005ad, - 0x60380938, 0x050df9db, 0x90040550, 0x82000500, - 0xfffffff7, 0x60380938, 0x050df9db, 0x59c410a3, - 0x84081518, 0x480b88a3, 0x0521fdef, 0x05020021, + 0x001003c4, 0x0010045e, 0x00100483, 0x00100531, + 0x60380938, 0x050df9c0, 0x90040550, 0x82000500, + 0xfffffff7, 0x60380938, 0x050df9c0, 0x59c410a3, + 0x84081518, 0x480b88a3, 0x0521f9ce, 0x05020021, 0x599c0019, 0x82000500, 0x0000e000, 0x82000580, 0x00004000, 0x0502001b, 0x59a808a8, 0x90040d07, 0x90040580, 0x0502000b, 0x59a8006c, 0x90000582, - 0x05000011, 0x050df91e, 0x497b506b, 0x050dfd1d, + 0x05000011, 0x050df903, 0x497b506b, 0x050dfd02, 0x640f5079, 0x640b506c, 0x64075078, 0x0501f00a, 0x90040584, 0x05020008, 0x497b2804, 0x497b2805, - 0x050dfd23, 0x64075078, 0x4a035079, 0xaabbccdd, + 0x050dfd08, 0x64075078, 0x4a035079, 0xaabbccdd, 0x6413506c, 0x59a800a8, 0x80000000, 0x480350a8, - 0x60000001, 0x0509fe82, 0x0539ff89, 0x59c408a3, - 0x82040d00, 0xfffffff7, 0x480788a3, 0x052dfeb2, - 0x0500000d, 0x052dfebc, 0x0500000b, 0x052dfeb4, - 0x0502099f, 0x59c400a3, 0x84000532, 0x84000570, - 0x480388a3, 0x0531f9e3, 0x4a038808, 0x00000208, + 0x60000001, 0x0509fe68, 0x0539f862, 0x59c408a3, + 0x82040d00, 0xfffffff7, 0x480788a3, 0x052df9eb, + 0x0500000d, 0x052df9f5, 0x0500000b, 0x052df9ed, + 0x050209a0, 0x59c400a3, 0x84000532, 0x84000570, + 0x480388a3, 0x052dfd1c, 0x4a038808, 0x00000208, 0x0501f012, 0x59c400a3, 0x84000530, 0x82000500, - 0xbf7fffff, 0x480388a3, 0x61e00801, 0x0525feb7, + 0xbf7fffff, 0x480388a3, 0x61e00801, 0x0525fa85, 0x59c400a3, 0x82000540, 0x00018000, 0x8400051c, 0x480388a3, 0x82000500, 0xfffeffff, 0x480388a3, 0x4a038808, 0x00000200, 0x59c40006, 0x82000500, 0xfbffff0e, 0x48038806, 0x497b282d, 0x497b282e, - 0x61d00803, 0x42001000, 0x001005c7, 0x0539fdaa, - 0x59c40805, 0x64078805, 0x0509ff2f, 0x05020006, - 0x60040000, 0x050df90f, 0x60040000, 0x050df8dd, - 0x0501f01e, 0x0509ff2e, 0x05020006, 0x41780000, - 0x050df908, 0x41780000, 0x050df8d6, 0x0501f017, - 0x0509ff2d, 0x05020006, 0x60080000, 0x050df901, - 0x60080000, 0x050df8cf, 0x0501f010, 0x0509ff2c, - 0x05020006, 0x600c0000, 0x050df8fa, 0x600c0000, - 0x050df8c8, 0x0501f009, 0x0509ff2b, 0x0502095c, - 0x59a80078, 0x800001c0, 0x05000004, 0x0509ff2b, - 0x6407506d, 0x0501f018, 0x050df948, 0x6407506d, - 0x052dfe61, 0x05000008, 0x052dfe6b, 0x05000006, - 0x052dfe63, 0x0502094e, 0x64075045, 0x052dfdd1, + 0x61d00803, 0x42001000, 0x0010054b, 0x0535fe88, + 0x59c40805, 0x64078805, 0x0509ff14, 0x05020006, + 0x60040000, 0x050df8f4, 0x60040000, 0x050df8c2, + 0x0501f01e, 0x0509ff13, 0x05020006, 0x41780000, + 0x050df8ed, 0x41780000, 0x050df8bb, 0x0501f017, + 0x0509ff12, 0x05020006, 0x60080000, 0x050df8e6, + 0x60080000, 0x050df8b4, 0x0501f010, 0x0509ff11, + 0x05020006, 0x600c0000, 0x050df8df, 0x600c0000, + 0x050df8ad, 0x0501f009, 0x0509ff10, 0x0502095d, + 0x59a80078, 0x800001c0, 0x05000004, 0x0509ff10, + 0x6407506d, 0x0501f018, 0x050df92d, 0x6407506d, + 0x052df99a, 0x05000008, 0x052df9a4, 0x05000006, + 0x052df99c, 0x0502094f, 0x64075045, 0x052df90a, 0x0501f00d, 0x59c400a4, 0x9000050f, 0x90000588, 0x05000003, 0x4a038805, 0x04000000, 0x59c400a3, 0x82000540, 0x0001c000, 0x480388a3, 0x84000520, 0x480388a3, 0x1c01f000, 0x0501f8e9, 0x05020003, - 0x640f506d, 0x0501f021, 0x0509ff07, 0x0502000d, - 0x59a80078, 0x800001c0, 0x0500000a, 0x0509ff07, - 0x59a80077, 0x8c00051e, 0x05000018, 0x052dfe44, - 0x05020006, 0x64075045, 0x052dfdb2, 0x0501f003, - 0x050df8f2, 0x05020011, 0x050df889, 0x640b506d, + 0x640f506d, 0x0501f021, 0x0509feec, 0x0502000d, + 0x59a80078, 0x800001c0, 0x0500000a, 0x0509feec, + 0x59a80077, 0x8c00051e, 0x05000018, 0x052df97d, + 0x05020006, 0x64075045, 0x052df8eb, 0x0501f003, + 0x050df8d7, 0x05020011, 0x050df86e, 0x640b506d, 0x497b5078, 0x59c400a3, 0x84000520, 0x480388a3, - 0x052dfe37, 0x05000009, 0x0521fd43, 0x05000007, + 0x052df970, 0x05000009, 0x0521f922, 0x05000007, 0x497b282d, 0x497b282e, 0x60b40800, 0x42001000, - 0x001005c7, 0x0539fd48, 0x1c01f000, 0x0501f8c4, + 0x0010054b, 0x0535fe26, 0x1c01f000, 0x0501f8c4, 0x05020003, 0x640f506d, 0x0501f0a9, 0x4a038805, - 0x000000f0, 0x050df8d9, 0x050200a0, 0x050dfae4, - 0x05000017, 0x050dfac9, 0x05020015, 0x050dfad2, + 0x000000f0, 0x050df8be, 0x050200a0, 0x050dfac9, + 0x05000017, 0x050dfaae, 0x05020015, 0x050dfab7, 0x0502000a, 0x59a80079, 0x90000584, 0x05fc07f2, - 0x0509fecf, 0x0502000e, 0x59a80079, 0x82000580, + 0x0509feb4, 0x0502000e, 0x59a80079, 0x82000580, 0xaabbccdd, 0x05fc07ec, 0x59a80079, 0x90000580, - 0x05fc07e9, 0x0509feb4, 0x05020005, 0x59a80079, + 0x05fc07e9, 0x0509fe99, 0x05020005, 0x59a80079, 0x82000580, 0xaabbccdd, 0x05fc07e3, 0x59a800aa, 0x8c000500, 0x0502000b, 0x59a80887, 0x8c04050c, - 0x05020008, 0x60380938, 0x050df8f6, 0x90040548, - 0x82000500, 0xffffffef, 0x60380938, 0x050df8f6, - 0x050dfabf, 0x05000032, 0x0521ff94, 0x0500000c, + 0x05020008, 0x60380938, 0x050df8db, 0x90040548, + 0x82000500, 0xffffffef, 0x60380938, 0x050df8db, + 0x050dfaa4, 0x05000032, 0x0521fb62, 0x0500000c, 0x4a03c014, 0x00200020, 0x59c40001, 0x82000500, 0x00018000, 0x82000580, 0x00018000, 0x05020026, 0x4a03c013, 0x00200020, 0x0501f025, 0x4a03c013, 0x03800300, 0x4a03c014, 0x03800380, 0x59c40001, 0x82000500, 0x00018000, 0x82000580, 0x00018000, 0x0502000c, 0x60880801, 0x61d81000, 0x60201800, - 0x0521ff7e, 0x050008ce, 0x60880801, 0x61b81000, - 0x60201800, 0x0521ff79, 0x050008c9, 0x0501f00b, - 0x60880801, 0x61d81000, 0x60201800, 0x0521ff81, - 0x050008c3, 0x60880801, 0x61b81000, 0x60201800, - 0x0521ff7c, 0x050008be, 0x4a03c014, 0x03800000, - 0x0501f003, 0x4a03c013, 0x00200000, 0x052dfdcc, + 0x0521fb4c, 0x050008cf, 0x60880801, 0x61b81000, + 0x60201800, 0x0521fb47, 0x050008ca, 0x0501f00b, + 0x60880801, 0x61d81000, 0x60201800, 0x0521fb4f, + 0x050008c4, 0x60880801, 0x61b81000, 0x60201800, + 0x0521fb4a, 0x050008bf, 0x4a03c014, 0x03800000, + 0x0501f003, 0x4a03c013, 0x00200000, 0x052df905, 0x0500003d, 0x59c400a4, 0x9000050f, 0x90000588, 0x05000021, 0x59c40005, 0x8c000534, 0x0502001e, - 0x5994002f, 0x800001c0, 0x05000007, 0x0501fadd, + 0x5994002f, 0x800001c0, 0x05000007, 0x0501fadb, 0x90000402, 0x5994082d, 0x80040480, 0x0502103c, 0x0501f004, 0x5994002d, 0x90000482, 0x05021038, - 0x052dfdbd, 0x05020036, 0x4a038805, 0x000000f0, - 0x052dfde7, 0x4a035044, 0x0000aaaa, 0x64035045, + 0x052df8f6, 0x05020036, 0x4a038805, 0x000000f0, + 0x052df920, 0x4a035044, 0x0000aaaa, 0x64035045, 0x59c408a3, 0x90040d48, 0x480788a3, 0x6006d800, 0x6403506d, 0x64078805, 0x497b282d, 0x497b282e, - 0x0501f019, 0x052dfdac, 0x05020007, 0x59a80044, + 0x0501f019, 0x052df8e5, 0x05020007, 0x59a80044, 0x82000580, 0x0000aaaa, 0x05020003, 0x4a035040, 0x00ffffff, 0x497b5044, 0x59c40006, 0x82000540, 0x04000001, 0x48038806, 0x8d0c0506, 0x05020004, @@ -396,3962 +365,3700 @@ static const uint32_t isp_2500_risc_code[] = { 0x6403506d, 0x64078805, 0x497b282d, 0x497b282e, 0x0501f00f, 0x59c40005, 0x82000500, 0x000000c0, 0x0500000b, 0x59c40006, 0x82000540, 0x000000f1, - 0x48038806, 0x05fdf7f2, 0x0509fe3f, 0x05020004, + 0x48038806, 0x05fdf7f2, 0x0509fe24, 0x05020004, 0x59a80078, 0x800001c0, 0x05fe0757, 0x497b8885, - 0x1c01f000, 0x4803c856, 0x0521fc8b, 0x05020005, - 0x050dfbf6, 0x42000000, 0x00111f4e, 0x0565fc99, - 0x60000001, 0x0509fd3a, 0x6403506d, 0x0509fe2e, + 0x1c01f000, 0x4803c856, 0x0521f86a, 0x05020005, + 0x050dfbdb, 0x42000000, 0x00110f3a, 0x0561f869, + 0x60000001, 0x0509fd20, 0x6403506d, 0x0509fe13, 0x05020009, 0x59a8006b, 0x800001c0, 0x05000004, 0x80000040, 0x4803506b, 0x05020003, 0x642b506b, - 0x64075078, 0x497b8885, 0x0501f226, 0x5994002d, + 0x64075078, 0x497b8885, 0x0501f224, 0x5994002d, 0x5994082e, 0x80040540, 0x1c01f000, 0x497b282e, 0x1c01f000, 0x4a038805, 0x000000f0, 0x1c01f000, - 0x64235096, 0x641f5097, 0x64035098, 0x4a035099, - 0x001090d5, 0x0531f8a4, 0x4a03544c, 0x0000ffff, - 0x4a035040, 0x00ffffff, 0x0555fb37, 0x4a035050, - 0x20200000, 0x4a035051, 0x88000200, 0x4a035052, - 0x00ff001f, 0x4a035053, 0x000007d0, 0x4a035054, - 0x80000a00, 0x4a035055, 0xa0000200, 0x4a035056, - 0x00ff0004, 0x4a035057, 0x00010000, 0x4a035058, - 0x80000000, 0x4a035059, 0x00000200, 0x4a03505a, - 0x00ff0000, 0x4a03505b, 0x00010000, 0x4a035062, - 0x514c4f47, 0x4a035063, 0x49432020, 0x1c01f000, - 0x4d340000, 0x4d440000, 0x417a8800, 0x4c5c0000, - 0x4178b800, 0x0001fb0f, 0x05020004, 0x0529fe76, - 0x05020002, 0x805cb800, 0x81468800, 0x83440580, - 0x000007f0, 0x05020002, 0x60028810, 0x59a800ad, - 0x81440580, 0x05fe07f4, 0x405c0800, 0x5c00b800, - 0x5c028800, 0x5c026800, 0x1c01f000, 0x4803c857, - 0x5c000000, 0x4c000000, 0x4803c857, 0x0501f808, - 0x485fc857, 0x4203e000, 0x50000000, 0x5c000000, - 0x4d780000, 0x6008b900, 0x0501f006, 0x485fc857, - 0x496fc857, 0x4203e000, 0x50000000, 0x6008b900, - 0x4c000000, 0x05006000, 0x4c040000, 0x59bc00ea, - 0x4803c857, 0x90000507, 0x90000581, 0x05020003, - 0x60000800, 0x0009f98d, 0x59b800ea, 0x4803c857, - 0x641370e8, 0x5c000800, 0x4807c025, 0x80040920, - 0x4807c026, 0x5c000000, 0x4803c023, 0x80000120, - 0x4803c024, 0x5c000000, 0x4803c857, 0x4803c021, - 0x80000120, 0x4803c022, 0x41f80000, 0x4803c029, - 0x80000120, 0x4803c02a, 0x41780800, 0x4807c027, - 0x59a800b4, 0x8c00050a, 0x05000004, 0x84040d4a, - 0x4807c857, 0x4807c027, 0x0565fd29, 0x0500004a, - 0x42000800, 0x00114029, 0x46000800, 0xfaceface, - 0x80040800, 0x4c080000, 0x4c0c0000, 0x600010f4, - 0x58080013, 0x44000800, 0x80040800, 0x58080022, - 0x44000800, 0x80040800, 0x58080023, 0x44000800, - 0x80040800, 0x58080024, 0x44000800, 0x80040800, - 0x58080025, 0x44000800, 0x80040800, 0x58080028, - 0x44000800, 0x80040800, 0x610010f4, 0x602c1800, - 0x50080000, 0x44000800, 0x80081000, 0x80040800, - 0x800c1840, 0x05fe07fb, 0x600c1800, 0x600010f6, - 0x480c1003, 0x58080005, 0x44000800, 0x80040800, - 0x800c1840, 0x05fe17fb, 0x600010f8, 0x58080002, - 0x44000800, 0x80040800, 0x58080003, 0x44000800, - 0x80040800, 0x58080020, 0x44000800, 0x80040800, - 0x58080021, 0x44000800, 0x80040800, 0x58080022, - 0x44000800, 0x80040800, 0x58080023, 0x44000800, - 0x80040800, 0x600010f6, 0x58080007, 0x44000800, - 0x80040800, 0x5808002b, 0x44000800, 0x80040800, - 0x5808007c, 0x44000800, 0x80040800, 0x5c001800, - 0x5c001000, 0x64030000, 0x485fc020, 0x905cb9c0, - 0x905cbd52, 0x485fc011, 0x4203e000, 0x40000000, - 0x6016d800, 0x59e00017, 0x60000800, 0x8c00050a, - 0x050a0889, 0x8d0c0530, 0x050a087c, 0x050a087e, - 0x6403c017, 0x4203e000, 0x30000001, 0x0501f94a, - 0x05fdf7ff, 0x600c0000, 0x0501f80c, 0x4a03c855, - 0x0001eb5a, 0x59e40001, 0x82000540, 0xff000700, - 0x4803c801, 0x42000000, 0x00111f76, 0x49780003, - 0x49780004, 0x1c01f000, 0x42000800, 0x00111f78, - 0x44000800, 0x59e40801, 0x82041500, 0x00f3c0ff, - 0x480bc801, 0x4a03c850, 0x001141d3, 0x800000d4, - 0x82002400, 0x001141d2, 0x4813c851, 0x4a03c853, - 0x00000400, 0x42000000, 0x001141d3, 0x82001400, - 0x00000c00, 0x45780000, 0x80000000, 0x80081d80, - 0x05fe07fd, 0x4807c801, 0x1c01f000, 0x42002000, - 0x00111f76, 0x59e41801, 0x58100c01, 0x82040500, - 0x00003800, 0x820c1d00, 0xffffc7ff, 0x800c1d40, - 0x480fc801, 0x1c01f000, 0x5c036000, 0x4db00000, - 0x49b3c857, 0x4803c857, 0x1c01f000, 0x4c5c0000, - 0x4c600000, 0x4c640000, 0x8d0c052a, 0x0500002f, - 0x401c0000, 0x80040d40, 0x4004b800, 0x400cc000, - 0x4018c800, 0x0501f8d3, 0x41784000, 0x42002800, - 0x00111f76, 0x58142017, 0x5814000d, 0x80100400, - 0x445c0000, 0x80102000, 0x80000000, 0x82104d00, - 0x000000ff, 0x050008a9, 0x0500001c, 0x4c000000, - 0x0501f890, 0x5c000000, 0x44080000, 0x80102000, - 0x80000000, 0x82104d00, 0x000000ff, 0x0500089f, - 0x05000012, 0x44600000, 0x80102000, 0x80000000, - 0x82104d00, 0x000000ff, 0x05000898, 0x0500000b, - 0x44640000, 0x80102000, 0x80000000, 0x82104d00, - 0x000000ff, 0x05000891, 0x05000004, 0x48102817, - 0x802041c0, 0x05060d4a, 0x5c00c800, 0x5c00c000, - 0x5c00b800, 0x1c01f000, 0x4c5c0000, 0x4c600000, - 0x4c640000, 0x42001000, 0x04000000, 0x41ccc800, - 0x42002800, 0x00111f76, 0x59a800d5, 0x82000d00, - 0x000003ff, 0x4c000000, 0x58140212, 0x0501f85d, - 0x5c000000, 0x4004b800, 0x4008c000, 0x905cbc06, - 0x8c000516, 0x05000002, 0x905cbc02, 0x0501f016, - 0x4c5c0000, 0x4c600000, 0x4c640000, 0x42002800, - 0x00111f76, 0x42001000, 0x03000000, 0x4000c800, - 0x821c0500, 0x00003c00, 0x80000114, 0x821c0d00, - 0x000003ff, 0x4c000000, 0x58140412, 0x0501f845, - 0x5c000000, 0x4004b800, 0x4008c000, 0x805cbc00, - 0x805cb840, 0x825c0480, 0x00000240, 0x05fe1edc, - 0x0501f878, 0x405c0000, 0x905cbc02, 0x80600d40, - 0x42002800, 0x00111f76, 0x41784000, 0x58142017, - 0x825c0480, 0x00000101, 0x05021028, 0x5814000d, - 0x80100400, 0x44040000, 0x80102000, 0x80000000, - 0x805cb840, 0x82104d00, 0x000000ff, 0x05000847, - 0x0500001a, 0x4c000000, 0x0501f82e, 0x5c000000, - 0x44080000, 0x80102000, 0x80000000, 0x805cb840, - 0x82104d00, 0x000000ff, 0x0500083c, 0x0500000f, - 0x50641800, 0x440c0000, 0x80000000, 0x80102000, - 0x8064c800, 0x805cb840, 0x05fe07f6, 0x82104d00, - 0x000000ff, 0x05000831, 0x05000004, 0x48102817, - 0x802041c0, 0x05060cea, 0x5c00c800, 0x5c00c000, - 0x5c00b800, 0x1c01f000, 0x82100500, 0x000000ff, - 0x805c0400, 0x82000480, 0x00000200, 0x05fc17d4, - 0x6108b800, 0x82600d40, 0x00008040, 0x05fdf7d0, - 0x800001c0, 0x05000006, 0x80041c80, 0x05001004, - 0x05000003, 0x40000800, 0x8408155c, 0x1c01f000, - 0x59a800bf, 0x800018c4, 0x800010ca, 0x800000cc, - 0x800c0400, 0x80081400, 0x59940024, 0x61a01807, - 0x800c1c80, 0x05021002, 0x61a01807, 0x5994002f, - 0x800c0400, 0x82001c80, 0x000007d0, 0x05001002, - 0x6140000f, 0x4c080000, 0x0501f8b6, 0x5c001000, - 0x80081400, 0x1c01f000, 0x4813c857, 0x5c036000, - 0x4db00000, 0x49b3c857, 0x40001800, 0x58140000, - 0x8c000502, 0x05000009, 0x58140821, 0x80040800, - 0x48042821, 0x4807c857, 0x8400054a, 0x48002800, - 0x80000580, 0x0501f00e, 0x82102500, 0x000003ff, - 0x80204000, 0x58140014, 0x80000000, 0x90000503, - 0x48002814, 0x05000003, 0x400c0000, 0x0501f002, - 0x5814000d, 0x80000540, 0x4803c857, 0x1c01f000, - 0x42002800, 0x00111f76, 0x58140000, 0x8c00050a, - 0x0500002f, 0x8c000502, 0x0502002d, 0x4c5c0000, - 0x5814b821, 0x49782821, 0x8400050a, 0x48002800, - 0x58142017, 0x4813c857, 0x5814000d, 0x80100400, - 0x41784000, 0x42000800, 0x0b000001, 0x44040000, + 0x64235096, 0x64235097, 0x4a035098, 0x000000cf, + 0x4a035099, 0x00109095, 0x052dfbdc, 0x4a03544c, + 0x0000ffff, 0x4a035040, 0x00ffffff, 0x0551fa5a, + 0x4a035050, 0x20200000, 0x4a035051, 0x88000200, + 0x4a035052, 0x00ff001f, 0x4a035053, 0x000007d0, + 0x4a035054, 0x80000a00, 0x4a035055, 0xa0000200, + 0x4a035056, 0x00ff0004, 0x4a035057, 0x00010000, + 0x4a035058, 0x80000000, 0x4a035059, 0x00000200, + 0x4a03505a, 0x00ff0000, 0x4a03505b, 0x00010000, + 0x4a035062, 0x514c4f47, 0x4a035063, 0x49432020, + 0x1c01f000, 0x4d340000, 0x4d440000, 0x417a8800, + 0x4c5c0000, 0x4178b800, 0x0001fafc, 0x05020004, + 0x0529fa39, 0x05020002, 0x805cb800, 0x81468800, + 0x83440580, 0x000007f0, 0x05020002, 0x60028810, + 0x59a800ad, 0x81440580, 0x05fe07f4, 0x405c0800, + 0x5c00b800, 0x5c028800, 0x5c026800, 0x1c01f000, + 0x4803c857, 0x5c000000, 0x4c000000, 0x4803c857, + 0x0501f808, 0x485fc857, 0x4203e000, 0x50000000, + 0x5c000000, 0x4d780000, 0x6008b900, 0x0501f006, + 0x485fc857, 0x496fc857, 0x4203e000, 0x50000000, + 0x6008b900, 0x4c000000, 0x05006000, 0x4c040000, + 0x59bc00ea, 0x4803c857, 0x90000507, 0x90000581, + 0x05020003, 0x60000800, 0x0005fe8c, 0x59b800ea, + 0x4803c857, 0x641370e8, 0x5c000800, 0x4807c025, + 0x80040920, 0x4807c026, 0x5c000000, 0x4803c023, + 0x80000120, 0x4803c024, 0x5c000000, 0x4803c857, + 0x4803c021, 0x80000120, 0x4803c022, 0x41f80000, + 0x4803c029, 0x80000120, 0x4803c02a, 0x41780800, + 0x4807c027, 0x59a800b4, 0x8c00050a, 0x05000004, + 0x84040d4a, 0x4807c857, 0x4807c027, 0x0561f8f8, + 0x0500004a, 0x42000800, 0x00112e0e, 0x46000800, + 0xfaceface, 0x80040800, 0x4c080000, 0x4c0c0000, + 0x600010f4, 0x58080013, 0x44000800, 0x80040800, + 0x58080022, 0x44000800, 0x80040800, 0x58080023, + 0x44000800, 0x80040800, 0x58080024, 0x44000800, + 0x80040800, 0x58080025, 0x44000800, 0x80040800, + 0x58080028, 0x44000800, 0x80040800, 0x610010f4, + 0x602c1800, 0x50080000, 0x44000800, 0x80081000, + 0x80040800, 0x800c1840, 0x05fe07fb, 0x600c1800, + 0x600010f6, 0x480c1003, 0x58080005, 0x44000800, + 0x80040800, 0x800c1840, 0x05fe17fb, 0x600010f8, + 0x58080002, 0x44000800, 0x80040800, 0x58080003, + 0x44000800, 0x80040800, 0x58080020, 0x44000800, + 0x80040800, 0x58080021, 0x44000800, 0x80040800, + 0x58080022, 0x44000800, 0x80040800, 0x58080023, + 0x44000800, 0x80040800, 0x600010f6, 0x58080007, + 0x44000800, 0x80040800, 0x5808002b, 0x44000800, + 0x80040800, 0x5808007c, 0x44000800, 0x80040800, + 0x5c001800, 0x5c001000, 0x64030000, 0x485fc020, + 0x905cb9c0, 0x905cbd52, 0x485fc011, 0x4203e000, + 0x40000000, 0x6016d800, 0x59e00017, 0x60000800, + 0x8c00050a, 0x050a086e, 0x8d0c0530, 0x050a0861, + 0x050a0863, 0x6403c017, 0x4203e000, 0x30000001, + 0x0501f947, 0x05fdf7ff, 0x600c0000, 0x0501f80c, + 0x4a03c855, 0x0001eb5a, 0x59e40001, 0x82000540, + 0xff000700, 0x4803c801, 0x42000000, 0x00110f62, + 0x49780003, 0x49780004, 0x1c01f000, 0x42000800, + 0x00110f64, 0x44000800, 0x59e40801, 0x82041500, + 0x00f3c0ff, 0x480bc801, 0x4a03c850, 0x00112e37, + 0x800000d4, 0x82002400, 0x00112e36, 0x4813c851, + 0x4a03c853, 0x00000400, 0x42000000, 0x00112e37, + 0x82001400, 0x00000c00, 0x45780000, 0x80000000, + 0x80081d80, 0x05fe07fd, 0x4807c801, 0x1c01f000, + 0x42002000, 0x00110f62, 0x59e41801, 0x58100c01, + 0x82040500, 0x00003800, 0x820c1d00, 0xffffc7ff, + 0x800c1d40, 0x480fc801, 0x1c01f000, 0x5c036000, + 0x4db00000, 0x49b3c857, 0x4803c857, 0x1c01f000, + 0x4c5c0000, 0x4c600000, 0x4c640000, 0x8d0c052a, + 0x0500002f, 0x401c0000, 0x80040d40, 0x4004b800, + 0x400cc000, 0x4018c800, 0x0501f8d0, 0x41784000, + 0x42002800, 0x00110f62, 0x58142017, 0x5814000d, + 0x80100400, 0x445c0000, 0x80102000, 0x80000000, + 0x82104d00, 0x000000ff, 0x050008a6, 0x0500001c, + 0x4c000000, 0x0501f88d, 0x5c000000, 0x44080000, + 0x80102000, 0x80000000, 0x82104d00, 0x000000ff, + 0x0500089c, 0x05000012, 0x44600000, 0x80102000, + 0x80000000, 0x82104d00, 0x000000ff, 0x05000895, + 0x0500000b, 0x44640000, 0x80102000, 0x80000000, + 0x82104d00, 0x000000ff, 0x0500088e, 0x05000004, + 0x48102817, 0x802041c0, 0x05060d2f, 0x5c00c800, + 0x5c00c000, 0x5c00b800, 0x1c01f000, 0x4c5c0000, + 0x4c600000, 0x4c640000, 0x42001000, 0x04000000, + 0x41ccc800, 0x42002800, 0x00110f62, 0x59a800d1, + 0x82000d00, 0x000003ff, 0x4c000000, 0x58140212, + 0x0501f85a, 0x5c000000, 0x4004b800, 0x4008c000, + 0x905cbc06, 0x0501f016, 0x4c5c0000, 0x4c600000, + 0x4c640000, 0x42002800, 0x00110f62, 0x42001000, + 0x03000000, 0x4000c800, 0x821c0500, 0x00003c00, + 0x80000114, 0x821c0d00, 0x000003ff, 0x4c000000, + 0x58140412, 0x0501f845, 0x5c000000, 0x4004b800, + 0x4008c000, 0x805cbc00, 0x805cb840, 0x825c0480, + 0x00000240, 0x05fe1edf, 0x0501f878, 0x405c0000, + 0x905cbc02, 0x80600d40, 0x42002800, 0x00110f62, + 0x41784000, 0x58142017, 0x825c0480, 0x00000101, + 0x05021028, 0x5814000d, 0x80100400, 0x44040000, + 0x80102000, 0x80000000, 0x805cb840, 0x82104d00, + 0x000000ff, 0x05000847, 0x0500001a, 0x4c000000, + 0x0501f82e, 0x5c000000, 0x44080000, 0x80102000, + 0x80000000, 0x805cb840, 0x82104d00, 0x000000ff, + 0x0500083c, 0x0500000f, 0x50641800, 0x440c0000, + 0x80000000, 0x80102000, 0x8064c800, 0x805cb840, + 0x05fe07f6, 0x82104d00, 0x000000ff, 0x05000831, + 0x05000004, 0x48102817, 0x802041c0, 0x05060cd2, + 0x5c00c800, 0x5c00c000, 0x5c00b800, 0x1c01f000, + 0x82100500, 0x000000ff, 0x805c0400, 0x82000480, + 0x00000200, 0x05fc17d4, 0x6108b800, 0x82600d40, + 0x00008040, 0x05fdf7d0, 0x800001c0, 0x05000006, + 0x80041c80, 0x05001004, 0x05000003, 0x40000800, + 0x8408155c, 0x1c01f000, 0x59a800bf, 0x800018c4, + 0x800010ca, 0x800000cc, 0x800c0400, 0x80081400, + 0x59940024, 0x61a01807, 0x800c1c80, 0x05021002, + 0x61a01807, 0x5994002f, 0x800c0400, 0x82001c80, + 0x000007d0, 0x05001002, 0x6140000f, 0x4c080000, + 0x0501f8b6, 0x5c001000, 0x80081400, 0x1c01f000, + 0x4813c857, 0x5c036000, 0x4db00000, 0x49b3c857, + 0x40001800, 0x58140000, 0x8c000502, 0x05000009, + 0x58140821, 0x80040800, 0x48042821, 0x4807c857, + 0x8400054a, 0x48002800, 0x80000580, 0x0501f00e, + 0x82102500, 0x000003ff, 0x80204000, 0x58140014, + 0x80000000, 0x90000503, 0x48002814, 0x05000003, + 0x400c0000, 0x0501f002, 0x5814000d, 0x80000540, + 0x4803c857, 0x1c01f000, 0x42002800, 0x00110f62, + 0x58140000, 0x8c00050a, 0x0500002f, 0x8c000502, + 0x0502002d, 0x4c5c0000, 0x5814b821, 0x49782821, + 0x8400050a, 0x48002800, 0x58142017, 0x4813c857, + 0x5814000d, 0x80100400, 0x41784000, 0x42000800, + 0x0b000001, 0x44040000, 0x80000000, 0x80102000, + 0x82104d00, 0x000000ff, 0x05fc0fca, 0x05fc0e4d, + 0x4c000000, 0x05fdffb1, 0x5c000000, 0x44080000, 0x80000000, 0x80102000, 0x82104d00, 0x000000ff, - 0x05fc0fca, 0x05fc0e4a, 0x4c000000, 0x05fdffb1, - 0x5c000000, 0x44080000, 0x80000000, 0x80102000, - 0x82104d00, 0x000000ff, 0x05fc0fc0, 0x05fc0e40, - 0x445c0000, 0x80000000, 0x80102000, 0x82104d00, - 0x000000ff, 0x05fc0fb9, 0x05fc0e39, 0x48102817, - 0x802041c0, 0x05060c72, 0x405c2000, 0x600c1800, - 0x60a01100, 0x0521f911, 0x5c00b800, 0x1c01f000, - 0x1c01f000, 0x59a800ba, 0x8c000530, 0x05fe07fe, - 0x4c080000, 0x60101000, 0x0501f849, 0x5c001000, - 0x4201d000, 0x00028b0a, 0x0539fbfd, 0x4c080000, - 0x60201000, 0x0501f842, 0x5c001000, 0x4201d000, - 0x00028b0a, 0x0539fbf6, 0x4c080000, 0x60401000, - 0x0501f83b, 0x5c001000, 0x4201d000, 0x00028b0a, - 0x0539fbef, 0x05fdf7e8, 0x8c00050c, 0x59a808ba, - 0x05020003, 0x84040d30, 0x0501f005, 0x84040d70, - 0x480750ba, 0x60001000, 0x0501f02d, 0x480750ba, - 0x916c0507, 0x0c01f001, 0x00100836, 0x00100828, - 0x00100828, 0x00100816, 0x0010082f, 0x00100828, - 0x00100828, 0x0010082f, 0x59c40801, 0x82040d00, - 0x00018000, 0x82040580, 0x00018000, 0x0500000a, - 0x82040580, 0x00010000, 0x05000004, 0x42001000, - 0x42004000, 0x0501f006, 0x42001000, 0x22002000, - 0x0501f003, 0x42001000, 0x12001000, 0x0501f015, - 0x59a800ba, 0x8c000534, 0x05020004, 0x42001000, - 0x74057005, 0x0501f80f, 0x1c01f000, 0x59a800ba, - 0x8c000534, 0x05020004, 0x42001000, 0x74057005, - 0x0501f008, 0x1c01f000, 0x1c01f000, 0x9008151c, - 0x82081540, 0x001c0000, 0x480bc013, 0x1c01f000, - 0x59a800ba, 0x8c000530, 0x05000002, 0x84081570, - 0x480b50ba, 0x8c000530, 0x05020005, 0x82081500, - 0x00007000, 0x80081114, 0x05fdfff1, 0x1c01f000, - 0x40001800, 0x800c18c2, 0x800c0400, 0x800c18c6, - 0x800c0400, 0x800c18c2, 0x800c0400, 0x800c190e, - 0x800c0400, 0x80000112, 0x1c01f000, 0x41780000, - 0x50041800, 0x800c0400, 0x80040800, 0x80102040, - 0x05fe07fc, 0x80080500, 0x80000540, 0x1c01f000, - 0x6002f000, 0x41780000, 0x41780800, 0x41781000, - 0x41781800, 0x41782000, 0x41782800, 0x41783000, - 0x41783800, 0x41784000, 0x41784800, 0x41785000, - 0x41785800, 0x41786000, 0x41786800, 0x41787000, - 0x41787800, 0x41788000, 0x41788800, 0x41789000, - 0x41789800, 0x4178a000, 0x4178a800, 0x4178b000, - 0x4178b800, 0x4178c000, 0x4178c800, 0x4178d000, - 0x4178d800, 0x4178e000, 0x4178e800, 0x4178f000, - 0x4178f800, 0x41790000, 0x41790800, 0x41791000, - 0x41791800, 0x41792000, 0x41792800, 0x41793000, - 0x41793800, 0x41794000, 0x41794800, 0x41795000, - 0x41795800, 0x41796000, 0x41796800, 0x41797000, - 0x41797800, 0x41798000, 0x41798800, 0x41799000, - 0x41799800, 0x4179a000, 0x6001a960, 0x60c9b17e, - 0x4179b800, 0x4179c800, 0x4179c000, 0x4179d000, - 0x4179d800, 0x4179e000, 0x4179e800, 0x4179f000, - 0x4179f800, 0x42020000, 0x001117c6, 0x417a0800, - 0x417a1000, 0x417a1800, 0x417a2000, 0x600228c2, - 0x417a3000, 0x417a3800, 0x417a4000, 0x417a4800, - 0x417a5000, 0x417a5800, 0x417a6000, 0x417a6800, - 0x417a7000, 0x417a7800, 0x417a8000, 0x417a8800, - 0x417a9000, 0x417a9800, 0x417ae800, 0x417af800, - 0x600300f8, 0x42031000, 0x00111e19, 0x607f1960, - 0x60df2160, 0x42032800, 0x00111d7d, 0x42033000, - 0x0002176f, 0x42034000, 0x0011176f, 0x42033800, - 0x0011178e, 0x42034800, 0x00111ae7, 0x42035000, - 0x00111680, 0x4a0350ac, 0x000007f0, 0x4a0350ad, - 0x00000800, 0x4a03500d, 0x0010de80, 0x42035800, - 0x0010d680, 0x41790000, 0x417b6000, 0x600368de, *** 118809 LINES SKIPPED *** From nobody Thu Dec 28 18:35:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1HJK67dQz56KLj; Thu, 28 Dec 2023 18:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1HJK5RKhz4JkQ; Thu, 28 Dec 2023 18:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703788545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q1sy1R9G6ZxHWNIlqEu1ek45+voyBu25RyyZVadMxpA=; b=FbfU+hVjej5H7+PwzGoJmirZryA827wEaM2qYKv/IWYlW2yngNR0DxFR4NYsg3L3oRjZCB oBk7B8FmUE3QECzxy404IXYgtxhw4ojkABrS6g+Am5reiw0cW/JW8vL2nTb2nbIAEa8BfI BOXIbfVjEnTf+ykq6OJaARUNGNDdONpHElNTskF931haqWuQXgvxlojd5bCDMCkZ2kmCNY fkSx1JGnPQJRtQ8zDXn501nWTs/L1YbzkVIgmtDLdp3pKqu4vrqYhfTg7zMPdBA2B+HVmf ZZrWJ4phwbpojhkRyIbyUkPHLfA8dwtRs8ggE20Wt9vx5jmemWzKrVGm7Wlizw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703788545; a=rsa-sha256; cv=none; b=AqxKtd3hmCELeD3IstLbtrYIB+B4GzhgomkbUFo3aL2IBDCFWnWx2SRD+DAzI4SRypDAr2 rSrjpHJs+5dwsaJuCYUWxAIRetRjcxEZsLSChtYywsw5y1TRCDwvx0WZ6w4RfEDN4m1UyZ 1TrKWRQDQlbCvcBqbP16fzMmJXWxI5KB0hGfg8AEy7jj2O43lzEIxZEGztM5J5nPTtW2FC C424Dw0TzFn3cT6hJEHSv2RFEqXzaKtcf5Y7wGvAKlWSulXAsANiYkZXVdCFCry76z5wVq v6wroO45vSd1ugoL0SBHtuHkW9RlblmqjaUhNX4u/62ml/6/qOEjoi/1e6M6VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703788545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q1sy1R9G6ZxHWNIlqEu1ek45+voyBu25RyyZVadMxpA=; b=hs4VV7N9xvh0Eb+8am66yoxFXbdgkCbGMVkrLXv30CTrNELIeZc7Ft8csgeCHX0U40d+0V ZscogZTV3TExLpIdBfUXfxKAAwMANDgSqxOmS1KloaknOMNwxvwlQzLIWWWS8WXAAVYc97 8T6Eg9s4ZmaDqdKGiz7PoO9HURWP4ur/xU15zz7VgAJepcs5XDToncqjpzsb84Nawyt3m3 qPNAzJTZYbx6bPPI2UCJJf03Uh9LUuU0H7RlGnKnKbXUkRM7QMmUF8dpqk4pc4sWak1A0l ThHkPZ7fQ+7R3BHYA9HQA4YIlso3Lv2NpYdnV0hKZpYgg96Sl4VDXs7Ogo/z5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1HJK4VGGzZP3; Thu, 28 Dec 2023 18:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSIZjqe007838; Thu, 28 Dec 2023 18:35:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSIZjWu007835; Thu, 28 Dec 2023 18:35:45 GMT (envelope-from git) Date: Thu, 28 Dec 2023 18:35:45 GMT Message-Id: <202312281835.3BSIZjWu007835@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: 10ed63fc06cb - main - isp(4): Rework firmware handling/loading List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 10ed63fc06cb9902cc783ce8d0086c9aa97ed1e1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10ed63fc06cb9902cc783ce8d0086c9aa97ed1e1 commit 10ed63fc06cb9902cc783ce8d0086c9aa97ed1e1 Author: Joerg Pulz AuthorDate: 2023-10-27 15:27:37 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 18:33:07 +0000 isp(4): Rework firmware handling/loading Correctly identify the active firmware in flash on adapters with primary and secondary firmware region in flash. Correctly identify the active NVRAM on adapters with primary and secondary NVRAM region in flash. Loading ispfw(4) moved from isp_pci_attach() to isp_reset(). Drop the reference to ispfw(4) after using it so one can kldunload(8) it. New isp_load_ram() function to load either ispfw(4) or flash firmware into RISC's RAM. New functions to read data from flash. The old ones will be removed later. A bunch of new helper functions to identify and validate active flash regions for firmware, auxiliary and NVRAM. Overhaul ISP_FW_* macros and make use of it when comparing firmware versions. We can handle firmware versions up to 255.255.255. Firmware load priority slightly changed: For 27xx and newer adapters: - load ispfw(4) firmware - request (active) flash firmware information - compare version numbers of ispfw(4) and flash firmware - load firmware with highest version into RISC's RAM - if loading ispfw(4) is disabled or failed - load firmware from flash - if everything else fails use MBOX_LOAD_FLASH_FIRMWARE as fallback For 26xx and older adapters nothing changed: - load ispfw(4) firmware and load it into RISC's RAM - if loading ispfw(4) is disabled or failed use MBOX_EXEC_FIRMWARE - for 26xx a preceding MBOX_LOAD_FLASH_FIRMWARE is used New read only sysctl(8)'s: dev.isp.N.fw_version_run: the firmware version actually running dev.isp.N.fw_version_ispfw: the firmware version provided by ispfw(4) dev.isp.N.fw_version_flash: the (active) firmware version in flash While here: - firmware attribute handling/parsing reworked + renamed defines from ISP2400_FW_ATTR_* to ISP_FW_ATTR_* + changed values to match new handling/parsing + added some more attributes - enable FLT support on 26xx based adapters - log level adjustments - new function return status codes (some for now, some for later use) - some minor style changes Tested and approved to work on real hardware with: - Qlogic ISP 2532 (QLogic QLE2560 8Gb FC Adapter) - Qlogic ISP 2031 (QLogic QLE2662 16Gbit 2Port FC Adapter) - Qlogic ISP 2722 (QLogic QLE2690 16Gb FC Adapter) - Qlogic ISP 2812 (QLogic QLE2772 32Gbit 2Port FC Adapter) PR: 273263 Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/877 MFC after: 1 month Sponsored by: Technical University of Munich --- share/man/man4/isp.4 | 21 +- sys/dev/isp/isp.c | 981 ++++++++++++++++++++++++++++++++++++++-------- sys/dev/isp/isp_freebsd.c | 21 +- sys/dev/isp/isp_freebsd.h | 2 +- sys/dev/isp/isp_pci.c | 35 +- sys/dev/isp/ispmbox.h | 62 +-- sys/dev/isp/ispreg.h | 11 + sys/dev/isp/ispvar.h | 127 ++++-- 8 files changed, 1002 insertions(+), 258 deletions(-) diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index 277e7775ddee..350a0ea59a64 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -24,7 +24,7 @@ .\" (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 April 25, 2023 +.Dd October 27, 2023 .Dt ISP 4 .Os .Sh NAME @@ -80,12 +80,15 @@ FC-Tape is automatically enabled when connecting controller that supports it to a target that supports it. It may be disabled using configuration and hint options described below. .Sh FIRMWARE -Firmware loading is supported if the +Firmware loading is supported and handled by +.Xr firmware 9 . +The correct firmware is either loaded automatically, if available for this +type of adapter, or by manually loading the .Xr ispfw 4 -module is loaded. +module. It is strongly recommended that you use the firmware available from .Xr ispfw 4 -as it is the most likely to have been tested with this driver. +as it is the one that most likely has been tested with this driver. .Sh HARDWARE Cards supported by the .Nm @@ -136,7 +139,7 @@ Limit on number of Message Signaled Interrupts (MSI) to be used. .It Va hint.isp. Ns Ar N Ns Va .msix Limit on number of Extended Message Signaled Interrupts (MSI-X) to be used. .It Va hint.isp. Ns Ar N Ns Va .fwload_disable -A hint value to disable loading of firmware +A hint value to disable loading of firmware provided by .Xr ispfw 4 . .It Va hint.isp. Ns Ar N Ns Va .ignore_nvram A hint value to ignore board NVRAM settings for. @@ -210,6 +213,14 @@ The default is 1 (enabled). This is the readonly World Wide Node Name value for this port. .It Va dev.isp. Ns Ar N Ns Va .wwpn This is the readonly World Wide Port Name value for this port. +.It Va dev.isp. Ns Ar N Ns Va .fw_version_flash +The readonly flash firmware version value in the active region of the +controller. +.It Va dev.isp. Ns Ar N Ns Va .fw_version_ispfw +The readonly firmware version value provided by +.Xr ispfw 4 . +.It Va dev.isp. Ns Ar N Ns Va .fw_version_run +The readonly firmware version value currently executed on the controller. .El .Sh SEE ALSO .Xr da 4 , diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 74f90b64441c..aa2f1fb74c59 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -49,7 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD$"); #include #endif #ifdef __FreeBSD__ +#include #include +#include #include #endif #ifdef __OpenBSD__ @@ -116,16 +118,31 @@ static uint16_t isp_next_handle(ispsoftc_t *, uint16_t *); static int isp_fw_state(ispsoftc_t *, int); static void isp_mboxcmd(ispsoftc_t *, mbreg_t *); +static void isp_get_flash_addrs(ispsoftc_t *); static void isp_setdfltfcparm(ispsoftc_t *, int); -static int isp_read_nvram(ispsoftc_t *, int); +static int isp_read_flash_dword(ispsoftc_t *, uint32_t, uint32_t *); +static int isp_read_flash_data(ispsoftc_t *, uint32_t *, uint32_t, uint32_t); static void isp_rd_2xxx_flash(ispsoftc_t *, uint32_t, uint32_t *); static int isp_read_flthdr_2xxx(ispsoftc_t *); static void isp_parse_flthdr_2xxx(ispsoftc_t *, uint8_t *); static int isp_read_flt_2xxx(ispsoftc_t *); static int isp_parse_flt_2xxx(ispsoftc_t *, uint8_t *); -static int isp_read_nvram_2400(ispsoftc_t *); +static int isp_read_nvram(ispsoftc_t *); static void isp_parse_nvram_2400(ispsoftc_t *, uint8_t *); +static void isp_print_image(ispsoftc_t *, char *, struct isp_image_status *); +static bool isp_check_aux_image_status_signature(struct isp_image_status *); +static bool isp_check_image_status_signature(struct isp_image_status *); +static unsigned long isp_image_status_checksum(struct isp_image_status *); +static void isp_component_status(struct active_regions *, struct isp_image_status *); +static int isp_compare_image_generation(ispsoftc_t *, struct isp_image_status *, struct isp_image_status *); +static void isp_get_aux_images(ispsoftc_t *, struct active_regions *); +static void isp_get_active_image(ispsoftc_t *, struct active_regions *); +static bool isp_risc_firmware_invalid(ispsoftc_t *, uint32_t *); +static int isp_load_ram(ispsoftc_t *, uint32_t *, uint32_t, uint32_t); +static int isp_load_risc_flash(ispsoftc_t *, uint32_t *, uint32_t); +static int isp_load_risc(ispsoftc_t *, uint32_t *); + static void isp_change_fw_state(ispsoftc_t *isp, int chan, int state) { @@ -139,6 +156,45 @@ isp_change_fw_state(ispsoftc_t *isp, int chan, int state) fcp->isp_fwstate = state; } +static void +isp_get_flash_addrs(ispsoftc_t *isp) +{ + fcparam *fcp = FCPARAM(isp, 0); + int r = 0; + + if (IS_28XX(isp)) { + fcp->flash_data_addr = ISP28XX_BASE_ADDR; + fcp->flt_region_flt = ISP28XX_FLT_ADDR; + } else if (IS_26XX(isp)) { /* 26xx and 27xx are identical */ + fcp->flash_data_addr = ISP27XX_BASE_ADDR; + fcp->flt_region_flt = ISP27XX_FLT_ADDR; + } else if (IS_25XX(isp)) { + fcp->flash_data_addr = ISP25XX_BASE_ADDR; + fcp->flt_region_flt = ISP25XX_FLT_ADDR; + } else { + fcp->flash_data_addr = ISP24XX_BASE_ADDR; + fcp->flt_region_flt = ISP24XX_FLT_ADDR; + } + fcp->flt_length = 0; + r = isp_read_flthdr_2xxx(isp); + if (r == 0) { + isp_read_flt_2xxx(isp); + } else { /* fallback to hardcoded NVRAM address */ + if (IS_28XX(isp)) { + fcp->flt_region_nvram = 0x300000; + } else if (IS_26XX(isp)) { + fcp->flash_data_addr = 0x7fe7c000; + fcp->flt_region_nvram = 0; + } else if (IS_25XX(isp)) { + fcp->flt_region_nvram = 0x48000; + } else { + fcp->flash_data_addr = 0x7ffe0000; + fcp->flt_region_nvram = 0; + } + fcp->flt_region_nvram += ISP2400_NVRAM_PORT_ADDR(isp->isp_port); + } +} + /* * Reset Hardware. * @@ -152,7 +208,7 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) { mbreg_t mbs; char *buf; - uint64_t fwt; + uint16_t fwt; uint32_t code_org, val; int loaded_fw, loops, i, dodnld = 1; const char *btype = "????"; @@ -321,41 +377,119 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) } /* - * Download new Firmware, unless requested not to do so. - * This is made slightly trickier in some cases where the - * firmware of the ROM revision is newer than the revision - * compiled into the driver. So, where we used to compare - * versions of our f/w and the ROM f/w, now we just see - * whether we have f/w at all and whether a config flag - * has disabled our download. + * Early setup DMA for the request and response queues. + * We do this now so we can use the request queue + * for dma to load firmware from. */ - if ((isp->isp_mdvec->dv_ispfw == NULL) || (isp->isp_confopts & ISP_CFG_NORELOAD)) { - dodnld = 0; - } else { - /* - * Set up DMA for the request and response queues. - * We do this now so we can use the request queue - * for dma to load firmware from. - */ - if (ISP_MBOXDMASETUP(isp) != 0) { - isp_prt(isp, ISP_LOGERR, "Cannot setup DMA"); - return; + if (ISP_MBOXDMASETUP(isp) != 0) { + isp_prt(isp, ISP_LOGERR, "Cannot setup DMA"); + return; + } + + /* + * FW load priority + * For 27xx and newer: + * Load ispfw(4) firmware unless requested not to do so. + * Request (active) flash firmware information. Compare + * version numbers of ispfw(4) and flash firmware. Load + * the highest version into RAM of the adapter. + * If loading ispfw(4) is disabled or loading it failed + * (eg. no firmware available) we just load firmware from + * flash. If this fails for whatever reason we fallback + * to let the adapter MBOX_LOAD_FLASH_FIRMWARE by itself + * followed by MBOX_EXEC_FIRMWARE and hope the best to + * get it up and running. + * + * For 26xx and older: + * Load ispfw(4) firmware unless requested not to do so + * and load it into RAM of the adapter. If loading + * ispfw(4) is disabled or loading it failed (eg. no + * firmware available) we just let the adapter + * MBOX_EXEC_FIRMWARE to start the flash firmware. + * For the 26xx a preceding MBOX_LOAD_FLASH_FIRMWARE + * is required. + */ + + fcparam *fcp = FCPARAM(isp, 0); + + /* read FLT to get flash region addresses */ + isp_get_flash_addrs(isp); + + /* set informational sysctl(8) to sane value */ + snprintf(fcp->fw_version_ispfw, sizeof(fcp->fw_version_ispfw), + "not loaded"); + snprintf(fcp->fw_version_flash, sizeof(fcp->fw_version_flash), + "not loaded"); + snprintf(fcp->fw_version_run, sizeof(fcp->fw_version_run), + "not loaded"); + + + /* Try to load ispfw(4) first */ + if (!(isp->isp_confopts & ISP_CFG_NORELOAD)) { + char fwname[32]; + snprintf(fwname, sizeof(fwname), "isp_%04x", isp->isp_did); + isp->isp_osinfo.ispfw = firmware_get(fwname); + if (isp->isp_osinfo.ispfw != NULL) { + isp->isp_mdvec->dv_ispfw = isp->isp_osinfo.ispfw->data; + const uint32_t *ispfwptr = isp->isp_mdvec->dv_ispfw; + for (i = 0; i < 4; i++) + fcp->fw_ispfwrev[i] = ispfwptr[4 + i]; + isp_prt(isp, ISP_LOGCONFIG, + "Loaded ispfw(4) firmware %s", fwname); + snprintf(fcp->fw_version_ispfw, + sizeof(fcp->fw_version_ispfw), + "%u.%u.%u", fcp->fw_ispfwrev[0], + fcp->fw_ispfwrev[1], fcp->fw_ispfwrev[2]); + isp_prt(isp, ISP_LOGCONFIG, + "Firmware revision (ispfw) %u.%u.%u (%x).", + fcp->fw_ispfwrev[0], fcp->fw_ispfwrev[1], + fcp->fw_ispfwrev[2], fcp->fw_ispfwrev[3]); + } else { + isp_prt(isp, ISP_LOGDEBUG0, + "Unable to load ispfw(4) firmware %s", fwname); } } - code_org = ISP_CODE_ORG_2400; loaded_fw = 0; + dodnld = 0; + + if (IS_27XX(isp)) { + switch (isp_load_risc(isp, 0)) { + case ISP_ABORTED: + /* download ispfw(4) as it's newer than flash */ + dodnld = 1; + break; + case ISP_SUCCESS: + /* We've loaded flash firmware */ + loaded_fw = 1; + break; + default: + /* + * Fall through to use ispfw(4) if available or + * just fall back to use MBOX_LOAD_FLASH_FIRMWARE + */ + if (isp->isp_osinfo.ispfw != NULL) + dodnld = 1; + break; + } + } else { + /* Fall through to load ispfw(4) or simply MBOX_EXEC_FIRMWARE */ + if (isp->isp_osinfo.ispfw != NULL) + dodnld = 1; + } + + code_org = ISP_CODE_ORG_2400; if (dodnld) { const uint32_t *ptr = isp->isp_mdvec->dv_ispfw; uint32_t la, wi, wl; - /* - * Keep loading until we run out of f/w. - */ + /* Keep loading until we run out of f/w. */ code_org = ptr[2]; /* 1st load address is our start addr */ for (;;) { - isp_prt(isp, ISP_LOGDEBUG0, "load 0x%x words of code at load address 0x%x", ptr[3], ptr[2]); + isp_prt(isp, ISP_LOGDEBUG2, + "Load 0x%x words of code at load address 0x%x", + ptr[3], ptr[2]); wi = 0; la = ptr[2]; @@ -368,20 +502,9 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) cp = isp->isp_rquest; for (i = 0; i < nw; i++) ISP_IOXPUT_32(isp, ptr[wi + i], &cp[i]); - MEMORYBARRIER(isp, SYNC_REQUEST, 0, ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)), -1); - MBSINIT(&mbs, MBOX_LOAD_RISC_RAM, MBLOGALL, 0); - mbs.param[1] = la; - mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); - mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); - mbs.param[4] = nw >> 16; - mbs.param[5] = nw; - mbs.param[6] = DMA_WD3(isp->isp_rquest_dma); - mbs.param[7] = DMA_WD2(isp->isp_rquest_dma); - mbs.param[8] = la >> 16; - isp_prt(isp, ISP_LOGDEBUG0, "LOAD RISC RAM %u words at load address 0x%x", nw, la); - isp_mboxcmd(isp, &mbs); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, "F/W download failed"); + if (isp_load_ram(isp, cp, la, nw) != 0) { + isp_prt(isp, ISP_LOGERR, + "Failed to load firmware fragment."); return; } la += nw; @@ -395,30 +518,32 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) ptr += ptr[3]; } loaded_fw = 1; - } else if (IS_26XX(isp)) { - isp_prt(isp, ISP_LOGDEBUG1, "loading firmware from flash"); - MBSINIT(&mbs, MBOX_LOAD_FLASH_FIRMWARE, MBLOGALL, 5000000); - mbs.ibitm = 0x01; - mbs.obitm = 0x07; - isp_mboxcmd(isp, &mbs); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, "Flash F/W load failed"); - return; - } + /* Drop reference to ispfw(4) firmware */ + if (isp->isp_osinfo.ispfw != NULL) + firmware_put(isp->isp_osinfo.ispfw, FIRMWARE_UNLOAD); } else { - isp_prt(isp, ISP_LOGDEBUG2, "skipping f/w download"); + isp_prt(isp, ISP_LOGCONFIG, + "Skipping ispfw(4) firmware download"); } - /* - * If we loaded firmware, verify its checksum - */ + /* If we loaded firmware, verify its checksum. */ if (loaded_fw) { MBSINIT(&mbs, MBOX_VERIFY_CHECKSUM, MBLOGNONE, 0); mbs.param[1] = code_org >> 16; mbs.param[2] = code_org; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, dcrc); + isp_prt(isp, ISP_LOGERR, "%s: 0x%x", dcrc, + (mbs.param[2] << 16 | mbs.param[1])); + return; + } + } else if (IS_26XX(isp)) { + isp_prt(isp, ISP_LOGCONFIG, + "Instruct RISC to load firmware from flash by itself"); + MBSINIT(&mbs, MBOX_LOAD_FLASH_FIRMWARE, MBLOGALL, 5000000); + isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, "Flash F/W load failed"); return; } } @@ -434,9 +559,27 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) mbs.param[2] = code_org; if (!IS_26XX(isp)) mbs.param[3] = loaded_fw ? 0 : 1; + mbs.param[4] = 0; + if (IS_27XX(isp)) + mbs.param[4] |= 0x08; /* NVME_ENABLE_FLAG */ + mbs.param[11] = 0; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) return; + fcp->fw_ability_mask = (mbs.param[3] << 16) | mbs.param[2]; + isp_prt(isp, ISP_LOGDEBUG0, "Firmware ability mask: 0x%x", + fcp->fw_ability_mask); + if (IS_26XX(isp)) { + fcp->max_supported_speed = mbs.param[2] & (0x1 | 0x2); + isp_prt(isp, ISP_LOGINFO, "Maximum supported speed: %s", + fcp->max_supported_speed == 0 ? "16Gbit/s" : + fcp->max_supported_speed == 1 ? "32Gbit/s" : + fcp->max_supported_speed == 2 ? "64Gbit/s" : "unknown"); + } + if (IS_28XX(isp) && (mbs.param[5] & 0x400)) { + isp_prt(isp, ISP_LOGINFO, + "HW supports EDIF (Encryption of data in flight)"); + } /* * Ask the chip for the current firmware version. @@ -452,103 +595,160 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) isp->isp_fwrev[1] = mbs.param[2]; isp->isp_fwrev[2] = mbs.param[3]; isp->isp_fwattr = mbs.param[6]; - isp->isp_fwattr |= ((uint64_t) mbs.param[15]) << 16; - if (isp->isp_fwattr & ISP2400_FW_ATTR_EXTNDED) { - isp->isp_fwattr |= - (((uint64_t) mbs.param[16]) << 32) | - (((uint64_t) mbs.param[17]) << 48); + isp->isp_fwattr_h = mbs.param[15]; + if (isp->isp_fwattr & ISP_FW_ATTR_EXTNDED) { + isp->isp_fwattr_ext[0] = mbs.param[16]; + isp->isp_fwattr_ext[1] = mbs.param[17]; } isp_prt(isp, ISP_LOGCONFIG, "Board Type %s, Chip Revision 0x%x, %s F/W Revision %d.%d.%d", - btype, isp->isp_revision, dodnld? "loaded" : "resident", isp->isp_fwrev[0], isp->isp_fwrev[1], isp->isp_fwrev[2]); + btype, isp->isp_revision, dodnld ? "loaded" : "resident", + isp->isp_fwrev[0], isp->isp_fwrev[1], isp->isp_fwrev[2]); + snprintf(fcp->fw_version_run, sizeof(fcp->fw_version_run), + "%u.%u.%u", isp->isp_fwrev[0], isp->isp_fwrev[1], + isp->isp_fwrev[2]); + if (!dodnld && !IS_26XX(isp)) + snprintf(fcp->fw_version_flash, sizeof(fcp->fw_version_flash), + "%s", fcp->fw_version_run); fwt = isp->isp_fwattr; buf = FCPARAM(isp, 0)->isp_scanscratch; - ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "Attributes:"); - if (fwt & ISP2400_FW_ATTR_CLASS2) { - fwt ^=ISP2400_FW_ATTR_CLASS2; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "FW Attributes Lower:"); + if (fwt & ISP_FW_ATTR_CLASS2) { + fwt ^= ISP_FW_ATTR_CLASS2; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s Class2", buf); } - if (fwt & ISP2400_FW_ATTR_IP) { - fwt ^=ISP2400_FW_ATTR_IP; + if (fwt & ISP_FW_ATTR_IP) { + fwt ^= ISP_FW_ATTR_IP; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s IP", buf); } - if (fwt & ISP2400_FW_ATTR_MULTIID) { - fwt ^=ISP2400_FW_ATTR_MULTIID; + if (fwt & ISP_FW_ATTR_MULTIID) { + fwt ^= ISP_FW_ATTR_MULTIID; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s MultiID", buf); } - if (fwt & ISP2400_FW_ATTR_SB2) { - fwt ^=ISP2400_FW_ATTR_SB2; + if (fwt & ISP_FW_ATTR_SB2) { + fwt ^= ISP_FW_ATTR_SB2; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s SB2", buf); } - if (fwt & ISP2400_FW_ATTR_T10CRC) { - fwt ^=ISP2400_FW_ATTR_T10CRC; + if (fwt & ISP_FW_ATTR_T10CRC) { + fwt ^= ISP_FW_ATTR_T10CRC; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s T10CRC", buf); } - if (fwt & ISP2400_FW_ATTR_VI) { - fwt ^=ISP2400_FW_ATTR_VI; + if (fwt & ISP_FW_ATTR_VI) { + fwt ^= ISP_FW_ATTR_VI; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s VI", buf); } - if (fwt & ISP2400_FW_ATTR_MQ) { - fwt ^=ISP2400_FW_ATTR_MQ; + if (fwt & ISP_FW_ATTR_MQ) { + fwt ^= ISP_FW_ATTR_MQ; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s MQ", buf); } - if (fwt & ISP2400_FW_ATTR_MSIX) { - fwt ^=ISP2400_FW_ATTR_MSIX; + if (fwt & ISP_FW_ATTR_MSIX) { + fwt ^= ISP_FW_ATTR_MSIX; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s MSIX", buf); } - if (fwt & ISP2400_FW_ATTR_FCOE) { - fwt ^=ISP2400_FW_ATTR_FCOE; + if (fwt & ISP_FW_ATTR_FCOE) { + fwt ^= ISP_FW_ATTR_FCOE; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s FCOE", buf); } - if (fwt & ISP2400_FW_ATTR_VP0) { - fwt ^= ISP2400_FW_ATTR_VP0; + if (fwt & ISP_FW_ATTR_VP0) { + fwt ^= ISP_FW_ATTR_VP0; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s VP0_Decoupling", buf); } - if (fwt & ISP2400_FW_ATTR_EXPFW) { - fwt ^= ISP2400_FW_ATTR_EXPFW; + if (fwt & ISP_FW_ATTR_EXPFW) { + fwt ^= ISP_FW_ATTR_EXPFW; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s (Experimental)", buf); } - if (fwt & ISP2400_FW_ATTR_HOTFW) { - fwt ^= ISP2400_FW_ATTR_HOTFW; + if (fwt & ISP_FW_ATTR_HOTFW) { + fwt ^= ISP_FW_ATTR_HOTFW; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s HotFW", buf); } - fwt &= ~ISP2400_FW_ATTR_EXTNDED; - if (fwt & ISP2400_FW_ATTR_EXTVP) { - fwt ^= ISP2400_FW_ATTR_EXTVP; + fwt &= ~ISP_FW_ATTR_EXTNDED; + if (fwt) { + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), + "%s (unknown 0x%04x)", buf, fwt); + } + isp_prt(isp, ISP_LOGCONFIG, "%s", buf); + + fwt = isp->isp_fwattr_h; + buf = FCPARAM(isp, 0)->isp_scanscratch; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "FW Attributes Upper:"); + if (fwt & ISP_FW_ATTR_H_EXTVP) { + fwt ^= ISP_FW_ATTR_H_EXTVP; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s ExtVP", buf); } - if (fwt & ISP2400_FW_ATTR_VN2VN) { - fwt ^= ISP2400_FW_ATTR_VN2VN; + if (fwt & ISP_FW_ATTR_H_VN2VN) { + fwt ^= ISP_FW_ATTR_H_VN2VN; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s VN2VN", buf); } - if (fwt & ISP2400_FW_ATTR_EXMOFF) { - fwt ^= ISP2400_FW_ATTR_EXMOFF; + if (fwt & ISP_FW_ATTR_H_EXMOFF) { + fwt ^= ISP_FW_ATTR_H_EXMOFF; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s EXMOFF", buf); } - if (fwt & ISP2400_FW_ATTR_NPMOFF) { - fwt ^= ISP2400_FW_ATTR_NPMOFF; + if (fwt & ISP_FW_ATTR_H_NPMOFF) { + fwt ^= ISP_FW_ATTR_H_NPMOFF; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s NPMOFF", buf); } - if (fwt & ISP2400_FW_ATTR_DIFCHOP) { - fwt ^= ISP2400_FW_ATTR_DIFCHOP; + if (fwt & ISP_FW_ATTR_H_DIFCHOP) { + fwt ^= ISP_FW_ATTR_H_DIFCHOP; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s DIFCHOP", buf); } - if (fwt & ISP2400_FW_ATTR_SRIOV) { - fwt ^= ISP2400_FW_ATTR_SRIOV; + if (fwt & ISP_FW_ATTR_H_SRIOV) { + fwt ^= ISP_FW_ATTR_H_SRIOV; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s SRIOV", buf); } - if (fwt & ISP2400_FW_ATTR_ASICTMP) { - fwt ^= ISP2400_FW_ATTR_ASICTMP; + if (fwt & ISP_FW_ATTR_H_NVME) { + fwt ^= ISP_FW_ATTR_H_NVME; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s NVMe", buf); + } + if (fwt & ISP_FW_ATTR_H_NVME_UP) { + fwt ^= ISP_FW_ATTR_H_NVME_UP; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s NVMe(updated)", buf); + } + if (fwt & (ISP_FW_ATTR_H_NVME_FB)) { + fwt ^= (ISP_FW_ATTR_H_NVME_FB); + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s NVMe(first burst)", buf); + } + if (fwt) { + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), + "%s (unknown 0x%04x)", buf, fwt); + } + isp_prt(isp, ISP_LOGCONFIG, "%s", buf); + + fwt = isp->isp_fwattr_ext[0]; + buf = FCPARAM(isp, 0)->isp_scanscratch; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "FW Ext. Attributes Lower:"); + if (fwt & ISP_FW_ATTR_E0_ASICTMP) { + fwt ^= ISP_FW_ATTR_E0_ASICTMP; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s ASICTMP", buf); } - if (fwt & ISP2400_FW_ATTR_ATIOMQ) { - fwt ^= ISP2400_FW_ATTR_ATIOMQ; + if (fwt & ISP_FW_ATTR_E0_ATIOMQ) { + fwt ^= ISP_FW_ATTR_E0_ATIOMQ; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s ATIOMQ", buf); } + if (fwt & ISP_FW_ATTR_E0_EDIF) { + fwt ^= ISP_FW_ATTR_E0_EDIF; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s EDIF", buf); + } + if (fwt & ISP_FW_ATTR_E0_SCM) { + fwt ^= ISP_FW_ATTR_E0_SCM; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s SCM", buf); + } + if (fwt & ISP_FW_ATTR_E0_NVME2) { + fwt ^= ISP_FW_ATTR_E0_NVME2; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s NVMe-2", buf); + } if (fwt) { - ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s (unknown 0x%08x%08x)", buf, - (uint32_t) (fwt >> 32), (uint32_t) fwt); + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), + "%s (unknown 0x%04x)", buf, fwt); + } + isp_prt(isp, ISP_LOGCONFIG, "%s", buf); + + fwt = isp->isp_fwattr_ext[1]; + buf = FCPARAM(isp, 0)->isp_scanscratch; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "FW Ext. Attributes Upper:"); + if (fwt) { + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), + "%s (unknown 0x%04x)", buf, fwt); } isp_prt(isp, ISP_LOGCONFIG, "%s", buf); @@ -3801,14 +4001,14 @@ static const uint32_t mbpfc[] = { ISP_FC_OPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */ ISP_FC_OPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */ ISP_FC_OPMAP_HALF(0x07, 0xff, 0x00, 0x1f), /* 0x02: MBOX_EXEC_FIRMWARE */ - ISP_FC_OPMAP(0xdf, 0x01), /* 0x03: MBOX_DUMP_RAM */ + ISP_FC_OPMAP(0x01, 0x07), /* 0x03: MBOX_LOAD_FLASH_FIRMWARE */ ISP_FC_OPMAP(0x07, 0x07), /* 0x04: MBOX_WRITE_RAM_WORD */ ISP_FC_OPMAP(0x03, 0x07), /* 0x05: MBOX_READ_RAM_WORD */ ISP_FC_OPMAP_FULL(0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff), /* 0x06: MBOX_MAILBOX_REG_TEST */ ISP_FC_OPMAP(0x07, 0x07), /* 0x07: MBOX_VERIFY_CHECKSUM */ ISP_FC_OPMAP_FULL(0x0, 0x0, 0x0, 0x01, 0x0, 0x3, 0x80, 0x7f), /* 0x08: MBOX_ABOUT_FIRMWARE */ ISP_FC_OPMAP(0xdf, 0x01), /* 0x09: MBOX_LOAD_RISC_RAM_2100 */ - ISP_FC_OPMAP(0xdf, 0x01), /* 0x0a: DUMP RAM */ + ISP_FC_OPMAP(0xdf, 0x01), /* 0x0a: MBOX_DUMP_RISC_RAM_2100 */ ISP_FC_OPMAP_HALF(0x1, 0xff, 0x0, 0x01), /* 0x0b: MBOX_LOAD_RISC_RAM */ ISP_FC_OPMAP(0x00, 0x00), /* 0x0c: */ ISP_FC_OPMAP_HALF(0x1, 0x0f, 0x0, 0x01), /* 0x0d: MBOX_WRITE_RAM_WORD_EXTENDED */ @@ -3940,14 +4140,14 @@ static const char *fc_mbcmd_names[] = { "NO-OP", /* 00h */ "LOAD RAM", "EXEC FIRMWARE", - "DUMP RAM", + "LOAD FLASH FIRMWARE", "WRITE RAM WORD", "READ RAM WORD", "MAILBOX REG TEST", "VERIFY CHECKSUM", "ABOUT FIRMWARE", "LOAD RAM (2100)", - "DUMP RAM", + "DUMP RAM (2100)", "LOAD RISC RAM", "DUMP RISC RAM", "WRITE RAM WORD EXTENDED", @@ -4084,7 +4284,7 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp) obits = ISP_FC_OBITS(opcode); if (cname == NULL) { cname = tname; - ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode); + ISP_SNPRINTF(tname, sizeof(tname), "opcode %x", opcode); } isp_prt(isp, ISP_LOGDEBUG3, "Mailbox Command '%s'", cname); @@ -4219,7 +4419,7 @@ out: xname = "TIMEOUT"; break; default: - ISP_SNPRINTF(mname, sizeof mname, "error 0x%x", mbp->param[0]); + ISP_SNPRINTF(mname, sizeof(mname), "error 0x%x", mbp->param[0]); xname = mname; break; } @@ -4279,7 +4479,7 @@ isp_setdfltfcparm(ispsoftc_t *isp, int chan) * Give a couple of tries at reading NVRAM. */ for (i = 0; i < 2; i++) { - j = isp_read_nvram(isp, chan); + j = isp_read_nvram(isp); if (j == 0) { break; } @@ -4336,50 +4536,49 @@ cleanup: /* * NVRAM Routines */ -static int -isp_read_nvram(ispsoftc_t *isp, int bus) +static inline uint32_t +flash_data_addr(ispsoftc_t *isp, uint32_t faddr) { fcparam *fcp = FCPARAM(isp, 0); - int r = 0; - if (isp->isp_type != ISP_HA_FC_2600) { - if (IS_28XX(isp)) { - fcp->flash_data_addr = ISP28XX_BASE_ADDR; - fcp->flt_region_flt = ISP28XX_FLT_ADDR; - } else if (IS_27XX(isp)) { - fcp->flash_data_addr = ISP27XX_BASE_ADDR; - fcp->flt_region_flt = ISP27XX_FLT_ADDR; - } else if (IS_25XX(isp)) { - fcp->flash_data_addr = ISP25XX_BASE_ADDR; - fcp->flt_region_flt = ISP25XX_FLT_ADDR; - } else { - fcp->flash_data_addr = ISP24XX_BASE_ADDR; - fcp->flt_region_flt = ISP24XX_FLT_ADDR; - } - fcp->flt_length = 0; - r = isp_read_flthdr_2xxx(isp); - if (r == 0) { - isp_read_flt_2xxx(isp); - } else { /* fallback to hardcoded NVRAM address */ - if (IS_28XX(isp)) { - fcp->flt_region_nvram = 0x300000; - } else if (IS_27XX(isp)) { - fcp->flash_data_addr = 0x7fe7c000; - fcp->flt_region_nvram = 0; - } else if (IS_25XX(isp)) { - fcp->flt_region_nvram = 0x48000; - } else { - fcp->flash_data_addr = 0x7ffe0000; - fcp->flt_region_nvram = 0; - } - fcp->flt_region_nvram += ISP2400_NVRAM_PORT_ADDR(isp->isp_port); + return (fcp->flash_data_addr + faddr); +} + +static int +isp_read_flash_dword(ispsoftc_t *isp, uint32_t addr, uint32_t *data) +{ + int loops = 0; + + ISP_WRITE(isp, BIU2400_FLASH_ADDR, addr & ~0x80000000); + for (loops = 0; loops < 30000; loops++) { + if (ISP_READ(isp, BIU2400_FLASH_ADDR & 0x80000000)) { + *data = ISP_READ(isp, BIU2400_FLASH_DATA); + return (ISP_SUCCESS); } - } else { - fcp->flash_data_addr = 0x7fe7c000; - fcp->flt_region_nvram = 0; - fcp->flt_region_nvram += ISP2400_NVRAM_PORT_ADDR(isp->isp_port); + ISP_DELAY(10); } - return (isp_read_nvram_2400(isp)); + isp_prt(isp, ISP_LOGERR, + "Flash read dword at 0x%x timeout.", addr); + *data = 0xffffffff; + return (ISP_FUNCTION_TIMEOUT); +} + +static int +isp_read_flash_data(ispsoftc_t *isp, uint32_t *dwptr, uint32_t faddr, uint32_t dwords) +{ + int loops = 0; + int rval = ISP_SUCCESS; + + /* Dword reads to flash. */ + faddr = flash_data_addr(isp, faddr); + for (loops = 0; loops < dwords; loops++, faddr++, dwptr++) { + rval = isp_read_flash_dword(isp, faddr, dwptr); + if (rval != ISP_SUCCESS) + break; + htole32(*((uint32_t *)(dwptr))); + } + + return (rval); } static void @@ -4388,22 +4587,19 @@ isp_rd_2xxx_flash(ispsoftc_t *isp, uint32_t addr, uint32_t *rp) fcparam *fcp = FCPARAM(isp, 0); int loops = 0; uint32_t base = fcp->flash_data_addr; - uint32_t tmp = 0; - ISP_WRITE(isp, BIU2400_FLASH_ADDR, base + addr); - for (loops = 0; loops < 5000; loops++) { + ISP_WRITE(isp, BIU2400_FLASH_ADDR, (base + addr) & ~0x80000000); + for (loops = 0; loops < 30000; loops++) { ISP_DELAY(10); - tmp = ISP_READ(isp, BIU2400_FLASH_ADDR); - if ((tmp & (1U << 31)) != 0) { - break; + if (ISP_READ(isp, BIU2400_FLASH_ADDR & 0x80000000)) { + *rp = ISP_READ(isp, BIU2400_FLASH_DATA); + ISP_SWIZZLE_NVRAM_LONG(isp, rp); + return; } } - if (tmp & (1U << 31)) { - *rp = ISP_READ(isp, BIU2400_FLASH_DATA); - ISP_SWIZZLE_NVRAM_LONG(isp, rp); - } else { - *rp = 0xffffffff; - } + isp_prt(isp, ISP_LOGERR, + "Flash read dword at 0x%x timeout.", (base + addr)); + *rp = 0xffffffff; } static int @@ -4418,8 +4614,7 @@ isp_read_flthdr_2xxx(ispsoftc_t *isp) addr = fcp->flt_region_flt; dptr = (uint32_t *) flthdr_data; - isp_prt(isp, ISP_LOGDEBUG0, - "FLTL[DEF]: 0x%x", addr); + isp_prt(isp, ISP_LOGDEBUG0, "FLTL[DEF]: 0x%x", addr); for (lwrds = 0; lwrds < FLT_HEADER_SIZE >> 2; lwrds++) { isp_rd_2xxx_flash(isp, addr++, dptr++); } @@ -4651,8 +4846,8 @@ isp_parse_flt_2xxx(ispsoftc_t *isp, uint8_t *flt_data) break; } } - isp_prt(isp, ISP_LOGDEBUG0, - "FLT[FLT]: boot=0x%x fw=0x%x vpd_nvram=0x%x vpd=0x%x nvram 0x%x " + isp_prt(isp, ISP_LOGCONFIG, + "FLT[FLT]: boot=0x%x fw=0x%x vpd_nvram=0x%x vpd=0x%x nvram=0x%x " "fdt=0x%x flt=0x%x npiv=0x%x fcp_prif_cfg=0x%x", fcp->flt_region_boot, fcp->flt_region_fw, fcp->flt_region_vpd_nvram, fcp->flt_region_vpd, fcp->flt_region_nvram, fcp->flt_region_fdt, @@ -4662,15 +4857,465 @@ isp_parse_flt_2xxx(ispsoftc_t *isp, uint8_t *flt_data) return (0); } +static void +isp_print_image(ispsoftc_t *isp, char *name, struct isp_image_status *image_status) +{ + isp_prt(isp, ISP_LOGDEBUG0, + "%s %s: mask=0x%02x gen=0x%04x ver=%u.%u map=0x%01x sum=0x%08x sig=0x%08x", + name, "status", + image_status->image_status_mask, + le16toh(image_status->generation), + image_status->ver_major, + image_status->ver_minor, + image_status->bitmap, + le32toh(image_status->checksum), + le32toh(image_status->signature)); +} + +static bool +isp_check_aux_image_status_signature(struct isp_image_status *image_status) +{ + unsigned long signature = le32toh(image_status->signature); + + return (signature != ISP28XX_AUX_IMG_STATUS_SIGN); +} + +static bool +isp_check_image_status_signature(struct isp_image_status *image_status) +{ + unsigned long signature = le32toh(image_status->signature); + + return ((signature != ISP27XX_IMG_STATUS_SIGN) && + (signature != ISP28XX_IMG_STATUS_SIGN)); +} + +static unsigned long +isp_image_status_checksum(struct isp_image_status *image_status) +{ + uint32_t *p = (uint32_t *)image_status; + unsigned int n = sizeof(*image_status) / sizeof(*p); + uint32_t sum = 0; + + for ( ; n--; p++) + sum += le32toh(*((uint32_t *)(p))); + + return (sum); +} + +static inline unsigned int +isp_component_bitmask(struct isp_image_status *aux, unsigned int bitmask) +{ + return (aux->bitmap & bitmask ? + ISP27XX_SECONDARY_IMAGE : ISP27XX_PRIMARY_IMAGE); +} + +static void +isp_component_status(struct active_regions *active_regions, struct isp_image_status *aux) +{ + active_regions->aux.board_config = + isp_component_bitmask(aux, ISP28XX_AUX_IMG_BOARD_CONFIG); + + active_regions->aux.vpd_nvram = + isp_component_bitmask(aux, ISP28XX_AUX_IMG_VPD_NVRAM); + + active_regions->aux.npiv_config_0_1 = + isp_component_bitmask(aux, ISP28XX_AUX_IMG_NPIV_CONFIG_0_1); + + active_regions->aux.npiv_config_2_3 = + isp_component_bitmask(aux, ISP28XX_AUX_IMG_NPIV_CONFIG_2_3); + + active_regions->aux.nvme_params = + isp_component_bitmask(aux, ISP28XX_AUX_IMG_NVME_PARAMS); +} + +static int +isp_compare_image_generation(ispsoftc_t *isp, + struct isp_image_status *pri_image_status, + struct isp_image_status *sec_image_status) +{ + /* calculate generation delta as uint16 (this accounts for wrap) */ + int16_t delta = + le16toh(pri_image_status->generation) - + le16toh(sec_image_status->generation); + + isp_prt(isp, ISP_LOGDEBUG0, "generation delta = %d", delta); + + return (delta); +} + +static void +isp_get_aux_images(ispsoftc_t *isp, struct active_regions *active_regions) *** 879 LINES SKIPPED *** From nobody Thu Dec 28 19:18:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1JFN4SW1z54Qd3; Thu, 28 Dec 2023 19:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1JFN3pZVz4PLD; Thu, 28 Dec 2023 19:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703791096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35ywUkfjVPECGmAVtsaillJlESE6O9gpwooA9QWIzb4=; b=qlnZk447EiQphHfHozCV0rA1bLOXNFlCvHwUBuXdJYwvJpOCIp3VhfZAGpWS3RGEcOEDiT /1bydhzyuqDNtkukY9MvHBuLR/YxO5Q44dWzpiwK5npYrP4dtv9XdWmVb9hZi4xPZV0U2E lJqY68Nug64Z4kJtgyxYThSNc/DImtN5YCunbZ5I4FlOpM498y538ZZsa9Bq6QZQrbvhh1 xSGwOLgG8RrWATi+muuNbkltn/PuUhez00eNxaoTYQsSoN6uYOtYzJHy6j50cth3yoqNJY 2u4FAsysKw1HRApiuvh89Dk0TEv32GxRWpOYb3i0nyuPoH2hiGIPb5fz4Opayw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703791096; a=rsa-sha256; cv=none; b=yP/LPowIoVTqcJ/bhTDERdGURhgvxWa0hcZC++JVH+1Riw8Iam5p+WWm0OYIht+zu08wVU STDXlXbfSZxOGJ8aebXViBSjW1OrsAWqUnCzHu8SfIkYzI7EeuPATbLq4qedNWmjH0HYfx eAw15+wsz4vheso/NkgICqVAn39CsyP/s/qvD64YyM68neGiOLbVsHvh7NxH1yKPXA9B06 7eodFp4xPP0hrqlwJ9dO8E/nE5yV1K+p3yobCV90VuzRMl07aROguODxubqeiKvIDm/NU7 RD2FtgXqhNTDHhMeSt2JxMsmMp0p5Wq3wzfDFsMlgR4eLenh5dqEF9NG0D7U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703791096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35ywUkfjVPECGmAVtsaillJlESE6O9gpwooA9QWIzb4=; b=KKizz/KXHSflKGKNTQG1amUl2engT35hEGXevvhKvd1YJhaJUKO3KmUzeAiGvUQV6v8C83 Ue2iP66MeMcU3Jya3QlOuF+srHC/AM2CiMAZW88Tpy3vPNF/7x10v0NnBc84hTRIuCVoNs LjuZNNwWJOSJxWaSOZStLZjR22l8WLcdben8VxXZRy6jCA0XPzflBioZTu3CM0VuvDvqo7 jn+OW5Irx2XTyvwRQtJeL1KpC+Zrcvwq+/+wr3B8sC1qLQ3LG6R6KPpoRSDnfNVwZ/BFIQ O1aNjJEJuV39FSKKUKQpgG/gdbX2newQd2ydC9lFNxDAwsQy8nCivywepOylWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1JFN2ryxzbKv; Thu, 28 Dec 2023 19:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSJIGW4075964; Thu, 28 Dec 2023 19:18:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSJIGMS075961; Thu, 28 Dec 2023 19:18:16 GMT (envelope-from git) Date: Thu, 28 Dec 2023 19:18:16 GMT Message-Id: <202312281918.3BSJIGMS075961@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: 854e1fd69218 - main - mbuf.9: Document mtodo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 854e1fd692185749fea092b1431efd4a8e09c2eb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=854e1fd692185749fea092b1431efd4a8e09c2eb commit 854e1fd692185749fea092b1431efd4a8e09c2eb Author: John Baldwin AuthorDate: 2023-12-28 19:17:22 +0000 Commit: John Baldwin CommitDate: 2023-12-28 19:17:45 +0000 mbuf.9: Document mtodo mtodo() accepts an mbuf and offset and returns a void * pointer to the requested offset into the mbuf's associated data. Similar to mtod(), no bounds checking is performed. Reviewed by: imp, markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43215 --- share/man/man9/Makefile | 1 + share/man/man9/mbuf.9 | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 81de035defb9..6bc814334f5d 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1516,6 +1516,7 @@ MLINKS+=\ mbuf.9 m_pullup.9 \ mbuf.9 m_split.9 \ mbuf.9 mtod.9 \ + mbuf.9 mtodo.9 \ mbuf.9 M_TRAILINGSPACE.9 \ mbuf.9 m_unshare.9 \ mbuf.9 M_WRITABLE.9 diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index 7c69ef86f63f..0b03d697b8bf 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 8, 2021 +.Dd December 28, 2023 .Dt MBUF 9 .Os .\" @@ -52,7 +52,10 @@ .Fc .\" .Ss Mbuf utility macros +.Ft type .Fn mtod "struct mbuf *mbuf" "type" +.Ft void * +.Fn mtodo "struct mbuf *mbuf" "offset" .Fn M_ALIGN "struct mbuf *mbuf" "u_int len" .Fn MH_ALIGN "struct mbuf *mbuf" "u_int len" .Ft int @@ -394,6 +397,14 @@ It is advisable to ensure that there is enough contiguous data in See .Fn m_pullup for details. +.It Fn mtodo mbuf offset +Return a data pointer at an offset (in bytes) into the data attached to +.Fa mbuf . +Returns a +.Ft void * +pointer . +.Sy Note : +The caller must ensure that the offset is in bounds of the attached data. .It Fn MGET mbuf how type Allocate an .Vt mbuf @@ -773,7 +784,9 @@ in the are contiguous and lay in the data area of .Fa mbuf , so they are accessible with -.Fn mtod mbuf type . +.Fn mtod +or +.Fn mtodo . .Fa len must be smaller than, or equal to, the size of an .Vt mbuf cluster . @@ -787,12 +800,13 @@ to the data contained in the returned mbuf is stored in If .Fa offsetp is NULL, the region may be accessed using -.Fn mtod mbuf type . +.Fn mtod mbuf type +or +.Fn mtodo mbuf 0 . If .Fa offsetp is non-NULL, the region may be accessed using -.Fn mtod mbuf uint8_t -+ *offsetp. +.Fn mtodo mbuf *offsetp . The region of the mbuf chain between its beginning and .Fa offset is not modified, therefore it is safe to hold pointers to data within From nobody Thu Dec 28 19:18:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1JFP6JsGz54QY5; Thu, 28 Dec 2023 19:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1JFP4sgJz4PQP; Thu, 28 Dec 2023 19:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703791097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6Si97if/6XFjxv+NcsSWszPwbKETzMU3415iMR5F98=; b=ReR0S6IvQSSDP9ImuXdwc4Ekg+Jm+FXs3X4KnqplxBOvFVbs/e7Vz4+mcczRlnlbSo6fjv TnbJjEdPDlBynOcxY8ydvpHmYL/DN/yGTQVjMzN8cCpCriwHWJXrg9KpBTP7imrA+x8Siq 6Qbynq2aB+/aeKrb8R0GVfveOUtZ8RsFDATUVUo3cUfqKENI9mAa3ZnwPHAkD/+dNiq5bW QYrtKiXoIVbLe0R8AwYm4ihzmM1/rELiHAML3O7opnMrur0AxidKloJfnIHHmtw2KgdgiV z8DLStptZLZkboTjWs9awCKkhv1qcz+BlGoeFMURJcDRUq+muGAsbtFGeAza2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703791097; a=rsa-sha256; cv=none; b=qRdDuwHvdgvKf65orL/BXAP596375MqH/QeTm7+AzVW5BcuF9GbOOPPPqa9sFIUsBXtazy K7+liFodJJ7LlaT/qDFGTE+ecK6jCUHJCD9a3/tD2I+MPyBzK40VkJYxAlXp9QP502A781 s1LvmbMSK9OpvaUbXJ2IhZvWGXoWFecJ9YHEJOZg2UzHC3gYdtS+OmVyuqY3fw1eehIivN EAK887VCQUvUQsuXt685H5EhgLia53sNQZmvnmwr4hslXg4rXe0nVvINQBK2DbqK0IA1OL nZJ71it3KhCHnaoXMnG1EHVNiiYcmUJnNpVRVA5b05FFDATVqN5+GZfxuTofyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703791097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6Si97if/6XFjxv+NcsSWszPwbKETzMU3415iMR5F98=; b=OnBSZoqBOA3MoN1at1po1l/gFBx9r1vXSFIbrn/z9atWe5EX4WliX+2qkMMFJZNALztWv2 XPNBDi05WWQC1an2qQtHUrDeBfgAwrNjy5YwPhtKqKNpi5lzYKvpTGL4huU6995JQsR7Sy vWzoXzOQlqp9OHF2H1Ql7Ihrv04HLrtfxCSNVkts4UXbUljLwd/nF18HIkBjHwIy2IG7br bupoXYYBF38KWhb4eEMeGIvQ8/EIZakFXJ8FzFmvUTQQ1DpBx3muNgIrkzAOYofTawZQQc z1GuZwK5wEH0HlPkhhyUF684f9X8yjWw13Vpm9mhrzn33vkS5UvqQQ5oWlOgpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1JFP3xkLzbKw; Thu, 28 Dec 2023 19:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSJIHn9076012; Thu, 28 Dec 2023 19:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSJIHIq076009; Thu, 28 Dec 2023 19:18:17 GMT (envelope-from git) Date: Thu, 28 Dec 2023 19:18:17 GMT Message-Id: <202312281918.3BSJIHIq076009@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: f7d5900aa063 - main - sys: Style fix for M_EXT | M_EXTPG List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f7d5900aa063c6e9d19e6372ba981fc76aa326a2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f7d5900aa063c6e9d19e6372ba981fc76aa326a2 commit f7d5900aa063c6e9d19e6372ba981fc76aa326a2 Author: John Baldwin AuthorDate: 2023-12-28 19:17:59 +0000 Commit: John Baldwin CommitDate: 2023-12-28 19:17:59 +0000 sys: Style fix for M_EXT | M_EXTPG Add a space around the | operator in places testing for either M_EXT or M_EXTPG. Reviewed by: imp, glebius Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43216 --- sys/kern/uipc_mbuf.c | 18 +++++++++--------- sys/netinet/tcp_output.c | 2 +- sys/netinet/tcp_pcap.c | 2 +- sys/netinet/tcp_stacks/rack.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 61af96d670d6..5125ad902c34 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -236,10 +236,10 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) { volatile u_int *refcnt; - KASSERT(m->m_flags & (M_EXT|M_EXTPG), - ("%s: M_EXT|M_EXTPG not set on %p", __func__, m)); - KASSERT(!(n->m_flags & (M_EXT|M_EXTPG)), - ("%s: M_EXT|M_EXTPG set on %p", __func__, n)); + KASSERT(m->m_flags & (M_EXT | M_EXTPG), + ("%s: M_EXT | M_EXTPG not set on %p", __func__, m)); + KASSERT(!(n->m_flags & (M_EXT | M_EXTPG)), + ("%s: M_EXT | M_EXTPG set on %p", __func__, n)); /* * Cache access optimization. @@ -569,7 +569,7 @@ m_copym(struct mbuf *m, int off0, int len, int wait) copyhdr = 0; } n->m_len = min(len, m->m_len - off); - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + off; mb_dupcl(n, m); } else @@ -611,7 +611,7 @@ m_copypacket(struct mbuf *m, int how) if (!m_dup_pkthdr(n, m, how)) goto nospace; n->m_len = m->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data; mb_dupcl(n, m); } else { @@ -629,7 +629,7 @@ m_copypacket(struct mbuf *m, int how) n = n->m_next; n->m_len = m->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data; mb_dupcl(n, m); } else { @@ -1070,7 +1070,7 @@ m_split(struct mbuf *m0, int len0, int wait) n->m_pkthdr.rcvif = m0->m_pkthdr.rcvif; n->m_pkthdr.len = m0->m_pkthdr.len - len0; m0->m_pkthdr.len = len0; - if (m->m_flags & (M_EXT|M_EXTPG)) + if (m->m_flags & (M_EXT | M_EXTPG)) goto extpacket; if (remain > MHLEN) { /* m can't be the lead packet */ @@ -1096,7 +1096,7 @@ m_split(struct mbuf *m0, int len0, int wait) M_ALIGN(n, remain); } extpacket: - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + len; mb_dupcl(n, m); } else { diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 6016aa3b6ddc..8d863ffcf432 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -2087,7 +2087,7 @@ tcp_m_copym(struct mbuf *m, int32_t off0, int32_t *plen, } n->m_len = mlen; len_cp += n->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + off; mb_dupcl(n, m); } else diff --git a/sys/netinet/tcp_pcap.c b/sys/netinet/tcp_pcap.c index 49ab87d814b5..f26287bd7f03 100644 --- a/sys/netinet/tcp_pcap.c +++ b/sys/netinet/tcp_pcap.c @@ -368,7 +368,7 @@ tcp_pcap_add(struct tcphdr *th, struct mbuf *m, struct mbufq *queue) * In cases where that isn't possible, settle for what we can * get. */ - if ((m->m_flags & (M_EXT|M_EXTPG)) && + if ((m->m_flags & (M_EXT | M_EXTPG)) && tcp_pcap_take_cluster_reference()) { n->m_data = m->m_data; n->m_len = m->m_len; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 8e374e28465e..10ab20f00e26 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18455,7 +18455,7 @@ rack_fo_base_copym(struct mbuf *the_m, uint32_t the_off, int32_t *plen, n->m_len = mlen; soff += mlen; len_cp += n->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + off; mb_dupcl(n, m); } else { From nobody Thu Dec 28 20:23:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1KhH45zqz54Y60; Thu, 28 Dec 2023 20:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1KhH3FtMz4W1Z; Thu, 28 Dec 2023 20:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703794991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh+U7WCe++zZogyiO140SqvaLVCXzFACxZ+0KT1Zosk=; b=mbxYCvlqNwS1rjjD0ZJkgDDxHrXRPKx0lIFrJIIBPd4TI2iXhrAlthof/itU3pjE2IegiU Shz/oE0Mk5Rflxyz4X6eq+xRN4Jk9Sg+WcZ++zqgqgWZ3M3OTNFBMGxAzg7P6DKGJRF1K4 zMSw2T6HtWzOdInhXMvNq2+rBh/L5oa0Y3Vbo8zMPfohjzUDHmbpC9GwlKQm2py9JJ3PLy Ox76koEXn/QvBoW7yzhDt/9fSFlOsC+csEX0coyM6Ugr78JisIKAYcu/Zz0w3D6rv6eXbB 9k4MVThO5bjyFS/Lfs3MNRvpo7CMtJnTC2ff1RwDt0uP0hjwBKSon82DbFuyig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703794991; a=rsa-sha256; cv=none; b=HV8VwWJt9MbroZKxOTeUg4mPttz+nDFe9aaPg/R1HGgI/AKM4buGVK3gQppjRE+zfSASIr xdunHJt/23GLX+O9tINfRiCI9j96AXKEdUnxUKV87p2aH3OhY/1ViaBg43ZPkjTOqvJigw Oi78kBzKiFniacyVE9UX6Bjp0YiUqZXHHAj+BaAY1b0ZpcPW6fjKlHKdnj/2/h+VgCgFXC 9uoeUWeoUJefVliea8DOHxXiWr4s9E0qH4nLSIFjB1Uch90KHbAn81K1QToGrrnNbz+/Wu 6OqMrU3mG+IiiZ+cI2C/zdXC63tH4kHrhhPIJaD76KfEyCiu3n8KSWshqSAS5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703794991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh+U7WCe++zZogyiO140SqvaLVCXzFACxZ+0KT1Zosk=; b=IzdMtBerRNseE4ur/AbrXRK+fd066KG/wDDQAFNsJqT0JjA2jwXxGI8jUITG4GliVOzlKO 6YmrshiEGGtQINVzk+0XPCLmnlbg1M0IONEVL6F5XDh0QfuK2FDHHekcIlWUOIGFfhZvse lg20ZJPorspm3WsA4QsRCOcOtGhP6iEqs/qxcnieHoVYxH5FNAA2ducOr/CBstp2ZbNFoT moZlkT7I7rFTFQeiPLTNeWvpv/hEkiPCs3no7pH9DvX+MYu4fZ3wfWforbkzIIinUt8sdc 0aHLWo9cF1Eq7vdaTEpyHLi4NG5BkSrVigAhchi/UikCBufHCOPZ3UVBiWZ6AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1KhH2JLwzcmb; Thu, 28 Dec 2023 20:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSKNBXN091362; Thu, 28 Dec 2023 20:23:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSKNBRt091359; Thu, 28 Dec 2023 20:23:11 GMT (envelope-from git) Date: Thu, 28 Dec 2023 20:23:11 GMT Message-Id: <202312282023.3BSKNBRt091359@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: c63dda466a5b - main - atrtc: Add a required include List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c63dda466a5ba6a9ec0a5de18f9180683f9af982 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c63dda466a5ba6a9ec0a5de18f9180683f9af982 commit c63dda466a5ba6a9ec0a5de18f9180683f9af982 Author: Mark Johnston AuthorDate: 2023-12-28 20:16:39 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 20:17:32 +0000 atrtc: Add a required include PR: 275867 MFC after: 1 week --- sys/x86/isa/atrtc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c index 45fd00c64da2..7c42cc28566e 100644 --- a/sys/x86/isa/atrtc.c +++ b/sys/x86/isa/atrtc.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include From nobody Thu Dec 28 20:27:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1KnD653Bz54YpB; Thu, 28 Dec 2023 20:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1KnD5MBrz4WlX; Thu, 28 Dec 2023 20:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703795248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3BxPO2V6uo2Ft2UnhiM1LuRCjgCe7oSauNnMrBqiTRg=; b=NAYCmnnnUo5vdcvl/y5vicMGMuwn4q8IMlS+FCcCRwxcyIEhQwLoRleUVUqUUvNB2PyO7W 1GOlp8/Iuv2QlF/qVuFoBHqui9m1KtEZ1+9Zmys6GNCSrqXY+VuG8jymG7S7nbbHyjvDXY UouGlSQHRwyp5CHBRHiP9DQog0a5WS2QJDhu8kffr/LVWvx7LVUajZik2lSpowlzQ0vLrn UXXlBiDX+/2GL/7WUxluHCFaGmun+aMDSMpPZ9I0G+3d6/1MuB95DSN0pYiGYh4vnItNBy LuhIJP/eoXhh1UTLIrkBdh9iXwPsnt3iioKiZnLOtfxdPq0owSrOYFDXv9L30w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703795248; a=rsa-sha256; cv=none; b=RI+EVQZdknaFFW50X1FrdrmzIyKERUxtoHXkVJJK7zsfvJpF5ob02XBLQgKbl/4he7XgUe dGut+PitCGxh5b4THRxY05kmTsNr8dJz1KLKimI49a11DoFgOeJwb5Pyrsuo9ouPnS/x8Q jDKYpyeLC8JyQ9/NNkL5tPS6yUMHhY9+tLWf0nIbfn96Z7ptCNNaa44ffGkpx0m4SsxZQu RTd8qc+SRiD7gPcG6x5J3i7PzhpLBXTDvb/PaUAkx/ASJ9U0CaJ5fTfncp10+F3I+IesET 7mRS03odxVPr2puVN82RmuyPdXAHTgJ3lYUttJ56b6CbIRKtRUs0bJIJ2uzboA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703795248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3BxPO2V6uo2Ft2UnhiM1LuRCjgCe7oSauNnMrBqiTRg=; b=k007ZhfrWlDplce15WUXP9rhSlo1B40PHvaJ31BJa1yGoXzqNso/Bc9vkxftiQyEV0XdEM y+phSkfiL4cjgxV+Ja0/ImdLl96MLROeYfE+aWJYdFEEBnhLuldJPZkOXxnxs8BsO4DmHR f7DeJ+h3P/yEJ+5IgpuoAaPPp4TJTMs1haAjUDLMMhv3Xr51Mrf+8DaZ6ZicIcfXA/xPCC E3jdn5Mw9MPa18FhAC0HZudu5vD64GqD5Eo6a7INofZhMv/E5MrJZay+Yl6sdqEy6TeKxn Q4wJfqL4STwJXfIJaiPiwHhxwSk/p1jMKntl6wt/dCvdpAaCX3H7QLphwFUvDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1KnD4KMszcpw; Thu, 28 Dec 2023 20:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSKRS25092074; Thu, 28 Dec 2023 20:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSKRSpR092071; Thu, 28 Dec 2023 20:27:28 GMT (envelope-from git) Date: Thu, 28 Dec 2023 20:27:28 GMT Message-Id: <202312282027.3BSKRSpR092071@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: f79b200b6aef - main - nfsstat: make -q work without -e/-E List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f79b200b6aefb9bdcbe931c5b7ea604e259beee0 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f79b200b6aefb9bdcbe931c5b7ea604e259beee0 commit f79b200b6aefb9bdcbe931c5b7ea604e259beee0 Author: Lexi Winter AuthorDate: 2023-12-28 12:56:57 +0000 Commit: Alan Somers CommitDate: 2023-12-28 20:27:07 +0000 nfsstat: make -q work without -e/-E MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/961 --- usr.bin/nfsstat/nfsstat.1 | 4 ++-- usr.bin/nfsstat/nfsstat.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1 index 6b062866ce5a..7d641b50f1ac 100644 --- a/usr.bin/nfsstat/nfsstat.1 +++ b/usr.bin/nfsstat/nfsstat.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 27, 2023 +.Dd December 28, 2023 .Dt NFSSTAT 1 .Os .Sh NAME @@ -117,7 +117,7 @@ second intervals. .It Fl z Reset statistics after displaying them. .It Fl q -Do not print header +Do not print headers. .It Fl -libxo Generate output via .Xr libxo 3 diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index 8c4df61b0482..55f5573662c7 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -270,7 +270,8 @@ intpr(int clientOnly, int serverOnly) xo_emit("{T:Client Info:\n"); xo_open_container("operations"); - xo_emit("{T:Rpc Counts:}\n"); + if (printtitle) + xo_emit("{T:Rpc Counts:}\n"); xo_emit("{T:Getattr/%13.13s}{T:Setattr/%13.13s}" "{T:Lookup/%13.13s}{T:Readlink/%13.13s}" @@ -321,7 +322,8 @@ intpr(int clientOnly, int serverOnly) xo_close_container("operations"); xo_open_container("rpcs"); - xo_emit("{T:Rpc Info:}\n"); + if (printtitle) + xo_emit("{T:Rpc Info:}\n"); xo_emit("{T:TimedOut/%13.13s}{T:Invalid/%13.13s}" "{T:X Replies/%13.13s}{T:Retries/%13.13s}" @@ -337,7 +339,8 @@ intpr(int clientOnly, int serverOnly) xo_close_container("rpcs"); xo_open_container("cache"); - xo_emit("{T:Cache Info:}\n"); + if (printtitle) + xo_emit("{T:Cache Info:}\n"); xo_emit("{T:Attr Hits/%13.13s}{T:Attr Misses/%13.13s}" "{T:Lkup Hits/%13.13s}{T:Lkup Misses/%13.13s}" @@ -384,7 +387,8 @@ intpr(int clientOnly, int serverOnly) if (serverOnly) { xo_open_container("serverstats"); - xo_emit("{T:Server Info:}\n"); + if (printtitle) + xo_emit("{T:Server Info:}\n"); xo_open_container("operations"); xo_emit("{T:Getattr/%13.13s}{T:Setattr/%13.13s}" @@ -437,7 +441,8 @@ intpr(int clientOnly, int serverOnly) xo_open_container("server"); - xo_emit("{T:Server Write Gathering:/%13.13s}\n"); + if (printtitle) + xo_emit("{T:Server Write Gathering:/%13.13s}\n"); xo_emit("{T:WriteOps/%13.13s}{T:WriteRPC/%13.13s}" "{T:Opsaved/%13.13s}\n"); @@ -453,7 +458,8 @@ intpr(int clientOnly, int serverOnly) xo_close_container("server"); xo_open_container("cache"); - xo_emit("{T:Server Cache Stats:/%13.13s}\n"); + if (printtitle) + xo_emit("{T:Server Cache Stats:/%13.13s}\n"); xo_emit("{T:Inprog/%13.13s}" "{T:Non-Idem/%13.13s}{T:Misses/%13.13s}\n"); xo_emit("{:inprog/%13ju}{:nonidem/%13ju}{:misses/%13ju}\n", From nobody Thu Dec 28 20:48:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1LFs2xN0z54bkC; Thu, 28 Dec 2023 20:48:49 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-ua1-f41.google.com (mail-ua1-f41.google.com [209.85.222.41]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1LFr4K11z4ZpN; Thu, 28 Dec 2023 20:48:48 +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.41 as permitted sender) smtp.mailfrom=antoine.brodin.freebsd@gmail.com; dmarc=none Received: by mail-ua1-f41.google.com with SMTP id a1e0cc1a2514c-7cc662fc2e6so595742241.0; Thu, 28 Dec 2023 12:48:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703796527; x=1704401327; 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=PAXHA/nQIXUgclzPyWJ3ISWnID64LYa4X1m4twLZTMs=; b=vTf0nfV+2D6dvE6fFP9XuXSEAYFMvYWT12G7j3GJc0kxFJYUwvJc0BBu0eMPYPIsRH 3t6oMCj4f1L0qqZezzKXHcmrM9qYLfH/GMDuKloq4ND+tjAFzB0dkH9T5zuk0wAzVQnA beAweIQZtbwfwmGV53R+KAzQpf50im/D8uVB4enVYy6levq0xXG+E+iHF7aNUm4DvRDM yBQ2a76iJ3KFi3uTYTq/YCaFNex5p64Vz2fgJQC1OiLy96zApDDuikr2h1UtuMoxHo/v xSsdXAvuf4kfTak5gzLT2yXmOiyNZsna0bbVBIb4AS/StAjF2w3FC9l5Lag11G3lbcmu 7qxA== X-Gm-Message-State: AOJu0YxC3/bGG7apzDGiDxaj5LhAoY0nuIdRkfdUgB2XgTtwDSunphNj /t1CQBtxXHH/hgU5KYREQLH8B1O9yzS5yuZwKxX9K55mixM= X-Google-Smtp-Source: AGHT+IF0tleX5Ag1FCNFEYgfjrZRqm53LpXb217pBDKbVfVOdIWvAVVT8vPfyvhFyLh/czbmVmX8WjDTb8YkBJ11cHg= X-Received: by 2002:a05:6122:d07:b0:4b6:bf49:ea3b with SMTP id az7-20020a0561220d0700b004b6bf49ea3bmr2430742vkb.26.1703796527019; Thu, 28 Dec 2023 12:48:47 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> In-Reply-To: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> From: Antoine Brodin Date: Thu, 28 Dec 2023 20:48:36 +0000 Message-ID: Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags To: Richard Scheffenegger 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.90 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.90)[-0.903]; FORGED_SENDER(0.30)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_NONE(0.00)[209.85.222.41:from]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.222.41:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com] X-Rspamd-Queue-Id: 4T1LFr4K11z4ZpN X-Spamd-Bar: -- On Wed, Dec 27, 2023 at 1:43=E2=80=AFAM Richard Scheffenegger wrote: > > The branch main has been updated by rscheff: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da8b70cf26030d68631200619bd= 1b0ad35b34b6b8 > > commit a8b70cf26030d68631200619bd1b0ad35b34b6b8 > Author: Richard Scheffenegger > AuthorDate: 2023-12-25 11:26:25 +0000 > Commit: Richard Scheffenegger > CommitDate: 2023-12-25 12:18:01 +0000 > > netpfil: Use accessor functions and named constants for all tcphdr fl= ags > > Update all remaining references to the struct tcphdr th_x2 field. > This completes the compatibilty of various aspects with AccECN > (TH_AE), after the internal ipfw "re-checksum required" was moved > to use the TH_RES1 flag. > > No functional change. > > Reviewed By: tuexen, #transport, glebius > Sponsored by: NetApp, Inc. > Differential Revision: https://reviews.freebsd.org/D43172 Hello, This breaks some ports: /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' Antoine From nobody Thu Dec 28 21:24:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1M2d2P6Rz54gDW; Thu, 28 Dec 2023 21:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1M2d1VjSz4dww; Thu, 28 Dec 2023 21:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703798649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Va6JlhQP72fUnjUnl+0nPcRjQmfVozTi2gD8Jt6qFWU=; b=FV7IbmqcCB8DSNKHYFNnq7O4oG/e7ATJtDPylK1nR5NnpBNPI3n7mLKXVnz0Iq/+M5D6dg h/QbuL0PADAyrRmiSheDRv3aB3PxNg1U2wH8ZdiKbmNwNN00lgESeR3s1spZwH+7AFE7Up OIFcRK6BRvH/97Go674imVQ9W6GIftRDZ7dwPG2y9U0SgKYRaHDR6j9SbXFCMLm4Prfxqo KWh2iPSKVtdWWmAe+VfgehrlD+LwuFk/eTpRRpkY9Mm6KKn/UoJIrbW99G6fuiL94auRs2 sKEhdwR5cfC28dy8rJnyzUj7lYGKS7p2iX+9b/O3JGwX5mQp/1L4Oqd4N9ip6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703798649; a=rsa-sha256; cv=none; b=LGnPB19VUPE13WnGE+KXF4x7auS3Fkhp3L0603oLsR2fHcvlKqi053nZSlhnHnglSVaAw3 GK35gAJx+syzCEmHUEtNAqBOyuIVf7XHmMljb7fiOQoo6UFi9klDjAg4xuRvwHgjewaHLK fA4mhnR4wR1H+2ctSFFBjITUZ7O1FRPs1nBfg/lKgrQl0hlr/fYoyPjKHNPhrN/oFBC2hV bzhTIpxu/guZocMmtfrQbBAFP3nKWebyZa+4Ln233XixTbL0BydxOvX0FDQpv6TP7WyqbW R+FnTtbfErVX2uri1Xi2A8ha6jlVbQcLxamLkYdb1yGIaO/0gmxSfT7HCQVWmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703798649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Va6JlhQP72fUnjUnl+0nPcRjQmfVozTi2gD8Jt6qFWU=; b=LZR4HZRhGlOk3OzgzTLifz+M1gmbOWYAacHY3ufUDzfP3uV5wDw+42TBuBE+wJxBa4YPvB wrUcaulS3qwH4skrCk6E4qGFLwzQWyIqvnSEyKb72jjlmxSgN6M0XDvzyuNA3k05PE245Q 1CEuOBjjNSeZ0p1cpPJx8Kq267h6mCz+gPu39/KJ0Xotv3WRiDdfynAhPLY2w07jpBlqZ5 AvArSKyOeUuoCYzba47/a84H98kNQO4jYWvTqa3MLE27peVIoDkEDeWjEdc985F0I4cIf4 bf6/UMXBPTzOc859n6LjcXd7dAlyng5MT8qmNeHPuXlDTwfLeufHfH+jIm6ADw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1M2d0ZYPzf6n; Thu, 28 Dec 2023 21:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSLO9xs091690; Thu, 28 Dec 2023 21:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSLO9cN091687; Thu, 28 Dec 2023 21:24:09 GMT (envelope-from git) Date: Thu, 28 Dec 2023 21:24:09 GMT Message-Id: <202312282124.3BSLO9cN091687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Kenneth D. Merry" Subject: git: 40a492d38ee1 - main - camcontrol: Add a sense subcommand List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40a492d38ee10ecf9d9a099c5cdecc072e24d2d1 Auto-Submitted: auto-generated The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=40a492d38ee10ecf9d9a099c5cdecc072e24d2d1 commit 40a492d38ee10ecf9d9a099c5cdecc072e24d2d1 Author: Kenneth D. Merry AuthorDate: 2023-12-28 21:23:16 +0000 Commit: Kenneth D. Merry CommitDate: 2023-12-28 21:23:16 +0000 camcontrol: Add a sense subcommand As the name suggests, this sends a SCSI REQUEST SENSE to a device, and prints out decoded sense information. It can also print out a hexdump of the sense data. sbin/camcontrol/camcontrol.c: Add the new sense subcommand. sbin/camcontrol/camcontrol.8: Document camcontrol sense. Sponsored by: Spectra Logic Reviewed by: mav MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43225 --- sbin/camcontrol/camcontrol.8 | 17 +++++- sbin/camcontrol/camcontrol.c | 122 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 2113c4fb2aab..0151376ff39f 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 1, 2023 +.Dd December 28, 2023 .Dt CAMCONTROL 8 .Os .Sh NAME @@ -51,6 +51,12 @@ .Op device id .Op generic args .Nm +.Ic sense +.Op device id +.Op generic args +.Op Fl D +.Op Fl x +.Nm .Ic inquiry .Op device id .Op generic args @@ -488,6 +494,15 @@ Send the SCSI test unit ready (0x00) command to the given device. The .Nm utility will report whether the device is ready or not. +.It Ic sense +Send a SCSI REQUEST SENSE command (0x03) to a device. +The decoded sense (or hexdump) is printed to stdout. +.Bl -tag -width 4n +.It Fl D +Request descriptor sense instead of fixed sense. +.It Fl x +Do a hexdump of the returned sense data. +.El .It Ic inquiry Send a SCSI inquiry command (0x12) to a device. By default, diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 9417943afcb3..555a67001443 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -111,6 +111,7 @@ typedef enum { CAM_CMD_DEVTYPE, CAM_CMD_AMA, CAM_CMD_DEPOP, + CAM_CMD_REQSENSE } cam_cmd; typedef enum { @@ -233,6 +234,7 @@ static struct camcontrol_opts option_table[] = { {"epc", CAM_CMD_EPC, CAM_ARG_NONE, "c:dDeHp:Pr:sS:T:"}, {"timestamp", CAM_CMD_TIMESTAMP, CAM_ARG_NONE, "f:mrsUT:"}, {"depop", CAM_CMD_DEPOP, CAM_ARG_NONE, "ac:de:ls"}, + {"sense", CAM_CMD_REQSENSE, CAM_ARG_NONE, "Dx"}, {"help", CAM_CMD_USAGE, CAM_ARG_NONE, NULL}, {"-?", CAM_CMD_USAGE, CAM_ARG_NONE, NULL}, {"-h", CAM_CMD_USAGE, CAM_ARG_NONE, NULL}, @@ -279,6 +281,9 @@ static int print_dev_mmcsd(struct device_match_result *dev_result, #ifdef WITH_NVME static int print_dev_nvme(struct device_match_result *dev_result, char *tmpstr); #endif +static int requestsense(struct cam_device *device, int argc, char **argv, + char *combinedopt, int task_attr, int retry_count, + int timeout); static int testunitready(struct cam_device *device, int task_attr, int retry_count, int timeout, int quiet); static int scsistart(struct cam_device *device, int startstop, int loadeject, @@ -840,6 +845,114 @@ print_dev_nvme(struct device_match_result *dev_result, char *tmpstr) } #endif +static int +requestsense(struct cam_device *device, int argc, char **argv, + char *combinedopt, int task_attr, int retry_count, int timeout) +{ + int c; + int descriptor_sense = 0; + int do_hexdump = 0; + struct scsi_sense_data sense; + union ccb *ccb = NULL; + int error = 0; + size_t returned_bytes; + + while ((c = getopt(argc, argv, combinedopt)) != -1) { + switch (c) { + case 'D': + descriptor_sense = 1; + break; + case 'x': + do_hexdump = 1; + break; + default: + break; + } + } + + ccb = cam_getccb(device); + if (ccb == NULL) { + warnx("couldn't allocate CCB"); + return (1); + } + + /* cam_getccb cleans up the header, caller has to zero the payload */ + CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->csio); + + bzero(&sense, sizeof(sense)); + + scsi_request_sense(&ccb->csio, + /*retries*/ retry_count, + /*cbfcnp*/ NULL, + /*data_ptr*/ (void *)&sense, + /*dxfer_len*/ sizeof(sense), + /*tag_action*/ task_attr, + /*sense_len*/ SSD_FULL_SIZE, + /*timeout*/ timeout ? timeout : 60000); + + if (descriptor_sense != 0) { + struct scsi_request_sense *cdb; + + cdb = (struct scsi_request_sense *)&ccb->csio.cdb_io.cdb_bytes; + cdb->byte2 |= SRS_DESC; + } + + ccb->ccb_h.flags |= CAM_DEV_QFRZDIS; + + if (arglist & CAM_ARG_ERR_RECOVER) + ccb->ccb_h.flags |= CAM_PASS_ERR_RECOVER; + + if (cam_send_ccb(device, ccb) < 0) { + warn("error sending REQUEST SENSE command"); + cam_freeccb(ccb); + error = 1; + goto bailout; + } + + /* + * REQUEST SENSE is not generally supposed to fail. But there can + * be transport or other errors that might cause it to fail. It + * may also fail if the user asks for descriptor sense and the + * device doesn't support it. So we check the CCB status here to see. + */ + if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + warnx("REQUEST SENSE failed"); + cam_error_print(device, ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); + error = 1; + goto bailout; + } + + returned_bytes = ccb->csio.dxfer_len - ccb->csio.resid; + + if (do_hexdump != 0) { + hexdump(&sense, returned_bytes, NULL, 0); + } else { + char path_str[80]; + struct sbuf *sb; + + cam_path_string(device, path_str, sizeof(path_str)); + sb = sbuf_new_auto(); + if (sb == NULL) { + warnx("%s: cannot allocate sbuf", __func__); + error = 1; + goto bailout; + } + + scsi_sense_only_sbuf(&sense, returned_bytes, sb, path_str, + &device->inq_data, scsiio_cdb_ptr(&ccb->csio), + ccb->csio.cdb_len); + + sbuf_finish(sb); + printf("%s", sbuf_data(sb)); + sbuf_delete(sb); + } +bailout: + if (ccb != NULL) + cam_freeccb(ccb); + + return (error); +} + static int testunitready(struct cam_device *device, int task_attr, int retry_count, int timeout, int quiet) @@ -9869,6 +9982,7 @@ usage(int printlong) " camcontrol devlist [-b] [-v]\n" " camcontrol periphlist [dev_id][-n dev_name] [-u unit]\n" " camcontrol tur [dev_id][generic args]\n" +" camcontrol sense [dev_id][generic args][-D][-x]\n" " camcontrol inquiry [dev_id][generic args] [-D] [-S] [-R]\n" " camcontrol identify [dev_id][generic args] [-v]\n" " camcontrol reportluns [dev_id][generic args] [-c] [-l] [-r report]\n" @@ -9957,6 +10071,7 @@ usage(int printlong) "Specify one of the following options:\n" "devlist list all CAM devices\n" "periphlist list all CAM peripheral drivers attached to a device\n" +"sense send a request sense command to the named device\n" "tur send a test unit ready to the named device\n" "inquiry send a SCSI inquiry command to the named device\n" "identify send a ATA identify command to the named device\n" @@ -10021,6 +10136,9 @@ usage(int printlong) "-f format specify defect list format (block, bfi or phys)\n" "-G get the grown defect list\n" "-P get the permanent defect list\n" +"sense arguments:\n" +"-D request descriptor sense data\n" +"-x do a hexdump of the sense data\n" "inquiry arguments:\n" "-D get the standard inquiry data\n" "-S get the serial number\n" @@ -10491,6 +10609,10 @@ main(int argc, char **argv) case CAM_CMD_DEVTYPE: error = getdevtype(cam_dev); break; + case CAM_CMD_REQSENSE: + error = requestsense(cam_dev, argc, argv, combinedopt, + task_attr, retry_count, timeout); + break; case CAM_CMD_TUR: error = testunitready(cam_dev, task_attr, retry_count, timeout, 0); From nobody Thu Dec 28 22:22:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1NKs3HTkz54m3N; Thu, 28 Dec 2023 22:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1NKs2m12z3DWv; Thu, 28 Dec 2023 22:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703802145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YF0phajNzbrl2je3fRsNQc7d2qG/BK2FfmKRcekqBQ=; b=PWlS/73XcOUfG8s4pDTRargbIPYus74t6VX1PCGULuVrkVJXGS8eztwyPhahK3kVN0qRY7 SiUR4TVJixt6hBRvzf33GaK9au3xXPl4825z9bw2P6vzPL3FxKE1n1PxNZqzl9XKpjpZaT ZkMEWmtSaXLqhG8hCV3SFDg4xDPhwuN5XkyU+EIH33kVkWNMN8QW/aqB05xoZcUXfjpLwk On3nFnT5MzVpLBVE75Rr+J65tgWbVO3GTTGwaxPxwd19sEAnPMB08ykf9iUUZ4pBZhUmtW 7bR77uDRfmXjk/g1YqA6h5bnzpvKB9o77o5xvlkyZwLINaR1pDCzHYI41+NxOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703802145; a=rsa-sha256; cv=none; b=PtCm0to5rSFooa7dbBXbo2pgIWbnOsq02NtB5AlXBARFaztY2Ucr4wMKVnUsmTgLwefC2m JOCqnQEQCMjyexAHjzjTwBMF/22Dt7XsOWKJ7EkvPQycuTWYXKsOZJE36XAWTMNCONEC85 BO2s1Mih8MZcwUIsQAzRYNY2+FoqYqtM92zwdKUXNtHappn8mQQGXvDyxA8OfHO0ts4GQI 1u9gjen5yx81r2a26Z8uxWebthMLIQwBxTHnunK0EO3tOwuCqAxtJHGPPBvEWWiM8KGp86 IDBrWehFvqYciFp+XlLCHk655Iazjbka2m8D6A6FKLHRwr2vGstjmR/7ZkJ0cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703802145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YF0phajNzbrl2je3fRsNQc7d2qG/BK2FfmKRcekqBQ=; b=DzCjaYPjokb1KXhskl9ebRyYxeosQDC6uDKbU9ySkdpOG9wkWbw0035Lm5gI3Vx5kIhHRX 3e5ZRnsd/HGoSq2vZfX0qmPYo0+KdS3fcf370DP0pdhyOlr09hS+CBzvbDasy6bWIKWdv5 UmkjImsJe680weifoUusZvyfuQ4DvskuAD9KJZMcUDKLkjABSpZOtuLMDkiSnXF4dFFMtb jpC5WVysMvp6W2hgDWTRZiQUdUfG8hAlXw4/xVaw05TnWC2Yr4Y/s194DPLaXobdPzwRyc +E+AFE0hSbivO4/Jc6nyzYeQtXQSdtQHjuhkfdQvKtKtTIljCDCyVMZzdusmgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1NKs1q5lzgsZ; Thu, 28 Dec 2023 22:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSMMPBE091966; Thu, 28 Dec 2023 22:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSMMPAJ091963; Thu, 28 Dec 2023 22:22:25 GMT (envelope-from git) Date: Thu, 28 Dec 2023 22:22:25 GMT Message-Id: <202312282222.3BSMMPAJ091963@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: e7300a8f638e - main - OptionalObsoleteFiles.inc: Add libnss_tacplus_p.a as an old profiled library List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e7300a8f638e6eb801953c0fb9e53d99308dc3f0 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e7300a8f638e6eb801953c0fb9e53d99308dc3f0 commit e7300a8f638e6eb801953c0fb9e53d99308dc3f0 Author: John Baldwin AuthorDate: 2023-12-28 22:20:54 +0000 Commit: John Baldwin CommitDate: 2023-12-28 22:20:54 +0000 OptionalObsoleteFiles.inc: Add libnss_tacplus_p.a as an old profiled library Noticed this was still present after upgrading a 12.x stable host to 14.0 stable. --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f9850b7b2e22..e0f624bbad96 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6920,6 +6920,7 @@ OLD_FILES+=usr/lib/libncurses_p.a OLD_FILES+=usr/lib/libncursesw_p.a OLD_FILES+=usr/lib/libnetgraph_p.a OLD_FILES+=usr/lib/libnetmap_p.a +OLD_FILES+=usr/lib/libnss_tacplus_p.a OLD_FILES+=usr/lib/libnv_p.a OLD_FILES+=usr/lib/libnvpair_p.a OLD_FILES+=usr/lib/libopencsd_p.a From nobody Thu Dec 28 22:28:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1NSh6VQpz54mQk; Thu, 28 Dec 2023 22:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1NSh5xXFz3FcQ; Thu, 28 Dec 2023 22:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703802500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMv2F1rIguN4lAcmTynITLm/SvisUQNn5TmnrnNsKlI=; b=nsfZqO2W6VNu970P1eilcxBZ4mvc0viGRJriVe8sf4ypnRupeXvNdbcR3pHgKoOfsajJYD R6AGTB+BT17DvJ4RITS78dTlVf5tZ3VijEOexijBSe4zoNNPe/0OLkxxH5ROLbXkZJbnGh MVJJidyrZcq0rn0FJ9SCEUsBGedCWZLoC8v6hK+CFMvhkBeBcwR+Yemhj+Vkl7VdtaGeM1 gpu38Nay5QlnMN/Qmhn0fALQrfyVn//TFztL/JjDfdRfJNpatb249nTN/vxaY/wS9H/kEe lPxObnGJD7u0e7MMGmczbynaKhTNAmd/Pug6IP0A2heZ5RRfSiwpyE/34v+elA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703802500; a=rsa-sha256; cv=none; b=oZUpPoj8nB2repWQ0OVsE6m7znd75jesVApIoLYJhgr6l+4SQgWp4zZ9hvXGv3txZY1sdb 41XPl7K4YSpCPOXzGIokYpdXxAfxf2M9TYQHc/oJsAZHRExZyuYNt57F93zdoiCTPCsMJV h5QBONNOgG/bRw0g7Fcmj7Agar23NTC74HCj2bKO4/9yJI4UDpNgi7C1vnUBj+w2xb4z93 iXbqsvKs1T4EjSt7xLbuCMeCSTO+CFH/Jf1zNvnCqzJ6HWRjG8do5RQ8ytb10WdgK35juR rBOvkZZCgoDhm32eSPcPBx7Cs3IvzJN7bK3lo3z0SHJEiJ/TEdFPa4ZBkSIX8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703802500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMv2F1rIguN4lAcmTynITLm/SvisUQNn5TmnrnNsKlI=; b=QbbvMjyzIJ9iF8+JYuIhyCCCdS9A6PxhhwEGvTuqqGD2BPAuj+5tA93+TgnNT/fHQy/rDM j0hfEZJMOAIu2NnCYBa+Rp4Jeq+32F0edL5hiV6r6yjOrFKe0aYNCTOSyhjCre968cIuyx g4HKHTG5mjoP+oaQfA1P5WMCSrDTw1TOhsVVhz0dudnAgNTvU7ZvMfKO1fNdgDgpysfwkL Bx2b9JEC+xROr44WHiP2OGmtkhKk2cqL0Z4pbb2vWeXJfTGx7BXSAkZksUD9zzzONMJwUb sHLk2BCZw+9Bwmd3oPHJbH/n7pR0VrHXI9LK+FF0Xrxftkub5s3K01JEhnAWJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1NSh4yBkzgsc; Thu, 28 Dec 2023 22:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSMSKCu092870; Thu, 28 Dec 2023 22:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSMSKFc092867; Thu, 28 Dec 2023 22:28:20 GMT (envelope-from git) Date: Thu, 28 Dec 2023 22:28:20 GMT Message-Id: <202312282228.3BSMSKFc092867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 8a735ffdf049 - main - EC2: Bump AMI size to 6 GB List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a735ffdf04936c6785ac4fa31486639262dd416 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8a735ffdf04936c6785ac4fa31486639262dd416 commit 8a735ffdf04936c6785ac4fa31486639262dd416 Author: Colin Percival AuthorDate: 2023-12-28 22:23:52 +0000 Commit: Colin Percival CommitDate: 2023-12-28 22:24:46 +0000 EC2: Bump AMI size to 6 GB This week's cloud-init ZFS snapshots ran out of disk space. --- release/tools/ec2.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index a233bf5981c1..f8bfe0911759 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -10,12 +10,12 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id amazon-ssm-agent" # Services which should be enabled by default in rc.conf(5). export VM_RC_LIST="dev_aws_disk ntpd" -# Build with a 4.9 GB partition; the growfs rc.d script will expand +# Build with a 5.9 GB partition; the growfs rc.d script will expand # the partition to fill the root disk after the EC2 instance is launched. # Note that if this is set to G, we will end up with an GB disk # image since VMSIZE is the size of the filesystem partition, not the disk # which it resides within. -export VMSIZE=5000m +export VMSIZE=6000m # No swap space; it doesn't make sense to provision any as part of the disk # image when we could be launching onto a system with anywhere between 0.5 From nobody Thu Dec 28 22:36:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1Nfh530fz54nkD; Thu, 28 Dec 2023 22:37:00 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4T1Nfh2f8Mz3GH8; Thu, 28 Dec 2023 22:37:00 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id EFD4C6A157; Thu, 28 Dec 2023 14:36:52 -0800 (PST) Date: Thu, 28 Dec 2023 14:36:52 -0800 From: Gleb Smirnoff To: Antoine Brodin Cc: Richard Scheffenegger , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags Message-ID: References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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:27348, ipnet:162.251.186.0/24, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1Nfh2f8Mz3GH8 Antoine, On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: A> > netpfil: Use accessor functions and named constants for all tcphdr flags A> > ... A> This breaks some ports: A> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' Definitely some ports that use some strange compilers :) Can you please give at least port names? -- Gleb Smirnoff From nobody Fri Dec 29 07:35:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1ccb1Z0Wz55WWl; Fri, 29 Dec 2023 07:35:59 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-vk1-f180.google.com (mail-vk1-f180.google.com [209.85.221.180]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1ccZ6wf5z4dtM; Fri, 29 Dec 2023 07:35:58 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vk1-f180.google.com with SMTP id 71dfb90a1353d-4b739b49349so673841e0c.1; Thu, 28 Dec 2023 23:35:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703835357; x=1704440157; 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=p7YCokxFPBzIQQkVkb0YO+CxI3aMdhPPbtt3kUUDOoQ=; b=fPkf3WoOMDJD5mqRt83up8Aly+vKGDqtPAJJKs8VutvSA43NduqCqYRLaqlMezf2WC 6tZUIdvH7C+Vm4pKUGOjpUcAbCfsVsBdfUkIZmssxNOuJhj2Jk5uiDWtpacgG9MyeiXF opbc0Mg+NCx9EAjxJbGolewb9X/QfUdqXEMmlHbkuFs1xlnDlUyzW72KR62EkzIEgsxR qln0QSqU4ipQ+ZDRLn0HdxGLRwddum+GzWBdkbVbRn5TJDHYZYSaoiNUOEsUg4LZxIUi SjYiHgaUUufe9bHkqG8aSDmZCxuPywLq5SD18axN55AnM2ua5hd1GuXzK/KYQsmf2Ywj QizQ== X-Gm-Message-State: AOJu0YzxgL/mcx8ohrgpiJf+XC7OhAzEW8efe9ARzWGbsWmi5J97sTNW /ymX1ewnG8eiZg/APqs7yf/ytIg1Xa1oENrQpp/7wfsbkx8= X-Google-Smtp-Source: AGHT+IGnHqtdgBEZ6DQRT5kQMcseBekfIHxNNfhd4jKt5dcJrw/xP6uSd0oBw77Mh51A2uxmEujdcwLv6nVoHtGPBoQ= X-Received: by 2002:a05:6122:d07:b0:4b6:e848:bf1b with SMTP id az7-20020a0561220d0700b004b6e848bf1bmr4004344vkb.29.1703835357606; Thu, 28 Dec 2023 23:35:57 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> In-Reply-To: From: Antoine Brodin Date: Fri, 29 Dec 2023 07:35:46 +0000 Message-ID: Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags To: Gleb Smirnoff Cc: Richard Scheffenegger , 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-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]; TAGGED_FROM(0.00)[] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1ccZ6wf5z4dtM On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff wrote: > > Antoine, > > On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: > A> > netpfil: Use accessor functions and named constants for all tcph= dr flags > A> > > ... > A> This breaks some ports: > A> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' > > Definitely some ports that use some strange compilers :) > > Can you please give at least port names? Some examples: https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/2= 023-12-28_20h35m41s/logs/errors/nspr-4.35.log https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/2= 023-12-28_20h35m41s/logs/errors/opusfile-0.12_1.log Antoine From nobody Fri Dec 29 07:48:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1cvc0wphz55XLY; Fri, 29 Dec 2023 07:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1cvc0P7Tz4gCq; Fri, 29 Dec 2023 07:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703836140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8RnaA8W94K2zn0ryfEl1elPErkBcb366b1JdsRMDBE=; b=L4nacjMOfhyWyQ9qiIqPIm3EQ8Y+TMTEHSdQ0Ev+dJGS2aHlr5L1aGXldLPifvOqu2Smwn PqleROFSXimqiN4bAgg3nRGsVDdbae+rlOpr2pfvrrAtLCHcRPweuZSCq/cvBhNXnGFrVi tInVzgwPO4nlT8UIC+WZW+RGHVMLvqzKYrv5cHS/u0S+v1nqCqSghnXLUC81fMMimKsPnP cTokicjMb0kgkmQYpp+nPzhI9cTxAkGOZdVuhTQmGopOXMuurxtyYwegoDD6tbMeZRimy4 FtL8a3IYA32ybjZj20my7AvW7zUaeLykMEU4nm6WhM8ALINGBrtMTBKcCcYLJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703836140; a=rsa-sha256; cv=none; b=Z0fuoLZ1zUZkDuPaOZItKFBVJDJD8gCNkzwwTAtmsL8hhcUTSRnZjy0Ei9mPIG9Bo+bH2b 90bS4WCiir71xIV3hCxnPYYjKiPxoncgRssN/eCCVWymBiG7otw586uVyKBEDDS+OJ9ong 3Xs2QtaFNt5fbm+rceZUNuTwwa3EkHcU18MKNVoYWsRD1Z7npRcYulCMt1/NlB9lQEMPH3 0YtIZp6Tq6JCEah7YfOorTcPm74Mp8lnrppaGyD052fkG36o86r9ct/3FrJWh5IFz4wVQB wFvB/1kiuvj+ZMEgFIaLM4HTK6kVeqnUcpj/rRoqtzTCXtWLB0ZvrZGgodoEKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703836140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8RnaA8W94K2zn0ryfEl1elPErkBcb366b1JdsRMDBE=; b=GzYIsWJKWU2Pf4NpBMjmJoHYBtvCdqC0kbf1fJ891rkDFYyp/5dInWVuZJ2B6yWc6trQwY Bx3EeqDW/CpHeC6REmvre0vdni0krZ5p4BbxjISBDDxM9RQdaKH3oWX+lVplrK2Nh2XH8m pDB0HrSA8hprkdFQ+SDnJd4xXEz4GLRgDGTPXGvcgtwq0APn6waai2lnsPBwhrckG3oZlM Ia93YCqUGOoVF3r+yhM9YYfDu7lvMpa6LcStJEtCO/bXqdh5QQU/eXNYG4Pckt+kL0Z8wd 3tHTKNGNl/SZy5D29hs9p91WgHdz+rsETdXYwQzHSGi+7QaRozRJlYkyd3briQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1cvb6MxQzxbn; Fri, 29 Dec 2023 07:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BT7mxs1030146; Fri, 29 Dec 2023 07:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BT7mxOp030143; Fri, 29 Dec 2023 07:48:59 GMT (envelope-from git) Date: Fri, 29 Dec 2023 07:48:59 GMT Message-Id: <202312290748.3BT7mxOp030143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: ee5804da116f - main - netmap: fix unit tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee5804da116f2107451c8b4376b69b3a64a630e8 Auto-Submitted: auto-generated The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=ee5804da116f2107451c8b4376b69b3a64a630e8 commit ee5804da116f2107451c8b4376b69b3a64a630e8 Author: Vincenzo Maffione AuthorDate: 2023-12-29 07:46:46 +0000 Commit: Vincenzo Maffione CommitDate: 2023-12-29 07:46:46 +0000 netmap: fix unit tests After ad874544d9f018bf8eef4053b5ca7b856c4674cb, interface name validation has been removed, resulting in two unit tests failures. Drop the failing tests since they no longer apply. Reported by: markj --- tests/sys/netmap/ctrl-api-test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/sys/netmap/ctrl-api-test.c b/tests/sys/netmap/ctrl-api-test.c index 9fc08d3082a4..8d33b4c58d2a 100644 --- a/tests/sys/netmap/ctrl-api-test.c +++ b/tests/sys/netmap/ctrl-api-test.c @@ -1803,7 +1803,6 @@ static struct nmreq_parse_test nmreq_parse_tests[] = { { "netmap:", "", NULL, EINVAL, 0, 0, 0 }, { "netmap:^", "", NULL, EINVAL, 0, 0, 0 }, { "netmap:{", "", NULL, EINVAL, 0, 0, 0 }, - { "netmap:vale0:0", NULL, NULL, EINVAL, 0, 0, 0 }, { "eth0", NULL, NULL, EINVAL, 0, 0, 0 }, { "vale0:0", "vale0:0", "", 0, NR_REG_ALL_NIC, 0, 0 }, { "vale:0", "vale:0", "", 0, NR_REG_ALL_NIC, 0, 0 }, @@ -1811,7 +1810,6 @@ static struct nmreq_parse_test nmreq_parse_tests[] = { { "valeXXX:YYY-4", "valeXXX:YYY", "", 0, NR_REG_ONE_NIC, 4, 0 }, { "netmapXXX:eth0", NULL, NULL, EINVAL, 0, 0, 0 }, { "netmap:14", "14", "", 0, NR_REG_ALL_NIC, 0, 0 }, - { "netmap:eth0&", NULL, NULL, EINVAL, 0, 0, 0 }, { "netmap:pipe{0", "pipe{0", "", 0, NR_REG_ALL_NIC, 0, 0 }, { "netmap:pipe{in", "pipe{in", "", 0, NR_REG_ALL_NIC, 0, 0 }, { "netmap:pipe{in-7", "pipe{in", "", 0, NR_REG_ONE_NIC, 7, 0 }, From nobody Fri Dec 29 08:33:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1dtd4xS4z55cxg; Fri, 29 Dec 2023 08:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1dtd4NWzz4kty; Fri, 29 Dec 2023 08:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703838793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FNPdiwfE/Zuzl4eH2Zeee1nfHMG+FPODwKa3BlNyTWQ=; b=kjSDfZsjnhFlo6zVS5YQt1axhOe9E5Lg39pu9RtJJJnxAB9OO+ZdmOOpyGUnJVg87v2EDw Wj642pq9WlsG0G0w+mX1QiJthiwPBKuCOHCOEM3i0BouCtUjA2Mm4SFwx05fR9xX/geREi Hlxe9F8nqEcpmPGXyPJ3jgAwyocPm1Yg04LCYXFdscjrz0trqmkCxPOIqEG2kPhWVHZACU VLbNu6LGSL6t8C5yrh+1Aad7+Tg24I0Re+hSlKoi19sYB1E4kVK5ggcZxIn6LJd5l9Nr3K bZdTBqb/mMclF/n0qOyG+qBvW8l9Kdcvj8m5kEKTpWTGIe5mo+cLT5/10jU9aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703838793; a=rsa-sha256; cv=none; b=pqhrQMUhs7NHjv7B94BznbdgSX5S5p5QJuxwKJ+fG5y7TvXmKrPMvMkEwm9+DyC8AMwbya MjAluxw1ERheamotiRGR2PF1g9yi7GoUse9xSft/Tp5F+AgvKR6EUGb8+R3gFlQTp1ZxGP kJZJ13Z5rIKcTmWsjYBjfzeNzDoJwGbKOnig0C+QSeqNNKymLvdA0qe5jpjlfvk6rk4M0l AYW4USsQCNQvJ/6VaTGEDRWHPzGlKaNZrDTHn246MMcH9MFbUoKNXxg8ASG0yWFefDeq0Q bOzCEN4CZd5tSWk2GqiCsoZewpr2H0mLeXNDzz7miI737B4llyWoQ8NnXehTJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703838793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FNPdiwfE/Zuzl4eH2Zeee1nfHMG+FPODwKa3BlNyTWQ=; b=LywP7e+fMqY9/09MRa3IaeNQuw9TtPelrt52y9fxlDfwKbT71gWyTzBwwRZqcXogzD59zz ts9DPAnxMyBv5cYao55kBuDoafdgZg6Il1H0iwAT7qtTU7+yYycnJKWZVwytbGdIqugQZy MKd6/wjSnTTLtCmXvsmLg3aQ/l1GC1GimAkkL5Ro82sHB7sIHS/EtV/DAdEiF4tI4Mtkfj GZSOnmIxRj52VAfgNFL4/PQ/Y9S3ipNKpUS4fhrNHVjdQZohPoxA+83VdhP8xVRzyHxWlf P9tmgefiZqxfuXO/x94foGE8LgsfKh3Agpzg8TMAqk2SKL38B/2uDpkWrva8Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1dtd3Rclzysk; Fri, 29 Dec 2023 08:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BT8XDO7012484; Fri, 29 Dec 2023 08:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BT8XDRF012481; Fri, 29 Dec 2023 08:33:13 GMT (envelope-from git) Date: Fri, 29 Dec 2023 08:33:13 GMT Message-Id: <202312290833.3BT8XDRF012481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 61174ad88e33 - main - newsyslog(8): Add support of specifying compression method in configuration file. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61174ad88e33b6162fa1c9ee37d7f227e0bbf931 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=61174ad88e33b6162fa1c9ee37d7f227e0bbf931 commit 61174ad88e33b6162fa1c9ee37d7f227e0bbf931 Author: Xin LI AuthorDate: 2023-12-25 07:47:36 +0000 Commit: Xin LI CommitDate: 2023-12-29 08:32:26 +0000 newsyslog(8): Add support of specifying compression method in configuration file. Administrators can now specify a global compression method directly at the beginning of the newsyslog.conf file, for example: none Relnotes: yes Reviewed by: dvl MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43174 --- usr.sbin/newsyslog/newsyslog.c | 97 +++++++++++++++++++++++++++++++------ usr.sbin/newsyslog/newsyslog.conf.5 | 23 +++++++-- 2 files changed, 99 insertions(+), 21 deletions(-) diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c index a08e7b903707..9f9185c1ad20 100644 --- a/usr.sbin/newsyslog/newsyslog.c +++ b/usr.sbin/newsyslog/newsyslog.c @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -124,6 +125,7 @@ enum compress_types_enum { #define DEFAULT_MARKER "" #define DEBUG_MARKER "" #define INCLUDE_MARKER "" +#define COMPRESS_MARKER "" #define DEFAULT_TIMEFNAME_FMT "%Y%m%dT%H%M%S" #define MAX_OLDLOGS 65536 /* Default maximum number of old logfiles */ @@ -248,6 +250,8 @@ static char *archdirname; /* Directory path to old logfiles archive */ static char *destdir = NULL; /* Directory to treat at root for logs */ static const char *conf; /* Configuration file to use */ static enum compress_types_enum compress_type_override = COMPRESS_LEGACY; /* Compression type */ +static bool compress_type_set = false; +static bool compress_type_seen = false; struct ptime_data *dbg_timenow; /* A "timenow" value set via -D option */ static struct ptime_data *timenow; /* The time to use for checking at-fields */ @@ -505,6 +509,37 @@ free_clist(struct cflist *list) list = NULL; } +static bool +parse_compression_type(const char *str, enum compress_types_enum *type) +{ + int i; + + for (i = 0; i < COMPRESS_TYPES; i++) { + if (strcasecmp(str, compress_type[i].name) == 0) { + *type = i; + break; + } + } + if (i == COMPRESS_TYPES) { + if (strcasecmp(str, "legacy") == 0) + compress_type_override = COMPRESS_LEGACY; + else { + return (false); + } + } + return (true); +} + +static const char * +compression_type_name(enum compress_types_enum type) +{ + + if (type == COMPRESS_LEGACY) + return ("legacy"); + else + return (compress_type[type].name); +} + static fk_entry do_entry(struct conf_entry * ent) { @@ -628,8 +663,13 @@ do_entry(struct conf_entry * ent) if (ent->rotate && !norotate) { if (temp_reason[0] != '\0') ent->r_reason = strdup(temp_reason); - if (verbose) - printf("--> trimming log....\n"); + if (verbose) { + if (ent->compress == COMPRESS_NONE) + printf("--> trimming log....\n"); + else + printf("--> trimming log and compressing with %s....\n", + compression_type_name(ent->compress)); + } if (noaction && !verbose) printf("%s <%d%s>: trimming\n", ent->log, ent->numlogs, @@ -647,7 +687,7 @@ do_entry(struct conf_entry * ent) static void parse_args(int argc, char **argv) { - int ch, i; + int ch; char *p; timenow = ptime_init(NULL); @@ -667,20 +707,11 @@ parse_args(int argc, char **argv) archdirname = optarg; break; case 'c': - for (i = 0; i < COMPRESS_TYPES; i++) { - if (strcmp(optarg, compress_type[i].name) == 0) { - compress_type_override = i; - break; - } - } - if (i == COMPRESS_TYPES) { - if (strcmp(optarg, "legacy") == 0) - compress_type_override = COMPRESS_LEGACY; - else { - warnx("Unrecognized compression method '%s'.", optarg); - usage(); - } + if (!parse_compression_type(optarg, &compress_type_override)) { + warnx("Unrecognized compression method '%s'.", optarg); + usage(); } + compress_type_set = true; break; case 'd': destdir = optarg; @@ -1187,6 +1218,36 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p, } else add_to_queue(q, inclist); continue; + } else if (strcasecmp(COMPRESS_MARKER, q) == 0) { + enum compress_types_enum result; + + if (verbose) + printf("Found: %s", errline); + q = parse = missing_field(sob(parse + 1), errline); + parse = son(parse); + if (!*parse) + warnx("compress line specifies no option:\n%s", + errline); + else { + *parse = '\0'; + if (parse_compression_type(q, &result)) { + if (compress_type_set) { + warnx("Ignoring compress line " + "option '%s', using '%s' instead", + q, + compression_type_name(compress_type_override)); + } else { + if (compress_type_seen) + warnx("Compress type should appear before all log files:\n%s", + errline); + compress_type_override = result; + compress_type_set = true; + } + } else { + warnx("Bad compress option '%s'", q); + }; + } + continue; } #define badline(msg, ...) do { \ @@ -1357,6 +1418,7 @@ no_trimat: working->compress = COMPRESS_BZIP2; else working->compress = compress_type_override; + compress_type_seen = true; break; case 'n': working->flags |= CE_NOSIGNAL; @@ -1381,18 +1443,21 @@ no_trimat: working->compress = COMPRESS_XZ; else working->compress = compress_type_override; + compress_type_seen = true; break; case 'y': if (compress_type_override == COMPRESS_LEGACY) working->compress = COMPRESS_ZSTD; else working->compress = compress_type_override; + compress_type_seen = true; break; case 'z': if (compress_type_override == COMPRESS_LEGACY) working->compress = COMPRESS_GZIP; else working->compress = compress_type_override; + compress_type_seen = true; break; case '-': break; diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index a53af5b38319..120c5a0cb7cc 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -18,7 +18,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd December 22, 2023 +.Dd December 25, 2023 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -67,11 +67,24 @@ The fields of the configuration file are as follows: .Bl -tag -width indent .It Ar logfile_name Name of the system log file to be archived, -or one of the literal strings -.Dq Aq Li default , +or one of the special strings +.Dq Li , +.Dq Li , or -.Dq Aq Li include . -The special default entry will only be used if a log file +.Dq Li . +The entry, +which should be placed at the beginning of the +.Nm +configuration file, +sets the global compress method. +This method is applied when a log file is flagged as +compressible, +which has the same effect of passing a compress method to the +.Fl c +option on the +.Xr newsyslog 8 +command line. +The special entry will only be used if a log file name is given as a command line argument to .Xr newsyslog 8 , and if that log file name is not matched by any other From nobody Fri Dec 29 08:46:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1f9r5qczz55dnj; Fri, 29 Dec 2023 08:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1f9r5KL4z4lLr; Fri, 29 Dec 2023 08:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703839584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpzg+ZVG1D7rYagOkbHsiW14vvQPRAIl6E/T+q1+C7I=; b=OguKyhN+/bNG2O4w2X7ALDg+oBhYparMy2PqW4d0tbMwbIyT78vXT9TTpaN89aLDGD9HM/ pD1If1nQPBrnH6561CmpbmtYR8iZaF+cNGHntnRVWngNuXoM3O4+1kKJq8aoi/7N9N7Gs8 MAOwgdr8MaR8i/pNPT208pijrhIho3WYvQ/bfENXw/TiE0OMy49pfOefuMKjwbsbHqmFCU LrisLwRsXPhO55bmavJFqE++Np4cgqnrgul1a5stCCR8vowqPFf1mP1tAlEoYhmsrVb/z4 8nWHTkd05A/LBvfU/EOsXHuuMOGmEHeB7bD+WH3b//38rvul/90IE2Vo2QU1tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703839584; a=rsa-sha256; cv=none; b=I0i5LWdFq98hHCCoLRs84A0xWfPn3/TK0jNe+LLRHrhfQrWaQKD81WzU4bjspJt857eOzi Jo2CnEtvYhDcudBYHHONGqdeRVynyFgtupXDsomP1Dw+c8W1GopVOvAt7GxaN6KJh/kvy0 aWOxPnBluAbQibyAJzbRzn+gx+OcF7Qavqstp/Yeye0GcWuivVVMNZujShSiH2pITkDdzD 2gJfvzEPmanBTOZCzHmcduG0z6kAii6SEIu8/1YfhpQRHT0Buq/5gYSCt/yyhWAbePxvHM 9JM5ljKmBx5/URfF54laXK5OxdGVC8kLACkaVv13vHv1iVrE9D7e1GglfjdiTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703839584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpzg+ZVG1D7rYagOkbHsiW14vvQPRAIl6E/T+q1+C7I=; b=DJ2L8fPhdnQ+buEwuUXqgglZlnOrESt+4/LhV+TaTH1AEr5WRgO/C0xOhzYlbeqIEB2PVq rjW0GPY7ITN2FpFnFmmfDFOhn+TZjattXiHNDeWKZ0zxMFx5tYH9pfcNqaTjFcU/I09D4a AZUAMApqf4/4bGjSinRQASB4JJA57J9RFtDMi39Yc44IkPf5PabkfKXIYoLb2k258320Gl +vhZHPC1NbG705UqnW+T1Kd6Mh+3nAMXRgHebLHpglD3z7y4aBrxyXvDgARvSeWQSAyELK ygmOGSH88ICGrtAImii1oVw8DYpk0D/nYt78brLhBrc+gNRd9LaoMfD3Z8p+XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1f9r4GNfzyrq; Fri, 29 Dec 2023 08:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BT8kOWZ029921; Fri, 29 Dec 2023 08:46:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BT8kOiO029918; Fri, 29 Dec 2023 08:46:24 GMT (envelope-from git) Date: Fri, 29 Dec 2023 08:46:24 GMT Message-Id: <202312290846.3BT8kOiO029918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 2f036705f337 - main - Document the two recent newsyslog(8) change (-c option and configuration option). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f036705f337f61cee5a3b4f570b023c3da29895 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2f036705f337f61cee5a3b4f570b023c3da29895 commit 2f036705f337f61cee5a3b4f570b023c3da29895 Author: Xin LI AuthorDate: 2023-12-29 08:45:52 +0000 Commit: Xin LI CommitDate: 2023-12-29 08:45:52 +0000 Document the two recent newsyslog(8) change (-c option and configuration option). --- RELNOTES | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/RELNOTES b/RELNOTES index 509cf36c070e..adb9ca67aa0c 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,26 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +61174ad88e33: + newsyslog(8) now supports specifying a global compression method directly + at the beginning of the newsyslog.conf file, which will make newsyslog(8) + to behave like the corresponding option was passed to the newly added + '-c' option. For example: + + none + +906748d208d3: + newsyslog(8) now accepts a new option, '-c' which overrides all historical + compression flags by treating their meaning as "treat the file as compressible" + rather than "compress the file with that specific method." + + The following choices are available: + * none: Do not compress, regardless of flag. + * legacy: Historical behavior (J=bzip2, X=xz, Y=zstd, Z=gzip). + * bzip2, xz, zstd, gzip: apply the specified compression method. + + We plan to change the default to 'none' in FreeBSD 15.0. + 1a878807006c: This commit added some statistics collection to the NFS-over-TLS code in the NFS server so that sysadmins can moditor usage. From nobody Fri Dec 29 09:40:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1gNT63VDz55kWx; Fri, 29 Dec 2023 09:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1gNT5ccGz4sMC; Fri, 29 Dec 2023 09:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703842841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8VXJXVNRb2q9yEHP2GRvEBVnzJxY2crWS5te8ljp00=; b=yGsYX6Q1BRLWJzX+fDn9kShVGrx2NnbdlVTkyomX1ZLeLUyfZG5tgqpcEzpz0bE3tjlVdz HgABHxgT4znwOrCyHETullpX+uTGe6Si3My1K2z5VsIGKIwKkfjTbfu1HwYumcwYKSzUoj QYOvIKe/A+/slIkAd5LeGr4583cxg/y73nuYo9UrptdQHNmdUa6jjo1gpQODwBEVETeN4u Lob1AaZI/oJtHPOpCKggSHeWrFWwG6Se3l9NsacGYNY25AjAXiu1wKnyjU1eRfRxxkdAF9 lebxtYn5TzbhCYSGEwDCNWjnElOM8UXi7KqF+DtbHEGxjYsaZ8CXnt+YDR0hCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703842841; a=rsa-sha256; cv=none; b=sgHEVMrgoX3udhFs/aMRb2kx2LEfzrBU0FjKpUFm1UVhXo03BckQ40ZfrX/D6trWfj6lQD 8oqVpCH+VdYOESN+BAB5uU/koCLPMDlWDbjZRzy+o43tw7JIXzZXjDDxYfkOIyh+vJQXEg WZclMVLrlfN2Fwqg01LK8AFtaTlJSN9zN9kdP3Iejw/mFGuL581AOKkIs6mJTM38g3sdzg LMljE6U1nxYsey/Q9bOvj3Xk/AdgkEeHCuipChbkocgETpp+qqn6cXXCmJyVYTY1IgqaJS 0MNkGG8vwfuEdTmcQ4pvfP33hFpQDEE0lSG/jvILelEwvE/t733T75hK76DfcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703842841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8VXJXVNRb2q9yEHP2GRvEBVnzJxY2crWS5te8ljp00=; b=Q0wf3tUmY/9PMmb2UDlKTd8f16XpKyZ+iYC7cpQ2XHpi31t5U06ianyA4trQNpcYUmBAbF gLcbGiWuiAtplXBXTIpq+H2iRSxrUJaPLyJLzE5pAqXkVqp3cW+8dy9seBKilSEUVZ/NI0 YJ7TvagoAHHFqyCmwBXlUV7EH1dkYy/su/gc3+tbfWui2OSfglM1E7RwOe5z4smGf38WHC VcGfeRTAIZVvVc+jrpB4YmfwhB4wACxoAlN6HQnM5FXyHXQxwvGY9CjMunPqWEqMXw1KBW H91ryyi6cfWV1m+JF8K0Za1jF0GPce7y7PHcgGHCYPA9Fpemt1BhbdCwfWuSYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1gNT4gZlz10hR; Fri, 29 Dec 2023 09:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BT9efCe022756; Fri, 29 Dec 2023 09:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BT9efqc022753; Fri, 29 Dec 2023 09:40:41 GMT (envelope-from git) Date: Fri, 29 Dec 2023 09:40:41 GMT Message-Id: <202312290940.3BT9efqc022753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 9035bfffede5 - main - indent: make the URL of the manpage two characters longer so that the test is successful List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9035bfffede56ce5c8520b864a800559f6bf99ff Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=9035bfffede56ce5c8520b864a800559f6bf99ff commit 9035bfffede56ce5c8520b864a800559f6bf99ff Author: Wolfram Schneider AuthorDate: 2023-12-29 09:37:43 +0000 Commit: Wolfram Schneider CommitDate: 2023-12-29 09:37:43 +0000 indent: make the URL of the manpage two characters longer so that the test is successful --- usr.bin/indent/tests/comments.0 | 2 +- usr.bin/indent/tests/comments.0.stdout | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/indent/tests/comments.0 b/usr.bin/indent/tests/comments.0 index 08d58fca37f2..6c40b9acfacb 100644 --- a/usr.bin/indent/tests/comments.0 +++ b/usr.bin/indent/tests/comments.0 @@ -10,7 +10,7 @@ void t(void) { /* * Old indent wrapped the URL near where this sentence ends. * - * https://man.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=freebsd-current&arch=default&format=html + * https://man.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=freebsd-current&arch=default&format=html&x */ /* diff --git a/usr.bin/indent/tests/comments.0.stdout b/usr.bin/indent/tests/comments.0.stdout index 655c3e0a8950..bc3f7ace6b9b 100644 --- a/usr.bin/indent/tests/comments.0.stdout +++ b/usr.bin/indent/tests/comments.0.stdout @@ -12,7 +12,7 @@ t(void) /* * Old indent wrapped the URL near where this sentence ends. * - * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=freebsd-current&arch=default&format=html + * https://man.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=freebsd-current&arch=default&format=html&x */ /* From nobody Fri Dec 29 10:17:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1hBq26Vtz55nWt; Fri, 29 Dec 2023 10:17:23 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1hBq0MQ2z3DH3; Fri, 29 Dec 2023 10:17:23 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703845043; 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=d/+yKCgsBhhsOx1DLTHbu9hAwMZ/vkln3z9HHgl1bF4=; b=WkFdcRBKeHB23duafZh8fdRvhwcmQSt7SKL5CF+Fd5ymzll/H5Abjwy/y/sTf0WfxNXfmv eUz8JKPUpRIafxFSzSY5kWnaPAoIcXwyntxI4H88Cam38NIltFCfCOm6deofpy7XsUZ0J8 IP1/sjCNAPPGcTgkIeGMwVkT71c89fZC2GHq1VYdpzoA3GYjcYkPbklp3aro14cnLQxRcx u8rP87NDUTSqcAN129ng71YqG5ufgKe7jNDjPFdE0QLXgOF5Yg6okMsOPuNw5TcTRiJouI 7PuwLOhB6Isvw3EEsvsZH64b80Qha8seYOSTwB0qkYF4oDIglkmLb3ezezaTUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703845043; a=rsa-sha256; cv=none; b=g25kYIWlFThhUWCTD5ksd67i1/jcR9yl+DnHaz42Sm/2lwIaGNoCOIZwtn79N1LQ/zy71u CntP3Xn7TPnS6BiXd/vHwsMS5cQktB4v8PVMIEJG0c8YLYQZJvmeCIGCewwt9ycyPRkO64 w0yFICz5bT6cSKgCqapIBc8vGverghzbnfv43ir9GQVh7Z4xykA/a/evucNl0jinmZpylN eFyQcwIzToywuw6ReNLWeygbnilFrVDqBEn4nO7eO0RFXs0YsAzRMD54Y9I/foS9780/81 JxcGZ9bro8/mIgVTbV+N1xDl6rg16MDDD0fgDRr+7oupIX473e1UDaLV8HWIow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703845043; 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=d/+yKCgsBhhsOx1DLTHbu9hAwMZ/vkln3z9HHgl1bF4=; b=GKu4/Mw808rzRbFToMLGVxQbcPif00x2crDrgyYBmOhUgWQtRF4l7z7NKM2QK6MC3pUF6q kxnpqh9r/YUzCIslUe89Fog2Ueki9YU6RVkFnFYZZuViYVpHCNoLtYWfCMwlnWIl/4VU5L lSzT4Yn4QzUu5TpuDkJ/k5SBgCOYcYYwUCNjfIj3LU19aOqbxREvj5cqCciOYP0AYkCiLV 9KvstVELN4oAz1tfTaW14MFn0QH1T1h9Ogoy72NKG0mgBvb08uAshkIKnmptXpBhkT09to b+ekqWAu+1HXinYfa7mW83t30STnX3tknlV+Fh+sVy5nGhxpZ505HDe2BHWAiQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4T1hBp5vcbzwBM; Fri, 29 Dec 2023 10:17:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id B695C42A35; Fri, 29 Dec 2023 11:17:21 +0100 (CET) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags From: Dimitry Andric In-Reply-To: Date: Fri, 29 Dec 2023 11:17:21 +0100 Cc: Gleb Smirnoff , Richard Scheffenegger , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <24134FF7-8C03-490D-A476-4EFF4EAD8132@FreeBSD.org> References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> To: Antoine Brodin X-Mailer: Apple Mail (2.3731.700.6) On 29 Dec 2023, at 08:35, Antoine Brodin wrote: >=20 > On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff = wrote: >>=20 >> Antoine, >>=20 >> On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: >> A> > netpfil: Use accessor functions and named constants for all = tcphdr flags >> A> > >> ... >> A> This breaks some ports: >> A> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' >>=20 >> Definitely some ports that use some strange compilers :) >>=20 >> Can you please give at least port names? >=20 > Some examples: >=20 > = https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/= 2023-12-28_20h35m41s/logs/errors/nspr-4.35.log > = https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/= 2023-12-28_20h35m41s/logs/errors/opusfile-0.12_1.log The culprit is likely the "-ansi" option. Just get rid of that, it is = not really useful: cc -o prmapopt.o -c -fvisibility=3Dhidden -O2 -pipe = -fstack-protector-strong -fno-strict-aliasing -ansi -Wall -fPIC -UDEBUG = -DPACKAGE_NAME=3D\"\" -DPACKAGE_TARNAME=3D\"\" -DPACKAGE_VERSION=3D\"\" = -DPACKAGE_STRING=3D\"\" -DPACKAGE_BUGREPORT=3D\"\" -DPACKAGE_URL=3D\"\" = -DNDEBUG=3D1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=3D1 = -DHAVE_VISIBILITY_PRAGMA=3D1 -DXP_UNIX=3D1 -DFREEBSD=3D1 = -DHAVE_BSD_FLOCK=3D1 -DHAVE_SOCKLEN_T=3D1 -DHAVE_POINTER_LOCALTIME_R=3D1 = -DHAVE_DLADDR=3D1 -DHAVE_LCHOWN=3D1 -DHAVE_SETPRIORITY=3D1 = -DHAVE_STRERROR=3D1 -DHAVE_SYSCALL=3D1 -DHAVE_SECURE_GETENV=3D1 = -D_REENTRANT=3D1 -D_THREAD_SAFE=3D1 -DFORCE_PR_LOG -D_PR_PTHREADS = -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ -I../../../dist/include/nspr = -I../../../pr/include -I../../../pr/include/private prmapopt.c In file included from prmapopt.c:46: In file included from prmapopt.c:46: /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' 82 | static inline uint16_t | ^ -Dimitry From nobody Fri Dec 29 11:39:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1k182Vnmz55w2q; Fri, 29 Dec 2023 11:39:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1k18200Pz3NGc; Fri, 29 Dec 2023 11:39:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703849948; 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=P2uQw9eEOLN7R2wtRnwjvvJxmu68IFLfO2G6p/zRDBo=; b=kyph0hzI7O6lieXRmQ7sEPMo78A6cQkxtSloBqRdysB2F0xdXI8dFr6/hY80Q7R3xGaGyF lrrTPZgEGvZErFtS4tvNJHEniuYkLX2/Z3Aj/uQkRCCgwfWIsR5/uizkp8LRDdZwiEwHPi /YXfrMvXp1KF9RVv3Jnp2DDgQ3+tM1f9lJXTKWBf7PF9NtsWBTnMYCbo5d/uufhIXc9OGv QtGPrHd4D4G/z6ISuIzfHswfvNsX8Cus6x3mfSQe17yi9TycvxGcIeaRHq7n5QVRyB0pIs t+aW0F2Z1O7Xd/Ocru/dhWgibh4NOa9IKTrR4nKE+XdfY+f9tNVZBm8YmOblRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703849948; a=rsa-sha256; cv=none; b=b+khgTO4Hspym/KmrS+o6P/q0g+6P4gZYFE9XiGYONMA8br5UBIEdyt4JrhiobN6uXJBqH A5r1pzuCDJqd0etPuxvVwqGs7Wjvi86EAzvb+6giKFVTZ8rwCDs5VAnJCZUyxE/4+1f3vF rfUe9tbXbie+pByprRTLIxmYoIOMPqGC4Noirwf8ZUzLVywZpOdbdBlbBxckbfvUxZMmHo iz0G6p9FP1rC1dLKsAPINXoXzlX9juN0m861sm4DTcJ4gDv23dCcxzj8kvdAwrLL0e0VZ4 W+j6XLuQzMB5xN18Q7nkOqyeDz4oSXBjh0I2/OIPEhcy9Eut/MB60oq4BxNZGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703849948; 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=P2uQw9eEOLN7R2wtRnwjvvJxmu68IFLfO2G6p/zRDBo=; b=cbOQf/+S/y0PkB4dkXim2TSWXqa+1zlCC7KtOMf4t4fRbfXYlREd+Csb7vSOW3v1PQC0vy Y4MkVTO8HphZgUYUvbp3n4BmBaXztUjS/a6Owm+x9NPZHMtqsDbrWhkm1OfIFcIRZNfY1M QLk8A6QO85JRkm530L9fkP1B3Qjpr3XBvH4ra94nhNeLQL+2iO/LIIQ+enX9yZwzBJQplE hH/uaNz8FBUPyBy1hMQTl+jdaxlV9z5PjRN25TiM6tduovdRQKElUtg0xHfCvYyO2hvjvL D05pz1kNJx3XTez2Wp8WkJrgGMQHp4AbmiUKFJlWHKKVe1q39sBY0Yg6wX4yug== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4T1k180GK7zxXv; Fri, 29 Dec 2023 11:39:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id E3E3442C04; Fri, 29 Dec 2023 12:39:06 +0100 (CET) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags From: Dimitry Andric In-Reply-To: <24134FF7-8C03-490D-A476-4EFF4EAD8132@FreeBSD.org> Date: Fri, 29 Dec 2023 12:39:06 +0100 Cc: Gleb Smirnoff , Richard Scheffenegger , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <0452FE2C-00E9-4E06-880B-6F7B56751728@FreeBSD.org> References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> <24134FF7-8C03-490D-A476-4EFF4EAD8132@FreeBSD.org> To: Antoine Brodin X-Mailer: Apple Mail (2.3731.700.6) On 29 Dec 2023, at 11:17, Dimitry Andric wrote: >=20 > On 29 Dec 2023, at 08:35, Antoine Brodin wrote: >>=20 >> On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff = wrote: >>>=20 >>> Antoine, >>>=20 >>> On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: >>> A> > netpfil: Use accessor functions and named constants for all = tcphdr flags >>> A> > >>> ... >>> A> This breaks some ports: >>> A> /usr/include/netinet/tcp.h:82:8: error: unknown type name = 'inline' >>>=20 >>> Definitely some ports that use some strange compilers :) >>>=20 >>> Can you please give at least port names? >>=20 >> Some examples: >>=20 >> = https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/= 2023-12-28_20h35m41s/logs/errors/nspr-4.35.log >> = https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/= 2023-12-28_20h35m41s/logs/errors/opusfile-0.12_1.log >=20 > The culprit is likely the "-ansi" option. Just get rid of that, it is = not really useful: >=20 > cc -o prmapopt.o -c -fvisibility=3Dhidden -O2 -pipe = -fstack-protector-strong -fno-strict-aliasing -ansi -Wall -fPIC -UDEBUG = -DPACKAGE_NAME=3D\"\" -DPACKAGE_TARNAME=3D\"\" -DPACKAGE_VERSION=3D\"\" = -DPACKAGE_STRING=3D\"\" -DPACKAGE_BUGREPORT=3D\"\" -DPACKAGE_URL=3D\"\" = -DNDEBUG=3D1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=3D1 = -DHAVE_VISIBILITY_PRAGMA=3D1 -DXP_UNIX=3D1 -DFREEBSD=3D1 = -DHAVE_BSD_FLOCK=3D1 -DHAVE_SOCKLEN_T=3D1 -DHAVE_POINTER_LOCALTIME_R=3D1 = -DHAVE_DLADDR=3D1 -DHAVE_LCHOWN=3D1 -DHAVE_SETPRIORITY=3D1 = -DHAVE_STRERROR=3D1 -DHAVE_SYSCALL=3D1 -DHAVE_SECURE_GETENV=3D1 = -D_REENTRANT=3D1 -D_THREAD_SAFE=3D1 -DFORCE_PR_LOG -D_PR_PTHREADS = -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ -I../../../dist/include/nspr = -I../../../pr/include -I../../../pr/include/private prmapopt.c > In file included from prmapopt.c:46: > In file included from prmapopt.c:46: > /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' > 82 | static inline uint16_t > | ^ Hm, I may have spoken too soon here. If this port has always compiled = successfully with -ansi, then indeed it may not be that handy to = directly use the 'inline' keyword in system headers. I think most other = system headers use '__inline', which is supported by both gcc and clang, = even in ANSI mode. And if the compiler somehow does not support = __inline, sys/cdefs.h can make sure all those keywords get removed. -Dimitry From nobody Fri Dec 29 14:51:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1pGn07CLz56FRg; Fri, 29 Dec 2023 14:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1pGm6nPBz4KtL; Fri, 29 Dec 2023 14:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703861473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5gQv/pVA2PlUVyDHvtIDK2fjPb63m2xMuaKVoCMDQko=; b=Iv22xxnW8U52399eojKPzzFAHiteIUOZZYH610yAm5FYqi27jm0KGKaSZB7BmsEsywhy2N rh6BuT740yn2xA16b33TxIpvAQj8ulJXb9IFNSLgBKryPs5ilk2qqWWNHVmjkFQdg/Qklj Fx8bqL/bEdBCwNYPNNc0GzE27Kkh+ND/YtSQpVmBs5p/ppJlF29G5rxm8Nu3e8CaBapMwZ C7G8jhuglZcH8y7H8xD578FoUL66549qEzchQXfyzqnBzqJpbOYd75U35pxWZk3WytoFR9 f91wFaTpVQ7k+mMED5fBpSUXeoQBWXZ5e/4B0cM/Ptb67z0bCmWLE/y5mZgwog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703861472; a=rsa-sha256; cv=none; b=e4JBTgwtXM3QLkLsCYAxOO++20MQOdkaP9ix7EREm5Zm3UCEc/ullmHolPCUkSDa3GPiDB JXkHYNc83i+x7wrBfHv4xZOD3UYSYfsUpvvg8dkaN8+IU375crm/2n9+UW/56Gv8VDyMzb eTCluZCsCcxVBlQjJ6tUjE3AzjcUNx5Wln8n8TLitLKYm2JgBqJjWWItxcw7+xyO4NlQ8H R+wLAdr8RrtmSVAsR4hrXpUcC9B+PNJ8Gi2+A2okn6F5EM5ybzu7ISvL9cX6DwT98p9eQp D6sRE6THLv/T3pdZMgX8FACyIZJe2XPo5Hfe9GKPZ7drVy8i8/iFtL5JoyPFDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703861472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5gQv/pVA2PlUVyDHvtIDK2fjPb63m2xMuaKVoCMDQko=; b=rS2X1f2gukOPHFR4xmCt+r4hfVcsL8i5zVDPVyhTDukePUD1JiuGGmDcqpetXfIB3KaX78 BPiOB/+gmbXRMa6ah565x/iKmDzpIMxSaIqlF3w7BB32PLNfDir/4071xa4ZsZsVnnvW/r IB8MRMXPJq+A2wcmIW4+kzk6qqJ9rt6DybtyqKmLVodunbQoGj+kLkD9x1Mk0oGelGcRSr bokknzt0U3ZXGf2HHAGOmcnIS63E1i7w+5RGL4tezR9lI3j2HYaYEHUwdKzUHqpvlernnZ NKBqDUZysO5+KGazCdMpZz3as7hwMjm5+b0NgeHApzLVGer27M2zUvHD2Flw6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1pGm5rwlz18wy; Fri, 29 Dec 2023 14:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTEpC9L047329; Fri, 29 Dec 2023 14:51:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTEpC3w047326; Fri, 29 Dec 2023 14:51:12 GMT (envelope-from git) Date: Fri, 29 Dec 2023 14:51:12 GMT Message-Id: <202312291451.3BTEpC3w047326@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: 56c202de785a - main - tegra210: change to UTF-8 (from ISO-8859) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 56c202de785a5701831ae345a1a5c906e0b2c3e6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=56c202de785a5701831ae345a1a5c906e0b2c3e6 commit 56c202de785a5701831ae345a1a5c906e0b2c3e6 Author: Ed Maste AuthorDate: 2023-12-29 03:53:16 +0000 Commit: Ed Maste CommitDate: 2023-12-29 14:51:00 +0000 tegra210: change to UTF-8 (from ISO-8859) Prompted by Phabricator's complaint that a C source file was a binary file, in D43192. Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D43229 --- sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c index e51cf74a3127..c3bf2d54668b 100644 --- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c +++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c @@ -655,7 +655,7 @@ uphy_pex_enable(struct padctl_softc *sc, struct padctl_pad *pad) goto err; } - /* 5. Enable the PLL (20 µs Lock time) */ + /* 5. Enable the PLL (20 μs Lock time) */ reg = RD4(sc, XUSB_PADCTL_UPHY_PLL_P0_CTL1); reg |= UPHY_PLL_P0_CTL1_PLL0_ENABLE; WR4(sc, XUSB_PADCTL_UPHY_PLL_P0_CTL1, reg); @@ -890,7 +890,7 @@ uphy_sata_enable(struct padctl_softc *sc, struct padctl_pad *pad, bool usb) goto err; } - /* 5. Enable the PLL (20 µs Lock time) */ + /* 5. Enable the PLL (20 μs Lock time) */ reg = RD4(sc, XUSB_PADCTL_UPHY_PLL_S0_CTL1); reg |= UPHY_PLL_S0_CTL1_PLL0_ENABLE; WR4(sc, XUSB_PADCTL_UPHY_PLL_S0_CTL1, reg); From nobody Fri Dec 29 15:25:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1q2R4bfpz56JRs; Fri, 29 Dec 2023 15:25:35 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1q2R2Wppz4N2f; Fri, 29 Dec 2023 15:25:35 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3BTFPY3J030203; Fri, 29 Dec 2023 09:25:34 -0600 (CST) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1703863534; bh=mi9yTQMNWO8725ljb5Yc/ne6yXVdxiSvKG45kAcrMwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kCIAjp6dEa5asqXG16yVVCBoTVloqfCJbhwRPqrGfkca1N/kabffvQK18bLLUOrc2 Z7b2dPPclyIg43PhpmQi2WFAwHnFJkGy+q8T7YKkPsKJGhwi8iJ1iemKOvQMEtjb1U KsO5VjX0zK+kXrulLPP6uGaSxM6nv5cmJYxAtmnyItGygNuxe2o5l122fquK+AU/Tu Ul6StrLiUNFJj9gKjQO3TgeDFVv04fVeum83X2Dd5V6Sl3dvofxITjf6Vj5GbR1ffd Z2VVbeBZ5JVFhhqePFjy4MjlYhGswg/TrxvrLpOz2Ia3P/mHYH9++tprWVGoGTqxk5 DXjhIslDa5N7g== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id //l3Du7kjmX5dQAAs/W3XQ (envelope-from ); Fri, 29 Dec 2023 09:25:34 -0600 From: Mike Karels To: Xin LI Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2f036705f337 - main - Document the two recent newsyslog(8) change (-c option and configuration option). Date: Fri, 29 Dec 2023 09:25:33 -0600 X-Mailer: MailMate (1.14r6015) Message-ID: <90D0905E-AA46-4351-AEE0-9ED9D835DB50@karels.net> In-Reply-To: <202312290846.3BT8kOiO029918@gitrepo.freebsd.org> References: <202312290846.3BT8kOiO029918@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1q2R2Wppz4N2f On 29 Dec 2023, at 2:46, Xin LI wrote: > The branch main has been updated by delphij: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D2f036705f337f61cee5a3b4f= 570b023c3da29895 > > commit 2f036705f337f61cee5a3b4f570b023c3da29895 > Author: Xin LI > AuthorDate: 2023-12-29 08:45:52 +0000 > Commit: Xin LI > CommitDate: 2023-12-29 08:45:52 +0000 > > Document the two recent newsyslog(8) change (-c option and > configuration option). > --- > RELNOTES | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/RELNOTES b/RELNOTES > index 509cf36c070e..adb9ca67aa0c 100644 > --- a/RELNOTES > +++ b/RELNOTES > @@ -10,6 +10,26 @@ newline. Entries should be separated by a newline. > > Changes to this file should not be MFCed. > > +61174ad88e33: > + newsyslog(8) now supports specifying a global compression method dire= ctly > + at the beginning of the newsyslog.conf file, which will make newsyslo= g(8) > + to behave like the corresponding option was passed to the newly added= > + '-c' option. For example: > + > + none > + > +906748d208d3: > + newsyslog(8) now accepts a new option, '-c' which overrides all histo= rical > + compression flags by treating their meaning as "treat the file as com= pressible" > + rather than "compress the file with that specific method." > + > + The following choices are available: > + * none: Do not compress, regardless of flag. > + * legacy: Historical behavior (J=3Dbzip2, X=3Dxz, Y=3Dzstd, Z=3Dgzip= ). > + * bzip2, xz, zstd, gzip: apply the specified compression method. > + > + We plan to change the default to 'none' in FreeBSD 15.0. Sorry not to have noticed this in the review; it was only when I saw this= message that it sunk in that we now have *three* ways to specify compress= ion, and I'm not even sure what the precedence is. I would have thought that would replace -c. It's a mess if the config file has entries that specify J and X flags as well as none, the config file has zstd, and the -c option is given as well. We now have a knob to override the knob to override a knob. The only reason to keep -c that I can think of is to specify a different compression in a single invocati= on, but as noted, changing compression requires manual operations that make it unreasonable to change it invocation by invocation. Also, using the -c option or (except with legacy) loses the ability to specify different compression types for different files. People have objected to the term "legacy" as well. I still think it would be much better to add an option letter to select the default compression as specified by . This would eliminate= the need for "legacy", and it would add the ability to have both a global= default and an exception. I think the redefinition of the existing flags= to have different meanings if is given is messy. The entry for -c says that we plan to change the default to "none" in 15.= 0. Hopefully that would be done via and not -c. However, there was significant pushback on "none" being the default. Mike From nobody Fri Dec 29 16:56:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1s3Z6Ksjz54Vq1; Fri, 29 Dec 2023 16:56:42 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1s3Z5TrTz4W2X; Fri, 29 Dec 2023 16:56:42 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703869002; 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=mVFTx6mH4c/KFphjwvXt9pfgoOy7O58C82TrEGPSk/s=; b=oKVlDukHMJuYiUH/U6srdVHtisjViYljMW9uaSZOWaUubvVdsvZBewArfctgwPZmx82Th0 yR9RyhuYHpBpnHHIBWkSymLy7OhAILQ11JtqsnQMk3nXAOPOjQEkBLjPLOCmT2crJ6RtkX I67E+MhIELPUggqFmau+Ko+DlYqsmgnpkjRrcAl5somgj4GiD3oeHFPfqQ7IMI6nJJ+Nqg VMqfUhZiZfdLZrog/gvmYEzItDxEnFvSMUrLd5BASYleYkVNtHtJu6hMDM1ubpUzQc1Olg T+kWcONm8bja18HS+45/DBn4FfVM2UDQPF1+3QWjz6PGrYpvmko/T6JUMN/Zog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703869002; a=rsa-sha256; cv=none; b=THWHiUtf3YFSl+OkZm7PObEe/tD24hOAYQjEMfgTDVZFc0FBv4+YAETdd8skg0jXaQiRXx NrMjNaLgacYsJ5owfFJo4sPKmHnT5TMXAy6ZEBDrk+xahLrm6T4PKoASwQAKVYCtQZv3w7 SGag7vVS3LMdCMyQaGvn6TWN0yxNjJ/SQIfYD+01hyyrTG8ETm4dOdcWLT1jSE5ImFFUhg Krs93doA24zuwaQz7j9Ydcuha68wbIMPFgjHz3KU7wytzAvmhr5p+OfporPZlRPX6Tss8C PEr8YTKo9n03P1SEX33u9nt0ZB9H9GpKbn76rATNMR567PA+P/mEXybxSFPZ3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703869002; 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=mVFTx6mH4c/KFphjwvXt9pfgoOy7O58C82TrEGPSk/s=; b=lZaQkhpQNAVkDKHMw7DlhoLPUq0f1NjsTfG7J68ED/NrGIT0c0OyCzLeGK2YL3wPOKNlBk BbJH0CNnzb3+aXCZRSVwXa2qMgAUoOYNWNjwWqnFHIlXA25CmBPP22mNjQDk8BJ0pMst8q 2P7G8VAJGLd89k44X0tQUkJMwbqw0efVTFIAwHMyX2koc/PnTKE0NT+d4lb1jpvY8eIcBN y8juR0gfob2NQ8NfwqmIVG+ntAgRUF/OmiSEVi7xE5rNH/i9IV2eyf7u1M2eob65jw5Upa wkoYO4UsG92UKZp8uxAz946bQ5vATjzV/gL4QWX22Pq3IH4RrkeTrmdzIexN7g== Received: by freefall.freebsd.org (Postfix, from userid 1033) id A968636CF; Fri, 29 Dec 2023 16:56:42 +0000 (UTC) Date: Fri, 29 Dec 2023 16:56:42 +0000 From: Alexey Dokuchaev To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 56c202de785a - main - tegra210: change to UTF-8 (from ISO-8859) Message-ID: References: <202312291451.3BTEpC3w047326@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202312291451.3BTEpC3w047326@gitrepo.freebsd.org> On Fri, Dec 29, 2023 at 02:51:12PM +0000, Ed Maste wrote: > commit 56c202de785a5701831ae345a1a5c906e0b2c3e6 > > tegra210: change to UTF-8 (from ISO-8859) Why not to plain ASCII? ./danfe From nobody Fri Dec 29 17:52:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1tJ62mhtz54bXy; Fri, 29 Dec 2023 17:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1tJ625mVz4dnK; Fri, 29 Dec 2023 17:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703872358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DkBBQD1Rsr1/6iBGh/c2HaRsvCHTPF8EJn45DHMHmAc=; b=ieDIw1mNfp5W06KHrYoPUCsckMWEYjpqKLsmBZUpuKtTz/TdP2r3aShWUApblH3IIIMl8t nPB1hlxkh0Lgak+47a8pmh/OkI0GmnpCm0+JzYluldi5v2GopFLEdfYWNEwslpbO+/ISWA eTt3bJrxRwaXQ1IgUPkbEgIKqDXTO45rBoe9x74hUD3VY5TbC4Cb5AC1KkJly2X0Qth/uq u1bubo70M9n0Sbnnb+/Il+ke0s50ObnQiYddoEmBo0lVtVOqO/JHBvHNtHophx0khHkd8P /K8g5JRvbcdjACvWbJFXot/gfqsEWfJyFNHh7jRz1MOdWnsPY8ISCqRCR4hljw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703872358; a=rsa-sha256; cv=none; b=KLijCwpUNz66Rj1kLmgb9Zf6BdgK9d3uAPFecLVSvtHnjKRfK1tC2FH3CqgfxXnZwX15ZY 2bdpm6R72xSC/XRI/VEyFSpS5fbuw8cxUhRAM5rJ+W5RF9sEll68fiLjv+0JWBQjEJ6TWO wewCrFHcBBMeyM25QDICU9K5tZ3JZBBFCV2B/uHtTA2MBpbc75oKa4YC8v6hDGavg/n0ZO ESXSDIj8SBlZ8COvPxm7SUXOD+UkCXwxfh3aDmdidrEqVRb08TqG+hjRYcyiBUH5Zl2Wi8 3dUMJCDIQ1VBYTLQioRsrf82yK2xod1llEG7khaJ+KpwYflYJghfeWo9pi49Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703872358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DkBBQD1Rsr1/6iBGh/c2HaRsvCHTPF8EJn45DHMHmAc=; b=XZAI+u/qrNo52WMfAKBtLkoPvqPv9QIp//1mOER0iBoXEsk6lGK/soG0ZxYrqgKeBhd6zy dVNDjh+9N1KNHN6Y+0KQF0apQZ0jlW9+fboH5MjPjLjxQIBuiz3Vk6ZjYCl14mJV+zZRRW IrfZ/+7SgB61YtLs6OMogqsnY6aVFBVv0DSV6po8TU3AOh0LSqa33Y+B1f/CAWu4An5i5h cGUuE515iyECPmRnwkegHz4RuK2gKZWpWlj1zWeyTnQ9xZk8lYtf6bt7nU0qA4Meh6uZ8Z lsLQdj9yRuZeU/eNNh0ciXq3iZ1TkmxbKPpykwRQCqCaPwIrgXlCx/AB27Jhaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1tJ618kkz1CC; Fri, 29 Dec 2023 17:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTHqcfl052113; Fri, 29 Dec 2023 17:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTHqcrg052110; Fri, 29 Dec 2023 17:52:38 GMT (envelope-from git) Date: Fri, 29 Dec 2023 17:52:38 GMT Message-Id: <202312291752.3BTHqcrg052110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: b831c7732c71 - main - bhyve: increase SNAPSHOT_BUFFER_SIZE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b831c7732c718a46642e6237fefcb5b29872e966 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=b831c7732c718a46642e6237fefcb5b29872e966 commit b831c7732c718a46642e6237fefcb5b29872e966 Author: Vitaliy Gusev AuthorDate: 2023-12-29 17:37:43 +0000 Commit: Robert Wing CommitDate: 2023-12-29 17:52:40 +0000 bhyve: increase SNAPSHOT_BUFFER_SIZE After commit fb51ddb20d57, suspending a vm fails with the error: vm_snapshot_buf: buffer too small Sponsored by: vStack Reviewed by: markj, rew Fixes: fb51ddb20d57 ("bhyve: increase fbuf display resolution limit") Differential Revision: https://reviews.freebsd.org/D43218 --- usr.sbin/bhyve/snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 5569cc065617..9bb7873f1d25 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -102,7 +102,7 @@ static sig_t old_winch_handler; #define SNAPSHOT_CHUNK (4 * MB) #define PROG_BUF_SZ (8192) -#define SNAPSHOT_BUFFER_SIZE (20 * MB) +#define SNAPSHOT_BUFFER_SIZE (40 * MB) #define JSON_KERNEL_ARR_KEY "kern_structs" #define JSON_DEV_ARR_KEY "devices" From nobody Fri Dec 29 18:14:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1tnc3jKKz54tQb; Fri, 29 Dec 2023 18:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1tnc39Z9z3CG1; Fri, 29 Dec 2023 18:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703873684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJOaoOTSGRLkYtTKsDi4unVczCBctucvBmMaAixq3jw=; b=appw8sg77UHQHplO/XZLIfUkwX3lnVKdcUBbihy0qIcl8qjFk+KB9tzQCscNXa8zlL+wOe 1B0oS1aV++fNbVWUx3jj5vg7fM5BmDU8Afsos6DUvT05Z9LnAQWzOQDkImXhFkb4MmdMuB wq0LVziOSJqiiL9y6+vaEee49MMJq1itjq4k5C9Meku5465X1yO0aiMv8tNKNVdZjjoep0 CsMsfO9xhCzyP8shAoFML5GzzRUdAFV9qDdqRSOymdhQHLh47iBDwVrCxWNadP98b2gEhn 3qVOxfRpSR/kN4En0VW1umiKojckJg7E2Ghur44rGI325LMMRnjIl9Dxl0EPeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703873684; a=rsa-sha256; cv=none; b=rgOnVRw2rf4vrgVDzvlj8fQvN1hh62zvKxRTLzCrGX9aq7jY5Vqdbu8A0Oo3yfXN3eVa2H MtHbWCHKm4+ORAezsRluPx5XBHaneHtaXbgzWvfZ5udBlO4THLHQnFcqDl/Hnri6hdXh6/ 4sJ2e/eWuzy1QlbK+HKhQOzhwzENkkpIzsaTzHUNHZk2ivDjtYFssxJPc1tM7jHQdyCg59 ONcH5xETRLcxed3IkF1BPUVio0ZjThOOKB3Pmiypzm67DlERYZe/PbNOwU4wfBMA5j1rLU IQiw7ym1+h88BP+CJZXb7wg7M1LP/r4LooJCm9LiZMmSSVM+BO96HhHlUxVwxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703873684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJOaoOTSGRLkYtTKsDi4unVczCBctucvBmMaAixq3jw=; b=ns1K7idVRg0LkChN05xR4kXS6XPYoCnSDhzlJSxDvxVNnTq0FXbTPlepQG/dhjqf3r2MxB KTnT2QuxvgiDT7dr7UlQKa4R6LNaCm5wSoSFw0nlvwMPdZBJfzgceFXTLxuv5d8ukw013F pHuuqyTMX+DgMZbKEoo+WhfrZcXYBzJr3J2559wVA4TxX9K7qxeA7cX78fM1yGuHAYutep YLagXR2EkhAibXj6Fs9CNLWopVOQ/L4saihFZ/kYQ3Ezzfxm7l/aMMGAJ1A7fjkQ8oWCwg WffWyfEiBG1dMxhJm6+B0Ak5m7m8lJtt3E8C2XXP9mpHNkK00LRuUVlc9vVDdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1tnc2CYlz2Lv; Fri, 29 Dec 2023 18:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTIEiPn086072; Fri, 29 Dec 2023 18:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTIEi0g086069; Fri, 29 Dec 2023 18:14:44 GMT (envelope-from git) Date: Fri, 29 Dec 2023 18:14:44 GMT Message-Id: <202312291814.3BTIEi0g086069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 683ea4d22bbc - main - vmm: MTRR should be saved/restored List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 683ea4d22bbcc892ac7c5bb996d1b134831dfdc3 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=683ea4d22bbcc892ac7c5bb996d1b134831dfdc3 commit 683ea4d22bbcc892ac7c5bb996d1b134831dfdc3 Author: Vitaliy Gusev AuthorDate: 2023-12-29 18:03:20 +0000 Commit: Robert Wing CommitDate: 2023-12-29 18:03:20 +0000 vmm: MTRR should be saved/restored This fixes restoring a Linux VM if it was suspended while in the GRUB menu. Adding MTTR increases the kernel dump size by 256 bytes per vCPU. Sponsored by: vStack Reviewed by: markj, rew Differential Revision: https://reviews.freebsd.org/D43226 --- sys/amd64/vmm/amd/svm.c | 2 ++ sys/amd64/vmm/intel/vmx.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 3fda9454090b..f1106158e44e 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -2781,6 +2781,8 @@ svm_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.gen, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.num, meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(&vcpu->mtrr, sizeof(vcpu->mtrr), meta, err, done); + /* Set all caches dirty */ if (meta->op == VM_SNAPSHOT_RESTORE) svm_set_dirty(vcpu, 0xffffffff); diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 317ed7e5d7fb..b7c1544ac0b3 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -4200,6 +4200,9 @@ vmx_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_BUF_OR_LEAVE(vcpu->pir_desc, sizeof(*vcpu->pir_desc), meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(&vcpu->mtrr, + sizeof(vcpu->mtrr), meta, err, done); + vmxctx = &vcpu->ctx; SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rdi, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rsi, meta, err, done); From nobody Fri Dec 29 19:13:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1w5l5WRhz551wg; Fri, 29 Dec 2023 19:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1w5l51Kxz3JFl; Fri, 29 Dec 2023 19:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703877227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F8q5Jh/QnA6lCYy7H5BrL4n/nGuqfc6KVs4/vSzhqdg=; b=bUSRB3OvmWR5T0o23kPLC7AJbWKUnwFyYrC5hoNMT4671LbzPTPc2eIY7zo+QhaNV5WtkH A0R9P+feRwJgTiW6sxMwe0uxAoUMmoLop0XNp+Lgi/ViRRLYR2vPOMwn0REsninr56DdUu tSXvd3aUFf83V/EixDtbtZhjfY4OvoX1KBQFiHb0MoDHSliL6cXpKulJDajVPMLcHp56Kr HM0SnDNsZ5LaYUaju3QoUeRqGpLamG6uULnjtemetIYB2qddPcW/H8YYh2+yK2Vg2vu/1A CcBFK+RIIhTKY1DdRE0lU31yYGUNCoICFUYQocJc11ZdQsHewdEgBm5G0MppdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703877227; a=rsa-sha256; cv=none; b=GQw0WFaeTZvZnOtXdrm+FcOZFVtWmbQJ6GzBwq22/MZZG2LqXHrG+fmIYwBIVC2tKoO+34 t66Syqk93EVExwL4zY3PmX/KEGmMKBdIPZfOs0LGeJqRbSnSBz9oTJg/ts/XG6G4U+ovRS 3BjeSxLPUfAnSkoYgsT5UTYmKQwo7+j9Wf2nQRsvb+CkUiMcBRN59iQVYUrhGUVOTopdiT xDty+dfu5x4oDecoGMDYAKkjGg0yygvEkgzESTxyFDEDVwMdvhMWINi24uIAQZZo5fwunF R7Rebi2PqnXJuPvDdZKz2hmX6cYymOyuKDea2TE6YA/1cjP9CPTGslAoJWXLpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703877227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F8q5Jh/QnA6lCYy7H5BrL4n/nGuqfc6KVs4/vSzhqdg=; b=oCtAhAp5LrIDXx89PCmf89+aWkLw2dQuFYBR05l43fTzhj3svlKDzMls4yV4SCuXkRtLLh 9rGdoEohwSyM7cKAHezWib3zUKOz9GLLd6lOsOQXFo+MDYllky+YvOIaHmPlmjmT+CBSuN ALh/BPRhmAAqVBDll+xye+7kGVpZhhoGyJxCrzxZiVajYrNNu5AbD/1gWiYluWNfPDSyQP +EeXt/7IEkZNIXCHbp/nmlhv834I/E1kRVKdx6r8Fsbwf7zHQKXisvTntSfRuQGkdmMnct Cb+m3IMjCPTI/4e3CktodOBsgEXvP+UN4NOr8hajSxIsshHnHXJSG0P5+ZoBXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1w5l43fvz3kF; Fri, 29 Dec 2023 19:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTJDlZu087295; Fri, 29 Dec 2023 19:13:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTJDl3L087292; Fri, 29 Dec 2023 19:13:47 GMT (envelope-from git) Date: Fri, 29 Dec 2023 19:13:47 GMT Message-Id: <202312291913.3BTJDl3L087292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 3358108a38f0 - main - llvm: Support: don't block signals around close if it can be avoided List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3358108a38f0efc7e7a143aeda80c941946fef77 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3358108a38f0efc7e7a143aeda80c941946fef77 commit 3358108a38f0efc7e7a143aeda80c941946fef77 Author: Mateusz Guzik AuthorDate: 2023-12-29 18:51:56 +0000 Commit: Mateusz Guzik CommitDate: 2023-12-29 18:52:12 +0000 llvm: Support: don't block signals around close if it can be avoided Signal blocking originally showed up in 51c2afc4b65b2782 ("Support: Don't call close again if we get EINTR"), but it was overzealous -- there are systems where the error is known to be fine. This commit elides signal blocking for said systems (the list is incomplete though). Note close() can still fail for other reasons (like ENOSPC), in which case an error will be returned while the fd slot is cleared up. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D42984 --- .../llvm-project/llvm/lib/Support/Unix/Process.inc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Support/Unix/Process.inc b/contrib/llvm-project/llvm/lib/Support/Unix/Process.inc index 2babf07944bf..c8b15cb759df 100644 --- a/contrib/llvm-project/llvm/lib/Support/Unix/Process.inc +++ b/contrib/llvm-project/llvm/lib/Support/Unix/Process.inc @@ -235,6 +235,25 @@ std::error_code Process::FixupStandardFileDescriptors() { return std::error_code(); } +// Close a file descriptor while being mindful of EINTR. +// +// On Unix systems closing a file descriptor usually starts with removing it +// from the fd table (or an equivalent structure). This means any error +// generated past that point will still result in the entry being cleared. +// +// Make sure to not bubble up EINTR as there is nothing to do in that case. +// XXX what about other errors? +#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \ + defined(__NetBSD__) || defined(__OpenBSD__) +std::error_code Process::SafelyCloseFileDescriptor(int FD) { + int EC = 0; + if (::close(FD) < 0) { + if (errno != EINTR) + EC = errno; + } + return std::error_code(EC, std::generic_category()); +} +#else std::error_code Process::SafelyCloseFileDescriptor(int FD) { // Create a signal set filled with *all* signals. sigset_t FullSet, SavedSet; @@ -269,6 +288,7 @@ std::error_code Process::SafelyCloseFileDescriptor(int FD) { return std::error_code(ErrnoFromClose, std::generic_category()); return std::error_code(EC, std::generic_category()); } +#endif bool Process::StandardInIsUserInput() { return FileDescriptorIsDisplayed(STDIN_FILENO); From nobody Fri Dec 29 19:25:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1wMV6TlFz5531m; Fri, 29 Dec 2023 19:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1wMV5vJyz3Jtt; Fri, 29 Dec 2023 19:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703877942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTZ0nzNSKVd7GewhOZCuyZrdfz5scD5y2kuXb6VJK18=; b=VOCpUTN5+rlkno6ezgzovqezIOPMxmgqM3jiV0/kvh5o7ygzcwwBVaB9NTPBhekdWWwkFy AF3xqS7nT3p8smBsM/Su9c0ycdYtDAscLa0306neWH/ZFY6jrHYn+bfUwAs0HQ7tqrJJfs 9TwwVWOJShC90F8ZArr0fX+jHnG7W+gZeIA1Zs0yrysf+J4/IFXpHiptJToDyNJdFUAwiM upKuhi6HJWLB+jfME8Ue2wYvrFEqkNg8UzbOuhl62o5eA2kewBAS1Jvl3qYifaWnrFNrRl tuJ8HH1eeT6Mnq73kUbwlBPpgvm8fq+YSehN5j3BXC3lUGGTkGRcOwbbBkVspQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703877942; a=rsa-sha256; cv=none; b=a/lqWyNKfXh0TwdthLi2c4HtKrBnSexXw/brtn6kYgdfF4XvZBxHwbWEZ11iHVQsJNSM0V mjfOww4xHN1e6epwDz+SRD3/UHFU3i77o1IWQtzIwaNqGTsWuvXyClmGUOq5kX/ptYJNKh 6gWOEGxyoH8vdLVcJj2IL+auNeWtAWolMJOjVGmFmQ6I0mbtNeMGpo0tT1crz96W5PE+GB CRmox/+bwBhrjL1g1fvwXboN2nWAy0wKBlkdm+m/etjE6Q1ExYy/dzerpdCLEBoATJHnR+ Ylx+rvFxZbQ6kgGGMhHjnabvRTaeA359WS/D6BMQUM9fjsQKfN0KgUlIwoXKNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703877942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTZ0nzNSKVd7GewhOZCuyZrdfz5scD5y2kuXb6VJK18=; b=dHbp1dYml9cSjkva0rHjKABGSNRPFr9ClgO3sHVnUGC88FI4CEzxy09zyAgBBmH3/m9Ome Sezuy/nL5qPvthZMMIw/M4xHBOposp5KPtFvDJWKDLeR6/P3qKaECYxr/JnS2u6iFE4ESJ NsRPg5pcM8N8IKJ8hfV0FU3QPkfmp3YN59LKFKIP8Sqqwp6Tt122liyRLbWiuCt5mVTxJg 1+0Jx5GgcFQxdB/tDS4Ej0U9GHdBkwnpa6U/oBwsU70McIC1NAcAV0okz/k2w6biBYCYkZ s03QdciZ8KbfjuCbbE0PRqNGtdoHu8uX22MNXw0Yi+x2royBgx40hE840mXRdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1wMV4xvlz3jC; Fri, 29 Dec 2023 19:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTJPgvS004119; Fri, 29 Dec 2023 19:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTJPgDF004116; Fri, 29 Dec 2023 19:25:42 GMT (envelope-from git) Date: Fri, 29 Dec 2023 19:25:42 GMT Message-Id: <202312291925.3BTJPgDF004116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Kenneth D. Merry" Subject: git: cd95f18c477c - main - camcontrol: add support for Toshiba drive firmware update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd95f18c477ca30c3ba6f98577d321f56b1e8439 Auto-Submitted: auto-generated The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=cd95f18c477ca30c3ba6f98577d321f56b1e8439 commit cd95f18c477ca30c3ba6f98577d321f56b1e8439 Author: Kenneth D. Merry AuthorDate: 2023-12-29 19:23:51 +0000 Commit: Kenneth D. Merry CommitDate: 2023-12-29 19:23:51 +0000 camcontrol: add support for Toshiba drive firmware update Thanks to Toshiba for providing the SCSI spec for their latest generation drives so I could confirm how they operate. The firmware download works in a pretty standard way, so this is a straightforward table addition. sbin/camcontrol/camcontrol.8: Document that Toshiba drives are supported for fwdownload, and that it was tested on TOSHIBA MG10SFA22TE 22TB drives. sbin/camcontrol/fwdownload.c: Add TOSHIBA to the known SCSI vendors list for fwdownload. Sponsored by: Spectra Logic MFC after: 3 days --- sbin/camcontrol/camcontrol.8 | 2 ++ sbin/camcontrol/fwdownload.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 0151376ff39f..ae6d896752fc 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -1700,6 +1700,8 @@ Tested with Constellation ES (ST32000444SS), ES.2 (ST33000651SS) and ES.3 (ST1000NM0023) drives. .It SmrtStor Tested with 400GB Optimus SSDs (TXA2D20400GA6001). +.It TOSHIBA +Tested with 22TB MG10SFA22TE SAS drives. .El .Pp .Em WARNING! WARNING! WARNING! diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c index 2ab18c93392b..569021c2bfc1 100644 --- a/sbin/camcontrol/fwdownload.c +++ b/sbin/camcontrol/fwdownload.c @@ -83,6 +83,7 @@ typedef enum { VENDOR_SAMSUNG, VENDOR_SEAGATE, VENDOR_SMART, + VENDOR_TOSHIBA, VENDOR_ATA, VENDOR_UNKNOWN } fw_vendor_t; @@ -212,6 +213,8 @@ static struct fw_vendor vendors_list[] = { 0x8000, 0x07, 0x07, 0, 1, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, {VENDOR_SMART, "SmrtStor", T_DIRECT, 0x8000, 0x07, 0x07, 0, 1, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, + {VENDOR_TOSHIBA, "TOSHIBA", T_DIRECT, + 0x8000, 0x07, 0x07, 0, 1, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, {VENDOR_HGST, "WD", T_DIRECT, 0x1000, 0x07, 0x07, 1, 0, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, {VENDOR_HGST, "WDC", T_DIRECT, From nobody Fri Dec 29 19:32:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1wVz12h1z553lG; Fri, 29 Dec 2023 19:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1wVy4NXPz3L5W; Fri, 29 Dec 2023 19:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703878330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEAtZNi54zOEQ8w8at74n4Dlw18kRf19UMI+irB7bFg=; b=pJcHHGv1OLl9ztYfHIxOFzQDj2pICXE8xCmsT+WebfyIKf9Ll2Nw+p/Y/oxYOHwjMsYJ1b GdbHQoVmn3HIj52PvOIejNBRgOos/pawi3nIf5S3U6AjGvSuAt8lqouhhGDHsGWY6bD5f/ 0Y67zyyYpomhlMBgQdWqPAFjL185VEJONu5ySb14P+5JsTWUQRCvdMDGnStA+0oS/Yhi3Q JMR7+N6hzIqU6yYr48Hu5T7GzA4q5yen786eDOcqp4zz73Z1fkcQVq7As0l8254irHP4ay ISq6rNQfnfetJe9KrehJFm3XZobgyIZFvlRiZOBtmJ0oJQZnq5j7FcaRVDKbtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703878330; a=rsa-sha256; cv=none; b=EnGEwjU9x9s6s917n1BU0BuGAh7RCfz31VLfONJm3nHnSkS28R2M2RxRov3/fzDtQVYRgg JWPdXiYrkDF5gzy0MEia5BrrWiw2kzIlEiGxmvCtoVyR2Fgxj0zL1gv/t53X75DBPXvSwu CL+Vk8JaLSFr1kTsS2KCwNlBuBWEBlesAcLof3DUaJvAjieAc4j/+LSK7uDblIM2DiHw3m ZjFuYJaDVmfyC46bzBGcVFV1y/R79iaS42PKJd3NfC3b/c9/o+DXKUCgFE/7lA/JQJH/kV RSLjGBThiuITtKD9i97lY4i7SI6Klg0Ay+eNLAKOuKW+Vdmwb9Pnlna4XivHOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703878330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEAtZNi54zOEQ8w8at74n4Dlw18kRf19UMI+irB7bFg=; b=LDffvaBGN1avbX/FC/O3tfiaxJT1Gb1NoSxSXMcfMxZRRmoM4sh0mIYGCgcNACY1zwreTh tcbSaBqk60N/Oasi6ATS+2FmtyF08WhjRAOrRMOW5aSKLABnt7XBLWR/rOoItdL/ZiLNVx CkJi+s8c13FnDN/H4/crZntP1pxfPzGPifm2kQq1cIcoMkGhF72n0hxhtumEhafeFsInqA HXwtaqev+aUfNfYUik1yDpknqbO4zf4OXNxgljF2Zmvkj27aCZPCC7XaWiLpnmFEXWuhZm 1sjsbFYEBrXM29HDSDAaCXqcTqK2RmhAREp1ImgHZPWmXAKByYfWBmE0ahHphw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1wVy3Skjz4PR; Fri, 29 Dec 2023 19:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTJWAVN018505; Fri, 29 Dec 2023 19:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTJWA5o018502; Fri, 29 Dec 2023 19:32:10 GMT (envelope-from git) Date: Fri, 29 Dec 2023 19:32:10 GMT Message-Id: <202312291932.3BTJWA5o018502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 79639686401b - main - Merge commit c97a7675eea4 from llvm git (by Qiu Chaofan): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79639686401bedbcbbf04eb71e0acb1cc7dcbbcb Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=79639686401bedbcbbf04eb71e0acb1cc7dcbbcb commit 79639686401bedbcbbf04eb71e0acb1cc7dcbbcb Author: Dimitry Andric AuthorDate: 2023-12-29 19:30:45 +0000 Commit: Dimitry Andric CommitDate: 2023-12-29 19:30:45 +0000 Merge commit c97a7675eea4 from llvm git (by Qiu Chaofan): [PowerPC] Expand FSINCOS of fp128 (#76494) This fixes "fatal error: error in backend: Cannot select: 0x6d420285c0: f128,f128 = fsincos 0x6d4202b6f0" when compiling s_cpowl.c for powerpc64le. Upstream ticket: https://github.com/llvm/llvm-project/issues/76442 Reported by: pkubaj MFC after: 3 days --- contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index d4d2da55160e..547b71a6101a 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -1166,6 +1166,7 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM, setTruncStoreAction(MVT::f128, MVT::f32, Expand); // No implementation for these ops for PowerPC. + setOperationAction(ISD::FSINCOS, MVT::f128, Expand); setOperationAction(ISD::FSIN, MVT::f128, Expand); setOperationAction(ISD::FCOS, MVT::f128, Expand); setOperationAction(ISD::FPOW, MVT::f128, Expand); @@ -1401,6 +1402,7 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM, setLibcallName(RTLIB::EXP2_F128, "exp2f128"); setLibcallName(RTLIB::SIN_F128, "sinf128"); setLibcallName(RTLIB::COS_F128, "cosf128"); + setLibcallName(RTLIB::SINCOS_F128, "sincosf128"); setLibcallName(RTLIB::POW_F128, "powf128"); setLibcallName(RTLIB::FMIN_F128, "fminf128"); setLibcallName(RTLIB::FMAX_F128, "fmaxf128"); From nobody Fri Dec 29 19:32:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1wWy1R42z553sR for ; Fri, 29 Dec 2023 19:33:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1wWx3nZyz3Lmt for ; Fri, 29 Dec 2023 19:33:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-55322dbabf6so7540728a12.0 for ; Fri, 29 Dec 2023 11:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1703878380; x=1704483180; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=w9iw9g5pTbyqV8PrJ4oYd4mCOALP0O3HCEIoN8HbCSU=; b=HYesA2ICnXA0j+1Uk7NWycEqZifEIhM6jK2xhZUQ01JZWoWwoRj8onbNJ/yu+CLIeY 2mWN0RVxDPDn/Ue6nEBu9XvveHcJPGo6dcotGpA7Mlh+CL8t12ojNrV2pouYHyf2k9wh r2t+3gSZQHfi1m+d4xb0H2DYmsoUKJiMV1WnEedGMQOGxoT2yEQskODOt9m1TfLcY5C4 qVEQnl4pWSvoCy/+otr3UI+TI4NZEfKMMZUDk94QKT7xmfk7qmcdoJu8/V6HMtlz+zgw h+iDMyfU/52ZvEb14q3l7nSiz/WECWCNJKyY9lBmuL/Kl0OE3XxXB9alybUFhdM8C7CB SIvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703878380; x=1704483180; 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=w9iw9g5pTbyqV8PrJ4oYd4mCOALP0O3HCEIoN8HbCSU=; b=vPt2PwfHzLuv/k3/vjQQeAZra1LMP7NJ1+/CiYBSk7n0fezywjxltdodkKR4A1tiC2 aE7bz+zY+layB41MnWR4EfAtsC6ecCIMMpMCj9pZFvg4CGn7jf0cz3G7XMGomSVAokLd CQm9JDmXEzL4nfUDFFX3XrK5PAmVuQ7ZDX1r4IdnhYmipxXvLJEDaq0GLCzn2tGYQbvv V26hgbH/WXXfZqS+HvKzwDjGOho1Ocuk70wSZpqKbIMxE1OIaWujhKIStlIpJksWruaJ 3VbDqJo3UZvRsy3r/WMl4+r1mkFkcojNaQPRZWRDEHuqrCKixGd1wlS4fcg+O6WKA3xr s52A== X-Gm-Message-State: AOJu0YzKgaHP3TaH3mUj+Cxs6ELxrB6GQIBSoXL2ml9UBjAxUQaNDs5Y zrPoz3RLEn6Np7WaXQmivPORo/zZ+q0CDq4sZHt1Zu2vq7akHw== X-Google-Smtp-Source: AGHT+IFzkIuYT3mEdIcjKEW0EwIbMGBh+twqWQm//xcPpuVHaUOTu+AYG+8Ev2HSBaRqcvIuL59o3FLYLEd0jbm01C0= X-Received: by 2002:a17:907:2cf4:b0:a1f:a0ac:ab3a with SMTP id hz20-20020a1709072cf400b00a1fa0acab3amr5977250ejc.129.1703878379807; Fri, 29 Dec 2023 11:32:59 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> <24134FF7-8C03-490D-A476-4EFF4EAD8132@FreeBSD.org> <0452FE2C-00E9-4E06-880B-6F7B56751728@FreeBSD.org> In-Reply-To: <0452FE2C-00E9-4E06-880B-6F7B56751728@FreeBSD.org> From: Warner Losh Date: Fri, 29 Dec 2023 12:32:48 -0700 Message-ID: Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags To: Dimitry Andric Cc: Antoine Brodin , Gleb Smirnoff , Richard Scheffenegger , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000091b2ef060dab19d3" 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:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1wWx3nZyz3Lmt --00000000000091b2ef060dab19d3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Dec 29, 2023, 4:39=E2=80=AFAM Dimitry Andric wrot= e: > On 29 Dec 2023, at 11:17, Dimitry Andric wrote: > > > > On 29 Dec 2023, at 08:35, Antoine Brodin wrote: > >> > >> On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff > wrote: > >>> > >>> Antoine, > >>> > >>> On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: > >>> A> > netpfil: Use accessor functions and named constants for all > tcphdr flags > >>> A> > > >>> ... > >>> A> This breaks some ports: > >>> A> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' > >>> > >>> Definitely some ports that use some strange compilers :) > >>> > >>> Can you please give at least port names? > >> > >> Some examples: > >> > >> > https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo= /2023-12-28_20h35m41s/logs/errors/nspr-4.35.log > >> > https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo= /2023-12-28_20h35m41s/logs/errors/opusfile-0.12_1.log > > > > The culprit is likely the "-ansi" option. Just get rid of that, it is > not really useful: > > > > cc -o prmapopt.o -c -fvisibility=3Dhidden -O2 -pipe > -fstack-protector-strong -fno-strict-aliasing -ansi -Wall -fPIC -UDEBUG > -DPACKAGE_NAME=3D\"\" -DPACKAGE_TARNAME=3D\"\" -DPACKAGE_VERSION=3D\"\" > -DPACKAGE_STRING=3D\"\" -DPACKAGE_BUGREPORT=3D\"\" -DPACKAGE_URL=3D\"\" > -DNDEBUG=3D1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=3D1 -DHAVE_VISIBILITY_PRA= GMA=3D1 > -DXP_UNIX=3D1 -DFREEBSD=3D1 -DHAVE_BSD_FLOCK=3D1 -DHAVE_SOCKLEN_T=3D1 > -DHAVE_POINTER_LOCALTIME_R=3D1 -DHAVE_DLADDR=3D1 -DHAVE_LCHOWN=3D1 > -DHAVE_SETPRIORITY=3D1 -DHAVE_STRERROR=3D1 -DHAVE_SYSCALL=3D1 > -DHAVE_SECURE_GETENV=3D1 -D_REENTRANT=3D1 -D_THREAD_SAFE=3D1 -DFORCE_PR_L= OG > -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ > -I../../../dist/include/nspr -I../../../pr/include > -I../../../pr/include/private prmapopt.c > > In file included from prmapopt.c:46: > > In file included from prmapopt.c:46: > > /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' > > 82 | static inline uint16_t > > | ^ > > Hm, I may have spoken too soon here. If this port has always compiled > successfully with -ansi, then indeed it may not be that handy to directly > use the 'inline' keyword in system headers. I think most other system > headers use '__inline', which is supported by both gcc and clang, even in > ANSI mode. And if the compiler somehow does not support __inline, > sys/cdefs.h can make sure all those keywords get removed. > Yes. You have to use __inline in system headers. Warner -Dimitry > > --00000000000091b2ef060dab19d3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Dec 29, 2023, 4:39=E2=80=AFAM Dimitry Andric &= lt;dim@freebsd.org> wrote:
On 29 Dec 2023, at 11:17, Dimitry Andric = <dim@FreeBSD.org> wrote:
>
> On 29 Dec 2023, at 08:35, Antoine Brodin <antoine@FreeBSD.org> w= rote:
>>
>> On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff <glebiu= s@freebsd.org> wrote:
>>>
>>> Antoine,
>>>
>>> On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote= :
>>> A> >=C2=A0 =C2=A0 =C2=A0netpfil: Use accessor functions = and named constants for all tcphdr flags
>>> A> >
>>> ...
>>> A> This breaks some ports:
>>> A> /usr/include/netinet/tcp.h:82:8: error: unknown type nam= e 'inline'
>>>
>>> Definitely some ports that use some strange compilers :)
>>>
>>> Can you please give at least port names?
>>
>> Some examples:
>>
>> https://pkg-status.freebsd.org/goha= n04/data/mainamd64PR275986-default-foo/2023-12-28_20h35m41s/logs/errors/nsp= r-4.35.log
>> https://pkg-status.freebsd.or= g/gohan04/data/mainamd64PR275986-default-foo/2023-12-28_20h35m41s/logs/erro= rs/opusfile-0.12_1.log
>
> The culprit is likely the "-ansi" option. Just get rid of th= at, it is not really useful:
>
> cc -o prmapopt.o -c -fvisibility=3Dhidden -O2 -pipe -fstack-protector-= strong -fno-strict-aliasing -ansi -Wall -fPIC -UDEBUG -DPACKAGE_NAME=3D\&qu= ot;\" -DPACKAGE_TARNAME=3D\"\" -DPACKAGE_VERSION=3D\"\&= quot; -DPACKAGE_STRING=3D\"\" -DPACKAGE_BUGREPORT=3D\"\"= ; -DPACKAGE_URL=3D\"\" -DNDEBUG=3D1 -DHAVE_VISIBILITY_HIDDEN_ATTR= IBUTE=3D1 -DHAVE_VISIBILITY_PRAGMA=3D1 -DXP_UNIX=3D1 -DFREEBSD=3D1 -DHAVE_B= SD_FLOCK=3D1 -DHAVE_SOCKLEN_T=3D1 -DHAVE_POINTER_LOCALTIME_R=3D1 -DHAVE_DLA= DDR=3D1 -DHAVE_LCHOWN=3D1 -DHAVE_SETPRIORITY=3D1 -DHAVE_STRERROR=3D1 -DHAVE= _SYSCALL=3D1 -DHAVE_SECURE_GETENV=3D1 -D_REENTRANT=3D1 -D_THREAD_SAFE=3D1 -= DFORCE_PR_LOG -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ -I../.= ./../dist/include/nspr -I../../../pr/include -I../../../pr/include/private = prmapopt.c
> In file included from prmapopt.c:46:
> In file included from prmapopt.c:46:
> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline&= #39;
>=C2=A0 =C2=A082 | static inline uint16_t
>=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 ^

Hm, I may have spoken too soon here. If this port has always compiled succe= ssfully with -ansi, then indeed it may not be that handy to directly use th= e 'inline' keyword in system headers. I think most other system hea= ders use '__inline', which is supported by both gcc and clang, even= in ANSI mode. And if the compiler somehow does not support __inline, sys/c= defs.h can make sure all those keywords get removed.
=

Yes. You have to use __= inline in system headers.

Warner=C2=A0


List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> <24134FF7-8C03-490D-A476-4EFF4EAD8132@FreeBSD.org> <0452FE2C-00E9-4E06-880B-6F7B56751728@FreeBSD.org> In-Reply-To: From: Antoine Brodin Date: Fri, 29 Dec 2023 19:43:07 +0000 Message-ID: Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags To: Warner Losh Cc: Dimitry Andric , Gleb Smirnoff , Richard Scheffenegger , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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]; TAGGED_FROM(0.00)[] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1wlq1XX9z3MGd On Fri, Dec 29, 2023 at 7:33=E2=80=AFPM Warner Losh wrote: > On Fri, Dec 29, 2023, 4:39=E2=80=AFAM Dimitry Andric wr= ote: >> >> On 29 Dec 2023, at 11:17, Dimitry Andric wrote: >> > >> > On 29 Dec 2023, at 08:35, Antoine Brodin wrote: >> >> >> >> On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff wrote: >> >>> >> >>> Antoine, >> >>> >> >>> On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: >> >>> A> > netpfil: Use accessor functions and named constants for all= tcphdr flags >> >>> A> > >> >>> ... >> >>> A> This breaks some ports: >> >>> A> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline= ' >> >>> >> >>> Definitely some ports that use some strange compilers :) >> >>> >> >>> Can you please give at least port names? >> >> >> >> Some examples: >> >> >> >> https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default= -foo/2023-12-28_20h35m41s/logs/errors/nspr-4.35.log >> >> https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default= -foo/2023-12-28_20h35m41s/logs/errors/opusfile-0.12_1.log >> > >> > The culprit is likely the "-ansi" option. Just get rid of that, it is = not really useful: >> > >> > cc -o prmapopt.o -c -fvisibility=3Dhidden -O2 -pipe -fstack-protector-= strong -fno-strict-aliasing -ansi -Wall -fPIC -UDEBUG -DPACKAGE_NAME=3D\"\"= -DPACKAGE_TARNAME=3D\"\" -DPACKAGE_VERSION=3D\"\" -DPACKAGE_STRING=3D\"\" = -DPACKAGE_BUGREPORT=3D\"\" -DPACKAGE_URL=3D\"\" -DNDEBUG=3D1 -DHAVE_VISIBIL= ITY_HIDDEN_ATTRIBUTE=3D1 -DHAVE_VISIBILITY_PRAGMA=3D1 -DXP_UNIX=3D1 -DFREEB= SD=3D1 -DHAVE_BSD_FLOCK=3D1 -DHAVE_SOCKLEN_T=3D1 -DHAVE_POINTER_LOCALTIME_R= =3D1 -DHAVE_DLADDR=3D1 -DHAVE_LCHOWN=3D1 -DHAVE_SETPRIORITY=3D1 -DHAVE_STRE= RROR=3D1 -DHAVE_SYSCALL=3D1 -DHAVE_SECURE_GETENV=3D1 -D_REENTRANT=3D1 -D_TH= READ_SAFE=3D1 -DFORCE_PR_LOG -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -D_NSP= R_BUILD_ -I../../../dist/include/nspr -I../../../pr/include -I../../../pr/i= nclude/private prmapopt.c >> > In file included from prmapopt.c:46: >> > In file included from prmapopt.c:46: >> > /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' >> > 82 | static inline uint16_t >> > | ^ >> >> Hm, I may have spoken too soon here. If this port has always compiled su= ccessfully with -ansi, then indeed it may not be that handy to directly use= the 'inline' keyword in system headers. I think most other system headers = use '__inline', which is supported by both gcc and clang, even in ANSI mode= . And if the compiler somehow does not support __inline, sys/cdefs.h can ma= ke sure all those keywords get removed. > > > Yes. You have to use __inline in system headers. Yes I confirm that using __inline instead of inline fixes both nspr and opusfile. Antoine From nobody Fri Dec 29 20:25:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1xhm0Lqrz558bN; Fri, 29 Dec 2023 20:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1xhl6sV7z3Smc; Fri, 29 Dec 2023 20:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703881544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h/jFyPLrX+1cYTkzrnUgkEJ6dcudOmRDCZEM18u9KcI=; b=TY1L+11VZDfTOetlgxdRDo+ZCseCUtCce1ztkGNu/d/jvh8bWFbH4FQP8PipHR5iok5Fcr tG7dg8FsLrNaHHnwtJSm00C1KLuLe3a0vauYInyk3HBATWq0v1WzA1Khk8GXcUbVpzaEwm SSEDbhI9ndnb7hwBL5Bk1TWGfqFA9lwHTntXCceRxd2XnkvPES6tJkbtHDFI0djKOItD2d fFs7uzeixSx8q2qyg9j9QF27WONScyZ95XhCnuzmGiGLfqSu2ogFXhShkY446CZfiG0a+C dapZk/aynw3WID7S79ghJjgbwnX8gIm1+Yx6DJ5mcA9c77Ts5UgP+SD2aoD+hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703881544; a=rsa-sha256; cv=none; b=BAtyAz0LPsHmL8mWH1r6Im1E8VyBkZ0RJSVmJU3GNP/2zfrORbppB2hJYCKME7yW4ewDYF G/CsBzt1YkuTakrBeAZpL+AxKRTMV8XNX1lxEG6J8RHc2IGYttUp5bdrytO1dknLDONmfa o3RIpwaQmbZCG98ppCPAY+7EEtokv0Jo2CP5v7uNIPtYo0z9bSoY8Upb6fYHU0lOazT1Nu MA+RZuc+SeToWNHZlFTLorQ8uNAbmYcY98MDEhnp4Zd7arRVCaFCArrIypD7ktZtvd1ql9 02O9SJK531pL5xnFu/IfyyDPRPIzBS70nYl9MNyOrYwiM5hSYFQYiS6565ubgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703881544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h/jFyPLrX+1cYTkzrnUgkEJ6dcudOmRDCZEM18u9KcI=; b=Wzo43Tq63f9rzmJINKi/nXKC+/nR1XrzbLPPAEFxTs9BsABdeSUcrbEhNmIhONBwRMa67b 41inrNxiQnv73ygMzIHb+TfNWlf6EVtW6U+utOLekF5OGVCDyzRzkSmrYRZ/6z/pSFsc0K gETvuTalWQHoMNpeuIAK9AOq795zmlySMN/vSHgqUuWqdUh9GB9Lj6Ca64EYZyfwFqwO9D UHDfgM62MCofBI4UuB/DMdOYFk1bhxra7N+OtauzvjQ0EFA2/iOamycI8U6GNznDbT8uP0 j0Oo9MRQvP2yOy6gIhLHS8kiI/zKZGL6iJ1lMe/NfwibnocUrA18tYF1sB69Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1xhl5wHJz5rP; Fri, 29 Dec 2023 20:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTKPhbE005906; Fri, 29 Dec 2023 20:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTKPh36005903; Fri, 29 Dec 2023 20:25:43 GMT (envelope-from git) Date: Fri, 29 Dec 2023 20:25:43 GMT Message-Id: <202312292025.3BTKPh36005903@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: 19bb1886be4f - main - bsdinstall: rename "Live CD" to "Live System" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 19bb1886be4f366e922f0be359874683a243624a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=19bb1886be4f366e922f0be359874683a243624a commit 19bb1886be4f366e922f0be359874683a243624a Author: Pierre Pronchery AuthorDate: 2023-12-29 18:23:48 +0000 Commit: Ed Maste CommitDate: 2023-12-29 20:24:25 +0000 bsdinstall: rename "Live CD" to "Live System" This uses more generic wording in the FreeBSD installer, when offering the user to use the system booted without running the installer. The updated wording is also reflected in freebsd-version(1). Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43233 --- bin/freebsd-version/freebsd-version.1 | 2 +- usr.sbin/bsdinstall/startbsdinstall | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1 index b9f0861f890a..82ea9c707d69 100644 --- a/bin/freebsd-version/freebsd-version.1 +++ b/bin/freebsd-version/freebsd-version.1 @@ -111,7 +111,7 @@ To determine the version of the currently running userland: /bin/freebsd-version -u .Ed .Pp -To inspect a system being repaired using a live CD: +To inspect a system being repaired using a live system: .Bd -literal -offset indent mount -rt ufs /dev/ada0p2 /mnt env ROOT=/mnt /mnt/bin/freebsd-version -ku diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall index af0fd56e73b3..63239c969ac6 100644 --- a/usr.sbin/bsdinstall/startbsdinstall +++ b/usr.sbin/bsdinstall/startbsdinstall @@ -57,7 +57,7 @@ if [ -f /etc/installerconfig ]; then exit fi -bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 +bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live system?" 0 0 case $? in $BSDDIALOG_OK) # Install @@ -70,7 +70,7 @@ $BSDDIALOG_OK) # Install trap true SIGINT # Ignore cntrl-C here bsdinstall if [ $? -eq 0 ]; then - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 + bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 case $? in $BSDDIALOG_OK) # Reboot @@ -90,7 +90,7 @@ $BSDDIALOG_OK) # Install sleep 1 done ;; - $BSDDIALOG_CANCEL) # Live CD + $BSDDIALOG_CANCEL) # Live System exit 0 ;; esac @@ -98,7 +98,7 @@ $BSDDIALOG_OK) # Install . "$0" fi ;; -$BSDDIALOG_CANCEL) # Live CD +$BSDDIALOG_CANCEL) # Live System exit 0 ;; $BSDDIALOG_EXTRA) # Shell From nobody Fri Dec 29 20:39:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1y060rlrz55B3d; Fri, 29 Dec 2023 20:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1y060JG6z3W1T; Fri, 29 Dec 2023 20:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703882342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1gwxiUoDdvNnlyCT39KHjty/6mKBlSHh4FjIMCcAtk=; b=uz7VdJnflAUQpzxFNNY+LqRyOJ8UB2jaO7omy87RGGEJiHAtxU3HT1yLOo0rCXlXvXlp+v LYis896S7/FI3CEuvWOyuBVgB1yvlvXaHvd33hwuILjx1RDHwiLXMpkSohPlzIdDeeDLEY PU4MbnEhRX6jOO6R1Lxl38N2Pfcv1g/YxlEHIjfOg6MSHyxKv3o5o67UVfMY0ucOpTLHJ1 jvAXCaHDuxeeCureJtvRKhtmQuYkLq00TqdOSO/Dd2Qd0k0Dcc5ExqOoiwMT4PaA1ty7QZ iJeWUR+OfhvLa53YKdJG8GL2PbMoBKKBL2XTU5/P+dqKPdMNe/dPDM35yKtlTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703882342; a=rsa-sha256; cv=none; b=SVj65R1G5FrVj2QvkrbnMRFv3NNwevgOvTu6I84EzrJUCfRUxnxUatcq4JsATI7uO7OWVB QHPsuQQs+Cu3iZjVZ0Avev0G7S8jkHWUZbucy/72b+JozNz4z8Qf3tSJtn5oAhQurB4PDF jz+oK8HpPdHOh+D4Q1/Fltqxnbm2/lAJJ29kbtWBNIScGL5VYDJS7l9ORc63gAGD+N/dYO GzUmQulQIFd4dqp91ztyNkAsTX/xZNA82f2GnBrY35sKkhmlczFQqweKJA9Yhbb6OXeWTm Yp8LxAghB6OOWDdyqudcqqRuMrYHtV4kuYdZS+l2o71RMm4qYQKVWmSt4POSiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703882342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1gwxiUoDdvNnlyCT39KHjty/6mKBlSHh4FjIMCcAtk=; b=A+GK+t2xMz3nPTc/k+hM4WLyIgnhJNvaS8nJxXOd1SfiGiWYRqNp7I63l9AgsKmEPTCK8C 7BWJn9P8q1sW4ROAfzk4SLfBdbwpXf8syAXNbKwQ0XtGroX0qhLJhgZl6F2J6SnqlDPU3D QpswmkWGR0xAkkZC8TSiO2+NDlRx25gUrWejro4oQoPQ4Mw0ss/9gYZhiom5jUIHQupH3/ WCQMnzDApfZrj73VRxQQqfVsnMRTXiqhyR/HDLcKs6rKla/bXnxk6To3/5A7Li1kx30e9i Jxaxf+bPc85uqmpe4lTEZ8ld6Ju8O4fT/h2q5VPUzEWyPfxtzCK8zjDFyPM3wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1y056MK5z64C; Fri, 29 Dec 2023 20:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTKd1DC023127; Fri, 29 Dec 2023 20:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTKd1BR023124; Fri, 29 Dec 2023 20:39:01 GMT (envelope-from git) Date: Fri, 29 Dec 2023 20:39:01 GMT Message-Id: <202312292039.3BTKd1BR023124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 0600b575402f - main - bhyve: verify that user provided fbuf values fall within limits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0600b575402feb180ba9aed52ebad1c4c08ead71 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=0600b575402feb180ba9aed52ebad1c4c08ead71 commit 0600b575402feb180ba9aed52ebad1c4c08ead71 Author: Robert Wing AuthorDate: 2023-12-29 19:18:15 +0000 Commit: Robert Wing CommitDate: 2023-12-29 20:37:57 +0000 bhyve: verify that user provided fbuf values fall within limits The upper limits for height/width are already checked, this commit enforces the lower limit as well. The behavior is also changed such that, the framebuffer fails to initialize if the provided values don't parse cleanly. Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D42692 --- usr.sbin/bhyve/bhyve.8 | 4 ++-- usr.sbin/bhyve/pci_fbuf.c | 33 +++++++++++++++------------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 3612251d7f7b..12e3f3ba926e 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 20, 2023 +.Dd December 29, 2023 .Dt BHYVE 8 .Os .Sh NAME @@ -778,7 +778,7 @@ optional zone identifier. A display resolution, width and height, respectively. If not specified, a default resolution of 1024x768 pixels will be used. Minimal supported resolution is 640x480 pixels, -and maximum is 1920x1200 pixels. +and maximum is 3840x2160 pixels. .It Cm vga= Ns Ar vgaconf Possible values for this option are .Cm io diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c index 247b7cb69c9a..798e9b41f0b0 100644 --- a/usr.sbin/bhyve/pci_fbuf.c +++ b/usr.sbin/bhyve/pci_fbuf.c @@ -312,26 +312,23 @@ pci_fbuf_parse_config(struct pci_fbuf_softc *sc, nvlist_t *nvl) } value = get_config_value_node(nvl, "w"); - if (value != NULL) { - sc->memregs.width = atoi(value); - if (sc->memregs.width > COLS_MAX) { - EPRINTLN("fbuf: width %d too large", sc->memregs.width); - return (-1); - } - if (sc->memregs.width == 0) - sc->memregs.width = 1920; - } + if (value != NULL) + sc->memregs.width = strtol(value, NULL, 10); value = get_config_value_node(nvl, "h"); - if (value != NULL) { - sc->memregs.height = atoi(value); - if (sc->memregs.height > ROWS_MAX) { - EPRINTLN("fbuf: height %d too large", - sc->memregs.height); - return (-1); - } - if (sc->memregs.height == 0) - sc->memregs.height = 1080; + if (value != NULL) + sc->memregs.height = strtol(value, NULL, 10); + + if (sc->memregs.width > COLS_MAX || + sc->memregs.height > ROWS_MAX) { + EPRINTLN("fbuf: max resolution is %ux%u", COLS_MAX, ROWS_MAX); + return (-1); + } + if (sc->memregs.width < COLS_MIN || + sc->memregs.height < ROWS_MIN) { + EPRINTLN("fbuf: minimum resolution is %ux%u", + COLS_MIN, ROWS_MIN); + return (-1); } value = get_config_value_node(nvl, "password"); From nobody Fri Dec 29 21:46:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1zW063cFz55Jv7; Fri, 29 Dec 2023 21:47:24 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mx-out-01.fh-muenster.de (mx-out-01.fh-muenster.de [185.149.214.63]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mx.fh-muenster.de", Issuer "GEANT OV RSA CA 4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1zW031r4z3bvM; Fri, 29 Dec 2023 21:47:24 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Authentication-Results: mx1.freebsd.org; none Received: from mail-director-01.fh-muenster.de (mail-director-01.fh-muenster.de [185.149.215.227]) by mx-out-01.fh-muenster.de (Postfix) with ESMTPS id 80DC320950; Fri, 29 Dec 2023 22:46:51 +0100 (CET) Received: from smtpclient.apple (ip4d152bbd.dynamic.kabel-deutschland.de [77.21.43.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tuexen) by mail-director-01.fh-muenster.de (Postfix) with ESMTPSA id 063D11A0064; Fri, 29 Dec 2023 22:46:52 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_0ECA1D9F-4225-41AB-8F26-48BA88592B3D"; protocol="application/pkcs7-signature"; micalg=sha-256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.300.61.1.2\)) Subject: Re: git: a8b70cf26030 - main - netpfil: Use accessor functions and named constants for all tcphdr flags From: tuexen@fh-muenster.de In-Reply-To: Date: Fri, 29 Dec 2023 22:46:49 +0100 Cc: Warner Losh , Dimitry Andric , Gleb Smirnoff , Richard Scheffenegger , src-committers , "" , "" Content-Transfer-Encoding: quoted-printable Message-Id: <694F7B7E-145A-46EE-BF32-411FB4FA36F4@fh-muenster.de> References: <202312270143.3BR1hMQf085312@gitrepo.freebsd.org> <24134FF7-8C03-490D-A476-4EFF4EAD8132@FreeBSD.org> <0452FE2C-00E9-4E06-880B-6F7B56751728@FreeBSD.org> To: Antoine Brodin X-Mailer: Apple Mail (2.3774.300.61.1.2) 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:680, ipnet:185.149.212.0/22, country:DE] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T1zW031r4z3bvM --Apple-Mail=_0ECA1D9F-4225-41AB-8F26-48BA88592B3D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Dec 29, 2023, at 20:43, Antoine Brodin wrote: >=20 > On Fri, Dec 29, 2023 at 7:33=E2=80=AFPM Warner Losh = wrote: >> On Fri, Dec 29, 2023, 4:39=E2=80=AFAM Dimitry Andric = wrote: >>>=20 >>> On 29 Dec 2023, at 11:17, Dimitry Andric wrote: >>>>=20 >>>> On 29 Dec 2023, at 08:35, Antoine Brodin = wrote: >>>>>=20 >>>>> On Thu, Dec 28, 2023 at 10:37=E2=80=AFPM Gleb Smirnoff = wrote: >>>>>>=20 >>>>>> Antoine, >>>>>>=20 >>>>>> On Thu, Dec 28, 2023 at 08:48:36PM +0000, Antoine Brodin wrote: >>>>>> A> > netpfil: Use accessor functions and named constants for = all tcphdr flags >>>>>> A> > >>>>>> ... >>>>>> A> This breaks some ports: >>>>>> A> /usr/include/netinet/tcp.h:82:8: error: unknown type name = 'inline' >>>>>>=20 >>>>>> Definitely some ports that use some strange compilers :) >>>>>>=20 >>>>>> Can you please give at least port names? >>>>>=20 >>>>> Some examples: >>>>>=20 >>>>> = https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/= 2023-12-28_20h35m41s/logs/errors/nspr-4.35.log >>>>> = https://pkg-status.freebsd.org/gohan04/data/mainamd64PR275986-default-foo/= 2023-12-28_20h35m41s/logs/errors/opusfile-0.12_1.log >>>>=20 >>>> The culprit is likely the "-ansi" option. Just get rid of that, it = is not really useful: >>>>=20 >>>> cc -o prmapopt.o -c -fvisibility=3Dhidden -O2 -pipe = -fstack-protector-strong -fno-strict-aliasing -ansi -Wall -fPIC -UDEBUG = -DPACKAGE_NAME=3D\"\" -DPACKAGE_TARNAME=3D\"\" -DPACKAGE_VERSION=3D\"\" = -DPACKAGE_STRING=3D\"\" -DPACKAGE_BUGREPORT=3D\"\" -DPACKAGE_URL=3D\"\" = -DNDEBUG=3D1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=3D1 = -DHAVE_VISIBILITY_PRAGMA=3D1 -DXP_UNIX=3D1 -DFREEBSD=3D1 = -DHAVE_BSD_FLOCK=3D1 -DHAVE_SOCKLEN_T=3D1 -DHAVE_POINTER_LOCALTIME_R=3D1 = -DHAVE_DLADDR=3D1 -DHAVE_LCHOWN=3D1 -DHAVE_SETPRIORITY=3D1 = -DHAVE_STRERROR=3D1 -DHAVE_SYSCALL=3D1 -DHAVE_SECURE_GETENV=3D1 = -D_REENTRANT=3D1 -D_THREAD_SAFE=3D1 -DFORCE_PR_LOG -D_PR_PTHREADS = -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ -I../../../dist/include/nspr = -I../../../pr/include -I../../../pr/include/private prmapopt.c >>>> In file included from prmapopt.c:46: >>>> In file included from prmapopt.c:46: >>>> /usr/include/netinet/tcp.h:82:8: error: unknown type name 'inline' >>>> 82 | static inline uint16_t >>>> | ^ >>>=20 >>> Hm, I may have spoken too soon here. If this port has always = compiled successfully with -ansi, then indeed it may not be that handy = to directly use the 'inline' keyword in system headers. I think most = other system headers use '__inline', which is supported by both gcc and = clang, even in ANSI mode. And if the compiler somehow does not support = __inline, sys/cdefs.h can make sure all those keywords get removed. >>=20 >>=20 >> Yes. You have to use __inline in system headers. >=20 > Yes I confirm that using __inline instead of inline fixes both nspr > and opusfile. Thanks for the feedback. A patch is under discussion: https://reviews.freebsd.org/D43231 Best regards Michael >=20 > Antoine --Apple-Mail=_0ECA1D9F-4225-41AB-8F26-48BA88592B3D Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEfMw ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIHKTCCBhGgAwIBAgIMJrRClNKRzetB0jc/MA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTIyMDUzMDEzMjIxNVoXDTI1 MDUyOTEzMjIxNVowgcQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIDBNOb3JkcmhlaW4tV2VzdGZhbGVu MREwDwYDVQQHDAhNdWVuc3RlcjEUMBIGA1UECgwLRkggTXVlbnN0ZXIxMjAwBgNVBAsMKUZhY2hi ZXJlaWNoIEVsZWt0cm90ZWNobmlrIHVuZCBJbmZvcm1hdGlrMQ8wDQYDVQQEDAZUdWV4ZW4xEDAO BgNVBCoMB01pY2hhZWwxFzAVBgNVBAMMDk1pY2hhZWwgVHVleGVuMIICIjANBgkqhkiG9w0BAQEF AAOCAg8AMIICCgKCAgEA2QZ7Uheto325SEnX2BTxBvYnz7u/BVmzxKlogaR4K0MA8ZcfNIdQkiJU efjL6imq21BSFsr/tXcODFZmPrvx9aIxjntCxmEFr7qFaw3e3mUIxJyj5n6BxjzZ/hyJte8LBDbj zj+e8WPUzXmYbSxtrh9kgw8NMx3+bo3Hslic+PkKEGx9JJp2I2TEs88xD0rHC2Ljwcfk6bS9jC+/ BAuY/TsbJoq+8d64DYSLGiIYbvMMuxM2C8BlpHLIOLx2FaH+uMqdH2dLVvCacZJ9YzHvvZY8O2nQ OBFCG1UMpX5YLHN8g/t02a+IBt+oe97JMdJ/kZsPjolI98dcRdzz0hTXZql2xvp6zlocm9iGTRcv dCSxy+0x4CIZD1EkVX9zCPGpzdTXnrU+zvnz14Uq3Wbfl3GiVgK0Avr1enfZepruAxAy7KGIm2zi /qY3XSkN8fvWJmYnomOjCRjaPtqS/azmnyeodsxlVhqQKbES65u/PbOXjOlhiYAvemS0IbK4iR76 3iSmkpwSNpJt6BCtFJN+w3Y8tztCP66KPPC1Fri1oj27KPaf04J66MkSjlQdpI7POS6lDyN7X2Hw tgZKRVA94h/JvZp4ld7mTzXTEW2tdO5azPILsL9xOYjSS5VIyUFF4MoxSbfZtXWaZFsMC1fXDNNL uRDrISotdwADuU75Fe0CAwEAAaOCAk4wggJKMD4GA1UdIAQ3MDUwDwYNKwYBBAGBrSGCLAEBBDAQ Bg4rBgEEAYGtIYIsAQEECjAQBg4rBgEEAYGtIYIsAgEECjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQE AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFDbROYIxDr3fvlX tkXqx7T8lihxMB8GA1UdIwQYMBaAFGs6mIv58lOJ2uCtsjIeCR/oqjt0MCAGA1UdEQQZMBeBFXR1 ZXhlbkBmaC1tdWVuc3Rlci5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu ZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9j ZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYB BQUHAQEEgc4wgcswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2 ZXIvT0NTUDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFs LWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRm bi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF AAOCAQEALubmL854icQMxKxOxQK+deXTjC6CLYnUDwB8MvnDC+BSeh3tUHT37fSgsK1ShNUSNJX0 YF0VYLfZ6+lPyaFYLArVrAIHqvDiVURaulB9NA+3gck/VSuRz4ILYBy61XbcGQQ8Wx+g6TcqsjsF oOhqEBycj5QuITj+EFmX8nvfo0dJtVa2OPDk1N9beLfQBcLhspJ/nv0pKhpNWv5YETG26YqYfsC7 FA/ZNGvRcoOPkjkDhBTtG+qq9DDD75XtGEBZhYXbnG15tn4/UV07B+UyK4/cqQSA+My5FML3YsQw EYrV9klVD/mLMOdZV5+95xt7O8IdYeHrBapVlhANH5bFazGCBJ0wggSZAgEBMIGeMIGNMQswCQYD VQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBG b3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVy ZWluIEdsb2JhbCBJc3N1aW5nIENBAgwmtEKU0pHN60HSNz8wDQYJYIZIAWUDBAIBBQCgggHPMBgG CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIzMTIyOTIxNDY0OVowLwYJ KoZIhvcNAQkEMSIEINgJbO/T8+T9ztMcbXVWwA3BZWogZQaHY+lqUoGDK/vyMIGvBgkrBgEEAYI3 EAQxgaEwgZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZvZXJkZXJ1bmcg ZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsMB0RGTi1QS0kx JTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3rQdI3PzCBsQYL KoZIhvcNAQkQAgsxgaGggZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZv ZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsM B0RGTi1QS0kxJTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3r QdI3PzANBgkqhkiG9w0BAQsFAASCAgCO7W6I0+5VtKqqio5O6oPUhqsHnnJOea/D12onE+U2BKnV hqE7CULaoLKtox1q5Rt1s3fVJq6ZaYWv+jdRFzDU/JBSUEDPBsfTmpiDVHcNGt4aBTLIzPj/THkq TU0DEpHqcLlKf3dEPmp3RsSAMp8RWIMy/QOYbQbaA24rpzuqe4wWoxmfu630P4SkbXLAV05qbKqq Gxcz7v6dYUVmssef5JCapciGf6R53H9TFOPb0XItjcydbcwIq/7OaIU4Q8PYhYIDbkP7kJXkEDC7 yJ+iwoEnTx/a1MZVL0/SHdbYJf3vbiuo7Al82c/mRpRsAVT698SQ7hvuZeNq6iwSh4soqwFqkWxl Bz0yRpSGS3obY3u3urXXFvdAZRopoDmw4nULjiBHno7Kgsvxk4D1E8bb2xH/HzP1FcmhuSNDohRz mh//f8VA7iSISBziCrtOQkUP6SEzNFZXv/TrL0iwl5xMH76dbr2i6+pkQpci0ViYnjiqUa2LpF81 0dbu0R9oREjDqAMbj4dItDZR8fRPRTioYUeS+uF6pw1sppYe7sh8DFqudZvHVN30UVmVn81yA48d PFqyYQ1elGhrCVAmd0k/iBPX2OO6vrz2s85af81+tvSZ9Liw4XkuPadKIeoLBL5iAWLAsHuvIlMk AHWyen9HpuMYQt+WdBInWNmVhYZdJwAAAAAAAA== --Apple-Mail=_0ECA1D9F-4225-41AB-8F26-48BA88592B3D-- From nobody Fri Dec 29 23:00:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T217k56thz55SXD; Fri, 29 Dec 2023 23:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T217k4hmsz4FWm; Fri, 29 Dec 2023 23:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703890850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frBU9J+A79JPa2YhYdFD/OvyHRjix0565w6TzMFG8CA=; b=CLJ33YoGZDtPaMGD5uZKCrd8QOekSCkHwQp0i/UNwvsSUS0+/pr4uCVpoIHJwkuto8R5mA Pn0jqcdDHgEse0gLmOw3seMcxpYvH50EP6S1sQ1BZwQl3f0C15ZSnKQlgNe3/+TvKvtjPU gY4gWA363tgxKDLlTlO7jcpfgN6pgTnSWsV1usfSXMkq+hsuNZPDumk9g4Pafndsy2rbQ9 ya6/C2iIYGsbd423Qb3uvfQUEFIc9bLSonmb7RO/HiDOs1GqxIuwCWb/CdqXTRUlBfqTn6 Mf8RIqa1Z5P7XnLuyl01RCA9WGhq8ctzOuAX7bgSUtsTQC/ghqYNfeTAQNykPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703890850; a=rsa-sha256; cv=none; b=rke/UBzvoFqHGtdi9KF3OYPM72MV4gklxWIOsDpcdFrGDS55FKj9nDniBJ3eFyDhwb97Bs weRu6/9sJsn5cppEMKItgz/6qctSlYYl53dK9edt8o4hvZqkPctCz5GMGs+JKx5I5THSDc HuFYqXdCfzWKMSwI0zjGKVQC96u0s47wpjdOBYzcWSBx9EU8rqZrMg+sZuoQpESEkNKmpL JPU+KLAt2u13YBt2GMW6ZE770FiP76jUu7fTf7dpQD3tANnUrk3/kN/DNofe/3OCKZlqMs WwWEmk2E654xqRpYMggULG5UrP2jyfihC4l45lIYo74bNdPZh4HsNZr2IJdewA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703890850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frBU9J+A79JPa2YhYdFD/OvyHRjix0565w6TzMFG8CA=; b=IlAb/EgMdkGh0TmStk9UZc7OQe/bHQ070zzOW068Sa7cxBc1w68TAurW/995NccZHAUM4t r/M30Pa3ddespeLmuvikl4VwhYu9VhLYcCeBkcb5zC+vL7OvrDTpokN9xcj+nHXNh25TbB 9/ew/0b/p4qnnVl+dE2BZIEKHyHhv2Ui0w5JcQxZr5uswCmAWn1PPAfS5DehK+0BoXLoDQ 46rzrXcH3617z8gLiunSdnPAbU7c5IY75i2ZLaesA53o1BNiKhPWDDHo8zk7cW8qwYM8EF 0bTSf6hrdj+Y9WM/IZuTIdh2dtN1HqBtby3sQzLubplUaQbobK7rZ6o4QzsR+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 4T217k3m4Yz9H2; Fri, 29 Dec 2023 23:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTN0oN8067031; Fri, 29 Dec 2023 23:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTN0oiH067028; Fri, 29 Dec 2023 23:00:50 GMT (envelope-from git) Date: Fri, 29 Dec 2023 23:00:50 GMT Message-Id: <202312292300.3BTN0oiH067028@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: 84b4342c0d7a - main - copy_file_range.2: Clarify that only regular files work List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 84b4342c0d7ac8a3187309a978d41e6765154cc1 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=84b4342c0d7ac8a3187309a978d41e6765154cc1 commit 84b4342c0d7ac8a3187309a978d41e6765154cc1 Author: Rick Macklem AuthorDate: 2023-12-29 22:59:00 +0000 Commit: Rick Macklem CommitDate: 2023-12-29 22:59:00 +0000 copy_file_range.2: Clarify that only regular files work PR#273962 reported that copy_file_range(2) did not work on shared memory objects and returned EINVAL. Although the reporter felt this was incorrect, it is what the Linux copy_file_range(2) syscall does. Since there was no collective agreement that the FreeBSD semantics should be changed to no longer be Linux compatible, copy_file_range(2) still works on regular files only. This man page update clarifies that. If, someday, copy_file_range(2) is changed to support non-regular files, then the man page will need to be updated to reflect that. PR: 273962 Reviewed by: karels, pauamma_gundo.com (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43227 --- lib/libc/sys/copy_file_range.2 | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/libc/sys/copy_file_range.2 b/lib/libc/sys/copy_file_range.2 index c9fa593b7f4c..bcd9170842d5 100644 --- a/lib/libc/sys/copy_file_range.2 +++ b/lib/libc/sys/copy_file_range.2 @@ -23,13 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 2, 2021 +.Dd December 28, 2023 .Dt COPY_FILE_RANGE 2 .Os .Sh NAME .Nm copy_file_range -.Nd kernel copy of a byte range from one file to another -or within one file +.Nd kernel copy of a byte range from one regular file to another +or within one regular file .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -178,9 +178,17 @@ are reset to the initial values for the system call. .Fa infd and .Fa outfd -refer to the same file and the byte ranges overlap or +refer to the same file and the byte ranges overlap. +.It Bq Er EINVAL +The .Fa flags -is not zero. +argument is not zero. +.It Bq Er EINVAL +Either +.Fa infd +or +.Fa outfd +refers to a file object that is not a regular file. .It Bq Er EIO An I/O error occurred while reading/writing the files. .It Bq Er EINTEGRITY From nobody Sat Dec 30 06:18:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2BsG0gFYz55bbG; Sat, 30 Dec 2023 06:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2BsF6xcQz3cYt; Sat, 30 Dec 2023 06:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703917138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s/O6AclWuzAPqEcIb5hViRj0B+qCwWeK5G+Fp6n1jEk=; b=LipThyKQMqNB8vEThQuTu8S+TpKZ9IkmdQwMLusPXnDwfkDiaPaMxQKTv1WUSOS/ga6lM5 BIUIDKaN6Z+PFGinI80rkY77eKlIFrOn0wZzLgOFwCCu4Cz0DmOg7er+6F3tQ7nMkxMWAB 9bI00YaA8X2Gyqc1bPDSv3fC5Gb/D6v4Z6YLdgBKG+EaRKUD39GZ7MApZLRN/kjYOEDoaH sBI53WTOLVY6iohHDcric8lAbQRa2qP7+bhVfaSjlnJvwJhSGJK/LIB7nm3EjofZ5qOcVV YOWfrd9OKsUD9T9TzaGsU6aNthezW4Bga9QiDV2Od+NiYrMworDlj6RLs3A1FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703917138; a=rsa-sha256; cv=none; b=OcrgzPwCZg4rpKCFzT9hHFrmyM69kpaIO4Egxt8+quSeTiRqf7RC9u2pHQKJY8BsnYg+LX zcr1TLK1nsbB0fYEPWlnr6J7eSsT49mZgu4Krq+VaLDrBNUklcQv4SV14pZqdrEm7oEsk5 /SDzZiBTUwuU9sL/Pnsoc9l/nSnHtrkOeCkGmhfUmkO5VZ3AaNY6bsB1Gq01Qrjxe6shck KVtnBLu2uWYpvb11ESvwiSzQewwX2mvO/xdcXirqPPjHtJxViRtFMP/A6y8bvA+Ux8IBFs YVbOnihpssxnO8Zgrmz6Fw3D9y+vlsZT9d/eiI12Tvc78Gui6J9JMEoiDO7Rxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703917138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s/O6AclWuzAPqEcIb5hViRj0B+qCwWeK5G+Fp6n1jEk=; b=HcfRjlKwQcyFYDY3H5l1QTB1QafEhwVi3WYffVhUo0F+yTF3EkcrAjGd3P/CHotZ98sF+u 9VTBV+EHNbAjhgIu17iA29RdGfxJrmAeAkMWejItHLpXpYh7q2QxkBviWb38CYfA16DqGs mHmw8mSKA4a7IEhsQeHNRc9tzhC9SokDMgnPXgxgiHKecT/hFAdZZWnKb+eDISJTQ98KNJ L31WW91xOwLsVU197nvyNbSdylWcpbzYg2e8buzdxN8LKABqPFfaIBPWN8aGRtKv+Rfeai 5E9xz3QuUAFCU8lwdNHiwyrDyI9b0yAtezYrgjllk1jxfQIkkOHVzEvDMi8D2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2BsF5sS8zfdB; Sat, 30 Dec 2023 06:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BU6IvYZ097468; Sat, 30 Dec 2023 06:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BU6Ivbt097465; Sat, 30 Dec 2023 06:18:57 GMT (envelope-from git) Date: Sat, 30 Dec 2023 06:18:57 GMT Message-Id: <202312300618.3BU6Ivbt097465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pawel Jakub Dawidek Subject: git: 1b8d70b2eb71 - main - kern: Introduce kern.pid_max_limit sysctl. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pjd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b8d70b2eb713f5c75605419bb2505ce18fa304a Auto-Submitted: auto-generated The branch main has been updated by pjd: URL: https://cgit.FreeBSD.org/src/commit/?id=1b8d70b2eb713f5c75605419bb2505ce18fa304a commit 1b8d70b2eb713f5c75605419bb2505ce18fa304a Author: Pawel Jakub Dawidek AuthorDate: 2023-12-30 06:15:17 +0000 Commit: Pawel Jakub Dawidek CommitDate: 2023-12-30 06:15:17 +0000 kern: Introduce kern.pid_max_limit sysctl. The kern.pid_max_limit will hold the PID_MAX value the kernel was compiled with. The existing kern.pid_max sysctl can be modified and doesn't really represent maximum PID number in the system, as there may still be processes created with higher PIDs before kern.pid_max was lowered. Reivewed by: kib, zlei Approved by: oshogbo Differential Revision: https://reviews.freebsd.org/D43077 --- sys/kern/kern_mib.c | 4 ++++ sys/sys/proc.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 5a95e3454ff2..b7a801cd53c0 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -754,6 +754,10 @@ SYSCTL_PROC(_kern, OID_AUTO, pid_max, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE, 0, 0, sysctl_kern_pid_max, "I", "Maximum allowed pid"); +SYSCTL_INT(_kern, OID_AUTO, pid_max_limit, CTLFLAG_RD, + SYSCTL_NULL_INT_PTR, PID_MAX, + "Maximum allowed pid (kern.pid_max) top limit"); + #include #include SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, diff --git a/sys/sys/proc.h b/sys/sys/proc.h index e7d2a1775603..33a878dc46aa 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -955,7 +955,7 @@ MALLOC_DECLARE(M_SUBPROC); * in a pid_t, as it is used to represent "no process group". */ #define PID_MAX 99999 -#define NO_PID 100000 +#define NO_PID (PID_MAX + 1) #define THREAD0_TID NO_PID extern pid_t pid_max; From nobody Sat Dec 30 14:44:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2Q4j39Thz55M8K; Sat, 30 Dec 2023 14:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2Q4j2S94z3VqJ; Sat, 30 Dec 2023 14:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703947477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wtmqfr53sk0D0oK6TL7UJya8J43iry0Rnjlmoaghn/Q=; b=vWy/KphbINAABssWB49m5D2rTT23MxtMo4XQp87UOV7B29ih41ACMw6ZhWCiJEsgO/8FGe KL/NCyYzidhhYvd3P2xGr/7liOPaqgonHHFWnauoypHI5Na+24kqjXQR34oqBxDFKfctcn BzJyBl4IEk4JMyXlLuC/M83Cjb5zRxTOj+yPTtXAZoKLry258WA7t2/il6hDjfLpDK8kmo xkgd/WA9BEyz1nAnrxyxj5h02nQDmhBKgAqJ+92OX0p7jF7F9QTHrVHMCpyFpGRo46jlGd RJhJsoh3HHgG0aYf5UungAAqXkCv3muyDq3NOFp9ga0maWOy86Cda+bQM4Um5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703947477; a=rsa-sha256; cv=none; b=U2Ti3lQrtFtNbHuiSqCbX19W4JqZvFc69NEy00p/aHk8osih5oUOAr+bFg1Mc4qypPYblo TyVDGaYBKop3alqaJU1b2l9Vqkpq5a7SB1oDqUfVxppK6QhJz2HQ//8zxjFcUtWBdZI7uX Gz20dVAGUOax7meIwfD95jjWPoacsO/ZB2ejiFcx09YScK9vRXFnhrh50U/z6bqVe63VuF Ho5mBxWQYuq5Zj8ljo3aG1F/VutOpmiR+bQgH5Xd/aOENjG+Fis/qV7rH/tyPk9YGosr8R aUP+UoBXdJrGnWiILTgo/Recg+UXId2N8omI76zHElmVWxDAAEFkr/mnPv15ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703947477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wtmqfr53sk0D0oK6TL7UJya8J43iry0Rnjlmoaghn/Q=; b=URzl8Y6LsMrDRRtgI5fTSqe9ginLqnXoJ+StzWbgcJjnTHPbuuT7U+9O/C5Vvc6s9PTwrt /5ulTCGm8K7f0/tfhtkBzI27O9CW4D3TcJ7Z30KlsytKFp2AeSq3siTHXL/TsyYlgmV0bc DNkhuVVbukexmjLh/lEjL0KcKt2QqSms9oqtuUqlaDBYV6vwG6IatjHktWOKLKHrWofx+8 C32/rYeBdMDFFo3nV4NeR7xCViv+OMk/5Y26SoXct4jXIXAn5i3joyFYSH4Gv8YYKuEgpd 1Dhm7r3eFGQywGYL7Qvm3qMkOPth2eRwlDIKzrHGgLq3R80KSkyKJFNP1jD9kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2Q4j1MvczvDq; Sat, 30 Dec 2023 14:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUEibqJ051711; Sat, 30 Dec 2023 14:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUEibUT051709; Sat, 30 Dec 2023 14:44:37 GMT (envelope-from git) Date: Sat, 30 Dec 2023 14:44:37 GMT Message-Id: <202312301444.3BUEibUT051709@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: 642ac6015b56 - main - tcp: fix ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 642ac6015b56ab7c1bcb34f0558567c7f9f9743a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=642ac6015b56ab7c1bcb34f0558567c7f9f9743a commit 642ac6015b56ab7c1bcb34f0558567c7f9f9743a Author: Michael Tuexen AuthorDate: 2023-12-30 02:28:13 +0000 Commit: Michael Tuexen CommitDate: 2023-12-30 02:28:13 +0000 tcp: fix ports inline is only support in C99 and newer. To support also C89, use __inline instead as suggested by dim. Reported by: eduardo Reviewed by: rscheff, markj, dim, imp Tested by: eduardo Fixes: a8b70cf26030 ("netpfil: Use accessor functions and named constants for all tcphdr flags") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43231 --- sys/netinet/tcp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 209b89c9a427..64286ede9575 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -79,13 +79,13 @@ struct tcphdr { u_short th_urp; /* urgent pointer */ }; -static inline uint16_t +static __inline uint16_t tcp_get_flags(const struct tcphdr *th) { return (((uint16_t)th->th_x2 << 8) | th->th_flags); } -static inline void +static __inline void tcp_set_flags(struct tcphdr *th, uint16_t flags) { th->th_x2 = (flags >> 8) & 0x0f; From nobody Sat Dec 30 17:11:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2TL12rNsz55dQH; Sat, 30 Dec 2023 17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2TL12Pgcz4GlD; Sat, 30 Dec 2023 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylAjsbPyt/Q4VH6cT5fTS9ZDQ5x725EZGtWANcnBgcM=; b=Mkghfx/cuuo30jtCBFzLcgmKRNZZoTSVqs9Bs+qm5yWOYUrIKij3hoQ7/Sq5NlU3PYzQ62 BNMrd2XX5Q58VP4Bzwq+v2eJCiy0v3asX4CebW44jSeq1Wtzm23IaWKBUT+zlvUOrw0KVw wW6SUIGRjZFvKNla4hJrRRy3P2gWUvc2ILvgOuyeEACmLI3Am+L/glwM3L7YVHlNb/7WLL yiVBnuZ0pQ3xmicjTL8GU2h5MJukdlaH9D9d5WvrmKSJ6pHzC32NX2Q9F+U5okbjIBitXK /krljmLfBWc3Y8gz6/WLB1Nqrawca38Rk5LZWTapR885Y/WU16FG4agOP7U8HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703956281; a=rsa-sha256; cv=none; b=OpiQ5qIZrGeejBtjwtE/HfDYn8WVuC2twicuAHuHAPUbJWQvXe4GGHNyRJGx5wm/t1K5ZV Z0Nb/35H6yg/6TyNze3FC1OSYRbkcA57oJUNBfbW8jcL2J28pWgexzu5L84bEuprTowulI e0O0XsxyKq3XBkb800eBESalMI7habYYU7wwOD5nNT0wxT9ZTePQ5+z1c0fTS8G8tYcZCa NCU58j2KAaRzZDKVDcLNIm3Qec1Ydr3/18KGjLG6sAnSLcxRsQBUyaaQju2Dn8jTHblbED y83Q9YKmLfTjH90wbF9JcL/3jyH6j0pLmU09k4zhuF6qKfegwoqyoVzSGKUrrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylAjsbPyt/Q4VH6cT5fTS9ZDQ5x725EZGtWANcnBgcM=; b=G6QhhcNbr5lg7XnWFNh5GwpWx2Ia8XuOnnfY6nzHki6B0XRKJanBsLtryPcfZJ7s80NxEH blzM1v0nI7USmKsn/aotEBYNgbkDfr3DwupMjg3W3LpKhc/ijXoBiDfMaddOF6HfiV7+Um zOYU9uhAKr0CwYMyDaTtoIdfRclApSyHBDBOM/D5IprSGiA4DXzLnXSweG3FtkBTC2+/59 otLryAWHNNMo/EyGA/9MiAiT9QmtXVknCoks2e4vCEAmLH9Iju8fincLprddg4MOvkI2AO amFTBWfAe4AFVCCsuOLZDu0z2xxPTQMg0DUYdQJUFxJDZGM0W3IIwpY0Intgnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2TL11S23zykS; Sat, 30 Dec 2023 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUHBLI1099762; Sat, 30 Dec 2023 17:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUHBLgi099759; Sat, 30 Dec 2023 17:11:21 GMT (envelope-from git) Date: Sat, 30 Dec 2023 17:11:21 GMT Message-Id: <202312301711.3BUHBLgi099759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 4d08b569a01e - main - bsd.man.mk allow staging compressed pages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d08b569a01efec69319d9d22c7e361b8270a21d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4d08b569a01efec69319d9d22c7e361b8270a21d commit 4d08b569a01efec69319d9d22c7e361b8270a21d Author: Simon J. Gerraty AuthorDate: 2023-12-30 17:10:03 +0000 Commit: Simon J. Gerraty CommitDate: 2023-12-30 17:10:03 +0000 bsd.man.mk allow staging compressed pages In the DIRDEPS_BUILD we use staging. The staging logic in bsd.man.mk was in the wrong place, shift it and add compressed man pages to the stage set if appropriate. Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D43238 --- share/mk/bsd.man.mk | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 25a0edcc7bc5..c80c618e48db 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -130,22 +130,6 @@ all-man: ${MAN} ZEXT= ${MCOMPRESS_EXT} .if defined(MAN) && !empty(MAN) -.if ${MK_STAGING_MAN} == "yes" -STAGE_TARGETS+= stage_files -_mansets:= ${MAN:E:O:u:M*[1-9]:@s@man$s@} -STAGE_SETS+= ${_mansets} -.for _page in ${MAN} -stage_files.man${_page:T:E}: ${_page} -STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} -.endfor -.if !empty(MLINKS) -STAGE_SETS+= mlinks -STAGE_TARGETS+= stage_links -STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} -stage_links.mlinks: ${_mansets:@s@stage_files.$s@} -.endif -.endif - CLEANFILES+= ${MAN:T:S/$/${MCOMPRESS_EXT}/g} CLEANFILES+= ${MAN:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} .for __page in ${MAN} @@ -185,6 +169,27 @@ _MANLINKS+= ${CATDIR}${_osect}${MANSUBDIR}/${_oname} \ .endfor .endif +.if defined(MAN) && !empty(MAN) +.if ${MK_STAGING_MAN} == "yes" +STAGE_TARGETS+= stage_files +_mansets:= ${MAN:E:O:u:M*[1-9]:@s@man$s@} +STAGE_SETS+= ${_mansets} +.for _page in ${MAN} +stage_files.man${_page:T:E}: ${_page} +.if target(${_page}${MCOMPRESS_EXT}) +stage_files.man${_page:T:E}: ${_page}${MCOMPRESS_EXT} +.endif +STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} +.endfor +.if !defined(NO_MLINKS) && !empty(MLINKS) +STAGE_SETS+= mlinks +STAGE_TARGETS+= stage_links +STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} +stage_links.mlinks: ${_mansets:@s@stage_files.$s@} +.endif +.endif +.endif + maninstall: .if defined(MAN) && !empty(MAN) maninstall: ${MAN}