From nobody Mon Jun 17 02:11:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2YKL2mckz5N1m4; Mon, 17 Jun 2024 02:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2YKL25nbz4dpR; Mon, 17 Jun 2024 02:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718590294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zklmRe8tVKX5FzvWGcR7BXNgL9/DHyRX4gTC1uvqKZk=; b=nmfzTxiXoOXHNw7IJLch3rGH6zqa3UyJe4xgF9iQf1pPJgZ9Rg1QTgWn0qfNMBPte5B1fX 0fdzEnmwNpGLfjAeQh6kk5c14kvBHSm+CpP6utIoMqCd22phTba/pKSyZM0Jxcbwr2FLmZ xjpNkibLcs/zK/fTu2uTNhX5QBXq1OPFkwDH2x5D11WKZOoow3uKuvxftvisjH32/SAjd/ niQs/0vODXAx0kcO2WUfdK1yPgWu6snzQnGeFrlF2NG3NDUL1nTPDgXlQ3b8EleCyxcN1P 9rB86Tawzv5xIs/7HU6HevwKJpM6fqX328I68okFsYbRDBYMpGXPMBTFY3FV3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718590294; a=rsa-sha256; cv=none; b=utD2dyGqSsYU1auAouAdPcc8gc1Nc3IPMgavxzpOLMarHZHRlnxc4H4tC8x89yNNwr9TLZ a59KB2dgUsKDBZDHD80jQd8+OkrMm6W2DeWrLMS1C64K2tHH/jZxHSZYT8wNhnxmhGBDwm xr6TsJMrIHLTvwsVCc9JC2PlKUefARb2qAsCQbaVcdaSiq0rSRsdQUO+L0Y6omYeoiFVC5 GqjPvEqxhhCYuQv9ua8vTEJBVx2mNodl+RfV5+ieDo9eSjNBBG8e3PC13U6Tu0sRoJcf9E PSprdLml5Xe5UaHnTDblXLo1ftfHMrUVmltJ8hScEc3pPhIeF5mKhs5cvLmg5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718590294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zklmRe8tVKX5FzvWGcR7BXNgL9/DHyRX4gTC1uvqKZk=; b=NHaKch7gc9pRhMl1vvm41mEp5OUboP5cUQml4q5sfULvee8/YTDMDetbw8RQ9yvFmZb/PN g1UzjC0Oiilazld7dzll39E69xx1ES262wqMhAr+s+NRaTA67OqL50q/Ocm4iAwrd3kpqw JuU8tVqVsjGYs8nLqRri96acgFTgTwYl8qp96jSp0c5vPhCUeoWIrobYPZQCwL+NYCJYVN OsY/m7THCts8ZqCZk3XQV5hZezQ8JhCaXs1vSdU5n2Vd9OcDk5dbCWsYBkjBcQ3tJjEOOt 7sRyGSBg3dtiDfvT/DkPoVGsxmrVJ7npmh8FaNton4zBOkEqPs+x2xqcQ90sog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2YKL1j3Yz1By5; Mon, 17 Jun 2024 02:11: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 45H2BYs8046513; Mon, 17 Jun 2024 02:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H2BYGo046510; Mon, 17 Jun 2024 02:11:34 GMT (envelope-from git) Date: Mon, 17 Jun 2024 02:11:34 GMT Message-Id: <202406170211.45H2BYGo046510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: e827b61cacdd - main - cxgbetool(8): Be flexible about the nexus name. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e827b61cacddd4bc9a2f1657ad8c6d2bcd70d52e Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e827b61cacddd4bc9a2f1657ad8c6d2bcd70d52e commit e827b61cacddd4bc9a2f1657ad8c6d2bcd70d52e Author: Navdeep Parhar AuthorDate: 2024-06-13 20:17:55 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-17 01:54:02 +0000 cxgbetool(8): Be flexible about the nexus name. Use the name as-is but perform cxgbe specific ioctls on the device to make sure that it is a Terminator device nexus. Determine the chip type, pf/vf, etc. from the device registers rather than the nexus name. This allows cxgbetool to work with the VF driver. MFC after: 1 week Sponsored by: Chelsio Communications --- usr.sbin/cxgbetool/cxgbetool.c | 116 +++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 40 deletions(-) diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c index bef99ff0f3da..8f58fe8107dc 100644 --- a/usr.sbin/cxgbetool/cxgbetool.c +++ b/usr.sbin/cxgbetool/cxgbetool.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -55,9 +56,16 @@ #define in_range(val, lo, hi) ( val < 0 || (val <= hi && val >= lo)) #define max(x, y) ((x) > (y) ? (x) : (y)) -static const char *progname, *nexus; -static int chip_id; /* 4 for T4, 5 for T5, and so on. */ -static int inst; /* instance of nexus device */ +static struct { + const char *progname, *nexus; + int chip_id; /* 4 for T4, 5 for T5, and so on. */ + int inst; /* instance of nexus device */ + int pf; /* PF# of the nexus (if not VF). */ + bool vf; /* Nexus is a VF. */ + + int fd; + bool warn_on_ioctl_err; +} g; struct reg_info { const char *name; @@ -87,7 +95,7 @@ struct field_desc { static void usage(FILE *fp) { - fprintf(fp, "Usage: %s [operation]\n", progname); + fprintf(fp, "Usage: %s [operation]\n", g.progname); fprintf(fp, "\tclearstats clear port statistics\n" "\tclip hold|release hold/release an address\n" @@ -136,27 +144,12 @@ get_card_vers(unsigned int version) static int real_doit(unsigned long cmd, void *data, const char *cmdstr) { - static int fd = -1; - int rc = 0; - - if (fd == -1) { - char buf[64]; - - snprintf(buf, sizeof(buf), "/dev/%s", nexus); - if ((fd = open(buf, O_RDWR)) < 0) { - warn("open(%s)", nexus); - rc = errno; - return (rc); - } - } - - rc = ioctl(fd, cmd, data); - if (rc < 0) { - warn("%s", cmdstr); - rc = errno; + if (ioctl(g.fd, cmd, data) < 0) { + if (g.warn_on_ioctl_err) + warn("%s", cmdstr); + return (errno); } - - return (rc); + return (0); } #define doit(x, y) real_doit(x, y, #x) @@ -522,7 +515,7 @@ dump_regs(int argc, const char *argv[]) rc = dump_regs_t6(argc, argv, regs.data); } else { warnx("%s (type %d, rev %d) is not a known card.", - nexus, vers, revision); + g.nexus, vers, revision); return (ENOTSUP); } @@ -914,7 +907,7 @@ do_show_one_filter_info(struct t4_filter *t, uint32_t mode) printf("(hash)"); } } - if (chip_id <= 5 && t->fs.prio) + if (g.chip_id <= 5 && t->fs.prio) printf(" Prio"); if (t->fs.rpttid) printf(" RptTID"); @@ -933,7 +926,7 @@ show_filters(int hash) if (rc != 0) return (rc); - if (!hash && chip_id >= 6) { + if (!hash && g.chip_id >= 6) { header = 0; bzero(&t, sizeof (t)); t.idx = 0; @@ -1924,10 +1917,10 @@ get_sge_context(int argc, const char *argv[]) if (rc != 0) return (rc); - if (chip_id == 4) + if (g.chip_id == 4) show_t4_ctxt(&cntxt); else - show_t5t6_ctxt(&cntxt, chip_id); + show_t5t6_ctxt(&cntxt, g.chip_id); return (0); } @@ -2243,7 +2236,7 @@ show_tcb(uint32_t *buf, uint32_t len) } printf("\n"); } - set_tcb_info(TIDTYPE_TCB, chip_id); + set_tcb_info(TIDTYPE_TCB, g.chip_id); set_print_style(PRNTSTYL_COMP); swizzle_tcb(tcb); parse_n_display_xcb(tcb); @@ -2447,7 +2440,7 @@ static void create_tracing_ifnet() { char *cmd[] = { - "/sbin/ifconfig", __DECONST(char *, nexus), "create", NULL + "/sbin/ifconfig", __DECONST(char *, g.nexus), "create", NULL }; char *env[] = {NULL}; @@ -3494,7 +3487,7 @@ display_clip(void) return (errno); } - snprintf(name, sizeof(name), "dev.t%unex.%u.misc.clip", chip_id, inst); + snprintf(name, sizeof(name), "dev.t%unex.%u.misc.clip", g.chip_id, g.inst); rc = sysctlbyname(name, buf, &clip_buf_size, NULL, 0); if (rc != 0) { warn("sysctl %s", name); @@ -3649,14 +3642,57 @@ run_cmd_loop(void) return (rc); } +#define A_PL_WHOAMI 0x19400 +#define A_PL_REV 0x1943c +#define A_PL_VF_WHOAMI 0x200 +#define A_PL_VF_REV 0x204 + static void -parse_nexus_name(const char *s) +open_nexus_device(const char *s) { - char junk; - - if (sscanf(s, "t%unex%u%c", &chip_id, &inst, &junk) != 2) - errx(EINVAL, "invalid nexus \"%s\"", s); - nexus = s; + const int len = strlen(s); + long long val; + const char *num; + int rc; + u_int chip_id, whoami; + char buf[128]; + + if (len < 2 || isdigit(s[0]) || !isdigit(s[len - 1])) + errx(1, "invalid nexus name \"%s\"", s); + for (num = s + len - 1; isdigit(*num); num--) + continue; + g.inst = strtoll(num, NULL, 0); + g.nexus = s; + snprintf(buf, sizeof(buf), "/dev/%s", g.nexus); + if ((g.fd = open(buf, O_RDWR)) < 0) + err(1, "open(%s)", buf); + + g.warn_on_ioctl_err = false; + rc = read_reg(A_PL_REV, 4, &val); + if (rc == 0) { + /* PF */ + g.vf = false; + whoami = A_PL_WHOAMI; + } else { + rc = read_reg(A_PL_VF_REV, 4, &val); + if (rc != 0) + errx(1, "%s is not a Terminator device.", s); + /* VF */ + g.vf = true; + whoami = A_PL_VF_WHOAMI; + } + chip_id = (val >> 4) & 0xf; + if (chip_id == 0) + chip_id = 4; + if (chip_id < 4 || chip_id > 7) + warnx("%s reports chip_id %d.", s, chip_id); + g.chip_id = chip_id; + + rc = read_reg(whoami, 4, &val); + if (rc != 0) + errx(rc, "failed to read whoami(0x%x): %d", whoami, rc); + g.pf = g.chip_id > 5 ? (val >> 9) & 7 : (val >> 8) & 7; + g.warn_on_ioctl_err = true; } int @@ -3664,7 +3700,7 @@ main(int argc, const char *argv[]) { int rc = -1; - progname = argv[0]; + g.progname = argv[0]; if (argc == 2) { if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) { @@ -3678,7 +3714,7 @@ main(int argc, const char *argv[]) exit(EINVAL); } - parse_nexus_name(argv[1]); + open_nexus_device(argv[1]); /* progname and nexus */ argc -= 2; From nobody Mon Jun 17 02:11:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2YKM3ryvz5N28l; Mon, 17 Jun 2024 02:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2YKM3GTjz4f2T; Mon, 17 Jun 2024 02:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718590295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5hBrft9SHYzDPZXFdV2C/TXun8ANNDy6YcHmeJFw2E=; b=j3GdiDKL52LgwRvCbVdmvQtlnmhlRcXbG5gsqHtZ5KFV7Vq9nI/KrDwKo5VB/WxlFlPWbU UpHrcSJhRX8yRd8M5CQoPhrTzo36vckbxMzNbDPVuwbBIh+fHLEA+25aga7ZvVQK0x25MN a4dzt9PFg61+8J5A91X5C9g+AIaj/l9nJvkEPw+6RaTZisRc1I4KBSEGvAINJJeOAMVQL0 76mhGeLKeT9WJ/7wsD3vmxxIEJyPx+86IfPbyOaGDcOGR5CjONz46CJ4TzRoaclyotTCVJ oWF8vErle0E4hKxgawAI3gAdkvb2OGTb/nrr4skoxqJMyrId+slitn8OBooX5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718590295; a=rsa-sha256; cv=none; b=qkbWvu5DWV7y4pm1114lTYMEUGJQf8D1u6IXoVWaXm8CHwrgDkwwjhTEsNJNiLL/iQ3ZW6 O0mIWACmowtfGKni1YUuYfXxjYZ85zte62tMCXv/D1/SmLynPWPfwWXBNcEM9eBp2HMRCr l2SCB5i0U364EUKGoNbeQNvzcBEXji/yOQCr3/QXnEGjjIkasK4nSLTUFL5lrEpjR5D8yG LSxvDt27tVyF/cq0G0qkZYruCrLZtDBB6vNo1QdEQhqmO9mU1Mp2cdvMQnrW7PGlZKvGgc M/g6EL8wTKWFZwBLF7YV3lwzL4YqfzlGHnQsq48lh9rxEovt1S1tSAA0ydMEgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718590295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5hBrft9SHYzDPZXFdV2C/TXun8ANNDy6YcHmeJFw2E=; b=wdXIUQlUznc3NPYVntwNroRzkrW8j5eJXrH/9t0OrxxsOucRpzTSRGi+K2V1alWMYjfxBE j8DdVFz0g/o57abdF5pXd/aG4rWtO0woGDQXTJEtn/ArB6lxCQhuKPluicZba+C4sU2YaO iLTUPRO5+UXoHkX1hPsJa8XLBu8CQoQn7uG0eVjCVu1E3VpbBU6jIUardOrW+Y3PM/CdXh vJadR+ObxXM1hRxgjZwoPELOw1Cmp8sSYcft5nM9FOl2GR144HRdkIE9CIQdZvPx5Y23lL kwbMQMsbuDNcDzpO7DZtgrj0nmyfEUiXDTd5f+Yh9vCIxC+on+IyMVrtERBErQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2YKM2l27z1BmC; Mon, 17 Jun 2024 02:11: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 45H2BZlc046586; Mon, 17 Jun 2024 02: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 45H2BZKw046583; Mon, 17 Jun 2024 02:11:35 GMT (envelope-from git) Date: Mon, 17 Jun 2024 02:11:35 GMT Message-Id: <202406170211.45H2BZKw046583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: d0fdafdb0ef4 - main - cxgbev(4): Use the correct source pf for T6 in the VF driver. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0fdafdb0ef4ec9c5c66f39daf2eca926f14be0d Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=d0fdafdb0ef4ec9c5c66f39daf2eca926f14be0d commit d0fdafdb0ef4ec9c5c66f39daf2eca926f14be0d Author: Navdeep Parhar AuthorDate: 2024-06-16 18:27:15 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-17 01:54:02 +0000 cxgbev(4): Use the correct source pf for T6 in the VF driver. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/t4vf_hw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/common/t4vf_hw.c b/sys/dev/cxgbe/common/t4vf_hw.c index 25ab3db77c72..a0c2eb5f60b3 100644 --- a/sys/dev/cxgbe/common/t4vf_hw.c +++ b/sys/dev/cxgbe/common/t4vf_hw.c @@ -139,7 +139,10 @@ int t4vf_get_sge_params(struct adapter *adapter) * This is based on the PF from which we're instantiated. */ whoami = t4_read_reg(adapter, VF_PL_REG(A_PL_VF_WHOAMI)); - pf = G_SOURCEPF(whoami); + if (chip_id(adapter) <= CHELSIO_T5) + pf = G_SOURCEPF(whoami); + else + pf = G_T6_SOURCEPF(whoami); s_hps = (S_HOSTPAGESIZEPF0 + (S_HOSTPAGESIZEPF1 - S_HOSTPAGESIZEPF0) * pf); From nobody Mon Jun 17 02:11:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2YKN5Jhjz5N1ph; Mon, 17 Jun 2024 02: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 4W2YKN4SZ4z4drS; Mon, 17 Jun 2024 02: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=1718590296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDhRvg9LVzmnQ/aK4Dskn8hhTK+OB3MsKtiUqmyo0uo=; b=gUG3uwpBJxrexE700hYQBeV80j553pCl4YoOMNrNqo/uJkxW8NBM9jS+fgv6/BZFqm1qOs 3cwL2h3uyb/Fgh6IO77yOzazqFt/mzbCfG4vFU40a/fz3GgffVS8rEY1ssmQ+EFQ/Ah6mn szXukhaD97YTzbvZZmSmeAWhnF+IlithC4gSiwAX4vJdFPK4Xyy1rYuaNJUrt4td6Krh5i R8/OUVxqDVL5m9aUIz6eKWu3mKxWvTh+2DGPd8UsAERM4nC32ivYu9bKEfGoqQXwj2T+1V RMUiyEu1u2giLr3PuyZcKriZVCre4SfEuDq/ox3b9rQ0cTd2vsiQXTsIuOnNVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718590296; a=rsa-sha256; cv=none; b=Tj27jjBChpZPG/O4bwGlCc6q4esZtnL464oLIVrDpb00EBLsJ/V6Jx4GO/Yn97QqaYafV4 LqEP9ebssuET8wW6fepvEKHMAC+vqgt9CLG68tHLYOl9OhNcezK8P9gAMjVF0N+cL/Kliq 97oqLmK8+RVzujYhQzRicYcCnQGR1SRbQpwEqa+QIcxRGBb8JiL1Rt4CZT8u7ewrSAnJNy NbZxb2cTH5NzRQpFAcYAJuxeXcRKuexWazAdRz9KoaNjYqgkZPGRU0+mLSyGZ2rpjh3Tow PAPYIg1rvBajixMPnrsqa7PcnFOiYccCBrP+EjohnEZ2qshyEOYoQbwcFh5E8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718590296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDhRvg9LVzmnQ/aK4Dskn8hhTK+OB3MsKtiUqmyo0uo=; b=TomF2we9376GiYqbBMVgXEtwzDcP3bh7Il0qcOYGp0oYryfPjITeY2tjIZ3Dj2uTZnSfe1 wOpW1JqOfolyfamc2NtG6aj7eGrP+PVHLV3XAWjCR92PU5Me3l+YpDWouAVQ1KKQqCgIHs VT9y6tuxAtkXBXy8cYZqr+iWKSmErH6KFBwLjjG5SnMuNUzxtLmeHrd/FmlZqO4HpAmnlK LQi6mN4s6H1oW/Od+xDVrURMCogdwRkG76onvzL0lFLkb4tpPZwTP52gFXLFEqoVmSWNiY zAt7aVZNzeDx0lK6JglLGP/lZVFKSaM8h5jzN5ZXB8rTvj6lwBeKQAIjYwYVrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2YKN3Z14z1BjN; Mon, 17 Jun 2024 02: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 45H2BaZJ046645; Mon, 17 Jun 2024 02:11:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H2Bavk046642; Mon, 17 Jun 2024 02:11:36 GMT (envelope-from git) Date: Mon, 17 Jun 2024 02:11:36 GMT Message-Id: <202406170211.45H2Bavk046642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: d72db09005e5 - main - cxgbe(4): Do not issue an L1CFG command from a VF. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d72db09005e53160d6c89b5221169efaac74cd55 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=d72db09005e53160d6c89b5221169efaac74cd55 commit d72db09005e53160d6c89b5221169efaac74cd55 Author: Navdeep Parhar AuthorDate: 2024-06-13 18:05:51 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-17 01:54:02 +0000 cxgbe(4): Do not issue an L1CFG command from a VF. It is pointless to attempt an operation that is not permitted. It spams the firmware devlog with "insufficient caps" errors that distract from real errors. 78 2463625358 ERR CORE insufficient caps to process mailbox cmd: pfn 0x0 vfn 0x1; r_caps 0x86 wx_caps 0x82 required r_caps 0x81 w_caps 0x5 MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 03b674cb9241..ae18efb25f15 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -6023,25 +6023,27 @@ apply_link_config(struct port_info *pi) if (lc->requested_fec & FEC_BASER_RS) MPASS(lc->pcaps & FW_PORT_CAP32_FEC_BASER_RS); #endif - rc = -t4_link_l1cfg(sc, sc->mbox, pi->tx_chan, lc); - if (rc != 0) { - /* Don't complain if the VF driver gets back an EPERM. */ - if (!(sc->flags & IS_VF) || rc != FW_EPERM) + if (!(sc->flags & IS_VF)) { + rc = -t4_link_l1cfg(sc, sc->mbox, pi->tx_chan, lc); + if (rc != 0) { device_printf(pi->dev, "l1cfg failed: %d\n", rc); - } else { - /* - * An L1_CFG will almost always result in a link-change event if - * the link is up, and the driver will refresh the actual - * fec/fc/etc. when the notification is processed. If the link - * is down then the actual settings are meaningless. - * - * This takes care of the case where a change in the L1 settings - * may not result in a notification. - */ - if (lc->link_ok && !(lc->requested_fc & PAUSE_AUTONEG)) - lc->fc = lc->requested_fc & (PAUSE_TX | PAUSE_RX); + return (rc); + } } - return (rc); + + /* + * An L1_CFG will almost always result in a link-change event if the + * link is up, and the driver will refresh the actual fec/fc/etc. when + * the notification is processed. If the link is down then the actual + * settings are meaningless. + * + * This takes care of the case where a change in the L1 settings may not + * result in a notification. + */ + if (lc->link_ok && !(lc->requested_fc & PAUSE_AUTONEG)) + lc->fc = lc->requested_fc & (PAUSE_TX | PAUSE_RX); + + return (0); } #define FW_MAC_EXACT_CHUNK 7 From nobody Mon Jun 17 02:11:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2YKP6mxYz5N291; Mon, 17 Jun 2024 02: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 4W2YKP53pQz4f2p; Mon, 17 Jun 2024 02: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=1718590297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10Ht+DwlXOW+xVCKnl5581GMypFC3QYZkyR0NXGyeo0=; b=bJQc73W2LuDwF7Ajfyfxfc7EaJjbdaKtOv34cbXbZGzGCIBwy/QIkAU9odowb9iFoMKQau C/cOmZuVEnKT8hW91AwTZ48o6/4Xkr/zSi2J9+rABg+GCFM4sG0SeP6o05DS0S0gW4V+zI 9lB21isXTQ8BcStIOiS5rt4vuOaqrkyxm1fF6lzWRBDjUphrM/LowOpQGcNpmQoZoGTzdE JDuX3JJpktKyXUs6HNj3ZJusOfqHr9HbYxxlwU7Vz7BIqDr2LNmH27kxRFOqccf1OJANkJ 0PkXtvgMvkeGi87AFAGdpSV4ew8lqSULrX7Is8+uh/TViDEznahxTVuLs10/YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718590297; a=rsa-sha256; cv=none; b=ipRsz+Ntor+UsbC2bu830Pg0/a18H574R0zhazsJRz6mRI6K/MIQLRCYG/4zYoYbaYdx+B PArec7A1aGR0ezgsLkUJjB260IqhW/VUTqhOmW/nnlenEbNcEhzrubKFHA+2jJxejlRX9v fLiMxuyiSi379lvNXdoDHuxBos+GHYess+Pdy+8+7wB31q71407rYHIe/kcH8q0bs8CPSC gFCLSDaIwxCVijXFNIoBgmAAa7pQsJhz8kXVKM4tTb3Gt7K6bjrwD4sNCchhjpP5rJ/ugY pX852+iIkEDbvLGpknTC0HcwVNVuV8jT2gMH35H9YF49T5TvPVxAIuZ8Qm1DZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718590297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10Ht+DwlXOW+xVCKnl5581GMypFC3QYZkyR0NXGyeo0=; b=gcIIjloRnNJUH5CI79+gJWwDp8i3CqHWb3eqL6rwAzwCq6MAC7DP8LG0lahvVoLhD/FNFR vAK9Z22UKo/VrH9s8gbdFHhduBJpNQT+/dcbcfz5btJwyPwC2bpBVZFNOMWKRdGNqhPOI1 3vzGz8WURM+wqsSu7XhkJS8FQeykQbhv8xXwKsRBBEM8NUrsDAOJRgyw+QS585mmmnl8GI B5QCpYAgAfuLT2wp+/XOpVN1aQxJwWl8q3FDch8Z9FzHztwO78KCCxXx+Cbd2876wH3yy6 7JsyggM/bNMdIInlt2nRuCILpRBfLmoGsiIeKvbljUKJZSPxgRZYI+o6D7ALkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2YKP4frLz1BvK; Mon, 17 Jun 2024 02: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 45H2BbGp046708; Mon, 17 Jun 2024 02: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 45H2BboF046705; Mon, 17 Jun 2024 02:11:37 GMT (envelope-from git) Date: Mon, 17 Jun 2024 02:11:37 GMT Message-Id: <202406170211.45H2BboF046705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: ba95b4aea789 - main - cxgbe(4): New knob to limit driver to the specified types of doorbells. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba95b4aea78909bca972239afcbd51538c4b37c1 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=ba95b4aea78909bca972239afcbd51538c4b37c1 commit ba95b4aea78909bca972239afcbd51538c4b37c1 Author: Navdeep Parhar AuthorDate: 2024-06-13 17:22:03 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-17 01:54:02 +0000 cxgbe(4): New knob to limit driver to the specified types of doorbells. hw.cxgbe.doorbells_allowed="0xf" The adapter's doorbells bitmap is clipped to the value specified in the tunable, which is meant for debug and workarounds only. There is no change in default behavior. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/adapter.h | 1 + sys/dev/cxgbe/t4_main.c | 21 +++++++++++++++++++++ sys/dev/cxgbe/t4_vf.c | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 1a61834c5a40..9ab672ba6442 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1364,6 +1364,7 @@ void t4_add_adapter(struct adapter *); int t4_detach_common(device_t); int t4_map_bars_0_and_4(struct adapter *); int t4_map_bar_2(struct adapter *); +int t4_adj_doorbells(struct adapter *); int t4_setup_intr_handlers(struct adapter *); void t4_sysctls(struct adapter *); int begin_synchronized_op(struct adapter *, struct vi_info *, int, char *); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index ae18efb25f15..96407e7ebaba 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -604,6 +604,11 @@ static int t5_write_combine = 0; SYSCTL_INT(_hw_cxl, OID_AUTO, write_combine, CTLFLAG_RDTUN, &t5_write_combine, 0, "Use WC instead of UC for BAR2"); +/* From t4_sysctls: doorbells = {"\20\1UDB\2WCWR\3UDBWC\4KDB"} */ +static int t4_doorbells_allowed = 0xf; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, doorbells_allowed, CTLFLAG_RDTUN, + &t4_doorbells_allowed, 0, "Limit tx queues to these doorbells"); + static int t4_num_vis = 1; SYSCTL_INT(_hw_cxgbe, OID_AUTO, num_vis, CTLFLAG_RDTUN, &t4_num_vis, 0, "Number of VIs per port"); @@ -1347,6 +1352,10 @@ t4_attach(device_t dev) if (rc != 0) goto done; /* error message displayed already */ + rc = t4_adj_doorbells(sc); + if (rc != 0) + goto done; /* error message displayed already */ + rc = t4_create_dma_tag(sc); if (rc != 0) goto done; /* error message displayed already */ @@ -3760,6 +3769,18 @@ t4_map_bar_2(struct adapter *sc) return (0); } +int +t4_adj_doorbells(struct adapter *sc) +{ + if ((sc->doorbells & t4_doorbells_allowed) != 0) { + sc->doorbells &= t4_doorbells_allowed; + return (0); + } + CH_ERR(sc, "No usable doorbell (available = 0x%x, allowed = 0x%x).\n", + sc->doorbells, t4_doorbells_allowed); + return (EINVAL); +} + struct memwin_init { uint32_t base; uint32_t aperture; diff --git a/sys/dev/cxgbe/t4_vf.c b/sys/dev/cxgbe/t4_vf.c index a4a611ed645c..24c80aaa7b2d 100644 --- a/sys/dev/cxgbe/t4_vf.c +++ b/sys/dev/cxgbe/t4_vf.c @@ -589,6 +589,10 @@ t4vf_attach(device_t dev) if (rc != 0) goto done; /* error message displayed already */ + rc = t4_adj_doorbells(sc); + if (rc != 0) + goto done; /* error message displayed already */ + rc = t4_create_dma_tag(sc); if (rc != 0) goto done; /* error message displayed already */ From nobody Mon Jun 17 04:03:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2bpQ6LqVz5NC8n; Mon, 17 Jun 2024 04:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2bpQ5sPKz4qtr; Mon, 17 Jun 2024 04:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFgrmQV0aKKxvlho4UHvVemAXa3d4FQh8SoKcFS2CSI=; b=cT1LjdQit8beGBM17YrBigJ/NrGcD+SVHacnx+4WPcnUvhJTJlzUHaYmlfZoPPaeJhV2LF NU/RisiCsP14ZYNwzmP2ICPqxertcu2SHBx9AYiK+DbKF1+g4i71SL0yO9fso5NVvukWnG 3OXV2QB8sqMsvO8Nh6R/Dx4BBPcP3rdQJhfwgi9kmVMYoUKWICfv/Hx2ntJ3VkYMzbWFmb +zDdaezjrFcLSdMjJTC8j/d7QM15aqt1VMY45bwAhUAzHPz7ROTZETfJ7JN0IsV2djNdRT 4ScykT9WntvsMldX/3mJ6/Z6eo1ghMqwR46zy0ocfCVD8lPLorkm3HCuLQAPWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597006; a=rsa-sha256; cv=none; b=MDMOXXEJRCCAdSySwUmFgKCsSYL5v4qOWQQikfB9jJ3ol2nPLVfadXYgaD5R/Imnnch6Db 4UKa7Ckh9NRTI1/PLCnO7W/q6aZgvNPincYiwAD410tSJnvCBs6L8rrRe/iy31apNi6kW1 kh06tYqMnLJestHbmq7charj8lAvrdPO08RS1Rgd2ONriISc1EOioCtIfMaJXaU9HjZBR5 p3Sp/TyupG9YYa6fM63BRA7CeN6mBE0WcW5VefhFsOv6H06O+46mRlMDtXo7TjIv7b7i5G gOKGvXU8Rd6dlPRzQYqKtICfRD1Fe+BeBcn6wgaoaLvnFnPcmfI2AhteDrPW/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=1718597006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFgrmQV0aKKxvlho4UHvVemAXa3d4FQh8SoKcFS2CSI=; b=REgFYCXoATB3qK5BskQk10Ak5kQJaQIWpr3SCzz4WIxWVf+U9qtcrPkqFbe6E0dhR5Phv0 M+fMCXF9dMAfWhw2YK4Sf8Fb1ktwuWQXjlsTDYr81PdNf2cwX8ZDhRvmAhSBJF8CtycckA Xl1JCMhmjISREA0Xs5O7zgfV/9KO5XYbyDBs1ZoiROZ85tv9ZD0YIr5Woq83c6c7nsfRxi 0Mbak/xvBPTpSFF0mZ5STMqSohCb5ZaX8spby/JGFg0A3R+MpGjHy6JlMBbq4DrJHW99L/ GTXVWdp10Qx83ou9XxuKTKcu42oqbYJUgdVuit6UXubEfVNn+FnGGzyfAe/caA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2bpQ5Sqjz1Fvk; Mon, 17 Jun 2024 04:03: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 45H43QCX039546; Mon, 17 Jun 2024 04:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43QBS039543; Mon, 17 Jun 2024 04:03:26 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:26 GMT Message-Id: <202406170403.45H43QBS039543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 049b3c953e1e - stable/14 - bhyve: avoid side effect in assertion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 049b3c953e1eb81851c8668092beda377c3dbf0b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=049b3c953e1eb81851c8668092beda377c3dbf0b commit 049b3c953e1eb81851c8668092beda377c3dbf0b Author: Pierre Pronchery AuthorDate: 2024-05-17 07:31:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 03:58:35 +0000 bhyve: avoid side effect in assertion An assert() was setting the error variable instead of checking it. Reported by: Coverity Scan CID: 1521431 Reviewed by: jhb Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1244 (cherry picked from commit f7d45c5443edc99857fdda19c68301b5ec4a8971) --- usr.sbin/bhyve/tpm_ppi_qemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/tpm_ppi_qemu.c b/usr.sbin/bhyve/tpm_ppi_qemu.c index 8bea45ea3208..da0edf84798f 100644 --- a/usr.sbin/bhyve/tpm_ppi_qemu.c +++ b/usr.sbin/bhyve/tpm_ppi_qemu.c @@ -162,7 +162,7 @@ tpm_ppi_deinit(void *sc) ppi = sc; error = unregister_mem(&ppi_mmio); - assert(error = 0); + assert(error == 0); free(ppi); } From nobody Mon Jun 17 04:03:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2bpS145mz5NCqC; Mon, 17 Jun 2024 04:03: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 4W2bpS0RbNz4ql6; Mon, 17 Jun 2024 04:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RLBvz3mgn41s0B5Y5eZa1c9FUYNzJbQPCNgdf38k25M=; b=ixtIDQrHMY1Q1Dt1INacC9pB9j8NfXieSWhzoLAjcsGgpzOXxvOyAxR+kuKzQV2DqfhX8D ApCKPR63kkxpPR1J12d4EPJzE7MY8ebQ/oGJCzxcWh2rttj501Ihm7hy+cPkEZhMGyDlzx lpq7UQqXaysvx7mKeePaK8f/6nH/ArliQl/qfFrEf423NYlFpq5cEQf7mlVU1LPoQC8YDu E0ESCNW9/8fjFpYzzPeURGtmu2oq31rvAW6Wjvqkz4WbPgH4jDzRYfO+P7h5tvSszYUgNI x5EeCVM8rZfrp+QYJJosM88+lkKSo1DaM0o/W74KwXO+PIQDbZjlAZUJ2NDIew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597008; a=rsa-sha256; cv=none; b=nw7oZ26Q/guy5OJuhvq8SusNTC4dWF+wqjCkind9TC/YNCHxKgkpPRSzNvf6gRIbofR8Kz UMOtegrRXCICNoSeNUHiJ0IgyfcRfoDCNl5XRwfkGh06/UKUyIJNfccdVbCxjHRgykc+uE KUQ96eihG4QVsC6KI/IaQrHw0x0Nk7Ya+qgmyg+2TETbo2sW9RZrJn7ZlKes4dXGitn0xx mOfe69ErROmAnHeuoS9NcF3PwbZqpF2fleFGGXsVPQb6c4YxYuHS22HPhMVWD83RTGSgZZ hiGlAAit+2QfX3TObHRcE8wbIyucx+V9dK55cOadeSEVXmf89LZZrOiL0r/xeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RLBvz3mgn41s0B5Y5eZa1c9FUYNzJbQPCNgdf38k25M=; b=p+DfTtYeJdc348FFdFNwFznuzWfPD9EcaLj8Im4fboiNCzPC5z1gNBC16dMnTVisX+tenb 2BLYja/mCBxyuMDNTpQL8lY2bFsJgTTgOL4Nf19yaWIyRGKdrA/rIlFY2SrIKhrQGl3RqV +kkw0Gd2j7ZpJmWK3/BOFosiWs6J3rEKdpn9ezTBR/513r4xZWwqKSLAlkPlJBrKQCSdjB T2A3gb6iGRnWk0Yz1M+8J5iGDVPyG0F/J/flDfEtToer5juvIVRBjJNjZjzTtSQwWmHYXe 57ENnuxCpsaRj5Z2ERTxqL2J+hQTOflTPw8rswJhmgsGhAv2GZrbpKwETflgKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2bpR6VBwz1Fxl; Mon, 17 Jun 2024 04:03: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 45H43RhU039610; Mon, 17 Jun 2024 04:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43RhZ039607; Mon, 17 Jun 2024 04:03:27 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:27 GMT Message-Id: <202406170403.45H43RhZ039607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a674f992a135 - stable/14 - if_enc(4): Prefer the boolean form when calling bpf_peers_present() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a674f992a135728648908874034408d43b3d1903 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a674f992a135728648908874034408d43b3d1903 commit a674f992a135728648908874034408d43b3d1903 Author: Zhenlei Huang AuthorDate: 2024-06-06 04:20:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 03:59:18 +0000 if_enc(4): Prefer the boolean form when calling bpf_peers_present() No functional change intended. MFC after: 1 week (cherry picked from commit 215a18d502cba2cf57251e82a84484219f2c432a) --- sys/net/if_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 971afdabfff6..eaac0a843189 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -217,7 +217,7 @@ enc_bpftap(struct ifnet *ifp, struct mbuf *m, const struct secasvar *sav, else if (hhook_type == HHOOK_TYPE_IPSEC_OUT && (enc & V_bpf_mask_out) == 0) return; - if (bpf_peers_present(ifp->if_bpf) == 0) + if (!bpf_peers_present(ifp->if_bpf)) return; hdr.af = af; hdr.spi = sav->spi; From nobody Mon Jun 17 04:03:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2bpT1pQ4z5NC8r; Mon, 17 Jun 2024 04:03: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 4W2bpT0pN0z4qtx; Mon, 17 Jun 2024 04:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNkoqzafjjLAZlCJlsqXnZZrg58awwvb1c7IjFzQbYw=; b=cvMLBs+5Jw0vOifXZVLmk/i8ECy85bXw3640wsqWZdHg/Wv1bOLpiRz2/Qo+H5u200KKqa ZCHFJPZlPnez9pV+hNqArpicCi+f7TN4x5YNVMqXIQRD2Qpu+hyJglRM4KMFKlv77phFem BBk6UQ0JjvKUASFL7u3ZdWZzxLS868xa5jGXlAsO7dV9ISzuv4EU3A273jXyBx2IrIL3m2 gRurhJ8rMEf48/no6kGRh2HINNcitVFXMim61xuXQcbkKn7jf0NxWgZqTJuR8/tu1xFDx6 7tOSAnyBz4/avA9LfK//iJ1ad32anDRmaJHYnWAt2iK+l8WzQKzOPWccxkq0yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597009; a=rsa-sha256; cv=none; b=vq84zWMSeF3407Lf0nV4G4OlZuRaA2SQVcUI9HO/ncG3mQAyP7mhVlUSw//73br4N7y9mS jkuj88q8cHVlxthUj3IZjLFk6KYqfg+3XfB/xGdUcnSPGfgNPJThFaB+bBBZ4ivqzx41Vl GgDQUB8gddvWRN2Ys2CmWo6jmGt3JVqvcCBhldMOEFPKgG6GjMj/FbUCQ0FECug7XkHSgK NFbqNpAxRAQOv3VViChszUZxEfbet9Ft2tLY1UhnPtIHpjFHyjmQ18L4K8fBbWfPQnfG6p aK7SOp/E2Tkd5arQy37ftxouv0FZuuqYwInWlX1TGIgO/W8TMFrD5Wljj9uk7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNkoqzafjjLAZlCJlsqXnZZrg58awwvb1c7IjFzQbYw=; b=Ci5oVtZIfzwq0dnIny6WnI5KUGISIg2ZYc1mslVYimWKCrAo5orzCczYnxU+Hnw8UOwbm/ gxZPzc0FFnWwRAKUaBUs/sOUVgY0sXYOIWHmk4lkziaPt24qcGYi1d/AHysdgRxv2pwhDi jx+XYTcc8wfN/L7Qu5CI1ShN0eRTmS1j8M7MrM8tI3dWiT8Wpze0mrYaoSVGUSM/yAA+2y sTCebosLy+daS5kG2x4hJkMrXOOx9H9tgDXx750AYvWrqn3DFu3nJNc9PLEbTy1xZvd/d6 I0JArwN0QOctOW+fSka3nEGPiF0G7EIs6YynUFL21HAA572JFzMaa70F9PHTmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2bpT0PtLz1Ft3; Mon, 17 Jun 2024 04:03: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 45H43STw039658; Mon, 17 Jun 2024 04:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43S08039655; Mon, 17 Jun 2024 04:03:28 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:28 GMT Message-Id: <202406170403.45H43S08039655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6ad2e347fcf8 - stable/14 - bpf: Make bpf_peers_present a boolean inline function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd commit 6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd Author: Zhenlei Huang AuthorDate: 2024-06-07 15:06:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 03:59:29 +0000 bpf: Make bpf_peers_present a boolean inline function This function was introduced in commit [1] and is actually used as a boolean function although it was not defined as so. No functional change intended. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: markj, kp, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45509 (cherry picked from commit 0dfd11abc4bd0dcb96a6d287cc4e52e8f59b64c1) --- sys/net/bpf.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 924dea5fc9f4..7b76129aec94 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -435,15 +435,13 @@ int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *); void bpfilterattach(int); u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); -static __inline int +static __inline bool bpf_peers_present(struct bpf_if *bpf) { struct bpf_if_ext *ext; ext = (struct bpf_if_ext *)bpf; - if (!CK_LIST_EMPTY(&ext->bif_dlist)) - return (1); - return (0); + return (!CK_LIST_EMPTY(&ext->bif_dlist)); } #define BPF_TAP(_ifp,_pkt,_pktlen) \ From nobody Mon Jun 17 04:03:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2bpV3sWGz5NCg5; Mon, 17 Jun 2024 04:03: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 4W2bpV1rqvz4qvH; Mon, 17 Jun 2024 04:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mlkj/8HTILA+UHkzpdV8ZbBPkeD82Tf0EHx3e+rrmno=; b=hKAsffAqZfPrRHk5RkzKw9ol60+GI7wvLLZ+pXiBwMs4AVJks6FKE4ezZ6D94QwO0hGnZi x4thBnd6mpgLB8wxttYJHgXTk013VUG76rqqpBSMCkOv//gm4oYRQHUqZs3WXuWGMRA3yy zXOVFWG0aFgmFZouzz5vcv4XeLAjswzk7CHHmhPsBHTXklQYY506uxkFQIddPi3/u/3khU FIIjce6wF+KYXAHIlig9XZ5BVE6t2fXOzrZlHxtXJXZ5X5yWwxKV8dq6XkBtDuU9QfAysd /aaE22iPpLWBt6Hg8GPn0K6+Ta6dziceZhrFJAJH2H/kI9woUb2SMCmq4pYhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597010; a=rsa-sha256; cv=none; b=DTrbyCn1xI4P+q8QEmlvTxPZwxlnZ+R+fFVVqnMCP4vd8fKENfIv/ziITPrPih4oejhcMO pD1uB5pqbegL4VlyflYVhfilkqLYcaT3/aNM1uGU46fMU6i3CV/kQ4pR1TD7mAohSzEwOx KD3AxcLhCoVKvr7/yPXFLJsRTTm0tizOX8BMPTXFjPszhwN7Rjqtz3JZBu0pcrcc2Xpo15 522myRxAkB0EcPg0qohXmR9WwEPGFXaRFgmsQpMg7amLrFxDe3Rx4qAoL5Qm2b0m0aUqzJ j+5tFNgdjkK56MsqAWMTU5MWeJlciJ0atZjBjVszaSDh892Ng+wVg4B9KHak5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mlkj/8HTILA+UHkzpdV8ZbBPkeD82Tf0EHx3e+rrmno=; b=oKEYvno0XMmauf7cAt620eiiyQb455IGLLrcYgWLCdORGPNwEESurw5+WOsozKU0yklBFJ FkTUj1e4vQtRsHBTIvlBIZ6ResOXh8eoqdM1qQpUmLb7026molhbDW0xj0qqxwyfU6wqif JCNBd1uHBwXBNx3IUfdiDeD2zRrsQUhrua8Lv8fc/OLnNrDuTDQpSKReMrryQ5rQ1aqfDr MmXH4SJHEqOmYWeOGlBWmq+X+7w7A6JoWu6AF3xxW/slkC/Dyj27HhBk1OttPnVvjNX1PM mxo0pGTIZfjsPg9w0TUBrOUh3j2pbD1wIIvuXC/W8V6BzFXBUe5xPeXWxqLj2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2bpV1Sxcz1Fxm; Mon, 17 Jun 2024 04:03: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 45H43UDK039709; Mon, 17 Jun 2024 04:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43UDI039706; Mon, 17 Jun 2024 04:03:30 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:30 GMT Message-Id: <202406170403.45H43UDI039706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 954e548b7e88 - stable/14 - pflog: Correctly check if bpf peers are present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 954e548b7e88b7490aa5b23d16df7972c407bef1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=954e548b7e88b7490aa5b23d16df7972c407bef1 commit 954e548b7e88b7490aa5b23d16df7972c407bef1 Author: Zhenlei Huang AuthorDate: 2024-06-09 01:05:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 03:59:49 +0000 pflog: Correctly check if bpf peers are present On creating the pflog(4) interface, pflog_clone_create() does an unconditional bpfattach(). Use bpf_peers_present() which was introduced in commit 16d878cc99ef [1] to check the presence of bpf peers. This will save a little CPU cycles when no bpf peers present. There should be no functional change. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45532 (cherry picked from commit ebc2bab04823c24c524f913457d6b88dc7ea9fac) --- sys/netpfil/pf/if_pflog.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 82e0daa01898..f20dc214f56e 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -223,9 +223,10 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, struct pfloghdr hdr; if (kif == NULL || m == NULL || rm == NULL || pd == NULL) - return ( 1); + return (1); - if ((ifn = V_pflogifs[rm->logif]) == NULL || !ifn->if_bpf) + ifn = V_pflogifs[rm->logif]; + if (ifn == NULL || !bpf_peers_present(ifn->if_bpf)) return (0); bzero(&hdr, sizeof(hdr)); @@ -274,7 +275,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1); if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len); - BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m); + bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m); return (0); } From nobody Mon Jun 17 04:03:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2bpW6NTCz5NCl5; Mon, 17 Jun 2024 04:03: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 4W2bpW2TDGz4qp7; Mon, 17 Jun 2024 04:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jCcLY/u3Lb5GhLTVchThsi8RcR+eeElEdCzEiPshTkU=; b=i8NdbQylSc/RRMD4cxJBh5XaT3fIrSc6j+4qhrTVdpuJxWL3iHkbw4MWEfTprADJCuTFoD kG6GlKwKUrnIEpKx4AGU6gu83yIKf2fEGXLkwSHhmB33zlDWCpbP1dVTOzWUK86OQsoFfX LGg+bY1pOX1bMYEf4WXKm+dYH8tZWoX7g5g54NfMAbGnFBNQ+1m4/rAn4HqvDYW0yuGvO2 tIatboSdX/6c/UJUtmhdbPe7YzVGFc4vYDOHLdCVFA/WkYxhmqBswzJlOCVexQFd+hjYp/ 17a1pqLm/sGAtytrkg8aGvEwqoAs6xZPqEHfMyPa86IjRsr45wQkqe1EqIRBNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597011; a=rsa-sha256; cv=none; b=S7+Wh1paUOFP0PqRvXEZyex8vCcsH+BWJ74TigUEdFGi4Vy6CKoKwTUd6X/oarCL4xcOP+ PdGDElddrViWvWGsYVMxK7Q7Ok9/zJdXsT0YYh+x1uZFM4Y529/h41vKXsK7g7RdaRzY6q wEuOnRy1d2fiQE1JSfe1IULGj9nw3jdJ5O12yg+0o4i5C8hTeQFW2xhdXJEw26PgjvqYNU lgWpmhMuPu1VyWf368EwdmBnAeDQeqVLXxKbQT1Jvko6tSEQWuM5gfc4/dqLTgLoNlAOOo y7rWCd69vmFGzrTZXmywKgcFI+8zO3tqmzShuxbnfPErvjKduc5WXwVo0s5Bcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jCcLY/u3Lb5GhLTVchThsi8RcR+eeElEdCzEiPshTkU=; b=a2h2ojjQsyjTHNPVmB9G8CuQ6SX0q86VUBDCzuZy3b8Z4/sxD721RTgCHwdXewC3BKLJ4Z 2ehDvl9mqsOCGD3n3is/gUgxg9aet8IQ28pJV4XxKvCKLezCzAaKcRIuWbbSD1ik+wzQei 83JsP2rMEey/dd186HakRSKJFVbXpgyRiPBwUqh00EgUO2vXqhYGA+zSNJiuPNt3d0D8um 3PXZqcj+YPLauW3kxmFuNMMePWrM1NW4LcpIebgsocReMnFea5BGkzxukxz4MHBeaffmY+ 5brsay/XbyJI8cRBgnqvwhHNqmH3p5zBAp1HO/q+IKget9mo92wYNOMzIEe7oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2bpW25WVz1Ft4; Mon, 17 Jun 2024 04:03: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 45H43VDk039760; Mon, 17 Jun 2024 04:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43VHp039757; Mon, 17 Jun 2024 04:03:31 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:31 GMT Message-Id: <202406170403.45H43VHp039757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f14b540dc4c1 - stable/14 - pfsync: Correctly check if bpf peers are present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f14b540dc4c17f6b60e23274153985fb7a2f0cb7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f14b540dc4c17f6b60e23274153985fb7a2f0cb7 commit f14b540dc4c17f6b60e23274153985fb7a2f0cb7 Author: Zhenlei Huang AuthorDate: 2024-06-09 01:05:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 04:00:02 +0000 pfsync: Correctly check if bpf peers are present On creating the pfsync(4) interface, pfsync_clone_create() does an unconditional bpfattach(). Use bpf_peers_present() which was introduced in commit 16d878cc99ef [1] to check the presence of bpf peers. This will save a little CPU cycles and memory usage when the synchronisation interface is not configured and there is no bpf peers present. There should be no functional change. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45533 (cherry picked from commit 2671bde99295d9e01d10316d0f3fb8b6d21f0f4d) --- sys/netpfil/pf/if_pfsync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index def06cd0c113..b188813cb8d1 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1796,7 +1796,7 @@ pfsync_sendout(int schedswi, int c) ("%s: sc_len %zu", __func__, b->b_len)); PFSYNC_BUCKET_LOCK_ASSERT(b); - if (ifp->if_bpf == NULL && sc->sc_sync_if == NULL) { + if (!bpf_peers_present(ifp->if_bpf) && sc->sc_sync_if == NULL) { pfsync_drop(sc); return; } @@ -1925,10 +1925,10 @@ pfsync_sendout(int schedswi, int c) V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_EOF]++; /* we're done, let's put it on the wire */ - if (ifp->if_bpf) { + if (bpf_peers_present(ifp->if_bpf)) { m->m_data += aflen; m->m_len = m->m_pkthdr.len = len - aflen; - BPF_MTAP(ifp, m); + bpf_mtap(ifp->if_bpf, m); m->m_data -= aflen; m->m_len = m->m_pkthdr.len = len; } From nobody Mon Jun 17 04:28:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2cLm5Lqnz5NFql; Mon, 17 Jun 2024 04:28: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 4W2cLm4mTHz4tVs; Mon, 17 Jun 2024 04:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yqnzHO+qDazP9cJfxnM6bBGa4Rck1uOIiXuwAaKCLx4=; b=Tk1lYho8cGtUuxlKYQ/eL2SjdqsSp9lXeGdf2wbbiBV/oaoc4a7a6OQWjfoTw/QM/b5oDM xYF5LAdhIZ9Veg4kovcqPzW1QztpWM7zWn3Os8K7ieWrGJ4vey9aAXRK5N/z9RzKGncS3N yk7hqTH5dXpyXvJVZ36fIgdWoO5mKQM9FO2MxU+LxmG/q0dEBYnzUyIRfVzWElB7lTgxzX ug2sZAOF6ha0faFCagt9T4nm2wRpAe34bl9ECZr1CRjAAZ+15XaJajZaipH0Gg0N3neMxt Pqn2cnDOo3+CQBJ9bhuM1/UBM7SFckCzKYTAwAayCMw65mbn+xzBH/rgOx5hIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598480; a=rsa-sha256; cv=none; b=HBI4eTqgESUDHRR/jXZR5irVuXKdIdAlnKOIJWJTS8I/qKOgSp5bzuSNG9n8ZcZ3jwX/7G 1GwZVRY4pR9duFXgFN7epf6WcAXiVTFUA+1W+cZoaIdW/KZuYyjnE9XpMhvTrQl9i0I1qh nLdLDqaSto1UlvDFVe7JZ11l2AxF2Ilj5v/A7qfGezqCU0JCAPaBS1ih3fnGJ7A2Csp9vi pIf8Z6OzZvYTp1ZuYqVriyyChi/7HiccBBYXGCv8L9O7H3tTsC5ql0fqtynSF9c94FmMR1 i0FU1ppsXIXbxSDCRkhpAQRMA6mQSiyfrRveqPpqxclbBXGu0plb+JszyIbWqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yqnzHO+qDazP9cJfxnM6bBGa4Rck1uOIiXuwAaKCLx4=; b=dezyJfvL0IdPFfomEV7nAi/DWSS6j/2OtdXhC5Ym9sz4bIT5oipQ7Fmobhel2F79B+ZaUL T4/UIBQf6j91tmeC9gPCFa3YlBxRBu2tNqTs/g23oGMUTyh1mivD2768lUwUiJtmMoM93j kolnpzs9AJXoJC43Bt8hyCw2q0Xl/p7FF1deUpPCTWwn6r8dvInd3ZNNaX0y1npkpBANwZ oiklYgypzKRTK8+oEM7WcDwyquZ0d18h+aUENlrWgdNBU6BAMbTUH1Yxe3IbnrQKCa4cgJ keoedicwrwUEE73bv5OvRskKWI+sSNnDq0C36t2CnfLgacC4mKqDprxxuofrNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2cLm4Mpvz1GLx; Mon, 17 Jun 2024 04:28: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 45H4S0lB073932; Mon, 17 Jun 2024 04:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S0To073929; Mon, 17 Jun 2024 04:28:00 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:28:00 GMT Message-Id: <202406170428.45H4S0To073929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 43bb3553f1d5 - stable/13 - if_enc(4): Prefer the boolean form when calling bpf_peers_present() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 43bb3553f1d523eec20d4078bf9bdaa222323940 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=43bb3553f1d523eec20d4078bf9bdaa222323940 commit 43bb3553f1d523eec20d4078bf9bdaa222323940 Author: Zhenlei Huang AuthorDate: 2024-06-06 04:20:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 04:10:11 +0000 if_enc(4): Prefer the boolean form when calling bpf_peers_present() No functional change intended. MFC after: 1 week (cherry picked from commit 215a18d502cba2cf57251e82a84484219f2c432a) (cherry picked from commit a674f992a135728648908874034408d43b3d1903) --- sys/net/if_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index cf7f763c33c6..752fbf207fb4 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -216,7 +216,7 @@ enc_bpftap(struct ifnet *ifp, struct mbuf *m, const struct secasvar *sav, else if (hhook_type == HHOOK_TYPE_IPSEC_OUT && (enc & V_bpf_mask_out) == 0) return; - if (bpf_peers_present(ifp->if_bpf) == 0) + if (!bpf_peers_present(ifp->if_bpf)) return; hdr.af = af; hdr.spi = sav->spi; From nobody Mon Jun 17 04:28:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2cLn71Wlz5NGL2; Mon, 17 Jun 2024 04:28: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 4W2cLn5Pjmz4thh; Mon, 17 Jun 2024 04:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89Ak88Ug5DTFJ5lxryQ4ztavxRplTLrf+9IwGXtEUf4=; b=e2n3nwhJRevW3WHXQKKDVWFssCRzeEw9KRe6X8d7J8jFSPZL7c4/GmAwYVTRzbI7GitZOi gpv7NuISLvLM02INGvdpQXPSfGybNZGoB4p1vCMQczR30SAH2X99ibQeo8jBRKh4N8/7bb RH3g3clc3UkbKzs1XP+w8npayP1w/h6ve/Kpguk1Raim8hFfqfL7kbdg4fistu895abgei yJflOQfQDJ93Y1WEefzim46Aoz18OVrhztIAZQz591VwSV713DXzvg3QLgIxljZ6qE/+LF zMRVzh6K3/HPFCxxDCaKgLd/23zypYYyDooUS/s30/7NdpOg+VZ+ca7h/3hq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598481; a=rsa-sha256; cv=none; b=r5s54XhxgHcdf2AxbLLVgJfEJh2O+kS22sn8CKe/SMqwehyD3nOqc3O/kWpOg5h7MRtBCe KhjoJVdP81OotjcTK8J7McX7Y+Kt9JCtwwLtB4KL+eWI07lDuIYCFu4ZXbJOR/Mk0ClbuP jGla4Mtb7YMguTC+ETMSw5GUtmbvGk8hKhgwc+oDJdsk1FG6/9H3YcxofqtlxXR5O3EsEt Y+1eF3OVje1TsT/dpVjN7GhGCtj9yYFLVv2ClEUXIRPjM3Zmk0xgvgAkxcV3iEvrHqqt4U u1xyxLioXGrS5Qn3lNTPKf8yslntFjSW5rSWMViK6SBIRkKDaJ7jJ/mzfZ1vJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89Ak88Ug5DTFJ5lxryQ4ztavxRplTLrf+9IwGXtEUf4=; b=EChoIrMjUAle8nPQaV6Q02TLhxWOSGLpWaokQooWxx1gMsvtF5J5aDgXD8E8udC3Ipan1u fJAn4UyfrNkpNGPz0QP/GV3J341rgYSyVwDoBlfIRVqmKGM/zn2G1/Tfgz8m0h5Z58tlZ8 ct+VSfkEibQHbodS48UTjCiSaLMep3yw2qGzGwOmkrhETPQck5f9cVsqHoKASHH9+86nXT 6ebzCvfnyAt6OUlT4EZO6svX/lWRrQ5h80vRBT470Ue2jWv3BKBcUER2NUGUL7gTdJ/Y6P ntvMrzn945qn2xXeB9KcPY7MuWW3zdtntP+Jkq20d+vWeEXen6waMh7N54N7nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2cLn51X9z1GJc; Mon, 17 Jun 2024 04:28: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 45H4S1fC073985; Mon, 17 Jun 2024 04:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S1De073982; Mon, 17 Jun 2024 04:28:01 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:28:01 GMT Message-Id: <202406170428.45H4S1De073982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d27149888c39 - stable/13 - bpf: Make bpf_peers_present a boolean inline function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d27149888c39fbf9a7cc174af50888cce0ca297d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d27149888c39fbf9a7cc174af50888cce0ca297d commit d27149888c39fbf9a7cc174af50888cce0ca297d Author: Zhenlei Huang AuthorDate: 2024-06-07 15:06:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 04:10:23 +0000 bpf: Make bpf_peers_present a boolean inline function This function was introduced in commit [1] and is actually used as a boolean function although it was not defined as so. No functional change intended. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: markj, kp, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45509 (cherry picked from commit 0dfd11abc4bd0dcb96a6d287cc4e52e8f59b64c1) (cherry picked from commit 6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd) --- sys/net/bpf.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 88331c2f663a..347b764735d0 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -431,15 +431,13 @@ int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *); void bpfilterattach(int); u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); -static __inline int +static __inline bool bpf_peers_present(struct bpf_if *bpf) { struct bpf_if_ext *ext; ext = (struct bpf_if_ext *)bpf; - if (!CK_LIST_EMPTY(&ext->bif_dlist)) - return (1); - return (0); + return (!CK_LIST_EMPTY(&ext->bif_dlist)); } #define BPF_TAP(_ifp,_pkt,_pktlen) do { \ From nobody Mon Jun 17 04:28:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2cLq1dszz5NGNd; Mon, 17 Jun 2024 04:28: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 4W2cLp6r21z4twR; Mon, 17 Jun 2024 04:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BfSswwa1rz2haaSlVTqQ+kpsHR/USrKt6SdrbLfn/ZM=; b=Syi7XEfs8dEqJ0VBYIh7T5FnGAoPuCU3iW2770rHMBrkcoRqyaB2w8g0Rv6FmsLO9Oetjm qv5VGMG7Q6Gyo93kpp31b1cqqmefK3v4377HbAmATlioAk1Q/fEsFsPZYf6S15tpQs3FWo M6ErILaPL3ZOduOY7cGcX8tIYCNqNon3al6OTu7APjKFx4Qy0ccdB/v3pZC8AvoXOzu/y8 rkIjdIHBSNgLsUlFo2yhENNCTXrifp1VDZOxRP/bH1zfYgtatv8D/qvGfiEvLorRtR/2JF JQA8Xfu4dFmdL/FiClsLkHh77W2SxotBcUZAlgvIZzh5T6KKLkXdNm8sp8VFYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598483; a=rsa-sha256; cv=none; b=BJySJcuN/T//rN8KH9++77XFSQoR29LLGjZJ1oK3j5zh6+4axNdfVhzBslUfxnEVRZXaMw zWW1KeqaytvMNbxk6Mu64hGw/DWw2d75pyzLa5UbRSsDVfmb/PcREL/DnA7l0MFrMQW5SW EWvr4gyHB0h2ZCPoVsxU/i7gbErxMj2BbROKPi//oSrzNmrzz6d5YOwwL0aiUBuTcfC6o9 AJZDKv87euau0PE1uQts9rJegYK6gbXeHxVwjS4R1/OpzCpgymio5A4XMLrNUueb7X0q8A hBfam+N8mV0GH143K/RAx2HYGbCZIEOoBMwjQHmspfJl8AOQ9W4Uf9ahdeXx7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BfSswwa1rz2haaSlVTqQ+kpsHR/USrKt6SdrbLfn/ZM=; b=PiIA1TmqWcWeloJCt9k9VzQq2b/AFbEn9uWv+Q4XneHxZOXXjhu8Fngjx01ksFb/f3aaaX SLn1Q7BX2Zm7yy4Le/I3PnCXv+7pxOQEvOFwkRH4Iw/qZ1SuQKdqk5XNpA5BmcAUj/MZbq oL6PtXGtDaxsEVLUod7xnGVQ2ENn21OVQTFk6I33DNgm8kfIMCvJ1YbijHMbYtgkpFpAye ms+CmdK5KAXf9G18A0qnCtRGTdsMOGYWQcJOD2eaRO51I/t/NyUA9aFgDtOykgzokGMr2i NHuj+pQOtOR1YT/2v7wBiOLXMj4w4WDV5NekLM3uKc4SOZ+DLBUXbKxF59BWLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2cLp6M8kz1GM1; Mon, 17 Jun 2024 04:28: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 45H4S2Re074037; Mon, 17 Jun 2024 04:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S2sx074034; Mon, 17 Jun 2024 04:28:02 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:28:02 GMT Message-Id: <202406170428.45H4S2sx074034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: cbea6b60da00 - stable/13 - pflog: Correctly check if bpf peers are present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cbea6b60da007bff698e508a10dd632c80c22b22 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cbea6b60da007bff698e508a10dd632c80c22b22 commit cbea6b60da007bff698e508a10dd632c80c22b22 Author: Zhenlei Huang AuthorDate: 2024-06-09 01:05:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 04:10:35 +0000 pflog: Correctly check if bpf peers are present On creating the pflog(4) interface, pflog_clone_create() does an unconditional bpfattach(). Use bpf_peers_present() which was introduced in commit 16d878cc99ef [1] to check the presence of bpf peers. This will save a little CPU cycles when no bpf peers present. There should be no functional change. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45532 (cherry picked from commit ebc2bab04823c24c524f913457d6b88dc7ea9fac) (cherry picked from commit 954e548b7e88b7490aa5b23d16df7972c407bef1) --- sys/netpfil/pf/if_pflog.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 0f9c18654077..541625709494 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -207,9 +207,10 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir, struct pfloghdr hdr; if (kif == NULL || m == NULL || rm == NULL || pd == NULL) - return ( 1); + return (1); - if ((ifn = V_pflogifs[rm->logif]) == NULL || !ifn->if_bpf) + ifn = V_pflogifs[rm->logif]; + if (ifn == NULL || !bpf_peers_present(ifn->if_bpf)) return (0); bzero(&hdr, sizeof(hdr)); @@ -258,7 +259,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir, if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1); if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len); - BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m); + bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m); return (0); } From nobody Mon Jun 17 04:28:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2cLr2RFVz5NGR0; Mon, 17 Jun 2024 04:28: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 4W2cLr0gQ9z4thv; Mon, 17 Jun 2024 04:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMUNenBFHdd9+69/jQKYj7+67Xlz7AQZcF2be7+OMRU=; b=hBsFZJicOufgu1j6cdcRz02b0TT74tlTsC7YGOQ1yItwlqOPUEjD5StSdBFFQsUB4sZd21 Mv1IIRzljRir5+UgXpYQs0q+kcPwKHNLsIza//JAQofxifZqsuJHtvb9rg8JOc9+oa3vzR ZZv8V1zPdydn6fY/6SvKb4nOJ2NnmjXnQGDPhufbtAiDIHQ/+wXAtBqrPxpoyPQhY2mBTt VjSAwXA1qJNyZgcKqsx48OLjW3aO0xg7yxWyu9MOFqLiry3KvGmqyy90KNBvsoCUm2/4hJ Y6kRdqbE8sYSoK7wxH/z74/j47mvsidQVHc1/quAW5LMtgg/UKtz7qWOT/Dreg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598484; a=rsa-sha256; cv=none; b=ILKVhtyBQeU8ZtxeCIYRvY7sjlSa/6u2eLyPabBa4aopGfncmOuk8psxQ2ccsPHm9FqqLD 1TeU+CBeEL0iDEbMhtAfLAzef2YzWt3LAlUFg5A15RVIwvijjGIXK6/F9y6Tn0psVaYhbS RKsLywurJicn5Ve8mAytEqaaejrfKgQW2qUcvtM5h14YoOcyQ6kDvJm6ZRcRjLlnWYaldx wiZZuvgiB6t0hGyOL6SK6eM+Oq3xaTlt1rkvwODtCJzT0DDKA4lYME7azT129EuM7dU0a4 eVT1VdidNzDihzeu+w36pYRuLnYBJne2KakFUU7s5I0nJGI6Kst6ipVBbtgmdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718598484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMUNenBFHdd9+69/jQKYj7+67Xlz7AQZcF2be7+OMRU=; b=XlS50APFrRIeWNX7qt1mwGopew0dIXkem4naiQNE0v/IGM1bSgY3QKgNw3VJ0lDnnE7tVr 8m/1yA92mUYk3VNqNwHQ0PjUyuwLw0nYk99EPp+XkitY1WiklLtaVgtKnNOFKVwJCT3zR3 w3xhIP/Lj5ElZzqK2ZhdEFDCJlDcv23dUEdFtgChzf1EYPJ9cGnvD59hXgqe1EorUrtJqy QdXcTNS1fpbxdWKImAZvSghOSkKl0opMjmieN1geJUe/FLfeFpBsW2mmOfPy38ibUQvqoW d4kW7/718aKFsdlUtPj2e/e94Y40kIcBItDzAKV2Bfjah/5uuUBPEH4Zmjxdug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2cLr0F00z1GJd; Mon, 17 Jun 2024 04:28: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 45H4S3Yn074088; Mon, 17 Jun 2024 04:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S3lI074085; Mon, 17 Jun 2024 04:28:03 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:28:03 GMT Message-Id: <202406170428.45H4S3lI074085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0dddcc657676 - stable/13 - pfsync: Correctly check if bpf peers are present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0dddcc6576768806aab1967289a349a65fe7cd3d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0dddcc6576768806aab1967289a349a65fe7cd3d commit 0dddcc6576768806aab1967289a349a65fe7cd3d Author: Zhenlei Huang AuthorDate: 2024-06-09 01:05:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 04:16:38 +0000 pfsync: Correctly check if bpf peers are present On creating the pfsync(4) interface, pfsync_clone_create() does an unconditional bpfattach(). Use bpf_peers_present() which was introduced in commit 16d878cc99ef [1] to check the presence of bpf peers. This will save a little CPU cycles and memory usage when the synchronisation interface is not configured and there is no bpf peers present. There should be no functional change. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45533 (cherry picked from commit 2671bde99295d9e01d10316d0f3fb8b6d21f0f4d) (cherry picked from commit f14b540dc4c17f6b60e23274153985fb7a2f0cb7) --- sys/netpfil/pf/if_pfsync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index d4d3c521a568..1dde4e52e3f8 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1587,7 +1587,7 @@ pfsync_sendout(int schedswi, int c) ("%s: sc_len %zu", __func__, b->b_len)); PFSYNC_BUCKET_LOCK_ASSERT(b); - if (ifp->if_bpf == NULL && sc->sc_sync_if == NULL) { + if (!bpf_peers_present(ifp->if_bpf) && sc->sc_sync_if == NULL) { pfsync_drop(sc); return; } @@ -1689,10 +1689,10 @@ pfsync_sendout(int schedswi, int c) V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_EOF]++; /* we're done, let's put it on the wire */ - if (ifp->if_bpf) { + if (bpf_peers_present(ifp->if_bpf)) { m->m_data += sizeof(*ip); m->m_len = m->m_pkthdr.len = b->b_len - sizeof(*ip); - BPF_MTAP(ifp, m); + bpf_mtap(ifp->if_bpf, m); m->m_data -= sizeof(*ip); m->m_len = m->m_pkthdr.len = b->b_len; } From nobody Mon Jun 17 04:59:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2d2m3pFXz5NJmb; Mon, 17 Jun 2024 04:59: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 4W2d2m38ZWz3yJJ; Mon, 17 Jun 2024 04:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718600352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36rIPS5YHYu+4HTKZ0FXkTIZMNh7ilIg3kY+uLw/8Eg=; b=IPkSR7qUoNfmSTCx1eIuyocNNGbDhUHgflTY756UhgNRIJNYq3c94OhiR+6TILeyDsjf/4 WNBMfXrnjyR4eu7a2CxSMZn7a5XaFNnZuPPLw5SxXYsw+y+/2Q6hFOCQ6F10cRVTvqtJzk VDnyYCMdKVDK81Z3CsukNq69VEuLAD3CpMe6Flohp3ktKfYdwWJucM0IxhOPTX+FVryH9y DxTCkkl7mV5BkSPTqb/thmg8YcwATRHqD/tU1dU1/3edaSEBlziMRYgGbwSrGQ605GEqgH HrlLeghw3hNJTrY6IS8/iKUsZrwcuVoTQCJfJtDwY0DTG4iQHo6CfGnn1e5i0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718600352; a=rsa-sha256; cv=none; b=kcM2ZP2iWmRMKCSRrJCxnAVaPsxL0dMOeJjKHbRw6s4Mo3G6UMk78zyg33MsZLDJoKexxx 4zkN/Vn3EYhFocMiLHVqjPTA14JgAlxwU3LkY1HvUKd3oKf++KF2COHLqoJl3yieNj+aRT /PCvLDmPnEaXxNtxJt+Oc4mJ4nwaawDymIzx/1Y8KUrjGJd8Ytay+Y/M3rwiwd6LQ2KZTe 00DQmNZlzwKrrlc/Yjs1rOz3vMpD70RYZDNOpDkNgkUaZFw3c6nP7BgFzK9bXdhRLYUXue Rx2EGUj0HpAST0eTVTj3WWuX/Yr4w/xxFIZXtE560Rrz8bb2VbwhbOJb8yyeXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718600352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36rIPS5YHYu+4HTKZ0FXkTIZMNh7ilIg3kY+uLw/8Eg=; b=VNBZ5OXeI5VqJUku5T5ecqhng2Nvps39ath0Y0ZWIWmhzR9AFZMzOOCXFcO2KCh31RlVu3 6v25Gdh83ua1A+MgeFXoD/vAJBmdv4breUVilbqZobZYIfV5qQCQQFLlDBzkA6tu0/tj5K Yob3kZJWiOOSMgt3s7m/8GXB6+xsNqWNdp9eFo39M0BSXONiFH4zv001GK3JqFrhv9LnuF RzPFrRjajCrizLeEYKcNQVHJYCC6momy9CQCPpQt/GA1XcD7esqU+dnppRkUlopXAkaH5H nzco51y16+0PpwSnDdr1a2JdC+btMutv/E5G+NghakFlnWNCgyRdgJHxT/AHLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2d2m2dn3z1Ghv; Mon, 17 Jun 2024 04:59: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 45H4xCKl024707; Mon, 17 Jun 2024 04:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4xCU1024704; Mon, 17 Jun 2024 04:59:12 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:59:12 GMT Message-Id: <202406170459.45H4xCU1024704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: efb1717d21c2 - stable/14 - rc.subr(8): MFC: introduce ${name}_offcmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efb1717d21c2cc488955914cb4fe9f3683b9cbe5 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=efb1717d21c2cc488955914cb4fe9f3683b9cbe5 commit efb1717d21c2cc488955914cb4fe9f3683b9cbe5 Author: Eugene Grosbein AuthorDate: 2024-06-02 19:13:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-17 04:57:53 +0000 rc.subr(8): MFC: introduce ${name}_offcmd New variable ${name}_offcmd may be used to supply commands executed if named service is not enabled. Previously start_precmd could be used for such a task but now rc.subr(8) does not call it if a service is not enabled. Fix devd startup script to use it instead of start_precmd. PR: 279198 Reported by: Dmitry S. Lukhtionov Tested by: Dmitry S. Lukhtionov (cherry picked from commit 32a579e4fc69a65e8901111ad5f65ec56a97dfab) (cherry picked from commit c2db3a0c7d31116028b38b426a9b139d26cbc7e5) --- libexec/rc/rc.d/devd | 7 +++---- libexec/rc/rc.subr | 25 +++++++++++++++++++++---- share/man/man8/rc.subr.8 | 4 +++- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/devd b/libexec/rc/rc.d/devd index 43fb9d5928dd..fe19abd817b4 100755 --- a/libexec/rc/rc.d/devd +++ b/libexec/rc/rc.d/devd @@ -14,7 +14,8 @@ desc="Device state change daemon" rcvar="devd_enable" command="/sbin/${name}" -start_precmd=${name}_prestart +devd_offcmd=devd_off +start_precmd=find_pidfile stop_precmd=find_pidfile find_pidfile() @@ -26,10 +27,8 @@ find_pidfile() fi } -devd_prestart() +devd_off() { - find_pidfile - # If devd is disabled, turn it off in the kernel to avoid unnecessary # memory usage. if ! checkyesno ${rcvar}; then diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 332718dc6f2c..a662b878860b 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -816,6 +816,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # +# ${name}_offcmd n If set, run if a service is not enabled. +# # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) # @@ -1051,13 +1053,13 @@ run_rc_command() -a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] || [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then - if [ -n "${rc_quiet}" ]; then - return 0 - fi + [ "$rc_arg" = "start" ] && _run_rc_offcmd + if [ -z "${rc_quiet}" ]; then echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " echo "instead of '${rc_arg}'." - return 0 + fi + return 0 fi fi @@ -1347,10 +1349,25 @@ $_cpusetcmd $command $rc_flags $command_args" # # name R/W # ------------------ +# _offcmd R # _precmd R # _postcmd R # _return W # +_run_rc_offcmd() +{ + eval _offcmd=\$${name}_offcmd + if [ -n "$_offcmd" ]; then + if [ -n "$_env" ]; then + eval "export -- $_env" + fi + debug "run_rc_command: ${name}_offcmd: $_offcmd $rc_extra_args" + eval "$_offcmd $rc_extra_args" + _return=$? + fi + return 0 +} + _run_rc_precmd() { check_required_before "$rc_arg" || return 1 diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 3e3ff8c8d1e1..3037840007a4 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 16, 2022 +.Dd June 2, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -631,6 +631,8 @@ Login class to use with .Va ${name}_limits . Defaults to .Dq Li daemon . +.It Va ${name}_offcmd +Shell commands to run if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command From nobody Mon Jun 17 05:07:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2dDg2521z5NKB7; Mon, 17 Jun 2024 05:07: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 4W2dDg1VSKz40rX; Mon, 17 Jun 2024 05:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718600867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k7yjoaHGmdBHLrl3+Bb/YkZv60mVt2daQR+9zy1ySEA=; b=xvdl2t+xYpQlNIYSgEoqEFN0VypRLQ+B5l8Ua1woYC24SapNlCqPldpivfoD49g8zB8LFv IJ+05FR4R125N0kOM6F+5grn6CSNg0x256Y8u80xeOjEOourjZIxU0pLw7Y68NVj/GSfu/ uqTbwwd0EpW10PwlRwP08n6LiiGkFztRMzLNqCEOfdr6cGOb7xanRhCOTBkFQdS9LUqacI jHgJDp4oZLCmnhcR+K7ef0ABx3Vv114OgC4ml4SUrdLLfHh0/1qK0IAZXbyYgR2vBaw90I UrjPpxvNOXlXJVPQmIg19H171EbVZzj+jILLrqMuy8fx9yjoY8zfWhws96f6kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718600867; a=rsa-sha256; cv=none; b=IH3dL7DybJQd3gPNUduv11imnEr3AH9Ftt7/3JxleTZ8iwwa1GFSn5wYyE6GCzQBnrYJfX 6Hd8oSWpd+9XHsWs6rXIggAdcmIBcCtmXD3YoOtQ+bRTsfK8I1iYgIDNzbsTD9StDdtqTx VYCQbX/NbENJylS4wAjZmecDWkr0XE60FtC7o9cJwaIj0n+xmpYEMkC8GdyAFylYhXrwHn A+AVAfn9v7U7123Gl0Rbk43YV/YIQHFBohdJP+5Jl4Fvmfv1kosrb1gVX6m8YWYBr1dMr/ wd6GLTrEmVtk7yk/QIVzpQeQP5LthjwvxwR4H6TmDOH/4FoKFDveHEeC2z/5jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718600867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k7yjoaHGmdBHLrl3+Bb/YkZv60mVt2daQR+9zy1ySEA=; b=k35oQ26zm2L0d6tFsHQX5tDRm2s+Ckwk1dY+K01+P5/lpgX3t4eR46Fh1shEjm/wbWszC1 Ijgj9IePlUcrKmsF3rgrcC6lfqFAyu7I2bzkVhKpCrhQaMVC1OkCOFB9w+/5C5v33oxYEa kg4ESQsw5KmszA/uUDyE5fxRYwhroU2Ajm5EUw3O9qzdmCMxmgwQzfSGG8nwMNR22sIzQg hV8QYWGUZ2uosyVROE6CLHyBoHkelRzoJRbyu9YwrNUcEyOaXLAf7IsvaCvYBeYKAjvbvy mcij40WEkk4DVQqoRXyTyira/33A5G1RQ9wioipFiTP3pvms5h79qZUSrxjDzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2dDg0zXGz1Gcw; Mon, 17 Jun 2024 05:07: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 45H57ltK042283; Mon, 17 Jun 2024 05:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H57lVY042280; Mon, 17 Jun 2024 05:07:47 GMT (envelope-from git) Date: Mon, 17 Jun 2024 05:07:47 GMT Message-Id: <202406170507.45H57lVY042280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 61d43332e688 - stable/13 - rc.subr(8): MFC: introduce ${name}_offcmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 61d43332e6882c6c3c3be1473d38db3a9803b32d Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=61d43332e6882c6c3c3be1473d38db3a9803b32d commit 61d43332e6882c6c3c3be1473d38db3a9803b32d Author: Eugene Grosbein AuthorDate: 2024-06-02 19:13:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-17 05:06:59 +0000 rc.subr(8): MFC: introduce ${name}_offcmd New variable ${name}_offcmd may be used to supply commands executed if named service is not enabled. Previously start_precmd could be used for such a task but now rc.subr(8) does not call it if a service is not enabled. Fix devd startup script to use it instead of start_precmd. PR: 279198 Reported by: Dmitry S. Lukhtionov Tested by: Dmitry S. Lukhtionov (cherry picked from commit 32a579e4fc69a65e8901111ad5f65ec56a97dfab) (cherry picked from commit c2db3a0c7d31116028b38b426a9b139d26cbc7e5) --- libexec/rc/rc.d/devd | 7 +++---- libexec/rc/rc.subr | 25 +++++++++++++++++++++---- share/man/man8/rc.subr.8 | 4 +++- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/devd b/libexec/rc/rc.d/devd index 43fb9d5928dd..fe19abd817b4 100755 --- a/libexec/rc/rc.d/devd +++ b/libexec/rc/rc.d/devd @@ -14,7 +14,8 @@ desc="Device state change daemon" rcvar="devd_enable" command="/sbin/${name}" -start_precmd=${name}_prestart +devd_offcmd=devd_off +start_precmd=find_pidfile stop_precmd=find_pidfile find_pidfile() @@ -26,10 +27,8 @@ find_pidfile() fi } -devd_prestart() +devd_off() { - find_pidfile - # If devd is disabled, turn it off in the kernel to avoid unnecessary # memory usage. if ! checkyesno ${rcvar}; then diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 04b30cac40a7..8ae0744939d0 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -811,6 +811,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # +# ${name}_offcmd n If set, run if a service is not enabled. +# # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) # @@ -1024,13 +1026,13 @@ run_rc_command() -a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] || [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then - if [ -n "${rc_quiet}" ]; then - return 0 - fi + [ "$rc_arg" = "start" ] && _run_rc_offcmd + if [ -z "${rc_quiet}" ]; then echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " echo "instead of '${rc_arg}'." - return 0 + fi + return 0 fi fi @@ -1319,10 +1321,25 @@ $command $rc_flags $command_args" # # name R/W # ------------------ +# _offcmd R # _precmd R # _postcmd R # _return W # +_run_rc_offcmd() +{ + eval _offcmd=\$${name}_offcmd + if [ -n "$_offcmd" ]; then + if [ -n "$_env" ]; then + eval "export -- $_env" + fi + debug "run_rc_command: ${name}_offcmd: $_offcmd $rc_extra_args" + eval "$_offcmd $rc_extra_args" + _return=$? + fi + return 0 +} + _run_rc_precmd() { check_required_before "$rc_arg" || return 1 diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 3fef4a60f8b4..b9713eb65a3c 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd June 2, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -631,6 +631,8 @@ Login class to use with .Va ${name}_limits . Defaults to .Dq Li daemon . +.It Va ${name}_offcmd +Shell commands to run if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command From nobody Mon Jun 17 09:54:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2lc24YWxz5NYVw; Mon, 17 Jun 2024 09:54: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 4W2lc23hDqz4SFD; Mon, 17 Jun 2024 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718618098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4R0gQSgtKZXD9wL2wDXUgNZFTCmPH3Wie+gvnY36Xj0=; b=inVt/r9lHmRcQFU/b/TcpNF7VYK7s2PMcSaxexc4YXScc/u3uoxHYyJPfflhM4Gkq+TDu+ T8MUUXr01j3UfCU9au693WZ97P8xmXMv3mIkBEZUZztl/h3NaLKniL7qBxYh1mhqMxccZM 26WfROlYGNwJ+FnaVLW3rvbT4WZL57j7c9P8OIXAmKH3F3wpiEOanOaaf938GDnoGrnA+I /AomBshp4mI/+RQ3LolR2YBgtmvvpXkDGgY0owd4N8LTjctOxRmhLEh9WKtgCqnwiAhNPY peD2fQkaOIbMVMJ9Yktl86ANL+LeHFp+UqVEa+i6p3C0dbOEZbU0Elk762qSOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718618098; a=rsa-sha256; cv=none; b=Q1Xxw2UIfRCC6xjtc7J1falMWYyYQWsCetlF8y/WzMNWbzjhMALLV2qJ6/KtK8wPwiGWx2 uBo3PEP7qvjSz+wigZa8pdxs59lEU5iGYMzckTlrvziVnIgPgDWguVHLreDLQPX69i1OUm rxIuWSXET+9GraZaccNbh9ejnV7kb1YhC5wwYIrLc2gd39ixryBc9VYuvQtPGAE9jc8Frn BeaueOdi5pPUpMwjqzzVGsgsndazuys0idZ8isvIj+lZz8s0nDSo6JyReKJVKYgAfwYVa0 /IeY9YtComCgaJdAWkm4Ndap8gj7JKlTnMyLV6UEcUL8ldSX2KdwGtj/VYbtSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718618098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4R0gQSgtKZXD9wL2wDXUgNZFTCmPH3Wie+gvnY36Xj0=; b=iji1lb4Z5lPW2S+SNDkAV5CF8fgjjahB4u1fPB1kF2l+Brw+LoGjl5C+xpJYCh8p06pzUa lWt2MYnBQVglddRHFWFlw2HPpUIYiIQcrHCIUco7Z4Q25h2ybCLIZ9p28V/3vH40hMgqMg 2Q4dNqJ3pCYV0qui6P+D9PwLxLi0tn31/JWRVQBz2NAhbSaPG6vCU3YvCppE74CazyiTKK fL6VqBj1Md0JMJQ5VvqKv/aJo0MXlhSmhLfkgQros1JRQ/z2HqW07T2M9viGQi/k5ThIiA hb/GK73gJGY/jw+6G64e5znJnKhNbVOieMP3y4w2iXyLf93zFbdYc64oNO0AVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2lc238sLz1Q6B; Mon, 17 Jun 2024 09:54: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 45H9swXr030905; Mon, 17 Jun 2024 09:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H9swjT030902; Mon, 17 Jun 2024 09:54:58 GMT (envelope-from git) Date: Mon, 17 Jun 2024 09:54:58 GMT Message-Id: <202406170954.45H9swjT030902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c57c26179033 - main - iovctl: allow vlan restrictions to be passed to the driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c57c26179033f64c2011a2d2a904ee3fa62e826a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c57c26179033f64c2011a2d2a904ee3fa62e826a commit c57c26179033f64c2011a2d2a904ee3fa62e826a Author: Kristof Provost AuthorDate: 2024-05-29 17:29:35 +0000 Commit: Kristof Provost CommitDate: 2024-06-17 08:50:15 +0000 iovctl: allow vlan restrictions to be passed to the driver Allow iovctl to create VFs that are restricted to specific VLAN IDs. Reviewed by: kib, np MFC after: 2 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D45402 --- sys/dev/pci/pci_iov_schema.c | 61 +++++++++++++++++++++++++++++++++++++++++++ sys/sys/iov.h | 2 ++ sys/sys/iov_schema.h | 3 ++- usr.sbin/iovctl/iovctl.c | 6 +++++ usr.sbin/iovctl/iovctl.conf.5 | 5 +++- usr.sbin/iovctl/parse.c | 25 ++++++++++++++++++ 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/pci_iov_schema.c b/sys/dev/pci/pci_iov_schema.c index 3cec329d77a1..804a8b1c0a8f 100644 --- a/sys/dev/pci/pci_iov_schema.c +++ b/sys/dev/pci/pci_iov_schema.c @@ -54,11 +54,13 @@ static validate_func pci_iov_schema_validate_bool; static validate_func pci_iov_schema_validate_string; static validate_func pci_iov_schema_validate_uint; static validate_func pci_iov_schema_validate_unicast_mac; +static validate_func pci_iov_schema_validate_vlan; static default_validate_t pci_iov_validate_bool_default; static default_validate_t pci_iov_validate_string_default; static default_validate_t pci_iov_validate_uint_default; static default_validate_t pci_iov_validate_unicast_mac_default; +static default_validate_t pci_iov_validate_vlan_default; struct config_type_validator { const char *type_name; @@ -107,6 +109,11 @@ static struct config_type_validator pci_iov_schema_validators[] = { .validate = pci_iov_schema_validate_unicast_mac, .default_validate = pci_iov_validate_unicast_mac_default, }, + { + .type_name = "vlan", + .validate = pci_iov_schema_validate_vlan, + .default_validate = pci_iov_validate_vlan_default, + }, }; static const struct config_type_validator * @@ -261,6 +268,26 @@ pci_iov_schema_add_unicast_mac(nvlist_t *schema, const char *name, nvlist_move_nvlist(schema, name, entry); } +void +pci_iov_schema_add_vlan(nvlist_t *schema, const char *name, + uint32_t flags, const uint16_t defaultVal) +{ + nvlist_t *entry; + + entry = nvlist_create(NV_FLAG_IGNORE_CASE); + if (entry == NULL) { + nvlist_set_error(schema, ENOMEM); + return; + } + + pci_iov_schema_add_type(entry, "vlan"); + if (flags & IOV_SCHEMA_HASDEFAULT) + nvlist_add_number(entry, "default", defaultVal); + pci_iov_schema_add_required(entry, flags); + + nvlist_move_nvlist(schema, name, entry); +} + static int pci_iov_schema_validate_bool(const struct config_type_validator * validator, const nvlist_t *config, const char *name) @@ -320,6 +347,24 @@ pci_iov_schema_validate_unicast_mac( return (0); } +static int +pci_iov_schema_validate_vlan( + const struct config_type_validator * validator, + const nvlist_t *config, const char *name) +{ + uint16_t vlan; + + if (!nvlist_exists_number(config, name)) + return (EINVAL); + + vlan = nvlist_get_number(config, name); + + if (vlan > 4095 && vlan != VF_VLAN_TRUNK) + return (EINVAL); + + return (0); +} + static void pci_iov_config_add_default(const nvlist_t *param_schema, const char *name, nvlist_t *config) @@ -400,6 +445,22 @@ pci_iov_validate_unicast_mac_default( return (0); } +static int +pci_iov_validate_vlan_default( + const struct config_type_validator * validator, const nvlist_t *param) +{ + uint16_t vlan; + + if (! nvlist_exists_number(param, DEFAULT_SCHEMA_NAME)) + return (EINVAL); + + vlan = nvlist_get_number(param, DEFAULT_SCHEMA_NAME); + if (vlan > 4095 && vlan != VF_VLAN_TRUNK) + return (EINVAL); + + return (0); +} + static int pci_iov_validate_param_schema(const nvlist_t *schema) { diff --git a/sys/sys/iov.h b/sys/sys/iov.h index 0171fc5a98cf..2ae7e5ac6767 100644 --- a/sys/sys/iov.h +++ b/sys/sys/iov.h @@ -46,6 +46,8 @@ #define DEFAULT_SCHEMA_NAME "DEFAULT" #define REQUIRED_SCHEMA_NAME "REQUIRED" +#define VF_VLAN_TRUNK 4096 + /* * Because each PF device is expected to expose a unique set of possible * configurations, the SR-IOV infrastructure dynamically queries the PF diff --git a/sys/sys/iov_schema.h b/sys/sys/iov_schema.h index cb50f7796d30..66c883540563 100644 --- a/sys/sys/iov_schema.h +++ b/sys/sys/iov_schema.h @@ -48,5 +48,6 @@ void pci_iov_schema_add_uint64(nvlist_t *schema, const char *name, uint32_t flags, uint64_t defaultVal); void pci_iov_schema_add_unicast_mac(nvlist_t *schema, const char *name, uint32_t flags, const uint8_t * defaultVal); - +void pci_iov_schema_add_vlan(nvlist_t *schema, const char *name, + uint32_t flags, const uint16_t defaultVal); #endif diff --git a/usr.sbin/iovctl/iovctl.c b/usr.sbin/iovctl/iovctl.c index 0110751082ec..28d2e0a93504 100644 --- a/usr.sbin/iovctl/iovctl.c +++ b/usr.sbin/iovctl/iovctl.c @@ -345,6 +345,12 @@ print_default_value(const nvlist_t *parameter, const char *type) mac = nvlist_get_binary(parameter, DEFAULT_SCHEMA_NAME, &size); printf(" (default = %02x:%02x:%02x:%02x:%02x:%02x)", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + } else if (strcasecmp(type, "vlan") == 0) { + uint16_t vlan = nvlist_get_number(parameter, DEFAULT_SCHEMA_NAME); + if (vlan == VF_VLAN_TRUNK) + printf(" (default = trunk)"); + else + printf(" (default = %d)", vlan); } else errx(1, "Unexpected type in schema: '%s'", type); } diff --git a/usr.sbin/iovctl/iovctl.conf.5 b/usr.sbin/iovctl/iovctl.conf.5 index a7eb6c2077ee..1bae96e150ba 100644 --- a/usr.sbin/iovctl/iovctl.conf.5 +++ b/usr.sbin/iovctl/iovctl.conf.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 29, 2020 +.Dd May 30, 2024 .Dt IOVCTL.CONF 5 .Os .Sh NAME @@ -95,6 +95,8 @@ The following option types are supported: .Bl -tag -width indent .It boolean Accepts a boolean value of true or false. +.It vlan +Accepts a VLAN ID, or "trunk" to allow any VLAN ID. .It mac-addr Accepts a unicast MAC address specified as a string of the form xx:xx:xx:xx:xx:xx, where xx is one or two hexadecimal digits. @@ -159,6 +161,7 @@ DEFAULT { VF-0 { mac-addr : "02:56:48:7e:d9:f7"; passthrough : false; + vlan: 1; } .Ed .Sh SEE ALSO diff --git a/usr.sbin/iovctl/parse.c b/usr.sbin/iovctl/parse.c index b1aad7d7ddd6..6b7645f341cc 100644 --- a/usr.sbin/iovctl/parse.c +++ b/usr.sbin/iovctl/parse.c @@ -160,6 +160,29 @@ add_unicast_mac_config(const char *key, const ucl_object_t *obj, nvlist_t *confi nvlist_add_binary(config, key, mac, ETHER_ADDR_LEN); } +static void +add_vlan_config(const char *key, const ucl_object_t *obj, nvlist_t *config) +{ + int64_t val; + const char *strVal = ""; + + if(ucl_object_tostring_safe(obj, &strVal)) { + if (strcasecmp(strVal, "trunk") == 0) { + nvlist_add_number(config, key, VF_VLAN_TRUNK); + return; + } + report_config_error(key, obj, "vlan"); + } + + if (!ucl_object_toint_safe(obj, &val)) + report_config_error(key, obj, "vlan"); + + if (val < 0 || val > 4095) + report_config_error(key, obj, "vlan"); + + nvlist_add_number(config, key, val); +} + /* * Validates that the given configuration value has the right type as specified * in the schema, and then adds the value to the configuration node. @@ -186,6 +209,8 @@ add_config(const char *key, const ucl_object_t *obj, nvlist_t *config, add_uint_config(key, obj, config, type, UINT64_MAX); else if (strcasecmp(type, "unicast-mac") == 0) add_unicast_mac_config(key, obj, config); + else if (strcasecmp(type, "vlan") == 0) + add_vlan_config(key, obj, config); else errx(1, "Unexpected type '%s' in schema", type); } From nobody Mon Jun 17 09:54:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2lc34kxNz5NYKc; Mon, 17 Jun 2024 09:54: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 4W2lc34GMyz4S20; Mon, 17 Jun 2024 09:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718618099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyisDM2ZLbuSJFyXOV1x82aoEotW3K+p8hbCBv8xyQc=; b=kVxxgSLqqg7zHmd3t5zjM4xj2nnDxdM+htW+WwbuIjaO2HZUVc/bQXDDJWQ6h3f5Pwsxt/ QGFMMFQNUCosn/eW5tpXlDDcknt4B/RfSvosjhAs4ZFmboAedqUVBM4c1hMXKqA/ropn++ nLN09Bs6zTQJtgQ4B7muX+RPYgA8P425Xa1en1xgQ2VK226N/wDfBYp5UZN7ZhUqcn2G5v Pt6/UY9uRuQGpzjFJGHMbXYcGBc3+mRX2S1g8/FuZso7oH6PeJM/Seo+VTbPjrW73YNVOG U51pv4qyEZJJnnO8+Y+2H6ro5JLm6DoSzvlVe7dInfscaj8gTKcWT/1nxgIbzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718618099; a=rsa-sha256; cv=none; b=FK6L5crbiQIRHjgL4vp8d6C5yJAmtmk+E/h42ElNQRd6bHix78ZUNDX1FTYxwcLv0PGV4H CbraYnDZRwh5CUbbUdR94v1MLBuYbTFxcD8YvHds9+Q4F2sC0D0pshg93ti4VJSWQBerrT CA/irEGGpVgN4EDrXeglerbYs23PUVXPRP4UQZY/tH/P71L1QTZ1OxU8T1iepujdolQ1od zTnB7Nl3IxA5upKvvwTNuXlotCdzyDN8RCajqEdKk4LaH6G0TvELkqJ91hF96HfC3YtAb2 sUBKjDZvto9OwO3q6FtlU0Qpx4Smmc1/uloEI7WhRkDGjngdlQSusg8GWAYMCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718618099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyisDM2ZLbuSJFyXOV1x82aoEotW3K+p8hbCBv8xyQc=; b=OguvhwQBRvNQEG9e5YZeG8nFdmwy8NjccJkAWsO4ODI50w0seTTIiwO0qDaxlKvDaZ6kXU Kiov/2/XZqatDnKeDcSFfqq2U3kBx3rZfljoeL+XUSjUJHBxe4LbcO+Wqpe3xgW58AXr4R ApNASxlxONVBEbwN/OWc+lpQRyaZvNAzd4teA7X0mBLZQGtluesRNtw0YFHCeH1LVEiHva bHcHkMmFgME+dZzVdGaWwOC6ce+0Rx4oES2RkILrrGrZul68u8wIDTE/BRqOzQlZlTU2CD T/fc5L3msvF2rmceepM+ZdfJci95Ea54uxvgL8AP5pzY8k1p2WQRI8XsyiY4ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2lc33t3fz1Q6C; Mon, 17 Jun 2024 09:54: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 45H9sxFp030948; Mon, 17 Jun 2024 09:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H9sx8c030945; Mon, 17 Jun 2024 09:54:59 GMT (envelope-from git) Date: Mon, 17 Jun 2024 09:54:59 GMT Message-Id: <202406170954.45H9sx8c030945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7deadea2eb0a - main - mlx5: handle vlan PF restrictions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7deadea2eb0aca0b83657d30f895d98795d9d81f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7deadea2eb0aca0b83657d30f895d98795d9d81f commit 7deadea2eb0aca0b83657d30f895d98795d9d81f Author: Kristof Provost AuthorDate: 2024-05-30 13:56:56 +0000 Commit: Kristof Provost CommitDate: 2024-06-17 08:50:16 +0000 mlx5: handle vlan PF restrictions Reviewed by: kib MFC after: 2 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D45427 --- sys/dev/mlx5/mlx5_core/mlx5_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 6b9b63a24714..95d88c728306 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -52,8 +52,12 @@ #include #ifdef PCI_IOV #include +#include #include #include +#include +#include +#include #endif static const char mlx5_version[] = "Mellanox Core driver " @@ -225,6 +229,7 @@ static void mlx5_set_driver_version(struct mlx5_core_dev *dev) #ifdef PCI_IOV static const char iov_mac_addr_name[] = "mac-addr"; +static const char iov_vlan_name[] = "vlan"; static const char iov_node_guid_name[] = "node-guid"; static const char iov_port_guid_name[] = "port-guid"; #endif @@ -1714,6 +1719,8 @@ static int init_one(struct pci_dev *pdev, vf_schema = pci_iov_schema_alloc_node(); pci_iov_schema_add_unicast_mac(vf_schema, iov_mac_addr_name, 0, NULL); + pci_iov_schema_add_vlan(vf_schema, + iov_vlan_name, 0, 0); pci_iov_schema_add_uint64(vf_schema, iov_node_guid_name, 0, 0); pci_iov_schema_add_uint64(vf_schema, iov_port_guid_name, @@ -1950,6 +1957,25 @@ mlx5_iov_add_vf(device_t dev, uint16_t vfnum, const nvlist_t *vf_config) } } + if (nvlist_exists_number(vf_config, iov_vlan_name)) { + uint16_t vlan = nvlist_get_number(vf_config, iov_vlan_name); + + if (vlan == DOT1Q_VID_NULL) + error = ENOTSUP; + else { + if (vlan == VF_VLAN_TRUNK) + vlan = DOT1Q_VID_NULL; + + error = -mlx5_eswitch_set_vport_vlan(priv->eswitch, + vfnum + 1, vlan, 0); + } + if (error != 0) { + mlx5_core_err(core_dev, + "setting VLAN for VF %d failed, error %d\n", + vfnum + 1, error); + } + } + if (nvlist_exists_number(vf_config, iov_node_guid_name)) { node_guid = nvlist_get_number(vf_config, iov_node_guid_name); error = -mlx5_modify_nic_vport_node_guid(core_dev, vfnum + 1, From nobody Mon Jun 17 14:35:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2sqb6LWCz5P0ZR; Mon, 17 Jun 2024 14:35: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 4W2sqb5kbyz4w5k; Mon, 17 Jun 2024 14:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718634923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YywvXzNtO4LenKEtBl9hdRqIWKl4/5+l9gDV5OXaLR0=; b=Vgln/n2eh+dM/Nlh5RSxCGdJRD4mJsiAHRTjKh4Dg76F3R5RQ74gGR38pHTYpYiTuahKkc vw6tJABAFVqAHlbx3ziSf71GyT+sWHBxA3SzfRIlKkghopxIrQvcCqK43xAloELT3b9VkF a2wGdqD+zudn/5VgUEizpZRnejRfjCerzpIWQ8hg8CAevlIBNncdFgCgveurEBnxEyKRa9 B7nSd9x43vbYwq541oC3fdEZWicF9yGusOA3OTV1TUi5XNzfp9SDkvpkgHyh2mYYfJ6Oga e5hmSA5/08+bFLIpbkDI1T7Rge8JDsjeYW/u8AvaqlAvOgziRLiugd683scHZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718634923; a=rsa-sha256; cv=none; b=Cnc3U0/wheWUUs/rc6Pj7PDYncqn2+RNFIkZput9G4aWxFscbW8xaTLb/i+qgrTuK6Y5Pt bTm6mVgLj09MoPZE9XX2Yeq2dtCapPMv0SWAAU5dtgo3b8ZDDElYu0WeidkZ2OKmg3pPJk jCrdRrd4D5ggK6RN8MzLCxqWoYBZswnY63VN3TiwakEnDUsFnEG8WynkR5RJThyFEd/06U Uw46hFnAKlGR5AtQxg438GwLKyNIf2yikPA2O9jgqdSwQBYCEIeQv2PjO1CpF6MSBixTZC 9bO+frxfQYvGZAYah3PP7C0jV6pUv9kvtynGzE7KyorGXr92m6FQcBljRBWqqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718634923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YywvXzNtO4LenKEtBl9hdRqIWKl4/5+l9gDV5OXaLR0=; b=SNczyWvZxPtSkPlt9T0Tn/XrRf5+Yhfqb7/gHMa9RT7WtJV5cuYLVKHcuiy+kRlyUfVmUu nrxsIijCVMmXAOSrqffY1ODWqFVrbNlEhOmsCHGhKk288VcO4yT6CBM22XAuRrIORFo/gI mZgtTJSvwap1xMibk8agXlAnz+FKnyhkWDm+aoVg5vhqTeUfbQprKfq8Y94er93ExmH2bq kZjPsO4gbjv94cAxrQjif193+XZ8Lenk1y0chHm1GLsmCZHDDToPx+Qu+38TppF4nT8A+q e1vkySP/hfcYCJ7JtYh1nBh7n13jrQ49xpoUn2vVtx0QAK0QBQCyFNoO1+Emrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2sqb4q8GzKVX; Mon, 17 Jun 2024 14:35: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 45HEZN3p004347; Mon, 17 Jun 2024 14:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HEZNH9004344; Mon, 17 Jun 2024 14:35:23 GMT (envelope-from git) Date: Mon, 17 Jun 2024 14:35:23 GMT Message-Id: <202406171435.45HEZNH9004344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6d451a20ef70 - stable/14 - libdtrace: Work around a warning from flex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d451a20ef70b9a0005442924dfd4ceaddd4c2b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6d451a20ef70b9a0005442924dfd4ceaddd4c2b4 commit 6d451a20ef70b9a0005442924dfd4ceaddd4c2b4 Author: Mark Johnston AuthorDate: 2024-06-01 15:16:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-17 13:27:24 +0000 libdtrace: Work around a warning from flex When compiling dt_lex.l, flex produces warnings of the form: dt_lex.l:413: warning, trailing context made variable due to preceding '|' action dt_lex.l:412: warning, dangerous trailing context dt_lex.l:412: warning, dangerous trailing context Here, trailing context refers to the use of "$", which expands to "/\n". The meaning behind these warnings is described in the first two paragraphs of the flex manual's DEFICIENCIES/BUGS section: Some trailing context patterns cannot be properly matched and generate warning messages ("dangerous trailing context"). These are patterns where the ending of the first part of the rule matches the beginning of the second part, such as "zx*/xy*", where the 'x*' matches the 'x' at the beginning of the trailing context. (Note that the POSIX draft states that the text matched by such patterns is undefined.) For some trailing context rules, parts which are actually fixed-length are not recognized as such, leading to the above mentioned performance loss. In particular, parts using '|' or {n} (such as "foo{3}") are always considered variable-length. Here, the warnings appear to be bogus in this case. The lexer has no problem matching either of the referenced patterns, e.g., printf("foobar or # 1 "asdfasdf Introduce a small amount of code duplication to silence the warning. MFC after: 2 weeks (cherry picked from commit 4bddff0833d3efee77a099b3ef447fbae1e63d21) --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l index d50369bb57c9..756a48b9c45f 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l @@ -407,7 +407,7 @@ if (yypcb->pcb_token != 0) { {RGX_FP} yyerror("floating-point constants are not permitted\n"); -\"{RGX_STR}$ | +\"{RGX_STR}$ xyerror(D_STR_NL, "newline encountered in string literal"); \"{RGX_STR}$ xyerror(D_STR_NL, "newline encountered in string literal"); \"{RGX_STR}\" | From nobody Mon Jun 17 14:35:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2sqc6bktz5P0T5; Mon, 17 Jun 2024 14:35: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 4W2sqc63Nqz4vjl; Mon, 17 Jun 2024 14:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718634924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRuc2yoz7GtCIIF8jQboRKye7IZ89ZUGIAv4tjrbplE=; b=OOP6rZJBzW/ovgiNzOcVHSSrr+WKx24Tza6HM/zpOSD7sB+7z0fOQhNXG4FpKyIooqwy8B M3mus0PA12PeRJ9Mbyf8i5k8PwIimwAv8dsE9LWo9O0i0yaq5BwagfJyjg48O0/R364XT5 KmLJxL/HI6U7cn1FhAHXk44ZKxHW9yIQwnUVw34NvB5zMlzmYAn0Fxnr+xZllpkgncN1js Gh4cP2C3XbQtE/nXEx3tLAqeiCxEJemjLhql8QZp927p+7C2Q5McXDY6i0aUl5T2Z6ZTsF /ZJTmvGvNH5V/e1xAwtZLcvO5cdhCwXge6dPtpd1PNf6JdDd5ZcTnEhUfuAiPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718634924; a=rsa-sha256; cv=none; b=ZSXBitS+qNxxyQXlQJl5CFSnTRrOgZ5Ex9wvJfksBU1kke/4cdcFt28GK/46TTKOTHwnoF O2QFfE4UhS5Pzi6rWkZqdVaSnlKwnEzKCN5dEkSkvYI63aULzevcT3WSLIEealPI9NDkOn BBetxi0SvTuo/+RJrxzEqzlg1rJ6Kg4nuWtet64aPZxEarhJJUs4GIUG8iVUpS/radbMTi QLTNOa49hVcGK+r9AxrgrXlWweEJElCXfZoA6gugXOOAGF+HYnAWOUin8D8Eept9KiTxW8 mTRpGxa0gjcCtfOzjH3J2RtJ4FgLwYn+zOyeD7m2HZkDgp4cGxrnzHgwya3mow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718634924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRuc2yoz7GtCIIF8jQboRKye7IZ89ZUGIAv4tjrbplE=; b=xu0vcwTdWRFTbcUAvS/Fi5JkGmE5BuTJS//uXebQMSHJTlbyx6gcMG/G3XJLIoA1Py6A9M bJUheJIdGQS5F/peFWAiCBS5WDe54JxG0NxqpZZFBvi+349c10KBG/bu2hXwiZD3H0fxnL Rfl5VPmkjpp71PpD6OT3c4dhbyRo1Wr0qDguYcLrb9mEBywgO0D/1MNxni/WOLqV1ZPR9p Wj/yxzwp90mjASCCNEC+rqn+dFGi30/3dFq8Wzut4b/0GBBzz97GqjvqRQD97IXqbViT9N qv33VlcPwa2SBoN8IdmK4JQS1HrKZ+t84KAOBmwRAy9MfCK6PhvIBOzH5PsRiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2sqc5fZ9zKVY; Mon, 17 Jun 2024 14:35: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 45HEZO5w004403; Mon, 17 Jun 2024 14:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HEZOZj004400; Mon, 17 Jun 2024 14:35:24 GMT (envelope-from git) Date: Mon, 17 Jun 2024 14:35:24 GMT Message-Id: <202406171435.45HEZOZj004400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1c27279ed22d - stable/14 - Destroy ARC buffer in case of fill error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c27279ed22d2b5226f31836da041bae45a9c77b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1c27279ed22d2b5226f31836da041bae45a9c77b commit 1c27279ed22d2b5226f31836da041bae45a9c77b Author: Alexander Motin AuthorDate: 2024-05-25 02:11:18 +0000 Commit: Mark Johnston CommitDate: 2024-06-17 14:25:59 +0000 Destroy ARC buffer in case of fill error In case of error dmu_buf_fill_done() returns the buffer back into DB_UNCACHED state. Since during transition from DB_UNCACHED into DB_FILL state dbuf_noread() allocates an ARC buffer, we must free it here, otherwise it will be leaked. Reviewed-by: Brian Behlendorf Reviewed-by: Jorgen Lundman Signed-off-by: Alexander Motin Sponsored by: iXsystems, Inc. Closes #15665 Closes #15802 Closes #16216 PR: 276341 (cherry picked from commit 02c5aa9b092818785ed8db4e2246a828278138e3) --- sys/contrib/openzfs/module/zfs/dbuf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index bb921af6d78a..0576da6475b1 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -2840,6 +2840,7 @@ dmu_buf_fill_done(dmu_buf_t *dbuf, dmu_tx_t *tx, boolean_t failed) failed = B_FALSE; } else if (failed) { VERIFY(!dbuf_undirty(db, tx)); + arc_buf_destroy(db->db_buf, db); db->db_buf = NULL; dbuf_clear_data(db); DTRACE_SET_STATE(db, "fill failed"); From nobody Mon Jun 17 16:52:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2wsy6mXPz5PF2N; Mon, 17 Jun 2024 16: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 4W2wsy5qFfz40CY; Mon, 17 Jun 2024 16: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=1718643158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AtYGkubb+V+drUnLC4JN35v6CldVEsMEnXjCF4XLqKs=; b=e2Tqf3X4CxnpoHu0ikrVToA7JYy8LggoEAuBm/74N4a3eN+4ykIfkSD+xYa+n3bDaLqAst xaE+8Jki/2WUsaCSCp43OYTFZvTYOEsE6NB1W2KSN7Ey+qPNvYif1CKqtFSUUIpCsppr/h 71NekS311r9EcZC+BDqnk4xSjbgn8mtvezp7n5B0HXg0IoA/ayXTST8NtUkAivT+9yofWG 9NjOo2ss88Tc38z32W2Tx/WS0PFWalJpRbQUA5BqNi51NPitjsMfDr5/GxCBjgsPtkD2HF cOKRpqfmSJPRnAiiahiFKCtTOg45c37O9iNgTHvDKPscnjnUoda7lInrfPmqdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718643158; a=rsa-sha256; cv=none; b=BOSWXXxFnvDO+KaJ1ETfckpfTfIxOqKvtpJ9ux2+cfl8b2P5/h4VrcobMgwxDH/sPC4nTy Wr7uZNz1v/p+gc8yPL/VhA+QMgdHNLWej715gELHP/s1C0gwxCH8nKxJNzBlUqZtdfl+5R S+YQ5SKFbbch0L6y0j7Gcyspa5dD16QJI4F5FQUBSLCfuGv+3Mon2k8t9m6VNgDu4KYamd Gbp88aSZjAoC+85zGhbE/R11YNTdwcaRssyqlh1R0vceDe3tUnGzA6R+UtmN824u7Lcca5 Fv8kLooxJljmsIHF6oikBigC984TO7hfuRsgDtXicdoDEgOPfrAavHdqLXGX8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718643158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AtYGkubb+V+drUnLC4JN35v6CldVEsMEnXjCF4XLqKs=; b=FrnnSIT8XsR0/KSahV2pHwoWcMiK+MyZ0t9NolaQKO/CG2daLoaA0x6bdhxV5r9HIrC0ga Yp61zD89IhWFU9m1Z9DvQikDru24Trd92YJeU4eS0O0FBFt4rSQL79eI/z/xmw2nIsZRSx vojNkG2Ny1u004RtDtZwbbCRiZ9kE+WzwkwYQKEoUpGBju/pkE8nJJuMKsYNdHUC/rEtNY auzACb0NFWBiPjznCLzyXi6jcwmfztL2/YNXVa4flAwJzivt6fsTVlKI/IR3HcoeEyWHqM jtfCU7BTcmRCnxBb1LVNnmqQGV6nt3RyIhqDTaCclOlVcEHhuEyv7tgUcjMsJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2wsy5QSzzNNk; Mon, 17 Jun 2024 16: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 45HGqcnJ039215; Mon, 17 Jun 2024 16: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 45HGqcW2039212; Mon, 17 Jun 2024 16:52:38 GMT (envelope-from git) Date: Mon, 17 Jun 2024 16:52:38 GMT Message-Id: <202406171652.45HGqcW2039212@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: f354ca7383f7 - main - development.7: markup nits, tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f354ca7383f709f8380e11b2192eb62312d4139f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f354ca7383f709f8380e11b2192eb62312d4139f commit f354ca7383f709f8380e11b2192eb62312d4139f Author: Alexander Ziaee AuthorDate: 2024-06-02 13:47:44 +0000 Commit: Ed Maste CommitDate: 2024-06-17 16:52:25 +0000 development.7: markup nits, tag spdx Using quoted literals is a mistake in roff(7). Please escape with `\&`, the zero-width-space. Reviewed by: emaste MFC after: 3 days --- share/man/man7/development.7 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 0eb5377bd07b..9af9bfb66fa8 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2018 Edward Tomasz Napierala .\" .\" Redistribution and use in source and binary forms, with or without @@ -89,7 +92,7 @@ and .Xr release 7 . Kernel programming interfaces (KPIs) are documented in section 9 manual pages; use -.Ql "apropos -s 9 ." +.Ql apropos -s 9 \&. for a list. Regression test suite is described in .Xr tests 7 . @@ -116,7 +119,6 @@ build and test status of CURRENT and STABLE branches, the continuous integration system is at: .Pp .Lk https://ci.FreeBSD.org -.Pp .Sh EXAMPLES Check out the CURRENT branch, build it, and install, overwriting the current system: @@ -187,8 +189,7 @@ The .Nm manual page was originally written by .An Matthew Dillon Aq Mt dillon@FreeBSD.org -and first appeared -in +and first appeared in .Fx 5.0 , December 2002. It was since extensively modified by From nobody Mon Jun 17 17:06:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2x9z2DGPz5PG4W; Mon, 17 Jun 2024 17:06: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 4W2x9z1XvDz42Fy; Mon, 17 Jun 2024 17:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718643991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeCHIIShtl79ZL7F0iaCpyUMcDboY2+nDph8EUkkDns=; b=mcydnQI+wQUastQ8Bf3Pc0k5ZsWC/eMIU04rJ7Jdy6Yl2NM7YQ8acrrS3JOOaGHQ/cP6HX 9fdN4nSIeCCMmYXzjNWioWmZRHcdFw3pG2yRVVUrOxFvV8OwR9L+S32g26UI1loDD54TxK h/znG9XPyMJbhlAXK4FyHK6Abc7gSicZJIK6dn0vbesGXbIATv2Y59NICS8ZdhoncUk2wE elt9mMdgkY72Kro0rBDq7k1XLfEoGTQ8n7EJfFVS78Eou6xWDqajUKBceSoiwPGw2Lo6OA h1dp9ZTwdT2EATqDvjTUhXwRDcV+BYEvcStVxN3KVtapeKj7mfyIMkD/WrT6yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718643991; a=rsa-sha256; cv=none; b=rmMr3CXnFglHy0a+bp/G+zQ8dms2qTfGcF5T3iVPTzirt/NRUHdH2raP5OIXxoTrjEtAKB a+b+2+O3Esj2V3QELBns+f0//8rcoVEzGwccUJAPu5lp/Ck3R9i59tnJ/c1Jvv9U0saETP nEc0PGw8rQ2lbt3Pv8AAqeAgS3GO2cc9SFTL4ojdRFW7de49oT97JN6wItrqdDjryYosK2 hP7FYFfwal5jK8fpA0DkKctVdiL3LnicE9XHj4PWIYJGpZiQvRaZw8pWA03dxgc15GvqVu af976yDuK3P08jxtWOaou0cO4/IFrvgTAzEkF68UsbDXUcct82wloJkudvEv1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718643991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeCHIIShtl79ZL7F0iaCpyUMcDboY2+nDph8EUkkDns=; b=ZtUbOE5FT+W2kF5SL6o+6bW3JwtzdMBRQ7emH58y7B+Vdp1v4l6I7pQ+QdrKW2geOmouKB 3X1T4wDwYiqbLeuipuUD2aZU0FmAFsWj9TXbsfoIgM+TiLiM/Ow78OZj5ciy8qRVWqkWoA W4sRNBTu/oyXUcCggASWarGLDXWW9WAWoSHqZbc0EITTfh2RhZziMNNiQmy7k4V1OGiiDP vGZRJdMU2dqpnNmt1Sap7mEy4Rn7UIvtxCOqFdszCE5E1/XT+slc9Hxuf468K7tzawjOhJ vATpQks21m7PvAtwzpFZApzWPE5jj2kIdhP7m/hnU96y75AyO6exSPqML+Hv9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2x9z0kJ2zNbX; Mon, 17 Jun 2024 17:06: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 45HH6UoG057760; Mon, 17 Jun 2024 17:06:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HH6UZG057758; Mon, 17 Jun 2024 17:06:30 GMT (envelope-from git) Date: Mon, 17 Jun 2024 17:06:30 GMT Message-Id: <202406171706.45HH6UZG057758@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: c6030b380469 - main - Revert "tzsetup: ask local/UTC question only on x86" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6030b380469f928c8cae87ed53bcb234cb3486f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c6030b380469f928c8cae87ed53bcb234cb3486f commit c6030b380469f928c8cae87ed53bcb234cb3486f Author: Ed Maste AuthorDate: 2024-06-17 17:03:44 +0000 Commit: Ed Maste CommitDate: 2024-06-17 17:04:40 +0000 Revert "tzsetup: ask local/UTC question only on x86" I am unsure if AArch64 Windows systems keep UTC or local time in the RTC by default, so keep tzsetup consistent across architectures for now. This reverts commit aa6fb1d277be47c51abc309ac9305def0fce7f9d. Reported by: Mark Millard --- usr.sbin/tzsetup/tzsetup.8 | 1 - usr.sbin/tzsetup/tzsetup.c | 25 ++++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8 index 4e70875ec74b..3fd463c31ee5 100644 --- a/usr.sbin/tzsetup/tzsetup.8 +++ b/usr.sbin/tzsetup/tzsetup.8 @@ -63,7 +63,6 @@ Skip the initial question about adjusting the clock if not set to UTC. will neither create nor delete .Pa /etc/wall_cmos_clock . On a newly installed system, the hardware clock will keep UTC. -This option is enabled automatically on non-x86 hardware. .El .Pp It is possible to short-circuit the menu system by specifying the diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 6629dd81f250..617de4efb765 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -826,28 +826,23 @@ main(int argc, char **argv) char prompt[128]; int fd; #endif - int c, rv; - bool skiputc; - char *dztpath; -#if defined(__i386__) || defined(__amd64__) + int c, rv, skiputc; char vm_guest[16] = ""; size_t len = sizeof(vm_guest); + char *dztpath; - skiputc = false; - - /* Default skiputc to true for VM guests */ - if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 && - strcmp(vm_guest, "none") != 0) - skiputc = true; -#else - skiputc = true; -#endif dztpath = NULL; + skiputc = 0; #ifdef HAVE_BSDDIALOG setlocale(LC_ALL, ""); #endif + /* Default skiputc to 1 for VM guests */ + if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 && + strcmp(vm_guest, "none") != 0) + skiputc = 1; + while ((c = getopt(argc, argv, "C:d:nrs")) != -1) { switch (c) { case 'C': @@ -866,7 +861,7 @@ main(int argc, char **argv) #endif break; case 's': - skiputc = true; + skiputc = 1; break; default: usage(); @@ -956,7 +951,7 @@ main(int argc, char **argv) if (bsddialog_init() == BSDDIALOG_ERROR) errx(1, "Error bsddialog: %s\n", bsddialog_geterror()); - if (!skiputc) { + if (skiputc == 0) { snprintf(prompt, sizeof(prompt), "Is this machine's CMOS clock set to UTC? " "If it is set to local time,\n" From nobody Mon Jun 17 17:41:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2xyF3Ljnz5PJFv; Mon, 17 Jun 2024 17:41: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 4W2xyF2xDXz46Dj; Mon, 17 Jun 2024 17:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718646085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S00MYPge2EeyRfSfy95hhTbv9KNB4yC2JgA9mx0FO5s=; b=UxPIRX8AQug7MiYId3wFO3mw7QPJs0dYGBKoZrOszyYpKnngnposvJsSUqnarjrK07aJzj CsVmdtORHtKRqbBLMIeNBp0IJahhuBBSYt4DaK/IORFJOi27ekoMdwFfIN3OG8v+3xTKmO v35d4FqEIL8H4vHDB8+/NhpplanCrcsHn4b9ZCcfgKMLnplbnBsGSoisoKd9zbEzeqvO2U PZbH94dZDctqmHbkPvjyFH4b7R4ApkHpAFQGtYQQ8ql2g0NoBprjMgwy7OewRR0+y4c3EZ FU5KW7u9pOzCNu9zLhfj3Cp95LuCK4cCvZwq0XSwI4GzifRGY0Mi1BkQE3HEbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718646085; a=rsa-sha256; cv=none; b=cI1KwCO5Tc082s5QD44hBwmX5sQLkUYnSU7F8B7Tly/b3xuxExlfJQZD/oHzeoGKMdRGoy ggu3b/NgAT7sYV58N5PKvC1ctnccqXDj1u9wyzh8zlqKtoznySeFCUCBNoqg+MpFJg3wiu +nxXP3YuKtmBS4i+4au+GSSXJRx5AnLAmp6RtaCis1Cvvfp8fXNqxBy5tUPsJxVok/0F0s 6I5gReRE9r38VF5oLXfM3K111QLjShBoYB2TcgXOt2UMugG+G/RQeXVE+gR4evZiUNEINk ihPRHxfZkQWbdJcc7OgieEzGiebDlY3GUlf5ojs1FhBUJC50FBlqSaVlmf0Ilg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718646085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S00MYPge2EeyRfSfy95hhTbv9KNB4yC2JgA9mx0FO5s=; b=ExDVNdMWfKnwVg/oAvPvSGfhjahIHTuuyAphCvXLL1e5kDg9/N8XrIwMHzSIm25kU3ZMRO bx2dyERY1hxNFMLnHDyaLaosFYyJ+VVdaN9pTCQFqo2XaXrdOdBKJUBBhIqQ1rPSxPMh7U Y5Jbd4axEsydM0zbYU8RErRosIfRPoLHpOwlKz+C0g5vD8SsQtp3NEkQV48wCom+27i3w7 7p2YGuIsSkqeaz5qwQknMNwq+1SIk9IZxKBMU2NzFhjiMXF6TtcAVIcuWGyymy9q2hHNwq +HJeg9V+/MyQicX06MBrwMmH3XvL3TBi8b9HAk1NSiRGWl34v8dcqvaCSM06tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2xyF2XwfzPvc; Mon, 17 Jun 2024 17:41: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 45HHfPHw021581; Mon, 17 Jun 2024 17:41:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HHfPNF021578; Mon, 17 Jun 2024 17:41:25 GMT (envelope-from git) Date: Mon, 17 Jun 2024 17:41:25 GMT Message-Id: <202406171741.45HHfPNF021578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 4471ff11969e - main - cxgbev(4): Shared code for the VF driver to query a VF's VLAN config. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4471ff11969ec6bd2e5d3c745fc5ba90fda596ed Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4471ff11969ec6bd2e5d3c745fc5ba90fda596ed commit 4471ff11969ec6bd2e5d3c745fc5ba90fda596ed Author: Navdeep Parhar AuthorDate: 2024-06-12 22:24:25 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-17 17:29:17 +0000 cxgbev(4): Shared code for the VF driver to query a VF's VLAN config. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/common.h | 1 + sys/dev/cxgbe/common/t4vf_hw.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h index a49c21576994..6e80ce40648b 100644 --- a/sys/dev/cxgbe/common/common.h +++ b/sys/dev/cxgbe/common/common.h @@ -948,6 +948,7 @@ int t4vf_get_vfres(struct adapter *adapter); int t4vf_prep_adapter(struct adapter *adapter); int t4vf_get_vf_mac(struct adapter *adapter, unsigned int port, unsigned int *naddr, u8 *addr); +int t4vf_get_vf_vlan(struct adapter *adapter); int t4_bar2_sge_qregs(struct adapter *adapter, unsigned int qid, enum t4_bar2_qtype qtype, int user, u64 *pbar2_qoffset, unsigned int *pbar2_qid); diff --git a/sys/dev/cxgbe/common/t4vf_hw.c b/sys/dev/cxgbe/common/t4vf_hw.c index a0c2eb5f60b3..8091eb5db2f9 100644 --- a/sys/dev/cxgbe/common/t4vf_hw.c +++ b/sys/dev/cxgbe/common/t4vf_hw.c @@ -429,3 +429,30 @@ int t4vf_get_vf_mac(struct adapter *adapter, unsigned int port, return ret; } + +/* + * t4vf_get_vf_vlan - Get the VLAN ID to be set to the VI of this VF. + * @adapter: The adapter + * + * Find the VLAN ID to be set to the VF's VI. The requested VLAN ID + * is from the host OS via callback in the PF driver. + */ +int t4vf_get_vf_vlan(struct adapter *adapter) +{ + struct fw_acl_vlan_cmd cmd = {0}; + int vlan = 0; + int ret = 0; + + cmd.op_to_vfn = htonl(V_FW_CMD_OP(FW_ACL_VLAN_CMD) | + F_FW_CMD_REQUEST | F_FW_CMD_READ); + + /* Note: Do not enable the ACL */ + cmd.en_to_len16 = htonl((unsigned int)FW_LEN16(cmd)); + + ret = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &cmd); + + if (!ret) + vlan = be16_to_cpu(cmd.vlanid[0]); + + return vlan; +} From nobody Mon Jun 17 17:41:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2xyG5Wh3z5PJRM; Mon, 17 Jun 2024 17:41: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 4W2xyG3zmXz45rh; Mon, 17 Jun 2024 17:41:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718646086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrYIBCaT/YqoA+5W3iLdcd3m/nq/Vul8ZkYNRFa+GTg=; b=qlW+1dXtBKk5qe+yDdnCBdBn4JZS+ndsmxAQ66e/f0/XG/5ctLrpbEdtdCP/h81cFhlfiQ 79hXfT8mK4tGaLqiwe97ND4T+ojOmwCs03BzdO/5fcprTjj14KOJzrOxEzpQ/NExBMXOP3 BdLZy3werZoEmgbK4Ij1TZQcWrfyIuZMKL5oLaWeiY1jnhwDXhkhyxx6jxTzdxFxTyhh8N x88cLCscNOata5i32WcKVBux1w4p4GELR58jrM3JfYSOY6foii2GysMrdDy8hp+bWiHu3l 91odVeuJYTKl61+Mn2Cvje+dVYigFos5GzprL2qilJ5jGq/VxUSr8Rx9mCF9MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718646086; a=rsa-sha256; cv=none; b=k83JetkgmhMJjWVGw2nb4ERd6e/ALr88pvaDzOn6VFbj5UvdE2kNTgsK4QywovLFG5qEWW FA82xIm2lbj5F3wmmZ+WgUMM/FGMz9HyH0TBANonuPpBDmbkppCpEXnLK6di8Hc3gTURPe CP5j+CENUn0UOUjs9s8ZM4UQDl8EmQktOG35H1JkvKVKV5tG361csM4dfmUCcwzgqFWo5K uVY1KxeKvxYs2oWoafbRGA4S690Dmeh7EfS5K+nYRG/HF0TSFHBUDERClRpdOniALouvMv Pxd+DF4kE1jU55ahMuvgW7WLSTsQHIGfFBw1fYxs7uB8uZbMqdD5N9SPQw/S/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=1718646086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrYIBCaT/YqoA+5W3iLdcd3m/nq/Vul8ZkYNRFa+GTg=; b=TCR1DfEUaCsdTWrfwel4CzAsUTkOVoTPTbUfxSJn6kJn1aspqsK4ubmR4SzqVCNSGllQKn q4eEIq5AiDDWS/A8GguHPbgcdi9SL9r9HXRwgPqMu3a8W1knE9PVS+DASDW9N+pGRXSA+7 NnewMQoKs1ZNk68Vh40X7ILf93Nd+VFg/7YNmHMfrVAhRV9IGJDGJi1s484jMSvkkZERwO gGF/SC2cTWigPmcXQUsec2idZi/eoeO+84ukqIHvsDvtZcQqPnQ3Dhm8BaZWXPlpgMtLRf alFmaH4fsqQIdCtbrRTtWFnAuu6khgfwzdMXKEuTR4iypR2jfn6PjGN4uizW6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2xyG3c2GzPk3; Mon, 17 Jun 2024 17:41: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 45HHfQBe021648; Mon, 17 Jun 2024 17:41:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HHfQio021645; Mon, 17 Jun 2024 17:41:26 GMT (envelope-from git) Date: Mon, 17 Jun 2024 17:41:26 GMT Message-Id: <202406171741.45HHfQio021645@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 2d0a01271223 - main - cxgbev(4): Pay attention to the VLAN configuration for the VF. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d0a01271223ce623c78f5c8236f8f3f4b6ef104 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=2d0a01271223ce623c78f5c8236f8f3f4b6ef104 commit 2d0a01271223ce623c78f5c8236f8f3f4b6ef104 Author: Navdeep Parhar AuthorDate: 2024-06-17 17:11:16 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-17 17:35:14 +0000 cxgbev(4): Pay attention to the VLAN configuration for the VF. Make sure that the transmit traffic is tagged correctly or else the firmware will refuse to transmit and will report an ACL violation. On receive the hardware will make sure that tagged traffic is delivered to the appropriate VM. The driver only asserts that the VLAN id that was extracted from the wire traffic matches the VF's configuration. All this works when associating a specific VLAN id with a VF. The 'trunk' setting likely needs more work. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/adapter.h | 1 + sys/dev/cxgbe/t4_sge.c | 20 +++++++++++++++----- sys/dev/cxgbe/t4_vf.c | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 9ab672ba6442..36529601dffa 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -929,6 +929,7 @@ struct adapter { u_int vxlan_refcount; int rawf_base; int nrawf; + u_int vlan_id; struct taskqueue *tq[MAX_NPORTS]; /* General purpose taskqueues */ struct port_info *port[MAX_NPORTS]; diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 505f2d1bf677..350d385ac490 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -2086,9 +2086,17 @@ have_mbuf: } if (cpl->vlan_ex) { - m0->m_pkthdr.ether_vtag = be16toh(cpl->vlan); - m0->m_flags |= M_VLANTAG; - rxq->vlan_extraction++; + if (sc->flags & IS_VF && sc->vlan_id) { + /* + * HW is not setup correctly if extracted vlan_id does + * not match the VF's setting. + */ + MPASS(be16toh(cpl->vlan) == sc->vlan_id); + } else { + m0->m_pkthdr.ether_vtag = be16toh(cpl->vlan); + m0->m_flags |= M_VLANTAG; + rxq->vlan_extraction++; + } } if (rxq->iq.flags & IQ_RX_TIMESTAMP) { @@ -5476,7 +5484,8 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq *txq, struct mbuf *m0) ctrl1 |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(m0->m_pkthdr.ether_vtag); txq->vlan_insertion++; - } + } else if (sc->vlan_id) + ctrl1 |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(sc->vlan_id); /* CPL header */ cpl->ctrl0 = txq->cpl_ctrl0; @@ -5977,7 +5986,8 @@ write_txpkts_vm_wr(struct adapter *sc, struct sge_txq *txq) ctrl1 |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(m->m_pkthdr.ether_vtag); txq->vlan_insertion++; - } + } else if (sc->vlan_id) + ctrl1 |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(sc->vlan_id); /* CPL header */ cpl->ctrl0 = txq->cpl_ctrl0; diff --git a/sys/dev/cxgbe/t4_vf.c b/sys/dev/cxgbe/t4_vf.c index 24c80aaa7b2d..8ca6dd98a66f 100644 --- a/sys/dev/cxgbe/t4_vf.c +++ b/sys/dev/cxgbe/t4_vf.c @@ -660,6 +660,8 @@ t4vf_attach(device_t dev) t4_os_set_hw_addr(pi, mac); pmask &= ~(1 << p); + sc->vlan_id = t4vf_get_vf_vlan(sc); + /* No t4_link_start. */ snprintf(pi->lockname, sizeof(pi->lockname), "%sp%d", From nobody Mon Jun 17 18:38:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2zCY6CQ8z5PP1W; Mon, 17 Jun 2024 18:38: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 4W2zCY5j3Bz4G2H; Mon, 17 Jun 2024 18:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718649481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=APV12tUMci5LVeRtrXibVczcYgrjClc0l+z/SgAHtS8=; b=MUZmJGRFBSH/0Xo+JX5XbQXlvGHURBRE+Z0++RZ/LO3mIOsxVYomW3nX56b8iy1et1L1Hh Mw8QPlLIFqy+nqcYqsv4IjVYSy0aNqKzQZnPZjV1XWRD0MVITO09FLhTxUNHCX/+Ml6oke 4gp48dwRWfB4TPO3UJ6ZNKpor4it+OwFuoahXobVNVMg5ER+wo/E5BzSqhh0+wReQL+lOx Ioib0Pz8291Sg/n91nTdc2qhR0RvtBhual9qP7Oe/+sQ9HeTx42SjT8dT4AlVUjGm8nYqq VemdyQMvbr0iiz2Yy6vQ6xWDZZRt4yErL4Q/bpFQJnygzaA3F6NenISmdLObpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718649481; a=rsa-sha256; cv=none; b=ebe17/8k0VrH9bGUbTT/pDj2rNDAK1Tibc0zJ52zPFn8QbcPq9u2LZtrqCUVGPX77nbirx CsraZJS4e36akOsho9en0fD7bGi0KZKPLGYqozaoofG4/hCOiHdvAFL6lN7E3ocIh79unx mrB2E8iNbFoAxReKBGtRUksGAY5JtRSAsQq/FZIItqmrmBcuw8pf0ZxdbiB2UHgMRVoTMK 5YyyfH6V6NfrNjSDDfyjxr9SD/g65IAZ0mlVv7DY5sdjhVspzGkzoL3Brg9BjnTq6R8nwg CRDlTzqfJyK36NmBVMqiDfvF3+pMCfk8lx//mR5YgtytHXGcLL1XxI8AfDVP+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718649481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=APV12tUMci5LVeRtrXibVczcYgrjClc0l+z/SgAHtS8=; b=MzhbhGhTMw1b89adYhRN1c0Y658Nw9aUbRT94j+P1mQkz28ee8MDv5bT47k7Hb7N8JPfq5 0h5OSIniieoRFwgWFcD77MG78hi01lSlzTg8ohuzXBrN3A3Yh61umkY/pIl6yG7KtbeoMe cUOAmzr8cvowvaxT2yFo93iWaX2wvQiJBDO/Dj2gpM3BeFM4TWj3aNXgg25sbQhZnVrpsh Hjxm5Rwedqw9xEfOVcAdfm5SfgUGFvSaxBkvTZF80gFWkJbjqWRf8SjC7KTJjSPc9d1QZX hLkd2L3y0vWrYWD9OUvyjH2q9WMH/JFvUCuWf7AyJxShFO/kwlk5dlulDKpe4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2zCY50gZzQny; Mon, 17 Jun 2024 18:38: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 45HIc1pK009950; Mon, 17 Jun 2024 18:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HIc1ZL009947; Mon, 17 Jun 2024 18:38:01 GMT (envelope-from git) Date: Mon, 17 Jun 2024 18:38:01 GMT Message-Id: <202406171838.45HIc1ZL009947@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: 2d6094615a13 - main - release: Remove mergemaster mm-mtree.sh script List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d6094615a137d9d4fc0ea0b29132d4a7e358eb5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2d6094615a137d9d4fc0ea0b29132d4a7e358eb5 commit 2d6094615a137d9d4fc0ea0b29132d4a7e358eb5 Author: Ed Maste AuthorDate: 2023-09-09 16:14:58 +0000 Commit: Ed Maste CommitDate: 2024-06-17 18:37:46 +0000 release: Remove mergemaster mm-mtree.sh script It is unused after 8ee478dfd46d ("release: stop generating mergemaster databases"). Sponsored by: The FreeBSD Foundation --- release/scripts/mm-mtree.sh | 152 -------------------------------------------- 1 file changed, 152 deletions(-) diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh deleted file mode 100755 index 7ba7d0c9694a..000000000000 --- a/release/scripts/mm-mtree.sh +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/sh - -# mergemaster mtree database generator - -# This script is intended to be used as part of the release building -# process to generate the /var/db/mergemaster.mtree file relevant to -# the source tree used to create the release so that users can make -# use of mergemaster's -U option to update their files after updating -# to -stable. - -# Copyright 2009 Douglas Barton -# dougb@FreeBSD.org - -PATH=/bin:/usr/bin:/usr/sbin - -display_usage () { - VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` - echo "${0##*/} version ${VERSION_NUMBER}" - echo "Usage: ${0##*/} [-m /path] [-t /path] [-A arch] [-F ] [-D /path]" - echo "Options:" - echo " -m /path/directory Specify location of source to do the make in" - echo " -t /path/directory Specify temp root directory" - echo " -A architecture Alternative architecture name to pass to make" - echo " -F Specify what to put on the make command line" - echo ' -D /path/directory Specify the destination directory to install files to' - echo '' -} - -# Set the default path for the temporary root environment -# -TEMPROOT=`TMPDIR=/var/tmp mktemp -d -t temproot` - -# Assign the location of the mtree database -# -MTREEDB=${MTREEDB:-/var/db} -MTREEFILE="${MTREEDB}/mergemaster.mtree" - -# Check the command line options -# -while getopts "m:t:A:F:D:h" COMMAND_LINE_ARGUMENT ; do - case "${COMMAND_LINE_ARGUMENT}" in - m) - SOURCEDIR=${OPTARG} - ;; - t) - TEMPROOT=${OPTARG} - ;; - A) - ARCHSTRING='TARGET_ARCH='${OPTARG} - ;; - F) - MM_MAKE_ARGS="${OPTARG}" - ;; - D) - DESTDIR=${OPTARG} - ;; - h) - display_usage - exit 0 - ;; - *) - echo '' - display_usage - exit 1 - ;; - esac -done - -# Assign the source directory -# -SOURCEDIR=${SOURCEDIR:-/usr/src} -if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ - -f ${SOURCEDIR}/../Makefile.inc1 ]; then - echo " *** The source directory you specified (${SOURCEDIR})" - echo " will be reset to ${SOURCEDIR}/.." - echo '' - sleep 3 - SOURCEDIR=${SOURCEDIR}/.. -fi - -# Setup make to use system files from SOURCEDIR -MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk -DDB_FROM_SRC" - -delete_temproot () { - rm -rf "${TEMPROOT}" 2>/dev/null - chflags -R 0 "${TEMPROOT}" 2>/dev/null - rm -rf "${TEMPROOT}" || exit 1 -} - -[ -d "${TEMPROOT}" ] && delete_temproot - -echo "*** Creating the temporary root environment in ${TEMPROOT}" - -if mkdir -p "${TEMPROOT}"; then - echo " *** ${TEMPROOT} ready for use" -fi - -if [ ! -d "${TEMPROOT}" ]; then - echo '' - echo " *** FATAL ERROR: Cannot create ${TEMPROOT}" - echo '' - exit 1 -fi - -echo " *** Creating and populating directory structure in ${TEMPROOT}" -echo '' - -{ cd ${SOURCEDIR} || { echo "*** Cannot cd to ${SOURCEDIR}" ; exit 1;} - case "${DESTDIR}" in - '') ;; - *) - ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs - ;; - esac - ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && - ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && - ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && - ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || - { echo ''; - echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; - echo " the temproot environment"; - echo ''; - exit 1;} - -# We really don't want to have to deal with files like login.conf.db, pwd.db, -# or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. -# Prompt the user to do so below, as needed. -# -rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd - -# We only need to compare things like freebsd.cf once -find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null - -# Delete stuff we do not need to keep the mtree database small, -# and to make the actual comparison faster. -find ${TEMPROOT}/usr -type l -delete 2>/dev/null -find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null -find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null - -# Build the mtree database in a temporary location. -MTREENEW=`mktemp -t mergemaster.mtree` -mtree -nci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null - -if [ -s "${MTREENEW}" ]; then - echo "*** Saving mtree database for future upgrades" - test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE} - mv ${MTREENEW} ${DESTDIR}${MTREEFILE} -fi - -delete_temproot - -exit 0 From nobody Mon Jun 17 21:42:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W33JJ4Z7dz5LxcS; Mon, 17 Jun 2024 21:42: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 4W33JJ2NGmz4XGC; Mon, 17 Jun 2024 21:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718660544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpMUiY55knibtJR57kW/LADXg0o37n2kz4iMMBuj+/E=; b=LQe1TgttMuAzSjeb3U7o8QqB+w0RL17KmbXDlfFcEPGGnux5htKAhFJ0RTWl8iBQJc1A/m NM7z02zMC0oWVKaBwoqOPacu26Z9pm7+5XT+eJTA2lNUjMQNqaT7Txh65qXFaiEah2o8mg ne1QnwU+9CN4JLsGPmmLDPMGX/GZyH/OIIkCWdqlHK/YnyY8v7R3ohAQEByREvrjFQ0OJh b7wup59mC3VTVnYay/WKyW0rq1kylyS8F+dqdeosY8DkZnl92uWmlzW5tIFaiOSIA5XMb8 JzVozfK2Q+9ViWKViQdF6HeFlGB4Q05tyUDZaUL1+wWwy3gQt6EUk4cwVHaDjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718660544; a=rsa-sha256; cv=none; b=EM8QI5FpxKZLhSWZPgHm1vBeRHD2b80vxJs/GAR/CPTP5YIKwtWpK69tcr1NRoSCIu2hy3 CIDl5T+tZlSayHQJo1aPmhUJb8pLq//rv3jda1q9NbKr8P9g0JvGLhnDRAvLFLhHECWLPT zP3gL5ZCjm90sYvEeM/oO/rH0mP8kiZKrod1WtgyGbMdrWDF6jJuXLyAS4SXWo9z8PYtS0 e2JUIfPorSlIYCkL3vro4a2b7IjO194TZGSkPp5j8YNi1a5PDp6RiU5nP6l+TjIt3u2BZs yCgrtEBrMAhfL+8AB4AE47S0g5dHgIYjmNtQG+mMZBEqjhZNWRnf7u0nh/RuFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718660544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpMUiY55knibtJR57kW/LADXg0o37n2kz4iMMBuj+/E=; b=K0H9Zfc5Sh26ofjuqaV1I3yD+8TS3ZOKQ+f5IwwnTJylaixsoe86aUHyT6hdVgXrNp+FVu yPK5v4aXTL697C9iukPYrNMtYp5sZCmHopptIoWQN9wgC44kROgIa92SoitpTLZZYY8ZqX j1xG1HsnZQqcqnvZcBAglBDOVhmqIZ5BnD1r347Ue1/ZVwjV1dMrrw6lyQvIq2y4xPMkOy pIebxrE28rdjcLSJ85vynzEsHjO9lUvPkGoZ/FtBMGNNrTw9koHS/Ksz15wCCwIorKEbWU xwsz0/CTF5vFLZ0jGLtASiSwYY3K98rpIiQ7Ih8HWRfBEdB0F8Caf60LiAEH9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W33JJ1zctzY4n; Mon, 17 Jun 2024 21:42: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 45HLgOEb027566; Mon, 17 Jun 2024 21:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HLgOs8027563; Mon, 17 Jun 2024 21:42:24 GMT (envelope-from git) Date: Mon, 17 Jun 2024 21:42:24 GMT Message-Id: <202406172142.45HLgOs8027563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1389314d5353 - main - cxgbe: handle vlan PF restrictions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1389314d53531e06c7ec02406b0addf7d77e7db7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1389314d53531e06c7ec02406b0addf7d77e7db7 commit 1389314d53531e06c7ec02406b0addf7d77e7db7 Author: Kristof Provost AuthorDate: 2024-05-30 13:59:09 +0000 Commit: Kristof Provost CommitDate: 2024-06-17 21:42:08 +0000 cxgbe: handle vlan PF restrictions Co-Authored-by: Navdeep Parhar MFC after: 2 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D45428 --- sys/dev/cxgbe/common/t4_hw.c | 7 ++++--- sys/dev/cxgbe/t4_iov.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c index 3d22673d34c1..07940a44f66e 100644 --- a/sys/dev/cxgbe/common/t4_hw.c +++ b/sys/dev/cxgbe/common/t4_hw.c @@ -11377,7 +11377,7 @@ out: * @vlan: The vlanid to be set * */ -int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf, +int t4_set_vlan_acl(struct adapter *adap, unsigned int pf, unsigned int vf, u16 vlan) { struct fw_acl_vlan_cmd vlan_cmd; @@ -11389,9 +11389,10 @@ int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf, F_FW_CMD_REQUEST | F_FW_CMD_WRITE | F_FW_CMD_EXEC | - V_FW_ACL_VLAN_CMD_PFN(adap->pf) | + V_FW_ACL_VLAN_CMD_PFN(pf) | V_FW_ACL_VLAN_CMD_VFN(vf)); - vlan_cmd.en_to_len16 = cpu_to_be32(enable | FW_LEN16(vlan_cmd)); + vlan_cmd.en_to_len16 = cpu_to_be32(enable | FW_LEN16(vlan_cmd) | + V_FW_ACL_VLAN_CMD_PMASK(1 << pf)); /* Drop all packets that donot match vlan id */ vlan_cmd.dropnovlan_fm = (enable ? (F_FW_ACL_VLAN_CMD_DROPNOVLAN | diff --git a/sys/dev/cxgbe/t4_iov.c b/sys/dev/cxgbe/t4_iov.c index 7b5e0cb1af4e..eef41d6398df 100644 --- a/sys/dev/cxgbe/t4_iov.c +++ b/sys/dev/cxgbe/t4_iov.c @@ -29,8 +29,12 @@ #include #include #include +#include #include +#include #include +#include +#include #ifdef PCI_IOV #include @@ -257,6 +261,7 @@ t4iov_attach_child(device_t dev) pf_schema = pci_iov_schema_alloc_node(); vf_schema = pci_iov_schema_alloc_node(); pci_iov_schema_add_unicast_mac(vf_schema, "mac-addr", 0, NULL); + pci_iov_schema_add_vlan(vf_schema, "vlan", 0, 0); error = pci_iov_attach_name(dev, pf_schema, vf_schema, "%s", device_get_nameunit(pdev)); if (error) { @@ -336,14 +341,15 @@ t4iov_add_vf(device_t dev, uint16_t vfnum, const struct nvlist *config) size_t size; int rc; + sc = device_get_softc(dev); + MPASS(sc->sc_attached); + MPASS(sc->sc_main != NULL); + adap = device_get_softc(sc->sc_main); + if (nvlist_exists_binary(config, "mac-addr")) { mac = nvlist_get_binary(config, "mac-addr", &size); bcopy(mac, ma, ETHER_ADDR_LEN); - sc = device_get_softc(dev); - MPASS(sc->sc_attached); - MPASS(sc->sc_main != NULL); - adap = device_get_softc(sc->sc_main); if (begin_synchronized_op(adap, NULL, SLEEP_OK | INTR_OK, "t4vfma") != 0) return (ENXIO); @@ -358,6 +364,29 @@ t4iov_add_vf(device_t dev, uint16_t vfnum, const struct nvlist *config) } } + if (nvlist_exists_number(config, "vlan")) { + uint16_t vlan = nvlist_get_number(config, "vlan"); + + /* We can't restrict to VID 0 */ + if (vlan == DOT1Q_VID_NULL) + return (ENOTSUP); + + if (vlan == VF_VLAN_TRUNK) + vlan = DOT1Q_VID_NULL; + + if (begin_synchronized_op(adap, NULL, SLEEP_OK | INTR_OK, + "t4vfvl") != 0) + return (ENXIO); + rc = t4_set_vlan_acl(adap, sc->pf, vfnum + 1, vlan); + end_synchronized_op(adap, 0); + if (rc != 0) { + device_printf(dev, + "Failed to set VF%d VLAN to %d, rc = %d\n", + vfnum, vlan, rc); + return (rc); + } + } + return (0); } #endif From nobody Tue Jun 18 00:21:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W36qf3NhFz5MDTn; Tue, 18 Jun 2024 00:21: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 4W36qf2l8gz4kyQ; Tue, 18 Jun 2024 00:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718670078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpyamKc0y7LCyio2eTBavXy5qX1sGjjJwdF+wzikKKk=; b=kj7PZuJDn+iv9ATycRR9z14HhIn8ZaNDyvZWcyQAUjEpiSqR5T6YVgcsKzcAEXyIE7fW4b Jk+R/jvd2DTT9pXsIdENqcEMvGxQpNES8DU1rMpRIFOIqw5qySf1BWKdgN/3jnJXU6vCEW USu3hIUBkOEvVCLN+05LcbNncX6DlrkLNhTg0IaBt/m5OxPl0x+vckUvWkkNkrc55FS4yd RDhhb5wkg7aOuniwesl64rms3dHH9AFPd5oSTmOxalDMmL/pFW758Zn8W9wTNywADUbZU/ wCa9tRodtkQs04iROjlGpHyQSO1JmX4hPixVKXRyxzhvcUMOthrbLvMvdxVOWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718670078; a=rsa-sha256; cv=none; b=SZ7pl/tZRUoNLk06FNYW5KiZZahBRd67PYHNsT8nBOWaXhEGNqdekjIjjzUUSaCZuO4Wn4 YkHD6e38d3CgQYfIXES5NfSABUf+jxgqrHR1BZn4/FSDiMNu0lPgMRERFjBi++vC2MLqku 1J+73Jp27xcyYkNbN5rszp7lF4qW5gcqX03u+rlpCWLjRKCncqS2VMIjC4WC65oTshKtfn JfazKJCSmzrHO7ZeJUt6q4m1bA8fVoKvYqDfn36kyvjGxxHiO20/65YuTYh/8Yg3zX51nQ GN+8qwa2x46wSeR+6HmSvjfcAF+LOIHGJQynJlmeFsXCKzK5ZTsdrf7YHksQvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718670078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpyamKc0y7LCyio2eTBavXy5qX1sGjjJwdF+wzikKKk=; b=VQ44DARF7/DLcJb5QlUzCOJJRbKIw36fUqbUntX2yngzFL/uC6xvrpiZdYHa1zRJPBtAzx E0T6nZiEyaNknNDlm23LU5ETte30Q86Lb6kHiUNXwaXKCNcxlya5wWCPjV+dNO14CYPijd 6y0vRDYHnRC1QdaaAWjx7Ut2bzTRSewVNM+EWKhgPaE/BFytgMWl79BwyxK+iHnrkenTxD oSAi4cEK9Q/4B57cgjM2iQT0BOQx/TXfAshr873JeTHH0/TAMVmnvhp9KEvTagPA9rFPWZ Xu8fhMuFctsjagUOM4w1okM2S42LJk2MYRmKSUxC006yzufWKMfjG/i2KXQYfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W36qf2M3jzcnw; Tue, 18 Jun 2024 00:21: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 45I0LILu093327; Tue, 18 Jun 2024 00:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45I0LIA0093325; Tue, 18 Jun 2024 00:21:18 GMT (envelope-from git) Date: Tue, 18 Jun 2024 00:21:18 GMT Message-Id: <202406180021.45I0LIA0093325@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: e2ad879d4c60 - main - ifconfig: make interface address without mask an error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2ad879d4c60fb22e768da5caec92920bc5f626b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e2ad879d4c60fb22e768da5caec92920bc5f626b commit e2ad879d4c60fb22e768da5caec92920bc5f626b Author: Ed Maste AuthorDate: 2024-06-13 17:37:32 +0000 Commit: Ed Maste CommitDate: 2024-06-18 00:21:06 +0000 ifconfig: make interface address without mask an error In commit d8237b955528, as part of the deprecation of IPv4 address classes, Mike Karels introduced a warning in ifconfig for setting an address without a width or mask. The commit message says "This will hopefully be an error in the future." As the warning has been included in releases from FreeBSD 13.1 on, and sufficient time has passed, turn this into an error. Reviewed by: allanjude, olce, grembo, philip, gordon Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45585 --- UPDATING | 5 +++++ sbin/ifconfig/af_inet.c | 32 ++++---------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/UPDATING b/UPDATING index 98d8b58dcd20..2b6f9cb0d956 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20240617: + ifconfig now treats IPv4 addresses without a width or mask as an error. + Specify the desired mask or width along with the IP address on the + ifconfig command line and in rc.conf. + 20240428: OpenBSM auditing runtime (auditd, etc.) has been moved into the new package FreeBSD-audit. If you use OpenBSM auditing and pkgbase, you diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index e21956cfc4fd..4fd74d481b3a 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -436,36 +436,13 @@ in_exec_nl(if_ctx *ctx, unsigned long action, void *data) return (e.error); } - -static void -in_setdefaultmask_nl(void) -{ - struct in_px *px = sintab_nl[ADDR]; - - in_addr_t i = ntohl(px->addr.s_addr); - - /* - * If netmask isn't supplied, use historical default. - * This is deprecated for interfaces other than loopback - * or point-to-point; warn in other cases. In the future - * we should return an error rather than warning. - */ - if (IN_CLASSA(i)) - px->plen = 32 - IN_CLASSA_NSHIFT; - else if (IN_CLASSB(i)) - px->plen = 32 - IN_CLASSB_NSHIFT; - else - px->plen = 32 - IN_CLASSC_NSHIFT; - px->maskset = true; -} #endif static void -warn_nomask(int ifflags) +err_nomask(int ifflags) { if ((ifflags & (IFF_POINTOPOINT | IFF_LOOPBACK)) == 0) { - warnx("WARNING: setting interface address without mask " - "is deprecated,\ndefault mask may not be correct."); + errx(1, "ERROR: setting interface address without mask is no longer supported."); } } @@ -474,12 +451,11 @@ in_postproc(if_ctx *ctx __unused, int newaddr, int ifflags) { #ifdef WITHOUT_NETLINK if (sintab[ADDR]->sin_len != 0 && sintab[MASK]->sin_len == 0 && newaddr) { - warn_nomask(ifflags); + err_nomask(ifflags); } #else if (sintab_nl[ADDR]->addrset && !sintab_nl[ADDR]->maskset && newaddr) { - warn_nomask(ifflags); - in_setdefaultmask_nl(); + err_nomask(ifflags); } #endif } From nobody Tue Jun 18 06:09:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3GY06rVVz5NNrM; Tue, 18 Jun 2024 06:09: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 4W3GY06J4dz4fY6; Tue, 18 Jun 2024 06:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718690948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v1uUHwn+00McEVMvJVejIe7c34Fm11eexhOvYDcNIbE=; b=OfM0FOZgtXx4v94NrM8DH1no9iXKxbtv1iQCn6hwf8Mx11xVxmwmn+qDZPL7xa4vcI1MeX yd2og9aB8RYZZJtsZfvPPYOtXZ5Z9Gka6y73WGwNzILMLiq97JcbyWCbIUmiirAwv/Qil8 lzsrKYQ8s+ZDZyDCF7RuEt4nUL0Tdk1BVvK+jQdny3JShbhi/Y7Mjsrn5aD2C3NJjvWEWb AY65AxyibhvcHBmvQG4/2OKXkfoByceo8f0ltb1HoCuUTU790fCS3NFMibJ3StQ8PFa9VF jY+gUwlpnqeM+835HzoAoOTU0S6CwhCDO49XyJxECHz5JFrGawcB0JGAuNKdXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718690948; a=rsa-sha256; cv=none; b=ZZuxvh3AKUh0oQ2M/aCmF9s57FJeIsKaL8ay0Hsh2Bnk5JyjptleOuo/TY4bUuUyGb1hiT aIsb12DtY33lByK2HqyTxHluyNahPEQQBcSPWiAxQSj64ZNPuNiHOaJaGGFROfp/vGFAy0 sN3rWVRAHMLr3tH4OjzExsgKLcTJnqJOER8D1bU0jkp4mHcNRss+pE8hWZ9vWI5X4PDt2g iANOrwQxoVHk3TtoKmpaSHRfC8zBhrK1v+sgBlRn2LS/rOA5TyQrOTGM2uwpxX3nZhaB2U WhhTOBUo8opGlzXYJCLzYJq8Yh8N/CpIWznPwC5CB1ZmkxkC5WBSlXXmHXNAtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718690948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v1uUHwn+00McEVMvJVejIe7c34Fm11eexhOvYDcNIbE=; b=awpAwsyPigJdWsTYJ9oJklT9CNZZQeCK0txsMlwo+o4jKBIc4MzSEzu/KU2pcdkkk3w71J UDSirNUp8/UdZwc97FEMsNXnuFwF1+oTLlUlQJ7kYOmeQnDv4mE5ul5ANW1jKdkVf4HXDS cqcpoD1AuOVwWKDnYhDagCotN8mBgf62BWCSW4K4yENCx7+lH+QbX7x40RMSNxALG3L3A8 jePp6J5LPVHL7IuAcDarlPj1utAMzLERyFSHEFN45Hwni85+FfLdwL33vfKl9hQj2SrTPt BYsQhevZ2TU5Aesy+PpUgzgjDVAwdXVOfxkcG0AiMGydTS/5HIwEbif0Ftc9aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3GY05nbSznKm; Tue, 18 Jun 2024 06:09: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 45I6983E089951; Tue, 18 Jun 2024 06:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45I698Wr089948; Tue, 18 Jun 2024 06:09:08 GMT (envelope-from git) Date: Tue, 18 Jun 2024 06:09:08 GMT Message-Id: <202406180609.45I698Wr089948@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: b81cbb12410b - main - gve: Make gve_free_qpls idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b81cbb12410b000074483899e61e9e767ba3ec1d Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=b81cbb12410b000074483899e61e9e767ba3ec1d commit b81cbb12410b000074483899e61e9e767ba3ec1d Author: Shailend Chand AuthorDate: 2024-06-05 05:31:46 +0000 Commit: Xin LI CommitDate: 2024-06-18 06:08:31 +0000 gve: Make gve_free_qpls idempotent This fixes a panic caused by double free. PR: kern/279410 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45489 --- sys/dev/gve/gve_qpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c index 3c6d9af6feee..9a946a2a2f2d 100644 --- a/sys/dev/gve/gve_qpl.c +++ b/sys/dev/gve/gve_qpl.c @@ -182,6 +182,7 @@ gve_free_qpls(struct gve_priv *priv) for (i = 0; i < num_qpls; i++) gve_free_qpl(priv, i); free(priv->qpls, M_GVE_QPL); + priv->qpls = NULL; } } From nobody Tue Jun 18 09:14:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3Lfr01rBz5NQcX; Tue, 18 Jun 2024 09:14: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 4W3Lfq6dxRz4tX4; Tue, 18 Jun 2024 09:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718702067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4aqLwPwxtNgViB0xcO5NNhefK+wUzywxef9wC3UGRY=; b=K7UFFzuNNpzTwakGSI5QuPOelCnT0syur2GKs4ANgifclll+YTHNBlW5SRcnT7YJz8ONyQ wwmJpKlugpBlC1zKLbop0dbCTMpVjBKf7dNlCDRIC3Y4YHEa472YvRSJJKyBHF9/aqz0q7 RZ/hA2lRRy8gFhH2x5Cl171yMZj20q5mXrm9DYda4AI1Q9kJnPnFVPz/Acxy6dY8gw1xbV Tq3686NjiA2zuPCDB8YmEyKlRav+Q09z62TZc4uKbNeJTZnO2MexEvgq2oYjiaPOIrgORy YG9mAXaBLAW+6vQU3tz5eUNWc5OTJZwzBmRYCfp5HHvyLTWyXRToO+c6/nFEBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718702067; a=rsa-sha256; cv=none; b=Q5BhjOvejltZVSpHRROBqZv7oER2jmgZad8IKPhjG8f6mFqcCLWFY2lCI1/P7M1K1YQ+gD 6cR66lBluF6WrfM+112Ss8pjtPPG0zV+EhJn3MbCIDaqemwvaZJ3Ouf4P9wIkhtf7Z3lak 3jZJ1230FEEN0XF5hDUYjv0abvIW2ZSDw8Nl01muMEXwOweZMlCsF4Ze3hOYZvKj31iYK/ orRJr8MWGdOG+rHq+2Wb41EixD1Y1f6yK/SmMFby5wFetsJ5Pg9tfC7GSNGdkEw9sbK8ZX y/IKZ6NttObXXgWVx0g3yA1ni0tQlaOfCTEoK6lAqQybStQk5BFWefMmbM/oyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718702067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4aqLwPwxtNgViB0xcO5NNhefK+wUzywxef9wC3UGRY=; b=qdw4sfAXU/qGSX2S0/zRRaJ5ijhVZ8j1hvRhu0zjaTD8kJXJZ1p8LGKaCsb6K4gLnB2Z5g shAi5VttSViQg7/csR/dINuGal8UQougMiPV8VSOHaq1n9iTsT9NCTYqJLEZHXlQxDPjLi 6VwMEEQqjli935RUsgw+I4mlIvUCZY+iiJBL+OFeNtNLMFGvraLYlZ9EXwKn0LvAThkHdQ XRy+itp12W5sEC+uC4r4WfE1cw9oluKAXLxCjxmDsNNwuAOxu4FO/SWa74/N7/obH4hfQW 8Vmv/UxkpqnZzynhSlpR2CV+l3Bw/u9N3THrDjhqrw5T6Kcbm+tYxxzbyDCBDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3Lfq6FSJzsXw; Tue, 18 Jun 2024 09:14: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 45I9ERfv008605; Tue, 18 Jun 2024 09:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45I9ERjt008602; Tue, 18 Jun 2024 09:14:27 GMT (envelope-from git) Date: Tue, 18 Jun 2024 09:14:27 GMT Message-Id: <202406180914.45I9ERjt008602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: af1b0aa5b957 - main - rc.subr: improve description for ${name}_offcmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af1b0aa5b957bbfedc929167aa3459ad2d8b6653 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=af1b0aa5b957bbfedc929167aa3459ad2d8b6653 commit af1b0aa5b957bbfedc929167aa3459ad2d8b6653 Author: Eugene Grosbein AuthorDate: 2024-06-18 09:11:56 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-18 09:13:51 +0000 rc.subr: improve description for ${name}_offcmd Clarify that ${name}_offcmd is for method start. MFC after: 3 days --- libexec/rc/rc.subr | 3 ++- share/man/man8/rc.subr.8 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index e540d8f7d207..f1f6cf6c8c2a 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -982,7 +982,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # -# ${name}_offcmd n If set, run if a service is not enabled. +# ${name}_offcmd n If set, run during start +# if a service is not enabled. # # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 4e3fa6771bf4..d2c9ce7af5d8 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 2, 2024 +.Dd June 18, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -774,7 +774,7 @@ Login class to use with Defaults to .Dq Li daemon . .It Va ${name}_offcmd -Shell commands to run if a service is not enabled. +Shell commands to run during start if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command From nobody Tue Jun 18 13:19:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3S5Z6tFVz5NnZR; Tue, 18 Jun 2024 13:19: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 4W3S5Z681mz4KHM; Tue, 18 Jun 2024 13:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BuxUvVVekTFSIio+DwXh6k5ihEO2hDyqsvsrV+LJGPo=; b=mxgd9iKJOlGfotFwFDw29POlU/K7Q5h01IsiyCU9UEaBjVyy3Y5y3clkwjnYb/Wpc71eF6 iR9a7YN8vDlXz22FuSyxFwDqJic1SYYmqRsCpE61zrzeUafpaPXVrur3QYmN2pXtLb7n9e Ab5DEY0Irb21c2t3KxfNGwfAxSVC3P6kHjhcTu0ysqoc1Km+f7uqM/yKOIeVUw8pESqtfq 0zZlvgCIFIDtiTULhUWaS8vwdmciMsOYUfv3GRr9aeu+cVcvbuHgJJmiTqSJHc961eKnWg X6PLrYZzX3n9+4nbSGqgGuelO6K3ypiTDXhcJ1nIxTyd4a82qEt6VieZKs9RSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718716770; a=rsa-sha256; cv=none; b=aZUGPzrMQYLXDz2T/xr2TFzFBJd7zg6OwaoXTK+QMiBn0H/iZKU0Zu3JMy0upcqFIhnQnN NDKAfhO6Uo5h3apNYeTmlY2lxsF8Ykn08Wx3NiXKXEe2M+Shi5w4DZXSjYdtI/umDJVmuf OID98CE0wO3GjHIoSu4SAfK6UC6M3rIIAOUEeFJiK2qNe7ZfE8MLLXrhzMmY8qBai+nbL3 6f83g+SlBWET1xpcABOiQaCSh9bg1E4iue2tZJJGQWWrKG1Dg9FG1AdVlhPo1KfJKRUTGV KD1Q6qWYdFIpaAFXMMR1mNsoFzVVowTjN2rIzjC+aooHaFbiINtqpVvAFtJyvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BuxUvVVekTFSIio+DwXh6k5ihEO2hDyqsvsrV+LJGPo=; b=Q0ExCkuhJrEv0IZi+lydlfauElz1/HbT6VbrIbvAdfbUMRpAKx17q9khxNuknoPLhlNSNg Nmxy0pHB1mbJdHCCb5XT3yug1lSP3rwcLu4gdb8tXeKPJoasBqBkw+s8XHO/SaeOPre6Fu oXdW7GlduKX2jZonWR7TYG6hBnplxdJw1hY4yFMCAnvh3jBDDrF2id70AEOGN0h26HWwN+ c2emr6z5vXUCIDwiqx7gef0QRphb9OWliJ+LFfOiDES7epELBwBKpq5EKVw4Bp8GlvPBoF 65fWHHmSuVG/Y06+ew/GX/IRbmWpWTod8RMWY83w5FDCZazR1FqWnMdaRe9JKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3S5Z5gvXz10d5; Tue, 18 Jun 2024 13:19: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 45IDJUHJ016007; Tue, 18 Jun 2024 13:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IDJUVT016004; Tue, 18 Jun 2024 13:19:30 GMT (envelope-from git) Date: Tue, 18 Jun 2024 13:19:30 GMT Message-Id: <202406181319.45IDJUVT016004@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: 8e36d212594b - main - sound: Support oss_audioinfo->cmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e36d212594b542cb0c57d549e0b57fd0f7e307c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8e36d212594b542cb0c57d549e0b57fd0f7e307c commit 8e36d212594b542cb0c57d549e0b57fd0f7e307c Author: Christos Margiolis AuthorDate: 2024-06-18 13:18:58 +0000 Commit: Christos Margiolis CommitDate: 2024-06-18 13:18:58 +0000 sound: Support oss_audioinfo->cmd Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45603 --- sys/dev/sound/pcm/dsp.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c737df33b97d..0f6d7e6b7f49 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2047,6 +2047,7 @@ dsp_oss_audioinfo_unavail(oss_audioinfo *ai, int unit) ai->dev = unit; snprintf(ai->name, sizeof(ai->name), "pcm%d (unavailable)", unit); ai->pid = -1; + strlcpy(ai->cmd, CHN_COMM_UNUSED, sizeof(ai->cmd)); ai->card_number = unit; ai->port_number = unit; ai->mixer_dev = -1; @@ -2132,6 +2133,7 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex) ai->dev = unit; strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name)); ai->pid = -1; + strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd)); ai->card_number = -1; ai->port_number = -1; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; @@ -2317,14 +2319,8 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) else ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; - /** - * @note - * @c cmd - OSSv4 docs: "Only supported under Linux at - * this moment." Cop-out, I know, but I'll save - * running around in the process table for later. - * Is there a risk of leaking information? - */ ai->pid = ch->pid; + strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd)); /* * These flags stolen from SNDCTL_DSP_GETCAPS handler. From nobody Tue Jun 18 13:19:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3S5c0dKjz5NnZW; Tue, 18 Jun 2024 13:19: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 4W3S5c022Gz4KX8; Tue, 18 Jun 2024 13:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GH3kPshKVxTrne2ksshSguxkGctAy/ugWJOc7IP0ZU=; b=g4IUx2IcYfRpSQpVLajTzmvtY818CrkeYce2qkZYXp0mO2l+QKsB0oh08EEViJ+0GOP1xP ARaDLibTwwcOZ1evT+1IWUcd66boteXXdcoAse4clEi/syKaJkm4bpiNPW4CWm8EZEQQaU WJEDbZyirf8o3am3I9VgZKB//YksWO1LCE8mlFiSU16SAREuh1AE3yfz/Klq+q5UMVQgnG BOd5Bwdn8VmOtl1HJgvJVNZz10jnxKqzWP5LAn+wELVOMr1TTm8jhAYlMeIrYy2QJFlWDJ MHDEonnCshvy3lwGzy4nRxofI1eCSjipeA2KuPqG24RpDFniAYw1SlokY4nWZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718716772; a=rsa-sha256; cv=none; b=qnTNotaoacgWd9X1B08OaqyYgzeXOFgV7vHl6mEJ0hg96NaPNZQ7C0OdnnajAPdiM0Mozi lJ9ZCa4tCAXz6Zz+N8zNgy24NeYqJ1pn2PzcIQNq1bUH/V11FkaDgFqC943e/nYSogUFKn xdmEARr/PiTRRBEjyGmm7vDxyyrsx5BBS4fYFd0qth5dbINWYbRx7PAOv0lehj/uS0dyO7 yXWvKpMefCVuzDDf42YTimGn/2ONMHwb9MT1ypkhuYKFBHMNGKIEz1FhgCV0mVWoT9eEXP 2bIDYfIRcb+eBPgFeJWQJuh+AB/rIyh0/fvks/Ex1ouPWylcm9DNQ5hJfR+ItA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GH3kPshKVxTrne2ksshSguxkGctAy/ugWJOc7IP0ZU=; b=ULkWwra/ASkl0ZpaPKP4VOhldPCtOZKnG3i5K5OxOl75+ZfgA5dcl6/qjRrn2R83UPN8SJ GDIql3hkhAe/1UOMI3RP6viQAYnTXEYEg9/d9ld87txnoszSff+28Mux7Zv9blvuSXiRrU jkEZihkcLMyj7F8Z5ERQ2lvvyr4mGUHGJVjjX9MI95sHLiTUv6cldK/gL2LO5UrXZZr1vt Vii2WZerj2fda0EWnBwvc9A1IlAfv5qfYc+9AfMVF0yTZFvDE1eE9i6j2zUgSLzRc/A2yN 5HpI+zfV9qa9Rv0TIax0aUJJhramdd233KonFEaq55NhU0kIUH29wUtfkEXX2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3S5b6jggz10b6; Tue, 18 Jun 2024 13:19: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 45IDJVde016059; Tue, 18 Jun 2024 13:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IDJVpR016056; Tue, 18 Jun 2024 13:19:31 GMT (envelope-from git) Date: Tue, 18 Jun 2024 13:19:31 GMT Message-Id: <202406181319.45IDJVpR016056@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: 0f878cdfc5a4 - main - sound: Fix oss_audioinfo's card_number, port_number and legacy_device List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f878cdfc5a46cc0dc198e12758f12558dfb1bf6 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0f878cdfc5a46cc0dc198e12758f12558dfb1bf6 commit 0f878cdfc5a46cc0dc198e12758f12558dfb1bf6 Author: Christos Margiolis AuthorDate: 2024-06-18 13:19:07 +0000 Commit: Christos Margiolis CommitDate: 2024-06-18 13:19:07 +0000 sound: Fix oss_audioinfo's card_number, port_number and legacy_device Although the docs advise against using them, it doesn't hurt to fill them out correctly. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45604 --- sys/dev/sound/pcm/dsp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 0f6d7e6b7f49..f94e5c05a743 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2134,8 +2134,8 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex) strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name)); ai->pid = -1; strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd)); - ai->card_number = -1; - ai->port_number = -1; + ai->card_number = unit; + ai->port_number = unit; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; ai->legacy_device = unit; snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); @@ -2371,20 +2371,20 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) * should normally not use this field for any * purpose." */ - ai->card_number = -1; + ai->card_number = unit; /** * @todo @c song_name - depends first on * SNDCTL_[GS]ETSONG @todo @c label - depends * on SNDCTL_[GS]ETLABEL * @todo @c port_number - routing information? */ - ai->port_number = -1; + ai->port_number = unit; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note * @c legacy_device - OSSv4 docs: "Obsolete." */ - ai->legacy_device = -1; + ai->legacy_device = unit; snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** From nobody Tue Jun 18 13:19:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3S5f10Ytz5Nnfp; Tue, 18 Jun 2024 13:19: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 4W3S5d29d6z4KV2; Tue, 18 Jun 2024 13:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/qPOYSoGmGA449bVAEnZqxEx8Xno7U+Bh9KSOGnwpyo=; b=SRCJjKWcYoV5p4QGZg8q6daMZaAEvn4Sc4pgReMzCx/dSrHMO3NGvIZgF82kkOhDOXBLB8 J2n5RU73CbgSGaliwxth3GyTbEQNqALtosr4dHbzc7jRqvsb2wbcubnCfs1GYbtAP2LlKb G7O9P+luwTwgaU87NonTd5LXotL+zmY0t5KmjAb1dtTWBVRmHOKy4xq08MgZvd5WW0uCSR d5Nolwkg0hFgsdmL4jeBPrmUxTm1RciAkC52IZN2WRu6o6dsJ8NikFLQxwlRJj5M/fgcAE f6wg6Lj2RT51Mzn/2IsIsKwtchXEYY+QrODNiKnD/9mRPGlaXv4+kN0yptFG/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718716773; a=rsa-sha256; cv=none; b=NyM8scOs1grqpxF5Q31H+EBXP2sv2aB6LF/W2vWFV3QLVUmXAYifwXlZz/hbO7dI4qkEU9 01kgYMJHB/IJ+dbk8ILpVb89M4PGEquGLK4R/jr7hz4XledcwGsKwQWjf6cW7HYWtL0k1g EUK0Uqqgce0Z2BWcBVq5qQ7MEBALqtw1nsKgjy64bFwDJCT5e9dWHsEpI2Tzpqhu5na/bA xag3LNO04DFm7jig0/VFzdoKier9p3TgP4vqbhECtZsnMSuptjhUiEE705yLP+EM+6PBKp kF5vBvdlke9XbtEdvWet1trazsihncIK1J0K7uBLXs8UHWgKyEIhnLp3I6gosw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/qPOYSoGmGA449bVAEnZqxEx8Xno7U+Bh9KSOGnwpyo=; b=VJOh8f9nGu1UKpE8kJkntueH+HfS61UiB7gSEpi1SVMpkgSJT7BJNSlYlZ1MmOluC9dTRq QAKKYx2rGXuLBOKvogzB6Gay7wg00DifQGeDaGAcBreFZld7NcJij2a9d2EfAJoe19sl9S NWSy1x7zeLCBTUmRXMwdeqfsxtJkleGSypX2ph/ou4mq8C7a+3GU2OHVeJ+OOlq/1TTKqJ HW8yGvZwEy6QAHqyverPtWaLAI8GQPaA7ll+touTBVfarznd6tDQCkkm45SbHddUFf6Nnb sRBXjjjjz+7noFRCAvyUhXQwYFkIA7y1AYR+5Nr7C85WcjJ/8pci1W1MwwJxaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3S5d0bPQz10d6; Tue, 18 Jun 2024 13:19: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 45IDJWN3016106; Tue, 18 Jun 2024 13:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IDJWHQ016103; Tue, 18 Jun 2024 13:19:32 GMT (envelope-from git) Date: Tue, 18 Jun 2024 13:19:32 GMT Message-Id: <202406181319.45IDJWHQ016103@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: 914c2b3314e8 - main - sound: Remove outdated comment in dsp_oss_engineinfo() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 914c2b3314e8f6e31833e33cfdcc4843f88fe31b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=914c2b3314e8f6e31833e33cfdcc4843f88fe31b commit 914c2b3314e8f6e31833e33cfdcc4843f88fe31b Author: Christos Margiolis AuthorDate: 2024-06-18 13:19:16 +0000 Commit: Christos Margiolis CommitDate: 2024-06-18 13:19:16 +0000 sound: Remove outdated comment in dsp_oss_engineinfo() Since we e07f9178502b ("sound: Separate implementations for SNDCTL_AUDIOINFO[_EX] and SNDCTL_ENGINEINFO") support more than mono/stereo. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch, markj, emaste Differential Revision: https://reviews.freebsd.org/D45605 --- sys/dev/sound/pcm/dsp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f94e5c05a743..0eb41faaae45 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2337,13 +2337,7 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) /* * Collect formats supported @b natively by the - * device. Also determine min/max channels. (I.e., - * mono, stereo, or both?) - * - * If any channel is stereo, maxch = 2; - * if all channels are stereo, minch = 2, too; - * if any channel is mono, minch = 1; - * and if all channels are mono, maxch = 1. + * device. Also determine min/max channels. */ minch = INT_MAX; maxch = 0; From nobody Tue Jun 18 14:20:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3TST5MJVz5Nt2M; Tue, 18 Jun 2024 14:20: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 4W3TST4sXpz4RrB; Tue, 18 Jun 2024 14:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718720457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9JO1LM9PvzEtb8/WXvlOJaI8jqd6lbhgkH11xX5+MY=; b=LWG9OuqeZvAjafLoPs9OpNfmdz+IYM8tr17jt97C1fhUSOVvHmF5hzorE9msTsxeJQrAAe VUhg+iMWqLsLxchCihNVELFDZP/KrwTVXkGwhuS8YL3x4rakRHcV3bnd52mzo1xBO00OJf 8R4YBuRy9jXDu9MVetvcw6LSO/RddOuMfH6PAyZRbDIoIGIPjCVBlaAD26/D/S2VBAm+I9 xNvQu0JxL6bc4N4Rklf0u5x+xmZRhfM1ERxeUyeVdcYwTV+GeglMB/GQy6QpBe07rsOBTL Sb77X5xJhAhlqi4fP4GGImBE3X5ec5klWhTO0S3rxP8b+GGN0rseOB63PYqVNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718720457; a=rsa-sha256; cv=none; b=SQiK6NGisIyBmgzpVeUf1DLo9OcUaiySiDWYA0zAYlR44v9g3d0mYoRE706i7KiemT+BFI nu0VOtmTRZ6l9OdIWeWRKuZwfBGRJkbjcA3ZrQW9c0ql1EOgOafJxti/3k6UsqcmcljCDc lEcqYEpk7hxzmjli5HzCyMAmp4WsVUOR8KQ9OjAuST1olIkWmezNRCkw6wLiTYORlKCKto w65ZC9ZLecv7lnO06i2O8zO6onvlMR3+9R9WHmZscxtIeJYKyKZ2wZNadEUqTbnybHwnOE pGtJ6KvIwcVLITgZFmYe4dJW29P0WC2BPpa/0aBRJrzlKMw0QNwvCFUbZL4rkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718720457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9JO1LM9PvzEtb8/WXvlOJaI8jqd6lbhgkH11xX5+MY=; b=OGYmkv5j9speJ3CnL0gz8tw2mYamiXU11wWSs11VR4CosF12dA1EpTdRn+Y2TrfawlS/SI PqzR6wM0Y67Qw8IPG2kRL0kxkBr7YrHi8GHcaKS37vO3m3M/T9PrOTXfyLdO759F5OyOKa vkA8z8x1KoyinNviIJEZbchYiwWnVLu6BAKJczMr8c5c+rIQWAMd+Xhv+tk6UVp1TVaUuN 4L/UjEhgz/gIdNVzt+CDCxV2P5pJ/1AjtjFrig1VYlCbKZn23/UWAK/3usSEiMXuz2aM4Y MqybzpfYuRAV4CMHQpsNVqTr4PjkKOtWy7QhYmkfFQoDfGsmyg0KRjQLmcJ4ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3TST4SyPz1222; Tue, 18 Jun 2024 14:20: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 45IEKvSn027164; Tue, 18 Jun 2024 14:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IEKvlx027161; Tue, 18 Jun 2024 14:20:57 GMT (envelope-from git) Date: Tue, 18 Jun 2024 14:20:57 GMT Message-Id: <202406181420.45IEKvlx027161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6e1a7ade2169 - stable/13 - mergemaster: postpone removal to FreeBSD 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e1a7ade216905cb8befde9eeb6af8e0527156ab Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6e1a7ade216905cb8befde9eeb6af8e0527156ab commit 6e1a7ade216905cb8befde9eeb6af8e0527156ab Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste CommitDate: 2024-06-18 14:20:41 +0000 mergemaster: postpone removal to FreeBSD 15 Mergemaster has been deprecated for quite some time, but was not removed prior to FreeBSD 14.0. Update the deprecation notice in the man page to reflect this. PR: 274967 Reported by: naddy Sponsored by: The FreeBSD Foundation (cherry picked from commit 73cce7d8886bc59284c757decb49deba046e73fc) (cherry picked from commit c0e5d8f9bda7907c83901d25d1d123a5b180443f) --- usr.sbin/mergemaster/mergemaster.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 695f1bba3474..20d746de347c 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 2, 2023 +.Dd April 16, 2024 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -45,7 +45,7 @@ The .Nm utility is deprecated and may not be available in -.Fx 14.0 +.Fx 15.0 or later. Users are advised to use .Xr etcupdate 8 From nobody Tue Jun 18 14:47:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3V2y5JRbz5NwRh; Tue, 18 Jun 2024 14:47: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 4W3V2y4qQSz4bHx; Tue, 18 Jun 2024 14:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7VuSJd5yyb9lKsQOmqv25dM4GWgOizYLKWktr2ikzk8=; b=PodQTrnRImgQZs0rRA2j0nnHH7owuYJuAthqlMOIl338sd09sYeCS6Hvy3ttDtBAN2Bv6q ZidirN+aZBC/ETHjji7NKF/x/C4Ired+bI739ZvYBRNsIZav4hMgJUNX9pczPDpGIPDYAE xhUJvmdoLETrTo/Mj+q3Rf2PLAaNXtL/0rgg/zhKdZeYp7P8/XLSefn9rQxIN3d7RMePiP hY7gLEywiiiwjUfADjOLubXA5HLDDIA4eC1m8/j6UzBT/giuyldMB8fxrnpmXFaHy08zng r35Xcz74EfVf+4qzLQnmJjydUXVPe/kpEBxGWihk3zQz+E1jBX9Vat6M7bjGGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722042; a=rsa-sha256; cv=none; b=tyVIK7kZAFzvOV9N/EHXo9pTG90VwLoAoZwfXKre7xyAM1Lqyb6zV5k8/nji7/34lAeJNO pDD7DNI7pwB71h/R57ask6SMQArEHyhK81mhSzrDfe3m2s+djN6lIXF9FH/Wk5LLFZfaje RRL4O0hft7cHITyIKpBaZ0jyr44b/yg5DQrx+2Is7XKm18yWrWQlQzrONUBhFPVFvxPih7 dvjLksLcNZqCZ++j3/EXEcZP8E7vstusV7f08dzhZtQ7ScjEzOx2A6OCpkBngo9nVGGQ+z cVTNjgaK0JrlB2x3TKNJVvli/8CrphEyLFRBEWjWNWK95VP1aXF6MnTWk3PwXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7VuSJd5yyb9lKsQOmqv25dM4GWgOizYLKWktr2ikzk8=; b=vme/8MQaI72EqGx/4mqGKbxHCCpDheDqpusFdFk0VzvFaVk+JEBE1uLu3FgDm1gzoFz3xt Jxya/+8ju5rMca4KT5/oLpmF3OL1kvfIGte3DR361WTlCUCSb9Amx/MlBXg0n3FgmkMpt0 Np6uVFcfcXwAL7zdbkImbe3n+jPEFzZDHzN5n2tZUnSTi4s3zTG+gVv30ey0+bu/0T7ayo Qc0+kDid6Fu5otU5uScL23q4kTTD3rc+NL2/dXj3XAFPxzoK1hPvlgbqa0grTK4MEBw72X ukGfKYp335FaLUlLCc2lUrz8JsiG7xVZEcd8HMV8hITm6Qz8L+RVY2cxSP1iBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3V2y4QDSz136Z; Tue, 18 Jun 2024 14:47: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 45IElMrW070643; Tue, 18 Jun 2024 14:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElM0x070640; Tue, 18 Jun 2024 14:47:22 GMT (envelope-from git) Date: Tue, 18 Jun 2024 14:47:22 GMT Message-Id: <202406181447.45IElM0x070640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: c71487dfba1f - stable/14 - pfctl: fix recursive printing of nat anchors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c71487dfba1f34bf06e3ae35890849bf0b454afc Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c71487dfba1f34bf06e3ae35890849bf0b454afc commit c71487dfba1f34bf06e3ae35890849bf0b454afc Author: Kristof Provost AuthorDate: 2024-05-28 14:26:28 +0000 Commit: Kristof Provost CommitDate: 2024-06-18 07:57:42 +0000 pfctl: fix recursive printing of nat anchors Similar to the preceding fix for rules, ensure that we recursively list wildcard anchors for nat rules. MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8ddd0359bca5c5fc38189000a80a3180854a8a2e) --- sbin/pfctl/pfctl.c | 103 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 31 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index d5541571a135..621d97d6c555 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -98,7 +98,7 @@ void pfctl_print_eth_rule_counters(struct pfctl_eth_rule *, int); void pfctl_print_rule_counters(struct pfctl_rule *, int); int pfctl_show_eth_rules(int, char *, int, enum pfctl_show, char *, int, int); int pfctl_show_rules(int, char *, int, enum pfctl_show, char *, int, int); -int pfctl_show_nat(int, char *, int, char *, int); +int pfctl_show_nat(int, char *, int, char *, int, int); int pfctl_show_src_nodes(int, int); int pfctl_show_states(int, const char *, int); int pfctl_show_status(int, int); @@ -1398,7 +1398,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } int -pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) +pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth, + int wildcard) { struct pfctl_rules_info ri; struct pfctl_rule rule; @@ -1406,14 +1407,65 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) u_int32_t nr; static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT }; int i, dotitle = opts & PF_OPT_SHOWALL; - int brace, ret; + int ret; int len = strlen(path); - char *p; + char *npath, *p; - if (path[0]) - snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); - else - snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + /* + * Truncate a trailing / and * on an anchorname before searching for + * the ruleset, this is syntactic sugar that doesn't actually make it + * to the kernel. + */ + if ((p = strrchr(anchorname, '/')) != NULL && + p[1] == '*' && p[2] == '\0') { + p[0] = '\0'; + } + + if (anchorname[0] == '/') { + if ((npath = calloc(1, MAXPATHLEN)) == NULL) + errx(1, "pfctl_rules: calloc"); + snprintf(npath, MAXPATHLEN, "%s", anchorname); + } else { + if (path[0]) + snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); + else + snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + npath = path; + } + + /* + * If this anchor was called with a wildcard path, go through + * the rulesets in the anchor rather than the rules. + */ + if (wildcard && (opts & PF_OPT_RECURSE)) { + struct pfioc_ruleset prs; + u_int32_t mnr, nr; + memset(&prs, 0, sizeof(prs)); + memcpy(prs.path, npath, sizeof(prs.path)); + if (ioctl(dev, DIOCGETRULESETS, &prs)) { + if (errno == EINVAL) + fprintf(stderr, "NAT anchor '%s' " + "not found.\n", anchorname); + else + err(1, "DIOCGETRULESETS"); + } + mnr = prs.nr; + + pfctl_print_rule_counters(&rule, opts); + for (nr = 0; nr < mnr; ++nr) { + prs.nr = nr; + if (ioctl(dev, DIOCGETRULESET, &prs)) + err(1, "DIOCGETRULESET"); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("nat-anchor \"%s\" all {\n", prs.name); + pfctl_show_nat(dev, npath, opts, + prs.name, depth + 1, 0); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("}\n"); + } + path[len] = '\0'; + return (0); + } for (i = 0; i < 3; i++) { ret = pfctl_get_rules_info(dev, &ri, nattype[i], path); @@ -1422,7 +1474,6 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) return (-1); } for (nr = 0; nr < ri.nr; ++nr) { - brace = 0; INDENT(depth, !(opts & PF_OPT_VERBOSE)); if (pfctl_get_rule(dev, nr, ri.ticket, path, @@ -1434,35 +1485,25 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) ri.ticket, nattype[i], path) != 0) return (-1); - if (anchor_call[0] && - ((((p = strrchr(anchor_call, '_')) != NULL) && - (p == anchor_call || - *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { - brace++; - if ((p = strrchr(anchor_call, '/')) != - NULL) - p++; - else - p = &anchor_call[0]; - } else - p = &anchor_call[0]; - if (dotitle) { pfctl_print_title("TRANSLATION RULES:"); dotitle = 0; } print_rule(&rule, anchor_call, opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC); - if (brace) + if (anchor_call[0] && + (((p = strrchr(anchor_call, '/')) ? + p[1] == '_' : anchor_call[0] == '_') || + opts & PF_OPT_RECURSE)) { printf(" {\n"); - else - printf("\n"); - pfctl_print_rule_counters(&rule, opts); - pfctl_clear_pool(&rule.rpool); - if (brace) { - pfctl_show_nat(dev, path, opts, p, depth + 1); + pfctl_print_rule_counters(&rule, opts); + pfctl_show_nat(dev, npath, opts, anchor_call, + depth + 1, rule.anchor_wildcard); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("}\n"); + } else { + printf("\n"); + pfctl_print_rule_counters(&rule, opts); } } } @@ -3058,7 +3099,7 @@ main(int argc, char *argv[]) break; case 'n': pfctl_load_fingerprints(dev, opts); - pfctl_show_nat(dev, path, opts, anchorname, 0); + pfctl_show_nat(dev, path, opts, anchorname, 0, 0); break; case 'q': pfctl_show_altq(dev, ifaceopt, opts, @@ -3093,7 +3134,7 @@ main(int argc, char *argv[]) pfctl_show_eth_rules(dev, path, opts, 0, anchorname, 0, 0); - pfctl_show_nat(dev, path, opts, anchorname, 0); + pfctl_show_nat(dev, path, opts, anchorname, 0, 0); pfctl_show_rules(dev, path, opts, 0, anchorname, 0, 0); pfctl_show_altq(dev, ifaceopt, opts, 0); pfctl_show_states(dev, ifaceopt, opts); From nobody Tue Jun 18 14:47:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3V2z74tnz5NwK0; Tue, 18 Jun 2024 14:47: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 4W3V2z5fKBz4bTW; Tue, 18 Jun 2024 14:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtIoXhPYaeNEKQKD0+YQy2oq+qa+Ebc80oUOnvpDTzs=; b=l+c/6gFIaU/Zts+m0AYS2zuLY7IOQ0TVw46gQh2kp6bpWt/CEqqalHRi86sXlVZghNpHEQ 6fq/xUMmtR8SrDbzxHRU2QYqJm0tXRo72p4ShhyciJTLXGJUa2iO3vGSTwq5AiMsb5rF2z 0YuVr2B0tmB+E9P2LuiAlsfKgxSBsjvVIefpMtxYAU+byeDs+G+trOiqaZ4U9HnAUEjLxf uayOVvgA+lbvmRbbj+iRw98Uy+L9Yx+f7LpUBBl4MylaWh8pSehVLFAB/KTBPs7KNzb6/l j4IS+T/MHrGJPlOLPgNrWzO4EAWOjh+xMz1pZFBaLxoVJKtWcGKjIZ107CfoGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722043; a=rsa-sha256; cv=none; b=lxQCahvKNgs9p+u1nd6BxZUFCTKXuv/uZbM3tlT1R1UZ1CLKNwMSplUAWbnEg93m7/C6Mj FX+TsQ5uyd8Ga3Q3sH2jtWEqr+qo/zLVxaUNIc8TdzDuShiNMGnOvCytLOsVVFnZDnyXFe uK/s8AW9nVSPc7x01yyS67eE2eAJtN1ba4kpC0MJ/71Rh+ryGe+tg64ucsBY7YHi3NKBEO GAtYxjjklhF/+yTP2aDpdxvhcJM5lcHcDntu9GvNhTojrXI9+p4bY5RTZ3l0YsHcrQ+m96 r7JueJc36BeOndu3LzQPWvgpIN6CgpFXsSRf3AdtmbdKR7TYFulgCbvJxK4XgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtIoXhPYaeNEKQKD0+YQy2oq+qa+Ebc80oUOnvpDTzs=; b=ZRVx21ghQDvgvutGrH7wLixWIVuc4gQ6+uiiEW0VWUjuyEj7Odh+dzmnp5FYuutnlFg0UV oWW8CPTOhBC7hrx6n/bY+XjsrNYmq8Y991NCq8xy3y79Te1qOCgt2A/bkCt+BQxHUSCP2V TJPTnOL3AH8pj7i2//Qw6zXScBMNmUoWiaza1yNHR9kAANRze31tzLLPoT2bL1w8ctpSij Ikg5fU44B5h85qErSgwDO94XzygR+i7fDDhnI/jf69TDpM/TSgl9uTBXW85ypN/3mk/hcA gHSODBb8w2VHnb53V7zFYNpXGgSscfs4SX3tPVt9uf07ilePWDs3zS4KKuCUAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3V2z5GNLz136b; Tue, 18 Jun 2024 14:47: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 45IElNxH070801; Tue, 18 Jun 2024 14:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElN5Y070798; Tue, 18 Jun 2024 14:47:23 GMT (envelope-from git) Date: Tue, 18 Jun 2024 14:47:23 GMT Message-Id: <202406181447.45IElN5Y070798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f93083028442 - stable/14 - pf tests: test longer anchor names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9308302844272aa1c470cbe73feb1d2a68785ac Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f9308302844272aa1c470cbe73feb1d2a68785ac commit f9308302844272aa1c470cbe73feb1d2a68785ac Author: Kristof Provost AuthorDate: 2024-05-24 12:50:53 +0000 Commit: Kristof Provost CommitDate: 2024-06-18 07:59:02 +0000 pf tests: test longer anchor names PR: 279225 MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8b28ec3861d5b3e9fd8a60dbfda13059a5301281) --- tests/sys/netpfil/pf/anchor.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index cf6da8740003..eba1ee935930 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -58,6 +58,37 @@ pr183198_cleanup() pft_cleanup } +atf_test_case "pr279225" "cleanup" +pr279225_head() +{ + atf_set descr "Test that we can retrieve longer anchor names, PR 279225" + atf_set require.user root +} + +pr279225_body() +{ + pft_init + + vnet_mkjail alcatraz + + pft_set_rules alcatraz \ + "nat-anchor \"appjail-nat/jail/*\" all" \ + "rdr-anchor \"appjail-rdr/*\" all" \ + "anchor \"appjail/jail/*\" all" + + atf_check -s exit:0 -o match:"nat-anchor \"appjail-nat/jail/\*\" all \{" \ + jexec alcatraz pfctl -sn -a "*" + atf_check -s exit:0 -o match:"rdr-anchor \"appjail-rdr/\*\" all \{" \ + jexec alcatraz pfctl -sn -a "*" + atf_check -s exit:0 -o match:"anchor \"appjail/jail/\*\" all \{" \ + jexec alcatraz pfctl -sr -a "*" +} + +pr279225_cleanup() +{ + pft_cleanup +} + atf_test_case "nested_anchor" "cleanup" nested_anchor_head() { @@ -133,6 +164,7 @@ wildcard_cleanup() atf_init_test_cases() { atf_add_test_case "pr183198" + atf_add_test_case "pr279225" atf_add_test_case "nested_anchor" atf_add_test_case "wildcard" } From nobody Tue Jun 18 14:47:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3V2z74Tbz5NwDr; Tue, 18 Jun 2024 14:47: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 4W3V2z4qg2z4bFN; Tue, 18 Jun 2024 14:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZWkmXGcZA8LgWh6v3xQ/mePmD88169PVWV0i/Hink8=; b=ZD6+PQqtw6B+eNZgCgH6SuzlxiZ8IJtEUTCl8L+BXzlUlDPA5stQ1MfX80PdMh5eIy5iT8 ALGXqCpcnBHZhj9NM1o1NjNFtOlhCwcox/my0bUDaBNKANqWeIrCv5MSG3x3RyolSC7kGl meKn4OQs/jlytyf7CZIdMbLKxW0cNcDHouIF5NxpP3mTFpl2FXM49FWryYHBjyjoNRl5Mq VGNjX6FUmOtDcYxlhJg9iPJAu2kZkJ2Tygl/chjuzGpWRcVqJS9NWj9OsxtIJqPTAFT6Ag qIF5vzl04DZgOSnRjO9FvulXHhgok0lrRKufg4A3f+I0X4DhspsHUa4rS1+iQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722043; a=rsa-sha256; cv=none; b=CM4lDa+qgRrLpW/sbkV5D13upTNYdljQBkeAq6a1cJWuaSR/DDAsHHv2S3lmTcFtPDrbC8 gsEXhVoWUtUBHE5u8xvIyN2SejMlqXlviVr6RH3v8GnT1UvWETu6QnhBg5S1JLc3wB/wsV xIh7YraYCbr5sQCO0oT1/v6+vghTkIqMjaDzO/leBqEI5ijATcZ2hu5oQwjSrXA7Ga08GU zhr6Uuyk1IwCq6742fHAf65JqruWtQl3riRL4KOg2osma22FWivAMkK2H1Th56fSYT6r1Y MSkbgxAWd+M06nH4dvOYJaYY2t5VtlvytJPDFe80JYzQx3Fn3E4wA3ylq8s+qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZWkmXGcZA8LgWh6v3xQ/mePmD88169PVWV0i/Hink8=; b=SiniFg6yml/1RH/wF2nbaqPliQfgI7gteWg82o8rINs/VRFfNFkLYK8i38xtVVL8JxcLSj THYDWxQpp3ikxA+nN843kFGxbN9CgrOsxXgA8uPHUI7a5uelkVvyXMkFlhBFUwAcgVH17j 4U2Re9laR0DYT5hu5TDwfujGogn++SlPqJPm4PC/ovEKIcjNXBieQxJrMBNuuxkXSkAW2R TMgRCVvyR1lo1wSUwFas0OlKZJdJgsA6CfEm3ZOrw3GTW+7JpCtBOfDbBf1BwwJfdvd/oD C1xJHW8X/YRZSQPh01OqE/wopUyV8/PwGHc/xpDDqDomZS1kJcVJIcqKHCe0tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3V2z3GpSz137q; Tue, 18 Jun 2024 14:47: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 45IElNPV070756; Tue, 18 Jun 2024 14:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElNib070753; Tue, 18 Jun 2024 14:47:23 GMT (envelope-from git) Date: Tue, 18 Jun 2024 14:47:23 GMT Message-Id: <202406181447.45IElNib070753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 70cd0b4b03b0 - stable/13 - pfctl: fix recursive printing of nat anchors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 70cd0b4b03b0eee2668b1a88b2f1076407753dbf Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=70cd0b4b03b0eee2668b1a88b2f1076407753dbf commit 70cd0b4b03b0eee2668b1a88b2f1076407753dbf Author: Kristof Provost AuthorDate: 2024-05-28 14:26:28 +0000 Commit: Kristof Provost CommitDate: 2024-06-18 14:43:43 +0000 pfctl: fix recursive printing of nat anchors Similar to the preceding fix for rules, ensure that we recursively list wildcard anchors for nat rules. MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8ddd0359bca5c5fc38189000a80a3180854a8a2e) --- sbin/pfctl/pfctl.c | 103 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 31 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 985cbe0771c0..1cdcd1d0b912 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -96,7 +96,7 @@ int pfctl_get_pool(int, struct pfctl_pool *, u_int32_t, u_int32_t, int, char *); void pfctl_print_rule_counters(struct pfctl_rule *, int); int pfctl_show_rules(int, char *, int, enum pfctl_show, char *, int, int); -int pfctl_show_nat(int, char *, int, char *, int); +int pfctl_show_nat(int, char *, int, char *, int, int); int pfctl_show_src_nodes(int, int); int pfctl_show_states(int, const char *, int); int pfctl_show_status(int, int); @@ -1220,7 +1220,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } int -pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) +pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth, + int wildcard) { struct pfctl_rules_info ri; struct pfctl_rule rule; @@ -1228,14 +1229,65 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) u_int32_t nr; static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT }; int i, dotitle = opts & PF_OPT_SHOWALL; - int brace, ret; + int ret; int len = strlen(path); - char *p; + char *npath, *p; - if (path[0]) - snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); - else - snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + /* + * Truncate a trailing / and * on an anchorname before searching for + * the ruleset, this is syntactic sugar that doesn't actually make it + * to the kernel. + */ + if ((p = strrchr(anchorname, '/')) != NULL && + p[1] == '*' && p[2] == '\0') { + p[0] = '\0'; + } + + if (anchorname[0] == '/') { + if ((npath = calloc(1, MAXPATHLEN)) == NULL) + errx(1, "pfctl_rules: calloc"); + snprintf(npath, MAXPATHLEN, "%s", anchorname); + } else { + if (path[0]) + snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); + else + snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + npath = path; + } + + /* + * If this anchor was called with a wildcard path, go through + * the rulesets in the anchor rather than the rules. + */ + if (wildcard && (opts & PF_OPT_RECURSE)) { + struct pfioc_ruleset prs; + u_int32_t mnr, nr; + memset(&prs, 0, sizeof(prs)); + memcpy(prs.path, npath, sizeof(prs.path)); + if (ioctl(dev, DIOCGETRULESETS, &prs)) { + if (errno == EINVAL) + fprintf(stderr, "NAT anchor '%s' " + "not found.\n", anchorname); + else + err(1, "DIOCGETRULESETS"); + } + mnr = prs.nr; + + pfctl_print_rule_counters(&rule, opts); + for (nr = 0; nr < mnr; ++nr) { + prs.nr = nr; + if (ioctl(dev, DIOCGETRULESET, &prs)) + err(1, "DIOCGETRULESET"); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("nat-anchor \"%s\" all {\n", prs.name); + pfctl_show_nat(dev, npath, opts, + prs.name, depth + 1, 0); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("}\n"); + } + path[len] = '\0'; + return (0); + } for (i = 0; i < 3; i++) { ret = pfctl_get_rules_info(dev, &ri, nattype[i], path); @@ -1244,7 +1296,6 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) return (-1); } for (nr = 0; nr < ri.nr; ++nr) { - brace = 0; INDENT(depth, !(opts & PF_OPT_VERBOSE)); if (pfctl_get_rule(dev, nr, ri.ticket, path, @@ -1256,35 +1307,25 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) ri.ticket, nattype[i], path) != 0) return (-1); - if (anchor_call[0] && - ((((p = strrchr(anchor_call, '_')) != NULL) && - (p == anchor_call || - *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { - brace++; - if ((p = strrchr(anchor_call, '/')) != - NULL) - p++; - else - p = &anchor_call[0]; - } else - p = &anchor_call[0]; - if (dotitle) { pfctl_print_title("TRANSLATION RULES:"); dotitle = 0; } print_rule(&rule, anchor_call, opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC); - if (brace) + if (anchor_call[0] && + (((p = strrchr(anchor_call, '/')) ? + p[1] == '_' : anchor_call[0] == '_') || + opts & PF_OPT_RECURSE)) { printf(" {\n"); - else - printf("\n"); - pfctl_print_rule_counters(&rule, opts); - pfctl_clear_pool(&rule.rpool); - if (brace) { - pfctl_show_nat(dev, path, opts, p, depth + 1); + pfctl_print_rule_counters(&rule, opts); + pfctl_show_nat(dev, npath, opts, anchor_call, + depth + 1, rule.anchor_wildcard); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("}\n"); + } else { + printf("\n"); + pfctl_print_rule_counters(&rule, opts); } } } @@ -2601,7 +2642,7 @@ main(int argc, char *argv[]) break; case 'n': pfctl_load_fingerprints(dev, opts); - pfctl_show_nat(dev, path, opts, anchorname, 0); + pfctl_show_nat(dev, path, opts, anchorname, 0, 0); break; case 'q': pfctl_show_altq(dev, ifaceopt, opts, @@ -2629,7 +2670,7 @@ main(int argc, char *argv[]) opts |= PF_OPT_SHOWALL; pfctl_load_fingerprints(dev, opts); - pfctl_show_nat(dev, path, opts, anchorname, 0); + pfctl_show_nat(dev, path, opts, anchorname, 0, 0); pfctl_show_rules(dev, path, opts, 0, anchorname, 0, 0); pfctl_show_altq(dev, ifaceopt, opts, 0); pfctl_show_states(dev, ifaceopt, opts); From nobody Tue Jun 18 14:47:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3V306YpPz5NwG1; Tue, 18 Jun 2024 14:47: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 4W3V304pJkz4bJ5; Tue, 18 Jun 2024 14:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnylVSfD+YKTtAoG0TS6/T9nbJUzXoEegD/DVRz7dxo=; b=wKX680r/lQWZ9Ki9ZXxI82wT0Pd5hizOnmTnychOfr9LrXmoFfP7mVYwinu1Oe/jahjxyS AIJ2rDWQwntnmEd2bAxqbPwGS6ziEB5HFvo3lT4VYDfPYlvFXd2HDG/9o98igSSgg5NH+e BDKCbW43LQHviBQaO87KSJjU5VkcJPEo1ztu0cVQ+fGRi9HpguZf6dMf4gCN0SlP83E8PX tu5PtV8Q2fdiFDAyMGYGgkK36ibgSuT8neAKeitseA14WZHSbxPUBUQIXRtBjpo/q5Y13h AvVFq8bq14a3MZVpXJb9pU1+PUQAURfJENzhi0yaltmdCwcKMq21PPwXcWjVIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722044; a=rsa-sha256; cv=none; b=fGHPFV8L0BJzuLcVHQjA8JvhPSrlRweU2s2WclG+PC/DMSCi3JA/hcILvX258pbK7RgOAi nhrBlTA0h8bnUyRswzQLnbAA3ZfbFe6LM5ofTD8r7+eYed66pGOWtd9rwMEOXArkB3ppl2 iavOuAIvBF9HJsD2XK9tsJ2GUVoFuFmYmjLhv+zdq2Xh5nQkwOhVzWxKBuPb8+ENkKWlBv SMCDd1PxdnfDhg2fjid7xUkhBGVwhRkOHZNBKK9iwk0z2siwD6mi5XjfmacOLyicvp+3iB ART6nf2t2nmKvZ9B29lWvc72o9mLUNLOfryNZuAqvdLlGRg43HKyw60k9I0SKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718722044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnylVSfD+YKTtAoG0TS6/T9nbJUzXoEegD/DVRz7dxo=; b=sRvVhCJvNJmwKBudX02P1juduqk1X0zlrgrS9oJFecjdF1KHaH7idlogRoUsfJb033llm2 ntNkGQz7JnjEXN+RDXNy7N+3OBgsv5wave9JlXZf4Em2h9cPtLuprEWQQcJudRpXhl+Gxs C5keavqGSqztmOy2CDFTnJanZdVtPiKvAAr1mmVcqh+Tmp+zhxFQq0j6zqtdxa/tF3afnM fT2FHMYDclTaVFueCFjtgUUtstEC+vEjHoAcykS4an7/t57qUqQzeHmfS4WQP/v8HPstxL WvAXoULpcOXXdtCrNBST9lUPhIjvCKa0W2zAcECz7zzE2gka+gnvaxEQIeRbGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3V304DtXz136c; Tue, 18 Jun 2024 14:47: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 45IElOtQ070846; Tue, 18 Jun 2024 14:47:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElOoU070843; Tue, 18 Jun 2024 14:47:24 GMT (envelope-from git) Date: Tue, 18 Jun 2024 14:47:24 GMT Message-Id: <202406181447.45IElOoU070843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9748482d343d - stable/13 - pf tests: test longer anchor names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9748482d343dfaca9cb92359d0af7b4d38aea3bd Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9748482d343dfaca9cb92359d0af7b4d38aea3bd commit 9748482d343dfaca9cb92359d0af7b4d38aea3bd Author: Kristof Provost AuthorDate: 2024-05-24 12:50:53 +0000 Commit: Kristof Provost CommitDate: 2024-06-18 14:43:43 +0000 pf tests: test longer anchor names PR: 279225 MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8b28ec3861d5b3e9fd8a60dbfda13059a5301281) --- tests/sys/netpfil/pf/anchor.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index cf6da8740003..eba1ee935930 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -58,6 +58,37 @@ pr183198_cleanup() pft_cleanup } +atf_test_case "pr279225" "cleanup" +pr279225_head() +{ + atf_set descr "Test that we can retrieve longer anchor names, PR 279225" + atf_set require.user root +} + +pr279225_body() +{ + pft_init + + vnet_mkjail alcatraz + + pft_set_rules alcatraz \ + "nat-anchor \"appjail-nat/jail/*\" all" \ + "rdr-anchor \"appjail-rdr/*\" all" \ + "anchor \"appjail/jail/*\" all" + + atf_check -s exit:0 -o match:"nat-anchor \"appjail-nat/jail/\*\" all \{" \ + jexec alcatraz pfctl -sn -a "*" + atf_check -s exit:0 -o match:"rdr-anchor \"appjail-rdr/\*\" all \{" \ + jexec alcatraz pfctl -sn -a "*" + atf_check -s exit:0 -o match:"anchor \"appjail/jail/\*\" all \{" \ + jexec alcatraz pfctl -sr -a "*" +} + +pr279225_cleanup() +{ + pft_cleanup +} + atf_test_case "nested_anchor" "cleanup" nested_anchor_head() { @@ -133,6 +164,7 @@ wildcard_cleanup() atf_init_test_cases() { atf_add_test_case "pr183198" + atf_add_test_case "pr279225" atf_add_test_case "nested_anchor" atf_add_test_case "wildcard" } From nobody Tue Jun 18 21:13:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3fd3709mz5NGbm; Tue, 18 Jun 2024 21:13: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 4W3fd36DDJz4Lmt; Tue, 18 Jun 2024 21:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718745239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHduoUmx5yZrAkxG4yrIgQaRMa98716n4TT2GVAr1Og=; b=JCWj/mZ6pa2+rUTU/Aveyb+Lq/uJRBQga4nrcnhwzL+npPT5311ewqcJ9ok+lB5hKC05QU qQjkuWHxgJRy9klbAYUGLVZrGBcpLHZGyF+2fHJIUbx5/HR2BUU5YYBSkfQaLzRq2SMhcH FY41fxUOz3g5w2akl4jR6cmQGmhHxD4jy2ZZjFG3CBURUKPwm3de1kxK66t3eHnIEYA2A7 2nxhmhFe6PweVDZ660OpGs0jLbuxRxBVK592UBTeKor/7MalIBKprMr7K/xBqHOQt7RnDL LKdNPbIOKPJE2mWRHek/4g1ag3h4D+uUduq++RfeuFuFyURoLmII3jouEUgaAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718745239; a=rsa-sha256; cv=none; b=NiSOXLOSn1/u8anu66vHZNxOZGpNYvW/M38XqmCzz4wMfr0r12RvB9bjDXZvyObPqkxtJ/ uYlGsItTnufX6Jv6rkpZRoWojj4tOZ/WlUQt8lvhv54geugo90wD2kWbAixjVI3Giiyd+t XlprwiqLmaSncBsc1G2UH26J7AfgD8ZetXhdJBkYKrFrgCh11v3pNkVkwMD0vsTsrbf/qd /YcLvBMmKELixQVm5K8eXJj7XdYLTBUby9NCtwK7+EJvs2pr5XR9n0TO2LLxz8tUItpA27 GSEXwQbqEA4euy1vc1NcIdUS2HoqA8OTDskFmrEPRDTkE00wEIphLSgNlU6xwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718745239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHduoUmx5yZrAkxG4yrIgQaRMa98716n4TT2GVAr1Og=; b=oi+Jy5YF/r/t5lg4xgMAi02JeUbO05ohk1PQOPWBkX8wdBCW3QfCFb0osj9e10xdKEbGCu wQBOA7dPuwtuAWfvDjmHwz8ZlsUp2sS8SqrwV9qrs78+JEQLdbeQRSC571UmtikGXS5k5r om/tol/JSpmGnWWNHS2WrL8dMmjcRviwF8hXK0J3enxSgaVCLMQTTl27OrX6DnOE81Pvd1 ubczVGnpk9w5W1GvQHamjnWthGK8OVnawk85Zbg3G20PaxXAOsT82uZDwJzA4eIi8wKpa4 o1LM9w0mz1zJ032lO96FczP+TNdPatrF14wvZOMhG7mC3Shq90kQvqg4oeIVvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3fd35qnczFcK; Tue, 18 Jun 2024 21:13: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 45ILDx9d030219; Tue, 18 Jun 2024 21:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45ILDx1D030216; Tue, 18 Jun 2024 21:13:59 GMT (envelope-from git) Date: Tue, 18 Jun 2024 21:13:59 GMT Message-Id: <202406182113.45ILDx1D030216@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: bb95fbf634b3 - main - ctladm: deprecate the undocumented "port -l" option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb95fbf634b3459363a136899e9b241a2f6c49cd Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=bb95fbf634b3459363a136899e9b241a2f6c49cd commit bb95fbf634b3459363a136899e9b241a2f6c49cd Author: Alan Somers AuthorDate: 2024-06-06 21:09:38 +0000 Commit: Alan Somers CommitDate: 2024-06-18 21:13:44 +0000 ctladm: deprecate the undocumented "port -l" option It was mostly removed from the man page in 9c887a4f86f5fd4f51c23443dc8435e52783a782, but left in the command. Fully remove it from the man page, and warn if anybody uses it. Remove it entirely for FreeBSD 16. PR: 279546 MFC after: 2 weeks Reviewed by: mav Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D45522 --- usr.sbin/ctladm/ctladm.8 | 5 +---- usr.sbin/ctladm/ctladm.c | 29 +++++++++++++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index 72f0162eed54..3da9713accac 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -597,9 +597,7 @@ The serial number is returned when the error is injected. .El .It Ic port Perform one of several CTL frontend port operations. -Either get a list of frontend ports -.Pq Fl l , -create a new frontend port +Either create a new frontend port .Pq Fl c , destroy a frontend port .Pq Fl r , @@ -614,7 +612,6 @@ for a given port. One of .Fl c , .Fl r , -.Fl l , .Fl o , or .Fl w diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 46b7b88547dd..95557406741c 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -184,7 +184,11 @@ static struct ctladm_opts option_table[] = { {"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:o:s:"}, {"nvlist", CTLADM_CMD_NVLIST, CTLADM_ARG_NONE, "vx"}, {"nvterminate", CTLADM_CMD_NVTERMINATE, CTLADM_ARG_NONE, "ac:h:"}, +#if (__FreeBSD_version < 1600000) {"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "lo:O:d:crp:qt:w:W:x"}, +#else + {"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "o:O:d:crp:t:w:W:"}, +#endif {"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:ilp:qvx"}, {"prin", CTLADM_CMD_PRES_IN, CTLADM_ARG_NEED_TL, "a:"}, {"prout", CTLADM_CMD_PRES_OUT, CTLADM_ARG_NEED_TL, "a:k:r:s:"}, @@ -410,7 +414,9 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) char *driver = NULL; nvlist_t *option_list; ctl_port_type port_type = CTL_PORT_NONE; +#if (__FreeBSD_version < 1600000) int quiet = 0, xml = 0; +#endif option_list = nvlist_create(0); if (option_list == NULL) @@ -418,12 +424,22 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) while ((c = getopt(argc, argv, combinedopt)) != -1) { switch (c) { +#if (__FreeBSD_version < 1600000) case 'l': + warnx("ctladm port -l is deprecated. " + "Use ctladm portlist instead"); if (port_mode != CCTL_PORT_MODE_NONE) goto bailout_badarg; port_mode = CCTL_PORT_MODE_LIST; break; + case 'q': + quiet = 1; + break; + case 'x': + xml = 1; + break; +#endif case 'c': port_mode = CCTL_PORT_MODE_CREATE; break; @@ -483,9 +499,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) case 'p': targ_port = strtol(optarg, NULL, 0); break; - case 'q': - quiet = 1; - break; case 't': { ctladm_optret optret; ctladm_cmdargs argnum; @@ -529,9 +542,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) wwpn = strtoull(optarg, NULL, 0); wwpn_set = 1; break; - case 'x': - xml = 1; - break; } } @@ -563,6 +573,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) entry.targ_port = targ_port; switch (port_mode) { +#if (__FreeBSD_version < 1600000) case CCTL_PORT_MODE_LIST: { char opts[] = "xq"; char argx[] = "-x"; @@ -579,6 +590,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) cctl_portlist(fd, argcx, argvx, opts); break; } +#endif case CCTL_PORT_MODE_REMOVE: /* FALLTHROUGH */ case CCTL_PORT_MODE_CREATE: { @@ -681,7 +693,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) fprintf(stdout, "Front End Ports disabled\n"); break; default: - warnx("%s: one of -l, -o or -w/-W must be specified", __func__); + warnx("%s: one of -c, -r, -o or -w/-W must be specified", __func__); retval = 1; goto bailout; break; @@ -4270,7 +4282,6 @@ usage(int error) "port options:\n" "-c : create new ioctl or iscsi frontend port\n" "-d : specify ioctl or iscsi frontend type\n" -"-l : list frontend ports\n" "-o on|off : turn frontend ports on or off\n" "-O pp|vp : create new frontend port using pp and/or vp\n" "-w wwnn : set WWNN for one frontend\n" @@ -4278,8 +4289,6 @@ usage(int error) "-t port_type : specify fc, scsi, ioctl, internal frontend type\n" "-p targ_port : specify target port number\n" "-r : remove frontend port\n" -"-q : omit header in list output\n" -"-x : output port list in XML format\n" "portlist options:\n" "-f frontend : specify frontend type\n" "-i : report target and initiators addresses\n" From nobody Wed Jun 19 00:18:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3kkW4SPlz5NX14; Wed, 19 Jun 2024 00:18: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 4W3kkW3ySLz4cBX; Wed, 19 Jun 2024 00:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718756339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edtKjvGU94wBdNHFnvJd3rKwoueSzkkoKz05ZyKfUAE=; b=A5c0TtxlKVLm724/Zd5FiZmAalhXXgS6rTu+1isQjqwdHOliYhemiX2lFDuf4KqGdcl1Rp qt9qGtX9My07Ugl50PBDxbmJmfFWGZfWfU7sdiyYKUQoN79fwZCQ9uCrkAdIXYxJkz7W/X eIfm9tiSFrSVnb4Wgn3XkdgS2/hTeKpOH0OSW6yg321VSLTtk4LSHhOtKwGguo9+hKdCw7 ZjH7fPqeP6ghI0mwLT2NXPaTAQzZcaNl7xlY9bWQHV69CtThMo4DmCcqwoR1mkC8etfQ84 IYhRnTdPy9X1ByMehlBtyTbHBHOLF13QQNc1x68tqniqiuvSbGst9ie1wJOA3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718756339; a=rsa-sha256; cv=none; b=vl5NnO7XTB2U4bLwcLxuJTpyRdy1Xoa4zmcKCl6JA7mZnQEKn0iQIWJhvH8SIv5zGg7NAa MvRMtFTZ3jXcxdWq7KvTPLwrEdfCp6fnlbwYmHq6IHofr1po8OC23oI1c9e3KKR+AUneFZ JasH0snhk0TTpRiR7UI6F8HBeivuD50YRO/b4kadyeewLLKWj7kb4mRD7iowwblUOlyV+k knc4hEyCz3o5a8VaNrdGIjGFvaCK0/nWH51gYGQLyEphJGsdd+BQa/zo5JIf48KurhS8hy hK2a9LgGnIgD0dz8jHptTfKuZPup0/o1ov4DeiLk9s8+7Mzvp9LY4QaLeYYCKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718756339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edtKjvGU94wBdNHFnvJd3rKwoueSzkkoKz05ZyKfUAE=; b=Y6jXqHIqD0zN9IJjrmpOtKMIgFrCfZYmZV9oKGx85GMF2ZFBEfPa7nUCcaMbbyYu2IyVYh 3kEsX+DbgbW+oHJGLHyJQmJ4menNLmMwnJGbOxDNWV0hrnV3ROwi3b7mntpMraD+z74e9l f+/dHw6ZII1FQIXBgW70KTy7azCcaXHhvy8d5+jRaHDhLZOC2oJPAHcufS6bOcMLO0Yhro 0KUHs3b7oM5+1N5YTZKIymF8AvZzqGNKIpToq8DYCR3//jNPEnoJoNdTNN/BJneL7c4wZY rCwCZwG+fSfl/3kRCDOcSpCEZUwyCgnKGF/LYKU7enRBCcK4jHZ875Zl9Hv+2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3kkW3R3SzKvF; Wed, 19 Jun 2024 00:18: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 45J0Ix9J033999; Wed, 19 Jun 2024 00:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J0IxGD033996; Wed, 19 Jun 2024 00:18:59 GMT (envelope-from git) Date: Wed, 19 Jun 2024 00:18:59 GMT Message-Id: <202406190018.45J0IxGD033996@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: 873881b7dbb7 - main - targ: fix compiling the example List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 873881b7dbb72077f3723f49a9f10a432231c532 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=873881b7dbb72077f3723f49a9f10a432231c532 commit 873881b7dbb72077f3723f49a9f10a432231c532 Author: Alan Somers AuthorDate: 2024-06-19 00:17:31 +0000 Commit: Alan Somers CommitDate: 2024-06-19 00:17:31 +0000 targ: fix compiling the example The targ example program doesn't compile with current clang, and probably hasn't for multiple releases. Fix the build. I don't have the right hardware to test it, though. MFC after: 2 weeks Sponsored by: Axcient --- share/examples/scsi_target/Makefile | 6 +++++- share/examples/scsi_target/scsi_cmds.c | 6 +----- share/examples/scsi_target/scsi_target.c | 32 ++++++++++++++++++-------------- share/examples/scsi_target/scsi_target.h | 6 +++++- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile index 39950b8c0ac1..1e2c076591bf 100644 --- a/share/examples/scsi_target/Makefile +++ b/share/examples/scsi_target/Makefile @@ -4,7 +4,11 @@ FILESDIR=${SHAREDIR}/examples/${PROG} PROG= scsi_target SRCS= scsi_target.h scsi_target.c scsi_cmds.c DPADD= ${LIBCAM} ${LIBSBUF} -LDADD= -lcam -lsbuf +LIBADD+= cam +LIBADD+= sbuf +# cast-qual is triggered only in a code path where the volatile keyword doesn't +# matter +CFLAGS.scsi_cmds.c= -Wno-cast-qual MAN= scsi_target.8 diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c index 43217a562aba..122d4dec6287 100644 --- a/share/examples/scsi_target/scsi_cmds.c +++ b/share/examples/scsi_target/scsi_cmds.c @@ -102,10 +102,6 @@ static struct targ_cdb_handlers cdb_handlers[] = { static struct scsi_inquiry_data inq_data; static struct initiator_state istates[MAX_INITIATORS]; -extern int debug; -extern off_t volume_size; -extern u_int sector_size; -extern size_t buf_size; cam_status tcmd_init(u_int16_t req_inq_flags, u_int16_t sim_inq_flags) @@ -553,7 +549,7 @@ tcmd_rdwr_decode(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio) tcmd_illegal_req(atio, ctio); return (0); } - if (blkno + count > volume_size) { + if (((off_t)(blkno + count)) > volume_size) { warnx("Attempt to access past end of volume"); tcmd_sense(ctio->init_id, ctio, SSD_KEY_ILLEGAL_REQUEST, 0x21, 0); diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c index b8f3ed6a8a81..ee0a94e7a2a0 100644 --- a/share/examples/scsi_target/scsi_target.c +++ b/share/examples/scsi_target/scsi_target.c @@ -77,7 +77,9 @@ static struct ccb_queue work_queue; static struct ioc_enable_lun ioc_enlun = { CAM_BUS_WILDCARD, CAM_TARGET_WILDCARD, - CAM_LUN_WILDCARD + CAM_LUN_WILDCARD, + 0, + 0 }; /* Local functions */ @@ -208,7 +210,7 @@ main(int argc, char *argv[]) if (argc != 2) usage(); - sscanf(argv[0], "%u:%u:%u", &ioc_enlun.path_id, &ioc_enlun.target_id, + sscanf(argv[0], "%u:%u:%ju", &ioc_enlun.path_id, &ioc_enlun.target_id, &ioc_enlun.lun_id); file_name = argv[1]; @@ -258,10 +260,12 @@ main(int argc, char *argv[]) if (notaio == 0) { struct aiocb aio, *aiop; + void *aio_buf; /* See if we have we have working AIO support */ memset(&aio, 0, sizeof(aio)); - aio.aio_buf = malloc(sector_size); + aio_buf = malloc(sector_size); + aio.aio_buf = aio_buf; if (aio.aio_buf == NULL) err(1, "malloc"); aio.aio_fildes = file_fd; @@ -278,7 +282,7 @@ main(int argc, char *argv[]) assert(aiop == &aio); signal(SIGSYS, SIG_DFL); } - free((void *)aio.aio_buf); + free(aio_buf); if (debug && notaio == 0) warnx("aio support tested ok"); } @@ -331,7 +335,7 @@ main(int argc, char *argv[]) } static void -cleanup() +cleanup(void) { struct ccb_hdr *ccb_h; @@ -358,7 +362,7 @@ cleanup() /* Allocate ATIOs/INOTs and queue on HBA */ static int -init_ccbs() +init_ccbs(void) { int i; @@ -395,7 +399,7 @@ init_ccbs() } static void -request_loop() +request_loop(void) { struct kevent events[MAX_EVENTS]; struct timespec ts, *tptr; @@ -535,10 +539,10 @@ request_loop() /* CCBs are ready from the kernel */ static void -handle_read() +handle_read(void) { union ccb *ccb_array[MAX_INITIATORS], *ccb; - int ccb_count, i, oo; + int ccb_count, i; ccb_count = read(targ_fd, ccb_array, sizeof(ccb_array)); if (ccb_count <= 0) { @@ -590,7 +594,7 @@ handle_read() /* Queue on the appropriate ATIO */ queue_io(ctio); /* Process any queued completions. */ - oo += run_queue(c_descr->atio); + run_queue(c_descr->atio); break; } case XPT_IMMEDIATE_NOTIFY: @@ -840,7 +844,7 @@ send_ccb(union ccb *ccb, int priority) /* Return a CTIO/descr/buf combo from the freelist or malloc one */ static struct ccb_scsiio * -get_ctio() +get_ctio(void) { struct ccb_scsiio *ctio; struct ctio_descr *c_descr; @@ -938,7 +942,7 @@ get_sim_flags(u_int16_t *flags) } static void -rel_simq() +rel_simq(void) { struct ccb_relsim crs; @@ -953,7 +957,7 @@ rel_simq() /* Cancel all pending CCBs. */ static void -abort_all_pending() +abort_all_pending(void) { struct ccb_abort cab; struct ccb_hdr *ccb_h; @@ -976,7 +980,7 @@ abort_all_pending() } static void -usage() +usage(void) { fprintf(stderr, "Usage: scsi_target [-AdSTY] [-b bufsize] [-c sectorsize]\n" diff --git a/share/examples/scsi_target/scsi_target.h b/share/examples/scsi_target/scsi_target.h index a873c050b7c6..57b6696d2e77 100644 --- a/share/examples/scsi_target/scsi_target.h +++ b/share/examples/scsi_target/scsi_target.h @@ -115,7 +115,11 @@ extern void free_ccb(union ccb *ccb); static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); } /* Global Data */ -extern int notaio; +extern int notaio; +extern int debug; +extern off_t volume_size; +extern u_int sector_size; +extern size_t buf_size; /* * Compat Defines From nobody Wed Jun 19 02:11:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3nDg67F1z5Nh69; Wed, 19 Jun 2024 02:11: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 4W3nDg5ffRz4n1h; Wed, 19 Jun 2024 02:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718763107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cHKgjMpTi5AXkMkTRj15F4kwc8/zZVULrolNLh0iVto=; b=he29VVBPbrDTGbv7EP9rcXDAavwAcQAE4pM0z1et6yBvpT+JJ+NdXyKqkRH8gsbzCF4/Ws Kf6T8uefzTm26dZGu34q2Uk/W0nyJd3Xe7WtKbnFTnChTWaAHe+AO/cOmEz8+IsTQKKU9M Zmb4DwmzU1p6MB5EiLgKh7yr0jZqHZ+NcEqDnN2yiTDzvDVdB4WvZonh2iHeWsQ8gd/SFv 2bhMZNj+t4oRmgFXwxoicx1bJlBnJ9yDka/C4d1vM1obb2JBtizGmkE0sh2GapH/boM7Kr oARf6yI/lT+FfTTPoc9HR0UxgZMtomm/jsbhV42JrNTTmWtGi0k4NMCjxqkb/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718763107; a=rsa-sha256; cv=none; b=Cpzt6eF5d2VwbsfQK33ten9xnXdhhmHV+vI1xuRAbFJUx5eJNohyMfNssRiForZOib15iX dOw492euF4mujpX/o/vufb4I9squJgimo0pgqifqE6a/rsjRnPpYBDmqBowyfCD7wPZqss 52Qj5eVR+cy7az9eJ3Tw5IZYc2yEZHvG8fFefXXWXQMPxWe+o2ON60JZabbMqHrS6L0JNr G1GJfYezKT43WupNAVYBphXVZQlaNY5FHsPauOlaIixUr+WQgL16XVZbB4thdDX9QOQ8lS UaNpY6AZSBUO7EuzVOIuLpm6B+lvgGrEYMSA2+C4GOypocrOX3m23H2shfOkfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718763107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cHKgjMpTi5AXkMkTRj15F4kwc8/zZVULrolNLh0iVto=; b=L1DXO1uYhPRqybI1mN4vL4St71Pyf7bPE3UYKNDhngx9Dpo+LUnyHI3iA9XgwYwTkLXbwC TCOMSZL+HnySIwo+wve9sg1WLbG38TwxcTOJVW526JI33Sqy9620we9Zixz3DV/cvmuaZA vz5FXyOZTdVDbjwRQ60d2+MBP6e8W2/g+qVP0bhTpsL0PAgBQUNSFLn4waOTZ94peyxmgF bot0kioqktXnKoWRTrUPSpULsl8breULIkC54H2MPvK1XRhIUoRX86fhhjFDz7Hqj6acL4 XODwaYCQK24MuhZ/MYbLux5TbfLZfioOccEHNDiEXp6SAPGsCTweyaCgM24IaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3nDg5Gd2zNYm; Wed, 19 Jun 2024 02:11: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 45J2Bl32033158; Wed, 19 Jun 2024 02:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J2BloL033155; Wed, 19 Jun 2024 02:11:47 GMT (envelope-from git) Date: Wed, 19 Jun 2024 02:11:47 GMT Message-Id: <202406190211.45J2BloL033155@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: 8a607939decc - main - Update leap-seconds to leap-seconds.3676924800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a607939decc9eddf31420a169d7a7ffe22295bf Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8a607939decc9eddf31420a169d7a7ffe22295bf commit 8a607939decc9eddf31420a169d7a7ffe22295bf Author: Xin LI AuthorDate: 2024-06-19 02:10:33 +0000 Commit: Xin LI CommitDate: 2024-06-19 02:10:33 +0000 Update leap-seconds to leap-seconds.3676924800 Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 MFC after: 3 days --- usr.sbin/ntp/ntpd/leap-seconds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds index 3fe9a1210e3c..c5a95aa51799 100644 --- a/usr.sbin/ntp/ntpd/leap-seconds +++ b/usr.sbin/ntp/ntpd/leap-seconds @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C66 -# File expires on: 28 June 2024 +# Updated through IERS Bulletin C67 +# File expires on: 28 December 2024 # -#@ 3928521600 +#@ 3944332800 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1 +#h 199a9d45 3f630d2f e47cb9cc c2f0fa47 96932227 From nobody Wed Jun 19 04:18:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3r2L6nQTz5NrWZ; Wed, 19 Jun 2024 04:18: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 4W3r2L6GbRz4xPl; Wed, 19 Jun 2024 04:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718770682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=em2kgvXF1uRFYxpQ2IDMArwP+RlpKdirDjNuUpXZtKQ=; b=OlLqQ9FnWbHpJwNvgZVg2GkFXIBTFH48r66NkPbBkc8OiNUfbZmsV5QDnG9P1AZEQksoK7 O5xOHiHFQMoeRK7yc7WOHPjUB3an5P1lP+p2HZHPYaJvNGA8ayxmpkXu4jzitjUpAHcSjJ tnl7GvklTgR+46YNPQ7Q4LL2VuyiJQwqGyALs7FsCOhyBCs2iGVDxG+DWyvGQG9nJudyeh jnUq5rZPPJ1zkbapHncrzYpwNdrQiwMHwcdpYf0pBAcwAVTBsY+PhLeQl5dUVZH5YrtC/N yoPmBfPQo/UXg+bCykcdwrtE5uuLxD4GU+q5M3Q/yLAdX6c9Hxq976RO71Gdtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718770682; a=rsa-sha256; cv=none; b=Od4nCcqf28FVx3I17gaR5D2TTYZ9sSLI+0jV/odCwNAuUXawONc6xajXk6gO65j9dJt8Za Fbx9licpeICmGd4DFS6T1fc4sAd+5k+u3qqgkiuIIySf6jvcZObpQqnM2yEHoSA88r13iI nsnxxHaVlBdyKg5zCCGRHsRqn77OgWWxkb/93K3G+VvpnR84Pgwi/uhH9XS/d7MVxjh/d6 Jj0cqnoZcw0rPEPalY8ClKeFCKkXspMtWMYIr49cS7CCAMQZUHHYBE0B0lVlm2qUlY0DM1 1f9lKzq9peEeY1bVY7tuVglNaqGieZybaAT4XtOAZCwwcPk7/L8Uj27uHosbLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718770682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=em2kgvXF1uRFYxpQ2IDMArwP+RlpKdirDjNuUpXZtKQ=; b=QZUCxtgeQV2ztMdjPHZt10lEEuAOSoGnRVpTItKNJqTtlr1R4qOuLfns7eU6yIvUtPNUn/ dKHiTm8ot2vIrI/sAHuqGrfUR9VIOw3zky0DXG5SgxehgU5TgEckF9aa6toVtlgsRmmnHy 1eEXtFnylsi01596gBWy0xIy7l5ba6eKWMNxTSRVR2rtFadzRuQ1dn2n+LnEWPDrkJ4RFH hyvddyNRhxzmtnGWFtOTqxhdMDzWZzcys4MSHAx+UMa5OTR7a1Y4uFCtKMLvTPs1TdoZkf fV/qQ0Y5m8I16eV0fAS17AYCWN3mva9UHRtpZAJ0Au5rGf0KFIiakgFQXnP4bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3r2L5sjCzRmm; Wed, 19 Jun 2024 04:18: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 45J4I2IJ039918; Wed, 19 Jun 2024 04:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J4I2Qm039915; Wed, 19 Jun 2024 04:18:02 GMT (envelope-from git) Date: Wed, 19 Jun 2024 04:18:02 GMT Message-Id: <202406190418.45J4I2Qm039915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9d7622367a46 - stable/14 - camcontrol.8: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d7622367a4651a2207be1ead7606d7c8f7b87c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7622367a4651a2207be1ead7606d7c8f7b87c6 commit 9d7622367a4651a2207be1ead7606d7c8f7b87c6 Author: Gordon Bergling AuthorDate: 2024-06-16 16:01:12 +0000 Commit: Gordon Bergling CommitDate: 2024-06-19 04:17:51 +0000 camcontrol.8: Fix a typo in the manual page - s/emtpy/empty/ (cherry picked from commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0) --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 065dfbe8a1b4..9d2eec87e0e0 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2330,7 +2330,7 @@ For the Report Zones command, specify a subset of zones to report. .It all Report all zones. This is the default. -.It emtpy +.It empty Report only empty zones. .It imp_open Report zones that are implicitly open. From nobody Wed Jun 19 04:18:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3r2g3CTcz5Nrtj; Wed, 19 Jun 2024 04:18: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 4W3r2g2jcKz4xYl; Wed, 19 Jun 2024 04:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718770699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0SAWtRpWoyORDg/oVOTlFXqnQV6GJiJpsoSgRuZAbOc=; b=J0jBaEG4ph/fsrWNA+hLR1xCVIQo1bBpDI1Uq4t21w1iq67Rl8IeZyJm8Q0BRZg/lYPSAO YMn35T+D4Wftxf3rXeqtZeVc6g4w1VtHJTsQ6Yyih71sYLvJSR8/phsmSZVnduD5fnkpkx czsn50wdpFi+fnUIpOKP3tkaTwdpsNG0ZPfdwf7Kiyj5Jz30Ojk1MP2ntqLLUh2un3XQqZ QmW3o/LvKE9y45IFPF4ZATsWsK1Bkl7LkoANld5YZNX2Q5v0YhIvL+nGU6CaNNoYLPnCX+ Sfou1as1Q8jEVCJ5Sk432DJydziQWHKslHYlx+lLmaZeTikX9ewcurq/i2bwAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718770699; a=rsa-sha256; cv=none; b=CZqdntFOfphjRvuHo2uwIHR7/OVK0iYZXFkDJhMQYWOxSvnV8IkS4CeBm5XkPULfweWLzq qio0sYKPPmQXG7XEYF+hKk/8IUA8RRAAfhxsPYAkt+I6YBQCJHX3HabuCrI0XBeeIdg4tL uIubfL6S+5RGdlI5MrufDW8CxERmRuFMMYUxu+wBsZB/CMFAyVoXzpk6f+AQzdb4y7Iei0 9b+Zn5wHyQh+K8L7xzkUoGPpSQtGPQl+PRmvxn0Ob3jP2PQX4gCSz6ZxQYKXjr/BboL8rb 7wVVa444lATjCEkyiRz+qC0sAS4hholxOHHw1NhuTMuVTTcldaU/6TI5hZpZ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718770699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0SAWtRpWoyORDg/oVOTlFXqnQV6GJiJpsoSgRuZAbOc=; b=ZsBnQTKDOj3ek3/hiBZGn4SeDhgDxUCeq3o0ZR6OelS8xQARle86bF80FqhEY0+lmCYZUk kdoNYCT20ZPC3RvkRwPFmBhJEX/1yOFwINviNU0x0upQ7ix2sXDkrrbTIeu4m37bEtLz6y SCfrUDWGUy0Aqnmtb9365fJ464RyvmuTv8DZkDHCDYBKUB6C1KyMayvyW2DkQq9Wjn7Gv3 xMXS3yiSnzLaNUGzfWvtRNA2vQcqRMpEcMHuvb2zeCe9tlxJj5LrvX8Atd+7imDa1cCyJA C/vKYQe8PREZB/Rr+PSeAI+R1UX4f24WzN/kIfbqOEomm5ZurqIJeHJMKq9PvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3r2g2KcGzRp8; Wed, 19 Jun 2024 04:18: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 45J4IJsB040079; Wed, 19 Jun 2024 04:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J4IJf7040076; Wed, 19 Jun 2024 04:18:19 GMT (envelope-from git) Date: Wed, 19 Jun 2024 04:18:19 GMT Message-Id: <202406190418.45J4IJf7040076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 0c1370e0625d - stable/13 - camcontrol.8: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c1370e0625d286a38479affcc50f023a117b8dd Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0c1370e0625d286a38479affcc50f023a117b8dd commit 0c1370e0625d286a38479affcc50f023a117b8dd Author: Gordon Bergling AuthorDate: 2024-06-16 16:01:12 +0000 Commit: Gordon Bergling CommitDate: 2024-06-19 04:18:10 +0000 camcontrol.8: Fix a typo in the manual page - s/emtpy/empty/ (cherry picked from commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0) --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index e19a222a1cf7..80f41bc6a11f 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2323,7 +2323,7 @@ For the Report Zones command, specify a subset of zones to report. .It all Report all zones. This is the default. -.It emtpy +.It empty Report only empty zones. .It imp_open Report zones that are implicitly open. From nobody Wed Jun 19 04:18:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3r3045kbz5Nrtp; Wed, 19 Jun 2024 04:18: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 4W3r303Fr1z4xrM; Wed, 19 Jun 2024 04:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718770716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7teHA9cwhpgAkrccplutQzs75ESb3J8XJZTkMU6gRiY=; b=pWWb8/bK7gK4boZUSLGL52jWSs6h3TJfTgYIRp+wNn0CQBZ9nPEode06ym+c4hLG29lCSz tKSxe1w+J+RMVgfyfcDL1TS+4Jgs58TozLMuWIE2/iBgKBSrcGMU1Rk9wOvW6wJxvDEbeP /KK5L1bOfrdRBLuS6SDblPNHP3DG+gvz953xK5b++6U/N6FqgLhz44ygGSOMZ3hNiTXnB0 WQNxxtxx7Doq8uxU3xKuyFtD/GW6RVrhPBBFz+N+vzcGN1G2vwke9BbzD6KkkzsbBTSRGP ip/c1ujEOpy6b6Aww37ZKIfk3cENm3vuRT/tzuL16GBkmlN+Y1+QbvvPpdH9ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718770716; a=rsa-sha256; cv=none; b=ArpDDg7ydspYIMtwW0/3iT18UKj+a+7a6GCutUvuLPtgiTmHyJUhp9ZY6Wj5ZbJtV0qpoN lhLSUaHfULY1Vm+u6EXvw40PqZEcbKDagJmAmioe1pDdQMtPq5ULhnLLOxJNGW5L596GRE MrLhviXKuOTefjEuw/zP0bT2qXFITiaPB00FvoS/xNA9Sy09kh1leiRhZIJk9FnJE7WxFI vtrD+GTRuQOXbVoywdPTeqdwzZoVnjfutBgy8b6bN2RU44SWWW7JrgF+kbS224TqzAHzW3 87sRk/XNpX+GywKGBre2pSw1Z7ZuGe1kxrOIWfjCw44tneqIpr1we3ZDsGdemA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718770716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7teHA9cwhpgAkrccplutQzs75ESb3J8XJZTkMU6gRiY=; b=vHQUGlm5W3dAI9PpVZUKkKNUAT17FIvqGN0kzO5uXONS6FblwKZSz2p6ZtC4DSPnMoICi6 OUwRAXQ3hWKmYL9oR4554tn4UuXFSagRkwmXHnIboR1uYxdB29po7yMbSUcRvrmMCsry3g djk7xCX6bCWukusvVJvftKJIf/TWbNbOjn1f9LUjSO6qDJZoJhyvoM/617kf/c6RO7gRKo 69f+PRVJfRi+Lryi6eKVIbExIIUgiRV2mNpqUUHZrmOUjEMOKdzEiQDFyq4k+fU9/3bYKk 04PdC2ZRoazNrW/j79AAyRVl2ea+rSg6CKfVtabNJ35pkaEAsShjLY2tG7cPCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3r302sM7zR6Q; Wed, 19 Jun 2024 04:18: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 45J4IaGo040244; Wed, 19 Jun 2024 04:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J4Iaeq040241; Wed, 19 Jun 2024 04:18:36 GMT (envelope-from git) Date: Wed, 19 Jun 2024 04:18:36 GMT Message-Id: <202406190418.45J4Iaeq040241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 0a2739feae90 - stable/12 - camcontrol.8: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0a2739feae90822f6f33e8e5aa00dbac73e8b7cb Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2739feae90822f6f33e8e5aa00dbac73e8b7cb commit 0a2739feae90822f6f33e8e5aa00dbac73e8b7cb Author: Gordon Bergling AuthorDate: 2024-06-16 16:01:12 +0000 Commit: Gordon Bergling CommitDate: 2024-06-19 04:18:25 +0000 camcontrol.8: Fix a typo in the manual page - s/emtpy/empty/ (cherry picked from commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0) --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index cf7aec25022d..20ee6f945a52 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2317,7 +2317,7 @@ For the Report Zones command, specify a subset of zones to report. .It all Report all zones. This is the default. -.It emtpy +.It empty Report only empty zones. .It imp_open Report zones that are implicitly open. From nobody Wed Jun 19 06:43:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3vG64dTHz5P48r; Wed, 19 Jun 2024 06:43:26 +0000 (UTC) (envelope-from lexi@le-fay.org) Received: from fuchsia.eden.le-Fay.ORG (fuchsia.eden.le-fay.org [81.187.47.195]) by mx1.freebsd.org (Postfix) with ESMTP id 4W3vG60DSWz3yj5; Wed, 19 Jun 2024 06:43:26 +0000 (UTC) (envelope-from lexi@le-fay.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=le-fay.org header.s=fuchsia header.b=l0dqClrp; dmarc=none; spf=pass (mx1.freebsd.org: domain of lexi@le-fay.org designates 81.187.47.195 as permitted sender) smtp.mailfrom=lexi@le-fay.org Received: from iris.eden.le-Fay.ORG (iris.eden.le-fay.org [IPv6:fd12:8247:3:1::7]) by fuchsia.eden.le-Fay.ORG (Postfix) with ESMTP id 34BA4200F7; Wed, 19 Jun 2024 06:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=le-fay.org; s=fuchsia; t=1718779405; bh=HueTPg5D/p4lEFMHVbpyfNhllx7RQA2mN5nEcXj9nVg=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=l0dqClrpv5Mz2m+lfR2YQdOeuZxC0MKJN/H7e8ReYIcw4FqgnqjC0xtrQyFaDNwTR z73ns+kyE6Gv37BF4ZFMabtnIJx/8pD7rSO+e7QTleACslKI454vx1aFucZBpbkFgl 5MwY9aCkH/hEa+icxumzj5QCMO7huA5FGeNRR7/c= Received: from ilythia.eden.le-fay.org (ilythia.eden.le-fay.org [IPv6:2001:8b0:aab5:c003:3::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by iris.eden.le-Fay.ORG (Postfix) with ESMTPSA id 205622C046F; Wed, 19 Jun 2024 07:43:23 +0100 (BST) Date: Wed, 19 Jun 2024 07:43:24 +0100 From: Lexi Winter To: "Bjoern A. Zeeb" Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 50ecbc5142e1 - main - libipsec: make const-correct Message-ID: Mail-Followup-To: "Bjoern A. Zeeb" , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202404230452.43N4qhYd063681@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bedbMt6zlDZY/qNY" Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.50 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.995]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip4:81.187.47.195:c]; R_DKIM_ALLOW(-0.20)[le-fay.org:s=fuchsia]; RCVD_NO_TLS_LAST(0.10)[]; ASN(0.00)[asn:20712, ipnet:81.187.0.0/16, country:GB]; DWL_DNSWL_NONE(0.00)[le-fay.org:dkim]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[le-fay.org]; DKIM_TRACE(0.00)[le-fay.org:+] X-Rspamd-Queue-Id: 4W3vG60DSWz3yj5 --bedbMt6zlDZY/qNY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Bjoern A. Zeeb: > > commit 50ecbc5142e1c58f2132b351da19c5e4aa5f4e6a > > Author: Lexi Winter > > AuthorDate: 2024-04-22 21:56:24 +0000 > > Commit: Warner Losh > > CommitDate: 2024-04-23 04:36:34 +0000 > >=20 > > libipsec: make const-correct >=20 > I am surprised that this did not break ipsec-tools and/or other ports > for conflicting types for ipsec_set_policy(), ipsec_get_policylen() and > ipsec_dump_policy(). it did, actually. maybe this should be reverted, although the current situation is also bad since the non-const-correct prototypes cause issues in client code. in the specific case of ipsec-tools i feel like a better fix might be to update ipsec-tools to work with the new prototypes; it does seem to have support for this (using __ipsec_const), that just isn't enabled on FreeBSD and i didn't understand the automake logic enough to determine why. --bedbMt6zlDZY/qNY Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEuwt6MaPcv/+Mo+ftDHqbqZ41x5kFAmZyfgwACgkQDHqbqZ41 x5m7rQv+JVEAd3UN+GVdDtgQ3xiBjguu1Hxlbva0SL+vNsqlj0xOpIwRr3UEcrx8 aodY8Vf8dMGsH87Defv+qaqTwCqOTtbNuY6LUoXUgREccHreJTLNiCe2p4Gveloa Gsy6YqPmLHdpsc1g2TbyqgRRmUbUeyXd6N6fEHXLzWMyGQ6T+x+tIvo9qt1Y2nHJ dOZAT0Lzja0htcdg3Q/rrQnHP5+YtLfwARULht65N1C+ttDE1bDI2e1eyV1El3F3 cHUlfrh+tZpJRqOGM1NeNklc83nO6kgPlonW5XwRgyZz0ePkKkI8oso9N0HoM1BI 0ESY6uOqx6HB8ikGRAHWZiX3GNNFpgTALK2YjkTsOO2rOEL/s1hrfM8pwvf+SCml IMxPX+HKSdfQhJ0npapPxg/FHMl8JOhkhhxM+zrdMRihuNVTWNHlxqUKI21VUo3n Z4Kssuz5SBUpApI48heXElIj0fmEJ9zm8YZmxM3xspGMuOn+rqqeThmwiJ88NBG/ wrk29H2e =aNWt -----END PGP SIGNATURE----- --bedbMt6zlDZY/qNY-- From nobody Wed Jun 19 10:01:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3zg41qVPz5PKG5; Wed, 19 Jun 2024 10:01: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 4W3zg35TNZz4JqV; Wed, 19 Jun 2024 10:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718791311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6s9PeV+ipdqEQImCDlvMOHjDqlFgxnHdVyZUzj+abWU=; b=SsO7qNarl3nNPhOR+gcPowYSyrzgc2CQoeMKP23UYEce8XKPGo+81L9Vhc5Up/PufN2Sa+ y3ZYhD9GAvXIlXs6tHYrwdR4GYgzVRjQnMASwDaWhckT2YMxO078F+N50RVFsd0FXL7n/j cLnbAzteW/tAsZkp6piTx8kiWBxOeE/rHTalSKTJraBuoU0Fjarc/tyWSUt2M+BN8lQvzg BAD8qXpJS8x7xeQBz6jOy2Fs7ElhVAmwvw4XUSCp+Je49pG6OobbUIv+BBsZzE9Witindq Zb7KrN8uUTcdwWRIgStK4ENNS9ypkI8vID6n4c7KoUsMx3RTc7Fa0L4RoEuDjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718791311; a=rsa-sha256; cv=none; b=Q3qzn0ijG1jqMCNtba20R+QLqwOSgmGKqVhxmGoD/hwG+NWbiEjOGfXnH4uU9hjjcDyxIh ucU4KUggi4r9WQji5JqARAoWhGwr3ss+JM//dvcWI2DZjiz+aiHFfSUOPsi/UyEB3srggE eBr5pkG0Ej38JPGqv9fYQPOgUbju228/fO53nkxI4KcKF7csJLnSl0khc+JYVE6O3jtBJi g5OfxVkim/yUrZ3M5tDx8WMWIMMiUxYlCdXXrWYB71nmHylBxBW181V10mB0gMZf8hotBj 7zgt3rRwL95vcT/Ie4TphyA81lJkDmHoMVlg7XDD3sxHuF6U2qgKe0oK6djS0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718791311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6s9PeV+ipdqEQImCDlvMOHjDqlFgxnHdVyZUzj+abWU=; b=CsHrEQ5KAS6CJ5SiFggwbofpUSZ2JY6PJBqza0aB2Lk6rGQQZS1BIxmNkSeWYDZoEkr1n2 lck0f7bySrKcu26fWD4T74mtfD0vdNFjHitxFQDaK3S3VWj3N/nfvGDHZVlVNaMjg0YbVP JARwbE4gcRQ1DmFn5iz8WdhqU+N4v0UxDjdoqj+/zDuvo0SRZxxN/9Fm25dQoxvxUmDcaO uRUILGdl2ZwWPRV8p+ADwQksxYlf3EBVEkAkNgB5v2jOs05J2Tnq+D1Lu4xGKpsXMWFISx UooYK3wCzh79eg1kDUrgxaIfgNl436FZHw7NMqi1fl2ht19sgSQTCmg2I6YYqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3zg354m0zdSB; Wed, 19 Jun 2024 10:01: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 45JA1pjA031517; Wed, 19 Jun 2024 10:01:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JA1pfE031514; Wed, 19 Jun 2024 10:01:51 GMT (envelope-from git) Date: Wed, 19 Jun 2024 10:01:51 GMT Message-Id: <202406191001.45JA1pfE031514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f1ee9f5425bd - stable/14 - sound: Support oss_audioinfo->cmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1ee9f5425bd1d5798ad7e88c5b803308bd518c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f1ee9f5425bd1d5798ad7e88c5b803308bd518c5 commit f1ee9f5425bd1d5798ad7e88c5b803308bd518c5 Author: Christos Margiolis AuthorDate: 2024-06-18 13:18:58 +0000 Commit: Christos Margiolis CommitDate: 2024-06-19 10:01:33 +0000 sound: Support oss_audioinfo->cmd Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45603 (cherry picked from commit 8e36d212594b542cb0c57d549e0b57fd0f7e307c) --- sys/dev/sound/pcm/dsp.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c737df33b97d..0f6d7e6b7f49 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2047,6 +2047,7 @@ dsp_oss_audioinfo_unavail(oss_audioinfo *ai, int unit) ai->dev = unit; snprintf(ai->name, sizeof(ai->name), "pcm%d (unavailable)", unit); ai->pid = -1; + strlcpy(ai->cmd, CHN_COMM_UNUSED, sizeof(ai->cmd)); ai->card_number = unit; ai->port_number = unit; ai->mixer_dev = -1; @@ -2132,6 +2133,7 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex) ai->dev = unit; strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name)); ai->pid = -1; + strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd)); ai->card_number = -1; ai->port_number = -1; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; @@ -2317,14 +2319,8 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) else ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; - /** - * @note - * @c cmd - OSSv4 docs: "Only supported under Linux at - * this moment." Cop-out, I know, but I'll save - * running around in the process table for later. - * Is there a risk of leaking information? - */ ai->pid = ch->pid; + strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd)); /* * These flags stolen from SNDCTL_DSP_GETCAPS handler. From nobody Wed Jun 19 10:01:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3zg50R2wz5PKG6; Wed, 19 Jun 2024 10: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 4W3zg46SnYz4JsV; Wed, 19 Jun 2024 10:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718791312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ie/JrYBnQZ7V8y2lzBWlBpK0dF6PlPWs05xAkr5wJk=; b=w20uDQtGRMQZRSWnAHsOJQ0wycCjIrZzh1WMzO6jc6wvqmYYoQOoERTLkOjPb2iCT1Ewid J6/8SgIoYbCoaCCpND/eV/MxFHyT3YmoSDYv7jxlfl/IwugXW/4yPVrY9tsO+qaVEfNmDB eUn8Njvs1s5wupqVKBUvt326zP7lV32baVHKeFKCxoAYOPyjKWl+6wfihSTlrIQdDw/VYE JmhWHb2GsT+dlGZBc/RMDHvjNDK04Whu/+NkClyk8trrvHFYsQg1OaIGd88VkpcCFK1LCd QxN+J3zSwLc3rBKIaEn+uuKxMvtrew/nqepg2VC2O8kPQUOPJ1nzg4ozvEVspw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718791312; a=rsa-sha256; cv=none; b=ZTeF0pBzIahaHHTANFTdKs0KcOjnxWXIwvyqSszRSJaAxriiSCvhNfvvZ35cW4zuCsm5cs f61yWE/Wiq0lw57VneW4FB+7v5Wu8SJzACf9azC+iz86cSN1XtQkR0/Q6ej7uxxcoutSm3 i9mmtxQNpLEz2mlcXoJdzUv+rYOR89Gn0IXXu5Pn9pY6p4YZtdm99euKYw8cXdfN4ACLBT 5nxHeKbApmGFnnqWAPrFNpmt8jRwwdU0Lq1Fq0rRl9BzObGW1HieAeU4uwaKpvC09NSuHl ogmIld5wROzxGOTco5cHmZZxWOW27hC2jksHY9ikFt3/3W/l3ymqNB4IFxdqnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718791312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ie/JrYBnQZ7V8y2lzBWlBpK0dF6PlPWs05xAkr5wJk=; b=DCfTl2t3V0gufQCk5OGo9ygpzM92b5UEt+PdPk1CSkw9rSUoLge7ggDiE04sIRGVXN9F1N HpsHhUgyol5pgQk+qH9WhtWjbGKcfQAIckPf0wWzn2j9CrkHUJiNPSU81JLfNNvJ9N9fPx R0jxo6hj4D1tfeNFii0VXfkQhi8XZP1UdekMc9dsvNiAwYrg5H+A3TNFJl8LPP5rGf9GEg r4g/HF6/ZaIIAvVbjJQWG2Icy2rvR6jPBLr4it9r0y8ReIznucc9NjealR21D1jlMme3H7 kXh+jIgvlJVaucnRvzrO6ok5x1qpSY673WjNhO3eiYCov4hGXH/5l8ULEfu64g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3zg464vzzd8D; Wed, 19 Jun 2024 10:01: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 45JA1qoh031569; Wed, 19 Jun 2024 10:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JA1qgQ031566; Wed, 19 Jun 2024 10:01:52 GMT (envelope-from git) Date: Wed, 19 Jun 2024 10:01:52 GMT Message-Id: <202406191001.45JA1qgQ031566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6f090333db2a - stable/14 - sound: Fix oss_audioinfo's card_number, port_number and legacy_device List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f090333db2a9fe6d7f446145054eddd50ddc3fb Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6f090333db2a9fe6d7f446145054eddd50ddc3fb commit 6f090333db2a9fe6d7f446145054eddd50ddc3fb Author: Christos Margiolis AuthorDate: 2024-06-18 13:19:07 +0000 Commit: Christos Margiolis CommitDate: 2024-06-19 10:01:33 +0000 sound: Fix oss_audioinfo's card_number, port_number and legacy_device Although the docs advise against using them, it doesn't hurt to fill them out correctly. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45604 (cherry picked from commit 0f878cdfc5a46cc0dc198e12758f12558dfb1bf6) --- sys/dev/sound/pcm/dsp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 0f6d7e6b7f49..f94e5c05a743 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2134,8 +2134,8 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex) strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name)); ai->pid = -1; strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd)); - ai->card_number = -1; - ai->port_number = -1; + ai->card_number = unit; + ai->port_number = unit; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; ai->legacy_device = unit; snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); @@ -2371,20 +2371,20 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) * should normally not use this field for any * purpose." */ - ai->card_number = -1; + ai->card_number = unit; /** * @todo @c song_name - depends first on * SNDCTL_[GS]ETSONG @todo @c label - depends * on SNDCTL_[GS]ETLABEL * @todo @c port_number - routing information? */ - ai->port_number = -1; + ai->port_number = unit; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note * @c legacy_device - OSSv4 docs: "Obsolete." */ - ai->legacy_device = -1; + ai->legacy_device = unit; snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** From nobody Wed Jun 19 10:01:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3zg61j5Kz5PKJd; Wed, 19 Jun 2024 10:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W3zg60Npbz4Jsd; Wed, 19 Jun 2024 10:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718791314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AZnffPG6YrYajKESXQD0e6fuLsWw/I7vhcq8yAa60To=; b=bO7Mxpy96tibreNx1cdubxQLKL4de+eFFx1mvX1dUPF7vfzCgDyP93+xFwF69DGPOnB22a GDjdxWR3k4VatKXe11t0M8e3QJsOHmwN/DADhzIwZrzrMmaGBxEdgvp4Q8NYY2m8Mlc2Es mTyHsOZ5eutNZlkAh7zUSEgRJUdGn3d3IYJ/HSRbgsYvCxqbT6USTabIRQ2/QQBh5XuVmp KZvcZqgWJWC1gk482f/ev3YJk1qrm7t9v8xAkoQWnnOmdp+aw441UmiisDmC3bxybwg6nv szzYIweHe9tgNBXq1z2vqlCwejkVDVabuiUWk3ZayZCQdEvptDDUtBlWvDU2dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718791314; a=rsa-sha256; cv=none; b=p7v+pcr1eesvkVbKiyF0R2OBdlGb2vU2SVeGDeRyKRIEx+JSPqHE0nEAUbBj8vb+15aivm wYCGUBV5p7Lel80FRJr0NRzBuR3VsROR9aPNzTih5z9flwFomdNEF2TMjmDVDhHY2ZCFrY 2siYSzypTf6XW+tf+tuBSgEVvETa992uXH29/WUDACjH5creX9ADJ9+f6j6O8ZLTK/dSSt 84iAFqq/prW8dvjkjgdqL9bsLP3HrO88qwX1Wei4Z1+22FripbDIksXNBp+klxHhErIAMj NNUz9oNu/hsopm8QI+eT+NEYIFGBratPHHO3V6DVPPv7SPBvXlYKDvgVIsJWSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718791314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AZnffPG6YrYajKESXQD0e6fuLsWw/I7vhcq8yAa60To=; b=Vsam6v1eXlkELu82oeQA0+ol9XdE4tcGKwPSicrkg7ImcL0Jl++0msse9d7EzN8WK0c+gw rxfmR1jLkdW60GmfdHashrmd3B67ypWj1tuCRzXRvL0rKGa9iUw+yiA6IWjCEQ4oMbH4xJ 3hR1kywqnl6ZtAU/vBWvwzOgQCaBkLmPlNUev9PO4RbjngLn4/HkLvtt0moF197ljcpXbI 9hnOCyIqFnFcdJWosOqA7YGwTQ5+YptPsajLEOjzlICJgpf/3IXAv/p784gYp8PaP75qc0 5hftay0CFE9V1lItfjnAswKYn8CE0JTdttkxTuYJA9EDeG7TCnRp093hkMj71A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3zg574YLzdDk; Wed, 19 Jun 2024 10: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 45JA1rAY031617; Wed, 19 Jun 2024 10: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 45JA1r5d031614; Wed, 19 Jun 2024 10:01:53 GMT (envelope-from git) Date: Wed, 19 Jun 2024 10:01:53 GMT Message-Id: <202406191001.45JA1r5d031614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 935c5a5554e9 - stable/14 - sound: Remove outdated comment in dsp_oss_engineinfo() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 935c5a5554e9726643f51d40d53de604fd30ab57 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=935c5a5554e9726643f51d40d53de604fd30ab57 commit 935c5a5554e9726643f51d40d53de604fd30ab57 Author: Christos Margiolis AuthorDate: 2024-06-18 13:19:16 +0000 Commit: Christos Margiolis CommitDate: 2024-06-19 10:01:34 +0000 sound: Remove outdated comment in dsp_oss_engineinfo() Since we e07f9178502b ("sound: Separate implementations for SNDCTL_AUDIOINFO[_EX] and SNDCTL_ENGINEINFO") support more than mono/stereo. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: dev_submerge.ch, markj, emaste Differential Revision: https://reviews.freebsd.org/D45605 (cherry picked from commit 914c2b3314e8f6e31833e33cfdcc4843f88fe31b) --- sys/dev/sound/pcm/dsp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f94e5c05a743..0eb41faaae45 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2337,13 +2337,7 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) /* * Collect formats supported @b natively by the - * device. Also determine min/max channels. (I.e., - * mono, stereo, or both?) - * - * If any channel is stereo, maxch = 2; - * if all channels are stereo, minch = 2, too; - * if any channel is mono, minch = 1; - * and if all channels are mono, maxch = 1. + * device. Also determine min/max channels. */ minch = INT_MAX; maxch = 0; From nobody Wed Jun 19 12:13:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W42Zt0f5Sz5N23y; Wed, 19 Jun 2024 12:13: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 4W42Zt0Lm1z4Vg2; Wed, 19 Jun 2024 12:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718799206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBumbbcpaRDbL160ZzL6WDY/bT8voxLPT/kckYXfxzY=; b=tPyXTY6kMvMnnxf6EwV86LwTqkb4m+kEz8pKC8Km8alEQfJgangBox+Boh0tsohx1UrJcl TgogUTeT+JdiTA9QeloeYJqk4ukKKNb0mlXhXNaQq7JhXJuxjgIzjAUByR3YRCIOXWLzP8 IRY7pfDCp2t7oyyQoxyQqYtVYns0TFsmFjlfgaAtE/CUTLKtxeQPbqiueMjah8hT3Ew4vn 6erHaWNT7ZZlPFnRGyUmnL8WyY5acI444PUNPsbFOXHQa88H5x1T2NZXaZvh0NBl/9Sl/e Cab4JWRK3pRKQzGUMKrQCN7JJa/zOkwrp55jdjj61Rlegm0FM3o2gLV00bqe6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718799206; a=rsa-sha256; cv=none; b=cQtPqPzgZiCePio5XbicLls7SbgIZOZ1HgIXRYM3+SZfpUSlfhpe0t31hBcmuXQ3VH3k5R xFkB24dUhyvkx9Aw3WSuZZ9bNzH3tOhX6UNG6P/Rg5JR4nQrf3n/Vmp/7LIxQheNFPT65N 80CoXG272EXmzEKMvS67mHb46yuPxdmY04znuq13HEqT0L5ET4P/ta3MgDdvNUxl49JqGm sqeHDQALPXHXmcvWREoor8aNjAo0JyzUzlena5u+vSqCSFHTUadBBcAjuusI7C74DoiHlL QuaSp3h1MdH9AJamKLtujTWkSuzYbblPnxQz6W1AapId30OJe6CGaYdFYkxgvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718799206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBumbbcpaRDbL160ZzL6WDY/bT8voxLPT/kckYXfxzY=; b=NH9nDXfqK3kxcVxGSZFh5FZV0T39+0xra0nftLDMgcKiamGNKCN3EcWwfMG+6WgXSG3Mm9 Za8wnThC+MRd6Wb7pKEnZ7XEq6ipSmIdh82FXyFxn3FR2nhhEGqdfajn18pW6k5yg/raUB zQTaU5skc9qzhnZSDkcBmzqb8yGDvJoMx8GBZedTrNX/zko6Df5KaYNd5X+3MOAkGr7Luc 2e2ggneYNMHG8N5bRMCiU68G7oCyyA/aOxUCgBMV/AgLMGXcGGDyYKcl6FeIAczPGCl5Bc VwdAJJrNqdVQh9U50VJxpjW7VgRWee5S1+u1Ro9lFAqrvRmPu22peOhxtQANUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W42Zs7408zhmp; Wed, 19 Jun 2024 12:13: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 45JCDPO0051967; Wed, 19 Jun 2024 12:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JCDPPP051964; Wed, 19 Jun 2024 12:13:25 GMT (envelope-from git) Date: Wed, 19 Jun 2024 12:13:25 GMT Message-Id: <202406191213.45JCDPPP051964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: e97ad33a89a7 - main - Add an implementation of the 9P filesystem List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e97ad33a89a78f55280b0485b3249ee9b907a718 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=e97ad33a89a78f55280b0485b3249ee9b907a718 commit e97ad33a89a78f55280b0485b3249ee9b907a718 Author: Doug Rabson AuthorDate: 2022-12-06 13:07:46 +0000 Commit: Doug Rabson CommitDate: 2024-06-19 12:12:04 +0000 Add an implementation of the 9P filesystem This is derived from swills@ fork of the Juniper virtfs with many changes by me including bug fixes, style improvements, clearer layering and more consistent logging. The filesystem is renamed to p9fs to better reflect its function and to prevent possible future confusion with virtio-fs. Several updates and fixes from Juniper have been integrated into this version by Val Packett and these contributions along with the original Juniper authors are credited below. To use this with bhyve, add 'virtio_p9fs_load=YES' to loader.conf. The bhyve virtio-9p device allows access from the guest to files on the host by mapping a 'sharename' to a host path. It is possible to use p9fs as a root filesystem by adding this to /boot/loader.conf: vfs.root.mountfrom="p9fs:sharename" for non-root filesystems add something like this to /etc/fstab: sharename /mnt p9fs rw 0 0 In both examples, substitute the share name used on the bhyve command line. The 9P filesystem protocol relies on stateful file opens which map protocol-level FIDs to host file descriptors. The FreeBSD vnode interface doesn't really support this and we use heuristics to guess the right FID to use for file operations. This can be confused by privilege lowering and does not guarantee that the FID created for a given file open is always used for file operations, even if the calling process is using the file descriptor from the original open call. Improving this would involve changes to the vnode interface which is out-of-scope for this import. Differential Revision: https://reviews.freebsd.org/D41844 Reviewed by: kib, emaste, dch MFC after: 3 months Co-authored-by: Val Packett Co-authored-by: Ka Ho Ng Co-authored-by: joyu Co-authored-by: Kumara Babu Narayanaswamy --- share/man/man5/Makefile | 1 + share/man/man5/p9fs.5 | 127 +++ sys/conf/files | 7 + sys/conf/options | 1 + sys/dev/virtio/p9fs/virtio_p9fs.c | 511 +++++++++ sys/dev/virtio/p9fs/virtio_p9fs.h | 39 + sys/fs/p9fs/p9_client.c | 1311 ++++++++++++++++++++++ sys/fs/p9fs/p9_client.h | 168 +++ sys/fs/p9fs/p9_debug.h | 45 + sys/fs/p9fs/p9_protocol.c | 632 +++++++++++ sys/fs/p9fs/p9_protocol.h | 280 +++++ sys/fs/p9fs/p9_transport.c | 70 ++ sys/fs/p9fs/p9_transport.h | 53 + sys/fs/p9fs/p9fs.h | 203 ++++ sys/fs/p9fs/p9fs_proto.h | 42 + sys/fs/p9fs/p9fs_subr.c | 411 +++++++ sys/fs/p9fs/p9fs_vfsops.c | 602 +++++++++++ sys/fs/p9fs/p9fs_vnops.c | 2148 +++++++++++++++++++++++++++++++++++++ sys/kern/vfs_mountroot.c | 1 + sys/modules/Makefile | 1 + sys/modules/p9fs/Makefile | 8 + sys/modules/virtio/Makefile | 2 +- sys/modules/virtio/p9fs/Makefile | 32 + 23 files changed, 6694 insertions(+), 1 deletion(-) diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index bc345b42717c..465cc85a3feb 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -35,6 +35,7 @@ MAN= acct.5 \ nsmb.conf.5 \ nsswitch.conf.5 \ os-release.5 \ + p9fs.5 \ passwd.5 \ pbm.5 \ periodic.conf.5 \ diff --git a/share/man/man5/p9fs.5 b/share/man/man5/p9fs.5 new file mode 100644 index 000000000000..5c110e3dc963 --- /dev/null +++ b/share/man/man5/p9fs.5 @@ -0,0 +1,127 @@ +.\" +.\" Copyright (c) 2022-present Doug Rabson +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS DOCUMENTATION 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. +.\" +.Dd December 7, 2022 +.Dt P9FS 5 +.Os +.Sh NAME +.Nm p9fs +.Nd "9P file system" +.Sh SYNOPSIS +To use this filesystem, +either add the following to the kernel config: +.Bd -ragged -offset indent +.Cd "options P9FS" +.Cd "device virtio_p9fs" +.Ed +.Pp +Alternatively, load the driver as a kernel module, +either at boot time by adding the following to +.Xr loader.conf 5 : +.Bd -literal -offset indent +virtio_p9fs_load="YES" +.Ed +.Pp +or on system startup using the command: +.Pp +.Dl "# sysrc kld_list+=virtio_p9fs" +.Sh DESCRIPTION +The +.Nm +filesystem uses the 9P protocol to mount a host file system directory +into a +.Xr bhyve 8 +guest. +Multiple host directories can be accessed using the +.Xr bhyve 8 +virtio-9p virtual PCI device. +Each device is configured with a share name and a host directory path. +The share name can be used with +.Xr mount 8 +to mount the host directory in the guest: +.Pp +.Dl "# mount -t p9fs mysharename /mnt" +.Pp +Host directories can be mounted on system startup using +.Xr fstab 5 +like this: +.Pp +.Bd -literal -offset indent +mysharename /mnt p9fs rw 0 0 +.Ed +.Pp +Using +.Nm +as a root file system is supported by adding the following to +.Xr loader.conf 5 : +.Bd -literal -offset indent +vfs.root.mountfrom="p9fs:mysharename" +.Ed +.Sh LIMITATIONS +The 9P protocol relies on stateful file opens +which map protocol-level FIDs to host file descriptors. +The FreeBSD vnode interface doesn't support this and +.Nm +uses heuristics to guess the right FID to use for file operations. +.Pp +This can be confused by privilege lowering and +does not guarantee that the FID created for a +given file open is always used, +even if the calling process is using the file descriptor from +the original open call. +.Pp +In particular, accessing unlinked files using open file descriptor +may not work correctly. +If +.Nm +is the root filesystem, +it is recommented to use with +.Xr tmpfs 5 +to ensure that temporary files created in +.Pa /tmp +or +.Pa /var/tmp +have the expected semantics. +.Sh SEE ALSO +.Xr fstab 5 +.Sh HISTORY +The 9P protocol first appeared in the Plan 9 operating system. +More recently, the protocol has been widely used with virtual machines +to allow the use of host file resources inside a guest VM. +.Sh AUTHORS +This is derived from software released by Juniper Networks, Inc. +with many improvements and fixes from +.An Steve Wills . +.Pp +This manual page was written by +.An -nosplit +.An Doug Rabson Aq Mt dfr@FreeBSD.org . +.Sh BUGS +A better name for this filesystem would be +.Ar 9pfs +but for technical reasons, +the names of filesystems must be valid C identifiers. +As a compromise, +the filesystem is named +.Nm . diff --git a/sys/conf/files b/sys/conf/files index 875021aaa357..968894ea948b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3444,6 +3444,7 @@ dev/virtio/balloon/virtio_balloon.c optional virtio_balloon dev/virtio/block/virtio_blk.c optional virtio_blk dev/virtio/console/virtio_console.c optional virtio_console dev/virtio/gpu/virtio_gpu.c optional virtio_gpu +dev/virtio/p9fs/virtio_p9fs.c optional virtio_p9fs dev/virtio/random/virtio_random.c optional virtio_random dev/virtio/scmi/virtio_scmi.c optional virtio_scmi dev/virtio/scsi/virtio_scsi.c optional virtio_scsi @@ -3593,6 +3594,12 @@ fs/nfsserver/nfs_nfsdcache.c optional nfsd inet fs/nullfs/null_subr.c optional nullfs fs/nullfs/null_vfsops.c optional nullfs fs/nullfs/null_vnops.c optional nullfs +fs/p9fs/p9_client.c optional p9fs +fs/p9fs/p9_protocol.c optional p9fs +fs/p9fs/p9_transport.c optional p9fs +fs/p9fs/p9fs_subr.c optional p9fs +fs/p9fs/p9fs_vfsops.c optional p9fs +fs/p9fs/p9fs_vnops.c optional p9fs fs/procfs/procfs.c optional procfs fs/procfs/procfs_dbregs.c optional procfs fs/procfs/procfs_fpregs.c optional procfs diff --git a/sys/conf/options b/sys/conf/options index d9bc981232c4..52fafffabd99 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -284,6 +284,7 @@ TMPFS opt_dontuse.h UDF opt_dontuse.h UNIONFS opt_dontuse.h ZFS opt_dontuse.h +P9FS opt_dontuse.h # Pseudofs debugging PSEUDOFS_TRACE opt_pseudofs.h diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c new file mode 100644 index 000000000000..48430b4f6b67 --- /dev/null +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -0,0 +1,511 @@ +/*- + * Copyright (c) 2017 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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. + * + */ +/* + * The Virtio 9P transport driver. This file contains all functions related to + * the virtqueue infrastructure which include creating the virtqueue, host + * interactions, interrupts etc. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#define VT9P_MTX(_sc) (&(_sc)->vt9p_mtx) +#define VT9P_LOCK(_sc) mtx_lock(VT9P_MTX(_sc)) +#define VT9P_UNLOCK(_sc) mtx_unlock(VT9P_MTX(_sc)) +#define VT9P_LOCK_INIT(_sc) mtx_init(VT9P_MTX(_sc), \ + "VIRTIO 9P CHAN lock", NULL, MTX_DEF) +#define VT9P_LOCK_DESTROY(_sc) mtx_destroy(VT9P_MTX(_sc)) +#define MAX_SUPPORTED_SGS 20 +static MALLOC_DEFINE(M_P9FS_MNTTAG, "p9fs_mount_tag", "P9fs Mounttag"); + +struct vt9p_softc { + device_t vt9p_dev; + struct mtx vt9p_mtx; + struct sglist *vt9p_sglist; + struct cv submit_cv; + bool busy; + struct virtqueue *vt9p_vq; + int max_nsegs; + uint16_t mount_tag_len; + char *mount_tag; + STAILQ_ENTRY(vt9p_softc) chan_next; +}; + +/* Global channel list, Each channel will correspond to a mount point */ +static STAILQ_HEAD( ,vt9p_softc) global_chan_list; +struct mtx global_chan_list_mtx; + +static struct virtio_feature_desc virtio_9p_feature_desc[] = { + { VIRTIO_9PNET_F_MOUNT_TAG, "9PMountTag" }, + { 0, NULL } +}; + +static void +global_chan_list_init(void) +{ + + mtx_init(&global_chan_list_mtx, "9pglobal", + NULL, MTX_DEF); + STAILQ_INIT(&global_chan_list); +} +SYSINIT(global_chan_list_init, SI_SUB_KLD, SI_ORDER_FIRST, + global_chan_list_init, NULL); + +/* We don't currently allow canceling of virtio requests */ +static int +vt9p_cancel(void *handle, struct p9_req_t *req) +{ + + return (1); +} + +SYSCTL_NODE(_vfs, OID_AUTO, 9p, CTLFLAG_RW, 0, "9P File System Protocol"); + +/* + * Maximum number of seconds vt9p_request thread sleep waiting for an + * ack from the host, before exiting + */ +static unsigned int vt9p_ackmaxidle = 120; + +SYSCTL_UINT(_vfs_9p, OID_AUTO, ackmaxidle, CTLFLAG_RW, &vt9p_ackmaxidle, 0, + "Maximum time request thread waits for ack from host"); + +/* + * Wait for completion of a p9 request. + * + * This routine will sleep and release the chan mtx during the period. + * chan mtx will be acquired again upon return. + */ +static int +vt9p_req_wait(struct vt9p_softc *chan, struct p9_req_t *req) +{ + if (req->tc->tag != req->rc->tag) { + if (msleep(req, VT9P_MTX(chan), 0, "chan lock", + vt9p_ackmaxidle * hz)) { + /* + * Waited for 120s. No response from host. + * Can't wait for ever.. + */ + P9_DEBUG(ERROR, "Timeout after waiting %u seconds" + "for an ack from host\n", vt9p_ackmaxidle); + return (EIO); + } + KASSERT(req->tc->tag == req->rc->tag, + ("Spurious event on p9 req")); + } + return (0); +} + +/* + * Request handler. This is called for every request submitted to the host + * It basically maps the tc/rc buffers to sg lists and submits the requests + * into the virtqueue. Since we have implemented a synchronous version, the + * submission thread sleeps until the ack in the interrupt wakes it up. Once + * it wakes up, it returns back to the P9fs layer. The rc buffer is then + * processed and completed to its upper layers. + */ +static int +vt9p_request(void *handle, struct p9_req_t *req) +{ + int error; + struct vt9p_softc *chan; + int readable, writable; + struct sglist *sg; + struct virtqueue *vq; + + chan = handle; + sg = chan->vt9p_sglist; + vq = chan->vt9p_vq; + + P9_DEBUG(TRANS, "%s: req=%p\n", __func__, req); + + /* Grab the channel lock*/ + VT9P_LOCK(chan); + sglist_reset(sg); + /* Handle out VirtIO ring buffers */ + error = sglist_append(sg, req->tc->sdata, req->tc->size); + if (error != 0) { + P9_DEBUG(ERROR, "%s: sglist append failed\n", __func__); + VT9P_UNLOCK(chan); + return (error); + } + readable = sg->sg_nseg; + + error = sglist_append(sg, req->rc->sdata, req->rc->capacity); + if (error != 0) { + P9_DEBUG(ERROR, "%s: sglist append failed\n", __func__); + VT9P_UNLOCK(chan); + return (error); + } + writable = sg->sg_nseg - readable; + +req_retry: + error = virtqueue_enqueue(vq, req, sg, readable, writable); + + if (error != 0) { + if (error == ENOSPC) { + /* + * Condvar for the submit queue. Unlock the chan + * since wakeup needs one. + */ + cv_wait(&chan->submit_cv, VT9P_MTX(chan)); + P9_DEBUG(TRANS, "%s: retry virtio request\n", __func__); + goto req_retry; + } else { + P9_DEBUG(ERROR, "%s: virtio enuqueue failed \n", __func__); + VT9P_UNLOCK(chan); + return (EIO); + } + } + + /* We have to notify */ + virtqueue_notify(vq); + + error = vt9p_req_wait(chan, req); + if (error != 0) { + VT9P_UNLOCK(chan); + return (error); + } + + VT9P_UNLOCK(chan); + + P9_DEBUG(TRANS, "%s: virtio request kicked\n", __func__); + + return (0); +} + +/* + * Completion of the request from the virtqueue. This interrupt handler is + * setup at initialization and is called for every completing request. It + * just wakes up the sleeping submission requests. + */ +static void +vt9p_intr_complete(void *xsc) +{ + struct vt9p_softc *chan; + struct virtqueue *vq; + struct p9_req_t *curreq; + + chan = (struct vt9p_softc *)xsc; + vq = chan->vt9p_vq; + + P9_DEBUG(TRANS, "%s: completing\n", __func__); + + VT9P_LOCK(chan); + while ((curreq = virtqueue_dequeue(vq, NULL)) != NULL) { + curreq->rc->tag = curreq->tc->tag; + wakeup_one(curreq); + } + virtqueue_enable_intr(vq); + cv_signal(&chan->submit_cv); + VT9P_UNLOCK(chan); +} + +/* + * Allocation of the virtqueue with interrupt complete routines. + */ +static int +vt9p_alloc_virtqueue(struct vt9p_softc *sc) +{ + struct vq_alloc_info vq_info; + device_t dev; + + dev = sc->vt9p_dev; + + VQ_ALLOC_INFO_INIT(&vq_info, sc->max_nsegs, + vt9p_intr_complete, sc, &sc->vt9p_vq, + "%s request", device_get_nameunit(dev)); + + return (virtio_alloc_virtqueues(dev, 1, &vq_info)); +} + +/* Probe for existence of 9P virtio channels */ +static int +vt9p_probe(device_t dev) +{ + + /* If the virtio device type is a 9P device, then we claim and attach it */ + if (virtio_get_device_type(dev) != VIRTIO_ID_9P) + return (ENXIO); + device_set_desc(dev, "VirtIO 9P Transport"); + + return (BUS_PROBE_DEFAULT); +} + +static void +vt9p_stop(struct vt9p_softc *sc) +{ + + /* Device specific stops .*/ + virtqueue_disable_intr(sc->vt9p_vq); + virtio_stop(sc->vt9p_dev); +} + +/* Detach the 9P virtio PCI device */ +static int +vt9p_detach(device_t dev) +{ + struct vt9p_softc *sc; + + sc = device_get_softc(dev); + VT9P_LOCK(sc); + vt9p_stop(sc); + VT9P_UNLOCK(sc); + + if (sc->vt9p_sglist) { + sglist_free(sc->vt9p_sglist); + sc->vt9p_sglist = NULL; + } + if (sc->mount_tag) { + free(sc->mount_tag, M_P9FS_MNTTAG); + sc->mount_tag = NULL; + } + mtx_lock(&global_chan_list_mtx); + STAILQ_REMOVE(&global_chan_list, sc, vt9p_softc, chan_next); + mtx_unlock(&global_chan_list_mtx); + + VT9P_LOCK_DESTROY(sc); + cv_destroy(&sc->submit_cv); + + return (0); +} + +/* Attach the 9P virtio PCI device */ +static int +vt9p_attach(device_t dev) +{ + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree; + struct vt9p_softc *chan; + char *mount_tag; + int error; + uint16_t mount_tag_len; + + chan = device_get_softc(dev); + chan->vt9p_dev = dev; + + /* Init the channel lock. */ + VT9P_LOCK_INIT(chan); + /* Initialize the condition variable */ + cv_init(&chan->submit_cv, "Conditional variable for submit queue" ); + chan->max_nsegs = MAX_SUPPORTED_SGS; + chan->vt9p_sglist = sglist_alloc(chan->max_nsegs, M_NOWAIT); + + /* Negotiate the features from the host */ + virtio_set_feature_desc(dev, virtio_9p_feature_desc); + virtio_negotiate_features(dev, VIRTIO_9PNET_F_MOUNT_TAG); + + /* + * If mount tag feature is supported read the mount tag + * from device config + */ + if (virtio_with_feature(dev, VIRTIO_9PNET_F_MOUNT_TAG)) + mount_tag_len = virtio_read_dev_config_2(dev, + offsetof(struct virtio_9pnet_config, mount_tag_len)); + else { + error = EINVAL; + P9_DEBUG(ERROR, "%s: Mount tag feature not supported by host\n", __func__); + goto out; + } + mount_tag = malloc(mount_tag_len + 1, M_P9FS_MNTTAG, + M_WAITOK | M_ZERO); + + virtio_read_device_config(dev, + offsetof(struct virtio_9pnet_config, mount_tag), + mount_tag, mount_tag_len); + + device_printf(dev, "Mount tag: %s\n", mount_tag); + + mount_tag_len++; + chan->mount_tag_len = mount_tag_len; + chan->mount_tag = mount_tag; + + ctx = device_get_sysctl_ctx(dev); + tree = device_get_sysctl_tree(dev); + SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "p9fs_mount_tag", + CTLFLAG_RD, chan->mount_tag, 0, "Mount tag"); + + if (chan->vt9p_sglist == NULL) { + error = ENOMEM; + P9_DEBUG(ERROR, "%s: Cannot allocate sglist\n", __func__); + goto out; + } + + /* We expect one virtqueue, for requests. */ + error = vt9p_alloc_virtqueue(chan); + + if (error != 0) { + P9_DEBUG(ERROR, "%s: Allocating the virtqueue failed \n", __func__); + goto out; + } + + error = virtio_setup_intr(dev, INTR_TYPE_MISC|INTR_MPSAFE); + + if (error != 0) { + P9_DEBUG(ERROR, "%s: Cannot setup virtqueue interrupt\n", __func__); + goto out; + } + error = virtqueue_enable_intr(chan->vt9p_vq); + + if (error != 0) { + P9_DEBUG(ERROR, "%s: Cannot enable virtqueue interrupt\n", __func__); + goto out; + } + + mtx_lock(&global_chan_list_mtx); + /* Insert the channel in global channel list */ + STAILQ_INSERT_HEAD(&global_chan_list, chan, chan_next); + mtx_unlock(&global_chan_list_mtx); + + return (0); +out: + /* Something went wrong, detach the device */ + vt9p_detach(dev); + return (error); +} + +/* + * Allocate a new virtio channel. This sets up a transport channel + * for 9P communication + */ +static int +vt9p_create(const char *mount_tag, void **handlep) +{ + struct vt9p_softc *sc, *chan; + + chan = NULL; + + /* + * Find out the corresponding channel for a client from global list + * of channels based on mount tag and attach it to client + */ + mtx_lock(&global_chan_list_mtx); + STAILQ_FOREACH(sc, &global_chan_list, chan_next) { + if (!strcmp(sc->mount_tag, mount_tag)) { + chan = sc; + break; + } + } + mtx_unlock(&global_chan_list_mtx); + + /* + * If chan is already attached to a client then it cannot be used for + * another client. + */ + if (chan && chan->busy) { + //p9_debug(TRANS, "Channel busy: used by clnt=%p\n", chan->client); + return (EBUSY); + } + + /* If we dont have one, for now bail out.*/ + if (chan) { + *handlep = (void *)chan; + chan->busy = TRUE; + } else { + P9_DEBUG(TRANS, "%s: No Global channel with mount_tag=%s\n", + __func__, mount_tag); + return (EINVAL); + } + + return (0); +} + +static void +vt9p_close(void *handle) +{ + struct vt9p_softc *chan = handle; + chan->busy = FALSE; +} + +static struct p9_trans_module vt9p_trans = { + .name = "virtio", + .create = vt9p_create, + .close = vt9p_close, + .request = vt9p_request, + .cancel = vt9p_cancel, +}; + +static device_method_t vt9p_mthds[] = { + /* Device methods. */ + DEVMETHOD(device_probe, vt9p_probe), + DEVMETHOD(device_attach, vt9p_attach), + DEVMETHOD(device_detach, vt9p_detach), + DEVMETHOD_END +}; + +static driver_t vt9p_drv = { + "virtio_p9fs", + vt9p_mthds, + sizeof(struct vt9p_softc) +}; + +static int +vt9p_modevent(module_t mod, int type, void *unused) +{ + int error; + + error = 0; + + switch (type) { + case MOD_LOAD: + p9_init_zones(); + p9_register_trans(&vt9p_trans); + break; + case MOD_UNLOAD: + p9_destroy_zones(); + break; + case MOD_SHUTDOWN: + break; + default: + error = EOPNOTSUPP; + break; + } + return (error); +} + +DRIVER_MODULE(virtio_p9fs, virtio_pci, vt9p_drv, vt9p_modevent, 0); +MODULE_VERSION(virtio_p9fs, 1); +MODULE_DEPEND(virtio_p9fs, virtio, 1, 1, 1); +MODULE_DEPEND(virtio_p9fs, p9fs, 1, 1, 1); diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.h b/sys/dev/virtio/p9fs/virtio_p9fs.h new file mode 100644 index 000000000000..924b413d29a5 --- /dev/null +++ b/sys/dev/virtio/p9fs/virtio_p9fs.h @@ -0,0 +1,39 @@ +/*- + * Copyright (c) 2017 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 __VIRTIO_9P_CONFIG__ +#define __VIRTIO_9P_CONFIG__ + +/* Mount point feature specified in config variable */ +#define VIRTIO_9PNET_F_MOUNT_TAG 1 + +struct virtio_9pnet_config { + /* Mount tag length */ + uint16_t mount_tag_len; + /* non NULL terminated tag name */ + uint8_t mount_tag[0]; +}; +#endif /* __VIRTIO_9P_CONFIG__ */ diff --git a/sys/fs/p9fs/p9_client.c b/sys/fs/p9fs/p9_client.c new file mode 100644 index 000000000000..8f36cc4e775a --- /dev/null +++ b/sys/fs/p9fs/p9_client.c @@ -0,0 +1,1311 @@ +/*- + * Copyright (c) 2017 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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. + * + */ + +/* + * This file contains 9P client functions which prepares message to be sent to + * the server. Every fileop typically has a function defined here to interact + * with the host. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#define QEMU_HEADER 7 +#define P9FS_MAX_FID_CNT (1024 * 1024 * 1024) +#define P9FS_ROOT_FID_NO 2 +#define P9FS_MIN_TAG 1 +#define P9FS_MAX_TAG 65535 +#define WSTAT_SIZE 47 +#define WSTAT_EXTENSION_SIZE 14 + +static MALLOC_DEFINE(M_P9CLNT, "p9_client", "p9fs client structure"); +static uma_zone_t p9fs_fid_zone; +static uma_zone_t p9fs_req_zone; +static uma_zone_t p9fs_buf_zone; + +SYSCTL_DECL(_vfs_p9fs); +int p9_debug_level = 0; +SYSCTL_INT(_vfs_p9fs, OID_AUTO, debug_level, CTLFLAG_RW, + &p9_debug_level, 0, "p9fs debug logging"); + +static struct p9_req_t *p9_get_request(struct p9_client *c, int *error); +static struct p9_req_t *p9_client_request( + struct p9_client *c, int8_t type, int *error, const char *fmt, ...); + +inline int +p9_is_proto_dotl(struct p9_client *clnt) +{ + + return (clnt->proto_version == p9_proto_2000L); +} + +inline int +p9_is_proto_dotu(struct p9_client *clnt) +{ + + return (clnt->proto_version == p9_proto_2000u); +} + +/* Parse mount options into client structure */ +static int +p9_parse_opts(struct mount *mp, struct p9_client *clnt) +{ + int error, len; + char *trans; + + /* + * Default to virtio since thats the only transport we have for now. + */ + error = vfs_getopt(mp->mnt_optnew, "trans", (void **)&trans, &len); + if (error == ENOENT) + trans = "virtio"; + + /* These are defaults for now */ + clnt->proto_version = p9_proto_2000L; + clnt->msize = 8192; + + /* Get the default trans callback */ + clnt->ops = p9_get_trans_by_name(trans); + + return (0); +} + +/* Allocate buffer for sending request and getting responses */ +static struct p9_buffer * +p9_buffer_alloc(int alloc_msize) +{ + struct p9_buffer *fc; + + fc = uma_zalloc(p9fs_buf_zone, M_WAITOK | M_ZERO); + fc->capacity = alloc_msize; + fc->offset = 0; + fc->size = 0; + fc->sdata = (char *)fc + sizeof(struct p9_buffer); + + return (fc); +} + +/* Free memory used by request and response buffers */ +static void +p9_buffer_free(struct p9_buffer **buf) +{ + + /* Free the sdata buffers first, then the whole structure*/ + uma_zfree(p9fs_buf_zone, *buf); + *buf = NULL; +} + +/* Free the request */ +static void +p9_free_req(struct p9_client *clnt, struct p9_req_t *req) +{ + + if (req->tc != NULL) { + if (req->tc->tag != P9_NOTAG) + p9_tag_destroy(clnt, req->tc->tag); + p9_buffer_free(&req->tc); + } + + if (req->rc != NULL) + p9_buffer_free(&req->rc); + + uma_zfree(p9fs_req_zone, req); +} + +/* Allocate a request by tag */ +static struct p9_req_t * +p9_get_request(struct p9_client *clnt, int *error) +{ + struct p9_req_t *req; + int alloc_msize; + uint16_t tag; + + alloc_msize = P9FS_MTU; + *** 5962 LINES SKIPPED *** From nobody Wed Jun 19 12:23:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W42p82Prnz5N3P5; Wed, 19 Jun 2024 12:23:12 +0000 (UTC) (envelope-from bapt@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 4W42p81cntz4XqH; Wed, 19 Jun 2024 12:23:12 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718799792; 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=I1jKbj+CnDEHUG98bli1L2eVkZWjNbq+kYX/E9fqYiA=; b=vgXlhOB/lw99OZACDlXeX1ARfDZLRWYwgKvYARdub/bf8MeSE5ZCSERFt0T3H+5/V8oB7q xY50mXntT5vOuLfsQKSjtspd5unpFT8AMkjZUb5nbgcxR4NuSRNRTghM7cNNh2tIhn6sdC IAoTsHhP1XJFHugD/UMnc2k2vJeEyI6xad9z/Cy+oyTYN6aCqDUIqy5CSLFK5DKcAqmOg0 rPcdsDanAH7sSpXbYjihTUHOIU8GZw4e45E/ycm8SY6iK40ASZ70mJUEFnv8/HLG/MJ3A9 BnKIRUmp1HFVSG5DyA5jwPVJCldIa+F2hH0euJbiC/KXriTX0lXFis78/GsXeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718799792; a=rsa-sha256; cv=none; b=gV1lvJR52BkpiyF7U6svXsBWoTuSC8KXZobGrJrHFX996aRxH8c2aV++2GEaI6IEBvcTxb +ty+XVPpr6X6rbtzMhjuVCIxfcgfJH26jLqVOsUBl+ADCxrmU8q142fSOa8hMT+uE1Mb/1 KcdRtSSKFieCL2rQ6Evof7HWvvva0TUQeZIHLeXheWN8yn5xged/rPPYJFNi9MebC7hP0k rnpadH2sSo5I0EqezcMiJGREc9TY7Ovc1Fv2SwmCmybVT/+V2S/6+ylVhWQotdAbSUARoD slW8wH8hJFQOip749v2+WZYKSgYb0TL1ABzn4qhSu5Irz8zdWMrRzu458M5scQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718799792; 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=I1jKbj+CnDEHUG98bli1L2eVkZWjNbq+kYX/E9fqYiA=; b=HUpV4wPeJ0ZrhZZ/XZlwT+U998o1zCMNUhJf6B0oVPClzDnWvQUkfxfOvLEgiyrxjGVtjT wzAYzQhAtmgLIK8hTQdpAMHEmcGHk2GtWCnDj3o7rCVNg46yS4fcR917M9vh6cXjsUQs9b WD/zqn9tFBF7nT7WHWco52iIkQK4H7iOk/OoP4Q/e0iu2873VGoom7q6rM6U5T1KIGgu52 AkQ3CSFsjkDSCFOAwDuU2yv5zzkpT6xnOcqtoSDjYYlw+5fAmNi+9eoAhyjNPVn6W+C7s6 0PNQ+GzEVfyiqL15k4/LojEIh5oD+EYAfOCUZ++Aj8GMCah6KLvEycMchYrztg== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W42p80XZTzNnk; Wed, 19 Jun 2024 12:23:12 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 0273695246; Wed, 19 Jun 2024 14:23:09 +0200 (CEST) Date: Wed, 19 Jun 2024 14:23:09 +0200 From: Baptiste Daroussin To: Doug Rabson Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e97ad33a89a7 - main - Add an implementation of the 9P filesystem Message-ID: References: <202406191213.45JCDPPP051964@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202406191213.45JCDPPP051964@gitrepo.freebsd.org> On Wed 19 Jun 12:13, Doug Rabson wrote: > The branch main has been updated by dfr: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e97ad33a89a78f55280b0485b3249ee9b907a718 > > commit e97ad33a89a78f55280b0485b3249ee9b907a718 > Author: Doug Rabson > AuthorDate: 2022-12-06 13:07:46 +0000 > Commit: Doug Rabson > CommitDate: 2024-06-19 12:12:04 +0000 > > Add an implementation of the 9P filesystem > > This is derived from swills@ fork of the Juniper virtfs with many > changes by me including bug fixes, style improvements, clearer layering > and more consistent logging. The filesystem is renamed to p9fs to better > reflect its function and to prevent possible future confusion with > virtio-fs. > > Several updates and fixes from Juniper have been integrated into this > version by Val Packett and these contributions along with the original > Juniper authors are credited below. > > To use this with bhyve, add 'virtio_p9fs_load=YES' to loader.conf. The > bhyve virtio-9p device allows access from the guest to files on the host > by mapping a 'sharename' to a host path. It is possible to use p9fs as a > root filesystem by adding this to /boot/loader.conf: > > vfs.root.mountfrom="p9fs:sharename" > > for non-root filesystems add something like this to /etc/fstab: > > sharename /mnt p9fs rw 0 0 > > In both examples, substitute the share name used on the bhyve command > line. > > The 9P filesystem protocol relies on stateful file opens which map > protocol-level FIDs to host file descriptors. The FreeBSD vnode > interface doesn't really support this and we use heuristics to guess the > right FID to use for file operations. This can be confused by privilege > lowering and does not guarantee that the FID created for a given file > open is always used for file operations, even if the calling process is > using the file descriptor from the original open call. Improving this > would involve changes to the vnode interface which is out-of-scope for > this import. > First of all: thanks a lot! you say the changes in the vnode interface are out of scope for this import, which makes perfectly sense, but it is part of your TODO for later? Best regards, Bapt From nobody Wed Jun 19 14:02:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W451W3dfjz5NCNw for ; Wed, 19 Jun 2024 14:03:11 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-yw1-x112c.google.com (mail-yw1-x112c.google.com [IPv6:2607:f8b0:4864:20::112c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W451W0BpFz4h6N for ; Wed, 19 Jun 2024 14:03:10 +0000 (UTC) (envelope-from dfr@rabson.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-x112c.google.com with SMTP id 00721157ae682-62ce53782f4so67232867b3.0 for ; Wed, 19 Jun 2024 07:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20230601.gappssmtp.com; s=20230601; t=1718805790; x=1719410590; 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=eihFgMoc6JXHHs8e5QjqtC1BJioKF61VzZKsrUESwQw=; b=wp9g0zAE23peO93QpfVfYApGL5NbGsNmbOcFJsWrSnhLlOxA1gN76ZR7o221L8A2Sm 5ash05f6Ychv3cUi0V3+udoPbtLsSq9U+Im4036luTLXnSIQdOLowB9rHtfYbb/mreza AZTYsOv55CCCBQa50EK0ir0LeFTU4Pr6mmRdcbqIuIiUDy8+BT6GdvDLRKnGmKKfKzB2 i0zLhOBcpfVvYw+FqRFtd3U4vuOxvEiwC2NFeG3iZSRHNEAeT1vJRYvHJZ3NpaHk+5IH 9qJVUSQi5f787mQ0fWRlfEJizvp0p4n81kccqTK2g5O5Nlk10p1VktWJxtK0eDinTYHl 5UQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718805790; x=1719410590; 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=eihFgMoc6JXHHs8e5QjqtC1BJioKF61VzZKsrUESwQw=; b=sRGzcj/r1JtyiW+xTU9uKeIt6Sj648WmbHhaF0WZvQewv8KPaJCOMUYFlTqf8Lp2+/ /+2158i0B9OHW6mQYhEBVAp98FqaenpE3E1cR0DkBouDIKzn7buekpdnc02a6ACY12vQ zRVj5T6wLM7EjpbTzcVHQGXaDSL8qGCkfOwojcRltacrHCe1ZKUoWffWUxVzZxsAb0Ed qmzBSj6jufcsQZrKBYBzNrisRe3lRj0TWa2UvNo9YSxOOXM9cn6ZvgbpgXJ+E06dlpI6 Ja4U9aNIMLNDwSezo6K++USyidGbtwysKLmGeZmka0ejqb0DYPIaOt3xsvK18xiHIyNQ iU9g== X-Forwarded-Encrypted: i=1; AJvYcCVoK1q2x35OWCt9pbiSbZs5rgqEMzgujawh89Vh+/gZfGHWddeDnUk+PuZl0/TAdZyBoiA+IrYUafJbmYbLwg1jyhX7HXgSeLdntxELr7zS X-Gm-Message-State: AOJu0Yz5Khm2N4aOSHcFpVLBV5rVdzeQHL+2RnKCdykK6ptIA1zXBben opxPFqAvpRFaa4aD3ghyyWchxtNN0WlP22NOezziKmdX/qXjkuIvWlzPmIrrVtcEoB8DfrsP1lv oqu/rzabK4yBB0mkTK0bPxEpObnTaC+m8WRpxrT3Gy1vxzqyr X-Google-Smtp-Source: AGHT+IHsjUiXV5zTef+UMT6uwbIyqWphLuBvZOmSVoEq19FJ09qZDPiUNBprGyYKJhoVdEqQDEup4QsWQrYrwspdcBE= X-Received: by 2002:a0d:d186:0:b0:61b:3356:f1b5 with SMTP id 00721157ae682-63a8e4bb54fmr30112867b3.28.1718805789969; Wed, 19 Jun 2024 07:03:09 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202406191213.45JCDPPP051964@gitrepo.freebsd.org> In-Reply-To: From: Doug Rabson Date: Wed, 19 Jun 2024 15:02:58 +0100 Message-ID: Subject: Re: git: e97ad33a89a7 - main - Add an implementation of the 9P filesystem To: Baptiste Daroussin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000008ca9fd061b3ea80a" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4W451W0BpFz4h6N --0000000000008ca9fd061b3ea80a Content-Type: text/plain; charset="UTF-8" On Wed, 19 Jun 2024 at 13:23, Baptiste Daroussin wrote: > On Wed 19 Jun 12:13, Doug Rabson wrote: > > The branch main has been updated by dfr: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=e97ad33a89a78f55280b0485b3249ee9b907a718 > > > > commit e97ad33a89a78f55280b0485b3249ee9b907a718 > > Author: Doug Rabson > > AuthorDate: 2022-12-06 13:07:46 +0000 > > Commit: Doug Rabson > > CommitDate: 2024-06-19 12:12:04 +0000 > > > > Add an implementation of the 9P filesystem > > > > This is derived from swills@ fork of the Juniper virtfs with many > > changes by me including bug fixes, style improvements, clearer > layering > > and more consistent logging. The filesystem is renamed to p9fs to > better > > reflect its function and to prevent possible future confusion with > > virtio-fs. > > > > Several updates and fixes from Juniper have been integrated into this > > version by Val Packett and these contributions along with the > original > > Juniper authors are credited below. > > > > To use this with bhyve, add 'virtio_p9fs_load=YES' to loader.conf. > The > > bhyve virtio-9p device allows access from the guest to files on the > host > > by mapping a 'sharename' to a host path. It is possible to use p9fs > as a > > root filesystem by adding this to /boot/loader.conf: > > > > vfs.root.mountfrom="p9fs:sharename" > > > > for non-root filesystems add something like this to /etc/fstab: > > > > sharename /mnt p9fs rw 0 0 > > > > In both examples, substitute the share name used on the bhyve command > > line. > > > > The 9P filesystem protocol relies on stateful file opens which map > > protocol-level FIDs to host file descriptors. The FreeBSD vnode > > interface doesn't really support this and we use heuristics to guess > the > > right FID to use for file operations. This can be confused by > privilege > > lowering and does not guarantee that the FID created for a given file > > open is always used for file operations, even if the calling process > is > > using the file descriptor from the original open call. Improving this > > would involve changes to the vnode interface which is out-of-scope > for > > this import. > > > > First of all: thanks a lot! you say the changes in the vnode interface are > out > of scope for this import, which makes perfectly sense, but it is part of > your > TODO for later? > It is something I would like to work on but I'm not sure exactly when. I may try a quick-and-dirty approximation to get a better idea about how much in vnode will need to change. Basically, we need to track state from the VOP_OPEN in struct file so that we can match the right 9P fid with each i/o operation. This seems possible since we already have an f_data member in struct file. Doug. --0000000000008ca9fd061b3ea80a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, 19 Jun 2024 at 13:23, Baptist= e Daroussin <bapt@freebsd.org>= ; wrote:
On Wed 19 Jun 12:13, Doug Rabson wrote:<= br> > The branch main has been updated by dfr:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3De97ad33a89a78f55280b0485b3249ee9b907a718<= /a>
>
> commit e97ad33a89a78f55280b0485b3249ee9b907a718
> Author:=C2=A0 =C2=A0 =C2=A0Doug Rabson <dfr@FreeBSD.org>
> AuthorDate: 2022-12-06 13:07:46 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Doug Rabson <dfr@FreeBSD.org>
> CommitDate: 2024-06-19 12:12:04 +0000
>
>=C2=A0 =C2=A0 =C2=A0Add an implementation of the 9P filesystem
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0This is derived from swills@ fork of the Juniper vi= rtfs with many
>=C2=A0 =C2=A0 =C2=A0changes by me including bug fixes, style improvemen= ts, clearer layering
>=C2=A0 =C2=A0 =C2=A0and more consistent logging. The filesystem is rena= med to p9fs to better
>=C2=A0 =C2=A0 =C2=A0reflect its function and to prevent possible future= confusion with
>=C2=A0 =C2=A0 =C2=A0virtio-fs.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Several updates and fixes from Juniper have been in= tegrated into this
>=C2=A0 =C2=A0 =C2=A0version by Val Packett and these contributions alon= g with the original
>=C2=A0 =C2=A0 =C2=A0Juniper authors are credited below.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0To use this with bhyve, add 'virtio_p9fs_load= =3DYES' to loader.conf. The
>=C2=A0 =C2=A0 =C2=A0bhyve virtio-9p device allows access from the guest= to files on the host
>=C2=A0 =C2=A0 =C2=A0by mapping a 'sharename' to a host path. It= is possible to use p9fs as a
>=C2=A0 =C2=A0 =C2=A0root filesystem by adding this to /boot/loader.conf= :
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vfs.root.mountfrom=3D&q= uot;p9fs:sharename"
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0for non-root filesystems add something like this to= /etc/fstab:
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sharename /mnt p9fs rw = 0 0
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0In both examples, substitute the share name used on= the bhyve command
>=C2=A0 =C2=A0 =C2=A0line.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0The 9P filesystem protocol relies on stateful file = opens which map
>=C2=A0 =C2=A0 =C2=A0protocol-level FIDs to host file descriptors. The F= reeBSD vnode
>=C2=A0 =C2=A0 =C2=A0interface doesn't really support this and we us= e heuristics to guess the
>=C2=A0 =C2=A0 =C2=A0right FID to use for file operations.=C2=A0 This ca= n be confused by privilege
>=C2=A0 =C2=A0 =C2=A0lowering and does not guarantee that the FID create= d for a given file
>=C2=A0 =C2=A0 =C2=A0open is always used for file operations, even if th= e calling process is
>=C2=A0 =C2=A0 =C2=A0using the file descriptor from the original open ca= ll. Improving this
>=C2=A0 =C2=A0 =C2=A0would involve changes to the vnode interface which = is out-of-scope for
>=C2=A0 =C2=A0 =C2=A0this import.
>=C2=A0 =C2=A0 =C2=A0

First of all: thanks a lot! you say the changes in the vnode interface are = out
of scope for this import, which makes perfectly sense, but it is part of yo= ur
TODO for later?

--0000000000008ca9fd061b3ea80a-- From nobody Wed Jun 19 14:17:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W45Kd59NGz5NDnJ; Wed, 19 Jun 2024 14:17: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 4W45Kd4f4nz4k1V; Wed, 19 Jun 2024 14:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718806629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1/h7570QAe8b3vnHiuNJ/u2U0AD6lvQDTaZKvSEX+0=; b=ArdvLaxEo237PbbRj3f8Od/CtrjoeMALUHjHY+kLNIJkvef7xbnll3CbV9ZrAriS6J1b4Q KwPtmxyI+2Zub9EsA4V4P2AqNgZDSXwJPtgj8T3MUTSnuDkComoaNm7xG8cysFgYk4+doy 6jSyMdDYJv8YFsKczXHJlcTdiXBdrO0D7y6KMS8YScmVg1zT+S1+bKrUGjF5GWrmo6AVS/ K57NlSc3oGJBtec1/5CBOnGdH5fL0WmLQEK2LwYCtO0noTB7JgGm4QGxT+o219R2VYu6+g 8xu7gxO1SXaSG1kCvLh5kZbjyFsOUFe6IWI4WBbYcQc3XHJZt8oAP278eshh0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718806629; a=rsa-sha256; cv=none; b=dX/XTZlDxnM5pUE+B5IH0KvTsshlnagmn+vu0EU96+N2eVD1WNajfCEmd1pSYJgZJnqAA/ SNiBBrSvZF2lTJ4Gc8fm4jLCLQdLnEq8tc+VkCVroTnbjYa/NOe9/Xl/r4Znz9y1Mffena AmSwzhc/rp2FL1XvQGN4I6eNk2J0Ns1KhIAeRaIxx94engWxMDBW3dnboc53wRPmbqcdWD 0P9/Wgqvr572rL8D5uqU8Tdmsb03a1+SCiM5HqSBOjdNTrRwclyDyHj8RJZ5Nb2oBy5ty5 QwjgUv2EsqFYfmOikLrCt8FkJY1rUewypO7LQh/MRYTbWjsHP+1NqL47noUA4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718806629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1/h7570QAe8b3vnHiuNJ/u2U0AD6lvQDTaZKvSEX+0=; b=Fdoq6wQzKCxSMp7aYiVmwk/XP60VK225QUR6EUsvYD3PHkO9z3oxyvi3kX6zwlQKq8flY3 P0pr/LhfD4m+ZpHC+nxsZLmcyjSIOoOHcD4GquQbRDs7bYbkIil9o6zgHcZL4txzSwktby MK+jaEjPVaBRaG41Kx0lXJQVEos9craFcELdMw+tlU42AiwrFcXBiK298oGSg0D5oAsAbN WDDkiSlL7qNv8b6uOWcRRkz+5f85QobZI/ACWyeXBDaZ0jxAoZEJ3N8KAEENrKeQUkwxPd 6b9QwGmuXQRMlDhun7f9bJ3KjjG8XLHRA40FokqY5K2VBAvUjjfvPEFQdR9vpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W45Kd46yLzlHv; Wed, 19 Jun 2024 14:17: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 45JEH9Tf055483; Wed, 19 Jun 2024 14:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JEH9sn055480; Wed, 19 Jun 2024 14:17:09 GMT (envelope-from git) Date: Wed, 19 Jun 2024 14:17:09 GMT Message-Id: <202406191417.45JEH9sn055480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: b2ebcd19f467 - main - p9fs: Fix the build for 32-bit kernels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2ebcd19f467f518aa969b84527018c03fb0286e Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ebcd19f467f518aa969b84527018c03fb0286e commit b2ebcd19f467f518aa969b84527018c03fb0286e Author: Doug Rabson AuthorDate: 2024-06-19 14:15:34 +0000 Commit: Doug Rabson CommitDate: 2024-06-19 14:16:38 +0000 p9fs: Fix the build for 32-bit kernels MFC after: 3 months --- sys/fs/p9fs/p9fs_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index c1bea18d5eef..d17d7624aef1 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -1762,7 +1762,7 @@ p9fs_readdir(struct vop_readdir_args *ap) count = 0; clnt = np->p9fs_ses->clnt; - P9_DEBUG(VOPS, "%s: vp %p, offset %ld, resid %zd\n", __func__, vp, uio->uio_offset, uio->uio_resid); + P9_DEBUG(VOPS, "%s: vp %p, offset %jd, resid %zd\n", __func__, vp, (intmax_t) uio->uio_offset, uio->uio_resid); if (ap->a_uio->uio_iov->iov_len <= 0) return (EINVAL); From nobody Wed Jun 19 17:57:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4BCx65yKz5NYfy; Wed, 19 Jun 2024 17:57: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 4W4BCx5WzCz44xK; Wed, 19 Jun 2024 17:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718819853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wrxmd41XUr6nM+C8a/UxBif21YDZuG8l7enPr7PIZRk=; b=jZM8YMwnUV8CdeRuywy3gqScS2yZnSBzbFJmLbKOW9SWbo+F5pvn99DySVyb/c8rDcS9Xz uSc4RMCPb9lmjN94CYcM2bK6JTyktdwbwVuiEzAoVdGiQjagZnaN42mczYLGUri+7OTyir 1T8MMDcGXCCdh2paKTCV9BaTIAFHqj55UWd1Hqp2O+i824sJmJAp1zg13pGqdJvXzxQs+k QcfvdeO6wQKTlfANKVsNzJ5W1lPwefCKxXCuOpZBgnOcFyWR0el3id5fKuv7364vg1nKpK 2JWauARHW2tOHUC6KcN3rZS1WqOQw+Gxf1/rCiTItI9XnPPvPdqJ3aHNvmkykA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718819853; a=rsa-sha256; cv=none; b=HCxeBQfDtrLHgKlkk2oTEEClxl7vqZibi8rsE+lzNIS8kwqnFr9aKqn5jUGku/MiTWdPQV wVq3GIh6ZgnO+MEo8QmwpHEhbHi/uZTDFA0cGmkKeGqbdU5wx+r/lrjFqCUQ5ea3WRr1Ic XMPUYkYoSuPuI+1PovlGQ4Jdc62I2nTMNkZt5KGV6iSVWf/DPhT/Ww4+yQ9qoOI9tFlbJF EAN5jKEBPR9rPlnANjFiCNTP4rXp4qqq6Q3k2OdJEFXo7t6+lCC8nGjuMAWUuEVnljuvC9 1fPolzdtHydZWaleA0HTH4LINkQajxyFhtOtZpfLwWIyQvK626EIIOf27sruZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718819853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wrxmd41XUr6nM+C8a/UxBif21YDZuG8l7enPr7PIZRk=; b=SfI8zt+lRZXwLahgNQHmFnT4WekZSIfYzrjduMUoK4GHhk90Y7F9VLGfVO7cr/16OqPwm0 Os1NjKYJqo1WyIdD3CCA1BjRgu9Cg6QKnlPtrs339w8Mn92S1if64edB0RWPI8dXlnN6E7 Cf5HNJkvkfIClFtGTKSuLlCnlvH7tLBNkzyTK+SivgPFa0B6lhWNw0AVXN3nQeiqXPrbcI xDKXi2F79xQXGelIw6RkTvSBpwrcOxegTsmA3c3Br/ZVf3Ch3Y0mV6pFsiyJkBkBtWUkmk vPs3c0QJ8BfWVga5G1jtGohmKUPZCDOZ65hXNITxS5KgRGmuJLec0SS8oBB9NQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4BCx57Fpzrvl; Wed, 19 Jun 2024 17:57: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 45JHvXuD027978; Wed, 19 Jun 2024 17:57:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JHvXP2027975; Wed, 19 Jun 2024 17:57:33 GMT (envelope-from git) Date: Wed, 19 Jun 2024 17:57:33 GMT Message-Id: <202406191757.45JHvXP2027975@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: 42fbb55d4549 - main - arch.7: armv6 will be removed prior to FreeBSD 15.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42fbb55d4549d26dba6b67cd1b501b6dc038dd07 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=42fbb55d4549d26dba6b67cd1b501b6dc038dd07 commit 42fbb55d4549d26dba6b67cd1b501b6dc038dd07 Author: Ed Maste AuthorDate: 2024-06-19 17:16:48 +0000 Commit: Ed Maste CommitDate: 2024-06-19 17:40:08 +0000 arch.7: armv6 will be removed prior to FreeBSD 15.0 Reviewed by: andrew, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45633 --- share/man/man7/arch.7 | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 35a7b0246389..f3d2e1036706 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.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 June 19, 2024 .Dt ARCH 7 .Os .Sh NAME @@ -87,7 +87,6 @@ release to support each architecture. .It Sy Architecture Ta Sy Initial Release .It aarch64 Ta 11.0 .It amd64 Ta 5.1 -.It armv6 Ta 10.0 .It armv7 Ta 12.0 .It i386 Ta 1.0 .It powerpc Ta 6.0 @@ -103,6 +102,7 @@ Discontinued architectures are shown in the following table. .It alpha Ta 3.2 Ta 6.4 .It arm Ta 6.0 Ta 12.4 .It armeb Ta 8.0 Ta 11.4 +.It armv6 Ta 10.0 Ta 14.x .It ia64 Ta 5.0 Ta 10.4 .It mips Ta 8.0 Ta 13.x .It mipsel Ta 9.0 Ta 13.x @@ -156,7 +156,7 @@ Examples are: .It Sy LP64 Ta Sy ILP32 counterpart .It Dv amd64 Ta Dv i386 .It Dv powerpc64 Ta Dv powerpc -.It Dv aarch64 Ta Dv armv6/armv7 +.It Dv aarch64 Ta Dv armv7 .El .Pp .Dv aarch64 @@ -166,11 +166,7 @@ or .Dv armv7 binaries if the CPU implements .Dv AArch32 -execution state, however older -.Dv armv4 -and -.Dv armv5 -binaries aren't supported. +execution state, however older arm binaries aren't supported. .Pp On all supported architectures: .Bl -column -offset -indent "long long" "Size" @@ -195,7 +191,6 @@ Machine-dependent type sizes: .It Sy Architecture Ta Sy void * Ta Sy long double Ta Sy time_t .It aarch64 Ta 8 Ta 16 Ta 8 .It amd64 Ta 8 Ta 16 Ta 8 -.It armv6 Ta 4 Ta 8 Ta 8 .It armv7 Ta 4 Ta 8 Ta 8 .It i386 Ta 4 Ta 12 Ta 4 .It powerpc Ta 4 Ta 8 Ta 8 @@ -212,7 +207,6 @@ is 8 bytes on all supported architectures except i386. .It Sy Architecture Ta Sy Endianness Ta Sy char Signedness .It aarch64 Ta little Ta unsigned .It amd64 Ta little Ta signed -.It armv6 Ta little Ta unsigned .It armv7 Ta little Ta unsigned .It i386 Ta little Ta signed .It powerpc Ta big Ta unsigned @@ -226,7 +220,6 @@ is 8 bytes on all supported architectures except i386. .It Sy Architecture Ta Sy Page Sizes .It aarch64 Ta 4K, 2M, 1G .It amd64 Ta 4K, 2M, 1G -.It armv6 Ta 4K, 1M .It armv7 Ta 4K, 1M .It i386 Ta 4K, 2M (PAE), 4M .It powerpc Ta 4K @@ -240,7 +233,6 @@ is 8 bytes on all supported architectures except i386. .It Sy Architecture Ta Sy float, double Ta Sy long double .It aarch64 Ta hard Ta soft, quad precision .It amd64 Ta hard Ta hard, 80 bit -.It armv6 Ta hard Ta hard, double precision .It armv7 Ta hard Ta hard, double precision .It i386 Ta hard Ta hard, 80 bit .It powerpc Ta hard Ta hard, double precision @@ -276,7 +268,7 @@ or similar things like boot sequences. .It Dv MACHINE Ta Dv MACHINE_CPUARCH Ta Dv MACHINE_ARCH .It arm64 Ta aarch64 Ta aarch64 .It amd64 Ta amd64 Ta amd64 -.It arm Ta arm Ta armv6, armv7 +.It arm Ta arm Ta armv7 .It i386 Ta i386 Ta i386 .It powerpc Ta powerpc Ta powerpc, powerpcspe, powerpc64, powerpc64le .It riscv Ta riscv Ta riscv64 @@ -308,7 +300,6 @@ Architecture-specific macros: .It Sy Architecture Ta Sy Predefined macros .It aarch64 Ta Dv __aarch64__ .It amd64 Ta Dv __amd64__ , Dv __x86_64__ -.It armv6 Ta Dv __arm__ , Dv __ARM_ARCH >= 6 .It armv7 Ta Dv __arm__ , Dv __ARM_ARCH >= 7 .It i386 Ta Dv __i386__ .It powerpc Ta Dv __powerpc__ From nobody Wed Jun 19 19:37:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4DRP66zKz5NjNf; Wed, 19 Jun 2024 19:37: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 4W4DRP5Zjhz4Hhp; Wed, 19 Jun 2024 19:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718825857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4d7d4OYiP9xT0fIBHtjNwVBQe0ICuENdKJd4jUqUDs=; b=SguK6KXd1JZqDH7aP0aQ80xxZ9kHZibq/DMU7ar0m28EPHv/eACZzm9Nk4IW41xaAvET5M 3etjPLdzmVXWa9Fo7adVcogiUJtMw13eLDrou7mWQ9w5SiVAeVLJAksz28jyFNixDmqnb5 fj8A9ziUB8++6+nFiaXIZcZ8maSJnRS+6RBI/7vQB2PX/e0d6rXw49/F0k7WFII99qbqqd nqMTim0/cWrDjcL7jzqv6MKfNpGGHiiLaeGUyzk1ptRAN8hFnngk+Q+58YR8FMbVVbJVoV oeaiK7BbMkP0c1VyR/brkCKaVOppE+jaUOye5ZcEspeOiyRufiB4U2K1NP9SZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718825857; a=rsa-sha256; cv=none; b=MMpdwmXsYX9VkL7Mgp+v15HCcLAVM/kCj2bBNVaYWNK0yndN/NPm1EoZvFrpDiDESQp/0g rhal2dd6rctVtwz4Zl2SvRMrqpRSqQB84b0I7QqCgjU15YRWr9/WYJBrRssM0dSujLZcCp IPvzHDIGA5mtaSgWeVuljLo9H6GwXks7r4tWT3qXDf7MDEE3nOR7dThB6RVxN8ZnS6Drew Ge8w13GDrES6oQYNlSUvpjbdqIu0ZMoTZ1md8X7G4WQTLjgp1ZEGe3IbR3L3Rmg2SZUfDf sIiUQk1pMo82JoKE1TdKgjNqnV0WsOR2L0oHBCcsaaADoOCYyJQuXpoz7iU3xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718825857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4d7d4OYiP9xT0fIBHtjNwVBQe0ICuENdKJd4jUqUDs=; b=pUtnTOwPIDyuDdiCqCiY2zZDU1+kxHIwrXKX66Lmiwuw5ufhCLVWaVh/s6bCtt308UK453 Vap00dDT2XURa1mYcjLlZu3VnSLpoE3ggOisUttUVU8iEWv1SkrwkEbGMXfFqO2ZJWVkwP JQJHHBTx9PyjFs/K5Xi7TrJVf4TNRCNYxrg6pFiLbFb3E38xS2vSx3b89pQwjRkxSlz79Y frBucfmQkE6fDy62KQcPpJHav03dnQQr4MLIjrboiasq7wCx1oYPqS0R193k5yTPPzBnqU 4sH6Xgb4Z9ZG0zEYgDk110tJOHzVKaF3xkVgmf/0iTfGsqqYmVSELiKaG00iZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4DRP4qXlzvFH; Wed, 19 Jun 2024 19:37: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 45JJbbkp099218; Wed, 19 Jun 2024 19:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JJbbna099215; Wed, 19 Jun 2024 19:37:37 GMT (envelope-from git) Date: Wed, 19 Jun 2024 19:37:37 GMT Message-Id: <202406191937.45JJbbna099215@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: 4771c2e9d1c7 - main - release: Publish non-uploaded cloudware bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4771c2e9d1c7db949a82dfe4f2b9878bb358a50e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4771c2e9d1c7db949a82dfe4f2b9878bb358a50e commit 4771c2e9d1c7db949a82dfe4f2b9878bb358a50e Author: Colin Percival AuthorDate: 2024-06-19 19:28:42 +0000 Commit: Colin Percival CommitDate: 2024-06-19 19:36:44 +0000 release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week --- release/Makefile | 3 +- release/Makefile.mirrors | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ release/Makefile.vm | 42 +++++++++++++++++++++ 3 files changed, 140 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 489cf4623ff4..a03951d17499 100644 --- a/release/Makefile +++ b/release/Makefile @@ -14,6 +14,7 @@ # install: Invokes the release-install and vm-install targets # release-install: Copies all release installation media into ${DESTDIR} # vm-install: Copies all virtual machine images into ${DESTDIR} +# cloud-install: Copies non-uploaded cloud images into ${DESTDIR} # # Variables affecting the build process: # WORLDDIR: location of src tree -- must have built world and default kernel @@ -326,7 +327,7 @@ real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -install: release-install vm-install +install: release-install vm-install .WAIT cloud-install release-install: .if defined(DESTDIR) && !empty(DESTDIR) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 591fd85b29ea..fd233e7abdb6 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -53,6 +53,11 @@ STAGE_TARGETS+= vm-images-stage VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} .endif +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +STAGE_TARGETS+= ci-images-stage +CI_DIR= ${TLD}/CI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} +.endif + CLEANFILES+= ${STAGE_TARGETS} CHECKSUM_FILES?= SHA512 SHA256 SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' ' @@ -203,6 +208,22 @@ vm-images-stage: ln -s ../${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ ${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor +. endfor +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cd ${RELEASEDIR}/vmimages && \ + mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cd ${VM_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor +. endfor +. endif . endfor cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} @@ -227,11 +248,86 @@ vm-images-stage: ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor +. endfor +. endif +. endfor . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \ ${VM_DIR}/Latest/CHECKSUM.${CHECKSUM} . endfor .endif +ci-images-stage: + mkdir -p ${CI_DIR} +.if defined(SNAPSHOT) && !empty(SNAPSHOT) +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest + mkdir -p ${CI_DIR}/${BUILDDATE} +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cd ${RELEASEDIR}/ciimages && \ + mv ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor + cd ${RELEASEDIR}/ciimages && \ + mv ${OSRELEASE}-${CW}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}.${VMFORMAT}.xz +. endfor +. endif +. endfor + cd ${RELEASEDIR}/ciimages && rm -f CHECKSUM.* +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/ciimages && \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${CI_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + CHECKSUM.${CHECKSUM} +. endfor +.else # not snapshot +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ + ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.${VMFORMAT}.xz \ + ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${VMFORMAT}.xz +. endfor +. endif +. endfor +. for CHECKSUM in ${CHECKSUM_FILES} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM} \ + ${CI_DIR}/Latest/CHECKSUM.${CHECKSUM} +. endfor +.endif + ftp-stage: remove-old-bits ${STAGE_TARGETS} diff --git a/release/Makefile.vm b/release/Makefile.vm index 548b4c1cca3b..8c48c0a13dc9 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -223,6 +223,48 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif +cloud-install-BASIC-CI: + mkdir -p ${DESTDIR}/ciimages +.for _FS in ${BASIC-CI_FSLIST} +. for _FMT in ${BASIC-CI_FORMAT} + cp -p ${.OBJDIR}/${BASIC-CI${_FS:tu}${_FMT:tu}IMAGE} \ + ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} + ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} +. endfor +.endfor +.for _FMT in ${BASIC-CI_FORMAT} + ln -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${VMFS}.${_FMT}.xz \ + ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.${_FMT}.xz +.endfor + cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA512 + cd ${DESTDIR}/ciimages && sha256 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA256 + +cloud-install-BASIC-CLOUDINIT: + mkdir -p ${DESTDIR}/vmimages +.for _FS in ${BASIC-CLOUDINIT_FSLIST} +. for _FMT in ${BASIC-CLOUDINIT_FORMAT} + cp -p ${.OBJDIR}/${BASIC-CLOUDINIT${_FS:tu}${_FMT:tu}IMAGE} \ + ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT.${_FS}.${_FMT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT.${_FS}.${_FMT} +. endfor +.endfor + cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ + ${DESTDIR}/vmimages/CHECKSUM.SHA512 + cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ + ${DESTDIR}/vmimages/CHECKSUM.SHA256 + +CLOUD_INSTALL_TGTS= +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for _CW in ${CLOUDWARE} +. if target(cloud-install-${_CW}) +CLOUD_INSTALL_TGTS+= cloud-install-${_CW} +. endif +. endfor +.endif +cloud-install: ${CLOUD_INSTALL_TGTS} + .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) vm-release: ${VMTARGETS} .else From nobody Wed Jun 19 20:36:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Flj1FK8z5NnC8; Wed, 19 Jun 2024 20:36: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 4W4Flj0l0Pz4NdL; Wed, 19 Jun 2024 20:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKqW6NEP5FII4wKcXobJnk1E/KZo5P8SL2vX56CfOEo=; b=xiHIDGBK6yP/MviJ/kJn1xyKE1edoJddAfVH0nguqhIKr+g6EoC5L342MW1e8o0QCG2tqa jiz9BukO+bAYQEKU1oD86iwogsQCg/1a8vIzJDQux0B7r8vGMmebyJawhYzfArvktzTahC sSuRC3zQcn43AZwLTqAWJ4XrYfaGy7H1J4IompBIKduq/ZpBKOPvEZd9Rk05mPPOpxmlWa 01fdmrtjC7QY5Hq+62Dfky0Zf9Rsi7Yg+nkmC/0dr6v1+PtODrFFArMRBoDGfvym4Jwk2A 90UyxRZ+lYgRn7yJ9xFeQwZHsd/7ZVt+Ny9YK9Krri/9gPaAUhp0Fg6OmLbmWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829409; a=rsa-sha256; cv=none; b=InHG2UQ4MzWB5FZxY0SwM8ikGjnJUIc/+kIHUjniRlCBIXDqJowPOxKMlzd0uKXqAJP+46 hmtxkBfDvPRW7+OvSXHSO1BtxEoi6W8aKq7A4eDIKYZQ5W37otkO+CAhJSp269sDHBk0eb dPP0C/AAljLUNhu1CUcjVPDwuZRJ28cOeVzxTtgph+Z8WSUZMPuh9iTVl31NXYN27drPmK RCqmDJAELYyU5mqJaGZSHRraIcvX3NfGHMK4KtxuXOhkdIL32MhcZxmOcB9Fz2/eW7rSTt XOwEbw8xMVRD8bZG8SpXyLLr2pHa7eh/2am1n8nRdR4je8UxvhkAU+y4VJGbVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKqW6NEP5FII4wKcXobJnk1E/KZo5P8SL2vX56CfOEo=; b=LM9vBQMQ83ENLIFpobX084k8OGUe0G3fbRZwikFzqv+e0Xfc0+TZjSRE5IGHM26U+XCEpN Dorcdpv8jG+EXvJtVK/BNCRaEn7nQKjYZ6YNod2WJK5VFIbS+wGl3zZcmLBjzkvW0WmsUy Fby5ZkrCpX2C/j/9aVi0PKZyhWLM7mTZ9T387hTHwcaxliFi/Mt7agVmuwsKj2VEE99XoH /OGOOdo8qipkuhp5tZoC5zvZMZ/KQr8VYP2T31sbSk2r7E+Yt1CGMbisuF4LesgTHhaD8O ROgm5XHpr4s3uqBIi2MnrhpMwpEE/83DihYxSX8Lbwg48HiiDlpIIZIkkEUxVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Flj0DTzzx5w; Wed, 19 Jun 2024 20:36: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 45JKamBd001815; Wed, 19 Jun 2024 20:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKamEi001812; Wed, 19 Jun 2024 20:36:48 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:36:48 GMT Message-Id: <202406192036.45JKamEi001812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: f566b7eb8d94 - releng/14.1 - Destroy ARC buffer in case of fill error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: f566b7eb8d94bdde7ad9ddf9bdc9cf336678c386 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=f566b7eb8d94bdde7ad9ddf9bdc9cf336678c386 commit f566b7eb8d94bdde7ad9ddf9bdc9cf336678c386 Author: Alexander Motin AuthorDate: 2024-05-25 02:11:18 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-18 17:35:52 +0000 Destroy ARC buffer in case of fill error In case of error dmu_buf_fill_done() returns the buffer back into DB_UNCACHED state. Since during transition from DB_UNCACHED into DB_FILL state dbuf_noread() allocates an ARC buffer, we must free it here, otherwise it will be leaked. Reviewed-by: Brian Behlendorf Reviewed-by: Jorgen Lundman Signed-off-by: Alexander Motin Sponsored by: iXsystems, Inc. Closes #15665 Closes #15802 Closes #16216 PR: 276341 Approved by: so Security: FreeBSD-EN-24:10.zfs (cherry picked from commit 02c5aa9b092818785ed8db4e2246a828278138e3) (cherry picked from commit 1c27279ed22d2b5226f31836da041bae45a9c77b) --- sys/contrib/openzfs/module/zfs/dbuf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index bb921af6d78a..0576da6475b1 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -2840,6 +2840,7 @@ dmu_buf_fill_done(dmu_buf_t *dbuf, dmu_tx_t *tx, boolean_t failed) failed = B_FALSE; } else if (failed) { VERIFY(!dbuf_undirty(db, tx)); + arc_buf_destroy(db->db_buf, db); db->db_buf = NULL; dbuf_clear_data(db); DTRACE_SET_STATE(db, "fill failed"); From nobody Wed Jun 19 20:36:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Flk23s5z5NnbZ; Wed, 19 Jun 2024 20:36: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 4W4Flk1Nq6z4NkM; Wed, 19 Jun 2024 20:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FF4F4hFiY02f8iSo5MgNN7mvYv8nkVtvSMT//tDUdyw=; b=KUTP0snls8l6fs4lalru68SS+xhadz3YzSQlXgmH0lde5Xoae6zaBBDsexUridV4JnDQBp bFUYgOCNdzpjTLF+aNAnJwRq/bv4SaBRwkcxpXiQTQhwkl23EhOABJnZgTYmyko/3l/HKY HyU3I3rxEFUhdpiHq9O9s3Jln8b7x3qqxwnf7/gbsWQ0Rgk7D/u4YOxSrnWL/pL9CWGL3T xsoRPQ000KICyD232jmsdSIuqfXuPq1YwEPThPt4U/rDNmr8AxPx1tTCkc1LAwYcryOleP YX+2DjwTQKwJ2PoVsHy57ckKYQrLOu2QSqpr4BxXTCJq0iHYyCkmi2g7gJYnEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829410; a=rsa-sha256; cv=none; b=ASRwzgT+f0coLPNTMnljKv4okYDavLnYGStAyGK9vuKNYv/iBDYayUsKyDSvg9iXXUXsYr 8AYv3hgC+SE8HO/2U1AcaFDmOV/wzKn4SDpD6zB1zgFT+618V3A/uypOWIh9SYz1P6npu6 Oc4wtR53iys54d4QMPkjGuu7evdRKgtr6pegxY0J6rDLnJGGwnjKnwHW6W1P+Ru+9DAbO9 fwZTVfeF11GubfszRfeBVFDGjGIlah6O+sVlZrRs4+DVSwoNzEmuJhaYn18gDyXB97HvJS WHskZ3UJaV8Wj8YVArXhEsZ3aQbMtRug+455TI2zLaqkErSAXfCFZjCsF7aSWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FF4F4hFiY02f8iSo5MgNN7mvYv8nkVtvSMT//tDUdyw=; b=kKtLS009Sorw2F2nZ4crFBNWLxDI8Uqe2VQZJLQwp7T+PXoyWx9V6WV0yghN4MMgeiRGIO 2mC2+XpmlHxoMZ1ozXWUGSdozm5yTCoaDdLaSW9klZF8OEl/bpkrkjZ24PJlMyLEh10kDX uG60PtlYVHJlvLMl02Rd5OI9GlYf1Kh6oGrZlL+8hDpzsEpIt25G8uaOiZ6oZtQgw49z67 cLH4gCh95oeWM4oZSkOOJGdV++uFNh5q0nFpxZCu10Akg98KLa2vnqE6aSSIewh+asrkgm PAy90qioDDfwB7vM0udUQKcaBR0TS1oOTBxmLSL6hsfZ6Z3l2sZr4+Oy9NV0Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Flk10YjzwNZ; Wed, 19 Jun 2024 20:36: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 45JKaoLf001888; Wed, 19 Jun 2024 20:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKaoZP001880; Wed, 19 Jun 2024 20:36:50 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:36:50 GMT Message-Id: <202406192036.45JKaoZP001880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 8e0e6b428cb8 - releng/14.1 - Merge commit 382f70a877f0 from llvm-project (by Louis Dionne): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 8e0e6b428cb8ba01941e53256880f7993671e786 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=8e0e6b428cb8ba01941e53256880f7993671e786 commit 8e0e6b428cb8ba01941e53256880f7993671e786 Author: Dimitry Andric AuthorDate: 2024-06-07 18:42:53 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-18 17:36:40 +0000 Merge commit 382f70a877f0 from llvm-project (by Louis Dionne): [libc++][NFC] Rewrite function call on two lines for clarity (#79141) Previously, there was a ternary conditional with a less-than comparison appearing inside a template argument, which was really confusing because of the <...> of the function template. This patch rewrites the same statement on two lines for clarity. Merge commit d129ea8d2fa3 from llvm-project (by Vitaly Buka): [libcxx] Align `__recommend() + 1` by __endian_factor (#90292) This is detected by asan after #83774 Allocation size will be divided by `__endian_factor` before storing. If it's not aligned, we will not be able to recover allocation size to pass into `__alloc_traits::deallocate`. we have code like this ``` auto __allocation = std::__allocate_at_least(__alloc(), __recommend(__sz) + 1); __p = __allocation.ptr; __set_long_cap(__allocation.count); void __set_long_cap(size_type __s) _NOEXCEPT { __r_.first().__l.__cap_ = __s / __endian_factor; __r_.first().__l.__is_long_ = true; } size_type __get_long_cap() const _NOEXCEPT { return __r_.first().__l.__cap_ * __endian_factor; } inline ~basic_string() { __annotate_delete(); if (__is_long()) __alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap()); } ``` 1. __recommend() -> even size 2. `std::__allocate_at_least(__alloc(), __recommend(__sz) + 1)` - > not even size 3. ` __set_long_cap() `- > lose one bit of size for __endian_factor == 2 (see `/ __endian_factor`) 4. `__alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap())` -> uses even size (see `__get_long_cap`) This should fix incorrect deallocation sizes for some instances of std::string. Memory profiling or debugging tools like AddressSanitizer, LeakSanitizer or TCMalloc could then complain about the the size passed to a deallocation not matching the size originally passed to the allocation. Reported by: Aliaksei Kandratsenka PR: 279560 Approved by: so Security: FreeBSD-EN-24:13.libc++ (cherry picked from commit ead8e4c081e5c4de4d508fc353f381457b058ca6) (cherry picked from commit 55c5dad2f305f74d1ff5ca85c453635511aab9b2) --- contrib/llvm-project/libcxx/include/string | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/string b/contrib/llvm-project/libcxx/include/string index ba169c3dbfc9..56e2ef09947f 100644 --- a/contrib/llvm-project/libcxx/include/string +++ b/contrib/llvm-project/libcxx/include/string @@ -1943,10 +1943,10 @@ private: if (__s < __min_cap) { return static_cast(__min_cap) - 1; } - size_type __guess = - __align_it < sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : 1 > (__s + 1) - 1; + const size_type __boundary = sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : __endian_factor; + size_type __guess = __align_it<__boundary>(__s + 1) - 1; if (__guess == __min_cap) - ++__guess; + __guess += __endian_factor; return __guess; } From nobody Wed Jun 19 20:36:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Fll5hFjz5NnFD; Wed, 19 Jun 2024 20:36: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 4W4Fll2PN4z4NbN; Wed, 19 Jun 2024 20:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DNqXX1eYejL/McekXv00ZrN6KxWLXr4UIOd4sFzy4ms=; b=kHx5/hmhdkB6EA+xfcYz02DB8R0XcmjB3d5XyXC57KFCwhelooP6TRAIXtx34/yTGiLr7r VXphJLpj4quT6rpPJbDNZZNSWiiQFUU1oH7x0OD2+5JRRDbQh93gHRpjmS6sperj0Ebbt8 TMKE/uV/FxzpahqVA0IzR4IFl4UcUYBObtcBYgy0kX21tzfHOMC0E3g69HG7ke6YML8QBc 7u+9o7B59vys5655V2KEvm9BNsUyfv2BM2G0xW3WtolP9O9oUSmvQht8+xo73kXrrHdfqL /AXF2caOWQo8vUty7bS8yvSqPlK43kW4SJgQW92VvXwX+DuY6aXl13jlyGnazA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829411; a=rsa-sha256; cv=none; b=PuxpNr/BXWKYenX/oGi2qurGPNv/r2vRGUYOs165oJY0y4rvGZOiZGDSS+ktB6/icXBnJT 0tTZERYahD2KpxZ1DFZ6zggxlq3VFipwe4DmpCTImyGTd8t1mlwfHsyoCzjyx5Gvh0fFPc nJKZLGU0cTx1vEEYtq5zjk0P96Gia459E11JIcPWYisz2awTHeLiRF/wN//kzepdjY8MhW TYngf4ntTE2jzkDn13N9ISg/pMjuC+2n2+NlvBiW8l2C76lSLlPRO0MHalcm7FRss60EDa oJ7GNXd7uxdVrEsbr3UjIvbfLkSKQDieyPRk21txFda7cum5lhg+MctIDztpeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DNqXX1eYejL/McekXv00ZrN6KxWLXr4UIOd4sFzy4ms=; b=yiL4vNZR/frcQIK+qSbyWYAbmY/MMEY7yqkABuDbeFWmtc353N59edAIBcQx2QY6AyIiGU SmpFC5NBm4NLWQacsOXbDL/QIAJdetYaZ+tu7ZbP5FjMa4OYdAOnzCw7Z3OxlxPB8C22w+ kL0L4TGAyaymMAMCvwOAP4dCIQOslbGPZZ+i6RTedrE4dWuj4YsaowSShzptjG8CJxvyDw mguXX0yGQqtw1p98HlBFp136S3fVIYwyJm030RSAJG5MCQPyi0E+ezokddE/yGSra7z93n 7r0ViT8dcxD1k52v+KRJHhEasgc+2aIJ4YGEoyB8KESNP9i2qhIcJhb6nkYkTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Fll21Q5zwZs; Wed, 19 Jun 2024 20:36: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 45JKapkH001944; Wed, 19 Jun 2024 20:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKapcV001941; Wed, 19 Jun 2024 20:36:51 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:36:51 GMT Message-Id: <202406192036.45JKapcV001941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 0892dff10444 - releng/14.1 - Add UPDATING entries and bump the branch version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 0892dff104440867956a53e78c12d66090fec36b Auto-Submitted: auto-generated The branch releng/14.1 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=0892dff104440867956a53e78c12d66090fec36b commit 0892dff104440867956a53e78c12d66090fec36b Author: Gordon Tetlow AuthorDate: 2024-06-18 17:48:38 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-19 20:22:12 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 2d4a66d0d29c..d972b89c5f69 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240619: + 14.1-RELEASE-p1 EN-24:10.zfs + EN-24:13.libc++ + + Fix kernel memory leak in ZFS [EN-24:10.zfs] + + Fix incorrect size passed to heap allocated std::string delete [EN-24:13.libc++] + 20240604: 14.1-RELEASE. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 38d445be32a6..8b55836841d7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.1" -BRANCH="RELEASE" +BRANCH="RELEASE-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Jun 19 20:36:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Flv4lZRz5NnSx; Wed, 19 Jun 2024 20:36: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 4W4Flv2lsHz4Nwc; Wed, 19 Jun 2024 20:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vxFwojKc5Uu6gCxqpLKMV6s5pj1KwOEiv7QWTHDHt6k=; b=WqGti5IlTMou0MjLgkGb02bD5RGJfCbcIIKc52YLS5JeY7yL+PGcZcIolajtw+sdenARhf 7y/fIojqakZ3SEnZMH+OjKH7Hf7iehfdj3efU6onZQ3VSx3Dqzi3CO2HJptiMnpIqismAa 61AbniHyUXiXtEfz23lWEcHHUsqNYWvOYG/l+AcH77pguYYza7p2tHijkyQUrYDm/RHvNI e+aNBoyGdv6nJObNnQ1J4mmzTfkJwswqJ5mLBhtsiHUfqu1YVHGcqLz+K8oU9z0zt4P4wr rZC+HWQoDWo9UYel+FwG6rkrGcmW5iQiEhxZAFZa8cy1hubGdGO4MTvLqj3XCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829419; a=rsa-sha256; cv=none; b=sPnfyClVZVgflynXKQ5+4CX+huSCPYRFFVBCHZZsU7qDuV/eIBGrp3ABnlogZgI8tAH+Kl nw7u5nhmEEmomDGzWuu1WTbib8TlOIILwQM6kRZ+WhOLqHbXyaXh5wOo9v6YGsy5Cdkdqq PhIylpLoMKWFYJQx1xA9iS6fYhDot7dU0OI6UJlRfx+I9r23tBFwm2pUiiXlXAxIvq1KMp W7mIp8OXjEErwXXLT6P9iijYJq5MRXje2MkNFD3I2HqVEJ49iZS97vwCDE17pPRjpqG2gd JYgy2r5zLE0EoABMKBzQUWApi5E6jPaO7mLn8F/2Dwe4x4tzm0nD1Z0dClxuDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vxFwojKc5Uu6gCxqpLKMV6s5pj1KwOEiv7QWTHDHt6k=; b=gv63EDxLVe5Rmx7EiZwuABpfKv6PJ45OgVMGxoixpBJMpW23lwJ+zf1R1hU2ZlPkw+etIk CmPwV6isWadU31RpZ1MLxgAwRLHB1y4kyRl5M2hOJ1iUySu02PZFcde9W9isQxgYjv4eGL 32/BkMRUSeRrcvrAB5o8/tpZFds6tLceLIG9XdFWF8zQUKXNCgOVdj5YgdY8m/7iaMK9yk xspZpHYTFj8p0mNlfs1+9pfI+o5IIaM0vWIx/P25YIA5yHc5W7FEd5kFvqkU3WftqalahR RHOPdGG2I3vU1Tfo1PooEHJIHIeoXD8PhFBx98at2/CD0Vxf3yHg2JcbuSoaBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Flv2MY3zx59; Wed, 19 Jun 2024 20:36: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 45JKax9s002122; Wed, 19 Jun 2024 20:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKaxMu002119; Wed, 19 Jun 2024 20:36:59 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:36:59 GMT Message-Id: <202406192036.45JKaxMu002119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: bdf75e830a77 - releng/14.0 - ldns: Ignore commented-out lines in resolv.conf. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bdf75e830a77a16ec0baf1c9367f64c6b96c5e02 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=bdf75e830a77a16ec0baf1c9367f64c6b96c5e02 commit bdf75e830a77a16ec0baf1c9367f64c6b96c5e02 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-15 10:16:24 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-18 17:32:56 +0000 ldns: Ignore commented-out lines in resolv.conf. This merges upstream PR 238 + an additional bug fix. PR: 278721 Approved by: so Security: FreeBSD-EN-24:11.ldns (cherry picked from commit 3b092e4936c433889cc668ea9563c8fd437d1a3e) (cherry picked from commit 7daf36028411c3a9c73e0c75732f9cbcbf66362e) --- contrib/ldns/ldns/parse.h | 2 ++ contrib/ldns/parse.c | 35 +++++++++++++++++++++++++++---- contrib/ldns/resolver.c | 53 ++++++++--------------------------------------- 3 files changed, 42 insertions(+), 48 deletions(-) diff --git a/contrib/ldns/ldns/parse.h b/contrib/ldns/ldns/parse.h index ba7edf5679d8..6130dae32bd2 100644 --- a/contrib/ldns/ldns/parse.h +++ b/contrib/ldns/ldns/parse.h @@ -95,6 +95,8 @@ ssize_t ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, */ ldns_status ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed, const char *delim, int *line_nr); +ssize_t ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim, size_t limit, int *line_nr); + /** * returns a token/char from the buffer b. * This function deals with ( and ) in the buffer, diff --git a/contrib/ldns/parse.c b/contrib/ldns/parse.c index 9698ba71e881..af8b2c1321b2 100644 --- a/contrib/ldns/parse.c +++ b/contrib/ldns/parse.c @@ -27,9 +27,14 @@ ldns_fget_token(FILE *f, char *token, const char *delim, size_t limit) return ldns_fget_token_l(f, token, delim, limit, NULL); } -ldns_status -ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed - , const char *delim, int *line_nr) +enum file_type2parse { + zone_file_type, resolv_conf_file_type +}; + +static ldns_status +ldns_fget_token_l_st_file_type(FILE *f, char **token, size_t *limit, + bool fixed, const char *delim, int *line_nr, + enum file_type2parse file_type) { int c, prev_c; int p; /* 0 -> no parentheses seen, >0 nr of ( seen */ @@ -98,7 +103,9 @@ ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed } /* do something with comments ; */ - if (c == ';' && quoted == 0) { + if ((c == ';' + || (c == '#' && file_type == resolv_conf_file_type)) + && quoted == 0) { if (prev_c != '\\') { com = 1; } @@ -215,6 +222,26 @@ tokenread: return i == 0 ? LDNS_STATUS_SYNTAX_EMPTY : LDNS_STATUS_OK; } +ldns_status +ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed + , const char *delim, int *line_nr) +{ + return ldns_fget_token_l_st_file_type( + f, token, limit, fixed, delim, line_nr, zone_file_type); +} + +ssize_t +ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim, + size_t limit, int *line_nr) +{ + if (limit == 0) + limit = LDNS_MAX_LINELEN; + if (ldns_fget_token_l_st_file_type(f, &token, &limit, true, delim, + line_nr, resolv_conf_file_type)) + return -1; + else + return (ssize_t)strlen(token); +} ssize_t ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *line_nr) diff --git a/contrib/ldns/resolver.c b/contrib/ldns/resolver.c index f9ec65a55966..a426b82c034e 100644 --- a/contrib/ldns/resolver.c +++ b/contrib/ldns/resolver.c @@ -775,7 +775,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) #endif ssize_t gtr, bgtr; ldns_buffer *b; - int lnr = 0, oldline; + int lnr = 0; FILE* myfp = fp; if(!line_nr) line_nr = &lnr; @@ -809,36 +809,18 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) gtr = 1; word[0] = 0; - oldline = *line_nr; expect = LDNS_RESOLV_KEYWORD; while (gtr > 0) { - /* check comments */ - if (word[0] == '#') { - word[0]='x'; - if(oldline == *line_nr) { - /* skip until end of line */ - int c; - do { - c = fgetc(myfp); - } while(c != EOF && c != '\n'); - if(c=='\n') (*line_nr)++; - } - /* and read next to prepare for further parsing */ - oldline = *line_nr; - continue; - } - oldline = *line_nr; switch(expect) { case LDNS_RESOLV_KEYWORD: /* keyword */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr != 0) { - if(word[0] == '#') continue; for(i = 0; i < LDNS_RESOLV_KEYWORDS; i++) { if (strcasecmp(keyword[i], word) == 0) { /* chosen the keyword and * expect values carefully - */ + */ expect = i; break; } @@ -856,16 +838,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) break; case LDNS_RESOLV_DEFDOMAIN: /* default domain dname */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr == 0) { if(!fp) fclose(myfp); ldns_resolver_deep_free(r); return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR; } - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - continue; - } tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word); if (!tmp) { if(!fp) fclose(myfp); @@ -879,16 +857,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) break; case LDNS_RESOLV_NAMESERVER: /* NS aaaa or a record */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr == 0) { if(!fp) fclose(myfp); ldns_resolver_deep_free(r); return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR; } - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - continue; - } if(strchr(word, '%')) { /* snip off interface labels, * fe80::222:19ff:fe31:4222%eth0 */ @@ -911,7 +885,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) break; case LDNS_RESOLV_SEARCH: /* search list domain dname */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); b = LDNS_MALLOC(ldns_buffer); if(!b) { ldns_resolver_deep_free(r); @@ -929,10 +903,6 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) bgtr = ldns_bget_token(b, word, LDNS_PARSE_NORMAL, (size_t) gtr + 1); while (bgtr > 0) { gtr -= bgtr; - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - break; - } tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word); if (!tmp) { ldns_resolver_deep_free(r); @@ -954,28 +924,23 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) } break; case LDNS_RESOLV_SORTLIST: - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); /* sortlist not implemented atm */ expect = LDNS_RESOLV_KEYWORD; break; case LDNS_RESOLV_OPTIONS: - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); /* options not implemented atm */ expect = LDNS_RESOLV_KEYWORD; break; case LDNS_RESOLV_ANCHOR: /* a file containing a DNSSEC trust anchor */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr == 0) { ldns_resolver_deep_free(r); if(!fp) fclose(myfp); return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR; } - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - continue; - } - #ifdef HAVE_SSL tmp_rr = ldns_read_anchor_file(word); (void) ldns_resolver_push_dnssec_anchor(r, tmp_rr); From nobody Wed Jun 19 20:37:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Flw4q8fz5Nnbh; Wed, 19 Jun 2024 20:37: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 4W4Flw3pRLz4Njq; Wed, 19 Jun 2024 20:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DS+L4Xs1+8cVL3zIznFkvhkxY1HUhHaEgwT7TIPUg9E=; b=Q+eKshStorIp4ixLngr7IiQmNgUknUmCCX+s5pj4Xt5K+LI4LZBLK5nDjuiIM2h2Gkedb6 jA2RSkFD9CPCHkeut0pI1xUlEsFslKMjBqL6vSM0vP17gGIvbw5KeXHvX9p+rvijPxPVIQ U/U5CPx6cbYeSqzlU1QBcOHtLOv1RimUB1/mVQhs2h82XU22FgiTOc17wCiviDwaeWrrPv 4CMMyupQAmrY5R2V9g6Oj/qIwivu+qAETAHmtaL1GxMDx3NRNI9eFiFRYpabgGELrnyogz HGevAoA6/JmfYJC2dVpwGwcyzusoLyVrGAYCxxRgFs17++OjVgLCfxOnNRYvlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829420; a=rsa-sha256; cv=none; b=bYNVrTmPDbQ+BvaCsRejmGegwFwk9LfJim00w1Qij9G27R43jfPWPpzmyAMoOTVe4B9TYq 444NY1jkcC5GQUjU5q64nMsA+Y6RWvM5b2xsNU55pl0qZWEQ0pLCeHwGLffWHlpddVw0R7 9+lEgzuF0hSQxfsbWVinjXYk4ess190j3QIE7fK3whj5JW9+AvMv1CmVKLs3RSLETfUTMA Zw7D3EdZgidoWQ+5P7uUOfC91SocXe1LnTJbxLg1OmtLDya1ujmtr088hPEcczAPyn+09l LO6QNlWageHsVMaT78R+d4yjAVyogC5FXhD56VnE4KzzAnTErBxJxjvcSjHBMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DS+L4Xs1+8cVL3zIznFkvhkxY1HUhHaEgwT7TIPUg9E=; b=VfeNJXT1K1gujmRc7dqbVhQwIurfuanYU4eOK+pIAb7tHhb09SP3PrsbTHMm1u+Ub+PKfD jEVt/zqQ/QexxbyIbsgftm42kx6u8e4SlP3fiz8WUHuOdNKY/4nO+9RaQmPWRRiSWvzsDi HOSr008m6f6I+2asKr9pmOQ4WVxxNfTnb1NmknMcnf5vWsCkButgzYUYelRRBnU/Xv1mYW vvTwhZ3tA4TV/6RXbOExkLr2B8DjEu6kQt+QKLRE7wdPO5aOWFYwvgUpOjGhUE4EmpoxRl tWX1gbqASNN5Gya8SmFRjIz+ZUoWOTPvYCNFtB6BmqGsusnFLsUTzN4qByhhQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Flw3QMZzwrZ; Wed, 19 Jun 2024 20:37: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 45JKb0TE002179; Wed, 19 Jun 2024 20:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKb0a1002176; Wed, 19 Jun 2024 20:37:00 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:37:00 GMT Message-Id: <202406192037.45JKb0a1002176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: bdba8eaa3db6 - releng/14.0 - Add UPDATING entries and bump the branch version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b commit bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b Author: Gordon Tetlow AuthorDate: 2024-06-18 17:34:24 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-19 20:21:41 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 8a24e55cb4b9..0a9ee0ff58f1 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240619: + 14.0-RELEASE-p7 EN-24:11.ldns + + Fix LDNS uses nameserver commented out in resolv.conf [EN-24:11.ldns] + 20240327: 14.0-RELEASE-p6 SA-24:03.unbound EN-24:05.tty diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 02f705ccc64a..2d5f3bbca98c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RELEASE-p6" +BRANCH="RELEASE-p7" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Jun 19 20:37:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Fm50hcBz5Nnbv; Wed, 19 Jun 2024 20:37: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 4W4Fm45sjFz4PKd; Wed, 19 Jun 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=supHDyejD/zPFA3ZN6ch3+8qf6vwPqoZXcnf4ppeJwE=; b=MPOQD3iCqZfHaqcv0PADdf21K30T4Kqwj1ThnQnMun8Kud4lF9MpS0Yysjq8BiB1gkjZPq aTsHfGvtLhTKJDehZdFsnQysejARLjcADLIlQoAdZgTY5+0TQDx327BBgdDqeSivrNFpou EUi0jr2P6ApiUt79ekPMa/Mp8ZV92liIFzY/XpBo0+6J02YF1nXxvZy+6NEXkUSTVAf9TC uN0WCHjbAJIds3yIhbqpqeUU8Y/IOzFLYE0p8mArgGPWDdcOSSY83hHOP5JQaf9hkOvbY3 QiHlbjOuNOc6Ay/aI+rLj0RGw5tvVWeIahLu1+mpVAMF9qPOQhgSQ7kHC86xFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829428; a=rsa-sha256; cv=none; b=V4zgD1NSX2D4Jfsxo152rw6XLMzZCu25O9wG2GWsS7NJrAlVl+UJivRJn5PpNfZN7FD5rk 9+EGl49t3sUzCSl58YsKMOo7cHzhW9dDYUXvjKxzYjj5H4mdk4QedKEQyEujYsnEOXjwuQ JGw3y20qh5qIS4gdR+NsR33ZDER8HoaQ+Yqf3kk6pWI2dpa2fv0NGLF32zSNqxQe38RFk/ Q0YABt/PCcH+zAHUOQrvnHxW5UIxVyqXFfa5Yn9U3y6skng5aPhpjti1zfAa30H93anAlH u4fHf2w7s/5KVVfE2RqCtMDjEaYOWvozzyVsD0MRNw+ui/OY7HZe4VAIY6NO8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=supHDyejD/zPFA3ZN6ch3+8qf6vwPqoZXcnf4ppeJwE=; b=lyveF4E9SNeJoRDadDo2pm8fn1/F0H3H0u8VH1ox86v29uLTqM8Dfka2WU2LvagCVtJash dDQp0x5zJGBmsLQMyUJ8it1kVO16KxTuRyj8FxQglpwMkjY86ZsjHMZDlt3WR632AOK31E VX2mPKZjEOgB62ehrujXC9JJcx0H7bqdrn/f/AkUblSj6q40pwnN4Qbju5R9Z5zUcOrNAY 8WIGjsK9DDyUFaogP4EQV9QVUwo13DX5OjLeLYwvhJfo5ViN3GEYfeQoZ6/kWNumQTXkYa 2RXerrAI8dxl+6efwbdzx42m8gAz9yIQfA91BWAvcwGcwhggFT2OXVdORgRZSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Fm45LTPzwly; Wed, 19 Jun 2024 20:37: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 45JKb8f4002360; Wed, 19 Jun 2024 20:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKb81x002357; Wed, 19 Jun 2024 20:37:08 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:37:08 GMT Message-Id: <202406192037.45JKb81x002357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: d45cf1d2f124 - releng/13.3 - ldns: Ignore commented-out lines in resolv.conf. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: d45cf1d2f1249d5b30c9fa0d35476dc9b9ee0321 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=d45cf1d2f1249d5b30c9fa0d35476dc9b9ee0321 commit d45cf1d2f1249d5b30c9fa0d35476dc9b9ee0321 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-15 10:16:24 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-18 17:25:37 +0000 ldns: Ignore commented-out lines in resolv.conf. This merges upstream PR 238 + an additional bug fix. PR: 278721 Approved by: so Security: FreeBSD-EN-24:11.ldns (cherry picked from commit 3b092e4936c433889cc668ea9563c8fd437d1a3e) (cherry picked from commit e95e16191f63240971687634a23c2defed64d713) --- contrib/ldns/ldns/parse.h | 2 ++ contrib/ldns/parse.c | 35 +++++++++++++++++++++++++++---- contrib/ldns/resolver.c | 53 ++++++++--------------------------------------- 3 files changed, 42 insertions(+), 48 deletions(-) diff --git a/contrib/ldns/ldns/parse.h b/contrib/ldns/ldns/parse.h index ba7edf5679d8..6130dae32bd2 100644 --- a/contrib/ldns/ldns/parse.h +++ b/contrib/ldns/ldns/parse.h @@ -95,6 +95,8 @@ ssize_t ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, */ ldns_status ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed, const char *delim, int *line_nr); +ssize_t ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim, size_t limit, int *line_nr); + /** * returns a token/char from the buffer b. * This function deals with ( and ) in the buffer, diff --git a/contrib/ldns/parse.c b/contrib/ldns/parse.c index 9698ba71e881..af8b2c1321b2 100644 --- a/contrib/ldns/parse.c +++ b/contrib/ldns/parse.c @@ -27,9 +27,14 @@ ldns_fget_token(FILE *f, char *token, const char *delim, size_t limit) return ldns_fget_token_l(f, token, delim, limit, NULL); } -ldns_status -ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed - , const char *delim, int *line_nr) +enum file_type2parse { + zone_file_type, resolv_conf_file_type +}; + +static ldns_status +ldns_fget_token_l_st_file_type(FILE *f, char **token, size_t *limit, + bool fixed, const char *delim, int *line_nr, + enum file_type2parse file_type) { int c, prev_c; int p; /* 0 -> no parentheses seen, >0 nr of ( seen */ @@ -98,7 +103,9 @@ ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed } /* do something with comments ; */ - if (c == ';' && quoted == 0) { + if ((c == ';' + || (c == '#' && file_type == resolv_conf_file_type)) + && quoted == 0) { if (prev_c != '\\') { com = 1; } @@ -215,6 +222,26 @@ tokenread: return i == 0 ? LDNS_STATUS_SYNTAX_EMPTY : LDNS_STATUS_OK; } +ldns_status +ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed + , const char *delim, int *line_nr) +{ + return ldns_fget_token_l_st_file_type( + f, token, limit, fixed, delim, line_nr, zone_file_type); +} + +ssize_t +ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim, + size_t limit, int *line_nr) +{ + if (limit == 0) + limit = LDNS_MAX_LINELEN; + if (ldns_fget_token_l_st_file_type(f, &token, &limit, true, delim, + line_nr, resolv_conf_file_type)) + return -1; + else + return (ssize_t)strlen(token); +} ssize_t ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *line_nr) diff --git a/contrib/ldns/resolver.c b/contrib/ldns/resolver.c index f9ec65a55966..a426b82c034e 100644 --- a/contrib/ldns/resolver.c +++ b/contrib/ldns/resolver.c @@ -775,7 +775,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) #endif ssize_t gtr, bgtr; ldns_buffer *b; - int lnr = 0, oldline; + int lnr = 0; FILE* myfp = fp; if(!line_nr) line_nr = &lnr; @@ -809,36 +809,18 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) gtr = 1; word[0] = 0; - oldline = *line_nr; expect = LDNS_RESOLV_KEYWORD; while (gtr > 0) { - /* check comments */ - if (word[0] == '#') { - word[0]='x'; - if(oldline == *line_nr) { - /* skip until end of line */ - int c; - do { - c = fgetc(myfp); - } while(c != EOF && c != '\n'); - if(c=='\n') (*line_nr)++; - } - /* and read next to prepare for further parsing */ - oldline = *line_nr; - continue; - } - oldline = *line_nr; switch(expect) { case LDNS_RESOLV_KEYWORD: /* keyword */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr != 0) { - if(word[0] == '#') continue; for(i = 0; i < LDNS_RESOLV_KEYWORDS; i++) { if (strcasecmp(keyword[i], word) == 0) { /* chosen the keyword and * expect values carefully - */ + */ expect = i; break; } @@ -856,16 +838,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) break; case LDNS_RESOLV_DEFDOMAIN: /* default domain dname */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr == 0) { if(!fp) fclose(myfp); ldns_resolver_deep_free(r); return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR; } - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - continue; - } tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word); if (!tmp) { if(!fp) fclose(myfp); @@ -879,16 +857,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) break; case LDNS_RESOLV_NAMESERVER: /* NS aaaa or a record */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr == 0) { if(!fp) fclose(myfp); ldns_resolver_deep_free(r); return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR; } - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - continue; - } if(strchr(word, '%')) { /* snip off interface labels, * fe80::222:19ff:fe31:4222%eth0 */ @@ -911,7 +885,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) break; case LDNS_RESOLV_SEARCH: /* search list domain dname */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); b = LDNS_MALLOC(ldns_buffer); if(!b) { ldns_resolver_deep_free(r); @@ -929,10 +903,6 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) bgtr = ldns_bget_token(b, word, LDNS_PARSE_NORMAL, (size_t) gtr + 1); while (bgtr > 0) { gtr -= bgtr; - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - break; - } tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word); if (!tmp) { ldns_resolver_deep_free(r); @@ -954,28 +924,23 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr) } break; case LDNS_RESOLV_SORTLIST: - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); /* sortlist not implemented atm */ expect = LDNS_RESOLV_KEYWORD; break; case LDNS_RESOLV_OPTIONS: - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr); /* options not implemented atm */ expect = LDNS_RESOLV_KEYWORD; break; case LDNS_RESOLV_ANCHOR: /* a file containing a DNSSEC trust anchor */ - gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); + gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr); if (gtr == 0) { ldns_resolver_deep_free(r); if(!fp) fclose(myfp); return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR; } - if(word[0] == '#') { - expect = LDNS_RESOLV_KEYWORD; - continue; - } - #ifdef HAVE_SSL tmp_rr = ldns_read_anchor_file(word); (void) ldns_resolver_push_dnssec_anchor(r, tmp_rr); From nobody Wed Jun 19 20:37:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Fm62Sfnz5Nn6n; Wed, 19 Jun 2024 20:37: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 4W4Fm56kJXz4PD7; Wed, 19 Jun 2024 20:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiRK9OZw5PvQgyhSP2GBPtOghyibdThpfxqFLkiYdxU=; b=rjbSt9OxqvRVYp5605nadLOZAiw1Kla9PVLGi8erq29f0LaoB9IUhPI+0hLgFrRagr4kG5 br6OymaPNsY5IuRHVOnAUrpS7PbTcdmkclBullVCOwLM9bfYd0ufkiDotPUASw4Id45E2Z Zv/WLhgpX/MK4/LyVCmVxyoLZupe18oz6mRLE08YqxdJn7/glbx0OPthTJPU1m//xfN183 s/1vAvUL3cb4C+WwJ9x42o11OahbRxAElGpd9AlRm/etHgrQgzRq681di9kubNu9RHNSYb zgaG8jPHS3gukwKcxVpnwoR+PJJQ9q/X3Pp/Hf0RMNoDQ7tmpe/VF1cHGRHZNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829429; a=rsa-sha256; cv=none; b=FVTpy9u61v8hIkfvbx4zFIIEwuGI6PAK3Cbu19bnfgJwSg4REr4Prl0pqa8g2O4SNnNAFA Ej2Ka+ubuM/e2SEjrKOpnzgCrMPfLVVH1wR3rSXvGR3NKCSCNs82w3628nn4UwrICL89kK ZMhjPYFeP9xY0rCFR3wvCvrkfLW662jf67ybo/q3nmaOEqgA1oL3I0lxxEQ9oE7+9bAyP4 LR1KQKD1nTD66zsWr0PRg7MdXb2LQB3nwaecdCk6I1fnKXjUuT13zIRkhmBejWXuOtsww2 +QaZtc6+CrwcbuPzuS4smho52MtOPS3FXssXScOiaypa2l1WCuyi7PqxEGUKpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiRK9OZw5PvQgyhSP2GBPtOghyibdThpfxqFLkiYdxU=; b=xlxifj+DorBm/Cmld9hrKe3mCXb5DycFqGBv649yGBRZcSCGsQr/0Lof3NEftdIGQXpsjF 3xs0GQh98FiEeYgWq1cFkCnCV7z45NThpnGgY5x4L8z3hYCqgEZljdsyfyxMEagS5nSHwy a2QprxUQrjUElWnypEpTsI/k4ZKZwINtaJLg6zI1KniGfcZqp8wQQmFLlCj6BRuHZdj1Cx DqiC5bCmpuhulS4qZhp9yVD+yWgFBQYzGZ3Xb7GNHDGzPNmi23fnc78+aUCnwkkVjXcpMw Ysw6OiHuo0WmBfd5N1Yd1QwcE/pYrJ6f9hLsu27p/gzX4c8i7um9NyvnBbCeWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Fm56LqczwpZ; Wed, 19 Jun 2024 20:37: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 45JKb99M002405; Wed, 19 Jun 2024 20:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKb9FE002402; Wed, 19 Jun 2024 20:37:09 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:37:09 GMT Message-Id: <202406192037.45JKb9FE002402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: eb410545d00d - releng/13.3 - killpg(): more carefully avoid LoR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: eb410545d00d55a40c4c30eb42b9d2ef5bb2361d Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=eb410545d00d55a40c4c30eb42b9d2ef5bb2361d commit eb410545d00d55a40c4c30eb42b9d2ef5bb2361d Author: Konstantin Belousov AuthorDate: 2023-07-07 17:19:33 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-18 17:26:29 +0000 killpg(): more carefully avoid LoR Approved by: so Security: FreeBSD-EN-24:12.killpg (cherry picked from commit 7a70f17ac4bd64dc1a5020f963ba4380cf37b7e5) (cherry picked from commit cd73b38955f62d9c05ded8e641a7462ca0f06179) --- sys/kern/kern_proc.c | 15 +++++++++++++-- sys/kern/kern_prot.c | 6 ++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 61c389f0b345..0db3718e15ff 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -587,8 +587,12 @@ enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess) ("enterpgrp: session leader attempted setpgrp")); old_pgrp = p->p_pgrp; - if (!sx_try_xlock(&old_pgrp->pg_killsx)) + if (!sx_try_xlock(&old_pgrp->pg_killsx)) { + sx_xunlock(&proctree_lock); + sx_xlock(&old_pgrp->pg_killsx); + sx_xunlock(&old_pgrp->pg_killsx); return (ERESTART); + } MPASS(old_pgrp == p->p_pgrp); if (sess != NULL) { @@ -656,11 +660,18 @@ enterthispgrp(struct proc *p, struct pgrp *pgrp) ("%s: p %p belongs to pgrp %p", __func__, p, pgrp)); old_pgrp = p->p_pgrp; - if (!sx_try_xlock(&old_pgrp->pg_killsx)) + if (!sx_try_xlock(&old_pgrp->pg_killsx)) { + sx_xunlock(&proctree_lock); + sx_xlock(&old_pgrp->pg_killsx); + sx_xunlock(&old_pgrp->pg_killsx); return (ERESTART); + } MPASS(old_pgrp == p->p_pgrp); if (!sx_try_xlock(&pgrp->pg_killsx)) { sx_xunlock(&old_pgrp->pg_killsx); + sx_xunlock(&proctree_lock); + sx_xlock(&pgrp->pg_killsx); + sx_xunlock(&pgrp->pg_killsx); return (ERESTART); } diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a91b7ec3015f..5dea43971e3d 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -345,10 +345,8 @@ again: error = EPERM; } else { error = enterpgrp(p, p->p_pid, newpgrp, newsess); - if (error == ERESTART) { - sx_xunlock(&proctree_lock); + if (error == ERESTART) goto again; - } MPASS(error == 0); td->td_retval[0] = p->p_pid; newpgrp = NULL; @@ -458,11 +456,11 @@ again: error = enterthispgrp(targp, pgrp); } done: - sx_xunlock(&proctree_lock); KASSERT(error == 0 || newpgrp != NULL, ("setpgid failed and newpgrp is NULL")); if (error == ERESTART) goto again; + sx_xunlock(&proctree_lock); uma_zfree(pgrp_zone, newpgrp); return (error); } From nobody Wed Jun 19 20:37:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Fm729Jzz5NnYt; Wed, 19 Jun 2024 20:37: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 4W4Fm70fRRz4PQS; Wed, 19 Jun 2024 20:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVY6U8USC4g6TyWlGgxcxqpzSGFOKxhazWHZNCHu6bA=; b=d5AtLtlrM3ZqI8WMf29dzkkUdZpzbOXX4VKU5PsV83BFSsZChQCBKxOy4kDeWXH0wTlfyN 0p0hi2s8TyRfaAy0WqyBsHXPXDd1KSGcqzt8K6bjQcPNRLvyA3Y6qdEEajQRJWeGF5PEKW RVlmmcN62EHXY1+kpXdl509P7mq6yfxDM8If6QbW3Bs5txTB3wjI8V025Zx0Gzwi0cD7HJ ehYhUiaLodPdA3frXdgGTSS+Z7BvUpdK448VwEPQH5mxacvncvJyvwgMv/wA8ex38ap9Vj nNKsAfG/7BfXYifI8cLpvCDCSrYOSP0io3QjJonYoF3nkCXFk7xeXts1P8YTBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829431; a=rsa-sha256; cv=none; b=VH9z7f6WbtvpcgENTww+kBZ47iZ7uPFqvh7KUyF+Gbyv7Q4+jJTxVBO2cVX5sDBx83YH9y OWBWEqP0zZiM7edrnSJuohVSisSN5tRDX/Wcbz/KfRLxov2JK84DVANvk4GugZ4ksgFTib Qs1nA7eUTqRokCB/R6aN7/xRQBsylHpBIAjJe3DRvlfL6Eadbz2+AlFETh6SICB6Fb+D73 QVF/UvJDgjbRTHHaRfwz2y4wbwt9ns/XqTQ4AyBnpQ1e5g8Z18l6qGaPl/SzzHE8HPTd68 MWFpVrQ7mKQS5z7zLMVBZwjhjvYyAk7q8w3jvIXQsgNA3N8MYnl4WaGtg+rlAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVY6U8USC4g6TyWlGgxcxqpzSGFOKxhazWHZNCHu6bA=; b=pgtLzIaThHZT9/lDOyUQgZ5SK8Op7EOyIIk5KT0p91WcsvFYzrGIwwHXlDk9nug0bkKGQa zxZKhVaW0h7hvLN63p37E7lBLCIIlBzS17hf97aSZXIRyuSdSKK13Zb2iFg9rjdtOzsULY a7odBHU3guZs4EXXLmLWZ/Mc+2vdQGuPyLd5z4yRIRVEN/Kmd/MZxlzGVbBBfvQmey2vkF 15kTV28BUmVRDP4KmqpchUim6tns5ciRuvxczg3ihs5dVE9ElwwRsxJ4o1IJMeVxE+ODBf H7LRWCps82qk5/4NmsxqPsMJAvkBsV/46G9msnYrHv09HjEpUqYx5wUACUtfOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Fm70GsFzwZv; Wed, 19 Jun 2024 20:37: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 45JKbA2c002468; Wed, 19 Jun 2024 20:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKbA0f002465; Wed, 19 Jun 2024 20:37:10 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:37:10 GMT Message-Id: <202406192037.45JKbA0f002465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 2dc3f3a5e231 - releng/13.3 - Add UPDATING entries and bump the branch version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 2dc3f3a5e2316622ff6d04c982618a9bea71f981 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=2dc3f3a5e2316622ff6d04c982618a9bea71f981 commit 2dc3f3a5e2316622ff6d04c982618a9bea71f981 Author: Gordon Tetlow AuthorDate: 2024-06-18 17:29:59 +0000 Commit: Gordon Tetlow CommitDate: 2024-06-19 20:20:58 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 97c8abff980a..1c9d8acbde6d 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240619: + 13.3-RELEASE-p3 EN-24:11.ldns + EN-24:12.killpg + + Fix LDNS uses nameserver commented out in resolv.conf [EN-24:11.ldns] + + Fix lock order reversal in killpg causing livelock [EN-24:12.killpg] + 20240424: 13.3-RELEASE-p2 EN-24:09.zfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c6e44a41b9f8..2e6012da6667 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.3" -BRANCH="RELEASE-p2" +BRANCH="RELEASE-p3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Jun 19 20:39:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Fpz2mmqz5Nnnt; Wed, 19 Jun 2024 20:39: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 4W4Fpz2GG7z4Qqb; Wed, 19 Jun 2024 20:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8xxA9lR+aCYPwEmuHtx11tdwqvh08jquG676IcoMqU=; b=V+ARqJeXz8ZVPOHfihUw4VUQmV3hvXie5RtT8W+94/dFsfc8d08cczL66ZHxeisGBl9L2A wbpn/l/rZI1JgTk8TzJ0CBWbzO+TdYtG8UxXb79+31dXWqGJWT6tVpks1r5U2DuUqSt7cK Wthkdxhy4PekrBfh1xR3Bf5/WiFJAvFDAb77vHlb1gB6ykNX/cuSDsuZoGsVKKfQgBjm8K O+2ZjPgUo8Jg6r3c8N2OzszbAySy0dq2tpnIU1V5TuKb1szJoTPa5WFRQRPoDHAO2h8iQu Jgy1QUgInjc5SDt5CzkK5MAw46MQTCBUuKkYZvF7f8vNHXnQEPjnRFMl0y2LvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829579; a=rsa-sha256; cv=none; b=pxgiXFBYWZY797niH16TfFhgrfhvZ1z5NN+1WjpQdKT1hwTqVFTH7lUv47t4dijAj2rMip gVrfz0zAd4twkQdknE71uOCYyxbA0lvaK812t/VkYbXtAJJ5dx4P2G/bWuuXaL60RYeN/5 RozLg51V/BJtb5+0jSfPBxDgn0KhkLjs0LoNBmR79O6VFgsFswx1uAh4rRRdYJpjWRZGQk Q5yHXn5vgRFRHAvHX+eg0YlsdAT4MPDwRwYOywt+Va9aSs1eQ3ezS8OOpkQXYDkNzdLhgm 3fs/vehSY/4wlbW9CSR9KzOZrs74FWywzIt9Wr6ymkcDXyJlWra+PxNKKKZl2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718829579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8xxA9lR+aCYPwEmuHtx11tdwqvh08jquG676IcoMqU=; b=EAM9gOh7ODzkgdJ/xHuvHSoSufdn0dDcyFZiemq9fiWw1YwdmDD/iG4IqzDK9J7pC6aLGt EkTB7ywpZLRXR9CcC1szZgaWwgK4lubqdmeTHnnRBr5Wm3oZKSV4/avF7ubJ/ihjmzMXrI QPykJT4xKvVCuqOIW6MwFKBoZu4dO+yvW/ITS0DqqQRmP2R/u+bu7Cu3zsm0wB9MijrGxw s+OqEVPTUpvTjvUfkyIxnVLlgxzO0UcbbHN+diT3N+gfeNVbwHUn1lHVPrQijkytV+VvCL 7+CrBggl4H94ZA6t7PQFmkvD45WZT1BEosoFMS0QI5IIuWdEJmYPYLenshEwYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Fpz1skGzwv8; Wed, 19 Jun 2024 20:39: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 45JKddEt002927; Wed, 19 Jun 2024 20:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKddLe002924; Wed, 19 Jun 2024 20:39:39 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:39:39 GMT Message-Id: <202406192039.45JKddLe002924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d511e97c54d3 - main - libsysdecode: support rfork(RFSPAWN) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d511e97c54d3b143368ff3896b4ab51040ca8994 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d511e97c54d3b143368ff3896b4ab51040ca8994 commit d511e97c54d3b143368ff3896b4ab51040ca8994 Author: Brooks Davis AuthorDate: 2024-06-19 20:38:31 +0000 Commit: Brooks Davis CommitDate: 2024-06-19 20:38:31 +0000 libsysdecode: support rfork(RFSPAWN) Match the "U" in RFSPAWN's value (1U<<31) (and "u" for completeness). Reject kernel-only RFPPWAIT to avoid a duplicate entry. Reviewed by: imp, markj Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D45597 --- lib/libsysdecode/mktables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index 8a990e0408d5..87ab24ddf1a5 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -120,7 +120,7 @@ gen_table "procctlcmd" "PROC_[A-Z_]+[[:space:]]+[0-9]" "sys gen_table "ptraceop" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" gen_table "quotactlcmds" "Q_[A-Z]+[[:space:]]+0x[0-9]+" "ufs/ufs/quota.h" gen_table "rebootopt" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h" -gen_table "rforkflags" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h" +gen_table "rforkflags" "RF[A-Z]+[[:space:]]+\([0-9]+[uU]?<<[0-9]+\)" "sys/unistd.h" "RFPPWAIT" gen_table "rlimit" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h" gen_table "rusage" "RUSAGE_[A-Z]+[[:space:]]+[-0-9]+" "sys/resource.h" gen_table "schedpolicy" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sys/sched.h" From nobody Wed Jun 19 20:58:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4GDK3Xfgz5Nq11; Wed, 19 Jun 2024 20:58: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 4W4GDK31Wrz4SGW; Wed, 19 Jun 2024 20:58:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718830689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bX5M3EaxJZ/rrgRgNda4HDnqq/7dTrHgsE1RLw6vbCU=; b=nISTMgKYcJZduilS0INNf7b/YbX6IKD7437hJcoo0lbQHqjmqVaqgbyPRJzTDjpD6fEXK5 OU8EdwDcCFl5Kb6JT1URqYliOXeuYGSn0scJ/VgqVEVCZFXptlfzMqtgfCnBuH3kPjxOvC SImd2gJ/WvQ9pOGW1DIBnixn1Wyi6YKxXdwYdLN0k0+mru3VXnZWDlVw8bt49jy6bAJOiS +ENSwfX7qmkKVEWPz8olGm/02bIxono1SeFzcAMdYifiopH2JmP3N6YDgRHdrPe78mA8qg ZpRJKZCKlyg0tUgZ96tBk6Nrq6sP6rO0u508+s4x4ILlyg0M40hL9Qn75ZFUeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718830689; a=rsa-sha256; cv=none; b=t2vgTwvtWlNvTYHhjqcTXXquxJW5k6BQRbJg4ZIhtGppBIBsWVsyEWiIrFPgQUa8mJTqjv nKa48BdvS1pCEQo+d+oj6q+CRmzWNrchyL53AzI/zhGB1h2GGvq6DyelQSQB6DIIdIhNjg nIP19obGfgHkD0sIZjYBbZKpLmUZvImo6ukt2sGY8W05oM/7Yq0c6TMYYPsdrwPDnuPdq2 ErwkjYZ+8ri9JK/xzXXfqmd/4jexNk06FVVOJKoa96VVvaXbdvRcOdCNAkNMneoAoeHreo 1vWHwqCTewGfGWggL1tmp05VaNdGz9G0sqChYIZKjA6lA31zUVXoo1wV7GIjeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718830689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bX5M3EaxJZ/rrgRgNda4HDnqq/7dTrHgsE1RLw6vbCU=; b=r3X0v/IQT+mkZP0o54XbfQCYQv3gWnaqPi0ZpXheXOj0+huhY5lKkowABIL2jdi50fr9Q5 6gLzhnwGOMPTjyhA6lIUUXJalxiqhAAzQh31ZT62d7swv/Fw1J5Rw4QhvSIIHbHAeHenJk PwhyOB8UxIV65R047QFWi16yE22pGPwL5rFFQH1KOYAnh+2x233GjpcJzkhR62lM5IZVyx 0+Tt0ooxDOV2y0jM21ABTEHazelReQMp4Ro/p19Pt5cShwb4UUgG2qZP2nL4xVaufWiXKA eF+CpmHFKqfEqRepnkni3dgj64xsnRuVDWYJtsCoYk6dYO0mUCnxCKopi57spw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4GDK0tF9zwtR; Wed, 19 Jun 2024 20:58: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 45JKw84G036225; Wed, 19 Jun 2024 20:58:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKw81W036222; Wed, 19 Jun 2024 20:58:08 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:58:08 GMT Message-Id: <202406192058.45JKw81W036222@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: bc2901144cf7 - main - dtrace: Remove LOCK_LEVEL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc2901144cf71fd14b4b04cef801fa1bab19ad32 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc2901144cf71fd14b4b04cef801fa1bab19ad32 commit bc2901144cf71fd14b4b04cef801fa1bab19ad32 Author: Mark Johnston AuthorDate: 2024-06-19 15:18:45 +0000 Commit: Mark Johnston CommitDate: 2024-06-19 20:54:02 +0000 dtrace: Remove LOCK_LEVEL It is unused on FreeBSD. No functional change intended. MFC after: 1 week --- sys/cddl/dev/dtrace/dtrace_cddl.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/cddl/dev/dtrace/dtrace_cddl.h b/sys/cddl/dev/dtrace/dtrace_cddl.h index 95317955c102..42a4721fbb90 100644 --- a/sys/cddl/dev/dtrace/dtrace_cddl.h +++ b/sys/cddl/dev/dtrace/dtrace_cddl.h @@ -25,8 +25,6 @@ #include -#define LOCK_LEVEL 10 - /* * Kernel DTrace extension to 'struct proc' for FreeBSD. */ From nobody Wed Jun 19 20:58:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4GDL4rz9z5Nq5d; Wed, 19 Jun 2024 20:58: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 4W4GDL21hKz4SNL; Wed, 19 Jun 2024 20:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718830690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YkLngRjxAY5/f5DcNdwBEQiWOxVoJTsz8UkYSc+DaAY=; b=XT/V7d+DO+Qir6d6Sh8+iCk8f2xxqyfGHrtEyohM9istIBGx652wHwiPAguzzT3gpgpagF VCb/lSZO3gQFyh/b9fhEyUDF0ZOcJ/c6Yj7OPYvyZezmE0UsCxBnYk+WV3pv59ffksVmD3 qRl69LG05xaFoaV2+nk6bjITfO0EvclulStFi+Ib3eP1brLfC3rzDvJJ4J5hDERGdZ3yGB 7ccIIk1TuJ4scStU/B8MiVASFi+yHECp7iuY1QvmT29tETHSa4OdkN39Mo1VqjvEVWzIYh fzVoQdMcZo8aPusFDBPHGYZUZblOZ4siEpqkIL98E1QuTJvVHcF2fDdTde5ZEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718830690; a=rsa-sha256; cv=none; b=qBZDAsxhix5h+rTchH9bfKgI17z4ooZOwLMGy4jOq6+5XuJ3op8B+bGCCH/2yiAdTQA/Mr OnggEy2DJ/yocZGBTjM1nRUItwayhD6JCJhS1kPMkLJudfbBU9zgDg5iPEDE2p0FVE0UqE nDfxIV+M3U7qHL5/63mh41WlwCOCW+zVHlqzyOcKQaFjfQlCJL4mcMJzvYgsOWU89HNCt/ xfx52+zIXiZRJ2mh6tWJjStiWvKQKO5Atr4zcPW6kfnubo4L4dSsWVqK+UiWzyi6SYD+aE DQ/u6Juj/DbecHaWMnmHfxmVM1UcKMnBekzafCLJBJJTOXB5pYhdlm0yzcHSqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718830690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YkLngRjxAY5/f5DcNdwBEQiWOxVoJTsz8UkYSc+DaAY=; b=vTod8LsbhuimZw6Wvykl5LVwcj4w+jYBz3TQBPDngIA7BbgCL9VtlFJ1/zRPVA350APIS0 zgcO/79DojRIeMPuifvJSiOpczToK7Yk6E2Mm+bikIkq7WSg5leQdDfumq73Xw1HpFn3V9 wICEhOv13gvpdQuqrsz4dhz2Eca28vHNndBtgn/HEFRZA1XoabTcRAfRAT0V+IGVeQXLhF YVJLNvsINUmDzEe1Vb2PvgtXp5mj6Tqn0RIasem42M5GflPHDkIy6A7GCC36IYKnjYJyif VF5Lm/f12df3JiRILIfz/dx5HFLRCmRQWHTCUJa3n4YBKYK1y8oOlYSRjobyZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4GDL1dmFzxXS; Wed, 19 Jun 2024 20:58: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 45JKwAMW036276; Wed, 19 Jun 2024 20:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKwAe7036273; Wed, 19 Jun 2024 20:58:10 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:58:10 GMT Message-Id: <202406192058.45JKwAe7036273@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: e5a7890dc00a - main - zfs: Use a statement expression to implement SET_ERROR() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5a7890dc00ac0b158498db92008f7c0b5970eac Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e5a7890dc00ac0b158498db92008f7c0b5970eac commit e5a7890dc00ac0b158498db92008f7c0b5970eac Author: Mark Johnston AuthorDate: 2024-06-19 16:01:54 +0000 Commit: Mark Johnston CommitDate: 2024-06-19 20:57:30 +0000 zfs: Use a statement expression to implement SET_ERROR() This way we can avoid making assumptions about the SDT probe implementation. No functional change intended. This was submitted upstream as https://github.com/openzfs/zfs/pull/16284 MFC after: 1 week --- sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h index 2daa6de1af08..74e03fd5b956 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h @@ -31,13 +31,14 @@ #include_next #ifdef KDTRACE_HOOKS -/* CSTYLED */ +/* BEGIN CSTYLED */ SDT_PROBE_DECLARE(sdt, , , set__error); -#define SET_ERROR(err) \ - ((sdt_sdt___set__error->id ? \ - (*sdt_probe_func)(sdt_sdt___set__error->id, \ - (uintptr_t)err, 0, 0, 0, 0) : 0), err) +#define SET_ERROR(err) ({ \ + SDT_PROBE1(sdt, , , set__error, (uintptr_t)err); \ + err; \ +}) +/* END CSTYLED */ #else #define SET_ERROR(err) (err) #endif From nobody Wed Jun 19 20:58:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4GDM4Fymz5Nq12; Wed, 19 Jun 2024 20: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 4W4GDM2hQLz4SGY; Wed, 19 Jun 2024 20: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=1718830691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VGyn2hq8/gNmb9EJEEm9AmpEQ5a8VfIJwei3lzCJKz0=; b=oWGPmpOAlnvIpBDxPnE+AohxciY2QbYhBzC/xOsua/K1tQrHI/K0uecoblQ5CA5iE7qkWB kwZCiaUF53vyNdYRWFhCNezUpynXLhUV01hfj7laZ1andxdlU0PdE2JNBvxxnNBVi0GZwk fnr7xr21d21FPy42dzb7Aw5uBz2eyk0LnlN1MkHmzLUAStwHwQZqAM44sDUT0buCtUdYkN +c9Rqp5DckaJhlrk2DgokPKqehpTzW9OxSeJ82Md9ffiNOBpWMPup8lcyZ5gDo18fIJslI ezjamBoXu8Z4Qe3HOTAtyzMjFgAa9eU58c5gY/MEGh80hri2M3t4uCQntP1DAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718830691; a=rsa-sha256; cv=none; b=RtHJD+dzZzaQX/x3dkckZ78dP3rFNA6npJ7mJWaiIeyVInpQct94qE2bVxPpM43juMZ5p/ fyOSCQTVkwecVil0PAzapU4wCiTbPUxYvhR9eiiFbzmflnPpihEuF4loLgUiqpcvYerBod uXmtA9yerGq/z7PVtVnkW0thDUrNbhNmiJAKG4aVIdoLmVE2ax9AebBXRrz//QGxL6gT29 uIKSiSM5J/7RYMgoWjAO9SmJUHVdqktxp871bLeJr9ZhkHBgzNIt3d+fisSYzn20WtBoUg RKo0cH7NlsVwkT24QRg9H/3ytyE+oTO2XGL63F09IV9ggSbHL2NzmlwGTo16OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718830691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VGyn2hq8/gNmb9EJEEm9AmpEQ5a8VfIJwei3lzCJKz0=; b=v1GE6yMKcaU/S/BzXJOZXMCMl36YHUlZya/F1guXkRzReZmDRpQxMjd+pHwepFqbm6nNlr qnb9zsH0p3FIhvSkoAicmTydQSP7nCGHo6K1SBfpY69xliu7y5OnvHFCYx5uhwMF3XlgW5 tJd4d92sUO2jKtSQaVvILUKpo8sk8ymUkY9zqw6A4btSoKVd/LQ03WdWN3y5CVUedgbn4H qKpHmzaBCtPLZc4bHLP4GpxgZQ+k1fuv8JQKNSkGCxmWLpZ1dDg9v5d/t1U8Ae84AlnCj8 ytoRP2XnWgu8sOhDai4D43iAtkgnWVIcJEx/aGyWWaIKIuVClS/IW8m5m6VvvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4GDM2JBYzwnf; Wed, 19 Jun 2024 20: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 45JKwBp2036330; Wed, 19 Jun 2024 20: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 45JKwB77036327; Wed, 19 Jun 2024 20:58:11 GMT (envelope-from git) Date: Wed, 19 Jun 2024 20:58:11 GMT Message-Id: <202406192058.45JKwB77036327@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: ddf0ed09bd8f - main - sdt: Implement SDT probes using hot-patching List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddf0ed09bd8f83677407db36828aca2c10f419c9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf0ed09bd8f83677407db36828aca2c10f419c9 commit ddf0ed09bd8f83677407db36828aca2c10f419c9 Author: Mark Johnston AuthorDate: 2024-06-19 20:57:09 +0000 Commit: Mark Johnston CommitDate: 2024-06-19 20:57:41 +0000 sdt: Implement SDT probes using hot-patching The idea here is to avoid a memory access and conditional branch per probe site. Instead, the probe is represented by an "unreachable" unconditional function call. asm goto is used to store the address of the probe site (represented by a no-op sled) and the address of the function call into a tracepoint record. Each SDT probe carries a list of tracepoints. When the probe is enabled, the no-op sled corresponding to each tracepoint is overwritten with a jmp to the corresponding label. The implementation uses smp_rendezvous() to park all other CPUs while the instruction is being overwritten, as this can't be done atomically in general. The compiler moves argument marshalling code and the sdt_probe() function call out-of-line, i.e., to the end of the function. Per gallatin@ in D43504, this approach has less overhead when probes are disabled. To make the implementation a bit simpler, I removed support for probes with 7 arguments; nothing makes use of this except a regression test case. It could be re-added later if need be. The approach taken in this patch enables some more improvements: 1. We can now automatically fill out the "function" field of SDT probe names. The SDT macros let the programmer specify the function and module names, but this is really a bug and shouldn't have been allowed. The intent was to be able to have the same probe in multiple functions and to let the user restrict which probes actually get enabled by specifying a function name or glob. 2. We can avoid branching on SDT_PROBES_ENABLED() by adding the ability to include blocks of code in the out-of-line path. For example: if (SDT_PROBES_ENABLED()) { int reason = CLD_EXITED; if (WCOREDUMP(signo)) reason = CLD_DUMPED; else if (WIFSIGNALED(signo)) reason = CLD_KILLED; SDT_PROBE1(proc, , , exit, reason); } could be written SDT_PROBE1_EXT(proc, , , exit, reason, int reason; reason = CLD_EXITED; if (WCOREDUMP(signo)) reason = CLD_DUMPED; else if (WIFSIGNALED(signo)) reason = CLD_KILLED; ); In the future I would like to use this mechanism more generally, e.g., to remove branches and marshalling code used by hwpmc, and generally to make it easier to add new tracepoint consumers without having to add more conditional branches to hot code paths. Reviewed by: Domagoj Stolfa, avg MFC after: 2 months Differential Revision: https://reviews.freebsd.org/D44483 --- .../cmd/dtrace/test/tst/common/sdt/tst.sdtargs.d | 11 +- sys/amd64/include/sdt_machdep.h | 12 ++ sys/arm/arm/sdt_machdep.c | 63 ++++++++++ sys/arm/include/sdt_machdep.h | 12 ++ sys/arm64/arm64/sdt_machdep.c | 77 ++++++++++++ sys/arm64/include/sdt_machdep.h | 12 ++ sys/cddl/dev/dtrace/dtrace_test.c | 6 +- sys/cddl/dev/sdt/sdt.c | 97 +++++++++++++-- sys/conf/files.arm | 1 + sys/conf/files.arm64 | 1 + sys/conf/files.powerpc | 1 + sys/conf/files.riscv | 1 + sys/conf/files.x86 | 1 + sys/i386/include/sdt_machdep.h | 19 +++ sys/kern/kern_sdt.c | 21 +++- sys/modules/dtrace/Makefile | 4 +- sys/powerpc/include/sdt_machdep.h | 12 ++ sys/powerpc/powerpc/sdt_machdep.c | 59 +++++++++ sys/riscv/include/sdt_machdep.h | 12 ++ sys/riscv/riscv/sdt_machdep.c | 68 +++++++++++ sys/sys/sdt.h | 133 +++++++++++---------- sys/x86/x86/sdt_machdep.c | 84 +++++++++++++ 22 files changed, 625 insertions(+), 82 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.d index e965b05f2405..d3f7bfad5db1 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.d @@ -27,7 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * ASSERTION: Verify that argN (1..7) variables are properly remapped. + * ASSERTION: Verify that argN (1..6) variables are properly remapped. */ BEGIN @@ -44,13 +44,12 @@ ERROR } test:::sdttest -/arg0 != 1 || arg1 != 2 || arg2 != 3 || arg3 != 4 || arg4 != 5 || arg5 != 6 || - arg6 != 7/ +/arg0 != 1 || arg1 != 2 || arg2 != 3 || arg3 != 4 || arg4 != 5 || arg5 != 6/ { printf("sdt arg mismatch\n\n"); - printf("args are : %d, %d, %d, %d, %d, %d, %d\n", arg0, arg1, arg2, - arg3, arg4, arg5, arg6); - printf("should be : 1, 2, 3, 4, 5, 6, 7\n"); + printf("args are : %d, %d, %d, %d, %d, %d\n", arg0, arg1, arg2, + arg3, arg4, arg5); + printf("should be : 1, 2, 3, 4, 5, 6\n"); exit(1); } diff --git a/sys/amd64/include/sdt_machdep.h b/sys/amd64/include/sdt_machdep.h new file mode 100644 index 000000000000..2434abed2e0e --- /dev/null +++ b/sys/amd64/include/sdt_machdep.h @@ -0,0 +1,12 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#ifndef _SYS_SDT_MACHDEP_H_ +#define _SYS_SDT_MACHDEP_H_ + +#define _SDT_ASM_PATCH_INSTR "nop; nop; nop; nop; nop" + +#endif diff --git a/sys/arm/arm/sdt_machdep.c b/sys/arm/arm/sdt_machdep.c new file mode 100644 index 000000000000..02361497ee8d --- /dev/null +++ b/sys/arm/arm/sdt_machdep.c @@ -0,0 +1,63 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#include +#include + +#include + +/* + * Return true if we can overwrite a nop at "patchpoint" with a jump to the + * target address. + */ +bool +sdt_tracepoint_valid(uintptr_t patchpoint, uintptr_t target) +{ + int32_t offset; + + if (patchpoint == target || + (patchpoint & (INSN_SIZE - 1)) != 0 || + (target & (INSN_SIZE - 1)) != 0 || + patchpoint + 2 * INSN_SIZE < patchpoint) + return (false); + offset = target - (patchpoint + 2 * INSN_SIZE); + if (offset < -(1 << 24) || offset > (1 >> 24)) + return (false); + return (true); +} + +/* + * Overwrite the copy of _SDT_ASM_PATCH_INSTR at the tracepoint with a jump to + * the target address. + */ +void +sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) +{ + uint32_t instr; + + KASSERT(sdt_tracepoint_valid(patchpoint, target), + ("%s: invalid tracepoint %#x -> %#x", + __func__, patchpoint, target)); + + instr = + (((target - (patchpoint + 2 * INSN_SIZE)) >> 2) & ((1 << 24) - 1)) | + 0xea000000; + memcpy((void *)patchpoint, &instr, sizeof(instr)); + icache_sync(patchpoint, sizeof(instr)); +} + +/* + * Overwrite the patchpoint with a nop instruction. + */ +void +sdt_tracepoint_restore(uintptr_t patchpoint) +{ + uint32_t instr; + + instr = 0xe320f000u; + memcpy((void *)patchpoint, &instr, sizeof(instr)); + icache_sync(patchpoint, sizeof(instr)); +} diff --git a/sys/arm/include/sdt_machdep.h b/sys/arm/include/sdt_machdep.h new file mode 100644 index 000000000000..738d246832a2 --- /dev/null +++ b/sys/arm/include/sdt_machdep.h @@ -0,0 +1,12 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#ifndef _SYS_SDT_MACHDEP_H_ +#define _SYS_SDT_MACHDEP_H_ + +#define _SDT_ASM_PATCH_INSTR "nop" + +#endif /* _SYS_SDT_MACHDEP_H_ */ diff --git a/sys/arm64/arm64/sdt_machdep.c b/sys/arm64/arm64/sdt_machdep.c new file mode 100644 index 000000000000..23324ffbf333 --- /dev/null +++ b/sys/arm64/arm64/sdt_machdep.c @@ -0,0 +1,77 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#include +#include + +#include +#include + +#include +#include +#include + +/* + * Return true if we can overwrite a nop at "patchpoint" with a jump to the + * target address. + */ +bool +sdt_tracepoint_valid(uintptr_t patchpoint, uintptr_t target) +{ + void *addr; + int64_t offset; + + if (!arm64_get_writable_addr((void *)patchpoint, &addr)) + return (false); + + if (patchpoint == target || + (patchpoint & (INSN_SIZE - 1)) != 0 || + (target & (INSN_SIZE - 1)) != 0) + return (false); + offset = target - patchpoint; + if (offset < -(1 << 26) || offset > (1 << 26)) + return (false); + return (true); +} + +/* + * Overwrite the copy of _SDT_ASM_PATCH_INSTR at the tracepoint with a jump to the + * target address. + */ +void +sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) +{ + void *addr; + uint32_t instr; + + KASSERT(sdt_tracepoint_valid(patchpoint, target), + ("%s: invalid tracepoint %#lx -> %#lx", + __func__, patchpoint, target)); + + if (!arm64_get_writable_addr((void *)patchpoint, &addr)) + panic("%s: Unable to write new instruction", __func__); + + instr = (((target - patchpoint) >> 2) & 0x3fffffful) | 0x14000000; + memcpy(addr, &instr, sizeof(instr)); + cpu_icache_sync_range((void *)patchpoint, INSN_SIZE); +} + +/* + * Overwrite the patchpoint with a nop instruction. + */ +void +sdt_tracepoint_restore(uintptr_t patchpoint) +{ + void *addr; + uint32_t instr; + + if (!arm64_get_writable_addr((void *)patchpoint, &addr)) + panic("%s: Unable to write new instruction", __func__); + + instr = 0xd503201f; + memcpy(addr, &instr, sizeof(instr)); + cpu_icache_sync_range((void *)patchpoint, INSN_SIZE); +} diff --git a/sys/arm64/include/sdt_machdep.h b/sys/arm64/include/sdt_machdep.h new file mode 100644 index 000000000000..738d246832a2 --- /dev/null +++ b/sys/arm64/include/sdt_machdep.h @@ -0,0 +1,12 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#ifndef _SYS_SDT_MACHDEP_H_ +#define _SYS_SDT_MACHDEP_H_ + +#define _SDT_ASM_PATCH_INSTR "nop" + +#endif /* _SYS_SDT_MACHDEP_H_ */ diff --git a/sys/cddl/dev/dtrace/dtrace_test.c b/sys/cddl/dev/dtrace/dtrace_test.c index 92ba3a36a24e..c77448670917 100644 --- a/sys/cddl/dev/dtrace/dtrace_test.c +++ b/sys/cddl/dev/dtrace/dtrace_test.c @@ -37,8 +37,8 @@ SDT_PROVIDER_DEFINE(test); -SDT_PROBE_DEFINE7(test, , , sdttest, "int", "int", "int", "int", "int", - "int", "int"); +SDT_PROBE_DEFINE6(test, , , sdttest, "int", "int", "int", "int", "int", + "int"); /* * These are variables that the DTrace test suite references in the @@ -68,7 +68,7 @@ dtrace_test_sdttest(SYSCTL_HANDLER_ARGS) else if (val == 0) return (0); - SDT_PROBE7(test, , , sdttest, 1, 2, 3, 4, 5, 6, 7); + SDT_PROBE6(test, , , sdttest, 1, 2, 3, 4, 5, 6); return (error); } diff --git a/sys/cddl/dev/sdt/sdt.c b/sys/cddl/dev/sdt/sdt.c index 684374848290..51fa0432437c 100644 --- a/sys/cddl/dev/sdt/sdt.c +++ b/sys/cddl/dev/sdt/sdt.c @@ -19,7 +19,7 @@ * CDDL HEADER END * * Portions Copyright 2006-2008 John Birrell jb@freebsd.org - * + * Copyright 2024 Mark Johnston */ /* @@ -187,7 +187,7 @@ sdt_create_probe(struct sdt_probe *probe) if (dtrace_probe_lookup(prov->id, mod, func, name) != DTRACE_IDNONE) return; - (void)dtrace_probe_create(prov->id, mod, func, name, 1, probe); + (void)dtrace_probe_create(prov->id, mod, func, name, 0, probe); } /* @@ -200,10 +200,62 @@ sdt_provide_probes(void *arg, dtrace_probedesc_t *desc) { } +struct sdt_enable_cb_arg { + struct sdt_probe *probe; + int cpu; + int arrived; + int done; + bool enable; +}; + +static void +sdt_probe_update_cb(void *_arg) +{ + struct sdt_enable_cb_arg *arg; + struct sdt_tracepoint *tp; + + arg = _arg; + if (arg->cpu != curcpu) { + atomic_add_rel_int(&arg->arrived, 1); + while (atomic_load_acq_int(&arg->done) == 0) + cpu_spinwait(); + return; + } else { + while (atomic_load_acq_int(&arg->arrived) != mp_ncpus - 1) + cpu_spinwait(); + } + + STAILQ_FOREACH(tp, &arg->probe->tracepoint_list, tracepoint_entry) { + if (arg->enable) + sdt_tracepoint_patch(tp->patchpoint, tp->target); + else + sdt_tracepoint_restore(tp->patchpoint); + } + + atomic_store_rel_int(&arg->done, 1); +} + +static void +sdt_probe_update(struct sdt_probe *probe, bool enable) +{ + struct sdt_enable_cb_arg cbarg; + + sched_pin(); + cbarg.probe = probe; + cbarg.cpu = curcpu; + atomic_store_rel_int(&cbarg.arrived, 0); + atomic_store_rel_int(&cbarg.done, 0); + cbarg.enable = enable; + smp_rendezvous(NULL, sdt_probe_update_cb, NULL, &cbarg); + sched_unpin(); +} + static void sdt_enable(void *arg __unused, dtrace_id_t id, void *parg) { - struct sdt_probe *probe = parg; + struct sdt_probe *probe; + + probe = parg; probe->id = id; probe->sdtp_lf->nenabled++; @@ -215,15 +267,20 @@ sdt_enable(void *arg __unused, dtrace_id_t id, void *parg) sdt_probes_enabled_count++; if (sdt_probes_enabled_count == 1) sdt_probes_enabled = true; + + sdt_probe_update(probe, true); } static void sdt_disable(void *arg __unused, dtrace_id_t id, void *parg) { - struct sdt_probe *probe = parg; + struct sdt_probe *probe; + probe = parg; KASSERT(probe->sdtp_lf->nenabled > 0, ("no probes enabled")); + sdt_probe_update(probe, false); + sdt_probes_enabled_count--; if (sdt_probes_enabled_count == 0) sdt_probes_enabled = false; @@ -284,26 +341,47 @@ sdt_kld_load_providers(struct linker_file *lf) static void sdt_kld_load_probes(struct linker_file *lf) { - struct sdt_probe **probe, **p_begin, **p_end; - struct sdt_argtype **argtype, **a_begin, **a_end; + struct sdt_probe **p_begin, **p_end; + struct sdt_argtype **a_begin, **a_end; + struct sdt_tracepoint *tp_begin, *tp_end; if (linker_file_lookup_set(lf, "sdt_probes_set", &p_begin, &p_end, NULL) == 0) { - for (probe = p_begin; probe < p_end; probe++) { + for (struct sdt_probe **probe = p_begin; probe < p_end; + probe++) { (*probe)->sdtp_lf = lf; sdt_create_probe(*probe); TAILQ_INIT(&(*probe)->argtype_list); + STAILQ_INIT(&(*probe)->tracepoint_list); } } if (linker_file_lookup_set(lf, "sdt_argtypes_set", &a_begin, &a_end, NULL) == 0) { - for (argtype = a_begin; argtype < a_end; argtype++) { + for (struct sdt_argtype **argtype = a_begin; argtype < a_end; + argtype++) { (*argtype)->probe->n_args++; TAILQ_INSERT_TAIL(&(*argtype)->probe->argtype_list, *argtype, argtype_entry); } } + + if (linker_file_lookup_set(lf, __XSTRING(_SDT_TRACEPOINT_SET), + &tp_begin, &tp_end, NULL) == 0) { + for (struct sdt_tracepoint *tp = tp_begin; tp < tp_end; tp++) { + if (!sdt_tracepoint_valid(tp->patchpoint, tp->target)) { + printf( + "invalid tracepoint %#jx->%#jx for %s:%s:%s:%s\n", + (uintmax_t)tp->patchpoint, + (uintmax_t)tp->target, + tp->probe->prov->name, tp->probe->mod, + tp->probe->func, tp->probe->name); + continue; + } + STAILQ_INSERT_TAIL(&tp->probe->tracepoint_list, tp, + tracepoint_entry); + } + } } /* @@ -378,6 +456,7 @@ sdt_load(void) TAILQ_INIT(&sdt_prov_list); sdt_probe_func = dtrace_probe; + sdt_probe6_func = (sdt_probe6_func_t)dtrace_probe; sdt_kld_load_tag = EVENTHANDLER_REGISTER(kld_load, sdt_kld_load, NULL, EVENTHANDLER_PRI_ANY); @@ -403,6 +482,7 @@ sdt_unload(void) EVENTHANDLER_DEREGISTER(kld_unload_try, sdt_kld_unload_try_tag); sdt_probe_func = sdt_probe_stub; + sdt_probe6_func = (sdt_probe6_func_t)sdt_probe_stub; TAILQ_FOREACH_SAFE(prov, &sdt_prov_list, prov_entry, tmp) { ret = dtrace_unregister(prov->id); @@ -419,7 +499,6 @@ sdt_unload(void) static int sdt_modevent(module_t mod __unused, int type, void *data __unused) { - switch (type) { case MOD_LOAD: case MOD_UNLOAD: diff --git a/sys/conf/files.arm b/sys/conf/files.arm index b049479fbe82..825680b73165 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -58,6 +58,7 @@ arm/arm/pmu.c optional pmu | hwpmc arm/arm/pmu_fdt.c optional fdt pmu | fdt hwpmc arm/arm/ptrace_machdep.c standard arm/arm/sc_machdep.c optional sc +arm/arm/sdt_machdep.c optional kdtrace_hooks arm/arm/setcpsr.S standard arm/arm/setstack.S standard arm/arm/stack_machdep.c optional ddb | stack diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 26f9eaf193af..a6bd1a1ba60a 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -68,6 +68,7 @@ arm64/arm64/ptrauth.c standard \ compile-with "${NORMAL_C:N-mbranch-protection*} -mbranch-protection=bti" arm64/arm64/pmap.c standard arm64/arm64/ptrace_machdep.c standard +arm64/arm64/sdt_machdep.c optional kdtrace_hooks arm64/arm64/sigtramp.S standard arm64/arm64/stack_machdep.c optional ddb | stack arm64/arm64/strcmp.S standard diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 1a0388884ee8..1baacb5628c7 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -336,6 +336,7 @@ powerpc/powerpc/platform.c standard powerpc/powerpc/platform_if.m standard powerpc/powerpc/ptrace_machdep.c standard powerpc/powerpc/sc_machdep.c optional sc +powerpc/powerpc/sdt_machdep.c optional powerpc64 kdtrace_hooks powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode32.S optional powerpc | powerpcspe | compat_freebsd32 powerpc/powerpc/sigcode64.S optional powerpc64 | powerpc64le diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 90e2826ce55d..5b94eb327f93 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -61,6 +61,7 @@ riscv/riscv/riscv_syscon.c optional syscon riscv_syscon fdt riscv/riscv/sigtramp.S standard riscv/riscv/sbi.c standard riscv/riscv/sbi_ipi.c optional smp +riscv/riscv/sdt_machdep.c optional kdtrace_hooks riscv/riscv/stack_machdep.c optional ddb | stack riscv/riscv/support.S standard riscv/riscv/swtch.S standard diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index de698e82c823..8a68459ff215 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -377,6 +377,7 @@ x86/x86/x86_mem.c optional mem x86/x86/mp_x86.c optional smp x86/x86/nexus.c standard x86/x86/pvclock.c optional kvm_clock | xenhvm +x86/x86/sdt_machdep.c optional kdtrace_hooks x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/ucode.c standard diff --git a/sys/i386/include/sdt_machdep.h b/sys/i386/include/sdt_machdep.h new file mode 100644 index 000000000000..550cfa7dd692 --- /dev/null +++ b/sys/i386/include/sdt_machdep.h @@ -0,0 +1,19 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#ifndef _SYS_SDT_MACHDEP_H_ +#define _SYS_SDT_MACHDEP_H_ + +#define _SDT_ASM_PATCH_INSTR "nop; nop; nop; nop; nop" + +/* + * Work around an apparent clang bug or limitation which prevents the use of the + * "i" (immediate) constraint with the probe structure. + */ +#define _SDT_ASM_PROBE_CONSTRAINT "Ws" +#define _SDT_ASM_PROBE_OPERAND "p" + +#endif diff --git a/sys/kern/kern_sdt.c b/sys/kern/kern_sdt.c index b5f30057d535..b7213d2051fc 100644 --- a/sys/kern/kern_sdt.c +++ b/sys/kern/kern_sdt.c @@ -37,6 +37,7 @@ SDT_PROVIDER_DEFINE(sdt); * dtrace_probe() when it loads. */ sdt_probe_func_t sdt_probe_func = sdt_probe_stub; +sdt_probe6_func_t sdt_probe6_func = (sdt_probe6_func_t)sdt_probe_stub; volatile bool __read_frequently sdt_probes_enabled; /* @@ -45,10 +46,24 @@ volatile bool __read_frequently sdt_probes_enabled; * to enable it. */ void -sdt_probe_stub(uint32_t id, uintptr_t arg0, uintptr_t arg1, - uintptr_t arg2, uintptr_t arg3, uintptr_t arg4) +sdt_probe_stub(uint32_t id __unused, uintptr_t arg0 __unused, + uintptr_t arg1 __unused, uintptr_t arg2 __unused, uintptr_t arg3 __unused, + uintptr_t arg4 __unused) { - printf("sdt_probe_stub: unexpectedly called\n"); kdb_backtrace(); } + +void +sdt_probe(uint32_t id, uintptr_t arg0, uintptr_t arg1, + uintptr_t arg2, uintptr_t arg3, uintptr_t arg4) +{ + sdt_probe_func(id, arg0, arg1, arg2, arg3, arg4); +} + +void +sdt_probe6(uint32_t id, uintptr_t arg0, uintptr_t arg1, + uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5) +{ + sdt_probe6_func(id, arg0, arg1, arg2, arg3, arg4, arg5); +} diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 73c71c5bd1fb..3cc672b62c3b 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -10,7 +10,6 @@ SUBDIR= dtaudit \ fbt \ profile \ prototype \ - sdt \ systrace .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" @@ -31,5 +30,8 @@ SUBDIR+= fasttrap ${MACHINE_ARCH} == "powerpc64" SUBDIR+= systrace_freebsd32 .endif +.if ${MACHINE_CPUARCH} != "powerpc" || ${MACHINE_ARCH} == "powerpc64" +SUBDIR+= sdt +.endif .include diff --git a/sys/powerpc/include/sdt_machdep.h b/sys/powerpc/include/sdt_machdep.h new file mode 100644 index 000000000000..8f6c3d88ea7d --- /dev/null +++ b/sys/powerpc/include/sdt_machdep.h @@ -0,0 +1,12 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#ifndef _SYS_SDT_MACHDEP_H_ +#define _SYS_SDT_MACHDEP_H_ + +#define _SDT_ASM_PATCH_INSTR "nop" + +#endif diff --git a/sys/powerpc/powerpc/sdt_machdep.c b/sys/powerpc/powerpc/sdt_machdep.c new file mode 100644 index 000000000000..8a84016a9571 --- /dev/null +++ b/sys/powerpc/powerpc/sdt_machdep.c @@ -0,0 +1,59 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#include +#include + +#include + +/* + * Return true if we can overwrite a nop at "patchpoint" with a jump to the + * target address. + */ +bool +sdt_tracepoint_valid(uintptr_t patchpoint, uintptr_t target) +{ + int64_t offset; + + if (patchpoint == target || + (patchpoint & 3) != 0 || (target & 3) != 0) + return (false); + offset = target - patchpoint; + if (offset < -(1 << 26) || offset > (1 << 26)) + return (false); + return (true); +} + +/* + * Overwrite the copy of _SDT_ASM_PATCH_INSTR at the tracepoint with a jump to + * the target address. + */ +void +sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) +{ + uint32_t instr; + + KASSERT(sdt_tracepoint_valid(patchpoint, target), + ("%s: invalid tracepoint %#lx -> %#lx", + __func__, patchpoint, target)); + + instr = ((target - patchpoint) & 0x7fffffful) | 0x48000000; + memcpy((void *)patchpoint, &instr, sizeof(instr)); + __syncicache((void *)patchpoint, sizeof(instr)); +} + +/* + * Overwrite the patchpoint with a nop instruction. + */ +void +sdt_tracepoint_restore(uintptr_t patchpoint) +{ + uint32_t instr; + + instr = 0x60000000; + memcpy((void *)patchpoint, &instr, sizeof(instr)); + __syncicache((void *)patchpoint, sizeof(instr)); +} diff --git a/sys/riscv/include/sdt_machdep.h b/sys/riscv/include/sdt_machdep.h new file mode 100644 index 000000000000..160f5d404204 --- /dev/null +++ b/sys/riscv/include/sdt_machdep.h @@ -0,0 +1,12 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#ifndef _SYS_SDT_MACHDEP_H_ +#define _SYS_SDT_MACHDEP_H_ + +#define _SDT_ASM_PATCH_INSTR ".option push; .option norvc; nop; .option pop" + +#endif /* _SYS_SDT_MACHDEP_H_ */ diff --git a/sys/riscv/riscv/sdt_machdep.c b/sys/riscv/riscv/sdt_machdep.c new file mode 100644 index 000000000000..4b139c8edd98 --- /dev/null +++ b/sys/riscv/riscv/sdt_machdep.c @@ -0,0 +1,68 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Mark Johnston + */ + +#include +#include + +#include + +/* + * Return true if we can overwrite a nop at "patchpoint" with a jump to the + * target address. + */ +bool +sdt_tracepoint_valid(uintptr_t patchpoint, uintptr_t target) +{ + int64_t offset; + + if (patchpoint == target || + (patchpoint & (INSN_C_SIZE - 1)) != 0 || + (target & (INSN_C_SIZE - 1)) != 0) + return (false); + offset = target - patchpoint; + if (offset < -(1 << 19) || offset > (1 << 19)) + return (false); + return (true); +} + +/* + * Overwrite the copy of _SDT_ASM_PATCH_INSTR at the tracepoint with a jump to + * the target address. + */ +void +sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) +{ + int32_t imm; + uint32_t instr; + + KASSERT(sdt_tracepoint_valid(patchpoint, target), + ("%s: invalid tracepoint %#lx -> %#lx", + __func__, patchpoint, target)); + + imm = target - patchpoint; + imm = (imm & 0x100000) | + ((imm & 0x7fe) << 8) | + ((imm & 0x800) >> 2) | + ((imm & 0xff000) >> 12); + instr = (imm << 12) | MATCH_JAL; + + memcpy((void *)patchpoint, &instr, sizeof(instr)); + fence_i(); +} + +/* + * Overwrite the patchpoint with a nop instruction. + */ +void +sdt_tracepoint_restore(uintptr_t patchpoint) +{ + uint32_t instr; + + instr = 0x13; /* uncompressed nop */ + + memcpy((void *)patchpoint, &instr, sizeof(instr)); + fence_i(); +} diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index fabf4d72740c..147d58c53ef4 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -77,8 +77,8 @@ #else /* _KERNEL */ -#include #include +#include extern volatile bool sdt_probes_enabled; @@ -102,8 +102,6 @@ extern volatile bool sdt_probes_enabled; #define SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) #define SDT_PROBE_DEFINE6(prov, mod, func, name, arg0, arg1, arg2, \ arg3, arg4, arg5) -#define SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2, \ - arg3, arg4, arg5, arg6) #define SDT_PROBE0(prov, mod, func, name) #define SDT_PROBE1(prov, mod, func, name, arg0) @@ -112,8 +110,6 @@ extern volatile bool sdt_probes_enabled; #define SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3) #define SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) #define SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5) -#define SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5, \ - arg6) #define MIB_SDT_PROBE1(...) #define MIB_SDT_PROBE2(...) @@ -130,9 +126,6 @@ extern volatile bool sdt_probes_enabled; arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4) #define SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, arg0, xarg0, \ arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5) -#define SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0, \ - arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6, \ - xarg6) #define DTRACE_PROBE(name) #define DTRACE_PROBE1(name, type0, arg0) @@ -144,6 +137,18 @@ extern volatile bool sdt_probes_enabled; #else +void sdt_probe(uint32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, + uintptr_t); +void sdt_probe6(uint32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, + uintptr_t, uintptr_t); + +#define _SDT_TRACEPOINT_SET sdt_tracepoint_set +#define _SDT_TRACEPOINT_SECTION "set_sdt_tracepoint_set" + +bool sdt_tracepoint_valid(uintptr_t patchpoint, uintptr_t target); +void sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target); +void sdt_tracepoint_restore(uintptr_t patchpoint); + #define __sdt_used SET_DECLARE(sdt_providers_set, struct sdt_provider); @@ -181,14 +186,58 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype); #define SDT_PROBES_ENABLED() __predict_false(sdt_probes_enabled) -#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) do { \ - if (SDT_PROBES_ENABLED()) { \ - if (__predict_false(_SDT_PROBE_NAME(prov, mod, func, name)->id)) \ - (*sdt_probe_func)(_SDT_PROBE_NAME(prov, mod, func, name)->id, \ - (uintptr_t) arg0, (uintptr_t) arg1, (uintptr_t) arg2, \ - (uintptr_t) arg3, (uintptr_t) arg4); \ - } \ +#ifdef _ILP32 +#define _SDT_ASM_WORD ".long" +#else +#define _SDT_ASM_WORD ".quad" +#endif + +#ifndef _SDT_ASM_PROBE_CONSTRAINT +#define _SDT_ASM_PROBE_CONSTRAINT "i" +#endif +#ifndef _SDT_ASM_PROBE_OPERAND +#define _SDT_ASM_PROBE_OPERAND "c" +#endif + +/* + * The asm below generates records corresponding to the structure's layout, so + * the two must be kept in sync. + */ +struct sdt_tracepoint { + struct sdt_probe *probe; + uintptr_t patchpoint; + uintptr_t target; + STAILQ_ENTRY(sdt_tracepoint) tracepoint_entry; +}; + +#define __SDT_PROBE(prov, mod, func, name, uniq, f, ...) do { \ + __WEAK(__CONCAT(__start_set_, _SDT_TRACEPOINT_SET)); \ + __WEAK(__CONCAT(__stop_set_, _SDT_TRACEPOINT_SET)); \ + asm goto( \ + "0:\n" \ + _SDT_ASM_PATCH_INSTR "\n" \ + ".pushsection " _SDT_TRACEPOINT_SECTION ", \"aw\"\n" \ + _SDT_ASM_WORD " %" _SDT_ASM_PROBE_OPERAND "0\n" \ + _SDT_ASM_WORD " 0b\n" \ + _SDT_ASM_WORD " %l1\n" \ + _SDT_ASM_WORD " 0\n" \ + ".popsection\n" \ + : \ + : _SDT_ASM_PROBE_CONSTRAINT (_SDT_PROBE_NAME(prov, mod, \ + func, name)) \ + : \ + : __sdt_probe##uniq); \ + if (0) { \ +__sdt_probe##uniq:; \ + f(_SDT_PROBE_NAME(prov, mod, func, name)->id, __VA_ARGS__); \ + } \ } while (0) +#define _SDT_PROBE(prov, mod, func, name, uniq, f, ...) \ + __SDT_PROBE(prov, mod, func, name, uniq, f, __VA_ARGS__) +#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \ + _SDT_PROBE(prov, mod, func, name, __COUNTER__, sdt_probe, \ + (uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \ + (uintptr_t)arg3, (uintptr_t)arg4) *** 186 LINES SKIPPED *** From nobody Wed Jun 19 22:09:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4HpR36fVz5P1J9; Wed, 19 Jun 2024 22:09: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 4W4HpR2936z4s3K; Wed, 19 Jun 2024 22:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718834959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmFfnX8kuaEp+VNZGDc4GSVv6UbnQZ4lq4Jl7vnnLfU=; b=DhhaYQAflvaK145pQipA4MMl3cdNHyeCJB4oy9oow/MHnftYmC3JmVcNVpEhmz1UfL8qyG nhMvOuBQnEq7352iUFDCJ+tvnH/T8ONQVQM8k8fa9mZaTtmga0Cu3Dsth4jsdNsuJO4Pfk PN0chQXdU9Ody42kJ7ya7IzNynmjM8aFN6L9hPjQh+Fe639kvApghK99xaVHXANMzIUkLa P+Xy8uwX3QlPQyhT2o00633CsMBD4TWPShfJbiwEn65JdTlFH33FwmEcaWAR4dcPqrWJwC 57PCsV2PvDX7uhTC1IIiGV6WODTZcywfO+PCofNnexE1WL2Ch4O1U6HrgJdMlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718834959; a=rsa-sha256; cv=none; b=wyzOo29Vu4GHBV4ub39r3bMamdC+3vok05+dlFBM7wZK6sbO7VrgPR1UCqGHr+S9V/I5nr OEJiinOobH8m4ktOE4SfnwTwgKhyR2YmaZTo/25Ya/pEIykM9BwWNZh9RvRUuo282GfAcB AVuozeCnXxSn0s7laQvMaWSS+O6dqE/JAQ0Kh373yK2imVkFD8YzkK3FI72fJeMeJZDHMP J9BLvq0CEc1jD2S23rVE7xmtyZ1r7alYt5zmCtNGAEPXi8sOKRoHQB0CyvwoaJP2Xsl5kr kbwgjpl3USATyvuZIMsYy7/rkoraX2Yj8GcxpBJk7qd47rqaAlR/44YhkcId4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718834959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmFfnX8kuaEp+VNZGDc4GSVv6UbnQZ4lq4Jl7vnnLfU=; b=Wl1s0hVXytUNzA9qwehKRMprtjqSKcQZOVqml2Y1NHVrIpLy3Vl/L6/w/b5k48GDchPCot da09rdkUYVrl9WBiiaEWrIs4/UxvMKsDiMmAZI8vkL7ax1SNzSNOV/OGfP/WT25cHXWAnP 7PRhx1o30hAZN+VjRsRbfyARkuRX/QTqUfmxOjPU7niW8mXT5Vi/WvHBrm5ZwyHfwQ0RYP pOzehfwd6jGyWP7nYOqTrKJptXO4gbl23E/lLokQQUTSl97uq6jGn1YBa2hucTo/Pw2pF3 uMtKbEIdo0iGVN2Wsvp9nivmxbInyZkjlQtgJUu4mVlkE06FzKW3dcBaiJMxGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4HpR1f8Jz1039; Wed, 19 Jun 2024 22:09: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 45JM9JvT055652; Wed, 19 Jun 2024 22:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JM9JCs055649; Wed, 19 Jun 2024 22:09:19 GMT (envelope-from git) Date: Wed, 19 Jun 2024 22:09:19 GMT Message-Id: <202406192209.45JM9JCs055649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 42c545c5f8a2 - main - libsys: sort Symbol.map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42c545c5f8a22b54b67f4f49678828a6bd8573a3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=42c545c5f8a22b54b67f4f49678828a6bd8573a3 commit 42c545c5f8a22b54b67f4f49678828a6bd8573a3 Author: Brooks Davis AuthorDate: 2024-06-19 22:07:10 +0000 Commit: Brooks Davis CommitDate: 2024-06-19 22:08:05 +0000 libsys: sort Symbol.map Fixes: 7448408656b0 Make __libsys_interposing_slot libsys only --- lib/libsys/Symbol.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map index b24e72b75b83..b2bc69108bbb 100644 --- a/lib/libsys/Symbol.map +++ b/lib/libsys/Symbol.map @@ -1,8 +1,8 @@ FBSDprivate_1.0 { __elf_aux_vector; __getosreldate; - __realpathat; __libsys_interposing_slot; + __realpathat; _elf_aux_info; freebsd11_fstat; freebsd11_fstatat; From nobody Thu Jun 20 04:28:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4SDB4dlMz5P50f; Thu, 20 Jun 2024 04:28: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 4W4SDB47h7z4YfT; Thu, 20 Jun 2024 04:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718857722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=br85Zj7i6lg/917/mxwDcLIVce/f+hGkIXXTnxai+eg=; b=U0wdQ/D0BjqQMaSMHMUb+ZT2vTCAJcHfrufq4iQHO3EjED0a7evDxej7z/8FgLmapT6L7A e4d2H7RjsrPNFexFlCkLIXi98MMwxZmwIoc4wpO4VGrKFZN4oB49PSN2i50JWb2/uEm3Zg 8jBaExPUvHEHM33JFd5m/BK2hQNK4zp3oZ5WZTi1EiWUvzF5xsnEPuM/PFSMzbV3ljRyZV oqF/AdjSvT2U62VbMtHHELOkJmmq/H7k7F28ntO+kPw66k5aoCiu/gT+fU1LlscGNnNcmQ fLaqXK32qm+IbYcKFsNi+VRReHUZAyE/DYARVEvDnlKKyNQQuCsfOfPEDfRT8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718857722; a=rsa-sha256; cv=none; b=EUjq4q5E2V0CprYkTgyeCHezvjj/EvZ2Pz5Bo+mWb6//YV5qmr7BE8pNeyIIAy8hgy+Sk8 2GPztbis34vhqsyVU8zTwyi9KNyV0a+l57/1TGW6sHq953mzAuCOdw7zQTK2OTLG6J00DK kw5x6GfTqiidkPpzFMZTWro0YkAdXKW6nfaBxmfHh7iXnCerZa3r5fsN4lK3TY1VCp952U JLG3cGmqppW6eA5LIiTDuEhkYKvTL1f4MUhDA2jrVLSz89lioF+AxF84ZAFJllCrfrPVPK 3jg2IfddQtM5uPp1VejbytcZNUP/skLoa1HX3hUOuMOeHJ7g/NnIgO8uEkRMug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718857722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=br85Zj7i6lg/917/mxwDcLIVce/f+hGkIXXTnxai+eg=; b=g2/5rMQe7Aq4Ok3U40lmLGzDzaEUnj0fQkqI5FYzQnkPs7keMacx3OyOgvYpiOnN/ZHRWk SZ+fE88OaRSxaV5vJX+vIXuwfbTWqUxC51vOQF0LW1YZ8prOgS6e50ajlwZB8Z7wRMA4W7 jJ7h4aBAB39XKtsUZNOLTiBOBC6MV/+uwGMXk+S7QjXdiS+1YFHklZN43fmwOk1vPYfP0W arvCLWFq3bIa8VO+XXTnA9/J0L71pDu9YuUfqVxia+UQRCtTQTSXWq5Y6h7iXRiTEeLtPV x8jLXTEZRdUDBTRaplq9ChNBQeJz8n4Mm3hc9HGkDZvX0rcxroeLVPYEskppfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4SDB3l20z19Tb; Thu, 20 Jun 2024 04:28: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 45K4Sgkp097566; Thu, 20 Jun 2024 04:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K4Sgja097563; Thu, 20 Jun 2024 04:28:42 GMT (envelope-from git) Date: Thu, 20 Jun 2024 04:28:42 GMT Message-Id: <202406200428.45K4Sgja097563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 34c98f40f549 - main - net80211: Correct a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34c98f40f549b3e5692aa5095448ff9135030f99 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=34c98f40f549b3e5692aa5095448ff9135030f99 commit 34c98f40f549b3e5692aa5095448ff9135030f99 Author: Zhenlei Huang AuthorDate: 2024-06-20 04:27:43 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-20 04:27:43 +0000 net80211: Correct a comment MFC after: 3 days --- sys/net80211/ieee80211_radiotap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_radiotap.c b/sys/net80211/ieee80211_radiotap.c index 34e27b323fc1..79e00106a780 100644 --- a/sys/net80211/ieee80211_radiotap.c +++ b/sys/net80211/ieee80211_radiotap.c @@ -125,7 +125,7 @@ ieee80211_radiotap_vattach(struct ieee80211vap *vap) void ieee80211_radiotap_vdetach(struct ieee80211vap *vap) { - /* NB: bpfattach is called by ether_ifdetach and claims all taps */ + /* NB: bpfdetach is called by ether_ifdetach and claims all taps */ } static void From nobody Thu Jun 20 08:03:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Y0Q1Bbwz5NFPR; Thu, 20 Jun 2024 08:03: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 4W4Y0Q0N2hz4v52; Thu, 20 Jun 2024 08:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718870630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJus3RoUI6zrC0sPjQ0Jsf2uMTEr0R6nMA4haslh0Lc=; b=X+Exbo2/YERI+cGUT6fQHpBawe8+w1MCxsBuEyvqlmO3tY3fFb6b0iXqUDnaVPO0EnKy67 WZbQhHU8EzDkD+iOEEV4+KhhnleNdfqjfRdavg5PDXeGoN+AkDXmCqNWALhjOVeRCXxMj3 ZH7IBTywIOunu4o7w9aD4f6Xk2SW/RHbOhewwc+cpI7lJPHFDlayyMyRB+XjNWOXnyrJo9 QIPPngzjZQeuBTthhP4s6rsrcpVy5PwIuBvx0QHG59ocx7K3RP4OxeVu11mIaBkFqCa/9P 254uTb5yO4iKEQGuAMhz/xq2e7z7hJZPW8uuKPALGjDEpSueCw8oCzV6aGQmtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718870630; a=rsa-sha256; cv=none; b=ncoxTPftbW0a0+rb3UYrlg4QLS1bGLSKqbHGy/I4tkesKbWEUqzqMn7ObY+DUSdhlaVvUm pmt1PR1Ec+kVMczVvdTahP6atqyf88F4Hwj3ul+BxzrBQuMuDroF0UG/B0wWcjDV7DXxLy p6Pi5rdIUf4C9Q7TAzvCUGFEUUiTj0SdTrZhKW5LC+B+cYr7zBUYNik0Fa4gS4D92CutdN Tq6iW805DJDlUHW9cZQPuhjxeqympSPlKQjBDnJwMUj+Un/FgWg0MyX5Ua56LEwyLFULoz Jtbev0xAZQZYFOIOvcir+/tLMx0PSyle0TYbfHKSOXRBUNVnWprdLyUswcQjiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718870630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJus3RoUI6zrC0sPjQ0Jsf2uMTEr0R6nMA4haslh0Lc=; b=EGMAUSAkPhi9vdIurTBe2bwWF/u61UiBr6sC67+jYPemylcFNEvvlWbN+H5Lnx4wkNQUp+ C5fDYRsASzVnVfAcdhLOpUI+GcKf6V/XZMGSTQzkmXvan2jOmd9ufmpS1crjhcILRUGxvU B/C/H2ivGB0OCdloP2DSmow4VFFatzMAcJysIK1yohpRz9zcYUwfLC6f++H7AUTr4h7QM9 fPjTIrazPgGKg4yUZVDJ+o4rGRUATX5dyD9BqMgI1xpGFrgUZv9x2FTd1CjvgL5wpbrd/H o81PsX5vzFxdrYMa5mqcFZUYUW8TMDASy4m+kzVZ/+ZjxKAsQpQm9dOdcx/aLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Y0P74zPzHPV; Thu, 20 Jun 2024 08:03: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 45K83ngJ068134; Thu, 20 Jun 2024 08:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K83nh7068130; Thu, 20 Jun 2024 08:03:49 GMT (envelope-from git) Date: Thu, 20 Jun 2024 08:03:49 GMT Message-Id: <202406200803.45K83nh7068130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4231a5e50404 - main - release: don't keep old packages if the BRANCH changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4231a5e5040403f4ae46a63bf6e1209d5eb7adb8 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4231a5e5040403f4ae46a63bf6e1209d5eb7adb8 commit 4231a5e5040403f4ae46a63bf6e1209d5eb7adb8 Author: Siva Mahadevan AuthorDate: 2024-06-05 18:11:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 08:02:34 +0000 release: don't keep old packages if the BRANCH changes --- Makefile.inc1 | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 28ab291928ff..91d59e57b396 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -576,17 +576,23 @@ MAJOR_REVISION= ${_REVISION:R} _PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} +BRANCH_EXT= .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} _PKG_REVISION= ${MAJOR_REVISION} -EXTRA_REVISION= .snap${_TIMENOW} +BRANCH_EXT= snap +EXTRA_REVISION= .${BRANCH_EXT}${_TIMENOW} .elif ${_BRANCH:MALPHA*} -EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= a${_BRANCH:C/ALPHA([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:MBETA*} -EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= b${_BRANCH:C/BETA([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:MRC*} -EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= rc${_BRANCH:C/RC([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:M*-p*} -EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +BRANCH_EXT= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +EXTRA_REVISION= ${BRANCH_EXT} .endif PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif @@ -2020,9 +2026,11 @@ PKG_EXT= pkg .if exists(${REPODIR}/${PKG_ABI}) PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest PKG_VERSION_FROM_DIR= ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM} +BRANCH_EXT_FROM= ${PKG_VERSION_FROM:C/.*([[:alpha:]][^\.]*).*/\1/} .else PKG_VERSION_FROM= PKG_VERSION_FROM_DIR= +BRANCH_EXT_FROM= .endif .endif .endif @@ -2060,7 +2068,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "$${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" == "$${newsum}" ]; then \ echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ From nobody Thu Jun 20 08:13:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4YCW3qR8z5NFp3 for ; Thu, 20 Jun 2024 08:13: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 4W4YCW3Hv5z3wdB; Thu, 20 Jun 2024 08:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718871207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tg2eVK7Uo9GFEsrd4ESddTxjmqnaR29fRQ7HISviuH0=; b=nwGxrpNiqnLe1cnumzI71XYntc7B/rGvbTB2A4mlS6ojmIl8EdxTz1MB2Ye8Ic+Ekvngr+ zkDt7UuwPLdA0+rK9Ra5MuLhmPtF5H3ZsUBm2Bpkl2RT9LMzcdMWSNEbOIKaAmTUqEA793 i+7n3LKUYHOhJpXzscp4tmiuq4yNMpTRyMbXHVxVN8or1GK3fy4FEKBTWOrtKL2pHyKqQr Fw0OHZbp6IzKeOqPS7NKl1Yu8sJZFd3+N18WAf346GWI6mpdneroOeQlAtuDbdo3Sj/CgS YdvQaP+IMXRR7J7H7Cnh5cz6BaXWuwaHecUSeGpJUV58gelsh3ump9sgDSCpKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718871207; a=rsa-sha256; cv=none; b=aMizvKfZw4k5RPgOiHmMOEpqRV6B8w6NSQg6SIzQT1EhD0JNU3hqNKgp0KzjyHaXJ8AZvV Fac/S+PUz9lFn9Nsmfe1xtDiSXhrlMlky2nnYiP3+my3rFe6fBXCrgbG3hGeIEb2pIis4f oXy8n+T7nT0Shr6gsetuwM9lONtuGZgmze6enEhNSriURl7WBMklgRtTCBNTDRLo/GokKs MpkdFkDIakSEeyEAMwO0baFM+y9iFnD2Q6wM1e5ab9OgQbeM1Kto7+LdRXTgygKGi2cuL7 4U4msqdNagQjwLjp7jx3yD4uLSeIta3fxKYs+yor+DuiA+Hdl4gE7xqdMRHGug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718871207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tg2eVK7Uo9GFEsrd4ESddTxjmqnaR29fRQ7HISviuH0=; b=uBpWLZxrmTMIOPcGkDxsIjvrp4p8GnRAtQIln65WdP2TPLKddASfMKyHwqMfT+tEq/Wphb 1IEyXR70uGQ5EagijHmycTfb2o22IIUm0FNWGWbndk34b7AasxiL+ZuBXz3FKOwUmTJtfK igGxGf5hMCwSj4mxyD0gHLp2EfIhSk3nf1a3KSoSInV2KlE9CmmC90s6WWm0P94x8lyFfY SfVu9Raj42ZLdg8yTeJt/rrggalEros+xjCGdaPD/JDYjx5ho8OxVyljOkZq6KlbU5okfs tB11uXXxmC5QXoi8XesGT19o4fRYHcztU4eWFqgSm2A3Z7yhIdDgfkqO30Fn4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4YCW2ZYfzHDp; Thu, 20 Jun 2024 08:13: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 45K8DRmq085260; Thu, 20 Jun 2024 08:13:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K8DRkx085259; Thu, 20 Jun 2024 08:13:27 GMT (envelope-from git) Date: Thu, 20 Jun 2024 08:13:27 GMT Message-Id: <202406200813.45K8DRkx085259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: bf0ab54638a5..24fa7a5107c5 - vendor/ncurses - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/vendor/ncurses X-Git-Reftype: branch X-Git-Commit: 24fa7a5107c5b75d1c197accf0305be64bc72882 X-Git-Oldrev: bf0ab54638a5ef969749f6ceae30e864f9556ea8 X-Git-Newrev: 24fa7a5107c5b75d1c197accf0305be64bc72882 Auto-Submitted: auto-generated The branch vendor/ncurses has been updated by bapt: URL: https://cgit.FreeBSD.org/src/log/?id=bf0ab54638a5..24fa7a5107c5 24fa7a5107c5 Vendor import ncurses 6.5 From nobody Thu Jun 20 08:13:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4YCc4Mzkz5NG63 for ; Thu, 20 Jun 2024 08:13: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 4W4YCc3tZnz3whf; Thu, 20 Jun 2024 08:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718871212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9EzSvyPKg+4E8dHXnRLhWVdHOFLrDRNU42FMFIhHDe0=; b=FXniIWI3Uvv70AqhzpIj91+lO/1PwC1+OiG/qoGZYJCmbWpmeaiwwxVnPXp8NO4Uz/RepD HOYy1tKd6QRE+ECnidI+2XorqMVcRrGZv5KDtncMrJmmd3d9jmpWoP1Evx+gly0k8L3YmY FvaNNtdcJgen0pztdXRY0DNquIr978yR/fv/lS7mSLVxEELq3n+fBfOCxZgtYOjOME3TKo AoyIaiLHgI/BfZ0BkbiTxqVyF2OOqN+LXgoYp5mSbAezma3jbrNIhIUJpPUKkWJ0ztH2LJ v7n1E9ka494e9LSSmkeTmwp6Ze0IpheqUqV9hhmuzGd1pbYAh7JmE5CtUAsOSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718871212; a=rsa-sha256; cv=none; b=QIsXm6JBdvwWgyIet3GP966lnuC5FzYPEvMgfd+0qP0rI2tj/tYaLBy6lXGepaU3E2Q7ok tDH6M/S7Xq7y2zygvX2XaM7eI8TG5eam8neqxuJNQrb1eL7PdKBG9ONFXooOPMvUZqDdhn OpHQfYVslQJKsp4QXTRRmhwLyR9Q0AQociKt2C19LDXcTpN73g5RX6SYYbVQmUlgG5cP1I 4XoaREevyeFdCKiWEuv5j/P9vHK5+tEJdaQd6kxd+vyKlNq+p+GAHzXNdePkNe/aAj21Zz 0V+Nmt1A3WeJ6hzUq1HaKECr0wEJ2pf6mG7KGUsEaLYNeNNhs+T8ZUSGM+OiqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718871212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9EzSvyPKg+4E8dHXnRLhWVdHOFLrDRNU42FMFIhHDe0=; b=NauHsaFCEfMXQGdpy2BaOuP7riCmof5ixNWuW9sTqPz8CoLoAV1qItYer4o1f6Ul6zx9ho HhbMkGs0qPMaV576ubbCWQXv/e0CPMppUOr+ne01QJ6Quzbr9ld6OV2U3dHpk65wSc2kwS kdLW6xts2iBI6TrwIEqp06rsyVpiO5W07Rhl8JQLN44JTPhaPpOgygrYzzFcRg0ck1V18W wJpAkBZQ+8OasU8EZ9O7JtjmAvoZglsK/TybLRH2RjZaj3GvohX7rPFhjmqu5wpMaVvW92 kwPYMVz4JdMPiSqF1s9A3ZF/3UzfYt+I4b2Ij2lF08ZioWtfaMwnmg7ULHU3IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4YCc3VwMzHBV; Thu, 20 Jun 2024 08:13: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 45K8DWx3085359; Thu, 20 Jun 2024 08:13:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K8DWEm085358; Thu, 20 Jun 2024 08:13:32 GMT (envelope-from git) Date: Thu, 20 Jun 2024 08:13:32 GMT Message-Id: <202406200813.45K8DWEm085358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: fa3569802f18 - Create tag vendor/ncurses/6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/tags/vendor/ncurses/6.5 X-Git-Reftype: annotated tag X-Git-Commit: fa3569802f18c1cf7359641719017ec6bab96ab4 Auto-Submitted: auto-generated The annotated tag vendor/ncurses/6.5 has been created by bapt: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/ncurses/6.5 tag vendor/ncurses/6.5 Tagger: Baptiste Daroussin TaggerDate: 2024-06-20 08:12:20 +0000 tag import of ncurses 6.5 commit 24fa7a5107c5b75d1c197accf0305be64bc72882 Author: Baptiste Daroussin AuthorDate: 2024-06-20 08:11:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 08:11:38 +0000 Vendor import ncurses 6.5 From nobody Thu Jun 20 09:26:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr23pTZz5NNND; Thu, 20 Jun 2024 09:26: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 4W4Zr21Nstz43PH; Thu, 20 Jun 2024 09:26:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2MhIU39vzl+S9cD73rUDasupvgBYwZKI2hKBuW8/TfQ=; b=Yne8aBIuHzL6RPpI+rlPXTS9DFu+rR+ypCS90zHVCYDroEFgN5IjHfzjRayNH5iJbPUJhX 66/LmihCGlJwTSo8TgksB7duQ6xppHWIpEZc2GPJdu3jyJpcGSik0I0C0u4j3Khg3dye82 1+yVKAQEyfeNkCIf+TdIQaL3BRSqPzbapa8tS6bWNSiXUrExlXoD2vuPMbugKsEulr8WA5 6LtZ8oS2lfGPCIoaMAnYpPnttm3RoGKlQd5UQoZPDRSkXYZmQ7nYo/o2Q0uHukGBt9SzrL RnzolN9y650asxD57uzSxVj9xo/1eIO2IMvxTRny7X9xnq0Lil1HudYkhv1mSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875602; a=rsa-sha256; cv=none; b=lHnfOfSab7sCnRHb3vD+XUj5wF0gYgv4DPL2TUdFzQjsCvPmzlAmbC/Sz1uUgtOJ+sT/Yd FnV00cVRUH0wFLFIuf1d43KdtzAmHkx/8tmbtQ8Z50nu4dKF2C9q2RyVrJmdrkrrbhP4LS 4TA4UgwI7DXd36lNsu0I0to8EzIQvpSUZi86ENCZg/PimwDA/7p5ooa9COAdw5JdKWLunU wmUSonADCG8U51O2tEryq3YNrSOJLVrYv6ypD6bTHYLr7coYnDsIwa9DERoGasWssxJMiL bT8/arNzFgpAdK2WSPuEtjIUYFBLg4qDl9XjIWMMObWaKp6F3XgCZfHga7Oy3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2MhIU39vzl+S9cD73rUDasupvgBYwZKI2hKBuW8/TfQ=; b=VqntSvEmdRvCYtXRZg6IAx1ZvJe42orKCKFIfJ5gMxhsylDSB12+Cxi52nTDWmGu5wuC3w rvHWBbGQyYjEEBPaXqv+GUvX2zrpmexyHqkCEaPU8AdoT1vpAo227OQfJ/iZX+dvUIDhsw yy5Xn7ZX0vchxE/yl9eYhiEWj0tt4+NH55FJ720NiE1OJmdl7TsRqS4gybCpkIok7gVAMg ZXN9O5HLwRX9jcqTp7syfgeioLxZTiuduMfrh1mx0YiKi0UMd6OfI4VpOj3rID054ksVJl qvS4+yYTnvuT2Y+tgc44CKSNn+Id4PKghCTbiSApH7vhXvGGq1Tl5irETwU85Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Zr20k2dzJxh; Thu, 20 Jun 2024 09:26: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 45K9QfjH004053; Thu, 20 Jun 2024 09:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9Qf7A004050; Thu, 20 Jun 2024 09:26:41 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:41 GMT Message-Id: <202406200926.45K9Qf7A004050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a67a0a6a2088 - main - nanobsd: Remove armv6 support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a67a0a6a20886eef5f74db57e349c5c9cc465e58 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a67a0a6a20886eef5f74db57e349c5c9cc465e58 commit a67a0a6a20886eef5f74db57e349c5c9cc465e58 Author: Andrew Turner AuthorDate: 2024-06-20 09:26:06 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:06 +0000 nanobsd: Remove armv6 support In preparation for removing armv6 remove it from nanobsd. Reviewed by: imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45635 --- tools/tools/nanobsd/embedded/common | 5 +---- tools/tools/nanobsd/embedded/rpi.cfg | 35 ----------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 4f5eac7806f2..4aecd3602f6f 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -52,7 +52,7 @@ # o msdos mtools fallback # o special boot for !x86 !arm platforms # o qemu image for aarch64 -# o qemu image for armv6/armv7 +# o qemu image for armv7 # o easy support for different image / vm formats # o need to promote much of this to nanobsd.sh and friends # o uses old kludge to build image w/o ownership being right @@ -502,9 +502,6 @@ std_amd64 ( ) { std_i386 } -std_armv6 ( ) { -} - std_armv7 ( ) { } diff --git a/tools/tools/nanobsd/embedded/rpi.cfg b/tools/tools/nanobsd/embedded/rpi.cfg deleted file mode 100644 index 54d2b559290b..000000000000 --- a/tools/tools/nanobsd/embedded/rpi.cfg +++ /dev/null @@ -1,35 +0,0 @@ - -#- -# Copyright (c) 2015 M. Warner Losh -# Copyright (c) 2010-2011 iXsystems, Inc. -# -# 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 iXsystems, Inc. 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. -# - -NANO_ARCH=armv6 -NANO_KERNEL=RPI-B -NANO_DRIVE=mmcsd0 -NANO_NAME=rpi-b -NANO_BOOT_PKG=u-boot-rpi -NANO_CPUTYPE=arm1176jzf-s - -. common # Pull in common definitions, keep last From nobody Thu Jun 20 09:26:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr33sHJz5NNKy; Thu, 20 Jun 2024 09:26: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 4W4Zr31fYKz43Qg; Thu, 20 Jun 2024 09:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875603; h=from:from:reply-to:subject:subject: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/V8xgL+mViRq5y8hgrVFe/gnkcNKbl7HU+wObcwv2k=; b=OA2dwWxzmEphuNx6qDksYimQ2o45F0NMLbpyv9q1KgED2xBQ/mdFB/ohi6+6BPX/2Q80uI 6OrCKJpz15/571/HiHwSDzIlYa1dxO/lITllQYbuik/Qb3Vo/tI2E5O31DlDDJL7M8fNl9 Lxdn70KZ0EableAyohfT4qryhb7XweoAdWjCWfFkAqUPxAhV9la4rgGN6mLeOcwZF7lzeK 1oVxQHT1GwMNy3BZtZQ510Z/DUIIY7XInkBg2On0+k+n720HEkGnhRfQIr2i1+VWzDqlg/ 1QpyLdi/ox2sfb5ZZ5YmBRL4wvg5R8SnhkBgd+HI/laraihz97zfsq8Kti30sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875603; a=rsa-sha256; cv=none; b=S7/+YYfvKRUyWqEkdO9XVa8242C+9WQI0bPCv6KuOrKxDApfTAQZ5IXb2gisLVVhE6QDet oe+qQbKAA1UXOx2o9HdYH5l4RrBEtFOoHV7klfwY6iE3Ga8Twze0bI08XNX/3dkfp+u7pH Q1718ZWu9aS/eCsjd50qqwqeStgMWIWyFf2FxOolleIoWG6MlvEJaRP1UOXJYf2UGt6PS9 tW8NZc8ao/e80lgYih7MVOSJHMjOdhzNbgPTb6uVIU+cYXwH3I1X3C4XA0k2PIqoPsUbX/ ISZeKcL6mx02KiSHa9WC6FTq9NXfGOYrjUjOWxhxOiHcYPnUib1iwnbY3dbfaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875603; h=from:from:reply-to:subject:subject: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/V8xgL+mViRq5y8hgrVFe/gnkcNKbl7HU+wObcwv2k=; b=qQkfnmbISy852cTdR/2nmutYyWPM7SCrN2OmTLdaqWyxjgt1Tn2o6CPkVWm4L6WQqRis33 mz8AdvFDXaKTTJCID+qSxZER7HKrGiTwJSUqn8qjRauZjXNbFsl8p1Y+QhUIffiSAtbTmB GZ0Yk316ya8RL/r0vInLGddiGweJWFd2AmfD8Ol8y+b+VEUIB/dspgs3Rt5mrCZyT3fiid 0Qk0SudMQvaXETGtnMTFL/bcli2T0s93JOCnkO2snV515HSRI082eSakIeatLoUjVob7gZ naZ9jwBwjA+3pd3fUQWczF98wLrYTvA5+1j1staNsqxqU8BsbTKCi70Phw5U0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Zr31HCFzK0b; Thu, 20 Jun 2024 09:26: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 45K9Qh7Q004095; Thu, 20 Jun 2024 09:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9QhQm004092; Thu, 20 Jun 2024 09:26:43 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:43 GMT Message-Id: <202406200926.45K9QhQm004092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: eda7eff0d266 - main - share/examples/etc/make.conf: Remove old arm archs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eda7eff0d266b9644f047469ce7c739a4ef2681a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=eda7eff0d266b9644f047469ce7c739a4ef2681a commit eda7eff0d266b9644f047469ce7c739a4ef2681a Author: Andrew Turner AuthorDate: 2024-06-20 09:26:10 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:10 +0000 share/examples/etc/make.conf: Remove old arm archs Remove the pre-armv7 architecture options from the example make.conf. These have either been removed, or will soon be removed from the build. Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45636 --- share/examples/etc/make.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 0cf156371aec..93c611557cb6 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -43,8 +43,7 @@ # pentium3m, pentium3, pentium-m, pentium2, pentiumpro, # pentium-mmx, pentium, i486 # (VIA CPUs) c7, c3-2, c3 -# ARM architecture: armv5, armv5te, armv6, armv6t2, arm1176jzf-s, armv7, -# armv7-a, armv7ve, generic-armv7-a, cortex-a5, +# ARM architecture: armv7, armv7-a, armv7ve, generic-armv7-a, cortex-a5, # cortex-a7, cortex-a8, cortex-a9, cortex-a12, # cortex-a15, cortex-a17 # ARM64 architecture: cortex-a53, cortex-a57, cortex-a72, @@ -78,7 +77,7 @@ # # CFLAGS+= -msse3 # CXXFLAGS+= -msse3 -# CFLAGS.armv6+= -mfloat-abi=softfp +# CFLAGS.armv7+= -mfloat-abi=softfp # # MAKE_SHELL controls the shell used internally by make(1) to process the # command scripts in makefiles. Three shells are supported, sh, ksh, and From nobody Thu Jun 20 09:26:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr50SXpz5NNyt; Thu, 20 Jun 2024 09:26: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 4W4Zr4319vz43M4; Thu, 20 Jun 2024 09:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRTKk7c1CnYJ4uxOarMQRpKelAQyv1D0bBWPh/k+Bog=; b=S6oLPX1Zxy9moIJB3tco/bwZt6dq5ccZctqMS4ziRV1NWTSJjlY6J2yeY0gw8j2MApoWIN z3XTgo8FAUczaTXE6LpWCl1VtbTuwVkZwk42lGebPB92Osql48VJDC6y1Ue9ZG7WJ6cLcC 4F387Id5FW1ChUNa8sSie+C2A0T1WnHZR2CIGsGEMDB8SimGtQQG8ZvVINZyqpXahzCHjp 9cKc23F0AVM+88p/TL1F8UF/PBCOcpZASNwtuNnhuDb9U7eRI9j4caHDVlpaGJTITjPwsW oRz2uliNNlBntOPB3BZKViElsk23URRG6MG8tRAzoM81/U5Wc4i+KVJYSmK03A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875604; a=rsa-sha256; cv=none; b=hchJBAYx1ZFWM9HbyIk0tTM3zYmZdv7wcCUmSybSaXmmqSqvsL0m9VvPOM1kwjdRm/2wfj 0Vxa0xwa2QxoFztW4MeMzRV50WNquksT5gHdF2dsXvxxgaHwD9A+jidRnn8XkBkTRA7Vg7 V4yLA+D+hZXAoqbfFV9QitigRBJcK/eepwnxaBk1A+Z5HwIfLJUu/Nw5LW10XwFuH0XhZu r9vqp5btnAmOYgfoT/27Ar+EMiwaASxTGpquTUzt2KubVIsWruxe/Eh/bJSbaDvfdinUv6 meeNWZbK3w+N7KZWjTigQOJaMcdIqj2VcqVF1k/UUwTtL5hGatbgfZyeMRmFew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRTKk7c1CnYJ4uxOarMQRpKelAQyv1D0bBWPh/k+Bog=; b=saWHF2KkIeM1xQ20C7d/Y7kIgCWzkMjtgpRPRjMYeIb+Oq1S7ZdoVGwzfSV+Rmvpay5CHH 4ykUSZfHnIMoy91p5bRoXfNQWankYpBdj8did2y7cAdq8bs4u70G0kwS/PUJk12QBmh5zY 8lLoYRhqvU6O0tmQ8x1BaSPIGCGIFwXRhd/DRUQIbinBDeTM8i5fmyzGPtfuY0a+knVsEt ofnE+j/bE0CvU9Uv+J5AJzM0i1LRFRnn9IhFN3AW0sQp1Ghp1W8+xygAsrEkQbUnghRI1v jSyAeSaWFeHF5CsYbX+VBHHmQysDfQygwsJuoVcBauhB58oOc3ETc7I/8uEDyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Zr42dm8zJv4; Thu, 20 Jun 2024 09:26: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 45K9Qi5k004146; Thu, 20 Jun 2024 09:26:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9Qi9D004143; Thu, 20 Jun 2024 09:26:44 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:44 GMT Message-Id: <202406200926.45K9Qi9D004143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8203cf1c53f0 - main - md.4: Remove armv6 as it is being removed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8203cf1c53f05ddb92075480cdf30c066b37ee4d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8203cf1c53f05ddb92075480cdf30c066b37ee4d commit 8203cf1c53f05ddb92075480cdf30c066b37ee4d Author: Andrew Turner AuthorDate: 2024-06-20 09:26:12 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:12 +0000 md.4: Remove armv6 as it is being removed Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45637 --- share/man/man4/md.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/md.4 b/share/man/man4/md.4 index acd52aecb675..0c99d61f8392 100644 --- a/share/man/man4/md.4 +++ b/share/man/man4/md.4 @@ -98,7 +98,7 @@ disk found in the man page. Other tools will also create these images, such as NanoBSD. .Sh ARM KERNEL OPTIONS -On armv6 and armv7 architectures, an MD_ROOT image larger than +On the armv7 architecture, an MD_ROOT image larger than approximately 55 MiB may require building a custom kernel using several tuning options related to kernel memory usage. .Bl -tag -width indent From nobody Thu Jun 20 09:26:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr56SNYz5NNnl; Thu, 20 Jun 2024 09:26: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 4W4Zr542F7z43Qx; Thu, 20 Jun 2024 09:26:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGY61NVOtVuNeipfICwB+244baJccn+4E/Nitnt+Zsw=; b=nxCsorCiZMGDoGbXZhvvNdDx750GXlgxKVPk1D7tuqHNcYtwLIJJ1rhVn0My5wLiX3JENF 2RTEteuA3Ri3yT1Ov/ZVlYbCJ0xllayd5aAsuglww/dPI3BjMeNrx04uYD4DrpNi3E+VCO Yw58KgBMkbdZadwTFv7wm80E8ONAiL+hwIAPwXKpUgt9/Y7jXnnQ4xOIID9cxDICqQcYm4 GWNC3cK24z1vhAT6LCFtagWdDxQTLVkN5I0iATX2fyl0wGlwOZQQqTEBG+XdL7IOev6jKA zU1NPYZQvrcsbAGyM56aQVwhwW0muYmKE3hYoxjkvz3K9CGtppjlIpqmH2GUwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875605; a=rsa-sha256; cv=none; b=d6ST4ZwxIx94wVoIsJEgNH2paUdpK/nTd5w4PMdK4W8edHkR3RfwoTJBexzXo+AoeZ0bTd Ao3Xue4fL1wXq5oEl6gzoo7RqNdTEVjDLEgRpbLNwNyOrrI82dcwRmUe7rheVjoSqq6pVN v8nZecPRBq8GHENsZEd7i5MErqKM1nRYi8xWVNnvuHdSNKLgB0rX9MzRKIIYO37e/K36QP xHyCjZ3+igEHHUGjjRKQcfKiclZdCNwrMIQJ7xBDh1gshGd9xtHxp/QcUhdj0/Ndi7GlAa lscahHpLPsJVbMJCEXzhmcC47cCtMzrb7WteVfY08SpAl5TUGJQ/NgeE2YrBbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGY61NVOtVuNeipfICwB+244baJccn+4E/Nitnt+Zsw=; b=bN8CC+yC9VcQfkv62Vv0bSPhfXDd6GS6Lzp7a6QuQf2a1AB8GUFckdfUGoVuMurUHwKgoB PVCIXGYKz4iXJaq7Y8j6ETDzxTPbpCghXYH61b/VkGE6shnm+ZiUz23R2/dVrWZnrRlNhB UJbjKweneApCqCvhypGzzyIibDP5n5FTsntOQMic1D42onw0ewqvv2y0M2eIDU5y8ERYb+ qNU6xVmZDvcO0R9OHWmqf2BYkz4SsLjJXcRUWL+fkyZclcNLynJIaA2BoToElxTcISGzh5 k8rFRLxMjQxqLuds1bxplBsmbN0yggeaXCdcYpxXOZDg4EvckFd8WNQHeHcVYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Zr53fTzzKHl; Thu, 20 Jun 2024 09:26: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 45K9Qjor004188; Thu, 20 Jun 2024 09:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9Qj96004185; Thu, 20 Jun 2024 09:26:45 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:45 GMT Message-Id: <202406200926.45K9Qj96004185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e726eed75d87 - main - share/mk: Remove pre-armv7 example architectures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e726eed75d87c7306c179e17c671e92e9fe61937 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e726eed75d87c7306c179e17c671e92e9fe61937 commit e726eed75d87c7306c179e17c671e92e9fe61937 Author: Andrew Turner AuthorDate: 2024-06-20 09:26:14 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:14 +0000 share/mk: Remove pre-armv7 example architectures These are already removed from the tree, or are in the process of being removed. Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45638 --- share/mk/bsd.cpu.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 730e4b4aa152..793c01b76dca 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -108,16 +108,11 @@ _CPUCFLAGS = -mfloat-abi=softfp _CPUCFLAGS = -march=armv7 -mfpu=vfp . elif ${CPUTYPE:Marmv[67]*} != "" # Handle all the armvX types that FreeBSD runs: -# armv6, armv6t2, armv7, armv7-a, armv7ve +# armv7, armv7-a, armv7ve # they require -march=. All the others require -mcpu=. _CPUCFLAGS = -march=${CPUTYPE} . else # Common values for FreeBSD -# arm: (any arm v4 or v5 processor you are targeting) -# arm920t, arm926ej-s, marvell-pj4, fa526, fa626, -# fa606te, fa626te, fa726te -# armv6: -# arm1176jzf-s # armv7: generic-armv7-a, cortex-a5, cortex-a7, cortex-a8, cortex-a9, # cortex-a12, cortex-a15, cortex-a17 # cortex-a53, cortex-a57, cortex-a72, From nobody Thu Jun 20 09:26:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr715l7z5NP09; Thu, 20 Jun 2024 09:26: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 4W4Zr64zWGz43M9; Thu, 20 Jun 2024 09:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQ9JkP6rI9+Sjua4IsEQya1X64oKtLhyr/y3iTmPAMM=; b=OwE9QS190X4CQJZK22LJj22piTHrCIyR9ji2Ey9mNb5EeSLAB6RikUAg4Je+j2RXE2IfGg i9neWqCZuTkHYWbclDLaaXnM941WYCkE+0SivA5cqHgL88aWqlx8c5rYc14ZDG1/yu9CKO q3kJpFv4LNTT2fzQARXXtoHkdW1LY3DAHEi6NoTskHWOypaPS4MDh5eUkb1OzQ+vzNbT/c rH46F5FK0IE7dm5EmSovzkfs42e/fbkdxOsG4K3qTrMfqI4U15yZtTDV4C/b06SqfiwMDr M0OJ3TEkFYr5x5EL8glLL+0qAzj8qO0OKboCKTomMloc17E9ETsi7CRISY4Hfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875606; a=rsa-sha256; cv=none; b=TFhQ+2B/XpatdqRVpZDw92u8BNobz7SD6srsV9yTCwdc8CSSdufs5StjWaXD4cKAxSEe/w XXVNx39lMEkXQa2raXMkvMk3VW4xV8eNziScvQav+4+8/PpEgf9rsNkAnU/x8ZSPUwNUcL Tlr7m8EpTPt+SbI6oHpNDqiyfAEF4/r0UJyzYuVxlxL5IsW+2OGwy0o+7KVAoObAeZwML5 qB227acSYKr1/3aAjohApaSoAc9TzjZcf2CbOATFTuJbBvxKV0E8qMn3t7sFxX/5TJP7GN CEjetLIRuA5P2UI9bF6NfBrAsgffyw0vrj5Xfvpyo1ojjByR2CJCN48I8H+png== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQ9JkP6rI9+Sjua4IsEQya1X64oKtLhyr/y3iTmPAMM=; b=V3JspHwd7Nf+Er1tg6sYrfgWCrtS+0ltwghMvKmZURb+YNaiRM0GQ8iq7ikel2+dhJHZhL dabJuV4nffTMSx6hD0Zp6Nt4UuC4EhC8Q2kqan4LH6O/QOoAcgqATRHXjfAEfMGbl2Z5Ts 7Kiz/D606tOMMVrdQD5xWr7BxuyqNfiEi0dPZNEPpv+Dz6VU99rFN7Ub0H0Qol1VaOxlp3 OukVgqGn5pZ2WpsE4RJV3wPrE3z3JzpgiQxKDYngokk0REmK8dXPi6HCRWHsz06r7TNGwM tH2Q2Lru3ChvKseiyZJMHT/oJmNi2Lwk+sBbMvovwPicPA65wJfJiMRGDIX1MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4Zr64P58zK59; Thu, 20 Jun 2024 09:26: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 45K9Qkvm004241; Thu, 20 Jun 2024 09:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9Qkwe004238; Thu, 20 Jun 2024 09:26:46 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:46 GMT Message-Id: <202406200926.45K9Qkwe004238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a2054786c255 - main - uefi.8: Remove a reference to armv6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2054786c255a79ed5ab25630013c868aca19480 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a2054786c255a79ed5ab25630013c868aca19480 commit a2054786c255a79ed5ab25630013c868aca19480 Author: Andrew Turner AuthorDate: 2024-06-20 09:26:16 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:16 +0000 uefi.8: Remove a reference to armv6 It is in the process of being removed from the tree. Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45640 --- share/man/man8/uefi.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 7a684f6b092b..fa4770188d61 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -126,7 +126,7 @@ boot support for amd64 first appeared in .Fx 10.1 ; for arm64 in .Fx 11.0 ; -for armv6 and armv7 in +for armv7 in .Fx 12.0 ; and for riscv in .Fx 13.0 . From nobody Thu Jun 20 09:26:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr775bQz5NNwm; Thu, 20 Jun 2024 09:26: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 4W4Zr7679hz43Wy; Thu, 20 Jun 2024 09:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqnJDDtePC0VFZ3kui4/3QyW+ixsB2RyN+F8/y6I7HE=; b=Nf41LDRn/7dU2jV6PKRUVju944iI7pRqzSGhzq7B0vBkDlUE7oh+QEN6UC5R0TZQRhQ+00 PHVMdz5P0Qu4smFradMmK/okT9eEYgD6eAo7HTh7dSmHpOsGDuvMWCcfyZjW1dC0lE/1w+ R3e2DhUeH/A7L5qELQEqYUS9/8OLrrEYxp0+0OwfzRkVYAaG3qOGHUES7wWBMtUHt4vjfc rbJRA1A964TG41MrNjopthv1VJXzRTjx7l4IokwJwymYDY9dp9LwYsyQbJKdaFaoce1az5 dmKW682jzy7pvbwPujUCLKnHvtPnFK4ZHVADYqaN1SFulgQrfEHu+skJejUk4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875607; a=rsa-sha256; cv=none; b=FmAp4fZtjbO1CTKp2U4+ivASpaV9cf7JZvcV10+jYUbfwSgYUmtyhhoSBq2yzzg2qYnoAh RFVh0TUdDORYu9X98OZ+qb0Mi32HqP7e99PCxITK7ozXnSeSjtWWZHMcCk8/Tab97ogpVo FBJYMC2BsHn0/V5bM+yCVRpQmShK5m42mACjZSfA5BPOxX6M75LkhNUau6dX1oYHRh5Jp/ 3Y5Nxjvwghhqbt13JsLhSHMgYiEtC3LXEMpciP7cbEKtgMdxCTPtYMrX4pBFSiGgsVZNgH ru/m1djIu2n3A/9DS9FEyFxOStdtygLQCiNdZsk4pkyNpLqvf3weAkG/yHdykQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqnJDDtePC0VFZ3kui4/3QyW+ixsB2RyN+F8/y6I7HE=; b=uTIMM1k4IinajdQ3PbS5Agv1u5Xq1ADCk6wivaxkob9DGjepZKA9nwPrtylSukfzk2UKJf qyOGF/xGXuxcMKk2z4XLCc5/Z1QbB9qxsVv2xNXlZzkZjo8v6Sy9mMtPIjVVa1mSYnkFWV UU3VwNZsC5Q5ltNMVdHWn5zHO2tLr876KuFBi/ngPBM6uM7FG0DuaPN/bbvFrAmNOTeG91 uWXe8iUkVT4J7SLfLc7hR/eovJCvYAsJ8+uehR5lTe42kvSjg+Go3UUePvGz/JpUHnIvu8 //gu+qe4+dA5kQvZYrWI71evhjPEZhuSTUHSUIkG/Mb6yU0D8tdYveZuXYDz+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 4W4Zr75hVXzK0c; Thu, 20 Jun 2024 09:26: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 45K9QleB004293; Thu, 20 Jun 2024 09:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9QlDh004290; Thu, 20 Jun 2024 09:26:47 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:47 GMT Message-Id: <202406200926.45K9QlDh004290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 68f044de29b3 - main - binmiscctl.8: Change the example to armv7 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68f044de29b3867c2e0d282b86395f777f95b034 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=68f044de29b3867c2e0d282b86395f777f95b034 commit 68f044de29b3867c2e0d282b86395f777f95b034 Author: Andrew Turner AuthorDate: 2024-06-20 09:26:18 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:18 +0000 binmiscctl.8: Change the example to armv7 armv6 is in the process of being removed. Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45641 --- usr.sbin/binmiscctl/binmiscctl.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 178389920448..4a4890146b57 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -288,15 +288,15 @@ Add QEMU bsd-user program as an image activator for 64-bit RISC-V binaries: \exff\exff\exff\exff\exff\exff\exfe\exff\exff\exff" \e --size 20 --set-enabled .Ed -.Ss "Create and use an ARMv6 chroot on an AMD64 host" +.Ss "Create and use an ARMv7 chroot on an AMD64 host" Use an existing source tree to build a chroot host with architecture overrides: .Bd -literal -offset ident D=/path/to/chroot cd /usr/src mkdir -p $D -make world TARGET=arm TARGET_ARCH=armv6 DESTDIR=$D -make distribution TARGET=arm TARGET_ARCH=armv6 DESTDIR=$D +make world TARGET=arm TARGET_ARCH=armv7 DESTDIR=$D +make distribution TARGET=arm TARGET_ARCH=armv7 DESTDIR=$D .Ed .Pp With From nobody Thu Jun 20 09:26:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4ZrB2LKkz5NNww; Thu, 20 Jun 2024 09:26: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 4W4ZrB14bTz43XT; Thu, 20 Jun 2024 09:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TmNRN7YXlxo3X+FJs5AWfz13PR2qAhMT7WafMbcPF8=; b=j1vMHJWCquqPspfshzssZTpxlOCeLSH3RAqT7v6RvoGL0qEYE8NikJ+ekXNWLlrrljrz3O BJNqulE1I9nKZZO8JgfUv7cW7yH3awHTCv2cHM3diF16xPQ+U7mE8BZdfGfUf556PnFktJ WrObIFfN45jaKwex8yp6Ep+CxxJgWtKsLZvwHn2jHrY7n3JYHC+GpWsMN/V0J97HNL8fSl dm+Ng7EhplDC7VgtwdR85aqrrmWE0cYX77dj/ZUg/7kI0H02jeKlyS2ZuOOYrTtlN+K4jI p4PdoXLNU0gz4Y23d1RFuBA4wspgaizywEKsa6+En+zog+wZ4hLTMs0H7gEauQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875610; a=rsa-sha256; cv=none; b=L5EWtacaldMztx+c98iBw+PNeyobmFI3JRcSuzkSOqo3yVq4NDSPoHRdnrlDSKaavMMXUY hYOa/h0/G4mLTzYEwXrSgcDkN/wow5fX0jLukE9PWuWgUcqp5D1pR62oaP3dGAupAolWXR 0+OaZ8nb+HPEfk2cfVnBld2jVUf33BM1i/GXkG8C9mRmyRl2srv7fuXUxtQfgKl9G9blmD 2s/SgaelPD9Iz4HpH4kNAYu7ngTkhyqlA93AAxZGy4LaR4iocQK6m3eSLKeCQQHVKevPa4 pLdCKZvdXlKG3vhpZVAR//m5/dW5zb+7n12l+c1w6LGEKtSbS/Tg+SlGe1SOIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TmNRN7YXlxo3X+FJs5AWfz13PR2qAhMT7WafMbcPF8=; b=fCI04ETb75goMo3wz119fsXl31LsAn/lfC2UOPzN6+Dpwv5WZJXXvO7F4tNuzzwjbruk8A fkC+G/othZNAJwJW5d7P+xqoato0o2+SVABqD/2+1FibaNbTFq17p3bpCc5t/ebmW9Ozai +Vigmh8TIuu0cIoy+gj6oWv51YECJc178c0PiE/MPLVBcuA0EuwES4UflWMthaLvgdWYUh riYhqGdKp/fFYBuUabKJ3o0WR38grVNd80vg4XWFuHUWuMbBW9lfR/A+ZLrICTa7lrm1wR gWescmh3TJJ7kRVM6+zZama5rdp12rQmUG+h2rp+bM5/CbCFZBk2q0S3oZhM/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 4W4ZrB0gqczJxk; Thu, 20 Jun 2024 09:26: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 45K9QnP8004392; Thu, 20 Jun 2024 09:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9QnD6004389; Thu, 20 Jun 2024 09:26:49 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:49 GMT Message-Id: <202406200926.45K9QnD6004389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 6eeedf35c3ec - main - libc: Replace armv6 with armv7 in a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6eeedf35c3ecf50cc3def1eaa40a37b2257b85ac Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6eeedf35c3ecf50cc3def1eaa40a37b2257b85ac commit 6eeedf35c3ecf50cc3def1eaa40a37b2257b85ac Author: Andrew Turner AuthorDate: 2024-06-20 09:26:22 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:22 +0000 libc: Replace armv6 with armv7 in a comment Armv6 is being removed from the treem and the comment applies to armv7. Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45645 --- lib/libc/arm/aeabi/aeabi_double.c | 2 +- lib/libc/arm/aeabi/aeabi_float.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/arm/aeabi/aeabi_double.c b/lib/libc/arm/aeabi/aeabi_double.c index 190354e5c6eb..61f64678e795 100644 --- a/lib/libc/arm/aeabi/aeabi_double.c +++ b/lib/libc/arm/aeabi/aeabi_double.c @@ -54,7 +54,7 @@ float64 __aeabi_dsub_vfp(float64, float64); /* * Depending on the target these will: - * On armv6 with a vfp call the above function, or + * On armv7 with a vfp call the above function, or * Call the softfloat function in the 3rd argument. */ int AEABI_FUNC2(dcmpeq, float64, float64_eq) diff --git a/lib/libc/arm/aeabi/aeabi_float.c b/lib/libc/arm/aeabi/aeabi_float.c index ac6b11ae9dfe..0e465754ecf0 100644 --- a/lib/libc/arm/aeabi/aeabi_float.c +++ b/lib/libc/arm/aeabi/aeabi_float.c @@ -54,7 +54,7 @@ float32 __aeabi_fsub_vfp(float32, float32); /* * Depending on the target these will: - * On armv6 with a vfp call the above function, or + * On armv7 with a vfp call the above function, or * Call the softfloat function in the 3rd argument. */ int AEABI_FUNC2(fcmpeq, float32, float32_eq) From nobody Thu Jun 20 09:26:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4Zr90xKkz5NNTG; Thu, 20 Jun 2024 09:26: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 4W4Zr908NLz43lN; Thu, 20 Jun 2024 09:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxmUXRzY8RfQ5lY9BNsqlLZ13t0eRXVbPKrzgkcyHeY=; b=A1BHhWJlqONRTGkfqiBk94OxgWiLvr8s9lHMpdBcqQWwpTtG/pVRc7AbenRz1i0I7ueu2S QcaLHoJWF/n+8Hb1Y3YTslZKGCz80jZmol8nnHi+pvN606pKuENHW8oIXndXyE3QFsrtze BGw2tK+5WbijlOb6VZKfXhO5OZAKkupPzt8pOWuzZ7KY9R4XHi0RqJVNXzEhiaNwdhPiS9 H9MUBwzg8sW6qyGkqoBVOjKLDMDHS0/mFZNzb3olTLI8HzXoKMZJ2j9nxs3t+3GE/A9+O2 xJSal3i6DmGPhNM43G2q6zUxHVsK2u4aJTdPsTl4JY4kYMvAWdPXJUzKWefeyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718875609; a=rsa-sha256; cv=none; b=rcNZaNAUyzT9Ye9i20Qnamsll6rcb7tyw+Z/h494IwIacpKlrmj6pEDppYQYJ3JoeEqm4B Tt2H4jh1Sb0P9G/45CfETmrysyPyXk3WWIHF46B3+Yo/WH/ddET9nZxMGsoymL6lRCQxt4 8mdbAq5aY6g3xu6feXziRCRPJXUWXo2F8emaDYX+OKpK0P7XQtedCPVzvJCOoDU6wUC6XF NqK33lFlJC8XiSC30pU6LiXby1GSK/aFIDTs2XlNRkb80eNHd47aTVbYAMVeYtw2yzat86 kMjjUsJIxjrKpqj7WppeAJqCFNcrjRblb0Yai1yZyFov/J9zcJPTZHoEB2wRgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718875609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxmUXRzY8RfQ5lY9BNsqlLZ13t0eRXVbPKrzgkcyHeY=; b=WAp4lCeMsbit5JwFL2ey4jOBw9Zs1EJw/XyNsK+G0uJEpoO+lGlJxNDRKl5oK7/+/Jcw/1 X71DiI2G8fKXUBAH7j+kL18lTRVNDq+TCfF6HsnGtI0JzUkXhIGtyf6JKVT13qxPJw8Bw5 BM8k3vp/7nszdXp3gmrG+hj8vBm0CVe6toRTDjX+4Q0GLnSCdG+dOQAg0lHe7OyichRMNB S4D5xCil+O/39guejYfcKlXQv+xlv+v4/W3FoFSfaWz2IXMTYGVzGXCIDm9LiWJ11zXJwV sTkRYOG3J2p0iqhldhflRd95HpED1WZX2iB0hsoID8Zlt+V/lesxSQ1L31eM/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 4W4Zr86jLtzJxj; Thu, 20 Jun 2024 09:26: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 45K9Qmpm004341; Thu, 20 Jun 2024 09:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K9Qmpb004338; Thu, 20 Jun 2024 09:26:48 GMT (envelope-from git) Date: Thu, 20 Jun 2024 09:26:48 GMT Message-Id: <202406200926.45K9Qmpb004338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4f351c1ddcfb - main - tools/boot/universe.sh: Remove armv6 from a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f351c1ddcfbd74a93e9969ab7b99f09e785de55 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4f351c1ddcfbd74a93e9969ab7b99f09e785de55 commit 4f351c1ddcfbd74a93e9969ab7b99f09e785de55 Author: Andrew Turner AuthorDate: 2024-06-20 09:26:20 +0000 Commit: Andrew Turner CommitDate: 2024-06-20 09:26:20 +0000 tools/boot/universe.sh: Remove armv6 from a comment It is in the process of being removed. Reviewed by: manu, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45642 --- tools/boot/universe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index 3e033ce26ae2..e97858ff2bcb 100755 --- a/tools/boot/universe.sh +++ b/tools/boot/universe.sh @@ -3,7 +3,7 @@ # # Full list of all arches we don't build. # -# powerpc/powerpcspe arm/armv6 +# powerpc/powerpcspe # # This script is expected to be run in stand (though you could run it anywhere # in the tree). It does a full clean build. For stand you can do all the archs in From nobody Thu Jun 20 11:27:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4dWk4d56z5NbXD; Thu, 20 Jun 2024 11:27: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 4W4dWk3z4Sz4JCX; Thu, 20 Jun 2024 11:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718882866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7VTbvAz8BNln+aMJ2Ha6bTOXFNJUS7ZAsgygPT7Zq8=; b=h1QM1H2ZLhUvlLO+9Ha5794vZFhLdE84eIyDaSW1FzDNLoqtz+w3slgcc19YgeyTrA23TB JztnrVJG1I4ATBwPup3nAWN5s5w0bcnTa/v4Y8c5HAKtLbHKSv1gmY9oEzIuqI+PcPVf7L eQI6ou3OHyTBhs/8Vmr7y8MZ7LKDAziNpZv797X5eCj7NUUlaeysRFq0hYE2EuZmX+Q1Nu uJ42fIDB3JbYYkDjxSwunsBxFe8NeT2q5uhvh4ro6Gkx/uyQJkWb02gZbKIHxpPR1UeBBq o3Wwq/2ilt/35Rd5dyDPUU2XddBflBuhwc1j8YgCi5xX6Re5xDvkc+uByJi6gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718882866; a=rsa-sha256; cv=none; b=Ui658SJN/TCkijjPNqKOQCQjhtSM7LLa70v942kREEeKljnM8V1tOldRmpPXd3id6H5Jns igQGPw/0kzo8qdWbzIyQ7Lo8QDnajStWkeJe5dOP9cmKWBEAQFE1+v3XVfRvj2B/5cyk3c vY7bl10j+T8GVOWBmaRctqJH2qWtYImR3mFWwQ8l4fb1tSXFkTAsZsv4r/riMlNSpRp+To uq5FZBG1jsEpYLH7YBo0ViRkdEo1CxuXlPb1C17NsrlgqFzyj+FsEFd7W0P2G4HEExw8WU YjrhsCGtr/81yL96t1mrWrC6HujwYP9yblgOT8ErZF0qzZgOWN4osNQ4IAaRcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718882866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7VTbvAz8BNln+aMJ2Ha6bTOXFNJUS7ZAsgygPT7Zq8=; b=Xu+4Jmhy8j2GEwUtbWhhm9Sm+0zQALWdp9V9wg6Bo/SQSiCHtNlFsOrYu1EmK4f2g5BzMA htWKmoYs9xUQWfLo/fCXeEqJID0IwaT205y+2VwhgkfDSsINyFUYsXkWMbeFNXLd6vP9ia jzOOy2omKgXOsCPllXpAkmmLJTms15eJDvUlJUsuHNkRJVLa4m9dnbfBVA2i/B3B5btgtM 8/Vs/xAFni0c+PgZUNsU4DE4DYzbzdcm0+odG3ZpM0QD6RDhyE8HBjO/fyC8tjJZCViTZd vRrc3Q/eaOsaXpKTTZx2TLoPy6CPsNiNQOhkuPoK+p7Gic0Ue6VZ+KlHswMsuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4dWk3RwXzNJM; Thu, 20 Jun 2024 11:27: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 45KBRkll006057; Thu, 20 Jun 2024 11:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KBRjoN006054; Thu, 20 Jun 2024 11:27:45 GMT (envelope-from git) Date: Thu, 20 Jun 2024 11:27:45 GMT Message-Id: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 21817992b331 - main - ncurses: vendor import version 6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21817992b3314c908ab50f0bb88d2ee750b9c4ac Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=21817992b3314c908ab50f0bb88d2ee750b9c4ac commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac Merge: 6eeedf35c3ec 24fa7a5107c5 Author: Baptiste Daroussin AuthorDate: 2024-06-20 11:15:14 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 11:26:22 +0000 ncurses: vendor import version 6.5 contrib/ncurses/ANNOUNCE | 909 +- contrib/ncurses/AUTHORS | 6 +- contrib/ncurses/COPYING | 4 +- contrib/ncurses/INSTALL | 316 +- contrib/ncurses/MANIFEST | 15 +- contrib/ncurses/Makefile.in | 25 +- contrib/ncurses/Makefile.os2 | 6 +- contrib/ncurses/NEWS | 1177 ++- contrib/ncurses/README | 41 +- contrib/ncurses/README.emx | 8 +- contrib/ncurses/VERSION | 2 +- contrib/ncurses/aclocal.m4 | 1687 +++- contrib/ncurses/announce.html.in | 1609 ++- contrib/ncurses/config.guess | 1263 ++- contrib/ncurses/config.sub | 828 +- contrib/ncurses/configure | 8956 +++++++++------- contrib/ncurses/configure.in | 310 +- contrib/ncurses/dist.mk | 25 +- contrib/ncurses/doc/hackguide.doc | 48 +- .../doc/html/NCURSES-Programming-HOWTO.html | 7415 -------------- contrib/ncurses/doc/html/announce.html | 2220 ---- contrib/ncurses/doc/html/hackguide.html | 969 -- contrib/ncurses/doc/html/ncurses-intro.html | 3446 ------- contrib/ncurses/doc/ncurses-intro.doc | 182 +- contrib/ncurses/form/Makefile.in | 15 +- contrib/ncurses/form/READ.ME | 8 +- contrib/ncurses/form/fld_def.c | 10 +- contrib/ncurses/form/fld_ftchoice.c | 6 +- contrib/ncurses/form/fld_ftlink.c | 10 +- contrib/ncurses/form/fld_info.c | 12 +- contrib/ncurses/form/fld_just.c | 12 +- contrib/ncurses/form/fld_link.c | 12 +- contrib/ncurses/form/fld_max.c | 8 +- contrib/ncurses/form/fld_move.c | 8 +- contrib/ncurses/form/fld_opts.c | 24 +- contrib/ncurses/form/fld_pad.c | 12 +- contrib/ncurses/form/fld_page.c | 14 +- contrib/ncurses/form/fld_stat.c | 14 +- contrib/ncurses/form/fld_type.c | 12 +- contrib/ncurses/form/fld_user.c | 12 +- contrib/ncurses/form/form.h | 6 +- contrib/ncurses/form/form.priv.h | 18 +- contrib/ncurses/form/frm_cursor.c | 8 +- contrib/ncurses/form/frm_data.c | 23 +- contrib/ncurses/form/frm_def.c | 8 +- contrib/ncurses/form/frm_driver.c | 51 +- contrib/ncurses/form/frm_opts.c | 28 +- contrib/ncurses/form/frm_page.c | 12 +- contrib/ncurses/form/frm_req_name.c | 15 +- contrib/ncurses/form/frm_scale.c | 8 +- contrib/ncurses/form/frm_sub.c | 14 +- contrib/ncurses/form/frm_user.c | 12 +- contrib/ncurses/form/frm_win.c | 14 +- contrib/ncurses/form/fty_enum.c | 46 +- contrib/ncurses/form/fty_generic.c | 6 +- contrib/ncurses/form/fty_int.c | 44 +- contrib/ncurses/form/fty_ipv4.c | 16 +- contrib/ncurses/form/fty_num.c | 20 +- contrib/ncurses/form/fty_regex.c | 35 +- contrib/ncurses/form/llib-lform | 192 +- contrib/ncurses/form/llib-lformt | 192 +- contrib/ncurses/form/llib-lformtw | 198 +- contrib/ncurses/form/llib-lformw | 198 +- contrib/ncurses/include/Caps | 303 +- contrib/ncurses/include/Caps-ncurses | 21 +- contrib/ncurses/include/Caps.aix4 | 297 +- contrib/ncurses/include/Caps.hpux11 | 301 +- contrib/ncurses/include/Caps.keys | 298 +- contrib/ncurses/include/Caps.osf1r5 | 222 +- contrib/ncurses/include/Caps.uwin | 225 +- contrib/ncurses/include/MKkey_defs.sh | 15 +- contrib/ncurses/include/MKncurses_def.sh | 6 +- contrib/ncurses/include/MKterm.h.awk.in | 39 +- contrib/ncurses/include/Makefile.in | 19 +- contrib/ncurses/include/capdefaults.c | 6 +- contrib/ncurses/include/curses.events | 4 +- contrib/ncurses/include/curses.h.in | 116 +- contrib/ncurses/include/curses.tail | 16 +- contrib/ncurses/include/curses.wide | 6 +- contrib/ncurses/include/edit_cfg.sh | 19 +- contrib/ncurses/include/headers | 8 +- contrib/ncurses/include/nc_access.h | 80 + contrib/ncurses/include/nc_alloc.h | 17 +- contrib/ncurses/include/nc_mingw.h | 13 +- contrib/ncurses/include/nc_string.h | 8 +- contrib/ncurses/include/nc_tparm.h | 5 +- contrib/ncurses/include/nc_win32.h | 8 +- contrib/ncurses/include/ncurses_defs | 30 +- contrib/ncurses/include/ncurses_dll.h.in | 10 +- contrib/ncurses/include/ncurses_mingw.h | 14 +- contrib/ncurses/include/term_entry.h | 29 +- contrib/ncurses/include/termcap.h.in | 10 +- contrib/ncurses/include/tic.h | 47 +- contrib/ncurses/include/win32_curses.h | 6 +- contrib/ncurses/install-sh | 671 +- contrib/ncurses/man/MKada_config.in | 139 +- contrib/ncurses/man/MKncu_config.in | 111 +- contrib/ncurses/man/MKterminfo.sh | 18 +- contrib/ncurses/man/Makefile.in | 23 +- contrib/ncurses/man/captoinfo.1m | 274 +- contrib/ncurses/man/clear.1 | 223 +- contrib/ncurses/man/curs_add_wch.3x | 403 +- contrib/ncurses/man/curs_add_wchstr.3x | 115 +- contrib/ncurses/man/curs_addch.3x | 579 +- contrib/ncurses/man/curs_addchstr.3x | 114 +- contrib/ncurses/man/curs_addstr.3x | 156 +- contrib/ncurses/man/curs_addwstr.3x | 157 +- contrib/ncurses/man/curs_attr.3x | 667 +- contrib/ncurses/man/curs_beep.3x | 38 +- contrib/ncurses/man/curs_bkgd.3x | 267 +- contrib/ncurses/man/curs_bkgrnd.3x | 237 +- contrib/ncurses/man/curs_border.3x | 177 +- contrib/ncurses/man/curs_border_set.3x | 256 +- contrib/ncurses/man/curs_clear.3x | 123 +- contrib/ncurses/man/curs_color.3x | 561 +- contrib/ncurses/man/curs_delch.3x | 117 +- contrib/ncurses/man/curs_deleteln.3x | 93 +- contrib/ncurses/man/curs_extend.3x | 85 +- contrib/ncurses/man/curs_get_wch.3x | 346 +- contrib/ncurses/man/curs_get_wstr.3x | 273 +- contrib/ncurses/man/curs_getcchar.3x | 118 +- contrib/ncurses/man/curs_getch.3x | 981 +- contrib/ncurses/man/curs_getstr.3x | 282 +- contrib/ncurses/man/curs_getyx.3x | 108 +- contrib/ncurses/man/curs_in_wch.3x | 73 +- contrib/ncurses/man/curs_in_wchstr.3x | 162 +- contrib/ncurses/man/curs_inch.3x | 97 +- contrib/ncurses/man/curs_inchstr.3x | 137 +- contrib/ncurses/man/curs_initscr.3x | 283 +- contrib/ncurses/man/curs_inopts.3x | 724 +- contrib/ncurses/man/curs_ins_wch.3x | 119 +- contrib/ncurses/man/curs_ins_wstr.3x | 151 +- contrib/ncurses/man/curs_insch.3x | 122 +- contrib/ncurses/man/curs_insstr.3x | 139 +- contrib/ncurses/man/curs_instr.3x | 129 +- contrib/ncurses/man/curs_inwstr.3x | 155 +- contrib/ncurses/man/curs_kernel.3x | 278 +- contrib/ncurses/man/curs_legacy.3x | 132 +- contrib/ncurses/man/curs_memleaks.3x | 113 +- contrib/ncurses/man/curs_mouse.3x | 631 +- contrib/ncurses/man/curs_move.3x | 82 +- contrib/ncurses/man/curs_opaque.3x | 242 +- contrib/ncurses/man/curs_outopts.3x | 216 +- contrib/ncurses/man/curs_overlay.3x | 92 +- contrib/ncurses/man/curs_pad.3x | 302 +- contrib/ncurses/man/curs_print.3x | 55 +- contrib/ncurses/man/curs_printw.3x | 263 +- contrib/ncurses/man/curs_refresh.3x | 148 +- contrib/ncurses/man/curs_scanw.3x | 322 +- contrib/ncurses/man/curs_scr_dump.3x | 171 +- contrib/ncurses/man/curs_scroll.3x | 156 +- contrib/ncurses/man/curs_slk.3x | 445 +- contrib/ncurses/man/curs_sp_funcs.3x | 496 +- contrib/ncurses/man/curs_termattrs.3x | 146 +- contrib/ncurses/man/curs_termcap.3x | 701 +- contrib/ncurses/man/curs_terminfo.3x | 1455 ++- contrib/ncurses/man/curs_threads.3x | 1117 +- contrib/ncurses/man/curs_touch.3x | 109 +- contrib/ncurses/man/curs_trace.3x | 211 +- contrib/ncurses/man/curs_util.3x | 382 +- contrib/ncurses/man/curs_variables.3x | 403 +- contrib/ncurses/man/curs_window.3x | 252 +- contrib/ncurses/man/default_colors.3x | 59 +- contrib/ncurses/man/define_key.3x | 41 +- contrib/ncurses/man/form.3x | 238 +- contrib/ncurses/man/form_cursor.3x | 33 +- contrib/ncurses/man/form_data.3x | 33 +- contrib/ncurses/man/form_driver.3x | 122 +- contrib/ncurses/man/form_field.3x | 57 +- contrib/ncurses/man/form_field_attributes.3x | 81 +- contrib/ncurses/man/form_field_buffer.3x | 79 +- contrib/ncurses/man/form_field_info.3x | 59 +- contrib/ncurses/man/form_field_just.3x | 57 +- contrib/ncurses/man/form_field_new.3x | 62 +- contrib/ncurses/man/form_field_opts.3x | 52 +- contrib/ncurses/man/form_field_userptr.3x | 35 +- contrib/ncurses/man/form_field_validation.3x | 179 +- contrib/ncurses/man/form_fieldtype.3x | 93 +- contrib/ncurses/man/form_hook.3x | 90 +- contrib/ncurses/man/form_new.3x | 42 +- contrib/ncurses/man/form_new_page.3x | 55 +- contrib/ncurses/man/form_opts.3x | 53 +- contrib/ncurses/man/form_page.3x | 71 +- contrib/ncurses/man/form_post.3x | 43 +- contrib/ncurses/man/form_requestname.3x | 44 +- contrib/ncurses/man/form_userptr.3x | 34 +- contrib/ncurses/man/form_variables.3x | 44 +- contrib/ncurses/man/form_win.3x | 60 +- contrib/ncurses/man/infocmp.1m | 611 +- contrib/ncurses/man/infotocap.1m | 104 +- contrib/ncurses/man/key_defined.3x | 31 +- contrib/ncurses/man/keybound.3x | 38 +- contrib/ncurses/man/keyok.3x | 33 +- contrib/ncurses/man/legacy_coding.3x | 90 +- contrib/ncurses/man/make_sed.sh | 43 +- .../man/{man_db.renames => man_db.renames.in} | 143 +- contrib/ncurses/man/manhtml.aliases | 68 +- contrib/ncurses/man/manhtml.externs | 28 +- contrib/ncurses/man/manlinks.sed | 40 +- contrib/ncurses/man/menu.3x | 210 +- contrib/ncurses/man/menu_attributes.3x | 108 +- contrib/ncurses/man/menu_cursor.3x | 33 +- contrib/ncurses/man/menu_driver.3x | 57 +- contrib/ncurses/man/menu_format.3x | 44 +- contrib/ncurses/man/menu_hook.3x | 79 +- contrib/ncurses/man/menu_items.3x | 58 +- contrib/ncurses/man/menu_mark.3x | 46 +- contrib/ncurses/man/menu_new.3x | 42 +- contrib/ncurses/man/menu_opts.3x | 49 +- contrib/ncurses/man/menu_pattern.3x | 45 +- contrib/ncurses/man/menu_post.3x | 46 +- contrib/ncurses/man/menu_requestname.3x | 42 +- contrib/ncurses/man/menu_spacing.3x | 78 +- contrib/ncurses/man/menu_userptr.3x | 32 +- contrib/ncurses/man/menu_win.3x | 60 +- contrib/ncurses/man/mitem_current.3x | 65 +- contrib/ncurses/man/mitem_name.3x | 38 +- contrib/ncurses/man/mitem_new.3x | 42 +- contrib/ncurses/man/mitem_opts.3x | 51 +- contrib/ncurses/man/mitem_userptr.3x | 33 +- contrib/ncurses/man/mitem_value.3x | 43 +- contrib/ncurses/man/mitem_visible.3x | 27 +- contrib/ncurses/man/ncurses.3x | 3402 ++++--- contrib/ncurses/man/new_pair.3x | 104 +- contrib/ncurses/man/panel.3x | 349 +- contrib/ncurses/man/resizeterm.3x | 165 +- contrib/ncurses/man/scr_dump.5 | 427 +- contrib/ncurses/man/tabs.1 | 323 +- contrib/ncurses/man/term.5 | 247 +- contrib/ncurses/man/term.7 | 122 +- contrib/ncurses/man/term_variables.3x | 145 +- contrib/ncurses/man/terminfo.head | 132 +- contrib/ncurses/man/terminfo.tail | 1188 ++- contrib/ncurses/man/tic.1m | 541 +- contrib/ncurses/man/toe.1m | 324 +- contrib/ncurses/man/tput.1 | 1345 ++- contrib/ncurses/man/tset.1 | 463 +- contrib/ncurses/man/user_caps.5 | 231 +- contrib/ncurses/man/wresize.3x | 56 +- contrib/ncurses/menu/Makefile.in | 17 +- contrib/ncurses/menu/READ.ME | 6 +- contrib/ncurses/menu/llib-lmenu | 98 +- contrib/ncurses/menu/llib-lmenut | 98 +- contrib/ncurses/menu/llib-lmenutw | 98 +- contrib/ncurses/menu/llib-lmenuw | 98 +- contrib/ncurses/menu/m_attribs.c | 38 +- contrib/ncurses/menu/m_cursor.c | 10 +- contrib/ncurses/menu/m_driver.c | 18 +- contrib/ncurses/menu/m_format.c | 7 +- contrib/ncurses/menu/m_global.c | 48 +- contrib/ncurses/menu/m_hook.c | 44 +- contrib/ncurses/menu/m_item_cur.c | 16 +- contrib/ncurses/menu/m_item_nam.c | 12 +- contrib/ncurses/menu/m_item_new.c | 34 +- contrib/ncurses/menu/m_item_opt.c | 28 +- contrib/ncurses/menu/m_item_top.c | 16 +- contrib/ncurses/menu/m_item_val.c | 18 +- contrib/ncurses/menu/m_item_vis.c | 8 +- contrib/ncurses/menu/m_items.c | 18 +- contrib/ncurses/menu/m_new.c | 18 +- contrib/ncurses/menu/m_pad.c | 14 +- contrib/ncurses/menu/m_pattern.c | 12 +- contrib/ncurses/menu/m_post.c | 64 +- contrib/ncurses/menu/m_req_name.c | 15 +- contrib/ncurses/menu/m_scale.c | 10 +- contrib/ncurses/menu/m_sub.c | 12 +- contrib/ncurses/menu/m_win.c | 12 +- contrib/ncurses/misc/Makefile.in | 32 +- contrib/ncurses/misc/csort | 6 +- contrib/ncurses/misc/gen-pkgconfig.in | 24 +- contrib/ncurses/misc/gen_edit.sh | 12 +- contrib/ncurses/misc/magic | 6 +- contrib/ncurses/misc/makedef.cmd | 8 +- contrib/ncurses/misc/makellib | 40 +- contrib/ncurses/misc/ncu2openbsd | 1288 +++ contrib/ncurses/misc/ncurses-config.in | 32 +- contrib/ncurses/misc/run_tic.in | 43 +- contrib/ncurses/misc/shlib | 8 +- contrib/ncurses/misc/tdlint | 24 +- contrib/ncurses/misc/terminfo.src | 10094 ++++++++++--------- contrib/ncurses/mk-0th.awk | 12 +- contrib/ncurses/mk-1st.awk | 100 +- contrib/ncurses/mk-2nd.awk | 6 +- contrib/ncurses/mk-hdr.awk | 8 +- contrib/ncurses/ncurses/Makefile.in | 50 +- contrib/ncurses/ncurses/README.IZ | 6 +- contrib/ncurses/ncurses/base/MKlib_gen.sh | 23 +- contrib/ncurses/ncurses/base/MKunctrl.awk | 7 +- contrib/ncurses/ncurses/base/key_defined.c | 7 +- contrib/ncurses/ncurses/base/keyok.c | 6 +- contrib/ncurses/ncurses/base/lib_addch.c | 35 +- contrib/ncurses/ncurses/base/lib_addstr.c | 32 +- contrib/ncurses/ncurses/base/lib_bkgd.c | 4 +- contrib/ncurses/ncurses/base/lib_clreol.c | 8 +- contrib/ncurses/ncurses/base/lib_color.c | 82 +- contrib/ncurses/ncurses/base/lib_delwin.c | 38 +- contrib/ncurses/ncurses/base/lib_dft_fgbg.c | 8 +- contrib/ncurses/ncurses/base/lib_echo.c | 8 +- contrib/ncurses/ncurses/base/lib_endwin.c | 28 +- contrib/ncurses/ncurses/base/lib_erase.c | 6 +- contrib/ncurses/ncurses/base/lib_freeall.c | 11 +- contrib/ncurses/ncurses/base/lib_getch.c | 63 +- contrib/ncurses/ncurses/base/lib_getstr.c | 35 +- contrib/ncurses/ncurses/base/lib_insnstr.c | 9 +- contrib/ncurses/ncurses/base/lib_instr.c | 8 +- contrib/ncurses/ncurses/base/lib_mouse.c | 153 +- contrib/ncurses/ncurses/base/lib_mvwin.c | 8 +- contrib/ncurses/ncurses/base/lib_newterm.c | 7 +- contrib/ncurses/ncurses/base/lib_newwin.c | 8 +- contrib/ncurses/ncurses/base/lib_nl.c | 8 +- contrib/ncurses/ncurses/base/lib_overlay.c | 16 +- contrib/ncurses/ncurses/base/lib_pad.c | 12 +- contrib/ncurses/ncurses/base/lib_refresh.c | 24 +- contrib/ncurses/ncurses/base/lib_restart.c | 17 +- contrib/ncurses/ncurses/base/lib_screen.c | 61 +- contrib/ncurses/ncurses/base/lib_set_term.c | 51 +- contrib/ncurses/ncurses/base/lib_slk.c | 8 +- contrib/ncurses/ncurses/base/lib_slkinit.c | 7 +- contrib/ncurses/ncurses/base/lib_slkrefr.c | 6 +- contrib/ncurses/ncurses/base/lib_wattron.c | 8 +- contrib/ncurses/ncurses/base/lib_window.c | 10 +- contrib/ncurses/ncurses/base/new_pair.c | 6 +- contrib/ncurses/ncurses/base/resizeterm.c | 14 +- contrib/ncurses/ncurses/base/safe_sprintf.c | 36 +- contrib/ncurses/ncurses/base/tries.c | 7 +- contrib/ncurses/ncurses/base/vsscanf.c | 11 +- contrib/ncurses/ncurses/base/wresize.c | 10 +- contrib/ncurses/ncurses/curses.priv.h | 508 +- contrib/ncurses/ncurses/llib-lncurses | 1420 +-- contrib/ncurses/ncurses/llib-lncursest | 1422 +-- contrib/ncurses/ncurses/llib-lncursestw | 1888 ++-- contrib/ncurses/ncurses/llib-lncursesw | 1886 ++-- contrib/ncurses/ncurses/llib-ltic | 54 +- contrib/ncurses/ncurses/llib-ltict | 54 +- contrib/ncurses/ncurses/llib-ltictw | 52 +- contrib/ncurses/ncurses/llib-lticw | 52 +- contrib/ncurses/ncurses/llib-ltinfo | 372 +- contrib/ncurses/ncurses/llib-ltinfot | 374 +- contrib/ncurses/ncurses/llib-ltinfotw | 370 +- contrib/ncurses/ncurses/llib-ltinfow | 368 +- contrib/ncurses/ncurses/new_pair.h | 13 +- contrib/ncurses/ncurses/report_offsets.c | 59 +- contrib/ncurses/ncurses/term.priv.h | 364 + contrib/ncurses/ncurses/tinfo/MKcaptab.sh | 5 +- contrib/ncurses/ncurses/tinfo/MKfallback.sh | 7 +- contrib/ncurses/ncurses/tinfo/MKkeys_list.sh | 10 +- contrib/ncurses/ncurses/tinfo/access.c | 127 +- contrib/ncurses/ncurses/tinfo/add_tries.c | 7 +- contrib/ncurses/ncurses/tinfo/alloc_entry.c | 206 +- contrib/ncurses/ncurses/tinfo/alloc_ttype.c | 122 +- contrib/ncurses/ncurses/tinfo/captoinfo.c | 16 +- contrib/ncurses/ncurses/tinfo/comp_error.c | 23 +- contrib/ncurses/ncurses/tinfo/comp_expand.c | 16 +- contrib/ncurses/ncurses/tinfo/comp_hash.c | 21 +- contrib/ncurses/ncurses/tinfo/comp_parse.c | 140 +- contrib/ncurses/ncurses/tinfo/comp_scan.c | 84 +- contrib/ncurses/ncurses/tinfo/db_iterator.c | 24 +- contrib/ncurses/ncurses/tinfo/doalloc.c | 11 +- contrib/ncurses/ncurses/tinfo/entries.c | 30 +- contrib/ncurses/ncurses/tinfo/free_ttype.c | 18 +- contrib/ncurses/ncurses/tinfo/init_keytry.c | 8 +- contrib/ncurses/ncurses/tinfo/lib_cur_term.c | 17 +- contrib/ncurses/ncurses/tinfo/lib_data.c | 28 +- contrib/ncurses/ncurses/tinfo/lib_kernel.c | 48 +- contrib/ncurses/ncurses/tinfo/lib_longname.c | 7 +- contrib/ncurses/ncurses/tinfo/lib_napms.c | 7 +- contrib/ncurses/ncurses/tinfo/lib_options.c | 6 +- contrib/ncurses/ncurses/tinfo/lib_print.c | 9 +- contrib/ncurses/ncurses/tinfo/lib_raw.c | 60 +- contrib/ncurses/ncurses/tinfo/lib_setup.c | 278 +- contrib/ncurses/ncurses/tinfo/lib_termcap.c | 6 +- contrib/ncurses/ncurses/tinfo/lib_tgoto.c | 16 +- contrib/ncurses/ncurses/tinfo/lib_tparm.c | 681 +- contrib/ncurses/ncurses/tinfo/lib_tputs.c | 50 +- contrib/ncurses/ncurses/tinfo/lib_win32con.c | 1294 ++- contrib/ncurses/ncurses/tinfo/lib_win32util.c | 28 +- contrib/ncurses/ncurses/tinfo/make_hash.c | 6 +- contrib/ncurses/ncurses/tinfo/make_keys.c | 12 +- contrib/ncurses/ncurses/tinfo/obsolete.c | 99 +- contrib/ncurses/ncurses/tinfo/parse_entry.c | 78 +- contrib/ncurses/ncurses/tinfo/read_entry.c | 110 +- contrib/ncurses/ncurses/tinfo/read_termcap.c | 36 +- contrib/ncurses/ncurses/tinfo/strings.c | 6 +- contrib/ncurses/ncurses/tinfo/tinfo_driver.c | 19 +- contrib/ncurses/ncurses/tinfo/trim_sgr0.c | 14 +- contrib/ncurses/ncurses/tinfo/write_entry.c | 118 +- contrib/ncurses/ncurses/trace/lib_trace.c | 99 +- contrib/ncurses/ncurses/trace/lib_traceatr.c | 26 +- contrib/ncurses/ncurses/trace/lib_tracechr.c | 16 +- contrib/ncurses/ncurses/trace/lib_tracedmp.c | 8 +- contrib/ncurses/ncurses/trace/trace_buf.c | 10 +- contrib/ncurses/ncurses/trace/varargs.c | 12 +- contrib/ncurses/ncurses/trace/visbuf.c | 12 +- contrib/ncurses/ncurses/tty/MKexpanded.sh | 9 +- contrib/ncurses/ncurses/tty/hardscroll.c | 47 +- contrib/ncurses/ncurses/tty/hashmap.c | 11 +- contrib/ncurses/ncurses/tty/lib_mvcur.c | 59 +- contrib/ncurses/ncurses/tty/lib_tstp.c | 24 +- contrib/ncurses/ncurses/tty/lib_twait.c | 25 +- contrib/ncurses/ncurses/tty/lib_vidattr.c | 6 +- contrib/ncurses/ncurses/tty/tty_update.c | 41 +- contrib/ncurses/ncurses/wcwidth.h | 18 +- contrib/ncurses/ncurses/widechar/lib_add_wch.c | 18 +- contrib/ncurses/ncurses/widechar/lib_cchar.c | 14 +- contrib/ncurses/ncurses/widechar/lib_erasewchar.c | 34 +- contrib/ncurses/ncurses/widechar/lib_get_wch.c | 6 +- contrib/ncurses/ncurses/widechar/lib_get_wstr.c | 53 +- contrib/ncurses/ncurses/widechar/lib_ins_wch.c | 13 +- contrib/ncurses/ncurses/widechar/lib_key_name.c | 19 +- contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c | 6 +- contrib/ncurses/ncurses/widechar/lib_unget_wch.c | 6 +- contrib/ncurses/ncurses/widechar/lib_vid_attr.c | 6 +- contrib/ncurses/ncurses/win32con/gettimeofday.c | 6 +- contrib/ncurses/ncurses/win32con/win32_driver.c | 12 +- contrib/ncurses/ncurses/win32con/win_driver.c | 97 +- contrib/ncurses/panel/Makefile.in | 17 +- contrib/ncurses/panel/llib-lpanel | 22 +- contrib/ncurses/panel/llib-lpanelt | 22 +- contrib/ncurses/panel/llib-lpaneltw | 22 +- contrib/ncurses/panel/llib-lpanelw | 22 +- contrib/ncurses/panel/p_bottom.c | 6 +- contrib/ncurses/panel/p_new.c | 8 +- contrib/ncurses/panel/p_show.c | 6 +- contrib/ncurses/panel/p_user.c | 6 +- contrib/ncurses/progs/MKtermsort.sh | 37 +- contrib/ncurses/progs/Makefile.in | 61 +- contrib/ncurses/progs/capconvert | 45 +- contrib/ncurses/progs/clear.c | 6 +- contrib/ncurses/progs/dump_entry.c | 86 +- contrib/ncurses/progs/dump_entry.h | 7 +- contrib/ncurses/progs/infocmp.c | 163 +- contrib/ncurses/progs/modules | 10 +- contrib/ncurses/progs/progs.priv.h | 153 +- contrib/ncurses/progs/reset_cmd.c | 305 +- contrib/ncurses/progs/reset_cmd.h | 8 +- contrib/ncurses/progs/tabs.c | 223 +- contrib/ncurses/progs/tic.c | 622 +- contrib/ncurses/progs/toe.c | 85 +- contrib/ncurses/progs/tparm_type.c | 13 +- contrib/ncurses/progs/tparm_type.h | 6 +- contrib/ncurses/progs/tput.c | 195 +- contrib/ncurses/progs/tset.c | 39 +- contrib/ncurses/progs/tty_settings.c | 12 +- contrib/ncurses/test/back_ground.c | 300 - contrib/ncurses/test/dup_field.c | 394 - contrib/ncurses/test/move_field.c | 524 - contrib/ncurses/test/test_tparm.c | 388 - lib/ncurses/config.mk | 4 +- lib/ncurses/tinfo/Makefile | 5 + lib/ncurses/tinfo/ncurses_cfg.h | 60 +- usr.bin/ncurses/Makefile | 6 +- 451 files changed, 48795 insertions(+), 50440 deletions(-) diff --cc contrib/ncurses/include/nc_access.h index 000000000000,1d2fb0a4ec5e..1d2fb0a4ec5e mode 000000,100644..100644 --- a/contrib/ncurses/include/nc_access.h +++ b/contrib/ncurses/include/nc_access.h diff --cc contrib/ncurses/install-sh index 462fa9c3d57b,000000000000..ec298b537402 mode 100755,000000..100755 --- a/contrib/ncurses/install-sh +++ b/contrib/ncurses/install-sh @@@ -1,294 -1,0 +1,541 @@@ - #! /bin/sh - # ++#!/bin/sh +# install - install a program, script, or datafile - # ++ ++scriptversion=2020-11-14.01; # UTC ++ +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent - # `make' implicit rules from creating a file called install from it ++# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written - # from scratch. It can only install one file at a time, a restriction - # shared with many OS's install programs. ++# from scratch. ++ ++tab=' ' ++nl=' ++' ++IFS=" $tab$nl" ++ ++# Set DOITPROG to "echo" to test this script. + ++doit=${DOITPROG-} ++doit_exec=${doit:-exec} + - # set DOITPROG to echo to test this script ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + - # Don't use :- since 4.3BSD and earlier shells don't like it. - doit="${DOITPROG-}" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} + ++posix_mkdir= + - # put in absolute paths if you don't have them in your path; or use env. vars. ++# Desired mode of installed file. ++mode=0755 + - mvprog="${MVPROG-mv}" - cpprog="${CPPROG-cp}" - chmodprog="${CHMODPROG-chmod}" - chownprog="${CHOWNPROG-chown}" - chgrpprog="${CHGRPPROG-chgrp}" - stripprog="${STRIPPROG-strip}" - rmprog="${RMPROG-rm}" - mkdirprog="${MKDIRPROG-mkdir}" ++# Create dirs (including intermediate dirs) using mode 755. ++# This is like GNU 'install' as of coreutils 8.32 (2020). ++mkdir_umask=22 + - transformbasename="" - transform_arg="" - instcmd="$mvprog" - chmodcmd="$chmodprog 0755" - chowncmd="" - chgrpcmd="" - stripcmd="" ++backupsuffix= ++chgrpcmd= ++chmodcmd=$chmodprog ++chowncmd= ++mvcmd=$mvprog +rmcmd="$rmprog -f" - mvcmd="$mvprog" - src="" - dst="" - dir_arg="" - - while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac - done ++stripcmd= + - if [ x"$src" = x ] - then - echo "$0: no input file specified" >&2 - exit 1 - else - : - fi ++src= ++dst= ++dir_arg= ++dst_arg= + - if [ x"$dir_arg" != x ]; then - dst=$src - src="" ++copy_on_change=false ++is_target_a_directory=possibly + - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi - else ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... + - # Waiting for this to be detected by the "$instcmd $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. + - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi ++Options: ++ --help display this help and exit. ++ --version display version info and exit. + - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi ++ -c (ignored) ++ -C install only if different (preserve data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -p pass -p to $cpprog. ++ -s $stripprog installed files. ++ -S SUFFIX attempt to back up existing files, with suffix SUFFIX. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + - # If destination is a directory, append the input filename; if your system - # does not like double slashes in filenames, you may need to add some logic ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG + - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi - fi ++By default, rm is invoked with -f; when overridden with RMPROG, ++it's up to you to specify -f if you want it. + - ## this sed command emulates the dirname command - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ++If -S is not specified, no backups are attempted. + - # Make sure that the destination directory exists. - # this part is taken from Noah Friedman's mkinstalldirs script ++Email bug reports to bug-automake@gnu.org. ++Automake home page: https://www.gnu.org/software/automake/ ++" + - # Skip lots of stat calls in the usual case. - if [ ! -d "$dstdir" ]; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" ++while test $# -ne 0; do ++ case $1 in ++ -c) ;; + - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - IFS=$oIFS ++ -C) copy_on_change=true;; + - pathcomp='' ++ -d) dir_arg=true;; + - while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 - shift ++ -g) chgrpcmd="$chgrpprog $2" ++ shift;; + - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi ++ --help) echo "$usage"; exit $?;; + - pathcomp=$pathcomp/ - done - fi ++ -m) mode=$2 ++ case $mode in ++ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + - if [ x"$dir_arg" != x ] - then - $doit $instcmd "$dst" && ++ -o) chowncmd="$chownprog $2" ++ shift;; + - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi - else ++ -p) cpprog="$cpprog -p";; + - # If we're going to rename the final executable, determine the name now. ++ -s) stripcmd=$stripprog;; + - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi ++ -S) backupsuffix="$2" ++ shift;; + - # don't allow the sed command to completely eliminate the filename ++ -t) ++ is_target_a_directory=always ++ dst_arg=$2 ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac ++ shift;; + - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi ++ -T) is_target_a_directory=never;; + - # Make a couple of temp file names in the proper directory. ++ --version) echo "$0 $scriptversion"; exit $?;; + - dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# ++ --) shift ++ break;; + - # Trap to clean up temp files at exit. ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; + - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 ++ *) break;; ++ esac ++ shift ++done + - # Move or copy the file name to the temp name ++# We allow the use of options -d and -T together, by making -d ++# take the precedence; this is for compatibility with GNU install. + - $doit $instcmd "$src" "$dsttmp" && ++if test -n "$dir_arg"; then ++ if test -n "$dst_arg"; then ++ echo "$0: target directory not allowed when installing a directory." >&2 ++ exit 1 ++ fi ++fi + - # and set any options; do chmod last to preserve setuid bits ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac ++ done ++fi + - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $instcmd $src $dsttmp" command. ++if test $# -eq 0; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call 'install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ++if test -z "$dir_arg"; then ++ if test $# -gt 1 || test "$is_target_a_directory" = always; then ++ if test ! -d "$dst_arg"; then ++ echo "$0: $dst_arg: Is not a directory." >&2 ++ exit 1 ++ fi ++ fi ++fi + - # Now remove or move aside any old file at destination location. We try this - # two ways since rm can't unlink itself on some systems and the destination - # file might be busy for other reasons. In this case, the final cleanup - # might fail but the new file should still install successfully. ++if test -z "$dir_arg"; then ++ do_exit='(exit $ret); exit $ret' ++ trap "ret=129; $do_exit" 1 ++ trap "ret=130; $do_exit" 2 ++ trap "ret=141; $do_exit" 13 ++ trap "ret=143; $do_exit" 15 ++ ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi + - { - if [ -f "$dstdir/$dstfile" ] ++for src ++do ++ # Protect names problematic for 'test' and other utilities. ++ case $src in ++ -* | [=\(\)!]) src=./$src;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? ++ # Don't chown directories that already exist. ++ if test $dstdir_status = 0; then ++ chowncmd="" ++ fi ++ else ++ ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dst_arg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ dst=$dst_arg ++ ++ # If destination is a directory, append the input filename. ++ if test -d "$dst"; then ++ if test "$is_target_a_directory" = never; then ++ echo "$0: $dst_arg: Is a directory" >&2 ++ exit 1 ++ fi ++ dstdir=$dst ++ dstbase=`basename "$src"` ++ case $dst in ++ */) dst=$dst$dstbase;; ++ *) dst=$dst/$dstbase;; ++ esac ++ dstdir_status=0 ++ else ++ dstdir=`dirname "$dst"` ++ test -d "$dstdir" ++ dstdir_status=$? ++ fi *** 1763 LINES SKIPPED *** From nobody Thu Jun 20 11:40:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4dpT2VYRz5Ncl4 for ; Thu, 20 Jun 2024 11:40: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 4W4dpT1y8fz4K5Y; Thu, 20 Jun 2024 11:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718883633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cotHLzg8ws9bZvDckZkthHFdcZwj+vAjHfqnlN/Fpk=; b=I7A83u4ZqvdyKH52O1ImJBxIwG7TopOIyTyFKjiXECMmhDKZqUTTYupTHgPPuf6nXWCXhp sxEKeya5cqJ1oLfiTWIvhQS43WZIVsKWtyYbHfo4y2VxqdJoL4wI3v8CP16JmWZCuQqBQz hGTOfrmInSNhefK1P1AWKh4NstqK60ZT05pNxxEBh/mPPgrTcMroldv+QLEv0bXXBJs4Vi Svu7ltetoubicik0lylcppz9wG0Kli3uL/iojynqCp8IJuFmBltf7/w5m3ddpqGIrU0L3e aCnNz/nu5dvWwC8s1wQstZbbZgZbY0yML8psTgkNg7llqVi6a3cbuOLcp+n0EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718883633; a=rsa-sha256; cv=none; b=thkalj+0D6R3N2kQz/aXjcvbEkA3CtYpie+4TffBPodN6MQYCZe8g3lEHezjGsXaxe36us NJV3G5hdpeHjIEU+TvXJxbb9/lDx0OWmySJxD85XEMBdLDCGXcUN+BiW6uFF0RlvO/ru2i AVXIh0CWh2Yi4ENGWEe3vKiFcrj5wfB01QyCcYhkj2BtHgyScYBzDVBDw66Nf2lR4P+H0B gynhY2A6Za1Nm418M6KJCeW3ls21MeHpWq/TfD2+YDPsYsugvBc9MCOGsLxnpAP8ckK8sO /gqoQpFdopxRp7WOkiHZ7iNUkmbtJnAdsR0I/anv79Ri3wMmJjp/uQbBIAwaIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718883633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cotHLzg8ws9bZvDckZkthHFdcZwj+vAjHfqnlN/Fpk=; b=qRDcSyhxPYNo3O8gQWqAJoaDs20JHO4Y1nVLpEAa3/Gkb/qyjHrMpeFNNKCVeroKlyn6ED 7B5s7kAkT7nQCMSZn2/ikhpCXs96kz5oizF1A5r2bXIljjpSdke6rBKpxfTZJqgGjxhrhz 280tmdQbcSww18iNrSR0OG2yT2SbbwfxXkHJ24wAvuRzAfVHYnMH52Ry1y/+KrORllL66n ABYoc6oVoK4HlLfxBc5ll5hl2VNN4as25TalMCdUcODAETitYdPcLzIYJNThiLrT9aBK26 AMgWBaf4yYXBWOprTNzkzYiRXKNqsYP1pmZOswJPBPNJJnU6QKHPmV6/LTQitA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4dpT16lDzNNR; Thu, 20 Jun 2024 11:40: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 45KBeX38033375; Thu, 20 Jun 2024 11:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KBeXNu033361; Thu, 20 Jun 2024 11:40:33 GMT (envelope-from git) Date: Thu, 20 Jun 2024 11:40:33 GMT Message-Id: <202406201140.45KBeXNu033361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: cba5e8978cf6..7b7e898c2ba0 - vendor/byacc - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/vendor/byacc X-Git-Reftype: branch X-Git-Commit: 7b7e898c2ba0736cc7ea628eca74e7630eab5038 X-Git-Oldrev: cba5e8978cf659b3216c47d38f9917403b4df1c4 X-Git-Newrev: 7b7e898c2ba0736cc7ea628eca74e7630eab5038 Auto-Submitted: auto-generated The branch vendor/byacc has been updated by bapt: URL: https://cgit.FreeBSD.org/src/log/?id=cba5e8978cf6..7b7e898c2ba0 7b7e898c2ba0 byacc: import version 20240109 From nobody Thu Jun 20 11:40:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4dpZ5HXVz5NcZr for ; Thu, 20 Jun 2024 11:40: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 4W4dpZ4qSHz4KGK; Thu, 20 Jun 2024 11:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718883638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3Hcvz0s8kXxtDnZDoHl2XoUmM/grTN9cKrg+e8VlgQ=; b=T/s5qgPXRuq61qVrWCkct5Q5CE46Xmt6aYYwPrGg6MezycqeY6WT/C73s5Fx3nY/YnZRO9 jmB+5bqE/JO+c84/j9aFcWWQqiIANQhRVDlOUebdpuhbXGU+mj7x7ozo7Pf3mbK4UP967Z wz/qaEAEnRcg90OgzcnKMLq20Taw5Pnnyrno1mDX+V14+MRxRrHFwX80QI+WlPZrHPCsDQ HcxM0H2u2BY3kcdLQxqr+XpI6HgZIjpIBRBqzlUp1lpTU3OUPqtjIPej/mH4URhGAvrnYN dc2Z87IQWtZWo9FYqR6r8SMgoUu4YwoHZS4OujAqXqlMeIDyob1XazyYlnS1eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718883638; a=rsa-sha256; cv=none; b=erLTdszAcmF/vApJEmHaLhouArVPfnm8wCRqvDtMmg9EQkmeXU7SweAZDLKmmOfwov29yA ZtGklEvcA80QUNhvrfnVfRlVxKKy8lGajI5drNBWL/WGbloNJKHEAb5IQW1mZ6I4jUXkOM JVcylJN9ZLiHMHudlJwv8mgaUhDBpFkVvTMlbdawQ3THCcVcTq0h8/e124CeGhmytg2FYc V1kMJPumQ8anL9KronOo+i+fPzPUDV/sOxN5GgvzcbJuHAMs6nAO+QDWYYuumUyG8pyF03 xxtis0tV3548tKTi+ApOWWLRCiiVNIU5JWPl8UhxQft9xclQqld9L4jB4TTjDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718883638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3Hcvz0s8kXxtDnZDoHl2XoUmM/grTN9cKrg+e8VlgQ=; b=F/Wy1998C2M9MBysaRIShePDJBtu0s23uqRse55jdcJeH8vOjxVrvo713sptc/hvKfXWoi SOeFqTDjQ0tCWVCc7RUKwSz9KVFe1LIxXxwntjC1oXZwk+8zmO2abb8JziZgd7Wld95ZmL wWJtpbFQxpNIKtLViVwQSutdzEhvSk0OI3HlfQYz4XKXvU9XMegRyEPAedl4hc5VXuFlXb wNeVT+73ZbldhFeqnKp8AIEb3dmP9rDEaCN6KP5DbFdSh+CFyt7zN4i0Dyzd/KAi/uy9v4 opx81lByZ49U5ItdlM6s8Y7F9D4+m1u9IzVUfQT6rN/LpV62nihxsYBGdxJISw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4dpZ4LhlzNRg; Thu, 20 Jun 2024 11:40: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 45KBecZi034912; Thu, 20 Jun 2024 11:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KBecrg034911; Thu, 20 Jun 2024 11:40:38 GMT (envelope-from git) Date: Thu, 20 Jun 2024 11:40:38 GMT Message-Id: <202406201140.45KBecrg034911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: d3d592e2ef1b - Create tag vendor/byacc/20240109 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/tags/vendor/byacc/20240109 X-Git-Reftype: annotated tag X-Git-Commit: d3d592e2ef1bed927e47f214e8533d3332bcbcb9 Auto-Submitted: auto-generated The annotated tag vendor/byacc/20240109 has been created by bapt: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/byacc/20240109 tag vendor/byacc/20240109 Tagger: Baptiste Daroussin TaggerDate: 2024-06-20 11:39:28 +0000 byacc: tag vendor import of version 20240109 commit 7b7e898c2ba0736cc7ea628eca74e7630eab5038 Author: Baptiste Daroussin AuthorDate: 2024-06-20 11:38:00 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 11:38:00 +0000 byacc: import version 20240109 From nobody Thu Jun 20 11:47:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4dyp51ffz5NdR5 for ; Thu, 20 Jun 2024 11:47: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 4W4dyp45Pkz4LTm; Thu, 20 Jun 2024 11:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718884066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2t/ZBTpnsoSt/lwtI0lGVrXFHXob3N6e3C/KLMFCGk=; b=VvsVPKaTvUK4zyxseOfc02WuSzG9MWd8mrkQbXaVxTeqFxu5uf8DHMOIq35oMmViy6uOHR fxWb6TvIFnDdq8qYKcVspnfxEk1cbT96U0sCXU8lnSTHMf51hOc2eMNLoB57ebHz+MXX2E LUI9lb6b8316eYzrrW7IbNFuNOIkUanTLh7zGg1xTykrJuAcTigkaoeHdnuDwCUyFtxDAo nARChHbGKbeqKlhS7dDvQ0gCG240jMsNanTzXi4UX6zCBLvAT2hN1g2qy5EvhZ4+WZmgKR dcwMCjM8EocErwPM0lsI6FeqsANwlqovBPlV8vPOGaiH1WX8kTJ0B1+qoe7GpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718884066; a=rsa-sha256; cv=none; b=VrhhzfNuE9jWbe/g3+6JHBxetJh6HK9buOM1Uzv3qnrmgkwyozq+/TrvPGRnRQoSEhy18s V6kPO96J4HZVQ/5CCCd5nNzIRi6k9P1SDNT5KFmHsTJOkhoC3tWwVU+NZ0AI151CmQ8/vB WTvfudJo7yuag1ouY7V05e6v62p0N51anui6xXTlPUw+mK0F93Dw/xvrrSLwKg6EmreZpA qLCz9lSGFHE7qVP8Tx8A3Xn5FK4H86CBX2U9OdZbc3Neh7VzNHCPqOIBVf0UAms7II1mHD X1D8//o85hpOV52lQi2EtDb/ved5I4UyyTx2S9L9KtIj2gAoY23mK+k5t8f1gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718884066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2t/ZBTpnsoSt/lwtI0lGVrXFHXob3N6e3C/KLMFCGk=; b=tjOhcmMZ+FE6JuoeA9MCOm67RkVNKVw1bXOWr5Q4u1BMHTLViSLhoECE+MK4A51AxMAv9q lO1yaj6hUbNNwINGvFgnr902PHwYKUA/2ktag2FA1+0Ttdg55q7QBHVeyWnTRg5kZlxjdu XRER/215RxoxGfS/Wti7Ahzau1gQS0PvAM+Okc5K3zUsMxaLyTf/UCYuv6qbT1yruytlax 3WxVK+fgJPp0Q2bg86++zdXSA2vpD2XoDXv8scIBCWHnrC4hq+7FbO88SPhCaZDI+jj0iq N362fSdk098Rm2+jpnNrIZvPD0o9NhkfsUxpNWJ6O03fCl+sODmFYgzakRajpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4dyp3CppzPKY; Thu, 20 Jun 2024 11:47: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 45KBlk8C040410; Thu, 20 Jun 2024 11:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KBlkdC040409; Thu, 20 Jun 2024 11:47:46 GMT (envelope-from git) Date: Thu, 20 Jun 2024 11:47:46 GMT Message-Id: <202406201147.45KBlkdC040409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: 7b7e898c2ba0..0b234d7a89df - vendor/byacc - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/vendor/byacc X-Git-Reftype: branch X-Git-Commit: 0b234d7a89df4780e9d2ea9817afd5d3dfaf4d27 X-Git-Oldrev: 7b7e898c2ba0736cc7ea628eca74e7630eab5038 X-Git-Newrev: 0b234d7a89df4780e9d2ea9817afd5d3dfaf4d27 Auto-Submitted: auto-generated The branch vendor/byacc has been updated by bapt: URL: https://cgit.FreeBSD.org/src/log/?id=7b7e898c2ba0..0b234d7a89df 0b234d7a89df byacc: actually import version 20240109 From nobody Thu Jun 20 11:50:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4f1T22gQz5NdkX for ; Thu, 20 Jun 2024 11:50: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 4W4f1T1TMMz4LfR; Thu, 20 Jun 2024 11:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718884205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBskUFJ89lrxjMQ/aWkVAGc+JAsxu7YHSlta8DFNNY0=; b=qVW3C5MefXJAH2AxlvGiDrLjPRP2f6RifEvkLFRC7wHxG64NZdgHLMGCzZgBkaBXpL4WuI dkDkQkNRnyuapw/hxugkYpeurXqRUI1+bCx9fz/Xi6yqMQTUcuHqXN6XV/dDH7AmLCbkw4 5Mb90vFBM8PdeTH8yZoLX6VSVYu28GwZtw18IMBgfE9ic0zjy5GKcAyq8uKNZvLfAwZlWx J9zdxXEwS7xKIZUymKKEGuTsVvFMdxF3hm5dZu0KYupbXCLBMVg7M+P8cIlMQfTDt2R3Tr nHLmuwd5KjLjQH8QKaB5NJB9HKLjTZNYasRuon6onrD+DGo4JtB2eaUojtSnsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718884205; a=rsa-sha256; cv=none; b=W7099plH5dXD/DfMNImLm0VwuZ67sjdiPXOD3ETWI8QqjoSNjnHJ9PYzIIhAqrpBGPEgAX ViQlP2U+2+TBWxPhqMEb8/dDYVoujsw/oV7/UG769ZLiuXzEYCAkXyUGbo/hwFPxQcbXgy d1+nrXSIr3D81CHTyoTDtSsjMhdNnb8WZF98UadR5/Yx/1ROK61MbJAgSQNLMRxsapZW3U phzAr45L4dBQFrICcpoCkCDrfKeqfqx0So7cRGYOZAH7Xik8sbMWu2zjT7z46IPstAHGI/ TixO/pdYJOOlbrAfevg7HDEdtVBvKSk9FzpRWNF23uOehYZ8tPbu7R0QARHvJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718884205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBskUFJ89lrxjMQ/aWkVAGc+JAsxu7YHSlta8DFNNY0=; b=Fg1qJsw3XE2tMsPaIp+9OyjPD9Fc+lCXdjoogQo8fSIelUPQP50hXkcRdFVhuVs30IcLYE vsgM0rVqlIvprAi1g6VpMYbaippjpnyNTHPEbmXP7yzh2Q8NAtjnXfVnv6/tWd9QqFqNGY OofSh/D2SvoDVkmLL7qQdLoqya014rii/2cPspDNfb5OuK9sdcga7NqEhjg0ZENQjCDH1V A6s69oYwgtai8b+HkwO14CStpWp8kof7S7my598Tp37Yi2OSWbV6AeNdYoj/YM6UAbwyJN XoydkqsTM2xQM5QoVw+yJ12qwG82bD7Aw0LwLiECTv2VKJYQFXzP9lrDEmWCQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4f1T0nlPzP8W; Thu, 20 Jun 2024 11:50: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 45KBo5LX043478; Thu, 20 Jun 2024 11:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KBo5tH043476; Thu, 20 Jun 2024 11:50:05 GMT (envelope-from git) Date: Thu, 20 Jun 2024 11:50:05 GMT Message-Id: <202406201150.45KBo5tH043476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: 0b234d7a89df..85a764b2c52b - vendor/byacc - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/vendor/byacc X-Git-Reftype: branch X-Git-Commit: 85a764b2c52b853993b20c6291983a1aac223f47 X-Git-Oldrev: 0b234d7a89df4780e9d2ea9817afd5d3dfaf4d27 X-Git-Newrev: 85a764b2c52b853993b20c6291983a1aac223f47 Auto-Submitted: auto-generated The branch vendor/byacc has been updated by bapt: URL: https://cgit.FreeBSD.org/src/log/?id=0b234d7a89df..85a764b2c52b 85a764b2c52b byacc: readd tests in the import From nobody Thu Jun 20 12:37:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4g3j43Zhz5NjCQ; Thu, 20 Jun 2024 12:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4g3j3Z6nz4QJb; Thu, 20 Jun 2024 12:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718887025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kVxbd617f18D0Mnhlh6DEbY8OTretRqEdD6zECFNCXo=; b=HDN1US3aD0Xm1WfD9msOU2tlTiuDZlHEhbqbBmlPy0vzga8rVJjJYD3KHAc3CAv/SNn73o UvPXEMJ09uGEpwYRkfJhHHxt/USEeKZd/f74Iy2B7qysFtjcEaTTQUwwf6cHG2EOSGH14N SB04NTqoCMtHWa763HCWyCBnzDKwWduFFuvBbMkmwQ50a7RMtY2fdzFHUXcZJF00grIsO4 5AACIixw9BQFGgJQ2oK4RG+9RR1tLfxLntw8CBw+m+93x2SDGF/pshrgBxZfdMFyPT7PKB B54gGcOqS0JJqGFa7Ner1lC4wkartw37NtrVQkw6AdCT/XJ/i21qPQ3NmNKd4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718887025; a=rsa-sha256; cv=none; b=uQaF5HAmLJKrcP5kvJyFsAVfcd/pwQePs3GBEhDjtrlKQMcDM5zLMIEbgVLrFvxGVegq/x r2fNjd15VSOw79sfEERA8oNNFVHFWfH8NM/JvTMfGSXBHeaBs/VFT74YBkOyToxonBNeOS eoSECpycIx9WBApsxtba3gFswxVDr155/7y3SgRy7Cqj8cbyBlIHZF0QtcOk4bTy4Hr4K2 ICyFW7Tubde8K6+EMmjlgls768gunKdUAdP3uE6IAqpreFoAyWV9hMSFMfkZb2za+w+brr uDI6HY/gk/Whqtuis3o26yGQejvE0LSaaaCdOilsh6HWi8bVauJgcPbfRfb7Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718887025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kVxbd617f18D0Mnhlh6DEbY8OTretRqEdD6zECFNCXo=; b=Jv+c5ehgH74hiOCgidFv2twoTCaFRxTcwNuSa8hRattPt/fpVY53fwSeKMxIKIHxncr1Yj TvjIiDjBXmCv7iCHGO52BvVKukaaauw0Jl2DiOFL2mtd2hxo8nqTPrH2SJV3rU+v0gL6Oy dO20jXWVw4lNNMGrp9LdbwA/Lfg5HiqV8iXQiLL95/frxm+nSQryKtBfOU6j6vzs6aMyGs VihOAzr2KWrFlbD0cyo3G4L1FCiNm15PNC3nFAlcFtPhlufR+nkjF8JOmgOYlv0XYbbMBM 7Fq7IibMgn8zfvS3HXdZte27avW8mbuifv+mLKgzMHBWaqasOfqRsuTBHhD2GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4g3j38v0zQKp; Thu, 20 Jun 2024 12:37: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 45KCb53N025019; Thu, 20 Jun 2024 12:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KCb5bx025014; Thu, 20 Jun 2024 12:37:05 GMT (envelope-from git) Date: Thu, 20 Jun 2024 12:37:05 GMT Message-Id: <202406201237.45KCb5bx025014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 822ca3276345 - main - byacc: really import 20240109 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 822ca3276345b4a67ccbc9b54616d8b205fd37f2 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=822ca3276345b4a67ccbc9b54616d8b205fd37f2 commit 822ca3276345b4a67ccbc9b54616d8b205fd37f2 Merge: 21817992b331 85a764b2c52b Author: Baptiste Daroussin AuthorDate: 2024-06-20 12:10:45 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 12:34:49 +0000 byacc: really import 20240109 contrib/byacc/CHANGES | 150 +++ contrib/byacc/LICENSE | 10 + contrib/byacc/MANIFEST | 5 +- contrib/byacc/VERSION | 2 +- contrib/byacc/aclocal.m4 | 396 ++++++- contrib/byacc/config.guess | 63 +- contrib/byacc/config.sub | 222 ++-- contrib/byacc/configure | 1380 ++++++++++++++--------- contrib/byacc/configure.in | 6 +- contrib/byacc/defs.h | 55 +- contrib/byacc/error.c | 73 +- contrib/byacc/main.c | 6 +- contrib/byacc/makefile.in | 8 +- contrib/byacc/mstring.c | 14 +- contrib/byacc/output.c | 16 +- contrib/byacc/package/byacc.spec | 119 -- contrib/byacc/package/debian/changelog | 519 --------- contrib/byacc/package/debian/control | 28 - contrib/byacc/package/debian/copyright | 129 --- contrib/byacc/package/debian/rules | 29 - contrib/byacc/package/debian/source/format | 1 - contrib/byacc/package/debian/watch | 20 - contrib/byacc/package/mingw-byacc.spec | 68 -- contrib/byacc/package/pkgsrc/DESCR | 6 - contrib/byacc/package/pkgsrc/Makefile | 19 - contrib/byacc/package/pkgsrc/PLIST | 3 - contrib/byacc/package/pkgsrc/distinfo | 6 - contrib/byacc/reader.c | 345 +++++- contrib/byacc/test/btyacc/btyacc_calc1.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_calc1.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_demo.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_demo.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_destroy1.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_destroy2.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_destroy2.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_destroy3.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_destroy3.tab.h | 2 +- contrib/byacc/test/btyacc/calc1.tab.c | 2 +- contrib/byacc/test/btyacc/calc1.tab.h | 2 +- contrib/byacc/test/btyacc/err_inherit3.tab.c | 2 +- contrib/byacc/test/btyacc/err_inherit3.tab.h | 2 +- contrib/byacc/test/btyacc/err_inherit4.tab.c | 2 +- contrib/byacc/test/btyacc/err_inherit4.tab.h | 2 +- contrib/byacc/test/btyacc/expr.oxout.tab.c | 2 +- contrib/byacc/test/btyacc/expr.oxout.tab.h | 2 +- contrib/byacc/test/btyacc/inherit1.tab.c | 2 +- contrib/byacc/test/btyacc/inherit1.tab.h | 2 +- contrib/byacc/test/btyacc/inherit2.tab.c | 2 +- contrib/byacc/test/btyacc/inherit2.tab.h | 2 +- contrib/byacc/test/btyacc/ok_syntax1.tab.c | 4 +- contrib/byacc/test/btyacc/ok_syntax1.tab.h | 4 +- contrib/byacc/test/btyacc/varsyntax_calc1.tab.c | 2 +- contrib/byacc/test/btyacc/varsyntax_calc1.tab.h | 2 +- contrib/byacc/test/expr.oxout.h | 90 ++ contrib/byacc/test/ok_syntax1.y | 2 +- contrib/byacc/test/yacc/calc1.tab.c | 2 +- contrib/byacc/test/yacc/calc1.tab.h | 2 +- contrib/byacc/test/yacc/expr.oxout.tab.c | 2 +- contrib/byacc/test/yacc/expr.oxout.tab.h | 2 +- contrib/byacc/test/yacc/ok_syntax1.tab.c | 4 +- contrib/byacc/test/yacc/ok_syntax1.tab.h | 4 +- contrib/byacc/test/yacc/varsyntax_calc1.tab.c | 2 +- contrib/byacc/test/yacc/varsyntax_calc1.tab.h | 2 +- contrib/byacc/yacc.1 | 57 +- 64 files changed, 2096 insertions(+), 1825 deletions(-) diff --cc contrib/byacc/LICENSE index 000000000000,c21f9f78a6db..c21f9f78a6db mode 000000,100644..100644 --- a/contrib/byacc/LICENSE +++ b/contrib/byacc/LICENSE diff --cc contrib/byacc/test/btyacc/calc1.tab.c index cc40060143b9,000000000000..54d7014a4b27 mode 100644,000000..100644 --- a/contrib/byacc/test/btyacc/calc1.tab.c +++ b/contrib/byacc/test/btyacc/calc1.tab.c @@@ -1,1746 -1,0 +1,1746 @@@ +/* original parser id follows */ +/* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */ +/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ + +#define YYBYACC 1 +#define YYMAJOR 2 +#define YYMINOR 0 +#define YYCHECK "yyyymmdd" + +#define YYEMPTY (-1) +#define yyclearin (yychar = YYEMPTY) +#define yyerrok (yyerrflag = 0) +#define YYRECOVERING() (yyerrflag != 0) +#define YYENOMEM (-2) +#define YYEOF 0 +#undef YYBTYACC +#define YYBTYACC 0 +#define YYDEBUGSTR YYPREFIX "debug" + +#ifndef yyparse +#define yyparse calc1_parse +#endif /* yyparse */ + +#ifndef yylex +#define yylex calc1_lex +#endif /* yylex */ + +#ifndef yyerror +#define yyerror calc1_error +#endif /* yyerror */ + +#ifndef yychar +#define yychar calc1_char +#endif /* yychar */ + +#ifndef yyval +#define yyval calc1_val +#endif /* yyval */ + +#ifndef yylval +#define yylval calc1_lval +#endif /* yylval */ + +#ifndef yydebug +#define yydebug calc1_debug +#endif /* yydebug */ + +#ifndef yynerrs +#define yynerrs calc1_nerrs +#endif /* yynerrs */ + +#ifndef yyerrflag +#define yyerrflag calc1_errflag +#endif /* yyerrflag */ + +#ifndef yylhs +#define yylhs calc1_lhs +#endif /* yylhs */ + +#ifndef yylen +#define yylen calc1_len +#endif /* yylen */ + +#ifndef yydefred +#define yydefred calc1_defred +#endif /* yydefred */ + +#ifndef yystos +#define yystos calc1_stos +#endif /* yystos */ + +#ifndef yydgoto +#define yydgoto calc1_dgoto +#endif /* yydgoto */ + +#ifndef yysindex +#define yysindex calc1_sindex +#endif /* yysindex */ + +#ifndef yyrindex +#define yyrindex calc1_rindex +#endif /* yyrindex */ + +#ifndef yygindex +#define yygindex calc1_gindex +#endif /* yygindex */ + +#ifndef yytable +#define yytable calc1_table +#endif /* yytable */ + +#ifndef yycheck +#define yycheck calc1_check +#endif /* yycheck */ + +#ifndef yyname +#define yyname calc1_name +#endif /* yyname */ + +#ifndef yyrule +#define yyrule calc1_rule +#endif /* yyrule */ + +#if YYBTYACC + +#ifndef yycindex +#define yycindex calc1_cindex +#endif /* yycindex */ + +#ifndef yyctable +#define yyctable calc1_ctable +#endif /* yyctable */ + +#endif /* YYBTYACC */ + +#define YYPREFIX "calc1_" + +#define YYPURE 0 + +#line 2 "calc1.y" + +/* http://dinosaur.compilertools.net/yacc/index.html */ + +#include +#include +#include +#include + +typedef struct interval +{ + double lo, hi; +} +INTERVAL; + +INTERVAL vmul(double, double, INTERVAL); +INTERVAL vdiv(double, double, INTERVAL); + +extern int yylex(void); +static void yyerror(const char *s); + +int dcheck(INTERVAL); + +double dreg[26]; +INTERVAL vreg[26]; + +#ifdef YYSTYPE +#undef YYSTYPE_IS_DECLARED +#define YYSTYPE_IS_DECLARED 1 +#endif +#ifndef YYSTYPE_IS_DECLARED +#define YYSTYPE_IS_DECLARED 1 +#line 31 "calc1.y" - typedef union ++typedef union YYSTYPE +{ + int ival; + double dval; + INTERVAL vval; +} YYSTYPE; +#endif /* !YYSTYPE_IS_DECLARED */ +#line 161 "calc1.tab.c" + +/* compatibility with bison */ +#ifdef YYPARSE_PARAM +/* compatibility with FreeBSD */ +# ifdef YYPARSE_PARAM_TYPE +# define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM) +# else +# define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM) +# endif +#else +# define YYPARSE_DECL() yyparse(void) +#endif + +/* Parameters sent to lex. */ +#ifdef YYLEX_PARAM +# define YYLEX_DECL() yylex(void *YYLEX_PARAM) +# define YYLEX yylex(YYLEX_PARAM) +#else +# define YYLEX_DECL() yylex(void) +# define YYLEX yylex() +#endif + +/* Parameters sent to yyerror. */ +#ifndef YYERROR_DECL +#define YYERROR_DECL() yyerror(const char *s) +#endif +#ifndef YYERROR_CALL +#define YYERROR_CALL(msg) yyerror(msg) +#endif + +extern int YYPARSE_DECL(); + +#define DREG 257 +#define VREG 258 +#define CONST 259 +#define UMINUS 260 +#define YYERRCODE 256 +typedef int YYINT; +static const YYINT calc1_lhs[] = { -1, + 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, +}; +static const YYINT calc1_len[] = { 2, + 0, 2, 2, 2, 4, 4, 2, 1, 1, 3, + 3, 3, 3, 2, 3, 1, 5, 1, 3, 3, + 3, 3, 3, 3, 3, 3, 2, 3, +}; +static const YYINT calc1_defred[] = { 0, + 0, 0, 0, 8, 0, 0, 0, 0, 0, 7, + 0, 0, 9, 18, 14, 27, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, + 0, 0, 0, 15, 0, 28, 0, 0, 0, 0, + 12, 24, 13, 26, 0, 0, 23, 25, 14, 0, + 0, 0, 0, 0, 5, 6, 0, 0, 0, 12, + 13, 17, +}; +#if defined(YYDESTRUCT_CALL) || defined(YYSTYPE_TOSTRING) +static const YYINT calc1_stos[] = { 0, + 256, 257, 258, 259, 45, 40, 262, 263, 264, 10, + 61, 61, 257, 258, 263, 264, 263, 264, 43, 45, + 42, 47, 10, 43, 45, 42, 47, 10, 45, 40, + 263, 263, 264, 41, 44, 41, 263, 264, 263, 264, + 263, 264, 263, 264, 264, 264, 264, 264, 263, 263, + 43, 45, 42, 47, 10, 10, 263, 263, 263, 263, + 263, 41, +}; +#endif /* YYDESTRUCT_CALL || YYSTYPE_TOSTRING */ +static const YYINT calc1_dgoto[] = { 7, + 32, 9, 0, +}; +static const YYINT calc1_sindex[] = { -40, + -8, -48, -47, 0, -37, -37, 0, 2, 17, 0, + -34, -37, 0, 0, 0, 0, -25, 90, -37, -37, + -37, -37, 0, -37, -37, -37, -37, 0, -34, -34, + 25, 125, 31, 0, -34, 0, -11, 37, -11, 37, + 0, 0, 0, 0, 37, 37, 0, 0, 0, 111, + -34, -34, -34, -34, 0, 0, 118, 69, 69, 0, + 0, 0, +}; +static const YYINT calc1_rindex[] = { 0, + 0, 38, 44, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, -9, 0, 0, 0, 0, 51, -3, 56, 61, + 0, 0, 0, 0, 67, 72, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 78, 83, 0, + 0, 0, +}; +#if YYBTYACC +static const YYINT calc1_cindex[] = { 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, +}; +#endif +static const YYINT calc1_gindex[] = { 0, + 4, 124, 0, +}; +#define YYTABLESIZE 225 +static const YYINT calc1_table[] = { 6, + 16, 10, 6, 8, 5, 30, 20, 5, 15, 17, + 29, 23, 11, 12, 31, 34, 21, 19, 35, 20, + 0, 22, 37, 39, 41, 43, 28, 0, 0, 0, + 21, 16, 49, 50, 55, 22, 0, 20, 57, 20, + 56, 20, 0, 21, 19, 0, 20, 9, 22, 0, + 0, 0, 0, 18, 58, 59, 60, 61, 26, 24, + 10, 25, 0, 27, 0, 11, 53, 51, 0, 52, + 22, 54, 26, 24, 0, 25, 19, 27, 26, 9, + 9, 21, 9, 27, 9, 18, 18, 10, 18, 0, + 18, 10, 11, 10, 10, 10, 11, 0, 11, 11, + 11, 22, 0, 22, 0, 22, 0, 19, 0, 19, + 53, 19, 21, 0, 21, 54, 21, 0, 10, 0, + 10, 0, 10, 11, 0, 11, 0, 11, 16, 18, + 36, 26, 24, 0, 25, 33, 27, 0, 0, 0, + 0, 0, 38, 40, 42, 44, 0, 45, 46, 47, + 48, 34, 53, 51, 0, 52, 0, 54, 62, 53, + 51, 0, 52, 0, 54, 0, 21, 19, 0, 20, + 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 3, 4, 13, + 14, 4, 13, 0, 4, +}; +static const YYINT calc1_check[] = { 40, + 10, 10, 40, 0, 45, 40, 10, 45, 5, 6, + 45, 10, 61, 61, 11, 41, 42, 43, 44, 45, + -1, 47, 19, 20, 21, 22, 10, -1, -1, -1, + 42, 41, 29, 30, 10, 47, -1, 41, 35, 43, + 10, 45, -1, 42, 43, -1, 45, 10, 47, -1, + -1, -1, -1, 10, 51, 52, 53, 54, 42, 43, + 10, 45, -1, 47, -1, 10, 42, 43, -1, 45, + 10, 47, 42, 43, -1, 45, 10, 47, 42, 42, + 43, 10, 45, 47, 47, 42, 43, 10, 45, -1, + 47, 41, 10, 43, 44, 45, 41, -1, 43, 44, + 45, 41, -1, 43, -1, 45, -1, 41, -1, 43, + 42, 45, 41, -1, 43, 47, 45, -1, 41, -1, + 43, -1, 45, 41, -1, 43, -1, 45, 5, 6, + 41, 42, 43, -1, 45, 12, 47, -1, -1, -1, + -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, + 27, 41, 42, 43, -1, 45, -1, 47, 41, 42, + 43, -1, 45, -1, 47, -1, 42, 43, -1, 45, + -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 256, 257, 258, 259, 257, + 258, 259, 257, -1, 259, +}; +#if YYBTYACC +static const YYINT calc1_ctable[] = { -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, +}; +#endif +#define YYFINAL 7 +#ifndef YYDEBUG +#define YYDEBUG 0 +#endif +#define YYMAXTOKEN 260 +#define YYUNDFTOKEN 266 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) +#if YYDEBUG +static const char *const calc1_name[] = { + +"$end",0,0,0,0,0,0,0,0,0,"'\\n'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,"'('","')'","'*'","'+'","','","'-'",0,"'/'",0,0,0,0,0,0,0,0,0,0,0,0, +0,"'='",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +"error","DREG","VREG","CONST","UMINUS","$accept","line","dexp","vexp","lines", +"illegal-symbol", +}; +static const char *const calc1_rule[] = { +"$accept : line", +"lines :", +"lines : lines line", +"line : dexp '\\n'", +"line : vexp '\\n'", +"line : DREG '=' dexp '\\n'", +"line : VREG '=' vexp '\\n'", +"line : error '\\n'", +"dexp : CONST", +"dexp : DREG", +"dexp : dexp '+' dexp", +"dexp : dexp '-' dexp", +"dexp : dexp '*' dexp", +"dexp : dexp '/' dexp", +"dexp : '-' dexp", +"dexp : '(' dexp ')'", +"vexp : dexp", +"vexp : '(' dexp ',' dexp ')'", +"vexp : VREG", +"vexp : vexp '+' vexp", +"vexp : dexp '+' vexp", +"vexp : vexp '-' vexp", +"vexp : dexp '-' vexp", +"vexp : vexp '*' vexp", +"vexp : dexp '*' vexp", +"vexp : vexp '/' vexp", +"vexp : dexp '/' vexp", +"vexp : '-' vexp", +"vexp : '(' vexp ')'", + +}; +#endif + +#if YYDEBUG +int yydebug; +#endif + +int yyerrflag; +int yychar; +YYSTYPE yyval; +YYSTYPE yylval; +int yynerrs; + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) +YYLTYPE yyloc; /* position returned by actions */ +YYLTYPE yylloc; /* position from the lexer */ +#endif + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) +#ifndef YYLLOC_DEFAULT +#define YYLLOC_DEFAULT(loc, rhs, n) \ +do \ +{ \ + if (n == 0) \ + { \ + (loc).first_line = YYRHSLOC(rhs, 0).last_line; \ + (loc).first_column = YYRHSLOC(rhs, 0).last_column; \ + (loc).last_line = YYRHSLOC(rhs, 0).last_line; \ + (loc).last_column = YYRHSLOC(rhs, 0).last_column; \ + } \ + else \ + { \ + (loc).first_line = YYRHSLOC(rhs, 1).first_line; \ + (loc).first_column = YYRHSLOC(rhs, 1).first_column; \ + (loc).last_line = YYRHSLOC(rhs, n).last_line; \ + (loc).last_column = YYRHSLOC(rhs, n).last_column; \ + } \ +} while (0) +#endif /* YYLLOC_DEFAULT */ +#endif /* defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) */ +#if YYBTYACC + +#ifndef YYLVQUEUEGROWTH +#define YYLVQUEUEGROWTH 32 +#endif +#endif /* YYBTYACC */ + +/* define the initial stack-sizes */ +#ifdef YYSTACKSIZE +#undef YYMAXDEPTH +#define YYMAXDEPTH YYSTACKSIZE +#else +#ifdef YYMAXDEPTH +#define YYSTACKSIZE YYMAXDEPTH +#else +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 +#endif +#endif + +#ifndef YYINITSTACKSIZE +#define YYINITSTACKSIZE 200 +#endif + +typedef struct { + unsigned stacksize; + YYINT *s_base; + YYINT *s_mark; + YYINT *s_last; + YYSTYPE *l_base; + YYSTYPE *l_mark; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE *p_base; + YYLTYPE *p_mark; +#endif +} YYSTACKDATA; +#if YYBTYACC + +struct YYParseState_s +{ + struct YYParseState_s *save; /* Previously saved parser state */ + YYSTACKDATA yystack; /* saved parser stack */ + int state; /* saved parser state */ + int errflag; /* saved error recovery status */ + int lexeme; /* saved index of the conflict lexeme in the lexical queue */ + YYINT ctry; /* saved index in yyctable[] for this conflict */ +}; +typedef struct YYParseState_s YYParseState; +#endif /* YYBTYACC */ +/* variables for the parser stack */ +static YYSTACKDATA yystack; +#if YYBTYACC + +/* Current parser state */ +static YYParseState *yyps = 0; + +/* yypath != NULL: do the full parse, starting at *yypath parser state. */ +static YYParseState *yypath = 0; + +/* Base of the lexical value queue */ +static YYSTYPE *yylvals = 0; + +/* Current position at lexical value queue */ +static YYSTYPE *yylvp = 0; + +/* End position of lexical value queue */ +static YYSTYPE *yylve = 0; + +/* The last allocated position at the lexical value queue */ +static YYSTYPE *yylvlim = 0; + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) +/* Base of the lexical position queue */ +static YYLTYPE *yylpsns = 0; + +/* Current position at lexical position queue */ +static YYLTYPE *yylpp = 0; + +/* End position of lexical position queue */ +static YYLTYPE *yylpe = 0; + +/* The last allocated position at the lexical position queue */ +static YYLTYPE *yylplim = 0; +#endif + +/* Current position at lexical token queue */ +static YYINT *yylexp = 0; + +static YYINT *yylexemes = 0; +#endif /* YYBTYACC */ +#line 176 "calc1.y" + /* beginning of subroutines section */ + +#define BSZ 50 /* buffer size for floating point numbers */ + + /* lexical analysis */ + +static void +yyerror(const char *s) +{ + fprintf(stderr, "%s\n", s); +} + +int +yylex(void) +{ + int c; + + while ((c = getchar()) == ' ') + { /* skip over blanks */ + } + + if (isupper(c)) + { + yylval.ival = c - 'A'; + return (VREG); + } + if (islower(c)) + { + yylval.ival = c - 'a'; + return (DREG); + } + + if (isdigit(c) || c == '.') + { + /* gobble up digits, points, exponents */ + char buf[BSZ + 1], *cp = buf; + int dot = 0, expr = 0; + + for (; (cp - buf) < BSZ; ++cp, c = getchar()) + { + + *cp = (char) c; + if (isdigit(c)) + continue; + if (c == '.') + { + if (dot++ || expr) + return ('.'); /* will cause syntax error */ + continue; + } + + if (c == 'e') + { + if (expr++) + return ('e'); /* will cause syntax error */ + continue; + } + + /* end of number */ + break; + } + *cp = '\0'; + + if ((cp - buf) >= BSZ) + printf("constant too long: truncated\n"); + else + ungetc(c, stdin); /* push back last char read */ + yylval.dval = atof(buf); + return (CONST); + } + return (c); +} + +static INTERVAL +hilo(double a, double b, double c, double d) +{ + /* returns the smallest interval containing a, b, c, and d */ + /* used by *, / routines */ + INTERVAL v; + + if (a > b) + { + v.hi = a; + v.lo = b; + } + else + { + v.hi = b; + v.lo = a; + } + + if (c > d) + { + if (c > v.hi) + v.hi = c; + if (d < v.lo) + v.lo = d; + } + else + { + if (d > v.hi) + v.hi = d; + if (c < v.lo) + v.lo = c; + } + return (v); +} + +INTERVAL +vmul(double a, double b, INTERVAL v) +{ + return (hilo(a * v.hi, a * v.lo, b * v.hi, b * v.lo)); +} + +int +dcheck(INTERVAL v) +{ + if (v.hi >= 0. && v.lo <= 0.) + { + printf("divisor interval contains 0.\n"); + return (1); + } + return (0); +} + +INTERVAL +vdiv(double a, double b, INTERVAL v) +{ + return (hilo(a / v.hi, a / v.lo, b / v.hi, b / v.lo)); +} +#line 655 "calc1.tab.c" + +/* For use in generated program */ +#define yydepth (int)(yystack.s_mark - yystack.s_base) +#if YYBTYACC +#define yytrial (yyps->save) +#endif /* YYBTYACC */ + +#if YYDEBUG +#include /* needed for printf */ +#endif + +#include /* needed for malloc, etc */ +#include /* needed for memset */ + +/* allocate initial stack or double stack size, up to YYMAXDEPTH */ +static int yygrowstack(YYSTACKDATA *data) +{ + int i; + unsigned newsize; + YYINT *newss; + YYSTYPE *newvs; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE *newps; +#endif + + if ((newsize = data->stacksize) == 0) + newsize = YYINITSTACKSIZE; + else if (newsize >= YYMAXDEPTH) + return YYENOMEM; + else if ((newsize *= 2) > YYMAXDEPTH) + newsize = YYMAXDEPTH; + + i = (int) (data->s_mark - data->s_base); + newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss)); + if (newss == NULL) + return YYENOMEM; + + data->s_base = newss; + data->s_mark = newss + i; + + newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs)); + if (newvs == NULL) + return YYENOMEM; + + data->l_base = newvs; + data->l_mark = newvs + i; + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + newps = (YYLTYPE *)realloc(data->p_base, newsize * sizeof(*newps)); + if (newps == NULL) + return YYENOMEM; + + data->p_base = newps; + data->p_mark = newps + i; +#endif + + data->stacksize = newsize; + data->s_last = data->s_base + newsize - 1; + +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%sdebug: stack size increased to %d\n", YYPREFIX, newsize); +#endif + return 0; +} + +#if YYPURE || defined(YY_NO_LEAKS) +static void yyfreestack(YYSTACKDATA *data) +{ + free(data->s_base); + free(data->l_base); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + free(data->p_base); +#endif + memset(data, 0, sizeof(*data)); +} +#else +#define yyfreestack(data) /* nothing */ +#endif /* YYPURE || defined(YY_NO_LEAKS) */ +#if YYBTYACC + +static YYParseState * +yyNewState(unsigned size) +{ + YYParseState *p = (YYParseState *) malloc(sizeof(YYParseState)); + if (p == NULL) return NULL; + + p->yystack.stacksize = size; + if (size == 0) + { + p->yystack.s_base = NULL; + p->yystack.l_base = NULL; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + p->yystack.p_base = NULL; +#endif + return p; + } + p->yystack.s_base = (YYINT *) malloc(size * sizeof(YYINT)); + if (p->yystack.s_base == NULL) return NULL; + p->yystack.l_base = (YYSTYPE *) malloc(size * sizeof(YYSTYPE)); + if (p->yystack.l_base == NULL) return NULL; + memset(p->yystack.l_base, 0, size * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + p->yystack.p_base = (YYLTYPE *) malloc(size * sizeof(YYLTYPE)); + if (p->yystack.p_base == NULL) return NULL; + memset(p->yystack.p_base, 0, size * sizeof(YYLTYPE)); +#endif + + return p; +} + +static void +yyFreeState(YYParseState *p) +{ + yyfreestack(&p->yystack); + free(p); +} +#endif /* YYBTYACC */ + +#define YYABORT goto yyabort +#define YYREJECT goto yyabort +#define YYACCEPT goto yyaccept +#define YYERROR goto yyerrlab +#if YYBTYACC +#define YYVALID do { if (yyps->save) goto yyvalid; } while(0) +#define YYVALID_NESTED do { if (yyps->save && \ + yyps->save->save == 0) goto yyvalid; } while(0) +#endif /* YYBTYACC */ + +int +YYPARSE_DECL() +{ + int yym, yyn, yystate, yyresult; +#if YYBTYACC + int yynewerrflag; + YYParseState *yyerrctx = NULL; +#endif /* YYBTYACC */ +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE yyerror_loc_range[3]; /* position of error start/end (0 unused) */ +#endif +#if YYDEBUG + const char *yys; + + if ((yys = getenv("YYDEBUG")) != NULL) + { + yyn = *yys; + if (yyn >= '0' && yyn <= '9') + yydebug = yyn - '0'; + } + if (yydebug) + fprintf(stderr, "%sdebug[<# of symbols on state stack>]\n", YYPREFIX); +#endif +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + memset(yyerror_loc_range, 0, sizeof(yyerror_loc_range)); +#endif + +#if YYBTYACC + yyps = yyNewState(0); if (yyps == 0) goto yyenomem; + yyps->save = 0; +#endif /* YYBTYACC */ + yym = 0; + /* yyn is set below */ + yynerrs = 0; + yyerrflag = 0; + yychar = YYEMPTY; + yystate = 0; + +#if YYPURE + memset(&yystack, 0, sizeof(yystack)); +#endif + + if (yystack.s_base == NULL && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; + yystack.s_mark = yystack.s_base; + yystack.l_mark = yystack.l_base; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark = yystack.p_base; +#endif + yystate = 0; + *yystack.s_mark = 0; + +yyloop: + if ((yyn = yydefred[yystate]) != 0) goto yyreduce; + if (yychar < 0) + { +#if YYBTYACC + do { + if (yylvp < yylve) + { + /* we're currently re-reading tokens */ + yylval = *yylvp++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylloc = *yylpp++; +#endif + yychar = *yylexp++; + break; + } + if (yyps->save) + { + /* in trial mode; save scanner results for future parse attempts */ + if (yylvp == yylvlim) + { /* Enlarge lexical value queue */ + size_t p = (size_t) (yylvp - yylvals); + size_t s = (size_t) (yylvlim - yylvals); + + s += YYLVQUEUEGROWTH; + if ((yylexemes = (YYINT *)realloc(yylexemes, s * sizeof(YYINT))) == NULL) goto yyenomem; + if ((yylvals = (YYSTYPE *)realloc(yylvals, s * sizeof(YYSTYPE))) == NULL) goto yyenomem; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + if ((yylpsns = (YYLTYPE *)realloc(yylpsns, s * sizeof(YYLTYPE))) == NULL) goto yyenomem; +#endif + yylvp = yylve = yylvals + p; + yylvlim = yylvals + s; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpe = yylpsns + p; + yylplim = yylpsns + s; +#endif + yylexp = yylexemes + p; + } + *yylexp = (YYINT) YYLEX; + *yylvp++ = yylval; + yylve++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *yylpp++ = yylloc; + yylpe++; +#endif + yychar = *yylexp++; + break; + } + /* normal operation, no conflict encountered */ +#endif /* YYBTYACC */ + yychar = YYLEX; +#if YYBTYACC + } while (0); +#endif /* YYBTYACC */ + if (yychar < 0) yychar = YYEOF; +#if YYDEBUG + if (yydebug) + { + if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN]; + fprintf(stderr, "%s[%d]: state %d, reading token %d (%s)", + YYDEBUGSTR, yydepth, yystate, yychar, yys); +#ifdef YYSTYPE_TOSTRING *** 11534 LINES SKIPPED *** From nobody Thu Jun 20 13:12:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4grk5y7cz5Nm0m; Thu, 20 Jun 2024 13:12: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 4W4grk39mDz4TMw; Thu, 20 Jun 2024 13:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718889158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DvReoF2hLv6VOv1VHTNUZzuQgMi6UMuncmiq7yjneic=; b=eBuM8lhlXBm2rz/rer6uTFBq3MI7FBIKgnjKP6EJkhB+/UpzEpDiZVcfGz54lr6+gLMmKZ +lJXutNPp6LMwwA/+9lWKwjnFzDU81KzmR4T+38x8iyW8egoyzvGMimj3Z/JbvnliauFNO pEPN5jFx3U9ajOcfshOseMs0Ntcu7cK/TUISvDCrifXL+mkVMftfHBuVwXsDQC6YhZtrUP goWEcirU7vnKF83X+9NKxrpGfLXZtdwEiKmR6B6lTVxn9BaLdtzvP45t+WPjntwRB0qXr7 ylmec6dqhljyNt6UlvWHytQBvHbzuhVtJgXPUGb+0LP6FBkvcbhgova6CHjsVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718889158; a=rsa-sha256; cv=none; b=jOxlSrpNA0JXDC6zgpxYqEFYSsavjlCLmke+6nFkIcbR2xJaLBtqYuovHGLkrfyJqxxn5l ki8ARSyKrxkGtvTywoBfbhyimQiQGDkRgCBfbOvferGp9LmKFNEaYiuy7mkUnhZIojE0Qn v7aQ/34EQ0J/GpcwACLCiIXCTEfPhft3MkeyExdElPHnwLvvoLFfnGx6No8GCPPl4ia5mD vMQD7aMqQ21cvPkwOMxA3kV2rc1mL60rbG6za9QCN/3xpxjtqK4FwTXC6HO9eII2iiFaUv fvoRlJhG4GYLgMcSn8aiJE0amn9AnZWV7Z7wJ06gxA0dw9dBErSHwYSCw9O4IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718889158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DvReoF2hLv6VOv1VHTNUZzuQgMi6UMuncmiq7yjneic=; b=qolXyG9TLZ/jg/EJoriRUbzJ5PhjqO9WHlKkSexSDIA38ZTtTVLjqRr/NfJMvj3imahj7S BY7wFxQgiB4c/B2a5Nq3ykKfKIObF7e4K1laXh2NHZHaeZ47VSmRVc/3Aqd9ZHzOtc9azd IOEIgIHSD5SpIeE+FNHLcP0K9HPu5dFnNG+kdPqPZmQvjBXVjG9DyW8LpRsquwS/7R0WG1 RNDhn56NSewU8GWMwuO2QAntiv7cr5rDeiE6u0ckOM3uV9M2xgWS9JEaMPcxVR0E6PH3Xw ve5/PSvEIsiBe1ctcOSEmufI2TaovG8uEWM1Qzm1yUzVCWy7fP+ViHpBYV3MTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4grk2p37zQnn; Thu, 20 Jun 2024 13:12: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 45KDCcHE092293; Thu, 20 Jun 2024 13:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KDCcFk092290; Thu, 20 Jun 2024 13:12:38 GMT (envelope-from git) Date: Thu, 20 Jun 2024 13:12:38 GMT Message-Id: <202406201312.45KDCcFk092290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 35e941ce5520 - main - systat: fix build with newer ncurses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35e941ce5520b8ef710bb388bd63460aa0ce63eb Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=35e941ce5520b8ef710bb388bd63460aa0ce63eb commit 35e941ce5520b8ef710bb388bd63460aa0ce63eb Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:10:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 13:10:38 +0000 systat: fix build with newer ncurses --- usr.bin/systat/netcmds.c | 2 +- usr.bin/systat/sctp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c index 5b6cb2163b7b..c0bbda7dee8a 100644 --- a/usr.bin/systat/netcmds.c +++ b/usr.bin/systat/netcmds.c @@ -245,7 +245,7 @@ showports(void) if (sp) printw("%s ", sp->s_name); else - printw("%d ", p->port); + printw("%ld ", p->port); } } diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c index abe4d0e68e04..26abbec68da8 100644 --- a/usr.bin/systat/sctp.c +++ b/usr.bin/systat/sctp.c @@ -276,7 +276,7 @@ showsctp(void) domode(&stats); #define DO(stat, row, col) \ - mvwprintw(wnd, row, col, "%12lu", stats.stat) + mvwprintw(wnd, row, col, "%12u", stats.stat) #define L(row, stat) DO(stat, row, 0) #define R(row, stat) DO(stat, row, 38) L(1, sctps_activeestab); R(1, sctps_outpackets); From nobody Thu Jun 20 13:34:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hLT64NCz5NnpG; Thu, 20 Jun 2024 13:34:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4hLT40bTz4WG6; Thu, 20 Jun 2024 13:34:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id KD0FswFx1drxEKHwGs4LD2; Thu, 20 Jun 2024 13:34:56 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id KHwEsphNbWhyfKHwFsFHwP; Thu, 20 Jun 2024 13:34:56 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=MenPuI/f c=1 sm=1 tr=0 ts=66743000 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=YSi0mlixrwkpaqcZTZsA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 5A90F9C7; Thu, 20 Jun 2024 06:34:54 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 24C13193; Thu, 20 Jun 2024 06:34:54 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Baptiste Daroussin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 35e941ce5520 - main - systat: fix build with newer ncurses In-reply-to: <202406201312.45KDCcFk092290@gitrepo.freebsd.org> References: <202406201312.45KDCcFk092290@gitrepo.freebsd.org> Comments: In-reply-to Baptiste Daroussin message dated "Thu, 20 Jun 2024 13:12:38 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 20 Jun 2024 06:34:54 -0700 Message-Id: <20240620133454.24C13193@slippy.cwsent.com> X-CMAE-Envelope: MS4xfCOndXIb7zkW6EQvGeMH+8mmV1S9H4xtlVB3RFyG9/ct0nrNF4C+pt+Kx3G4lmvpEEsWm3iABmPtMW04nIOShNhrDogdve+ejeoFyELJRtCmiGVWuoU4 D8ozfa8sRb9w37U7DdLT6DVvQreqt+r+4lYVRv/VdhFy0F5O6h4EO0RQ33f6Gcy96uteEarAFQtvhiqvpTjB4iGscb2gQyRMYvzY4KHw+rVVMRi51ujtVVhv 7ApsDFsKjHNuJ1PwtGcsaUjgxeY5d5mHqZdsYz7a5WjQO66OiYLWhifHQ9zFG5wHIEFoW3LP6exKKjNBbR8ji6BUBqQmOJSWSDJ15X2Va/c= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4W4hLT40bTz4WG6 In message <202406201312.45KDCcFk092290@gitrepo.freebsd.org>, Baptiste Daroussi n writes: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=35e941ce5520b8ef710bb388bd63460a > a0ce63eb > > commit 35e941ce5520b8ef710bb388bd63460aa0ce63eb > Author: Baptiste Daroussin > AuthorDate: 2024-06-20 13:10:38 +0000 > Commit: Baptiste Daroussin > CommitDate: 2024-06-20 13:10:38 +0000 > > systat: fix build with newer ncurses > --- > usr.bin/systat/netcmds.c | 2 +- > usr.bin/systat/sctp.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c > index 5b6cb2163b7b..c0bbda7dee8a 100644 > --- a/usr.bin/systat/netcmds.c > +++ b/usr.bin/systat/netcmds.c > @@ -245,7 +245,7 @@ showports(void) > if (sp) > printw("%s ", sp->s_name); > else > - printw("%d ", p->port); > + printw("%ld ", p->port); > } > } > > diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c > index abe4d0e68e04..26abbec68da8 100644 > --- a/usr.bin/systat/sctp.c > +++ b/usr.bin/systat/sctp.c > @@ -276,7 +276,7 @@ showsctp(void) > domode(&stats); > > #define DO(stat, row, col) \ > - mvwprintw(wnd, row, col, "%12lu", stats.stat) > + mvwprintw(wnd, row, col, "%12u", stats.stat) > #define L(row, stat) DO(stat, row, 0) > #define R(row, stat) DO(stat, row, 38) > L(1, sctps_activeestab); R(1, sctps_outpackets); > I'm still getting errors. This time in ee. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jun 20 13:35:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hMG28p4z5NpBl; Thu, 20 Jun 2024 13:35: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 4W4hMF61vMz4WYT; Thu, 20 Jun 2024 13:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718890537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2m/zxCFhFSNA9wHBfbEMY/+eHddcYgUQ0UD0J6hMMYE=; b=Dob0f55fFm/Gbp5fDCsCUhuMe08zC+BXKaWL2R4ylmtXAilzFrTdSZK/MQCD6lcxvhBG+y QMEGQlAZCs+O/ALKiQaVTjk3egoD7LhaC2tB6elePaPNGHhkVeDFp3o9y7AZaGpDFZ30SQ 3yG9ONFKYAV4nI+bpf5uKqtwfKZHsfv9dPgROD8qIlUisEcUqoFu71/fmWlxjQzMpSmrwL 2jgTv0ErUjMYW5dF9lj47W0qvfSjfv/PPCRr7RexjVU20+DMcgmd8p6NM5qzR+cUuGFQgu NCDBvY1moy4t3bXxnc6vcTK2dpCn75BFDJuxW2Azal9adzJYHJoUo0tVApH/DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718890537; a=rsa-sha256; cv=none; b=UMC3UnGR79tuXHsd3rSqoBEV29P0dMHa6rkrjXerJTwd5sgmgamLRy8mdE3ZV/mfeS7eeJ BRQ9j+bvmh12wOcFPQ2aV1Amgj2/Db3NwRPJGXmBQLld1ieK6ozBs8qYFu3sw1ELq1fLrp n/DCbsJf5WKhxERhSMDILjaICIvmqdVQuJI8YEsMqC3v+8NaYCTA/YzId8XR4xhGKuUwH9 ZmfDxsEPgXvmSqyw11oJ2NSaqjmCd/6LAtmzb9Xsmg1mWga/kryhiQWBmZI6PaIujG127/ E9+ohfwzjmiq4TCG1VIqO9xMQtQxHist/fVB0kdx+rKERheCXyh/qrsTcBG/sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718890537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2m/zxCFhFSNA9wHBfbEMY/+eHddcYgUQ0UD0J6hMMYE=; b=pYFwrzTIYQRzCeMfuSI4c7sXbfHPCSVvhYuv1EnrlKX4BH4NDtsh79TFfZD7vtD4aIWQHe SOt+tz00EmXfT54hDxJ2xPqBXimY3vUu2ALaW5cG25yIp/aqvIaTPo0nW3dNHnWrmam+2q g65REsFQDESN0cjT/e32l0HKgFOaOI5JT+XgJM4c7z011PPiXA3cd5MJDGkEbmPqqw/SP7 bWZxUVtmRqm2eu/94wekq0TCehwUaC7iw2d/CApOtWz3TukkBnGzCvtmHf6Wg/ynCprv36 k476sFmJXHnCIFfCnKiYsvpkQpwNw9qdLvYOg281N3ywb0/e9S8UCUIVj8MT0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4hMF5dJfzRjg; Thu, 20 Jun 2024 13:35: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 45KDZbH3026320; Thu, 20 Jun 2024 13:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KDZb4J026317; Thu, 20 Jun 2024 13:35:37 GMT (envelope-from git) Date: Thu, 20 Jun 2024 13:35:37 GMT Message-Id: <202406201335.45KDZb4J026317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8d9900a31359 - main - ncurses: readd 2 html files in the doc (fix MK_HTML=yes) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d9900a313593adeeaae295b4aea982cb14cb8a5 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8d9900a313593adeeaae295b4aea982cb14cb8a5 commit 8d9900a313593adeeaae295b4aea982cb14cb8a5 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:33:23 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 13:34:17 +0000 ncurses: readd 2 html files in the doc (fix MK_HTML=yes) Reported by: Michael Butler --- contrib/ncurses/doc/html/hackguide.html | 962 ++++++++ contrib/ncurses/doc/html/ncurses-intro.html | 3390 +++++++++++++++++++++++++++ 2 files changed, 4352 insertions(+) diff --git a/contrib/ncurses/doc/html/hackguide.html b/contrib/ncurses/doc/html/hackguide.html new file mode 100644 index 000000000000..2b9445538dc8 --- /dev/null +++ b/contrib/ncurses/doc/html/hackguide.html @@ -0,0 +1,962 @@ + + + + + + A Hacker's Guide to Ncurses Internals + + + + +

A Hacker's Guide to NCURSES

+ +

A Hacker's Guide to NCURSES

+ +
+

Contents

+ + +
+ +

Abstract

+ +

This document is a hacker's tour of the + ncurses library and utilities. It discusses + design philosophy, implementation methods, and the conventions + used for coding and documentation. It is recommended reading for + anyone who is interested in porting, extending or improving the + package.

+ +

Objective of the + Package

+ +

The objective of the ncurses package is to + provide a free software API for character-cell terminals and + terminal emulators with the following characteristics:

+ +
    +
  • Source-compatible with historical curses implementations + (including the original BSD curses and System V curses.
    • + +
  • Conformant with the XSI Curses standard issued as part of + XPG4 by X/Open.
    • + +
  • High-quality — stable and reliable code, wide + portability, good packaging, superior documentation.
    • + +
  • Featureful — should eliminate as much of the drudgery + of C interface programming as possible, freeing programmers to + think at a higher level of design.
    • +
+ +

These objectives are in priority order. So, for example, + source compatibility with older version must trump featurefulness + — we cannot add features if it means breaking the portion + of the API corresponding to historical curses versions.

+ +

Why System V Curses?

+ +

We used System V curses as a model, reverse-engineering their + API, in order to fulfill the first two objectives.

+ +

System V curses implementations can support BSD curses + programs with just a recompilation, so by capturing the System V + API we also capture BSD's.

+ +

More importantly for the future, the XSI Curses standard + issued by X/Open is explicitly and closely modeled on System V. + So conformance with System V took us most of the way to + base-level XSI conformance.

+ +

How to Design + Extensions

+ +

The third objective (standards conformance) requires that it + be easy to condition source code using ncurses + so that the absence of nonstandard extensions does not break the + code.

+ +

Accordingly, we have a policy of associating with each + nonstandard extension a feature macro, so that ncurses client + code can use this macro to condition in or out the code that + requires the ncurses extension.

+ +

For example, there is a macro + NCURSES_MOUSE_VERSION which XSI Curses does not + define, but which is defined in the ncurses + library header. You can use this to condition the calls to the + mouse API calls.

+ +

Portability and + Configuration

+ +

Code written for ncurses may assume an + ANSI-standard C compiler and POSIX-compatible OS interface. It + may also assume the presence of a System-V-compatible + select(2) call.

+ +

We encourage (but do not require) developers to make the code + friendly to less-capable UNIX environments wherever possible.

+ +

We encourage developers to support OS-specific optimizations + and methods not available under POSIX/ANSI, provided only + that:

+ +
    +
  • All such code is properly conditioned so the build process + does not attempt to compile it under a plain ANSI/POSIX + environment.
    • + +
  • Adding such implementation methods does not introduce + incompatibilities in the ncurses API between + platforms.
    • +
+ +

We use GNU autoconf(1) as a tool to deal with + portability issues. The right way to leverage an OS-specific + feature is to modify the autoconf specification files + (configure.in and aclocal.m4) to set up a new feature macro, + which you then use to condition your code.

+ +

Documentation + Conventions

+ +

There are three kinds of documentation associated with this + package. Each has a different preferred format:

+ +
    +
  • Package-internal files (README, INSTALL, TO-DO etc.)
    • + +
  • Manual pages.
    • + +
  • Everything else (i.e., narrative documentation).
    • +
+ +

Our conventions are simple:

+ +
    +
  1. Maintain package-internal files in plain + text. The expected viewer for them is more(1) or + an editor window; there is no point in elaborate mark-up.
    2. + +
  2. Mark up manual pages in the man macros. + These have to be viewable through traditional man(1) + programs.
    3. + +
  3. Write everything else in HTML. +
    4. +
+ +

When in doubt, HTMLize a master and use lynx(1) to + generate plain ASCII (as we do for the announcement + document).

+ +

The reason for choosing HTML is that it is (a) well-adapted + for on-line browsing through viewers that are everywhere; (b) + more easily readable as plain text than most other mark-ups, if + you do not have a viewer; and (c) carries enough information that + you can generate a nice-looking printed version from it. Also, of + course, it make exporting things like the announcement document + to WWW pretty trivial.

+ +

How to Report Bugs

+ +

The reporting address for + bugs is bug-ncurses@gnu.org. This is a + majordomo list; to join, write to + bug-ncurses-request@gnu.org with a message + containing the line:

+ + 
+             subscribe <name>@<host.domain>
+
+

The ncurses code is maintained by a small group + of volunteers. While we try our best to fix bugs promptly, we + simply do not have a lot of hours to spend on elementary + hand-holding. We rely on intelligent cooperation from our users. + If you think you have found a bug in ncurses, there + are some steps you can take before contacting us that will help + get the bug fixed quickly.

+ +

In order to use our bug-fixing time efficiently, we put people + who show us they have taken these steps at the head of our queue. + This means that if you do not, you will probably end up at the + tail end and have to wait a while.

+ +
    +

  1. Develop a recipe to reproduce the bug. +

    Bugs we can reproduce are likely to be fixed very quickly, + often within days. The most effective single thing you can do + to get a quick fix is develop a way we can duplicate the bad + behavior — ideally, by giving us source for a small, + portable test program that breaks the library. (Even better + is a keystroke recipe using one of the test programs provided + with the distribution.)

    +
    2. + +

  2. Try to reproduce the bug on a different terminal type. +

    In our experience, most of the behaviors people report as + library bugs are actually due to subtle problems in terminal + descriptions. This is especially likely to be true if you are + using a traditional asynchronous terminal or PC-based + terminal emulator, rather than xterm or a UNIX console + entry.

    + +

    It is therefore extremely helpful if you can tell us + whether or not your problem reproduces on other terminal + types. Usually you will have both a console type and xterm + available; please tell us whether or not your bug reproduces + on both.

    + +

    If you have xterm available, it is also good to collect + xterm reports for different window sizes. This is especially + true if you normally use an unusual xterm window size — + a surprising number of the bugs we have seen are either + triggered or masked by these.

    +
    3. + +

  3. Generate and examine a trace file for the broken behavior. +

    Recompile your program with the debugging versions of the + libraries. Insert a trace() call with the + argument set to TRACE_UPDATE. (See "Writing Programs with + NCURSES" for details on trace levels.) Reproduce your + bug, then look at the trace file to see what the library was + actually doing.

    + +

    Another frequent cause of apparent bugs is application + coding errors that cause the wrong things to be put on the + virtual screen. Looking at the virtual-screen dumps in the + trace file will tell you immediately if this is happening, + and save you from the possible embarrassment of being told + that the bug is in your code and is your problem rather than + ours.

    + +

    If the virtual-screen dumps look correct but the bug + persists, it is possible to crank up the trace level to give + more and more information about the library's update actions + and the control sequences it issues to perform them. The test + directory of the distribution contains a tool for digesting + these logs to make them less tedious to wade through.

    + +

    Often you will find terminfo problems at this stage by + noticing that the escape sequences put out for various + capabilities are wrong. If not, you are likely to learn + enough to be able to characterize any bug in the + screen-update logic quite exactly.

    +
    4. + +

  4. Report details and symptoms, not just interpretations. +

    If you do the preceding two steps, it is very likely that + you will discover the nature of the problem yourself and be + able to send us a fix. This will create happy feelings all + around and earn you good karma for the first time you run + into a bug you really cannot characterize and fix + yourself.

    + +

    If you are still stuck, at least you will know what to + tell us. Remember, we need details. If you guess about what + is safe to leave out, you are too likely to be wrong.

    + +

    If your bug produces a bad update, include a trace file. + Try to make the trace at the least voluminous level + that pins down the bug. Logs that have been through + tracemunch are OK, it does not throw away any information + (actually they are better than un-munched ones because they + are easier to read).

    + +

    If your bug produces a core-dump, please include a + symbolic stack trace generated by gdb(1) or your local + equivalent.

    + +

    Tell us about every terminal on which you have reproduced + the bug — and every terminal on which you cannot. + Ideally, send us terminfo sources for all of these (yours + might differ from ours).

    + +

    Include your ncurses version and your OS/machine type, of + course! You can find your ncurses version in the + curses.h file.

    +
    5. +
+ +

If your problem smells like a logic error or in cursor + movement or scrolling or a bad capability, there are a couple of + tiny test frames for the library algorithms in the progs + directory that may help you isolate it. These are not part of the + normal build, but do have their own make productions.

+ +

The most important of these is mvcur, a test + frame for the cursor-movement optimization code. With this + program, you can see directly what control sequences will be + emitted for any given cursor movement or scroll/insert/delete + operations. If you think you have got a bad capability + identified, you can disable it and test again. The program is + command-driven and has on-line help.

+ +

If you think the vertical-scroll optimization is broken, or + just want to understand how it works better, build + hashmap and read the header comments of + hardscroll.c and hashmap.c; then try it + out. You can also test the hardware-scrolling optimization + separately with hardscroll.

+ +

A Tour of the Ncurses + Library

+ +

Library Overview

+ +

Most of the library is superstructure — fairly trivial + convenience interfaces to a small set of basic functions and data + structures used to manipulate the virtual screen (in particular, + none of this code does any I/O except through calls to more + fundamental modules described below). The files

+ +
+ lib_addch.c lib_bkgd.c lib_box.c lib_chgat.c lib_clear.c + lib_clearok.c lib_clrbot.c lib_clreol.c lib_colorset.c + lib_data.c lib_delch.c lib_delwin.c lib_echo.c lib_erase.c + lib_gen.c lib_getstr.c lib_hline.c lib_immedok.c lib_inchstr.c + lib_insch.c lib_insdel.c lib_insstr.c lib_instr.c + lib_isendwin.c lib_keyname.c lib_leaveok.c lib_move.c + lib_mvwin.c lib_overlay.c lib_pad.c lib_printw.c lib_redrawln.c + lib_scanw.c lib_screen.c lib_scroll.c lib_scrollok.c + lib_scrreg.c lib_set_term.c lib_slk.c lib_slkatr_set.c + lib_slkatrof.c lib_slkatron.c lib_slkatrset.c lib_slkattr.c + lib_slkclear.c lib_slkcolor.c lib_slkinit.c lib_slklab.c + lib_slkrefr.c lib_slkset.c lib_slktouch.c lib_touch.c + lib_unctrl.c lib_vline.c lib_wattroff.c lib_wattron.c + lib_window.c +
+ +

are all in this category. They are very unlikely to need + change, barring bugs or some fundamental reorganization in the + underlying data structures.

+ +

These files are used only for debugging support:

+ +
+ lib_trace.c lib_traceatr.c lib_tracebits.c lib_tracechr.c + lib_tracedmp.c lib_tracemse.c trace_buf.c +
+ +

It is rather unlikely you will ever need to change these, + unless you want to introduce a new debug trace level for some + reason.

+ +

There is another group of files that do direct I/O via + tputs(), computations on the terminal capabilities, or + queries to the OS environment, but nevertheless have only fairly + low complexity. These include:

+ +
+ lib_acs.c lib_beep.c lib_color.c lib_endwin.c + lib_initscr.c lib_longname.c lib_newterm.c lib_options.c + lib_termcap.c lib_ti.c lib_tparm.c lib_tputs.c lib_vidattr.c + read_entry.c. +
+ +

They are likely to need revision only if ncurses is being + ported to an environment without an underlying terminfo + capability representation.

+ +

These files have serious hooks into the tty driver and signal + facilities:

+ +
+ lib_kernel.c lib_baudrate.c lib_raw.c lib_tstp.c + lib_twait.c +
+ +

If you run into porting snafus moving the package to another + UNIX, the problem is likely to be in one of these files. The file + lib_print.c uses sleep(2) and also falls in this + category.

+ +

Almost all of the real work is done in the files

+ +
+ hardscroll.c hashmap.c lib_addch.c lib_doupdate.c + lib_getch.c lib_mouse.c lib_mvcur.c lib_refresh.c lib_setup.c + lib_vidattr.c +
+ +

Most of the algorithmic complexity in the library lives in + these files. If there is a real bug in ncurses + itself, it is probably here. We will tour some of these files in + detail below (see The Engine Room).

+ +

Finally, there is a group of files that is actually most of + the terminfo compiler. The reason this code lives in the + ncurses library is to support fallback to + /etc/termcap. These files include

+ +
+ alloc_entry.c captoinfo.c comp_captab.c comp_error.c + comp_hash.c comp_parse.c comp_scan.c parse_entry.c + read_termcap.c write_entry.c +
+ +

We will discuss these in the compiler tour.

+ +

The Engine Room

+ +

Keyboard Input

+ +

All ncurses input funnels through the function + wgetch(), defined in lib_getch.c. This + function is tricky; it has to poll for keyboard and mouse events + and do a running match of incoming input against the set of + defined special keys.

+ +

The central data structure in this module is a FIFO queue, + used to match multiple-character input sequences against + special-key capabilities; also to implement pushback via + ungetch().

+ +

The wgetch() code distinguishes between function + key sequences and the same sequences typed manually by doing a + timed wait after each input character that could lead a function + key sequence. If the entire sequence takes less than 1 second, it + is assumed to have been generated by a function key press.

+ +

Hackers bruised by previous encounters with variant + select(2) calls may find the code in + lib_twait.c interesting. It deals with the problem + that some BSD selects do not return a reliable time-left value. + The function timed_wait() effectively simulates a + System V select.

+ +

Mouse Events

+ +

If the mouse interface is active, wgetch() polls + for mouse events each call, before it goes to the keyboard for + input. It is up to lib_mouse.c how the polling is + accomplished; it may vary for different devices.

+ +

Under xterm, however, mouse event notifications come in via + the keyboard input stream. They are recognized by having the + kmous capability as a prefix. This is kind of + klugey, but trying to wire in recognition of a mouse key prefix + without going through the function-key machinery would be just + too painful, and this turns out to imply having the prefix + somewhere in the function-key capabilities at terminal-type + initialization.

+ +

This kluge only works because kmous is not + actually used by any historic terminal type or curses + implementation we know of. Best guess is it is a relic of some + forgotten experiment in-house at Bell Labs that did not leave any + traces in the publicly-distributed System V terminfo files. If + System V or XPG4 ever gets serious about using it again, this + kluge may have to change.

+ +

Here are some more details about mouse event handling:

+ +

The lib_mouse() code is logically split into a + lower level that accepts event reports in a device-dependent + format and an upper level that parses mouse gestures and filters + events. The mediating data structure is a circular queue of event + structures.

+ +

Functionally, the lower level's job is to pick up primitive + events and put them on the circular queue. This can happen in one + of two ways: either (a) _nc_mouse_event() detects a + series of incoming mouse reports and queues them, or (b) code in + lib_getch.c detects the kmous + prefix in the keyboard input stream and calls _nc_mouse_inline to + queue up a series of adjacent mouse reports.

+ +

In either case, _nc_mouse_parse() should be + called after the series is accepted to parse the digested mouse + reports (low-level events) into a gesture (a high-level or + composite event).

+ +

Output and Screen Updating

+ +

With the single exception of character echoes during a + wgetnstr() call (which simulates cooked-mode line + editing in an ncurses window), the library normally does all its + output at refresh time.

+ +

The main job is to go from the current state of the screen (as + represented in the curscr window structure) to the + desired new state (as represented in the newscr + window structure), while doing as little I/O as possible.

+ +

The brains of this operation are the modules + hashmap.c, hardscroll.c and + lib_doupdate.c; the latter two use + lib_mvcur.c. Essentially, what happens looks like + this:

+ +
    +
  • +

    The hashmap.c module tries to detect vertical + motion changes between the real and virtual screens. This + information is represented by the oldindex members in the + newscr structure. These are modified by vertical-motion and + clear operations, and both are re-initialized after each + update. To this change-journalling information, the hashmap + code adds deductions made using a modified Heckel algorithm + on hash values generated from the line contents.

    +
    • + +
  • +

    The hardscroll.c module computes an optimum + set of scroll, insertion, and deletion operations to make the + indices match. It calls _nc_mvcur_scrolln() in + lib_mvcur.c to do those motions.

    +
    • + +
  • +

    Then lib_doupdate.c goes to work. Its job is + to do line-by-line transformations of curscr + lines to newscr lines. Its main tool is the + routine mvcur() in lib_mvcur.c. + This routine does cursor-movement optimization, attempting to + get from given screen location A to given location B in the + fewest output characters possible.

    +
    • +
+ +

If you want to work on screen optimizations, you should use + the fact that (in the trace-enabled version of the library) + enabling the TRACE_TIMES trace level causes a report + to be emitted after each screen update giving the elapsed time + and a count of characters emitted during the update. You can use + this to tell when an update optimization improves efficiency.

+ +

In the trace-enabled version of the library, it is also + possible to disable and re-enable various optimizations at + runtime by tweaking the variable + _nc_optimize_enable. See the file + include/curses.h.in for mask values, near the + end.

+ +

The Forms and Menu Libraries

+ +

The forms and menu libraries should work reliably in any + environment you can port ncurses to. The only portability issue + anywhere in them is what flavor of regular expressions the + built-in form field type TYPE_REGEXP will recognize.

+ +

The configuration code prefers the POSIX regex facility, + modeled on System V's, but will settle for BSD regexps if the + former is not available.

+ +

Historical note: the panels code was written primarily to + assist in porting u386mon 2.0 (comp.sources.misc v14i001-4) to + systems lacking panels support; u386mon 2.10 and beyond use it. + This version has been slightly cleaned up for + ncurses.

+ +

A Tour of the Terminfo Compiler

+ +

The ncurses implementation of + tic is rather complex internally; it has to do a + trying combination of missions. This starts with the fact that, + in addition to its normal duty of compiling terminfo sources into + loadable terminfo binaries, it has to be able to handle termcap + syntax and compile that too into terminfo entries.

+ +

The implementation therefore starts with a table-driven, + dual-mode lexical analyzer (in comp_scan.c). The + lexer chooses its mode (termcap or terminfo) based on the first + “,” or “:” it finds in each entry. The + lexer does all the work of recognizing capability names and + values; the grammar above it is trivial, just "parse entries till + you run out of file".

+ +

Translation of + Non-use Capabilities

+ +

Translation of most things besides use + capabilities is pretty straightforward. The lexical analyzer's + tokenizer hands each capability name to a hash function, which + drives a table lookup. The table entry yields an index which is + used to look up the token type in another table, and controls + interpretation of the value.

+ +

One possibly interesting aspect of the implementation is the + way the compiler tables are initialized. All the tables are + generated by various awk/sed/sh scripts from a master table + include/Caps; these scripts actually write C + initializers which are linked to the compiler. Furthermore, the + hash table is generated in the same way, so it doesn't have to be + generated at compiler startup time (another benefit of this + organization is that the hash table can be in shareable text + space).

+ +

Thus, adding a new capability is usually pretty trivial, just + a matter of adding one line to the include/Caps + file. We will have more to say about this in the section on + Source-Form Translation.

+ +

Use Capability Resolution

+ +

The background problem that makes tic tricky + is not the capability translation itself, it is the resolution of + use capabilities. Older versions would not + handle forward use references for this reason + (that is, a using terminal always had to follow its use target in + the source file). By doing this, they got away with a simple + implementation tactic; compile everything as it blows by, then + resolve uses from compiled entries.

+ +

This will not do for ncurses. The problem is + that that the whole compilation process has to be embeddable in + the ncurses library so that it can be called by + the startup code to translate termcap entries on the fly. The + embedded version cannot go promiscuously writing everything it + translates out to disk — for one thing, it will typically + be running with non-root permissions.

+ +

So our tic is designed to parse an entire + terminfo file into a doubly-linked circular list of entry + structures in-core, and then do use resolution + in-memory before writing everything out. This design has other + advantages: it makes forward and back use-references equally easy + (so we get the latter for free), and it makes checking for name + collisions before they are written out easy to do.

+ +

And this is exactly how the embedded version works. But the + stand-alone user-accessible version of tic + partly reverts to the historical strategy; it writes to disk (not + keeping in core) any entry with no use + references.

+ +

This is strictly a core-economy kluge, implemented because the + terminfo master file is large enough that some core-poor systems + swap like crazy when you compile it all in memory...there have + been reports of this process taking three hours, + rather than the twenty seconds or less typical on the author's + development box.

+ +

So. The executable tic passes the + entry-parser a hook that immediately writes out the + referenced entry if it has no use capabilities. The compiler main + loop refrains from adding the entry to the in-core list when this + hook fires. If some other entry later needs to reference an entry + that got written immediately, that is OK; the resolution code + will fetch it off disk when it cannot find it in core.

+ +

Name collisions will still be detected, just not as cleanly. + The write_entry() code complains before overwriting + an entry that postdates the time of tic's first + call to write_entry(), Thus it will complain about + overwriting entries newly made during the tic + run, but not about overwriting ones that predate it.

+ +

Source-Form + Translation

+ +

Another use of tic is to do source + translation between various termcap and terminfo formats. There + are more variants out there than you might think; the ones we + know about are described in the captoinfo(1) + manual page.

+ +

The translation output code (dump_entry() in + ncurses/dump_entry.c) is shared with the + infocmp(1) utility. It takes the same internal + representation used to generate the binary form and dumps it to + standard output in a specified format.

+ +

The include/Caps file has a header comment + describing ways you can specify source translations for + nonstandard capabilities just by altering the master table. It is + possible to set up capability aliasing or tell the compiler to + plain ignore a given capability without writing any C code at + all.

+ +

For circumstances where you need to do algorithmic + translation, there are functions in parse_entry.c + called after the parse of each entry that are specifically + intended to encapsulate such translations. This, for example, is + where the AIX box1 capability get translated to + an acsc string.

+ +

Other Utilities

+ +

The infocmp utility is just a wrapper around + the same entry-dumping code used by tic for + source translation. Perhaps the one interesting aspect of the + code is the use of a predicate function passed in to + dump_entry() to control which capabilities are + dumped. This is necessary in order to handle both the ordinary + De-compilation case and entry difference reporting.

+ +

The tput and clear utilities + just do an entry load followed by a tputs() of a + selected capability.

+ +

Style Tips for Developers

+ +

See the TO-DO file in the top-level directory of the source + distribution for additions that would be particularly useful.

+ +

The prefix _nc_ should be used on library public + functions that are not part of the curses API in order to prevent + pollution of the application namespace. If you have to add to or + modify the function prototypes in curses.h.in, read + ncurses/MKlib_gen.sh first so you can avoid breaking XSI + conformance. Please join the ncurses mailing list. See the + INSTALL file in the top level of the distribution for details on + the list.

+ +

Look for the string FIXME in source files to tag + minor bugs and potential problems that could use fixing.

+ +

Do not try to auto-detect OS features in the main body of the + C code. That is the job of the configuration system.

+ +

To hold down complexity, do make your code data-driven. + Especially, if you can drive logic from a table filtered out of + include/Caps, do it. If you find you need to augment + the data in that file in order to generate the proper table, that + is still preferable to ad-hoc code — that is why the fifth + field (flags) is there.

+ +

Have fun!

+ +

Porting Hints

+ +

The following notes are intended to be a first step towards + DOS and Macintosh ports of the ncurses libraries.

+ +

The following library modules are “pure curses”; + they operate only on the curses internal structures, do all + output through other curses calls (not including + tputs() and putp()) and do not call any + other UNIX routines such as signal(2) or the stdio library. Thus, + they should not need to be modified for single-terminal + ports.

+ +
+ lib_addch.c lib_addstr.c lib_bkgd.c lib_box.c lib_clear.c + lib_clrbot.c lib_clreol.c lib_delch.c lib_delwin.c lib_erase.c + lib_inchstr.c lib_insch.c lib_insdel.c lib_insstr.c + lib_keyname.c lib_move.c lib_mvwin.c lib_newwin.c lib_overlay.c + lib_pad.c lib_printw.c lib_refresh.c lib_scanw.c lib_scroll.c + lib_scrreg.c lib_set_term.c lib_touch.c lib_tparm.c lib_tputs.c + lib_unctrl.c lib_window.c panel.c +
+ +

This module is pure curses, but calls outstr():

+ +
+ lib_getstr.c +
+ +

These modules are pure curses, except that they use + tputs() and putp():

+ +
+ lib_beep.c lib_color.c lib_endwin.c lib_options.c + lib_slk.c lib_vidattr.c +
+ +

This modules assist in POSIX emulation on non-POSIX + systems:

+ +
+
sigaction.c
+ +
signal calls
+
+ +

The following source files will not be needed for a + single-terminal-type port.

+ +
+ alloc_entry.c captoinfo.c clear.c comp_captab.c + comp_error.c comp_hash.c comp_main.c comp_parse.c comp_scan.c + dump_entry.c infocmp.c parse_entry.c read_entry.c tput.c + write_entry.c +
+ +

The following modules will use + open()/read()/write()/close()/lseek() on files, but no other OS + calls.

+ +
+
lib_screen.c
+ +
used to read/write screen dumps
+ +
lib_trace.c
+ +
used to write trace data to the logfile
+
+ +

Modules that would have to be modified for a port start + here:

+ +

The following modules are “pure curses” but + contain assumptions inappropriate for a memory-mapped port.

+ +
+
lib_longname.c
+ +
assumes there may be multiple terminals
+ +
lib_acs.c
+ +
assumes acs_map as a double indirection
+ +
lib_mvcur.c
+ +
assumes cursor moves have variable cost
+ +
lib_termcap.c
+ +
assumes there may be multiple terminals
+ +
lib_ti.c
+ +
assumes there may be multiple terminals
+
+ +

The following modules use UNIX-specific calls:

+ +
+
lib_doupdate.c
+ +
input checking
+ +
lib_getch.c
+ +
read()
+ +
lib_initscr.c
+ +
getenv()
+ +
lib_newterm.c
+ +
lib_baudrate.c
+ +
lib_kernel.c
+ +
various tty-manipulation and system calls
+ +
lib_raw.c
+ +
various tty-manipulation calls
+ +
lib_setup.c
+ +
various tty-manipulation calls
+ +
lib_restart.c
+ +
various tty-manipulation calls
+ +
lib_tstp.c
+ +
signal-manipulation calls
+ +
lib_twait.c
+ +
gettimeofday(), select().
+
+ +
+ +
+ Eric S. Raymond <esr@snark.thyrsus.com> +
+ (Note: This is not the bug + address!) + + *** 3396 LINES SKIPPED *** From nobody Thu Jun 20 13:44:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hYw4dnpz5NpwM; Thu, 20 Jun 2024 13:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4hYw44H4z4XFM; Thu, 20 Jun 2024 13:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718891092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uz1FFyTgt85P4N2naLpqv1x3fiID3UiM1v7aUuexlJg=; b=hX3681WyIZJWjHfRTFMXQB7pqazmAln0fmdYqzAu/Dzf92fSAy3aPWsQBXZqivBhO9P3ze w59KlUUpTIsLdOrbzj5eNNYUTFc839kNR7vr9L49Z6CISYdpKxIXd0POYvh7JWQi1NU3OC CqpcHQXUzPZBtaC80oCYs3ZdXC1d37bkMRvc2T3my0oawrKMPbhUaQHtU0z2UjFTzXa0Ia qxS/s8mYLx3HkzdlyNzKt1oo0fxPZ8He57JMZw64D5Y7c0JFnO5On8HbX24Vx+kl6Uh5jm shw4mLvCi58vdN3EzSFB2zKBDTdyhVNLGk6KCZUt8zxtn+hoTxwzRq0jigWlqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718891092; a=rsa-sha256; cv=none; b=umJPCFEOaPz54AziIQ0n4nJJxCMXMiyXa64el9OsDXzA0HfTUZ9xG0dYYD/u9+2BqeO0Vf 1hM0Tao698/DW6ZCJFK3B+NkLjqXyLqrCkI3S8xlYmA7PlWnTvBc460KB5EDZFjPpkJJWJ 8tKsdLGNvLHf18PH1ayvWdxGXSDCf3R62WIf32SJuT+7Z+vc5pp+Hxz3nV49fwJ6eu4sZ6 yYI1jLGpmp+rcPQbB9DlSYZcaPV7eZbK1HeJ4mb+ubnTjQOZKY1iwiFLV0nfwAhL+a1jyr hp8KjDPWd3TUa9i/KY9Nb0rSNYedwg9wqbmLgJmrT8eVjU35uX4yeuJEhmP4zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718891092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uz1FFyTgt85P4N2naLpqv1x3fiID3UiM1v7aUuexlJg=; b=NsmHRTlzXLqM9enLOHgcgR57SDR4MxzwOIAkStMI2BqdKy9rIBKSCIo6PjCu7y6s2g3BVz dSX8SYxLEnH5wzq3Mo3S1/1VSdeCG+mWo5WfsdKAo4lNfOpY/nSOFaQs2MJVY/V8qSk0uR Cm2pY7YCZ71z0IFdr0A2hMEGOWZZOC72bW15iHbZ2FIKgcmjXgsDIamD0/OjUrIgo73wC6 Wx+2YDVQOypuEnX0hAWg241A0EtkJ9G1mbcskQ5is95K7ovnXhhwzFMTdkPt28Hu9m5MfX uXOOuGs11rAiA4WOpAJmpoxyX6RJCdAAuCO7NQ4MOmX6j8Rtu3nq4c3RghmI2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4hYw3YY6zS10; Thu, 20 Jun 2024 13:44: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 45KDiqdA042959; Thu, 20 Jun 2024 13:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KDiqtm042956; Thu, 20 Jun 2024 13:44:52 GMT (envelope-from git) Date: Thu, 20 Jun 2024 13:44:52 GMT Message-Id: <202406201344.45KDiqtm042956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0667538b888c - main - ee: fix wprintw usage (highlighted by ncurses 6.5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0667538b888c1171932c6cf28b62fc19d393e119 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0667538b888c1171932c6cf28b62fc19d393e119 commit 0667538b888c1171932c6cf28b62fc19d393e119 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:42:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 13:43:44 +0000 ee: fix wprintw usage (highlighted by ncurses 6.5) Reported by: cy --- contrib/ee/ee.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index 5576537f3fad..a14f9c0ead13 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -591,11 +591,11 @@ main(int argc, char *argv[]) { wmove(com_win, 0, 0); werase(com_win); - wprintw(com_win, ree_no_file_msg); + wprintw(com_win, "%s", ree_no_file_msg); wrefresh(com_win); edit_abort(0); } - wprintw(com_win, no_file_string); + wprintw(com_win, "%s", no_file_string); wrefresh(com_win); } else @@ -615,7 +615,7 @@ main(int argc, char *argv[]) if (!nohighlight) wstandout(info_win); wmove(info_win, 5, 0); - wprintw(info_win, separator); + wprintw(info_win, "%s", separator); wmove(info_win, 5, 5); wprintw(info_win, "line %d col %d lines from top %d ", curr_line->line_number, scr_horz, absolute_lin); @@ -1668,7 +1668,7 @@ command_prompt(void) if (result == 0) wprintw(com_win, unkn_cmd_str, cmd_str); else - wprintw(com_win, non_unique_cmd_msg); + wprintw(com_win, "%s", non_unique_cmd_msg); wrefresh(com_win); @@ -1744,7 +1744,7 @@ command(char *cmd_str1) wmove(com_win, 0, 0); wclrtoeol(com_win); if (in_file_name == NULL) - wprintw(com_win, no_file_string); + wprintw(com_win, "%s", no_file_string); else wprintw(com_win, current_file_str, in_file_name); } @@ -2245,7 +2245,7 @@ get_file(char *file_name) { if ((errno == ENOTDIR) || (errno == EACCES) || (errno == EROFS) || (errno == ETXTBSY) || (errno == EFAULT)) { - wprintw(com_win, read_only_msg); + wprintw(com_win, "%s", read_only_msg); ro_flag = TRUE; } } @@ -2282,7 +2282,7 @@ get_file(char *file_name) wclrtoeol(com_win); wprintw(com_win, file_read_lines_msg, in_file_name, curr_line->line_number); if (ro_flag) - wprintw(com_win, read_only_msg); + wprintw(com_win, "%s", read_only_msg); wrefresh(com_win); } else if (can_read) /* not input_file and file is non-zero size */ @@ -2400,7 +2400,7 @@ finish(void) if ((file_name == NULL) || (*file_name == '\0')) { wmove(com_win, 0, 0); - wprintw(com_win, file_not_saved_msg); + wprintw(com_win, "%s", file_not_saved_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; @@ -2577,7 +2577,7 @@ search(int display_message) { wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, searching_msg); + wprintw(com_win, "%s", searching_msg); wrefresh(com_win); clear_com_win = TRUE; } @@ -3378,7 +3378,7 @@ menu_op(struct menu_entries menu_list[]) { wmove(com_win, 0, 0); werase(com_win); - wprintw(com_win, menu_too_lrg_msg); + wprintw(com_win, "%s", menu_too_lrg_msg); wrefresh(com_win); clear_com_win = TRUE; return(0); @@ -3630,10 +3630,10 @@ paint_menu(struct menu_entries menu_list[], int max_width, int max_height, { if (list_size > 1) wprintw(menu_win, "%c) ", item_alpha[min((counter - 1), max_alpha_char)]); - wprintw(menu_win, menu_list[counter].item_string); + wprintw(menu_win, "%s", menu_list[counter].item_string); } else - wprintw(menu_win, more_below_str); + wprintw(menu_win, "%s", more_below_str); } else { @@ -3663,7 +3663,7 @@ help(void) wrefresh(help_win); werase(com_win); wmove(com_win, 0, 0); - wprintw(com_win, press_any_key_msg); + wprintw(com_win, "%s", press_any_key_msg); wrefresh(com_win); counter = wgetch(com_win); if (counter == -1) @@ -3790,7 +3790,7 @@ file_op(int arg) if ((string == NULL) || (*string == '\0')) { wmove(com_win, 0, 0); - wprintw(com_win, file_not_saved_msg); + wprintw(com_win, "%s", file_not_saved_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; @@ -3925,7 +3925,7 @@ Format(void) wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -3971,7 +3971,7 @@ Format(void) wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4046,7 +4046,7 @@ Format(void) wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4270,7 +4270,7 @@ dump_ee_conf(void) if (option == 0) { - wprintw(com_win, conf_not_saved_msg); + wprintw(com_win, "%s", conf_not_saved_msg); wrefresh(com_win); return; } @@ -4293,7 +4293,7 @@ dump_ee_conf(void) init_file = fopen(file_name, "w"); if (init_file == NULL) { - wprintw(com_win, conf_dump_err_msg); + wprintw(com_win, "%s", conf_dump_err_msg); wrefresh(com_win); return; } @@ -4412,7 +4412,7 @@ spell_op(void) command(shell_echo_msg); adv_line(); wmove(com_win, 0, 0); - wprintw(com_win, spell_in_prog_msg); + wprintw(com_win, "%s", spell_in_prog_msg); wrefresh(com_win); command("<>!spell"); /* send contents of buffer to command 'spell' and read the results back into the editor */ @@ -5001,7 +5001,7 @@ restrict_mode(void) return(FALSE); wmove(com_win, 0, 0); - wprintw(com_win, restricted_msg); + wprintw(com_win, "%s", restricted_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; From nobody Thu Jun 20 13:45:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hZW2cJDz5NpTC; Thu, 20 Jun 2024 13:45:23 +0000 (UTC) (envelope-from bapt@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 4W4hZW243Yz4XdW; Thu, 20 Jun 2024 13:45:23 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718891123; 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=zl2j8dn4lFG4HKxHTAPM7beERtGf8rdpCNUIynIiV+4=; b=GM30hT/NWNkcGcvYnZynGkQGa46FlikTQDakMzUvjA1tcpQATIXXlrY18BT3YUwZKWwnzO kuDvWqUke8QnekUT+qErTMqGxChNDHD1+YwHnw716auJ1B3DuD5UmD/Z2uoRcRE4eSiLWH 9Ey8DmMHsSdtZyZEY3dwUPxWDeBla9vxIRhMkn4iUj6NyR/B75vr4FCxgmHFOU0WHDaQnK WTm7docOir31IMcz6fxnIMKMB67/gWOd6bPMRHO9Wmv8J/U4jBjs5Awh+N0E1Z3KhulVG9 SRE5NaBYUXTPDlAP4Jii8rjueYgJmKsJ/iS0Jq8LW1p8KrhdEhAiGVdk7P6TLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718891123; a=rsa-sha256; cv=none; b=ylDb5EVK4DrYujrcSEK09dWhC7peGf+I6vHhzijlb2XRaaRRPhWtcM5VLu+2XJxgZ5k666 F/ltpmAZ1RehpDntUtla0s+zgCnip+S+S2gd8P9pFiRROlA4s5zPkic6Z7XMPaVX0lkXHj SsxPJf903N7HR+/iJ4zr3L3QobGU2VVTNEPH4l8qiewpSDFwOR5TQlxRsvU8upFFtx8w4C UANygJG9GF/4TEWrBVERK5M3l0DnANHKCphV6JVpM4E2cWnrDKBO8wRlx845bPvwVY/GSl /mlaRA0bV4quFtbkBAbPaPidaY6DvRcTI9cxDjZOj43PxHGFTbnmQf7kq+209A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718891123; 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=zl2j8dn4lFG4HKxHTAPM7beERtGf8rdpCNUIynIiV+4=; b=uvq/jU6QIGOfqHwqYDQnebH8krA2ACO4BrXlSXSElUWRca3R+vlIOlkr3v1LLkfBMDKrU3 ml3WClJEtg5zCGnpwl4u0HkWJyUhUS1lwrR1LogOqYZqSu0ZxEo5XzjeGbAaoQlFHGVtGo EGgcLsDl40cySbS3rqLGlOumSNrbNpH/eAn5JZIKeFgmgovTAq3kt13yumwvEjuFsNKD10 bIGRgFXb8gI4TCppG2SOIvNv3uTKTP4JWvDLSMNIUA4UE1cV/pTWbDLiZUJqQhZPvM2r6j uj/dS9N9AKl47CWbKL25q8/kWRDvVqjvuv+Lu+oVhnXn+JNYFGaQ9vU3sJ5Ajw== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W4hZW0wPNz17DB; Thu, 20 Jun 2024 13:45:23 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 9E28C96179; Thu, 20 Jun 2024 15:45:21 +0200 (CEST) Date: Thu, 20 Jun 2024 15:45:21 +0200 From: Baptiste Daroussin To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 35e941ce5520 - main - systat: fix build with newer ncurses Message-ID: References: <202406201312.45KDCcFk092290@gitrepo.freebsd.org> <20240620133454.24C13193@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240620133454.24C13193@slippy.cwsent.com> On Thu 20 Jun 06:34, Cy Schubert wrote: > In message <202406201312.45KDCcFk092290@gitrepo.freebsd.org>, Baptiste > Daroussi > n writes: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=35e941ce5520b8ef710bb388bd63460a > > a0ce63eb > > > > commit 35e941ce5520b8ef710bb388bd63460aa0ce63eb > > Author: Baptiste Daroussin > > AuthorDate: 2024-06-20 13:10:38 +0000 > > Commit: Baptiste Daroussin > > CommitDate: 2024-06-20 13:10:38 +0000 > > > > systat: fix build with newer ncurses > > --- > > usr.bin/systat/netcmds.c | 2 +- > > usr.bin/systat/sctp.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c > > index 5b6cb2163b7b..c0bbda7dee8a 100644 > > --- a/usr.bin/systat/netcmds.c > > +++ b/usr.bin/systat/netcmds.c > > @@ -245,7 +245,7 @@ showports(void) > > if (sp) > > printw("%s ", sp->s_name); > > else > > - printw("%d ", p->port); > > + printw("%ld ", p->port); > > } > > } > > > > diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c > > index abe4d0e68e04..26abbec68da8 100644 > > --- a/usr.bin/systat/sctp.c > > +++ b/usr.bin/systat/sctp.c > > @@ -276,7 +276,7 @@ showsctp(void) > > domode(&stats); > > > > #define DO(stat, row, col) \ > > - mvwprintw(wnd, row, col, "%12lu", stats.stat) > > + mvwprintw(wnd, row, col, "%12u", stats.stat) > > #define L(row, stat) DO(stat, row, 0) > > #define R(row, stat) DO(stat, row, 38) > > L(1, sctps_activeestab); R(1, sctps_outpackets); > > > > I'm still getting errors. This time in ee. > > fixed, Bapt From nobody Thu Jun 20 13:51:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hjx3Jxtz5NqYx; Thu, 20 Jun 2024 13:51:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4hjx1S3Bz4YSR; Thu, 20 Jun 2024 13:51:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id KCo0swFcUdrxEKICas4Npw; Thu, 20 Jun 2024 13:51:48 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id KICZs7BfSpsbgKICZsWyb7; Thu, 20 Jun 2024 13:51:48 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=667433f4 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=yrBq6eRubN929Ok-BtMA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D8CDAA19; Thu, 20 Jun 2024 06:51:46 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id C004A76; Thu, 20 Jun 2024 06:51:46 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Baptiste Daroussin cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 35e941ce5520 - main - systat: fix build with newer ncurses In-reply-to: References: <202406201312.45KDCcFk092290@gitrepo.freebsd.org> <20240620133454.24C13193@slippy.cwsent.com> Comments: In-reply-to Baptiste Daroussin message dated "Thu, 20 Jun 2024 15:45:21 +0200." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 20 Jun 2024 06:51:46 -0700 Message-Id: <20240620135146.C004A76@slippy.cwsent.com> X-CMAE-Envelope: MS4xfFVoSFsVX+OEkCzcAjgB7gLN0/kOk82ylOJHbrV1d37TKE1wr9gAUhETLpZJixSAJPHjtot9hlLXl7/E2uMO/oAclwDXFwE15LNDhQV5gIttq0rcwJLC Nz9Ja5IyM/4X4WoDeg6zKD2qyVeJfo2l8k4KaDxs6CXl39vDBdORwNW6L99W93DLg9jdG0GO2YDLLl/ymDrxso191gdmOgxcfXa/2e8DdAIqblUpiCU55/4H 6UGwn+iU4OEkLrCMNpaH/rloOaNgFveX+NL4lB4PeLHCT09wm5yRnI6cgKi6kZCHVyQCIJbKp+LKXsVAup2imB/YdMzVp2DSIUxeOZd80iE= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4W4hjx1S3Bz4YSR In message , B aptiste Daroussin writes: > On Thu 20 Jun 06:34, Cy Schubert wrote: > > In message <202406201312.45KDCcFk092290@gitrepo.freebsd.org>, Baptiste > > Daroussi > > n writes: > > > The branch main has been updated by bapt: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=35e941ce5520b8ef710bb388bd63 > 460a > > > a0ce63eb > > > > > > commit 35e941ce5520b8ef710bb388bd63460aa0ce63eb > > > Author: Baptiste Daroussin > > > AuthorDate: 2024-06-20 13:10:38 +0000 > > > Commit: Baptiste Daroussin > > > CommitDate: 2024-06-20 13:10:38 +0000 > > > > > > systat: fix build with newer ncurses > > > --- > > > usr.bin/systat/netcmds.c | 2 +- > > > usr.bin/systat/sctp.c | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c > > > index 5b6cb2163b7b..c0bbda7dee8a 100644 > > > --- a/usr.bin/systat/netcmds.c > > > +++ b/usr.bin/systat/netcmds.c > > > @@ -245,7 +245,7 @@ showports(void) > > > if (sp) > > > printw("%s ", sp->s_name); > > > else > > > - printw("%d ", p->port); > > > + printw("%ld ", p->port); > > > } > > > } > > > > > > diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c > > > index abe4d0e68e04..26abbec68da8 100644 > > > --- a/usr.bin/systat/sctp.c > > > +++ b/usr.bin/systat/sctp.c > > > @@ -276,7 +276,7 @@ showsctp(void) > > > domode(&stats); > > > > > > #define DO(stat, row, col) \ > > > - mvwprintw(wnd, row, col, "%12lu", stats.stat) > > > + mvwprintw(wnd, row, col, "%12u", stats.stat) > > > #define L(row, stat) DO(stat, row, 0) > > > #define R(row, stat) DO(stat, row, 38) > > > L(1, sctps_activeestab); R(1, sctps_outpackets); > > > > > > > I'm still getting errors. This time in ee. > > > > > fixed, That fixed it. Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jun 20 13:53:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hlY61K2z5Nqjh; Thu, 20 Jun 2024 13:53:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4hlY2Pwgz4Ylq; Thu, 20 Jun 2024 13:53:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id KCPfskp0n2Ui5KIDwszpNK; Thu, 20 Jun 2024 13:53:12 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id KIDusOrwK9Cr4KIDvs5Dpy; Thu, 20 Jun 2024 13:53:12 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=66743448 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=g5aYd172q1L5E24Bq10A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A352B9EB; Thu, 20 Jun 2024 06:53:10 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A000A9C; Thu, 20 Jun 2024 06:53:10 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Baptiste Daroussin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 0667538b888c - main - ee: fix wprintw usage (highlighted by ncurses 6.5) In-reply-to: <202406201344.45KDiqtm042956@gitrepo.freebsd.org> References: <202406201344.45KDiqtm042956@gitrepo.freebsd.org> Comments: In-reply-to Baptiste Daroussin message dated "Thu, 20 Jun 2024 13:44:52 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 20 Jun 2024 06:53:10 -0700 Message-Id: <20240620135310.A000A9C@slippy.cwsent.com> X-CMAE-Envelope: MS4xfPFT5c7t586GsU5oTDsFyxVh0rTUV3LczXpJZGTBLjqoabnV8xrxAd1Seln0ucWd5m792m7YgLoKyG2XnXJFwAsIX6xFxs/hHiYGVngIywvXOfx5Oaa6 04GqnxFHqmQzSgFoNBvAhUc39XgT9BiPqbsff3whYAYVLSkbWIyMpVgimJnyYaxCTp6r+BDSZv9iSm8+NWkmZbtCi9EiOzx6fgbwESxWgrhXvAo3hzVMcIl1 0+t8YqBiaXSXKP3jUE9OUtarG9KWl+NmgSHrSJfN0BTF+59xoop/GGlduIgo+SHyNkRyVc5sRqSgp890TtFy7fxCps4akb/MHKwBJZRGxU0= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4W4hlY2Pwgz4Ylq In message <202406201344.45KDiqtm042956@gitrepo.freebsd.org>, Baptiste Daroussi n writes: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0667538b888c1171932c6cf28b62fc19 > d393e119 > > commit 0667538b888c1171932c6cf28b62fc19d393e119 > Author: Baptiste Daroussin > AuthorDate: 2024-06-20 13:42:59 +0000 > Commit: Baptiste Daroussin > CommitDate: 2024-06-20 13:43:44 +0000 > > ee: fix wprintw usage (highlighted by ncurses 6.5) > > Reported by: cy > --- > contrib/ee/ee.c | 42 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 21 deletions(-) > > diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c > index 5576537f3fad..a14f9c0ead13 100644 > --- a/contrib/ee/ee.c > +++ b/contrib/ee/ee.c > @@ -591,11 +591,11 @@ main(int argc, char *argv[]) > { > wmove(com_win, 0, 0); > werase(com_win); > - wprintw(com_win, ree_no_file_msg); > + wprintw(com_win, "%s", ree_no_file_msg); > wrefresh(com_win); > edit_abort(0); > } > - wprintw(com_win, no_file_string); > + wprintw(com_win, "%s", no_file_string); > wrefresh(com_win); > } > else > @@ -615,7 +615,7 @@ main(int argc, char *argv[]) > if (!nohighlight) > wstandout(info_win); > wmove(info_win, 5, 0); > - wprintw(info_win, separator); > + wprintw(info_win, "%s", separator); > wmove(info_win, 5, 5); > wprintw(info_win, "line %d col %d lines from top %d ", > curr_line->line_number, scr_horz, absolute_li > n); > @@ -1668,7 +1668,7 @@ command_prompt(void) > if (result == 0) > wprintw(com_win, unkn_cmd_str, cmd_str); > else > - wprintw(com_win, non_unique_cmd_msg); > + wprintw(com_win, "%s", non_unique_cmd_msg); > > wrefresh(com_win); > > @@ -1744,7 +1744,7 @@ command(char *cmd_str1) > wmove(com_win, 0, 0); > wclrtoeol(com_win); > if (in_file_name == NULL) > - wprintw(com_win, no_file_string); > + wprintw(com_win, "%s", no_file_string); > else > wprintw(com_win, current_file_str, in_file_name); > } > @@ -2245,7 +2245,7 @@ get_file(char *file_name) > { > if ((errno == ENOTDIR) || (errno == EACCES) || (errno = > = EROFS) || (errno == ETXTBSY) || (errno == EFAULT)) > { > - wprintw(com_win, read_only_msg); > + wprintw(com_win, "%s", read_only_msg); > ro_flag = TRUE; > } > } > @@ -2282,7 +2282,7 @@ get_file(char *file_name) > wclrtoeol(com_win); > wprintw(com_win, file_read_lines_msg, in_file_name, curr_line-> > line_number); > if (ro_flag) > - wprintw(com_win, read_only_msg); > + wprintw(com_win, "%s", read_only_msg); > wrefresh(com_win); > } > else if (can_read) /* not input_file and file is non-zero size */ > @@ -2400,7 +2400,7 @@ finish(void) > if ((file_name == NULL) || (*file_name == '\0')) > { > wmove(com_win, 0, 0); > - wprintw(com_win, file_not_saved_msg); > + wprintw(com_win, "%s", file_not_saved_msg); > wclrtoeol(com_win); > wrefresh(com_win); > clear_com_win = TRUE; > @@ -2577,7 +2577,7 @@ search(int display_message) > { > wmove(com_win, 0, 0); > wclrtoeol(com_win); > - wprintw(com_win, searching_msg); > + wprintw(com_win, "%s", searching_msg); > wrefresh(com_win); > clear_com_win = TRUE; > } > @@ -3378,7 +3378,7 @@ menu_op(struct menu_entries menu_list[]) > { > wmove(com_win, 0, 0); > werase(com_win); > - wprintw(com_win, menu_too_lrg_msg); > + wprintw(com_win, "%s", menu_too_lrg_msg); > wrefresh(com_win); > clear_com_win = TRUE; > return(0); > @@ -3630,10 +3630,10 @@ paint_menu(struct menu_entries menu_list[], int max_w > idth, int max_height, > { > if (list_size > 1) > wprintw(menu_win, "%c) ", item_alpha[min((count > er - 1), max_alpha_char)]); > - wprintw(menu_win, menu_list[counter].item_string); > + wprintw(menu_win, "%s", menu_list[counter].item_string) > ; > } > else > - wprintw(menu_win, more_below_str); > + wprintw(menu_win, "%s", more_below_str); > } > else > { > @@ -3663,7 +3663,7 @@ help(void) > wrefresh(help_win); > werase(com_win); > wmove(com_win, 0, 0); > - wprintw(com_win, press_any_key_msg); > + wprintw(com_win, "%s", press_any_key_msg); > wrefresh(com_win); > counter = wgetch(com_win); > if (counter == -1) > @@ -3790,7 +3790,7 @@ file_op(int arg) > if ((string == NULL) || (*string == '\0')) > { > wmove(com_win, 0, 0); > - wprintw(com_win, file_not_saved_msg); > + wprintw(com_win, "%s", file_not_saved_msg); > wclrtoeol(com_win); > wrefresh(com_win); > clear_com_win = TRUE; > @@ -3925,7 +3925,7 @@ Format(void) > > wmove(com_win, 0, 0); > wclrtoeol(com_win); > - wprintw(com_win, formatting_msg); > + wprintw(com_win, "%s", formatting_msg); > wrefresh(com_win); > > /* > @@ -3971,7 +3971,7 @@ Format(void) > > wmove(com_win, 0, 0); > wclrtoeol(com_win); > - wprintw(com_win, formatting_msg); > + wprintw(com_win, "%s", formatting_msg); > wrefresh(com_win); > > /* > @@ -4046,7 +4046,7 @@ Format(void) > > wmove(com_win, 0, 0); > wclrtoeol(com_win); > - wprintw(com_win, formatting_msg); > + wprintw(com_win, "%s", formatting_msg); > wrefresh(com_win); > > /* > @@ -4270,7 +4270,7 @@ dump_ee_conf(void) > > if (option == 0) > { > - wprintw(com_win, conf_not_saved_msg); > + wprintw(com_win, "%s", conf_not_saved_msg); > wrefresh(com_win); > return; > } > @@ -4293,7 +4293,7 @@ dump_ee_conf(void) > init_file = fopen(file_name, "w"); > if (init_file == NULL) > { > - wprintw(com_win, conf_dump_err_msg); > + wprintw(com_win, "%s", conf_dump_err_msg); > wrefresh(com_win); > return; > } > @@ -4412,7 +4412,7 @@ spell_op(void) > command(shell_echo_msg); > adv_line(); > wmove(com_win, 0, 0); > - wprintw(com_win, spell_in_prog_msg); > + wprintw(com_win, "%s", spell_in_prog_msg); > wrefresh(com_win); > command("<>!spell"); /* send contents of buffer to command 'spell' > and read the results back into the editor */ > @@ -5001,7 +5001,7 @@ restrict_mode(void) > return(FALSE); > > wmove(com_win, 0, 0); > - wprintw(com_win, restricted_msg); > + wprintw(com_win, "%s", restricted_msg); > wclrtoeol(com_win); > wrefresh(com_win); > clear_com_win = TRUE; > I wonder if the editors/aee port might also want some tender loving care? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jun 20 14:03:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4hz55sQcz5NrMD; Thu, 20 Jun 2024 14:03:13 +0000 (UTC) (envelope-from bapt@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 4W4hz558Kdz4ZqK; Thu, 20 Jun 2024 14:03:13 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718892193; 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=Xg1AsmUN6Pd3NbisWyvYSm397MgTaOn5C7OCIl1c//k=; b=mz0RZRtUtQec0xvDLja2hNCtVr17h54wkRShufy8pPzQWI7F7Wk0yVwwfPLThmmi+Z8oei kvqAfprg4dcEAPZdUmavULT4A13DwgVPFbRirEraWgp7kPcSwVUz3oA27pQz5aMsJVAEBV J4pB1UJTkP6uOoNZvIuiRhDmZ+ZDRaFOe1w/LTOdsm0WE8E0hgKj1C1iHzcD6P30953NNw YfWhiFcJenDQiSod4FyAiyU8kNeOaziWD58iKMRcDFU1uELIq78CNzk1qKHVH87iefqLdA A2aiO8ztrcU4lwIGWH0fQ33QFXEhscsSYDLLMnd0rX0daOUopythk6SqypHF8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718892193; a=rsa-sha256; cv=none; b=XP8/l2TNvrfUy1WFN85S55eIX16ZLPGzxW+UJthviPGZ9ByrSGB/dXA+UyK2v+UI69fLZ4 CyvXzsYInOL36hMnZvCWJwtT0uteieuMArbJIgaeOjkNX90gEF8O3/91w0n0oq2SHUlnDM aAhZFMy0v9ROWHVJYeLwqZpUR2ldhpY2E+0Zf2LzZdo7vAPF47LdnrkUInGjNpBIz0yzMU MwApwb1Xe9QVNbvKtfPOTMFxIduj9t01mhyxCiwhbYj72xMjocC8h6DdaJfzls+OGDKdjQ uYj/0I/6vqWRCJGdGLJoHStkyCiBlZ/RUCuqUTYvTGEyn7miZalCnQ5U8uLbQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718892193; 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=Xg1AsmUN6Pd3NbisWyvYSm397MgTaOn5C7OCIl1c//k=; b=T00gq7bnZUfGsx1/FEfsepaRL3hk+wj2UOX9myIUDcI6fAX2qQ7Orz7Ut8vn1DcRLn4XBG TNPieu6lhl/8kjVUusjqyXmb4bgBqcQYSx6ZrPmqyBheaILFpTOuBXtuPV7v172iba/giE KSQt4ogWaaSGxr/aqKqAN6AmPijmHH4wDQ/JzVhPYpx9/aNDD+LGUq8jiisCT6ATlY7dpG ZHx3VZeYJOMEEuUZmCEKAyzva7BsDH6Tzvjx+C/iBdcE98cm7Fx+DgxQxCR+KqUiSkJz3L PdlN2b7XU+cTIhHTDHOjaKmUb/Q+KAFi2oRG3H+ptFNAKPNebTCzSTo4hbRPIw== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W4hz53Mgmz18yK; Thu, 20 Jun 2024 14:03:13 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 5BB8496590; Thu, 20 Jun 2024 16:03:12 +0200 (CEST) Date: Thu, 20 Jun 2024 16:03:12 +0200 From: Baptiste Daroussin To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0667538b888c - main - ee: fix wprintw usage (highlighted by ncurses 6.5) Message-ID: References: <202406201344.45KDiqtm042956@gitrepo.freebsd.org> <20240620135310.A000A9C@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240620135310.A000A9C@slippy.cwsent.com> On Thu 20 Jun 06:53, Cy Schubert wrote: > In message <202406201344.45KDiqtm042956@gitrepo.freebsd.org>, Baptiste > Daroussi > n writes: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=0667538b888c1171932c6cf28b62fc19 > > d393e119 > > > > commit 0667538b888c1171932c6cf28b62fc19d393e119 > > Author: Baptiste Daroussin > > AuthorDate: 2024-06-20 13:42:59 +0000 > > Commit: Baptiste Daroussin > > CommitDate: 2024-06-20 13:43:44 +0000 > > > > ee: fix wprintw usage (highlighted by ncurses 6.5) > > > > Reported by: cy > > --- > > contrib/ee/ee.c | 42 +++++++++++++++++++++--------------------- > > 1 file changed, 21 insertions(+), 21 deletions(-) > > > > diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c > > index 5576537f3fad..a14f9c0ead13 100644 > > --- a/contrib/ee/ee.c > > +++ b/contrib/ee/ee.c > > @@ -591,11 +591,11 @@ main(int argc, char *argv[]) > > { > > wmove(com_win, 0, 0); > > werase(com_win); > > - wprintw(com_win, ree_no_file_msg); > > + wprintw(com_win, "%s", ree_no_file_msg); > > wrefresh(com_win); > > edit_abort(0); > > } > > - wprintw(com_win, no_file_string); > > + wprintw(com_win, "%s", no_file_string); > > wrefresh(com_win); > > } > > else > > @@ -615,7 +615,7 @@ main(int argc, char *argv[]) > > if (!nohighlight) > > wstandout(info_win); > > wmove(info_win, 5, 0); > > - wprintw(info_win, separator); > > + wprintw(info_win, "%s", separator); > > wmove(info_win, 5, 5); > > wprintw(info_win, "line %d col %d lines from top %d ", > > curr_line->line_number, scr_horz, absolute_li > > n); > > @@ -1668,7 +1668,7 @@ command_prompt(void) > > if (result == 0) > > wprintw(com_win, unkn_cmd_str, cmd_str); > > else > > - wprintw(com_win, non_unique_cmd_msg); > > + wprintw(com_win, "%s", non_unique_cmd_msg); > > > > wrefresh(com_win); > > > > @@ -1744,7 +1744,7 @@ command(char *cmd_str1) > > wmove(com_win, 0, 0); > > wclrtoeol(com_win); > > if (in_file_name == NULL) > > - wprintw(com_win, no_file_string); > > + wprintw(com_win, "%s", no_file_string); > > else > > wprintw(com_win, current_file_str, in_file_name); > > } > > @@ -2245,7 +2245,7 @@ get_file(char *file_name) > > { > > if ((errno == ENOTDIR) || (errno == EACCES) || (errno = > > = EROFS) || (errno == ETXTBSY) || (errno == EFAULT)) > > { > > - wprintw(com_win, read_only_msg); > > + wprintw(com_win, "%s", read_only_msg); > > ro_flag = TRUE; > > } > > } > > @@ -2282,7 +2282,7 @@ get_file(char *file_name) > > wclrtoeol(com_win); > > wprintw(com_win, file_read_lines_msg, in_file_name, curr_line-> > > line_number); > > if (ro_flag) > > - wprintw(com_win, read_only_msg); > > + wprintw(com_win, "%s", read_only_msg); > > wrefresh(com_win); > > } > > else if (can_read) /* not input_file and file is non-zero size */ > > @@ -2400,7 +2400,7 @@ finish(void) > > if ((file_name == NULL) || (*file_name == '\0')) > > { > > wmove(com_win, 0, 0); > > - wprintw(com_win, file_not_saved_msg); > > + wprintw(com_win, "%s", file_not_saved_msg); > > wclrtoeol(com_win); > > wrefresh(com_win); > > clear_com_win = TRUE; > > @@ -2577,7 +2577,7 @@ search(int display_message) > > { > > wmove(com_win, 0, 0); > > wclrtoeol(com_win); > > - wprintw(com_win, searching_msg); > > + wprintw(com_win, "%s", searching_msg); > > wrefresh(com_win); > > clear_com_win = TRUE; > > } > > @@ -3378,7 +3378,7 @@ menu_op(struct menu_entries menu_list[]) > > { > > wmove(com_win, 0, 0); > > werase(com_win); > > - wprintw(com_win, menu_too_lrg_msg); > > + wprintw(com_win, "%s", menu_too_lrg_msg); > > wrefresh(com_win); > > clear_com_win = TRUE; > > return(0); > > @@ -3630,10 +3630,10 @@ paint_menu(struct menu_entries menu_list[], int max_w > > idth, int max_height, > > { > > if (list_size > 1) > > wprintw(menu_win, "%c) ", item_alpha[min((count > > er - 1), max_alpha_char)]); > > - wprintw(menu_win, menu_list[counter].item_string); > > + wprintw(menu_win, "%s", menu_list[counter].item_string) > > ; > > } > > else > > - wprintw(menu_win, more_below_str); > > + wprintw(menu_win, "%s", more_below_str); > > } > > else > > { > > @@ -3663,7 +3663,7 @@ help(void) > > wrefresh(help_win); > > werase(com_win); > > wmove(com_win, 0, 0); > > - wprintw(com_win, press_any_key_msg); > > + wprintw(com_win, "%s", press_any_key_msg); > > wrefresh(com_win); > > counter = wgetch(com_win); > > if (counter == -1) > > @@ -3790,7 +3790,7 @@ file_op(int arg) > > if ((string == NULL) || (*string == '\0')) > > { > > wmove(com_win, 0, 0); > > - wprintw(com_win, file_not_saved_msg); > > + wprintw(com_win, "%s", file_not_saved_msg); > > wclrtoeol(com_win); > > wrefresh(com_win); > > clear_com_win = TRUE; > > @@ -3925,7 +3925,7 @@ Format(void) > > > > wmove(com_win, 0, 0); > > wclrtoeol(com_win); > > - wprintw(com_win, formatting_msg); > > + wprintw(com_win, "%s", formatting_msg); > > wrefresh(com_win); > > > > /* > > @@ -3971,7 +3971,7 @@ Format(void) > > > > wmove(com_win, 0, 0); > > wclrtoeol(com_win); > > - wprintw(com_win, formatting_msg); > > + wprintw(com_win, "%s", formatting_msg); > > wrefresh(com_win); > > > > /* > > @@ -4046,7 +4046,7 @@ Format(void) > > > > wmove(com_win, 0, 0); > > wclrtoeol(com_win); > > - wprintw(com_win, formatting_msg); > > + wprintw(com_win, "%s", formatting_msg); > > wrefresh(com_win); > > > > /* > > @@ -4270,7 +4270,7 @@ dump_ee_conf(void) > > > > if (option == 0) > > { > > - wprintw(com_win, conf_not_saved_msg); > > + wprintw(com_win, "%s", conf_not_saved_msg); > > wrefresh(com_win); > > return; > > } > > @@ -4293,7 +4293,7 @@ dump_ee_conf(void) > > init_file = fopen(file_name, "w"); > > if (init_file == NULL) > > { > > - wprintw(com_win, conf_dump_err_msg); > > + wprintw(com_win, "%s", conf_dump_err_msg); > > wrefresh(com_win); > > return; > > } > > @@ -4412,7 +4412,7 @@ spell_op(void) > > command(shell_echo_msg); > > adv_line(); > > wmove(com_win, 0, 0); > > - wprintw(com_win, spell_in_prog_msg); > > + wprintw(com_win, "%s", spell_in_prog_msg); > > wrefresh(com_win); > > command("<>!spell"); /* send contents of buffer to command 'spell' > > and read the results back into the editor */ > > @@ -5001,7 +5001,7 @@ restrict_mode(void) > > return(FALSE); > > > > wmove(com_win, 0, 0); > > - wprintw(com_win, restricted_msg); > > + wprintw(com_win, "%s", restricted_msg); > > wclrtoeol(com_win); > > wrefresh(com_win); > > clear_com_win = TRUE; > > > > I wonder if the editors/aee port might also want some tender loving care? > > I checked and it does not, (which is probably a problem but hey :D Bapt From nobody Thu Jun 20 16:45:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4mZb4mcgz5P636; Thu, 20 Jun 2024 16:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4mZb4D1xz4qNp; Thu, 20 Jun 2024 16:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718901943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SFrmoCv4tdOdGaR4QYduu/oZZ0clW8iNLVAhklvDQVk=; b=Wf7EJuoxBgUbk10mSVkvVb7qupRMADByCsLuWk8RBEEsmSCCHvJeJBjy+jtnijIIBTe1Qa dKQ6KmBnCVhW9VfjJn2ami+gGuOX4iD/b12Po2jCYKW+tDu5Lowoz0xOMMY2iCfRODUymm pgrOUr9QqzyEMsZqYZ+mLdNsJw57yzypKdCpxfnVllxDINdStvAoJzHagZAVRaIGlG5Sql hwE2Lp5zjbA3XzVqt+fL/3alwv2umSdpXt+z/6BRdHxrMhoPww940NraUKVRo7b2/ydF0S cDbt85qwE3vsUVi4o4Wy9WR0/bIpEHL+VdyvPSfJg7jqg3UZAOKqgHx+yEpXiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718901943; a=rsa-sha256; cv=none; b=eTNR9A6OEIwHBpCY4HyfD33OwRvNNOqdql9LqgRE/p4CbGcb13mmiSB51LwlOjVRhB/LdK 7KX2puSXEDMyZFgbATwdnllOFZMofihPK8OyzfOTx4v5Rcr1Y/ipSbaPePHZmmfKGnqGYD GDWWBwYH5ok1Ng5nqO3wyGuT020grQ+hy6zkLrEBs/JtRNkTmxv9A4vOnZeLSHyazFDrKt 076mg2oDxSOnsX8qcpHGu5G0knmrLQtRBSzM84TB+dT8BHANSYLsckBI+EHmDUabHOSQn5 sWaRoSzK7JhV5SKW+xHR5FWlaCxlDHCT4VPRQXem4JhjcX0AP8+sZSJVcFO/2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718901943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SFrmoCv4tdOdGaR4QYduu/oZZ0clW8iNLVAhklvDQVk=; b=ggHnwxoBTcdEgUiHzvXhaT41FgXzRBSvLEX42gLXJzGaI9ursA64Y6za95Q/8Tx++2l65M urUV/7IYiJ44mEr08zFsC3NCI/52l0agvz8MpJsYq8ivMr4RpIbvDW8or3R/dezjtUdUp8 U8i7hobYYWy2ycWrOvAATT7B2iLi9W4qU9rnDtEDjtrPtdQvr9lMErmKgOfT1A9WmEuGRq j+BYR23qYuLP96Nhlw0G3pVR5obTr9ui5LfGZ1/bPCM/EVOqsK1hwxjDhbQGOnEabWjgEz JS3mqMHlohiNZlzsexWyWzdVtHgNah7cZgRVbj0vIim4RNxM2QUusQL8au/3AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4mZb3qp9zYZP; Thu, 20 Jun 2024 16:45: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 45KGjh3C048087; Thu, 20 Jun 2024 16:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KGjhq1048084; Thu, 20 Jun 2024 16:45:43 GMT (envelope-from git) Date: Thu, 20 Jun 2024 16:45:43 GMT Message-Id: <202406201645.45KGjhq1048084@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: 70c712a86da5 - main - sdt: Support fetching the probe sixth argument with MI machinery List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70c712a86da5d9760074b84dee15e229190bbd11 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=70c712a86da5d9760074b84dee15e229190bbd11 commit 70c712a86da5d9760074b84dee15e229190bbd11 Author: Mark Johnston AuthorDate: 2024-06-20 16:40:25 +0000 Commit: Mark Johnston CommitDate: 2024-06-20 16:40:25 +0000 sdt: Support fetching the probe sixth argument with MI machinery SDT calls dtrace_probe() directly, and this can be used to pass up to five probe arguments directly. To pass the sixth argument (SDT currently doesn't support more than this), we use a hack: just add additional parameters to the call and cast dtrace_probe accordingly. This happens to work on amd64, but doesn't work in general. Modify SDT to call dtrace_probe() after storing arguments beyond the first five in thread-local storage. Implement sdt_getargval() to fetch extra argument values this way. An alternative would be to use invop handlers instead and make sdt_probe_func point to a breakpoint instruction, so that one can extract arguments using the breakpoint exception trapframe, but this makes the providers more expensive when enabled and doesn't seem justified. This approach works well unless we want to add more than one or two more parameters to SDT probes, which seems unlikely at present. In particular, this fixes fetching the last argument of most ip and tcp probes on arm64. Reported by: rwatson Reviewed by: Domagoj Stolfa MFC after: 1 month Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D45648 --- sys/cddl/dev/dtrace/dtrace_cddl.h | 3 ++- sys/cddl/dev/sdt/sdt.c | 35 +++++++++++++++++++++++++++++++---- sys/kern/kern_sdt.c | 8 ++++---- sys/sys/sdt.h | 5 +---- 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/sys/cddl/dev/dtrace/dtrace_cddl.h b/sys/cddl/dev/dtrace/dtrace_cddl.h index 42a4721fbb90..c151c8cf9660 100644 --- a/sys/cddl/dev/dtrace/dtrace_cddl.h +++ b/sys/cddl/dev/dtrace/dtrace_cddl.h @@ -79,7 +79,7 @@ typedef struct kdtrace_thread { #ifdef __amd64__ uintptr_t td_dtrace_regv; #endif - uint64_t td_hrtime; /* Last time on cpu. */ + uintptr_t td_dtrace_sdt_arg[1]; /* Space for extra SDT args */ void *td_dtrace_sscr; /* Saved scratch space location. */ void *td_systrace_args; /* syscall probe arguments. */ uint64_t td_fasttrap_tp_gen; /* Tracepoint hash table gen. */ @@ -110,6 +110,7 @@ typedef struct kdtrace_thread { #define t_dtrace_scrpc td_dtrace->td_dtrace_scrpc #define t_dtrace_astpc td_dtrace->td_dtrace_astpc #define t_dtrace_regv td_dtrace->td_dtrace_regv +#define t_dtrace_sdt_arg td_dtrace->td_dtrace_sdt_arg #define t_dtrace_sscr td_dtrace->td_dtrace_sscr #define t_dtrace_systrace_args td_dtrace->td_systrace_args #define t_fasttrap_tp_gen td_dtrace->td_fasttrap_tp_gen diff --git a/sys/cddl/dev/sdt/sdt.c b/sys/cddl/dev/sdt/sdt.c index 51fa0432437c..461f454186a3 100644 --- a/sys/cddl/dev/sdt/sdt.c +++ b/sys/cddl/dev/sdt/sdt.c @@ -58,8 +58,11 @@ #include #include +#include + /* DTrace methods. */ static void sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); +static uint64_t sdt_getargval(void *, dtrace_id_t, void *, int, int); static void sdt_provide_probes(void *, dtrace_probedesc_t *); static void sdt_destroy(void *, dtrace_id_t, void *); static void sdt_enable(void *, dtrace_id_t, void *); @@ -93,7 +96,7 @@ static dtrace_pops_t sdt_pops = { .dtps_suspend = NULL, .dtps_resume = NULL, .dtps_getargdesc = sdt_getargdesc, - .dtps_getargval = NULL, + .dtps_getargval = sdt_getargval, .dtps_usermode = NULL, .dtps_destroy = sdt_destroy, }; @@ -321,6 +324,23 @@ sdt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc) } } +/* + * Fetch arguments beyond the first five passed directly to dtrace_probe(). + * FreeBSD's SDT implement currently only supports up to 6 arguments, so we just + * need to handle arg5 here. + */ +static uint64_t +sdt_getargval(void *arg __unused, dtrace_id_t id __unused, + void *parg __unused, int argno, int aframes __unused) +{ + if (argno != 5) { + DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP); + return (0); + } else { + return (curthread->t_dtrace_sdt_arg[argno - 5]); + } +} + static void sdt_destroy(void *arg, dtrace_id_t id, void *parg) { @@ -449,14 +469,21 @@ sdt_load_probes_cb(linker_file_t lf, void *arg __unused) return (0); } +static void +sdt_dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, + uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5) +{ + curthread->t_dtrace_sdt_arg[0] = arg5; + dtrace_probe(id, arg0, arg1, arg2, arg3, arg4); +} + static void sdt_load(void) { TAILQ_INIT(&sdt_prov_list); - sdt_probe_func = dtrace_probe; - sdt_probe6_func = (sdt_probe6_func_t)dtrace_probe; + sdt_probe_func = sdt_dtrace_probe; sdt_kld_load_tag = EVENTHANDLER_REGISTER(kld_load, sdt_kld_load, NULL, EVENTHANDLER_PRI_ANY); @@ -482,7 +509,6 @@ sdt_unload(void) EVENTHANDLER_DEREGISTER(kld_unload_try, sdt_kld_unload_try_tag); sdt_probe_func = sdt_probe_stub; - sdt_probe6_func = (sdt_probe6_func_t)sdt_probe_stub; TAILQ_FOREACH_SAFE(prov, &sdt_prov_list, prov_entry, tmp) { ret = dtrace_unregister(prov->id); @@ -515,3 +541,4 @@ SYSUNINIT(sdt_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_unload, NULL); DEV_MODULE(sdt, sdt_modevent, NULL); MODULE_VERSION(sdt, 1); MODULE_DEPEND(sdt, dtrace, 1, 1, 1); +MODULE_DEPEND(sdt, opensolaris, 1, 1, 1); diff --git a/sys/kern/kern_sdt.c b/sys/kern/kern_sdt.c index b7213d2051fc..9704326299e6 100644 --- a/sys/kern/kern_sdt.c +++ b/sys/kern/kern_sdt.c @@ -28,6 +28,7 @@ #include #include #include +#include #include SDT_PROVIDER_DEFINE(sdt); @@ -37,7 +38,6 @@ SDT_PROVIDER_DEFINE(sdt); * dtrace_probe() when it loads. */ sdt_probe_func_t sdt_probe_func = sdt_probe_stub; -sdt_probe6_func_t sdt_probe6_func = (sdt_probe6_func_t)sdt_probe_stub; volatile bool __read_frequently sdt_probes_enabled; /* @@ -48,7 +48,7 @@ volatile bool __read_frequently sdt_probes_enabled; void sdt_probe_stub(uint32_t id __unused, uintptr_t arg0 __unused, uintptr_t arg1 __unused, uintptr_t arg2 __unused, uintptr_t arg3 __unused, - uintptr_t arg4 __unused) + uintptr_t arg4 __unused, uintptr_t arg5 __unused) { printf("sdt_probe_stub: unexpectedly called\n"); kdb_backtrace(); @@ -58,12 +58,12 @@ void sdt_probe(uint32_t id, uintptr_t arg0, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4) { - sdt_probe_func(id, arg0, arg1, arg2, arg3, arg4); + sdt_probe_func(id, arg0, arg1, arg2, arg3, arg4, 0); } void sdt_probe6(uint32_t id, uintptr_t arg0, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5) { - sdt_probe6_func(id, arg0, arg1, arg2, arg3, arg4, arg5); + sdt_probe_func(id, arg0, arg1, arg2, arg3, arg4, arg5); } diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index 147d58c53ef4..0987f1cc19c3 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -419,15 +419,12 @@ __sdt_probe##uniq:; \ * way to avoid having to rely on CDDL code. */ typedef void (*sdt_probe_func_t)(uint32_t, uintptr_t arg0, uintptr_t arg1, - uintptr_t arg2, uintptr_t arg3, uintptr_t arg4); -typedef void (*sdt_probe6_func_t)(uint32_t, uintptr_t arg0, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5); /* * The 'sdt' provider will set it to dtrace_probe when it loads. */ extern sdt_probe_func_t sdt_probe_func; -extern sdt_probe6_func_t sdt_probe6_func; struct sdt_probe; struct sdt_provider; @@ -466,7 +463,7 @@ struct sdt_provider { }; void sdt_probe_stub(uint32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, - uintptr_t); + uintptr_t, uintptr_t); SDT_PROVIDER_DECLARE(sdt); From nobody Thu Jun 20 16:45:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4mZc5bdzz5P5ys; Thu, 20 Jun 2024 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4mZc4v97z4qJr; Thu, 20 Jun 2024 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718901944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6R/pzT3UKy2ZcrCRetF2Np79L1B81aIhmcaf5OKRkM=; b=UjYlbsqoem+GkhY0XEEmJm7lJqUs5tA7ccpgWKQN5PUdyZ/TmWkXcUQFCuSzLvSdanwHTM bviQ+XbZXB3JEuIYZKysF4umhq+bYQNPl43m3PI3Qn3sTlwqyB94kVGQ3gJ2PrUYDqCqeV xPqUV5Ufv+TKvsMFxywmuIPnMtEkD2MD5KTVluTZzqfXYQd/erLW+PuK/ZRBucux0TGjpC SpI2AeJ/AaQ3QOcDeAIRHNYZ+pxmPHxNJjdU1uw9bySJRfUXxC7IJLRTUeQ05LPAO6grOQ 7iQCOhsETJ+uca1Xxig0APUR+DvZuFIsCkZ1G8plRxGMz0FsqQxImivyXCH2Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718901944; a=rsa-sha256; cv=none; b=d2Vys6Ewoy31NTbWVh7iIVq6AkmVZFJMx2GoZyDvTtWX2JyKP7r6vP3NpkFGJy2MAkLrBw Quqtfe3XSvGVNJ3MNvdlCM7YaM8GWEbhK5KZUy7AUf314VZl6a7uK1cHJVVWJXQrU1pSaC UFLYCwKIZ1JDMVR9wE9V9dA+4Dnn9YIl6tt8fXPvM/83i1xUXzTdNkQemz7oEQXfOh3mJ8 3Az8KtKTPX/VAXtMEQcnb35mGSGTBFvLGpFzyn5XvxPOQybJixk/XQfLHraAMtXHhFnedL wSBdHhJg18G5P0HnsmfsOQcClfraGxZ3w9ZkKfarFBCyGVicfNop7fLcpKFlgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718901944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6R/pzT3UKy2ZcrCRetF2Np79L1B81aIhmcaf5OKRkM=; b=RxbblqloMp6RmgChzjmDyBApa2w/T8GnYu8utID/u4MC70BC/nr/A74f9kqeiYowmNz5o6 E2fLYpvM3P/Q4zRI9/ZgjeY5VRQE/UXvHOBPQOcwrlD+/AIo6GqVkjnUiVgin3pVDDP4Sd ONbRPLThkr8ZKSaQBakI2NAP/Dx0cGdJck4m3MQZtUlX7BFWW5STGcFDNEOQEHDHK+KIx/ 3KQFE3rQSjI/gL7NmVXGQoOMkv24d7/458jTROlREA29BoxDBotuma78XpYydqhaOfgK9O o2vmzgo+IdlVpu4aw2q4IXhGIAvNss/juvboiK+igDjK9D0wZes0Y0deZtl5Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4mZc4SkmzYWs; Thu, 20 Jun 2024 16:45: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 45KGji09048141; Thu, 20 Jun 2024 16:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KGjiZR048138; Thu, 20 Jun 2024 16:45:44 GMT (envelope-from git) Date: Thu, 20 Jun 2024 16:45:44 GMT Message-Id: <202406201645.45KGjiZR048138@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: bae00433f013 - main - dtrace: Add a partial implementation of dtrace_getarg() on arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bae00433f013c1c960ab13b9d81edef5a9dbf84d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bae00433f013c1c960ab13b9d81edef5a9dbf84d commit bae00433f013c1c960ab13b9d81edef5a9dbf84d Author: Mark Johnston AuthorDate: 2024-06-20 16:41:01 +0000 Commit: Mark Johnston CommitDate: 2024-06-20 16:41:01 +0000 dtrace: Add a partial implementation of dtrace_getarg() on arm64 For invop providers (i.e., fbt and kinst) we can simply reach into the invop trapframe to fetch argument registers for arguments 0-7; for argument 8 and beyond we have to read the value off of the stack. Reviewed by: Domagoj Stolfa, avg MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D45649 --- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 33 +++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index 34e225f32e81..72944e8a5ae2 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -238,14 +238,37 @@ dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit) printf("IMPLEMENT ME: %s\n", __func__); } -/*ARGSUSED*/ uint64_t -dtrace_getarg(int arg, int aframes) +dtrace_getarg(int arg, int aframes __unused) { + struct trapframe *tf; - printf("IMPLEMENT ME: %s\n", __func__); - - return (0); + /* + * We only handle invop providers here. + */ + if ((tf = curthread->t_dtrace_trapframe) == NULL) { + DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP); + return (0); + } else if (arg < 8) { + return (tf->tf_x[arg]); + } else { + uintptr_t p; + uint64_t val; + + p = (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); + if ((p & 7) != 0) { + DTRACE_CPUFLAG_SET(CPU_DTRACE_BADALIGN); + cpu_core[curcpu].cpuc_dtrace_illval = p; + return (0); + } + if (!kstack_contains(curthread, p, sizeof(uint64_t))) { + DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); + cpu_core[curcpu].cpuc_dtrace_illval = p; + return (0); + } + memcpy(&val, (void *)p, sizeof(uint64_t)); + return (val); + } } int From nobody Thu Jun 20 17:16:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4nFg5m8bz5P8gw; Thu, 20 Jun 2024 17:16:07 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4nFg3fWzz4tsJ; Thu, 20 Jun 2024 17:16:07 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id KFwOswL1HdrxEKLOIs5ANu; Thu, 20 Jun 2024 17:16:06 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id KLOHsqnxXWhyfKLOIsFtnl; Thu, 20 Jun 2024 17:16:06 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=MenPuI/f c=1 sm=1 tr=0 ts=667463d6 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=-1voiWOiB9mMTDoKt98A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C5CA7231; Thu, 20 Jun 2024 10:16:04 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id BC89061; Thu, 20 Jun 2024 10:16:04 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Baptiste Daroussin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 21817992b331 - main - ncurses: vendor import version 6.5 In-reply-to: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> References: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> Comments: In-reply-to Baptiste Daroussin message dated "Thu, 20 Jun 2024 11:27:45 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 20 Jun 2024 10:16:04 -0700 Message-Id: <20240620171604.BC89061@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKL7zIjIaePUOHEUJerLC8v/LDVTMkweX79RSUednx9kH5ZeNLnzPMLSf8s2A7OXWDz1dlVZO26KhCDWzJrDa5INCMq9UW81C6YvQXDKuBMb28X9sR89 7ZZapKe5J+KbtfbRMyL905jcTVQt66CQXY3ZNBgEmNN5OyrtWulxhEX83yRylotjXBbxMb2Ly0YdD59oEGt+J6Vvvf5yES00nyn+PNWZ0QQbRirI5IpRS15Y 26jbDZdTCmFvd01I0MknC9CmlwJLY4X5RAHfpt8U+vs0HSbjJZT9g38UeSVzD0h1tjsX8cU/Hat5Sr7ZiWBTD8VPbtdjdXSNvopUkB9CR8s= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4W4nFg3fWzz4tsJ In message <202406201127.45KBRjoN006054@gitrepo.freebsd.org>, Baptiste Daroussi n writes: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=21817992b3314c908ab50f0bb88d2ee7 > 50b9c4ac > > commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac > Merge: 6eeedf35c3ec 24fa7a5107c5 > Author: Baptiste Daroussin > AuthorDate: 2024-06-20 11:15:14 +0000 > Commit: Baptiste Daroussin > CommitDate: 2024-06-20 11:26:22 +0000 > > ncurses: vendor import version 6.5 > The following errors are displayed by sysutils/screen following this revision. Name collision 'cdc456tst' between cdc456tst and cdc456tst Cannot remove alias 'cdc456tst' Name collision 'tab132w' between tab132w and tab132w Cannot remove alias 'tab132w' And if one does incremental builds, /usr/bin/vi will display the following errors. Name collision 'qume5' between qume5|qume|Qume Sprint 5 and qume5|qume|Qume Sprint 5 ...now qume|Qume Sprint 5 ...now Qume Sprint 5 I hgave pushed a commit to ports/sysutils/screen bumping PORTREVISION to force a rebuild. I wouldn't be surprised if other ports may need a PORTREVISION bump to force rebuilds. For those of us doing incremental builds our options are to rebuild vi (maybe others) separately or do a clean build. Can we add a note to UPDATING? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jun 20 17:26:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4nTk1CVvz5P9N9; Thu, 20 Jun 2024 17:26:34 +0000 (UTC) (envelope-from bapt@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 4W4nTk0LyXz4vm5; Thu, 20 Jun 2024 17:26:34 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718904394; 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=9Ejndme72IY5afPcFSAPGOzf9YjIAIGN18ioDcVxa48=; b=Gv5jJKDTfYVmecjoy9xIy4iVru0GeXBuPX7+6Fiydxurqy2/OKGJWZfrhmiVh+ar/3n4ZF Gf7U6ZHhdREtKxf6hv/3sTJp2wjTW5Blsn8MrJ7FtjiTjP8xRb/kyUoyrTLtwOTBpLgX29 DVHkmgBYQPxaQ6xd8UASLz7dbilnNoltunmxnDq32MgK9tOZF6GkMQcPMNRyoJ8DRKKxDC tCMZi06UB+lzcbcWH+V5heuq8A6E3puwGFu6cjcopIy023MFQrvLR2VgnhKzlHu2A1SNw9 N9FnYFfWkSL76kqvq6W6k3x+gr+jpnZtJN3fAOY1j7e7NkSkgNCwzhL3W40v5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718904394; a=rsa-sha256; cv=none; b=Bbgq46haBR0GJlOloM9MY3mxUH31CQ5EubwwIFAiXj+9cOBmz/315eMflDwVrC2xp1Ie0U xnRq6pKTlvajylwAt5AbRVXDGFprJBEtvcU5uhLN7plrSfngzoE4qeKOAxm/jLDQFIeMIY lg8Tu1pu3qS+4gHBozFDzssJb6wGn52jV4o175D8iVjHUpCLAOYMHlQEUGCDi9THscVl9O 93+cZQKBEzaxNniihR1DYZwspVLWg9amPA1tzWTxKnsVQiYFVraAzKtjm8hH/TD/7NCpA5 AjgFxN4Zyq63Wc4Pac8wg51lls7mDYlJqr5wpHLVdkjz+2VNORAk6YS0SqgDww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718904394; 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=9Ejndme72IY5afPcFSAPGOzf9YjIAIGN18ioDcVxa48=; b=ZAhYdxAQvEechrugXPpVTvI1+ZMGVdIg722dSWbgNSeuZkZ2jX3GT8g1iwnJVStDryPLtY R03n9rY5ewAR4TWLHmV5bAy5H4sZJ6np0/DU9ags0IXMfQvAmEgzOEnuYXSNloIM9xx6Eb 0kbQqC6T7JeAEVVZxoVtrNzbnpX7ot3M/NFpTkQVl6d0gdYENlt/+YWle3WzGHKtT4ViFm G1mqufLYM3OY4FVSGWrG/vLjrsDGZp8vp/6nQrcMYYtYux+K3NOc56sr7xpBfFMcb2DEtS +RQLbL4Hw2zR1L/Pz0TKn06gDLc2fXd6gpMwLn+rGotFPZrJzvWrNV1U2ZOc5w== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W4nTj6LHFz1BLC; Thu, 20 Jun 2024 17:26:33 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 100AA9656F; Thu, 20 Jun 2024 19:26:31 +0200 (CEST) Date: Thu, 20 Jun 2024 19:26:30 +0200 From: Baptiste Daroussin To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 21817992b331 - main - ncurses: vendor import version 6.5 Message-ID: References: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> <20240620171604.BC89061@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240620171604.BC89061@slippy.cwsent.com> On Thu 20 Jun 10:16, Cy Schubert wrote: > In message <202406201127.45KBRjoN006054@gitrepo.freebsd.org>, Baptiste > Daroussi > n writes: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=21817992b3314c908ab50f0bb88d2ee7 > > 50b9c4ac > > > > commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac > > Merge: 6eeedf35c3ec 24fa7a5107c5 > > Author: Baptiste Daroussin > > AuthorDate: 2024-06-20 11:15:14 +0000 > > Commit: Baptiste Daroussin > > CommitDate: 2024-06-20 11:26:22 +0000 > > > > ncurses: vendor import version 6.5 > > > > The following errors are displayed by sysutils/screen following this > revision. > > Name collision 'cdc456tst' between > cdc456tst > and cdc456tst > Cannot remove alias 'cdc456tst' > Name collision 'tab132w' between > tab132w > and tab132w > Cannot remove alias 'tab132w' > > And if one does incremental builds, /usr/bin/vi will display the following > errors. > > Name collision 'qume5' between > qume5|qume|Qume Sprint 5 > and qume5|qume|Qume Sprint 5 > ...now qume|Qume Sprint 5 > ...now Qume Sprint 5 > > I hgave pushed a commit to ports/sysutils/screen bumping PORTREVISION to > force a rebuild. I wouldn't be surprised if other ports may need a > PORTREVISION bump to force rebuilds. > > For those of us doing incremental builds our options are to rebuild vi > (maybe others) separately or do a clean build. > > Can we add a note to UPDATING? That should not happen, on my system I have newer ncurses and /usr/bin/vi from before the new ncurses. ALso I have installed screen from packages (thus built before the newer ncurses) and I don't have the issue you are stating! Best regards, Bapt From nobody Thu Jun 20 17:53:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4p595BV8z5PC8T; Thu, 20 Jun 2024 17:53: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 4W4p594h3Gz4y4f; Thu, 20 Jun 2024 17:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z+yPIhNOynaxDjNBsiT+vmjfx9HQs2aMGsbRMKUQ2mc=; b=p+9JWHSn6kc8z0unGbS7C5TxpGWn+DpW2n3y54gyhcDDK1zKG00xQhT/sQnmIbVrRfomhi kplcc3C4g+7NDjD03+C3VZfy4PCDimrIbC1tEwIE/pkuUwYokuFTudsTUaQsR55stgl+IM DsZy0gF24PoN79OLzd/mbmb5b6aC0/CM4kAodQiPSx5qE2ukl9t0Osdhvv6jazm58YrWGH OLUi7byqjjVXIegNdjY2IH+7V4CdgSMX78ticGpkNDwxsDkcSDzEU3tmCM5QSKGBL2dwwD qBcwGw0VztQ0D+iDUEmdJ0ladKpha3fdr/YwXBN9rsS78tMSYx+avLePl/sI9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718906029; a=rsa-sha256; cv=none; b=Tu+PLARtIgDc6X6bM0+h5TvCElXKdARuKPO2ubdrnqmpmI66fecoMxqCBDMBKCYRa2jxlp /IWr16oaC5xLhFJGKJYSE8ReQD+nGQXiFIWdHv3K0cBgJQDsfHB7EzTvDhztAVRW11bl90 KIzBTG2Yi1GtZvoqpYhphjGW8SC4S1dJWiHcLMISVNUS1BB+SPr/D3pyWCDrfLwuTjjbcA DUyUBpF9sIzaM57ZGYyKCygLvePglZugrYjMmFCsqN1v7NqLpWsp4ej6boHZuwDa723Bis 3CIePhin0ytcsNQmqDh1Tml23ZO8T6dYlK9vNmgNgC/1bZo7IsFaw10xt/4Ieg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z+yPIhNOynaxDjNBsiT+vmjfx9HQs2aMGsbRMKUQ2mc=; b=IzevpCzBACWigYSZYe+QCEozhjcPpYX7VTxMyVSHSCR4aJP90Pf9j3Aj65OXvI/NBnkg5X vXeguijxDbP1vK5KKsE4uZg1XvFAvX0ONrJI+MJMKq8m8ecf1j9If7zlot76LSDEQj06nS SkCEJ8OGro07WVBb6ji6v9LaQyQosyA4YmQfbvYxWMOV4weyiocSNVTXQ75sDmlmLcBaEc Zp+uwkxTa4TiSpbndeJFxFO9QcBv5gwXu9kFpy0ArRXSb/7wXsG80JTxsZ4SHFGbIHLsY4 eWOmEZSdW8WC/nQO/W6bGI72mdV/yVu8BUeTTyj4iUX0TQ1w0vnvHe3KhkTkqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4p5948SWzb3r; Thu, 20 Jun 2024 17:53: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 45KHrnJS065836; Thu, 20 Jun 2024 17:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KHrnjw065833; Thu, 20 Jun 2024 17:53:49 GMT (envelope-from git) Date: Thu, 20 Jun 2024 17:53:49 GMT Message-Id: <202406201753.45KHrnjw065833@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: aaef18e6ae28 - main - rwlock: add static qualifier to implementations previously declared static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaef18e6ae2809f4b399e9da419699ef570a71f4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=aaef18e6ae2809f4b399e9da419699ef570a71f4 commit aaef18e6ae2809f4b399e9da419699ef570a71f4 Author: Gleb Smirnoff AuthorDate: 2024-06-20 17:53:31 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-20 17:53:31 +0000 rwlock: add static qualifier to implementations previously declared static --- sys/kern/kern_rwlock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 28dddb950966..29767f09b304 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -157,14 +157,14 @@ LOCK_DELAY_SYSINIT(rw_lock_delay_init); #define __rw_assert(c, what, file, line) #endif -void +static void assert_rw(const struct lock_object *lock, int what) { rw_assert((const struct rwlock *)lock, what); } -void +static void lock_rw(struct lock_object *lock, uintptr_t how) { struct rwlock *rw; @@ -176,7 +176,7 @@ lock_rw(struct lock_object *lock, uintptr_t how) rw_wlock(rw); } -uintptr_t +static uintptr_t unlock_rw(struct lock_object *lock) { struct rwlock *rw; @@ -193,7 +193,7 @@ unlock_rw(struct lock_object *lock) } #ifdef KDTRACE_HOOKS -int +static int owner_rw(const struct lock_object *lock, struct thread **owner) { const struct rwlock *rw = (const struct rwlock *)lock; @@ -1524,7 +1524,7 @@ __rw_assert(const volatile uintptr_t *c, int what, const char *file, int line) #endif /* INVARIANT_SUPPORT */ #ifdef DDB -void +static void db_show_rwlock(const struct lock_object *lock) { const struct rwlock *rw; From nobody Thu Jun 20 17:53:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4p5C00jYz5PC8Y; Thu, 20 Jun 2024 17:53: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 4W4p5B58nyz4xyn; Thu, 20 Jun 2024 17:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hP2rRxPuYLKjFDsPylaHnNRy9RBdGxtNgS7rdpHDRQk=; b=dkwNx6ZmNKoYXYl92n9QFk212p6jtQQNmaYjz7IUT4fuOjGqNj5IAKFV+tIO06IoTqLWD0 /+H7j4jRrx/7ppWsCvcX2RTAG6ql8wUDQxM0bgvSAmhXVXCxAAgwEKG31NgVHmU5how+m/ OuaOPQ9ST0Kf5rhJ2dLaz9jW2nwFgPUk4XoOV+Yes3LC9qfQfZtC62X8mlinNsExI4cQDw hJAPIXwrvdMRTZ+uW08yoiU1sTyRepEDupRlBZVTN4K2bHfRIShukLC2beTNWG4Rms1Wi+ 6HluSUurAXYBv01Sr0zQ6gn9u2rimTbvjRW7RS9D/xKuBfSviJR/f9GVwRq/dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718906030; a=rsa-sha256; cv=none; b=XRmPXWPHK8pERHI+7m7hr9ARjPd51mnrvNINLFdnZ7VjkMViaedP0zt4cT4oPDawd6IeyN YIWCV3jcdLQKlwEP+eQh1E1Nvzu939N1/4iaDBcK0g72DEFKS5XBCvs+TGtEd2Io8HJdl6 Dq1OmITPJdzTYYwiUoWC1mlJUXvT3FZI++H7OIm6niCMHs0ndkfMi2111hxr3Mhy2K1TPH 6c7CuxDum7i4CcBSLiAsQ6v3y3fLXgfh+XronVAQYUXf3Wpws+NNJ4MzcsxoZS8IXSuj+f zAxYERQBSRjQ9sUSCFZU1LwtSm22o1U8GpLOCRSErDQXQidVVOWVg8kLoW/nBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hP2rRxPuYLKjFDsPylaHnNRy9RBdGxtNgS7rdpHDRQk=; b=llQxPf9VnWmkOWRBxz+9d9ZdNOGHli6FTEUzgRcF7F9iAZS8KpyMC+e2MXITpTFVrF032c eLWw1KoHPijMo8J7jr4dbAy8Q1HCRdInDESWr48DxkVvbU745z2AILnZOew4ZUaZVGFhyi MeJnm3Ysx7nGN6hpKle4wJwKq+sducmQAX/++di8auuQByEBBX2NEyr/eLmbzKNZVoZENB BCnzPhLe3ir+U9T05Nd6ONmtkCFtyLB+fqXaUePe18sX6xHoWtzu4pN4vQu5OpNXT+SL4l 07pmszcxPu1FFLNK+WDZDnh2elwYZVve4JLGty3prPVHQ10pEIs9Dly7QpLMMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4p5B4nDLzZn0; Thu, 20 Jun 2024 17:53: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 45KHro9C065890; Thu, 20 Jun 2024 17:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KHrohH065887; Thu, 20 Jun 2024 17:53:50 GMT (envelope-from git) Date: Thu, 20 Jun 2024 17:53:50 GMT Message-Id: <202406201753.45KHrohH065887@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: 95a9594adce3 - main - mutex: add static qualifier to implementations previously declared static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95a9594adce38946168c6718819402d9adba9847 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=95a9594adce38946168c6718819402d9adba9847 commit 95a9594adce38946168c6718819402d9adba9847 Author: Gleb Smirnoff AuthorDate: 2024-06-20 17:53:31 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-20 17:53:31 +0000 mutex: add static qualifier to implementations previously declared static --- sys/kern/kern_mutex.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 92be72546b46..90361b23c09a 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -180,7 +180,7 @@ struct mtx __exclusive_cache_line Giant; static void _mtx_lock_indefinite_check(struct mtx *, struct lock_delay_arg *); -void +static void assert_mtx(const struct lock_object *lock, int what) { @@ -202,21 +202,21 @@ assert_mtx(const struct lock_object *lock, int what) mtx_assert((const struct mtx *)lock, what); } -void +static void lock_mtx(struct lock_object *lock, uintptr_t how) { mtx_lock((struct mtx *)lock); } -void +static void lock_spin(struct lock_object *lock, uintptr_t how) { mtx_lock_spin((struct mtx *)lock); } -uintptr_t +static uintptr_t unlock_mtx(struct lock_object *lock) { struct mtx *m; @@ -227,7 +227,7 @@ unlock_mtx(struct lock_object *lock) return (0); } -uintptr_t +static uintptr_t unlock_spin(struct lock_object *lock) { struct mtx *m; @@ -239,7 +239,7 @@ unlock_spin(struct lock_object *lock) } #ifdef KDTRACE_HOOKS -int +static int owner_mtx(const struct lock_object *lock, struct thread **owner) { const struct mtx *m; @@ -1314,7 +1314,7 @@ mtx_wait_unlocked(struct mtx *m) } #ifdef DDB -void +static void db_show_mtx(const struct lock_object *lock) { struct thread *td; From nobody Thu Jun 20 17:53:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4p5D6Pcpz5PCVp; Thu, 20 Jun 2024 17:53: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 4W4p5C6347z4y72; Thu, 20 Jun 2024 17:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C/zbLobjqfo24PEmn46HScYjZTvmT5mqYK7HqdNsIco=; b=uexkN84PZH8Oe6MNPO0hEPjT1y3IpLCKjDREtWT/lwS5Vr50eYkTuyBvQflMZr5kQKriiP PQtUQthPb6KVx0lAflh/le3HPhgyOeniibR6iC9ewBujVtJrzZy3nzitJgnqmFKqd0s+eG JtoeVdnBhjKAfCsNAHf3DVm0lO8YM6QOIVURTqkx4AwaNY9EUUmrSRcmSweAsnwVprsj5P ubuGEtmSvSDVn00f+qHvew75MTWZBLTFrMJaM5HlxMm8lnyExgbKyhma9e5sYZsFTV2zg1 hCOa7tHEB4YYcaRAzcdYasjI76c7qBHM4MtmiQrn54RPcEvBwZBr0xqAIvTQBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718906031; a=rsa-sha256; cv=none; b=HQ9PikmzMJOBCuVLpDe1VowN6fLx2i0S3LhN8wKxGS5ly5NqG0PBP4kxxfIdh9VRLTwZfu GaHc8WmtIHD02BI5dKcgI0+apJgKWtdYYK+64xLuuM9n3RRRz9ylX4K9tPQWEu9eEWTX9s sSkxrBfG57bU+UTXHvkwKHFspN9HkRcEeQvBUC3L1D4st8KvrTqdNvUJF/fm1yFiiKsrBV Oho4ij3qL2LXEWEC4yhNRU6iKX7rLKo/X723VmKLB8Gn0LEUB5pzyklOLDETIjxhszuAwR E1x6guHlI0GqvKww6bOJ8fXQUlMFBJwFK0veLwdT4dZ0Pin7P6WpZak9JFbm8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C/zbLobjqfo24PEmn46HScYjZTvmT5mqYK7HqdNsIco=; b=YUAPQK9/PsPXwTmyawpFJXmZpeD6VghWNf99N91ENfVgs2fjJRdEe4+uPEFZYY7XHKC0rI K1TjyWct3V8JWUDwmY8VZC5jRnIZ3/n2TzwDcTN7Kl+cxsO4p9lNP1sQWEJj/xKE/LZTKR aAoRe9m3HJkk395StfU2U23uf9gu0Xq41qTT3JjzL8o+0yg5RwefJG487JGh00ykRkM9dv J/7R/hrSXH4dc0F/pxbeY+qhMx3n95Eq8gAPu2zfTXOt/nykKALo/xd33m5i6Or31kuONc zBQxOLtiwAuRNJ1PDIPyWp+205UdPtwBb/VLhWtUh+g8uyIUqNSood1gmAtssg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4p5C5TtYzZn1; Thu, 20 Jun 2024 17:53: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 45KHrpd1065935; Thu, 20 Jun 2024 17:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KHrpVm065932; Thu, 20 Jun 2024 17:53:51 GMT (envelope-from git) Date: Thu, 20 Jun 2024 17:53:51 GMT Message-Id: <202406201753.45KHrpVm065932@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: 39afff09c550 - main - callout: tidy up _callout_init_lock() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39afff09c5509c2e838c370a0c476dd9ac97d622 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=39afff09c5509c2e838c370a0c476dd9ac97d622 commit 39afff09c5509c2e838c370a0c476dd9ac97d622 Author: Gleb Smirnoff AuthorDate: 2024-06-20 17:53:31 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-20 17:53:31 +0000 callout: tidy up _callout_init_lock() Separate function into assertive part and into assigning part. Consistently use __func__ in the assertions. Write the assigning code in a declarative style. The functional change is that we no longer validate flags in the non-INVARIANT kernel. The assertion that checks flags has been there for 17 years, so all code that calls with invalid flags must have been filtered and fixed. --- sys/kern/kern_timeout.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 5f2d78285c66..e06cf997ab8a 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1331,16 +1331,18 @@ callout_init(struct callout *c, int mpsafe) void _callout_init_lock(struct callout *c, struct lock_object *lock, int flags) { - bzero(c, sizeof *c); - c->c_lock = lock; KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED | CALLOUT_SHAREDLOCK)) == 0, - ("callout_init_lock: bad flags %d", flags)); + ("%s: bad flags %d", __func__, flags)); KASSERT(lock != NULL || (flags & CALLOUT_RETURNUNLOCKED) == 0, - ("callout_init_lock: CALLOUT_RETURNUNLOCKED with no lock")); + ("%s: CALLOUT_RETURNUNLOCKED with no lock", __func__)); KASSERT(lock == NULL || !(LOCK_CLASS(lock)->lc_flags & LC_SLEEPABLE), ("%s: callout %p has sleepable lock", __func__, c)); - c->c_iflags = flags & (CALLOUT_RETURNUNLOCKED | CALLOUT_SHAREDLOCK); - c->c_cpu = cc_default_cpu; + + *c = (struct callout ){ + .c_lock = lock, + .c_iflags = flags, + .c_cpu = cc_default_cpu, + }; } static int From nobody Thu Jun 20 17:53:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4p5F1jtJz5PC8f; Thu, 20 Jun 2024 17:53: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 4W4p5D6nLTz4y2V; Thu, 20 Jun 2024 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZR1Jh3pHIQOZyqSuHxNHMxTonIupDMvlNoDNIylqmc=; b=JLh8mEZ8+CrTggXdBrdYdgbdZruX93eGosxRwzFf5AM0T3E5xTez8OhuDhX1bvZ8JKwcHB 5z4NRQDw1qmCaB7RBSlOKOUJL18fqlpNMfpvT9cuI8UC/pcAWEAmI/EC4G5/uAazkZdA1H E4F/ydlW+CVe4qsfWKhAa4JSxwnx9LgO0iQ6f4TAl/TJ0//8E9tm0HLWS3F4n/QQ/Ln3cI GW9SUwZBa7boOkD8YJcm3a0ToBoNg9eVHQEdLNaPqwA8xoI/VD+m047vsrfi24uHxAI9Dl xCYmNohKthZBay6uqGwYrZ8XOZAuH7HfSc8exwFuhJbd/5tbJZfTOKxQvYCbpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718906032; a=rsa-sha256; cv=none; b=P8gNtHl9bKNnv7MY6oVDlM/zIozu//93Fq0NDbVJ1Wukm1jq4MBwzMJrmWWTBUW96aOwGr T5t4JcHuX9f667Gupfwzl1xnB30OhJUYzRk+UmCXOhsDUSOW78kVGHtIXZD+uXO8ghS9F7 IFL4uJ16zMYbYkSxV2Qa2YslLvSEpk0SSiIbqDD+Fbxxrn6Ze60P9ilChx5Lpo7Eh6vrke t+ZP9ZYh+P97vwiiqXP3D9tMEBXcrUJTigh1nlj83fhUKazOeU4g30OvzdBnR5MwF8zcy3 XbLqOD9Mn40LoQIGeDXWdl+sakGyqIw4dUyDKadksCvykTtXvBE9RHhAaqBdFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZR1Jh3pHIQOZyqSuHxNHMxTonIupDMvlNoDNIylqmc=; b=eGMyDgS4mEFkv3Q0xxUnAEFK1LlJBry4R+kgWH0nQB/d+RGnQiwiP1RJY3FDl/MCzWa2JI ntcu5sEhsK1Wkv3qnfjdfMU1mJBJBoBIrvzWh6sl6YapSGl9GcYmf7Ut21lzhuaR6YH/PS ciSO2v59I0LDnLgL+rHDxMuquyHtf55nLti1bIXJ2dnCMbc6nKKPM8jABgbDM41BsFJEtR UInU0vK/U9cTFuEXxBWiRWwJQW4uxw4rbA+x/6sn+ShtjPyeOVL8aLNaOx/WNSP2AK89rQ 6yf+T8iok7n/0Rh80pxUuJCkzCi6tjGHZ8ZqVnk+yvI17vVxiBV3dJDHL9+zJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4p5D6GH4zb18; Thu, 20 Jun 2024 17:53: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 45KHrqs5065993; Thu, 20 Jun 2024 17:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KHrqFr065990; Thu, 20 Jun 2024 17:53:52 GMT (envelope-from git) Date: Thu, 20 Jun 2024 17:53:52 GMT Message-Id: <202406201753.45KHrqFr065990@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: 3beb43dd4f87 - main - callout: assert that callout_init_*lock* functions are called with a lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3beb43dd4f87fee0a8f5536ad103664374f9b97b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3beb43dd4f87fee0a8f5536ad103664374f9b97b commit 3beb43dd4f87fee0a8f5536ad103664374f9b97b Author: Gleb Smirnoff AuthorDate: 2024-06-20 17:53:31 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-20 17:53:31 +0000 callout: assert that callout_init_*lock* functions are called with a lock Quick grep around kernel confirms they all do. --- sys/kern/kern_timeout.c | 5 ++--- sys/sys/callout.h | 9 +++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index e06cf997ab8a..699a57d51f0e 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1331,11 +1331,10 @@ callout_init(struct callout *c, int mpsafe) void _callout_init_lock(struct callout *c, struct lock_object *lock, int flags) { + KASSERT(lock != NULL, ("%s: no lock", __func__)); KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED | CALLOUT_SHAREDLOCK)) == 0, ("%s: bad flags %d", __func__, flags)); - KASSERT(lock != NULL || (flags & CALLOUT_RETURNUNLOCKED) == 0, - ("%s: CALLOUT_RETURNUNLOCKED with no lock", __func__)); - KASSERT(lock == NULL || !(LOCK_CLASS(lock)->lc_flags & LC_SLEEPABLE), + KASSERT(!(LOCK_CLASS(lock)->lc_flags & LC_SLEEPABLE), ("%s: callout %p has sleepable lock", __func__, c)); *c = (struct callout ){ diff --git a/sys/sys/callout.h b/sys/sys/callout.h index f2a5bf92ab46..5d0d896b5d3b 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -85,14 +85,11 @@ void callout_init(struct callout *, int); void _callout_init_lock(struct callout *, struct lock_object *, int); #define callout_init_mtx(c, mtx, flags) \ - _callout_init_lock((c), ((mtx) != NULL) ? &(mtx)->lock_object : \ - NULL, (flags)) + _callout_init_lock((c), &(mtx)->lock_object, (flags)) #define callout_init_rm(c, rm, flags) \ - _callout_init_lock((c), ((rm) != NULL) ? &(rm)->lock_object : \ - NULL, (flags)) + _callout_init_lock((c), &(rm)->lock_object, (flags)) #define callout_init_rw(c, rw, flags) \ - _callout_init_lock((c), ((rw) != NULL) ? &(rw)->lock_object : \ - NULL, (flags)) + _callout_init_lock((c), &(rw)->lock_object, (flags)) #define callout_pending(c) ((c)->c_iflags & CALLOUT_PENDING) int callout_reset_sbt_on(struct callout *, sbintime_t, sbintime_t, void (*)(void *), void *, int, int); From nobody Thu Jun 20 17:55:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4p7S4z7Bz5PCk1; Thu, 20 Jun 2024 17:55: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 4W4p7S4GkXz50bQ; Thu, 20 Jun 2024 17:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5PHcZTHqZ8MONPt/c35vuf9cuIfWSBJ0Cr42aGR2cM=; b=t4zxB44xu/7xupYQe2jzt7RIUkROUXxUBQ+knGGGmiPcOwS/9OzjHKfTKJPX9CtHh3tjsl oNQkxIYwxA01AXXuVh1Iss3YyRmEkWkzNgVZZnc2kF4f5Ty1ThTMGvwe92AJ3univx8QAC HG+5B/BWL4lHVNHhkqMlY/ms1W8inoh/SEKnswvUWFeli78uv/VHAkJK2a7mIMma3C1Oqw 8R2l1Z13EzAtlShJacH1FTPZFprThkGVPWKvMOj6GbrMYCT71tuujKAzyF7NBG8MFrrYtb TJXKYFfgSgxMm/HXmS6IbtvfPv+XcDpDjNkcwPHzP9y12YcA4VnbQnifzKKoMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718906148; a=rsa-sha256; cv=none; b=LPkZR3ieJHyUYEWRnWmz4oGG9wWjZA4jLHZr6wbjHD0CfHqkVFwErb7Sm75XDwCYSnKu2W GJz8DHdi4uli8Tlh37mYLpWBD+7zuiFZKjX85r22DKqR0viAB0nykjtiUAOwtpQiETLn53 l/0N9XtQtlH+SGKNjFDWkp0Oohp3x1uSpy4W/ohlqrLHGF5KiIaEnJuHkL7LKlvWlBhajL LjyBd9nOeBsvIAspi8gq80b2ZfyFmcUuTOlcY6C+UPQOhs6bpM+ln/8FcWR0MLxIsMMCSM dHRqueWNbr8WM1XQLd5djCuutDHPdQTWdAg57oIsj3y2m52Ny8ekbSu/ZvpKpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5PHcZTHqZ8MONPt/c35vuf9cuIfWSBJ0Cr42aGR2cM=; b=AgeEwq0f4Dv2zfNC7NrfblNR7/RbqXZEBa0T/r8hIwt/rHcekJy/+rjLs5c7MQQUuzHfdt 4yp3GAy+5Sx2VQiavuMQjejPg7ha5M2Cj6jsndBXKzTeX4JyzZuKKtvYE0bxJ6fnNOSPpT xzkXfVGn9mE24llILJ2XL3P4mSU9EPBL3Yj2XlyppDRubeMbCKZafAzymL/niQA83eXy4l YErr8fjAtFoiaxL4JjqaPK8rpVfd51TzqxtY8xtGOV9ioE+DTwMsYM4UIAz9/vWeguz3W3 WtvCghuU5XHl/MJHONtyzO2V30h482eq2B2Fy0kpmIG1X2c/af87NZaUStFlKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4p7S3ZVWzb3s; Thu, 20 Jun 2024 17:55: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 45KHtmOC066442; Thu, 20 Jun 2024 17:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KHtmG1066439; Thu, 20 Jun 2024 17:55:48 GMT (envelope-from git) Date: Thu, 20 Jun 2024 17:55:48 GMT Message-Id: <202406201755.45KHtmG1066439@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: b6196537b012 - main - pf: fix the "keepcounters" to stop truncating to 32-bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6196537b0125c50f25bd64ed60e1cdd635ecd34 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b6196537b0125c50f25bd64ed60e1cdd635ecd34 commit b6196537b0125c50f25bd64ed60e1cdd635ecd34 Author: Mateusz Guzik AuthorDate: 2024-06-20 17:48:52 +0000 Commit: Mateusz Guzik CommitDate: 2024-06-20 17:55:43 +0000 pf: fix the "keepcounters" to stop truncating to 32-bit The machinery to support 64-bit counters even on 32-bit kernels had a bug where it would unitentionally truncate the value back to 32-bits when transferring to a new counter. This resulted in buggy be behavior on 64-bit kernels as well. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 15 +++++++++++++++ sys/netpfil/pf/pf_ioctl.c | 10 +++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index d6d01c9b5970..62c367fe6a29 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -127,6 +127,14 @@ pf_counter_u64_critical_exit(void) critical_exit(); } +static inline void +pf_counter_u64_rollup_protected(struct pf_counter_u64 *pfcu64, uint64_t n) +{ + + MPASS(curthread->td_critnest > 0); + pfcu64->pfcu64_value += n; +} + static inline void pf_counter_u64_add_protected(struct pf_counter_u64 *pfcu64, uint32_t n) { @@ -250,6 +258,13 @@ pf_counter_u64_critical_exit(void) } +static inline void +pf_counter_u64_rollup_protected(struct pf_counter_u64 *pfcu64, uint64_t n) +{ + + counter_u64_add(pfcu64->counter, n); +} + static inline void pf_counter_u64_add_protected(struct pf_counter_u64 *pfcu64, uint32_t n) { diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index f801afd9da80..2cb6923e1e69 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1408,15 +1408,15 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) continue; } pf_counter_u64_critical_enter(); - pf_counter_u64_add_protected(&rule->evaluations, + pf_counter_u64_rollup_protected(&rule->evaluations, pf_counter_u64_fetch(&old_rule->evaluations)); - pf_counter_u64_add_protected(&rule->packets[0], + pf_counter_u64_rollup_protected(&rule->packets[0], pf_counter_u64_fetch(&old_rule->packets[0])); - pf_counter_u64_add_protected(&rule->packets[1], + pf_counter_u64_rollup_protected(&rule->packets[1], pf_counter_u64_fetch(&old_rule->packets[1])); - pf_counter_u64_add_protected(&rule->bytes[0], + pf_counter_u64_rollup_protected(&rule->bytes[0], pf_counter_u64_fetch(&old_rule->bytes[0])); - pf_counter_u64_add_protected(&rule->bytes[1], + pf_counter_u64_rollup_protected(&rule->bytes[1], pf_counter_u64_fetch(&old_rule->bytes[1])); pf_counter_u64_critical_exit(); } From nobody Thu Jun 20 18:08:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4pPr0rfyz5PDHV; Thu, 20 Jun 2024 18:08:16 +0000 (UTC) (envelope-from bapt@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 4W4pPr05dGz52N1; Thu, 20 Jun 2024 18:08:16 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906896; 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=I9aASZYIYMpFKRtVVLvf6IKS7Mp4OdV87hCHgFfWkuo=; b=NZUQxTxlGuQgE7vRKMGanlR2A4UH67sJiCwkmy/2Hg0xT31NnOxiG6o0H8y82IhHako1d+ IciMKa7snvx7K6lMie4bl+GpgixUeMxU+ofmY88rH9sAeNGEpewPe+wqwikdVcc4CcVQPy LLzAgGvmWKZY6bVuqngQx789iFR95vD9dW2z9b5ei/QJAPFsVobid6+Rua3CPMGOUDqlvp OSzcvCg/HMTnl3Ei8OpFYNLAAEDScoHGWkbM18kJKKeeVaDUq+rHlI9UtH8KUN7qhjPXMs VZ+7WQR8eWdfmtAK8iedG3lZscsdSe1u5wFQJiRyjU6/fWeFPHJdbwdx6KjrBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718906896; a=rsa-sha256; cv=none; b=A64xTvi4ovoMT3nqzUL44rr3qKTMUTeO8wZ+MjMPilrblfOGnidW+PprvG2993kCAxuHne M9z67TRmxv4Y6DFHR3f4d8TFGgixn16+tBV0iizw630aH0TV/se7cTsJcZG9FWFqcU1rVj mdTySzVsCHynawUrHVzmY0rwp8SODRFfjkElJV/BXxjEgoCcnkgEsxpIOVfuECrh3YaUt/ 8L5tolm0Io6bSkQNUk4X+Hz+1AX6P2gS42njTItGrc3VFRgTiXL3jWeIHGhoggDhwHlvNS /x29uBRvYxng7tIiMJjOMUP//uUU+sYOnFAHrEOC8ftPo3GBvrYsD47QTaL5RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718906896; 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=I9aASZYIYMpFKRtVVLvf6IKS7Mp4OdV87hCHgFfWkuo=; b=t1beEjR+ESSaGJ8OVvSh0zXX6v9cIdoQMJidLivrsG7oGWxmZ+yn8/nKjjeavmeIz27o/c 2tx/lplEY1G9xb2qinuaEJT4xGpLReTdSFYnuztDTOA150qEEg5pzHo49UJHSJ+ZrKyBVD 4HTIkzIlf87O2Vs0Ss37GiPO88iT4W9Q+BY9IpEcpUdo6XTZW9dC228V+HhYb9l7vWcFTx nfdZye5H4UOCjNqnaMfUrnAfZQ+d6NsypenFbIKbcbVGohWb/WON3rc2ea3sNaN1odpjh2 etnbvkkXzsZmKWJ6FPaL0BI7SkB+D3dOtxw1ZqDjojggCPHF01f3KxHWKdP2IQ== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W4pPq670tz1Crm; Thu, 20 Jun 2024 18:08:15 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id A9F7696BC8; Thu, 20 Jun 2024 20:08:14 +0200 (CEST) Date: Thu, 20 Jun 2024 20:08:14 +0200 From: Baptiste Daroussin To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 21817992b331 - main - ncurses: vendor import version 6.5 Message-ID: References: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> <20240620171604.BC89061@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240620171604.BC89061@slippy.cwsent.com> On Thu 20 Jun 10:16, Cy Schubert wrote: > In message <202406201127.45KBRjoN006054@gitrepo.freebsd.org>, Baptiste > Daroussi > n writes: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=21817992b3314c908ab50f0bb88d2ee7 > > 50b9c4ac > > > > commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac > > Merge: 6eeedf35c3ec 24fa7a5107c5 > > Author: Baptiste Daroussin > > AuthorDate: 2024-06-20 11:15:14 +0000 > > Commit: Baptiste Daroussin > > CommitDate: 2024-06-20 11:26:22 +0000 > > > > ncurses: vendor import version 6.5 > > > > The following errors are displayed by sysutils/screen following this > revision. > > Name collision 'cdc456tst' between > cdc456tst > and cdc456tst > Cannot remove alias 'cdc456tst' > Name collision 'tab132w' between > tab132w > and tab132w > Cannot remove alias 'tab132w' > > And if one does incremental builds, /usr/bin/vi will display the following > errors. > > Name collision 'qume5' between > qume5|qume|Qume Sprint 5 > and qume5|qume|Qume Sprint 5 > ...now qume|Qume Sprint 5 > ...now Qume Sprint 5 > > I hgave pushed a commit to ports/sysutils/screen bumping PORTREVISION to > force a rebuild. I wouldn't be surprised if other ports may need a > PORTREVISION bump to force rebuilds. > > For those of us doing incremental builds our options are to rebuild vi > (maybe others) separately or do a clean build. > > Can we add a note to UPDATING? > I found a way to reproduce, I will fix! Best regards, Bapt From nobody Thu Jun 20 18:28:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4pry0tLWz5PG51; Thu, 20 Jun 2024 18:28: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 4W4prx5j8Mz53NV; Thu, 20 Jun 2024 18:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718908097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBffDIgjS6axorQnwEo9X04k0EfvZ0/GANyfZKGChCk=; b=UJdXMk15QNgHNsvFerKgHZdbAE4JbcfK1m42kYZpGVIeBpHebWjnGP4zu4po+xZbhf8UX6 jF9PHvEGRmCHGn6B0ntikTyHfwOQC03137jtc9v5nspmZXrRAFsmVX3CNuG9Moz0KD4O+X XKsPt8QZeA98glGrhf/DIaNSODsOmg5to0464IHaOkZTB3LKLN8us2DFgw3TCQuzCPRfWE lhrDkSuCNzA0h4b8Pug9YHM5sgeLp80U9sItzMpfCByOFCnudyh0I/BPLVzkp8SR7SS42g 81VFhDMBGjNWM+7uIr8WZEcxbSLwnPztGvTwqfXRE7x9Bb6GpmvYeWjpavofZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718908097; a=rsa-sha256; cv=none; b=X3qhNXLTof/s/BYXkBUgVkdVKcVEZLATkhw0sNq4P0XB+ew4b+l6o+SHUWYOZbKmmWsI6j IAEP08zlDVkFg8e461Yjb16rFtuGFooMd0YGQzjhm0a8dlCZCT9LHYVpzk14RHKnfBC4hz 3IkgQQ0Sx16X/1VPsTt8ud/rY1svkES8I5NU4zWe1aOHYgwDB+0YkNEOpvN4hrneOG64Aw ereAlXgQV/Z3pNpD/3TVWpp9RwYMpgzizYktnpvMDAZWFTCg1dD0T3YDaGx4sQqQl/i75X K3oKnntlOsxHMqDh8T/lWFP72P9qQZ9EiG2/dKG6gXJGlXMKyoN5BQV+WUbVBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718908097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBffDIgjS6axorQnwEo9X04k0EfvZ0/GANyfZKGChCk=; b=ceZfHQ/7QETTGRGEHEu320fgjZD1NhavY3HQljLaEMIj/Ag1joMbhtbPfV+1KIwuARi5R5 A3w1ywYn7foXhejdeVj1vkMJw3Adke4ZmHDtmtLsvXy03DmiHUiI24JPHo3YeO8o0WaKDA ZyBSdqB0i06SeGHrucy20wO29/u/qxHy4GdGl6171Y8rnli71oQ7zPPAzkWLwZor5AFPpk fpkaZ4/9frO2nGfv+qgFzEEnCGJCFRZIHpbhkw1+GiexDLDVdm/nXcDy9vCPaHfnh/FcWw KyiOmMDqYnLKXjawBAFVIsDois1jRVH/YqCPgVpYeO6aPNC4pJmlFDFSZY0o0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4prx5JbDzbxs; Thu, 20 Jun 2024 18:28: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 45KISH6H017614; Thu, 20 Jun 2024 18:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KISHPQ017611; Thu, 20 Jun 2024 18:28:17 GMT (envelope-from git) Date: Thu, 20 Jun 2024 18:28:17 GMT Message-Id: <202406201828.45KISHPQ017611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e402155e1ad7 - main - ncurses: reinstantiate bsd specific code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e402155e1ad7ec92a1fbd1712ce86c2ca43e1823 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e402155e1ad7ec92a1fbd1712ce86c2ca43e1823 commit e402155e1ad7ec92a1fbd1712ce86c2ca43e1823 Author: Baptiste Daroussin AuthorDate: 2024-06-20 18:26:14 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-20 18:27:15 +0000 ncurses: reinstantiate bsd specific code This fixes ncurses 6.5 badly reading termcap --- lib/ncurses/tinfo/ncurses_cfg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ncurses/tinfo/ncurses_cfg.h b/lib/ncurses/tinfo/ncurses_cfg.h index ced59c68e93c..33890f300310 100644 --- a/lib/ncurses/tinfo/ncurses_cfg.h +++ b/lib/ncurses/tinfo/ncurses_cfg.h @@ -60,6 +60,9 @@ #define HAVE_LONG_FILE_NAMES 1 #define MIXEDCASE_FILENAMES 1 #define STDC_HEADERS 1 +#define USE_GETCAP 1 +#define USE_BSD_TPUTS 1 +#define HAVE_BSD_CGETENT 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 #define HAVE_STDLIB_H 1 From nobody Thu Jun 20 18:29:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4ptw6Lljz5PGBV; Thu, 20 Jun 2024 18:30:00 +0000 (UTC) (envelope-from bapt@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 4W4ptw5qsyz53y9; Thu, 20 Jun 2024 18:30:00 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718908200; 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=Q+X7mzJvH9wjpzMBDhbD0+d9cqon/c7/Q73ysRFsQ+w=; b=IdFeOuw4fJVXKBoIE8ec1w7ShVnintO43YyV1u+HYD7xiuhfSaJ3KENVdGN7ogwTiln2Ri dN0XSE4nKgubeh4JMK2C0Mf9ZUby3curWxXsjF67QwkUa9jM0KzbZQVaVhABTW/56b6KzK 3O+72fPabvXwdsueeeQOeTgHe8mHIVbU5PRZX8H6Ouwn11yh7Bc2H98i6UCHGrZh+kKGAF UE/Bim9rjjotB8kAC56Drad4pEhx03qzVQinBhdaNaC1eksfAXyLpZ6ZcUEkD84KRebLHg 2rzwB5jL5oFv8IZv3Y0pzGe87sSksDdSX6sI3WVJ4X0Dm2rP/YNP2gU6niTTiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718908200; a=rsa-sha256; cv=none; b=kIqam9falIRNvPpO5/F/ERofXZbmy+91Q9CH80+Ch5h51ROMk4sm+f3roBEA2E9Z6nkok3 siEychRC6b+j88+rrkaegrnSdkb0P0FED/WjzSDLt18tv9KFWSIJAcFWggkvX/VNRL9+Ap 43sOsUB7lzRADsnh9MepbqvqRTxAIdSOHb/cpzUhZRdufvRQCY6otTaBNSxZYXAlOPQBlq 1sxoo/Z8v2X9/mAym4oeFBQeqUkktE2nXwYjt6tTxsfvWsGME6CkYTMz5ltPX5Xh3ZsUjs IR2AifyFQx0X39oYMFy/JI1TNhMpHSTwZCJQsrqIwq3H+x9tHG4TTRFTwxfcEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718908200; 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=Q+X7mzJvH9wjpzMBDhbD0+d9cqon/c7/Q73ysRFsQ+w=; b=q6qLpFFGupXVPHfHitzrcHuXqUKlUzd48IVTBKkExcAmw1kxOevrGu6M2PYzr37GQysDrv m/bFOGK/9n1PakC0F1UwY6E1swMlXdqbCOjurvxXD60Mlgd5YtkN3iIteWRAbcsc32C59u 2wWN8F+HnJgt8LEKcdFiQbwaM9yTZS49BHYZiG07xkPY5xnfv9mcjjcmlqKPL7qKxfWn19 GkwB1YpY2up7UW2uxV5yHn+RKtvL3Fg/ITcQXnIduzHu6e9NyjIn55WjK0v3eOgZ/3203R aGNvriF+6JiM8PRlCIh1DsePFq9r3Q9siqdLVgh0xzLo96hy3BMj2x/5/onArg== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W4ptw4lbWz1FQh; Thu, 20 Jun 2024 18:30:00 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 0390A96BDF; Thu, 20 Jun 2024 20:29:58 +0200 (CEST) Date: Thu, 20 Jun 2024 20:29:58 +0200 From: Baptiste Daroussin To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 21817992b331 - main - ncurses: vendor import version 6.5 Message-ID: References: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> <20240620171604.BC89061@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu 20 Jun 19:26, Baptiste Daroussin wrote: > On Thu 20 Jun 10:16, Cy Schubert wrote: > > In message <202406201127.45KBRjoN006054@gitrepo.freebsd.org>, Baptiste > > Daroussi > > n writes: > > > The branch main has been updated by bapt: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=21817992b3314c908ab50f0bb88d2ee7 > > > 50b9c4ac > > > > > > commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac > > > Merge: 6eeedf35c3ec 24fa7a5107c5 > > > Author: Baptiste Daroussin > > > AuthorDate: 2024-06-20 11:15:14 +0000 > > > Commit: Baptiste Daroussin > > > CommitDate: 2024-06-20 11:26:22 +0000 > > > > > > ncurses: vendor import version 6.5 > > > > > > > The following errors are displayed by sysutils/screen following this > > revision. > > > > Name collision 'cdc456tst' between > > cdc456tst > > and cdc456tst > > Cannot remove alias 'cdc456tst' > > Name collision 'tab132w' between > > tab132w > > and tab132w > > Cannot remove alias 'tab132w' > > > > And if one does incremental builds, /usr/bin/vi will display the following > > errors. > > > > Name collision 'qume5' between > > qume5|qume|Qume Sprint 5 > > and qume5|qume|Qume Sprint 5 > > ...now qume|Qume Sprint 5 > > ...now Qume Sprint 5 > > > > I hgave pushed a commit to ports/sysutils/screen bumping PORTREVISION to > > force a rebuild. I wouldn't be surprised if other ports may need a > > PORTREVISION bump to force rebuilds. > > > > For those of us doing incremental builds our options are to rebuild vi > > (maybe others) separately or do a clean build. > > > > Can we add a note to UPDATING? > > That should not happen, on my system I have newer ncurses and /usr/bin/vi from > before the new ncurses. > > ALso I have installed screen from packages (thus built before the newer ncurses) > and I don't have the issue you are stating! > > Best regards, > Bapt Should be fixed by: e402155e1ad7ec92a1fbd1712ce86c2ca43e1823 From nobody Thu Jun 20 18:44:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4qCd2QxDz5PGrW; Thu, 20 Jun 2024 18:44:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4qCd0C23z54ww; Thu, 20 Jun 2024 18:44:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id KE4Iskrii2Ui5KMlos0y8k; Thu, 20 Jun 2024 18:44:28 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id KMlms8hqYpsbgKMlnsXslN; Thu, 20 Jun 2024 18:44:27 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=6674788b a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=gwWkesVXE8SjraNJtb8A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 9A34B2E5; Thu, 20 Jun 2024 11:44:25 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 3F97771; Thu, 20 Jun 2024 11:44:25 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Baptiste Daroussin cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 21817992b331 - main - ncurses: vendor import version 6.5 In-reply-to: References: <202406201127.45KBRjoN006054@gitrepo.freebsd.org> <20240620171604.BC89061@slippy.cwsent.com> Comments: In-reply-to Baptiste Daroussin message dated "Thu, 20 Jun 2024 20:29:58 +0200." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 20 Jun 2024 11:44:25 -0700 Message-Id: <20240620184425.3F97771@slippy.cwsent.com> X-CMAE-Envelope: MS4xfObN7UsOIt3w6dMI50mJ3MjX881rn7k01haVT2Rq9dhIDPjNXsG3yu/+EBslWhdxIaFRDXTPC+tPsF/xCExgotzXlpvFNx9MKAIh7mZe6Ux5nyC/QK/J KMljYSUj4V6N4hkg9r5IJJAGIMYyJmTur+v3y5ckDUe7aNZFuEXiLGPf/0H9UtnWaKSWkRNmkzk8XzAk7Bi5GAX85g+XWlT0WeVJSJd0b/1/w++l1eVLCsdg OFJ97UwIJNzQH1ZR+UfbT8EaFOp48mTUvrEaReN7xzNyJG1+QLP2e30TUj2mVT7G7+aZPNqBnoJZIK1F5fHkzdVs6OlsftIUOakIYRMGEtk= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4W4qCd0C23z54ww In message , B aptiste Daroussin writes: > On Thu 20 Jun 19:26, Baptiste Daroussin wrote: > > On Thu 20 Jun 10:16, Cy Schubert wrote: > > > In message <202406201127.45KBRjoN006054@gitrepo.freebsd.org>, Baptiste > > > Daroussi > > > n writes: > > > > The branch main has been updated by bapt: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=21817992b3314c908ab50f0bb8 > 8d2ee7 > > > > 50b9c4ac > > > > > > > > commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac > > > > Merge: 6eeedf35c3ec 24fa7a5107c5 > > > > Author: Baptiste Daroussin > > > > AuthorDate: 2024-06-20 11:15:14 +0000 > > > > Commit: Baptiste Daroussin > > > > CommitDate: 2024-06-20 11:26:22 +0000 > > > > > > > > ncurses: vendor import version 6.5 > > > > > > > > > > The following errors are displayed by sysutils/screen following this > > > revision. > > > > > > Name collision 'cdc456tst' between > > > cdc456tst > > > and cdc456tst > > > Cannot remove alias 'cdc456tst' > > > Name collision 'tab132w' between > > > tab132w > > > and tab132w > > > Cannot remove alias 'tab132w' > > > > > > And if one does incremental builds, /usr/bin/vi will display the followin > g > > > errors. > > > > > > Name collision 'qume5' between > > > qume5|qume|Qume Sprint 5 > > > and qume5|qume|Qume Sprint 5 > > > ...now qume|Qume Sprint 5 > > > ...now Qume Sprint 5 > > > > > > I hgave pushed a commit to ports/sysutils/screen bumping PORTREVISION to > > > force a rebuild. I wouldn't be surprised if other ports may need a > > > PORTREVISION bump to force rebuilds. > > > > > > For those of us doing incremental builds our options are to rebuild vi > > > (maybe others) separately or do a clean build. > > > > > > Can we add a note to UPDATING? > > > > That should not happen, on my system I have newer ncurses and /usr/bin/vi f > rom > > before the new ncurses. > > > > ALso I have installed screen from packages (thus built before the newer ncu > rses) > > and I don't have the issue you are stating! > > > > Best regards, > > Bapt > > Should be fixed by: e402155e1ad7ec92a1fbd1712ce86c2ca43e1823 Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Jun 20 19:00:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4qYw3nSdz5PJDX; Thu, 20 Jun 2024 19:00: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 4W4qYw3GPkz567W; Thu, 20 Jun 2024 19:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6syL/Q/iGjutfQCTlNU2a438pIg4sS6P3I4q4eCYkeM=; b=S690aKnjCeKuouL2TjvzcK/xS1Jq1eA8FzVL1u7zJTdbACbWTMJG4OCchmQOy2JRpbjAde gMwpsNtamgI/NgqcRNJ7RzcLuMuyefhUjmzWZtGpUTwj7yAtioikhQKR7oqOZxRvqldG8I 2IRCIeUzYvh6Lig1yY1WhxEhV8bMvdAURDTaNlO/ObDa1V4TU+oCwv27/lO+jNxGoJUXEc pyd01FIFv/qJT5eAyJtRPVLaLJOptFaGlxEgGX3/Evy68MRUpbZRueJbK5VMSILlvOdpMU twpDHYzM6UdIF3aZQjkkj57a+B6ZZeaMmnLiTd/5SasiarmgSWy6kEKcGq3UrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718910020; a=rsa-sha256; cv=none; b=yAHTCWC4TvnR0pf1CodhMI/zOSp8kwom7MaGq2emfYuhJu4/QXpaj/gIk3CKPdmAJDSGne TXDzkS3KSBiqcCWBvbUD6DsbbDgXFNSOrBieBG2SQT0zTxoG1PSsibfebO42/65DB+badX Gj+MQaiscwIOXunyLi88+0i/9leC1MErJCkT2Aj141LQFLxQ42EnaLozhUZSfnHekzh62n V80ZNYpDzDv2pCTklshNDj5eGl5rKnpkOShWwX3l7HXVioBWnJVFTcacQreAYCjU7G5eGk IhWYy8/tdmbVepD18wHaZkTe3yAy+fU54jrLzbSci+3KtnbddFi6vHGHcFXWjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6syL/Q/iGjutfQCTlNU2a438pIg4sS6P3I4q4eCYkeM=; b=OEayhGyKhqeC7+rDtVTq6QjEZ6IorMNn443PRmDcHzXZogLdh/6v3dCcQOrXYfSVQ5gsNT jicS4SznG9X8MVJenKhNSAA8D8HdJ0BIHXsSJ3oL8ByZa6oeRUw4k4idL2/EHao9sq+TYq ZNRxNwRuX9n/ehtmVDgZLCKMnG/9qr3YGVnLqMcQ61liEJu/P6yBl+AuSRAnPkwtVvUWEL pRDIQF3OM9FlDTlhX3f54Y0vIISrIWhKVTgV80uPFkfXKXNSQivdLVKbHhsCkIZkrV3Dkg xj6lWHl8q/4qVTfB05smwY8KPQqSmz4dKoTdI+TSMOkrxUUYEPG2+Yk+6G/gZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4qYw2sDwzcvW; Thu, 20 Jun 2024 19:00: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 45KJ0KX7077722; Thu, 20 Jun 2024 19:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJ0K8W077719; Thu, 20 Jun 2024 19:00:20 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:00:20 GMT Message-Id: <202406201900.45KJ0K8W077719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: bfb857546984 - main - riscv: Construct an identity map in locore.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfb857546984a817a862658e9c36f8034603f63b Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bfb857546984a817a862658e9c36f8034603f63b commit bfb857546984a817a862658e9c36f8034603f63b Author: Mitchell Horne AuthorDate: 2024-06-20 18:28:20 +0000 Commit: Mitchell Horne CommitDate: 2024-06-20 18:33:19 +0000 riscv: Construct an identity map in locore.S This is useful for two reasons. Within this change, it allows the early DTB mapping to be eliminated, as we can now just dereference the physical address provided by FW and copy the DTB contents into KVA. It will also aid in an upcoming change: the larger reworking of page table bootstrapping on this platform. Reviewed by: markj, jhb MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45324 --- sys/riscv/include/machdep.h | 1 - sys/riscv/include/vmparam.h | 2 -- sys/riscv/riscv/genassym.c | 2 -- sys/riscv/riscv/locore.S | 51 ++++++++++++++++----------------------------- sys/riscv/riscv/machdep.c | 9 +++++--- sys/riscv/riscv/pmap.c | 15 +------------ 6 files changed, 25 insertions(+), 55 deletions(-) diff --git a/sys/riscv/include/machdep.h b/sys/riscv/include/machdep.h index 7cd8b7e1b2cf..581749f44d76 100644 --- a/sys/riscv/include/machdep.h +++ b/sys/riscv/include/machdep.h @@ -39,7 +39,6 @@ struct riscv_bootparams { vm_offset_t kern_l1pt; /* Kernel L1 base */ vm_offset_t kern_phys; /* Kernel base (physical) addr */ vm_offset_t kern_stack; - vm_offset_t dtbp_virt; /* Device tree blob virtual addr */ vm_offset_t dtbp_phys; /* Device tree blob physical addr */ vm_offset_t modulep; /* loader(8) metadata */ }; diff --git a/sys/riscv/include/vmparam.h b/sys/riscv/include/vmparam.h index 5092977d0669..7bfa587ce37c 100644 --- a/sys/riscv/include/vmparam.h +++ b/sys/riscv/include/vmparam.h @@ -209,8 +209,6 @@ #define PS_STRINGS_SV39 (USRSTACK_SV39 - sizeof(struct ps_strings)) #define PS_STRINGS_SV48 (USRSTACK_SV48 - sizeof(struct ps_strings)) -#define VM_EARLY_DTB_ADDRESS (VM_MAX_KERNEL_ADDRESS - (2 * L2_SIZE)) - /* * How many physical pages per kmem arena virtual page. */ diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c index 6e4f9197a591..b1e1034fd479 100644 --- a/sys/riscv/riscv/genassym.c +++ b/sys/riscv/riscv/genassym.c @@ -58,7 +58,6 @@ ASSYM(KERNBASE, KERNBASE); ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); ASSYM(VM_MAX_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS); -ASSYM(VM_EARLY_DTB_ADDRESS, VM_EARLY_DTB_ADDRESS); ASSYM(PMAP_MAPDEV_EARLY_SIZE, PMAP_MAPDEV_EARLY_SIZE); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); @@ -102,6 +101,5 @@ ASSYM(RISCV_BOOTPARAMS_KERN_L1PT, offsetof(struct riscv_bootparams, kern_l1pt)); ASSYM(RISCV_BOOTPARAMS_KERN_PHYS, offsetof(struct riscv_bootparams, kern_phys)); ASSYM(RISCV_BOOTPARAMS_KERN_STACK, offsetof(struct riscv_bootparams, kern_stack)); -ASSYM(RISCV_BOOTPARAMS_DTBP_VIRT, offsetof(struct riscv_bootparams, dtbp_virt)); ASSYM(RISCV_BOOTPARAMS_DTBP_PHYS, offsetof(struct riscv_bootparams, dtbp_phys)); ASSYM(RISCV_BOOTPARAMS_MODULEP, offsetof(struct riscv_bootparams, modulep)); diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S index 7e885ab8ca89..17fdcc8ef55c 100644 --- a/sys/riscv/riscv/locore.S +++ b/sys/riscv/riscv/locore.S @@ -118,9 +118,26 @@ _start: * a1 - zero or dtbp */ pagetables: - /* Get the kernel's load address */ + /* Get the kernel's load address (kernstart) in s9 */ jal get_physmem + /* Construct 1GB Identity Map (1:1 PA->VA) */ + lla s1, pagetable_l1 + + srli s2, s9, L1_SHIFT /* kernstart >> L1_SHIFT */ + andi a5, s2, Ln_ADDR_MASK /* & Ln_ADDR_MASK */ + li t4, (PTE_KERN) + slli s2, s2, PTE_PPN2_S /* (s2 << PTE_PPN2_S) */ + or t6, t4, s2 + + /* Store L1 PTE entry to position */ + li a6, PTE_SIZE + mulw a5, a5, a6 /* calculate L1 slot */ + add t0, s1, a5 + sd t6, (t0) /* Store new PTE */ + + /* Construct the virtual address space */ + /* Add L1 entry for kernel */ lla s1, pagetable_l1 lla s2, pagetable_l2 /* Link to next level PN */ @@ -172,29 +189,6 @@ pagetables: add t0, s1, a5 sd t6, (t0) - /* Check if we have a DTB that needs to be mapped */ - beqz a1, 2f - - /* Create an L2 mapping for the DTB */ - lla s1, pagetable_l2_devmap - mv s2, a1 - srli s2, s2, PAGE_SHIFT - /* Mask off any bits that aren't aligned */ - andi s2, s2, ~((1 << (PTE_PPN1_S - PTE_PPN0_S)) - 1) - - li t0, (PTE_KERN) - slli t2, s2, PTE_PPN0_S /* << PTE_PPN0_S */ - or t0, t0, t2 - - /* Store the L2 table entry for the DTB */ - li a6, PTE_SIZE - li a5, VM_EARLY_DTB_ADDRESS - srli a5, a5, L2_SHIFT /* >> L2_SHIFT */ - andi a5, a5, Ln_ADDR_MASK /* & Ln_ADDR_MASK */ - mulw a5, a5, a6 - add t1, s1, a5 - sd t0, (t1) - /* Page tables END */ /* @@ -202,7 +196,6 @@ pagetables: * may generate a page fault. We simply wish to continue onwards, so * have the trap deliver us to 'va'. */ -2: lla t0, va sub t0, t0, s9 li t1, KERNBASE @@ -257,15 +250,7 @@ va: la t0, initstack sd t0, RISCV_BOOTPARAMS_KERN_STACK(sp) - - li t0, (VM_EARLY_DTB_ADDRESS) - /* Add offset of DTB within superpage */ - li t1, (L2_OFFSET) - and t1, a1, t1 - add t0, t0, t1 - sd t0, RISCV_BOOTPARAMS_DTBP_VIRT(sp) sd a1, RISCV_BOOTPARAMS_DTBP_PHYS(sp) - sd a0, RISCV_BOOTPARAMS_MODULEP(sp) mv a0, sp diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 1e2b96acd3a1..0d04bf0d3544 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -380,13 +380,16 @@ fake_preload_metadata(struct riscv_bootparams *rvbp) PRELOAD_PUSH_VALUE(uint32_t, sizeof(size_t)); PRELOAD_PUSH_VALUE(uint64_t, (size_t)((vm_offset_t)&end - KERNBASE)); - /* Copy the DTB to KVA space. */ + /* + * Copy the DTB to KVA space. We are able to dereference the physical + * address due to the identity map created in locore. + */ lastaddr = roundup(lastaddr, sizeof(int)); PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA | MODINFOMD_DTBP); PRELOAD_PUSH_VALUE(uint32_t, sizeof(vm_offset_t)); PRELOAD_PUSH_VALUE(vm_offset_t, lastaddr); - dtb_size = fdt_totalsize(rvbp->dtbp_virt); - memmove((void *)lastaddr, (const void *)rvbp->dtbp_virt, dtb_size); + dtb_size = fdt_totalsize(rvbp->dtbp_phys); + memmove((void *)lastaddr, (const void *)rvbp->dtbp_phys, dtb_size); lastaddr = roundup(lastaddr + dtb_size, sizeof(int)); PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA | MODINFOMD_KERNEND); diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 1e4061935ca0..ca051a9e4416 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -244,12 +244,9 @@ CTASSERT((DMAP_MAX_ADDRESS & ~L1_OFFSET) == DMAP_MAX_ADDRESS); /* * This code assumes that the early DEVMAP is L2_SIZE aligned and is fully - * contained within a single L2 entry. The early DTB is mapped immediately - * before the devmap L2 entry. + * contained within a single L2 entry. */ CTASSERT((PMAP_MAPDEV_EARLY_SIZE & L2_OFFSET) == 0); -CTASSERT((VM_EARLY_DTB_ADDRESS & L2_OFFSET) == 0); -CTASSERT(VM_EARLY_DTB_ADDRESS < (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE)); static struct rwlock_padalign pvh_global_lock; static struct mtx_padalign allpmaps_lock; @@ -623,7 +620,6 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) vm_offset_t dpcpu, freemempos, l0pv, msgbufpv; vm_paddr_t l0pa, l1pa, max_pa, min_pa, pa; pd_entry_t *l0p; - pt_entry_t *l2p; u_int l1_slot, l2_slot; u_int physmap_idx; int i, mode; @@ -687,15 +683,6 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) freemempos = pmap_bootstrap_l3(l1pt, VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE, freemempos); - /* - * Invalidate the mapping we created for the DTB. At this point a copy - * has been created, and we no longer need it. We want to avoid the - * possibility of an aliased mapping in the future. - */ - l2p = pmap_l2(kernel_pmap, VM_EARLY_DTB_ADDRESS); - if ((pmap_load(l2p) & PTE_V) != 0) - pmap_clear(l2p); - sfence_vma(); #define alloc_pages(var, np) \ From nobody Thu Jun 20 19:00:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4qYx4H0Sz5PJDY; Thu, 20 Jun 2024 19:00: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 4W4qYx3k5Sz56JJ; Thu, 20 Jun 2024 19:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TvcSgZBPE7AlAUgoUmVbGPFQarpuk5gK9L5ajytyZEY=; b=ZZnJKj7LnA4hOhEbEPQFXeKtjwNTE65ukEyY8Df6tREoH8Ied56fNG83KulPhVoMiCl9+b 9Wp0clWL1wCKlzR66uK+Dhnu/IRFtN8g8W4/XJB/M4qjeb+TJq7QuAuTFKi+wi0B1gXvnz VSQpVM14PFzVLhlOHmeuVhUIg/B6/lJ/BUFbspihzIddQtmlPb+Zo5IwxFhEpkr/odBwQX VJ47oVqF5XUCMjaCqktY2xMGFTT6iIitvJfDjVpcfULA0H5UF8m18dliuFw51of0jWkBLS RO0JcQPaV8zYZ4Q/VFYfrT+n2lcpxdB/HEymdftzz4ZrbiAzcNLUnVe81fHSkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718910021; a=rsa-sha256; cv=none; b=DgWbi9sXD7beUA+oqae12zP1cXSjvQezq3uf7iOWMrCngEb+E3sqsnXh4Hc2SeFO2oLceX V9ryZz/ijnWeNTRMQgkRAAMC2Gskaj2ehQOSlGwbD7XuRIT+GryB+HAJHjKZenW3Hnb+xz cFtJ1OtBg1jFzbkS4772npwcCqB4MBaO/hK/1K9zuxVvRQQouHH7k3JY6J6yi5DFnuVjZY oZiS7lzdXgaaW0mRt7wB4TcNV3KQCvYxVVfXSR18hY5aR4JYEyt67Zt7JQRSTqnh9VaGDV v/deKM/4g+fKMCGfwvSM8cJtVBkWCif1DwHsaCqLqFJqgcZQ15bE1MoRisZtNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TvcSgZBPE7AlAUgoUmVbGPFQarpuk5gK9L5ajytyZEY=; b=AomE7z6BExLILyZHxtt0FGpP5jE7ZjZIFShwhwzfdP5ASTYGnvEdLIgAMb24Mv6vIo0WvW +qbOOF+X5PH7zI807+vZKLumZ1c/CPDI7/ZsrcSM8H6gawZB7TxWQqqgki5S4WYg4jp3wp qNlotn/PjaXD4jwaz7dAmwXNcKj8pCpNqG1V654+Bj2MVdI6H38UPbvuiU45jZuou+g97c jdVHP/YM/1tYovS8RigDFz7yVNxD2Bi011B1EBQdBhtiL/XPyGNYGWBwry2Dhh2WKZQbVL 6EfEh6bhbKmzknaxzaDA1SVJjKCYqPL36LA2U+r4VMe/cTXTKU0yXrK1RlBtPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4qYx3KT8zcvX; Thu, 20 Jun 2024 19:00: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 45KJ0LTK077764; Thu, 20 Jun 2024 19:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJ0LgF077761; Thu, 20 Jun 2024 19:00:21 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:00:21 GMT Message-Id: <202406201900.45KJ0LgF077761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: de09dcebd720 - main - riscv: rework page table bootstrap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de09dcebd720d5776df4cc4e67ffc7da757e4305 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=de09dcebd720d5776df4cc4e67ffc7da757e4305 commit de09dcebd720d5776df4cc4e67ffc7da757e4305 Author: Mitchell Horne AuthorDate: 2024-06-20 18:30:17 +0000 Commit: Mitchell Horne CommitDate: 2024-06-20 18:33:19 +0000 riscv: rework page table bootstrap The overall goal of the change is to reduce the amount of work done in locore assembly, and defer as much as possible until pmap_bootstrap(). Currently, half the setup is done in assembly, and then we pass the l1pt address to pmap_bootstrap() where it is amended with other mappings. Inspiration and understanding has been taken from amd64's create_pagetables() routine, and I try to present the page table construction in the same way: a linear procedure with commentary explaining what we are doing and why. Thus the core of the new implementation is contained in pmap_create_pagetables(). Once pmap_create_pagetables() has finished, we switch to the new pagetable root and leave the bootstrap ones created by locore behind, resulting in a minimal 8kB of wasted space. Having the whole procedure in one place, in C code, allows it to be more easily understood, while also making it more amenable to future changes which depend on CPU feature/errata detection. Note that with this change the size of the early devmap is bumped up from one to four L2 pages (8MB). Reviewed by: markj MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45327 --- sys/riscv/include/pte.h | 2 - sys/riscv/include/vmparam.h | 7 +- sys/riscv/riscv/genassym.c | 2 + sys/riscv/riscv/locore.S | 87 +++++------ sys/riscv/riscv/pmap.c | 355 ++++++++++++++++++++++++++++---------------- 5 files changed, 272 insertions(+), 181 deletions(-) diff --git a/sys/riscv/include/pte.h b/sys/riscv/include/pte.h index da7bd051e122..031cae667f0c 100644 --- a/sys/riscv/include/pte.h +++ b/sys/riscv/include/pte.h @@ -93,5 +93,3 @@ typedef uint64_t pn_t; /* page number */ #define PTE_SIZE 8 #endif /* !_MACHINE_PTE_H_ */ - -/* End of pte.h */ diff --git a/sys/riscv/include/vmparam.h b/sys/riscv/include/vmparam.h index 7bfa587ce37c..c750791bb280 100644 --- a/sys/riscv/include/vmparam.h +++ b/sys/riscv/include/vmparam.h @@ -238,13 +238,16 @@ extern vm_paddr_t dmap_phys_base; extern vm_paddr_t dmap_phys_max; extern vm_offset_t dmap_max_addr; -extern vm_offset_t init_pt_va; #endif #define ZERO_REGION_SIZE (64 * 1024) /* 64KB */ +/* + * The top of KVA is reserved for early device mappings. + */ #define DEVMAP_MAX_VADDR VM_MAX_KERNEL_ADDRESS -#define PMAP_MAPDEV_EARLY_SIZE L2_SIZE +#define DEVMAP_MIN_VADDR (DEVMAP_MAX_VADDR - PMAP_MAPDEV_EARLY_SIZE) +#define PMAP_MAPDEV_EARLY_SIZE (4 * L2_SIZE) /* * No non-transparent large page support in the pmap. diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c index b1e1034fd479..105e17e679b7 100644 --- a/sys/riscv/riscv/genassym.c +++ b/sys/riscv/riscv/genassym.c @@ -60,6 +60,8 @@ ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); ASSYM(VM_MAX_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS); ASSYM(PMAP_MAPDEV_EARLY_SIZE, PMAP_MAPDEV_EARLY_SIZE); +ASSYM(PM_SATP, offsetof(struct pmap, pm_satp)); + ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ASSYM(PCB_RA, offsetof(struct pcb, pcb_ra)); diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S index 17fdcc8ef55c..f7363fd025a7 100644 --- a/sys/riscv/riscv/locore.S +++ b/sys/riscv/riscv/locore.S @@ -1,6 +1,10 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015-2018 Ruslan Bukin * All rights reserved. + * Copyright (c) 2019-2021 Mitchell Horne + * Copyright (c) 2022-2024 The FreeBSD Foundation * * Portions of this software were developed by SRI International and the * University of Cambridge Computer Laboratory under DARPA/AFRL contract @@ -10,6 +14,9 @@ * Computer Laboratory as part of the CTSRD Project, with support from the * UK Higher Education Innovation Fund (HEIF). * + * Portions of this software were developed by Mitchell Horne + * 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: @@ -36,7 +43,6 @@ #include #include -#include #include #include @@ -104,16 +110,24 @@ _start: mv a1, zero /* - * Set up page tables: map a 1GB region starting at KERNBASE using 2MB - * superpages, starting from the first 2MB physical page into which the - * kernel was loaded. Also reserve an L2 page for the early device map - * and map the DTB, if any, using the second-last entry of that L2 - * page. This is hopefully enough to get us to pmap_bootstrap(). + * Set up page tables: Our goal is to enable virtual memory, doing the + * minimum amount of work in assembly; just what is required to + * bootstrap. We will construct the real page tables in C code, in + * pmap_bootstrap(). + * + * Here we map a 1GB region starting at KERNBASE using 2MB superpages, + * starting from the first 2MB physical page into which the kernel was + * loaded. * - * Implementations are required to provide SV39 mode, so we use that - * initially and will optionally enable SV48 mode during kernel pmap - * initialization. + * We also use an L1 entry to create a 1GB identity map (1:1 PA->VA). + * This is useful for two reasons: + * - handling the DTB pointer passed from SBI firmware (physical addr) + * - simpler construction of pagetables in pmap_bootstrap() * + * Implementations are required to provide Sv39 mode, so we use that + * here and will conditionally enable Sv48 (or higher) later. + * + * We arrive here with: * a0 - modulep or zero * a1 - zero or dtbp */ @@ -122,7 +136,7 @@ pagetables: jal get_physmem /* Construct 1GB Identity Map (1:1 PA->VA) */ - lla s1, pagetable_l1 + lla s1, bootstrap_pt_l1 srli s2, s9, L1_SHIFT /* kernstart >> L1_SHIFT */ andi a5, s2, Ln_ADDR_MASK /* & Ln_ADDR_MASK */ @@ -136,11 +150,11 @@ pagetables: add t0, s1, a5 sd t6, (t0) /* Store new PTE */ - /* Construct the virtual address space */ + /* Construct the virtual address space at KERNBASE */ /* Add L1 entry for kernel */ - lla s1, pagetable_l1 - lla s2, pagetable_l2 /* Link to next level PN */ + lla s1, bootstrap_pt_l1 + lla s2, bootstrap_pt_l2 /* Link to next level PN */ srli s2, s2, PAGE_SHIFT li a5, KERNBASE @@ -157,9 +171,9 @@ pagetables: sd t6, (t0) /* Level 2 superpages (512 x 2MiB) */ - lla s1, pagetable_l2 + lla s1, bootstrap_pt_l2 srli t4, s9, L2_SHIFT /* Div physmem base by 2 MiB */ - li t2, 512 /* Build 512 entries */ + li t2, Ln_ENTRIES /* Build 512 entries */ add t3, t4, t2 li t0, (PTE_KERN | PTE_X) 1: @@ -171,24 +185,6 @@ pagetables: addi t4, t4, 1 bltu t4, t3, 1b - /* Create an L1 table entry for early devmap */ - lla s1, pagetable_l1 - lla s2, pagetable_l2_devmap /* Link to next level PN */ - srli s2, s2, PAGE_SHIFT - - li a5, (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE) - srli a5, a5, L1_SHIFT /* >> L1_SHIFT */ - andi a5, a5, Ln_ADDR_MASK /* & Ln_ADDR_MASK */ - li t4, PTE_V - slli t5, s2, PTE_PPN0_S /* (s2 << PTE_PPN0_S) */ - or t6, t4, t5 - - /* Store the L1 table entry */ - li a6, PTE_SIZE - mulw a5, a5, a6 - add t0, s1, a5 - sd t6, (t0) - /* Page tables END */ /* @@ -203,7 +199,7 @@ pagetables: csrw stvec, t0 /* Set page tables base register */ - lla s2, pagetable_l1 + lla s2, bootstrap_pt_l1 srli s2, s2, PAGE_SHIFT li t0, SATP_MODE_SV39 or s2, s2, t0 @@ -244,8 +240,6 @@ va: bltu t0, t1, 1b /* Fill riscv_bootparams */ - la t0, pagetable_l1 - sd t0, RISCV_BOOTPARAMS_KERN_L1PT(sp) sd s9, RISCV_BOOTPARAMS_KERN_PHYS(sp) la t0, initstack @@ -278,12 +272,13 @@ initstack: .space (PAGE_SIZE * KSTACK_PAGES) initstack_end: - .align 12 -pagetable_l1: - .space PAGE_SIZE -pagetable_l2: +/* + * Static space for the bootstrap page tables. Unused after pmap_bootstrap(). + */ + .balign PAGE_SIZE +bootstrap_pt_l1: .space PAGE_SIZE -pagetable_l2_devmap: +bootstrap_pt_l2: .space PAGE_SIZE .align 3 @@ -292,10 +287,6 @@ virt_map: hart_lottery: .space 4 - .globl init_pt_va -init_pt_va: - .quad pagetable_l2 /* XXX: Keep page tables VA */ - #ifndef SMP ENTRY(mpentry) 1: @@ -343,10 +334,8 @@ ENTRY(mpentry) csrw stvec, t0 /* Set page tables base register */ - lla s2, pagetable_l1 - srli s2, s2, PAGE_SHIFT - li t0, SATP_MODE_SV39 - or s2, s2, t0 + lla t2, kernel_pmap_store + ld s2, PM_SATP(t2) sfence.vma csrw satp, s2 diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index ca051a9e4416..937bb22371e2 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -243,8 +243,7 @@ CTASSERT((DMAP_MIN_ADDRESS & ~L1_OFFSET) == DMAP_MIN_ADDRESS); CTASSERT((DMAP_MAX_ADDRESS & ~L1_OFFSET) == DMAP_MAX_ADDRESS); /* - * This code assumes that the early DEVMAP is L2_SIZE aligned and is fully - * contained within a single L2 entry. + * This code assumes that the early DEVMAP is L2_SIZE aligned. */ CTASSERT((PMAP_MAPDEV_EARLY_SIZE & L2_OFFSET) == 0); @@ -324,6 +323,8 @@ static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, struct spglist *); static int pmap_change_attr_locked(vm_offset_t va, vm_size_t size, int mode); +static uint64_t pmap_satp_mode(void); + #define pmap_clear(pte) pmap_store(pte, 0) #define pmap_clear_bits(pte, bits) atomic_clear_64(pte, bits) #define pmap_load_store(pte, entry) atomic_swap_64(pte, entry) @@ -361,6 +362,28 @@ pagezero(void *p) ((((l2) & ~PTE_HI_MASK) >> PTE_PPN1_S) << L2_SHIFT) #define PTE_TO_VM_PAGE(pte) PHYS_TO_VM_PAGE(PTE_TO_PHYS(pte)) +/* + * Construct a page table entry of the specified level pointing to physical + * address pa, with PTE bits 'bits'. + * + * A leaf PTE of any level must point to an address matching its alignment, + * e.g. L2 pages must be 2MB aligned in memory. + */ +#define L1_PTE(pa, bits) ((((pa) >> L1_SHIFT) << PTE_PPN2_S) | (bits)) +#define L2_PTE(pa, bits) ((((pa) >> L2_SHIFT) << PTE_PPN1_S) | (bits)) +#define L3_PTE(pa, bits) ((((pa) >> L3_SHIFT) << PTE_PPN0_S) | (bits)) + +/* + * Construct a page directory entry (PDE), pointing to next level entry at pa, + * with PTE bits 'bits'. + * + * Unlike PTEs, page directory entries can point to any 4K-aligned physical + * address. + */ +#define L0_PDE(pa, bits) L3_PTE(pa, bits) +#define L1_PDE(pa, bits) L3_PTE(pa, bits) +#define L2_PDE(pa, bits) L3_PTE(pa, bits) + static __inline pd_entry_t * pmap_l0(pmap_t pmap, vm_offset_t va) { @@ -501,45 +524,20 @@ pmap_distribute_l1(struct pmap *pmap, vm_pindex_t l1index, mtx_unlock(&allpmaps_lock); } +/* + * This should only be used during pmap bootstrap e.g. by + * pmap_create_pagetables(). + */ static pt_entry_t * -pmap_early_page_idx(vm_offset_t l1pt, vm_offset_t va, u_int *l1_slot, - u_int *l2_slot) +pmap_early_alloc_tables(vm_paddr_t *freemempos, int npages) { - pt_entry_t *l2; - pd_entry_t *l1 __diagused; - - l1 = (pd_entry_t *)l1pt; - *l1_slot = (va >> L1_SHIFT) & Ln_ADDR_MASK; + pt_entry_t *pt; - /* Check locore has used a table L1 map */ - KASSERT((l1[*l1_slot] & PTE_RX) == 0, - ("Invalid bootstrap L1 table")); + pt = (pt_entry_t *)*freemempos; + *freemempos += npages * PAGE_SIZE; + bzero(pt, npages * PAGE_SIZE); - /* Find the address of the L2 table */ - l2 = (pt_entry_t *)init_pt_va; - *l2_slot = pmap_l2_index(va); - - return (l2); -} - -static vm_paddr_t -pmap_early_vtophys(vm_offset_t l1pt, vm_offset_t va) -{ - u_int l1_slot, l2_slot; - pt_entry_t *l2; - vm_paddr_t ret; - - l2 = pmap_early_page_idx(l1pt, va, &l1_slot, &l2_slot); - - /* Check locore has used L2 superpages */ - KASSERT((l2[l2_slot] & PTE_RX) != 0, - ("Invalid bootstrap L2 table")); - - /* L2 is superpages */ - ret = L2PTE_TO_PHYS(l2[l2_slot]); - ret += (va & L2_OFFSET); - - return (ret); + return (pt); } static void @@ -575,38 +573,152 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t min_pa, vm_paddr_t max_pa) sfence_vma(); } -static vm_offset_t -pmap_bootstrap_l3(vm_offset_t l1pt, vm_offset_t va, vm_offset_t l3_start) +/* + * Create a new set of pagetables to run the kernel with. + * + * An initial, temporary setup was created in locore.S, which serves well + * enough to get us this far. It mapped kernstart -> KERNBASE, using 2MB + * superpages, and created a 1GB identity map, which allows this function + * to dereference physical addresses. + * + * The memory backing these page tables is allocated in the space + * immediately following the kernel's preload area. Depending on the size + * of this area, some, all, or none of these pages can be implicitly + * mapped by the kernel's 2MB mappings. This memory will only ever be + * accessed through the direct map, however. + */ +static vm_paddr_t +pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, + vm_paddr_t min_pa, vm_paddr_t max_pa, vm_paddr_t *root_pt_phys) { - vm_offset_t l3pt; - pt_entry_t entry; - pd_entry_t *l2; - vm_paddr_t pa; - u_int l2_slot; - pn_t pn; + pt_entry_t *l0, *l1, *kern_l2, *kern_l3, *devmap_l3; + pd_entry_t *devmap_l2; + vm_paddr_t kernend, freemempos, pa; + int nkernl2, nkernl3, ndevmapl3; + int i, slot; + int mode; - KASSERT((va & L2_OFFSET) == 0, ("Invalid virtual address")); + kernend = kernstart + kernlen; - l2 = pmap_l2(kernel_pmap, va); - l2 = (pd_entry_t *)((uintptr_t)l2 & ~(PAGE_SIZE - 1)); - l2_slot = pmap_l2_index(va); - l3pt = l3_start; + /* Static allocations begin after the kernel staging area. */ + freemempos = roundup2(kernend, PAGE_SIZE); - for (; va < VM_MAX_KERNEL_ADDRESS; l2_slot++, va += L2_SIZE) { - KASSERT(l2_slot < Ln_ENTRIES, ("Invalid L2 index")); + /* Detect Sv48 mode. */ + mode = PMAP_MODE_SV39; + TUNABLE_INT_FETCH("vm.pmap.mode", &mode); - pa = pmap_early_vtophys(l1pt, l3pt); - pn = (pa / PAGE_SIZE); - entry = (PTE_V); - entry |= (pn << PTE_PPN0_S); - pmap_store(&l2[l2_slot], entry); - l3pt += PAGE_SIZE; + if (mode == PMAP_MODE_SV48 && (mmu_caps & MMU_SV48) != 0) { + /* + * Sv48 mode: allocate an L0 page table to be the root. The + * layout of KVA is otherwise identical to Sv39. + */ + l0 = pmap_early_alloc_tables(&freemempos, 1); + *root_pt_phys = (vm_paddr_t)l0; + pmap_mode = PMAP_MODE_SV48; + } else { + l0 = NULL; + } + + /* + * Allocate an L1 page table. + */ + l1 = pmap_early_alloc_tables(&freemempos, 1); + if (pmap_mode == PMAP_MODE_SV39) + *root_pt_phys = (vm_paddr_t)l1; + + /* + * Allocate a set of L2 page tables for KVA. Most likely, only 1 is + * needed. + */ + nkernl2 = howmany(howmany(kernlen, L2_SIZE), Ln_ENTRIES); + kern_l2 = pmap_early_alloc_tables(&freemempos, nkernl2); + + /* + * Allocate an L2 page table for the static devmap, located at the end + * of KVA. We can expect that the devmap will always be less than 1GB + * in size. + */ + devmap_l2 = pmap_early_alloc_tables(&freemempos, 1); + + /* Allocate L3 page tables for the devmap. */ + ndevmapl3 = howmany(howmany(PMAP_MAPDEV_EARLY_SIZE, L3_SIZE), + Ln_ENTRIES); + devmap_l3 = pmap_early_alloc_tables(&freemempos, ndevmapl3); + + /* + * Allocate some L3 bootstrap pages, for early KVA allocations before + * vm_mem_init() has run. For example, the message buffer. + * + * A somewhat arbitrary choice of 32MB. This should be more than enough + * for any early allocations. There is no need to worry about waste, as + * whatever is not used will be consumed by later calls to + * pmap_growkernel(). + */ + nkernl3 = 16; + kern_l3 = pmap_early_alloc_tables(&freemempos, nkernl3); + + /* Allocations are done. */ + if (freemempos < roundup2(kernend, L2_SIZE)) + freemempos = roundup2(kernend, L2_SIZE); + + /* + * Map the kernel (and preloaded modules or data) using L2 superpages. + * + * kernstart is 2MB-aligned. This is enforced by loader(8) and required + * by locore assembly. + * + * TODO: eventually, this should be done with proper permissions for + * each segment, rather than mapping the entire kernel and preloaded + * modules RWX. + */ + slot = pmap_l2_index(KERNBASE); + for (pa = kernstart; pa < kernend; pa += L2_SIZE, slot++) { + pmap_store(&kern_l2[slot], L2_PTE(pa, PTE_KERN | PTE_X)); + } + + /* + * Connect the L3 bootstrap pages to the kernel L2 table. The L3 PTEs + * themselves are invalid. + */ + slot = pmap_l2_index(freemempos - kernstart + KERNBASE); + for (i = 0; i < nkernl3; i++, slot++) { + pa = (vm_paddr_t)kern_l3 + ptoa(i); + pmap_store(&kern_l2[slot], L2_PDE(pa, PTE_V)); + } + + /* Connect the L2 tables to the L1 table. */ + slot = pmap_l1_index(KERNBASE); + for (i = 0; i < nkernl2; i++, slot++) { + pa = (vm_paddr_t)kern_l2 + ptoa(i); + pmap_store(&l1[slot], L1_PDE(pa, PTE_V)); + } + + /* Connect the L1 table to L0, if in use. */ + if (pmap_mode == PMAP_MODE_SV48) { + slot = pmap_l0_index(KERNBASE); + pmap_store(&l0[slot], L0_PDE((vm_paddr_t)l1, PTE_V)); + } + + /* + * Connect the devmap L3 pages to the L2 table. The devmap PTEs + * themselves are invalid. + */ + slot = pmap_l2_index(DEVMAP_MIN_VADDR); + for (i = 0; i < ndevmapl3; i++, slot++) { + pa = (vm_paddr_t)devmap_l3 + ptoa(i); + pmap_store(&devmap_l2[slot], L2_PDE(pa, PTE_V)); } - /* Clean the L2 page table */ - memset((void *)l3_start, 0, l3pt - l3_start); + /* Connect the devmap L2 pages to the L1 table. */ + slot = pmap_l1_index(DEVMAP_MIN_VADDR); + pa = (vm_paddr_t)devmap_l2; + pmap_store(&l1[slot], L1_PDE(pa, PTE_V)); + + /* Bootstrap the direct map. */ + pmap_bootstrap_dmap((vm_offset_t)l1, min_pa, max_pa); - return (l3pt); + /* Return the next position of free memory */ + return (freemempos); } /* @@ -616,19 +728,17 @@ void pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) { vm_paddr_t physmap[PHYS_AVAIL_ENTRIES]; - uint64_t satp; - vm_offset_t dpcpu, freemempos, l0pv, msgbufpv; - vm_paddr_t l0pa, l1pa, max_pa, min_pa, pa; - pd_entry_t *l0p; - u_int l1_slot, l2_slot; + vm_paddr_t freemempos; + vm_paddr_t max_pa, min_pa, pa; + vm_paddr_t root_pt_phys; + vm_offset_t freeva; + vm_offset_t dpcpu, msgbufpv; + pt_entry_t *pte; u_int physmap_idx; - int i, mode; + int i; printf("pmap_bootstrap %lx %lx %lx\n", l1pt, kernstart, kernlen); - /* Set this early so we can use the pagetable walking functions */ - kernel_pmap_store.pm_top = (pd_entry_t *)l1pt; - kernel_pmap_store.pm_stage = PM_STAGE1; PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvchunk); vm_radix_init(&kernel_pmap->pm_root); @@ -664,74 +774,63 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) printf("min_pa %lx\n", min_pa); printf("max_pa %lx\n", max_pa); - /* Create a direct map region early so we can use it for pa -> va */ - pmap_bootstrap_dmap(l1pt, min_pa, max_pa); - - /* - * Read the page table to find out what is already mapped. - * This assumes we have mapped a block of memory from KERNBASE - * using a single L1 entry. - */ - (void)pmap_early_page_idx(l1pt, KERNBASE, &l1_slot, &l2_slot); - - /* Sanity check the index, KERNBASE should be the first VA */ - KASSERT(l2_slot == 0, ("The L2 index is non-zero")); - - freemempos = roundup2(KERNBASE + kernlen, PAGE_SIZE); - - /* Create the l3 tables for the early devmap */ - freemempos = pmap_bootstrap_l3(l1pt, - VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE, freemempos); + /* Create a new set of pagetables to run the kernel in. */ + freemempos = pmap_create_pagetables(kernstart, kernlen, min_pa, max_pa, + &root_pt_phys); + /* Switch to the newly created page tables. */ + kernel_pmap->pm_stage = PM_STAGE1; + kernel_pmap->pm_top = (pd_entry_t *)PHYS_TO_DMAP(root_pt_phys); + kernel_pmap->pm_satp = atop(root_pt_phys) | pmap_satp_mode(); + csr_write(satp, kernel_pmap->pm_satp); sfence_vma(); -#define alloc_pages(var, np) \ - (var) = freemempos; \ - freemempos += (np * PAGE_SIZE); \ - memset((char *)(var), 0, ((np) * PAGE_SIZE)); - - mode = 0; - TUNABLE_INT_FETCH("vm.pmap.mode", &mode); - if (mode == PMAP_MODE_SV48 && (mmu_caps & MMU_SV48) != 0) { - /* - * Enable SV48 mode: allocate an L0 page and set SV48 mode in - * SATP. If the implementation does not provide SV48 mode, - * the mode read back from the (WARL) SATP register will be - * unchanged, and we continue in SV39 mode. - */ - alloc_pages(l0pv, 1); - l0p = (void *)l0pv; - l1pa = pmap_early_vtophys(l1pt, l1pt); - l0p[pmap_l0_index(KERNBASE)] = PTE_V | - ((l1pa >> PAGE_SHIFT) << PTE_PPN0_S); - - l0pa = pmap_early_vtophys(l1pt, l0pv); - csr_write(satp, (l0pa >> PAGE_SHIFT) | SATP_MODE_SV48); - satp = csr_read(satp); - if ((satp & SATP_MODE_M) == SATP_MODE_SV48) { - pmap_mode = PMAP_MODE_SV48; - kernel_pmap_store.pm_top = l0p; - } else { - /* Mode didn't change, give the page back. */ - freemempos -= PAGE_SIZE; - } - } - - /* Allocate dynamic per-cpu area. */ - alloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); + /* + * Now, we need to make a few more static reservations from KVA. + * + * Set freeva to freemempos virtual address, and be sure to advance + * them together. + */ + freeva = freemempos - kernstart + KERNBASE; +#define reserve_space(var, pa, size) \ + do { \ + var = freeva; \ + pa = freemempos; \ + freeva += size; \ + freemempos += size; \ + } while (0) + + /* Allocate the dynamic per-cpu area. */ + reserve_space(dpcpu, pa, DPCPU_SIZE); + + /* Map it. */ + pte = pmap_l3(kernel_pmap, dpcpu); + KASSERT(pte != NULL, ("Bootstrap pages missing")); + for (i = 0; i < howmany(DPCPU_SIZE, PAGE_SIZE); i++) + pmap_store(&pte[i], L3_PTE(pa + ptoa(i), PTE_KERN)); + + /* Now, it can be initialized. */ dpcpu_init((void *)dpcpu, 0); /* Allocate memory for the msgbuf, e.g. for /sbin/dmesg */ - alloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE); + reserve_space(msgbufpv, pa, round_page(msgbufsize)); msgbufp = (void *)msgbufpv; - virtual_avail = roundup2(freemempos, L2_SIZE); - virtual_end = VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE; - kernel_vm_end = virtual_avail; + /* Map it. */ + pte = pmap_l3(kernel_pmap, msgbufpv); + KASSERT(pte != NULL, ("Bootstrap pages missing")); + for (i = 0; i < howmany(msgbufsize, PAGE_SIZE); i++) + pmap_store(&pte[i], L3_PTE(pa + ptoa(i), PTE_KERN)); + +#undef reserve_space - pa = pmap_early_vtophys(l1pt, freemempos); + /* Mark the bounds of our available virtual address space */ + virtual_avail = kernel_vm_end = freeva; + virtual_end = DEVMAP_MIN_VADDR; - physmem_exclude_region(kernstart, pa - kernstart, EXFLAG_NOALLOC); + /* Exclude the reserved physical memory from allocations. */ + physmem_exclude_region(kernstart, freemempos - kernstart, + EXFLAG_NOALLOC); } /* From nobody Thu Jun 20 19:00:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4qYy6B6Gz5PJ5M; Thu, 20 Jun 2024 19:00: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 4W4qYy4n87z56GS; Thu, 20 Jun 2024 19:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OC5ZpaLfQpqm/kwEN3LVeiwoJQ4lf8OpwCNQkujZkSM=; b=ZM0tQ4PugilJkEmkRGmnan3meUu3y3eeMdPlqGwt4CKas74wTnekFfVpWrNqksuEI+XNWc SGMAUl7oipLU5J5/bVTIPmhQK8E+nlxil50sI48eATiiRq/OZ+PrybodQ173UmKGNGytHG RHUm2pE3F8Zdvyu1sEP3K0wuIE9oXBtP+r6nPw1AGKIRf43QrxyWuJ+KVbUIT1gGF/i/pk vAyEI44VI19FXN32ElwVZj+tTDzpKGiiUl8X4wN7eiRW5i7v9RyADLhQSeu4QoOgira1sN H6KxzKdIpuRSphL7cTFGZ0G0/PWPg1dJTl4zaw51kF82AJs6S8zyq8Kwz5lW9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718910022; a=rsa-sha256; cv=none; b=JZKqUua9xqcJ63ahwzhuXskAxIMbE793n6B+4fDrC2lt1eIuFkuEeWI5hi3CCBoKWzZEfj X6YiqDW9U/UX1aRdfrilCzeL4e7yHWj5+kL56+hYpADHBAiOfqg9Wt93oiGKgMhcEbml9B Y5AqeMinA1wN49utQedgrllz6oBmvc6a4KOrom8yaGnSygOyGQJvwaR2iCz/RpMMOafAIq GYpA5qQgBbSuVjDo1dkCthgvXuJ8j56ELpDVsnmw8vsPhhrKRG2duC5uPF2+GBLAtGnYMW wgU+blbOHly8qWFhmBBALm567n8tnaSgEtcdpbsMTTwThXsXM8hyUT43DrPXyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OC5ZpaLfQpqm/kwEN3LVeiwoJQ4lf8OpwCNQkujZkSM=; b=Q/Ra069TOlG0U9l+dGZ/DaYat4GEYUPCD56HGo4B8e5PraNNneo/QLg/tv5IYeHOL+2XRU IeSa7HpsRWAzzHhRT91E7oPr7jgc5HWisZLlwHxtM+W+hwkSC4E77iXJNdw37IIbvAbonS 69PvV47MXa/C0NLbtvDOoxBONBpV8Bm9T8iFQE7Ls03CYlhze9ojrfRBXDiVRFDn/3MjFS o+lem7FAd6zbqfkuRCbYSYG4C+kTU9r6GH/z/BepsnFMg4q/jG5LTe9KM8j7gLjrwz8LNi Zhr0AEUAzUT7GjWGiwNQAt6MUZ4eIzMdeHdBE5G/lrwRafFJ/4Wz7x9E4oObMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4qYy4LZ6zcV7; Thu, 20 Jun 2024 19:00: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 45KJ0MHZ077803; Thu, 20 Jun 2024 19:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJ0MAe077801; Thu, 20 Jun 2024 19:00:22 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:00:22 GMT Message-Id: <202406201900.45KJ0MAe077801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 762a3224cde6 - main - riscv: smarter DMAP construction List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 762a3224cde67ce74ad6c0b0b6e434dd761d0baa Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=762a3224cde67ce74ad6c0b0b6e434dd761d0baa commit 762a3224cde67ce74ad6c0b0b6e434dd761d0baa Author: Mitchell Horne AuthorDate: 2024-06-20 18:32:07 +0000 Commit: Mitchell Horne CommitDate: 2024-06-20 18:33:19 +0000 riscv: smarter DMAP construction Currently we create the DMAP by mapping the entire range between the smallest and largest physical memory addresses with L1 superpages. This is obviously overkill, and we may end up mapping all kinds of ranges that are not real memory. In the case of the HiFive Unmatched (obsolete hardware), there is an errata resulting in faults when a TLB mapping spans PMP (firmware) protection regions. So, when our DMAP mapping spans into the memory reserved by OpenSBI, we get a fatal fault. This highlights the need to be smarter here. Therefore, let's attempt to build the DMAP a little more correctly by walking the physmap array and mapping each range individually. It is not perfect in that we still only respect the range to a 2MB granularity, but this could be improved in the future. Reviewed by: markj MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45328 --- sys/riscv/riscv/pmap.c | 154 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 54 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 937bb22371e2..8839a944de32 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -540,37 +540,109 @@ pmap_early_alloc_tables(vm_paddr_t *freemempos, int npages) return (pt); } -static void -pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t min_pa, vm_paddr_t max_pa) +/* + * Construct the direct map -- a linear mapping of physical memory into + * the kernel address space. + * + * We walk the list of physical memory segments (of arbitrary size and + * address) mapping each appropriately using L2 and L1 superpages. + * Consequently, the DMAP address space will have unmapped regions + * corresponding to any holes between physical memory segments. + * + * The lowest usable physical address will always be mapped to + * DMAP_MIN_ADDRESS. + */ +static vm_paddr_t +pmap_bootstrap_dmap(pd_entry_t *l1, vm_paddr_t freemempos) { + vm_paddr_t physmap[PHYS_AVAIL_ENTRIES]; vm_offset_t va; - vm_paddr_t pa; - pd_entry_t *l1; - u_int l1_slot; - pt_entry_t entry; - pn_t pn; + vm_paddr_t min_pa, max_pa, pa, endpa; + pd_entry_t *l2; + u_int l1slot, l2slot; + int physmap_idx; + + physmap_idx = physmem_avail(physmap, nitems(physmap)); + min_pa = physmap[0]; + max_pa = physmap[physmap_idx - 1]; - pa = dmap_phys_base = min_pa & ~L1_OFFSET; - va = DMAP_MIN_ADDRESS; - l1 = (pd_entry_t *)kern_l1; - l1_slot = pmap_l1_index(DMAP_MIN_ADDRESS); + printf("physmap_idx %u\n", physmap_idx); + printf("min_pa %lx\n", min_pa); + printf("max_pa %lx\n", max_pa); - for (; va < DMAP_MAX_ADDRESS && pa < max_pa; - pa += L1_SIZE, va += L1_SIZE, l1_slot++) { - KASSERT(l1_slot < Ln_ENTRIES, ("Invalid L1 index")); + /* Set the limits of the DMAP region. */ + dmap_phys_base = rounddown(min_pa, L1_SIZE); + dmap_phys_max = max_pa; - /* superpages */ - pn = (pa / PAGE_SIZE); - entry = PTE_KERN; - entry |= (pn << PTE_PPN0_S); - pmap_store(&l1[l1_slot], entry); + /* Walk the physmap table. */ + l2 = NULL; + l1slot = Ln_ENTRIES; /* sentinel value */ + for (int idx = 0; idx < physmap_idx; idx += 2) { + pa = rounddown(physmap[idx], L2_SIZE); + endpa = physmap[idx + 1]; + + /* Virtual address for this range. */ + va = PHYS_TO_DMAP(pa); + + /* Any 1GB possible for this range? */ + if (roundup(pa, L1_SIZE) + L1_SIZE > endpa) + goto l2end; + + /* Loop until the next 1GB boundary. */ + while ((pa & L1_OFFSET) != 0) { + if (l2 == NULL || pmap_l1_index(va) != l1slot) { + /* Need to alloc another page table. */ + l2 = pmap_early_alloc_tables(&freemempos, 1); + + /* Link it. */ + l1slot = pmap_l1_index(va); + pmap_store(&l1[l1slot], + L1_PDE((vm_paddr_t)l2, PTE_V)); + } + + /* map l2 pages */ + l2slot = pmap_l2_index(va); + pmap_store(&l2[l2slot], L2_PTE(pa, PTE_KERN)); + + pa += L2_SIZE; + va += L2_SIZE; + } + + /* Map what we can with 1GB superpages. */ + while (pa + L1_SIZE - 1 < endpa) { + /* map l1 pages */ + l1slot = pmap_l1_index(va); + pmap_store(&l1[l1slot], L1_PTE(pa, PTE_KERN)); + + pa += L1_SIZE; + va += L1_SIZE; + } + +l2end: + while (pa < endpa) { + if (l2 == NULL || pmap_l1_index(va) != l1slot) { + /* Need to alloc another page table. */ + l2 = pmap_early_alloc_tables(&freemempos, 1); + + /* Link it. */ + l1slot = pmap_l1_index(va); + pmap_store(&l1[l1slot], + L1_PDE((vm_paddr_t)l2, PTE_V)); + } + + /* map l2 pages */ + l2slot = pmap_l2_index(va); + pmap_store(&l2[l2slot], L2_PTE(pa, PTE_KERN)); + + pa += L2_SIZE; + va += L2_SIZE; + } } - /* Set the upper limit of the DMAP region */ - dmap_phys_max = pa; + /* And finally, the limit on DMAP VA. */ dmap_max_addr = va; - sfence_vma(); + return (freemempos); } /* @@ -589,7 +661,7 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t min_pa, vm_paddr_t max_pa) */ static vm_paddr_t pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, - vm_paddr_t min_pa, vm_paddr_t max_pa, vm_paddr_t *root_pt_phys) + vm_paddr_t *root_pt_phys) { pt_entry_t *l0, *l1, *kern_l2, *kern_l3, *devmap_l3; pd_entry_t *devmap_l2; @@ -657,6 +729,9 @@ pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, nkernl3 = 16; kern_l3 = pmap_early_alloc_tables(&freemempos, nkernl3); + /* Bootstrap the direct map. */ + freemempos = pmap_bootstrap_dmap(l1, freemempos); + /* Allocations are done. */ if (freemempos < roundup2(kernend, L2_SIZE)) freemempos = roundup2(kernend, L2_SIZE); @@ -714,9 +789,6 @@ pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, pa = (vm_paddr_t)devmap_l2; pmap_store(&l1[slot], L1_PDE(pa, PTE_V)); - /* Bootstrap the direct map. */ - pmap_bootstrap_dmap((vm_offset_t)l1, min_pa, max_pa); - /* Return the next position of free memory */ return (freemempos); } @@ -727,14 +799,11 @@ pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, void pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) { - vm_paddr_t physmap[PHYS_AVAIL_ENTRIES]; - vm_paddr_t freemempos; - vm_paddr_t max_pa, min_pa, pa; + vm_paddr_t freemempos, pa; vm_paddr_t root_pt_phys; vm_offset_t freeva; vm_offset_t dpcpu, msgbufpv; pt_entry_t *pte; - u_int physmap_idx; int i; printf("pmap_bootstrap %lx %lx %lx\n", l1pt, kernstart, kernlen); @@ -752,31 +821,8 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) */ CPU_SET(PCPU_GET(hart), &kernel_pmap->pm_active); - /* Assume the address we were loaded to is a valid physical address. */ - min_pa = max_pa = kernstart; - - physmap_idx = physmem_avail(physmap, nitems(physmap)); - physmap_idx /= 2; - - /* - * Find the minimum physical address. physmap is sorted, - * but may contain empty ranges. - */ - for (i = 0; i < physmap_idx * 2; i += 2) { - if (physmap[i] == physmap[i + 1]) - continue; - if (physmap[i] <= min_pa) - min_pa = physmap[i]; - if (physmap[i + 1] > max_pa) - max_pa = physmap[i + 1]; - } - printf("physmap_idx %u\n", physmap_idx); - printf("min_pa %lx\n", min_pa); - printf("max_pa %lx\n", max_pa); - /* Create a new set of pagetables to run the kernel in. */ - freemempos = pmap_create_pagetables(kernstart, kernlen, min_pa, max_pa, - &root_pt_phys); + freemempos = pmap_create_pagetables(kernstart, kernlen, &root_pt_phys); /* Switch to the newly created page tables. */ kernel_pmap->pm_stage = PM_STAGE1; From nobody Thu Jun 20 19:00:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4qZ01DXlz5PJGy; Thu, 20 Jun 2024 19:00: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 4W4qYz60Ntz55rP; Thu, 20 Jun 2024 19:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VmTsSC7PvEm6ZsUgycNebsF33DrYrm7g4chpOIz3Mc4=; b=JDc6+Togt2gh1dqNN2pqYK0T6hNvBbzLPDImidomRX4mQ+pMhrrjednThetSnzo7ob2ykQ pkFrSglPemq6OFrlNz+m/bhGP7vvua0au4LwbWwF/9b9ddS16NxEsKFWZwP+Yk2yW5kmPA D7VD4e3fKCI8S2gJd5m9ko3k2jliEc4OSVQriRuppQdut1mxdFG1UKmituBy9Nqo44YJPu yoQ2cJ9c9i03kg0j1ls7IPE3qXEh99KuGp0NzAwHh1APvN8CDTXq0CYFQOTS+8AUzq25W4 fHtpMArAwzUlUI+/EW6gLu+c9HjgGpXlveqyXCzl033mLgY7fiFaagcBn04YOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718910023; a=rsa-sha256; cv=none; b=qxHTqFpP6jQdnns8ZayjxOO4wm7Q6Ptfh63zowlpGG7ynYYa1Qzfq8AiEYcAx+zvHCrF64 J3Q+K5EIfA255kDP9tLz75U/7H1smGV5oaa9p0/XSBIKMxqsMgo1lJ3Kstds/1JF5jwAEf o/WijCeTawY3QXIJNBXBhSRyhLwO+R35IJaAjdCR4pXoFhlETIGCZeQZZo7oG6mIO8gERa ZHhR2TQeojciMGeOOaZmhLDXmRp5G1yz/zEB4IXQGiJWcUE9LvvWauFVid5EWM7ppA2Oxz Iji2Q11vcfnl2+ujR1HLJwzpe5k0UUe13rmXlByctDD4IqLrdmXPMpyAUDX2Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718910023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VmTsSC7PvEm6ZsUgycNebsF33DrYrm7g4chpOIz3Mc4=; b=iBR3RvVHrmaYkFnjoeUR6EBCvDYwJ2CVOPG0nxkxnSvZ6k/SRjR3gjGN46QSOSAzaRouLa FFggDYkaONTWxY+EzzmkHe/7c3oTbvBtIS5pW96dxDdUqQg8lxHjXxArkeBJ7Jjwrmmfe5 t6yACgpWQ76qQ3wjDsYtbICmrd9+ffKDJQ7aEZWP6fD8XVlJ0wVCKniePVE1DUVALRCG2m SZHwszpcTJJQZLXr+dBkQ9zDh5oR39kQrjESx9CwHgtGYgg2bTHKddXRR0YLV1ZS4NngDj yIGC5+gPh0VTsGfrBdwwDVbMmS1RAU0fHSP7ymW/+5w5vGpGtk2J1r8MkTo2lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4qYz5MhWzcV8; Thu, 20 Jun 2024 19:00: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 45KJ0NS3077848; Thu, 20 Jun 2024 19:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJ0Nrc077845; Thu, 20 Jun 2024 19:00:23 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:00:23 GMT Message-Id: <202406201900.45KJ0Nrc077845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 18051cc694be - main - riscv: drop l1pt argument from pmap_bootstrap() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18051cc694be7949e289c10e696dc1d56b8b69ca Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=18051cc694be7949e289c10e696dc1d56b8b69ca commit 18051cc694be7949e289c10e696dc1d56b8b69ca Author: Mitchell Horne AuthorDate: 2024-06-20 18:32:54 +0000 Commit: Mitchell Horne CommitDate: 2024-06-20 18:33:19 +0000 riscv: drop l1pt argument from pmap_bootstrap() And from struct riscv_bootparams. It is no longer needed. Reviewed by: br, markj MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45470 --- sys/riscv/include/machdep.h | 1 - sys/riscv/include/pmap.h | 2 +- sys/riscv/riscv/genassym.c | 1 - sys/riscv/riscv/machdep.c | 2 +- sys/riscv/riscv/pmap.c | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/riscv/include/machdep.h b/sys/riscv/include/machdep.h index 581749f44d76..cfe95e5d81aa 100644 --- a/sys/riscv/include/machdep.h +++ b/sys/riscv/include/machdep.h @@ -36,7 +36,6 @@ #define _MACHINE_MACHDEP_H_ struct riscv_bootparams { - vm_offset_t kern_l1pt; /* Kernel L1 base */ vm_offset_t kern_phys; /* Kernel base (physical) addr */ vm_offset_t kern_stack; vm_offset_t dtbp_phys; /* Device tree blob physical addr */ diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h index 8123231144bb..74e15d965826 100644 --- a/sys/riscv/include/pmap.h +++ b/sys/riscv/include/pmap.h @@ -133,7 +133,7 @@ struct thread; void pmap_activate_boot(pmap_t); void pmap_activate_sw(struct thread *); -void pmap_bootstrap(vm_offset_t, vm_paddr_t, vm_size_t); +void pmap_bootstrap(vm_paddr_t, vm_size_t); int pmap_change_attr(vm_offset_t va, vm_size_t size, int mode); void pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode); void pmap_kenter_device(vm_offset_t, vm_size_t, vm_paddr_t); diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c index 105e17e679b7..637510db242e 100644 --- a/sys/riscv/riscv/genassym.c +++ b/sys/riscv/riscv/genassym.c @@ -99,7 +99,6 @@ ASSYM(TF_SCAUSE, offsetof(struct trapframe, tf_scause)); ASSYM(TF_SSTATUS, offsetof(struct trapframe, tf_sstatus)); ASSYM(RISCV_BOOTPARAMS_SIZE, sizeof(struct riscv_bootparams)); -ASSYM(RISCV_BOOTPARAMS_KERN_L1PT, offsetof(struct riscv_bootparams, kern_l1pt)); ASSYM(RISCV_BOOTPARAMS_KERN_PHYS, offsetof(struct riscv_bootparams, kern_phys)); ASSYM(RISCV_BOOTPARAMS_KERN_STACK, offsetof(struct riscv_bootparams, kern_stack)); diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 0d04bf0d3544..ffb29e53b88e 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -567,7 +567,7 @@ initriscv(struct riscv_bootparams *rvbp) /* Bootstrap enough of pmap to enter the kernel proper */ kernlen = (lastaddr - KERNBASE); - pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); + pmap_bootstrap(rvbp->kern_phys, kernlen); physmem_init_kernel_globals(); diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8839a944de32..377d038a9a8a 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -797,7 +797,7 @@ pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen, * Bootstrap the system enough to run with virtual memory. */ void -pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) +pmap_bootstrap(vm_paddr_t kernstart, vm_size_t kernlen) { vm_paddr_t freemempos, pa; vm_paddr_t root_pt_phys; @@ -806,7 +806,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) pt_entry_t *pte; int i; - printf("pmap_bootstrap %lx %lx %lx\n", l1pt, kernstart, kernlen); + printf("pmap_bootstrap %lx %lx\n", kernstart, kernlen); PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvchunk); From nobody Thu Jun 20 19:18:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4qyn42cHz5PKJd; Thu, 20 Jun 2024 19:18: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 4W4qyn3VTcz58PV; Thu, 20 Jun 2024 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718911105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TsHkMnSYOjdYPsV81tj/DNPfvNpfPuIMDpSC0YTXDA=; b=mgUNIW34mXXlLObw1eYqe5UtEdTZGUevOad4JFAz0N3//354DrRxYpj97r7CvfrH7WRrBv CyGhJ1sqcgECfpSvjrNjiChM1q6zdkfFi0ByoJB70BzEcW6psWkboKdVFh3Vj3mHu2WGt2 4m1pGiw2w3jsww+fzQZE1d8u6949g873E76h9dz3AAuz+zaBR0huzhlLgUPQpPl4f+QdSC Or0xOWLJeDJxseF+/LbupgEnlkcpp50B4GDS9LFuTaut7xSZ1+NQVNO+hzTCj/AB7FpEz9 UrkatSpZppZ5Q6SmYwmk2yBazTSfJgDkDXDayrVDSXyk+w+ppiYNxzMWnyCaxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718911105; a=rsa-sha256; cv=none; b=psK0zFTVWKoIYIxVTc7vahhP4CiUzKXVmRKOyn7c7G7ERIuX5ariqCayvoLFXixPMGQr1Q 9x9joY3Wjtv8OXHPEkLCgZKEz91DbgmUkbT12ZyPTlDntHJeFWQIgqh9Xywx0Z7WpuLnnB qWCaZyHPiZe5ZD4ptOaxslA8GNAM2nrlgWxD2/nFAT5kO+Qrqsfcu8FnBe15slexdG7QJb ZB2ZvM3UWTmYTe76ZSO9az4E1FpeRT0e4639wn+GUxcdH4EdRsNqqQiDkCCp85qB42Wg/O kDKH9jJpP6bhogHnueYNtzib21oCjFLRkcFRH8v8h+ELl/CC+45pQphgsB2qzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718911105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TsHkMnSYOjdYPsV81tj/DNPfvNpfPuIMDpSC0YTXDA=; b=R2F42VH2niBAHAJcE9HVyNON0YpOdB+jN+7UYaqUutNGAubsRF0TIZRZfvspe0IpA9gV4M QbAO/nafRlHcRVYbA7soZNBNaJiW2pmY9W3DOkXAhMqR0ltBXVQs8nDGCsZaewGbpffEVN fP2UC/VldHbkqjuE5+CfD12MxMFWT4/pJP9qqAsuCd5A+p57/BnNM0GdWYBUbs0FSY+URZ MWo0zfpYVnzWFLDaMNaNEkeud+hBEjCZYzmBISBM9YZ0XSWmxnYlbdYRUeKKuCO1ZquS6g +9xnuxOjTpWRxCDWG3BQ2QRAaoBrkQtkj6AxZv77po/TEzrF/Rs0mVA94ej6Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4qyn2zWfzdFv; Thu, 20 Jun 2024 19:18: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 45KJIPmi002064; Thu, 20 Jun 2024 19:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJIPpH002061; Thu, 20 Jun 2024 19:18:25 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:18:25 GMT Message-Id: <202406201918.45KJIPpH002061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: aee4c9c5b88a - main - Makefile.inc1: Fix typo affecting incremental pkgbase builds. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aee4c9c5b88adc899b2e155a1c144acf96719f1e Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=aee4c9c5b88adc899b2e155a1c144acf96719f1e commit aee4c9c5b88adc899b2e155a1c144acf96719f1e Author: Navdeep Parhar AuthorDate: 2024-06-20 19:15:12 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-20 19:17:46 +0000 Makefile.inc1: Fix typo affecting incremental pkgbase builds. Fixes: 4231a5e50404 release: don't keep old packages if the BRANCH changes Sponsored by: Chelsio Communications --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 91d59e57b396..2f442bc9a394 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2068,7 +2068,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a "$${oldsum}" == "$${newsum}" ]; then \ echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ From nobody Thu Jun 20 20:14:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4sD032Mrz5PPJK; Thu, 20 Jun 2024 20:14:56 +0000 (UTC) (envelope-from bapt@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 4W4sD02VZkz41RD; Thu, 20 Jun 2024 20:14:56 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718914496; 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=ctAsexrsQG+1HXPBQQvCCZiyxnujmgrDyYcZC4LtDrA=; b=WNjxHoMCp9RNOP8oOP3y4n9aQTEYYeNO/pPqdaKLiE0oGP9kn2zKG79d3d9MHZIQFvi82Q 1/1RJz/snrNbrkIeNHn5mHOfFhh2F35nIEMLKO1e4JI3sHsox3qLLvh/MnyWQNNPfr7nek rk0+6FcIYgIH/68aZMk53hVzB2lvI1uZX93tLG8kc1WGjOOYceZClTkW3imqEN5MZZ4eHY /2rDSpS0zXPJkP8XNnK+tAPPEWB/rVcrX7Jbf/WKF1+Tm6f97AeExY8y9iegAXFacm5MDU +2u+8rgiRZmJp2DDluo9oi0LmpgSm8AIxgoqokyOI72uRwQFLuvpfCpSI2HxcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718914496; a=rsa-sha256; cv=none; b=vVK/HQt2NCCi/OEJ7XN3Sq5cHEg7hzkv66ZwIvxzv9siIVM58aNugAIBr0ld6HkVniZcB4 B/9IojeO9Do/nBTwGmUVcKsz7y3fLXPr0fK3fmGsT+gYnvn7bk/YiS8q92JCEolPrgy4XM qdwRsw+wkrGQNLOb7tcd1w3wON6JTBAaR0u86tf+pzIk+xxNV2xeE/FFSCq6qPhdZXXSKM xC8IRWc8taJFSLHCL7j9ZEfFr1aZEsefYwFxy1MEryhKvRKNOTAMOdmkuDc28nABMtuCKD MQiTJPaVHCFHu1cJhwH1eBxdTtewMgBv7nRur4BwCuBLO1zAGi549Co5PzvHXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718914496; 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=ctAsexrsQG+1HXPBQQvCCZiyxnujmgrDyYcZC4LtDrA=; b=OAELYAMy0+2jmHLdcXlX4PVI6gGxllGJNZIhCoeMWoMmXGVqoGrIWLvfNl4nqXXlAOY1rQ qad+tNzRaRLcu63YpZan1vXjCp4JrUsS5xBWjLWPj6/aAkevwcfyRfM3Lp0z24Z7CHklgC wFOigPIpu7JDHtFu/gtNX/XvorFcY/1PyT5dmekVze+pxrRsM70Mm0ysrGRr1Kl7Q49pOI rS6WvWLfmrO0IbnBULex6JVIXd8gdYWWtzQ8JyzzMTN+yY5VtalZ9u71sHMYuFzWZytvlz 8r0RrP/sgrNLhz2JG56Q60P2sIu/Ep1w2/9AZrMqWcdwy4+OMV807PSTYahdlw== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W4sD01RQJz1Gp4; Thu, 20 Jun 2024 20:14:56 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 2C96696C5C; Thu, 20 Jun 2024 22:14:55 +0200 (CEST) Date: Thu, 20 Jun 2024 22:14:55 +0200 From: Baptiste Daroussin To: Navdeep Parhar Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: aee4c9c5b88a - main - Makefile.inc1: Fix typo affecting incremental pkgbase builds. Message-ID: References: <202406201918.45KJIPpH002061@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202406201918.45KJIPpH002061@gitrepo.freebsd.org> On Thu 20 Jun 19:18, Navdeep Parhar wrote: > The branch main has been updated by np: > > URL: https://cgit.FreeBSD.org/src/commit/?id=aee4c9c5b88adc899b2e155a1c144acf96719f1e > > commit aee4c9c5b88adc899b2e155a1c144acf96719f1e > Author: Navdeep Parhar > AuthorDate: 2024-06-20 19:15:12 +0000 > Commit: Navdeep Parhar > CommitDate: 2024-06-20 19:17:46 +0000 > > Makefile.inc1: Fix typo affecting incremental pkgbase builds. > > Fixes: 4231a5e50404 release: don't keep old packages if the BRANCH changes > Sponsored by: Chelsio Communications Thank you!! Best regards, Bapt From nobody Thu Jun 20 22:00:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4vYM01Bsz5NqBg; Thu, 20 Jun 2024 22:00: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 4W4vYL6Zpnz48jb; Thu, 20 Jun 2024 22:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718920806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZW3m/2tI+W7OKnNpyQMbGyPQvOwLARAPNJepafkvRmg=; b=Dw5AYuRsO/CQDKyB8HDi1Sd3XPrRd7/wXecXdgUDSNFibOEZBQ+Zc784tAhetLWyl/vrNH lxwxRkzEVegxgidnvXTJfjA4dDEXL+FEmm2tkn3K1f4jjeuvJAx2nRapC7yowbNOEzcXLR rekkizaZW6Z0YcfZioORZr2XGzpI3AaDcV6BeCQfsBzXpKg6qsESnn0jSskfUvZo4rM2E6 ipzYqr/yWYMn0Wrweb4i7n9ovHp9Q05rH0Yy22Bqa7A6TOC+WQh7crKX+gPcwQh8+ZT/O+ VBBypcaVzuZOg96x+TArULpQMOawiTD07Y6Vf3QRMyqHuKtFr/DBTG+QRyOI3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718920806; a=rsa-sha256; cv=none; b=bxBBdWQJ0bgnkkP7HcmfNO2jbIVQUM6/z+Z00Mr2B++hS+jYH7P55E0Fo4ijftGyYvs48X nlIhwSfEmn8L/8qGn0Q62WPacYoQqV4f4fLGGDU1VkWQFiXnx93MovnFpl34fIyqkBCF8P +WYkshzrQ5uaAnDhWhuaaPPYFXpwOkRLMr+PIOUDtSuJ6nR9N5FqGQYnxsUGfU9JQwF6IH qAMEouwcq8iJU/A4+BP+VbvF+KHRBMxTNeIFwZf/560KaKwHEodfZF4oAuPq3KDCE5guga epUO7uX6NEocL+C0jalZTegCADSgGSjmH5tFat8E/GT2e7Pe1Gc/lICLbFofzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718920806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZW3m/2tI+W7OKnNpyQMbGyPQvOwLARAPNJepafkvRmg=; b=nfzQHcChE/YgfOoHbc3JngGTEETiszc5hDhpDlIUkzgJ9ogRQcUoxSWm++YnYHFLPgIESw QwlNLvrVgCi1pOJ0bWkhHkRiGMF3/UDKxcO7nG2tysq1ABK0LmXzY8cJiI3e54Ajh7jWA9 GiXsB6+SyV/SF6Yu7YZOhNg2lLtY49le5Ghs88rOShwjha109jny2NfOB1e1AarzZVaXN1 DEMSLwWy0LwPtr7W7EgbdAe7VqlSzlGDL24Lwn/TtSmwQHc3Na/gM3wqTrcgmIigMOmHLt cNfv0Nuf1KR0u9m2gjx7wfyOOIhXk5nlKM1pNFgN2YOq8R1pfdl6gzhO40/pkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4vYL530Gzhdh; Thu, 20 Jun 2024 22:00: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 45KM06dT076709; Thu, 20 Jun 2024 22:00:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KM06je076704; Thu, 20 Jun 2024 22:00:06 GMT (envelope-from git) Date: Thu, 20 Jun 2024 22:00:06 GMT Message-Id: <202406202200.45KM06je076704@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: f45213c74cba - main - physmem: Correct a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f45213c74cbac7f41ab3c94440cb37a2fd92a449 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f45213c74cbac7f41ab3c94440cb37a2fd92a449 commit f45213c74cbac7f41ab3c94440cb37a2fd92a449 Author: Mark Johnston AuthorDate: 2024-06-20 20:43:39 +0000 Commit: Mark Johnston CommitDate: 2024-06-20 21:45:40 +0000 physmem: Correct a comment MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/kern/subr_physmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c index a45c36aef2d7..059566f0eccb 100644 --- a/sys/kern/subr_physmem.c +++ b/sys/kern/subr_physmem.c @@ -177,7 +177,8 @@ physmem_print_tables(void) * * Updates the value at *pavail with the sum of all pages in all hw regions. * - * Returns the number of pages of non-excluded memory added to the avail list. + * Returns the number of entries in the avail list, which is twice the number + * of returned regions. */ static size_t regions_to_avail(vm_paddr_t *avail, uint32_t exflags, size_t maxavail, From nobody Thu Jun 20 22:00:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4vYN1nvyz5NqT5; Thu, 20 Jun 2024 22:00: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 4W4vYM6hpXz48pr; Thu, 20 Jun 2024 22:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718920807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brdg2k5l/cjMdwCeY95lRBy46VfFY27u5oO35c+Q3OA=; b=HE3oiIi+O9wP8wdG6Clucg7CgAMqIjpqEALgtR6cGzF/0L0Xh+73qWApJ/cMQRmiumheRW q/xcp/iNMfxjHmceh7XiCe4c0BZoXGplO0V61DqyqAQt5HOc69LNyKEWSLzhdTKaWnaTlY iKohWs72VZdUCDpppufm/ECzbl3N4xSwBx4POVkypmX7Lk22FSx784o/JtGv2lApoH6edA MUXvYbxUBrOxC2TvV7Td5OEd7M01prQIc95tuTCtgmEk5YQs0UCDi2cStEx+KTsNjYG+c8 92s5bzlAEYlsCj/zKopuntsNTVgr9F9HIE6zpXiQW1F/ZBpH/2hFpFr+6KuqKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718920807; a=rsa-sha256; cv=none; b=sAdLJDh8JegCDj7PkBAArXwOP7pC9WHNB2YSIV+HZqusd0IYIBBxX8Xt63DYRaIGoIP2hm c8v3YqfyeyyixD6GgkFMBZ8KZvyPg8e6Y4zx1elpx18dm4ZNab86C3H30PlYoF6eQUKiMy 7o/J+87poasctnhV2Xo34+s34r4IWM7ijzFw2+ejpCg7qSSZK21xbhLyoj7Kc3focUPHo7 l7is7hsdS0Vpl39zdBIekgJyYzuLJyfQOHSIeSTc8McspaMPvtRO56fNoI6wCo9r7R2HLp QPISsutEdPMGqTsCoJwLKot4RwF2V+GEGH6hGfx+JSPibdP4PH7+Ta8aM3dqeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718920807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brdg2k5l/cjMdwCeY95lRBy46VfFY27u5oO35c+Q3OA=; b=pHKoh6y1DzaPJDsRgESxMgbtFzz1ENAp5bqYvWC5ufnnbx3xw+wwnLO45LMCYq6lYug8Tj +MFHhjUn/U4rVWmsARogMREt8vP3vgo5IevIXREceC+/f0NjbToV7h6rwtUNnGlbjztbBC AtHC8LfvPS5LIDER3HHbrvILkpKhT4Ye1T1KcwNGze8gEAHUMF6EL6mPjZSlpgTPVrKWVA bYg0DMRzUqh0B2edHPK/rP34/t9VACt5JyADkuWfA9cs1CSnEfqVDV8LEpSaXd7G28rbWF 8MtJoAJ5QTGzoZjDfama7sZg04Xl8RvknJ3mwBZAi0wLBNDCSeZattMLbsgIDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4vYM5XJFzjCt; Thu, 20 Jun 2024 22:00: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 45KM070Z076987; Thu, 20 Jun 2024 22:00:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KM07tk076981; Thu, 20 Jun 2024 22:00:07 GMT (envelope-from git) Date: Thu, 20 Jun 2024 22:00:07 GMT Message-Id: <202406202200.45KM07tk076981@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: d03e1ffbea6d - main - arm64: Remove some redundant calculations from pmap_bootstrap{,_san1}() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d03e1ffbea6dd74ea8716b6a7cd052893d347b58 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d03e1ffbea6dd74ea8716b6a7cd052893d347b58 commit d03e1ffbea6dd74ea8716b6a7cd052893d347b58 Author: Mark Johnston AuthorDate: 2024-06-20 20:43:48 +0000 Commit: Mark Johnston CommitDate: 2024-06-20 21:53:54 +0000 arm64: Remove some redundant calculations from pmap_bootstrap{,_san1}() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/arm64/arm64/pmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index e8991ae706f9..d072a387d9b9 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1323,13 +1323,12 @@ pmap_bootstrap(vm_size_t kernlen) min_pa = pmap_early_vtophys(KERNBASE); physmap_idx = physmem_avail(physmap, nitems(physmap)); - physmap_idx /= 2; /* * Find the minimum physical address. physmap is sorted, * but may contain empty ranges. */ - for (i = 0; i < physmap_idx * 2; i += 2) { + for (i = 0; i < physmap_idx; i += 2) { if (physmap[i] == physmap[i + 1]) continue; if (physmap[i] <= min_pa) @@ -1439,7 +1438,6 @@ pmap_bootstrap_san1(vm_offset_t va, int scale) * allocation since pmap_bootstrap(). */ physmap_idx = physmem_avail(physmap, nitems(physmap)); - physmap_idx /= 2; eva = va + (virtual_avail - VM_MIN_KERNEL_ADDRESS) / scale; @@ -1448,7 +1446,7 @@ pmap_bootstrap_san1(vm_offset_t va, int scale) * the shadow map as high up as we can to avoid depleting the lower 4GB in case * it's needed for, e.g., an xhci controller that can only do 32-bit DMA. */ - for (i = (physmap_idx * 2) - 2; i >= 0; i -= 2) { + for (i = physmap_idx - 2; i >= 0; i -= 2) { vm_paddr_t plow, phigh; /* L2 mappings must be backed by memory that is L2-aligned */ From nobody Thu Jun 20 23:11:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4x7Z6c14z5Nwm8; Thu, 20 Jun 2024 23:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4x7Z68KXz4H5w; Thu, 20 Jun 2024 23:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718925082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYSHLH0LOt9R6fdLPut6cjb/rmhDY5UFYIgqZ2qLl6o=; b=OJF+TEjCvPCTQJp4iXHbLKd/U9xx8rycs/p3L9rc/L2rxgWJ5B802MWGjDE7+gpieAhZax dI103nLFsIwo74UpVGyVZyBjmRAgouXYYWYXkuO4zZ7sCe8U1ssntCv5hTBWL0J4CsE/3p zoWliAdR9inkOSlEfXQhCi2BHsxkp4ONkwAu2ZuqCjOyKd6XMf6R8wzX+p9rqNfQoZlT4A VI5Mx5FsYqNzkrU9Hda4ondnebV0EmnkWfbdxr6+Z+FhJU1ZbgT6MNZbsaLoAaktQnFPKu rnB5pEpGnRqbI78LOPps0YNEVen6MtqyDmxn5f8S2/Al3z16OX3ZJt5A1E39xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718925082; a=rsa-sha256; cv=none; b=SD2QxHjYKwjTVQnLMun7Z+AZSm/YC9uS9hy7yQL4/R2q0GLB109PnKeHDfqq0qaBzyVCex a24uIZHNLuIzGAawh/DbNf29gKlNDh/bPDMIoQ4ImpgSpvjpHHzm8g8EMvUlEMIEBcB9ux DBPDAf1/2CZR105nT6vrMi3ri4chuNz9YptXwipkv3Wy4dLPnYMjUCWsFA5Kawsnr8/3zU 1148uSwpx+LTRW3d/mdWlU3cdWiy8+4fQ6fBUCc0T3iSx6w9u0LR+NIo0aRMqCDq5+YrY1 FsYvGvDTdLZdNE8P9/X8Vhn89o+wZsYNbabzjp2OmwBhAMJJanMrqQ9gH2NHjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718925082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYSHLH0LOt9R6fdLPut6cjb/rmhDY5UFYIgqZ2qLl6o=; b=w/SVXuvkIfYv9WTyDQC45Nz1Mge7wgQ09VzEtp/d8WapKNdb1crZ7JkOTdXosfj1V/K50n B9jooKzimxNkLe0uBhkk1XpT6FwJsDQb9YpwRNdkz2CIRMW7uB3iGgQnFpc/qQpqdbOAek iHuEizN9Ef44iJahNAQA4CiNw4ZSMRxYxmYf/2VHu9zkcIFD6vBtpwe3jXwyCbDpwOw2b3 AL0WpDwQc6McFlHCA4FHWlv4/TnAfz0SBnBWOcyb/tkufiWxUn5FxeAPZWxczO26C4ggfB n7uanuuSoX2jkgJjiYeV6S5avXpWdRRy4B697rFYqpLc9Ahtg0eF1h3THrd9Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4x7Z5ksTzkqB; Thu, 20 Jun 2024 23:11: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 45KNBMNA003685; Thu, 20 Jun 2024 23:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KNBMY5003682; Thu, 20 Jun 2024 23:11:22 GMT (envelope-from git) Date: Thu, 20 Jun 2024 23:11:22 GMT Message-Id: <202406202311.45KNBMY5003682@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: 969cb79f5b7e - main - netlink/route: reformat comment to fit 80 chars List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 969cb79f5b7e7547d24895c40d6735fe07cbcf35 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=969cb79f5b7e7547d24895c40d6735fe07cbcf35 commit 969cb79f5b7e7547d24895c40d6735fe07cbcf35 Author: Gleb Smirnoff AuthorDate: 2024-06-20 23:10:39 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-20 23:10:39 +0000 netlink/route: reformat comment to fit 80 chars No functional or content changes. --- sys/netlink/route/route.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 1d4149e23d2f..60c3a22718a3 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -134,9 +134,10 @@ enum rt_scope_t { /* * Routing table identifiers. - * FreeBSD route table numbering starts from 0, where 0 is a valid default routing table. - * Indicating "all tables" via netlink can be done by not including RTA_TABLE attribute - * and keeping rtm_table=0 (compatibility) or setting RTA_TABLE value to RT_TABLE_UNSPEC. + * FreeBSD route table numbering starts from 0, where 0 is a valid default + * routing table. Indicating "all tables" via netlink can be done by not + * including RTA_TABLE attribute and keeping rtm_table=0 (compatibility) or + * setting RTA_TABLE value to RT_TABLE_UNSPEC. */ #define RT_TABLE_MAIN 0 /* RT_DEFAULT_FIB */ #define RT_TABLE_UNSPEC 0xFFFFFFFF /* RT_ALL_FIBS */ From nobody Thu Jun 20 23:11:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4x7c1vd8z5NwgV; Thu, 20 Jun 2024 23:11: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 4W4x7c04Z3z4GtJ; Thu, 20 Jun 2024 23:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718925084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ak1fzz0q5SNTVI9+Ue3eUOW3eTt0hvpwFEP3B8HNMA=; b=RmQfpM8hxKAd6+IBDAw7PPnSMmbit2SGbxF1LDrXoPXIwHx2CR1CaNMOBfAosTYYgr6me9 MVvL/BU2Mqm1DheZ5AKNwskz2ChbdOaiajVFhMCRl3rK4BWVpQ+a8coYEGnWKIXsRTa+IO zV1DBNGrrSf1LVjASGd2jICuvTqUDxHka5ZzEpDeEtWyRz1ctn+RyoAIDwqcxBH2eQJBT1 dtqejGfKxytzMAlb4lIfjePCpe4iUka4PFNBc1kwalJnd17+fDuJYTepWVlnhlhaZiUA44 gxLtPDmy4z1qM1MX2e2DTjNQA9LzI47BjLBoaLheqcOWvB+ABOk3aisFI0oBEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718925084; a=rsa-sha256; cv=none; b=ueEA++IV7986NvAxM0bLOG+S6SVGW2vpPhCKqi8jZe701or7ftGaBcafKYwb4JcJoP5nGy S3Gp/gfTriqBUwXn+MBqRVnpdoNYeEqviqOdxpquavCPZJoi0vL5656m7XPZ+F9tlmojJZ 3h1No3L4ZLUiDQlVv0+Yjx00Uz51rHDBW4xN5w61yNZQq1Mepv00Uug4qo24cqjCpKU8EN ceU0P75VOHRjq+oFymOD2SHJok/wekfmXP8IBMr/jPYwfiGc9ocy3DRj311R8LLybtqSJH 34Gqwx0xWdxWlAbzhDY3cer/r3KK580zVZkZRBPYoxlUUq28EpyWeFsgukcgRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718925084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ak1fzz0q5SNTVI9+Ue3eUOW3eTt0hvpwFEP3B8HNMA=; b=cGe6O0kvrU5A659WNDH7kPKy9iknc1ZFcMkTWZMdS8+TuYT16W+1dgb2mK2yIJXWGsFs13 JQoI+MOpMyYndw9utOsuGy96B/Qfkcsv5H6i4wjk42rUzBM+TmO4nhEifcZG7nQ1R06GkD Qt52tbU/308GcbceOCiMO2iMhow8GBzVULuD3EoVyU/35QS1Vp1FL7grHf2908R9uXRVPh S+wmNLwKXl6/a2GktnxELj5n/jAIYRaxwEJzHLLj1NzU60qW9sOAixewRzrO/7D0dIZS3J IC8THEcSHU0gGNzdpaWMPBQpaKW+4K+7/SuHN7gzv2JRTUdsjV8oIrHApS8hWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4x7b6mtczkf0; Thu, 20 Jun 2024 23:11: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 45KNBNQ7004503; Thu, 20 Jun 2024 23:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KNBNkI004492; Thu, 20 Jun 2024 23:11:23 GMT (envelope-from git) Date: Thu, 20 Jun 2024 23:11:23 GMT Message-Id: <202406202311.45KNBNkI004492@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: f34aca55adef - main - netlink/route: provide pre-2.6.19 Linux compat shim List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f34aca55adef1e28cd68b2e6705a0cac03f0238e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f34aca55adef1e28cd68b2e6705a0cac03f0238e commit f34aca55adef1e28cd68b2e6705a0cac03f0238e Author: Gleb Smirnoff AuthorDate: 2024-06-20 23:10:39 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-20 23:10:39 +0000 netlink/route: provide pre-2.6.19 Linux compat shim The old Linux used 8-bit rtm_table field of the RTM_NEWROUTE message to specify routing table id. Modern netlink uses RTA_TABLE 32-bit attribute. Unfortunately, there is modern software (namely bird) that would prefer the old API as long as the routing table id fits into 8-bit. PR: 279662 --- sys/netlink/route/rt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index ffa06fb4c1ab..00315afbcb02 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -475,6 +475,7 @@ struct nl_parsed_route { uint32_t rta_nh_id; uint32_t rta_weight; uint32_t rtax_mtu; + uint8_t rtm_table; uint8_t rtm_family; uint8_t rtm_dst_len; uint8_t rtm_protocol; @@ -507,6 +508,7 @@ static const struct nlfield_parser nlf_p_rtmsg[] = { { .off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_type), .off_out = _OUT(rtm_type), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_table), .off_out = _OUT(rtm_table), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_flags), .off_out = _OUT(rtm_flags), .cb = nlf_get_u32 }, }; #undef _IN @@ -937,7 +939,10 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, return (EINVAL); } - if (attrs.rta_table >= V_rt_numfibs) { + if (attrs.rtm_table > 0 && attrs.rta_table == 0) { + /* pre-2.6.19 Linux API compatibility */ + attrs.rta_table = attrs.rtm_table; + } else if (attrs.rta_table >= V_rt_numfibs) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); return (EINVAL); } From nobody Thu Jun 20 23:15:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4xCp0BSNz5NxRl for ; Thu, 20 Jun 2024 23: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 4W4xCn6ZFrz4J1f; Thu, 20 Jun 2024 23: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=1718925301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6hy8zA1YXK0g6SYqOPDL4GF84j/gGXNRVQyUYuGJfY=; b=vIM9CmP9cb04b4L3Hjv4hcZxcKpp92tCkaAoB4DvFrgSe5TaIu2UOnvc5iuTN4SO9tbeBL ddzs/Y0PtE2IpxLSxbyWcYWdW2mKcrmy6l1/1PAiiqeZbP7I24AYrzXOnUHoVDwjRijWMo mNW391yWhPzxCrEUBR00IgXdXGAeClqB8FLCPnE58lrGdpT/qkAUzNYUCF+97gXMSeuZJV QErcF0ITX+3lOlS2lmEAPER9FmwfporiNXFypb00dDa4yYHBhoz6lIy5Iucij9FhBQN35B 9toBRqBu7h/778/FHchUw9L+o68GilXlhj5c1O88r6L13ALNaCh9UAHs+alLbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718925301; a=rsa-sha256; cv=none; b=OofAs7S6kbajJl8aJ9w+nRBtJt3IQ0Gq9pH0ZU7yIYAp57abSQc9l+OvCi8FzT7NHdt7OP 00yDBTmx52Zh7cvysB2w4dkW2Wb3aqz/b26qQbSEJyiybFAYR1mBGMdsxH+SP3D87vl5E9 3gG/5EeyGT6s3XNRi+qQPC4yD6hF+MbKkUrvQDrc95KEXCnpimC7jacNqZB1Aj/YGwrC/M Sw3qVKWhxQPgYe73/rBCF4g+fQp71s5eJxtc09VLjxpD+FMQG6+HGhiEG7AiiQ3dFU6/lf kaOA07EDQ+Q+7i4XNb3kR34+isBPnh1cMYGpQqTkG80eC1DZVI7SifEVDgFIFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718925301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6hy8zA1YXK0g6SYqOPDL4GF84j/gGXNRVQyUYuGJfY=; b=WioyImqxx8i6cOsLchkoPMqatoohBWfd/947LS2UDaUwibmYpUfeoKkeQV5cdm1hValt0e XhF35Z04/4sY783mearISYt97HaiMD9p9hpLOUoZh3dd0aznBVULYfwIio9DKCJbuEV2TF 6YqaoWHXoDLp6x+U8hl2H8imG5t4ZuyYNMxZgAWaWEvQIsvejg7XAs2Xs2Ex2S2MYpqtaQ a5NATbTB72c7iKNRkAhb2sYanBFzMxi12NTHr1+wJwrLSp2BpU85BZTUghh0aBL63zasIZ 4Z6rsjqtwd+JdkwSdFlwW949fYSfPVieHUGIkVRkKq7ciwPUJ1yfC+/ZAvcnhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4xCn66x4zkqP; Thu, 20 Jun 2024 23: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 45KNF1Ke008269; Thu, 20 Jun 2024 23: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 45KNF1Qu008268; Thu, 20 Jun 2024 23:15:01 GMT (envelope-from git) Date: Thu, 20 Jun 2024 23:15:01 GMT Message-Id: <202406202315.45KNF1Qu008268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: 507d6f285fcc - Create tag vendor/openssl/3.0.13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/tags/vendor/openssl/3.0.13 X-Git-Reftype: annotated tag X-Git-Commit: 507d6f285fcc838621e1fd3a244e31d40ee429c5 Auto-Submitted: auto-generated The annotated tag vendor/openssl/3.0.13 has been created by ngie: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssl/3.0.13 tag vendor/openssl/3.0.13 Tagger: Enji Cooper TaggerDate: 2024-06-20 23:14:52 +0000 Tag OpenSSL 3.0.13 commit 9dd13e84fa8eca8f3462bd55485aa3da8c37f54a Author: Cy Schubert AuthorDate: 2024-02-02 04:39:16 +0000 Commit: Cy Schubert CommitDate: 2024-02-02 09:48:38 +0000 OpenSSL: Vendor import of OpenSSL 3.0.13 * Fixed PKCS12 Decoding crashes ([CVE-2024-0727]) * Fixed Excessive time spent checking invalid RSA public keys ([CVE-2023-6237]) * Fixed POLY1305 MAC implementation corrupting vector registers on PowerPC CPUs which support PowerISA 2.07 ([CVE-2023-6129]) * Fix excessive time spent in DH check / generation with large Q parameter value ([CVE-2023-5678]) Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html. From nobody Thu Jun 20 23:26:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4xTF11wSz5NyFq for ; Thu, 20 Jun 2024 23:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4xTF0NTwz4Krk; Thu, 20 Jun 2024 23:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718926001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRxFUrn/K+4ossN1jhJWj9IN/IpGZqg9OfiTMYMk4Yg=; b=OCxCAbn8rbdyRCocTL8K4nB1oV5Z+N+LSwBCBHZuLW7XfJLzplaTJ5myoVHsFRGu/enKEz ER29+7nIQg+gsX6h3DXxiGTYbN0XbyGt3/vSsG0fdyCtnmxnnljxwcTz/4IVilZ22TLGxU AOtFSECyznuhezpKaspxKHpCNEQ83HdKF+Mf3eNitllXjcXNnsHISR4v917P6IyJqT7F0f /LP21BmR/j2BARVbvrlsUZVuHx4hoPo45B0xtjranBwbDRwnFMRye93n2ZlCeDnKnYxzX2 m+R55NFHM09o5RhCKLrXGm4jGTgkH/mwlTQUnjibS6KpHrvWyGQ0Ry7LtjRpdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718926001; a=rsa-sha256; cv=none; b=Y1vwd+7MBKFWCNGa22Ic9xJCyKkWg0w9pWf9YuiR6ucN6njT+/xRDNDTJG6FA6xFVxKZWy ZZze1sCLdID5ApAMiagqmr93NDSIAvWlffMdy/ueZ9QGQJc7y5g8JNIj3mhY3A+rPc7X8c TRnOATcangyx+blVJqO2VzSr5US50a8+aFjr7w6DIwsh0ndKYjS2Cy+hw+qerQwGugFJuW /81sL1/l91RCCxyTi7VfHLzvyflv0ipwiKiYhqN1cppn7Qd/JgAcunt+OgCsZ/euuwUbdb 6AnBCRmFpfpiUNOE+9tSrMEuRRh3P+PptMfHWtTeKTiViIMJ+LvRTXFeHr1yvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718926001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRxFUrn/K+4ossN1jhJWj9IN/IpGZqg9OfiTMYMk4Yg=; b=ahaM/hCo0d5rtPgZGr05D9wSrlDTBCu5NER4tXVP+M5zYTz9B2b/6eaIhpHFAn2xXTRC+2 utbGzDlNgbGmBCwCmYozG1Qk5qE5l5zZaXImxrk6lPdeMTNbQHEuO4JJFpqIsrQiNQbCet sdteuj22eUp5UXuSavwfDyXCoL9n6cKr1nC04kq/2hGhOt0NQVVXUvPdfu3UxWO9ZrA+lj OT3ftfPBTqM9NPOagY9dV5d8ktjvWU6E6rDUSoa8cnpkndo7eDtDQRxbvv07RR1XDgHmOB s79nLofP5WJWwFQb+PJqI6NeKTMKwG0ydicFQTf67dOM9twJ1lOYIaW+zpkUZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W4xTD7017zkqr; Thu, 20 Jun 2024 23:26: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 45KNQeC4025506; Thu, 20 Jun 2024 23:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KNQeDU025505; Thu, 20 Jun 2024 23:26:40 GMT (envelope-from git) Date: Thu, 20 Jun 2024 23:26:40 GMT Message-Id: <202406202326.45KNQeDU025505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: 8391ce9b0461 - Create tag vendor/openssl/3.0.14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/tags/vendor/openssl/3.0.14 X-Git-Reftype: annotated tag X-Git-Commit: 8391ce9b0461528e41ad4d7a51e3c98f65c96c91 Auto-Submitted: auto-generated The annotated tag vendor/openssl/3.0.14 has been created by ngie: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssl/3.0.14 tag vendor/openssl/3.0.14 Tagger: Enji Cooper TaggerDate: 2024-06-20 23:26:33 +0000 Tag OpenSSL 3.0.14 commit 1070e7dca8223387baf5155524b28f62bfe7da3c Author: Enji Cooper AuthorDate: 2024-06-20 23:24:17 +0000 Commit: Enji Cooper CommitDate: 2024-06-20 23:24:17 +0000 Import OpenSSL 3.0.14 This release resolves 3 upstream found CVEs: - Fixed potential use after free after SSL_free_buffers() is called (CVE-2024-4741) - Fixed an issue where checking excessively long DSA keys or parameters may be very slow (CVE-2024-4603) - Fixed unbounded memory growth with session handling in TLSv1.3 (CVE-2024-2511) From nobody Fri Jun 21 00:41:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W4z7L641Wz5P5L1; Fri, 21 Jun 2024 00:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W4z7L3RWMz4QYs; Fri, 21 Jun 2024 00:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718930478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRvAuYzAx7xz/N3zP50ED3dV8cxoVv9GAGZ6Mxr+qWE=; b=sAfWudrwYWt1Md0/BMyX0i956y5+YO62/IChjfBfJFK3+chwn9anfqyNSWLJG/33aEr/JR 3G+FQL9T0qr5pg3Q3LXjIUds+zU5zXygHipZzJKlI7fkIVRn6/kCLmJqsp+R0hh2tNeVo0 +p9SydVQfM9ETNbT2WXuvgmWgoYXTc64gq98xsN+rGJNzQHcUULypvLRjdLgyxtKv+DN7L HYF3uN8yu5P4TOij1fdv5u8y0WqbwnM/wh04pp80m6S7UJtEt+8V14CRywEYdJN/br6xAC ZeKPslDocmuAuwdda9MqBC9lU2e7AYFqpv6u4mSxj2r0R0HmQqILdi4ndA1p6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718930478; a=rsa-sha256; cv=none; b=FLgdyNTK5SMriSbjW6GUpdjFM5KDX0yx24bLoJ8DlFuBu3K5Jv27CS+cXa7Dcu0cEkVO9i OOe/PXmx5BeWGICSYKqcL2ySpmCk5Pzk2+3eqbr3GHxVaWHuIXwjwK7IEdLH659/gV4jAq DJ4gePtgefmqlVcwQgXJnAIdWpZI/MKsNiclPS0AuHpm6o3eoRYOgrOTnNboJD4Q5Tx39W I+ZH4aP6JXLJz3hcD3wT2Ze55btYHEivi+QMCz6jVlqXSBb6KxgUBCH/WQuvQE8kA7SBXm qka9twiJJoQfmyIGN3twEqJbuL1Tq1uqL99Bf2tNNpHFSU0Bg5ieg/XBCHJpNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718930478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRvAuYzAx7xz/N3zP50ED3dV8cxoVv9GAGZ6Mxr+qWE=; b=ubIo6TTJWobUrZvnkkrq8vC7TopIy/8oXcquaXCn0FiqubaGEK3+WpRfk+8npA4YEM5uuu jDWedFlUzC7GeKSHhS4R4IWUon/oEBl9jlqJv91ZVradK4WEWF39Eq80PkYA9zKHAOkSuD f3CoCsXJxXARI8dDfv+ZL2wffDaygsCyvZ+7rgSHKqxfNrCZ+L18cFj7WhUAy1ilDpLnG1 +EYc6GbPMBK2l8Bg0BzBZh3e+36CM7Z6U6N7LWvVJ0fhKWsADeIBam5qA/LWZnQAea/ddu C1Nzzxc4ROWh/hjDiyi3gD9ojIE55WeRdUgQrcO9C/XnnzyK2q4jMucv3XuQ/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 4W4z7L32vczn5c; Fri, 21 Jun 2024 00:41: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 45L0fI7M052022; Fri, 21 Jun 2024 00:41:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L0fIcP052019; Fri, 21 Jun 2024 00:41:18 GMT (envelope-from git) Date: Fri, 21 Jun 2024 00:41:18 GMT Message-Id: <202406210041.45L0fIcP052019@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: 836f00ebb96a - main - release: Don't publish CW if !WITH_CLOUDWARE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 836f00ebb96ac343e0f8a68ea264d2d330198488 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=836f00ebb96ac343e0f8a68ea264d2d330198488 commit 836f00ebb96ac343e0f8a68ea264d2d330198488 Author: Colin Percival AuthorDate: 2024-06-21 00:38:46 +0000 Commit: Colin Percival CommitDate: 2024-06-21 00:41:14 +0000 release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days --- release/Makefile.mirrors | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index fd233e7abdb6..1888f86d3002 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -209,10 +209,11 @@ vm-images-stage: ${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cd ${RELEASEDIR}/vmimages && \ mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz @@ -221,10 +222,11 @@ vm-images-stage: cd ${VM_DIR}/Latest && \ ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/vmimages && \ @@ -248,16 +250,18 @@ vm-images-stage: ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \ ${VM_DIR}/Latest/CHECKSUM.${CHECKSUM} From nobody Fri Jun 21 02:41:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W51nw1wXBz5PH3S; Fri, 21 Jun 2024 02:41: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 4W51nv3v4Zz4c2r; Fri, 21 Jun 2024 02:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718937683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C77Yz4LTzokiKWlzVMk40X3PESxKkLbP1Y7KaLkD8N8=; b=vl0vcl7AIEUmdPzuNIhIq6//tyu5dPP6cRQNipU+w6GSaKKb2pwdGNDg/kQDvFqzgdS3QE VtPUdhLEwBBFifVQhPGakPUmFuZZP5CBP5KQvTdHZyi7llr0tPa7jf5xsx63OMqLlJdLTI ZeIYAwjJvM1ebWMsPhTSp45zBlsO86uWPBHwL6qCTlSbC6buOxbpEJW7g0ByvmjPTD7KA+ DDWsUpCjJKVsvVsbEi6dvIUAubg4ikjAD3ae0u1T1aFlPhjfo7FWdgDGC/vLrHXWqkzqXr vJSbQLZjZysb9vQ9tfzTCmmyxRMWYrS2uRByggmFfHElRiJl9TxtfgcKcQ9Eww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718937683; a=rsa-sha256; cv=none; b=cxPkKQRaJakshqI3wY4GCOsnnPcHu9fMTIA8pdsdhCJadxOqnW0S8ebj8ykBRXSNuNqaw+ 3LZY1UXnGvFlSoWd77ySqQGp6MmVjs322p2lwtvr+hNO3+fF7bEENjzn4v9l5KfsKm3H8H Oyv8wbsikedAqc9o2zBUD0TnNYpswjD60QQrNZBSQJGSNZO1Tu0bQlJIzcZjWM5Um0ms9v LHXmPcRi3VeGPJdUCjEcdKpeLdhx7TExquH/CnZKY54v73NT5uLjwY0td3/rTv5Gtrqmhu YCpyCmQyzeE+PQKh6q9Ffa1XH6fHNtzoLVYVl3CeNs7q0zNAIsjTMbo6gxlmpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718937683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C77Yz4LTzokiKWlzVMk40X3PESxKkLbP1Y7KaLkD8N8=; b=vWoWl52R3wxAV3yx6GRMzEJfe7/a0614xA26b24v1noCV9Aal027B6eDmWVAiNM2ikMq/Q sRzSdJoarimR+Z5CjQJxNWmtDQiB5S9N8UnKtgoHPLxJIBjASOCpbCf+F5xT1g4B+vW5rT nEUjirvqqGd/TG48gfIdkPcRo3Lek8FhWD4/j5Zpp6zngrhfVFOgDavWQHo6Hw5kovVwod Wwia1R4YnfhP5pMBADG2y36Ua37qzYNUKbbiY6DVRGGzxYujxYZ/lBUZlyCJdW5aF1IJ3E TsM8a31nf+sOB0JajZnipx45oH15+PUB2FJiAr+NAhxmUab0yVILIdCRd9dRiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W51nv3Vspzqy3; Fri, 21 Jun 2024 02:41: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 45L2fNm7056965; Fri, 21 Jun 2024 02:41:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L2fNU2056962; Fri, 21 Jun 2024 02:41:23 GMT (envelope-from git) Date: Fri, 21 Jun 2024 02:41:23 GMT Message-Id: <202406210241.45L2fNU2056962@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: 2508372b7b46 - main - cdefs.h: Assume the compiler supports at least GNU C 3.0 extensions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2508372b7b46117a9fb801b50624265d30888442 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2508372b7b46117a9fb801b50624265d30888442 commit 2508372b7b46117a9fb801b50624265d30888442 Author: Warner Losh AuthorDate: 2024-06-20 23:02:42 +0000 Commit: Warner Losh CommitDate: 2024-06-21 02:41:08 +0000 cdefs.h: Assume the compiler supports at least GNU C 3.0 extensions All compilers that can build FreeBSD binaries (as opposed to the entire system) support at least gcc 9 (gcc, clang, tcc). Even pcc supports most of the gcc 4.3 attributes. Make this file simpler by removing support for pre-3.0 compilers. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D45653 Sponsored by: Netflix --- sys/sys/cdefs.h | 79 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 78 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 476c89d1dddb..88019819eb35 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -160,18 +160,6 @@ * a feature that we cannot live without. */ #define __weak_symbol __attribute__((__weak__)) -#if !__GNUC_PREREQ__(2, 5) -#define __dead2 -#define __pure2 -#define __unused -#endif -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 -#define __dead2 __attribute__((__noreturn__)) -#define __pure2 __attribute__((__const__)) -#define __unused -/* XXX Find out what to do for __packed, __aligned and __section */ -#endif -#if __GNUC_PREREQ__(2, 7) #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) #define __unused __attribute__((__unused__)) @@ -179,7 +167,6 @@ #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) -#endif #define __writeonly __unused #if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__) #define __alloc_size(x) __attribute__((__alloc_size__(x))) @@ -194,10 +181,6 @@ #define __alloc_align(x) #endif -#if !__GNUC_PREREQ__(2, 95) -#define __alignof(x) __offsetof(struct { char __a; x __b; }, __b) -#endif - /* * Keywords added in C11. */ @@ -304,13 +287,8 @@ #define __min_size(x) (x) #endif -#if __GNUC_PREREQ__(2, 96) #define __malloc_like __attribute__((__malloc__)) #define __pure __attribute__((__pure__)) -#else -#define __malloc_like -#define __pure -#endif #if __GNUC_PREREQ__(3, 1) #define __always_inline __attribute__((__always_inline__)) @@ -355,7 +333,7 @@ #define __unreachable() ((void)0) #endif -#if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 #define __LONG_LONG_SUPPORTED #endif @@ -389,45 +367,10 @@ */ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901 #define __restrict restrict -#elif !__GNUC_PREREQ__(2, 95) -#define __restrict #endif -/* - * GNU C version 2.96 adds explicit branch prediction so that - * the CPU back-end can hint the processor and also so that - * code blocks can be reordered such that the predicted path - * sees a more linear flow, thus improving cache behavior, etc. - * - * The following two macros provide us with a way to utilize this - * compiler feature. Use __predict_true() if you expect the expression - * to evaluate to true, and __predict_false() if you expect the - * expression to evaluate to false. - * - * A few notes about usage: - * - * * Generally, __predict_false() error condition checks (unless - * you have some _strong_ reason to do otherwise, in which case - * document it), and/or __predict_true() `no-error' condition - * checks, assuming you want to optimize for the no-error case. - * - * * Other than that, if you don't know the likelihood of a test - * succeeding from empirical or other `hard' evidence, don't - * make predictions. - * - * * These are meant to be used in places that are run `a lot'. - * It is wasteful to make predictions in code that is run - * seldomly (e.g. at subsystem initialization time) as the - * basic block reordering that this affects can often generate - * larger code. - */ -#if __GNUC_PREREQ__(2, 96) #define __predict_true(exp) __builtin_expect((exp), 1) #define __predict_false(exp) __builtin_expect((exp), 0) -#else -#define __predict_true(exp) (exp) -#define __predict_false(exp) (exp) -#endif #if __GNUC_PREREQ__(4, 0) #define __null_sentinel __attribute__((__sentinel__)) @@ -481,13 +424,6 @@ * that are known to support the features properly (old versions of gcc-2 * didn't permit keeping the keywords out of the application namespace). */ -#if !__GNUC_PREREQ__(2, 7) -#define __printflike(fmtarg, firstvararg) -#define __scanflike(fmtarg, firstvararg) -#define __format_arg(fmtarg) -#define __strfmonlike(fmtarg, firstvararg) -#define __strftimelike(fmtarg, firstvararg) -#else #define __printflike(fmtarg, firstvararg) \ __attribute__((__format__ (__printf__, fmtarg, firstvararg))) #define __scanflike(fmtarg, firstvararg) \ @@ -497,7 +433,6 @@ __attribute__((__format__ (__strfmon__, fmtarg, firstvararg))) #define __strftimelike(fmtarg, firstvararg) \ __attribute__((__format__ (__strftime__, fmtarg, firstvararg))) -#endif /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */ #if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && \ @@ -508,7 +443,6 @@ #define __printf0like(fmtarg, firstvararg) #endif -#if defined(__GNUC__) #define __strong_reference(sym,aliassym) \ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) #ifdef __STDC__ @@ -536,22 +470,11 @@ #define __sym_default(impl,sym,verid) \ __asm__(".symver impl, sym@@@verid") #endif /* __STDC__ */ -#endif /* __GNUC__ */ #define __GLOBL(sym) __asm__(".globl " __XSTRING(sym)) #define __WEAK(sym) __asm__(".weak " __XSTRING(sym)) -#if defined(__GNUC__) #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"") -#else -/* - * The following definition might not work well if used in header files, - * but it should be better than nothing. If you want a "do nothing" - * version, then it should generate some harmless declaration, such as: - * #define __IDSTRING(name,string) struct __hack - */ -#define __IDSTRING(name,string) static const char name[] __unused = string -#endif /* * Embed the rcs id of a source file in the resulting library. Note that in From nobody Fri Jun 21 02:41:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W51nx0c54z5PHGY; Fri, 21 Jun 2024 02:41: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 4W51nw4tXxz4c2s; Fri, 21 Jun 2024 02:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718937684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yJdhlMaNoXiARCM+ZttkjINkSmQt2brTUPvlL8uexA=; b=wnaO/jl+/94aCyXySI3/CLD4xiaWIUCNeUr6lwDMn29Bo1ii2VWjRLY9xp6pDe5IJE9C0/ 64XIBwhqy2BqJWg1w1tuhVVmlDr+XjsV6xQLwg04LPfryRky+OHyieD8AJPTP7XCAO+k++ J2pfguPBLK1rLaAUrKkWzJXVsflIPe9fgcIaPVpV9guLHAMWVYNB+dR80C9QckfWcgQtiK Mvl1j6Bo7qkopIlXGKVXbERf+13IQkUme9WvXClWB4b/xYYNekiMGpyijyez5GxoszZ44h ywb2fDDoN5pWvXkZ5TojXDFTfLe8cdZBX1+yoOL/Q/IsyosDJ9+ttJZiy7/mNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718937684; a=rsa-sha256; cv=none; b=Gdv7K3b/jBBWiQ09Lz273L62vE1UwFY34H0dfq7a4vWfHYT06hgOqQffeLgHcqk9hnXGdu 07cdA7pOI/7d0s9KuHUoNCD/PkVouQ5tbZQOPGdRTQUxKZp9qmGuKO+k1Yj7T8MCMAq31A 09pqwR9zM6XN11rbpzdCU1vGKjaqofC+2GjJLcXzy1/YyGWJ/o2C37Gp+WMrs+TnQnCJOo u+D8Lb956nW5NN2TPWx9O0qlupf1SLAbYTyovRVerJ+Qad83FBAaVwaJYOSZNF+fYhCX8w BsPBA4zZX/2aVh80bZdgD9+SPAfnLUi0PbdJblLuhPKa+NHNhh0/vdlwa1uxpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718937684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yJdhlMaNoXiARCM+ZttkjINkSmQt2brTUPvlL8uexA=; b=PGOOxV46fKHpIseNQ6OCjGkHTojdnSdVhZuluz2V9SqnU4EC2S6y8zFZYk27d+wF0jL5hx xs7M++C4qXkgSOVgTiB2tTZAfAgpNqUj1wUAOBNxaAR71blHYKxu7IyAY/qDlSm9G3gUwx FsWy2DmMR9fndhkeT7TRgf6gJFDlFVV9kP2BRmweERo+Rufi8AuKspbYcUCEPgINmY7Z3s pGlUdosz9Ys6UelkjOsCMbYRIi3fhZuhBEjjxsZgTEsa1Z8Wk8AcoHkSUcebmGDr2ZgJid TmmtEnpp6ZWxAfUa/OmA+dy3NDuyMUgxNzybBr72v5aNchY8idSE8HFj6m1sJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W51nw4TsCzrDx; Fri, 21 Jun 2024 02:41: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 45L2fONo057013; Fri, 21 Jun 2024 02:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L2fOkP057010; Fri, 21 Jun 2024 02:41:24 GMT (envelope-from git) Date: Fri, 21 Jun 2024 02:41:24 GMT Message-Id: <202406210241.45L2fOkP057010@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: 67d1a1cd9e77 - main - cdefs.h: Remove support for pre gcc 4.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67d1a1cd9e772e2ef94003579f4fbc271d38be7d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=67d1a1cd9e772e2ef94003579f4fbc271d38be7d commit 67d1a1cd9e772e2ef94003579f4fbc271d38be7d Author: Warner Losh AuthorDate: 2024-06-20 23:02:56 +0000 Commit: Warner Losh CommitDate: 2024-06-21 02:41:08 +0000 cdefs.h: Remove support for pre gcc 4.0 All supported compilers support the gcc 3 attribute extensions. Remove the #else clauses for this. Also, latter-day pcc compilers also define __GNUC__, so there's not need to also test for __PCC__. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D45654 Sponsored by: Netflix --- sys/sys/cdefs.h | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 88019819eb35..a6ecdca5d8b9 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -151,13 +151,9 @@ #endif /* !(__STDC__ || __cplusplus) */ /* - * Compiler-dependent macros to help declare dead (non-returning) and - * pure (no side effects) functions, and unused variables. They are - * null except for versions of gcc that are known to support the features - * properly (old versions of gcc-2 supported the dead and pure features - * in a different (wrong) way). If we do not provide an implementation - * for a given compiler, let the compile fail if it is told to use - * a feature that we cannot live without. + * Compiler-dependent macros to help declare dead (non-returning) and pure (no + * side effects) functions, and unused variables. These attributes are supported + * by all current compilers, even pcc. */ #define __weak_symbol __attribute__((__weak__)) #define __dead2 __attribute__((__noreturn__)) @@ -266,7 +262,7 @@ __has_extension(c_generic_selections) #define __generic(expr, t, yes, no) \ _Generic(expr, t: yes, default: no) -#elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus) +#elif !defined(__cplusplus) #define __generic(expr, t, yes, no) \ __builtin_choose_expr( \ __builtin_types_compatible_p(__typeof((0, (expr))), t), yes, no) @@ -290,19 +286,8 @@ #define __malloc_like __attribute__((__malloc__)) #define __pure __attribute__((__pure__)) -#if __GNUC_PREREQ__(3, 1) #define __always_inline __attribute__((__always_inline__)) -#else -#define __always_inline -#endif - -#if __GNUC_PREREQ__(3, 1) #define __noinline __attribute__ ((__noinline__)) -#else -#define __noinline -#endif - -#if __GNUC_PREREQ__(3, 4) #define __fastcall __attribute__((__fastcall__)) #define __result_use_check __attribute__((__warn_unused_result__)) #ifdef __clang__ @@ -316,10 +301,6 @@ #else #define __result_use_or_ignore_check #endif /* !__clang__ */ -#else -#define __fastcall -#define __result_use_check -#endif #if __GNUC_PREREQ__(4, 1) #define __returns_twice __attribute__((__returns_twice__)) @@ -408,15 +389,10 @@ * assign pointer x to a local variable, to check that its type is * compatible with member m. */ -#if __GNUC_PREREQ__(3, 1) #define __containerof(x, s, m) ({ \ const volatile __typeof(((s *)0)->m) *__x = (x); \ __DEQUALIFY(s *, (const volatile char *)__x - __offsetof(s, m));\ }) -#else -#define __containerof(x, s, m) \ - __DEQUALIFY(s *, (const volatile char *)(x) - __offsetof(s, m)) -#endif /* * Compiler-dependent macros to declare that functions take printf-like @@ -434,14 +410,8 @@ #define __strftimelike(fmtarg, firstvararg) \ __attribute__((__format__ (__strftime__, fmtarg, firstvararg))) -/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */ -#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && \ - defined(__GNUC__) #define __printf0like(fmtarg, firstvararg) \ __attribute__((__format__ (__printf0__, fmtarg, firstvararg))) -#else -#define __printf0like(fmtarg, firstvararg) -#endif #define __strong_reference(sym,aliassym) \ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) @@ -534,11 +504,7 @@ #endif #if !defined(_STANDALONE) && !defined(_KERNEL) -#if defined(__GNUC__) || defined(__PCC__) #define __RENAME(x) __asm(__STRING(x)) -#else -#define __RENAME(x) no renaming support for compiler in use -#endif /* __GNUC__ */ #else /* _STANDALONE || _KERNEL */ #define __RENAME(x) no renaming in kernel/standalone environment #endif From nobody Fri Jun 21 03:24:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W52lT2ykqz5PLPh; Fri, 21 Jun 2024 03:24: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 4W52lT2hQKz4gsm; Fri, 21 Jun 2024 03:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718940261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEEE7VOAXxwlf7K/uxdIanxCD11u0SSDF2AOBAF5rKY=; b=JSsCMCB+ILXZnT3fz5lrRHd5c5kcPlnO2KY/QhGHJl39myxHBssLb2TI+WBeLfgqXFRB0k vsdf7wfRVLhB3Y9HnfmW4hWVv7PKp6+2HZ+r6vvBIYXLwQnQxPOkWyYb01T90bA34p9r0B dgMotARfGKDRhoXLP1xz1xFDrk6L0kUy6yfMN8mWf3/jWKERJPKrPnJWAuizSaqisP74Ku M9eo5pTFkUIYSaDpJNVDpZgnHbOZhEm/HDXmM7nL7Sb5ejMqU7GU0+HEP22qqZ3/kE97iU MQROd5NRYx+UnTeZBtmEIu0ZbP2XUpra+s5IrvI+rAg1xILoWMBN2ccS0JHn+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718940261; a=rsa-sha256; cv=none; b=VK8z5/mp0ksoAXe/3N/nHufj6hFj1DG3dLBIPPAfA72YBGBYOOoA2lntp+M5GtuBAmAGzY l6X4n+6nOXxOXKwmxbwoTcH/FsrozHXPlRO60Fklg2/C4GcZmVPZdGUTfnBdfz919lTEnn 3BifbwGfCd0Dew4LY2TrWaf76AveQ1W3EizzS6nUm5urq+uA9Bv+Th1NKDYjGdp6+I/kmS acM64EECwhBvulQHFQdChfqBXQ2Mlk5QVL3CyMoa5bDxA/DTVs5jgcpPomETWhjx6e9F2E MbZNFc25TG2ixTD3H4Xkjo2JITyDfMZuBTGi19rS6rHZMp3pJVtIYhkYo3H+Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718940261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEEE7VOAXxwlf7K/uxdIanxCD11u0SSDF2AOBAF5rKY=; b=dqSp3zibGxiyyoSKxdf64ghgrJfZAbDYzUNPQaxZmDOTScF1AJgNs07u6qOw4f3ks9BNAZ 6YWfebZPIChIcD7i0kIEsnZTydk1TaXZ35nJ0tUoTB5k4a43K+KHczThh1l4hfu7Ru1xmB melw5MdRfG/A0cDQmstSODpHEwhel7WJuQmc1gemZQzoXhK/aCSXwiz1KJ+LNiSMhYqW4p QA9ej1jdWzrajkDIcb0iR31WmTIHf6yn5JuPJPrWvlsa2YWKXGyV7kcCdVNzqkJTsUFwLa sZgEUJ16Ghyn2RGhGYqYxN8u4Pu6+Gpa2QutgxJKGEHDCRC8HAknek4KXvxExQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W52lT2HYZzsVr; Fri, 21 Jun 2024 03:24: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 45L3OLEN031967; Fri, 21 Jun 2024 03:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L3OLh5031964; Fri, 21 Jun 2024 03:24:21 GMT (envelope-from git) Date: Fri, 21 Jun 2024 03:24:21 GMT Message-Id: <202406210324.45L3OLh5031964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 3465f14dac7d - main - ossl: Add support for powerpc64/powerpc64le List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3465f14dac7dc4efaf1f8b4e10c2a00b2db7c513 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=3465f14dac7dc4efaf1f8b4e10c2a00b2db7c513 commit 3465f14dac7dc4efaf1f8b4e10c2a00b2db7c513 Author: Shawn Anastasio AuthorDate: 2024-06-21 07:15:55 +0000 Commit: Justin Hibbits CommitDate: 2024-06-21 07:29:04 +0000 ossl: Add support for powerpc64/powerpc64le Summary: Add support for building ossl(4) on powerpc64* by implementing ossl_cpuid and other support functions for powerpc. The required assembly files for ppc were already present in-tree. Test Plan: The changes were tested using the in-tree tools/tools/crypto/cryptocheck.c tool on both powerpc64 and powerpc64le on a POWER9 system. Reviewed by: #powerpc, jhibbits, jhb Differential Revision: https://reviews.freebsd.org/D41837 --- sys/conf/files.powerpc | 43 ++++++++++++ sys/crypto/openssl/ossl_aes.c | 4 ++ sys/crypto/openssl/ossl_ppc.c | 154 ++++++++++++++++++++++++++++++++++++++++++ sys/crypto/openssl/ossl_ppc.h | 45 ++++++++++++ sys/modules/Makefile | 3 +- sys/modules/ossl/Makefile | 42 ++++++++++++ sys/powerpc/conf/GENERIC64 | 1 + sys/powerpc/conf/GENERIC64LE | 1 + 8 files changed, 292 insertions(+), 1 deletion(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 1baacb5628c7..96e891577917 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -20,6 +20,49 @@ contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S optional zfs compile-with contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S optional zfs compile-with "${ZFS_S}" contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S optional zfs compile-with "${ZFS_S}" +# openssl ppc common files +crypto/openssl/ossl_ppc.c optional ossl powerpc64 | ossl powerpc64le + +# openssl assembly files (powerpc64le) +crypto/openssl/powerpc64le/aes-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/aesp8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/chacha-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ghashp8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/keccak1600-ppc64.S optional ossl powerpc64le +crypto/openssl/powerpc64le/poly1305-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/poly1305-ppcfp.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ppc-mont.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ppccpuid.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha1-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha256-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha256p8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha512-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha512p8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/vpaes-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/x25519-ppc64.S optional ossl powerpc64le + +# openssl assembly files (powerpc64) +crypto/openssl/powerpc64/aes-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/aesp8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/chacha-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/ecp_nistz256-ppc64.S optional ossl powerpc64 +crypto/openssl/powerpc64/ghashp8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/keccak1600-ppc64.S optional ossl powerpc64 +crypto/openssl/powerpc64/poly1305-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/poly1305-ppcfp.S optional ossl powerpc64 +crypto/openssl/powerpc64/ppc-mont.S optional ossl powerpc64 +crypto/openssl/powerpc64/ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/ppccpuid.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha1-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha256-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha256p8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha512-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha512p8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/vpaes-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/x25519-ppc64.S optional ossl powerpc64 + cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc | dtrace powerpc | zfs powerpcspe | dtrace powerpcspe compile-with "${ZFS_C}" cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index b6425035f031..dd24e5875c45 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -41,6 +41,10 @@ #include #elif defined (__arm__) #include +#elif defined (__powerpc64__) +#include +#else +#error "Unsupported architecture!" #endif static ossl_cipher_process_t ossl_aes_cbc; diff --git a/sys/crypto/openssl/ossl_ppc.c b/sys/crypto/openssl/ossl_ppc.c new file mode 100644 index 000000000000..0951745c4b43 --- /dev/null +++ b/sys/crypto/openssl/ossl_ppc.c @@ -0,0 +1,154 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Raptor Engineering, 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. + */ + +#include +#include + +#include + +#include +#include +#include + +unsigned int OPENSSL_ppccap_P = 0; + +ossl_cipher_setkey_t aes_p8_set_encrypt_key; +ossl_cipher_setkey_t aes_p8_set_decrypt_key; +ossl_cipher_setkey_t vpaes_set_encrypt_key; +ossl_cipher_setkey_t vpaes_set_decrypt_key; + +void +ossl_cpuid(struct ossl_softc *sc) +{ + if (cpu_features2 & PPC_FEATURE2_HAS_VEC_CRYPTO) { + OPENSSL_ppccap_P |= PPC_CRYPTO207; + } + + if (cpu_features2 & PPC_FEATURE2_ARCH_3_00) { + OPENSSL_ppccap_P |= PPC_MADD300; + } + + if (cpu_features & PPC_FEATURE_64) { + OPENSSL_ppccap_P |= PPC_MFTB; + } else { + OPENSSL_ppccap_P |= PPC_MFSPR268; + } + + if (cpu_features & PPC_FEATURE_HAS_FPU) { + OPENSSL_ppccap_P |= PPC_FPU; + + if (cpu_features & PPC_FEATURE_64) { + OPENSSL_ppccap_P |= PPC_FPU64; + } + } + + if (cpu_features & PPC_FEATURE_HAS_ALTIVEC) { + OPENSSL_ppccap_P |= PPC_ALTIVEC; + } + + /* Pick P8 crypto if available, otherwise fall back to altivec */ + if (OPENSSL_ppccap_P & PPC_CRYPTO207) { + ossl_cipher_aes_cbc.set_encrypt_key = aes_p8_set_encrypt_key; + ossl_cipher_aes_cbc.set_decrypt_key = aes_p8_set_decrypt_key; + sc->has_aes = true; + } else if (OPENSSL_ppccap_P & PPC_ALTIVEC) { + ossl_cipher_aes_cbc.set_encrypt_key = vpaes_set_encrypt_key; + ossl_cipher_aes_cbc.set_decrypt_key = vpaes_set_decrypt_key; + sc->has_aes = true; + } +} + +/* + * The following trivial wrapper functions were copied from OpenSSL 1.1.1v's + * crypto/ppccap.c. + */ + +void sha256_block_p8(void *ctx, const void *inp, size_t len); +void sha256_block_ppc(void *ctx, const void *inp, size_t len); +void sha256_block_data_order(void *ctx, const void *inp, size_t len); +void sha256_block_data_order(void *ctx, const void *inp, size_t len) +{ + OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) : + sha256_block_ppc(ctx, inp, len); +} + +void sha512_block_p8(void *ctx, const void *inp, size_t len); +void sha512_block_ppc(void *ctx, const void *inp, size_t len); +void sha512_block_data_order(void *ctx, const void *inp, size_t len); +void sha512_block_data_order(void *ctx, const void *inp, size_t len) +{ + OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) : + sha512_block_ppc(ctx, inp, len); +} + +void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32_vmx(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32_vsx(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]) +{ + OPENSSL_ppccap_P & PPC_CRYPTO207 + ? ChaCha20_ctr32_vsx(out, inp, len, key, counter) + : OPENSSL_ppccap_P & PPC_ALTIVEC + ? ChaCha20_ctr32_vmx(out, inp, len, key, counter) + : ChaCha20_ctr32_int(out, inp, len, key, counter); +} + +void poly1305_init_int(void *ctx, const unsigned char key[16]); +void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, + unsigned int padbit); +void poly1305_emit(void *ctx, unsigned char mac[16], + const unsigned int nonce[4]); +void poly1305_init_fpu(void *ctx, const unsigned char key[16]); +void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len, + unsigned int padbit); +void poly1305_emit_fpu(void *ctx, unsigned char mac[16], + const unsigned int nonce[4]); +int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]); +int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]) +{ + if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) { + poly1305_init_fpu(ctx, key); + func[0] = (void*)(uintptr_t)poly1305_blocks_fpu; + func[1] = (void*)(uintptr_t)poly1305_emit_fpu; + } else { + poly1305_init_int(ctx, key); + func[0] = (void*)(uintptr_t)poly1305_blocks; + func[1] = (void*)(uintptr_t)poly1305_emit; + } + return 1; +} diff --git a/sys/crypto/openssl/ossl_ppc.h b/sys/crypto/openssl/ossl_ppc.h new file mode 100644 index 000000000000..5f685687d27e --- /dev/null +++ b/sys/crypto/openssl/ossl_ppc.h @@ -0,0 +1,45 @@ +/* + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef __OSSL_PPC__ +#define __OSSL_PPC__ + +#include +#include + +extern unsigned int OPENSSL_ppccap_P; + +/* + * Flags' usage can appear ambiguous, because they are set rather + * to reflect OpenSSL performance preferences than actual processor + * capabilities. + */ +# define PPC_FPU64 (1<<0) +# define PPC_ALTIVEC (1<<1) +# define PPC_CRYPTO207 (1<<2) +# define PPC_FPU (1<<3) +# define PPC_MADD300 (1<<4) +# define PPC_MFTB (1<<5) +# define PPC_MFSPR268 (1<<6) + +/* aesp8-ppc.S */ +ossl_cipher_encrypt_t aes_p8_cbc_encrypt; +/* vpaes-ppc.S */ +ossl_cipher_encrypt_t vpaes_cbc_encrypt; + +static void +AES_CBC_ENCRYPT(const unsigned char *in, unsigned char *out, + size_t length, const void *key, unsigned char *iv, int encrypt) +{ + if (OPENSSL_ppccap_P & PPC_CRYPTO207) + aes_p8_cbc_encrypt(in, out, length, key, iv, encrypt); + else + vpaes_cbc_encrypt(in, out, length, key, iv, encrypt); +} +#endif diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5ef245f17051..be7539e9eae1 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -577,7 +577,8 @@ _vmware= vmware .endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH} == "armv7" + ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH} == "armv7" || \ + ${MACHINE_ARCH:Mpowerpc64*} != "" _ossl= ossl .endif diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index 9777e0bcfacc..edaebe26ff9a 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -59,6 +59,48 @@ SRCS.i386= \ sha512-586.S \ ossl_x86.c +SRCS.powerpc64le= \ + ossl_ppccap.c \ + aes-ppc.S \ + aesp8-ppc.S \ + chacha-ppc.S \ + ecp_nistz256-ppc64.S \ + ghashp8-ppc.S \ + keccak1600-ppc64.S \ + poly1305-ppc.S \ + poly1305-ppcfp.S \ + ppc-mont.S \ + ppc.S \ + ppccpuid.S \ + sha1-ppc.S \ + sha256-ppc.S \ + sha256p8-ppc.S \ + sha512-ppc.S \ + sha512p8-ppc.S \ + vpaes-ppc.S \ + x25519-ppc64.S + +SRCS.powerpc64= \ + ossl_ppccap.c \ + aes-ppc.S \ + aesp8-ppc.S \ + chacha-ppc.S \ + ecp_nistz256-ppc64.S \ + ghashp8-ppc.S \ + keccak1600-ppc64.S \ + poly1305-ppc.S \ + poly1305-ppcfp.S \ + ppc-mont.S \ + ppc.S \ + ppccpuid.S \ + sha1-ppc.S \ + sha256-ppc.S \ + sha256p8-ppc.S \ + sha512-ppc.S \ + sha512p8-ppc.S \ + vpaes-ppc.S \ + x25519-ppc64.S + CFLAGS.bsaes-armv7.S+= -D__KERNEL__ CFLAGS+= -I${SRCTOP}/sys/crypto/openssl diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 2a5e3d377ab8..79f484e02dbc 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -191,6 +191,7 @@ device mlx5en # Ethernet driver # Pseudo devices. device crypto # core crypto support +device ossl # OpenSSL OpenCrypto module device loop # Network loopback device ether # Ethernet support device vlan # 802.1Q VLAN support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 63e10df90200..61f67b7246c6 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -187,6 +187,7 @@ device mlx5en # Ethernet driver # Pseudo devices. device crypto # core crypto support +device ossl # OpenSSL OpenCrypto module device loop # Network loopback device ether # Ethernet support device vlan # 802.1Q VLAN support From nobody Fri Jun 21 03:47:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W53Fk1gd5z5PN4t; Fri, 21 Jun 2024 03:47: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 4W53Fk15vhz4jCR; Fri, 21 Jun 2024 03:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718941626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xOCiNrtCqZFmFvIoqg7zKZU3h1EYiG4tuapFCR/OWuE=; b=UdfPyT5RLOnGILvhUBuj6HLszNXVPnSHzbmxuhBohyoX6OYjQawrGvVYVPjl9NgkkE4Mpg zYVcZATx1WmUzDV9n9W6pfhn1xbQiGhGLfgb3M0GLrP/JH0zExCYKnMZS8kW/Jspply0hc Paqo17q/GczRBeN3MhgWLpv/5fwq0FiyoM/JrxcE3Jl1jQx4m7Ylf2FarPQcMKi7Wjnnd8 OXVr6i/dUt/CuC/2skV2c+T6R5yJi+mV/ae9dKMv4mljCSfSsH11Rk8mZL/bbZvV5+yIyZ D2v4YsL+GyM59DIieaEjf26dxSfXhOlPCbAF8XxELt9wofm15hTFJaDq5t7xEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718941626; a=rsa-sha256; cv=none; b=bTNcMgqo2v8LVKLIg/PbGr6+8DOVNxyDHPbF720MDXTb46QrvLcc7RfvO9ppnJ3H7hR8Xv MLXxf54BYG7YFDlyQ01Z6Z7VvUxkwDD35EUvUkUJsalyZVpLSj+kVTBT9bmPh2vrf7j5Kt bOTAVMFjGPEQr9T4A37QuLcxqVUsqCK7y7XCdBOPvl8MSnN76JwPomfBv8IymQZUZMoraK 3nu1MI3ZDPjIwukO+2RtMvm58wUKujWP9ETnCtwkqaf6DE12TnfTKsf4GdiDpXT4UVAK9L hnAFZlA8U7vQISeO1dazmxy4GGfwdD1XxQ1tVHnaIw8O89o3bp18hN/zfhrung== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718941626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xOCiNrtCqZFmFvIoqg7zKZU3h1EYiG4tuapFCR/OWuE=; b=mZeMqlLjcgPX5gui0VFnCM6Cvo+xQ8PbpAOSMFr0w6TqqjY+1jLVjwAz9Jb4/GyrZ74KCu W/hncCQspMZvEmVr2Y+3XKpiVn1Ipvr3m+UOAP12WqRJfk2OreWeGvGOPIH043ngXzKVcR lQCp+sYVBttFJtBlRQrpLyA+yERvz8wIv4AXPFz6nmSo5AUjPEnTOQ4t3vAbIIsKUcT7NC oQnwGApP9rNaJuBnUZ3RApQQ3Fa7qnfitJDNTA3eOTKLFA/3Tc6dD1STHOp4TpmuSUdDJi O+WQXfBvTDPZ9+e98wHLJ8vx3EXV8NKXrfBEyriOKGaCsSqNR8Hji17LZlziHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W53Fk0j8LzsLf; Fri, 21 Jun 2024 03:47: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 45L3l5sJ065195; Fri, 21 Jun 2024 03:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L3l5co065192; Fri, 21 Jun 2024 03:47:05 GMT (envelope-from git) Date: Fri, 21 Jun 2024 03:47:05 GMT Message-Id: <202406210347.45L3l5co065192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 17bcc10aec4b - stable/14 - virtio(4): Fix two typos in KASSERT messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17bcc10aec4b1e13e42a02c0a185ed0dac56af1b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=17bcc10aec4b1e13e42a02c0a185ed0dac56af1b commit 17bcc10aec4b1e13e42a02c0a185ed0dac56af1b Author: Gordon Bergling AuthorDate: 2024-06-16 16:02:46 +0000 Commit: Gordon Bergling CommitDate: 2024-06-21 03:46:51 +0000 virtio(4): Fix two typos in KASSERT messages - s/emtpy/empty/ (cherry picked from commit 018a361f8902d629fca64be372ef9b266fee53ba) --- sys/dev/virtio/console/virtio_console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c index d8048d0f1f6e..45cd11ddb5ef 100644 --- a/sys/dev/virtio/console/virtio_console.c +++ b/sys/dev/virtio/console/virtio_console.c @@ -979,7 +979,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc, */ VTCON_CTRL_TX_LOCK(sc); KASSERT(virtqueue_empty(vq), - ("%s: virtqueue is not emtpy", __func__)); + ("%s: virtqueue is not empty", __func__)); error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0); if (error == 0) { virtqueue_notify(vq); @@ -1367,7 +1367,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize) vq = port->vtcport_outvq; KASSERT(virtqueue_empty(vq), - ("%s: port %p out virtqueue not emtpy", __func__, port)); + ("%s: port %p out virtqueue not empty", __func__, port)); sglist_init(&sg, 2, segs); error = sglist_append(&sg, buf, bufsize); From nobody Fri Jun 21 03:47:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W53GG3lFJz5PMr7; Fri, 21 Jun 2024 03:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W53GG3DBcz4jkZ; Fri, 21 Jun 2024 03:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718941654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F3KiPDUlwfkKngBG+smsAGPTgD2vT4tMeQmfTjfRIn0=; b=aAMgJ3eRHwTfYj8sTiwc0BkrSVM/7R2/1B1W/ssrYMBqtiMBl0W5xp2OfvaSDzS+c9EywO oEBFl4Ab/ddWWYOiPrPEaiIAwxLLdlb1lUYMo/YYQuM2v7dI/IqzdNuRu5Uade+eWqa7vK k0JG9oUcHhSrQuzCiWKwCiXkbKbGgbsp/RoL6B5Uqwx84je03RSTgO4/2cAzLoF/fsOtuG efjTcdwrMZcPijgF9s/5NmIsGfOfFvZFNmrrBY08aYbAxw4Gy7Wup6K6et1iU2dACk6FxK TLgWgFrNvxXH5I3ZYjgwbA1uBDtnJpgdO5PyZCBvW+Ta1l6y5f96i+488a5ILA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718941654; a=rsa-sha256; cv=none; b=WhkwIoygsDzjvANZCpcSe+kNNT/HBDUBbxzn06sZeW77Wxuc2FikECL8zzKslqm/dA/prT 0RzFNOT1syJz/KiX+yUcNHtpbW1bgj5LNVUyEmykMsmCFtdmKi8SRcGJdJ32I3S+L6vDHr NYf81NZg4efEb5r/af9eA4TzVtlZx+oy1VQA/2sfaY+YsXJ4OmmCzAWOypiYB6rCiX4uAq 1oXehmdDGJn0MQqb3NB4UhOgts9bK/yWqI8N10teM88wpTypko+aeUBBk76bZnZVlphdB3 31Xs5j+DKr1cfY7Kic50MrA9+7Gdnqq2RdBKwl9kpcnqGA/yOWJkpB+TAKO7WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718941654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F3KiPDUlwfkKngBG+smsAGPTgD2vT4tMeQmfTjfRIn0=; b=qtT5Xake3VJL5IYQ/LIaiZSd5OHYVNFgN2r1r6OD4MkMBNtjPH16s81Gpr5G/gVDweeIF7 /qjYOfuWTinGme0nMEYbuknDHoQKP24Eh9/GQ4areG/IOs2eDlWu7by5lsOCJMf6YRmojP pRRvDJPpmR1pX0eub9b1MDusEoaEOOl4zhygiLD4WpWEWLyTam1Bk5WTGeUflLUXAwDTSy BivgUcUFyWNicO4TcgZLuDqw5bnUeNl3Dq8L5fw9QIjXKF9H4YWMji9Wsr616rGxXy73+C POZbmD3o2+8W93pqLuFytgwYYrd8YVbc+GuhaW9tPaOdfxPfRtUJMejaqAxr6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W53GG2p7QzsX0; Fri, 21 Jun 2024 03:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45L3lYbI065368; Fri, 21 Jun 2024 03:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L3lYrf065365; Fri, 21 Jun 2024 03:47:34 GMT (envelope-from git) Date: Fri, 21 Jun 2024 03:47:34 GMT Message-Id: <202406210347.45L3lYrf065365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 35dfbe1ec827 - stable/13 - virtio(4): Fix two typos in KASSERT messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35dfbe1ec827d902e1096de2e0be4db300f4851f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=35dfbe1ec827d902e1096de2e0be4db300f4851f commit 35dfbe1ec827d902e1096de2e0be4db300f4851f Author: Gordon Bergling AuthorDate: 2024-06-16 16:02:46 +0000 Commit: Gordon Bergling CommitDate: 2024-06-21 03:47:22 +0000 virtio(4): Fix two typos in KASSERT messages - s/emtpy/empty/ (cherry picked from commit 018a361f8902d629fca64be372ef9b266fee53ba) --- sys/dev/virtio/console/virtio_console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c index a966d72f2084..96ccb398ab34 100644 --- a/sys/dev/virtio/console/virtio_console.c +++ b/sys/dev/virtio/console/virtio_console.c @@ -981,7 +981,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc, */ VTCON_CTRL_TX_LOCK(sc); KASSERT(virtqueue_empty(vq), - ("%s: virtqueue is not emtpy", __func__)); + ("%s: virtqueue is not empty", __func__)); error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0); if (error == 0) { virtqueue_notify(vq); @@ -1369,7 +1369,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize) vq = port->vtcport_outvq; KASSERT(virtqueue_empty(vq), - ("%s: port %p out virtqueue not emtpy", __func__, port)); + ("%s: port %p out virtqueue not empty", __func__, port)); sglist_init(&sg, 2, segs); error = sglist_append(&sg, buf, bufsize); From nobody Fri Jun 21 03:47:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W53Gj42Scz5PN0f; Fri, 21 Jun 2024 03:47: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 4W53Gj3JC8z4jrV; Fri, 21 Jun 2024 03:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718941677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vBHirl0AlhofNBkYFaw3Qx+JzxdDFX4fFwzDeIPKfU=; b=PZTG14nPTfvk4C3bSHd+2Kibqqa79kdE4Yo2sciNGUfl8vSXsVxQLxe77Tan5AkwgcQCYE DUJlWr331n4ejdrRZXdiQ0vZz9HlZPRsvTIJys3mP8y+Qpat486YASZg6jFc12eOnw8gib Q6GFRdfXUDIg6elXRxfaOjJ1QiwUyIQrTLHUf5BQ5cmIHb2Xw97jYIW3l0sZ1bInXwDjwG t5i0imEXzRpsG5pGr56yjcoRJF+XxRYF/aRzvrvBnNXVG1b5oYTnt4QiawpIPYnaTWVg2F hSvk6f8xRaRJvt/VJgHBFPfJ1Nsv+3ETMsc8uBWP7MIo9xA1gmk41qchgzlFBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718941677; a=rsa-sha256; cv=none; b=P7kuhI7MxZU949ZJKALot+oH+mPZt96V9kuLnR/mzbH7+tv9tZdoromCVshZJXq7MJ7vju awNloyJIdx8oFpmI/ygJQGnpu6n2SDQQUYPl07GuAeT9WQwo9TnsDtFNTx+Xbhuw8zgZfx Jf+1hbpVvJKdy5A+/8XTtr/D/4W3lqsQNtENYfqTY37g7VyIjuq8I7l4TnxnOuByv4APHe SVAEgBKgEnRGfIYL6TYlFrZ777YpE2Fj1S/2+pbX0u5dVThA6DKWHSbVvPGBbnQ5JhUCQU FdIZjFVvTjCOqsPt9EQuGeIry5YGWOw1cIoF31Mw2VL2PWNq9xh2wyr/nrfEzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718941677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vBHirl0AlhofNBkYFaw3Qx+JzxdDFX4fFwzDeIPKfU=; b=tUdDlFtvIkBgNhaazPT/4JgwnHPv0llrC/zoI8gkRqSNTa6VikR/8P/86erOOH0vlxeZt0 V5Zi5Et67GE1QqmdA0zpIvHKFV5xv9ZNikgfFGWrqpwBZcgqeSsYuhGl/eZANZU7nCbzIm MZHZwmLhaDTcntkHZupSqB7RFvGnlc6bIEQL47wD2OMD6zKHkRjSMxqJifsFRqPfu0dY4r ttj84OpSzHHRiwZF3wLNRZi0cziycZEK5BhJrIrgEtjNu5UsZ3bRA5L7MAmKaas0NTBhD3 CFIdmsECrEboTcVYDmAEIlQjTJDQmNM63H65UMFG7cxPdv4wzESZkGO+ja1ytg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W53Gj2v0TzsLg; Fri, 21 Jun 2024 03:47: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 45L3lvFC065570; Fri, 21 Jun 2024 03:47:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L3lvdP065567; Fri, 21 Jun 2024 03:47:57 GMT (envelope-from git) Date: Fri, 21 Jun 2024 03:47:57 GMT Message-Id: <202406210347.45L3lvdP065567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6f545abb9ac3 - stable/12 - virtio(4): Fix two typos in KASSERT messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6f545abb9ac30b95740be355a5312c2fc24ea9cd Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6f545abb9ac30b95740be355a5312c2fc24ea9cd commit 6f545abb9ac30b95740be355a5312c2fc24ea9cd Author: Gordon Bergling AuthorDate: 2024-06-16 16:02:46 +0000 Commit: Gordon Bergling CommitDate: 2024-06-21 03:47:47 +0000 virtio(4): Fix two typos in KASSERT messages - s/emtpy/empty/ (cherry picked from commit 018a361f8902d629fca64be372ef9b266fee53ba) --- sys/dev/virtio/console/virtio_console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c index 919e61be90f7..fd78bec2540f 100644 --- a/sys/dev/virtio/console/virtio_console.c +++ b/sys/dev/virtio/console/virtio_console.c @@ -967,7 +967,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc, */ VTCON_CTRL_TX_LOCK(sc); KASSERT(virtqueue_empty(vq), - ("%s: virtqueue is not emtpy", __func__)); + ("%s: virtqueue is not empty", __func__)); error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0); if (error == 0) { virtqueue_notify(vq); @@ -1355,7 +1355,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize) vq = port->vtcport_outvq; KASSERT(virtqueue_empty(vq), - ("%s: port %p out virtqueue not emtpy", __func__, port)); + ("%s: port %p out virtqueue not empty", __func__, port)); sglist_init(&sg, 2, segs); error = sglist_append(&sg, buf, bufsize); From nobody Fri Jun 21 05:45:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W55ss0crQz5PWy1; Fri, 21 Jun 2024 05:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W55sr70mmz4tLd; Fri, 21 Jun 2024 05:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=REEBGfxB9yD9KkWeB6x2gugVhlMhyCdCbYdoXJBy2wY=; b=K4KC5DV33DDl6H7ILDPWcYnDsEV9yCPPR4M+fh5bDN/geX8rKyVKn9mCsLYm8HKdqvFWm3 7LhDxFxu19NcAF69KSfPmdJo+YazRVtkWOp44DcrHT8ahamA6DDnA4WSkFFWjelo7xosWy /a9CyC5efBf1Fs1oahkDI8WfzSjzo0yiM12ssFiUd6qdAABdDMeq70ojgmvC+NPgq5RizH F+CnuAkj7QfFDkKFAr/HsNaODrVL3eOr6sRvDfcRBA5YWvazAI6ciMLeTxrivQxPPBs+4M 3R7Hnu9eroI51h3xh3Eo8JTaw/AdBzO58iRtqYM4XFZ9RzZj1KphdQgQ+nIsjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948705; a=rsa-sha256; cv=none; b=qrgMM/EGY0R/m10/qRLMbFm6rHuzAlv+j9BXUMPSbRJUCog5iUucH/lPs0JYZI5LE1SuPq snhx0Z7zINldamNt+Zwunqz+6AjETenMSV7oMCGbUDshWAghM+QmASSpzSIaQT4U3SW/ix 03xRIKZAIjd33PyrwCQFr9Aq+G9gbDfThVt1zhH0jk1HRNLjZIwZ/5rl64hAiKzTEZW1SV nvfs2noE+AncNNaJeOP/mdYGbV+kabcUoHQjy+wr6mnQyQ6q9C2CykwFl1Qy2u//f+9GOm My1db7GjEOCRs/Igil3mEpaWWNKVXIF/7367XWYxbp8eenJsPpYRoHoj8z2Hww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=REEBGfxB9yD9KkWeB6x2gugVhlMhyCdCbYdoXJBy2wY=; b=TFb2mNr77M1DIWip/rkK4/F0tLhjd4MWA9WOKCVT56u5Irff67l7ps6V8jt3je1nqYWakk B35xJoCUnIW5819Ij8rWyYrYMQ1R3h+nRZ29GHAmhiMdAgklIuwS8rA/SRGkPs0ANTlEYp 0oOscpL1649psCDypkONG4Emnw/bkt1OQLBIZHKfG1oOlqsF0Qfz+WfeedzqHG4jSANTbu eQP+gpQiHGiEYt/taGVNxjTiuhBLRtA/WFrM0bd8paug7jsSFYCFDKp1GSybR+rb4qV9UD gB0cW9B5ZPOYmjvZly0f9oF9SKLxIG94gZylh2szjw/z02h2DasjwwwuUnUVEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W55sr6YWCzwHl; Fri, 21 Jun 2024 05:45: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 45L5j4hU066923; Fri, 21 Jun 2024 05:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5j47N066920; Fri, 21 Jun 2024 05:45:04 GMT (envelope-from git) Date: Fri, 21 Jun 2024 05:45:04 GMT Message-Id: <202406210545.45L5j47N066920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 224e20ceb121 - stable/14 - gve: Make gve_free_qpls idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 224e20ceb1212579887397b67c43b42d41108c62 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=224e20ceb1212579887397b67c43b42d41108c62 commit 224e20ceb1212579887397b67c43b42d41108c62 Author: Shailend Chand AuthorDate: 2024-06-05 05:31:46 +0000 Commit: Xin LI CommitDate: 2024-06-21 05:44:34 +0000 gve: Make gve_free_qpls idempotent This fixes a panic caused by double free. PR: kern/279410 Differential Revision: https://reviews.freebsd.org/D45489 (cherry picked from commit b81cbb12410b000074483899e61e9e767ba3ec1d) --- sys/dev/gve/gve_qpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c index 3c6d9af6feee..9a946a2a2f2d 100644 --- a/sys/dev/gve/gve_qpl.c +++ b/sys/dev/gve/gve_qpl.c @@ -182,6 +182,7 @@ gve_free_qpls(struct gve_priv *priv) for (i = 0; i < num_qpls; i++) gve_free_qpl(priv, i); free(priv->qpls, M_GVE_QPL); + priv->qpls = NULL; } } From nobody Fri Jun 21 05:46:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W55v33tLmz5PWd4; Fri, 21 Jun 2024 05:46: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 4W55v33Hw0z4tjw; Fri, 21 Jun 2024 05:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01s0ov1xkeT9yECFBiT4M+AdQFIU3s2WpG7TaGWbGok=; b=ksvQiFWadXcoHYRf2ntZx+4aASNXhVU+3oRLVduRehNQOpvlp/GhAGTsBCnyb4OcovuIxP apeqLF6EuQimjYK1TaE+i5l4gjQlm9hyctbk4lFMRTZlGRNwPKCj84Kjsei/QaYOb7YrX+ qn/Pnl2jynwErmF1h2r+m4woXDm8aR+ZIZncpTpAWYBv+n4Vv7jDp/ZMfdn3KfGpnFnzYD Dj0NmiaU5Pw9EsGNj7XnqOIBwbvYC2yq8mzOkIcf+zmj6py7j32RsBvMPbqPbKI4sgKBq6 pbiL+CF0i26FAYvNhH3vzp0bheVlwod9q7+FdCbSknJosFSbFIKO2s9tgu7+eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948767; a=rsa-sha256; cv=none; b=gQFa3bO4ccFEm7ztY/yjVtmqMAfs/DmbLstJTfkZHxY0dgXfc7gKDohZbOU7xVX0TCm89d XqtFhOREQ6B9jfZx6+M0K7Abgm3mmuq2biMwPXABxSP+vF/tza/n+dd8JeW92edm0pDPeV 3SIKsO+uGCGl8VB7j7wKy5TosH15kfGpHrfGgVvQT43NChCw6QHBF8WxwFQVl6anWJ85+Q GdjDzvnvTUvrE8RXKSHgWZcVTL3hejg5BVy74a4SpHywGjRtzWLqODpjU0SLtMFhrZaB69 m7jdxwZMdkFd+7b+xmzj7gZeHItEi7tmZQYqRiqeoLTwTHAdGHoUk2XgHGV+Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01s0ov1xkeT9yECFBiT4M+AdQFIU3s2WpG7TaGWbGok=; b=vvp0DLbi3vK9CoZmW9+PyTQLJ6Jn/UQF/blT0IQeCV/RAky++npQW3YtdYAuJQt/9LROiV mcwskvevCcRoMN9FeipNjWUbr8ikqy5w4oHhg0/FPKVPb4/1QLT6+1RwxOenBvbHyDa/i2 +cHabuOhAD4pnGVzFqHAd7WcEAAbM3sbqkWESn1EMeTXZ1Cv1LyaoFFBc+8iMpWN+ocppA ye4p5reAx54EsU2nDtChJZd0NVzf8pMbf+SxoAOvgg8aXmkzbcy+0upEA7lsZP2KZnFryK twAoKB+gPRZV08JLrtfdcHkmsjqY/oKbRpXB7p+1GiUsfmifHBMebxWXaKskpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W55v32vHkzwjh; Fri, 21 Jun 2024 05:46: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 45L5k76U067236; Fri, 21 Jun 2024 05:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5k7Vn067233; Fri, 21 Jun 2024 05:46:07 GMT (envelope-from git) Date: Fri, 21 Jun 2024 05:46:07 GMT Message-Id: <202406210546.45L5k7Vn067233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 14454f417201 - stable/13 - gve: Make gve_free_qpls idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14454f417201a6c1075768c1a571b22c6d4c57d2 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=14454f417201a6c1075768c1a571b22c6d4c57d2 commit 14454f417201a6c1075768c1a571b22c6d4c57d2 Author: Shailend Chand AuthorDate: 2024-06-05 05:31:46 +0000 Commit: Xin LI CommitDate: 2024-06-21 05:45:58 +0000 gve: Make gve_free_qpls idempotent This fixes a panic caused by double free. PR: kern/279410 Differential Revision: https://reviews.freebsd.org/D45489 (cherry picked from commit b81cbb12410b000074483899e61e9e767ba3ec1d) --- sys/dev/gve/gve_qpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c index 3c6d9af6feee..9a946a2a2f2d 100644 --- a/sys/dev/gve/gve_qpl.c +++ b/sys/dev/gve/gve_qpl.c @@ -182,6 +182,7 @@ gve_free_qpls(struct gve_priv *priv) for (i = 0; i < num_qpls; i++) gve_free_qpl(priv, i); free(priv->qpls, M_GVE_QPL); + priv->qpls = NULL; } } From nobody Fri Jun 21 05:46:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W55vk29nMz5PWY8; Fri, 21 Jun 2024 05:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W55vk1Mlqz4ttQ; Fri, 21 Jun 2024 05:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948802; h=from:from:reply-to:subject:subject: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/CkdFcglABSx0FNGbgp3KI9/gOzRevFaQAUzTnj9HQ=; b=D38KnRBuEBsgrrm4hW/eA0Dazg4wr8e+N4oPGQCLmmWQ2WiOvCsyIrSqe5EdClDwNfwh/2 n0o+k/NRAXRiGSPttarecS5l/dDBZLNSh17uLjrjrJPJ6g8qeZkskDQ60xu9B2HzaRo63S Lqn/+m1uwS03/TN3jPFZ/kCAet2w03AmanYMJE1/2QarpdmYwkm0gjJTRvZurHn5OTRV8w eAc0J+uTdDRfo0CxEGR+BhLmPAAn+CnUWW4/3sY3sC3TR7VkTdJwMO8tqSPZFnQWAzmxO0 7sB2KwckWsjQyh6/u8n4N3sr3YCncBZcXe2oBorx98/tiln0uoH3Qb+Eapvvhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948802; a=rsa-sha256; cv=none; b=j8NLxK4pwACNMeuNFTImdfr1OXjLf6EC/RWkfpmKpEnvC4lByzmVEXduMwy8rgWl87taur jQEu2AjAFxGU3XomglXVJ0XSRxL5ZBHtI7Ihu+tQPxGkHf+X04uYQVoZOBGBD1V9vRQVMK lghQ64LOG0aOzCw/JmXrxisWHbQHJhMTT3y7oQtZKzerqRGVpw0qowA2STtY8FdrlORL5t vJEARlhCMdyJTV91BO0MsoPjVDeFmhDwUSZDwbPS3yW5aZqU9wbfd8B+IgBn40GrFJZh/Q famIvfk8lf/Qay+qvtOl4TS1FZiep/4ZeDJjwhoaWx0j/EWCl8qC9aVH/499Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948802; h=from:from:reply-to:subject:subject: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/CkdFcglABSx0FNGbgp3KI9/gOzRevFaQAUzTnj9HQ=; b=fwZYp/XciKgXeNIiIU5gvJgFFngltWr+puC8pCnbqywN9TVtCFdgea2Ts+/Rk9JnbIKByg +Cgw/8pB17B/xVrA6O06MixEu8Dfspl19zeTxoilGggXV0IN5zV1C0jtAanxCcVu1D0OHs OKam/rjhhXkDZLnzHLxLdTIBLQE+miVU8Nf8A3HeiLz4QHP3M4j1CGw7D5JA1ZF6DOMBH4 Ey8HuLHWmgScQDC6cvI8oQdx3xY96JB97K5bUO32TGA5V5fjz2YTzbcXong4VEyIFncyXS wRDZASmHDf7o4kIUN7xGubvJ3l4UUeI7ptgw9pC3Nc8Rn8EbPduNWIJmqTBZgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W55vk0z0Rzwjk; Fri, 21 Jun 2024 05:46: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 45L5kgkD067429; Fri, 21 Jun 2024 05:46:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5kgGc067426; Fri, 21 Jun 2024 05:46:42 GMT (envelope-from git) Date: Fri, 21 Jun 2024 05:46:42 GMT Message-Id: <202406210546.45L5kgGc067426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 70ad4a1f4b55 - stable/14 - Update leap-seconds to leap-seconds.3676924800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70ad4a1f4b557e1fcc58cbcabc61216dc1efbeb6 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=70ad4a1f4b557e1fcc58cbcabc61216dc1efbeb6 commit 70ad4a1f4b557e1fcc58cbcabc61216dc1efbeb6 Author: Xin LI AuthorDate: 2024-06-19 02:10:33 +0000 Commit: Xin LI CommitDate: 2024-06-21 05:46:30 +0000 Update leap-seconds to leap-seconds.3676924800 Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 (cherry picked from commit 8a607939decc9eddf31420a169d7a7ffe22295bf) --- usr.sbin/ntp/ntpd/leap-seconds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds index 3fe9a1210e3c..c5a95aa51799 100644 --- a/usr.sbin/ntp/ntpd/leap-seconds +++ b/usr.sbin/ntp/ntpd/leap-seconds @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C66 -# File expires on: 28 June 2024 +# Updated through IERS Bulletin C67 +# File expires on: 28 December 2024 # -#@ 3928521600 +#@ 3944332800 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1 +#h 199a9d45 3f630d2f e47cb9cc c2f0fa47 96932227 From nobody Fri Jun 21 05:46:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W55vw6ftQz5PX0y; Fri, 21 Jun 2024 05:46: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 4W55vw4rHtz4v88; Fri, 21 Jun 2024 05:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MyoeQwmJ9tqm9fyYx5ggnUjUEDZCigsrPiRqyCLPPgE=; b=ZWBm0iraFfNIJ3qvrzxzU4lN612C0BFS2I25DfghDT7WZmkEnO3cTyrt2ykJyX0qWIht1P Zo9DunIlw2ToK7A54wXFcSZrNbxhcxXRJXbllf3An2x82Jc8OzummKtmNtkMVoZMUI1WbK rvPq+KWCBxTX/VhyMrRAVxOEGxJqLmk/q4uIm2XugtZmLpFMim2eZjhMdrmVITRccLxbAy ARIMpaZVvLOhzi1vGTG965wZy846o/NEzIfcnE+MUEg4pc2YA7L7+ewUR0eBTbtH55Jli+ Z0UGo2jLi+cXeL4XlqMzsyK/fEs+VchpkKIybT0oXU0EUcc/zf84w+r0NapeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948812; a=rsa-sha256; cv=none; b=sDtvAb5AJ9f8xeZOUpMAs9gdzHgT80ty0da2FpDU/Ts4mqHBoo3/9nJxknojTUPIc5v3NP PCEhf7WXRnUwVHe09/+amGCfIFkDdS19J7k0sfPMIyU1DqskRgbENryy2I3f62PK6HiRHg UUaiXypVs3my8EGZ57n7vfD1aHO9Ec+hV5b9jJQMljo91m1THL7KKoxAi7J/2OJsHmF3Hk GOOIbvATo7vuH3ELsFiJ94h2HoxBeWk6NdYqDlnnulhGqR7K7InLdSGYp3R01oeRkS7oU9 u/UHubMQmoi7XL0zk/XlrZIiimWEdyRqqKzfshDzw25iJcpgMWhGm+aWosnWQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718948812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MyoeQwmJ9tqm9fyYx5ggnUjUEDZCigsrPiRqyCLPPgE=; b=EF3e2DaB9eBmI2lHu9mxmVyd/zL+pLq1pFjg1Ez6vv4xbJxCq9Ca2PzQ5mSGAkyJmxS/Y5 HXNd5QjtwuaJeu6lh20M45ZPcRl17GavLXPZIPGER4oXy/9OOQZxvOgNTYy1O3b1/LXKMB waao6gf/2fjQIcBBq0GmCCHtSqIU7aF5Msmed+omXWi+ZqHhW1IOqJ4PioWsnwEdT3VSTi Bm8m/X25n7QmrFkOf0gDlg0X/jOUPr962VyWCstawUX8wNB1uLGXJ35q+zxmC3cGYBrUhY 9cV0io9ImRAO/m5eDWttrsv96y+CNi+O5Z59hTu/ZQFlJ9h3yWryzveVH2Kggw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W55vw493Wzwwc; Fri, 21 Jun 2024 05:46: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 45L5kqsI067589; Fri, 21 Jun 2024 05:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5kqbu067586; Fri, 21 Jun 2024 05:46:52 GMT (envelope-from git) Date: Fri, 21 Jun 2024 05:46:52 GMT Message-Id: <202406210546.45L5kqbu067586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: cbfeaa80e39f - stable/13 - Update leap-seconds to leap-seconds.3676924800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cbfeaa80e39fd7012e7c4e6616c47e8cd8a3b6c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=cbfeaa80e39fd7012e7c4e6616c47e8cd8a3b6c0 commit cbfeaa80e39fd7012e7c4e6616c47e8cd8a3b6c0 Author: Xin LI AuthorDate: 2024-06-19 02:10:33 +0000 Commit: Xin LI CommitDate: 2024-06-21 05:46:46 +0000 Update leap-seconds to leap-seconds.3676924800 Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 (cherry picked from commit 8a607939decc9eddf31420a169d7a7ffe22295bf) --- usr.sbin/ntp/ntpd/leap-seconds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds index 3fe9a1210e3c..c5a95aa51799 100644 --- a/usr.sbin/ntp/ntpd/leap-seconds +++ b/usr.sbin/ntp/ntpd/leap-seconds @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C66 -# File expires on: 28 June 2024 +# Updated through IERS Bulletin C67 +# File expires on: 28 December 2024 # -#@ 3928521600 +#@ 3944332800 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1 +#h 199a9d45 3f630d2f e47cb9cc c2f0fa47 96932227 From nobody Fri Jun 21 07:19:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W57yp6zNJz5Pf3f; Fri, 21 Jun 2024 07:19: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 4W57yp6Qsbz44Zf; Fri, 21 Jun 2024 07:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718954370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWUoAkXW8XukvtbOUXaC1FFlA/+odHVHFLcLVEZ1GMU=; b=fNko0bL9XMSswQGJLxwmh8zlz0umPp9d3ro6ovG5/mzRV6CLdsni7A9TC9vCU8AxJ2bvBa th4oQMzBHuaxRrkXEeBsrFvZ7ODy7MvwenPxMAgOOX4dRa8+tNjiatkRPImm4rHPE1+U2U UwxIvypP/HAs/yILxaKVH92TWEIJTZPieGZ3N0oigWgiGyeji8kwSCOpF36O90KYCnEKGr hZNJUaFbPBYBFD6qHHV+kmCZ52Eg7Lq0xFC+BqhMxw4OBvjJffbnILLlXRaxhH34xHCMIY 7XroQSRecZU5wCXxggZISjqe5BAkqLZSTlntKBO8KgmV6rXe/kuCV+gG5LvOsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718954370; a=rsa-sha256; cv=none; b=L7ataW/N2K6GL/17f6HmadtihYYjTrT2FFJI5+TI+bkJD4DlFQToM0aD+UCx+B7Vcle3hJ 2cwNWttrOA8aGvt5Ht1kq6fqrAfpkFxXo7I9TEnBbtiK3qxpMQMQpbTSemlz3GaGR3kV2u OuSwwaZunzafqUuR9LPNaYE8daGAbQVYoL4KBGxEIkC+GXXXEXycKIeVMADkVh8F+T1sAW bvO/OKOIDxvhWS+N9eBzT//runMBJcQ/Q9bu4xnzgFg737seXkFttN0TSrL/f/IAlCWNmh hNjclkaqMSkeY/YR4sDGYXZeIoPYrINyxoYjsO/kG3d8TIJL66/oEYOdzzWkHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718954370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWUoAkXW8XukvtbOUXaC1FFlA/+odHVHFLcLVEZ1GMU=; b=k/UT4j6b8O59kxXTsUYeSDYgkym65/Rd6FY8dNO1AvzIsXXMjzPrq2HzVkviHYGYeT4s4T 4KBoWW0hTnlzRQDEt6gfWM1icQLCAzvOxgSdDkAbzqyf1nFGLzLuAFxTDM9V6T//Uz4l5X IGg0+w/hEBAMuDFbL0njCL4hJUU9vqFR6W4Q1CDwmZQvg60DIAo5n7idFI65j3wiMOgFp+ 9wzRvp+7bSEX+OJTvVAVPXNOCiJE8DGfCBQwohNsvmrg+KZR6QjkqwAjmeto6U5XPl3LnA CIzd9/Ofk3qJ+G1lXjo4Wf170MuA1sX4yhmte/4hnkPwUQLFgGQX4RUieW0suw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W57yp61zMz101s; Fri, 21 Jun 2024 07:19: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 45L7JUiK020538; Fri, 21 Jun 2024 07:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L7JU1H020535; Fri, 21 Jun 2024 07:19:30 GMT (envelope-from git) Date: Fri, 21 Jun 2024 07:19:30 GMT Message-Id: <202406210719.45L7JU1H020535@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: 00d061855deb - main - Garbage-collect ACPI-safe timer and friends List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 00d061855deb93df5d709c8a794985ebb55012f8 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=00d061855deb93df5d709c8a794985ebb55012f8 commit 00d061855deb93df5d709c8a794985ebb55012f8 Author: Colin Percival AuthorDate: 2024-06-21 07:06:48 +0000 Commit: Colin Percival CommitDate: 2024-06-21 07:19:08 +0000 Garbage-collect ACPI-safe timer and friends In 2001 when the ACPI timer was introduced, it included code to check for a bug present in some Pentium II and Pentium III chipsets; if the bug was found to be present, ACPI-safe (which was slower but had a workaround for the bug) would be used rather than ACPI-fast (which read the same timer but without the workaround). In a8b89dff6ac0 (September 2021) I disabled this check by default, with a loader tunable available to re-enable it; I announced at the time that it would go away in FreeBSD 15 if I didn't receive any reports of problems. I have received no such problems, so this code is now going away. The debug.acpi.timer_test loader variable triggered a lengthy (in fact, infinitely long) test of the ACPI timer and appears to have been introduced as part of the process of writing the ACPI timer (and the associated ACPI-safe workaround) in 2001; since we are dropping support for systems with this ACPI bug, there is no need to keep that test code either. --- sys/dev/acpica/acpi_timer.c | 126 ++------------------------------------------ 1 file changed, 3 insertions(+), 123 deletions(-) diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index e78b4728749a..13a89c4e6154 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -74,11 +74,6 @@ static void acpi_timer_suspend_handler(struct timecounter *); static u_int acpi_timer_get_timecount(struct timecounter *tc); static u_int acpi_timer_get_timecount_safe(struct timecounter *tc); static int acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS); -static void acpi_timer_boot_test(void); - -static int acpi_timer_test(void); -static int acpi_timer_test_enabled = 0; -TUNABLE_INT("hw.acpi.timer_test_enabled", &acpi_timer_test_enabled); static device_method_t acpi_timer_methods[] = { DEVMETHOD(device_identify, acpi_timer_identify), @@ -192,8 +187,6 @@ acpi_timer_probe(device_t dev) acpi_timer_timecounter.tc_counter_mask = 0x00ffffff; acpi_timer_timecounter.tc_frequency = acpi_timer_frequency; acpi_timer_timecounter.tc_flags = TC_FLAGS_SUSPEND_SAFE; - if (testenv("debug.acpi.timer_test")) - acpi_timer_boot_test(); /* * If all tests of the counter succeed, use the ACPI-fast method. If @@ -203,19 +196,11 @@ acpi_timer_probe(device_t dev) j = 0; if (bootverbose) printf("ACPI timer:"); - for (i = 0; i < 10; i++) - j += acpi_timer_test(); if (bootverbose) printf(" -> %d\n", j); - if (j == 10) { - acpi_timer_timecounter.tc_name = "ACPI-fast"; - acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount; - acpi_timer_timecounter.tc_quality = 900; - } else { - acpi_timer_timecounter.tc_name = "ACPI-safe"; - acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount_safe; - acpi_timer_timecounter.tc_quality = 850; - } + acpi_timer_timecounter.tc_name = "ACPI-fast"; + acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount; + acpi_timer_timecounter.tc_quality = 900; tc_init(&acpi_timer_timecounter); device_set_descf(dev, "%d-bit timer at %u.%06uMHz", @@ -368,108 +353,3 @@ SYSCTL_PROC(_machdep, OID_AUTO, acpi_timer_freq, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, acpi_timer_sysctl_freq, "I", "ACPI timer frequency"); - -/* - * Some ACPI timers are known or believed to suffer from implementation - * problems which can lead to erroneous values being read. This function - * tests for consistent results from the timer and returns 1 if it believes - * the timer is consistent, otherwise it returns 0. - * - * It appears the cause is that the counter is not latched to the PCI bus - * clock when read: - * - * ] 20. ACPI Timer Errata - * ] - * ] Problem: The power management timer may return improper result when - * ] read. Although the timer value settles properly after incrementing, - * ] while incrementing there is a 3nS window every 69.8nS where the - * ] timer value is indeterminate (a 4.2% chance that the data will be - * ] incorrect when read). As a result, the ACPI free running count up - * ] timer specification is violated due to erroneous reads. Implication: - * ] System hangs due to the "inaccuracy" of the timer when used by - * ] software for time critical events and delays. - * ] - * ] Workaround: Read the register twice and compare. - * ] Status: This will not be fixed in the PIIX4 or PIIX4E, it is fixed - * ] in the PIIX4M. - */ -#define N 2000 -static int -acpi_timer_test(void) -{ - uint32_t last, this; - int delta, max, max2, min, n; - register_t s; - - /* Skip the test based on the hw.acpi.timer_test_enabled tunable. */ - if (!acpi_timer_test_enabled) - return (1); - - TSENTER(); - - min = INT32_MAX; - max = max2 = 0; - - /* Test the timer with interrupts disabled to get accurate results. */ - s = intr_disable(); - last = acpi_timer_read(); - for (n = 0; n < N; n++) { - this = acpi_timer_read(); - delta = acpi_TimerDelta(this, last); - if (delta > max) { - max2 = max; - max = delta; - } else if (delta > max2) - max2 = delta; - if (delta < min) - min = delta; - last = this; - } - intr_restore(s); - - delta = max2 - min; - if ((max - min > 8 || delta > 3) && vm_guest == VM_GUEST_NO) - n = 0; - else if (min < 0 || max == 0 || max2 == 0) - n = 0; - else - n = 1; - if (bootverbose) - printf(" %d/%d", n, delta); - - TSEXIT(); - - return (n); -} -#undef N - -/* - * Test harness for verifying ACPI timer behaviour. - * Boot with debug.acpi.timer_test set to invoke this. - */ -static void -acpi_timer_boot_test(void) -{ - uint32_t u1, u2, u3; - - u1 = acpi_timer_read(); - u2 = acpi_timer_read(); - u3 = acpi_timer_read(); - - device_printf(acpi_timer_dev, "timer test in progress, reboot to quit.\n"); - for (;;) { - /* - * The failure case is where u3 > u1, but u2 does not fall between - * the two, ie. it contains garbage. - */ - if (u3 > u1) { - if (u2 < u1 || u2 > u3) - device_printf(acpi_timer_dev, - "timer is not monotonic: 0x%08x,0x%08x,0x%08x\n", - u1, u2, u3); - } - u1 = u2; - u2 = u3; - u3 = acpi_timer_read(); - } -} From nobody Fri Jun 21 07:35:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W58K24sM7z5Pg3b; Fri, 21 Jun 2024 07:35: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 4W58K23qVyz463S; Fri, 21 Jun 2024 07:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718955318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VdcpW5z9bLM41mBrrF7t4y90yi2sa01Mc8f0a/HkTRI=; b=tl4Umr6DEH3+VnHUcg4UEXk19vCsCNjYN+Hg50BchdzLglUDIKmTF22/cUgndn+zP50rmW s7aRTOGFUS0U9oEhXZqZg5SjIblz1WK0K1ePD0hDKZNBjSKIUDB9cemWIzsykPZTHyDYkZ w3lEL3ZSGQwHmMyPwRrt80w4YIHfoK3Gm4ezGC+ZkY3+3d80gtvTj2MYdiyjKk2KthKsWW ON90PCQz9i2X0v0saAB33gSolY0O8kEQj2VrTaKxKG3LJHHg3CbscTR/WjX5lbi0Ec1zkL Ilh5Bl8Zt8NozSeeRnjZ8J8qZg3mVBmXm9oe6BejiQixJisvEzKuxKmh0iCCvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718955318; a=rsa-sha256; cv=none; b=Cvt0dHsbK3A/4bUaG6IN38Ei0MEuZ3LypHYM8wAQNsha8OgjC4IEEhpCmP0WRz0E2BfDH1 vB9OmIfk1oyZs1GS4snx65ef1mSBGUb2x606Jh90sWybCmaB35cYQMy79lt72xwR1iQR7U 50eyLDsIcHZnBQZ9RqmQvxHpuqLQDSRFuxtgL6taBK3NRWaXuaw1lRUP7B19ZnXOLxwiVe 9Bpn3guEBI1HTsD/dE3jlzidfTGEBVJuXpxGGo1T/7w295vAD19LS81NofriDnJRgoVwvR zET1Ro4DOwLmhKHp1pHZi3+lxIFwrdbRf8FCwes9LwS/8vcmnlKiALUgoqtROA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718955318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VdcpW5z9bLM41mBrrF7t4y90yi2sa01Mc8f0a/HkTRI=; b=rf15QNX10AIZ9NjPH0WktXaldMXklzEAG9pFVN/Zv3IUl5b24UqsY7RK+3Z/iBPtcLbJuk qK/0oGNHVeWjPtBwHyOLtII0DYMz46fZNZ2K5FvN/nVmnLPvKKbJM5CfWhRmnKo5AXjbtm CxsP5oDLpSzveZF6Lp/LdaNCZlHp36kdZVdqLPSHBSsBewxfkbpHmkVrqL7Txes+MLniXx Xj+qSk+rcqWFoC2fDSnjjtC7n+DeMwFvsz+/gE6BidfCtY42Rz2l2S/NP5h0eJC8rH0/aH iQOJ4E2zKK9mHVpV19gu6LFZnjp98FvafhOAzIJJjNDZXj1f4rhMKWL+FXynuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W58K23NzVz105X; Fri, 21 Jun 2024 07:35: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 45L7ZIpW052764; Fri, 21 Jun 2024 07:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L7ZIfn052761; Fri, 21 Jun 2024 07:35:18 GMT (envelope-from git) Date: Fri, 21 Jun 2024 07:35:18 GMT Message-Id: <202406210735.45L7ZIfn052761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2e98b8863846 - main - RELNOTES: add entries about byacc and ncurses updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e98b88638469fcd9ac19d9b9bd29d570cc8892b Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2e98b88638469fcd9ac19d9b9bd29d570cc8892b commit 2e98b88638469fcd9ac19d9b9bd29d570cc8892b Author: Baptiste Daroussin AuthorDate: 2024-06-21 07:33:18 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-21 07:34:10 +0000 RELNOTES: add entries about byacc and ncurses updates --- RELNOTES | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RELNOTES b/RELNOTES index 5c2eff22168e..ddc2a781d5fa 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,13 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. + +822ca3276345: + byacc was updated to 20240109. + +21817992b331: + ncurses was updated to 6.5. + 8aac90f18aef: new MAC/do policy and mdo(1) utility which enables a user to become another user without the requirement of setuid root. From nobody Fri Jun 21 07:38:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W58NX2Lmkz5Pg5m; Fri, 21 Jun 2024 07:38:20 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4W58NW6dxKz46VY; Fri, 21 Jun 2024 07:38:19 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 33C88892BC; Fri, 21 Jun 2024 07:38:11 +0000 (UTC) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.18.1/8.16.1) with ESMTPS id 45L7cAuh007447 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 21 Jun 2024 07:38:10 GMT (envelope-from phk@critter.freebsd.dk) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 45L7cA2e007446; Fri, 21 Jun 2024 07:38:10 GMT (envelope-from phk) Message-Id: <202406210738.45L7cA2e007446@critter.freebsd.dk> To: Colin Percival cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 00d061855deb - main - Garbage-collect ACPI-safe timer and friends In-reply-to: <202406210719.45L7JU1H020535@gitrepo.freebsd.org> From: "Poul-Henning Kamp" References: <202406210719.45L7JU1H020535@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <7444.1718955490.1@critter.freebsd.dk> Date: Fri, 21 Jun 2024 07:38:10 +0000 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] X-Rspamd-Queue-Id: 4W58NW6dxKz46VY -------- Colin Percival writes: > commit 00d061855deb93df5d709c8a794985ebb55012f8 > > Garbage-collect ACPI-safe timer and friends > > In 2001 when the ACPI timer was introduced, it included code to check > for a bug present in some Pentium II and Pentium III chipsets; Boy, does that bring back memories... Apologies for not taking this out behind the barn myself, I had totally forgotten about it. Poul-Henning -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Fri Jun 21 07:55:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W58mN0b1cz5PhL1; Fri, 21 Jun 2024 07:55: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 4W58mM6zDfz48vP; Fri, 21 Jun 2024 07:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718956532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6WZAXGNTXk0vO4sUjwUysEC7vOUp1FT4KJVqimSOop0=; b=Z/toNXPXP7paYmiQdupXg7+2QkTx13lgywv2iHUboPg+jOB0mmETlzuLHNbd437lvbiRvS fRuA+8jodpgpRjP+CV6Z2mrlb01jLQRV6te6BeyTEIM1OA+ElRPDvDl978E9eCEyg1He7p 9psmL/P0Rp32eV/73N/PEE/wP8eHHBT2wh5MWo1un8jHtAEKrmDCShlHLB9rP3sVLLPa8H MDHtHMLRZyo0/dAzmNO9M8ig4ucMzLMWXss07rKMpgrr2bDAdpxMEEA2r/vAqAjdiBbckO z0SPTINeGvTvYL7NVga+4xsnvZAmgXYnLHSQYKdkkr016MDhp0W3In9jdI6c2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718956532; a=rsa-sha256; cv=none; b=kh1H8rkNmYrPMUUzrexd4hk6ULeUyGQwk8cocLxGWQF/748UvfJ6/4GAfY9f5MTaNJvBoB tNtnWBI7U0ZyF5nqcLRjcJwync1zkQh+qdYWkY81A8JguvRKcj7AbFcjwmqcFGrrK8t5/a eJaRs57GvqORBHuNymqbAb2v6hoiZxdfVn5P0dPifd+YQLGMkfPGQps4oEavfqap2lB9dl KTESodFtXw+fT7GK5JDilJk+4QYFa8e2dn/tPwDsyYTbo+e7m2ykeXww5KwrhxT/25IHil vSuZgQgniuANDsofmV0IY//zvr/zZLppme/M5jC2SV46ONohx7eBzf0FfF1ASg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718956532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6WZAXGNTXk0vO4sUjwUysEC7vOUp1FT4KJVqimSOop0=; b=WyDok11HqNRV1Sjukp0gZomqvjjhVYcXFF4++tPb1RHDByJsg2CkXpIFytEx423ovnXHHN Ns2rIzIaJ9tlDP0i8vRUhaETNQtW9H91zsyBUe4751768D5X0ZkCOM4Wu97KyiHH8pZsk9 X8wlwycw0bTxG4eIxiNKHt2FoV9Np8owqJMqZmjGlgTawcQP8igQmTso1sJWkSswSsjLXU jj4L9QQkdMkYWH6azjOfw4mE5nO06jvo1QZyAMUJB0tA70BOLt5QIFQTQhrt+HjaLGtd2p XzZSKZB2c+VuvM17H8F+L/b7Rrpq+UAfR0/hjmJg0+QZjE3Gc+S00VaNoMc4ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W58mM6Rr4z116B; Fri, 21 Jun 2024 07:55: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 45L7tVOi086477; Fri, 21 Jun 2024 07:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L7tVeJ086474; Fri, 21 Jun 2024 07:55:31 GMT (envelope-from git) Date: Fri, 21 Jun 2024 07:55:31 GMT Message-Id: <202406210755.45L7tVeJ086474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2933c05c5638 - main - acpi_timer: remove unused variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2933c05c5638c17230b49bc32ad027ac7f281a52 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2933c05c5638c17230b49bc32ad027ac7f281a52 commit 2933c05c5638c17230b49bc32ad027ac7f281a52 Author: Baptiste Daroussin AuthorDate: 2024-06-21 07:53:42 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-21 07:53:42 +0000 acpi_timer: remove unused variable the fixes kernel building after 00d061855deb --- sys/dev/acpica/acpi_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 13a89c4e6154..49474f71dfcb 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -154,7 +154,7 @@ acpi_timer_identify(driver_t *driver, device_t parent) static int acpi_timer_probe(device_t dev) { - int i, j, rid, rtype; + int j, rid, rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); From nobody Fri Jun 21 08:28:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W59VN03yGz5Pk9H; Fri, 21 Jun 2024 08:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W59VM6fXSz4CtN; Fri, 21 Jun 2024 08:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718958507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u26JqSwKiQk8t7PBmBihFQoMr2Cr2LeF95JOKAO1Eao=; b=aQ+wbdEiFTQmFp5rCq8rEF1CrZD8IMYC5a1+JYkFTFQTy0gfR8RuaBh9/KN59sYYi9qOis JJKWpR6KbJWctgKkRC7omT1+qYLs3tR5LTfhO9aQcC8AgJRw8E5Yqs6NuwxHlziKXX2ovU YY2lJHKdPedyNB42+U/EneftQO5WEZUCeOPf1bo2eSbsXgNaPp6VTXqqa9g74SPv3KXdHR tZ6DiEamtIuI+sWSjmVyMbBdUoNS1oics2yjNXFUeq9PRgYVWLgrWGf5yZMo5sQN0YIdfH tQ7NbJwHWF03XmwoyF5r2Mqh6yjHad718knE29EZnDz5ReAlWMDAhNAdim+LBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718958507; a=rsa-sha256; cv=none; b=RaVwYmTyrVfgOO/4Ei7h+H9xbHXd6xBPh6x/ZDR+ypgbwl1sCjECBetuorwKcmBU/Amk4Z /SRUlWCiT5jGj/QS9mDykyZFMyr7g8wbihKRDKZkUNZiHwpx7T3FIInr9qD9cBiiFXK3Cx OYzPR5QQM5HU20z/0xufacYlS+MwgadpEqHYp1Abcsd/Io9o5p110v3zfV34fWVESW03Q+ eHLmccJWO/1NuRyxH354sCJeTda2+hmW9zqaLSRYB/ZV82FbAItSm7ROxETr6K0v9bm/Il S0oPgxqUXZTALU9iyJ9C0WyGmQD2YKeDGug0ahZ/VLeJcIoILWSy33NbbejRuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718958507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u26JqSwKiQk8t7PBmBihFQoMr2Cr2LeF95JOKAO1Eao=; b=HfGg6W6aEIYwfmabmjq7YtkZVQPG8NHuv/w6Uy/0Zv4oKiMFSSacHlr6A1LO+F1k7jwyUu 5kCq16pVwjEnDrHZOG3OMxaBsWbbAczrgj0/+TjnYCwpy1gmlASJJ/dSIgRL81i4c60QgO 79YbTHQpSD41zasxUgCYwTTTBmoB4sHipXuhuj2EK549xWoFIthibUROAQpn4h0b1hYhMH hUe6Xq9+XldkFR6rwNIrZ6kSu8l3xwn7Q3PInokb8YoJVceiJbXAPljh7WZas8gxfEApm9 2y8aS/6MGvXmpSJSsszHaYoW6hz+3LBmfe06bAvzAPCr4fXoEomUjxlBKpqcxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W59VM6G0nz11q3; Fri, 21 Jun 2024 08:28: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 45L8SRIu038161; Fri, 21 Jun 2024 08:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L8SROg038158; Fri, 21 Jun 2024 08:28:27 GMT (envelope-from git) Date: Fri, 21 Jun 2024 08:28:27 GMT Message-Id: <202406210828.45L8SROg038158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: a3a09bbf21dc - stable/14 - rc.subr: improve description for ${name}_offcmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3a09bbf21dcd4f18b90e11023e0c26368bed4d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=a3a09bbf21dcd4f18b90e11023e0c26368bed4d2 commit a3a09bbf21dcd4f18b90e11023e0c26368bed4d2 Author: Eugene Grosbein AuthorDate: 2024-06-18 09:11:56 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-21 08:27:50 +0000 rc.subr: improve description for ${name}_offcmd Clarify that ${name}_offcmd is for method start. (cherry picked from commit af1b0aa5b957bbfedc929167aa3459ad2d8b6653) --- libexec/rc/rc.subr | 3 ++- share/man/man8/rc.subr.8 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index a662b878860b..05d46f74e598 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -816,7 +816,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # -# ${name}_offcmd n If set, run if a service is not enabled. +# ${name}_offcmd n If set, run during start +# if a service is not enabled. # # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 3037840007a4..a32347a09eb2 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 2, 2024 +.Dd June 18, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -632,7 +632,7 @@ Login class to use with Defaults to .Dq Li daemon . .It Va ${name}_offcmd -Shell commands to run if a service is not enabled. +Shell commands to run during start if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command From nobody Fri Jun 21 08:30:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W59XM3Kxdz5PkGj; Fri, 21 Jun 2024 08:30: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 4W59XM2rLmz4DGS; Fri, 21 Jun 2024 08:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718958611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHPQL1HrVKO558kNOV0S4E+UnYSYuZMKS98lIZBTg6c=; b=NRJUIj1Vle7wTZ+oPNLpDGqvdLZVC80IceK0biRbZM8aS77xGRZJah5PfT03mTrvv9d9eg b13xk6mcNEGCpjv4Ig2511XQis1I9JIV8H1mPF0fnsJA7DUp2SgUpSTHuePKeIo87nvYYl VZZzzxrFHl3+HKEFNbkCFuhV8y6l6fa3uJndVOtLuETijQ3ch9TJP1D/PC9Mtb8kOBKW8j tyrh3oyPjgViWIQQeTwQUhBTwi5AkSudm3OPNfPcsI+4hTXFkrQa8cgIkssw4BC8+1KctJ OTiwgXcMNIX7bbfU11ZoBRZL9/0NSFzuhtR4f7meiwBdWKK+knI/7tp1IubBhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718958611; a=rsa-sha256; cv=none; b=IRz8aYgiPyhdA53KtQOxhBXVYqG4o7wBfYyCGeFyWwNEmAmXyQqzp7ORxIF5H/LceeeHZS 9gstNNbAibxNDxtdkV4Fy7Ie8+p0Jdp/5yT+YvS47rj0LRYH7gUjxiWCSszpH4hjqIDGOf MOJfWlmhCgq4OuBCJEKh8fE4eunLT2hOBFy5RfOJC1D1f6MQ4KqJ0d9z4+L4tOFcIquEO6 0hmV7xDnIxjo6IovisvRYj9RItAeRj52WpsjrW2VjQdJrR8S2yUuOL1hQQdcOjTfGiSEX4 21ZdgzdNv3YqFVYMjj1PtU1KDeYgifR/BklZFrPGUA0uSO7/8elZTrnSVV8TRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718958611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHPQL1HrVKO558kNOV0S4E+UnYSYuZMKS98lIZBTg6c=; b=FBMXe0nbGu/vABfYDqjwyNcQu0lxUPvHWfKfuCK/jVDZOXT4f/PO5bMYFUuw1upd86Aixi X+jO7ZOMxMlu7tGOdJLeea0RxVkJTKnD8M63q318yqvQrjJY66wp4EdxA2DElg4PL7SS0e cXMCdm4zA/Ywe8bghw4eRBdaCPMu0mIxFXVOwPdmYj4MtkXAEMfmkrHLe10jivfUQfTpDS 5FRbzzdOWF448SxFpJDVg8EGuZ8L0vYzskdHBOmL3U7e8ZKY4HSJLJOMEdMluNOJLcuhlV ITSQP5mU4aMxERPwSc+1axXAIcIDsP2BpWdD7jxX63kLur/DbMB+Mk4DouNIFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W59XM2RZwz11tB; Fri, 21 Jun 2024 08:30: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 45L8UBup043169; Fri, 21 Jun 2024 08:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L8UBeo043164; Fri, 21 Jun 2024 08:30:11 GMT (envelope-from git) Date: Fri, 21 Jun 2024 08:30:11 GMT Message-Id: <202406210830.45L8UBeo043164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 73d1f732cea1 - stable/13 - rc.subr: improve description for ${name}_offcmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73d1f732cea18de474b58783b562b11a28f1dd99 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=73d1f732cea18de474b58783b562b11a28f1dd99 commit 73d1f732cea18de474b58783b562b11a28f1dd99 Author: Eugene Grosbein AuthorDate: 2024-06-18 09:11:56 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-21 08:29:53 +0000 rc.subr: improve description for ${name}_offcmd Clarify that ${name}_offcmd is for method start. (cherry picked from commit af1b0aa5b957bbfedc929167aa3459ad2d8b6653) --- libexec/rc/rc.subr | 3 ++- share/man/man8/rc.subr.8 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 8ae0744939d0..f1eeb81a5d39 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -811,7 +811,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # -# ${name}_offcmd n If set, run if a service is not enabled. +# ${name}_offcmd n If set, run during start +# if a service is not enabled. # # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index b9713eb65a3c..9126cc5e8ac6 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 2, 2024 +.Dd June 18, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -632,7 +632,7 @@ Login class to use with Defaults to .Dq Li daemon . .It Va ${name}_offcmd -Shell commands to run if a service is not enabled. +Shell commands to run during start if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command From nobody Fri Jun 21 11:47:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5FwY3xs3z5NX0f for ; Fri, 21 Jun 2024 11:47:57 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with SMTP id 4W5FwY26VSz4YNW for ; Fri, 21 Jun 2024 11:47:57 +0000 (UTC) (envelope-from cperciva@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: (qmail 74196 invoked from network); 21 Jun 2024 11:47:51 -0000 Received: from unknown (HELO framework.daemonology.net) (127.0.0.1) by mail.tarsnap.com with SMTP; 21 Jun 2024 11:47:51 -0000 Received: (qmail 11038 invoked from network); 21 Jun 2024 11:47:50 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 21 Jun 2024 11:47:50 -0000 Message-ID: <01aa02dd-f7e9-40f8-965f-9ce78a8c6437@freebsd.org> Date: Fri, 21 Jun 2024 04:47:50 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 00d061855deb - main - Garbage-collect ACPI-safe timer and friends To: Poul-Henning Kamp Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202406210719.45L7JU1H020535@gitrepo.freebsd.org> <202406210738.45L7cA2e007446@critter.freebsd.dk> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@freebsd.org; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFARnJlZUJTRC5vcmc+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSrYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT++ ig/9GZKdN2fHSyrANKZX38ivd7IX2wAYouqH9DrQM94W8IciaDLmarN4Pl9mY+aucMwQUSyp uNtKOJwKqhVVaalF9Zw0sRMH4CJuvT7vKCtZ3q1Okb7soRvFte4d+vXhvPxCvBFDA5JzU7Lg DR5eqqcvF1dN1OuCq16pl0zCOSH/Jr5ToE3LM3Av1KBGcZD7ZSzHRWsFjV5AOUJKySuA3GwJ e/jASQcQ0YfCnru8ntLmYg/2SKvZFlfthZiCBnAppMt4n4BUAw3TDvf10HIDtdneejawcbLS gofLCvGqumwbZYAMKWrFzT4+7KQvr0pOw8QD7EbxnB4f9hQ7UiVF8qWsyKU3iv6b5JLhbS59 ooKRccyOvdMLcVJ0ZdpqoxrNv061ZUqLL5RiWjBlc1qjBnDxeg5oyM0rT8WLftdgvyH6RQt0 KWngumBAT5AT2DUYL8Uz1490cqfO9K4yEGZAJB9XRVX1g2IWTOjae+0g9ZII+h91UngFz+Rz aKDeseKBbCGDOFXx1TqKiHl2g255ZnUxKYTlucFtguv4gDGBgEk4G9JaEWBw1IWblcKhxH7L 2vWsUhvwghjIxHdO/RkeIeHvSp4YZxCJ7a3TaJLYAlwYopfTKVzNhcDY5h5syEuoHjyJCxXK SyoJYAVu8Yl2KUhvOtOmL1VZ6xyHnpdMRWKJZ5jOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202406210738.45L7cA2e007446@critter.freebsd.dk> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.86.0.0/16, country:US] X-Rspamd-Queue-Id: 4W5FwY26VSz4YNW On 6/21/24 00:38, Poul-Henning Kamp wrote: > -------- > Colin Percival writes: > >> commit 00d061855deb93df5d709c8a794985ebb55012f8 >> >> Garbage-collect ACPI-safe timer and friends >> >> In 2001 when the ACPI timer was introduced, it included code to check >> for a bug present in some Pentium II and Pentium III chipsets; > > Boy, does that bring back memories... > > Apologies for not taking this out behind the barn myself, I had totally > forgotten about it. I only became aware of this in 2021 when I noticed that every time we booted we spent 140 ms checking if we had this chipset bug. The workaround could probably have stuck around for another 20 years if it had been faster. ;-) -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Fri Jun 21 11:49:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5FyQ1BdQz5NX5G; Fri, 21 Jun 2024 11:49: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 4W5FyQ0fzGz4Z5F; Fri, 21 Jun 2024 11:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718970574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MIxzl+QdJuR2Ly3zcJ1FYN+AMgCw0nSWvK/FKXAoA+o=; b=cVpKhli0kuh7I9HQX+IV4bgh/vqYU8pYN0UHovpgBs+SvYpNqFKghQGZBf42JFvJwoWobp tco7Wikb8MnrFuU2d3wxyaGqPQxg4nUNMcPY5e2xrRUltgSWLH8wWooo06Wr4F/q+ZTFx5 M0al5uQK4RGJGToDSaj8KqCRqYrdNRbwxtLZfcfuXjAgvOOiiWbLqv+A0RPRUd48p/Xn/h dZZs5tfV8Vz3dgc4oI3HUZjY8HMBzRp8NwmdSMzeIozkkbgrAT3T2spTRUWivhdp1DyPqJ uGehFM1oaIh9nAXuqjJj35mKtWLID75yl+fKbAOgtW+NJbQ/Z91FP8SHZsvJzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718970574; a=rsa-sha256; cv=none; b=tBfLmInrUHqAlShtBqGnr4WoBlL5syWMOfZ7GYkWhd/O64a+QIgKgKDSd+ZJRfgrOB6uva vn5MzMy/lg24o3pHWrFs+ALhT3Mxvx9JJ14hyq1c7Btd++pMEIc6nVkXOC2RzCRkBCPcj2 ZpB7B+8shX4O31IDLWZle6KRFkwDeBpRBPmD5u3D9nT1o5dQkvw43Q1EADR2fhhFH7WbMY suGclKY1PANsndhLiB1OMN3tuPukHJ1BX/MC4RiMMwbA8F+lHp0YQlaYGg+FY7xuABKkt+ jmwmOYQ1e+PuErpHqX5dB5Djm8gSkaV3dJ7qho/OdbikT1c/HXSFRF8JxODJDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718970574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MIxzl+QdJuR2Ly3zcJ1FYN+AMgCw0nSWvK/FKXAoA+o=; b=jSed5WwST7IO5zBpBdepavYGTZbm5VPrv5tUpwVqPzLeL/cAM3uynE6NSPDR7cPt4T9upw FeNWMETaHY/SQY+7AWdUxpOAFektKgFBijVcKiz0CHdCTnLeoq5l5ARlzLmMUM/MzYKILu y+A/iIIqSAmdEoAlxo6tvO91d/qBHjIdMozFFNiMZc9CPktMgtyMdWNT7yDWTnHbQaeYan D4BAaQrsElxvDjcEcX8vbzkEat6tiUYFZ/uYTl6Mkgt7xX3hQyo19dcA+hE3zv1oLUHeqT RZfbBRG3PZAG/RPYkvnvi/CV1Yxng4XtnnfGvBPbPhdiPuaIQp6Z7Wobw+afCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5FyQ0CdDz16WS; Fri, 21 Jun 2024 11:49: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 45LBnXrX075988; Fri, 21 Jun 2024 11:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LBnXRu075985; Fri, 21 Jun 2024 11:49:33 GMT (envelope-from git) Date: Fri, 21 Jun 2024 11:49:33 GMT Message-Id: <202406211149.45LBnXRu075985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 025df3e6a0c3 - main - pf tests: test keepcounters when we exceed 32 bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 025df3e6a0c3a4477dd55153543f395bc018dd37 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=025df3e6a0c3a4477dd55153543f395bc018dd37 commit 025df3e6a0c3a4477dd55153543f395bc018dd37 Author: Kristof Provost AuthorDate: 2024-06-10 10:11:02 +0000 Commit: Kristof Provost CommitDate: 2024-06-21 11:49:17 +0000 pf tests: test keepcounters when we exceed 32 bits Ensure that we correctly transfer byte counts if the value exceeds what can be stored in a single 32-bit counter. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/rules_counter.sh | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/sys/netpfil/pf/rules_counter.sh b/tests/sys/netpfil/pf/rules_counter.sh index 962e7c93ba93..98f96a7adca1 100644 --- a/tests/sys/netpfil/pf/rules_counter.sh +++ b/tests/sys/netpfil/pf/rules_counter.sh @@ -148,6 +148,54 @@ keepcounters_body() jexec alcatraz pfctl -s r -v } +atf_test_case "4G" "cleanup" +4G_head() +{ + atf_set descr 'Test keepcounter for values above 32 bits' + atf_set require.user root +} + +4G_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz nc -l 1234 >/dev/null & + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "pass all" + + # Now pass more than 4GB of data + dd if=/dev/zero bs=1k count=4M | nc -N 192.0.2.2 1234 + + bytes=$(jexec alcatraz pfctl -s r -v | awk '/Bytes:/ { print $7; }') + if [ $bytes -lt 4000000000 ]; + then + atf_fail "Expected to see > 4GB" + fi + + # Set new rules, keeping counters + pft_set_rules noflush alcatraz \ + "set keepcounters" \ + "pass all" + + bytes=$(jexec alcatraz pfctl -s r -v | awk '/Bytes:/ { print $7; }') + if [ $bytes -lt 4000000000 ]; + then + atf_fail "Expected to see > 4GB after rule reload" + fi +} + +4G_cleanup() +{ + pft_cleanup +} + keepcounters_cleanup() { pft_cleanup @@ -157,4 +205,5 @@ atf_init_test_cases() { atf_add_test_case "get_clear" atf_add_test_case "keepcounters" + atf_add_test_case "4G" } From nobody Fri Jun 21 12:07:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5GMB0lLFz5NYQn; Fri, 21 Jun 2024 12:07: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 4W5GMB050Kz4bll; Fri, 21 Jun 2024 12:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718971654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ9erjkq2Xud8YVh8+hRavOj3BilVaSVXsdZXFzFehk=; b=gtooYGFxvQh1rkFMvoQRT9zZkPKnYVD480qf3w8lppnUQwII+J8+u4vu7iOxeo1jhLPXju tEmaArWh6fsdgWcFiqczbl6tOjGgXBk7uXAr0RYDKMOh3DP2eDo78WH+c7qhoQFINKrR9J hkLARxu43qhD6/4MsC7/T51psMc6mvmBApFyRNzcTVEZXSW6EIJyXQjIAYJQT95SI+yr4l nkQ1189hYawzdYjWwHSdY9hofso7XWm8Ovh+ryANzODwCgpyIqOS7IID75JyYGMHafSyeK DUepeoXKMmw7Z0czhL6piqcyJICcnkaT20WtbpN0hmQ4mw0NHsEhvlc6YKckIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718971654; a=rsa-sha256; cv=none; b=TC226pKboWeOGsNUaaaX3ybllMyrjtGGhQGW9TaFmtkTEF4zxRC5cxITtcWSKOHOMakGRS 5c7aeXut9+Ev8l7O3cdHSMp9fnHaFdL9ewBjERoFxov+yMNO/WnrC198BOrK42nDTFj46o MnaNoO4HTerMWGWA6TuaYj+1iTxDXpgnllxsT16BNrFYX3Nk1hmBEwd8+cqhRrz6YHwEdD Uo2Vwe6/5pDI5NF9mFKeTgtEaUTUzyX32nWlmb6/4W9yqc2J2iHGxb1RbMuyNT6+33B1+r 0yfkSP4R18SWhk4rD/ud64YDK9L9HpoWBQ+XZvJNENVAJum3DaAxa9EtOwQFSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718971654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ9erjkq2Xud8YVh8+hRavOj3BilVaSVXsdZXFzFehk=; b=pGJHYzSvDDtm/JPDJWblJKUh9bmdsCcFEjTXdSpyL3D9bcf73WH7k8ibbLFN2n4BlSR+Ui OpVyT7dQVquM2wb03liGL4cnpI7CrliwfiJ1RHRb8/8pJjvzaKW0VfycVheUGY/aT5mvDi SS4/nx1wwQOVouy4aVhDrDl/aE3AtwWaJ+g3WfPMNY8rcVfvefcYX7I4EBL1nfyE/bXJvI HU1vkF+LyhLFd0ALL0mg1FGGrpKwj3EhMQGEsCsfazj30dxeXkorR1jOGmZFOURxOtlma+ MM80/czB0jSl+CavEb4TZzaEs9iDPDGw+CCbD2p63KjDjwap3Zb2LZ9goGZHaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5GM96lmfz16hK; Fri, 21 Jun 2024 12:07: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 45LC7Xd9011159; Fri, 21 Jun 2024 12:07:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LC7XJB011156; Fri, 21 Jun 2024 12:07:33 GMT (envelope-from git) Date: Fri, 21 Jun 2024 12:07:33 GMT Message-Id: <202406211207.45LC7XJB011156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 3fdf11fe8fb0 - main - acpi_timer: remove leftovers from Garbage-collect ACPI-safe timer and friends List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fdf11fe8fb0a532cc8eafc92b7b12ca40acc221 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3fdf11fe8fb0a532cc8eafc92b7b12ca40acc221 commit 3fdf11fe8fb0a532cc8eafc92b7b12ca40acc221 Author: Baptiste Daroussin AuthorDate: 2024-06-21 07:57:10 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-21 12:06:26 +0000 acpi_timer: remove leftovers from Garbage-collect ACPI-safe timer and friends Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D45669 --- sys/dev/acpica/acpi_timer.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 49474f71dfcb..3d51a4211b80 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -154,7 +154,7 @@ acpi_timer_identify(driver_t *driver, device_t parent) static int acpi_timer_probe(device_t dev) { - int j, rid, rtype; + int rid, rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -188,16 +188,6 @@ acpi_timer_probe(device_t dev) acpi_timer_timecounter.tc_frequency = acpi_timer_frequency; acpi_timer_timecounter.tc_flags = TC_FLAGS_SUSPEND_SAFE; - /* - * If all tests of the counter succeed, use the ACPI-fast method. If - * at least one failed, default to using the safe routine, which reads - * the timer multiple times to get a consistent value before returning. - */ - j = 0; - if (bootverbose) - printf("ACPI timer:"); - if (bootverbose) - printf(" -> %d\n", j); acpi_timer_timecounter.tc_name = "ACPI-fast"; acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount; acpi_timer_timecounter.tc_quality = 900; From nobody Fri Jun 21 13:05:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5HfT1MJrz5Ndr2; Fri, 21 Jun 2024 13:05: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 4W5HfT0kwSz4j7p; Fri, 21 Jun 2024 13:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWqdHAYM7zeKMAlAT3XpKf4H++e//dEkOLaIi2yaCmE=; b=GMHno2l85qzVMhK7H8f5qgUFPDOJldN75pzkdq72EErSy4ztcUFjHMy1wNomTW6+RATvDj 06PPg92wi6voUW9U+Zk5vkXlcxNvcB1SrxO3VO54ddPHhNSVVbXrH/4+VmgLWTphanqgcA K/H4ucEUJut367xAVCBkQnopCiVvyQioREitNSlWSLbjHNl/J2CK4sCp2lLmLPXrDiP1It GVWXcnfK1CxLT6Pt3eoRlJ6y19v4m8/v+YG26JlwPsvhJQyA4nqlK+Mn69GLNFt5LNadpI nEXcp5NMZrsUEdveqQTJ6iy7aZ4u9RdtuLcaWj1awBwQGG6xBlGhAK02aNpTfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975153; a=rsa-sha256; cv=none; b=w2bgVXsm/QihS/cWnTyz1YDCrvq8LwyNahF7/iDKtc4iMBOyn1dVa7KHVqYiol+w+3AyDt 9Z68LEC/UCXE8kkd4KtJOOgmYcxoal8qMooXZQ9q9Fh2CFY9iE46GMXBjVxkdkgcTm8Tzz czu7q3FpaGkrUzBSH4QWLFIJnbJLX7RBheYfWDnwyMtLBhg59xiG+b/EydjjiSA9Q5Qilj TPr5OEOw6uucnhfZKPVsyoluR0O/HVKtK360RlEGrMquWEezWZqFbVkY7FibQGamUHqaM/ CxnGWoH2FI1EMx33PNrUEYlNAKDMaaIaN02A0B5zShlT+/isva9/jErxVQ+GBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWqdHAYM7zeKMAlAT3XpKf4H++e//dEkOLaIi2yaCmE=; b=K8s5ccAMud2+t/JMzSSworO+Wps+u932TR7RWduwFJOy2iYGRUfWLWgAvZ01Db4V55LDvT 5r17AQVOObAXJQ2lT+PKhXe6d6rbjySWn64p8JIjq/EnPE87nebaK4SRfOLZnnLK6S2cIM WNqTL/OG2po76XjQkL8yVMhnaELFSaEZMTEEUJZN+3CF8Ol2lteP2GkcV5Sv7i71J84Uti vr95bmL7VNpwcz+WTZz+JRE+xlxshYXDaS/x0pPEDwUOPBMEHUc54FvDKVX8q8TKqY+gM4 5sFBjgoTzKmE+VLmo3ZsIwuV6+P83qNkNrqekwBwb4xpaC4TzJ9eS0MRxJUOaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5HfT0DKjz18h1; Fri, 21 Jun 2024 13:05: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 45LD5qpk011879; Fri, 21 Jun 2024 13:05:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5qtu011876; Fri, 21 Jun 2024 13:05:52 GMT (envelope-from git) Date: Fri, 21 Jun 2024 13:05:52 GMT Message-Id: <202406211305.45LD5qtu011876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a3e8efd45a42 - stable/14 - git-arc.1: list width typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3e8efd45a42d5c4c1bde45ba7f636a840dc6e44 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a3e8efd45a42d5c4c1bde45ba7f636a840dc6e44 commit a3e8efd45a42d5c4c1bde45ba7f636a840dc6e44 Author: Alexander Ziaee AuthorDate: 2024-06-01 06:19:33 +0000 Commit: Mitchell Horne CommitDate: 2024-06-21 13:05:01 +0000 git-arc.1: list width typo Reviewed by: mhorne MFC after: 3 days Fixes: 760be44702 ("git-arc: document "create" command options") Pull Request: https://github.com/freebsd/freebsd-src/pull/1272 (cherry picked from commit 41d6858ebd6ae0431196c1bc6f03f8e388eae8e6) --- tools/tools/git/git-arc.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1 index c816de672984..064c86ec9e47 100644 --- a/tools/tools/git/git-arc.1 +++ b/tools/tools/git/git-arc.1 @@ -70,7 +70,7 @@ The available verbs are: .It Cm create Create new Differential Revisions from the specified commits. Accepts options: -.Bl -tag -width subscriber +.Bl -tag -width "-s subscriber" .It Fl l Before processing commit(s) display list of commits to be processed and wait for confirmation. From nobody Fri Jun 21 13:05:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5HfV285Rz5NfDK; Fri, 21 Jun 2024 13:05: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 4W5HfV1SjHz4hpq; Fri, 21 Jun 2024 13:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=znGuygTR554Fk3XxioouG1u4RuYZy134WzH2zpsl/zg=; b=vNixSJy1RfDzrcyB7XtRYQl988t7dluMvBt/YAN23I5AKV2/xJCHe+T6RZnTdUibwoWVGW HrXXO5oD11LolqbSrkDgU2dDllLiE5bbuSUAJNybKPfUbKdlXTR3ynM3KCfYF4f+R74bt+ TxpiXxL6o9BQlcI8lrZrmvSzphR5K/0HSH+UarQ91nLgCKM2jpNoAMGMi8YZPjzHtB8fan 3Q4tm+xnwzfSq99gf7CuR3wOGf5N4nxnoMugzKCh/zsH6A1QTS6R+ZwY/5mHNxuknh6X2x dqN6aAsgLc9a8sdiHNJKjAAfNHjgsK/HI1qoplebSSTBde5g5HKKHyr9D+UtBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975154; a=rsa-sha256; cv=none; b=ORWgvXPRIGGees+YqsU5lbi1wB8oOej89cVdorA+wjo18KkIMIc/p0P9e/CkRhTD9tl6I5 OVsqsReZfOUH8CEfMml0pubqhBoUhOZQDdrxczVmFqVINh/MKm6PczmaXDla5uuZS8Rwko zgC44RFcf0psNAWBafjpENoecNMmkaUFhexXYPwCJX6mvcDmmMyrTCFkI6o6Zh/eBdAudk XA2w4se25pRUqVAexd7TmBF2e6AKgWNAZp6nWoEcZBcLsbL82Q+/O9t5Gvpf8sX8WNDQ0r 9mwVQhZlrlsI9WrYvYwZyDvIGicTo6xo7DRU8X9K077Li6bgU2Qd/pOY/jf3Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=znGuygTR554Fk3XxioouG1u4RuYZy134WzH2zpsl/zg=; b=x0Y+3peA+4XS0CSB2JEKSE3syuUYkWgzz3/xuOidbSQ9EGIYARpC5d0ng81YwyDitm/oWV BrdN6fNNwslxra2eRBt/9CYKpihiImTzu1soyHhAoxpws2PGUhWqFb6lj7Rtr5H4s5+a+1 HMiI9vaysFZmn++vVxC2FCzEW90PBwqfGFum1A2Q+GCBJGWW72o56QO5cxDWTWlo15++19 xRY3oX832I/TRtyzgs7g1/ib6TNdwutx4bWasML2UDB0D1qvheIwID5khM6KUgM+YysxE/ utcFVdwIYqchhM7Qt2lPKNUifADsDYLeNFolLmwfZinZZXVdt1TlCC5dwusbtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5HfV10NRz18h2; Fri, 21 Jun 2024 13:05: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 45LD5seK011931; Fri, 21 Jun 2024 13:05:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5sIG011928; Fri, 21 Jun 2024 13:05:54 GMT (envelope-from git) Date: Fri, 21 Jun 2024 13:05:54 GMT Message-Id: <202406211305.45LD5sIG011928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 6d87472f3234 - stable/14 - build.7: nit section order, tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d87472f32342f1e17b07b75be743ef354dd0b18 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6d87472f32342f1e17b07b75be743ef354dd0b18 commit 6d87472f32342f1e17b07b75be743ef354dd0b18 Author: Alexander Ziaee AuthorDate: 2024-06-02 13:23:40 +0000 Commit: Mitchell Horne CommitDate: 2024-06-21 13:05:01 +0000 build.7: nit section order, tag spdx Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1273 (cherry picked from commit 8327796cc873ad86dfdef2846412a68709dcbbf2) --- share/man/man7/build.7 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 6846b38c99a6..09e58d4ff013 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2000 .\" Mike W. Meyer .\" @@ -891,11 +894,6 @@ cd /usr/src make TARGET_ARCH=armv6 buildworld buildkernel make TARGET_ARCH=armv6 DESTDIR=/clients/arm installworld installkernel .Ed -.Sh HISTORY -The -.Nm -manpage first appeared in -.Fx 4.3 . .Sh SEE ALSO .Xr cc 1 , .Xr install 1 , @@ -911,5 +909,10 @@ manpage first appeared in .Xr etcupdate 8 , .Xr reboot 8 , .Xr shutdown 8 +.Sh HISTORY +The +.Nm +manpage first appeared in +.Fx 4.3 . .Sh AUTHORS .An Mike W. Meyer Aq Mt mwm@mired.org From nobody Fri Jun 21 13:05:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5HfW4zNDz5Ndw6; Fri, 21 Jun 2024 13:05: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 4W5HfW2Cq9z4jQC; Fri, 21 Jun 2024 13:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oAIyJ5CbMFQD3nYHuHzTfKgWClCa0pvty0cPdXRDYY8=; b=DznijQfr8cGFsqaXB+04lbaS0Zsk1Jq4516AgY0nqBsWiO9Oc42L45gB11vkqHeW44Yyrn 5pJDXpwCrkE8m4FyBgAwM4MtpYD4ksdgadqgHSCULNEdKFOx57ui6u66CbcdqmsXjnWiDg PWZzoyz1Pt7n+JCTEgGD6hn4KPCi4J+SJP3WKnXUqqmohrV+54a68JwojP3tKSdXmKh/dV yXPi5eWDksHO97sqy1rSZRGHlr8A9mzdJ5k16g4BZhD+zhgJ05jd/mndnIA/pcg4AXQ7DH T6/WN5YgpPZJeAFyfgb293DpxX8S/MtTjdMZT2i4K+YN8/dmx/QJbIEFxHCiKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975155; a=rsa-sha256; cv=none; b=nfhAa9qYol856WDq13L8dNAdRib9nirTyAuYwJEHn32JNxbKQWuNRr+XZoYAm228CQ2dPt +UHhamzdjdds9Raa9gd5kLaHzNxEasMO3EU1xO/S6BQohYPj0v8zJvGsMDS/N/ARWKKd1o sVw3mbqjoWvIEEaAj9hr1LaMFZyKkLx7zrsUlX9ljdYM5G/7R/1vwPtPqn9ehvXyXGuR7K CHyU5CcgPj6UowtJlf0LDKTcWDeiKm8lUPVMoR8/6j9XX/dsxu0WJhecNlmLnbNlFHrAKP L98hRYO0P1eBeg/6BNiYm6WKF+zReoxx/JzSGxskZS2g2JsAsalH7LbsD87rIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oAIyJ5CbMFQD3nYHuHzTfKgWClCa0pvty0cPdXRDYY8=; b=IUL7Mdc18hnaXKqpqFIyON0qE8Vb4PcBLzIlu6zmHTUS7kUm1IJrCwi1yqithm3baf7XdI 4UEF9FveOnS8lDPpyYeD0wsDF+f9bfo/p1LPp6GmEJtEXFJLuMBL6sn/IS5UIjBSFXkJpp PL/+srlN/T+MpuwqJ0EyQVzK0GLCtqFHNNUEyGd3vkL5nwa0Y2MG27nrMKxUh6P5leYweU jhQU5+v0XfcKQi7kLLyra4U5++tG9tlooKCNy6MdfMUFVy78ZeUXrlLDZAppeCGX2zthhu kn4Y0dZXY/yIvmAOgJNWcpcLkhOj7o8tTm8vrDH53KrgnLDtQBfrGe/UOHO5yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5HfW1nQsz18CK; Fri, 21 Jun 2024 13:05: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 45LD5tSK011979; Fri, 21 Jun 2024 13:05:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5tas011976; Fri, 21 Jun 2024 13:05:55 GMT (envelope-from git) Date: Fri, 21 Jun 2024 13:05:55 GMT Message-Id: <202406211305.45LD5tas011976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 1b8d4c8496cf - stable/14 - build.7: +freebsd to description, link development List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b8d4c8496cf5d4665a4daeaac37d0d655bd8702 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1b8d4c8496cf5d4665a4daeaac37d0d655bd8702 commit 1b8d4c8496cf5d4665a4daeaac37d0d655bd8702 Author: Alexander Ziaee AuthorDate: 2024-06-02 13:25:19 +0000 Commit: Mitchell Horne CommitDate: 2024-06-21 13:05:02 +0000 build.7: +freebsd to description, link development Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1273 (cherry picked from commit a8a2d5ef126f9ed866f2524a4fe012ba831add2f) --- share/man/man7/build.7 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 09e58d4ff013..916382f98b76 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -30,7 +30,9 @@ .Os .Sh NAME .Nm build -.Nd General instructions on how to build the system +.Nd general instructions on how to build the +.Fx +system .Sh DESCRIPTION The sources for the .Fx @@ -901,6 +903,7 @@ make TARGET_ARCH=armv6 DESTDIR=/clients/arm installworld installkernel .Xr make.conf 5 , .Xr src.conf 5 , .Xr arch 7 , +.Xr development 7 , .Xr pkg 7 , .Xr ports 7 , .Xr release 7 , From nobody Fri Jun 21 13:05:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5HfX42ppz5Nf7C; Fri, 21 Jun 2024 13:05: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 4W5HfX3793z4jLQ; Fri, 21 Jun 2024 13:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxoDEMcJX+k6HGXZiY8MlDumcpDQTR0ZiRCsn6KnDB0=; b=R6YbQtw3Bj4tQK6UlmQBeTqs1a31gEZlYshxwzidqqOM29nGG1+ulYopwM6K3BevfbCqFw Sfwwm1pdOeoX2pcMU8BwZ8SRHC2EG4+Er5iAmNLHQmY7IWCPFpbCEPg3q6pX7Y+8Q9xice 6aL6KI7iCYlVFghg01RLzcy9TY1LG+G+AmRfaAUbpdaS85wzQ+VeeRN510PWoNyhNZD6YZ zVl0NlYY8TpFJCCLG/N/rsuYpD6t4cYXFExF3IqHPYJj6kwvCLGWleg3Gn9phfm+TQfWOO iWUteDikp1FZh8NCvmSPuqTTEfPi3rZGmbbkJacOSIegacBCt951tS9XjWPDpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975156; a=rsa-sha256; cv=none; b=MmFEYcN9MGmCwa1dO68KkgreNNTgol8xZMKy6yjcw6tnxVFyAA6j12sR4kuc3F0Bvs8y7+ u564JICZs+vURHi54Tdoy97RIPL19P/wdgC90R95TwbjjeQUNio28tYSRqnO9Gb1qxbgVN Ks/o6LiAx3RQZEyMiSqhNeLXaPJRGTsvWNxXlacbwH9WgoBo0fesYVBQA2VXJ1V7954Bxd AnASohIL/lT0KacTqHXqO5FnoCxHtDTxnrZqKqzi2NLNTQ47BRcE9DY2LMmW/HTbDtZVPW Vo0IaWDrVqqHDcG35bk6t7tJAEPTuqcyiyIV0pLzBFkt077oFukiV0dctBzFSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718975156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxoDEMcJX+k6HGXZiY8MlDumcpDQTR0ZiRCsn6KnDB0=; b=BqkgpsUEfYjsOcSMpfN0nZRsxnAfDGGkipey308qfl3PRo7JwNT6/Ipahq79H6pIge1jPO XTtsJdx6HhbdjjYtxbEdEU1YXbfQKVt2ZbTrzlTcGXcDM3ohmkKoLIfnsoml9y3gCj7w4j kU4RKjDbmYEbl8afkQDL+rscuQWWarVWW2fAga1HmRBAN2i4uSDe5h5a7HoYDXYE2a43Tk atwg0598z5MZ2a96y5jefYuPt3JbL1JgJ7HaQFywsYrtvLc1Lb+VXT6lczCguqEB1c1HXT Gr3EJkn1I7CkLmcQ+9jTlJMQjBmp5tM6sNc7SESe+GN7fz8+waTdF66gBKv4AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5HfX2lRGz187f; Fri, 21 Jun 2024 13:05: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 45LD5ulR012025; Fri, 21 Jun 2024 13:05:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5uFg012022; Fri, 21 Jun 2024 13:05:56 GMT (envelope-from git) Date: Fri, 21 Jun 2024 13:05:56 GMT Message-Id: <202406211305.45LD5uFg012022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b8f2781b4623 - stable/14 - build.7: update cross-compile example List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8f2781b46237fe54f472537d72cfad84991aefb Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b8f2781b46237fe54f472537d72cfad84991aefb commit b8f2781b46237fe54f472537d72cfad84991aefb Author: Mitchell Horne AuthorDate: 2024-06-04 18:22:54 +0000 Commit: Mitchell Horne CommitDate: 2024-06-21 13:05:02 +0000 build.7: update cross-compile example Replace armv6 with the more-relevant arm64. MFC after: 3 days (cherry picked from commit afa166be99fc202027ab5b2030205b59d5104299) --- share/man/man7/build.7 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 916382f98b76..79c05f5ab63a 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 1, 2023 +.Dd June 4, 2024 .Dt BUILD 7 .Os .Sh NAME @@ -889,12 +889,13 @@ method of updating your system from the latest sources, please see the section in .Pa src/UPDATING . .Pp -The following sequence of commands can be used to cross-build the -system for the armv6 architecture on an amd64 host: +The following sequence of commands can be used to cross-build the system for +the arm64 (aarch64) architecture on a different host architecture, such as +amd64: .Bd -literal -offset indent cd /usr/src -make TARGET_ARCH=armv6 buildworld buildkernel -make TARGET_ARCH=armv6 DESTDIR=/clients/arm installworld installkernel +make TARGET=arm64 buildworld buildkernel +make TARGET=arm64 DESTDIR=/clients/arm64 installworld installkernel .Ed .Sh SEE ALSO .Xr cc 1 , From nobody Fri Jun 21 15:52:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5MM43F8Sz5Nsrd; Fri, 21 Jun 2024 15:52: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 4W5MM42jkJz41Zn; Fri, 21 Jun 2024 15:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718985168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sz0kO/qa7G5Ud2xlf2f0iVZt41Hr8KZmFsvf9Diw3hc=; b=Icedzj13xo1s8HaEj5TJVaXiA7l1OtA/W/wbcFn2+4GzxETg+KA2acPocFdtYTkxrkjecx Cf1AHhVrQsdvKm3GW2HgmLaajnuK6g85XAskCO96jFA86ZtdnsG+m40sdyoM86C54aXGy/ Q95CHkz2gMci5X1U0hJqe78KKC9yfx7tlS9qSTC3Ji9k3y2HGQNvofMFB0kCzc6fqIBq+S Heu8ODXzHqDlTU5U9FTQzYassnvg0hC/3qV2vDNmDqHCaDLZHhGSD+hw/SzDTa3rE5SssR TG6GCJJ1dEboKCx9RF4L+PHS9JNR4zn+NcCUPJJhMiGSTTMjYm7B+p6gkii45w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718985168; a=rsa-sha256; cv=none; b=QAs+nEp3ICbPi5wpd2AT+ouDG+clao7DOwvPRJmuBH2UX7Yo2RswkFmRg+BThkLz6SKuYn xQr03cKfEctiAErHawyC7lhHWzH5Fx2yBVtuvgcOfOAtmwWF2Mg1704ahsVZTUuOE1lLxh O6zLkEGFBIXvRsn9aF9AA0XPyt2nSEmjQKm9QH62OAAgYU9nereGCb01h3vc4cCrMxpnib 60jygWEFdU8nAM5mW+YV/cgA4CP2luFK1KSgH20rO8SiKCebnBAvq71x7qhIO65FzfyMY+ 9LZf9NyXaydPp1zyKuDilrJrwEQ/q09LigXuO3vGOxtsQr21ZsvoEplCQ0vuCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718985168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sz0kO/qa7G5Ud2xlf2f0iVZt41Hr8KZmFsvf9Diw3hc=; b=OzIu4veOus15a0L4lQGmVs0DWqyqSFCl2hIiN+cAReKDFNiUylX06QFc3H/Va71HQ541pA h9zTjxXI0Fwnn5p5gl4MUQ9rXCg9cC5VBZWF9HileaUWqp+RCL2hwYbOZrbSgNtJOTcbsq fa+WJCKV6ZoPF4aCcH50yF6gWQpcHZqEcQws6c79+llKxWY7fSGZswSpfAZwtE2xhiMFUM 3UntclJBc/OwmNxAeJJBgnogVh1g627xvrMRpS0c4w+WmaxSu0YXGNEy91nhncbrgIkHSA tW6rc6Izqnfob25FjQ/ZezS8bm2skl18i6Tc30gyICRSYFdsh57imle4G7KONA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5MM42K9HzDq0; Fri, 21 Jun 2024 15:52: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 45LFqmeG097645; Fri, 21 Jun 2024 15:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LFqmtP097642; Fri, 21 Jun 2024 15:52:48 GMT (envelope-from git) Date: Fri, 21 Jun 2024 15:52:48 GMT Message-Id: <202406211552.45LFqmtP097642@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: 4a86b26b84be - main - stdlib: Support compiling with tinyc by omitting compat qsort code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a86b26b84be2888c70a04f216734bf1456ee766 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4a86b26b84be2888c70a04f216734bf1456ee766 commit 4a86b26b84be2888c70a04f216734bf1456ee766 Author: Warner Losh AuthorDate: 2024-06-21 15:48:41 +0000 Commit: Warner Losh CommitDate: 2024-06-21 15:53:07 +0000 stdlib: Support compiling with tinyc by omitting compat qsort code TinyC doesn't support the .symver assembler directive. Add a generic way to signal this and use that not to define __sym_() macros that use it. Only use the __sym_* macros in headers when they are defined (which currently is only for the qsort_r compat code. Not supporting this for tcc is fine: It's an edge case for legacy binaries / code anyway which isn't relevant to tinyc. Sponsored by: Netflix Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D45651 --- include/stdlib.h | 17 ++++++++++------- sys/sys/cdefs.h | 13 +++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/stdlib.h b/include/stdlib.h index c1c8ab5eebb3..db339688cb78 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -330,23 +330,26 @@ __uint64_t * parameter, and both are different from the ones expected by the historical * FreeBSD qsort_r() interface. * - * Apply a workaround where we explicitly link against the historical - * interface, qsort_r@FBSD_1.0, in case when qsort_r() is called with - * the last parameter with a function pointer that exactly matches the - * historical FreeBSD qsort_r() comparator signature, so applications - * written for the historical interface can continue to work without - * modification. + * Apply a workaround where we explicitly link against the historical interface, + * qsort_r@FBSD_1.0, in case when qsort_r() is called with the last parameter + * with a function pointer that exactly matches the historical FreeBSD qsort_r() + * comparator signature, so applications written for the historical interface + * can continue to work without modification. Toolchains that don't support + * symbol versioning don't define __sym_compat, so only provide this symbol in + * supported environments. */ +#ifdef __sym_compat #if defined(__generic) || defined(__cplusplus) void __qsort_r_compat(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *)); __sym_compat(qsort_r, __qsort_r_compat, FBSD_1.0); #endif +#endif #if defined(__generic) && !defined(__cplusplus) #define qsort_r(base, nel, width, arg4, arg5) \ __generic(arg5, int (*)(void *, const void *, const void *), \ __qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5) -#elif defined(__cplusplus) +#elif defined(__cplusplus) && defined(__sym_compat) __END_DECLS extern "C++" { static inline void qsort_r(void *base, size_t nmemb, size_t size, diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 43d179b82020..419fc260f200 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -90,9 +90,18 @@ #define __compiler_membar() __asm __volatile(" " : : : "memory") #define __CC_SUPPORTS___INLINE 1 +#define __CC_SUPPORTS_SYMVER 1 #endif /* __GNUC__ */ +/* + * TinyC pretends to be gcc 9.3. This is generally good enough to support + * everything FreeBSD... except for the .symver assembler directive. + */ +#ifdef __TINYC__ +#undef __CC_SUPPORTS_SYMVER +#endif + /* * The __CONCAT macro is used to concatenate parts of symbol names, e.g. * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. @@ -369,10 +378,12 @@ __asm__(".section .gnu.warning." #sym); \ __asm__(".asciz \"" msg "\""); \ __asm__(".previous") +#ifdef __CC_SUPPORTS_SYMVER #define __sym_compat(sym,impl,verid) \ __asm__(".symver " #impl ", " #sym "@" #verid) #define __sym_default(sym,impl,verid) \ __asm__(".symver " #impl ", " #sym "@@@" #verid) +#endif #else #define __weak_reference(sym,alias) \ __asm__(".weak alias"); \ @@ -381,10 +392,12 @@ __asm__(".section .gnu.warning.sym"); \ __asm__(".asciz \"msg\""); \ __asm__(".previous") +#ifdef __CC_SUPPORTS_SYMVER #define __sym_compat(sym,impl,verid) \ __asm__(".symver impl, sym@verid") #define __sym_default(impl,sym,verid) \ __asm__(".symver impl, sym@@@verid") +#endif #endif /* __STDC__ */ #define __GLOBL(sym) __asm__(".globl " __XSTRING(sym)) From nobody Fri Jun 21 15:52:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5MM54TN2z5Nsv8; Fri, 21 Jun 2024 15:52: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 4W5MM53xlXz41h4; Fri, 21 Jun 2024 15:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718985169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wK18bfSroowGSnzBcxhQ4YnI5KhYzFtOT4cj/CJpr0A=; b=v+QVTgT/SnMBII9AuxkvqQi4s2auLp3tMdONUM8lWgFbnwSDjqOD8ItpG20DzOWx/whAp8 4dN4GhVQlq2D1kEy+jUp8MS6LnSVwRoryYaFsGQxnlrdy2UJO9y3V0MwzaW8uqDgYf+CWL dQDxzNttIkXvULaKBHExQFrYMNLJ3Cyq/ChjFODWH/oprJPxNEmLFiSwyZhbugiEEFHLDK ntIJobWWNHQjVNNjjMCiFUOFXd7hKWvIGnfO4Vj7MvrXbWYj/R35h2jOUc4fM6LnWv3eLs yxTwaRdji7PAqw7xQjBuoUHyI9NiGyGda/hir1qU0KLEv4mDnltQPAM8o8NoXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718985169; a=rsa-sha256; cv=none; b=m7j7Se7Yiehz7XIDvU2lJrC1MkgioowY0+7aPS7nz5ZJADDDkan9gw4hywBFeaKVzHk/H/ I+zM+2rriiFwrdzCj2V/T/BXuO0dKXCw5lVrToBxTzjbWUhojyq1vHfz/Rtmzstw3I3eYD 77uKhxU2rXwMyFK/Sq2bvWA+f2GBa2yfmNBtLJaAoqMxIxjtbiTlFhfj6hShthuSKuY58R zINzx4UpCTR9lj4DGtYxQadrETzTE8Dz6xId87imhDKr9JEGL29OezYlQmZFfGphbCjVqg vD5f2vYge+KFWWbOrlK5cgkp/sJcupkGo6JG3UY2w1i2OB1Q389S/asSzAdAhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718985169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wK18bfSroowGSnzBcxhQ4YnI5KhYzFtOT4cj/CJpr0A=; b=xYkFVwsemRMkIrfiqSRM+GKekmFuopg7VqvZiUot20nLqHiEUiDxvu9aEhqCUxtG++GYtB B2Uto1hBoZJ/YDKk7x46BGI+TW3FFRQA2YLFA3IiVtTzdt3GRZ48XEdYC57EpVWaZqG033 ncbs/G2MrmLzRmjJO4UYbTDTFIKuPNtkwH8FIXazeaeFP6KH5NEDuk1IN/RfLCHanoa3TB QXdS0kUVJ9Hg4qUvzqUktTIXVThepVp3SFVCXD3wLPRCMjUN8BucdSpWeNW6oP5uAr8aHl pneWirdG92mPBOQbgrePGDjJIGaOH2sLuB3zSqmlOZu0v0zvVITD8njmwDKxSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5MM53YK6zFGx; Fri, 21 Jun 2024 15:52: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 45LFqn5N097693; Fri, 21 Jun 2024 15:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LFqndF097690; Fri, 21 Jun 2024 15:52:49 GMT (envelope-from git) Date: Fri, 21 Jun 2024 15:52:49 GMT Message-Id: <202406211552.45LFqndF097690@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: 5a969a3459e4 - main - cdefs.h: Move to more regular _Thread_local define List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a969a3459e49efaf2ca1dc1d99895ddf04a5d02 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a969a3459e49efaf2ca1dc1d99895ddf04a5d02 commit 5a969a3459e49efaf2ca1dc1d99895ddf04a5d02 Author: Warner Losh AuthorDate: 2024-06-21 15:48:48 +0000 Commit: Warner Losh CommitDate: 2024-06-21 15:53:07 +0000 cdefs.h: Move to more regular _Thread_local define Move to trusting C++ environment for thread local storage designation. Noticed by: brooks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D45663 --- sys/sys/cdefs.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 419fc260f200..8809240ebbf3 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -213,12 +213,7 @@ #endif #if !__has_extension(c_thread_local) -/* - * XXX: Some compilers (Clang 3.3, GCC 4.7) falsely announce C++11 mode - * without actually supporting the thread_local keyword. Don't check for - * the presence of C++11 when defining _Thread_local. - */ -#if /* (defined(__cplusplus) && __cplusplus >= 201103L) || */ \ +#if (defined(__cplusplus) && __cplusplus >= 201103L) || __has_extension(cxx_thread_local) #define _Thread_local thread_local #else From nobody Fri Jun 21 16:43:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5NTV0dxjz5NxcH; Fri, 21 Jun 2024 16:43: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 4W5NTT6y1Hz44Zh; Fri, 21 Jun 2024 16:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718988206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2A8OHarNlqdYtqXBqytvlDyb1Ya2IQZC70G9Fn1gjI=; b=nZaAUQ3rVer/HPMu5eFyFeqqS6kkoBqq8rszYQsEtpyf7TLztQ+Wwh0wWJbrY2bQibHO+k EjthI4W1AmkuYqtv9ZBPhdDic9nHFUzfik9Vh6qP24TXWgo3A+qeo5DOhNhB58l534JTIc nQNEcObnQstwa3dJSWs2rTia+tw/APqKfMwsOAjXajRAW1kJhBbXckDifpBXc4N/az8I6w 5ck1NkYsEP2CSmeUvC6OrbJZ0x4AXKCKtQSsOLaw7YmIxRouCZqg4fb5rs/GjlrG46mqnk lb+M5m4uexC8WEHT8JilA04vDawjNbCDNAtBoiLpX3usBczwgOPbFLDMocVynA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718988206; a=rsa-sha256; cv=none; b=XOpbjbCWVU8Wbqe6d2beYjaSA6d9X3zhzl213Gv8pWvVgWkD9e1JbWfZXoXjqrqfmnxD05 AZo19wiJ0KWCxBmyEYjqhI4XM1k7aJIwxbcpVFRK+jmT7ZGGSE+Hj4rcMywUiSRtbBhD4j q2jxbvcQb3d9fwXPFZzqY/n35VH7FYoXhD6NhG/sZ2whCe7hWAnBGuTJRycFkGjgBVv+6x Jvl2kzMQYhfgBxJJyLKAkwRZytWskx9BUZdVHDiGSEq+rVCPdQuIAZ7Gi+gc2FlF4jlP7T XLrJ0G3vshh4dmXLQnBOLDldcPDLFTuXFiwHLA4IVHvR5rsiQOXIKven8E0Avw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718988206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2A8OHarNlqdYtqXBqytvlDyb1Ya2IQZC70G9Fn1gjI=; b=eIrKn6uQLtPbaTheefiDC2v+8SgHEtLo7rEIVH/SjYaSNgRvHDHjUtpvcjd1/Fq0rlBmDJ D17RuhQhTT64XldcVy0ZjtQkZbse7laAVp1nAQdtlfHu+boPr0do94YlukIP8lEUbIINA4 ATjYjCQ+eJoFxVO4vt31ETNZozeJr/Yuk0TXIEy7VUa8Gl+muydwUWJGvUFsaZT5DRHVaW 8egj8XAYqjJ6POl+9jJRyzxfIcewBvF+0ff+xTQVgNCHzj7Q6E2KYGvLJM077DMk3b8OFn pccrr69Qs273ZsgfkVaZYYqpcGion2csGW7zYwqiPBvcUXHHWbC65G6hOi5EJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5NTT6Y5lzG3C; Fri, 21 Jun 2024 16:43: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 45LGhPQU084021; Fri, 21 Jun 2024 16:43:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LGhPke084018; Fri, 21 Jun 2024 16:43:25 GMT (envelope-from git) Date: Fri, 21 Jun 2024 16:43:25 GMT Message-Id: <202406211643.45LGhPke084018@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: 681fd2bed8ea - main - pax: Terminate loop for empty directory names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 681fd2bed8eaba88693867ba928a1c03a5b152cc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=681fd2bed8eaba88693867ba928a1c03a5b152cc commit 681fd2bed8eaba88693867ba928a1c03a5b152cc Author: Ganael Laplanche AuthorDate: 2024-06-21 16:39:09 +0000 Commit: Warner Losh CommitDate: 2024-06-21 16:39:09 +0000 pax: Terminate loop for empty directory names Pax can sometimes loop forever. For example: $ mkdir -p /tmp/src/foo/bar $ rm -rf /tmp/dst ; mkdir -p /tmp/dst $ cd /tmp/src $ echo 'foo/bar/' | /bin/pax -r -w -d -pe "/tmp/dst" Here, pax(1) infinitely deletes and re-creates /tmp/dst/foo/bar/. The problem is that chk_path() (bin/pax/file_subs.c), called from node_creat() also creates the leaf directory when a trailing '/' appears in the directory name to create. When the execution goes back from chk_path() to node_creat(), the function still cannot create the leaf directory (it has been created by chk_path()), so it unlinks it and calls node_creat() again. The function re-creates it, and so on... In node_creat() detect trailing slashes and not create a leaf directory, but only intermediate ones. PR: 277060 Reviewed by: imp --- bin/pax/file_subs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 7214de337ec4..06602c12db2c 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -555,7 +555,12 @@ chk_path( char *name, uid_t st_uid, gid_t st_gid) * work forward from the first / and check each part of the path */ spt = strchr(spt, '/'); - if (spt == NULL) + + /* + * skip creating a leaf dir (with an ending '/') as we only want + * to create parents here + */ + if ((spt == NULL) || (*(spt + 1) == '\0')) break; *spt = '\0'; From nobody Fri Jun 21 18:21:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5Qg93ksFz5P5d9; Fri, 21 Jun 2024 18:21: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 4W5Qg93GqPz4Jlt; Fri, 21 Jun 2024 18:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718994117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWAJvdGrLjG6YexvjChIZ00sHdCGtfJ4CQx5YK17X1A=; b=sYQiSDvD6J760+YluHgeevHZuQ2O5RvcreksIC6BUlUShHq6t5t2QqmX2zTqrSCGYj0tH9 2H/bD0JQR8/8cyP5h8Of981Se8CSM6/0+2fkwhXOsyaCdMCTAzGn5uN2sqDyFWHC80q08f XlVFyFIlFTbDagjHN9nV+ePTLrJgPGSVTRGySNhAAvndunSV8zS+kB93aaOqXm54m8iAxK DXiN1tcuYNJD5DYwMQFuzeWyGMkk1kZMt0tSUUyi40V21CDT/+cbPi3gRq7FlwV7M01YRf MBK42omlD+Ij2MHrPqtaucVS1zT8BzVzIhFdDOYIi9zJu4czoWFxXIN1CPaR0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718994117; a=rsa-sha256; cv=none; b=l19vFjHVcYcQAOLyFT9o7pZIstHmwnecB40QyGLiialhTNRgKmn9kWyH9dhOrYo8kc7DUS dSNS1ShN+u5MY0C2QKPXjkQmF/YKKuqJbcHQBvB3FVc4cD6itr2tJgLvpC1DyAhutZ4K6N cSio2rseFkTAbDqmB2rZ75U3tYSF+BsxsIswFdoczyMWk1HAflPk7HNHzbOvmD7Y6+N7md EaSGkGuaTpHxKU7/itiJ/rMehTSG1UaEk9YfTCrLsaulbTcPeDJJF7lpPFeeXIvDYbM0te RUsHibt5b+hnTImsSVvVyZTe8nBuDtTP+Lmm/ijCJKx5CPt4n+s9bVNfZYo9Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718994117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWAJvdGrLjG6YexvjChIZ00sHdCGtfJ4CQx5YK17X1A=; b=ReSMRhU+zIEkoSPYBBtlCVohZNuQe4KrwUUSOk0ExLspvx1WD5xG3ilUAWmSFzxFyBBlHz HAePoUXcwjtLnA8kMqD6HS2B+zm5cy/AZP314e/JpV/BAPhFsLHyKgkCnD0jcuy6g41lBS V97U5EowNY/5i+LsAO6LracC98xOFjJz9nE38mCMFDS1rnl7+Ruworg2TAnWtlp8EDn6Pc kIGwQC1TeDRBxqKELI5kngXUb7a9KpVfpoJvr9FSdP34U850dJ0DbbZAhNT1DQElkCsHM4 pXrcrzQYdUfLImjJk7RuGCRCEo3fkE6GGemOfbY7Zya7IvPOc/fJJBMXQhfhjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5Qg92tHvzJhP; Fri, 21 Jun 2024 18:21: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 45LILvWw052601; Fri, 21 Jun 2024 18:21:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LILvWH052581; Fri, 21 Jun 2024 18:21:57 GMT (envelope-from git) Date: Fri, 21 Jun 2024 18:21:57 GMT Message-Id: <202406211821.45LILvWH052581@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: ac52fa1f1b97 - main - sendfile tests: Fix an error check in tcp_socketpair() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac52fa1f1b9768d281b9deed6d1158f43a8564ca Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ac52fa1f1b9768d281b9deed6d1158f43a8564ca commit ac52fa1f1b9768d281b9deed6d1158f43a8564ca Author: Mark Johnston AuthorDate: 2024-06-21 18:18:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-21 18:18:22 +0000 sendfile tests: Fix an error check in tcp_socketpair() Fixes: c368d3f20fc0 ("tests/sendfile: factor out tcp_socketpair()") Differential Revision: https://reviews.freebsd.org/D45598 --- tests/sys/kern/sendfile_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/sendfile_helper.c b/tests/sys/kern/sendfile_helper.c index 703b04fdea6c..6365531e312c 100644 --- a/tests/sys/kern/sendfile_helper.c +++ b/tests/sys/kern/sendfile_helper.c @@ -84,7 +84,7 @@ tcp_socketpair(int *sv) if (fcntl(sv[0], F_SETFL, flags) == -1) err(1, "fcntl +O_NONBLOCK"); - if (connect(sv[0], (void *)&sin, sizeof(sin)) != -1 || + if (connect(sv[0], (void *)&sin, sizeof(sin)) == -1 && errno != EINPROGRESS) err(1, "connect cs"); From nobody Fri Jun 21 21:42:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5W6H6JWhz5PNGk; Fri, 21 Jun 2024 21:42: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 4W5W6H3qKyz4cpY; Fri, 21 Jun 2024 21:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719006135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=px5UPKB3thpPpDE+imASowG4AAIvoy0dwMPFrYxFnd0=; b=XfyCL9HmHc7RkJue7ezkT6YRClB2a1qxx8OYrOkSs/O4+t/4m7Tz0fGfxmBtTqsuPyIuZT UI0VUfpCuQX8hcaqatg3qQzq93iz9HIIH2gWAPelDACsd0SFVOM4uFdvChdhjy5b9FyRO/ wgItT5wImfmWJq5oeHjej1dDOlqfwgeUTcViQ/5Z5o6aCkS0NOExPo9xBYS7kwyctGpPfk EkBuzZpW/YMjp12ptx6uuHSl10rKmWuzIpEhVVZ/qp6K/gLKAdLvhbkXy1nDFZhCo59rCD 5lfub8VPK15afuM/udh0cOLFD7RBmBU0eif/i8/UWlNiFAJIJq47E0h9zjFb2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719006135; a=rsa-sha256; cv=none; b=n+dmE/xQx9nt0/Wo5+CnEldZ/UYpBKGCUO66QZhzbR/CEsFfjpH6Z35wNgOz08rxaH1Q3l 8ZiumfjKHThlIFqmnsfsrgCnVp0CLz+ggr2hzKeyTz4JnHki7HOw/VDukW1y6QoMmxUqal gS6PfLz+991sF0h/+9Ea1Rw0uBPAw7FF9HuDXTG0qx7E94DhJsgykFO0YtMHXOvgeKTBd/ 7zAj5uehRwgYIXQXkC7dzTxgCeMrpIBpW6nzcGloFQKFJApWv6r6suIhmCVXL6u0T+wWJ6 K/mtO53L27bJ8CSvgfJ3KdouOMiJOPipgwqPy5EZMaclpstf7PiW+HEwlj9uWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719006135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=px5UPKB3thpPpDE+imASowG4AAIvoy0dwMPFrYxFnd0=; b=rhfS6El26s4pduhY5IVhSWP58oQB58We5lATobsyk5+9S4WQsERvezs8xWxU4Tbuevnvpn mDxmROB3dehOJgcyfcKV/PRGgFmKj/vPYyL3QbWkbhncXz5qwMse08qXCdQAalLnVS7ACQ B4TPEbcyS1SxFXZsQU6iZZvFPTfx+Ntd7XqGoZcMAbn3Gvf6FOq4JeSdPEXciOfLnTfWNk EmLz5MGEZRnx8YQHvNZJCgyPOhXWR8DORoMLYxfOyxSC2aiF+ZchFwGvTa9RQdjaG2bbGd zMiPNsSqIfHt4GSwUuwTgMuPrBdJPm/kYAGQNAMfMo04P3pMpZKHeHyDarz04Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5W6H2M4mzPxk; Fri, 21 Jun 2024 21:42: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 45LLgF7W092170; Fri, 21 Jun 2024 21:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LLgFFQ092167; Fri, 21 Jun 2024 21:42:15 GMT (envelope-from git) Date: Fri, 21 Jun 2024 21:42:15 GMT Message-Id: <202406212142.45LLgFFQ092167@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: 45846afcb7ae - main - release: Stop publishing non-FS-tagged VM images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 45846afcb7ae1b9682107a62b105aeb5021994ba Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=45846afcb7ae1b9682107a62b105aeb5021994ba commit 45846afcb7ae1b9682107a62b105aeb5021994ba Author: Colin Percival AuthorDate: 2024-06-21 21:39:44 +0000 Commit: Colin Percival CommitDate: 2024-06-21 21:42:10 +0000 release: Stop publishing non-FS-tagged VM images VM, BASIC-CI, and BASIC-CLOUDWARE images are published with the filesystem type (UFS or ZFS) in the file name. For backwards compatibility we have published the UFS images with no filesystem in the filename (aka with the same file names as we used before we supported building ZFS VM images); those are going away now. This will not be MFCed. --- release/Makefile.mirrors | 20 -------------------- release/Makefile.vm | 12 ------------ 2 files changed, 32 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 1888f86d3002..8a6888ccc96c 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -190,14 +190,6 @@ vm-images-stage: mkdir -p ${VM_DIR}/Latest mkdir -p ${VM_DIR}/${BUILDDATE} . for VMFORMAT in ${VMFORMATS} - cd ${RELEASEDIR}/vmimages && \ - mv ${OSRELEASE}.${VMFORMAT}.xz \ - ${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cd ${VM_DIR}/Latest && \ - ln -s ../${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${OSRELEASE}.${VMFORMAT}.xz . for FS in ${VMFSLIST} cd ${RELEASEDIR}/vmimages && \ mv ${OSRELEASE}-${FS}.${VMFORMAT}.xz \ @@ -243,8 +235,6 @@ vm-images-stage: . endif mkdir -p ${VM_DIR}/Latest . for VMFORMAT in ${VMFORMATS} - cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}.${VMFORMAT}.xz \ - ${VM_DIR}/Latest/${OSRELEASE}.${VMFORMAT}.xz . for FS in ${VMFSLIST} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz @@ -289,14 +279,6 @@ ci-images-stage: ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz . endfor - cd ${RELEASEDIR}/ciimages && \ - mv ${OSRELEASE}-${CW}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cd ${CI_DIR}/Latest && \ - ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}.${VMFORMAT}.xz . endfor . endif . endfor @@ -322,8 +304,6 @@ ci-images-stage: cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz . endfor - cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.${VMFORMAT}.xz \ - ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${VMFORMAT}.xz . endfor . endif . endfor diff --git a/release/Makefile.vm b/release/Makefile.vm index 8c48c0a13dc9..f5dc6af67189 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -209,14 +209,6 @@ vm-install: . endfor . endfor . endif - # Compatibility hardlinks from "foo.bar" to "foo-${VMFS}.bar". -. for FORMAT in ${VMFORMATS} -. if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES) - ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT}.xz ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}.xz -. else - ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} -. endif -. endfor cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ ${DESTDIR}/vmimages/CHECKSUM.SHA512 cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ @@ -231,10 +223,6 @@ cloud-install-BASIC-CI: ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} . endfor -.endfor -.for _FMT in ${BASIC-CI_FORMAT} - ln -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${VMFS}.${_FMT}.xz \ - ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.${_FMT}.xz .endfor cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ ${DESTDIR}/ciimages/CHECKSUM.SHA512 From nobody Fri Jun 21 22:10:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5WkV3hpcz5NQkB; Fri, 21 Jun 2024 22:10: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 4W5WkV2qxDz4fp7; Fri, 21 Jun 2024 22:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719007810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhr0WG4tQYOddYNbMPOSn+dTlK00DnuHsi0FFm6XopM=; b=AYOQWZRBlSz0JMktk3ABymLI2Uvoes96ZRgYZVtIlveL/5BMSWna/DAjYgYAngKdMIhY8m A/8zO23Mi7Ia3gAuQO31HizC+x8Ho6nLDsvOkirx/eTEmDCwGMGGBTr9jm7GpyarHDjpHO DCk8ST6qck2S79KYnf7fHYe1xmmrj3ukVeAF+koJa8LIiqMFTaapccY4nXEE3vRdd+YAxy EJFHDIM/LFw0fcNtQm8Twi91ZZmoj6k5dYKjgZh8/hWabUP8d8dZjtLSQBXVtd3dDSrPyn rxrlzHk2nD6wwScc7G3eR28NY8HHQwWkrH+YwJvSyTK/2dgZ2cUEMgw/3gh/fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719007810; a=rsa-sha256; cv=none; b=XWOShOu2Q3d+/tpNj5MLmX6jWBy2VtZaMf2Sm9GjuPzy5amWnJ+EnvB9vnwHIyGiYmsoxL 7YvdHnt8hinplG7Zb0zzZ6stBxkPSqsgLNC8IsV1jaQJonrKoWSmCQiq/XXQbQt6YDOGZi kVD5Q8pBi+vBj6UzHdOOs3JqXtY251ZAHvab8aRGmYzop3vnVZdPcps6s/Azz9oo3LgX6z B411g/1S7Eufwyi4Z/AKSXxZHuTKpWv5YtTPA4l1jhB7bvLZ1n+hs7PexENP/9XlYH7eZA syLDjUk8tire6aNNDhc8RQEc1KBGn2/ls0gZsjns6kyv8RMdd6V7PEHd/6CtgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719007810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhr0WG4tQYOddYNbMPOSn+dTlK00DnuHsi0FFm6XopM=; b=TuS+ISjJOpc97eWxkuBkB6uzTXqmVBw5gTzHDZNymsVwvZ7HnvrleoZGyZsG51oRTpmuyK DjA85CQxMA2IHihH68Min8BoWMemRmcvMioH2JCNM0mh2inKWi+2CBfC/c29NH+uVzSRnj PxTA1WTp2oHzcNospcn4+5127uk2YWaOY/cGTauvIVIPspd9crVfAWWKrO7Y2K2036CWUb 4xnkAdo9+v+XANKhfR/90vkX0IxAG0VT7iA0KJfwpFcjW2qOiaddlh6knqDxD1hi/h4j3b NViJwPnczkXbF9Pmf0FxZkAVjmGOgDmT0aoiFazu8pgF+hxnZ7GF62uSAecnaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5WkV2Qn1zQV5; Fri, 21 Jun 2024 22:10: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 45LMAAOu031523; Fri, 21 Jun 2024 22:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LMAANh031517; Fri, 21 Jun 2024 22:10:10 GMT (envelope-from git) Date: Fri, 21 Jun 2024 22:10:10 GMT Message-Id: <202406212210.45LMAANh031517@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: a7de51068502 - main - nfsd: Fix nfsrv_cleanclient so that it can be called with a mutex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7de51068502ad1e2851d4a855ed28b27573bb36 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a7de51068502ad1e2851d4a855ed28b27573bb36 commit a7de51068502ad1e2851d4a855ed28b27573bb36 Author: Rick Macklem AuthorDate: 2024-06-21 22:08:48 +0000 Commit: Rick Macklem CommitDate: 2024-06-21 22:08:48 +0000 nfsd: Fix nfsrv_cleanclient so that it can be called with a mutex On Feb. 28, a problem was reported on freebsd-stable@ where a nfsd thread processing an ExchangeID operation was blocked for a long time by another nfsd thread performing a copy_file_range. This occurred because the copy_file_range was taking a long time, but also because handling a clientID requires that all other nfsd threads be blocked via an exclusive lock, as required by ExchangeID. This patch adds two arguments to nfsv4_cleanclient() so that it can optionally be called with a mutex held. For this patch, the first of these arguments is "false" and, as such, there is no change in semantics. However, this change will allow a future commit to modify handling of the clientID so that it can be done with a mutex held while other nfsd threads continue to process NFS RPCs. MFC after: 1 month --- sys/fs/nfs/nfsrvstate.h | 2 +- sys/fs/nfsserver/nfs_nfsdsocket.c | 2 +- sys/fs/nfsserver/nfs_nfsdstate.c | 55 +++++++++++++++++++++++---------------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/sys/fs/nfs/nfsrvstate.h b/sys/fs/nfs/nfsrvstate.h index da214ae9d4e9..cc19ed6fa1d2 100644 --- a/sys/fs/nfs/nfsrvstate.h +++ b/sys/fs/nfs/nfsrvstate.h @@ -333,7 +333,7 @@ struct nfsf_rec { u_int32_t numboots; /* Number of boottimes */ }; -void nfsrv_cleanclient(struct nfsclient *, NFSPROC_T *); +void nfsrv_cleanclient(struct nfsclient *, NFSPROC_T *, bool, SVCXPRT **); void nfsrv_freedeleglist(struct nfsstatehead *); /* diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index 1f50634405d0..df0c0edd1b59 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -797,7 +797,7 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram, u_char *tag, !LIST_EMPTY(&clp->lc_deleg)) nfsrv_writestable(clp->lc_id, clp->lc_idlen, NFSNST_REVOKE, p); - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); LIST_REMOVE(clp, lc_hash); diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index ce3f3481f04a..7a28e51e21fc 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -204,7 +204,7 @@ static void nfsrv_locklf(struct nfslockfile *lfp); static void nfsrv_unlocklf(struct nfslockfile *lfp); static struct nfsdsession *nfsrv_findsession(uint8_t *sessionid); static int nfsrv_freesession(struct nfsrv_descript *nd, struct nfsdsession *sep, - uint8_t *sessionid); + uint8_t *sessionid, bool locked, SVCXPRT **old_xprtp); static int nfsv4_setcbsequence(struct nfsrv_descript *nd, struct nfsclient *clp, int dont_replycache, struct nfsdsession **sepp, int *slotposp); static int nfsv4_getcbsession(struct nfsclient *clp, struct nfsdsession **sepp); @@ -337,7 +337,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, */ if (i != nfsrv_clienthashsize) { LIST_REMOVE(clp, lc_hash); - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); zapit = 1; @@ -390,7 +390,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, */ if (clp->lc_expiry < NFSD_MONOSEC && (!LIST_EMPTY(&clp->lc_open) || !LIST_EMPTY(&clp->lc_deleg))) { - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); } @@ -454,7 +454,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, /* Get rid of all sessions on this clientid. */ LIST_FOREACH_SAFE(sep, &clp->lc_session, sess_list, nsep) { - ret = nfsrv_freesession(NULL, sep, NULL); + ret = nfsrv_freesession(NULL, sep, NULL, false, NULL); if (ret != 0) printf("nfsrv_setclient: verifier changed free" " session failed=%d\n", ret); @@ -725,7 +725,7 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, * for an Open with CLAIM_DELEGATE_PREV unless in * grace, but get rid of the rest of the state. */ - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_olddeleg); if (nfsrv_checkgrace(nd, clp, 0)) { /* In grace, so just delete delegations */ @@ -893,7 +893,7 @@ nfsrv_destroyclient(struct nfsrv_descript *nd, nfsquad_t clientid, NFSPROC_T *p) } /* Destroy the clientid and return ok. */ - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); LIST_REMOVE(clp, lc_hash); @@ -962,7 +962,7 @@ nfsrv_adminrevoke(struct nfsd_clid *revokep, NFSPROC_T *p) */ clp->lc_flags &= ~LCL_CALLBACKSON; clp->lc_flags |= LCL_ADMINREVOKED; - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); NFSLOCKV4ROOTMUTEX(); @@ -1382,7 +1382,8 @@ nfsrv_servertimer(void *arg __unused) * there are no other active nfsd threads. */ void -nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p) +nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p, bool locked, + SVCXPRT **old_xprtp) { struct nfsstate *stp, *nstp; struct nfsdsession *sep, *nsep; @@ -1391,7 +1392,8 @@ nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p) nfsrv_freeopenowner(stp, 1, p); if ((clp->lc_flags & LCL_ADMINREVOKED) == 0) LIST_FOREACH_SAFE(sep, &clp->lc_session, sess_list, nsep) - (void)nfsrv_freesession(NULL, sep, NULL); + (void)nfsrv_freesession(NULL, sep, NULL, locked, + old_xprtp); } /* @@ -4499,7 +4501,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, if (procnum != NFSV4PROC_CBNULL) nfsv4_freeslot(&sep->sess_cbsess, slotpos, true); - nfsrv_freesession(NULL, sep, NULL); + nfsrv_freesession(NULL, sep, NULL, false, NULL); } else if (nd->nd_procnum == NFSV4PROC_CBNULL) error = newnfs_connect(NULL, &clp->lc_req, cred, NULL, 1, dotls, &clp->lc_req.nr_client); @@ -4548,7 +4550,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, nfsv4_freeslot(&sep->sess_cbsess, slotpos, true); } - nfsrv_freesession(NULL, sep, NULL); + nfsrv_freesession(NULL, sep, NULL, false, NULL); } else error = newnfs_request(nd, NULL, clp, &clp->lc_req, NULL, NULL, cred, clp->lc_program, @@ -5151,7 +5153,7 @@ nfsrv_clientconflict(struct nfsclient *clp, int *haslockp, vnode_t vp, */ nfsrv_writestable(clp->lc_id, clp->lc_idlen, NFSNST_REVOKE, p); nfsrv_backupstable(); - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); LIST_REMOVE(clp, lc_hash); @@ -5343,7 +5345,7 @@ nfsrv_delegconflict(struct nfsstate *stp, int *haslockp, NFSPROC_T *p, nfsrv_writestable(clp->lc_id, clp->lc_idlen, NFSNST_REVOKE, p); nfsrv_backupstable(); if (clp->lc_expiry < NFSD_MONOSEC) { - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); LIST_REMOVE(clp, lc_hash); @@ -6150,7 +6152,7 @@ nfsrv_throwawayallstate(NFSPROC_T *p) for (i = 0; i < nfsrv_clienthashsize; i++) { LIST_FOREACH_SAFE(clp, &NFSD_VNET(nfsclienthash)[i], lc_hash, nclp) { - nfsrv_cleanclient(clp, p); + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); free(clp->lc_stateid, M_NFSDCLIENT); @@ -6373,7 +6375,7 @@ nfsrv_destroysession(struct nfsrv_descript *nd, uint8_t *sessionid) } while (igotlock == 0); NFSUNLOCKV4ROOTMUTEX(); - error = nfsrv_freesession(nd, NULL, sessionid); + error = nfsrv_freesession(nd, NULL, sessionid, false, NULL); if (error == 0 && samesess != 0) nd->nd_flag &= ~ND_HASSEQUENCE; @@ -6469,12 +6471,13 @@ out: */ static int nfsrv_freesession(struct nfsrv_descript *nd, struct nfsdsession *sep, - uint8_t *sessionid) + uint8_t *sessionid, bool locked, SVCXPRT **old_xprtp) { struct nfssessionhash *shp; int i; - NFSLOCKSTATE(); + if (!locked) + NFSLOCKSTATE(); if (sep == NULL) { shp = NFSSESSIONHASH(sessionid); NFSLOCKSESSION(shp); @@ -6488,28 +6491,36 @@ nfsrv_freesession(struct nfsrv_descript *nd, struct nfsdsession *sep, if (nd != NULL && nfsrv_checkmachcred(NFSV4OP_DESTROYSESSION, nd, sep->sess_clp) != 0) { NFSUNLOCKSESSION(shp); - NFSUNLOCKSTATE(); + if (!locked) + NFSUNLOCKSTATE(); return (NFSERR_AUTHERR | AUTH_TOOWEAK); } sep->sess_refcnt--; if (sep->sess_refcnt > 0) { NFSUNLOCKSESSION(shp); - NFSUNLOCKSTATE(); + if (!locked) + NFSUNLOCKSTATE(); return (NFSERR_BACKCHANBUSY); } LIST_REMOVE(sep, sess_hash); LIST_REMOVE(sep, sess_list); } NFSUNLOCKSESSION(shp); - NFSUNLOCKSTATE(); + if (!locked) + NFSUNLOCKSTATE(); if (sep == NULL) return (NFSERR_BADSESSION); for (i = 0; i < NFSV4_SLOTS; i++) if (sep->sess_slots[i].nfssl_reply != NULL) m_freem(sep->sess_slots[i].nfssl_reply); - if (sep->sess_cbsess.nfsess_xprt != NULL) - SVC_RELEASE(sep->sess_cbsess.nfsess_xprt); + if (!locked) { + if (sep->sess_cbsess.nfsess_xprt != NULL) + SVC_RELEASE(sep->sess_cbsess.nfsess_xprt); + if (old_xprtp != NULL) + *old_xprtp = NULL; + } else if (old_xprtp != NULL) + *old_xprtp = sep->sess_cbsess.nfsess_xprt; free(sep, M_NFSDSESSION); return (0); } From nobody Fri Jun 21 22:51:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5Xfk5tYsz5NVCC; Fri, 21 Jun 2024 22:51: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 4W5Xfk2y3Rz4jN5; Fri, 21 Jun 2024 22:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719010318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=crphkEiX7oSmuxJxQziAWGCm9yBA23LdmHel0VdIJLw=; b=OU4r7ZCv2OnEvHFpgsiNMm489JAv4yz3aducv+tPJmdtz7ayhGWS+WVyWJrOip3hvMM9FU vLdWHmygZNdQr7Uq4GbDMVHqa/HCYlG8k8OeJBfXMbe8uxJOOEcYXzLl9fSs0+L2pC63f6 UGX5LpkZG0rBBExeMHo/A+BBmXV2Qy5LQ3Rz5yL2Jib+/Que1wKqUo6J+csVFkuLZ4yseb kSpo8HyrnFhrpei34Asxb8P2elPkiLnJtrYJztbD6UGUN2Mlo4fQ9yv9D6RmniAo2uhy/I NpoGFnAls4YgnqHRBVJbisW3ensQlizksJSimPy9Tek/0279FJ3xbz+Sx0Jmtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719010318; a=rsa-sha256; cv=none; b=ptns8GWfnszayaQQy0/7Dj7LbqHNC4GwR+Uibzj3f489fbmo0xZSZFwt2w0/6TSGC8bMcU xYq+0L6TqfXxTHpZmXwjaqAD9DfMV4BO8cdo3+BDoUz/hadNVvQeaAIRWpURwOdolnYj/z csBGj5Do9UXgqEtXiPSizay3IeHGlKJMeMFJ86Nu6p8PxqRWPUK9sSjdGj/+vKmROmXiHH PDgbfw2aztkSjz4Da2ucfo1wgW9WrpiAmkmkqyYruvysoTNLl+OU7jg9yi943eK5ckO2iy ezmpU30nKfvrrsnIDMp9lxG0IOenzq102rI6j5m8pOtkfneKZ9XFfkQULdsxyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719010318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=crphkEiX7oSmuxJxQziAWGCm9yBA23LdmHel0VdIJLw=; b=x0IDiNCvQnxBqWU1yxo8GSksvq2CzSB10zRTt/HIg2mBr/mSc3HTgBBHKWpii3wBNtrirF SkeZhOjUzlMJAofZNBGmi+XIq9yhE2QKxbhouakus0D6m4sl0l3TFbvPGwTYQA4irScHyP aMxIv5sC30Zljye4Crgap/0vccM3IMSv5JxB2Yx+RD+IzbP9DCMUW8gFu12F8AIOZ5v6DG VhOkRUyixVD/M7a5PmImHcs0fSBZzEYMyucpFkGW736WvOganxtNqkdD6MhEm2a/fTl8qH GvDXD3hePJxkjVsPgoI+iX2T8uD0L4EZCyzGK7YSPvwYjoE+FoFzzpZHyrfrqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5Xfk2Y8bzRjV; Fri, 21 Jun 2024 22:51: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 45LMpwfV007056; Fri, 21 Jun 2024 22:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LMpwTJ007053; Fri, 21 Jun 2024 22:51:58 GMT (envelope-from git) Date: Fri, 21 Jun 2024 22:51:58 GMT Message-Id: <202406212251.45LMpwTJ007053@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: b1cd308b37ea - main - cdefs: Add missing continuation line... List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1cd308b37eaacb15fffa584a289a41103018452 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b1cd308b37eaacb15fffa584a289a41103018452 commit b1cd308b37eaacb15fffa584a289a41103018452 Author: Warner Losh AuthorDate: 2024-06-21 22:48:50 +0000 Commit: Warner Losh CommitDate: 2024-06-21 22:51:44 +0000 cdefs: Add missing continuation line... TinyC has heart-burn on this construct, but gcc and clang like it just fine. Sponsored by: Netflix --- sys/sys/cdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 8809240ebbf3..6592bd2020ae 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -213,7 +213,7 @@ #endif #if !__has_extension(c_thread_local) -#if (defined(__cplusplus) && __cplusplus >= 201103L) || +#if (defined(__cplusplus) && __cplusplus >= 201103L) || \ __has_extension(cxx_thread_local) #define _Thread_local thread_local #else From nobody Sat Jun 22 01:26:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5c4Z2pQcz5NjMc; Sat, 22 Jun 2024 01: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 4W5c4Z2LMKz3xPJ; Sat, 22 Jun 2024 01: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=1719019566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HeIWiTkYzyKNrPkeVVOlh2jQIjpCb7AzLXlZf/qIDic=; b=hC4dlvpwjYornw/p8moz3TqSfc6/rHIJdMN4PookW8lEwPLgC0ngvchXS0LmYyivJ4v6dv Ev2y8qetpjPNkQj48ITTXudVM8iHbwrnXtWd/gqU9KJjr/fKu5f8I7WYWe9mG8Ee3BqB3n 4BRebuQ54m70TTEaSJh6lywRf5rPUCJevAKp7wJLgSqHurkBuFJCeAtwiSB62wvo9K3ZPa fZg3XRCTr1lklRfxejGSeHZDhgIb5A2Bk7ZqfmRmtoWnKO+AYfDUhYid46RAk16PAFvOgn N8g2s82tSpGyyqrdiQu0E5/G2tcqB5NSXkd56v/sZiqg85VXgbKq357vr+B1BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719019566; a=rsa-sha256; cv=none; b=fuaYoL0sc9dn/TwU2fKw4oZBrJKbfTa3JuhK1Ev8ZfaVELabHtAEMfGS8eOYInCgtsbHC7 R/n8mEvOY3XyE8EvzGWlB/sCMdbJcYoMyTkH6eMaJFW54gqQ9yZnZXgiTKveAkt3Xll7BO v2QEwtvRm6PQgT4z1kY37Q2fF0x0Ux9vEIPrU84jEuKH4FS7FvnRAxQQmWrpUaIwIqKIHV AdwyBgiK3/p69uY01vmV/y0G62UtEUu6NfKHPy5ZMSN24tculZZkk1wQgyhOPMAUBHcEXa 3CZl0f/0y3/JEaYoCnbXE2DIyK5MhmeN0ztZPKA9ptCirF4u7jTOq9Jq1zqd2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719019566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HeIWiTkYzyKNrPkeVVOlh2jQIjpCb7AzLXlZf/qIDic=; b=MVA/OgHKeGaCSAvePqDv7LMbbLWxUHf8gwt2f+laFOHpfLMRVcjy5lKy2RMlb+CFDRUjop aZtpg6Il+aqTYb1bb0DTN+rZo3IG0u3iHgbO7VI1gOqpZcK6OiFcE8BVObKPxrp0U4PPUZ q/KyD+DEwCRLQXCIo9GpTQohMY28w758MM7cgA67NhKDeFiIYg2Q7QYMjmnhtt+Y/Iy4Hj o0jtdruycI3YYUg/YsdEA4BEQIcWAGgSPLgkofSeTaksVIXkmjGpoHQjCcdpcry46s7eNh L03uKVybJZLGTkIQTDazB0P2amWXVbqWKUkrUE1SE1WInKIKnqU8u85zi6wUWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5c4Z1s7YzXV5; Sat, 22 Jun 2024 01: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 45M1Q6iQ063500; Sat, 22 Jun 2024 01: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 45M1Q67w063498; Sat, 22 Jun 2024 01:26:06 GMT (envelope-from git) Date: Sat, 22 Jun 2024 01:26:06 GMT Message-Id: <202406220126.45M1Q67w063498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 85641d316a87 - stable/14 - nfsd: Delete an unused VNET global variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85641d316a8764eced62ea9c4b5cbcdc6f9e08bd Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=85641d316a8764eced62ea9c4b5cbcdc6f9e08bd commit 85641d316a8764eced62ea9c4b5cbcdc6f9e08bd Author: Rick Macklem AuthorDate: 2024-06-08 23:40:52 +0000 Commit: Rick Macklem CommitDate: 2024-06-22 01:24:36 +0000 nfsd: Delete an unused VNET global variable During code inspection, I noticed that NFSD_VNET_DEFINE(nfsrv_dontlisthead) is unused, so delete it. (cherry picked from commit 13a51233e4c7d6cff04043c38845b1ec1af38680) --- sys/fs/nfsserver/nfs_nfsdsubs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index 0d7e4c73fe69..d80826993f23 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -57,9 +57,6 @@ NFSD_VNET_DECLARE(int, nfs_rootfhset); NFSD_VNET_DECLARE(uid_t, nfsrv_defaultuid); NFSD_VNET_DECLARE(gid_t, nfsrv_defaultgid); -NFSD_VNET_DEFINE(struct nfsdontlisthead, nfsrv_dontlisthead); - - char nfs_v2pubfh[NFSX_V2FH]; struct nfsdontlisthead nfsrv_dontlisthead; struct nfslayouthead nfsrv_recalllisthead; From nobody Sat Jun 22 05:51:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5jyQ0QCSz5P4lp; Sat, 22 Jun 2024 05:51: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 4W5jyP6zkJz4N43; Sat, 22 Jun 2024 05:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719035470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Lkurp+vwAC14Ma1jgDuP/RG6KIIhdHUDgTU362pSgg=; b=YynvURFEg1EaDD/ruP7arHZeuckG15IpGop2N7Jurgv+tFAexmxFxaKNZaI/qZGLGU/2rY LW+PX47aFOGkrLwZsu1C7pf5HKts+0ibyatwmVMVBgP0tTkpKsSXP2Daa5e8uPaBU0k+5c j9h/nbeog1m98c2AhJH4maADhZQ8aZMdrOwwglgFq0SRxmv1I4Nk6Yz+gQMbU2oud/7kQ/ HxynjudbTWncpJQVcvWT1RkfFLyYhTKYfWBPmhj/0F6l7iuwlgWsArrJ8qv9fvusk5DtNn /RHNj8kQJisSkl6+32r3wD4fc4nOvY2Fo+AV5m7kN+zyRemfL/hAU3/KdB+hGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719035470; a=rsa-sha256; cv=none; b=MJvi1VxVMEO1d7goOeQKUz2AWMVyRvMcRcl2N641o9+olbuZmBMtclQMKPOBNpKr7l7uhT wy9gxtJWdlKJ4+r9awFZTOAFOCRux2eh/q45IjzMOPOp7zIZCKexdpewi77jjaGyKNxZSX kSgDI+U1P3moHjZvemSwINwKXvYAi/PhLJbGtzHBZDrqQUwT/r6+ok2QxdODgfdRjwHHYw G6mGfOSCCXCaCcRqw5Eh6jfbxhNAeA0sKZwHXvDtm0IHpXH8bHllc5Fo/2s0VliT8nahr5 1cxB8hwwWhq8fG8BoeZ8GMSpnKSH8FoHXaabXk6SXQWhDgVNMzKQ6rV0f/32WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719035470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Lkurp+vwAC14Ma1jgDuP/RG6KIIhdHUDgTU362pSgg=; b=E/rHFZ28brFpxPqm4KVdz/8he1QiVt55kCfb4AkqzVG+XxeViv/MXHKf/E1eVRvPEc0jXr SXHnqPH62XmLgPAnI8tTrsbvM6We3dSGC9PO7rYzUyVYxo7A3gcK/LppzgghwpsQOr6kAo wqCRURBLoDGRPoRBzGTtCKEFvgLNZ/6/QRYLIgad8aZdsAq8d0BuYr2Jsgmgr4hLnpNswX Fp6gLzC1gjLt8lA39jc7wpVve+Ydf+R5GNZmbpe+hoqyh5Pqt+/T0Ivq6glPGnfL73vaAC OZDaAfaMzzGg1lSmvy1CHlLgn77kR0a1zE0A0y/fPqWW0MPD795a67wmT8U1Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5jyP6bvmzfrG; Sat, 22 Jun 2024 05:51: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 45M5p96s012344; Sat, 22 Jun 2024 05:51:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45M5p9ms012341; Sat, 22 Jun 2024 05:51:09 GMT (envelope-from git) Date: Sat, 22 Jun 2024 05:51:09 GMT Message-Id: <202406220551.45M5p9ms012341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 10d8f953952b - main - spelling: specifiy -> specify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10d8f953952b9967f8b3655cedf0b7e295514eda Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=10d8f953952b9967f8b3655cedf0b7e295514eda commit 10d8f953952b9967f8b3655cedf0b7e295514eda Author: Doug Moore AuthorDate: 2024-06-22 05:49:40 +0000 Commit: Doug Moore CommitDate: 2024-06-22 05:49:40 +0000 spelling: specifiy -> specify A spelling error correction. No functional change. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D45667 --- sys/vm/vm_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8e94c02089ae..e343170eff6a 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1995,7 +1995,7 @@ vm_page_alloc_domain(vm_object_t object, vm_pindex_t pindex, int domain, /* * Allocate a page in the specified object with the given page index. To - * optimize insertion of the page into the object, the caller must also specifiy + * optimize insertion of the page into the object, the caller must also specify * the resident page in the object with largest index smaller than the given * page index, or NULL if no such page exists. */ From nobody Sat Jun 22 06:58:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5lSG5FlPz5P9ft; Sat, 22 Jun 2024 06:58: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 4W5lSG2Yf5z4TlT; Sat, 22 Jun 2024 06:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719039518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JN24QhiAnQsNFx3LtCUWKKDDUlm5euMRy8VQ8AmzHO8=; b=AsRz7DI5NZ8Su13l+FpEhv2hh1IDD3a3asRzoNMZf635itJw96NdsRUl3EzWdZ9XUI57qF 2Rpmv4Xmb15ybhIAwtGdpjcxcd/PRw4Ez4EWJyMUrS9s9xHKjprSHQeZPy8briH6++MjUc Q3F943PQKWNIOx1tR1R0Wl+cMYlNMtpJusZkOaqlrvum1NmvD8ISoghqJW7x2/Za2+fv9t J5+N7fhgerceeZ/mA533f9+wGEaC6m6qhquEVjxN6LO2NxsgaYMkbvpVN2bLF/UT1PpsjN xCTf9wl2krWluHNkzubyJ3HzduBJip8ouCepnAAH2+eUi0jkzCpLpwTbbsAuRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719039518; a=rsa-sha256; cv=none; b=m68amz+Xg8Q5ZWJg4YyWn9jlwz5KRgKcMhYwhi5N1osR27nmUqLom8JQD8IOvvnvlSM5Bp QfX6A56P7HXIWCXgtK4RlaikUJ9wqJ7h0dso07H6Tgu9B3J6KS7dRuW/5HyZNMKVbcz1d5 0ioh7HSD/ooNLlBiLIgWTGTsxlepbcBMit62xPxe00WDah01dqokJG8JdRia2UHnf38UbF B/YwQToeZ+vyEFbb1NGTkZDcaH8PF4g4zyEJHBGOdj/M4pKyJt/MhN/6YxTrBIU0k3M8Jt vZ+73jSoyOTeJQ7XpzoLeRAr9PHHCuQJd+Z51U5P9clrQxLcKrSm3utzBt9Xjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719039518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JN24QhiAnQsNFx3LtCUWKKDDUlm5euMRy8VQ8AmzHO8=; b=KTwsJ1BJzCXOd08Bkjy0zzAolCFVAy7eYew+TVYjm8oiad9nxc9aEiLFvfEPIT2uzpG5rX vfAXAw8xkP5Aq8oEKt7moI/qHwrX1ncEUYML2yTDqHqh6q7vSpJQRYpazEHYRsCZ/kw5aj g3q90/DxzitMBxH7RnA50MFsqz9ztviEJycCXmXtto+GUHf2vSD+64IH4dCwQk8PHNa6a7 5V7mhk3HPqOOgG7GaHldyq6L1Oxn8Kq7Kqh0jobsP43EsvAX2KI9g987Z7pDnRiPV57oVE IRiNvFM+508bJPW5jgl3sJ+ve6kEl2jQol1NdWWqxMjCuY8saoSm/rHWWczUPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5lSG1Qg6zh5w; Sat, 22 Jun 2024 06:58: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 45M6wcfc021410; Sat, 22 Jun 2024 06:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45M6wchh021408; Sat, 22 Jun 2024 06:58:38 GMT (envelope-from git) Date: Sat, 22 Jun 2024 06:58:38 GMT Message-Id: <202406220658.45M6wchh021408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 48dbc2a4f9fc - main - mailmap: Translate my personal address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48dbc2a4f9fcf893afba107b4dbbcb1c161aeb55 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/src/commit/?id=48dbc2a4f9fcf893afba107b4dbbcb1c161aeb55 commit 48dbc2a4f9fcf893afba107b4dbbcb1c161aeb55 Author: Ganael LAPLANCHE AuthorDate: 2024-06-22 06:57:56 +0000 Commit: Ganael LAPLANCHE CommitDate: 2024-06-22 06:57:56 +0000 mailmap: Translate my personal address Approved by: imp --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 0d0231a3da68..3d33acc8d59a 100644 --- a/.mailmap +++ b/.mailmap @@ -16,3 +16,4 @@ Jose Luis Duran Val Packett Piotr Paweł Stefaniak Sumit Saxena +Ganael LAPLANCHE From nobody Sat Jun 22 07:32:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5mCZ5mTqz5PD93 for ; Sat, 22 Jun 2024 07:32: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 4W5mCZ57C1z4YN1; Sat, 22 Jun 2024 07:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719041562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jnqKuPi0M9p4rfxmDEW6Fc+tSvabzATqfE6dKloRZo=; b=s54iXkGslMaQ9W0rKOnqWL0Ti19ZzV8ifFaXasYkSrCOt44QdzTjvNTEn6J1jm4jKboQ2k 4THb8/mapdR4SH7G59RP/gx6tex1Bx1FReq2WILte/OF0A1QjM+Rd52VelsgRTiFWlZQbH 5RkVTnw5F0BDC6kHm1MrE74pF/HW7Qnk5F0udZoNStWTL6d+0caBsGHeOGzah5TSbXt/9+ GF3eGnwCDiP4D9S6GptisOBNoQkDLWufV7LxXiu4tJzqSpUMPM9pgCwReZR02ABTBGwOnD eI09ZQgiCe91ZYCc9sa5UV4hx4pBLmnRaB+6UqH5ef+5KunvvN3aNja/d0cI5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719041562; a=rsa-sha256; cv=none; b=PDnmmX1hXTMwVI/NJXtn7Af7XZdQPeXYmS0SUZDPAoM0khXExc8O8Idn9NzHfgPjWf9NUw KCy79dyvUKjHsMtjDQLJscD4fwTEMEgiaoy5ozHtcM7bj+089dv+CTuOnaTPdMOd1Qdhh8 DI9cbwEludztpakxwrI1dC6qKj005rJFciSX1t2ILzrA3w9AFNPHs++SOvGDRHcsHT+bdt HKpv5wTKMhjmTwRWLSqByFWnujx+JRncGt9LLN3vpNBsIaIH6UrBydOkmMFs3RWnJoZ1dM Y4OJFSAB3zDGoGeQcXLqm4fZQeqF4uUa0rT3qCJmw4wGHKw4EcHDrRAwVIxZxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719041562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jnqKuPi0M9p4rfxmDEW6Fc+tSvabzATqfE6dKloRZo=; b=b66pk5/k3w6QNQ0JGthaNNjQ6bz51b4POXP3IsLmx8iVSTk/wrhiUwTYFgMl8SmWojJVxs Es8zbLwAuNAfOXmn+agMQ3M6HrCnOJg+CMacj7Ybtvj1vyBN1Ki61y7yAvEe2AXkz4I08O F2GEe/73I4lIbYJeTvxldLREMV24tpCfhZDSVSuVpa7C0U5K91/XHls5E/S3pqCSH4yHwg n6HbXoPWdg/yKGC7JJvvprmZefpnAh8+S9Sh1XO7XQbh/A6e6Kuj0aS9HdKdi3vDbgJ0g/ rD3VNZuL9H8hie/mP0C0BDrUnVh9J8k5euQkWvJVYqqDzaHURPDii6A568m5Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5mCZ4klqzjfx; Sat, 22 Jun 2024 07:32: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 45M7WgGq088796; Sat, 22 Jun 2024 07:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45M7WgZ5088795; Sat, 22 Jun 2024 07:32:42 GMT (envelope-from git) Date: Sat, 22 Jun 2024 07:32:42 GMT Message-Id: <202406220732.45M7WgZ5088795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: e2357561b949..c98295eed268 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: c98295eed2687cee704ef5f8f3218d3d44a6a1d8 X-Git-Oldrev: e2357561b9499296bff758afe4868dbc39735675 X-Git-Newrev: c98295eed2687cee704ef5f8f3218d3d44a6a1d8 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=e2357561b949..c98295eed268 a301dc364c33 ZTS: Fix redacted_send failures on FreeBSD 4185179190f3 icp: remove unused blowfish_ctx and des_ctx 57249bcddc0d icp: brutally remove unused AES modes 4ed91dc26e63 icp: remove unusued incremental cipher methods 94f1e56e4129 icp: remove unused KCF_ macros 1291c46ea4ba icp: remove digest entry points 10de12e9ed2f icp: reorganise SHA2 digest mechanisms f39241aeb333 icp: remove unused SHA2 HMAC mechanisms ae512620d0c3 icp: remove skein module 4e714c0be10f icp: remove unused headers a72751a34265 icp: remove redundant FreeBSD check 23a489a41167 zdb: detect cachefile automatically otherwise force import b558f0a9d65c zdb: fix FreeBSD build failure 4de260efe337 contrib/bash_completion.d: squelch FreeBSD seq when first < last 20c8bdd85ef4 FreeBSD: Update use of UMA-related symbols in arc_available_memory 121a2d335414 FreeBSD: unregister mountroot eventhandler on unload c98295eed268 disable automatic dependency tracking for dkms builds From nobody Sat Jun 22 18:47:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W63Bd4Xm1z5NtmF for ; Sat, 22 Jun 2024 18:47:53 +0000 (UTC) (envelope-from pfg@freebsd.org) Received: from sonic304-21.consmr.mail.ne1.yahoo.com (sonic304-21.consmr.mail.ne1.yahoo.com [66.163.191.147]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4W63Bc5k47z49FV for ; Sat, 22 Jun 2024 18:47:52 +0000 (UTC) (envelope-from pfg@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=Mci42g9z; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=softfail (mx1.freebsd.org: 66.163.191.147 is neither permitted nor denied by domain of pfg@freebsd.org) smtp.mailfrom=pfg@freebsd.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1719082070; bh=aoT29uLAv34pw2jJvhfZ7GiqQRS3DQAjt7OCUR6TviY=; h=Date:From:To:In-Reply-To:References:Subject:From:Subject:Reply-To; b=Mci42g9zuCCicuz2CoaUuWexFBL0yakXn9K7bzt9iSrttm20axipwwJFEbXQFkthcKDhQAE1b0wZ5sUvAmqeUOnJ32AC0MFz6k1l6MUd5b0PSreVcqYcLu8eNdubznbYURLvuQrnr8hRAtHZRo+blCtFjQ+hz6i2dk2Wo3lQEUruomkUfKRTs240MDQZPNMAPFRGyPUV7ToD3in5T00yPaUHCA9hWyTHTnDUh9pYI81poG81DeHT9ZOPFnfHW8jDbXf/k+9nBsssB15T+mQ8Qk5dZcyr+HN5bYVeKWOPs1/K/XQXS8R3jrz5orGkEm7nZhc2fF6CTB6B3UNROM2YwA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1719082070; bh=3QZb1B3d2AvAiTi8nrDD5EV/hWeIUl05PKcCjAHVFRr=; h=X-Sonic-MF:Date:From:To:Subject:From:Subject; b=F82stNbp8pSowcEizandRYGK3HYa8WUmH8j0TWvjQWu01mtXf1U25p5Vi8L4QyohLHusZ03atwMUKSsueZ2DZtP9/XOHjQs6G+J3UFKlf4ow9n1Td4I2WTX0Ms667Cy0xlK85ch8N2kJ/AygONggmrnTir7Anw6PUjvS/lT4+Mu2tP0tkjfiCpogqSaPxyHMa7jKu7gPSa5UnYJ3kEQy04DXhCBnGPB99UYHNH2dKepn0L8xMHlv07Wb0y0JxGIVavXg+J0+Q791GjP9+aMTGpXfKbpG44Qbyw8Z1+18QSvgO61inF/Xsur9QnK+DzAkMn7qyUYKRbGxs2sdmUa5Bw== X-YMail-OSG: GWBTQ3QVM1mrH18.Fi1CeYOZr5AppD.QE2bouRIumlD2qyKoinWJBsJWHRf2FlD mHf2YYPufTqsUUvVSgqRDSDepJBxkL553Ii07P2RNqOz5ZwF8oONNwCjbPwLo3J.lQU5BccDH1we wbG.EHpfJDrsIfUP3rigKbOSzLfV2GMntoXEQ4CknjKMP13XYxJnOt0qIT2kixvUsqb8nkhGad._ 7cusRayPDDNLn2CbC8QGMHmq6OXD6MmncNW5ReDm_9Xs3iNY4Bp7P2NCBrmpvV9REIzpJOJhQOnR 4iz1PrU5H2htQACmwDMZDp33gDQpnYavSXTruMRemSVMDdldol_QNELMvABT9zSPJUdRq0OFi92_ 1hiqEQN87auMIv0dXZm8uqK0kkTWIowMDXd_CIrFwF8tkvROtxQcjBxiWYbyd1IHSbNUiY5_dXJE 3ZTNc3GjHh4Fu8hTw4qBrWzZmFTJYu8hUMb_fYhDiiPnn4ClfowQr1ZeXdNnjQgcN3fLQfPZbln1 TgP_v9gywnscWBm6Prl8BJ21FpvNjDDbwbLx9WhetRXz6SxLJHIZdywJB2IP4eSbey0Sro6Y20UW moXKkvIJmZ20POg3U0DRG8CkZLOgqy3CK4otOt554D1wtmFVZg7K.9uBI9ybX2QAcBtJYXUVwVZb b1ebD2p_BdcGDncdt9mNLoq8iQBNrEDBsFOnhTJPjHUVfXXqwHEz.4.aQapGCFCKjIh46EeWVhyh FKQOTi3YxpG5QPHtryuSpctt.zffINliFUT3YjVvuNLOLRgi3tsjSF_WVxv3W71tL3G4vkR1mo3k i0nIgi4z.8kYOV5zu4Z.aQQxYOt0JdxZSaY.JFxwjqdtXvkvp7fNQibWAI06b9ohiK1iG6aIcunn Xj8NomefDDMpXo.p8xsGTVJXcHbtiHYbVYG2Ptb4GUxL61imARdaWeaWM9YJWqzRbTan_WjqbGNm yfthUEaqWSWHT.2sHDNhCUO94.sS5F3e3O17GRZGtJ62etJjrrQDY1_n7ce72WAG0ykDK7BizmQe rYue07i49dNF3BjQ_TTiC3SIA4lATKw57gAe0TSQOpsMDXpxLUKHldvY5a0BuOfQXCPVJJG5k2N7 fqb.DQRRfBYKGCEgCiK34SN5QGT0a_sXRQmKCP3h7iy88qJrlozS2q0v0i6Lm9zGX5H9u4o6X5DL Qq9qKoM5fG9B8IUDbrkaRvQTDkmXSqRrpBu2XPkKN37lvpIt9DDtR9qaIZ3gH8o_py23NBGjGfER Jm2NzMnO7IcpDyKWxGx2l8fm.N4ZbLaoN.cjrwvh9XQSoMORbYPK._Ha3x9_iai0S8I.UqDtLdm2 N4axqLrpmk6A67g4pDXDUt2mKCvws75CBfll_iCLlKYjsHxpZDM6Nmv425Nwj.oN9_yG32qozDBs fHip1dXCdE5PoysFYPOBVpoF4L99Qb2MJHaNHqAmchhBpcnSH6o0pEneFq6tIq9rJIAbbKznH6ER OOWDSr4R9Fn9yt6BMPHSjGcvX.csiMtIRIFBAj6JPR6LeJzEXgwJ4WasfpTHCKPA_aqR5esC9r_e x5cVjOCGhhCvgfQJFKptqPg.VpjEtlbQMgjCgXSLK91un6ueh1gTBE51s_SV8DhVTewLWdAWsRuk po22q83QBwyu1Q8k_PrIkB6TXv6pJK0AYn.31kKLKGskLDv4F9QYqeOgDhMaEWMza.fULqcJPUWO DMHWusOEJSGrB23DJp_H1ZG4rNsH3NEvpUEcr0n6VdUaKuNPpY9s3CAhHkOPt5SvmfNs91n_Tbfa QIHog0VO3rgIw2gTzLYi4bI3tf3k9SAehpUUK7B8IqLBDlimdW4eVg9df_J4lU0ONJL7FjriyqQi pvWtGhyaAQpV3y.vMJS1FIDKLU_3vjA4d40HV_icGmYx4YifR0qM99J7VHpu02UjSUIoqVg4Ni3F qFmoH5BQkvqs0jx_U6GDwdD5M9NBhUESTz0VC48MrpFQHT8uCi0MrTN51PTn0i8qmfQByYCkkWVi dchtCaINav8yFpW9LOG11GZftEMj1Pp4atAdYRYSKBGPicpNLzEV.WdIUlDs6exdX8Z2DcfdHGnc A3WTvesFnIM3tDeO_YUDneh3X0RLH5Dy3UUKxCzjSWqNJV_c8hoiqarbrkfhRe0vKHfA6c7v3Kjc qlosQIEz8EIONoQNPyN8c.8RCXPUIvUDR1otV_SBaCBfipEr.CLGETy9R6PsW6hDlmMwa X-Sonic-MF: X-Sonic-ID: 95c19ea2-f88a-46be-b84c-022d05c6d6e9 Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ne1.yahoo.com with HTTP; Sat, 22 Jun 2024 18:47:50 +0000 Date: Sat, 22 Jun 2024 18:47:46 +0000 (UTC) From: Pedro Giffuni To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Warner Losh Message-ID: <111875645.165697.1719082066518@mail.yahoo.com> In-Reply-To: <202406210241.45L2fQZA057110@gitrepo.freebsd.org> References: <202406210241.45L2fQZA057110@gitrepo.freebsd.org> Subject: Re: git: d5c01e1124ff - main - cdefs.h: Remove pre gcc 5.0 support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_165696_1045442462.1719082066515" X-Mailer: WebService/1.1.22407 YMailNorrin X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.20 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, DKIM not aligned (relaxed),none]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US]; FREEFALL_USER(0.00)[pfg]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[66.163.191.147:from]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_SOFTFAIL(0.00)[~all]; FROM_EQ_ENVFROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.163.191.147:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; DKIM_TRACE(0.00)[yahoo.com:+] X-Rspamd-Queue-Id: 4W63Bc5k47z49FV ------=_Part_165696_1045442462.1719082066515 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable It was long ago when I last touched this but FWIW ... clang used to report itself as GCC 4.2 and kept it's GCC extension support = level consistent with that version so these version numbers were relevant. Pedro. On Thursday, June 20, 2024 at 09:41:34 PM GMT-5, Warner Losh wrote: =20 =20 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd5c01e1124ffa4adb2513e7e8d70= 8d7072dbfc75 commit d5c01e1124ffa4adb2513e7e8d708d7072dbfc75 Author:=C2=A0 =C2=A0 Warner Losh AuthorDate: 2024-06-20 23:03:15 +0000 Commit:=C2=A0 =C2=A0 Warner Losh CommitDate: 2024-06-21 02:41:09 +0000 =C2=A0 =C2=A0 cdefs.h: Remove pre gcc 5.0 support =C2=A0 =C2=A0=20 =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 brooks =C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd.org/D456= 56 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Netflix --- sys/sys/cdefs.h | 54 -----------------------------------------------------= - 1 file changed, 54 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index a6ecdca5d8b9..43d179b82020 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -164,18 +164,9 @@ #define=C2=A0=C2=A0=C2=A0 __aligned(x)=C2=A0=C2=A0=C2=A0 __attribute__((__= aligned__(x))) #define=C2=A0=C2=A0=C2=A0 __section(x)=C2=A0=C2=A0=C2=A0 __attribute__((__= section__(x))) #define=C2=A0=C2=A0=C2=A0 __writeonly=C2=A0=C2=A0=C2=A0 __unused -#if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__) #define=C2=A0=C2=A0=C2=A0 __alloc_size(x)=C2=A0=C2=A0=C2=A0 __attribute__(= (__alloc_size__(x))) #define=C2=A0=C2=A0=C2=A0 __alloc_size2(n, x)=C2=A0=C2=A0=C2=A0 __attribut= e__((__alloc_size__(n, x))) -#else -#define=C2=A0=C2=A0=C2=A0 __alloc_size(x) -#define=C2=A0=C2=A0=C2=A0 __alloc_size2(n, x) -#endif -#if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__) #define=C2=A0=C2=A0=C2=A0 __alloc_align(x)=C2=A0=C2=A0=C2=A0 __attribute__= ((__alloc_align__(x))) -#else -#define=C2=A0=C2=A0=C2=A0 __alloc_align(x) -#endif =20 /* =C2=A0 * Keywords added in C11. @@ -199,15 +190,6 @@ #define=C2=A0=C2=A0=C2=A0 _Alignof(x)=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0= __alignof(x) #endif =20 -#if !defined(__cplusplus) && !__has_extension(c_atomic) && \ -=C2=A0=C2=A0=C2=A0 !__has_extension(cxx_atomic) && !__GNUC_PREREQ__(4, 7) -/* - * No native support for _Atomic(). Place object in structure to prevent - * most forms of direct non-atomic access. - */ -#define=C2=A0=C2=A0=C2=A0 _Atomic(T)=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 = struct { T volatile __val; } -#endif - #if defined(__cplusplus) && __cplusplus >=3D 201103L #define=C2=A0=C2=A0=C2=A0 _Noreturn=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 [= [noreturn]] #else @@ -218,15 +200,6 @@ #if (defined(__cplusplus) && __cplusplus >=3D 201103L) || \ =C2=A0 =C2=A0 __has_extension(cxx_static_assert) #define=C2=A0=C2=A0=C2=A0 _Static_assert(x, y)=C2=A0=C2=A0=C2=A0 static_as= sert(x, y) -#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) -/* Nothing, gcc 4.6 and higher has _Static_assert built-in */ -#elif defined(__COUNTER__) -#define=C2=A0=C2=A0=C2=A0 _Static_assert(x, y)=C2=A0=C2=A0=C2=A0 __Static_= assert(x, __COUNTER__) -#define=C2=A0=C2=A0=C2=A0 __Static_assert(x, y)=C2=A0=C2=A0=C2=A0 ___Stati= c_assert(x, y) -#define=C2=A0=C2=A0=C2=A0 ___Static_assert(x, y)=C2=A0=C2=A0=C2=A0 typedef= char __assert_ ## y[(x) ? 1 : -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 __unused -#else -#define=C2=A0=C2=A0=C2=A0 _Static_assert(x, y)=C2=A0=C2=A0=C2=A0 struct __= hack #endif #endif =20 @@ -276,7 +249,6 @@ =C2=A0 * void bar(int myArray[__min_size(10)]); =C2=A0 */ #if !defined(__cplusplus) && \ -=C2=A0 =C2=A0 (defined(__clang__) || __GNUC_PREREQ__(4, 6)) && \ =C2=A0 =C2=A0 (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >=3D 199901)= ) #define __min_size(x)=C2=A0=C2=A0=C2=A0 static (x) #else @@ -302,17 +274,9 @@ #define=C2=A0=C2=A0=C2=A0 __result_use_or_ignore_check #endif /* !__clang__ */ =20 -#if __GNUC_PREREQ__(4, 1) #define=C2=A0=C2=A0=C2=A0 __returns_twice=C2=A0=C2=A0=C2=A0 __attribute__(= (__returns_twice__)) -#else -#define=C2=A0=C2=A0=C2=A0 __returns_twice -#endif =20 -#if __GNUC_PREREQ__(4, 6) || __has_builtin(__builtin_unreachable) #define=C2=A0=C2=A0=C2=A0 __unreachable()=C2=A0=C2=A0=C2=A0 __builtin_unre= achable() -#else -#define=C2=A0=C2=A0=C2=A0 __unreachable()=C2=A0=C2=A0=C2=A0 ((void)0) -#endif =20 #if !defined(__STRICT_ANSI__) || __STDC_VERSION__ >=3D 199901 #define=C2=A0=C2=A0=C2=A0 __LONG_LONG_SUPPORTED @@ -353,33 +317,15 @@ #define=C2=A0=C2=A0=C2=A0 __predict_true(exp)=C2=A0 =C2=A0 __builtin_expec= t((exp), 1) #define=C2=A0=C2=A0=C2=A0 __predict_false(exp)=C2=A0 =C2=A0 __builtin_expe= ct((exp), 0) =20 -#if __GNUC_PREREQ__(4, 0) #define=C2=A0=C2=A0=C2=A0 __null_sentinel=C2=A0=C2=A0=C2=A0 __attribute__(= (__sentinel__)) #define=C2=A0=C2=A0=C2=A0 __exported=C2=A0=C2=A0=C2=A0 __attribute__((__vi= sibility__("default"))) #define=C2=A0=C2=A0=C2=A0 __hidden=C2=A0=C2=A0=C2=A0 __attribute__((__visi= bility__("hidden"))) -#else -#define=C2=A0=C2=A0=C2=A0 __null_sentinel -#define=C2=A0=C2=A0=C2=A0 __exported -#define=C2=A0=C2=A0=C2=A0 __hidden -#endif =20 /* =C2=A0 * We define this here since , , and =C2=A0 * require it. =C2=A0 */ -#if __GNUC_PREREQ__(4, 1) #define=C2=A0=C2=A0=C2=A0 __offsetof(type, field)=C2=A0=C2=A0=C2=A0 __buil= tin_offsetof(type, field) -#else -#ifndef __cplusplus -#define=C2=A0=C2=A0=C2=A0 __offsetof(type, field) \ -=C2=A0=C2=A0=C2=A0 ((__size_t)(__uintptr_t)((const volatile void *)&((type= *)0)->field)) -#else -#define=C2=A0=C2=A0=C2=A0 __offsetof(type, field)=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 (__offsetof__ (reinterpret_cast <__size_t>=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 (&reinterpret_cast= =C2=A0=C2=A0=C2=A0 \ -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (static_cas= t (0)->field)))) -#endif -#endif #define=C2=A0=C2=A0=C2=A0 __rangeof(type, start, end) \ =C2=A0=C2=A0=C2=A0 (__offsetof(type, end) - __offsetof(type, start)) =20 =20 ------=_Part_165696_1045442462.1719082066515 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
It was long ago when I last = touched this but FWIW ...
<= br>
clang used to report itself= as GCC 4.2 and kept it's GCC extension support level consistent with that = version so these version numbers were relevant.

Pedro.

=20
=20
On Thursday, June 20, 2024 at 09:41:34 PM GMT-5, Wa= rner Losh <imp@freebsd.org> wrote:


=20 =20
The branch main has been updated by i= mp:


commit d5c01e1124ffa4adb2513e7e8d708d7072db= fc75
Author:    Warner Losh <imp@FreeBSD= .org>
AuthorDate: 2024-06-20 23:03:15 +000= 0
Commit:    Warner Losh <imp@FreeBSD.= org>
CommitDate: 2024-06-21 02:41:09 +0000=

    cdefs.h= : Remove pre gcc 5.0 support
   
    Reviewed by:        =     brooks
    Differential R= evision:  https://reviews.freebsd.org/D45656
    Sponsored by:          = Netflix
---
sys/sys/cd= efs.h | 54 ------------------------------------------------------
=
1 file changed, 54 deletions(-)

diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h<= br>
index a6ecdca5d8b9..43d179b82020 100644
=
--- a/sys/sys/cdefs.h
+++ b/sys/= sys/cdefs.h
@@ -164,18 +164,9 @@
#define    __aligned(x)    __attri= bute__((__aligned__(x)))
#define  &nbs= p; __section(x)    __attribute__((__section__(x)))
=
#define    __writeonly    _= _unused
-#if __GNUC_PREREQ__(4, 3) || __has_attri= bute(__alloc_size__)
#define    _= _alloc_size(x)    __attribute__((__alloc_size__(x)))
#define    __alloc_size2(n, x) &nbs= p;  __attribute__((__alloc_size__(n, x)))
-#= else
-#define    __alloc_size(x)
-#define    __alloc_size2(n, x)
=
-#endif
-#if __GNUC_PREREQ= __(4, 9) || __has_attribute(__alloc_align__)
#de= fine    __alloc_align(x)    __attribute__((__= alloc_align__(x)))
-#else
-#define    __alloc_align(x)
-#= endif

/*
  * Keywords added in C11.
@@= -199,15 +190,6 @@
#define    _Al= ignof(x)        __alignof(x)
#endif

-#i= f !defined(__cplusplus) && !__has_extension(c_atomic) && \<= br>
-    !__has_extension(cxx_atomic) = && !__GNUC_PREREQ__(4, 7)
-/*
- * No native support for _Atomic(). Place object in structu= re to prevent
- * most forms of direct non-atomic= access.
- */
-#define&= nbsp;   _Atomic(T)        struct { = T volatile __val; }
-#endif
-
#if defined(__cplusplus) && __cpl= usplus >=3D 201103L
#define   = _Noreturn        [[noreturn]]
#else
@@ -218,15 +200,6 @@
=
#if (defined(__cplusplus) && __cplusplus >=3D = 201103L) || \
    __has_extension(cxx_= static_assert)
#define    _Static= _assert(x, y)    static_assert(x, y)
-#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus)
-/* Nothing, gcc 4.6 and higher has _Static_assert built-in = */
-#elif defined(__COUNTER__)
-#define    _Static_assert(x, y)    = __Static_assert(x, __COUNTER__)
-#define &nb= sp;  __Static_assert(x, y)    ___Static_assert(x, y)
-#define    ___Static_assert(x, y)&n= bsp;   typedef char __assert_ ## y[(x) ? 1 : -1] \
-             = ;   __unused
-#else
-#define    _Static_assert(x, y)    = struct __hack
#endif
= #endif

@@ -276,7 +249= ,6 @@
  * void bar(int myArray[__min_size(10= )]);
  */
#if !de= fined(__cplusplus) && \
-    (d= efined(__clang__) || __GNUC_PREREQ__(4, 6)) && \
    (!defined(__STDC_VERSION__) || (__STDC_VERSION__ &g= t;=3D 199901))
#define __min_size(x)  =   static (x)
#else
@@ -302,17 +274,9 @@
#define   = __result_use_or_ignore_check
#endif /* !__clang= __ */

-#if __GNUC_PRE= REQ__(4, 1)
#define    __returns_= twice    __attribute__((__returns_twice__))
-#else
-#define    __ret= urns_twice
-#endif
-#if __GNUC_PREREQ__(4, 6) || __has_builtin(__built= in_unreachable)
#define    __unre= achable()    __builtin_unreachable()
-#else
-#define    __unreachabl= e()    ((void)0)
-#endif
=

#if !defined(__STRICT_ANSI__)= || __STDC_VERSION__ >=3D 199901
#define = ;   __LONG_LONG_SUPPORTED
@@ -353,33 +3= 17,15 @@
#define    __predict_tru= e(exp)    __builtin_expect((exp), 1)
= #define    __predict_false(exp)    __builtin_expec= t((exp), 0)

-#if __GN= UC_PREREQ__(4, 0)
#define    __nu= ll_sentinel    __attribute__((__sentinel__))
#define    __exported    __attrib= ute__((__visibility__("default")))
#define =    __hidden    __attribute__((__visibility__("hidd= en")))
-#else
-#define&= nbsp;   __null_sentinel
-#define &= nbsp;  __exported
-#define   = __hidden
-#endif

=
/*
  * We define thi= s here since <stddef.h>, <sys/queue.h>, and <sys/types.h>=
  * require it.
&= nbsp; */
-#if __GNUC_PREREQ__(4, 1)
#define    __offsetof(type, field)  =   __builtin_offsetof(type, field)
-#else
-#ifndef __cplusplus
-#de= fine    __offsetof(type, field) \
= -    ((__size_t)(__uintptr_t)((const volatile void *)&((= type *)0)->field))
-#else
-#define    __offsetof(type, field)    =                = \
-  (__offsetof__ (reinterpret_cast <__= size_t>            \
-               = ; (&reinterpret_cast <const volatile char &>  &nbs= p; \
-            &= nbsp;     (static_cast<type *> (0)->field))))
<= div dir=3D"ltr">-#endif
-#endif
#define    __rangeof(type, start, end) \
=
    (__offsetof(type, end) - __offsetof(ty= pe, start))

------=_Part_165696_1045442462.1719082066515-- From nobody Sat Jun 22 22:57:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W68l01mwBz5PDpC; Sat, 22 Jun 2024 22:57: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 4W68l015RZz4T5f; Sat, 22 Jun 2024 22:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719097068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NFbBoH+AWt0gvOQOeddX7l/nLV8jWa4f3HcvV9Pt1Ts=; b=ShP5UKVI++MTGX95osjGY73iEi55U8alrtDN0jVdHRtjwLoekRdlsLo7vdjsIQd6377/oA wBFMYB2x7B3ax1iaS2ZDeH+WFc/s1ftZsqnjRtg9p2ubJjCLQlYBvUczTgRGmgEh1oCKxF K3sfSz3+slJMcq5Q7B0m97NtT4sc5oUCuXQuZFhTz3BVf+en2d63F09Ws0lS6SlYCwumhQ kNf1Q65ONpZQIH4rDX6RkTv0131LkvTtMhg42ywgp91yE06fMFRO6mBSaCfQ77vMDyqeEo I12N58O3WrVFiz+VIeQXdN/2ZUDqejoqbxZHeTVJlDXoYH+Fmr5H08K0s1tI1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719097068; a=rsa-sha256; cv=none; b=e8T5NigIYqXX4s6aOeDMVo0ngGod6ilJiYRNH9tQ+mAZenbq/TbfWoPpW17hqZbFGKWMqD 9c8+esUXbkHUtEJvY7k902S+vR7ccyUFew4Ra3nbv5nG69iMLiO3v50eL/5TlLOgd3Q09R ADs4slPAYGiiaKHCNh17/P9db38/S+cJlXgwPWhTzVJEVuscb4Lf8IoKzPmuw7eTc0l08A D8StGrIX5GMtLCz2NfOrCGZm6kRp6UMrh3ex+PCuBLb4XQ/DQvSr45Cjkc/0ttMRv/qxMP bswuNm1hQnvWJTYrUHUU96oRydwjl9FRjzCtPNKGI8XFHAIBOPZUZHgbceqT/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=1719097068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NFbBoH+AWt0gvOQOeddX7l/nLV8jWa4f3HcvV9Pt1Ts=; b=MxaMzpgauv/6NkcgA3/08HiiCZ3CCfKngXR5pqvx3ZP2RFf3kNvyuRF1qX5db89nZploIk M4SK7QCvLwlEnkxKTXrxWr2bnx1kDN+kIpiNfjgolr1MDvgOJ0pM/Th1cWrZH4EjnQK1NR ZbLPaiOsJaT96JkXooHYk3BQjC7xGZ0E9mQfx+9dyMJg707pkcfswb2Wvwzwnp+t4vGpeE nq2S/ct21Z9dyB9IMtEixAosKIdiEgl2MnxSuhoMiDKaoBca+jMeVjxgBLw6V4p4Z5CITe 1YtYBzK9vzBlAfni/6GXOxeOPpsjFC1Ap7VDsQCbR8361oiPe6uhYVkqRGgE/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 4W68l00hbbz19Q5; Sat, 22 Jun 2024 22:57: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 45MMvmk2039948; Sat, 22 Jun 2024 22:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45MMvmdl039945; Sat, 22 Jun 2024 22:57:48 GMT (envelope-from git) Date: Sat, 22 Jun 2024 22:57:48 GMT Message-Id: <202406222257.45MMvmdl039945@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: dfaeeacc2cc2 - main - nfsd: Allow a mutex lock for clientID handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfaeeacc2cc29d0497ecd4cd5b7fd0d5ab61fcd5 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=dfaeeacc2cc29d0497ecd4cd5b7fd0d5ab61fcd5 commit dfaeeacc2cc29d0497ecd4cd5b7fd0d5ab61fcd5 Author: Rick Macklem AuthorDate: 2024-06-22 22:56:40 +0000 Commit: Rick Macklem CommitDate: 2024-06-22 22:56:40 +0000 nfsd: Allow a mutex lock for clientID handling On Feb. 28, a problem was reported on freebsd-stable@ where a nfsd thread processing an ExchangeID operation was blocked for a long time by another nfsd thread performing a copy_file_range. This occurred because the copy_file_range was taking a long time, but also because handling a clientID requires that all other nfsd threads be blocked via an exclusive lock, as required by ExchangeID. This patch allows clientID handling to be done with only a mutex held (instead of an exclusive lock that blocks all other nfsd threads) when vfs.nfsd.enable_locallocks is 0. For the case of vfs.nfsd.enable_locallocks set to 1, the exclusive lock that blocks all nfsd threads is still required. This patch does make changing the value of vfs.nfsd.enable_locallocks somewhat racy. A future commit will ensure any change is done when all nfsd threads are blocked to avoid this racyness. MFC after: 1 month --- sys/fs/nfsserver/nfs_nfsdstate.c | 245 ++++++++++++++++++++++++++------------- 1 file changed, 162 insertions(+), 83 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 7a28e51e21fc..6b40e0f64141 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -245,6 +245,45 @@ static void nfsrv_issuedelegation(struct vnode *vp, struct nfsclient *clp, u_quad_t filerev, uint64_t rdonly, struct nfsstate **new_delegp, struct nfsstate *new_stp, struct nfslockfile *lfp, uint32_t *rflagsp, nfsv4stateid_t *delegstateidp); +static void nfsrv_clientlock(bool mlocked); +static void nfsrv_clientunlock(bool mlocked); + +/* + * Lock the client structure, either with the mutex or the exclusive nfsd lock. + */ +static void +nfsrv_clientlock(bool mlocked) +{ + int igotlock; + + if (mlocked) { + NFSLOCKSTATE(); + } else { + NFSLOCKV4ROOTMUTEX(); + nfsv4_relref(&nfsv4rootfs_lock); + do { + igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL, + NFSV4ROOTLOCKMUTEXPTR, NULL); + } while (!igotlock); + NFSUNLOCKV4ROOTMUTEX(); + } +} + +/* + * Unlock the client structure. + */ +static void +nfsrv_clientunlock(bool mlocked) +{ + + if (mlocked) { + NFSUNLOCKSTATE(); + } else { + NFSLOCKV4ROOTMUTEX(); + nfsv4_unlock(&nfsv4rootfs_lock, 1); + NFSUNLOCKV4ROOTMUTEX(); + } +} /* * Scan the client list for a match and either return the current one, @@ -266,7 +305,10 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, struct sockaddr_in6 *sin6, *rin6; #endif struct nfsdsession *sep, *nsep; - int zapit = 0, gotit, hasstate = 0, igotlock; + SVCXPRT *old_xprt; + struct nfssessionhead old_sess; + int zapit = 0, gotit, hasstate = 0; + bool mlocked; static u_int64_t confirm_index = 0; /* @@ -294,14 +336,11 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, */ new_clp->lc_program = 0; + mlocked = true; + if (nfsrv_dolocallocks != 0) + mlocked = false; /* Lock out other nfsd threads */ - NFSLOCKV4ROOTMUTEX(); - nfsv4_relref(&nfsv4rootfs_lock); - do { - igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL, - NFSV4ROOTLOCKMUTEXPTR, NULL); - } while (!igotlock); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientlock(mlocked); /* * Search for a match in the client list. @@ -318,6 +357,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, if (gotit == 0) i++; } + old_xprt = NULL; if (!gotit || (clp->lc_flags & (LCL_NEEDSCONFIRM | LCL_ADMINREVOKED))) { if ((nd->nd_flag & ND_NFSV41) != 0 && confirmp->lval[1] != 0) { @@ -325,9 +365,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, * For NFSv4.1, if confirmp->lval[1] is non-zero, the * client is trying to update a confirmed clientid. */ - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); confirmp->lval[1] = 0; error = NFSERR_NOENT; goto out; @@ -337,7 +375,10 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, */ if (i != nfsrv_clienthashsize) { LIST_REMOVE(clp, lc_hash); - nfsrv_cleanclient(clp, p, false, NULL); + if (mlocked) + nfsrv_cleanclient(clp, p, true, &old_xprt); + else + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); zapit = 1; @@ -372,11 +413,12 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, NFSD_VNET(nfsstatsv1_p)->srvclients++; nfsrv_openpluslock++; nfsrv_clients++; - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); - if (zapit) + nfsrv_clientunlock(mlocked); + if (zapit != 0) { + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); nfsrv_zapclient(clp, p); + } *new_clpp = NULL; goto out; } @@ -390,7 +432,10 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, */ if (clp->lc_expiry < NFSD_MONOSEC && (!LIST_EMPTY(&clp->lc_open) || !LIST_EMPTY(&clp->lc_deleg))) { - nfsrv_cleanclient(clp, p, false, NULL); + if (mlocked) + nfsrv_cleanclient(clp, p, true, &old_xprt); + else + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); } @@ -435,9 +480,9 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, break; #endif } - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); error = NFSERR_CLIDINUSE; goto out; } @@ -452,13 +497,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, */ LIST_REMOVE(clp, lc_hash); - /* Get rid of all sessions on this clientid. */ - LIST_FOREACH_SAFE(sep, &clp->lc_session, sess_list, nsep) { - ret = nfsrv_freesession(NULL, sep, NULL, false, NULL); - if (ret != 0) - printf("nfsrv_setclient: verifier changed free" - " session failed=%d\n", ret); - } + LIST_NEWHEAD(&old_sess, &clp->lc_session, sess_list); new_clp->lc_flags |= LCL_NEEDSCONFIRM; if ((nd->nd_flag & ND_NFSV41) != 0) { @@ -502,21 +541,31 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, NFSD_VNET(nfsstatsv1_p)->srvclients++; nfsrv_openpluslock++; nfsrv_clients++; - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + if (!mlocked) { + nfsrv_clientunlock(mlocked); + NFSLOCKSTATE(); + } /* * Must wait until any outstanding callback on the old clp * completes. */ - NFSLOCKSTATE(); while (clp->lc_cbref) { clp->lc_flags |= LCL_WAKEUPWANTED; (void)mtx_sleep(clp, NFSSTATEMUTEXPTR, PZERO - 1, "nfsd clp", 10 * hz); } NFSUNLOCKSTATE(); + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); + /* Get rid of all sessions on this clientid. */ + LIST_FOREACH_SAFE(sep, &old_sess, sess_list, nsep) { + ret = nfsrv_freesession(NULL, sep, NULL, false, NULL); + if (ret != 0) + printf("nfsrv_setclient: verifier changed free" + " session failed=%d\n", ret); + } + nfsrv_zapclient(clp, p); *new_clpp = NULL; goto out; @@ -568,24 +617,31 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp, nfsrv_openpluslock++; nfsrv_clients++; } - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + if (!mlocked) + nfsrv_clientunlock(mlocked); if ((nd->nd_flag & ND_NFSV41) == 0) { /* * Must wait until any outstanding callback on the old clp * completes. */ - NFSLOCKSTATE(); + if (!mlocked) + NFSLOCKSTATE(); while (clp->lc_cbref) { clp->lc_flags |= LCL_WAKEUPWANTED; (void)mtx_sleep(clp, NFSSTATEMUTEXPTR, PZERO - 1, "nfsdclp", 10 * hz); } NFSUNLOCKSTATE(); + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); nfsrv_zapclient(clp, p); *new_clpp = NULL; + } else { + if (mlocked) + NFSUNLOCKSTATE(); + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); } out: @@ -605,11 +661,13 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, struct nfsstate *stp; int i; struct nfsclienthashhead *hp; - int error = 0, igotlock, doneok; + int error = 0, doneok, igotlock; struct nfssessionhash *shp; struct nfsdsession *sep; uint64_t sessid[2]; - bool sess_replay; + CLIENT *client; + SVCXPRT *old_xprt; + bool mlocked, sess_replay; static uint64_t next_sess = 0; if (clpp) @@ -626,13 +684,27 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, * already held. Otherwise, we need to get either that or, * for the case of Confirm, lock out the nfsd threads. */ + client = NULL; + old_xprt = NULL; + mlocked = true; + if (nfsrv_dolocallocks != 0) + mlocked = false; if (opflags & CLOPS_CONFIRM) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_relref(&nfsv4rootfs_lock); - do { - igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL, - NFSV4ROOTLOCKMUTEXPTR, NULL); - } while (!igotlock); + if (nsep != NULL && + (nsep->sess_crflags & NFSV4CRSESS_CONNBACKCHAN) != 0) + client = (struct __rpc_client *) + clnt_bck_create(nd->nd_xprt->xp_socket, + cbprogram, NFSV4_CBVERS); + if (mlocked) { + nfsrv_clientlock(mlocked); + } else { + NFSLOCKV4ROOTMUTEX(); + nfsv4_relref(&nfsv4rootfs_lock); + do { + igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, + NULL, NFSV4ROOTLOCKMUTEXPTR, NULL); + } while (!igotlock); + } /* * Create a new sessionid here, since we need to do it where * there is a mutex held to serialize update of next_sess. @@ -641,7 +713,8 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, sessid[0] = ++next_sess; sessid[1] = clientid.qval; } - NFSUNLOCKV4ROOTMUTEX(); + if (!mlocked) + NFSUNLOCKV4ROOTMUTEX(); } else if (opflags != CLOPS_RENEW) { NFSLOCKSTATE(); } @@ -678,9 +751,9 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, } if (error) { if (opflags & CLOPS_CONFIRM) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); + if (client != NULL) + CLNT_RELEASE(client); } else if (opflags != CLOPS_RENEW) { NFSUNLOCKSTATE(); } @@ -725,7 +798,10 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, * for an Open with CLAIM_DELEGATE_PREV unless in * grace, but get rid of the rest of the state. */ - nfsrv_cleanclient(clp, p, false, NULL); + if (mlocked) + nfsrv_cleanclient(clp, p, true, &old_xprt); + else + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_olddeleg); if (nfsrv_checkgrace(nd, clp, 0)) { /* In grace, so just delete delegations */ @@ -749,10 +825,10 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, /* Hold a reference on the xprt for a backchannel. */ if ((nsep->sess_crflags & NFSV4CRSESS_CONNBACKCHAN) != 0 && !sess_replay) { - if (clp->lc_req.nr_client == NULL) - clp->lc_req.nr_client = (struct __rpc_client *) - clnt_bck_create(nd->nd_xprt->xp_socket, - cbprogram, NFSV4_CBVERS); + if (clp->lc_req.nr_client == NULL) { + clp->lc_req.nr_client = client; + client = NULL; + } if (clp->lc_req.nr_client != NULL) { SVC_ACQUIRE(nd->nd_xprt); CLNT_ACQUIRE(clp->lc_req.nr_client); @@ -769,13 +845,15 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, NFSX_V4SESSIONID); if (!sess_replay) { shp = NFSSESSIONHASH(nsep->sess_sessionid); - NFSLOCKSTATE(); + if (!mlocked) + NFSLOCKSTATE(); NFSLOCKSESSION(shp); LIST_INSERT_HEAD(&shp->list, nsep, sess_hash); LIST_INSERT_HEAD(&clp->lc_session, nsep, sess_list); nsep->sess_clp = clp; NFSUNLOCKSESSION(shp); - NFSUNLOCKSTATE(); + if (!mlocked) + NFSUNLOCKSTATE(); } } } @@ -809,9 +887,11 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp, clp->lc_expiry = nfsrv_leaseexpiry(); } if (opflags & CLOPS_CONFIRM) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); + if (client != NULL) + CLNT_RELEASE(client); + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); } else if (opflags != CLOPS_RENEW) { NFSUNLOCKSTATE(); } @@ -831,21 +911,20 @@ nfsrv_destroyclient(struct nfsrv_descript *nd, nfsquad_t clientid, NFSPROC_T *p) { struct nfsclient *clp; struct nfsclienthashhead *hp; - int error = 0, i, igotlock; + SVCXPRT *old_xprt; + int error = 0, i; + bool mlocked; if (NFSD_VNET(nfsrvboottime) != clientid.lval[0]) { error = NFSERR_STALECLIENTID; goto out; } + mlocked = true; + if (nfsrv_dolocallocks != 0) + mlocked = false; /* Lock out other nfsd threads */ - NFSLOCKV4ROOTMUTEX(); - nfsv4_relref(&nfsv4rootfs_lock); - do { - igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL, - NFSV4ROOTLOCKMUTEXPTR, NULL); - } while (igotlock == 0); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientlock(mlocked); hp = NFSCLIENTHASH(clientid); LIST_FOREACH(clp, hp, lc_hash) { @@ -853,9 +932,7 @@ nfsrv_destroyclient(struct nfsrv_descript *nd, nfsquad_t clientid, NFSPROC_T *p) break; } if (clp == NULL) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); /* Just return ok, since it is gone. */ goto out; } @@ -863,9 +940,7 @@ nfsrv_destroyclient(struct nfsrv_descript *nd, nfsquad_t clientid, NFSPROC_T *p) /* Check for the SP4_MACH_CRED case. */ error = nfsrv_checkmachcred(NFSV4OP_DESTROYCLIENTID, nd, clp); if (error != 0) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); goto out; } @@ -878,28 +953,28 @@ nfsrv_destroyclient(struct nfsrv_descript *nd, nfsquad_t clientid, NFSPROC_T *p) /* Scan for state on the clientid. */ for (i = 0; i < nfsrv_statehashsize; i++) if (!LIST_EMPTY(&clp->lc_stateid[i])) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); error = NFSERR_CLIENTIDBUSY; goto out; } if (!LIST_EMPTY(&clp->lc_session) || !LIST_EMPTY(&clp->lc_deleg)) { - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); error = NFSERR_CLIENTIDBUSY; goto out; } /* Destroy the clientid and return ok. */ - nfsrv_cleanclient(clp, p, false, NULL); + old_xprt = NULL; + if (mlocked) + nfsrv_cleanclient(clp, p, true, &old_xprt); + else + nfsrv_cleanclient(clp, p, false, NULL); nfsrv_freedeleglist(&clp->lc_deleg); nfsrv_freedeleglist(&clp->lc_olddeleg); LIST_REMOVE(clp, lc_hash); - NFSLOCKV4ROOTMUTEX(); - nfsv4_unlock(&nfsv4rootfs_lock, 1); - NFSUNLOCKV4ROOTMUTEX(); + nfsrv_clientunlock(mlocked); + if (old_xprt != NULL) + SVC_RELEASE(old_xprt); nfsrv_zapclient(clp, p); out: NFSEXITCODE2(error, nd); @@ -1388,8 +1463,12 @@ nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p, bool locked, struct nfsstate *stp, *nstp; struct nfsdsession *sep, *nsep; - LIST_FOREACH_SAFE(stp, &clp->lc_open, ls_list, nstp) - nfsrv_freeopenowner(stp, 1, p); + LIST_FOREACH_SAFE(stp, &clp->lc_open, ls_list, nstp) { + if (locked) + nfsrv_freeopenowner(stp, 0, p); + else + nfsrv_freeopenowner(stp, 1, p); + } if ((clp->lc_flags & LCL_ADMINREVOKED) == 0) LIST_FOREACH_SAFE(sep, &clp->lc_session, sess_list, nsep) (void)nfsrv_freesession(NULL, sep, NULL, locked, From nobody Sun Jun 23 10:51:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6SZ76fZ2z5PHh7; Sun, 23 Jun 2024 10:51: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 4W6SZ763jxz4SPH; Sun, 23 Jun 2024 10:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719139871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLZl02SAJY3A1rFyi0q+wK63szoxRjn3Z4LcinBPo68=; b=f6YYJ833j3kRQRBvtR+WyIxizwxP+0xHX1dRkST2CWSsBnq7Z5cSprQfQCvfVeXi2gDZxV Zvcq4Ia6Dc+6hVR755SijX6TDL2Q6tWgWEvZbMrxcQ8FFiJtfpsSH9wALuaKviGtVxfHG/ Xdk0V5i5wrAQjCLYZMTjJ1MBRPwBBO7VLLsjQcvb0B0CnhzuTTdVJAikj9Ad9w5DoQS2VD rBD55HzxFWIzgzyuje4pp0cG28/4LmfRCEjQT059BXiokFtvoNIKOt+qaTUcYv1g69Hfuz YLZTgo2ATNMaQkMeTPthSIay6Gpd2biQvQR5wUAHRZDreflfQ7sQ/xM6AJptsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719139871; a=rsa-sha256; cv=none; b=STJmmmqqibKK+8V070bmbWNS6fm5CJpqvQmc6ifQ/aaAiyyDLsV3LsMLse6RDGXQDSFvmc XqcRWrCGJbMATQMiNqMCbMMC31edMmGq1gfvc1iqgPiomtYgDgN5WxFe2S7Bg63rEDT6PU sWSfEJMZ74nE31pcYhffKlnxiGh9Qp7xWYM3ZCQ/s1iY/5RU5NlPvO2uo0rUpJL6b7TUPB nn8X4+RKoKgrGvTGtqyT8LcK5n2f7nmhuyaHDIq1V4PbqOUPlVRhSRTRHp869ZYwMZrNIS OhpobfjhQMU0e8DLcnkiRHnqNLtPznbIOvhJtZZ+DsDG70Xb8u8IGXdlD4Aqkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719139871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLZl02SAJY3A1rFyi0q+wK63szoxRjn3Z4LcinBPo68=; b=BxyMnbBdo/vxgNpvX1tTkopWkK1kVpIuDGQlrBTJYaQsdbcw7DtPVn0A10NPRI1GAgMHlA Gbumpsag/cuT6dJeXJbInjC0tNWVuEnt5AW2V8tL/xDnuTTFph48h1OM4D/uuhfRdpbsJB wJi4jt6zeZSK0WzsjuIasfRznbplNDp0Pfk+OaMn8bph6o4aCu22Rl5hsnqxDDEl2aJHiw bC8H37Dsf0VpKeazKCiZAmLXcxKFrLWdM+l2UBjQZKTSuhulC2xrfiRqJvlQX7H/dNnCzM m3JXkFJr8Uzb76n7UW9TuOahx7rqNjVulrtf/g5VAVcqGZHBRysxqYpJqkrDXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6SZ75g6RzXpk; Sun, 23 Jun 2024 10:51: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 45NApBV3057599; Sun, 23 Jun 2024 10:51:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NApB5G057597; Sun, 23 Jun 2024 10:51:11 GMT (envelope-from git) Date: Sun, 23 Jun 2024 10:51:11 GMT Message-Id: <202406231051.45NApB5G057597@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: 16c3d7e1fa15 - main - erf.3: Add a STANDARDS section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16c3d7e1fa150ee136b910448cf431e8deab5293 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=16c3d7e1fa150ee136b910448cf431e8deab5293 commit 16c3d7e1fa150ee136b910448cf431e8deab5293 Author: Gordon Bergling AuthorDate: 2024-06-23 10:50:47 +0000 Commit: Gordon Bergling CommitDate: 2024-06-23 10:50:47 +0000 erf.3: Add a STANDARDS section Add a STANDARDS section for the erf(3) manual page. PR: 273413 Reviewed by: pauamma_gundo.com MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44140 --- lib/msun/man/erf.3 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3 index d5be06036ce9..8d66017ed11c 100644 --- a/lib/msun/man/erf.3 +++ b/lib/msun/man/erf.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 13, 2014 +.Dd June 23, 2024 .Dt ERF 3 .Os .Sh NAME @@ -86,6 +86,17 @@ subtracts the result of the error function from 1.0. .Sh SEE ALSO .Xr math 3 +.Sh STANDARDS +The +.Fn erf , +.Fn erff , +.Fn erfl , +.Fn erfc , +.Fn erfcf +and +.Fn erfcl +functions conform to +.St -isoC-99 . .Sh HISTORY The .Fn erf From nobody Sun Jun 23 11:36:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6TZ33TgSz5PMcL; Sun, 23 Jun 2024 11:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W6TZ32xtTz4Z1W; Sun, 23 Jun 2024 11:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719142571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGOvO+wmavSa8Ya2RBC+WqM9sqUFGVBzOQEWetmffyA=; b=ch1WOdEebd1J9T1uv8iSk8wXH5jVubU4H5B+2WyS8vq9N1yA4jO7KVwC8gitcJTa+Pnw4/ wt6r9kzVpk4C7HXEA7YZ/B5AJmJxX39wmOXdFN40L3DUIXmWCuxOAC7xO/3bMC3dzUGj0r IfnvWv7JGWLk02d/uywTSzsMl/OQjVfXyVDG4/VUB7yR+q9LSOX3ULGD7aRKLimz3h99Bu J1GvwuAzK0Lt/e26wOMj9Q8mYjeFkcyqzeIZ+gkBzj+/Oroj2CaFg2jeJ3ZxcPoq6QejZw FUR367rCGRdKLglsJLa3n+zovndQ2z2GNWnA1OZpVGcc/Nuplbsx4owdmYNMTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719142571; a=rsa-sha256; cv=none; b=EhQtw1S5c+KrWRjnEJvmwRY3YdTRv8JNNKNkz3nieGhaBHLnAaRwB1HQJXu3Welb2JAI9Q Lz72Mf4WnWlzwQOshFJGAa+Sqo7eXkJqzwOwSqrUMpmK5PhMFuNhrDCEkMKLti3vy1SSz4 mRZhN8bhUX+VNPZvUlGUZwD6FGryUbwvdwBfZ0X3udS+MgCTU/iIyWXseCqjCU8HCb7Buc HDr/vYjiTKa+FPJBUDkWAOS9JlKlqM5sWBaP3L39XSpvWDeMRyUDEfXHGNsaATic4jbgfZ 9mtekJ+J+0voFBWRhHu1wo6SeD7Tue8PWAN5dWt1pXdYjQGA8ID9evAA6t4JmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719142571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGOvO+wmavSa8Ya2RBC+WqM9sqUFGVBzOQEWetmffyA=; b=MOFCbGeTlm69hAlMJdESoHAuNnaFBhgkrWO0MMiG1ZGGBM+3oba0nSY9z1ebpbK/AGuJdx H0qh9JGHNc64eaePUFzJsIB04k9J/ZtmmCnTIgIAk1UTwjBHN5GvFuWNFgHOTr8hCCNCB/ pwuPFcaK4D964N0crwzW4EEzb+pk/q7V7ZtPSqvDqAgI4GJIqcYgQgG7ALKN0xa9BTleGk nc/RAzoKlLBFOr0TAwsIBr4j5fgSBkoqKf6sQ8M/J3EIeODXpl4ZPQAoygEMRRgyFkdJ7l ZeUtyDFsRxiwZTOBsF+wJfpQBoRoXB7WOcbXHqpM/GEkLWBFz5acwIe5b5V0Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6TZ32YBkzYXl; Sun, 23 Jun 2024 11:36: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 45NBaBDJ034286; Sun, 23 Jun 2024 11:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NBaBJX034283; Sun, 23 Jun 2024 11:36:11 GMT (envelope-from git) Date: Sun, 23 Jun 2024 11:36:11 GMT Message-Id: <202406231136.45NBaBJX034283@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: 60117f9ee58e - main - lo: update man page since SCTP checksum offloading is supported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60117f9ee58e202be55a8af5bb6b6c768e7a940e Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=60117f9ee58e202be55a8af5bb6b6c768e7a940e commit 60117f9ee58e202be55a8af5bb6b6c768e7a940e Author: Michael Tuexen AuthorDate: 2024-06-23 11:27:54 +0000 Commit: Michael Tuexen CommitDate: 2024-06-23 11:34:50 +0000 lo: update man page since SCTP checksum offloading is supported The loopback interface supports SCTP checksum offloading in addition to TCP and UDP. Reviewed by: gbe MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45698 --- share/man/man4/lo.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4 index 2f0242b267c2..7bad739eec41 100644 --- a/share/man/man4/lo.4 +++ b/share/man/man4/lo.4 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 25, 2012 +.Dd June 23, 2024 .Dt LO 4 .Os .Sh NAME @@ -55,11 +55,11 @@ be configured first unless no hardware interfaces exist. .Pp If the transmit checksum offload capability flag is enabled on a loopback -interface, checksums will not be generated by IP, UDP, or TCP for packets +interface, checksums will not be generated by IP, UDP, TCP, or SCTP for packets sent on the interface. .Pp If the receive checksum offload capability flag is enabled on a loopback -interface, checksums will not be validated by IP, UDP, or TCP for packets +interface, checksums will not be validated by IP, UDP, TCP, or SCTP for packets received on the interface. .Pp By default, both receive and transmit checksum flags will be enabled, in From nobody Sun Jun 23 21:48:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6l863jxQz5P4R0; Sun, 23 Jun 2024 21:48: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 4W6l861WnQz4Ydx; Sun, 23 Jun 2024 21:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719179286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bsRCOAflU9F8JEj3yRvg3FC0JN01BH3bi19pMBNIuR8=; b=p3TKa4A7wszK2pdSNTjOPpRYhuEbEim+7d3QaVlWEjS/wof7fEu/FP3ekG7MyGgHYMrYwW RsSQX3hxEv5UtRtabmt8ATYqMwRiONGjSIRaeKWQx8aZUbXNZDm83i/3HQRkyGIcfE9xdc X4qUqOLq5MFrOQHYQIWzoTy4M2Bxz4VO5vseKwREiuZgeXf1mCjCwdZCcL/ZzcIKeA5pm3 OZOPaoCBZsMcEgp/dtX6WF0C34Xkd+YgHiT5/JKIEufFyI77AFWTxaBVYkhN1p+myHwkyB S1FiERYsBYbBi8qOROC2VOe/NqMX2mlnSbZ9v+417yRwA4B1UU3cLzurK8RwYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719179286; a=rsa-sha256; cv=none; b=TcKm84oJR78Gcq1e2OXYUe/e7FWiW5i2jzbWR8/UYS6Q5pOWSisC7j8VYnL0w0aMphtCdb rK1m6HazyXK/WIMNd3sWC0ejqB5jWyVyjvy0rFBpiLBEmUq7lnyMNg+HXzHIASOGnfhMzu V76dX+AWC2Mf/Y9A5mNYqDjscq3USHP/0ZQ7mWBGHSusqsb6KxzPRicnJf8Q11J+S343VM vEd1vdzs9K803plixN1ejuTmk8YBEvkisKDKEj4cty+1bk+TrEaTfq0aJnm6opeC8BUwiD ADwWlD1ke4mEHyXGVIG6oj8nUdP0NyeI49XASoaPvH5QlGQdpBe9A+1SCvF6Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719179286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bsRCOAflU9F8JEj3yRvg3FC0JN01BH3bi19pMBNIuR8=; b=DeLAYxlxXjYcm12AidOudJ6+/kOHRHkOn7L13BwEV1fh0DjoYq5UFORGGSLt8LCj3ecGJf oMwU8EKRRJ7osq05IW5Xvnd46aSEoTbqYNSmQO0CA+baHIhMFrHsw/ZIC4Rp5Xubi4x97R 0j7J0XONSDpMVjv0LvUNhDNskXzmymxkD7NBPc0zY+tLe2k7c+fGzUeKyW9Jsl0KM47c0P WIyU6XfkVjLWq3TnnGm0MJzFVoDA4sMKDykRLMuGOgHBZJ5tg+MRm5Sb2chXJBUkFZrIwM nLvI6SuS+xW6/V06xfPSeAVtir/JpS3Nzs2TEyGmBdUSwY5yuyjjEwuUE2xhnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6l8614ntzryD; Sun, 23 Jun 2024 21:48: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 45NLm6J7063937; Sun, 23 Jun 2024 21:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NLm64v063934; Sun, 23 Jun 2024 21:48:06 GMT (envelope-from git) Date: Sun, 23 Jun 2024 21:48:06 GMT Message-Id: <202406232148.45NLm64v063934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: fda32d586035 - main - lock.9: describe lockmgr_{disowned,lock_flags,slock,unlock,xlock} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fda32d586035f0bead930ecdb4547869e1c80fb5 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=fda32d586035f0bead930ecdb4547869e1c80fb5 commit fda32d586035f0bead930ecdb4547869e1c80fb5 Author: Ryan Libby AuthorDate: 2024-06-23 21:46:31 +0000 Commit: Ryan Libby CommitDate: 2024-06-23 21:46:31 +0000 lock.9: describe lockmgr_{disowned,lock_flags,slock,unlock,xlock} Describe and link the following functions in the lockgmr API: - lockmgr_disowned - lockmgr_lock_flags - lockmgr_slock - lockmgr_unlock - lockmgr_xlock This is not a complete update of lock.9 but at least covers all the main lock operations. Reviewed by: gbe, kib Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45689 --- share/man/man9/Makefile | 5 ++++ share/man/man9/lock.9 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index dfc9bd996504..38d836b1647a 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1431,9 +1431,14 @@ MLINKS+=lock.9 lockdestroy.9 \ lock.9 lockmgr_args_rw.9 \ lock.9 lockmgr_assert.9 \ lock.9 lockmgr_disown.9 \ + lock.9 lockmgr_disowned.9 \ + lock.9 lockmgr_lock_flags.9 \ lock.9 lockmgr_printinfo.9 \ lock.9 lockmgr_recursed.9 \ lock.9 lockmgr_rw.9 \ + lock.9 lockmgr_slock.9 \ + lock.9 lockmgr_unlock.9 \ + lock.9 lockmgr_xlock.9 \ lock.9 lockstatus.9 MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9 MLINKS+=make_dev.9 destroy_dev.9 \ diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9 index 96f617a72123..9cff6e3bd8aa 100644 --- a/share/man/man9/lock.9 +++ b/share/man/man9/lock.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd May 18, 2024 +.Dd June 21, 2024 .Dt LOCK 9 .Os .Sh NAME @@ -34,9 +34,14 @@ .Nm lockmgr_args , .Nm lockmgr_args_rw , .Nm lockmgr_disown , +.Nm lockmgr_disowned , +.Nm lockmgr_lock_flags , .Nm lockmgr_printinfo , .Nm lockmgr_recursed , .Nm lockmgr_rw , +.Nm lockmgr_slock , +.Nm lockmgr_unlock , +.Nm lockmgr_xlock , .Nm lockstatus , .Nm lockmgr_assert .Nd "lockmgr family of functions" @@ -56,6 +61,10 @@ .Fn lockmgr_args_rw "struct lock *lkp" "u_int flags" "struct rwlock *ilk" "const char *wmesg" "int prio" "int timo" .Ft void .Fn lockmgr_disown "struct lock *lkp" +.Ft int +.Fn lockmgr_disowned "const struct lock *lkp" +.Ft int +.Fn lockmgr_lock_flags "struct lock *lkp" "u_int flags" "struct lock_object *ilk" "const char *file" "int line" .Ft void .Fn lockmgr_printinfo "const struct lock *lkp" .Ft int @@ -63,6 +72,12 @@ .Ft int .Fn lockmgr_rw "struct lock *lkp" "u_int flags" "struct rwlock *ilk" .Ft int +.Fn lockmgr_slock "struct lock *lkp" "u_int flags" "const char *file" "int line" +.Ft int +.Fn lockmgr_unlock "struct lock *lkp" +.Ft int +.Fn lockmgr_xlock "struct lock *lkp" "u_int flags" "const char *file" "int line" +.Ft int .Fn lockstatus "const struct lock *lkp" .Pp .Cd "options INVARIANTS" @@ -253,12 +268,55 @@ and .Dv LK_TIMO_DEFAULT . .Pp The +.Fn lockmgr_lock_flags +function works like +.Fn lockmgr +but accepts explicit +.Fa file +and +.Fa line +arguments for lock tracing. +.Pp +The +.Fn lockmgr_slock , +.Fn lockmgr_xlock , +and +.Fn lockmgr_unlock +functions are lightweight entry points that function like +.Fn lockmgr +for the +.Dv LK_SHARED , +.Dv LK_EXCLUSIVE , +and +.Dv LK_RELEASE +operations respectively. +They provide functionality similar to +.Xr sx 9 +locks in that none of the additional +.Xr lockmgr 9 +features are supported. +Specifically, these functions do not support unlocking interlocks, the +.Dv LK_SLEEPFAIL +flag, or locks with shared locking disabled via +.Dv LK_NOSHARE . +They also accept explicit +.Fa file +and +.Fa line +arguments for lock tracing. +.Pp +The .Fn lockmgr_disown function switches the owner from the current thread to be .Dv LK_KERNPROC , if the lock is already held. .Pp The +.Fn lockmgr_disowned +function returns true or false according to whether the lock is held by +.Dv LK_KERNPROC . +.Pp +The .Fn lockmgr_printinfo function prints debugging information about the lock. It is used primarily by @@ -354,6 +412,8 @@ was requested and another thread had already requested a lock upgrade. was set, and a sleep would have been required, or .Dv LK_TRYUPGRADE operation was not able to upgrade the lock. +.It Bq Er EDEADLK +A shared lock was attempted while the thread already held the exclusive lock. .It Bq Er ENOLCK .Dv LK_SLEEPFAIL was set and @@ -398,6 +458,7 @@ exclusive lock, and a .Xr panic 9 will be the result of trying. .Sh SEE ALSO +.Xr witness 4 , .Xr condvar 9 , .Xr locking 9 , .Xr mtx_assert 9 , From nobody Sun Jun 23 22:48:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6mTn4gHtz5P8l9; Sun, 23 Jun 2024 22:48: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 4W6mTn4B2Vz4cwN; Sun, 23 Jun 2024 22: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=1719182909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRWfKkBAeNmg4SULWJPB6rB4JXfDsp6j288Nyy8spP4=; b=hc2vnlMgndpLVEAcuuh+eNdcj/erTNmI+MtdRK4n+Q3EsW1oI18dWHQJHSqDvhtXusZfzc 9xZEmNgFkBRLGB5mNaMRRnMIPBDfEoRSxNwcXXOR6om/SfEx0QK77rf3Mwk2QB6fChEoC/ ICOzod3p5I5Va8T2iGtPj5PUr4LjRFQ83sPB9WQxYLr7rOFiPVayCEDmY89fQpi2UTYvO+ UxeYtuFyiYYNU3Tt6I1SHqWrh3dkufWO0HNuGgRSu7Zvt3ZAOeQC3JFQQrQmalItRAwbAC hRk7DBMqwSo1H1IsHq8ee7kY2FlvXLGeb5pmzKZo0oNLxvplXnIrWSjh9PdjNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719182909; a=rsa-sha256; cv=none; b=lvwj963mCqATC0GfXBL+TaN/oh+AOh+djD0yzsVYbIIWFXLveGDDxtWUanYk2vIzRJL6ex umqbmovFAGaMtUdbk+tASFLm/snMqdyJbgCDjVnZKR/FM/Q26ojPSXNPrkMS26whu+mmJT JZfowsd88mE+1BhB7E9O93YCRuW9EEKvYHoM7Zlla5FoEVzr8rm9bLJj+tqLs/iAuJNdiz ILOVncTtDFpnyGc3bG7YS80pjKqQoJwaoRJK09mtOf5bOh+kjBw/cVnD0lYy8OUj5woAuW ps16uaijHhGLLOvXWAJUofqPtCAI+LEx6A+Nf9ZkapDFFreJjzatJUOFOgSOCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719182909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRWfKkBAeNmg4SULWJPB6rB4JXfDsp6j288Nyy8spP4=; b=lVOhZGhN6YXNuUyrVMW27IeZyqCLMZR4jdkpV7i/jyAkAQ7Fzt/brzTrEQUW5JVT8d47L/ pI2waBfvRmbyl4igOSxTqVmmLdYME8kwApgyByeytffxZWuCql6SoNPPYE/nOgroskYMU4 5Bk9oF7USvJZu7lpulmydCknv7y3nOQUQTzha5KExcQqGrEQeqJZIauKwshd5sQ2M4xZDI gRpMQrEtK/X6pBMYJymoQolJmuW3grG3ON7C/WIkJl/0GLfE6VYbOg5dyldZdHgR+dNntz MtxxTjoaG31osJGdCOVGvXlA2ZNViC/Kg8HJdyQ36JrIP915fGRYnsVHHPaRJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6mTn3TBJzt4F; Sun, 23 Jun 2024 22: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 45NMmT7H065556; Sun, 23 Jun 2024 22: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 45NMmTG9065553; Sun, 23 Jun 2024 22:48:29 GMT (envelope-from git) Date: Sun, 23 Jun 2024 22:48:29 GMT Message-Id: <202406232248.45NMmTG9065553@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: 67284d32e5e0 - main - nfsd: Make modifying vfs.nfsd.enable_locallocks safe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67284d32e5e0d5f015d73eeac4342974277263f5 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=67284d32e5e0d5f015d73eeac4342974277263f5 commit 67284d32e5e0d5f015d73eeac4342974277263f5 Author: Rick Macklem AuthorDate: 2024-06-23 22:47:22 +0000 Commit: Rick Macklem CommitDate: 2024-06-23 22:47:22 +0000 nfsd: Make modifying vfs.nfsd.enable_locallocks safe Commit dfaeeacc2cc2 modified clientID handling so that it could be done with only a mutex lock held when vfs.nfsd.enable_locallocks is 0. This makes it unsafe to change the setting of vfs.nfsd.enable_locallocks when nfsd threads are active. This patch forces all nfsd threads to be blocked when the value of vfs.nfsd.enable_locallocks is changed, so that it is done safely. MFC after: 1 month --- sys/fs/nfsserver/nfs_nfsdport.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 6f5b2855bcf0..fa99a76f492e 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -69,6 +69,7 @@ extern int nfsrv_maxpnfsmirror; extern uint32_t nfs_srvmaxio; extern int nfs_bufpackets; extern u_long sb_max_adj; +extern struct nfsv4lock nfsv4rootfs_lock; NFSD_VNET_DECLARE(int, nfsrv_numnfsd); NFSD_VNET_DECLARE(struct nfsrv_stablefirst, nfsrv_stablefirst); @@ -178,8 +179,6 @@ SYSCTL_INT(_vfs_nfsd, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, 0, ""); SYSCTL_INT(_vfs_nfsd, OID_AUTO, issue_delegations, CTLFLAG_RW, &nfsrv_issuedelegs, 0, "Enable nfsd to issue delegations"); -SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_locallocks, CTLFLAG_RW, - &nfsrv_dolocallocks, 0, "Enable nfsd to acquire local locks on files"); SYSCTL_INT(_vfs_nfsd, OID_AUTO, debuglevel, CTLFLAG_RW, &nfsd_debuglevel, 0, "Debug level for NFS server"); NFSD_VNET_DECLARE(int, nfsd_enable_stringtouid); @@ -294,6 +293,38 @@ SYSCTL_PROC(_vfs_nfsd, OID_AUTO, srvmaxio, CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_srvmaxio, "IU", "Maximum I/O size in bytes"); +static int +sysctl_dolocallocks(SYSCTL_HANDLER_ARGS) +{ + int error, igotlock, newdolocallocks; + + newdolocallocks = nfsrv_dolocallocks; + error = sysctl_handle_int(oidp, &newdolocallocks, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (newdolocallocks == nfsrv_dolocallocks) + return (0); + if (jailed(curthread->td_ucred)) + return (EINVAL); + + NFSLOCKV4ROOTMUTEX(); + do { + igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL, + NFSV4ROOTLOCKMUTEXPTR, NULL); + } while (!igotlock); + NFSUNLOCKV4ROOTMUTEX(); + + nfsrv_dolocallocks = newdolocallocks; + + NFSLOCKV4ROOTMUTEX(); + nfsv4_unlock(&nfsv4rootfs_lock, 0); + NFSUNLOCKV4ROOTMUTEX(); + return (0); +} +SYSCTL_PROC(_vfs_nfsd, OID_AUTO, enable_locallocks, + CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, + sysctl_dolocallocks, "IU", "Enable nfsd to acquire local locks on files"); + #define MAX_REORDERED_RPC 16 #define NUM_HEURISTIC 1031 #define NHUSE_INIT 64 From nobody Sun Jun 23 23:13:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6n2w528fz5PC1g; Sun, 23 Jun 2024 23:13: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 4W6n2w42gQz4g1w; Sun, 23 Jun 2024 23:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719184424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQ30dDksZCRpF2rbaz1+nqiKr1MF0ku/K/iCRX08Mks=; b=U/htF2gb5TCcylr5/f7PgzSx6zAb87iiK47GeAdW/n6U8QFPdK+LYNRuBBrP27mHxEqTAo MldsZxbo6P2ONEFcrhCaSeDmR4hhJ04SOQ8uTmR1T3/DK0eNJZUY9O+goJKLuAbSk0QY2z 4ZOH8HP3tpVJLuG9C19N0Fb0hOxotbtU3fvAxXxA/huAO4osDZR1x21JH/80ih6TI2pDLP p5Rb3sOpAR/kcZQVmFATb+71ms3XvMiGWAKSlyVD5pjCHENcBj8BiPKdkhGUHAkXYQGiHG q6P6pmVHReG1+c26ZWDB4XschL9n0GqJoCi49I2yqCqm3L3r2f3ZU1OXBkNbnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719184424; a=rsa-sha256; cv=none; b=k8IjNqOMTnsXWUYGpIFRf1EiiFyxUC0OlrA1zEdID5n4aCVC3OyoKhg3QNlT7M8RHfIEMu EP9w0IgVXt+4Z6nBOipJmZkc2RRYVyc3X0PZYq9dcBrdO3SsAldd9izQSqgfx2MFSF5lIt Bp3LjiuTRK/G3CvSIiEn5lw9NjYNX6HMGsV1DDXTfSmysx8yjHAU5Fa7+/DyofDSjWF26y ShtclUWUM+dCNfHgPazUGiqSbenn8YcOBMrVRoQenCIFPz/CSJhG7CnA69onjnUjnCmOUp sKVoTLm4fvM4S+/wZHsjqBJ5W0Az3+Wb2AbENHYL11pz3w0k+XGDQ/FovS1RGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719184424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQ30dDksZCRpF2rbaz1+nqiKr1MF0ku/K/iCRX08Mks=; b=CSS/Ey//3cUOjvPHy/eqjG4J/CxiYBT690uBVu1Qg3ZhBuyeV2auNkC27QF87H33t8BaB+ oy9v0AMlzLCS36AP0lnjsAqXC3yEdkDkFcJKtO3AAF9z+Jy2ETzmFPPa9VTqtEEQIliROG DNdQkn2xVsWhI05WBsVRL8pcq/rC9UXNBmv9wbX69R8WRj+/rH8uJmWPZVdOZgs74zS5vt mi50ZQHBYVamxrQGX6Yc9T+a6xs4zqRnEDINcAileSuKUD7Yt19sJmJfj5kxMLTbgfnAM4 SSNEyE5uM9My4QpbdIvfxWK9wGcsf1ietfQs7nhUaBrrOZbxafkiC/0XpifYlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6n2w3f98zv0m; Sun, 23 Jun 2024 23:13: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 45NNDiAc016324; Sun, 23 Jun 2024 23:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NNDilr016321; Sun, 23 Jun 2024 23:13:44 GMT (envelope-from git) Date: Sun, 23 Jun 2024 23:13:44 GMT Message-Id: <202406232313.45NNDilr016321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 3dd248798d80 - main - procctl(2) actually appeared in 9.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dd248798d806ddac50f569ca3e6b70a5f119f3f Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=3dd248798d806ddac50f569ca3e6b70a5f119f3f commit 3dd248798d806ddac50f569ca3e6b70a5f119f3f Author: David E. O'Brien AuthorDate: 2024-06-17 21:42:07 +0000 Commit: David E. O'Brien CommitDate: 2024-06-23 23:13:28 +0000 procctl(2) actually appeared in 9.3 --- lib/libsys/procctl.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/procctl.2 b/lib/libsys/procctl.2 index cb5234b6e40c..049568c5fc09 100644 --- a/lib/libsys/procctl.2 +++ b/lib/libsys/procctl.2 @@ -841,7 +841,7 @@ or invalid signal number. The .Fn procctl function appeared in -.Fx 10.0 . +.Fx 9.3 . .Pp The reaper facility is based on a similar feature of Linux and DragonflyBSD, and first appeared in From nobody Sun Jun 23 23:13:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6n2x5fd9z5PBxr; Sun, 23 Jun 2024 23:13: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 4W6n2x53D7z4g68; Sun, 23 Jun 2024 23:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719184425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNKQgfBYkECCZUalQu1aZ0NlhW7AuXNLTRC/j7KRGcg=; b=IIzW4oowvKbzdr2PBfjj7IXOriShXH2i2U/KCPQ+s4DBU4FkfDjuI2cqVqfNc6imJJFD9v 9PSHravMVAc5Em+3C6w9w04w3sOfB9gX19vtYHXRjAkj34YDsyWgvsUI3WXyAPxUN3yhoX TxasMBMIqI9smx8Tqi2osNi2nRbU4NTGoRw1gPSVZV0chq28ynKTLdc0LklOfoZ7pYUCNA Tki/48L/Dmbi+Ue4jWarjgRb67cxFmboco1wL3ZxFjZ23SR0i4DHiCFopA3rQllfcPBXf9 TUG3LuFYaiaQVuLt7oYvZeIqHANd/IfP80l1i2PxGLgomXPPZ8hPZQim4gTmzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719184425; a=rsa-sha256; cv=none; b=gNvPTe/tXgoar5wgEgfTAh8Hr6U5RsTPEDu8UTI+iwJyVAfE11Zwxamhc5QFPQdbICV2XC /4tSvNrRMzwnuAm40U+7q2ie2mKiX3OQS2DXv2B7k4CuDhf+XLblogDSOybnySIrKLQWVE 0DNOTJn152h5ckBzmZt4W3pxXlok5ww63ra9iLaXvOPS3lGoGPkeqB8QjLU6gibuwBjFRJ wzH/3iIGP2ttYu5CEUTqhlhd9saIFT+kKsGvllI1/YpDv10thqi/x3JE1Fj1cCUcnusXRO 1bTS51pFKN21fzbMcQUlhRtF2/xDqi74C3bAAGl0EgD0i3rLovEF6b7Ind567A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719184425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNKQgfBYkECCZUalQu1aZ0NlhW7AuXNLTRC/j7KRGcg=; b=D99Civqx8nY1b6NYbsdLUfUseyEtf8fZoQqLH91V8MFtUzqdCD5J3aFmv9Iur059Rc2RNA byTH0N7hr7O15C13GNnufJy99YewvupUyNG6fSeLShFUf861cJ9cIvTmlEBlCJRrZsYTPa ib8BpYkiWcycwWXxSKuUoEK5MAdonzgrRncz/cGFczGMz1vGwALoSMxR+jX5EGTGBlyxf5 Uy88FANIokW+KiMGwsNzp6/BOoYOZt2xu9MUCWl5cKruTWB7lbPMbJmLX+TAiyQzAi0BId Vc4vL0ySGkhsWJIXEAaHejGiEOecP7d4jp0jma8w/yME6PkCtQa27vF7wQaHwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6n2x4fK4zv0n; Sun, 23 Jun 2024 23:13: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 45NNDjti016372; Sun, 23 Jun 2024 23:13:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NNDjVQ016369; Sun, 23 Jun 2024 23:13:45 GMT (envelope-from git) Date: Sun, 23 Jun 2024 23:13:45 GMT Message-Id: <202406232313.45NNDjVQ016369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 5bcc33d1e0e6 - main - ppoll(2) was actually added in 10.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bcc33d1e0e61beba4890018e646fc945ada0047 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=5bcc33d1e0e61beba4890018e646fc945ada0047 commit 5bcc33d1e0e61beba4890018e646fc945ada0047 Author: David E. O'Brien AuthorDate: 2024-06-18 06:16:07 +0000 Commit: David E. O'Brien CommitDate: 2024-06-23 23:13:28 +0000 ppoll(2) was actually added in 10.2 --- lib/libsys/poll.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/poll.2 b/lib/libsys/poll.2 index 175958ce644e..6a5cc1dc3a89 100644 --- a/lib/libsys/poll.2 +++ b/lib/libsys/poll.2 @@ -282,7 +282,7 @@ This manual page and the core of the implementation was taken from The .Fn ppoll function first appeared in -.Fx 11.0 +.Fx 10.2 .Sh BUGS The distinction between some of the fields in the .Fa events From nobody Sun Jun 23 23:24:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6nHb12bzz5PDCF; Sun, 23 Jun 2024 23:24: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 4W6nHb0TFGz4hSX; Sun, 23 Jun 2024 23: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=1719185083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pnMc1up+8Be5xBgZewyCmQjp4ZnNXzZpSG5OEr8ZQHU=; b=NOjirMJB9ZBU/4xVJMegWAwdbulbWCWLyLz7wTbA30GyW7pop3A9sn8ULsHYOMrNyLvb49 8w7eVQt1342YqhfTMMCw2IMceU/fEcqygb9ciru7LzfQTlVz3O7rKVo+UDHUPhgcCyxDoN 3mis6giJGAVNtHTJo0Qth12yRzhh85SpCPWTww2i4yxt2dM0VdAU784pTUnFj35xbehmgd O8X20Y7XfYHMM35lbCbuPaG+zwD8Akv1zWfx+iaGXC7UBuh4HNm09FqXX7KVOmQ8ban3NB aJ0e1qneK2y6NEn2oLgvWGZXWlW+8lo+qCnoqpjB+e4h1ymwExOOYa59lUKc6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719185083; a=rsa-sha256; cv=none; b=IqP909L5F6dSc/U3E69Ud8TXdH7A0E8BEdQKBqTAtN//2gm/Eub2NlDA31Dm2CvkRKulj5 ZvJWMCxzpmD7VTsHeqYxCfpYI9rBNY93N6rsklptQ+ZZjUwYEh0V0qqD0dFz7ZsGMwlZ2N 7dr5CpCYHVzJ8i0rAlF0oFRbl2S0DtGsY430E3nt1zICT1IAuiakglqhVcNvlofcXkC5mf 2h7Jhq/wE0+AdRZD3MkqKG0ng0tDYZMkNvYWWAQyEjG/vADJ4oljdqJbfsCgojJt1Cr5dn KI25+38tk4sJkx2ABgjBhALuBZ0jZlE/YFTz+gyZdYZHV0fjui9DeNCDOp2MAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719185083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pnMc1up+8Be5xBgZewyCmQjp4ZnNXzZpSG5OEr8ZQHU=; b=sum5BY05uUTGEwdv/321PXpvnyF82XXs5c/r7QzSGA3r7TQb3FBSJIdsDLb4155gw7z5tg 44BtZDki+QTpp+JFjtOBMsG1Hb1zGZCVCeoUzgysSiEThBbXbuqAGU7iTrSN3/B62HN9tT FxwTiKfM7UZnaLovIEejFWx92+zKHS3msvAroY+R1B98P0khpywv5z1YuEBRv/Ze6girCY EBQ1mSJpj9zYpzUiXPNY6fTxxXVLmN5XNXQvzg1UfSdox6haCeWsg5JF802sr2RaAtHe9n vEfodcv5W7Zg9Kf80c1XM630ho1HLtNFV7nqQYf2fkm/NLcTvvcfkSLNGqbixQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6nHb04yPzvJ2; Sun, 23 Jun 2024 23: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 45NNOgcP032757; Sun, 23 Jun 2024 23:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NNOg4f032754; Sun, 23 Jun 2024 23:24:42 GMT (envelope-from git) Date: Sun, 23 Jun 2024 23:24:42 GMT Message-Id: <202406232324.45NNOg4f032754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 6095f4b04cf9 - main - amd64 kernel __storeload_barrier: quiet gcc -Warray-bounds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6095f4b04cf9714a3b66fc5906fcfc5ec2a8ddd6 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=6095f4b04cf9714a3b66fc5906fcfc5ec2a8ddd6 commit 6095f4b04cf9714a3b66fc5906fcfc5ec2a8ddd6 Author: Ryan Libby AuthorDate: 2024-06-23 23:23:14 +0000 Commit: Ryan Libby CommitDate: 2024-06-23 23:23:14 +0000 amd64 kernel __storeload_barrier: quiet gcc -Warray-bounds Use a constant input operand instead of an output operand to tell the compiler about OFFSETOF_MONITORBUF. If we tell it we are writing to *(u_int *)OFFSETOF_MONITORBUF, it rightly complains, but we aren't. The memory clobber already covers the necessary semantics for the compiler. Reviewed by: kib Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45694 --- sys/amd64/include/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index facf6da844d3..75a88e03290e 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -295,8 +295,8 @@ static __inline void __storeload_barrier(void) { #if defined(_KERNEL) - __asm __volatile("lock; addl $0,%%gs:%0" - : "+m" (*(u_int *)OFFSETOF_MONITORBUF) : : "memory", "cc"); + __asm __volatile("lock; addl $0,%%gs:%c0" + : : "i" (OFFSETOF_MONITORBUF) : "memory", "cc"); #else /* !_KERNEL */ __asm __volatile("lock; addl $0,-8(%%rsp)" : : : "memory", "cc"); #endif /* _KERNEL*/ From nobody Sun Jun 23 23:45:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6nlp2PHzz5PG02 for ; Sun, 23 Jun 2024 23:45:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W6nll6MZVz4kKD for ; Sun, 23 Jun 2024 23:45:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=oFR3KgmH; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::535) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-70df2135426so2345458a12.2 for ; Sun, 23 Jun 2024 16:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1719186338; x=1719791138; 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=ob8kW93XwGqaOI81aUoHcamPlZCftJPrYPDGQyv4+4c=; b=oFR3KgmHDCHYRh4n4oguS2D/upvaa5d9G3C1hkDjlAdId3yu6q3CmeOUSBIITzx/tA c1TX7JJSGxHzMj+bQvYLiBO7mPb25aA0hkQC/wjrjmAHs7IfquezQMS88AnpvPxG+4YW GEIXQqKoHcHtULeEXuOVQ33eot7xjjq3QO6rXsZ1FGTgCoccPvC+JJSPn2OJQT0FBVXX 0Hd/QVW6HvHZ0Fuh2yPkBxWh8QpP5tb7kDZXUvIZf0SrnfAY80cKkBdxF/IH0N2+YtMB gNVApcLnIG89grOBdc+X5WxlPXlrGMsw3jFmvazSU3wXKtbASxvDL5tIHXr+0DQWmmTo MLCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719186338; x=1719791138; 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=ob8kW93XwGqaOI81aUoHcamPlZCftJPrYPDGQyv4+4c=; b=pbvUB2ZsFXyVvtCg7tvRtdRwHRyzX9d6LegSuM/5mAFSoUsPjiAvitqS85GQssZLyY bUerzODqu9zXRIL/SSZnqKIN0kDHbYfsnCidmxFR4M1tMWx8PFe0H5+5sKLkxnS/Wa9R 3YQQwdnS7StOo2T7Z9JTI/74UqsIR944eNvEZAC6YAvLPUcm5CWBkjuL1cnMLlC0FXxt ma9A7VZeUtMYNx4mEIDGj1Rdl/tMVku7f6Kp/SXUsos610uuIhs1dzHYTP/pwYZsG+9k 4CDJ/PUvDmhjDBWo8EOc5Ax2ygAxmHjbLgulzZAzpk6Q8KQOapBv3S+QVNRr+eriTM7V 1YBQ== X-Forwarded-Encrypted: i=1; AJvYcCUpO3X1yF/9ZhzN8dvOGsDaVRJ5odQIM/NdLB5a5tN1ui/VX7CuQWEgvAdk/8/9nvWM2otye1O40aI3q4U6NziROHI8fqo8Ob23m0zuzhBF X-Gm-Message-State: AOJu0YzL33JkzANwzhOkassUKfKupZ0vDw10BIt1c/fMxQ8OOZXrBs3s WlPEtFmEYRSnsf1bycbFXpW2sdPl75A6sNbMRTs8vX3UoBIc1XI5L23Eb7z190rZr08/xAQt77U UiGoGH9HkefDZvdwqNW2yy8vuVXZKPM0kvz74Mw== X-Google-Smtp-Source: AGHT+IGCBDgmZ7GmA6tgmHyG62HROZBP2FIYZVtGRws4RFspKGHyX4b7WrCStFq9G2u20nJW0N/uXv6wSJCypTDKz/Q= X-Received: by 2002:a17:90b:4c41:b0:2c3:213b:d0b1 with SMTP id 98e67ed59e1d1-2c86127e2a8mr1942516a91.5.1719186338163; Sun, 23 Jun 2024 16:45:38 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202406210241.45L2fQZA057110@gitrepo.freebsd.org> <111875645.165697.1719082066518@mail.yahoo.com> In-Reply-To: <111875645.165697.1719082066518@mail.yahoo.com> From: Warner Losh Date: Sun, 23 Jun 2024 17:45:27 -0600 Message-ID: Subject: Re: git: d5c01e1124ff - main - cdefs.h: Remove pre gcc 5.0 support To: Pedro Giffuni Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Warner Losh Content-Type: multipart/alternative; boundary="000000000000fd48f8061b97429d" X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_SOME(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::535:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; R_SPF_NA(0.00)[no SPF record]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4W6nll6MZVz4kKD --000000000000fd48f8061b97429d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Indeed. But none of the ones that I removed are affected by this quirk since they are true for clang all versions. Warner On Sat, Jun 22, 2024 at 12:47=E2=80=AFPM Pedro Giffuni wr= ote: > It was long ago when I last touched this but FWIW ... > > clang used to report itself as GCC 4.2 and kept it's GCC extension suppor= t > level consistent with that version so these version numbers were relevant= . > > Pedro. > > On Thursday, June 20, 2024 at 09:41:34 PM GMT-5, Warner Losh < > imp@freebsd.org> wrote: > > > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dd5c01e1124ffa4adb2513e7e8d708d7= 072dbfc75 > > commit d5c01e1124ffa4adb2513e7e8d708d7072dbfc75 > Author: Warner Losh > AuthorDate: 2024-06-20 23:03:15 +0000 > Commit: Warner Losh > CommitDate: 2024-06-21 02:41:09 +0000 > > cdefs.h: Remove pre gcc 5.0 support > > Reviewed by: brooks > Differential Revision: https://reviews.freebsd.org/D45656 > Sponsored by: Netflix > --- > sys/sys/cdefs.h | 54 ----------------------------------------------------= -- > 1 file changed, 54 deletions(-) > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > index a6ecdca5d8b9..43d179b82020 100644 > --- a/sys/sys/cdefs.h > +++ b/sys/sys/cdefs.h > @@ -164,18 +164,9 @@ > #define __aligned(x) __attribute__((__aligned__(x))) > #define __section(x) __attribute__((__section__(x))) > #define __writeonly __unused > -#if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__) > #define __alloc_size(x) __attribute__((__alloc_size__(x))) > #define __alloc_size2(n, x) __attribute__((__alloc_size__(n, x))) > -#else > -#define __alloc_size(x) > -#define __alloc_size2(n, x) > -#endif > -#if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__) > #define __alloc_align(x) __attribute__((__alloc_align__(x))) > -#else > -#define __alloc_align(x) > -#endif > > /* > * Keywords added in C11. > @@ -199,15 +190,6 @@ > #define _Alignof(x) __alignof(x) > #endif > > -#if !defined(__cplusplus) && !__has_extension(c_atomic) && \ > - !__has_extension(cxx_atomic) && !__GNUC_PREREQ__(4, 7) > -/* > - * No native support for _Atomic(). Place object in structure to prevent > - * most forms of direct non-atomic access. > - */ > -#define _Atomic(T) struct { T volatile __val; } > -#endif > - > #if defined(__cplusplus) && __cplusplus >=3D 201103L > #define _Noreturn [[noreturn]] > #else > @@ -218,15 +200,6 @@ > #if (defined(__cplusplus) && __cplusplus >=3D 201103L) || \ > __has_extension(cxx_static_assert) > #define _Static_assert(x, y) static_assert(x, y) > -#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) > -/* Nothing, gcc 4.6 and higher has _Static_assert built-in */ > -#elif defined(__COUNTER__) > -#define _Static_assert(x, y) __Static_assert(x, __COUNTER__) > -#define __Static_assert(x, y) ___Static_assert(x, y) > -#define ___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 > : -1] \ > - __unused > -#else > -#define _Static_assert(x, y) struct __hack > #endif > #endif > > @@ -276,7 +249,6 @@ > * void bar(int myArray[__min_size(10)]); > */ > #if !defined(__cplusplus) && \ > - (defined(__clang__) || __GNUC_PREREQ__(4, 6)) && \ > (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >=3D 199901)) > #define __min_size(x) static (x) > #else > @@ -302,17 +274,9 @@ > #define __result_use_or_ignore_check > #endif /* !__clang__ */ > > -#if __GNUC_PREREQ__(4, 1) > #define __returns_twice __attribute__((__returns_twice__)) > -#else > -#define __returns_twice > -#endif > > -#if __GNUC_PREREQ__(4, 6) || __has_builtin(__builtin_unreachable) > #define __unreachable() __builtin_unreachable() > -#else > -#define __unreachable() ((void)0) > -#endif > > #if !defined(__STRICT_ANSI__) || __STDC_VERSION__ >=3D 199901 > #define __LONG_LONG_SUPPORTED > @@ -353,33 +317,15 @@ > #define __predict_true(exp) __builtin_expect((exp), 1) > #define __predict_false(exp) __builtin_expect((exp), 0) > > -#if __GNUC_PREREQ__(4, 0) > #define __null_sentinel __attribute__((__sentinel__)) > #define __exported __attribute__((__visibility__("default"))) > #define __hidden __attribute__((__visibility__("hidden"))) > -#else > -#define __null_sentinel > -#define __exported > -#define __hidden > -#endif > > /* > * We define this here since , , and > * require it. > */ > -#if __GNUC_PREREQ__(4, 1) > #define __offsetof(type, field) __builtin_offsetof(type, field) > -#else > -#ifndef __cplusplus > -#define __offsetof(type, field) \ > - ((__size_t)(__uintptr_t)((const volatile void *)&((type *)0)->field)= ) > -#else > -#define __offsetof(type, field) \ > - (__offsetof__ (reinterpret_cast <__size_t> \ > - (&reinterpret_cast \ > - (static_cast (0)->field)))) > -#endif > -#endif > #define __rangeof(type, start, end) \ > (__offsetof(type, end) - __offsetof(type, start)) > > --000000000000fd48f8061b97429d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Indeed. But none of the ones that I removed are affected b= y this quirk since they are true for clang all versions.

Warner

On Sat, Jun 22, 2024 at 12:47=E2=80=AFPM Pedro Giffuni <pfg@freebsd.org> wrote:
It was long ago when I last touched this but FWIW = ...

clang used to repo= rt itself as GCC 4.2 and kept it's GCC extension support level consiste= nt with that version so these version numbers were relevant.

Pedro.

=20
=20
On Thursday, June 20, 2024 at 09:41:34 PM GMT-5, Wa= rner Losh <imp@free= bsd.org> wrote:


=20 =20
The branch main has been updated by i= mp:


commit d5c01e1124ffa4adb2513e7e8d708d7072db= fc75
Author:=C2=A0 =C2=A0 Warner Losh <imp@FreeBSD= .org>
AuthorDate: 2024-06-20 23:03:15 +000= 0
Commit:=C2=A0 =C2=A0 Warner Losh <imp@FreeBSD.= org>
CommitDate: 2024-06-21 02:41:09 +0000=

=C2=A0 =C2=A0 cdefs.h= : Remove pre gcc 5.0 support
=C2=A0 =C2=A0
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 brooks
=C2=A0 =C2=A0 Differential R= evision:=C2=A0 https://reviews.freebsd.org/D45656
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = Netflix
---
sys/sys/cd= efs.h | 54 ------------------------------------------------------
=
1 file changed, 54 deletions(-)

diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h<= br>
index a6ecdca5d8b9..43d179b82020 100644
=
--- a/sys/sys/cdefs.h
+++ b/sys/= sys/cdefs.h
@@ -164,18 +164,9 @@
#define=C2=A0=C2=A0=C2=A0 __aligned(x)=C2=A0=C2=A0=C2=A0 __attri= bute__((__aligned__(x)))
#define=C2=A0=C2=A0=C2= =A0 __section(x)=C2=A0=C2=A0=C2=A0 __attribute__((__section__(x)))
#define=C2=A0=C2=A0=C2=A0 __writeonly=C2=A0=C2=A0=C2=A0 = __unused
-#if __GNUC_PREREQ__(4, 3) || __has_attr= ibute(__alloc_size__)
#define=C2=A0=C2=A0=C2=A0 = __alloc_size(x)=C2=A0=C2=A0=C2=A0 __attribute__((__alloc_size__(x)))
#define=C2=A0=C2=A0=C2=A0 __alloc_size2(n, x)=C2=A0=C2= =A0=C2=A0 __attribute__((__alloc_size__(n, x)))
-= #else
-#define=C2=A0=C2=A0=C2=A0 __alloc_size(x)<= br>
-#define=C2=A0=C2=A0=C2=A0 __alloc_size2(n, x)
-#endif
-#if __GNUC_PRERE= Q__(4, 9) || __has_attribute(__alloc_align__)
#d= efine=C2=A0=C2=A0=C2=A0 __alloc_align(x)=C2=A0=C2=A0=C2=A0 __attribute__((_= _alloc_align__(x)))
-#else
-#define=C2=A0=C2=A0=C2=A0 __alloc_align(x)
-= #endif

/*
<= div dir=3D"ltr">=C2=A0 * Keywords added in C11.
@= @ -199,15 +190,6 @@
#define=C2=A0=C2=A0=C2=A0 _A= lignof(x)=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 __alignof(x)
#endif

-#= if !defined(__cplusplus) && !__has_extension(c_atomic) && \=
-=C2=A0=C2=A0=C2=A0 !__has_extension(cxx_atomic)= && !__GNUC_PREREQ__(4, 7)
-/*
<= div dir=3D"ltr">- * No native support for _Atomic(). Place object in struct= ure to prevent
- * most forms of direct non-atomi= c access.
- */
-#define= =C2=A0=C2=A0=C2=A0 _Atomic(T)=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 struct {= T volatile __val; }
-#endif
-
#if defined(__cplusplus) && __cp= lusplus >=3D 201103L
#define=C2=A0=C2=A0=C2= =A0 _Noreturn=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 [[noreturn]]
#else
@@ -218,15 +200,6 @@
#if (defined(__cplusplus) && __cplusplus >= =3D 201103L) || \
=C2=A0 =C2=A0 __has_extension(= cxx_static_assert)
#define=C2=A0=C2=A0=C2=A0 _St= atic_assert(x, y)=C2=A0=C2=A0=C2=A0 static_assert(x, y)
-#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus)
-/* Nothing, gcc 4.6 and higher has _Static_assert bui= lt-in */
-#elif defined(__COUNTER__)
-#define=C2=A0=C2=A0=C2=A0 _Static_assert(x, y)=C2=A0=C2=A0= =C2=A0 __Static_assert(x, __COUNTER__)
-#define= =C2=A0=C2=A0=C2=A0 __Static_assert(x, y)=C2=A0=C2=A0=C2=A0 ___Static_assert= (x, y)
-#define=C2=A0=C2=A0=C2=A0 ___Static_asser= t(x, y)=C2=A0=C2=A0=C2=A0 typedef char __assert_ ## y[(x) ? 1 : -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 __unused
-#else
<= div dir=3D"ltr">-#define=C2=A0=C2=A0=C2=A0 _Static_assert(x, y)=C2=A0=C2=A0= =C2=A0 struct __hack
#endif
#endif

@@ -276= ,7 +249,6 @@
=C2=A0 * void bar(int myArray[__min_= size(10)]);
=C2=A0 */
= #if !defined(__cplusplus) && \
-=C2=A0 = =C2=A0 (defined(__clang__) || __GNUC_PREREQ__(4, 6)) && \
=
=C2=A0 =C2=A0 (!defined(__STDC_VERSION__) || (__STDC_VERS= ION__ >=3D 199901))
#define __min_size(x)=C2= =A0=C2=A0=C2=A0 static (x)
#else
@@ -302,17 +274,9 @@
#define=C2=A0=C2= =A0=C2=A0 __result_use_or_ignore_check
#endif /*= !__clang__ */

-#if _= _GNUC_PREREQ__(4, 1)
#define=C2=A0=C2=A0=C2=A0 _= _returns_twice=C2=A0=C2=A0=C2=A0 __attribute__((__returns_twice__))
-#else
-#define=C2=A0=C2=A0=C2= =A0 __returns_twice
-#endif

-#if __GNUC_PREREQ__(4, 6) || __has_builti= n(__builtin_unreachable)
#define=C2=A0=C2=A0=C2= =A0 __unreachable()=C2=A0=C2=A0=C2=A0 __builtin_unreachable()
-#else
-#define=C2=A0=C2=A0=C2=A0 __= unreachable()=C2=A0=C2=A0=C2=A0 ((void)0)
-#endif=

#if !defined(__STRI= CT_ANSI__) || __STDC_VERSION__ >=3D 199901
#d= efine=C2=A0=C2=A0=C2=A0 __LONG_LONG_SUPPORTED
@@ = -353,33 +317,15 @@
#define=C2=A0=C2=A0=C2=A0 __p= redict_true(exp)=C2=A0 =C2=A0 __builtin_expect((exp), 1)
#define=C2=A0=C2=A0=C2=A0 __predict_false(exp)=C2=A0 =C2=A0 __bui= ltin_expect((exp), 0)

-#if __GNUC_PREREQ__(4, 0)
#define=C2=A0=C2=A0= =C2=A0 __null_sentinel=C2=A0=C2=A0=C2=A0 __attribute__((__sentinel__))
<= /div>
#define=C2=A0=C2=A0=C2=A0 __exported=C2=A0=C2=A0=C2= =A0 __attribute__((__visibility__("default")))
#define=C2=A0=C2=A0=C2=A0 __hidden=C2=A0=C2=A0=C2=A0 __attribute_= _((__visibility__("hidden")))
-#else
-#define=C2=A0=C2=A0=C2=A0 __null_sentinel
-#define=C2=A0=C2=A0=C2=A0 __exported
-#define=C2=A0=C2=A0=C2=A0 __hidden
-#en= dif

/*
=C2=A0 * We define this here since <stddef.h>, <sys/q= ueue.h>, and <sys/types.h>
=C2=A0 * requ= ire it.
=C2=A0 */
-#if = __GNUC_PREREQ__(4, 1)
#define=C2=A0=C2=A0=C2=A0 = __offsetof(type, field)=C2=A0=C2=A0=C2=A0 __builtin_offsetof(type, field)<= br>
-#else
-#ifndef __cplus= plus
-#define=C2=A0=C2=A0=C2=A0 __offsetof(type, = field) \
-=C2=A0=C2=A0=C2=A0 ((__size_t)(__uintpt= r_t)((const volatile void *)&((type *)0)->field))
-#else
-#define=C2=A0=C2=A0=C2=A0 __offs= etof(type, field)=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 (= __offsetof__ (reinterpret_cast <__size_t>=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 (&reinterpret_cast <const vo= latile char &>=C2=A0=C2=A0=C2=A0 \
-=C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (static_cast<ty= pe *> (0)->field))))
-#endif
-#endif
#define=C2=A0=C2=A0=C2=A0 __= rangeof(type, start, end) \
=C2=A0=C2=A0=C2=A0 (= __offsetof(type, end) - __offsetof(type, start))
=
--000000000000fd48f8061b97429d--